c/libxlsxwriter
1
0
Fork 0
mirror of https://github.com/jmcnamara/libxlsxwriter synced 2025-03-28 21:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed non-static but non-public function names.

Browse Source 
Renamed non-static but non-public (i.e., non-documented) function names
to avoid clashes and conflicts.
This commit is contained in:
John McNamara 2016-01-05 00:27:12 +00:00
parent fd6f125bdc
commit bf84e5606e
13 changed files with 773 additions and 766 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/xlsxwriter/workbook.h
View File

@ -475,7 +475,6 @@ void lxw_workbook_set_default_xf_indices(lxw_workbook *workbook);
/* Declarations required for unit testing. */
#ifdef TESTING
STATIC void _workbook_xml_declaration(lxw_workbook *self);
STATIC void _workbook_xml_declaration(lxw_workbook *self);
STATIC void _write_workbook(lxw_workbook *self);
STATIC void _write_file_version(lxw_workbook *self);

59
include/xlsxwriter/xmlwriter.h
View File

@ -53,37 +53,38 @@ struct xml_attribute {
STAILQ_HEAD(xml_attribute_list, xml_attribute);
/* Create a new attribute struct to add to a xml_attribute_list. */
struct xml_attribute *_new_attribute_str(const char *key, const char *value);
struct xml_attribute *_new_attribute_int(const char *key, uint32_t value);
struct xml_attribute *_new_attribute_dbl(const char *key, double value);
struct xml_attribute *lxw_new_attribute_str(const char *key,
const char *value);
struct xml_attribute *lxw_new_attribute_int(const char *key, uint32_t value);
struct xml_attribute *lxw_new_attribute_dbl(const char *key, double value);
/* Macro to initialize the xml_attribute_list pointers. */
#define _INIT_ATTRIBUTES() \
#define LXW_INIT_ATTRIBUTES() \
STAILQ_INIT(&attributes)
/* Macro to add attribute string elements to xml_attribute_list. */
#define _PUSH_ATTRIBUTES_STR(key, value) \
#define LXW_PUSH_ATTRIBUTES_STR(key, value) \
do { \
attribute = _new_attribute_str((key), (value)); \
attribute = lxw_new_attribute_str((key), (value)); \
STAILQ_INSERT_TAIL(&attributes, attribute, list_entries); \
} while (0)
/* Macro to add attribute int values to xml_attribute_list. */
#define _PUSH_ATTRIBUTES_INT(key, value) \
#define LXW_PUSH_ATTRIBUTES_INT(key, value) \
do { \
attribute = _new_attribute_int((key), (value)); \
attribute = lxw_new_attribute_int((key), (value)); \
STAILQ_INSERT_TAIL(&attributes, attribute, list_entries); \
} while (0)
/* Macro to add attribute double values to xml_attribute_list. */
#define _PUSH_ATTRIBUTES_DBL(key, value) \
#define LXW_PUSH_ATTRIBUTES_DBL(key, value) \
do { \
attribute = _new_attribute_dbl((key), (value)); \
attribute = lxw_new_attribute_dbl((key), (value)); \
STAILQ_INSERT_TAIL(&attributes, attribute, list_entries); \
} while (0)
/* Macro to free xml_attribute_list and attribute. */
#define _FREE_ATTRIBUTES() \
#define LXW_FREE_ATTRIBUTES() \
while (!STAILQ_EMPTY(&attributes)) { \
attribute = STAILQ_FIRST(&attributes); \
STAILQ_REMOVE_HEAD(&attributes, list_entries); \
@ -95,7 +96,7 @@ struct xml_attribute *_new_attribute_dbl(const char *key, double value);
*
* @param xmlfile A FILE pointer to the output XML file.
*/
void _xml_declaration(FILE * xmlfile);
void lxw_xml_declaration(FILE * xmlfile);
/**
* Write an XML start tag with optional attributes.
@ -104,8 +105,9 @@ void _xml_declaration(FILE * xmlfile);
* @param tag The XML tag to write.
* @param attributes An optional list of attributes to add to the tag.
*/
void _xml_start_tag(FILE * xmlfile,
const char *tag, struct xml_attribute_list *attributes);
void lxw_xml_start_tag(FILE * xmlfile,
const char *tag,
struct xml_attribute_list *attributes);
/**
* Write an XML start tag with optional un-encoded attributes.
@ -115,9 +117,9 @@ void _xml_start_tag(FILE * xmlfile,
* @param tag The XML tag to write.
* @param attributes An optional list of attributes to add to the tag.
*/
void _xml_start_tag_unencoded(FILE * xmlfile,
const char *tag,
struct xml_attribute_list *attributes);
void lxw_xml_start_tag_unencoded(FILE * xmlfile,
const char *tag,
struct xml_attribute_list *attributes);
/**
* Write an XML end tag.
@ -125,7 +127,7 @@ void _xml_start_tag_unencoded(FILE * xmlfile,
* @param xmlfile A FILE pointer to the output XML file.
* @param tag The XML tag to write.
*/
void _xml_end_tag(FILE * xmlfile, const char *tag);
void lxw_xml_end_tag(FILE * xmlfile, const char *tag);
/**
* Write an XML empty tag with optional attributes.
@ -134,8 +136,9 @@ void _xml_end_tag(FILE * xmlfile, const char *tag);
* @param tag The XML tag to write.
* @param attributes An optional list of attributes to add to the tag.
*/
void _xml_empty_tag(FILE * xmlfile,
const char *tag, struct xml_attribute_list *attributes);
void lxw_xml_empty_tag(FILE * xmlfile,
const char *tag,
struct xml_attribute_list *attributes);
/**
* Write an XML empty tag with optional un-encoded attributes.
@ -145,9 +148,9 @@ void _xml_empty_tag(FILE * xmlfile,
* @param tag The XML tag to write.
* @param attributes An optional list of attributes to add to the tag.
*/
void _xml_empty_tag_unencoded(FILE * xmlfile,
const char *tag,
struct xml_attribute_list *attributes);
void lxw_xml_empty_tag_unencoded(FILE * xmlfile,
const char *tag,
struct xml_attribute_list *attributes);
/**
* Write an XML element containing data and optional attributes.
@ -157,12 +160,12 @@ void _xml_empty_tag_unencoded(FILE * xmlfile,
* @param data The data section of the XML element.
* @param attributes An optional list of attributes to add to the tag.
*/
void _xml_data_element(FILE * xmlfile,
const char *tag,
const char *data,
struct xml_attribute_list *attributes);
void lxw_xml_data_element(FILE * xmlfile,
const char *tag,
const char *data,
struct xml_attribute_list *attributes);
char *_escape_control_characters(const char *string);
char *lxw_escape_control_characters(const char *string);
/* *INDENT-OFF* */
#ifdef __cplusplus

84
src/app.c
View File

@ -92,7 +92,7 @@ lxw_app_free(lxw_app *app)
STATIC void
_app_xml_declaration(lxw_app *self)
{
_xml_declaration(self->file);
lxw_xml_declaration(self->file);
}
/*
@ -106,13 +106,13 @@ _write_properties(lxw_app *self)
char xmlns[] = APP_SCHEMA "/extended-properties";
char xmlns_vt[] = APP_SCHEMA "/docPropsVTypes";
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("xmlns", xmlns);
_PUSH_ATTRIBUTES_STR("xmlns:vt", xmlns_vt);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("xmlns", xmlns);
LXW_PUSH_ATTRIBUTES_STR("xmlns:vt", xmlns_vt);
_xml_start_tag(self->file, "Properties", &attributes);
lxw_xml_start_tag(self->file, "Properties", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -121,7 +121,7 @@ _write_properties(lxw_app *self)
STATIC void
_write_application(lxw_app *self)
{
_xml_data_element(self->file, "Application", "Microsoft Excel", NULL);
lxw_xml_data_element(self->file, "Application", "Microsoft Excel", NULL);
}
/*
@ -130,7 +130,7 @@ _write_application(lxw_app *self)
STATIC void
_write_doc_security(lxw_app *self)
{
_xml_data_element(self->file, "DocSecurity", "0", NULL);
lxw_xml_data_element(self->file, "DocSecurity", "0", NULL);
}
/*
@ -139,7 +139,7 @@ _write_doc_security(lxw_app *self)
STATIC void
_write_scale_crop(lxw_app *self)
{
_xml_data_element(self->file, "ScaleCrop", "false", NULL);
lxw_xml_data_element(self->file, "ScaleCrop", "false", NULL);
}
/*
@ -148,7 +148,7 @@ _write_scale_crop(lxw_app *self)
STATIC void
_write_vt_lpstr(lxw_app *self, const char *str)
{
_xml_data_element(self->file, "vt:lpstr", str, NULL);
lxw_xml_data_element(self->file, "vt:lpstr", str, NULL);
}
/*
@ -157,7 +157,7 @@ _write_vt_lpstr(lxw_app *self, const char *str)
STATIC void
_write_vt_i4(lxw_app *self, const char *value)
{
_xml_data_element(self->file, "vt:i4", value, NULL);
lxw_xml_data_element(self->file, "vt:i4", value, NULL);
}
/*
@ -167,14 +167,14 @@ STATIC void
_write_vt_variant(lxw_app *self, const char *key, const char *value)
{
/* Write the vt:lpstr element. */
_xml_start_tag(self->file, "vt:variant", NULL);
lxw_xml_start_tag(self->file, "vt:variant", NULL);
_write_vt_lpstr(self, key);
_xml_end_tag(self->file, "vt:variant");
lxw_xml_end_tag(self->file, "vt:variant");
/* Write the vt:i4 element. */
_xml_start_tag(self->file, "vt:variant", NULL);
lxw_xml_start_tag(self->file, "vt:variant", NULL);
_write_vt_i4(self, value);
_xml_end_tag(self->file, "vt:variant");
lxw_xml_end_tag(self->file, "vt:variant");
}
/*
@ -187,19 +187,19 @@ _write_vt_vector_heading_pairs(lxw_app *self)
struct xml_attribute *attribute;
lxw_heading_pair *heading_pair;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("size", self->num_heading_pairs * 2);
_PUSH_ATTRIBUTES_STR("baseType", "variant");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("size", self->num_heading_pairs * 2);
LXW_PUSH_ATTRIBUTES_STR("baseType", "variant");
_xml_start_tag(self->file, "vt:vector", &attributes);
lxw_xml_start_tag(self->file, "vt:vector", &attributes);
STAILQ_FOREACH(heading_pair, self->heading_pairs, list_pointers) {
_write_vt_variant(self, heading_pair->key, heading_pair->value);
}
_xml_end_tag(self->file, "vt:vector");
lxw_xml_end_tag(self->file, "vt:vector");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -212,19 +212,19 @@ _write_vt_vector_lpstr_named_parts(lxw_app *self)
struct xml_attribute *attribute;
lxw_part_name *part_name;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("size", self->num_part_names);
_PUSH_ATTRIBUTES_STR("baseType", "lpstr");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("size", self->num_part_names);
LXW_PUSH_ATTRIBUTES_STR("baseType", "lpstr");
_xml_start_tag(self->file, "vt:vector", &attributes);
lxw_xml_start_tag(self->file, "vt:vector", &attributes);
STAILQ_FOREACH(part_name, self->part_names, list_pointers) {
_write_vt_lpstr(self, part_name->name);
}
_xml_end_tag(self->file, "vt:vector");
lxw_xml_end_tag(self->file, "vt:vector");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -233,12 +233,12 @@ _write_vt_vector_lpstr_named_parts(lxw_app *self)
STATIC void
_write_heading_pairs(lxw_app *self)
{
_xml_start_tag(self->file, "HeadingPairs", NULL);
lxw_xml_start_tag(self->file, "HeadingPairs", NULL);
/* Write the vt:vector element. */
_write_vt_vector_heading_pairs(self);
_xml_end_tag(self->file, "HeadingPairs");
lxw_xml_end_tag(self->file, "HeadingPairs");
}
/*
@ -247,12 +247,12 @@ _write_heading_pairs(lxw_app *self)
STATIC void
_write_titles_of_parts(lxw_app *self)
{
_xml_start_tag(self->file, "TitlesOfParts", NULL);
lxw_xml_start_tag(self->file, "TitlesOfParts", NULL);
/* Write the vt:vector element. */
_write_vt_vector_lpstr_named_parts(self);
_xml_end_tag(self->file, "TitlesOfParts");
lxw_xml_end_tag(self->file, "TitlesOfParts");
}
/*
@ -267,7 +267,8 @@ _write_manager(lxw_app *self)
return;
if (properties->manager)
_xml_data_element(self->file, "Manager", properties->manager, NULL);
lxw_xml_data_element(self->file, "Manager", properties->manager,
NULL);
}
/*
@ -279,9 +280,10 @@ _write_company(lxw_app *self)
lxw_doc_properties *properties = self->properties;
if (properties && properties->company)
_xml_data_element(self->file, "Company", properties->company, NULL);
lxw_xml_data_element(self->file, "Company", properties->company,
NULL);
else
_xml_data_element(self->file, "Company", "", NULL);
lxw_xml_data_element(self->file, "Company", "", NULL);
}
/*
@ -290,7 +292,7 @@ _write_company(lxw_app *self)
STATIC void
_write_links_up_to_date(lxw_app *self)
{
_xml_data_element(self->file, "LinksUpToDate", "false", NULL);
lxw_xml_data_element(self->file, "LinksUpToDate", "false", NULL);
}
/*
@ -299,7 +301,7 @@ _write_links_up_to_date(lxw_app *self)
STATIC void
_write_shared_doc(lxw_app *self)
{
_xml_data_element(self->file, "SharedDoc", "false", NULL);
lxw_xml_data_element(self->file, "SharedDoc", "false", NULL);
}
/*
@ -314,8 +316,8 @@ _write_hyperlink_base(lxw_app *self)
return;
if (properties->hyperlink_base)
_xml_data_element(self->file, "HyperlinkBase",
properties->hyperlink_base, NULL);
lxw_xml_data_element(self->file, "HyperlinkBase",
properties->hyperlink_base, NULL);
}
/*
@ -324,7 +326,7 @@ _write_hyperlink_base(lxw_app *self)
STATIC void
_write_hyperlinks_changed(lxw_app *self)
{
_xml_data_element(self->file, "HyperlinksChanged", "false", NULL);
lxw_xml_data_element(self->file, "HyperlinksChanged", "false", NULL);
}
/*
@ -333,7 +335,7 @@ _write_hyperlinks_changed(lxw_app *self)
STATIC void
_write_app_version(lxw_app *self)
{
_xml_data_element(self->file, "AppVersion", "12.0000", NULL);
lxw_xml_data_element(self->file, "AppVersion", "12.0000", NULL);
}
/*****************************************************************************
@ -366,7 +368,7 @@ lxw_app_assemble_xml_file(lxw_app *self)
_write_hyperlinks_changed(self);
_write_app_version(self);
_xml_end_tag(self->file, "Properties");
lxw_xml_end_tag(self->file, "Properties");
}
/*****************************************************************************

32
src/content_types.c
View File

@ -105,7 +105,7 @@ lxw_content_types_free(lxw_content_types *content_types)
STATIC void
_content_types_xml_declaration(lxw_content_types *self)
{
_xml_declaration(self->file);
lxw_xml_declaration(self->file);
}
/*
@ -117,12 +117,12 @@ _write_types(lxw_content_types *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("xmlns", LXW_CONTENT_TYPE_SCHEMA);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("xmlns", LXW_CONTENT_TYPE_SCHEMA);
_xml_start_tag(self->file, "Types", &attributes);
lxw_xml_start_tag(self->file, "Types", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -134,13 +134,13 @@ _write_default(lxw_content_types *self, const char *ext, const char *type)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("Extension", ext);
_PUSH_ATTRIBUTES_STR("ContentType", type);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("Extension", ext);
LXW_PUSH_ATTRIBUTES_STR("ContentType", type);
_xml_empty_tag(self->file, "Default", &attributes);
lxw_xml_empty_tag(self->file, "Default", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -153,13 +153,13 @@ _write_override(lxw_content_types *self, const char *part_name,
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("PartName", part_name);
_PUSH_ATTRIBUTES_STR("ContentType", type);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("PartName", part_name);
LXW_PUSH_ATTRIBUTES_STR("ContentType", type);
_xml_empty_tag(self->file, "Override", &attributes);
lxw_xml_empty_tag(self->file, "Override", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*****************************************************************************
@ -208,7 +208,7 @@ lxw_content_types_assemble_xml_file(lxw_content_types *self)
_write_overrides(self);
/* Close the content_types tag. */
_xml_end_tag(self->file, "Types");
lxw_xml_end_tag(self->file, "Types");
}
/*****************************************************************************

73
src/core.c
View File

@ -78,7 +78,7 @@ _localtime_to_iso8601_date(time_t *timer, char *str, size_t size)
STATIC void
_core_xml_declaration(lxw_core *self)
{
_xml_declaration(self->file);
lxw_xml_declaration(self->file);
}
/*
@ -90,18 +90,18 @@ _write_cp_core_properties(lxw_core *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("xmlns:cp",
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("xmlns:cp",
"http://schemas.openxmlformats.org/package/2006/metadata/core-properties");
_PUSH_ATTRIBUTES_STR("xmlns:dc", "http://purl.org/dc/elements/1.1/");
_PUSH_ATTRIBUTES_STR("xmlns:dcterms", "http://purl.org/dc/terms/");
_PUSH_ATTRIBUTES_STR("xmlns:dcmitype", "http://purl.org/dc/dcmitype/");
_PUSH_ATTRIBUTES_STR("xmlns:xsi",
LXW_PUSH_ATTRIBUTES_STR("xmlns:dc", "http://purl.org/dc/elements/1.1/");
LXW_PUSH_ATTRIBUTES_STR("xmlns:dcterms", "http://purl.org/dc/terms/");
LXW_PUSH_ATTRIBUTES_STR("xmlns:dcmitype", "http://purl.org/dc/dcmitype/");
LXW_PUSH_ATTRIBUTES_STR("xmlns:xsi",
"http://www.w3.org/2001/XMLSchema-instance");
_xml_start_tag(self->file, "cp:coreProperties", &attributes);
lxw_xml_start_tag(self->file, "cp:coreProperties", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -111,11 +111,11 @@ STATIC void
_write_dc_creator(lxw_core *self)
{
if (self->properties->author) {
_xml_data_element(self->file, "dc:creator", self->properties->author,
NULL);
lxw_xml_data_element(self->file, "dc:creator",
self->properties->author, NULL);
}
else {
_xml_data_element(self->file, "dc:creator", "", NULL);
lxw_xml_data_element(self->file, "dc:creator", "", NULL);
}
}
@ -126,11 +126,11 @@ STATIC void
_write_cp_last_modified_by(lxw_core *self)
{
if (self->properties->author) {
_xml_data_element(self->file, "cp:lastModifiedBy",
self->properties->author, NULL);
lxw_xml_data_element(self->file, "cp:lastModifiedBy",
self->properties->author, NULL);
}
else {
_xml_data_element(self->file, "cp:lastModifiedBy", "", NULL);
lxw_xml_data_element(self->file, "cp:lastModifiedBy", "", NULL);
}
}
@ -146,12 +146,13 @@ _write_dcterms_created(lxw_core *self)
_localtime_to_iso8601_date(&self->properties->created, datetime, ATTR_32);
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("xsi:type", "dcterms:W3CDTF");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("xsi:type", "dcterms:W3CDTF");
_xml_data_element(self->file, "dcterms:created", datetime, &attributes);
lxw_xml_data_element(self->file, "dcterms:created", datetime,
&attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -166,12 +167,13 @@ _write_dcterms_modified(lxw_core *self)
_localtime_to_iso8601_date(&self->properties->created, datetime, ATTR_32);
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("xsi:type", "dcterms:W3CDTF");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("xsi:type", "dcterms:W3CDTF");
_xml_data_element(self->file, "dcterms:modified", datetime, &attributes);
lxw_xml_data_element(self->file, "dcterms:modified", datetime,
&attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -183,7 +185,8 @@ _write_dc_title(lxw_core *self)
if (!self->properties->title)
return;
_xml_data_element(self->file, "dc:title", self->properties->title, NULL);
lxw_xml_data_element(self->file, "dc:title", self->properties->title,
NULL);
}
/*
@ -195,8 +198,8 @@ _write_dc_subject(lxw_core *self)
if (!self->properties->subject)
return;
_xml_data_element(self->file, "dc:subject", self->properties->subject,
NULL);
lxw_xml_data_element(self->file, "dc:subject", self->properties->subject,
NULL);
}
/*
@ -208,8 +211,8 @@ _write_cp_keywords(lxw_core *self)
if (!self->properties->keywords)
return;
_xml_data_element(self->file, "cp:keywords", self->properties->keywords,
NULL);
lxw_xml_data_element(self->file, "cp:keywords",
self->properties->keywords, NULL);
}
/*
@ -221,8 +224,8 @@ _write_dc_description(lxw_core *self)
if (!self->properties->comments)
return;
_xml_data_element(self->file, "dc:description",
self->properties->comments, NULL);
lxw_xml_data_element(self->file, "dc:description",
self->properties->comments, NULL);
}
/*
@ -234,8 +237,8 @@ _write_cp_category(lxw_core *self)
if (!self->properties->category)
return;
_xml_data_element(self->file, "cp:category", self->properties->category,
NULL);
lxw_xml_data_element(self->file, "cp:category",
self->properties->category, NULL);
}
/*
@ -247,8 +250,8 @@ _write_cp_content_status(lxw_core *self)
if (!self->properties->status)
return;
_xml_data_element(self->file, "cp:contentStatus",
self->properties->status, NULL);
lxw_xml_data_element(self->file, "cp:contentStatus",
self->properties->status, NULL);
}
/*****************************************************************************
@ -278,7 +281,7 @@ lxw_core_assemble_xml_file(lxw_core *self)
_write_cp_category(self);
_write_cp_content_status(self);
_xml_end_tag(self->file, "cp:coreProperties");
lxw_xml_end_tag(self->file, "cp:coreProperties");
}
/*****************************************************************************

136
src/drawing.c
View File

@ -109,7 +109,7 @@ lxw_add_drawing_object(lxw_drawing *drawing,
STATIC void
_drawing_xml_declaration(lxw_drawing *self)
{
_xml_declaration(self->file);
lxw_xml_declaration(self->file);
}
/*
@ -123,14 +123,14 @@ _write_drawing_workspace(lxw_drawing *self)
char xmlns_xdr[] = DRAWING_SCHEMA "spreadsheetDrawing";
char xmlns_a[] = DRAWING_SCHEMA "main";
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("xmlns:xdr", xmlns_xdr);
_PUSH_ATTRIBUTES_STR("xmlns:a", xmlns_a);
LXW_PUSH_ATTRIBUTES_STR("xmlns:xdr", xmlns_xdr);
LXW_PUSH_ATTRIBUTES_STR("xmlns:a", xmlns_a);
_xml_start_tag(self->file, "xdr:wsDr", &attributes);
lxw_xml_start_tag(self->file, "xdr:wsDr", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -139,7 +139,7 @@ _write_drawing_workspace(lxw_drawing *self)
STATIC void
_drawing_write_col(lxw_drawing *self, char *data)
{
_xml_data_element(self->file, "xdr:col", data, NULL);
lxw_xml_data_element(self->file, "xdr:col", data, NULL);
}
/*
@ -148,7 +148,7 @@ _drawing_write_col(lxw_drawing *self, char *data)
STATIC void
_drawing_write_col_off(lxw_drawing *self, char *data)
{
_xml_data_element(self->file, "xdr:colOff", data, NULL);
lxw_xml_data_element(self->file, "xdr:colOff", data, NULL);
}
/*
@ -157,7 +157,7 @@ _drawing_write_col_off(lxw_drawing *self, char *data)
STATIC void
_drawing_write_row(lxw_drawing *self, char *data)
{
_xml_data_element(self->file, "xdr:row", data, NULL);
lxw_xml_data_element(self->file, "xdr:row", data, NULL);
}
/*
@ -166,7 +166,7 @@ _drawing_write_row(lxw_drawing *self, char *data)
STATIC void
_drawing_write_row_off(lxw_drawing *self, char *data)
{
_xml_data_element(self->file, "xdr:rowOff", data, NULL);
lxw_xml_data_element(self->file, "xdr:rowOff", data, NULL);
}
/*
@ -177,7 +177,7 @@ _drawing_write_from(lxw_drawing *self, lxw_drawing_coords *coords)
{
char data[LXW_UINT32_T_LEN];
_xml_start_tag(self->file, "xdr:from", NULL);
lxw_xml_start_tag(self->file, "xdr:from", NULL);
lxw_snprintf(data, LXW_UINT32_T_LEN, "%u", coords->col);
_drawing_write_col(self, data);
@ -191,7 +191,7 @@ _drawing_write_from(lxw_drawing *self, lxw_drawing_coords *coords)
lxw_snprintf(data, LXW_UINT32_T_LEN, "%u", (uint32_t) coords->row_offset);
_drawing_write_row_off(self, data);
_xml_end_tag(self->file, "xdr:from");
lxw_xml_end_tag(self->file, "xdr:from");
}
/*
@ -202,7 +202,7 @@ _drawing_write_to(lxw_drawing *self, lxw_drawing_coords *coords)
{
char data[LXW_UINT32_T_LEN];
_xml_start_tag(self->file, "xdr:to", NULL);
lxw_xml_start_tag(self->file, "xdr:to", NULL);
lxw_snprintf(data, LXW_UINT32_T_LEN, "%u", coords->col);
_drawing_write_col(self, data);
@ -216,7 +216,7 @@ _drawing_write_to(lxw_drawing *self, lxw_drawing_coords *coords)
lxw_snprintf(data, LXW_UINT32_T_LEN, "%u", (uint32_t) coords->row_offset);
_drawing_write_row_off(self, data);
_xml_end_tag(self->file, "xdr:to");
lxw_xml_end_tag(self->file, "xdr:to");
}
/*
@ -232,15 +232,15 @@ _drawing_write_c_nv_pr(lxw_drawing *self, uint16_t index,
char name[PIC_NAME_LENGTH];
lxw_snprintf(name, PIC_NAME_LENGTH, "Picture %d", index);
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("id", index + 1);
_PUSH_ATTRIBUTES_STR("name", name);
_PUSH_ATTRIBUTES_STR("descr", drawing_object->description);
LXW_PUSH_ATTRIBUTES_INT("id", index + 1);
LXW_PUSH_ATTRIBUTES_STR("name", name);
LXW_PUSH_ATTRIBUTES_STR("descr", drawing_object->description);
_xml_empty_tag(self->file, "xdr:cNvPr", &attributes);
lxw_xml_empty_tag(self->file, "xdr:cNvPr", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -252,12 +252,12 @@ _drawing_write_a_pic_locks(lxw_drawing *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("noChangeAspect", "1");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("noChangeAspect", "1");
_xml_empty_tag(self->file, "a:picLocks", &attributes);
lxw_xml_empty_tag(self->file, "a:picLocks", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -266,12 +266,12 @@ _drawing_write_a_pic_locks(lxw_drawing *self)
STATIC void
_drawing_write_c_nv_pic_pr(lxw_drawing *self)
{
_xml_start_tag(self->file, "xdr:cNvPicPr", NULL);
lxw_xml_start_tag(self->file, "xdr:cNvPicPr", NULL);
/* Write the a:picLocks element. */
_drawing_write_a_pic_locks(self);
_xml_end_tag(self->file, "xdr:cNvPicPr");
lxw_xml_end_tag(self->file, "xdr:cNvPicPr");
}
/*
@ -281,7 +281,7 @@ STATIC void
_drawing_write_nv_pic_pr(lxw_drawing *self, uint16_t index,
lxw_drawing_object *drawing_object)
{
_xml_start_tag(self->file, "xdr:nvPicPr", NULL);
lxw_xml_start_tag(self->file, "xdr:nvPicPr", NULL);
/* Write the xdr:cNvPr element. */
_drawing_write_c_nv_pr(self, index, drawing_object);
@ -289,7 +289,7 @@ _drawing_write_nv_pic_pr(lxw_drawing *self, uint16_t index,
/* Write the xdr:cNvPicPr element. */
_drawing_write_c_nv_pic_pr(self);
_xml_end_tag(self->file, "xdr:nvPicPr");
lxw_xml_end_tag(self->file, "xdr:nvPicPr");
}
/*
@ -305,13 +305,13 @@ _drawing_write_a_blip(lxw_drawing *self, uint16_t index)
lxw_snprintf(r_id, ATTR_32, "rId%d", index);
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("xmlns:r", xmlns_r);
_PUSH_ATTRIBUTES_STR("r:embed", r_id);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("xmlns:r", xmlns_r);
LXW_PUSH_ATTRIBUTES_STR("r:embed", r_id);
_xml_empty_tag(self->file, "a:blip", &attributes);
lxw_xml_empty_tag(self->file, "a:blip", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -320,7 +320,7 @@ _drawing_write_a_blip(lxw_drawing *self, uint16_t index)
STATIC void
_drawing_write_a_fill_rect(lxw_drawing *self)
{
_xml_empty_tag(self->file, "a:fillRect", NULL);
lxw_xml_empty_tag(self->file, "a:fillRect", NULL);
}
/*
@ -329,12 +329,12 @@ _drawing_write_a_fill_rect(lxw_drawing *self)
STATIC void
_drawing_write_a_stretch(lxw_drawing *self)
{
_xml_start_tag(self->file, "a:stretch", NULL);
lxw_xml_start_tag(self->file, "a:stretch", NULL);
/* Write the a:fillRect element. */
_drawing_write_a_fill_rect(self);
_xml_end_tag(self->file, "a:stretch");
lxw_xml_end_tag(self->file, "a:stretch");
}
/*
@ -343,7 +343,7 @@ _drawing_write_a_stretch(lxw_drawing *self)
STATIC void
_drawing_write_blip_fill(lxw_drawing *self, uint16_t index)
{
_xml_start_tag(self->file, "xdr:blipFill", NULL);
lxw_xml_start_tag(self->file, "xdr:blipFill", NULL);
/* Write the a:blip element. */
_drawing_write_a_blip(self, index);
@ -351,7 +351,7 @@ _drawing_write_blip_fill(lxw_drawing *self, uint16_t index)
/* Write the a:stretch element. */
_drawing_write_a_stretch(self);
_xml_end_tag(self->file, "xdr:blipFill");
lxw_xml_end_tag(self->file, "xdr:blipFill");
}
/*
@ -363,13 +363,13 @@ _drawing_write_a_ext(lxw_drawing *self, lxw_drawing_object *drawing_object)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("cx", drawing_object->width);
_PUSH_ATTRIBUTES_INT("cy", drawing_object->height);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("cx", drawing_object->width);
LXW_PUSH_ATTRIBUTES_INT("cy", drawing_object->height);
_xml_empty_tag(self->file, "a:ext", &attributes);
lxw_xml_empty_tag(self->file, "a:ext", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -381,13 +381,13 @@ _drawing_write_a_off(lxw_drawing *self, lxw_drawing_object *drawing_object)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("x", drawing_object->col_absolute);
_PUSH_ATTRIBUTES_INT("y", drawing_object->row_absolute);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("x", drawing_object->col_absolute);
LXW_PUSH_ATTRIBUTES_INT("y", drawing_object->row_absolute);
_xml_empty_tag(self->file, "a:off", &attributes);
lxw_xml_empty_tag(self->file, "a:off", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -396,7 +396,7 @@ _drawing_write_a_off(lxw_drawing *self, lxw_drawing_object *drawing_object)
STATIC void
_drawing_write_a_xfrm(lxw_drawing *self, lxw_drawing_object *drawing_object)
{
_xml_start_tag(self->file, "a:xfrm", NULL);
lxw_xml_start_tag(self->file, "a:xfrm", NULL);
/* Write the a:off element. */
_drawing_write_a_off(self, drawing_object);
@ -404,7 +404,7 @@ _drawing_write_a_xfrm(lxw_drawing *self, lxw_drawing_object *drawing_object)
/* Write the a:ext element. */
_drawing_write_a_ext(self, drawing_object);
_xml_end_tag(self->file, "a:xfrm");
lxw_xml_end_tag(self->file, "a:xfrm");
}
/*
@ -413,7 +413,7 @@ _drawing_write_a_xfrm(lxw_drawing *self, lxw_drawing_object *drawing_object)
STATIC void
_drawing_write_a_av_lst(lxw_drawing *self)
{
_xml_empty_tag(self->file, "a:avLst", NULL);
lxw_xml_empty_tag(self->file, "a:avLst", NULL);
}
/*
@ -425,17 +425,17 @@ _drawing_write_a_prst_geom(lxw_drawing *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("prst", "rect");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("prst", "rect");
_xml_start_tag(self->file, "a:prstGeom", &attributes);
lxw_xml_start_tag(self->file, "a:prstGeom", &attributes);
/* Write the a:avLst element. */
_drawing_write_a_av_lst(self);
_xml_end_tag(self->file, "a:prstGeom");
lxw_xml_end_tag(self->file, "a:prstGeom");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -444,7 +444,7 @@ _drawing_write_a_prst_geom(lxw_drawing *self)
STATIC void
_drawing_write_sp_pr(lxw_drawing *self, lxw_drawing_object *drawing_object)
{
_xml_start_tag(self->file, "xdr:spPr", NULL);
lxw_xml_start_tag(self->file, "xdr:spPr", NULL);
/* Write the a:xfrm element. */
_drawing_write_a_xfrm(self, drawing_object);
@ -452,7 +452,7 @@ _drawing_write_sp_pr(lxw_drawing *self, lxw_drawing_object *drawing_object)
/* Write the a:prstGeom element. */
_drawing_write_a_prst_geom(self);
_xml_end_tag(self->file, "xdr:spPr");
lxw_xml_end_tag(self->file, "xdr:spPr");
}
/*
@ -462,7 +462,7 @@ STATIC void
_drawing_write_pic(lxw_drawing *self, uint16_t index,
lxw_drawing_object *drawing_object)
{
_xml_start_tag(self->file, "xdr:pic", NULL);
lxw_xml_start_tag(self->file, "xdr:pic", NULL);
/* Write the xdr:nvPicPr element. */
_drawing_write_nv_pic_pr(self, index, drawing_object);
@ -473,7 +473,7 @@ _drawing_write_pic(lxw_drawing *self, uint16_t index,
/* Write the xdr:spPr element. */
_drawing_write_sp_pr(self, drawing_object);
_xml_end_tag(self->file, "xdr:pic");
lxw_xml_end_tag(self->file, "xdr:pic");
}
/*
@ -482,7 +482,7 @@ _drawing_write_pic(lxw_drawing *self, uint16_t index,
STATIC void
_drawing_write_client_data(lxw_drawing *self)
{
_xml_empty_tag(self->file, "xdr:clientData", NULL);
lxw_xml_empty_tag(self->file, "xdr:clientData", NULL);
}
/*
@ -495,17 +495,17 @@ _drawing_write_two_cell_anchor(lxw_drawing *self, uint16_t index,
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
if (drawing_object->anchor_type == LXW_ANCHOR_TYPE_IMAGE) {
if (drawing_object->edit_as == LXW_ANCHOR_EDIT_AS_ABSOLUTE)
_PUSH_ATTRIBUTES_STR("editAs", "absolute");
LXW_PUSH_ATTRIBUTES_STR("editAs", "absolute");
else if (drawing_object->edit_as != LXW_ANCHOR_EDIT_AS_RELATIVE)
_PUSH_ATTRIBUTES_STR("editAs", "oneCell");
LXW_PUSH_ATTRIBUTES_STR("editAs", "oneCell");
}
_xml_start_tag(self->file, "xdr:twoCellAnchor", &attributes);
lxw_xml_start_tag(self->file, "xdr:twoCellAnchor", &attributes);
_drawing_write_from(self, &drawing_object->from);
_drawing_write_to(self, &drawing_object->to);
@ -528,9 +528,9 @@ _drawing_write_two_cell_anchor(lxw_drawing *self, uint16_t index,
/* Write the xdr:clientData element. */
_drawing_write_client_data(self);
_xml_end_tag(self->file, "xdr:twoCellAnchor");
lxw_xml_end_tag(self->file, "xdr:twoCellAnchor");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*****************************************************************************
@ -564,7 +564,7 @@ lxw_drawing_assemble_xml_file(lxw_drawing *self)
}
_xml_end_tag(self->file, "xdr:wsDr");
lxw_xml_end_tag(self->file, "xdr:wsDr");
}
/*****************************************************************************

26
src/relationships.c
View File

@ -78,7 +78,7 @@ lxw_free_relationships(lxw_relationships *rels)
STATIC void
_relationships_xml_declaration(lxw_relationships *self)
{
_xml_declaration(self->file);
lxw_xml_declaration(self->file);
}
/*
@ -95,17 +95,17 @@ _write_relationship(lxw_relationships *self, const char *type,
self->rel_id++;
lxw_snprintf(r_id, ATTR_32, "rId%d", self->rel_id);
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("Id", r_id);
_PUSH_ATTRIBUTES_STR("Type", type);
_PUSH_ATTRIBUTES_STR("Target", target);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("Id", r_id);
LXW_PUSH_ATTRIBUTES_STR("Type", type);
LXW_PUSH_ATTRIBUTES_STR("Target", target);
if (target_mode)
_PUSH_ATTRIBUTES_STR("TargetMode", target_mode);
LXW_PUSH_ATTRIBUTES_STR("TargetMode", target_mode);
_xml_empty_tag(self->file, "Relationship", &attributes);
lxw_xml_empty_tag(self->file, "Relationship", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -118,16 +118,16 @@ _write_relationships(lxw_relationships *self)
struct xml_attribute *attribute;
lxw_rel_tuple *rel;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("xmlns", LXW_PACKAGE_SCHEMA);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("xmlns", LXW_PACKAGE_SCHEMA);
_xml_start_tag(self->file, "Relationships", &attributes);
lxw_xml_start_tag(self->file, "Relationships", &attributes);
STAILQ_FOREACH(rel, self->relationships, list_pointers) {
_write_relationship(self, rel->type, rel->target, rel->target_mode);
}
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*****************************************************************************
@ -148,7 +148,7 @@ lxw_relationships_assemble_xml_file(lxw_relationships *self)
_write_relationships(self);
/* Close the relationships tag. */
_xml_end_tag(self->file, "Relationships");
lxw_xml_end_tag(self->file, "Relationships");
}
/*

30
src/shared_strings.c
View File

@ -108,7 +108,7 @@ _element_cmp(struct sst_element *element1, struct sst_element *element2)
STATIC void
_sst_xml_declaration(lxw_sst *self)
{
_xml_declaration(self->file);
lxw_xml_declaration(self->file);
}
/*
@ -120,16 +120,16 @@ _write_t(lxw_sst *self, char *string)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
/* Add attribute to preserve leading or trailing whitespace. */
if (isspace((unsigned char) string[0])
|| isspace((unsigned char) string[strlen(string) - 1]))
_PUSH_ATTRIBUTES_STR("xml:space", "preserve");
LXW_PUSH_ATTRIBUTES_STR("xml:space", "preserve");
_xml_data_element(self->file, "t", string, &attributes);
lxw_xml_data_element(self->file, "t", string, &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -140,20 +140,20 @@ _write_si(lxw_sst *self, char *string)
{
uint8_t escaped_string = LXW_FALSE;
_xml_start_tag(self->file, "si", NULL);
lxw_xml_start_tag(self->file, "si", NULL);
/* Look for and escape control chars in the string. */
if (strpbrk(string, "\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C"
"\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16"
"\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F")) {
string = _escape_control_characters(string);
string = lxw_escape_control_characters(string);
escaped_string = LXW_TRUE;
}
/* Write the t element. */
_write_t(self, string);
_xml_end_tag(self->file, "si");
lxw_xml_end_tag(self->file, "si");
if (escaped_string)
free(string);
@ -170,14 +170,14 @@ _write_sst(lxw_sst *self)
char xmlns[] =
"http://schemas.openxmlformats.org/spreadsheetml/2006/main";
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("xmlns", xmlns);
_PUSH_ATTRIBUTES_INT("count", self->string_count);
_PUSH_ATTRIBUTES_INT("uniqueCount", self->unique_count);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("xmlns", xmlns);
LXW_PUSH_ATTRIBUTES_INT("count", self->string_count);
LXW_PUSH_ATTRIBUTES_INT("uniqueCount", self->unique_count);
_xml_start_tag(self->file, "sst", &attributes);
lxw_xml_start_tag(self->file, "sst", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*****************************************************************************
@ -216,7 +216,7 @@ lxw_sst_assemble_xml_file(lxw_sst *self)
_write_sst_strings(self);
/* Close the sst tag. */
_xml_end_tag(self->file, "sst");
lxw_xml_end_tag(self->file, "sst");
}
/*****************************************************************************

390
src/styles.c
View File

@ -76,7 +76,7 @@ lxw_styles_free(lxw_styles *styles)
STATIC void
_styles_xml_declaration(lxw_styles *self)
{
_xml_declaration(self->file);
lxw_xml_declaration(self->file);
}
/*
@ -87,13 +87,13 @@ _write_style_sheet(lxw_styles *self)
{
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("xmlns",
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("xmlns",
"http://schemas.openxmlformats.org/spreadsheetml/2006/main");
_xml_start_tag(self->file, "styleSheet", &attributes);
lxw_xml_start_tag(self->file, "styleSheet", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -105,13 +105,13 @@ _write_num_fmt(lxw_styles *self, uint8_t num_fmt_id, char *format_code)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("numFmtId", num_fmt_id);
_PUSH_ATTRIBUTES_STR("formatCode", format_code);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("numFmtId", num_fmt_id);
LXW_PUSH_ATTRIBUTES_STR("formatCode", format_code);
_xml_empty_tag(self->file, "numFmt", &attributes);
lxw_xml_empty_tag(self->file, "numFmt", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -127,10 +127,10 @@ _write_num_fmts(lxw_styles *self)
if (!self->num_format_count)
return;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("count", self->num_format_count);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("count", self->num_format_count);
_xml_start_tag(self->file, "numFmts", &attributes);
lxw_xml_start_tag(self->file, "numFmts", &attributes);
/* Write the numFmts elements. */
STAILQ_FOREACH(format, self->xf_formats, list_pointers) {
@ -142,9 +142,9 @@ _write_num_fmts(lxw_styles *self)
_write_num_fmt(self, format->num_format_index, format->num_format);
}
_xml_end_tag(self->file, "numFmts");
lxw_xml_end_tag(self->file, "numFmts");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -156,12 +156,12 @@ _write_font_size(lxw_styles *self, uint16_t font_size)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("val", font_size);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("val", font_size);
_xml_empty_tag(self->file, "sz", &attributes);
lxw_xml_empty_tag(self->file, "sz", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -173,12 +173,12 @@ _write_font_color_theme(lxw_styles *self, uint8_t theme)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("theme", theme);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("theme", theme);
_xml_empty_tag(self->file, "color", &attributes);
lxw_xml_empty_tag(self->file, "color", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -193,12 +193,12 @@ _write_font_color_rgb(lxw_styles *self, int32_t rgb)
lxw_snprintf(rgb_str, ATTR_32, "FF%06X", rgb & LXW_COLOR_MASK);
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("rgb", rgb_str);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("rgb", rgb_str);
_xml_empty_tag(self->file, "color", &attributes);
lxw_xml_empty_tag(self->file, "color", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -210,16 +210,16 @@ _write_font_name(lxw_styles *self, const char *font_name)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
if (*font_name)
_PUSH_ATTRIBUTES_STR("val", font_name);
LXW_PUSH_ATTRIBUTES_STR("val", font_name);
else
_PUSH_ATTRIBUTES_STR("val", LXW_DEFAULT_FONT_NAME);
LXW_PUSH_ATTRIBUTES_STR("val", LXW_DEFAULT_FONT_NAME);
_xml_empty_tag(self->file, "name", &attributes);
lxw_xml_empty_tag(self->file, "name", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -231,12 +231,12 @@ _write_font_family(lxw_styles *self, uint8_t font_family)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("val", font_family);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("val", font_family);
_xml_empty_tag(self->file, "family", &attributes);
lxw_xml_empty_tag(self->file, "family", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -248,16 +248,16 @@ _write_font_scheme(lxw_styles *self, const char *font_scheme)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
if (*font_scheme)
_PUSH_ATTRIBUTES_STR("val", font_scheme);
LXW_PUSH_ATTRIBUTES_STR("val", font_scheme);
else
_PUSH_ATTRIBUTES_STR("val", "minor");
LXW_PUSH_ATTRIBUTES_STR("val", "minor");
_xml_empty_tag(self->file, "scheme", &attributes);
lxw_xml_empty_tag(self->file, "scheme", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -269,20 +269,20 @@ _write_font_underline(lxw_styles *self, uint8_t underline)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
/* Handle the underline variants. */
if (underline == LXW_UNDERLINE_DOUBLE)
_PUSH_ATTRIBUTES_STR("val", "double");
LXW_PUSH_ATTRIBUTES_STR("val", "double");
else if (underline == LXW_UNDERLINE_SINGLE_ACCOUNTING)
_PUSH_ATTRIBUTES_STR("val", "singleAccounting");
LXW_PUSH_ATTRIBUTES_STR("val", "singleAccounting");
else if (underline == LXW_UNDERLINE_DOUBLE_ACCOUNTING)
_PUSH_ATTRIBUTES_STR("val", "doubleAccounting");
LXW_PUSH_ATTRIBUTES_STR("val", "doubleAccounting");
/* Default to single underline. */
_xml_empty_tag(self->file, "u", &attributes);
lxw_xml_empty_tag(self->file, "u", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
@ -295,12 +295,12 @@ _write_vert_align(lxw_styles *self, const char *align)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("val", align);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("val", align);
_xml_empty_tag(self->file, "vertAlign", &attributes);
lxw_xml_empty_tag(self->file, "vertAlign", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -309,22 +309,22 @@ _write_vert_align(lxw_styles *self, const char *align)
STATIC void
_write_font(lxw_styles *self, lxw_format *format)
{
_xml_start_tag(self->file, "font", NULL);
lxw_xml_start_tag(self->file, "font", NULL);
if (format->bold)
_xml_empty_tag(self->file, "b", NULL);
lxw_xml_empty_tag(self->file, "b", NULL);
if (format->italic)
_xml_empty_tag(self->file, "i", NULL);
lxw_xml_empty_tag(self->file, "i", NULL);
if (format->font_strikeout)
_xml_empty_tag(self->file, "strike", NULL);
lxw_xml_empty_tag(self->file, "strike", NULL);
if (format->font_outline)
_xml_empty_tag(self->file, "outline", NULL);
lxw_xml_empty_tag(self->file, "outline", NULL);
if (format->font_shadow)
_xml_empty_tag(self->file, "shadow", NULL);
lxw_xml_empty_tag(self->file, "shadow", NULL);
if (format->underline)
_write_font_underline(self, format->underline);
@ -356,7 +356,7 @@ _write_font(lxw_styles *self, lxw_format *format)
_write_font_scheme(self, format->font_scheme);
}
_xml_end_tag(self->file, "font");
lxw_xml_end_tag(self->file, "font");
}
/*
@ -369,19 +369,19 @@ _write_fonts(lxw_styles *self)
struct xml_attribute *attribute;
lxw_format *format;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("count", self->font_count);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("count", self->font_count);
_xml_start_tag(self->file, "fonts", &attributes);
lxw_xml_start_tag(self->file, "fonts", &attributes);
STAILQ_FOREACH(format, self->xf_formats, list_pointers) {
if (format->has_font)
_write_font(self, format);
}
_xml_end_tag(self->file, "fonts");
lxw_xml_end_tag(self->file, "fonts");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -393,14 +393,14 @@ _write_default_fill(lxw_styles *self, const char *pattern)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("patternType", pattern);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("patternType", pattern);
_xml_start_tag(self->file, "fill", NULL);
_xml_empty_tag(self->file, "patternFill", &attributes);
_xml_end_tag(self->file, "fill");
lxw_xml_start_tag(self->file, "fill", NULL);
lxw_xml_empty_tag(self->file, "patternFill", &attributes);
lxw_xml_end_tag(self->file, "fill");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -413,14 +413,14 @@ _write_fg_color(lxw_styles *self, lxw_color_t color)
struct xml_attribute *attribute;
char rgb_str[ATTR_32];
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
lxw_snprintf(rgb_str, ATTR_32, "FF%06X", color & LXW_COLOR_MASK);
_PUSH_ATTRIBUTES_STR("rgb", rgb_str);
LXW_PUSH_ATTRIBUTES_STR("rgb", rgb_str);
_xml_empty_tag(self->file, "fgColor", &attributes);
lxw_xml_empty_tag(self->file, "fgColor", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -433,19 +433,19 @@ _write_bg_color(lxw_styles *self, lxw_color_t color)
struct xml_attribute *attribute;
char rgb_str[ATTR_32];
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
if (color == LXW_COLOR_UNSET) {
_PUSH_ATTRIBUTES_STR("indexed", "64");
LXW_PUSH_ATTRIBUTES_STR("indexed", "64");
}
else {
lxw_snprintf(rgb_str, ATTR_32, "FF%06X", color & LXW_COLOR_MASK);
_PUSH_ATTRIBUTES_STR("rgb", rgb_str);
LXW_PUSH_ATTRIBUTES_STR("rgb", rgb_str);
}
_xml_empty_tag(self->file, "bgColor", &attributes);
lxw_xml_empty_tag(self->file, "bgColor", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -483,24 +483,24 @@ _write_fill(lxw_styles *self, lxw_format *format)
"gray0625",
};
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
_xml_start_tag(self->file, "fill", NULL);
lxw_xml_start_tag(self->file, "fill", NULL);
if (pattern)
_PUSH_ATTRIBUTES_STR("patternType", patterns[pattern]);
LXW_PUSH_ATTRIBUTES_STR("patternType", patterns[pattern]);
_xml_start_tag(self->file, "patternFill", &attributes);
lxw_xml_start_tag(self->file, "patternFill", &attributes);
if (fg_color != LXW_COLOR_UNSET)
_write_fg_color(self, fg_color);
_write_bg_color(self, bg_color);
_xml_end_tag(self->file, "patternFill");
_xml_end_tag(self->file, "fill");
lxw_xml_end_tag(self->file, "patternFill");
lxw_xml_end_tag(self->file, "fill");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -513,10 +513,10 @@ _write_fills(lxw_styles *self)
struct xml_attribute *attribute;
lxw_format *format;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("count", self->fill_count);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("count", self->fill_count);
_xml_start_tag(self->file, "fills", &attributes);
lxw_xml_start_tag(self->file, "fills", &attributes);
/* Write the default fills. */
_write_default_fill(self, "none");
@ -527,9 +527,9 @@ _write_fills(lxw_styles *self)
_write_fill(self, format);
}
_xml_end_tag(self->file, "fills");
lxw_xml_end_tag(self->file, "fills");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -542,19 +542,19 @@ _write_border_color(lxw_styles *self, lxw_color_t color)
struct xml_attribute *attribute;
char rgb_str[ATTR_32];
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
if (color != LXW_COLOR_UNSET) {
lxw_snprintf(rgb_str, ATTR_32, "FF%06X", color & LXW_COLOR_MASK);
_PUSH_ATTRIBUTES_STR("rgb", rgb_str);
LXW_PUSH_ATTRIBUTES_STR("rgb", rgb_str);
}
else {
_PUSH_ATTRIBUTES_STR("auto", "1");
LXW_PUSH_ATTRIBUTES_STR("auto", "1");
}
_xml_empty_tag(self->file, "color", &attributes);
lxw_xml_empty_tag(self->file, "color", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -585,20 +585,20 @@ _write_sub_border(lxw_styles *self, const char *type, uint8_t style,
};
if (!style) {
_xml_empty_tag(self->file, type, NULL);
lxw_xml_empty_tag(self->file, type, NULL);
return;
}
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("style", border_styles[style]);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("style", border_styles[style]);
_xml_start_tag(self->file, type, &attributes);
lxw_xml_start_tag(self->file, type, &attributes);
_write_border_color(self, color);
_xml_end_tag(self->file, type);
lxw_xml_end_tag(self->file, type);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -610,18 +610,18 @@ _write_border(lxw_styles *self, lxw_format *format)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
/* Add attributes for diagonal borders. */
if (format->diag_type == LXW_DIAGONAL_BORDER_UP) {
_PUSH_ATTRIBUTES_STR("diagonalUp", "1");
LXW_PUSH_ATTRIBUTES_STR("diagonalUp", "1");
}
else if (format->diag_type == LXW_DIAGONAL_BORDER_DOWN) {
_PUSH_ATTRIBUTES_STR("diagonalDown", "1");
LXW_PUSH_ATTRIBUTES_STR("diagonalDown", "1");
}
else if (format->diag_type == LXW_DIAGONAL_BORDER_UP_DOWN) {
_PUSH_ATTRIBUTES_STR("diagonalUp", "1");
_PUSH_ATTRIBUTES_STR("diagonalDown", "1");
LXW_PUSH_ATTRIBUTES_STR("diagonalUp", "1");
LXW_PUSH_ATTRIBUTES_STR("diagonalDown", "1");
}
/* Ensure that a default diag border is set if the diag type is set. */
@ -630,7 +630,7 @@ _write_border(lxw_styles *self, lxw_format *format)
}
/* Write the start border tag. */
_xml_start_tag(self->file, "border", &attributes);
lxw_xml_start_tag(self->file, "border", &attributes);
/* Write the <border> sub elements. */
_write_sub_border(self, "left", format->left, format->left_color);
@ -640,9 +640,9 @@ _write_border(lxw_styles *self, lxw_format *format)
_write_sub_border(self,
"diagonal", format->diag_border, format->diag_color);
_xml_end_tag(self->file, "border");
lxw_xml_end_tag(self->file, "border");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -655,19 +655,19 @@ _write_borders(lxw_styles *self)
struct xml_attribute *attribute;
lxw_format *format;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("count", self->border_count);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("count", self->border_count);
_xml_start_tag(self->file, "borders", &attributes);
lxw_xml_start_tag(self->file, "borders", &attributes);
STAILQ_FOREACH(format, self->xf_formats, list_pointers) {
if (format->has_border)
_write_border(self, format);
}
_xml_end_tag(self->file, "borders");
lxw_xml_end_tag(self->file, "borders");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -679,15 +679,15 @@ _write_style_xf(lxw_styles *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("numFmtId", "0");
_PUSH_ATTRIBUTES_STR("fontId", "0");
_PUSH_ATTRIBUTES_STR("fillId", "0");
_PUSH_ATTRIBUTES_STR("borderId", "0");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("numFmtId", "0");
LXW_PUSH_ATTRIBUTES_STR("fontId", "0");
LXW_PUSH_ATTRIBUTES_STR("fillId", "0");
LXW_PUSH_ATTRIBUTES_STR("borderId", "0");
_xml_empty_tag(self->file, "xf", &attributes);
lxw_xml_empty_tag(self->file, "xf", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -699,14 +699,14 @@ _write_cell_style_xfs(lxw_styles *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("count", "1");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("count", "1");
_xml_start_tag(self->file, "cellStyleXfs", &attributes);
lxw_xml_start_tag(self->file, "cellStyleXfs", &attributes);
_write_style_xf(self);
_xml_end_tag(self->file, "cellStyleXfs");
lxw_xml_end_tag(self->file, "cellStyleXfs");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -750,7 +750,7 @@ _write_alignment(lxw_styles *self, lxw_format *format)
struct xml_attribute *attribute;
int16_t rotation = format->rotation;
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
/* Indent is only allowed for horizontal left, right and distributed. */
/* If it is defined for any other alignment or no alignment has been */
@ -782,43 +782,43 @@ _write_alignment(lxw_styles *self, lxw_format *format)
format->just_distrib = 0;
if (format->text_h_align == LXW_ALIGN_LEFT)
_PUSH_ATTRIBUTES_STR("horizontal", "left");
LXW_PUSH_ATTRIBUTES_STR("horizontal", "left");
if (format->text_h_align == LXW_ALIGN_CENTER)
_PUSH_ATTRIBUTES_STR("horizontal", "center");
LXW_PUSH_ATTRIBUTES_STR("horizontal", "center");
if (format->text_h_align == LXW_ALIGN_RIGHT)
_PUSH_ATTRIBUTES_STR("horizontal", "right");
LXW_PUSH_ATTRIBUTES_STR("horizontal", "right");
if (format->text_h_align == LXW_ALIGN_FILL)
_PUSH_ATTRIBUTES_STR("horizontal", "fill");
LXW_PUSH_ATTRIBUTES_STR("horizontal", "fill");
if (format->text_h_align == LXW_ALIGN_JUSTIFY)
_PUSH_ATTRIBUTES_STR("horizontal", "justify");
LXW_PUSH_ATTRIBUTES_STR("horizontal", "justify");
if (format->text_h_align == LXW_ALIGN_CENTER_ACROSS)
_PUSH_ATTRIBUTES_STR("horizontal", "centerContinuous");
LXW_PUSH_ATTRIBUTES_STR("horizontal", "centerContinuous");
if (format->text_h_align == LXW_ALIGN_DISTRIBUTED)
_PUSH_ATTRIBUTES_STR("horizontal", "distributed");
LXW_PUSH_ATTRIBUTES_STR("horizontal", "distributed");
if (format->just_distrib)
_PUSH_ATTRIBUTES_STR("justifyLastLine", "1");
LXW_PUSH_ATTRIBUTES_STR("justifyLastLine", "1");
if (format->text_v_align == LXW_ALIGN_VERTICAL_TOP)
_PUSH_ATTRIBUTES_STR("vertical", "top");
LXW_PUSH_ATTRIBUTES_STR("vertical", "top");
if (format->text_v_align == LXW_ALIGN_VERTICAL_CENTER)
_PUSH_ATTRIBUTES_STR("vertical", "center");
LXW_PUSH_ATTRIBUTES_STR("vertical", "center");
if (format->text_v_align == LXW_ALIGN_VERTICAL_JUSTIFY)
_PUSH_ATTRIBUTES_STR("vertical", "justify");
LXW_PUSH_ATTRIBUTES_STR("vertical", "justify");
if (format->text_v_align == LXW_ALIGN_VERTICAL_DISTRIBUTED)
_PUSH_ATTRIBUTES_STR("vertical", "distributed");
LXW_PUSH_ATTRIBUTES_STR("vertical", "distributed");
if (format->indent)
_PUSH_ATTRIBUTES_INT("indent", format->indent);
LXW_PUSH_ATTRIBUTES_INT("indent", format->indent);
/* Map rotation to Excel values. */
if (rotation) {
@ -827,25 +827,25 @@ _write_alignment(lxw_styles *self, lxw_format *format)
else if (rotation < 0)
rotation = -rotation + 90;
_PUSH_ATTRIBUTES_INT("textRotation", rotation);
LXW_PUSH_ATTRIBUTES_INT("textRotation", rotation);
}
if (format->text_wrap)
_PUSH_ATTRIBUTES_STR("wrapText", "1");
LXW_PUSH_ATTRIBUTES_STR("wrapText", "1");
if (format->shrink)
_PUSH_ATTRIBUTES_STR("shrinkToFit", "1");
LXW_PUSH_ATTRIBUTES_STR("shrinkToFit", "1");
if (format->reading_order == 1)
_PUSH_ATTRIBUTES_STR("readingOrder", "1");
LXW_PUSH_ATTRIBUTES_STR("readingOrder", "1");
if (format->reading_order == 2)
_PUSH_ATTRIBUTES_STR("readingOrder", "2");
LXW_PUSH_ATTRIBUTES_STR("readingOrder", "2");
if (!STAILQ_EMPTY(&attributes))
_xml_empty_tag(self->file, "alignment", &attributes);
lxw_xml_empty_tag(self->file, "alignment", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -857,17 +857,17 @@ _write_protection(lxw_styles *self, lxw_format *format)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
LXW_INIT_ATTRIBUTES();
if (!format->locked)
_PUSH_ATTRIBUTES_STR("locked", "0");
LXW_PUSH_ATTRIBUTES_STR("locked", "0");
if (format->hidden)
_PUSH_ATTRIBUTES_STR("hidden", "1");
LXW_PUSH_ATTRIBUTES_STR("hidden", "1");
_xml_empty_tag(self->file, "protection", &attributes);
lxw_xml_empty_tag(self->file, "protection", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -882,38 +882,38 @@ _write_xf(lxw_styles *self, lxw_format *format)
uint8_t has_alignment = _has_alignment(format);
uint8_t apply_alignment = _apply_alignment(format);
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("numFmtId", format->num_format_index);
_PUSH_ATTRIBUTES_INT("fontId", format->font_index);
_PUSH_ATTRIBUTES_INT("fillId", format->fill_index);
_PUSH_ATTRIBUTES_INT("borderId", format->border_index);
_PUSH_ATTRIBUTES_STR("xfId", "0");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("numFmtId", format->num_format_index);
LXW_PUSH_ATTRIBUTES_INT("fontId", format->font_index);
LXW_PUSH_ATTRIBUTES_INT("fillId", format->fill_index);
LXW_PUSH_ATTRIBUTES_INT("borderId", format->border_index);
LXW_PUSH_ATTRIBUTES_STR("xfId", "0");
if (format->num_format_index > 0)
_PUSH_ATTRIBUTES_STR("applyNumberFormat", "1");
LXW_PUSH_ATTRIBUTES_STR("applyNumberFormat", "1");
/* Add applyFont attribute if XF format uses a font element. */
if (format->font_index > 0)
_PUSH_ATTRIBUTES_STR("applyFont", "1");
LXW_PUSH_ATTRIBUTES_STR("applyFont", "1");
/* Add applyFill attribute if XF format uses a fill element. */
if (format->fill_index > 0)
_PUSH_ATTRIBUTES_STR("applyFill", "1");
LXW_PUSH_ATTRIBUTES_STR("applyFill", "1");
/* Add applyBorder attribute if XF format uses a border element. */
if (format->border_index > 0)
_PUSH_ATTRIBUTES_STR("applyBorder", "1");
LXW_PUSH_ATTRIBUTES_STR("applyBorder", "1");
/* We can also have applyAlignment without a sub-element. */
if (apply_alignment)
_PUSH_ATTRIBUTES_STR("applyAlignment", "1");
LXW_PUSH_ATTRIBUTES_STR("applyAlignment", "1");
if (has_protection)
_PUSH_ATTRIBUTES_STR("applyProtection", "1");
LXW_PUSH_ATTRIBUTES_STR("applyProtection", "1");
/* Write XF with sub-elements if required. */
if (has_alignment || has_protection) {
_xml_start_tag(self->file, "xf", &attributes);
lxw_xml_start_tag(self->file, "xf", &attributes);
if (has_alignment)
_write_alignment(self, format);
@ -921,13 +921,13 @@ _write_xf(lxw_styles *self, lxw_format *format)
if (has_protection)
_write_protection(self, format);
_xml_end_tag(self->file, "xf");
lxw_xml_end_tag(self->file, "xf");
}
else {
_xml_empty_tag(self->file, "xf", &attributes);
lxw_xml_empty_tag(self->file, "xf", &attributes);
}
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -940,18 +940,18 @@ _write_cell_xfs(lxw_styles *self)
struct xml_attribute *attribute;
lxw_format *format;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_INT("count", self->xf_count);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_INT("count", self->xf_count);
_xml_start_tag(self->file, "cellXfs", &attributes);
lxw_xml_start_tag(self->file, "cellXfs", &attributes);
STAILQ_FOREACH(format, self->xf_formats, list_pointers) {
_write_xf(self, format);
}
_xml_end_tag(self->file, "cellXfs");
lxw_xml_end_tag(self->file, "cellXfs");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -963,14 +963,14 @@ _write_cell_style(lxw_styles *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("name", "Normal");
_PUSH_ATTRIBUTES_STR("xfId", "0");
_PUSH_ATTRIBUTES_STR("builtinId", "0");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("name", "Normal");
LXW_PUSH_ATTRIBUTES_STR("xfId", "0");
LXW_PUSH_ATTRIBUTES_STR("builtinId", "0");
_xml_empty_tag(self->file, "cellStyle", &attributes);
lxw_xml_empty_tag(self->file, "cellStyle", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -981,14 +981,14 @@ _write_cell_styles(lxw_styles *self)
{
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("count", "1");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("count", "1");
_xml_start_tag(self->file, "cellStyles", &attributes);
lxw_xml_start_tag(self->file, "cellStyles", &attributes);
_write_cell_style(self);
_xml_end_tag(self->file, "cellStyles");
lxw_xml_end_tag(self->file, "cellStyles");
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -1000,12 +1000,12 @@ _write_dxfs(lxw_styles *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("count", "0");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("count", "0");
_xml_empty_tag(self->file, "dxfs", &attributes);
lxw_xml_empty_tag(self->file, "dxfs", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -1017,14 +1017,14 @@ _write_table_styles(lxw_styles *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("count", "0");
_PUSH_ATTRIBUTES_STR("defaultTableStyle", "TableStyleMedium9");
_PUSH_ATTRIBUTES_STR("defaultPivotStyle", "PivotStyleLight16");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("count", "0");
LXW_PUSH_ATTRIBUTES_STR("defaultTableStyle", "TableStyleMedium9");
LXW_PUSH_ATTRIBUTES_STR("defaultPivotStyle", "PivotStyleLight16");
_xml_empty_tag(self->file, "tableStyles", &attributes);
lxw_xml_empty_tag(self->file, "tableStyles", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*****************************************************************************
@ -1076,7 +1076,7 @@ lxw_styles_assemble_xml_file(lxw_styles *self)
/* _write_colors(self); */
/* Close the style sheet tag. */
_xml_end_tag(self->file, "styleSheet");
lxw_xml_end_tag(self->file, "styleSheet");
}
/*****************************************************************************

104
src/workbook.c
View File

@ -733,7 +733,7 @@ _prepare_defined_names(lxw_workbook *self)
STATIC void
_workbook_xml_declaration(lxw_workbook *self)
{
_xml_declaration(self->file);
lxw_xml_declaration(self->file);
}
/*
@ -749,13 +749,13 @@ _write_workbook(lxw_workbook *self)
char xmlns_r[] = "http://schemas.openxmlformats.org"
"/officeDocument/2006/relationships";
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("xmlns", xmlns);
_PUSH_ATTRIBUTES_STR("xmlns:r", xmlns_r);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("xmlns", xmlns);
LXW_PUSH_ATTRIBUTES_STR("xmlns:r", xmlns_r);
_xml_start_tag(self->file, "workbook", &attributes);
lxw_xml_start_tag(self->file, "workbook", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -767,15 +767,15 @@ _write_file_version(lxw_workbook *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("appName", "xl");
_PUSH_ATTRIBUTES_STR("lastEdited", "4");
_PUSH_ATTRIBUTES_STR("lowestEdited", "4");
_PUSH_ATTRIBUTES_STR("rupBuild", "4505");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("appName", "xl");
LXW_PUSH_ATTRIBUTES_STR("lastEdited", "4");
LXW_PUSH_ATTRIBUTES_STR("lowestEdited", "4");
LXW_PUSH_ATTRIBUTES_STR("rupBuild", "4505");
_xml_empty_tag(self->file, "fileVersion", &attributes);
lxw_xml_empty_tag(self->file, "fileVersion", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -787,12 +787,12 @@ _write_workbook_pr(lxw_workbook *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("defaultThemeVersion", "124226");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("defaultThemeVersion", "124226");
_xml_empty_tag(self->file, "workbookPr", &attributes);
lxw_xml_empty_tag(self->file, "workbookPr", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -804,21 +804,21 @@ _write_workbook_view(lxw_workbook *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("xWindow", "240");
_PUSH_ATTRIBUTES_STR("yWindow", "15");
_PUSH_ATTRIBUTES_STR("windowWidth", "16095");
_PUSH_ATTRIBUTES_STR("windowHeight", "9660");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("xWindow", "240");
LXW_PUSH_ATTRIBUTES_STR("yWindow", "15");
LXW_PUSH_ATTRIBUTES_STR("windowWidth", "16095");
LXW_PUSH_ATTRIBUTES_STR("windowHeight", "9660");
if (self->first_sheet)
_PUSH_ATTRIBUTES_INT("firstSheet", self->first_sheet);
LXW_PUSH_ATTRIBUTES_INT("firstSheet", self->first_sheet);
if (self->active_sheet)
_PUSH_ATTRIBUTES_INT("activeTab", self->active_sheet);
LXW_PUSH_ATTRIBUTES_INT("activeTab", self->active_sheet);
_xml_empty_tag(self->file, "workbookView", &attributes);
lxw_xml_empty_tag(self->file, "workbookView", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -827,11 +827,11 @@ _write_workbook_view(lxw_workbook *self)
STATIC void
_write_book_views(lxw_workbook *self)
{
_xml_start_tag(self->file, "bookViews", NULL);
lxw_xml_start_tag(self->file, "bookViews", NULL);
_write_workbook_view(self);
_xml_end_tag(self->file, "bookViews");
lxw_xml_end_tag(self->file, "bookViews");
}
/*
@ -847,18 +847,18 @@ _write_sheet(lxw_workbook *self, const char *name, uint32_t sheet_id,
lxw_snprintf(r_id, ATTR_32, "rId%d", sheet_id);
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("name", name);
_PUSH_ATTRIBUTES_INT("sheetId", sheet_id);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("name", name);
LXW_PUSH_ATTRIBUTES_INT("sheetId", sheet_id);
if (hidden)
_PUSH_ATTRIBUTES_STR("state", "hidden");
LXW_PUSH_ATTRIBUTES_STR("state", "hidden");
_PUSH_ATTRIBUTES_STR("r:id", r_id);
LXW_PUSH_ATTRIBUTES_STR("r:id", r_id);
_xml_empty_tag(self->file, "sheet", &attributes);
lxw_xml_empty_tag(self->file, "sheet", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -869,14 +869,14 @@ _write_sheets(lxw_workbook *self)
{
lxw_worksheet *worksheet;
_xml_start_tag(self->file, "sheets", NULL);
lxw_xml_start_tag(self->file, "sheets", NULL);
STAILQ_FOREACH(worksheet, self->worksheets, list_pointers) {
_write_sheet(self, worksheet->name, worksheet->index + 1,
worksheet->hidden);
}
_xml_end_tag(self->file, "sheets");
lxw_xml_end_tag(self->file, "sheets");
}
/*
@ -888,13 +888,13 @@ _write_calc_pr(lxw_workbook *self)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("calcId", "124519");
_PUSH_ATTRIBUTES_STR("fullCalcOnLoad", "1");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("calcId", "124519");
LXW_PUSH_ATTRIBUTES_STR("fullCalcOnLoad", "1");
_xml_empty_tag(self->file, "calcPr", &attributes);
lxw_xml_empty_tag(self->file, "calcPr", &attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -906,19 +906,19 @@ _write_defined_name(lxw_workbook *self, lxw_defined_name *defined_name)
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("name", defined_name->name);
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("name", defined_name->name);
if (defined_name->index != -1)
_PUSH_ATTRIBUTES_INT("localSheetId", defined_name->index);
LXW_PUSH_ATTRIBUTES_INT("localSheetId", defined_name->index);
if (defined_name->hidden)
_PUSH_ATTRIBUTES_INT("hidden", 1);
LXW_PUSH_ATTRIBUTES_INT("hidden", 1);
_xml_data_element(self->file, "definedName", defined_name->formula,
&attributes);
lxw_xml_data_element(self->file, "definedName", defined_name->formula,
&attributes);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
/*
@ -932,13 +932,13 @@ _write_defined_names(lxw_workbook *self)
if (TAILQ_EMPTY(self->defined_names))
return;
_xml_start_tag(self->file, "definedNames", NULL);
lxw_xml_start_tag(self->file, "definedNames", NULL);
TAILQ_FOREACH(defined_name, self->defined_names, list_pointers) {
_write_defined_name(self, defined_name);
}
_xml_end_tag(self->file, "definedNames");
lxw_xml_end_tag(self->file, "definedNames");
}
/*****************************************************************************
@ -981,7 +981,7 @@ lxw_workbook_assemble_xml_file(lxw_workbook *self)
_write_calc_pr(self);
/* Close the workbook tag. */
_xml_end_tag(self->file, "workbook");
lxw_xml_end_tag(self->file, "workbook");
}
/*****************************************************************************

488
src/worksheet.c
View File

File diff suppressed because it is too large Load Diff

38
src/xmlwriter.c
View File

@ -29,7 +29,7 @@ void _fprint_escaped_data(FILE * xmlfile, const char *data);
* Write the XML declaration.
*/
void
_xml_declaration(FILE * xmlfile)
lxw_xml_declaration(FILE * xmlfile)
{
fprintf(xmlfile, "<?xml version=\"1.0\" "
"encoding=\"UTF-8\" standalone=\"yes\"?>\n");
@ -39,8 +39,8 @@ _xml_declaration(FILE * xmlfile)
* Write an XML start tag with optional attributes.
*/
void
_xml_start_tag(FILE * xmlfile,
const char *tag, struct xml_attribute_list *attributes)
lxw_xml_start_tag(FILE * xmlfile,
const char *tag, struct xml_attribute_list *attributes)
{
fprintf(xmlfile, "<%s", tag);
@ -54,9 +54,9 @@ _xml_start_tag(FILE * xmlfile,
* This is a minor speed optimization for elements that don't need encoding.
*/
void
_xml_start_tag_unencoded(FILE * xmlfile,
const char *tag,
struct xml_attribute_list *attributes)
lxw_xml_start_tag_unencoded(FILE * xmlfile,
const char *tag,
struct xml_attribute_list *attributes)
{
struct xml_attribute *attribute;
@ -75,7 +75,7 @@ _xml_start_tag_unencoded(FILE * xmlfile,
* Write an XML end tag.
*/
void
_xml_end_tag(FILE * xmlfile, const char *tag)
lxw_xml_end_tag(FILE * xmlfile, const char *tag)
{
fprintf(xmlfile, "</%s>", tag);
}
@ -84,8 +84,8 @@ _xml_end_tag(FILE * xmlfile, const char *tag)
* Write an empty XML tag with optional attributes.
*/
void
_xml_empty_tag(FILE * xmlfile,
const char *tag, struct xml_attribute_list *attributes)
lxw_xml_empty_tag(FILE * xmlfile,
const char *tag, struct xml_attribute_list *attributes)
{
fprintf(xmlfile, "<%s", tag);
@ -99,9 +99,9 @@ _xml_empty_tag(FILE * xmlfile,
* This is a minor speed optimization for elements that don't need encoding.
*/
void
_xml_empty_tag_unencoded(FILE * xmlfile,
const char *tag,
struct xml_attribute_list *attributes)
lxw_xml_empty_tag_unencoded(FILE * xmlfile,
const char *tag,
struct xml_attribute_list *attributes)
{
struct xml_attribute *attribute;
@ -120,9 +120,9 @@ _xml_empty_tag_unencoded(FILE * xmlfile,
* Write an XML element containing data with optional attributes.
*/
void
_xml_data_element(FILE * xmlfile,
const char *tag,
const char *data, struct xml_attribute_list *attributes)
lxw_xml_data_element(FILE * xmlfile,
const char *tag,
const char *data, struct xml_attribute_list *attributes)
{
fprintf(xmlfile, "<%s", tag);
@ -216,7 +216,7 @@ _escape_data(const char *data)
* Escape control characters in strings with with _xHHHH_.
*/
char *
_escape_control_characters(const char *string)
lxw_escape_control_characters(const char *string)
{
size_t escape_len = sizeof("_xHHHH_") - 1;
size_t encoded_len = (strlen(string) * escape_len + 1);
@ -315,7 +315,7 @@ _fprint_escaped_data(FILE * xmlfile, const char *data)
/* Create a new string XML attribute. */
struct xml_attribute *
_new_attribute_str(const char *key, const char *value)
lxw_new_attribute_str(const char *key, const char *value)
{
struct xml_attribute *attribute = malloc(sizeof(struct xml_attribute));
@ -327,7 +327,7 @@ _new_attribute_str(const char *key, const char *value)
/* Create a new integer XML attribute. */
struct xml_attribute *
_new_attribute_int(const char *key, uint32_t value)
lxw_new_attribute_int(const char *key, uint32_t value)
{
struct xml_attribute *attribute = malloc(sizeof(struct xml_attribute));
@ -339,7 +339,7 @@ _new_attribute_int(const char *key, uint32_t value)
/* Create a new double XML attribute. */
struct xml_attribute *
_new_attribute_dbl(const char *key, double value)
lxw_new_attribute_dbl(const char *key, double value)
{
struct xml_attribute *attribute = malloc(sizeof(struct xml_attribute));

78
test/unit/xmlwriter/test_xmlwriter.c
View File

@ -17,7 +17,7 @@ CTEST(xmlwriter, xml_declaration) {
char exp[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
FILE* testfile = tmpfile();
_xml_declaration(testfile);
lxw_xml_declaration(testfile);
RUN_XLSX_STREQ(exp, got);
}
@ -29,7 +29,7 @@ CTEST(xmlwriter, xml_start_tag) {
char exp[] = "<foo>";
FILE* testfile = tmpfile();
_xml_start_tag(testfile, "foo", NULL);
lxw_xml_start_tag(testfile, "foo", NULL);
RUN_XLSX_STREQ(exp, got);
}
@ -43,15 +43,15 @@ CTEST(xmlwriter, xml_start_tag_with_attributes) {
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("span", "8");
_PUSH_ATTRIBUTES_STR("baz", "7");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("span", "8");
LXW_PUSH_ATTRIBUTES_STR("baz", "7");
_xml_start_tag(testfile, "foo", &attributes);
lxw_xml_start_tag(testfile, "foo", &attributes);
RUN_XLSX_STREQ(exp, got);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
// Test _xml_start_tag() with attributes requiring escaping.
@ -63,14 +63,14 @@ CTEST(xmlwriter, xml_start_tag_with_attributes_to_escape) {
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("span", "&<>\"");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("span", "&<>\"");
_xml_start_tag(testfile, "foo", &attributes);
lxw_xml_start_tag(testfile, "foo", &attributes);
RUN_XLSX_STREQ(exp, got);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
// Test _xml_start_tag_unencoded() with attributes.
@ -82,14 +82,14 @@ CTEST(xmlwriter, xml_start_tag_unencoded) {
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("span", "&<>\"");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("span", "&<>\"");
_xml_start_tag_unencoded(testfile, "foo", &attributes);
lxw_xml_start_tag_unencoded(testfile, "foo", &attributes);
RUN_XLSX_STREQ(exp, got);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
// Test _xml_end_tag().
@ -99,7 +99,7 @@ CTEST(xmlwriter, xml_end_tag) {
char exp[] = "</foo>";
FILE* testfile = tmpfile();
_xml_end_tag(testfile, "foo");
lxw_xml_end_tag(testfile, "foo");
RUN_XLSX_STREQ(exp, got);
}
@ -111,7 +111,7 @@ CTEST(xmlwriter, xml_empty_tag) {
char exp[] = "<foo/>";
FILE* testfile = tmpfile();
_xml_empty_tag(testfile, "foo", NULL);
lxw_xml_empty_tag(testfile, "foo", NULL);
RUN_XLSX_STREQ(exp, got);
}
@ -125,15 +125,15 @@ CTEST(xmlwriter, xml_empty_tag_with_attributes) {
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("span", "8");
_PUSH_ATTRIBUTES_STR("baz", "7");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("span", "8");
LXW_PUSH_ATTRIBUTES_STR("baz", "7");
_xml_empty_tag(testfile, "foo", &attributes);
lxw_xml_empty_tag(testfile, "foo", &attributes);
RUN_XLSX_STREQ(exp, got);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
// Test _xml_empty_tag() with attributes requiring escaping.
@ -145,14 +145,14 @@ CTEST(xmlwriter, xml_empty_tag_with_attributes_to_escape) {
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("span", "&<>\"");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("span", "&<>\"");
_xml_empty_tag(testfile, "foo", &attributes);
lxw_xml_empty_tag(testfile, "foo", &attributes);
RUN_XLSX_STREQ(exp, got);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
// Test _xml_empty_tag_unencoded() with attributes.
@ -164,14 +164,14 @@ CTEST(xmlwriter, xml_empty_tag_unencoded) {
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("span", "&<>\"");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("span", "&<>\"");
_xml_empty_tag_unencoded(testfile, "foo", &attributes);
lxw_xml_empty_tag_unencoded(testfile, "foo", &attributes);
RUN_XLSX_STREQ(exp, got);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
// Test _xml_empty_tag() with no attributes.
@ -181,7 +181,7 @@ CTEST(xmlwriter, xml_data_element) {
char exp[] = "<foo>bar</foo>";
FILE* testfile = tmpfile();
_xml_data_element(testfile, "foo", "bar", NULL);
lxw_xml_data_element(testfile, "foo", "bar", NULL);
RUN_XLSX_STREQ(exp, got);
}
@ -195,14 +195,14 @@ CTEST(xmlwriter, xml_data_element_with_attributes) {
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("span", "8");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("span", "8");
_xml_data_element(testfile, "foo", "bar", &attributes);
lxw_xml_data_element(testfile, "foo", "bar", &attributes);
RUN_XLSX_STREQ(exp, got);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}
// Test _xml_data_element() with data requiring escaping.
@ -214,13 +214,13 @@ CTEST(xmlwriter, xml_data_element_with_escapes) {
struct xml_attribute_list attributes;
struct xml_attribute *attribute;
_INIT_ATTRIBUTES();
_PUSH_ATTRIBUTES_STR("span", "8");
LXW_INIT_ATTRIBUTES();
LXW_PUSH_ATTRIBUTES_STR("span", "8");
_xml_data_element(testfile, "foo", "&<>\"", &attributes);
lxw_xml_data_element(testfile, "foo", "&<>\"", &attributes);
RUN_XLSX_STREQ(exp, got);
_FREE_ATTRIBUTES();
LXW_FREE_ATTRIBUTES();
}