Org reader: change handling of inline TeX.

Previously inline TeX was handled in a way that was different
from org's own export, and that could lead to information loss.
This was particularly noticeable for inline math environments
such as `equation`.  Previously, an `equation` environment
starting at the beginning of a line would create a raw block,
splitting up the paragraph containing it (see #10836).
On the other hand, an `equation` environment not at the beginning
of a line would be turned into regular inline elements
representing the math. (This would cause the equation number to
go missing and in some cases degrade the math formatting.)

Now, we parse all of these as raw "latex" inlines, which will be
omitted when converting to formats other than LaTeX (and other
formats like pandoc's Markdown that allow raw LaTex).

Closes #10836.

5 files changed, 40 insertions, 30 deletions

diff --git a/test/Tests/Readers/Org/Block.hs b/test/Tests/Readers/Org/Block.hs
index 0b47b90b3..2bb658213 100644
--- a/test/Tests/Readers/Org/Block.hs
+++ b/test/Tests/Readers/Org/Block.hs
@@ -169,26 +169,24 @@ tests =
       rawBlock "html" "<samp>Hello, World!</samp>\n"
 
     , "LaTeX fragment" =:
-      T.unlines [ "\\begin{equation}"
-                , "X_i = \\begin{cases}"
-                , "      G_{\\alpha(i)} & \\text{if }\\alpha(i-1) = \\alpha(i)\\\\"
-                , "      C_{\\alpha(i)} & \\text{otherwise}"
-                , "      \\end{cases}"
-                , "\\end{equation}"
-                ] =?>
-      rawBlock "latex"
-      (T.unlines [ "\\begin{equation}"
-               , "X_i = \\begin{cases}"
-               , "      G_{\\alpha(i)} & \\text{if }\\alpha(i-1) =" <>
-                 " \\alpha(i)\\\\"
-               , "      C_{\\alpha(i)} & \\text{otherwise}"
-               , "      \\end{cases}"
-               , "\\end{equation}"
-               ])
+      "\\begin{equation}\n\
+      \X_i = \\begin{cases}\n\
+      \      G_{\\alpha(i)} & \\text{if }\\alpha(i-1) = \\alpha(i)\\\\\n\
+      \      C_{\\alpha(i)} & \\text{otherwise}\n\
+      \      \\end{cases}\n\
+      \\\end{equation}"
+      =?>
+      para (rawInline "latex"
+             "\\begin{equation}\n\
+             \X_i = \\begin{cases}\n\
+             \      G_{\\alpha(i)} & \\text{if }\\alpha(i-1) = \\alpha(i)\\\\\n\
+             \      C_{\\alpha(i)} & \\text{otherwise}\n\
+             \      \\end{cases}\n\
+             \\\end{equation}")
 
     , "One-line LaTeX fragment" =:
       "\\begin{equation} 2 + 3 \\end{equation}" =?>
-      rawBlock "latex" "\\begin{equation} 2 + 3 \\end{equation}\n"
+      para (rawInline "latex" "\\begin{equation} 2 + 3 \\end{equation}")
 
     , "LaTeX fragment with more arguments" =:
       T.unlines [ "\\begin{tikzcd}[ampersand replacement=\\&]"
diff --git a/test/Tests/Readers/Org/Directive.hs b/test/Tests/Readers/Org/Directive.hs
index db997afa8..1f80e8607 100644
--- a/test/Tests/Readers/Org/Directive.hs
+++ b/test/Tests/Readers/Org/Directive.hs
@@ -188,7 +188,7 @@ tests =
           T.unlines [ "#+OPTIONS: tex:t"
                     , "Hello \\emph{Name}"
                     ] =?>
-          para ("Hello" <> space <> emph "Name")
+          para ("Hello" <> space <> rawInline "latex" "\\emph{Name}")
 
         , "Alpha" =:
           T.unlines [ "#+OPTIONS: tex:t"
@@ -197,15 +197,15 @@ tests =
           para "α"
 
         , "equation environment" =:
-          T.unlines [ "#+OPTIONS: tex:t"
-                    , "\\begin{equation}"
-                    , "f(x) = x^2"
-                    , "\\end{equation}"
-                    ] =?>
-          rawBlock "latex" (T.unlines [ "\\begin{equation}"
-                                      , "f(x) = x^2"
-                                      , "\\end{equation}"
-                                      ])
+          "#+OPTIONS: tex:t\n\
+          \\\begin{equation}\n\
+          \f(x) = x^2\n\
+          \\\end{equation}"
+          =?>
+          para (rawInline "latex"
+                 "\\begin{equation}\n\
+                 \f(x) = x^2\n\
+                 \\\end{equation}")
         ]
 
       , testGroup "Ignore LaTeX fragments"
@@ -227,7 +227,7 @@ tests =
                     , "f(x) = x^2"
                     , "\\end{equation}"
                     ] =?>
-          (mempty :: Blocks)
+          (para mempty)
         ]
 
       , testGroup "Verbatim LaTeX"
diff --git a/test/Tests/Readers/Org/Inline.hs b/test/Tests/Readers/Org/Inline.hs
index 21f42858c..00956e1ce 100644
--- a/test/Tests/Readers/Org/Inline.hs
+++ b/test/Tests/Readers/Org/Inline.hs
@@ -342,7 +342,7 @@ tests =
 
   , "Inline LaTeX command with spaces" =:
       "\\emph{Emphasis mine}" =?>
-      para (emph "Emphasis mine")
+      para (rawInline "latex" "\\emph{Emphasis mine}")
 
   , "Inline math symbols" =:
       "\\tau \\oplus \\alpha" =?>
diff --git a/test/Tests/Readers/Org/Inline/Citation.hs b/test/Tests/Readers/Org/Inline/Citation.hs
index ed60a16e9..3849ae3e7 100644
--- a/test/Tests/Readers/Org/Inline/Citation.hs
+++ b/test/Tests/Readers/Org/Inline/Citation.hs
@@ -208,6 +208,6 @@ tests =
                    , citationMode = NormalCitation
                    , citationNoteNum = 0
                    , citationHash = 0}
-    in (para . cite [citation] $ rawInline "latex" "\\cite{Coffee}")
+    in (para $ rawInline "latex" "\\cite{Coffee}")
 
   ]
diff --git a/test/command/10836.md b/test/command/10836.md
new file mode 100644
index 000000000..864361b5c
--- /dev/null
+++ b/test/command/10836.md
@@ -0,0 +1,12 @@
+```
+% pandoc -f org -t latex
+Some equation here
+\begin{equation}
+x = y
+\end{equation}
+where $x$ is something important.
+^D
+Some equation here \begin{equation}
+x = y
+\end{equation} where \(x\) is something important.
+```