Merge remote-tracking branch 'origin' into fixingIncompleteElements

app/Main.hs

@@ -1,27 +1,8 @@
 module Main where
 
 import MdToHTML
-import System.Environment
-import System.IO
-
-readLinesHelper :: [String] -> IO [String]
-readLinesHelper xs = do
-  done <- isEOF
-  if done
-    then return xs
-    else do
-      line <- getLine
-      let xs' = line : xs
-      readLinesHelper xs'
-
-readLines :: IO [String]
-readLines = reverse <$> readLinesHelper []
 
 main :: IO ()
 main = do
-  args <- getArgs
+   let res = fst $ leftmostLongestParse parseDocument "# _Hello_\n"
-  fileContents <- case args of
+   putStrLn (show res)
-    [] -> getContents
-    x : _ -> readFile x
-  let res = fst $ leftmostLongestParse parseDocument fileContents
-  print res

md-to-html.cabal

@@ -67,6 +67,10 @@ executable md-to-html-runner
     -- .hs or .lhs file containing the Main module.
     main-is:          Main.hs
 
+    -- Modules included in this executable, other than Main.
+    other-modules:
+        MdToHTML
+        MdToHtmlTest
 
     -- LANGUAGE extensions used by modules in this package.
     -- other-extensions:

src/MdToHTML.hs

@@ -37,7 +37,6 @@ data MdToken
   | Codeblock String
   | Link MdToken URL
   | Image MdToken ImgPath
-  | Figure MdToken ImgPath
   | Bold MdToken
   | Italic MdToken
   | Strikethrough MdToken
@@ -59,8 +58,7 @@ instance Show MdToken where
   show (Code code) = "<code>" ++ show code ++ "</code>"
   show (Codeblock code) = show code
   show (Link txt url) = "<a href=\"" ++ getUrl url ++ "\">" ++ show txt ++ "</a>"
-  show (Image txt imgPath) = "<img src=\"" ++ getPath imgPath ++ "\"" ++ " alt=\"" ++ show txt ++ "\" />"
+  show (Image txt imgPath) = "<img src=" ++ getPath imgPath ++ ">" ++ show txt ++ "</img>"
-  show (Figure txt imgPath) = "<figure><img src=\"" ++ getPath imgPath ++ "\" alt=\"" ++ show txt ++ "\"/><figcaption aria-hidden=\"true\">" ++ show txt ++ "</figcaption></figure>"
   show (Bold token) = "<b>" ++ show token ++ "</b>"
   show (Italic token) = "<i>" ++ show token ++ "</i>"
   show (Strikethrough token) = "<s>" ++ show token ++ "</s>"
@@ -90,9 +88,9 @@ leftmostLongestParse parser input =
         Nothing -> (mempty, mempty)
         Just x -> x
 
-specialChars = "\n\\`*_{}[]()<>#+|"
+specialChars = "\\#*_[\n`"
 
-escapableChars = "-~!." ++ specialChars
+escapableChars = '~' : specialChars
 
 -- Makes a parser greedy. Instead of returning all possible parses, only the longest one is returned.
 greedyParse :: ReadP a -> ReadP [a]
@@ -145,7 +143,7 @@ parseBold = parseBoldWith "**" <|> parseBoldWith "__"
   where
     parseBoldWith delim = do
       string delim
-      inside <- greedyParse1 parseLineToken
+      inside <- many1 parseLineToken
       string delim
       return (Bold (Line inside))
 
@@ -155,7 +153,7 @@ parseItalic = parseItalicWith "*" <|> parseItalicWith "_"
   where
     parseItalicWith delim = do
       string delim
-      inside <- greedyParse1 parseLineToken
+      inside <- many1 parseLineToken
       string delim
       return (Italic (Line inside))
 
@@ -194,28 +192,7 @@ parseLinebreak = do
 parseSingleNewline :: ReadP MdToken
 parseSingleNewline = do
   char '\n'
