md2tex: Two bugs prevented graceful handling of ampersands in headings

md2tex

@@ -42,7 +42,7 @@ function inline(text) {
   gsub(/_/, "\\_", text)
   gsub(/#/, "\\#", text)
   gsub(/%/, "\\%", text)
-  gsub(/&/, "\\&", text)
+  gsub(/&/, "\\\\&", text)
   gsub(/\^/, "\\textasciicircum ", text)
   gsub(/\.{3,}/, "\\ldots", text)
   text = gensub(/\*\*([^\*]*)\*\*/, "\\textbf{\\1}", "g", text)
@@ -88,13 +88,13 @@ function inline(text) {
   t="section"
   for (i=3; i<=d; i++) t="sub"t
   gsub(/^#* /, "", $0)
-  tag(t"{" $0 "}")
+  tag(t"{" inline($0) "}")
   next
 }
 
 /^### / {
   gsub(/^#* /, "", $0)
-  tag("subsection{" $0 "}")
+  tag("subsection{" inline($0) "}")
   next
 }