FIXED: Fix bug in citation links

diff --git a/src/html.c b/src/html.c
index cda764f71978bb2bceed3a04856b278de7fd49b1..6d08ee7e7292f8f89e2ecb1a2265808774d1ebab 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -1530,6 +1530,7 @@ void mmd_export_footnote_list_html(DString * out, const char * source, scratch_p
                pad(out, 2, scratch);
                print("</ol>\n</div>");
                scratch->padded = 0;
+               scratch->footnote_being_printed = 0;
        }
 }
 
@@ -1577,6 +1578,7 @@ void mmd_export_citation_list_html(DString * out, const char * source, scratch_p
                pad(out, 2, scratch);
                print("</ol>\n</div>");
                scratch->padded = 0;
+               scratch->citation_being_printed = 0;
        }
 }
 

diff --git a/tests/MMD6Tests/Dutch.html b/tests/MMD6Tests/Dutch.html
index bf863740b31f121a5b734c7b097588d574391ef4..ccb0e226d27a9bb0dbfdf8bcf8c9b11809c8521d 100644 (file)
--- a/tests/MMD6Tests/Dutch.html
+++ b/tests/MMD6Tests/Dutch.html
@@ -32,7 +32,7 @@
 <ol>
 
 <li id="cn:1">
-<p>bar <a href="#fnref:1" title="return to body" class="reversefootnote">&#160;&#8617;</a></p>
+<p>bar <a href="#cnref:1" title="return to body" class="reversecitation">&#160;&#8617;</a></p>
 </li>
 
 </ol>

diff --git a/tests/MMD6Tests/English.html b/tests/MMD6Tests/English.html
index 40c4da470c104bd472842fed9faefe8032307045..5af934779bab1c22487918156a7198100e99abf1 100644 (file)
--- a/tests/MMD6Tests/English.html
+++ b/tests/MMD6Tests/English.html
@@ -32,7 +32,7 @@
 <ol>
 
 <li id="cn:1">
-<p>bar <a href="#fnref:1" title="return to body" class="reversefootnote">&#160;&#8617;</a></p>
+<p>bar <a href="#cnref:1" title="return to body" class="reversecitation">&#160;&#8617;</a></p>
 </li>
 
 </ol>

diff --git a/tests/MMD6Tests/French.html b/tests/MMD6Tests/French.html
index 3046b5e26100218f984eed2e1c8e07ec22eaad27..b27c02c5fa483f6ab49dfd09af1e25da31788404 100644 (file)
--- a/tests/MMD6Tests/French.html
+++ b/tests/MMD6Tests/French.html
@@ -32,7 +32,7 @@
 <ol>
 
 <li id="cn:1">
-<p>bar <a href="#fnref:1" title="return to body" class="reversefootnote">&#160;&#8617;</a></p>
+<p>bar <a href="#cnref:1" title="return to body" class="reversecitation">&#160;&#8617;</a></p>
 </li>
 
 </ol>

diff --git a/tests/MMD6Tests/German Guillemets.html b/tests/MMD6Tests/German Guillemets.html
index 05627f68d2762d73d5e44e116a1d32b1149d93af..e9965fd4885e7d699ffdff6e9bca884989e82aa8 100644 (file)
--- a/tests/MMD6Tests/German Guillemets.html
+++ b/tests/MMD6Tests/German Guillemets.html
@@ -32,7 +32,7 @@
 <ol>
 
 <li id="cn:1">
-<p>bar <a href="#fnref:1" title="zum Haupttext" class="reversefootnote">&#160;&#8617;</a></p>
+<p>bar <a href="#cnref:1" title="zum Haupttext" class="reversecitation">&#160;&#8617;</a></p>
 </li>
 
 </ol>

diff --git a/tests/MMD6Tests/German.html b/tests/MMD6Tests/German.html
index 4b468a11c7d5fd98a0a5338db457c0aff22e8052..26c893a689061b5d84f35ccf31138e6ab891758b 100644 (file)
--- a/tests/MMD6Tests/German.html
+++ b/tests/MMD6Tests/German.html
@@ -32,7 +32,7 @@
 <ol>
 
 <li id="cn:1">
-<p>bar <a href="#fnref:1" title="zum Haupttext" class="reversefootnote">&#160;&#8617;</a></p>
+<p>bar <a href="#cnref:1" title="zum Haupttext" class="reversecitation">&#160;&#8617;</a></p>
 </li>
 
 </ol>

