]> granicus.if.org Git - multimarkdown/commitdiff
UPDATED: Fix issue with AStyle indent settings
authorFletcher T. Penney <fletcher@fletcherpenney.net>
Wed, 1 Nov 2017 19:14:01 +0000 (15:14 -0400)
committerFletcher T. Penney <fletcher@fletcherpenney.net>
Wed, 1 Nov 2017 19:14:01 +0000 (15:14 -0400)
21 files changed:
.astylerc
Makefile
Sources/libMultiMarkdown/aho-corasick.c
Sources/libMultiMarkdown/d_string.c
Sources/libMultiMarkdown/epub.c
Sources/libMultiMarkdown/fodt.c
Sources/libMultiMarkdown/html.c
Sources/libMultiMarkdown/latex.c
Sources/libMultiMarkdown/lexer.h
Sources/libMultiMarkdown/mmd.c
Sources/libMultiMarkdown/object_pool.h
Sources/libMultiMarkdown/opendocument-content.c
Sources/libMultiMarkdown/opendocument.c
Sources/libMultiMarkdown/rng.c
Sources/libMultiMarkdown/stack.h
Sources/libMultiMarkdown/token.c
Sources/libMultiMarkdown/token_pairs.c
Sources/libMultiMarkdown/token_pairs.h
Sources/libMultiMarkdown/uuid.c
Sources/libMultiMarkdown/writer.c
Sources/multimarkdown/main.c

index e90f01d18108346b6c0f818b04599b47f13cbea6..0ff809fce6c3b03c351ec473c36ed8b6ea199c6f 100644 (file)
--- a/.astylerc
+++ b/.astylerc
@@ -7,7 +7,7 @@
 
 
 # Indents
---indent=tab=4
+--indent=force-tab=4
 
 
 # Switch statements
index 194da142d6a8796e3f00c8c00c324af2e1a255f8..59e520d356e2f2b03ec72773168a804231ef978f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -128,4 +128,4 @@ CHANGELOG:
 # Use astyle
 .PHONY : astyle
 astyle:
-       astyle --options=.astylerc "Sources/libMultiMarkdown/*.c" "Sources/multimarkdown/*.c" "Sources/libMultiMarkdown/*.h" 
+       astyle --options=.astylerc "Sources/libMultiMarkdown/*.c" "Sources/multimarkdown/*.c" "Sources/libMultiMarkdown/*.h"  "Sources/libMultiMarkdown/include/*.h" 
index 35744c2daeea2327280a2e2323a835d7f0b6fb73..6ad2daf97c0ac76e2c58f4e22df4282f6f89694b 100644 (file)
@@ -285,7 +285,7 @@ void ac_trie_node_prepare(trie * a, size_t s, char * buffer, unsigned short dept
        // Prepare children
        for (int i = 0; i < 256; ++i) {
                if ((n->child[i] != 0) &&
-                       (n->child[i] != s)) {
+                               (n->child[i] != s)) {
                        buffer[depth] = i;
 
                        ac_trie_node_prepare(a, n->child[i], buffer, depth + 1, last_match_state);
@@ -403,7 +403,7 @@ match * ac_trie_search(trie * a, const char * source, size_t start, size_t len)
                                }
 
                                m = match_add(m, counter - a->node[temp_state].len,
-                                             a->node[temp_state].len, a->node[temp_state].match_type);
+                                                         a->node[temp_state].len, a->node[temp_state].match_type);
                        }
 
                        // Iterate to find shorter matches
@@ -445,7 +445,7 @@ int match_count(match * m) {
 
 void match_describe(match * m, const char * source) {
        fprintf(stderr, "'%.*s'(%d) at %lu:%lu\n", (int)m->len, &source[m->start],
-               m->match_type, m->start, m->start + m->len);
+                       m->match_type, m->start, m->start + m->len);
 }
 
 
@@ -475,14 +475,14 @@ void match_set_filter_leftmost_longest(match * header) {
                        }
 
                        while (m->next &&
-                               m->next->start > m->start &&
-                               m->next->start < m->start + m->len) {
+                                       m->next->start > m->start &&
+                                       m->next->start < m->start + m->len) {
                                // This match is "lefter" than next
                                match_excise(m->next);
                        }
 
                        while (m->next &&
-                               m->next->start < m->start) {
+                                       m->next->start < m->start) {
                                // Next match is "lefter" than us
                                n = m;
                                m = m->prev;
@@ -491,8 +491,8 @@ void match_set_filter_leftmost_longest(match * header) {
                }
 
                while (m->prev &&
-                       m->prev->len &&
-                       m->prev->start >= m->start) {
+                               m->prev->len &&
+                               m->prev->start >= m->start) {
                        // We are "lefter" than previous
                        n = m->prev;
                        match_excise(n);
index 366f9a9a0af519124f60e6ce0a8765ca49ba8515..697fab242649d2b5037b16b3dd28409bf450fb49 100644 (file)
@@ -355,7 +355,7 @@ char * d_string_copy_substring(DString * d, size_t start, size_t len) {
                if (start + len > d->currentStringLength) {
                        fprintf(stderr, "d_string: Asked to copy invalid substring range.\n");
                        fprintf(stderr, "start: %lu  len: %lu  string: %lu\n", start, len,
-                               d->currentStringLength);
+                                       d->currentStringLength);
                        return NULL;
                }
        }
index d878599b70891d645a74475f109627631818b00c..4cb069b1b6e441f36c4ec4b3571f0f57621f9fa8 100644 (file)
@@ -211,7 +211,7 @@ char * epub_package_document(scratch_pad * scratch) {
                struct tm * today = localtime(&t);
 
                d_string_append_printf(out, "<meta property=\"dcterms:modified\">%d-%02d-%02d</meta>\n",
-                                      today->tm_year + 1900, today->tm_mon + 1, today->tm_mday);
+                                                          today->tm_year + 1900, today->tm_mon + 1, today->tm_mday);
        }
 
        d_string_append(out, "</metadata>\n");
