Use Pun for primes in TeX reader, revise type of toPrimes.

This will ensure that `mo` is used for primes in MathML.

Author: jgm

src/Text/TeXMath/Readers/TeX.hs

@@ -68,8 +68,8 @@ expr1 = do
   case getPrimes primes of
     "" -> return e
     cs -> return $ case e of
-                     ESub b sub -> ESubsup b sub (ESymbol Ord (T.pack cs))
-                     _ -> ESuper e (ESymbol Ord (T.pack cs))
+                     ESub b sub -> ESubsup b sub (ESymbol Pun (T.pack cs))
+                     _ -> ESuper e (ESymbol Pun (T.pack cs))
 
 expr2 :: TP Exp
 expr2 = choice

src/Text/TeXMath/Shared.hs

@@ -362,13 +362,16 @@ isUppercaseGreek t = not (T.null t) && T.all isUGreek t
  where
   isUGreek c = c >= '\x0391' && c <= '\x03A9'
 
-toPrimes :: T.Text -> Maybe T.Text
-toPrimes t =
-  case T.uncons t of
-    Nothing -> Just ""
-    Just ('\'', t') -> ("'" <>) <$> toPrimes t'
-    Just ('\x2032', t') -> ("'" <>) <$> toPrimes t'
-    Just ('\x2033', t') -> ("''" <>) <$> toPrimes t'
-    Just ('\x2034', t') -> ("'''" <>) <$> toPrimes t'
-    Just ('\x2057', t') -> ("''''" <>) <$> toPrimes t'
-    _ -> Nothing
+toPrimes :: Exp -> Maybe T.Text
+toPrimes (ESymbol ty s) | ty == Pun || ty == Ord = go s
+ where
+  go t =
+    case T.uncons t of
+      Nothing -> Just ""
+      Just ('\'', t') -> ("'" <>) <$> go t'
+      Just ('\x2032', t') -> ("'" <>) <$> go t'
+      Just ('\x2033', t') -> ("''" <>) <$> go t'
+      Just ('\x2034', t') -> ("'''" <>) <$> go t'
+      Just ('\x2057', t') -> ("''''" <>) <$> go t'
+      _ -> Nothing
+toPrimes _ = Nothing

src/Text/TeXMath/Writers/Eqn.hs

@@ -165,15 +165,13 @@ writeExp (EFraction fractype e1 e2) = writeExp' e1 <> op <> writeExp' e2
                 else " over "
 writeExp (ESub b e1) = writeExp' b <> " sub " <> writeExp' e1
 writeExp (ESuper b e1) = writeExp' b <>
-  case e1 of
-    ESymbol Ord s
-     | Just ps <- toPrimes s -> ps
+  case toPrimes e1 of
+    Just ps -> ps
     _ -> " sup " <> writeExp' e1
 writeExp (ESubsup b e1 e2) =
   writeExp' b <> " sub " <> writeExp' e1 <>
-  case e2 of
-    ESymbol Ord s
-     | Just cs <- toPrimes s -> writeExp' b <> cs
+  case toPrimes e2 of
+    Just ps -> ps
     _ -> " sup " <> writeExp' e2
 writeExp (EOver _convertible b e1) =
   writeExp' b <> " to " <> writeExp' e1

src/Text/TeXMath/Writers/TeX.hs

@@ -199,18 +199,16 @@ writeExp (ESub b e1) = do
   tellGroup (writeExp e1)
 writeExp (ESuper b e1) = do
   (if isFancy b then tellGroup else id) $ writeExp b
-  case e1 of
-    ESymbol Ord s
-      | Just ps <- S.toPrimes s -> tell (replicate (T.length ps) (Token '\''))
+  case S.toPrimes e1 of
+    Just ps -> tell (replicate (T.length ps) (Token '\''))
     _ -> do tell [Token '^']
             tellGroup (writeExp e1)
 writeExp (ESubsup b e1 e2) = do
   (if isFancy b then tellGroup else id) $ writeExp b
   tell [Token '_']
   tellGroup (writeExp e1)
-  case e2 of
-    ESymbol Ord s
-      | Just ps <- S.toPrimes s -> tell (replicate (T.length ps) (Token '\''))
+  case S.toPrimes e2 of
+    Just ps -> tell (replicate (T.length ps) (Token '\''))
     _ -> do tell [Token '^']
             tellGroup (writeExp e2)
 writeExp (EOver convertible b e1) = do

src/Text/TeXMath/Writers/Typst.hs

@@ -140,14 +140,12 @@ writeExp (EFraction _fractype e1 e2) =
     _ -> writeExp e1 <> " / " <> writeExp e2
 writeExp (ESub b e1) = writeExpB b <> "_" <> writeExpS e1
 writeExp (ESuper b e1) = writeExpB b <>
-  case e1 of
-    ESymbol Ord t
-      | Just ps <- S.toPrimes t -> ps
+  case S.toPrimes e1 of
+    Just ps -> ps
     _ -> "^" <> writeExpS e1
 writeExp (ESubsup b e1 e2) = writeExpB b <> "_" <> writeExpS e1 <>
-  case e2 of
-    ESymbol Ord t
-      | Just ps <- S.toPrimes t -> ps
+  case S.toPrimes e2 of
+    Just ps -> ps
     _ -> "^" <> writeExpS e2
 writeExp (EOver _ (EOver _ b (ESymbol TOver "\9182")) e1) =
   "overbrace(" <> writeExp b <> ", " <> writeExp e1 <> ")"

test/reader/tex/07.test

@@ -3,13 +3,13 @@ u'' + p(x)u' + q(x)u=f(x),\quad x>a
 
 
 >>> native
-[ ESuper (EIdentifier "u") (ESymbol Ord "\8243")
+[ ESuper (EIdentifier "u") (ESymbol Pun "\8243")
 , ESymbol Bin "+"
 , EIdentifier "p"
 , ESymbol Open "("
 , EIdentifier "x"
 , ESymbol Close ")"
-, ESuper (EIdentifier "u") (ESymbol Ord "\8242")
+, ESuper (EIdentifier "u") (ESymbol Pun "\8242")
 , ESymbol Bin "+"
 , EIdentifier "q"
 , ESymbol Open "("