diff --git a/tests/MMD6Tests/Integrated.html b/tests/MMD6Tests/Integrated.html
index f9aca9ab59c9a391a394ebfe54ec2853f0472ea6..0b22f41cdeb2202b226c05c6c549d1180ada47a3 100644 (file)
--- a/tests/MMD6Tests/Integrated.html
+++ b/tests/MMD6Tests/Integrated.html
@@ -38,12 +38,25 @@ code
 <li><p>[</p></li>
 </ol>
 
+<h1 id="footnotes">Footnotes </h1>
+
 <p>Foo.<a href="#fn:1" id="fnref:1" title="see footnote" class="footnote">[1]</a></p>
 
 <p>Bar.<a href="#fn:2" id="fnref:2" title="see footnote" class="footnote">[2]</a></p>
 
+<p>Cite.<a href="#cn:1" id="cnref:1" title="see citation" class="citation">[1]</a></p>
+
+<h1 id="linksandimages">Links and Images </h1>
+
 <p><a href="http://foo.net/">link</a> and <a href="http://bar.net" title="title" class="custom">link</a></p>
 
+<figure>
+<img src="http://foo.bar/" alt="test" title="title" width="40px" height="400px" />
+<figcaption>test</figcaption>
+</figure>
+
+<h1 id="math">Math </h1>
+
 <p>math <span class="math">\({e}^{i\pi }+1=0\)</span></p>
 
 <h1 id="smartquotes">Smart Quotes </h1>
@@ -72,6 +85,10 @@ code
 <dd>baz bat*</dd>
 </dl>
 
+<h1 id="horizontalrules">Horizontal Rules </h1>
+
+<hr />
+
 <div class="footnotes">
 <hr />
 <ol>
@@ -86,3 +103,14 @@ code
 
 </ol>
 </div>
+
+<div class="citations">
+<hr />
+<ol>
+
+<li id="cn:1">
+<p>Inline Citation <a href="#cnref:1" title="return to body" class="reversecitation">&#160;&#8617;</a></p>
+</li>
+
+</ol>
+</div>

diff --git a/tests/MMD6Tests/Integrated.htmlc b/tests/MMD6Tests/Integrated.htmlc
index e1f71c0a305ea12e85802f468b9e6f8789919b12..e58e7145855025fd4cc4992860e1c9b1fce9aada 100644 (file)
--- a/tests/MMD6Tests/Integrated.htmlc
+++ b/tests/MMD6Tests/Integrated.htmlc
@@ -37,16 +37,26 @@ code
 <li><p>[</p></li>
 </ol>
 
+<h1>Footnotes </h1>
+
 <p>Foo.[^This is an inline footnote]</p>
 
 <p>Bar.[^foot]</p>
 
 <p>[^foot]: And a reference footnote.</p>
 
+<p>Cite.[#Inline Citation]</p>
+
+<h1>Links and Images </h1>
+
 <p><a href="http://foo.net/">link</a> and [link]</p>
 
 <p>[link]: http://bar.net &quot;title&quot; class=&quot;custom&quot;</p>
 
+<p>![test](http://foo.bar/ &quot;title&quot; width=&quot;40px&quot; height=400px)</p>
+
+<h1>Math </h1>
+
 <p>math ${e}^{i\pi }+1=0$</p>
 
 <h1>Smart Quotes </h1>
@@ -71,3 +81,7 @@ code
 bar
 :      <em>foo bar
 :      baz bat</em></p>
+
+<h1>Horizontal Rules </h1>
+
+<hr />

diff --git a/tests/MMD6Tests/Integrated.tex b/tests/MMD6Tests/Integrated.tex
index 2c79737ee993a35f878f61f11eebcc01fa8835fa..84dde238946fb0c447f9b7a433f0cbee04e1ba0a 100644 (file)
--- a/tests/MMD6Tests/Integrated.tex
+++ b/tests/MMD6Tests/Integrated.tex
@@ -47,12 +47,24 @@ blockquote
 
 \end{enumerate}
 
+\part{Footnotes }
+\label{footnotes}
+
 Foo.\footnote{This is an inline footnote}
 
 Bar.\footnote{And a reference footnote.}
 
+Cite.\citesyntax TBD
+
+\part{Links and Images }
+\label{linksandimages}
+
 \href{http://foo.net/}{link}\footnote{\href{http://foo.net/}{http:/\slash foo.net\slash }} and \href{http://bar.net}{link}\footnote{\href{http://bar.net}{http:/\slash bar.net}}
 
+
+\part{Math }
+\label{math}
+
 math ${e}^{i\pi }+1=0$
 
 \part{Smart Quotes }
@@ -78,8 +90,15 @@ math ${e}^{i\pi }+1=0$
 
 \begin{description}
 \item[foo]
+
 \item[bar]
+
 *foo bar
 
 baz bat*
 \end{description}
+
+\part{Horizontal Rules }
+\label{horizontalrules}
+
+\begin{center}\rule{3in}{0.4pt}\end{center}

diff --git a/tests/MMD6Tests/Integrated.text b/tests/MMD6Tests/Integrated.text
index 30fd2803e5e2732b6a840e305b2af651248871f8..089e8754e94cf6de950b318b2376caa9a3cbca7e 100644 (file)
--- a/tests/MMD6Tests/Integrated.text
+++ b/tests/MMD6Tests/Integrated.text
@@ -36,22 +36,37 @@ Escapes [escaped]
 
 3. \[
 
+
+# Footnotes #
+
 Foo.[^This is an inline footnote]
 
 Bar.[^foot]
 
 [^foot]: And a reference footnote.
 
+Cite.[#Inline Citation]
+
+
+# Links and Images #
+
 [link](http://foo.net/) and [link]
 
 [link]: http://bar.net "title" class="custom"
 
+![test](http://foo.bar/ "title" width="40px" height=400px)
+
+
+# Math #
+
 math ${e}^{i\pi }+1=0$
 
+
 # Smart Quotes # 
 
 "foo" and 'bar' -- with --- dashes...
 
+
 # CriticMarkup #
 
 {++foo++}
@@ -64,9 +79,16 @@ math ${e}^{i\pi }+1=0$
 
 {==bar==}
 
+
 # Definition Lists #
 
 foo
 bar
 :      *foo bar
 :      baz bat*
+
+
+# Horizontal Rules #
+
+----
+

diff --git a/tests/MMD6Tests/Swedish.html b/tests/MMD6Tests/Swedish.html
index 07a918cb4fea954bf1953d76145a0079473d810d..4f4cf7459635455ee10d5f05bca0ea178fa15602 100644 (file)
--- a/tests/MMD6Tests/Swedish.html
+++ b/tests/MMD6Tests/Swedish.html
@@ -32,7 +32,7 @@
 <ol>
 
 <li id="cn:1">
-<p>bar <a href="#fnref:1" title="return to body" class="reversefootnote">&#160;&#8617;</a></p>
+<p>bar <a href="#cnref:1" title="return to body" class="reversecitation">&#160;&#8617;</a></p>
 </li>
 
 </ol>