diff --git a/src/Text/TeXMath/Writers/Typst.hs b/src/Text/TeXMath/Writers/Typst.hs index 2894f9d3..842b2e24 100644 --- a/src/Text/TeXMath/Writers/Typst.hs +++ b/src/Text/TeXMath/Writers/Typst.hs @@ -308,9 +308,13 @@ tshow :: Show a => a -> Text tshow = T.pack . show typstSymbolMap :: M.Map Text Text -typstSymbolMap = M.fromList $ - ("\776", "dot.double") -- see #231 - : [(s,name) | (name, _, s) <- typstSymbols] +typstSymbolMap = + -- prefer inter names for typst-symbols (sect is deprecated) + M.insert "\x22C2" "inter.big" $ + M.insert "\x2229" "inter" $ + M.fromList $ + ("\776", "dot.double") -- see #231 + : [(s,name) | (name, _, s) <- typstSymbols] getAccentCommand :: Text -> Maybe Text getAccentCommand ac = do diff --git a/test/writer/typst/deMorgans_law.test b/test/writer/typst/deMorgans_law.test index 3d7f258c..5944c56d 100644 --- a/test/writer/typst/deMorgans_law.test +++ b/test/writer/typst/deMorgans_law.test @@ -36,4 +36,4 @@ (ESymbol TOver "\175") ] >>> typst -not (p and q) arrow.l.r.double (not p) or (not q) overline(union.big_(i = 1)^n A_i) = sect.big_(i = 1)^n overline(A_i) +not (p and q) arrow.l.r.double (not p) or (not q) overline(union.big_(i = 1)^n A_i) = inter.big_(i = 1)^n overline(A_i) diff --git a/test/writer/typst/intersection_operators.test b/test/writer/typst/intersection_operators.test new file mode 100644 index 00000000..d9686712 --- /dev/null +++ b/test/writer/typst/intersection_operators.test @@ -0,0 +1,4 @@ +<<< native +[ ESymbol Bin "\8745" , ESymbol Op "\8898" ] +>>> typst +inter inter.big diff --git a/test/writer/typst/largeop1.test b/test/writer/typst/largeop1.test index 2ca7b9a2..3116b36a 100644 --- a/test/writer/typst/largeop1.test +++ b/test/writer/typst/largeop1.test @@ -76,9 +76,9 @@ ] ] >>> typst -upright("displaystyle: false largeop: false") & and.big or.big integral sum product union.big sect.big\ -upright("displaystyle: false largeop: true") & and.big or.big integral sum product union.big sect.big\ -upright("displaystyle: true largeop: false") & and.big or.big integral sum product union.big sect.big\ -upright("displaystyle: true largeop: true") & and.big or.big integral sum product union.big sect.big\ -upright("displaystyle: false largeop: default") & and.big or.big integral sum product union.big sect.big\ -upright("displaystyle: true largeop: default") & and.big or.big integral sum product union.big sect.big +upright("displaystyle: false largeop: false") & and.big or.big integral sum product union.big inter.big\ +upright("displaystyle: false largeop: true") & and.big or.big integral sum product union.big inter.big\ +upright("displaystyle: true largeop: false") & and.big or.big integral sum product union.big inter.big\ +upright("displaystyle: true largeop: true") & and.big or.big integral sum product union.big inter.big\ +upright("displaystyle: false largeop: default") & and.big or.big integral sum product union.big inter.big\ +upright("displaystyle: true largeop: default") & and.big or.big integral sum product union.big inter.big diff --git a/test/writer/typst/largeopPos3.test b/test/writer/typst/largeopPos3.test index be115d88..b8954c81 100644 --- a/test/writer/typst/largeopPos3.test +++ b/test/writer/typst/largeopPos3.test @@ -8,4 +8,4 @@ [ EIdentifier "A" , ESymbol Bin "\8745" , EIdentifier "B" ] ] >>> typst -sect.big_(i = 0)^oo A sect B +inter.big_(i = 0)^oo A inter B