git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #2327 from hftf/list-style

HTML Reader: Correctly parse inline list-style(-type) for <ol>

commit74c31abb1aa696760d20efb202369e1cb0ecfd20 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 7 Aug 2015, 11:08 (11 years ago) parent3e8590d18b1b21
5 files changed+92−24
compare with master
unifiedsplit
pandoc.cabal+2−1 src/Text/Pandoc/CSS.hs+35 src/Text/Pandoc/Readers/HTML.hs+35−23 tests/html-reader.html+7 tests/html-reader.native+13
pandoc.cabal+2−1
@@ -362,7 +362,8 @@ Library
362362 Text.Pandoc.Templates,
363363 Text.Pandoc.XML,
364364 Text.Pandoc.SelfContained,
365− Text.Pandoc.Process
365+ Text.Pandoc.Process,
366+ Text.Pandoc.CSS
366367 Other-Modules: Text.Pandoc.Readers.Docx.Lists,
367368 Text.Pandoc.Readers.Docx.Reducible,
368369 Text.Pandoc.Readers.Docx.Parse,
src/Text/Pandoc/CSS.hsnew file+35
@@ -0,0 +1,35 @@
1+module Text.Pandoc.CSS ( foldOrElse,
2+ pickStyleAttrProps
3+ )
4+where
5+
6+import Text.Pandoc.Shared (trim)
7+import Text.Parsec
8+import Text.Parsec.String
9+import Control.Applicative ((<*))
10+
11+ruleParser :: Parser (String, String)
12+ruleParser = do
13+ p <- many1 (noneOf ":") <* char ':'
14+ v <- many1 (noneOf ":;") <* char ';' <* spaces
15+ return (trim p, trim v)
16+
17+styleAttrParser :: Parser [(String, String)]
18+styleAttrParser = do
19+ p <- many1 ruleParser
20+ return p
21+
22+orElse :: Eq a => a -> a -> a -> a
23+orElse v x y = if v == x then y else x
24+
25+foldOrElse :: Eq a => a -> [a] -> a
26+foldOrElse v xs = foldr (orElse v) v xs
27+
28+eitherToMaybe :: Either a b -> Maybe b
29+eitherToMaybe (Right x) = Just x
30+eitherToMaybe _ = Nothing
31+
32+pickStyleAttrProps :: [String] -> String -> Maybe String
33+pickStyleAttrProps lookupProps styleAttr = do
34+ styles <- eitherToMaybe $ parse styleAttrParser "" styleAttr
35+ foldOrElse Nothing $ map (flip lookup styles) lookupProps
src/Text/Pandoc/Readers/HTML.hs+35−23
@@ -64,6 +64,7 @@ import Data.Default (Default (..), def)
6464import Control.Monad.Reader (Reader,ask, asks, local, runReader)
6565import Network.URI (isURI)
6666import Text.Pandoc.Error
67+import Text.Pandoc.CSS (foldOrElse, pickStyleAttrProps)
6768
6869import Text.Parsec.Error
6970
@@ -252,6 +253,22 @@ pListItem nonItem = do
252253 let liDiv = maybe mempty (\x -> B.divWith (x, [], []) mempty) (lookup "id" attr)
253254 (liDiv <>) <$> pInTags "li" block <* skipMany nonItem
254255
256+parseListStyleType :: String -> ListNumberStyle
257+parseListStyleType "lower-roman" = LowerRoman
258+parseListStyleType "upper-roman" = UpperRoman
259+parseListStyleType "lower-alpha" = LowerAlpha
260+parseListStyleType "upper-alpha" = UpperAlpha
261+parseListStyleType "decimal" = Decimal
262+parseListStyleType _ = DefaultStyle
263+
264+parseTypeAttr :: String -> ListNumberStyle
265+parseTypeAttr "i" = LowerRoman
266+parseTypeAttr "I" = UpperRoman
267+parseTypeAttr "a" = LowerAlpha
268+parseTypeAttr "A" = UpperAlpha
269+parseTypeAttr "1" = Decimal
270+parseTypeAttr _ = DefaultStyle
271+
255272pOrderedList :: TagParser Blocks
256273pOrderedList = try $ do
257274 TagOpen _ attribs <- pSatisfy (~== TagOpen "ol" [])
@@ -261,23 +278,19 @@ pOrderedList = try $ do
261278 sta' = if all isDigit sta
262279 then read sta
263280 else 1
264− sty = fromMaybe (fromMaybe "" $
265− lookup "style" attribs) $
266− lookup "class" attribs
267− sty' = case sty of
268− "lower-roman" -> LowerRoman
269− "upper-roman" -> UpperRoman
270− "lower-alpha" -> LowerAlpha
271− "upper-alpha" -> UpperAlpha
272− "decimal" -> Decimal
273− _ ->
274− case lookup "type" attribs of
275− Just "1" -> Decimal
276− Just "I" -> UpperRoman
277− Just "i" -> LowerRoman
278− Just "A" -> UpperAlpha
279− Just "a" -> LowerAlpha
280− _ -> DefaultStyle
281+
282+ pickListStyle = pickStyleAttrProps ["list-style-type", "list-style"]
283+
284+ typeAttr = fromMaybe "" $ lookup "type" attribs
285+ classAttr = fromMaybe "" $ lookup "class" attribs
286+ styleAttr = fromMaybe "" $ lookup "style" attribs
287+ listStyle = fromMaybe "" $ pickListStyle styleAttr
288+
289+ sty' = foldOrElse DefaultStyle
290+ [ parseTypeAttr typeAttr
291+ , parseListStyleType classAttr
292+ , parseListStyleType listStyle
293+ ]
281294 let nonItem = pSatisfy (\t ->
282295 not (tagOpen (`elem` ["li","ol","ul","dl"]) (const True) t) &&
283296 not (t ~== TagClose "ol"))
@@ -622,12 +635,11 @@ pSpan = try $ do
622635 guardEnabled Ext_native_spans
623636 TagOpen _ attr <- lookAhead $ pSatisfy $ tagOpen (=="span") (const True)
624637 contents <- pInTags "span" inline
625− let attr' = mkAttr attr
626− return $ case attr' of
627− ("",[],[("style",s)])
628− | filter (`notElem` " \t;") s == "font-variant:small-caps" ->
629− B.smallcaps contents
630− _ -> B.spanWith (mkAttr attr) contents
638+ let isSmallCaps = fontVariant == "small-caps"
639+ where styleAttr = fromMaybe "" $ lookup "style" attr
640+ fontVariant = fromMaybe "" $ pickStyleAttrProps ["font-variant"] styleAttr
641+ let tag = if isSmallCaps then B.smallcaps else B.spanWith (mkAttr attr)
642+ return $ tag contents
631643
632644pRawHtmlInline :: TagParser Inlines
633645pRawHtmlInline = do
tests/html-reader.html+7
@@ -185,6 +185,13 @@ These should not be escaped: \$ \\ \> \[ \{
185185<li><p>Item 3.</p>
186186</li>
187187</ol>
188+<p>List styles:</p>
189+<ol></ol>
190+<ol type="i"></ol>
191+<ol class="lower-roman"></ol>
192+<ol style="lower-roman"></ol>
193+<ol style="list-style: lower-roman;"></ol>
194+<ol style="list-style-type: lower-roman;"></ol>
188195<h2>Nested</h2>
189196<ul>
190197<li>Tab<ul>
tests/html-reader.native+13
@@ -116,6 +116,19 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl
116116 ,Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog's",Space,Str "back."]]
117117 ,[Para [Str "Item",Space,Str "2."]]
118118 ,[Para [Str "Item",Space,Str "3."]]]
119+,Para [Str "List",Space,Str "styles:"]
120+,OrderedList (1,DefaultStyle,DefaultDelim)
121+ []
122+,OrderedList (1,LowerRoman,DefaultDelim)
123+ []
124+,OrderedList (1,LowerRoman,DefaultDelim)
125+ []
126+,OrderedList (1,DefaultStyle,DefaultDelim)
127+ []
128+,OrderedList (1,LowerRoman,DefaultDelim)
129+ []
130+,OrderedList (1,LowerRoman,DefaultDelim)
131+ []
119132,Header 2 ("",[],[]) [Str "Nested"]
120133,BulletList
121134 [[Plain [Str "Tab"]