-  remaining <- look
+  return SingleNewline
-  case remaining of
-    [] -> return $ Unit ""
-    _ -> return SingleNewline
-
-parseImage :: ReadP MdToken
-parseImage = do
-  char '!'
-  char '['
-  altText <- many1 (parseEscapedChar <++ parseUnit)
-  char ']'
-  char '('
-  path <- many1 get
-  char ')'
-  return $ Image (Line altText) (ImgPath path)
-
-parseFigure = do
-  img <- parseImage
-  void (string "\n\n") <++ eof
-  case img of
-    Image text path -> return $ Figure text path
-    _ -> return img
 
 -- Parse an escaped character
 parseEscapedChar :: ReadP MdToken
@@ -227,7 +204,8 @@ parseEscapedChar = do
 -- Parse a character as a Unit.
 parseUnit :: ReadP MdToken
 parseUnit = do
-  text <- satisfy (`notElem` specialChars)
+  -- text <- satisfy (`notElem` specialChars)
+  text <- get
   return (Unit [text])
 
 lineParsers :: [ReadP MdToken]
@@ -236,7 +214,6 @@ lineParsers =
     parseSingleNewline,
     parseEscapedChar,
     parseCode,
-    parseImage,
     parseBold,
     parseItalic,
     parseStrikethrough,
@@ -249,7 +226,6 @@ listLineParsers =
   [ parseLinebreak,
     parseEscapedChar,
     parseCode,
-    parseImage,
     parseBold,
     parseItalic,
     parseStrikethrough,
@@ -286,7 +262,6 @@ parsePara = do
   text <- manyTill get (string "\n\n" <|> (eof >> return ""))
   when (null text) pfail
   let parsedText = fst $ leftmostLongestParse parseLine text -- Parse a line
-  parseMany (char '\n')
   return (Para parsedText)
 
 -- Parse a line starting with '>', return the line except for the '>'.
@@ -407,17 +382,12 @@ parseOrderedList = do
   void (char '\n') <++ eof
   return $ OrdList (firstLine : lineItems)
 
-parseHorizontalRule :: ReadP MdToken
-parseHorizontalRule = string "---" *> (void (string "\n\n") <++ eof) *> return HorizontalRule
-
 documentParsers :: [ReadP MdToken]
 documentParsers =
-  [ parseHorizontalRule,
+  [ parseHeader,
-    parseHeader,
     parseBlockquote,
     parseUnorderedList,
     parseOrderedList,
-    parseFigure,
     parsePara
   ]
 

src/MdToHtmlTest.hs

@@ -97,23 +97,9 @@ codeTests =
   TestList
     [ check_equal "Code by itself" "<p><code>Hello world!</code></p>" (convert "`Hello world!`"),
       check_equal "Code in a paragraph" "<p>The following <code>text</code> is code</p>" (convert "The following `text` is code"),
-      check_equal "Code across paragraphs (shouldn't work" "<p></p><p></p>" (convert "`Incomplete\n\nCode`") -- At the moment, this is just treated as a syntax error, so nothing is rendered.
+      check_equal "Code across paragraphs (shouldn't work" "<p>`Incomplete</p><p>Code`</p>" (convert "`Incomplete\n\nCode`")
     ]
 
-imageTests =
-  TestList
-    [ check_equal "Image with text" "<p>This is an image <img src=\"img.png\" alt=\"Image 1\" /></p>" (convert "This is an image ![Image 1](img.png)")
-    ]
-
-figureTests =
-  TestList
-    [ check_equal "Image by itself" "<figure><img src=\"img.png\" alt=\"Image 1\"/><figcaption aria-hidden=\"true\">Image 1</figcaption></figure>" (convert "![Image 1](img.png)")
-    ]
-
-horizontalRuleTests =
-  TestList
-    [check_equal "Horizontal Rule" "<p>a</p><hr><p>b</p>" (convert "a\n\n---\n\nb")]
-
 integrationTests =
   TestList
     [ check_equal "Integration 1" "<h1>Sample Markdown</h1><p>This is some basic, sample markdown.</p><h2><b>Second</b> <i>Heading</i></h2>" (convert "# Sample Markdown\n\n This is some basic, sample markdown.\n\n  ## __Second__ _Heading_"),
@@ -148,10 +134,7 @@ tests =
       blockquoteTests,
       unorderedListTests,
       orderedListTests,
-      imageTests,
-      figureTests,
       codeTests,
-      horizontalRuleTests,
       integrationTests
     ]