diff --git a/data/templates/styles.html b/data/templates/styles.html
index 800f63c7a6a5..9822213625f7 100644
--- a/data/templates/styles.html
+++ b/data/templates/styles.html
@@ -210,3 +210,10 @@
$if(csl-css)$
$styles.citations.html()$
$endif$
+$for(counter-styles)$
+@counter-style $it.name$ {
+ system: extends $it.extends$;
+ prefix: "$it.prefix$";
+ suffix: "$it.suffix$";
+}
+$endfor$
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index 2b4cfc5aac38..9e78771d4691 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -39,7 +39,7 @@ import Data.List (intercalate, intersperse, partition, delete, (\\))
import qualified Data.List as L
import Data.List.NonEmpty (NonEmpty((:|)))
import Data.Containers.ListUtils (nubOrd)
-import Data.Maybe (fromMaybe, isJust, isNothing)
+import Data.Maybe (fromMaybe, isJust, isNothing, mapMaybe)
import qualified Data.Set as Set
import Data.Text (Text)
import qualified Data.Text as T
@@ -85,6 +85,8 @@ import Text.XML.Light (elChildren, unode, unqual)
import qualified Text.XML.Light as XML
import Text.XML.Light.Output
import Data.String (fromString)
+import Data.Map.Strict (Map)
+import qualified Data.Map.Strict as Map
data WriterState = WriterState
{ stNotes :: [Html] -- ^ List of notes
@@ -102,6 +104,7 @@ data WriterState = WriterState
, stCsl :: Bool -- ^ Has CSL references
, stCslEntrySpacing :: Maybe Int -- ^ CSL entry spacing
, stBlockLevel :: Int -- ^ Current block depth, excluding section divs
+ , stCounterStyles :: Set.Set (ListNumberStyle, ListNumberDelim) -- ^ List styles used in this document
}
defaultWriterState :: WriterState
@@ -119,7 +122,8 @@ defaultWriterState = WriterState {stNotes= [],
stCodeBlockNum = 0,
stCsl = False,
stCslEntrySpacing = Nothing,
- stBlockLevel = 0}
+ stBlockLevel = 0,
+ stCounterStyles = Set.empty}
-- Helpers to render HTML with the appropriate function.
@@ -356,6 +360,16 @@ pandocToHtml opts (Pandoc meta blocks) = do
_ -> mempty
let mCss :: Maybe [Text] = lookupContext "css" metadata
+ let counterStyle :: ListNumberStyle -> ListNumberDelim -> Maybe (Map Text Text)
+ counterStyle _ DefaultDelim = Nothing
+ counterStyle _ Period = Nothing
+ counterStyle num del = Just $ Map.fromList [
+ ("name", (counterStyleName num del)),
+ ("extends", (camelCaseToHyphenated $ tshow num)),
+ ("prefix", case del of
+ OneParen -> ""
+ TwoParens -> "("),
+ ("suffix", ")") ]
let context :: Context Text
context = (if stHighlighting st
then case writerHighlightMethod opts of
@@ -461,6 +475,7 @@ pandocToHtml opts (Pandoc meta blocks) = do
defField "s5-url" ("s5/default" :: Doc Text) .
defField "table-caption-below"
(writerTableCaptionPosition opts == CaptionBelow) .
+ defField "counter-styles" (mapMaybe (uncurry counterStyle) (Set.toList $ stCounterStyles st)) .
defField "html5" (stHtml5 st) $
metadata
return (thebody, context)
@@ -1025,26 +1040,28 @@ blockToHtmlInner opts (BulletList lst) = do
contents <- mapM (listItemToHtml opts) lst
(if isJust (mapM toTaskListItem lst) then (! A.class_ "task-list") else id) <$>
unordList opts contents
-blockToHtmlInner opts (OrderedList (startnum, numstyle, _) lst) = do
+blockToHtmlInner opts (OrderedList (startnum, numstyle, delstyle) lst) = do
contents <- mapM (listItemToHtml opts) lst
html5 <- gets stHtml5
- let numstyle' = case numstyle of
- Example -> "decimal"
- _ -> camelCaseToHyphenated $ tshow numstyle
+ modify (\st -> st{stCounterStyles = Set.insert (numstyle, delstyle) (stCounterStyles st)})
+ let counterStyle = case writerTemplate opts of
+ Nothing -> case numstyle of
+ Example -> "decimal"
+ _ -> camelCaseToHyphenated $ tshow numstyle
+ Just _ -> counterStyleName numstyle delstyle
let attribs = [A.start $ toValue startnum | startnum /= 1] ++
[A.class_ "example" | numstyle == Example] ++
(if numstyle /= DefaultStyle
- then if html5
- then [A.type_ $
- case numstyle of
- Decimal -> "1"
- LowerAlpha -> "a"
- UpperAlpha -> "A"
- LowerRoman -> "i"
- UpperRoman -> "I"
- _ -> "1"]
- else [A.style $ toValue $ "list-style-type: " <>
- numstyle']
+ then [A.style $ toValue $ "list-style-type: " <> counterStyle] ++
+ if html5 then [A.type_ $
+ case numstyle of
+ Decimal -> "1"
+ LowerAlpha -> "a"
+ UpperAlpha -> "A"
+ LowerRoman -> "i"
+ UpperRoman -> "I"
+ _ -> "1"]
+ else []
else [])
l <- ordList opts contents
return $ L.foldl' (!) l attribs
@@ -1713,6 +1730,12 @@ inDiv cls x = do
isRef :: Text -> Bool
isRef t = "\\ref{" `T.isPrefixOf` t || "\\eqref{" `T.isPrefixOf` t
+counterStyleName :: ListNumberStyle -> ListNumberDelim -> Text
+counterStyleName Example _ = "decimal"
+counterStyleName num DefaultDelim = camelCaseToHyphenated $ tshow num
+counterStyleName num Period = camelCaseToHyphenated $ tshow num
+counterStyleName num del = mconcat [camelCaseToHyphenated $ tshow num, "-", camelCaseToHyphenated $ tshow del]
+
isMathEnvironment :: Text -> Bool
isMathEnvironment s = "\\begin{" `T.isPrefixOf` s &&
envName `elem` mathmlenvs
@@ -1795,3 +1818,4 @@ hasVariable var = checkVar
checkVar (DT.Concat t1 t2) = checkVar t1 || checkVar t2
checkVar (DT.Literal _) = False
checkVar DT.Empty = False
+
diff --git a/test/command/10328.md b/test/command/10328.md
index cdd379701651..19e3abbaf503 100644
--- a/test/command/10328.md
+++ b/test/command/10328.md
@@ -20,7 +20,7 @@ Unwrap divs if they only have the `nonincremental` or `incremental` classes.
^D
First slide
-
+
Note 1
Note 2
Note 3
@@ -28,7 +28,7 @@ Unwrap divs if they only have the `nonincremental` or `incremental` classes.
Second Slide
-
+
Note 1
Note 2
Note 3
diff --git a/test/command/11335.md b/test/command/11335.md
new file mode 100644
index 000000000000..883f2711cd2e
--- /dev/null
+++ b/test/command/11335.md
@@ -0,0 +1,109 @@
+Without fancy_lists, we get the Default counter styles
+
+```
+% pandoc -t native -f markdown_strict
+1. A
+2. B
+
+(a) A
+(b) B
+^D
+[ OrderedList
+ ( 1 , DefaultStyle , DefaultDelim )
+ [ [ Plain [ Str "A" ] ] , [ Plain [ Str "B" ] ] ]
+, Para
+ [ Str "(a)"
+ , Space
+ , Str "A"
+ , SoftBreak
+ , Str "(b)"
+ , Space
+ , Str "B"
+ ]
+]
+```
+
+and thus as HTML we don't have `style` or `type` in the ``:
+
+```
+% pandoc -t html -f markdown_strict
+1. A
+2. B
+
+(a) A
+(b) B
+^D
+
+
A
+
B
+
+
(a) A (b) B
+```
+
+With fancy_lists, we get Decimal and Period instead of Default.
+
+```
+% pandoc -t native -f markdown_strict+fancy_lists
+1. A
+2. B
+
+(a) A
+(b) B
+^D
+[ OrderedList
+ ( 1 , Decimal , Period )
+ [ [ Plain [ Str "A" ] ] , [ Plain [ Str "B" ] ] ]
+, OrderedList
+ ( 1 , LowerAlpha , TwoParens )
+ [ [ Plain [ Str "A" ] ] , [ Plain [ Str "B" ] ] ]
+]
+```
+
+With commonmark, we get Decimal and Period even without fancy_lists.
+
+```
+% pandoc -t native -f commonmark
+1. A
+2. B
+
+(a) A
+(b) B
+^D
+[ OrderedList
+ ( 1 , Decimal , Period )
+ [ [ Plain [ Str "A" ] ] , [ Plain [ Str "B" ] ] ]
+, Para
+ [ Str "(a)"
+ , Space
+ , Str "A"
+ , SoftBreak
+ , Str "(b)"
+ , Space
+ , Str "B"
+ ]
+]
+```
+
+With fancy_lists and parens in the markdown source, we don't try to use a
+custom counter-style as the list-style-type in HTML output when no template is
+used.
+
+```
+% pandoc -t html -f markdown
+1. A
+2. B
+
+(a) A
+(b) B
+^D
+
+
A
+
B
+
+
+
A
+
B
+
+```
+
+The `@counter-style` rules are demonstrated in the writer.html5 golden output.
diff --git a/test/command/5627.md b/test/command/5627.md
index fde15fe9ac9d..94e57cc1855d 100644
--- a/test/command/5627.md
+++ b/test/command/5627.md
@@ -15,7 +15,7 @@ Something
~~~
^D