Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Markdown writer: use numerical labels for refs...

Browse source 
...that are longer than 999 characters or contain
square brackets. For conformity with commonmark.

Closes #6560
This commit is contained in:
John MacFarlane 2020-07-23 18:26:29 -07:00
parent 5a216f7bd7
commit 8c8d3bacb8
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Text/Pandoc/Writers/Markdown.hs
View file

@ -47,6 +47,7 @@ import Text.Pandoc.Walk
import Text.Pandoc.Writers.HTML (writeHtml5String)
import Text.Pandoc.Writers.Math (texMathToInlines)
import Text.Pandoc.XML (toHtml5Entities)
import Data.Coerce (coerce)
type Notes = [[Block]]
type Ref = (Text, Target, Attr)
@ -903,6 +904,7 @@ getNextIndex = do
prevRefs <- gets stPrevRefs
refs <- gets stRefs
i <- (+ 1) <$> gets stLastIdx
modify $ \s -> s{ stLastIdx = i }
let refLbls = map (\(r,_,_) -> r) $ prevRefs ++ refs
return $ findUsableIndex refLbls i
@ -915,12 +917,15 @@ getReference attr label target = do
Just (ref, _, _) -> return ref
Nothing -> do
keys <- gets stKeys
case M.lookup (getKey label) keys of
let key = getKey label
let rawkey = coerce key
case M.lookup key keys of
Nothing -> do -- no other refs with this label
(lab', idx) <- if isEmpty label
(lab', idx) <- if T.null rawkey ||
T.length rawkey > 999 ||
T.any (\c -> c == '[' || c == ']') rawkey
then do
i <- getNextIndex
modify $ \s -> s{ stLastIdx = i }
return (tshow i, i)
else
return (render Nothing label, 0)
@ -947,11 +952,10 @@ getReference attr label target = do
return lab'
Nothing -> do -- but this one is to a new target
i <- getNextIndex
modify $ \s -> s{ stLastIdx = i }
let lab' = tshow i
modify (\s -> s{
stRefs = (lab', target, attr) : refs,
stKeys = M.insert (getKey label)
stKeys = M.insert key
(M.insert (target, attr) i km)
(stKeys s) })
return lab'