From: Fletcher T. Penney Date: Mon, 6 Aug 2018 23:28:46 +0000 (-0500) Subject: FIXED: Trim single remaining whitespace when exporting headers X-Git-Tag: 6.4.0^2~9 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=063a161e0b65654992e9483ef6009ab8f7b50f82;p=multimarkdown FIXED: Trim single remaining whitespace when exporting headers --- diff --git a/Sources/libMultiMarkdown/beamer.c b/Sources/libMultiMarkdown/beamer.c index 7db7d2c..48fd69f 100644 --- a/Sources/libMultiMarkdown/beamer.c +++ b/Sources/libMultiMarkdown/beamer.c @@ -270,6 +270,7 @@ void mmd_export_token_beamer(DString * out, const char * source, token * t, scra } mmd_export_token_tree_beamer(out, source, t->child, scratch); + trim_trailing_whitespace_d_string(out); if (scratch->extensions & EXT_NO_LABELS) { print_const("}"); diff --git a/Sources/libMultiMarkdown/html.c b/Sources/libMultiMarkdown/html.c index bdac5a4..2220f39 100644 --- a/Sources/libMultiMarkdown/html.c +++ b/Sources/libMultiMarkdown/html.c @@ -682,6 +682,8 @@ void mmd_export_token_html(DString * out, const char * source, token * t, scratc } mmd_export_token_tree_html(out, source, t->child, scratch); + trim_trailing_whitespace_d_string(out); + printf("", temp_short + scratch->base_header_level - 1); scratch->padded = 0; break; @@ -2098,7 +2100,7 @@ void mmd_export_token_html_raw(DString * out, const char * source, token * t, sc case ESCAPED_CHARACTER: print_const("\\"); - + if (t->next && t->next->type == TEXT_EMPTY && source[t->start + 1] == ' ') { } else { mmd_print_char_html(out, source[t->start + 1], false); diff --git a/Sources/libMultiMarkdown/latex.c b/Sources/libMultiMarkdown/latex.c index eebcb20..58f51d2 100644 --- a/Sources/libMultiMarkdown/latex.c +++ b/Sources/libMultiMarkdown/latex.c @@ -687,6 +687,7 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat } mmd_export_token_tree_latex(out, source, t->child, scratch); + trim_trailing_whitespace_d_string(out); if (scratch->extensions & EXT_NO_LABELS) { print_const("}"); @@ -2176,10 +2177,12 @@ void mmd_export_token_latex_tt(DString * out, const char * source, token * t, sc case ESCAPED_CHARACTER: print_const("\\textbackslash{}"); + if (t->next && t->next->type == TEXT_EMPTY && source[t->start + 1] == ' ') { } else { mmd_print_char_latex(out, source[t->start + 1]); } + break; case HASH1: diff --git a/Sources/libMultiMarkdown/opendocument-content.c b/Sources/libMultiMarkdown/opendocument-content.c index 08ef7b5..3702e8a 100644 --- a/Sources/libMultiMarkdown/opendocument-content.c +++ b/Sources/libMultiMarkdown/opendocument-content.c @@ -312,10 +312,12 @@ void mmd_export_token_opendocument_raw(DString * out, const char * source, token case ESCAPED_CHARACTER: print_const("\\"); + if (t->next && t->next->type == TEXT_EMPTY && source[t->start + 1] == ' ') { } else { mmd_print_char_opendocument(out, source[t->start + 1]); } + break; case HTML_COMMENT_START: @@ -346,25 +348,30 @@ void mmd_export_token_opendocument_raw(DString * out, const char * source, token case MARKER_H5: case MARKER_H6: temp = (char *) &source[t->start]; + while (temp) { switch (*temp) { case '#': print_const("#"); temp++; break; + case ' ': print_const(" "); temp++; break; + case '\t': print_const(""); temp++; break; + default: temp = NULL; break; } } + break; case MARKER_LIST_BULLET: @@ -425,6 +432,7 @@ void mmd_export_token_opendocument_raw(DString * out, const char * source, token case TEXT_LINEBREAK: print_const(" "); + case TEXT_NL: print_const(""); break; @@ -876,6 +884,8 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t free(temp_char); } + trim_trailing_whitespace_d_string(out); + print_const(""); scratch->padded = 0; break; diff --git a/Sources/libMultiMarkdown/opml.c b/Sources/libMultiMarkdown/opml.c index adaf6aa..97296e0 100644 --- a/Sources/libMultiMarkdown/opml.c +++ b/Sources/libMultiMarkdown/opml.c @@ -8,7 +8,7 @@ @author Fletcher T. Penney - @bug + @bug **/ @@ -18,38 +18,38 @@ The `MultiMarkdown 6` project is released under the MIT License.. - + GLibFacade.c and GLibFacade.h are from the MultiMarkdown v4 project: - + https://github.com/fletcher/MultiMarkdown-4/ - + MMD 4 is released under both the MIT License and GPL. - - + + CuTest is released under the zlib/libpng license. See CuTest.c for the text of the license. - + uthash library: Copyright (c) 2005-2016, Troy D. Hanson - + Licensed under Revised BSD license - + miniz library: Copyright 2013-2014 RAD Game Tools and Valve Software Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC - + Licensed under the MIT license - + argtable3 library: Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann All rights reserved. - + Licensed under the Revised BSD License - - + + ## The MIT License ## - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including @@ -57,10 +57,10 @@ distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -68,10 +68,10 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - + + ## Revised BSD License ## - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -85,7 +85,7 @@ names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -97,7 +97,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ @@ -129,31 +129,40 @@ void mmd_print_source(DString * out, const char * source, size_t start, size_t l case '&': print_const("&"); break; + case '<': print_const("<"); break; + case '>': print_const(">"); break; + case '"': print_const("""); break; + case '\'': print_const("'"); break; + case '\n': print_const(" "); break; + case '\r': print_const(" "); break; + case '\t': print_const(" "); break; + default: print_char(*c); break; } + c++; } } @@ -164,7 +173,7 @@ void mmd_check_preamble_opml(DString * out, token * t, scratch_pad * scratch) { token * walker = t->child; while (walker) { - switch(walker->type) { + switch (walker->type) { case BLOCK_META: walker = walker->next; break; @@ -259,6 +268,7 @@ void mmd_outline_add_opml(DString * out, const char * source, token * current, s case BLOCK_H6: level = 1 + current->type - BLOCK_H1; break; + default: level = 100; break; @@ -286,6 +296,7 @@ void mmd_outline_add_opml(DString * out, const char * source, token * current, s } else { start = t->start + t->len; } + break; case BLOCK_H1: @@ -466,6 +477,7 @@ void mmd_export_token_opml(DString * out, const char * source, token * t, scratc print_const(" text=\""); mmd_export_header_opml(out, source, t, scratch); + trim_trailing_whitespace_d_string(out); print_const("\" _note=\""); break; diff --git a/Sources/libMultiMarkdown/opml.h b/Sources/libMultiMarkdown/opml.h index 0cddd7e..196691e 100644 --- a/Sources/libMultiMarkdown/opml.h +++ b/Sources/libMultiMarkdown/opml.h @@ -4,11 +4,11 @@ @file opml.h - @brief + @brief @author Fletcher T. Penney - @bug + @bug **/ @@ -18,38 +18,38 @@ The `MultiMarkdown 6` project is released under the MIT License.. - + GLibFacade.c and GLibFacade.h are from the MultiMarkdown v4 project: - + https://github.com/fletcher/MultiMarkdown-4/ - + MMD 4 is released under both the MIT License and GPL. - - + + CuTest is released under the zlib/libpng license. See CuTest.c for the text of the license. - + uthash library: Copyright (c) 2005-2016, Troy D. Hanson - + Licensed under Revised BSD license - + miniz library: Copyright 2013-2014 RAD Game Tools and Valve Software Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC - + Licensed under the MIT license - + argtable3 library: Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann All rights reserved. - + Licensed under the Revised BSD License - - + + ## The MIT License ## - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including @@ -57,10 +57,10 @@ distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -68,10 +68,10 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - + + ## Revised BSD License ## - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -85,7 +85,7 @@ names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -97,7 +97,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ diff --git a/Sources/libMultiMarkdown/writer.c b/Sources/libMultiMarkdown/writer.c index 1444288..8dccf8d 100644 --- a/Sources/libMultiMarkdown/writer.c +++ b/Sources/libMultiMarkdown/writer.c @@ -1081,6 +1081,7 @@ footnote * footnote_new(const char * source, token * label, token * content, boo default: // Trim trailing newlines walker = content->tail; + while (walker) { switch (walker->type) { case TEXT_NL: @@ -2492,6 +2493,18 @@ void strip_leading_whitespace(token * chain, const char * source) { } +void trim_trailing_whitespace_d_string(DString * d) { + if (d) { + char * c = &(d->str[d->currentStringLength - 1]); + + while (d->currentStringLength && char_is_whitespace(*c)) { + *c-- = 0; + d->currentStringLength--; + } + } +} + + bool table_has_caption(token * t) { if (t->next && t->next->type == BLOCK_PARA) { diff --git a/Sources/libMultiMarkdown/writer.h b/Sources/libMultiMarkdown/writer.h index 7b9e24e..6922a9d 100644 --- a/Sources/libMultiMarkdown/writer.h +++ b/Sources/libMultiMarkdown/writer.h @@ -245,6 +245,8 @@ void read_table_column_alignments(const char * source, token * table, scratch_pa void strip_leading_whitespace(token * chain, const char * source); +void trim_trailing_whitespace_d_string(DString * d); + bool table_has_caption(token * table); char * get_fence_language_specifier(token * fence, const char * source); diff --git a/tests/Beamer/Raw Source.tex b/tests/Beamer/Raw Source.tex index a4e7800..006aea1 100644 --- a/tests/Beamer/Raw Source.tex +++ b/tests/Beamer/Raw Source.tex @@ -3,7 +3,7 @@ \input{mmd6-beamer-begin} \begin{frame}[fragile] -\frametitle{0 } +\frametitle{0} \label{0} \texttt{*foo*}\{*\} @@ -19,7 +19,7 @@ \end{frame} \begin{frame}[fragile] -\frametitle{5 } +\frametitle{5} \label{5} \begin{lstlisting}[language={*}] @@ -33,7 +33,7 @@ \end{frame} \begin{frame}[fragile] -\frametitle{10 } +\frametitle{10} \label{10} *foo* diff --git a/tests/Beamer/What Is MMD.tex b/tests/Beamer/What Is MMD.tex index 155a659..dfacb88 100644 --- a/tests/Beamer/What Is MMD.tex +++ b/tests/Beamer/What Is MMD.tex @@ -9,7 +9,7 @@ \input{mmd6-beamer-begin} \begin{frame}[fragile] -\frametitle{MultiMarkdown is a derivative of Markdown } +\frametitle{MultiMarkdown is a derivative of Markdown} \label{multimarkdownisaderivativeofmarkdown} \href{http://daringfireball.net/projects/markdown/}{Markdown}\footnote{\href{http://daringfireball.net/projects/markdown/}{http:\slash \slash daringfireball.net\slash projects\slash markdown\slash }} is a program and a @@ -19,7 +19,7 @@ suitable for using on a web page. \end{frame} \begin{frame}[fragile] -\frametitle{The old way was complicated } +\frametitle{The old way was complicated} \label{theoldwaywascomplicated} \begin{verbatim} @@ -41,7 +41,7 @@ creating lists:

\end{frame} \begin{frame}[fragile] -\frametitle{The new way is easier } +\frametitle{The new way is easier} \label{thenewwayiseasier} \begin{verbatim} @@ -61,7 +61,7 @@ syntax. Additionally, for example, creating lists: \end{frame} \begin{frame}[fragile] -\frametitle{Markdown is designed for people } +\frametitle{Markdown is designed for people} \label{markdownisdesignedforpeople} The overriding design goal for Markdown's formatting syntax is to make it as @@ -75,7 +75,7 @@ of inspiration for Markdown's syntax is the format of plain text email. \end{frame} \begin{frame}[fragile] -\frametitle{But Markdown wasn't complete } +\frametitle{But Markdown wasn't complete} \label{butmarkdownwasntcomplete} I, and others, loved the spirit and elegance of Markdown, but felt it was @@ -86,7 +86,7 @@ programmers. \end{frame} \begin{frame}[fragile] -\frametitle{MultiMarkdown adds several new features } +\frametitle{MultiMarkdown adds several new features} \label{multimarkdownaddsseveralnewfeatures} \begin{itemize} @@ -115,7 +115,7 @@ programmers. \end{frame} \begin{frame}[fragile] -\frametitle{MMD also adds something else{\ldots} } +\frametitle{MMD also adds something else{\ldots}} \label{mmdalsoaddssomethingelse...} \begin{itemize} @@ -136,7 +136,7 @@ the LaTeX commands mean --- just have the software installed. \end{frame} \begin{frame}[fragile] -\frametitle{So, one text file becomes multiple final documents } +\frametitle{So, one text file becomes multiple final documents} \label{soonetextfilebecomesmultiplefinaldocuments} \begin{figure}[htbp] @@ -148,7 +148,7 @@ the LaTeX commands mean --- just have the software installed. \end{frame} \begin{frame}[fragile] -\frametitle{The goal is to separate content from formatting } +\frametitle{The goal is to separate content from formatting} \label{thegoalistoseparatecontentfromformatting} By focusing on the text content of your document, you can focus on the @@ -161,7 +161,7 @@ take. \end{frame} \begin{frame}[fragile] -\frametitle{MultiMarkdown and Mathematics } +\frametitle{MultiMarkdown and Mathematics} \label{multimarkdownandmathematics} Built into MultiMarkdown is support for mathematical equations. You write @@ -181,7 +181,7 @@ becomes \end{frame} \begin{frame}[fragile] -\frametitle{Images are just as easy } +\frametitle{Images are just as easy} \label{imagesarejustaseasy} \begin{verbatim} @@ -193,7 +193,7 @@ becomes{\ldots} \end{frame} \begin{frame}[fragile] -\frametitle{Images are just as easy } +\frametitle{Images are just as easy} \label{imagesarejustaseasy} \begin{figure}[htbp] @@ -205,7 +205,7 @@ becomes{\ldots} \end{frame} \begin{frame}[fragile] -\frametitle{Support for a bibliography is also included } +\frametitle{Support for a bibliography is also included} \label{supportforabibliographyisalsoincluded} \begin{itemize} @@ -220,7 +220,7 @@ arguments.~\citep[p. 42]{fake} \end{frame} \begin{frame}[fragile] -\frametitle{Installation is easy } +\frametitle{Installation is easy} \label{installationiseasy} \begin{itemize} @@ -239,7 +239,7 @@ OpenOffice.org (with the proper plug-in installed), etc. \end{frame} \begin{frame}[fragile] -\frametitle{How do I create a MultiMarkdown document? } +\frametitle{How do I create a MultiMarkdown document?} \label{howdoicreateamultimarkdowndocument} \begin{itemize} @@ -257,7 +257,7 @@ MultiMarkdown support. \end{frame} \begin{frame}[fragile] -\frametitle{Why should I mess with this LaTeX stuff? } +\frametitle{Why should I mess with this LaTeX stuff?} \label{whyshouldimesswiththislatexstuff} MultiMarkdown's support for LaTeX is designed to automatically do the ``right'' @@ -271,7 +271,7 @@ documents without learning all of the complicated LaTeX commands and markup. \end{frame} \begin{frame}[fragile] -\frametitle{How do I create a fancy PDF? } +\frametitle{How do I create a fancy PDF?} \label{howdoicreateafancypdf} If you're using LaTeX, and have the proper software installed it's easy: @@ -289,7 +289,7 @@ file into a pdf. \end{frame} \begin{frame}[fragile] -\frametitle{Where to learn more } +\frametitle{Where to learn more} \label{wheretolearnmore} \begin{itemize} @@ -304,7 +304,7 @@ file into a pdf. \end{frame} \begin{frame}[fragile] -\frametitle{By the way{\ldots} } +\frametitle{By the way{\ldots}} \label{bytheway...} This presentation was, of course, written in MultiMarkdown and processed by diff --git a/tests/MMD6Tests/Abbreviations.fodt b/tests/MMD6Tests/Abbreviations.fodt index f7f4f43..74564c1 100644 --- a/tests/MMD6Tests/Abbreviations.fodt +++ b/tests/MMD6Tests/Abbreviations.fodt @@ -341,9 +341,9 @@ bar Table Update Fields to calculate numbers:foo bar -foo bar +foo bar -foo bar +foo bar foo bar diff --git a/tests/MMD6Tests/Abbreviations.html b/tests/MMD6Tests/Abbreviations.html index d59159b..e2431d2 100644 --- a/tests/MMD6Tests/Abbreviations.html +++ b/tests/MMD6Tests/Abbreviations.html @@ -67,9 +67,9 @@ -

foo bar

+

foo bar

-

foo bar

+

foo bar

foo bar

diff --git a/tests/MMD6Tests/Abbreviations.htmlc b/tests/MMD6Tests/Abbreviations.htmlc index 22c6047..63fb99a 100644 --- a/tests/MMD6Tests/Abbreviations.htmlc +++ b/tests/MMD6Tests/Abbreviations.htmlc @@ -45,9 +45,9 @@ bar

| foo | bar | [foo bar]

-

foo bar

+

foo bar

-

foo bar

+

foo bar

foo bar

diff --git a/tests/MMD6Tests/Abbreviations.opml b/tests/MMD6Tests/Abbreviations.opml index 992d6df..fe39f32 100644 --- a/tests/MMD6Tests/Abbreviations.opml +++ b/tests/MMD6Tests/Abbreviations.opml @@ -3,7 +3,7 @@ Abbreviations - + diff --git a/tests/MMD6Tests/Abbreviations.tex b/tests/MMD6Tests/Abbreviations.tex index f8fa664..6be7739 100644 --- a/tests/MMD6Tests/Abbreviations.tex +++ b/tests/MMD6Tests/Abbreviations.tex @@ -81,10 +81,10 @@ fo'o fo'o \end{minipage} \end{table} -\part{foo bar } +\part{foo bar} \label{foobar} -\section{foo bar } +\section{foo bar} \label{foobar} \part{foo bar} diff --git a/tests/MMD6Tests/Advanced Headers.fodt b/tests/MMD6Tests/Advanced Headers.fodt index 74ab6bc..dcdc0b7 100644 --- a/tests/MMD6Tests/Advanced Headers.fodt +++ b/tests/MMD6Tests/Advanced Headers.fodt @@ -278,21 +278,21 @@ office:mimetype="application/vnd.oasis.opendocument.text"> -foo +foo foo foo bar -foo bar +foo bar foo bar 5 -foo +foo -foo bar +foo bar foo bar diff --git a/tests/MMD6Tests/Advanced Headers.html b/tests/MMD6Tests/Advanced Headers.html index 3e0dc7a..fec207b 100644 --- a/tests/MMD6Tests/Advanced Headers.html +++ b/tests/MMD6Tests/Advanced Headers.html @@ -6,13 +6,13 @@ -

foo

+

foo

foo

foo bar

-

foo bar

+

foo bar

foo bar

@@ -20,7 +20,7 @@

foo

-

foo bar

+

foo bar

foo bar

diff --git a/tests/MMD6Tests/Advanced Headers.htmlc b/tests/MMD6Tests/Advanced Headers.htmlc index 9d3b17a..723f368 100644 --- a/tests/MMD6Tests/Advanced Headers.htmlc +++ b/tests/MMD6Tests/Advanced Headers.htmlc @@ -1,7 +1,7 @@

Title: Advanced Headers latex config: article

-

foo [bar]

+

foo [bar]

foo[bar]

@@ -15,7 +15,7 @@ latex config: article

foo [bar]

-

foo bar

+

foo bar

foo bar

diff --git a/tests/MMD6Tests/Advanced Headers.opml b/tests/MMD6Tests/Advanced Headers.opml index d0db718..b7898ad 100644 --- a/tests/MMD6Tests/Advanced Headers.opml +++ b/tests/MMD6Tests/Advanced Headers.opml @@ -3,13 +3,13 @@ Advanced Headers - + - + diff --git a/tests/MMD6Tests/Advanced Headers.tex b/tests/MMD6Tests/Advanced Headers.tex index 73a4851..6672ccf 100644 --- a/tests/MMD6Tests/Advanced Headers.tex +++ b/tests/MMD6Tests/Advanced Headers.tex @@ -2,7 +2,7 @@ \def\mytitle{Advanced Headers} \input{mmd6-article-begin} -\part{foo } +\part{foo} \label{bar} \part{foo} @@ -11,7 +11,7 @@ \part{foo bar (\autoref{bat})} \label{foobarbat} -\part{foo bar (\autoref{bar}) } +\part{foo bar (\autoref{bar})} \label{bat} \part{foo bar (\autoref{bat})} @@ -19,10 +19,10 @@ 5 -\part{foo } +\part{foo} \label{bar} -\part{\emph{foo} bar } +\part{\emph{foo} bar} \label{foobar} \part{\emph{foo diff --git a/tests/MMD6Tests/Basic Blocks.fodt b/tests/MMD6Tests/Basic Blocks.fodt index a366b79..5278123 100644 --- a/tests/MMD6Tests/Basic Blocks.fodt +++ b/tests/MMD6Tests/Basic Blocks.fodt @@ -280,9 +280,9 @@ office:mimetype="application/vnd.oasis.opendocument.text"> foo -Heading foo +Heading foo -Heading +Heading foo bar diff --git a/tests/MMD6Tests/Basic Blocks.html b/tests/MMD6Tests/Basic Blocks.html index d8fa6c4..1952b51 100644 --- a/tests/MMD6Tests/Basic Blocks.html +++ b/tests/MMD6Tests/Basic Blocks.html @@ -8,9 +8,9 @@

foo

-

Heading foo

+

Heading foo

-

Heading

+

Heading

foo bar

diff --git a/tests/MMD6Tests/Basic Blocks.htmlc b/tests/MMD6Tests/Basic Blocks.htmlc index 1f79fa7..0bd0511 100644 --- a/tests/MMD6Tests/Basic Blocks.htmlc +++ b/tests/MMD6Tests/Basic Blocks.htmlc @@ -3,9 +3,9 @@ latex config: article

foo

-

Heading foo

+

Heading foo

-

Heading

+

Heading

foo bar

diff --git a/tests/MMD6Tests/Basic Blocks.opml b/tests/MMD6Tests/Basic Blocks.opml index e1264fd..b2a58fe 100644 --- a/tests/MMD6Tests/Basic Blocks.opml +++ b/tests/MMD6Tests/Basic Blocks.opml @@ -3,7 +3,7 @@ Basic Blocks - + diff --git a/tests/MMD6Tests/Basic Blocks.tex b/tests/MMD6Tests/Basic Blocks.tex index 0f4068c..6c36468 100644 --- a/tests/MMD6Tests/Basic Blocks.tex +++ b/tests/MMD6Tests/Basic Blocks.tex @@ -4,10 +4,10 @@ foo -\part{Heading \emph{foo} } +\part{Heading \emph{foo}} \label{headingfoo} -\chapter{Heading } +\chapter{Heading} \label{heading} foo diff --git a/tests/MMD6Tests/Citations.fodt b/tests/MMD6Tests/Citations.fodt index 620170d..4051b22 100644 --- a/tests/MMD6Tests/Citations.fodt +++ b/tests/MMD6Tests/Citations.fodt @@ -278,7 +278,7 @@ office:mimetype="application/vnd.oasis.opendocument.text"> -citep +citep John Doe. A Totally Fake Book 1. Vanity Press, 2006. @@ -292,7 +292,7 @@ office:mimetype="application/vnd.oasis.opendocument.text"> 1John Doe. A Totally Fake Book 2. Vanity Press, 2006. -citet +citet 1 diff --git a/tests/MMD6Tests/Citations.html b/tests/MMD6Tests/Citations.html index 5974714..2dcd7c7 100644 --- a/tests/MMD6Tests/Citations.html +++ b/tests/MMD6Tests/Citations.html @@ -6,7 +6,7 @@ -

citep

+

citep

(1)

@@ -20,7 +20,7 @@

(1)(2)

-

citet

+

citet

(1)

diff --git a/tests/MMD6Tests/Citations.htmlc b/tests/MMD6Tests/Citations.htmlc index c7ad0c7..8cfa7bd 100644 --- a/tests/MMD6Tests/Citations.htmlc +++ b/tests/MMD6Tests/Citations.htmlc @@ -1,7 +1,7 @@

Title: Citations latex config: article

-

citep

+

citep

[#foo1]

@@ -15,7 +15,7 @@ latex config: article

[#foo1][#foo2]

-

citet

+

citet

[#foo1;]

diff --git a/tests/MMD6Tests/Citations.opml b/tests/MMD6Tests/Citations.opml index d5c482d..bf64c4d 100644 --- a/tests/MMD6Tests/Citations.opml +++ b/tests/MMD6Tests/Citations.opml @@ -3,8 +3,8 @@ Citations - - + + diff --git a/tests/MMD6Tests/Citations.tex b/tests/MMD6Tests/Citations.tex index 14a5b4b..010ce82 100644 --- a/tests/MMD6Tests/Citations.tex +++ b/tests/MMD6Tests/Citations.tex @@ -2,7 +2,7 @@ \def\mytitle{Citations} \input{mmd6-article-begin} -\part{citep } +\part{citep} \label{citep} ~\citep{foo1} @@ -17,7 +17,7 @@ ~\citep{foo1}~\citep{foo2} -\part{citet } +\part{citet} \label{citet} \citet{foo1} diff --git a/tests/MMD6Tests/Cross-References.fodt b/tests/MMD6Tests/Cross-References.fodt index f8c12e2..8423327 100644 --- a/tests/MMD6Tests/Cross-References.fodt +++ b/tests/MMD6Tests/Cross-References.fodt @@ -278,25 +278,25 @@ office:mimetype="application/vnd.oasis.opendocument.text"> -A Section +A Section -109&*&#()^ Can Start With Digit +109&*&#()^ Can Start With Digit -Strip out &%^ characters &*^ +Strip out &%^ characters &*^ A Section. -1 Cross-References: Special Characters!@#$%&*()<>^ +1 Cross-References: Special Characters!@#$%&*()<>^ 5 And now, link to 1 Cross-References: Special Characters!@#$%&*()<>^ -Заголовок по-русски +Заголовок по-русски И ссылка на Заголовок по-русски. -Test 的 Multibyte +Test 的 Multibyte 10 diff --git a/tests/MMD6Tests/Cross-References.html b/tests/MMD6Tests/Cross-References.html index ab8e1e5..27b4249 100644 --- a/tests/MMD6Tests/Cross-References.html +++ b/tests/MMD6Tests/Cross-References.html @@ -6,25 +6,25 @@ -

A Section

+

A Section

-

109&*&#()^ Can Start With Digit

+

109&*&#()^ Can Start With Digit

-

Strip out &%^ characters &*^

+

Strip out &%^ characters &*^

A Section.

-

1 Cross-References: Special Characters!@#$%&*()<>^

+

1 Cross-References: Special Characters!@#$%&*()<>^

5

And now, link to 1 Cross-References: Special Characters!@#$%&*()<>^

-

Заголовок по-русски

+

Заголовок по-русски

И ссылка на Заголовок по-русски.

-

Test 的 Multibyte

+

Test 的 Multibyte

10

diff --git a/tests/MMD6Tests/Cross-References.htmlc b/tests/MMD6Tests/Cross-References.htmlc index ccf5fb9..32c59aa 100644 --- a/tests/MMD6Tests/Cross-References.htmlc +++ b/tests/MMD6Tests/Cross-References.htmlc @@ -1,24 +1,24 @@

Title: Cross-References latex config: article

-

A Section

+

A Section

-

109&*&#()^ Can Start With Digit

+

109&*&#()^ Can Start With Digit

-

Strip out &%^ characters &*^

+

Strip out &%^ characters &*^

[A Section].

-

1 Cross-References: Special Characters!@#$%&*()<>^

+

1 Cross-References: Special Characters!@#$%&*()<>^

5

And now, link to [1 Cross-References: Special Characters!@#$%&*()<>^][]

-

Заголовок по-русски

+

Заголовок по-русски

И ссылка на [Заголовок по-русски].

-

Test 的 Multibyte

+

Test 的 Multibyte

10

diff --git a/tests/MMD6Tests/Cross-References.opml b/tests/MMD6Tests/Cross-References.opml index b432b3f..9f78631 100644 --- a/tests/MMD6Tests/Cross-References.opml +++ b/tests/MMD6Tests/Cross-References.opml @@ -3,12 +3,12 @@ Cross-References - - - + + + - - + + diff --git a/tests/MMD6Tests/Cross-References.tex b/tests/MMD6Tests/Cross-References.tex index ebc28b4..b58a8aa 100644 --- a/tests/MMD6Tests/Cross-References.tex +++ b/tests/MMD6Tests/Cross-References.tex @@ -2,30 +2,30 @@ \def\mytitle{Cross-References} \input{mmd6-article-begin} -\part{A Section } +\part{A Section} \label{asection} -\part{109\&*\&\#()\^{} Can Start With Digit } +\part{109\&*\&\#()\^{} Can Start With Digit} \label{109canstartwithdigit} -\part{Strip out \&\%\^{} characters \&*\^{} } +\part{Strip out \&\%\^{} characters \&*\^{}} \label{stripoutcharacters} A Section (\autoref{asection}). -\chapter{1 Cross-References: Special Characters!@\#\$\%\&*()<>\^{} } +\chapter{1 Cross-References: Special Characters!@\#\$\%\&*()<>\^{}} \label{1cross-references:specialcharacters} 5 And now, link to 1 Cross-References: Special Characters!@\#\$\%\&*()<>\^{} (\autoref{1cross-references:specialcharacters}) -\part{Заголовок по-русски } +\part{Заголовок по-русски} \label{Заголовокпо-русски} И ссылка на Заголовок по-русски (\autoref{Заголовокпо-русски}). -\part{Test 的 Multibyte } +\part{Test 的 Multibyte} \label{test的multibyte} 10 diff --git a/tests/MMD6Tests/Fenced Code Blocks.htmlc b/tests/MMD6Tests/Fenced Code Blocks.htmlc index ff18e4a..1b7fa47 100644 --- a/tests/MMD6Tests/Fenced Code Blocks.htmlc +++ b/tests/MMD6Tests/Fenced Code Blocks.htmlc @@ -71,11 +71,11 @@ foo

bar

-

baz

+

baz

foo ##

-
bar ##
+
bar ##
baz
diff --git a/tests/MMD6Tests/Fuzz.fodt b/tests/MMD6Tests/Fuzz.fodt index 2c6c307..37acf07 100644 --- a/tests/MMD6Tests/Fuzz.fodt +++ b/tests/MMD6Tests/Fuzz.fodt @@ -292,7 +292,7 @@ list -:Escapes +:Escapes [>MM]: MultiMarkdown diff --git a/tests/MMD6Tests/Fuzz.tex b/tests/MMD6Tests/Fuzz.tex index b6ec57f..6e11797 100644 --- a/tests/MMD6Tests/Fuzz.tex +++ b/tests/MMD6Tests/Fuzz.tex @@ -15,7 +15,7 @@ Collection of test cases identified by \href{http://lcamtuf.coredump.cx/afl/}{Am \end{itemize} -\chapter{:Escapes } +\chapter{:Escapes} \label{escaped} [>MM]: MultiMarkdown diff --git a/tests/MMD6Tests/HTML Blocks.fodt b/tests/MMD6Tests/HTML Blocks.fodt index 3531076..7b552f3 100644 --- a/tests/MMD6Tests/HTML Blocks.fodt +++ b/tests/MMD6Tests/HTML Blocks.fodt @@ -295,7 +295,7 @@ office:mimetype="application/vnd.oasis.opendocument.text"> 10 -foo2 +foo2 foo diff --git a/tests/MMD6Tests/HTML Blocks.html b/tests/MMD6Tests/HTML Blocks.html index 2cc6195..d6cf2d6 100644 --- a/tests/MMD6Tests/HTML Blocks.html +++ b/tests/MMD6Tests/HTML Blocks.html @@ -62,7 +62,7 @@
-

foo2

+

foo2

foo

diff --git a/tests/MMD6Tests/HTML Blocks.htmlc b/tests/MMD6Tests/HTML Blocks.htmlc index 38cb03f..b92dcd9 100644 --- a/tests/MMD6Tests/HTML Blocks.htmlc +++ b/tests/MMD6Tests/HTML Blocks.htmlc @@ -57,7 +57,7 @@ latex config: article

-

foo2

+

foo2

[foo][foo2]

diff --git a/tests/MMD6Tests/HTML Blocks.opml b/tests/MMD6Tests/HTML Blocks.opml index 4d7e2d9..eb00cb7 100644 --- a/tests/MMD6Tests/HTML Blocks.opml +++ b/tests/MMD6Tests/HTML Blocks.opml @@ -3,7 +3,7 @@ HTML Blocks - + diff --git a/tests/MMD6Tests/HTML Blocks.tex b/tests/MMD6Tests/HTML Blocks.tex index b4f6a29..3b2b9db 100644 --- a/tests/MMD6Tests/HTML Blocks.tex +++ b/tests/MMD6Tests/HTML Blocks.tex @@ -19,7 +19,7 @@ foo 10 -\part{foo2 } +\part{foo2} \label{foo2} foo (\autoref{foo2}) diff --git a/tests/MMD6Tests/Headers.fodt b/tests/MMD6Tests/Headers.fodt index cc329da..cdfd480 100644 --- a/tests/MMD6Tests/Headers.fodt +++ b/tests/MMD6Tests/Headers.fodt @@ -278,13 +278,13 @@ office:mimetype="application/vnd.oasis.opendocument.text"> -foo +foo -foo +foo -foo +foo -foo +foo # foo # @@ -298,23 +298,23 @@ office:mimetype="application/vnd.oasis.opendocument.text"> # foo # -foo +foo 10 -foo +foo -foo +foo -foo +foo -foo +foo ####### foo ####### 15 -foo +foo diff --git a/tests/MMD6Tests/Headers.html b/tests/MMD6Tests/Headers.html index c2ae635..6079421 100644 --- a/tests/MMD6Tests/Headers.html +++ b/tests/MMD6Tests/Headers.html @@ -6,13 +6,13 @@ -

foo

+

foo

-

foo

+

foo

-

foo

+

foo

-

foo

+

foo

# foo #
 
@@ -27,23 +27,23 @@

# foo #

-

foo

+

foo

10

-

foo

+

foo

-

foo

+

foo

-
foo
+
foo
-
foo
+
foo

####### foo #######

15

-
foo
+
foo
diff --git a/tests/MMD6Tests/Headers.htmlc b/tests/MMD6Tests/Headers.htmlc index 6959dfa..99f850f 100644 --- a/tests/MMD6Tests/Headers.htmlc +++ b/tests/MMD6Tests/Headers.htmlc @@ -1,13 +1,13 @@

Title: Headers latex config: article

-

foo

+

foo

-

foo

+

foo

-

foo

+

foo

-

foo

+

foo

# foo #
 
@@ -22,20 +22,20 @@ latex config: article

# foo #

-

foo

+

foo

10

-

foo

+

foo

-

foo

+

foo

-
foo
+
foo
-
foo
+
foo

####### foo #######

15

-
foo
+
foo
diff --git a/tests/MMD6Tests/Headers.opml b/tests/MMD6Tests/Headers.opml index 536424a..02d97b1 100644 --- a/tests/MMD6Tests/Headers.opml +++ b/tests/MMD6Tests/Headers.opml @@ -3,12 +3,12 @@ Headers - - - - - - + + + + + + diff --git a/tests/MMD6Tests/Headers.tex b/tests/MMD6Tests/Headers.tex index 3b192fd..c5f1570 100644 --- a/tests/MMD6Tests/Headers.tex +++ b/tests/MMD6Tests/Headers.tex @@ -2,16 +2,16 @@ \def\mytitle{Headers} \input{mmd6-article-begin} -\part{foo } +\part{foo} \label{foo} -\part{foo } +\part{foo} \label{foo} -\part{foo } +\part{foo} \label{foo} -\part{foo } +\part{foo} \label{foo} \begin{verbatim} @@ -29,28 +29,28 @@ \# foo \# -\chapter{foo } +\chapter{foo} \label{foo} 10 -\section{foo } +\section{foo} \label{foo} -\subsection{foo } +\subsection{foo} \label{foo} -\subsubsection{foo } +\subsubsection{foo} \label{foo} -\paragraph{foo } +\paragraph{foo} \label{foo} \#\#\#\#\#\#\# foo \#\#\#\#\#\#\# 15 -\paragraph{foo } +\paragraph{foo} \label{foo} \input{mmd6-article-footer} diff --git a/tests/MMD6Tests/Integrated.fodt b/tests/MMD6Tests/Integrated.fodt index 3485b51..3ee9d37 100644 --- a/tests/MMD6Tests/Integrated.fodt +++ b/tests/MMD6Tests/Integrated.fodt @@ -283,7 +283,7 @@ office:mimetype="application/vnd.oasis.opendocument.text"> identify common structures that are not supported yet – particularly useful when developing a new output format. -Basic Blocks +Basic Blocks paragraph @@ -309,7 +309,7 @@ list emph and strong and both -Escapes +Escapes @@ -323,7 +323,7 @@ list -Footnotes +Footnotes Foo.This is an inline footnote @@ -333,7 +333,7 @@ list Cite.bar -Links and Images +Links and Images link and link @@ -354,7 +354,7 @@ draw:z-index="0" draw:style-name="fr1" svg:width="40pt"> bar -Math +Math foo \({e}^{i\pi }+1=0\) bar @@ -366,11 +366,11 @@ draw:z-index="0" draw:style-name="fr1" svg:width="40pt"> $${x}_{1,2}=\frac{-b\pm \sqrt{{b}^{2}-4ac}}{2a}$$ -Smart Quotes +Smart Quotes “foo” and ‘bar’ – with — dashes… -CriticMarkup +CriticMarkup foo @@ -382,7 +382,7 @@ draw:z-index="0" draw:style-name="fr1" svg:width="40pt"> bar -Definition Lists +Definition Lists foo bar @@ -390,11 +390,11 @@ draw:z-index="0" draw:style-name="fr1" svg:width="40pt"> baz bat* -Horizontal Rules +Horizontal Rules -Glossary +Glossary termA term to be defined. diff --git a/tests/MMD6Tests/Integrated.html b/tests/MMD6Tests/Integrated.html index 30487ab..4e36bc8 100644 --- a/tests/MMD6Tests/Integrated.html +++ b/tests/MMD6Tests/Integrated.html @@ -11,7 +11,7 @@ identify common structures that are not supported yet – particularly useful when developing a new output format.

-

Basic Blocks

+

Basic Blocks

paragraph

@@ -46,7 +46,7 @@ code
  • [

  • -

    Footnotes

    +

    Footnotes

    Foo.1

    @@ -56,7 +56,7 @@ code

    Cite.(2)

    -

    Links and Images

    +

    Links and Images

    link and link

    @@ -73,7 +73,7 @@ code

    bar

    -

    Math

    +

    Math

    foo \({e}^{i\pi }+1=0\) bar

    @@ -85,11 +85,11 @@ code

    \[{x}_{1,2}=\frac{-b\pm \sqrt{{b}^{2}-4ac}}{2a}\]

    -

    Smart Quotes

    +

    Smart Quotes

    “foo” and ‘bar’ – with — dashes…

    -

    CriticMarkup

    +

    CriticMarkup

    foo

    @@ -101,7 +101,7 @@ code

    bar

    -

    Definition Lists

    +

    Definition Lists

    foo
    @@ -111,11 +111,11 @@ code
    baz bat*
    -

    Horizontal Rules

    +

    Horizontal Rules


    -

    Glossary

    +

    Glossary

    term

    diff --git a/tests/MMD6Tests/Integrated.htmlc b/tests/MMD6Tests/Integrated.htmlc index 90a2915..537c9d1 100644 --- a/tests/MMD6Tests/Integrated.htmlc +++ b/tests/MMD6Tests/Integrated.htmlc @@ -6,7 +6,7 @@ latex config: article

    identify common structures that are not supported yet -- particularly useful when developing a new output format.

    -

    Basic Blocks

    +

    Basic Blocks

    paragraph

    @@ -40,7 +40,7 @@ code
  • [

  • -

    Footnotes

    +

    Footnotes

    Foo.[^This is an inline footnote]

    @@ -52,7 +52,7 @@ code

    Cite.#foo

    -

    Links and Images

    +

    Links and Images

    link and [link]

    @@ -68,7 +68,7 @@ code

    bar

    -

    Math

    +

    Math

    foo \({e}^{i\pi }+1=0\) bar

    @@ -80,11 +80,11 @@ code

    $${x}_{1,2}=\frac{-b\pm \sqrt{{b}^{2}-4ac}}{2a}$$

    -

    Smart Quotes

    +

    Smart Quotes

    "foo" and 'bar' -- with --- dashes...

    -

    CriticMarkup

    +

    CriticMarkup

    {++foo++}

    @@ -96,18 +96,18 @@ code

    {==bar==}

    -

    Definition Lists

    +

    Definition Lists

    foo bar : foo bar : baz bat

    -

    Horizontal Rules

    +

    Horizontal Rules


    -

    Glossary

    +

    Glossary

    [?term]

    diff --git a/tests/MMD6Tests/Integrated.opml b/tests/MMD6Tests/Integrated.opml index b9ae80c..22e5f0a 100644 --- a/tests/MMD6Tests/Integrated.opml +++ b/tests/MMD6Tests/Integrated.opml @@ -3,16 +3,16 @@ Integrated - + - - - - - - - - + + + + + + + + diff --git a/tests/MMD6Tests/Integrated.tex b/tests/MMD6Tests/Integrated.tex index 28b181a..f7c01e3 100644 --- a/tests/MMD6Tests/Integrated.tex +++ b/tests/MMD6Tests/Integrated.tex @@ -11,7 +11,7 @@ This file is a designed as a single test that incorporates most of the identify common structures that are not supported yet -- particularly useful when developing a new output format. -\part{Basic Blocks } +\part{Basic Blocks} \label{basicblocks} paragraph @@ -43,7 +43,7 @@ blockquote \emph{emph} and \textbf{strong} and \textbf{\emph{both}} -\chapter{Escapes } +\chapter{Escapes} \label{escaped} \begin{enumerate} @@ -55,7 +55,7 @@ blockquote \end{enumerate} -\part{Footnotes } +\part{Footnotes} \label{footnotes} Foo.\footnote{This is an inline footnote} @@ -66,7 +66,7 @@ Cite.~\citep{inlinecitation} Cite.~\citep{foo} -\part{Links and Images } +\part{Links and Images} \label{linksandimages} \href{http://foo.net/}{link}\footnote{\href{http://foo.net/}{http:\slash \slash foo.net\slash }} and \href{http://bar.net}{link}\footnote{\href{http://bar.net}{http:\slash \slash bar.net}} @@ -85,7 +85,7 @@ bar (\autoref{bar}) bar (\autoref{bar}) -\part{Math } +\part{Math} \label{math} foo \({e}^{i\pi }+1=0\) bar @@ -98,12 +98,12 @@ foo ${e}^{i\pi }+1=0$, bar $${x}_{1,2}=\frac{-b\pm \sqrt{{b}^{2}-4ac}}{2a}$$ -\part{Smart Quotes } +\part{Smart Quotes} \label{smartquotes} ``foo'' and `bar' -- with --- dashes{\ldots} -\part{CriticMarkup } +\part{CriticMarkup} \label{criticmarkup} \underline{foo} @@ -116,7 +116,7 @@ $${x}_{1,2}=\frac{-b\pm \sqrt{{b}^{2}-4ac}}{2a}$$ \hl{bar} -\part{Definition Lists } +\part{Definition Lists} \label{definitionlists} \begin{description} @@ -129,12 +129,12 @@ $${x}_{1,2}=\frac{-b\pm \sqrt{{b}^{2}-4ac}}{2a}$$ baz bat* \end{description} -\part{Horizontal Rules } +\part{Horizontal Rules} \label{horizontalrules} \begin{center}\rule{3in}{0.4pt}\end{center} -\part{Glossary } +\part{Glossary} \label{glossary} \gls{term} diff --git a/tests/MMD6Tests/Link Variations.fodt b/tests/MMD6Tests/Link Variations.fodt index e0b23bc..b4e8b5d 100644 --- a/tests/MMD6Tests/Link Variations.fodt +++ b/tests/MMD6Tests/Link Variations.fodt @@ -278,7 +278,7 @@ office:mimetype="application/vnd.oasis.opendocument.text"> -Foo Bar +Foo Bar Link to Foo Bar. diff --git a/tests/MMD6Tests/Link Variations.html b/tests/MMD6Tests/Link Variations.html index e3b2ce7..e1e637c 100644 --- a/tests/MMD6Tests/Link Variations.html +++ b/tests/MMD6Tests/Link Variations.html @@ -6,7 +6,7 @@ -

    Foo Bar

    +

    Foo Bar

    Link to Foo Bar.

    diff --git a/tests/MMD6Tests/Link Variations.htmlc b/tests/MMD6Tests/Link Variations.htmlc index e99423f..952674f 100644 --- a/tests/MMD6Tests/Link Variations.htmlc +++ b/tests/MMD6Tests/Link Variations.htmlc @@ -1,7 +1,7 @@

    Title: Link Variations latex config: article

    -

    Foo Bar

    +

    Foo Bar

    Link to [Foo Bar].

    diff --git a/tests/MMD6Tests/Link Variations.opml b/tests/MMD6Tests/Link Variations.opml index a138f13..5649446 100644 --- a/tests/MMD6Tests/Link Variations.opml +++ b/tests/MMD6Tests/Link Variations.opml @@ -3,7 +3,7 @@ Link Variations - + diff --git a/tests/MMD6Tests/Link Variations.tex b/tests/MMD6Tests/Link Variations.tex index ed6266a..89951d6 100644 --- a/tests/MMD6Tests/Link Variations.tex +++ b/tests/MMD6Tests/Link Variations.tex @@ -2,7 +2,7 @@ \def\mytitle{Link Variations} \input{mmd6-article-begin} -\chapter{Foo Bar } +\chapter{Foo Bar} \label{foobar} Link to Foo Bar (\autoref{foobar}). diff --git a/tests/MMD6Tests/Markdown Syntax.fodt b/tests/MMD6Tests/Markdown Syntax.fodt index d81be5f..a132899 100644 --- a/tests/MMD6Tests/Markdown Syntax.fodt +++ b/tests/MMD6Tests/Markdown Syntax.fodt @@ -277,7 +277,7 @@ office:mimetype="application/vnd.oasis.opendocument.text"> -Markdown: Syntax +Markdown: Syntax diff --git a/tests/MMD6Tests/Markdown Syntax.html b/tests/MMD6Tests/Markdown Syntax.html index 3ed1e49..860891b 100644 --- a/tests/MMD6Tests/Markdown Syntax.html +++ b/tests/MMD6Tests/Markdown Syntax.html @@ -1,4 +1,4 @@ -

    Markdown: Syntax

    +

    Markdown: Syntax

    • Main
    • diff --git a/tests/MMD6Tests/Markdown Syntax.htmlc b/tests/MMD6Tests/Markdown Syntax.htmlc index be89b34..a083129 100644 --- a/tests/MMD6Tests/Markdown Syntax.htmlc +++ b/tests/MMD6Tests/Markdown Syntax.htmlc @@ -1,4 +1,4 @@ -

      Markdown: Syntax

      +

      Markdown: Syntax

      • Main
      • diff --git a/tests/MMD6Tests/Markdown Syntax.opml b/tests/MMD6Tests/Markdown Syntax.opml index 6eca48f..d87c657 100644 --- a/tests/MMD6Tests/Markdown Syntax.opml +++ b/tests/MMD6Tests/Markdown Syntax.opml @@ -1,7 +1,7 @@ - + diff --git a/tests/MMD6Tests/Markdown Syntax.tex b/tests/MMD6Tests/Markdown Syntax.tex index 6dc0436..2e24e43 100644 --- a/tests/MMD6Tests/Markdown Syntax.tex +++ b/tests/MMD6Tests/Markdown Syntax.tex @@ -1,4 +1,4 @@ -\part{Markdown: Syntax } +\part{Markdown: Syntax} \label{markdown:syntax} \begin{itemize} diff --git a/tests/MMD6Tests/Metadata.fodt b/tests/MMD6Tests/Metadata.fodt index ae7cfcf..6661eb2 100644 --- a/tests/MMD6Tests/Metadata.fodt +++ b/tests/MMD6Tests/Metadata.fodt @@ -282,7 +282,7 @@ office:mimetype="application/vnd.oasis.opendocument.text"> foo:bar -foo +foo diff --git a/tests/MMD6Tests/Metadata.html b/tests/MMD6Tests/Metadata.html index a0513e4..662202a 100644 --- a/tests/MMD6Tests/Metadata.html +++ b/tests/MMD6Tests/Metadata.html @@ -12,7 +12,7 @@

        foo: bar

        -

        foo

        +

        foo

        diff --git a/tests/MMD6Tests/Metadata.htmlc b/tests/MMD6Tests/Metadata.htmlc index 82add94..fd7daa7 100644 --- a/tests/MMD6Tests/Metadata.htmlc +++ b/tests/MMD6Tests/Metadata.htmlc @@ -17,4 +17,4 @@ base header level: 3

        foo: bar

        -

        foo

        +

        foo

        diff --git a/tests/MMD6Tests/Metadata.opml b/tests/MMD6Tests/Metadata.opml index ef649ab..17cd67a 100644 --- a/tests/MMD6Tests/Metadata.opml +++ b/tests/MMD6Tests/Metadata.opml @@ -3,7 +3,7 @@ *foo* "bar" - + diff --git a/tests/MMD6Tests/Metadata.tex b/tests/MMD6Tests/Metadata.tex index e7cb5a1..7998708 100644 --- a/tests/MMD6Tests/Metadata.tex +++ b/tests/MMD6Tests/Metadata.tex @@ -6,7 +6,7 @@ foo: bar -\chapter{foo } +\chapter{foo} \label{foo} \input{mmd6-article-footer} diff --git a/tests/MMD6Tests/Table of Contents.fodt b/tests/MMD6Tests/Table of Contents.fodt index 3479e5d..5036a3c 100644 --- a/tests/MMD6Tests/Table of Contents.fodt +++ b/tests/MMD6Tests/Table of Contents.fodt @@ -302,29 +302,29 @@ office:mimetype="application/vnd.oasis.opendocument.text"> -Second Level +Second Level -First Level +First Level -Second Level b +Second Level b -Third Level +Third Level -Second Level c +Second Level c -First Level b +First Level b -Third Level b +Third Level b -Second level d +Second level d -Third level d +Third level d -Fourth level d +Fourth level d -First level +First level -Second level +Second level diff --git a/tests/MMD6Tests/Table of Contents.html b/tests/MMD6Tests/Table of Contents.html index b03d082..4c5cdad 100644 --- a/tests/MMD6Tests/Table of Contents.html +++ b/tests/MMD6Tests/Table of Contents.html @@ -42,29 +42,29 @@
    -

    Second Level

    +

    Second Level

    -

    First Level

    +

    First Level

    -

    Second Level b

    +

    Second Level b

    -

    Third Level

    +

    Third Level

    -

    Second Level c

    +

    Second Level c

    -

    First Level b

    +

    First Level b

    -

    Third Level b

    +

    Third Level b

    -

    Second level d

    +

    Second level d

    -

    Third level d

    +

    Third level d

    -

    Fourth level d

    +

    Fourth level d

    -

    First level

    +

    First level

    -

    Second level

    +

    Second level

    diff --git a/tests/MMD6Tests/Table of Contents.htmlc b/tests/MMD6Tests/Table of Contents.htmlc index d90de5a..d2f23aa 100644 --- a/tests/MMD6Tests/Table of Contents.htmlc +++ b/tests/MMD6Tests/Table of Contents.htmlc @@ -3,26 +3,26 @@ latex config: article

    {{TOC}}

    -

    Second Level

    +

    Second Level

    -

    First Level

    +

    First Level

    -

    Second Level b

    +

    Second Level b

    -

    Third Level

    +

    Third Level

    -

    Second Level c

    +

    Second Level c

    -

    First Level b

    +

    First Level b

    -

    Third Level b

    +

    Third Level b

    -

    Second level d

    +

    Second level d

    -

    Third level d

    +

    Third level d

    -

    Fourth level d

    +

    Fourth level d

    -

    First level [First Level e]

    +

    First level [First Level e]

    -

    Second level [Second Level e]

    +

    Second level [Second Level e]

    diff --git a/tests/MMD6Tests/Table of Contents.opml b/tests/MMD6Tests/Table of Contents.opml index 233a2fd..fe6b7fc 100644 --- a/tests/MMD6Tests/Table of Contents.opml +++ b/tests/MMD6Tests/Table of Contents.opml @@ -3,17 +3,17 @@ Table of Contents - - + + - + - - + + - + diff --git a/tests/MMD6Tests/Table of Contents.tex b/tests/MMD6Tests/Table of Contents.tex index 9b99b2b..05f3fc6 100644 --- a/tests/MMD6Tests/Table of Contents.tex +++ b/tests/MMD6Tests/Table of Contents.tex @@ -4,40 +4,40 @@ \tableofcontents -\chapter{Second Level } +\chapter{Second Level} \label{secondlevel} -\part{First Level } +\part{First Level} \label{firstlevel} -\chapter{Second Level b } +\chapter{Second Level b} \label{secondlevelb} -\section{Third Level } +\section{Third Level} \label{thirdlevel} -\chapter{Second Level c } +\chapter{Second Level c} \label{secondlevelc} -\part{First Level b } +\part{First Level b} \label{firstlevelb} -\section{Third Level b } +\section{Third Level b} \label{thirdlevelb} -\chapter{Second level d } +\chapter{Second level d} \label{secondleveld} -\section{Third level d } +\section{Third level d} \label{thirdleveld} -\subsection{Fourth level d } +\subsection{Fourth level d} \label{fourthleveld} -\part{First level } +\part{First level} \label{firstlevele} -\chapter{Second level } +\chapter{Second level} \label{secondlevele} \input{mmd6-article-footer} diff --git a/tests/Memoir/Integrated.tex b/tests/Memoir/Integrated.tex index 54dfb8f..fb7b3bc 100644 --- a/tests/Memoir/Integrated.tex +++ b/tests/Memoir/Integrated.tex @@ -11,7 +11,7 @@ This file is a designed as a single test that incorporates most of the identify common structures that are not supported yet -- particularly useful when developing a new output format. -\part{Basic Blocks } +\part{Basic Blocks} \label{basicblocks} paragraph @@ -46,7 +46,7 @@ blockquote \emph{emph} and \textbf{strong} and \textbf{\emph{both}} -\chapter{Escapes } +\chapter{Escapes} \label{escaped} \begin{enumerate} @@ -58,7 +58,7 @@ blockquote \end{enumerate} -\part{Footnotes } +\part{Footnotes} \label{footnotes} Foo.\footnote{This is an inline footnote} @@ -69,7 +69,7 @@ Cite.~\citep{inlinecitation} Cite.~\citep{foo} -\part{Links and Images } +\part{Links and Images} \label{linksandimages} \href{http://foo.net/}{link}\footnote{\href{http://foo.net/}{http:\slash \slash foo.net\slash }} and \href{http://bar.net}{link}\footnote{\href{http://bar.net}{http:\slash \slash bar.net}} @@ -88,7 +88,7 @@ bar (\autoref{bar}) bar (\autoref{bar}) -\part{Math } +\part{Math} \label{math} foo \({e}^{i\pi }+1=0\) bar @@ -101,12 +101,12 @@ foo ${e}^{i\pi }+1=0$, bar $${x}_{1,2}=\frac{-b\pm \sqrt{{b}^{2}-4ac}}{2a}$$ -\part{Smart Quotes } +\part{Smart Quotes} \label{smartquotes} ``foo'' and `bar' -- with --- dashes{\ldots} -\part{CriticMarkup } +\part{CriticMarkup} \label{criticmarkup} \underline{foo} @@ -119,7 +119,7 @@ $${x}_{1,2}=\frac{-b\pm \sqrt{{b}^{2}-4ac}}{2a}$$ \hl{bar} -\part{Definition Lists } +\part{Definition Lists} \label{definitionlists} \begin{description} @@ -132,12 +132,12 @@ $${x}_{1,2}=\frac{-b\pm \sqrt{{b}^{2}-4ac}}{2a}$$ baz bat* \end{description} -\part{Horizontal Rules } +\part{Horizontal Rules} \label{horizontalrules} \begin{center}\rule{3in}{0.4pt}\end{center} -\part{Glossary } +\part{Glossary} \label{glossary} \gls{term}