Use lastest texmath, typst-symbols, typst.

Targets typst 0.7.

5 files changed, 25 insertions, 28 deletions

diff --git a/cabal.project b/cabal.project
index b423bb624..1565d8005 100644
--- a/cabal.project
+++ b/cabal.project
@@ -5,11 +5,9 @@ packages: .
 tests: True
 flags: +embed_data_files
 constraints: skylighting-format-blaze-html >= 0.1.1,
-             skylighting-format-context >= 0.1.0.2,
-             typst-symbols == 0.1.2
--- for typst 0.6 support; remove this constraint when we support typst 0.7
+             skylighting-format-context >= 0.1.0.2
 
-source-repository-package
-  type: git
-  location: https://github.com/jgm/texmath
-  tag: 0a7b5a58e1969d93e18ff7d39f8375098e21300b
+-- source-repository-package
+--   type: git
+--   location: https://github.com/jgm/texmath
+--   tag: 0a7b5a58e1969d93e18ff7d39f8375098e21300b
diff --git a/pandoc.cabal b/pandoc.cabal
index 11b8bb1d6..90bc3e3ab 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -514,7 +514,7 @@ library
                  syb                   >= 0.1      && < 0.8,
                  tagsoup               >= 0.14.6   && < 0.15,
                  temporary             >= 1.1      && < 1.4,
-                 texmath               >= 0.12.8   && < 0.13,
+                 texmath               >= 0.12.8.1 && < 0.13,
                  text                  >= 1.1.1.0  && < 2.1,
                  text-conversions      >= 0.3      && < 0.4,
                  time                  >= 1.5      && < 1.14,
@@ -524,7 +524,7 @@ library
                  zip-archive           >= 0.4.3    && < 0.5,
                  zlib                  >= 0.5      && < 0.7,
                  xml                   >= 1.3.12   && < 1.4,
-                 typst                 >= 0.3.1    && < 0.4,
+                 typst                 >= 0.3.2.0  && < 0.3.3,
                  vector                >= 0.12     && < 0.14
 
   if !os(windows)
diff --git a/stack.yaml b/stack.yaml
index a4c5aec98..dae549a2f 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -19,11 +19,10 @@ extra-deps:
 - crypton-x509-system-1.6.7
 - crypton-x509-validation-1.6.12
 - http-client-tls-0.3.6.2
-- typst-symbols-0.1.2
+- typst-symbols-0.1.4
 - toml-parser-1.3.0.0
-- typst-0.3.1.0
-- git: https://github.com/jgm/texmath
-  commit: 0a7b5a58e1969d93e18ff7d39f8375098e21300b
+- typst-0.3.2.0
+- texmath-0.12.8.1
 
 ghc-options:
    "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/test/typst-reader.native b/test/typst-reader.native