index 5f3b61ae5d7bd5515c1c8a0bf1b2b3641da73614..d98b1647f366def4dfdb3ae4101ca39abd07b02a 100644 (file)
@@ -777,7 +777,7 @@ void mmd_export_token_odf(DString * out, const char * source, token * t, scratch
                                temp_token = t->next->child;
 
                                if (temp_token->next &&
-                                       temp_token->next->type == PAIR_BRACKET) {
+                                               temp_token->next->type == PAIR_BRACKET) {
                                        temp_token = temp_token->next;
                                }
 
@@ -949,7 +949,7 @@ void mmd_export_token_odf(DString * out, const char * source, token * t, scratch
 
                case ESCAPED_CHARACTER:
                        if (!(scratch->extensions & EXT_COMPATIBILITY) &&
-                               (source[t->start + 1] == ' ')) {
+                                       (source[t->start + 1] == ' ')) {
                                print_const(" ");              // This is a non-breaking space character
                        } else {
                                mmd_print_char_odf(out, source[t->start + 1]);
@@ -1171,7 +1171,7 @@ void mmd_export_token_odf(DString * out, const char * source, token * t, scratch
 
                case PAIR_BRACKET:
                        if ((scratch->extensions & EXT_NOTES) &&
-                               (t->next && t->next->type == PAIR_BRACKET_CITATION)) {
+                                       (t->next && t->next->type == PAIR_BRACKET_CITATION)) {
                                goto parse_citation;
                        }
 
@@ -1187,8 +1187,8 @@ void mmd_export_token_odf(DString * out, const char * source, token * t, scratch
                                        temp_token = t->next;
 
                                        if (temp_token &&
-                                               ((temp_token->type == PAIR_BRACKET) ||
-                                                (temp_token->type == PAIR_PAREN))) {
+                                                       ((temp_token->type == PAIR_BRACKET) ||
+                                                        (temp_token->type == PAIR_PAREN))) {
                                                temp_token = temp_token->next;
                                        }
 
@@ -1555,7 +1555,7 @@ parse_citation:
 
                        // Ignore if we're rejecting or accepting
                        if ((scratch->extensions & EXT_CRITIC_REJECT) ||
-                               (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+                                       (scratch->extensions & EXT_CRITIC_ACCEPT)) {
                                break;
                        }
 
@@ -1575,7 +1575,7 @@ parse_citation:
 
                        // Ignore if we're rejecting or accepting
                        if ((scratch->extensions & EXT_CRITIC_REJECT) ||
-                               (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+                                       (scratch->extensions & EXT_CRITIC_ACCEPT)) {
                                t->child->type = TEXT_EMPTY;
                                t->child->mate->type = TEXT_EMPTY;
                                mmd_export_token_tree_odf(out, source, t->child, scratch);
@@ -1604,8 +1604,8 @@ parse_citation:
 
                case PAIR_CRITIC_SUB_DEL:
                        if ((scratch->extensions & EXT_CRITIC) &&
-                               (t->next) &&
-                               (t->next->type == PAIR_CRITIC_SUB_ADD)) {
+                                       (t->next) &&
+                                       (t->next->type == PAIR_CRITIC_SUB_ADD)) {
                                t->child->type = TEXT_EMPTY;
                                t->child->mate->type = TEXT_EMPTY;
 
@@ -1626,8 +1626,8 @@ parse_citation:
 
                case PAIR_CRITIC_SUB_ADD:
                        if ((scratch->extensions & EXT_CRITIC) &&
-                               (t->prev) &&
-                               (t->prev->type == PAIR_CRITIC_SUB_DEL)) {
+                                       (t->prev) &&
+                                       (t->prev->type == PAIR_CRITIC_SUB_DEL)) {
                                t->child->type = TEXT_EMPTY;
                                t->child->mate->type = TEXT_EMPTY;
 
@@ -1945,291 +1945,291 @@ void mmd_export_token_tree_odf_raw(DString * out, const char * source, token * t
 
 void mmd_start_complete_odf(DString * out, const char * source, scratch_pad * scratch) {
        print_const("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \
-                   "<office:document xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\"\n" \
-                   "     xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\"\n" \
-                   "     xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\"\n" \
-                   "     xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\"\n" \
-                   "     xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\"\n" \
-                   "     xmlns:fo=\"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\"\n" \
-                   "     xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n" \
-                   "     xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n" \
-                   "     xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\"\n" \
-                   "     xmlns:number=\"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\"\n" \
-                   "     xmlns:svg=\"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\"\n" \
-                   "     xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\"\n" \
-                   "     xmlns:dr3d=\"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\"\n" \
-                   "     xmlns:math=\"http://www.w3.org/1998/Math/MathML\"\n" \
-                   "     xmlns:form=\"urn:oasis:names:tc:opendocument:xmlns:form:1.0\"\n" \
-                   "     xmlns:script=\"urn:oasis:names:tc:opendocument:xmlns:script:1.0\"\n" \
-                   "     xmlns:config=\"urn:oasis:names:tc:opendocument:xmlns:config:1.0\"\n" \
-                   "     xmlns:ooo=\"http://openoffice.org/2004/office\"\n" \
-                   "     xmlns:ooow=\"http://openoffice.org/2004/writer\"\n" \
-                   "     xmlns:oooc=\"http://openoffice.org/2004/calc\"\n" \
-                   "     xmlns:dom=\"http://www.w3.org/2001/xml-events\"\n" \
-                   "     xmlns:xforms=\"http://www.w3.org/2002/xforms\"\n" \
-                   "     xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n" \
-                   "     xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" \
-                   "     xmlns:rpt=\"http://openoffice.org/2005/report\"\n" \
-                   "     xmlns:of=\"urn:oasis:names:tc:opendocument:xmlns:of:1.2\"\n" \
-                   "     xmlns:xhtml=\"http://www.w3.org/1999/xhtml\"\n" \
-                   "     xmlns:grddl=\"http://www.w3.org/2003/g/data-view#\"\n" \
-                   "     xmlns:tableooo=\"http://openoffice.org/2009/table\"\n" \
-                   "     xmlns:field=\"urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0\"\n" \
-                   "     xmlns:formx=\"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0\"\n" \
-                   "     xmlns:css3t=\"http://www.w3.org/TR/css3-text/\"\n" \
-                   "     office:version=\"1.2\"\n" \
-                   "     grddl:transformation=\"http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl\"\n" \
-                   "     office:mimetype=\"application/vnd.oasis.opendocument.text\">\n");
+                               "<office:document xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\"\n" \
+                               "     xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\"\n" \
+                               "     xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\"\n" \
+                               "     xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\"\n" \
+                               "     xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\"\n" \
+                               "     xmlns:fo=\"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\"\n" \
+                               "     xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n" \
+                               "     xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n" \
+                               "     xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\"\n" \
+                               "     xmlns:number=\"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\"\n" \
+                               "     xmlns:svg=\"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\"\n" \
+                               "     xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\"\n" \
+                               "     xmlns:dr3d=\"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\"\n" \
+                               "     xmlns:math=\"http://www.w3.org/1998/Math/MathML\"\n" \
+                               "     xmlns:form=\"urn:oasis:names:tc:opendocument:xmlns:form:1.0\"\n" \
+                               "     xmlns:script=\"urn:oasis:names:tc:opendocument:xmlns:script:1.0\"\n" \
+                               "     xmlns:config=\"urn:oasis:names:tc:opendocument:xmlns:config:1.0\"\n" \
+                               "     xmlns:ooo=\"http://openoffice.org/2004/office\"\n" \
+                               "     xmlns:ooow=\"http://openoffice.org/2004/writer\"\n" \
+                               "     xmlns:oooc=\"http://openoffice.org/2004/calc\"\n" \
+                               "     xmlns:dom=\"http://www.w3.org/2001/xml-events\"\n" \
+                               "     xmlns:xforms=\"http://www.w3.org/2002/xforms\"\n" \
+                               "     xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n" \
+                               "     xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" \
+                               "     xmlns:rpt=\"http://openoffice.org/2005/report\"\n" \
+                               "     xmlns:of=\"urn:oasis:names:tc:opendocument:xmlns:of:1.2\"\n" \
+                               "     xmlns:xhtml=\"http://www.w3.org/1999/xhtml\"\n" \
+                               "     xmlns:grddl=\"http://www.w3.org/2003/g/data-view#\"\n" \
+                               "     xmlns:tableooo=\"http://openoffice.org/2009/table\"\n" \
+                               "     xmlns:field=\"urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0\"\n" \
+                               "     xmlns:formx=\"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0\"\n" \
+                               "     xmlns:css3t=\"http://www.w3.org/TR/css3-text/\"\n" \
+                               "     office:version=\"1.2\"\n" \
+                               "     grddl:transformation=\"http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl\"\n" \
+                               "     office:mimetype=\"application/vnd.oasis.opendocument.text\">\n");
 
        /* Font Declarations */
        print_const("<office:font-face-decls>\n" \
-                   "   <style:font-face style:name=\"Courier New\" svg:font-family=\"'Courier New'\"\n" \
-                   "                    style:font-adornments=\"Regular\"\n" \
-                   "                    style:font-family-generic=\"modern\"\n" \
-                   "                    style:font-pitch=\"fixed\"/>\n" \
-                   "</office:font-face-decls>\n");
+                               "   <style:font-face style:name=\"Courier New\" svg:font-family=\"'Courier New'\"\n" \
+                               "                    style:font-adornments=\"Regular\"\n" \
+                               "                    style:font-family-generic=\"modern\"\n" \
+                               "                    style:font-pitch=\"fixed\"/>\n" \
+                               "</office:font-face-decls>\n");
 
        /* Append basic style information */
        print_const("<office:styles>\n" \
-                   "<style:style style:name=\"Standard\" style:family=\"paragraph\" style:class=\"text\">\n" \
-                   "      <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0.15in\"" \
-                   "     fo:text-align=\"justify\" style:justify-single-word=\"false\"/>\n" \
-                   "   </style:style>\n" \
-                   "<style:style style:name=\"Preformatted_20_Text\" style:display-name=\"Preformatted Text\"\n" \
-                   "             style:family=\"paragraph\"\n" \
-                   "             style:parent-style-name=\"Standard\"\n" \
-                   "             style:class=\"html\">\n" \
-                   "   <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0in\" fo:text-align=\"start\"\n" \
-                   "                               style:justify-single-word=\"false\"/>\n" \
-                   "   <style:text-properties style:font-name=\"Courier New\" fo:font-size=\"11pt\"\n" \
-                   "                          style:font-name-asian=\"Courier New\"\n" \
-                   "                          style:font-size-asian=\"11pt\"\n" \
-                   "                          style:font-name-complex=\"Courier New\"\n" \
-                   "                          style:font-size-complex=\"11pt\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"Source_20_Text\" style:display-name=\"Source Text\"\n" \
-                   "             style:family=\"text\">\n" \
-                   "   <style:text-properties style:font-name=\"Courier New\" style:font-name-asian=\"Courier New\"\n" \
-                   "                          style:font-name-complex=\"Courier New\"\n" \
-                   "                          fo:font-size=\"11pt\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"List\" style:family=\"paragraph\"\n" \
-                   "             style:parent-style-name=\"Standard\"\n" \
-                   "             style:class=\"list\">\n" \
-                   "   <style:paragraph-properties fo:text-align=\"start\" style:justify-single-word=\"false\"/>\n" \
-                   "   <style:text-properties style:font-size-asian=\"12pt\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"Quotations\" style:family=\"paragraph\"\n" \
-                   "             style:parent-style-name=\"Standard\"\n" \
-                   "             style:class=\"html\">\n" \
-                   "   <style:paragraph-properties fo:margin-left=\"0.3937in\" fo:margin-right=\"0.3937in\" fo:margin-top=\"0in\"\n" \
-                   "                               fo:margin-bottom=\"0.1965in\"\n" \
-                   "                               fo:text-align=\"justify\"" \
-                   "                               style:justify-single-word=\"false\"" \
-                   "                               fo:text-indent=\"0in\"\n" \
-                   "                               style:auto-text-indent=\"false\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"Table_20_Heading\" style:display-name=\"Table Heading\"\n" \
-                   "             style:family=\"paragraph\"\n" \
-                   "             style:parent-style-name=\"Table_20_Contents\"\n" \
-                   "             style:class=\"extra\">\n" \
-                   "   <style:paragraph-properties fo:text-align=\"center\" style:justify-single-word=\"false\"\n" \
-                   "                               text:number-lines=\"false\"\n" \
-                   "                               text:line-number=\"0\"/>\n" \
-                   "   <style:text-properties fo:font-weight=\"bold\" style:font-weight-asian=\"bold\"\n" \
-                   "                          style:font-weight-complex=\"bold\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"Horizontal_20_Line\" style:display-name=\"Horizontal Line\"\n" \
-                   "             style:family=\"paragraph\"\n" \
-                   "             style:parent-style-name=\"Standard\"\n" \
-                   "             style:class=\"html\">\n" \
-                   "   <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0.1965in\"\n" \
-                   "                               style:border-line-width-bottom=\"0.0008in 0.0138in 0.0008in\"\n" \
-                   "                               fo:padding=\"0in\"\n" \
-                   "                               fo:border-left=\"none\"\n" \
-                   "                               fo:border-right=\"none\"\n" \
-                   "                               fo:border-top=\"none\"\n" \
-                   "                               fo:border-bottom=\"0.0154in double #808080\"\n" \
-                   "                               text:number-lines=\"false\"\n" \
-                   "                               text:line-number=\"0\"\n" \
-                   "                               style:join-border=\"false\"/>\n" \
-                   "   <style:text-properties fo:font-size=\"6pt\" style:font-size-asian=\"6pt\" style:font-size-complex=\"6pt\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"Footnote_20_anchor\" style:display-name=\"Footnote anchor\"" \
-                   "              style:family=\"text\">" \
-                   "    <style:text-properties style:text-position=\"super 58%\"/>" \
-                   " </style:style>\n" \
-                   "<style:style style:name=\"TOC_Item\" style:family=\"paragraph\" style:parent-style-name=\"Standard\">\n" \
-                   " <style:paragraph-properties>\n" \
-                   "  <style:tab-stops>\n" \
-                   "   <style:tab-stop style:position=\"6.7283in\" style:type=\"right\" style:leader-style=\"dotted\" style:leader-text=\".\"/>\n" \
-                   "  </style:tab-stops>\n" \
-                   " </style:paragraph-properties>\n" \
-                   "</style:style>\n" \
-                   "  <text:notes-configuration text:note-class=\"footnote\" text:default-style-name=\"Footnote\" text:citation-style-name=\"Footnote_20_Symbol\" text:citation-body-style-name=\"Footnote_20_anchor\" text:master-page-name=\"Footnote\" style:num-format=\"a\" text:start-value=\"0\" text:footnotes-position=\"page\" text:start-numbering-at=\"page\"/>\n" \
-                   "  <text:notes-configuration text:note-class=\"endnote\" text:default-style-name=\"Endnote\" text:citation-style-name=\"Endnote_20_Symbol\" text:citation-body-style-name=\"Endnote_20_anchor\" text:master-page-name=\"Endnote\" style:num-format=\"1\" text:start-value=\"0\"/>\n" \
-                   "</office:styles>\n");
+                               "<style:style style:name=\"Standard\" style:family=\"paragraph\" style:class=\"text\">\n" \
+                               "      <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0.15in\"" \
+                               "     fo:text-align=\"justify\" style:justify-single-word=\"false\"/>\n" \
+                               "   </style:style>\n" \
+                               "<style:style style:name=\"Preformatted_20_Text\" style:display-name=\"Preformatted Text\"\n" \
+                               "             style:family=\"paragraph\"\n" \
+                               "             style:parent-style-name=\"Standard\"\n" \
+                               "             style:class=\"html\">\n" \
+                               "   <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0in\" fo:text-align=\"start\"\n" \
+                               "                               style:justify-single-word=\"false\"/>\n" \
+                               "   <style:text-properties style:font-name=\"Courier New\" fo:font-size=\"11pt\"\n" \
+                               "                          style:font-name-asian=\"Courier New\"\n" \
+                               "                          style:font-size-asian=\"11pt\"\n" \
+                               "                          style:font-name-complex=\"Courier New\"\n" \
+                               "                          style:font-size-complex=\"11pt\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"Source_20_Text\" style:display-name=\"Source Text\"\n" \
+                               "             style:family=\"text\">\n" \
+                               "   <style:text-properties style:font-name=\"Courier New\" style:font-name-asian=\"Courier New\"\n" \
+                               "                          style:font-name-complex=\"Courier New\"\n" \
+                               "                          fo:font-size=\"11pt\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"List\" style:family=\"paragraph\"\n" \
+                               "             style:parent-style-name=\"Standard\"\n" \
+                               "             style:class=\"list\">\n" \
+                               "   <style:paragraph-properties fo:text-align=\"start\" style:justify-single-word=\"false\"/>\n" \
+                               "   <style:text-properties style:font-size-asian=\"12pt\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"Quotations\" style:family=\"paragraph\"\n" \
+                               "             style:parent-style-name=\"Standard\"\n" \
+                               "             style:class=\"html\">\n" \
+                               "   <style:paragraph-properties fo:margin-left=\"0.3937in\" fo:margin-right=\"0.3937in\" fo:margin-top=\"0in\"\n" \
+                               "                               fo:margin-bottom=\"0.1965in\"\n" \
+                               "                               fo:text-align=\"justify\"" \
+                               "                               style:justify-single-word=\"false\"" \
+                               "                               fo:text-indent=\"0in\"\n" \
+                               "                               style:auto-text-indent=\"false\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"Table_20_Heading\" style:display-name=\"Table Heading\"\n" \
+                               "             style:family=\"paragraph\"\n" \
+                               "             style:parent-style-name=\"Table_20_Contents\"\n" \
+                               "             style:class=\"extra\">\n" \
+                               "   <style:paragraph-properties fo:text-align=\"center\" style:justify-single-word=\"false\"\n" \
+                               "                               text:number-lines=\"false\"\n" \
+                               "                               text:line-number=\"0\"/>\n" \
+                               "   <style:text-properties fo:font-weight=\"bold\" style:font-weight-asian=\"bold\"\n" \
+                               "                          style:font-weight-complex=\"bold\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"Horizontal_20_Line\" style:display-name=\"Horizontal Line\"\n" \
+                               "             style:family=\"paragraph\"\n" \
+                               "             style:parent-style-name=\"Standard\"\n" \
+                               "             style:class=\"html\">\n" \
+                               "   <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0.1965in\"\n" \
+                               "                               style:border-line-width-bottom=\"0.0008in 0.0138in 0.0008in\"\n" \
+                               "                               fo:padding=\"0in\"\n" \
+                               "                               fo:border-left=\"none\"\n" \
+                               "                               fo:border-right=\"none\"\n" \
+                               "                               fo:border-top=\"none\"\n" \
+                               "                               fo:border-bottom=\"0.0154in double #808080\"\n" \
+                               "                               text:number-lines=\"false\"\n" \
+                               "                               text:line-number=\"0\"\n" \
+                               "                               style:join-border=\"false\"/>\n" \
+                               "   <style:text-properties fo:font-size=\"6pt\" style:font-size-asian=\"6pt\" style:font-size-complex=\"6pt\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"Footnote_20_anchor\" style:display-name=\"Footnote anchor\"" \
+                               "              style:family=\"text\">" \
+                               "    <style:text-properties style:text-position=\"super 58%\"/>" \
+                               " </style:style>\n" \
+                               "<style:style style:name=\"TOC_Item\" style:family=\"paragraph\" style:parent-style-name=\"Standard\">\n" \
+                               " <style:paragraph-properties>\n" \
+                               "  <style:tab-stops>\n" \
+                               "   <style:tab-stop style:position=\"6.7283in\" style:type=\"right\" style:leader-style=\"dotted\" style:leader-text=\".\"/>\n" \
+                               "  </style:tab-stops>\n" \
+                               " </style:paragraph-properties>\n" \
+                               "</style:style>\n" \
+                               "  <text:notes-configuration text:note-class=\"footnote\" text:default-style-name=\"Footnote\" text:citation-style-name=\"Footnote_20_Symbol\" text:citation-body-style-name=\"Footnote_20_anchor\" text:master-page-name=\"Footnote\" style:num-format=\"a\" text:start-value=\"0\" text:footnotes-position=\"page\" text:start-numbering-at=\"page\"/>\n" \
+                               "  <text:notes-configuration text:note-class=\"endnote\" text:default-style-name=\"Endnote\" text:citation-style-name=\"Endnote_20_Symbol\" text:citation-body-style-name=\"Endnote_20_anchor\" text:master-page-name=\"Endnote\" style:num-format=\"1\" text:start-value=\"0\"/>\n" \
+                               "</office:styles>\n");
 
        /* Automatic style information */
        print_const("<office:automatic-styles>" \
-                   "   <style:style style:name=\"MMD-Italic\" style:family=\"text\">\n" \
-                   "      <style:text-properties fo:font-style=\"italic\" style:font-style-asian=\"italic\"\n" \
-                   "                             style:font-style-complex=\"italic\"/>\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"MMD-Bold\" style:family=\"text\">\n" \
-                   "      <style:text-properties fo:font-weight=\"bold\" style:font-weight-asian=\"bold\"\n" \
-                   "                             style:font-weight-complex=\"bold\"/>\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"MMD-Superscript\" style:family=\"text\">\n" \
-                   "      <style:text-properties style:text-position=\"super 58%\"/>\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"MMD-Subscript\" style:family=\"text\">\n" \
-                   "      <style:text-properties style:text-position=\"sub 58%\"/>\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"Strike\" style:family=\"text\">\n" \
-                   "      <style:text-properties style:text-line-through-style=\"solid\" />\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"Underline\" style:family=\"text\">\n" \
-                   "      <style:text-properties style:text-underline-style=\"solid\" style:text-underline-color=\"font-color\"/>\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"Highlight\" style:family=\"text\">\n" \
-                   "      <style:text-properties fo:background-color=\"#FFFF00\" />\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"Comment\" style:family=\"text\">\n" \
-                   "      <style:text-properties fo:color=\"#0000BB\" />\n" \
-                   "   </style:style>\n" \
-                   "<style:style style:name=\"MMD-Table\" style:family=\"paragraph\" style:parent-style-name=\"Standard\">\n" \
-                   "   <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0.05in\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"MMD-Table-Center\" style:family=\"paragraph\" style:parent-style-name=\"MMD-Table\">\n" \
-                   "   <style:paragraph-properties fo:text-align=\"center\" style:justify-single-word=\"false\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"MMD-Table-Right\" style:family=\"paragraph\" style:parent-style-name=\"MMD-Table\">\n" \
-                   "   <style:paragraph-properties fo:text-align=\"right\" style:justify-single-word=\"false\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"P2\" style:family=\"paragraph\" style:parent-style-name=\"Standard\"\n" \
-                   "             style:list-style-name=\"L2\">\n" \
-                   "<style:paragraph-properties fo:text-align=\"start\" style:justify-single-word=\"false\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"fr1\" style:family=\"graphic\" style:parent-style-name=\"Frame\">\n" \
-                   "   <style:graphic-properties style:print-content=\"true\" style:vertical-pos=\"top\"\n" \
-                   "                             style:vertical-rel=\"baseline\"\n" \
-                   "                             fo:padding=\"0in\"\n" \
-                   "                             fo:border=\"none\"\n" \
-                   "                             style:shadow=\"none\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"P1\" style:family=\"paragraph\" style:parent-style-name=\"Standard\"\n" \
-                   "             style:list-style-name=\"L1\"/>\n" \
-                   "<text:list-style style:name=\"L1\">\n" \
-                   "   <text:list-level-style-bullet text:level=\"1\" text:style-name=\"Numbering_20_Symbols\" style:num-suffix=\".\" text:bullet-char=\"•\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.5in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-bullet>\n" \
-                   "   <text:list-level-style-bullet text:level=\"2\" text:style-name=\"Numbering_20_Symbols\" style:num-suffix=\".\" text:bullet-char=\"◦\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.75in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-bullet>\n" \
-                   "   <text:list-level-style-bullet text:level=\"3\" text:style-name=\"Numbering_20_Symbols\" style:num-suffix=\".\" text:bullet-char=\"▪\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-bullet>\n" \
-                   "   <text:list-level-style-number text:level=\"4\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.25in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"5\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.5in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"6\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.75in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"7\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"8\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.25in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"9\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.5in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"10\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.75in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "</text:list-style>\n" \
-                   "<text:list-style style:name=\"L2\">\n" \
-                   "   <text:list-level-style-number text:level=\"1\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.5in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"2\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.75in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"3\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"4\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.25in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"5\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.5in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"6\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.75in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"7\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"8\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.25in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"9\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.5in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"10\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.75in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "</text:list-style>\n" \
-                   "</office:automatic-styles>\n" \
-                   " <office:master-styles>\n" \
-                   "  <style:master-page style:name=\"Endnote\" >\n" \
-                   "    <style:header><text:h text:outline-level=\"2\">Bibliography</text:h></style:header></style:master-page>\n" \
-                   "  <style:master-page style:name=\"Footnote\" style:page-layout-name=\"pm2\"/>\n" \
-                   " </office:master-styles>\n");
+                               "   <style:style style:name=\"MMD-Italic\" style:family=\"text\">\n" \
+                               "      <style:text-properties fo:font-style=\"italic\" style:font-style-asian=\"italic\"\n" \
+                               "                             style:font-style-complex=\"italic\"/>\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"MMD-Bold\" style:family=\"text\">\n" \
+                               "      <style:text-properties fo:font-weight=\"bold\" style:font-weight-asian=\"bold\"\n" \
+                               "                             style:font-weight-complex=\"bold\"/>\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"MMD-Superscript\" style:family=\"text\">\n" \
+                               "      <style:text-properties style:text-position=\"super 58%\"/>\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"MMD-Subscript\" style:family=\"text\">\n" \
+                               "      <style:text-properties style:text-position=\"sub 58%\"/>\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"Strike\" style:family=\"text\">\n" \
+                               "      <style:text-properties style:text-line-through-style=\"solid\" />\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"Underline\" style:family=\"text\">\n" \
+                               "      <style:text-properties style:text-underline-style=\"solid\" style:text-underline-color=\"font-color\"/>\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"Highlight\" style:family=\"text\">\n" \
+                               "      <style:text-properties fo:background-color=\"#FFFF00\" />\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"Comment\" style:family=\"text\">\n" \
+                               "      <style:text-properties fo:color=\"#0000BB\" />\n" \
+                               "   </style:style>\n" \
+                               "<style:style style:name=\"MMD-Table\" style:family=\"paragraph\" style:parent-style-name=\"Standard\">\n" \
+                               "   <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0.05in\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"MMD-Table-Center\" style:family=\"paragraph\" style:parent-style-name=\"MMD-Table\">\n" \
+                               "   <style:paragraph-properties fo:text-align=\"center\" style:justify-single-word=\"false\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"MMD-Table-Right\" style:family=\"paragraph\" style:parent-style-name=\"MMD-Table\">\n" \
+                               "   <style:paragraph-properties fo:text-align=\"right\" style:justify-single-word=\"false\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"P2\" style:family=\"paragraph\" style:parent-style-name=\"Standard\"\n" \
+                               "             style:list-style-name=\"L2\">\n" \
+                               "<style:paragraph-properties fo:text-align=\"start\" style:justify-single-word=\"false\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"fr1\" style:family=\"graphic\" style:parent-style-name=\"Frame\">\n" \
+                               "   <style:graphic-properties style:print-content=\"true\" style:vertical-pos=\"top\"\n" \
+                               "                             style:vertical-rel=\"baseline\"\n" \
+                               "                             fo:padding=\"0in\"\n" \
+                               "                             fo:border=\"none\"\n" \
+                               "                             style:shadow=\"none\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"P1\" style:family=\"paragraph\" style:parent-style-name=\"Standard\"\n" \
+                               "             style:list-style-name=\"L1\"/>\n" \
+                               "<text:list-style style:name=\"L1\">\n" \
+                               "       <text:list-level-style-bullet text:level=\"1\" text:style-name=\"Numbering_20_Symbols\" style:num-suffix=\".\" text:bullet-char=\"•\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.5in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-bullet>\n" \
+                               "       <text:list-level-style-bullet text:level=\"2\" text:style-name=\"Numbering_20_Symbols\" style:num-suffix=\".\" text:bullet-char=\"◦\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.75in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-bullet>\n" \
+                               "       <text:list-level-style-bullet text:level=\"3\" text:style-name=\"Numbering_20_Symbols\" style:num-suffix=\".\" text:bullet-char=\"▪\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-bullet>\n" \
+                               "       <text:list-level-style-number text:level=\"4\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.25in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"5\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.5in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"6\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.75in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"7\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"8\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.25in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"9\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.5in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"10\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.75in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "</text:list-style>\n" \
+                               "<text:list-style style:name=\"L2\">\n" \
+                               "       <text:list-level-style-number text:level=\"1\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.5in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"2\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.75in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"3\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"4\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.25in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"5\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.5in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"6\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.75in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"7\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"8\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.25in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"9\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.5in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"10\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.75in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "</text:list-style>\n" \
+                               "</office:automatic-styles>\n" \
+                               " <office:master-styles>\n" \
+                               "  <style:master-page style:name=\"Endnote\" >\n" \
+                               "    <style:header><text:h text:outline-level=\"2\">Bibliography</text:h></style:header></style:master-page>\n" \
+                               "  <style:master-page style:name=\"Footnote\" style:page-layout-name=\"pm2\"/>\n" \
+                               " </office:master-styles>\n");
 
        // Iterate over metadata keys
        meta * m;
index 9dbd56e4f74989ee398fcaf43ecf9001fc1beecb..69873693d191a943bfcfec80f60a5a8d4db6afb5 100644 (file)
@@ -883,7 +883,7 @@ void mmd_export_token_html(DString * out, const char * source, token * t, scratc
                                temp_token = t->next->child;
 
                                if (temp_token->next &&
-                                       temp_token->next->type == PAIR_BRACKET) {
+                                               temp_token->next->type == PAIR_BRACKET) {
                                        temp_token = temp_token->next;
                                }
 
@@ -1125,7 +1125,7 @@ void mmd_export_token_html(DString * out, const char * source, token * t, scratc
 
                case ESCAPED_CHARACTER:
                        if (!(scratch->extensions & EXT_COMPATIBILITY) &&
-                               (source[t->start + 1] == ' ')) {
+                                       (source[t->start + 1] == ' ')) {
                                print_const("&nbsp;");
                        } else {
                                mmd_print_char_html(out, source[t->start + 1], false);
@@ -1344,7 +1344,7 @@ void mmd_export_token_html(DString * out, const char * source, token * t, scratc
 
                case PAIR_BRACKET:
                        if ((scratch->extensions & EXT_NOTES) &&
-                               (t->next && t->next->type == PAIR_BRACKET_CITATION)) {
+                                       (t->next && t->next->type == PAIR_BRACKET_CITATION)) {
                                goto parse_citation;
                        }
 
@@ -1360,8 +1360,8 @@ void mmd_export_token_html(DString * out, const char * source, token * t, scratc
                                        temp_token = t->next;
 
                                        if (temp_token &&
-                                               ((temp_token->type == PAIR_BRACKET) ||
-                                                (temp_token->type == PAIR_PAREN))) {
+                                                       ((temp_token->type == PAIR_BRACKET) ||
+                                                        (temp_token->type == PAIR_PAREN))) {
                                                temp_token = temp_token->next;
                                        }
 
@@ -1519,11 +1519,11 @@ parse_citation:
                                                if (temp_short2 == scratch->used_citations->size) {
                                                        // This is a re-use of a previously used note
                                                        printf("<a href=\"#cn:%d\" title=\"%s\" class=\"citation\">(%d)</a>",
-                                                              temp_short, LC("see citation"), temp_short);
+                                                                  temp_short, LC("see citation"), temp_short);
                                                } else {
                                                        // This is the first time this note was used
                                                        printf("<a href=\"#cn:%d\" id=\"cnref:%d\" title=\"%s\" class=\"citation\">(%d)</a>",
-                                                              temp_short, temp_short, LC("see citation"), temp_short);
+                                                                  temp_short, temp_short, LC("see citation"), temp_short);
                                                }
                                        } else {
                                                // Locator present
@@ -1531,11 +1531,11 @@ parse_citation:
                                                if (temp_short2 == scratch->used_citations->size) {
                                                        // This is a re-use of a previously used note
                                                        printf("<a href=\"#cn:%d\" title=\"%s\" class=\"citation\">(%s, %d)</a>",
-                                                              temp_short, LC("see citation"), temp_char, temp_short);
+                                                                  temp_short, LC("see citation"), temp_char, temp_short);
                                                } else {
                                                        // This is the first time this note was used
                                                        printf("<a href=\"#cn:%d\" id=\"cnref:%d\" title=\"%s\" class=\"citation\">(%s, %d)</a>",
-                                                              temp_short, temp_short, LC("see citation"), temp_char, temp_short);
+                                                                  temp_short, temp_short, LC("see citation"), temp_char, temp_short);
                                                }
                                        }
                                } else {
@@ -1582,7 +1582,7 @@ parse_citation:
                                        }
 
                                        printf("<a href=\"#fn:%d\" title=\"%s\" class=\"footnote\"><sup>%d</sup></a>",
-                                              temp_short3, LC("see footnote"), temp_short);
+                                                  temp_short3, LC("see footnote"), temp_short);
                                } else {
                                        // This is the first time this note was used
 
@@ -1594,7 +1594,7 @@ parse_citation:
                                        }
 
                                        printf("<a href=\"#fn:%d\" id=\"fnref:%d\" title=\"%s\" class=\"footnote\"><sup>%d</sup></a>",
-                                              temp_short3, temp_short3, LC("see footnote"), temp_short);
+                                                  temp_short3, temp_short3, LC("see footnote"), temp_short);
                                }
                        } else {
                                // Note-based syntax disabled
@@ -1634,7 +1634,7 @@ parse_citation:
                                        // This is a re-use of a previously used note
 
                                        printf("<a href=\"#gn:%d\" title=\"%s\" class=\"glossary\">",
-                                              temp_short, LC("see glossary"));
+                                                  temp_short, LC("see glossary"));
                                        mmd_print_string_html(out, temp_note->clean_text, false);
                                        print_const("</a>");
                                } else {
@@ -1642,7 +1642,7 @@ parse_citation:
 
 
                                        printf("<a href=\"#gn:%d\" id=\"gnref:%d\" title=\"%s\" class=\"glossary\">",
-                                              temp_short, temp_short, LC("see glossary"));
+                                                  temp_short, temp_short, LC("see glossary"));
                                        mmd_print_string_html(out, temp_note->clean_text, false);
                                        print_const("</a>");
                                }
