Fix encoding of some markup inside LaTeX texttt environment (fixes #110…

… and #108)
fletcher · Feb 4, 2018 · 8dc8ee9 · 8dc8ee9
1 parent adcbea5
commit 8dc8ee9
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 0 deletions.
diff --git a/Sources/libMultiMarkdown/latex.c b/Sources/libMultiMarkdown/latex.c
@@ -2140,6 +2140,17 @@ void mmd_export_token_latex_tt(DString * out, const char * source, token * t, sc
 			mmd_print_char_latex(out, source[t->start + 1]);
 			break;
 
+		case HASH1:
+		case HASH2:
+		case HASH3:
+		case HASH4:
+		case HASH5:
+		case HASH6:
+		case TEXT_HASH:
+			print_const("\\");
+			print_token(t);
+			break;
+
 		case HTML_ENTITY:
 			if (source[t->start + 1] == '#') {
 				print_const("\\&\\#");
@@ -2156,6 +2167,14 @@ void mmd_export_token_latex_tt(DString * out, const char * source, token * t, sc
 				t->next->type = TEXT_EMPTY;
 			}
 
+		case MATH_DOLLAR_SINGLE:
+			print_const("\\$");
+			break;
+
+		case MATH_DOLLAR_DOUBLE:
+			print_const("\\$\\$");
+			break;
+
 		case MATH_BRACKET_OPEN:
 		case MATH_BRACKET_CLOSE:
 		case MATH_PAREN_OPEN:

diff --git a/tests/MMD6Tests/Amps and Angles.fodt b/tests/MMD6Tests/Amps and Angles.fodt
@@ -307,6 +307,10 @@ office:mimetype="application/vnd.oasis.opendocument.text">
 <text:p text:style-name="Standard">&amp;#169; <text:span text:style-name="Source_20_Text">&amp;#169;</text:span></text:p>
 
 <text:p text:style-name="Standard">&amp;#xA9; <text:span text:style-name="Source_20_Text">&amp;#xA9;</text:span></text:p>
+
+<text:p text:style-name="Standard">15</text:p>
+
+<text:p text:style-name="Standard"><text:span text:style-name="Source_20_Text">&amp; and &amp;amp; and &lt; and &gt; in code span.</text:span></text:p>
 </office:text>
 </office:body>
 </office:document>
diff --git a/tests/MMD6Tests/Amps and Angles.html b/tests/MMD6Tests/Amps and Angles.html
@@ -37,6 +37,10 @@
 
 <p>&#xA9; <code>&amp;#xA9;</code></p>
 
+<p>15</p>
+
+<p><code>&amp; and &amp;amp; and &lt; and &gt; in code span.</code></p>
+
 </body>
 </html>
 
diff --git a/tests/MMD6Tests/Amps and Angles.htmlc b/tests/MMD6Tests/Amps and Angles.htmlc
@@ -31,3 +31,7 @@ latex config:	article</p>
 <p>&#169; <code>&amp;#169;</code></p>
 
 <p>&#xA9; <code>&amp;#xA9;</code></p>
+
+<p>15</p>
+
+<p><code>&amp; and &amp;amp; and &lt; and &gt; in code span.</code></p>
diff --git a/tests/MMD6Tests/Amps and Angles.tex b/tests/MMD6Tests/Amps and Angles.tex
@@ -34,5 +34,9 @@
 
 \&\#xA9; \texttt{\&\#xA9;}
 
+15
+
+\texttt{\& and \& and < and > in code span.}
+
 \input{mmd6-article-footer}
 \end{document}
diff --git a/tests/MMD6Tests/Amps and Angles.text b/tests/MMD6Tests/Amps and Angles.text
@@ -33,3 +33,7 @@ Here is an inline [link](</script?foo=1&bar=2>).
 &#169; `&#169;`
 
 &#xA9; `&#xA9;`
+
+15
+
+`& and &amp; and < and > in code span.`
diff --git a/tests/MMD6Tests/Code Spans.fodt b/tests/MMD6Tests/Code Spans.fodt
@@ -311,6 +311,12 @@ office:mimetype="application/vnd.oasis.opendocument.text">
 <text:p text:style-name="Standard"><text:span text:style-name="Source_20_Text">-&lt;&gt;--&amp;\&amp;---...</text:span></text:p>
 
 <text:p text:style-name="Standard"><text:span text:style-name="Source_20_Text">`foo`</text:span></text:p>
+
+<text:p text:style-name="Standard">15</text:p>
+
+<text:p text:style-name="Standard"><text:span text:style-name="Source_20_Text">$foo &lt;&lt; $bar</text:span></text:p>
+
+<text:p text:style-name="Standard"><text:span text:style-name="Source_20_Text">#foo</text:span></text:p>
 </office:text>
 </office:body>
 </office:document>
diff --git a/tests/MMD6Tests/Code Spans.html b/tests/MMD6Tests/Code Spans.html
@@ -41,6 +41,12 @@
 
 <p><code>`foo`</code></p>
 
+<p>15</p>
+
+<p><code>$foo &lt;&lt; $bar</code></p>
+
+<p><code>#foo</code></p>
+
 </body>
 </html>
 
diff --git a/tests/MMD6Tests/Code Spans.htmlc b/tests/MMD6Tests/Code Spans.htmlc
@@ -35,3 +35,9 @@ baz</code></p>
 <p><code>-&lt;&gt;--&amp;\&amp;---...</code></p>
 
 <p><code>`foo`</code></p>
+
+<p>15</p>
+
+<p><code>$foo &lt;&lt; $bar</code></p>
+
+<p><code>#foo</code></p>
diff --git a/tests/MMD6Tests/Code Spans.tex b/tests/MMD6Tests/Code Spans.tex
@@ -37,5 +37,11 @@
 
 \texttt{`foo`}
 
+15
+
+\texttt{\$foo << \$bar}
+
+\texttt{\#foo}
+
 \input{mmd6-article-footer}
 \end{document}
diff --git a/tests/MMD6Tests/Code Spans.text b/tests/MMD6Tests/Code Spans.text
@@ -37,3 +37,9 @@ foo
 `-<>--&\&---...`
 
 `` `foo` ``
+
+15
+
+`$foo << $bar`
+
+`#foo`