index 2f037fa7b..53aa4eda7 100644
--- a/test/typst-reader.native
+++ b/test/typst-reader.native
@@ -1926,7 +1926,7 @@ Pandoc
                           [ Para
                               [ Span
                                   ( "" , [ "box" ] , [] )
-                                  [ Math InlineMath "\\Sigma^{*}"
+                                  [ Math InlineMath "\\Sigma^{\\ast}"
                                   , Str "\8192"
                                   , Code ( "" , [] , [] ) "Sigma^*"
                                   ]
@@ -2909,7 +2909,7 @@ Pandoc
                           [ Para
                               [ Span
                                   ( "" , [ "box" ] , [] )
-                                  [ Math InlineMath "< <"
+                                  [ Math InlineMath "\\ll"
                                   , Str "\8192"
                                   , Code ( "" , [] , [] ) "<<"
                                   , Str ","
@@ -2928,7 +2928,7 @@ Pandoc
                                   ( "" , [ "box" ] , [] )
                                   [ Math InlineMath "\\cong"
                                   , Str "\8192"
-                                  , Code ( "" , [] , [] ) "tilde.eqq"
+                                  , Code ( "" , [] , [] ) "tilde.equiv"
                                   ]
                               ]
                           ]
@@ -2940,7 +2940,7 @@ Pandoc
                           [ Para
                               [ Span
                                   ( "" , [ "box" ] , [] )
-                                  [ Math InlineMath "*"
+                                  [ Math InlineMath "\\ast"
                                   , Str "\8192"
                                   , Code ( "" , [] , [] ) "*"
                                   , Str ","
@@ -2960,7 +2960,7 @@ Pandoc
                           [ Para
                               [ Span
                                   ( "" , [ "box" ] , [] )
-                                  [ Math InlineMath "> >"
+                                  [ Math InlineMath "\\gg"
                                   , Str "\8192"
                                   , Code ( "" , [] , [] ) ">>"
                                   , Str ","
@@ -2980,7 +2980,7 @@ Pandoc
                                   [ Math InlineMath "\\ncong"
                                   , Str "\8192"
                                   , Code
-                                      ( "" , [] , [] ) "tilde.eqq.not"
+                                      ( "" , [] , [] ) "tilde.equiv.not"
                                   ]
                               ]
                           ]
@@ -3106,7 +3106,7 @@ Pandoc
                                   ( "" , [ "box" ] , [] )
                                   [ Math InlineMath "\\equiv"
                                   , Str "\8192"
-                                  , Code ( "" , [] , [] ) "ident"
+                                  , Code ( "" , [] , [] ) "equiv"
                                   ]
                               ]
                           ]
@@ -3519,7 +3519,7 @@ Pandoc
                           [ Para
                               [ Span
                                   ( "" , [ "box" ] , [] )
-                                  [ Math InlineMath "| \\rightarrow"
+                                  [ Math InlineMath "\\mapsto"
                                   , Str "\8192"
                                   , Code ( "" , [] , [] ) "|->"
                                   , Str ","
@@ -3624,7 +3624,7 @@ Pandoc
                           [ Para
                               [ Span
                                   ( "" , [ "box" ] , [] )
-                                  [ Math InlineMath "\\leftarrow >"
+                                  [ Math InlineMath "\\leftrightarrow"
                                   , Str "\8192"
                                   , Code ( "" , [] , [] ) "<->"
                                   , Str ","
@@ -5130,7 +5130,7 @@ Pandoc
           , Space
           , Str "from"
           , Space
-          , Code ( "" , [] , [] ) "ident"
+          , Code ( "" , [] , [] ) "equiv"
           , Space
           , Str "and"
           , Space
diff --git a/test/undergradmath.typ b/test/undergradmath.typ
index 388e12723..1910d31b0 100644
--- a/test/undergradmath.typ
+++ b/test/undergradmath.typ
@@ -253,11 +253,11 @@ Just type them!
   cell($>$, [`>`, `gt`]), cell($ell$, `ell`), cell($minus.plus$, `minus.plus`),
   cell($>=$, [`>=`, `gt.eq`]), cell($parallel$, `parallel`), cell($times$, `times`),
   cell($!=$, [`!=`, `eq.not`]), cell($45 degree$, `45 degree`), cell($div$, `div`),
-  cell($<<$, [`<<`, `lt.double`]), cell($tilde.eqq$, `tilde.eqq`), cell($*$, [`*`, `ast`]),
-  cell($>>$, [`>>`, `gt.double`]), cell($tilde.eqq.not$, `tilde.eqq.not`), cell($divides$, `divides`),
+  cell($<<$, [`<<`, `lt.double`]), cell($tilde.equiv$, `tilde.equiv`), cell($*$, [`*`, `ast`]),
+  cell($>>$, [`>>`, `gt.double`]), cell($tilde.equiv.not$, `tilde.equiv.not`), cell($divides$, `divides`),
   cell($approx$, `approx`), cell($tilde$, `tilde`), cell($divides.not$, `divides.not`),
   cell($\u{224D}$, [`\u{224D}` @tricky]), cell($tilde.eq$, `tilde.eq`), cell($n!$, `n!`),
-  cell($ident$, `ident`), cell($tilde.not$, `tilde.not`), cell($diff$, `diff`),
+  cell($equiv$, `equiv`), cell($tilde.not$, `tilde.not`), cell($diff$, `diff`),
   cell($prec$, `prec`), cell($plus.circle$, `plus.circle`), cell($nabla$, `nabla`),
   cell($prec.eq$, `prec.eq`), cell($minus.circle$, `minus.cirle`), cell($planck.reduce$, `planck.reduce`),
   cell($succ$, `succ`), cell($dot.circle$, `dot.circle`), cell($circle.stroked.tiny$, `circle.stroked.tiny`),
@@ -464,7 +464,7 @@ The last three here are display style.
 ))
 
 = Discrete mathematics examples
-For modulo, there is a symbol $ident$ from `ident` and a text operator $mod$ from `mod`.
+For modulo, there is a symbol $equiv$ from `equiv` and a text operator $mod$ from `mod`.
 
 For combinations the binomial symbol $binom(n, k)$ is from `binom(n, k)`.
 This resizes to be bigger in a display.
@@ -507,4 +507,4 @@ See also the Typst Documentation at #link("https://typst.app/docs").
 #block(
   line(length: 100%, stroke: headcolor) +
   text(headcolor)[johanvx (https://github.com/johanvx) #h(1fr) #date]
-)
+)
\ No newline at end of file