@@ -1719,7 +1719,7 @@ parse_citation:
 
                        // Ignore if we're rejecting or accepting
                        if ((scratch->extensions & EXT_CRITIC_REJECT) ||
-                               (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+                                       (scratch->extensions & EXT_CRITIC_ACCEPT)) {
                                break;
                        }
 
@@ -1739,7 +1739,7 @@ parse_citation:
 
                        // Ignore if we're rejecting or accepting
                        if ((scratch->extensions & EXT_CRITIC_REJECT) ||
-                               (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+                                       (scratch->extensions & EXT_CRITIC_ACCEPT)) {
                                t->child->type = TEXT_EMPTY;
                                t->child->mate->type = TEXT_EMPTY;
                                mmd_export_token_tree_html(out, source, t->child, scratch);
@@ -1768,8 +1768,8 @@ parse_citation:
 
                case PAIR_CRITIC_SUB_DEL:
                        if ((scratch->extensions & EXT_CRITIC) &&
-                               (t->next) &&
-                               (t->next->type == PAIR_CRITIC_SUB_ADD)) {
+                                       (t->next) &&
+                                       (t->next->type == PAIR_CRITIC_SUB_ADD)) {
                                t->child->type = TEXT_EMPTY;
                                t->child->mate->type = TEXT_EMPTY;
 
@@ -1790,8 +1790,8 @@ parse_citation:
 
                case PAIR_CRITIC_SUB_ADD:
                        if ((scratch->extensions & EXT_CRITIC) &&
-                               (t->prev) &&
-                               (t->prev->type == PAIR_CRITIC_SUB_DEL)) {
+                                       (t->prev) &&
+                                       (t->prev->type == PAIR_CRITIC_SUB_DEL)) {
                                t->child->type = TEXT_EMPTY;
                                t->child->mate->type = TEXT_EMPTY;
 
index f8728bbeddddfc1461dd6fe575bc9ef32ae8419a..4795fc52494004fdcd2f7d58f119bc2a0458ea2c 100644 (file)
@@ -800,7 +800,7 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
                                temp_token = t->next->child;
 
                                if (temp_token->next &&
-                                       temp_token->next->type == PAIR_BRACKET) {
+                                               temp_token->next->type == PAIR_BRACKET) {
                                        temp_token = temp_token->next;
                                }
 
@@ -1028,7 +1028,7 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 
                case ESCAPED_CHARACTER:
                        if (!(scratch->extensions & EXT_COMPATIBILITY) &&
-                               (source[t->start + 1] == ' ')) {
+                                       (source[t->start + 1] == ' ')) {
                                print_const("~");
                        } else {
                                mmd_print_char_latex(out, source[t->start + 1]);
@@ -1240,7 +1240,7 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 
                case PAIR_BRACKET:
                        if ((scratch->extensions & EXT_NOTES) &&
-                               (t->next && t->next->type == PAIR_BRACKET_CITATION)) {
+                                       (t->next && t->next->type == PAIR_BRACKET_CITATION)) {
                                goto parse_citation;
                        }
 
@@ -1256,8 +1256,8 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
                                        temp_token = t->next;
 
                                        if (temp_token &&
-                                               ((temp_token->type == PAIR_BRACKET) ||
-                                                (temp_token->type == PAIR_PAREN))) {
+                                                       ((temp_token->type == PAIR_BRACKET) ||
+                                                        (temp_token->type == PAIR_PAREN))) {
                                                temp_token = temp_token->next;
                                        }
 
@@ -1636,7 +1636,7 @@ parse_citation:
 
                        // Ignore if we're rejecting or accepting
                        if ((scratch->extensions & EXT_CRITIC_REJECT) ||
-                               (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+                                       (scratch->extensions & EXT_CRITIC_ACCEPT)) {
                                break;
                        }
 
@@ -1656,7 +1656,7 @@ parse_citation:
 
                        // Ignore if we're rejecting or accepting
                        if ((scratch->extensions & EXT_CRITIC_REJECT) ||
-                               (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+                                       (scratch->extensions & EXT_CRITIC_ACCEPT)) {
                                t->child->type = TEXT_EMPTY;
                                t->child->mate->type = TEXT_EMPTY;
                                mmd_export_token_tree_latex(out, source, t->child, scratch);
@@ -1686,8 +1686,8 @@ parse_citation:
 
                case PAIR_CRITIC_SUB_DEL:
                        if ((scratch->extensions & EXT_CRITIC) &&
-                               (t->next) &&
-                               (t->next->type == PAIR_CRITIC_SUB_ADD)) {
+                                       (t->next) &&
+                                       (t->next->type == PAIR_CRITIC_SUB_ADD)) {
                                t->child->type = TEXT_EMPTY;
                                t->child->mate->type = TEXT_EMPTY;
 
@@ -1708,8 +1708,8 @@ parse_citation:
 
                case PAIR_CRITIC_SUB_ADD:
                        if ((scratch->extensions & EXT_CRITIC) &&
-                               (t->prev) &&
-                               (t->prev->type == PAIR_CRITIC_SUB_DEL)) {
+                                       (t->prev) &&
+                                       (t->prev->type == PAIR_CRITIC_SUB_DEL)) {
                                t->child->type = TEXT_EMPTY;
                                t->child->mate->type = TEXT_EMPTY;
 
index 4c6513921526d92a7f22d01008a4e5d19911db6f..6a44cb9497da1e6cd7ed33928a116fac3f1f86b2 100644 (file)
@@ -69,7 +69,7 @@ typedef struct Scanner Scanner;
 
 /// Scan for the next token
 int scan(
-    Scanner * s,                       //!< Pointer to Scanner state structure
-    const char * stop          //!< Pointer to position in string at which to stop parsing
+       Scanner * s,                    //!< Pointer to Scanner state structure
+       const char * stop               //!< Pointer to position in string at which to stop parsing
 );
 
index c1e8259d32bc6ad2c6d7fadd6a2385c7f524a5e5..ce5c6b7dab0e950afb3f95420d06928da84e58af 100644 (file)
@@ -512,13 +512,13 @@ void mmd_assign_line_type(mmd_engine * e, token * line) {
                                // Strip trailing '#' sequence if present
                                if (line->child->tail->type == TEXT_NL) {
                                        if ((line->child->tail->prev->type >= HASH1) &&
-                                               (line->child->tail->prev->type <= HASH6)) {
+                                                       (line->child->tail->prev->type <= HASH6)) {
                                                line->child->tail->prev->type -= HASH1;
                                                line->child->tail->prev->type += MARKER_H1;
                                        }
                                } else {
                                        if ((line->child->tail->type >= HASH1) &&
-                                               (line->child->tail->type <= HASH6)) {
+                                                       (line->child->tail->type <= HASH6)) {
                                                line->child->tail->type -= TEXT_EMPTY;
                                                line->child->tail->type += MARKER_H1;
                                        }
@@ -572,8 +572,8 @@ void mmd_assign_line_type(mmd_engine * e, token * line) {
                                                                t = first_child;
 
                                                                while (t->next && ((t->next->type == INDENT_SPACE) ||
-                                                                                  (t->next->type == INDENT_TAB) ||
-                                                                                  (t->next->type == NON_INDENT_SPACE))) {
+                                                                                                  (t->next->type == INDENT_TAB) ||
+                                                                                                  (t->next->type == NON_INDENT_SPACE))) {
                                                                        tokens_prune(t->next, t->next);
                                                                }
 
@@ -722,8 +722,8 @@ void mmd_assign_line_type(mmd_engine * e, token * line) {
                                                                t = first_child;
 
                                                                while (t->next && ((t->next->type == INDENT_SPACE) ||
-                                                                                  (t->next->type == INDENT_TAB) ||
-                                                                                  (t->next->type == NON_INDENT_SPACE))) {
+                                                                                                  (t->next->type == INDENT_TAB) ||
+                                                                                                  (t->next->type == NON_INDENT_SPACE))) {
                                                                        tokens_prune(t->next, t->next);
                                                                }
 
@@ -832,7 +832,7 @@ void mmd_assign_line_type(mmd_engine * e, token * line) {
        }
 
        if ((line->type == LINE_PLAIN) &&
-               !(e->extensions & EXT_COMPATIBILITY)) {
+                       !(e->extensions & EXT_COMPATIBILITY)) {
                // Check if this is a potential table line
                token * walker = first_child;
 
@@ -1253,7 +1253,7 @@ void mmd_assign_ambidextrous_tokens_in_block(mmd_engine * e, token * block, size
 
                                // Do we treat this like metadata?
                                if (!(e->extensions & EXT_COMPATIBILITY) &&
-                                       !(e->extensions & EXT_NO_METADATA)) {
+                                               !(e->extensions & EXT_NO_METADATA)) {
                                        break;
                                }
 
@@ -1478,14 +1478,14 @@ void mmd_assign_ambidextrous_tokens_in_block(mmd_engine * e, token * block, size
                                offset = t->start;
 
                                if (!((offset == 0) ||
-                                       (char_is_whitespace_or_line_ending_or_punctuation(str[offset - 1])) ||
-                                       (char_is_whitespace_or_line_ending_or_punctuation(str[offset + 1])))) {
+                                               (char_is_whitespace_or_line_ending_or_punctuation(str[offset - 1])) ||
+                                               (char_is_whitespace_or_line_ending_or_punctuation(str[offset + 1])))) {
                                        t->type = APOSTROPHE;
                                        break;
                                }
 
                                if (offset && (char_is_punctuation(str[offset - 1])) &&
-                                       (char_is_alphanumeric(str[offset + 1]))) {
+                                               (char_is_alphanumeric(str[offset + 1]))) {
                                        // If possessive apostrophe, e.g. `x`'s
                                        if (str[offset + 1] == 's' || str[offset + 1] == 'S') {
                                                if (char_is_whitespace_or_line_ending_or_punctuation(str[offset + 2])) {
@@ -1520,7 +1520,7 @@ void mmd_assign_ambidextrous_tokens_in_block(mmd_engine * e, token * block, size
                                if (t->len == 1) {
                                        // Check whether we have '1-2'
                                        if ((offset == 0) || (!char_is_digit(str[offset - 1])) ||
-                                               (!char_is_digit(str[offset + 1]))) {
+                                                       (!char_is_digit(str[offset + 1]))) {
                                                t->type = TEXT_PLAIN;
                                        }
                                }
@@ -1661,11 +1661,11 @@ void pair_emphasis_tokens(token * t) {
                                        closer = t->mate;
 
                                        if (t->next &&
-                                               (t->next->mate == closer->prev) &&
-                                               (t->type == t->next->type) &&
-                                               (t->next->mate != t) &&
-                                               (t->start + t->len == t->next->start) &&
-                                               (closer->start == closer->prev->start + closer->prev->len)) {
+                                                       (t->next->mate == closer->prev) &&
+                                                       (t->type == t->next->type) &&
+                                                       (t->next->mate != t) &&
+                                                       (t->start + t->len == t->next->start) &&
+                                                       (closer->start == closer->prev->start + closer->prev->len)) {
 
                                                // We have a strong pair
                                                t->type = STRONG_START;
@@ -1788,8 +1788,8 @@ void is_list_loose(token * list) {
 /// Is this actually an HTML block?
 void is_para_html(mmd_engine * e, token * block) {
        if ((block == NULL) ||
-               (block->child == NULL) ||
-               (block->child->type != LINE_PLAIN)) {
+                       (block->child == NULL) ||
+                       (block->child->type != LINE_PLAIN)) {
                return;
        }
 
@@ -2043,7 +2043,7 @@ void strip_line_tokens_from_block(mmd_engine * e, token * block) {
                        case LINE_SETEXT_1:
                        case LINE_SETEXT_2:
                                if ((block->type == BLOCK_SETEXT_1) ||
-                                       (block->type == BLOCK_SETEXT_2)) {
+                                               (block->type == BLOCK_SETEXT_2)) {
                                        temp = l->next;
                                        tokens_prune(l, l);
                                        l = temp;
@@ -2088,7 +2088,7 @@ handle_line:
 
                                // If we're not a code block, strip additional indents
                                if ((block->type != BLOCK_CODE_INDENTED) &&
-                                       (block->type != BLOCK_CODE_FENCED)) {
+                                               (block->type != BLOCK_CODE_FENCED)) {
                                        while (l->child && ((l->child->type == INDENT_SPACE) || (l->child->type == INDENT_TAB))) {
                                                token_remove_first_child(l);
                                        }
index 3dcaca7f65fa6fbb081ad58ae21e9836f0d3ff3d..ba0c133eea92d1d1a9445022d1ba924154f8d7fd 100644 (file)
@@ -76,25 +76,25 @@ typedef struct pool pool;
 
 /// Allocate a new object pool
 pool * pool_new(
-    short size                                                 //!< How big are the objects to be allocated
+       short size                                              //!< How big are the objects to be allocated
 );
 
 
 /// Free object pool
 void pool_free(
-    pool * p                                           //!< Pool to be freed
+       pool * p                                                //!< Pool to be freed
 );
 
 
 /// Drain pool -- free slabs previously allocated
 void pool_drain(
-    pool * p                                           //!< Pool to be drained
+       pool * p                                                //!< Pool to be drained
 );
 
 
 /// Request memory for a new object from the pool
 void * pool_allocate_object(
-    pool * p                                           //!< Pool to be used for allocation
+       pool * p                                                //!< Pool to be used for allocation
 );
 
 
index 964e26ebdeaf0fea1bc5e7e78f8d12062705c185..27ecbf019266250f4c65076d1f8c6963c02ceaba 100644 (file)
@@ -976,7 +976,7 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
                                temp_token = t->next->child;
 
                                if (temp_token->next &&
-                                       temp_token->next->type == PAIR_BRACKET) {
+                                               temp_token->next->type == PAIR_BRACKET) {
                                        temp_token = temp_token->next;
                                }
 
@@ -1148,7 +1148,7 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
 
                case ESCAPED_CHARACTER:
                        if (!(scratch->extensions & EXT_COMPATIBILITY) &&
-                               (source[t->start + 1] == ' ')) {
+                                       (source[t->start + 1] == ' ')) {
                                print_const(" ");              // This is a non-breaking space character
                        } else {
                                mmd_print_char_opendocument(out, source[t->start + 1]);
@@ -1370,7 +1370,7 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
 
                case PAIR_BRACKET:
                        if ((scratch->extensions & EXT_NOTES) &&
-                               (t->next && t->next->type == PAIR_BRACKET_CITATION)) {
+                                       (t->next && t->next->type == PAIR_BRACKET_CITATION)) {
                                goto parse_citation;
                        }
 
@@ -1386,8 +1386,8 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
                                        temp_token = t->next;
 
                                        if (temp_token &&
-                                               ((temp_token->type == PAIR_BRACKET) ||
-                                                (temp_token->type == PAIR_PAREN))) {
+                                                       ((temp_token->type == PAIR_BRACKET) ||
+                                                        (temp_token->type == PAIR_PAREN))) {
                                                temp_token = temp_token->next;
                                        }
 
@@ -1754,7 +1754,7 @@ parse_citation:
 
                        // Ignore if we're rejecting or accepting
                        if ((scratch->extensions & EXT_CRITIC_REJECT) ||
-                               (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+                                       (scratch->extensions & EXT_CRITIC_ACCEPT)) {
                                break;
                        }
 
@@ -1774,7 +1774,7 @@ parse_citation:
 
                        // Ignore if we're rejecting or accepting
                        if ((scratch->extensions & EXT_CRITIC_REJECT) ||
-                               (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+                                       (scratch->extensions & EXT_CRITIC_ACCEPT)) {
                                t->child->type = TEXT_EMPTY;
                                t->child->mate->type = TEXT_EMPTY;
                                mmd_export_token_tree_opendocument(out, source, t->child, scratch);
@@ -1803,8 +1803,8 @@ parse_citation:
 
                case PAIR_CRITIC_SUB_DEL:
                        if ((scratch->extensions & EXT_CRITIC) &&
-                               (t->next) &&
-                               (t->next->type == PAIR_CRITIC_SUB_ADD)) {
+                                       (t->next) &&
+                                       (t->next->type == PAIR_CRITIC_SUB_ADD)) {
                                t->child->type = TEXT_EMPTY;
                                t->child->mate->type = TEXT_EMPTY;
 
@@ -1825,8 +1825,8 @@ parse_citation:
 
                case PAIR_CRITIC_SUB_ADD:
                        if ((scratch->extensions & EXT_CRITIC) &&
-                               (t->prev) &&
-                               (t->prev->type == PAIR_CRITIC_SUB_DEL)) {
+                                       (t->prev) &&
+                                       (t->prev->type == PAIR_CRITIC_SUB_DEL)) {
                                t->child->type = TEXT_EMPTY;
                                t->child->mate->type = TEXT_EMPTY;
 
index 5ea74af8b20d735665c36ce5c73a06797f57e20b..0aca6ffb93340a4d19d446a390884bb3ee8e5ffa 100644 (file)
@@ -249,253 +249,253 @@ char * opendocument_style(int format) {
 
        /* Font Declarations */
        print_const("<office:font-face-decls>\n" \
-                   "   <style:font-face style:name=\"Courier New\" svg:font-family=\"'Courier New'\"\n" \
-                   "                    style:font-adornments=\"Regular\"\n" \
-                   "                    style:font-family-generic=\"modern\"\n" \
-                   "                    style:font-pitch=\"fixed\"/>\n" \
-                   "</office:font-face-decls>\n");
+                               "   <style:font-face style:name=\"Courier New\" svg:font-family=\"'Courier New'\"\n" \
+                               "                    style:font-adornments=\"Regular\"\n" \
+                               "                    style:font-family-generic=\"modern\"\n" \
+                               "                    style:font-pitch=\"fixed\"/>\n" \
+                               "</office:font-face-decls>\n");
 
        /* Append basic style information */
        print_const("<office:styles>\n" \
-                   "<style:style style:name=\"Standard\" style:family=\"paragraph\" style:class=\"text\">\n" \
-                   "      <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0.15in\"" \
-                   "     fo:text-align=\"justify\" style:justify-single-word=\"false\"/>\n" \
-                   "   </style:style>\n" \
-                   "<style:style style:name=\"Preformatted_20_Text\" style:display-name=\"Preformatted Text\"\n" \
-                   "             style:family=\"paragraph\"\n" \
-                   "             style:parent-style-name=\"Standard\"\n" \
-                   "             style:class=\"html\">\n" \
-                   "   <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0in\" fo:text-align=\"start\"\n" \
-                   "                               style:justify-single-word=\"false\"/>\n" \
-                   "   <style:text-properties style:font-name=\"Courier New\" fo:font-size=\"11pt\"\n" \
-                   "                          style:font-name-asian=\"Courier New\"\n" \
-                   "                          style:font-size-asian=\"11pt\"\n" \
-                   "                          style:font-name-complex=\"Courier New\"\n" \
-                   "                          style:font-size-complex=\"11pt\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"Source_20_Text\" style:display-name=\"Source Text\"\n" \
-                   "             style:family=\"text\">\n" \
-                   "   <style:text-properties style:font-name=\"Courier New\" style:font-name-asian=\"Courier New\"\n" \
-                   "                          style:font-name-complex=\"Courier New\"\n" \
-                   "                          fo:font-size=\"11pt\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"List\" style:family=\"paragraph\"\n" \
-                   "             style:parent-style-name=\"Standard\"\n" \
-                   "             style:class=\"list\">\n" \
-                   "   <style:paragraph-properties fo:text-align=\"start\" style:justify-single-word=\"false\"/>\n" \
-                   "   <style:text-properties style:font-size-asian=\"12pt\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"Quotations\" style:family=\"paragraph\"\n" \
-                   "             style:parent-style-name=\"Standard\"\n" \
-                   "             style:class=\"html\">\n" \
-                   "   <style:paragraph-properties fo:margin-left=\"0.3937in\" fo:margin-right=\"0.3937in\" fo:margin-top=\"0in\"\n" \
-                   "                               fo:margin-bottom=\"0.1965in\"\n" \
-                   "                               fo:text-align=\"justify\"" \
-                   "                               style:justify-single-word=\"false\"" \
-                   "                               fo:text-indent=\"0in\"\n" \
-                   "                               style:auto-text-indent=\"false\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"Table_20_Heading\" style:display-name=\"Table Heading\"\n" \
-                   "             style:family=\"paragraph\"\n" \
-                   "             style:parent-style-name=\"Table_20_Contents\"\n" \
-                   "             style:class=\"extra\">\n" \
-                   "   <style:paragraph-properties fo:text-align=\"center\" style:justify-single-word=\"false\"\n" \
-                   "                               text:number-lines=\"false\"\n" \
-                   "                               text:line-number=\"0\"/>\n" \
-                   "   <style:text-properties fo:font-weight=\"bold\" style:font-weight-asian=\"bold\"\n" \
-                   "                          style:font-weight-complex=\"bold\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"Horizontal_20_Line\" style:display-name=\"Horizontal Line\"\n" \
-                   "             style:family=\"paragraph\"\n" \
-                   "             style:parent-style-name=\"Standard\"\n" \
-                   "             style:class=\"html\">\n" \
-                   "   <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0.1965in\"\n" \
-                   "                               style:border-line-width-bottom=\"0.0008in 0.0138in 0.0008in\"\n" \
-                   "                               fo:padding=\"0in\"\n" \
-                   "                               fo:border-left=\"none\"\n" \
-                   "                               fo:border-right=\"none\"\n" \
-                   "                               fo:border-top=\"none\"\n" \
-                   "                               fo:border-bottom=\"0.0154in double #808080\"\n" \
-                   "                               text:number-lines=\"false\"\n" \
-                   "                               text:line-number=\"0\"\n" \
-                   "                               style:join-border=\"false\"/>\n" \
-                   "   <style:text-properties fo:font-size=\"6pt\" style:font-size-asian=\"6pt\" style:font-size-complex=\"6pt\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"Footnote_20_anchor\" style:display-name=\"Footnote anchor\"" \
-                   "              style:family=\"text\">" \
-                   "    <style:text-properties style:text-position=\"super 58%\"/>" \
-                   " </style:style>\n" \
-                   "<style:style style:name=\"TOC_Item\" style:family=\"paragraph\" style:parent-style-name=\"Standard\">\n" \
-                   " <style:paragraph-properties>\n" \
-                   "  <style:tab-stops>\n" \
-                   "   <style:tab-stop style:position=\"6.7283in\" style:type=\"right\" style:leader-style=\"dotted\" style:leader-text=\".\"/>\n" \
-                   "  </style:tab-stops>\n" \
-                   " </style:paragraph-properties>\n" \
-                   "</style:style>\n" \
-                   "  <text:notes-configuration text:note-class=\"footnote\" text:default-style-name=\"Footnote\" text:citation-style-name=\"Footnote_20_Symbol\" text:citation-body-style-name=\"Footnote_20_anchor\" text:master-page-name=\"Footnote\" style:num-format=\"a\" text:start-value=\"0\" text:footnotes-position=\"page\" text:start-numbering-at=\"page\"/>\n" \
-                   "  <text:notes-configuration text:note-class=\"endnote\" text:default-style-name=\"Endnote\" text:citation-style-name=\"Endnote_20_Symbol\" text:citation-body-style-name=\"Endnote_20_anchor\" text:master-page-name=\"Endnote\" style:num-format=\"1\" text:start-value=\"0\"/>\n" \
-                   "</office:styles>\n");
+                               "<style:style style:name=\"Standard\" style:family=\"paragraph\" style:class=\"text\">\n" \
+                               "      <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0.15in\"" \
+                               "     fo:text-align=\"justify\" style:justify-single-word=\"false\"/>\n" \
+                               "   </style:style>\n" \
+                               "<style:style style:name=\"Preformatted_20_Text\" style:display-name=\"Preformatted Text\"\n" \
+                               "             style:family=\"paragraph\"\n" \
+                               "             style:parent-style-name=\"Standard\"\n" \
+                               "             style:class=\"html\">\n" \
+                               "   <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0in\" fo:text-align=\"start\"\n" \
+                               "                               style:justify-single-word=\"false\"/>\n" \
+                               "   <style:text-properties style:font-name=\"Courier New\" fo:font-size=\"11pt\"\n" \
+                               "                          style:font-name-asian=\"Courier New\"\n" \
+                               "                          style:font-size-asian=\"11pt\"\n" \
+                               "                          style:font-name-complex=\"Courier New\"\n" \
+                               "                          style:font-size-complex=\"11pt\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"Source_20_Text\" style:display-name=\"Source Text\"\n" \
+                               "             style:family=\"text\">\n" \
+                               "   <style:text-properties style:font-name=\"Courier New\" style:font-name-asian=\"Courier New\"\n" \
+                               "                          style:font-name-complex=\"Courier New\"\n" \
+                               "                          fo:font-size=\"11pt\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"List\" style:family=\"paragraph\"\n" \
+                               "             style:parent-style-name=\"Standard\"\n" \
+                               "             style:class=\"list\">\n" \
+                               "   <style:paragraph-properties fo:text-align=\"start\" style:justify-single-word=\"false\"/>\n" \
+                               "   <style:text-properties style:font-size-asian=\"12pt\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"Quotations\" style:family=\"paragraph\"\n" \
+                               "             style:parent-style-name=\"Standard\"\n" \
+                               "             style:class=\"html\">\n" \
+                               "   <style:paragraph-properties fo:margin-left=\"0.3937in\" fo:margin-right=\"0.3937in\" fo:margin-top=\"0in\"\n" \
+                               "                               fo:margin-bottom=\"0.1965in\"\n" \
+                               "                               fo:text-align=\"justify\"" \
+                               "                               style:justify-single-word=\"false\"" \
+                               "                               fo:text-indent=\"0in\"\n" \
+                               "                               style:auto-text-indent=\"false\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"Table_20_Heading\" style:display-name=\"Table Heading\"\n" \
+                               "             style:family=\"paragraph\"\n" \
+                               "             style:parent-style-name=\"Table_20_Contents\"\n" \
+                               "             style:class=\"extra\">\n" \
+                               "   <style:paragraph-properties fo:text-align=\"center\" style:justify-single-word=\"false\"\n" \
+                               "                               text:number-lines=\"false\"\n" \
+                               "                               text:line-number=\"0\"/>\n" \
+                               "   <style:text-properties fo:font-weight=\"bold\" style:font-weight-asian=\"bold\"\n" \
+                               "                          style:font-weight-complex=\"bold\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"Horizontal_20_Line\" style:display-name=\"Horizontal Line\"\n" \
+                               "             style:family=\"paragraph\"\n" \
+                               "             style:parent-style-name=\"Standard\"\n" \
+                               "             style:class=\"html\">\n" \
+                               "   <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0.1965in\"\n" \
+                               "                               style:border-line-width-bottom=\"0.0008in 0.0138in 0.0008in\"\n" \
+                               "                               fo:padding=\"0in\"\n" \
+                               "                               fo:border-left=\"none\"\n" \
+                               "                               fo:border-right=\"none\"\n" \
+                               "                               fo:border-top=\"none\"\n" \
+                               "                               fo:border-bottom=\"0.0154in double #808080\"\n" \
+                               "                               text:number-lines=\"false\"\n" \
+                               "                               text:line-number=\"0\"\n" \
+                               "                               style:join-border=\"false\"/>\n" \
+                               "   <style:text-properties fo:font-size=\"6pt\" style:font-size-asian=\"6pt\" style:font-size-complex=\"6pt\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"Footnote_20_anchor\" style:display-name=\"Footnote anchor\"" \
+                               "              style:family=\"text\">" \
+                               "    <style:text-properties style:text-position=\"super 58%\"/>" \
+                               " </style:style>\n" \
+                               "<style:style style:name=\"TOC_Item\" style:family=\"paragraph\" style:parent-style-name=\"Standard\">\n" \
+                               " <style:paragraph-properties>\n" \
+                               "  <style:tab-stops>\n" \
+                               "   <style:tab-stop style:position=\"6.7283in\" style:type=\"right\" style:leader-style=\"dotted\" style:leader-text=\".\"/>\n" \
+                               "  </style:tab-stops>\n" \
+                               " </style:paragraph-properties>\n" \
+                               "</style:style>\n" \
+                               "  <text:notes-configuration text:note-class=\"footnote\" text:default-style-name=\"Footnote\" text:citation-style-name=\"Footnote_20_Symbol\" text:citation-body-style-name=\"Footnote_20_anchor\" text:master-page-name=\"Footnote\" style:num-format=\"a\" text:start-value=\"0\" text:footnotes-position=\"page\" text:start-numbering-at=\"page\"/>\n" \
+                               "  <text:notes-configuration text:note-class=\"endnote\" text:default-style-name=\"Endnote\" text:citation-style-name=\"Endnote_20_Symbol\" text:citation-body-style-name=\"Endnote_20_anchor\" text:master-page-name=\"Endnote\" style:num-format=\"1\" text:start-value=\"0\"/>\n" \
+                               "</office:styles>\n");
 
        /* Automatic style information */
        print_const("<office:automatic-styles>" \
-                   "   <style:style style:name=\"MMD-Italic\" style:family=\"text\">\n" \
-                   "      <style:text-properties fo:font-style=\"italic\" style:font-style-asian=\"italic\"\n" \
-                   "                             style:font-style-complex=\"italic\"/>\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"MMD-Bold\" style:family=\"text\">\n" \
-                   "      <style:text-properties fo:font-weight=\"bold\" style:font-weight-asian=\"bold\"\n" \
-                   "                             style:font-weight-complex=\"bold\"/>\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"MMD-Superscript\" style:family=\"text\">\n" \
-                   "      <style:text-properties style:text-position=\"super 58%\"/>\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"MMD-Subscript\" style:family=\"text\">\n" \
-                   "      <style:text-properties style:text-position=\"sub 58%\"/>\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"Strike\" style:family=\"text\">\n" \
-                   "      <style:text-properties style:text-line-through-style=\"solid\" />\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"Underline\" style:family=\"text\">\n" \
-                   "      <style:text-properties style:text-underline-style=\"solid\" style:text-underline-color=\"font-color\"/>\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"Highlight\" style:family=\"text\">\n" \
-                   "      <style:text-properties fo:background-color=\"#FFFF00\" />\n" \
-                   "   </style:style>\n" \
-                   "   <style:style style:name=\"Comment\" style:family=\"text\">\n" \
-                   "      <style:text-properties fo:color=\"#0000BB\" />\n" \
-                   "   </style:style>\n" \
-                   "<style:style style:name=\"MMD-Table\" style:family=\"paragraph\" style:parent-style-name=\"Standard\">\n" \
-                   "   <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0.05in\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"MMD-Table-Center\" style:family=\"paragraph\" style:parent-style-name=\"MMD-Table\">\n" \
-                   "   <style:paragraph-properties fo:text-align=\"center\" style:justify-single-word=\"false\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"MMD-Table-Right\" style:family=\"paragraph\" style:parent-style-name=\"MMD-Table\">\n" \
-                   "   <style:paragraph-properties fo:text-align=\"right\" style:justify-single-word=\"false\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"P2\" style:family=\"paragraph\" style:parent-style-name=\"Standard\"\n" \
-                   "             style:list-style-name=\"L2\">\n" \
-                   "<style:paragraph-properties fo:text-align=\"start\" style:justify-single-word=\"false\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"fr1\" style:family=\"graphic\" style:parent-style-name=\"Frame\">\n" \
-                   "   <style:graphic-properties style:print-content=\"true\" style:vertical-pos=\"top\"\n" \
-                   "                             style:vertical-rel=\"baseline\"\n" \
-                   "                             fo:padding=\"0in\"\n" \
-                   "                             fo:border=\"none\"\n" \
-                   "                             style:shadow=\"none\"/>\n" \
-                   "</style:style>\n" \
-                   "<style:style style:name=\"P1\" style:family=\"paragraph\" style:parent-style-name=\"Standard\"\n" \
-                   "             style:list-style-name=\"L1\"/>\n" \
-                   "<text:list-style style:name=\"L1\">\n" \
-                   "   <text:list-level-style-bullet text:level=\"1\" text:style-name=\"Numbering_20_Symbols\" style:num-suffix=\".\" text:bullet-char=\"•\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.5in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-bullet>\n" \
-                   "   <text:list-level-style-bullet text:level=\"2\" text:style-name=\"Numbering_20_Symbols\" style:num-suffix=\".\" text:bullet-char=\"◦\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.75in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-bullet>\n" \
-                   "   <text:list-level-style-bullet text:level=\"3\" text:style-name=\"Numbering_20_Symbols\" style:num-suffix=\".\" text:bullet-char=\"▪\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-bullet>\n" \
-                   "   <text:list-level-style-number text:level=\"4\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.25in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"5\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.5in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"6\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.75in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"7\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"8\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.25in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"9\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.5in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"10\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.75in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "</text:list-style>\n" \
-                   "<text:list-style style:name=\"L2\">\n" \
-                   "   <text:list-level-style-number text:level=\"1\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.5in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"2\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.75in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"3\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"4\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.25in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"5\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.5in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"6\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.75in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"7\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"8\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.25in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"9\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.5in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "   <text:list-level-style-number text:level=\"10\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
-                   "           <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
-                   "                   <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.75in\"/>\n" \
-                   "           </style:list-level-properties>\n" \
-                   "   </text:list-level-style-number>\n" \
-                   "</text:list-style>\n" \
-                   "</office:automatic-styles>\n" \
-                   " <office:master-styles>\n" \
-                   "  <style:master-page style:name=\"Endnote\" >\n" \
-                   "    <style:header><text:h text:outline-level=\"2\">Bibliography</text:h></style:header></style:master-page>\n" \
-                   "  <style:master-page style:name=\"Footnote\" style:page-layout-name=\"pm2\"/>\n" \
-                   " </office:master-styles>\n");
+                               "   <style:style style:name=\"MMD-Italic\" style:family=\"text\">\n" \
+                               "      <style:text-properties fo:font-style=\"italic\" style:font-style-asian=\"italic\"\n" \
+                               "                             style:font-style-complex=\"italic\"/>\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"MMD-Bold\" style:family=\"text\">\n" \
+                               "      <style:text-properties fo:font-weight=\"bold\" style:font-weight-asian=\"bold\"\n" \
+                               "                             style:font-weight-complex=\"bold\"/>\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"MMD-Superscript\" style:family=\"text\">\n" \
+                               "      <style:text-properties style:text-position=\"super 58%\"/>\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"MMD-Subscript\" style:family=\"text\">\n" \
+                               "      <style:text-properties style:text-position=\"sub 58%\"/>\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"Strike\" style:family=\"text\">\n" \
+                               "      <style:text-properties style:text-line-through-style=\"solid\" />\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"Underline\" style:family=\"text\">\n" \
+                               "      <style:text-properties style:text-underline-style=\"solid\" style:text-underline-color=\"font-color\"/>\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"Highlight\" style:family=\"text\">\n" \
+                               "      <style:text-properties fo:background-color=\"#FFFF00\" />\n" \
+                               "   </style:style>\n" \
+                               "   <style:style style:name=\"Comment\" style:family=\"text\">\n" \
+                               "      <style:text-properties fo:color=\"#0000BB\" />\n" \
+                               "   </style:style>\n" \
+                               "<style:style style:name=\"MMD-Table\" style:family=\"paragraph\" style:parent-style-name=\"Standard\">\n" \
+                               "   <style:paragraph-properties fo:margin-top=\"0in\" fo:margin-bottom=\"0.05in\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"MMD-Table-Center\" style:family=\"paragraph\" style:parent-style-name=\"MMD-Table\">\n" \
+                               "   <style:paragraph-properties fo:text-align=\"center\" style:justify-single-word=\"false\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"MMD-Table-Right\" style:family=\"paragraph\" style:parent-style-name=\"MMD-Table\">\n" \
+                               "   <style:paragraph-properties fo:text-align=\"right\" style:justify-single-word=\"false\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"P2\" style:family=\"paragraph\" style:parent-style-name=\"Standard\"\n" \
+                               "             style:list-style-name=\"L2\">\n" \
+                               "<style:paragraph-properties fo:text-align=\"start\" style:justify-single-word=\"false\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"fr1\" style:family=\"graphic\" style:parent-style-name=\"Frame\">\n" \
+                               "   <style:graphic-properties style:print-content=\"true\" style:vertical-pos=\"top\"\n" \
+                               "                             style:vertical-rel=\"baseline\"\n" \
+                               "                             fo:padding=\"0in\"\n" \
+                               "                             fo:border=\"none\"\n" \
+                               "                             style:shadow=\"none\"/>\n" \
+                               "</style:style>\n" \
+                               "<style:style style:name=\"P1\" style:family=\"paragraph\" style:parent-style-name=\"Standard\"\n" \
+                               "             style:list-style-name=\"L1\"/>\n" \
+                               "<text:list-style style:name=\"L1\">\n" \
+                               "       <text:list-level-style-bullet text:level=\"1\" text:style-name=\"Numbering_20_Symbols\" style:num-suffix=\".\" text:bullet-char=\"•\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.5in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-bullet>\n" \
+                               "       <text:list-level-style-bullet text:level=\"2\" text:style-name=\"Numbering_20_Symbols\" style:num-suffix=\".\" text:bullet-char=\"◦\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.75in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-bullet>\n" \
+                               "       <text:list-level-style-bullet text:level=\"3\" text:style-name=\"Numbering_20_Symbols\" style:num-suffix=\".\" text:bullet-char=\"▪\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-bullet>\n" \
+                               "       <text:list-level-style-number text:level=\"4\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.25in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"5\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.5in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"6\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.75in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"7\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"8\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.25in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"9\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.5in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"10\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.75in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "</text:list-style>\n" \
+                               "<text:list-style style:name=\"L2\">\n" \
+                               "       <text:list-level-style-number text:level=\"1\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.5in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"2\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"0.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"0.75in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"3\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"4\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.25in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"5\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.5in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"6\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"1.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"1.75in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"7\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"8\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.25in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.25in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"9\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.5in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.5in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "       <text:list-level-style-number text:level=\"10\" text:style-name=\"Standard\" style:num-suffix=\".\" style:num-format=\"1\">\n" \
+                               "               <style:list-level-properties text:list-level-position-and-space-mode=\"label-alignment\">\n" \
+                               "                       <style:list-level-label-alignment text:label-followed-by=\"listtab\" text:list-tab-stop-position=\"2.75in\" fo:text-indent=\"-0.25in\" fo:margin-left=\"2.75in\"/>\n" \
+                               "               </style:list-level-properties>\n" \
+                               "       </text:list-level-style-number>\n" \
+                               "</text:list-style>\n" \
+                               "</office:automatic-styles>\n" \
+                               " <office:master-styles>\n" \
+                               "  <style:master-page style:name=\"Endnote\" >\n" \
+                               "    <style:header><text:h text:outline-level=\"2\">Bibliography</text:h></style:header></style:master-page>\n" \
+                               "  <style:master-page style:name=\"Footnote\" style:page-layout-name=\"pm2\"/>\n" \
+                               " </office:master-styles>\n");
 
        char * result = out->str;
        d_string_free(out, false);
@@ -513,41 +513,41 @@ char * opendocument_style_file(int format) {
        d_string_append(out, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
 
        print_const("<office:document-styles xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\"\n" \
-                   "xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\"\n" \
-                   "xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\"\n" \
-                   "xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\"\n" \
-                   "xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\"\n" \
-                   "xmlns:fo=\"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\"\n" \
-                   "xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n" \
-                   "xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n" \
-                   "xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\"\n" \
-                   "xmlns:number=\"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\"\n" \
-                   "xmlns:svg=\"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\"\n" \
-                   "xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\"\n" \
-                   "xmlns:dr3d=\"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\"\n" \
-                   "xmlns:math=\"http://www.w3.org/1998/Math/MathML\"\n" \
-                   "xmlns:form=\"urn:oasis:names:tc:opendocument:xmlns:form:1.0\"\n" \
-                   "xmlns:script=\"urn:oasis:names:tc:opendocument:xmlns:script:1.0\"\n" \
-                   "xmlns:ooo=\"http://openoffice.org/2004/office\"\n" \
-                   "xmlns:ooow=\"http://openoffice.org/2004/writer\"\n" \
-                   "xmlns:oooc=\"http://openoffice.org/2004/calc\"\n" \
-                   "xmlns:dom=\"http://www.w3.org/2001/xml-events\"\n" \
-                   "xmlns:xforms=\"http://www.w3.org/2002/xforms\"\n" \
-                   "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n" \
-                   "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" \
-                   "xmlns:rpt=\"http://openoffice.org/2005/report\"\n" \
-                   "xmlns:of=\"urn:oasis:names:tc:opendocument:xmlns:of:1.2\"\n" \
-                   "xmlns:xhtml=\"http://www.w3.org/1999/xhtml\"\n" \
-                   "xmlns:grddl=\"http://www.w3.org/2003/g/data-view#\"\n" \
-                   "xmlns:officeooo=\"http://openoffice.org/2009/office\"\n" \
-                   "xmlns:tableooo=\"http://openoffice.org/2009/table\"\n" \
-                   "xmlns:drawooo=\"http://openoffice.org/2010/draw\"\n" \
-                   "xmlns:calcext=\"urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0\"\n" \
-                   "xmlns:loext=\"urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0\"\n" \
-                   "xmlns:field=\"urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0\"\n" \
-                   "xmlns:formx=\"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0\"\n" \
-                   "xmlns:css3t=\"http://www.w3.org/TR/css3-text/\"\n" \
-                   "office:version=\"1.2\">\n");
+                               "xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\"\n" \
+                               "xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\"\n" \
+                               "xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\"\n" \
+                               "xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\"\n" \
+                               "xmlns:fo=\"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\"\n" \
+                               "xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n" \
+                               "xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n" \
+                               "xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\"\n" \
+                               "xmlns:number=\"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\"\n" \
+                               "xmlns:svg=\"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\"\n" \
+                               "xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\"\n" \
+                               "xmlns:dr3d=\"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\"\n" \
+                               "xmlns:math=\"http://www.w3.org/1998/Math/MathML\"\n" \
+                               "xmlns:form=\"urn:oasis:names:tc:opendocument:xmlns:form:1.0\"\n" \
+                               "xmlns:script=\"urn:oasis:names:tc:opendocument:xmlns:script:1.0\"\n" \
+                               "xmlns:ooo=\"http://openoffice.org/2004/office\"\n" \
+                               "xmlns:ooow=\"http://openoffice.org/2004/writer\"\n" \
+                               "xmlns:oooc=\"http://openoffice.org/2004/calc\"\n" \
+                               "xmlns:dom=\"http://www.w3.org/2001/xml-events\"\n" \
+                               "xmlns:xforms=\"http://www.w3.org/2002/xforms\"\n" \
+                               "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n" \
+                               "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" \
+                               "xmlns:rpt=\"http://openoffice.org/2005/report\"\n" \
+                               "xmlns:of=\"urn:oasis:names:tc:opendocument:xmlns:of:1.2\"\n" \
+                               "xmlns:xhtml=\"http://www.w3.org/1999/xhtml\"\n" \
+                               "xmlns:grddl=\"http://www.w3.org/2003/g/data-view#\"\n" \
+                               "xmlns:officeooo=\"http://openoffice.org/2009/office\"\n" \
+                               "xmlns:tableooo=\"http://openoffice.org/2009/table\"\n" \
+                               "xmlns:drawooo=\"http://openoffice.org/2010/draw\"\n" \
+                               "xmlns:calcext=\"urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0\"\n" \
+                               "xmlns:loext=\"urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0\"\n" \
+                               "xmlns:field=\"urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0\"\n" \
+                               "xmlns:formx=\"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0\"\n" \
+                               "xmlns:css3t=\"http://www.w3.org/TR/css3-text/\"\n" \
+                               "office:version=\"1.2\">\n");
 
        // Styles
        d_string_append(out, style);
@@ -813,41 +813,41 @@ mz_zip_archive * opendocument_core_zip(mmd_engine * e, int format) {
 /// Add shared office:document config
 void opendocument_document_attr(DString * out) {
        print_const("xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\"\n" \
-                   "xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\"\n" \
-                   "xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\"\n" \
-                   "xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\"\n" \
-                   "xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\"\n" \
-                   "xmlns:fo=\"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\"\n" \
-                   "xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n" \
-                   "xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n" \
-                   "xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\"\n" \
-                   "xmlns:number=\"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\"\n" \
-                   "xmlns:svg=\"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\"\n" \
-                   "xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\"\n" \
-                   "xmlns:dr3d=\"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\"\n" \
-                   "xmlns:math=\"http://www.w3.org/1998/Math/MathML\"\n" \
-                   "xmlns:form=\"urn:oasis:names:tc:opendocument:xmlns:form:1.0\"\n" \
-                   "xmlns:script=\"urn:oasis:names:tc:opendocument:xmlns:script:1.0\"\n" \
-                   "xmlns:ooo=\"http://openoffice.org/2004/office\"\n" \
-                   "xmlns:ooow=\"http://openoffice.org/2004/writer\"\n" \
-                   "xmlns:oooc=\"http://openoffice.org/2004/calc\"\n" \
-                   "xmlns:dom=\"http://www.w3.org/2001/xml-events\"\n" \
-                   "xmlns:xforms=\"http://www.w3.org/2002/xforms\"\n" \
-                   "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n" \
-                   "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" \
-                   "xmlns:rpt=\"http://openoffice.org/2005/report\"\n" \
-                   "xmlns:of=\"urn:oasis:names:tc:opendocument:xmlns:of:1.2\"\n" \
-                   "xmlns:xhtml=\"http://www.w3.org/1999/xhtml\"\n" \
-                   "xmlns:grddl=\"http://www.w3.org/2003/g/data-view#\"\n" \
-                   "xmlns:officeooo=\"http://openoffice.org/2009/office\"\n" \
-                   "xmlns:tableooo=\"http://openoffice.org/2009/table\"\n" \
-                   "xmlns:drawooo=\"http://openoffice.org/2010/draw\"\n" \
-                   "xmlns:calcext=\"urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0\"\n" \
-                   "xmlns:loext=\"urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0\"\n" \
-                   "xmlns:field=\"urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0\"\n" \
-                   "xmlns:formx=\"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0\"\n" \
-                   "xmlns:css3t=\"http://www.w3.org/TR/css3-text/\"\n" \
-                   "office:version=\"1.2\"");
+                               "xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\"\n" \
+                               "xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\"\n" \
+                               "xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\"\n" \
+                               "xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\"\n" \
+                               "xmlns:fo=\"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\"\n" \
+                               "xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n" \
+                               "xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n" \
+                               "xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\"\n" \
+                               "xmlns:number=\"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\"\n" \
+                               "xmlns:svg=\"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\"\n" \
+                               "xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\"\n" \
+                               "xmlns:dr3d=\"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\"\n" \
+                               "xmlns:math=\"http://www.w3.org/1998/Math/MathML\"\n" \
+                               "xmlns:form=\"urn:oasis:names:tc:opendocument:xmlns:form:1.0\"\n" \
+                               "xmlns:script=\"urn:oasis:names:tc:opendocument:xmlns:script:1.0\"\n" \
+                               "xmlns:ooo=\"http://openoffice.org/2004/office\"\n" \
+                               "xmlns:ooow=\"http://openoffice.org/2004/writer\"\n" \
+                               "xmlns:oooc=\"http://openoffice.org/2004/calc\"\n" \
+                               "xmlns:dom=\"http://www.w3.org/2001/xml-events\"\n" \
+                               "xmlns:xforms=\"http://www.w3.org/2002/xforms\"\n" \
+                               "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n" \
+                               "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" \
+                               "xmlns:rpt=\"http://openoffice.org/2005/report\"\n" \
+                               "xmlns:of=\"urn:oasis:names:tc:opendocument:xmlns:of:1.2\"\n" \
+                               "xmlns:xhtml=\"http://www.w3.org/1999/xhtml\"\n" \
+                               "xmlns:grddl=\"http://www.w3.org/2003/g/data-view#\"\n" \
+                               "xmlns:officeooo=\"http://openoffice.org/2009/office\"\n" \
+                               "xmlns:tableooo=\"http://openoffice.org/2009/table\"\n" \
+                               "xmlns:drawooo=\"http://openoffice.org/2010/draw\"\n" \
+                               "xmlns:calcext=\"urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0\"\n" \
+                               "xmlns:loext=\"urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0\"\n" \
+                               "xmlns:field=\"urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0\"\n" \
+                               "xmlns:formx=\"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0\"\n" \
+                               "xmlns:css3t=\"http://www.w3.org/TR/css3-text/\"\n" \
+                               "office:version=\"1.2\"");
 }
 
 
index b725966ed591b6b714c8ac150a944d5f0e228408..c60910004dcbaaeec9d4256dc61cc7c452cd3a4c 100644 (file)
@@ -92,7 +92,7 @@ long *ran_arr_ptr = &ran_arr_dummy; /* the next random number, or -1 */
 
                for (j = KK + KK - 2; j >= KK; j--)
                        x[j - (KK - LL)] = mod_diff(x[j - (KK - LL)], x[j]),
-                                          x[j - KK] = mod_diff(x[j - KK], x[j]);
+                                                          x[j - KK] = mod_diff(x[j - KK], x[j]);
 
                if (is_odd(ss)) {              /* "multiply by z" */
                        for (j = KK; j > 0; j--) {
index e63b0271ed685508d4c85e56eb848b65fa988109..497713f7fa3e4e5a4c692ffe2fcec7f564309b59 100644 (file)
@@ -71,39 +71,39 @@ typedef struct stack stack;
 /// Create a new stack with dynamic storage with an
 /// initial capacity (0 to use default capacity)
 stack * stack_new(
-    int startingSize                           //!< Default capacity for stack
+       int startingSize                                //!< Default capacity for stack
 );
 
 
 /// Free the stack
 void stack_free(
-    stack * s                                          //!< Stack to be freed
+       stack * s                                               //!< Stack to be freed
 );
 
 
 /// Add a new pointer to the stack
 void stack_push(
-    stack * s,                                         //!< Stack to use
-    void * element                                     //!< Pointer to push onto stack
+       stack * s,                                              //!< Stack to use
+       void * element                                  //!< Pointer to push onto stack
 );
 
 
 /// Pop the top pointer off the stack and return it
 void * stack_pop(
-    stack * s                                          //!< Stack to examine
+       stack * s                                               //!< Stack to examine
 );
 
 
 /// Peek at the top pointer on the stack (but don't remove it from stack)
 void * stack_peek(
-    stack * s                                          //!< Stack to examine
+       stack * s                                               //!< Stack to examine
 );
 
 
 /// Peek at a specific index in the stack
 void * stack_peek_index(
-    stack * s,                                         //!< Stack to examine
-    size_t index                                       //!< Index to peek at (0 is first pointer on stack)
+       stack * s,                                              //!< Stack to examine
+       size_t index                                    //!< Index to peek at (0 is first pointer on stack)
 );
 
 
index f023a049353da19dd2cdaa657244de0831e4e22c..b71dc1ee4c11d51d574c7edd4a0395a75b157cc4 100644 (file)
@@ -190,7 +190,7 @@ token * token_new_parent(token * child, unsigned short type) {
 /// may or may not also be the start of a chain
 void token_chain_append(token * chain_start, token * t) {
        if ((chain_start == NULL) ||
-               (t == NULL)) {
+                       (t == NULL)) {
                return;
        }
 
@@ -465,15 +465,15 @@ void token_tree_describe(token * t, const char * string) {
 /// Find the child node of a given parent that contains the specified
 /// offset position.
 token * token_child_for_offset(
-    token * parent,                                            //!< Pointer to parent token
-    size_t offset                                              //!< Search position
+       token * parent,                                         //!< Pointer to parent token
+       size_t offset                                           //!< Search position
 ) {
        if (parent == NULL) {
                return NULL;
        }
 
        if ((parent->start > offset) ||
-               (parent->start + parent->len < offset)) {
+                       (parent->start + parent->len < offset)) {
                return NULL;
        }
 
@@ -505,16 +505,16 @@ static bool ranges_intersect(size_t start1, size_t len1, size_t start2, size_t l
 /// Find first child node of a given parent that intersects the specified
 /// offset range.
 token * token_first_child_in_range(
-    token * parent,                                            //!< Pointer to parent token
-    size_t start,                                              //!< Start search position
-    size_t len                                                 //!< Search length
+       token * parent,                                         //!< Pointer to parent token
+       size_t start,                                           //!< Start search position
+       size_t len                                                      //!< Search length
 ) {
        if (parent == NULL) {
                return NULL;
        }
 
        if ((parent->start > start + len) ||
-               (parent->start + parent->len < start)) {
+                       (parent->start + parent->len < start)) {
                return NULL;
        }
 
@@ -539,16 +539,16 @@ token * token_first_child_in_range(
 /// Find last child node of a given parent that intersects the specified
 /// offset range.
 token * token_last_child_in_range(
-    token * parent,                                            //!< Pointer to parent token
-    size_t start,                                              //!< Start search position
-    size_t len                                                 //!< Search length
+       token * parent,                                         //!< Pointer to parent token
+       size_t start,                                           //!< Start search position
+       size_t len                                                      //!< Search length
 ) {
        if (parent == NULL) {
                return NULL;
        }
 
        if ((parent->start > start + len) ||
-               (parent->start + parent->len < start)) {
+                       (parent->start + parent->len < start)) {
                return NULL;
        }
 
index 712f7de356ee0ca191e3814ffd61d00bcd6f03fc..9100e938c9f81677785f6de03cc1090dc47f6618 100644 (file)
@@ -97,7 +97,7 @@ void token_pair_engine_free(token_pair_engine * e) {
 
 /// Add a new pairing configuration to a token pair engine
 void token_pair_engine_add_pairing(token_pair_engine * e, unsigned short open_type, unsigned short close_type,
-                                   unsigned short pair_type, int options) {
+                                                                  unsigned short pair_type, int options) {
        // \todo: This needs to be more sophisticated
        e->can_open_pair[open_type] = 1;
        e->can_close_pair[close_type] = 1;
@@ -189,7 +189,7 @@ close:
                                        if (!e->empty_allowed[pair_type]) {
                                                // Make sure they aren't consecutive tokens
                                                if ((peek->next == walker) &&
-                                                       (peek->start + peek->len == walker->start)) {
+                                                               (peek->start + peek->len == walker->start)) {
                                                        // i--;
                                                        i = start_counter;      // In this situation, we can't use this token as a closer
                                                        continue;
index 6e4001e1007b5ebc9f5711cb0dc45aafe1e84aa8..548d5c559774bf4a3dd1be71397b591ba7fb5990 100644 (file)
@@ -99,24 +99,24 @@ token_pair_engine * token_pair_engine_new(void);
 
 /// Free existing token pair engine
 void token_pair_engine_free(
-    token_pair_engine * e                                      //!< Token pair engine to be freed
+       token_pair_engine * e                                   //!< Token pair engine to be freed
 );
 
 /// Add a new pairing configuration to a token pair engine
 void token_pair_engine_add_pairing(
-    token_pair_engine * e,                                     //!< Token pair engine to add to
-    unsigned short open_type,                          //!< Token type for opener
-    unsigned short close_type,                         //!< Token type for closer
-    unsigned short pair_type,                          //!< Token type for pairing
-    int options                                                                //!< Token pair options to use
+       token_pair_engine * e,                                  //!< Token pair engine to add to
+       unsigned short open_type,                               //!< Token type for opener
+       unsigned short close_type,                              //!< Token type for closer
+       unsigned short pair_type,                               //!< Token type for pairing
+       int options                                                             //!< Token pair options to use
 );
 
 /// Search a token's childen for matching pairs
 void token_pairs_match_pairs_inside_token(
-    token * parent,                                                    //!< Which tokens should we search for pairs
-    token_pair_engine * e,                                     //!< Token pair engine to be used for matching
-    stack * s,                                                         //!< Pointer to a stack to use for pairing tokens
-    unsigned short depth                                       //!< Keep track of recursion depth
+       token * parent,                                                 //!< Which tokens should we search for pairs
+       token_pair_engine * e,                                  //!< Token pair engine to be used for matching
+       stack * s,                                                              //!< Pointer to a stack to use for pairing tokens
+       unsigned short depth                                    //!< Keep track of recursion depth
 );
 
 
index eed3cbe1cea7b26639dfdaf734a96238f76c7845..2c91c9f219160a1f80fcb74fb1176665e8bc1e38 100644 (file)
@@ -102,8 +102,8 @@ char * uuid_string_from_bits(unsigned char * raw) {
        char * result = malloc(37);
 
        sprintf(result, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-               raw[0], raw[1], raw[2], raw[3], raw[4], raw[5], raw[6], raw[7],
-               raw[8], raw[9], raw[10], raw[11], raw[12], raw[13], raw[14], raw[15] );
+                       raw[0], raw[1], raw[2], raw[3], raw[4], raw[5], raw[6], raw[7],
+                       raw[8], raw[9], raw[10], raw[11], raw[12], raw[13], raw[14], raw[15] );
 
        return result;
 }
index d1087f69a2d639c91ac8c57e94643751a3f74d8c..536c97f7a2605e9ecab5d38c27933b43f9a29b22 100644 (file)
@@ -418,8 +418,8 @@ char * label_from_string(const char * str) {
                                next_char++;
                        }
                } else if ((*str >= '0' && *str <= '9') || (*str >= 'A' && *str <= 'Z')
-                          || (*str >= 'a' && *str <= 'z') || (*str == '.') || (*str == '_')
-                          || (*str == '-') || (*str == ':')) {
+                                  || (*str >= 'a' && *str <= 'z') || (*str == '.') || (*str == '_')
+                                  || (*str == '-') || (*str == ':')) {
                        // Allow 0-9, A-Z, a-z, ., _, -, :
                        d_string_append_c(out, tolower(*str));
                }
@@ -909,7 +909,7 @@ char * destination_accept(const char * source, token ** remainder, bool validate
 
                        // Advance remainder to end of destination
                        while ((*remainder)->next &&
-                               (*remainder)->next->start < start + scan_len) {
+                                       (*remainder)->next->start < start + scan_len) {
                                *remainder = (*remainder)->next;
                        }
 
@@ -962,7 +962,7 @@ char * url_accept(const char * source, size_t start, size_t max_len, size_t * en
 
                // Is this <foo>?
                if ((source[start] == '<') &&
-                       (source[start + scan_len - 1] == '>')) {
+                               (source[start + scan_len - 1] == '>')) {
                        // Strip '<' and '>'
                        start++;
                        scan_len -= 2;
@@ -1367,8 +1367,8 @@ void process_definition_block(mmd_engine * e, token * block) {
                                        f->label_text = f->clean_text;
 
                                        if (f->content->child &&
-                                               f->content->child->next &&
-                                               f->content->child->next->next) {
+                                                       f->content->child->next &&
+                                                       f->content->child->next->next) {
                                                f->clean_text = clean_string_from_range(e->dstr->str, f->content->child->next->next->start, block->start + block->len - f->content->child->next->next->start, false);
                                        } else {
                                                f->clean_text = NULL;
@@ -1542,7 +1542,7 @@ void process_table_to_link(mmd_engine * e, token * t) {
                token * temp_token = t->next->child;
 
                if (temp_token->next &&
-                       temp_token->next->type == PAIR_BRACKET) {
+                               temp_token->next->type == PAIR_BRACKET) {
                        temp_token = temp_token->next;
                }
 
@@ -1571,7 +1571,7 @@ void process_table_stack(mmd_engine * e) {
 /// Parse metadata
 void process_metadata_stack(mmd_engine * e, scratch_pad * scratch) {
        if ((scratch->extensions & EXT_NO_METADATA) ||
-               (scratch->extensions & EXT_COMPATIBILITY)) {
+                       (scratch->extensions & EXT_COMPATIBILITY)) {
                return;
        }
 
@@ -1601,13 +1601,13 @@ void process_metadata_stack(mmd_engine * e, scratch_pad * scratch) {
                        }
                } else if (strcmp(m->key, "latexheaderlevel") == 0) {
                        if ((scratch->output_format == FORMAT_LATEX) ||
-                               (scratch->output_format == FORMAT_BEAMER) ||
-                               (scratch->output_format == FORMAT_MEMOIR)) {
+                                       (scratch->output_format == FORMAT_BEAMER) ||
+                                       (scratch->output_format == FORMAT_MEMOIR)) {
                                header_level = atoi(m->value);
                        }
                } else if (strcmp(m->key, "odfheaderlevel") == 0) {
                        if ((scratch->output_format == FORMAT_ODT) ||
-                               (scratch->output_format == FORMAT_FODT)) {
+                                       (scratch->output_format == FORMAT_FODT)) {
                                header_level = atoi(m->value);
                        }
                } else if (strcmp(m->key, "language") == 0) {
@@ -1650,18 +1650,18 @@ void process_metadata_stack(mmd_engine * e, scratch_pad * scratch) {
                        temp_char = label_from_string(m->value);
 
                        if ((strcmp(temp_char, "dutch") == 0) ||
-                               (strcmp(temp_char, "nl") == 0)) {
+                                       (strcmp(temp_char, "nl") == 0)) {
                                scratch->quotes_lang = DUTCH;
                        } else if ((strcmp(temp_char, "french") == 0) ||
-                                  (strcmp(temp_char, "fr") == 0)) {
+                                          (strcmp(temp_char, "fr") == 0)) {
                                scratch->quotes_lang = FRENCH;
                        } else if ((strcmp(temp_char, "german") == 0) ||
-                                  (strcmp(temp_char, "de") == 0)) {
+                                          (strcmp(temp_char, "de") == 0)) {
                                scratch->quotes_lang = GERMAN;
                        } else if (strcmp(temp_char, "germanguillemets") == 0) {
                                scratch->quotes_lang = GERMANGUILL;
                        } else if ((strcmp(temp_char, "swedish") == 0) ||
-                                  (strcmp(temp_char, "sv") == 0)) {
+                                          (strcmp(temp_char, "sv") == 0)) {
                                scratch->quotes_lang = SWEDISH;
                        } else {
                                scratch->quotes_lang = ENGLISH;
@@ -2468,13 +2468,13 @@ bool table_has_caption(token * t) {
                        t = t->next;
 
                        if (t && t->next &&
-                               t->next->type == PAIR_BRACKET) {
+                                       t->next->type == PAIR_BRACKET) {
                                t = t->next;
                        }
 
                        if (t && t->next &&
-                               ((t->next->type == TEXT_NL) ||
-                                (t->next->type == TEXT_LINEBREAK))) {
+                                       ((t->next->type == TEXT_NL) ||
+                                        (t->next->type == TEXT_LINEBREAK))) {
                                t = t->next;
                        }
 
index 9797ec4933f6737f0dd2dd6356bbe27884724bfb..291c670e2e6a15a85368ed7c7a8d8ed12f8429ab 100644 (file)
@@ -74,8 +74,8 @@
 
 // argtable structs
 struct arg_lit *a_help, *a_version, *a_compatibility, *a_nolabels, *a_batch,
-              *a_accept, *a_reject, *a_full, *a_snippet, *a_random, *a_meta,
-              *a_notransclude, *a_nosmart;
+                  *a_accept, *a_reject, *a_full, *a_snippet, *a_random, *a_meta,
+                  *a_notransclude, *a_nosmart;
 struct arg_str *a_format, *a_lang, *a_extract;
 struct arg_file *a_file, *a_o;
 struct arg_end *a_end;