wip

Author: ingun37

answers-script.cabal

@@ -73,7 +73,7 @@ library
         filepath,
         lens,
         text,
-        cmark,
+        cmark-gfm,
         containers,
         directory,
         cryptohash-sha1,
@@ -87,7 +87,7 @@ library
         monad-loops,
         aeson,
         attoparsec,
-        cmark-lens
+        cmark-gfm-lens
 
     -- Directories containing source files.
     hs-source-dirs:   src
@@ -155,6 +155,6 @@ test-suite answers-script-test
         bytestring,
         lens,
         attoparsec,
-        cmark,
-        cmark-lens,
+        cmark-gfm,
+        cmark-gfm-lens,
         directory

cabal.project

@@ -25,4 +25,9 @@ source-repository-package
     type: git
     location: https://github.com/ingun37/cmark-lens.git
     tag: 4456f10deccb61419ce28811db448c266931190f
-    --sha256: 0s1zzpd1bgap403awkjar365qxsysw4lwq6i23whjydqj3whqdhb
+    --sha256: 0s1zzpd1bgap403awkjar365qxsysw4lwq6i23whjydqj3whqdhb
+
+source-repository-package
+    type: git
+    location: https://github.com/ingun37/cmark-gfm-lens.git
+    tag: 7c57b38c7ddb8888df8b3b92800a42a1ac0ac359

src/MatlabMark.hs

@@ -3,8 +3,8 @@
 
 module MatlabMark (generateMatlabAnswersDB, readMatlabMD) where
 
-import CMark
-import CMark.Lens
+import CMarkGFM
+import CMarkGFM.Lens
 import Control.Lens
 import Data.Attoparsec.Text qualified as A
 import Data.Text qualified as T
@@ -38,7 +38,7 @@ parseVersion = do
 generateMatlabAnswersDB :: FilePath -> Node -> IO ()
 generateMatlabAnswersDB outputDirPath node =
   let (intro, groups) = groupByProblems node
-      toDocText = CMark.nodeToCommonmark [] Nothing . Node Nothing DOCUMENT
+      toDocText = nodeToCommonmark [] Nothing . Node Nothing DOCUMENT
       writeMD name nodes = do
         D.createDirectory $ outputDirPath F.</> name
         TIO.writeFile (outputDirPath F.</> name F.</> "a.md") (toDocText nodes)
@@ -47,4 +47,4 @@ generateMatlabAnswersDB outputDirPath node =
         mapM_ (uncurry writeMD) groups
 
 readMatlabMD :: FilePath -> IO Node
-readMatlabMD mdFilePath = CMark.commonmarkToNode [] . changeMatlabMarkdownDelimeters <$> TIO.readFile mdFilePath
+readMatlabMD mdFilePath = commonmarkToNode [] [] . changeMatlabMarkdownDelimeters <$> TIO.readFile mdFilePath

src/MyLib.hs

@@ -3,7 +3,7 @@
 
 module MyLib (someFunc) where
 
-import CMark qualified
+import CMarkGFM qualified as CMark
 import Control.Lens
 import Control.Monad qualified as Monad
 import Crypto.Hash.SHA1 qualified as SHA (hash)
@@ -153,7 +153,7 @@ theWriter source destination prefix (parentPathComponents, item) = do
         putStrLn $ "  Compiling " ++ src ++ " -> " ++ dst
         let safePrefix = List.dropWhileEnd (== '/') $ dropWhile (== '/') prefix
         let finalPrefix = List.intercalate "/" (filter (not . null) [safePrefix, "resources", _hash])
-        TIO.writeFile dst (CMark.nodeToHtml [] $ MyMark.prefixImageUrl finalPrefix $ CMark.commonmarkToNode [] _content)
+        TIO.writeFile dst (CMark.nodeToHtml [] [CMark.extTable] $ MyMark.prefixImageUrl finalPrefix $ CMark.commonmarkToNode [] [] _content)
 
   let writeFileType key =
         \case

src/MyMark.hs

@@ -1,6 +1,6 @@
 module MyMark (prefixImageUrl) where
 
-import CMark
+import CMarkGFM
 import Data.Text qualified as T
 
 prefixImageUrl :: String -> Node -> Node

test/Main.hs

@@ -14,9 +14,6 @@ import System.Directory qualified as D
 import System.FilePath qualified as F
 import Test.Hspec
 import Control.Lens
-import CMark qualified
-import CMark.Lens
-import Data.Attoparsec.Text qualified as A
 
 main :: IO ()
 main = hspec $ do
@@ -50,6 +47,7 @@ matlab =
   do
     node <- MatlabMark.readMatlabMD $ "test" F.</> "matlab-short.md"
     let dst = "test" F.</> "matlab-dst"
+    D.removeDirectoryRecursive dst
     D.createDirectoryIfMissing True dst
     MatlabMark.generateMatlabAnswersDB dst node
     a <- DT.readDirectoryWith TIO.readFile dst

test/matlab-expect/11.31/a.md

@@ -4,3 +4,10 @@ code
 
 in\_pascal =
 $`\displaystyle 205000000`$
+
+| Start with *H* | Start with *T* |
+| -------------- | -------------- |
+| HH | THH |
+| HT HH | TH THH |
+| HT HT HH | TH TH THH |
+| ... | ... |

test/matlab-short.md

@@ -51,3 +51,9 @@ code
 in_pascal = 
  $\displaystyle 205000000$
 
+| Start with *H* | Start with *T* |
+| -------------- | -------------- |
+| HH | THH |
+| HT HH | TH THH |
+| HT HT HH | TH TH THH |
+| ... | ... |