git.iko.soy/typeable/pandoc
on master help sign in
Markdown writer: changes to `--reference-links`.
8614902John MacFarlane
src/Text/Pandoc/Readers/Markdown.hs+6−2
compare with master
unifiedsplit
@@ -414,8 +414,12 @@ referenceKey = try $ do
414 let oldkeys = stateKeys st
414 let oldkeys = stateKeys st
415 let key = toKey raw
415 let key = toKey raw
416 case M.lookup key oldkeys of
416 case M.lookup key oldkeys of
417+ Just (t,a) | not (t == target && a == attr') ->
418+ -- We don't warn on two duplicate keys if the targets are also
419+ -- the same. This can happen naturally with --reference-location=block
420+ -- or section. See #3701.
417− Just _ -> logMessage $ DuplicateLinkReference raw pos
421+ logMessage $ DuplicateLinkReference raw pos
418− Nothing -> return ()
422+ _ -> return ()
419 updateState $ \s -> s { stateKeys = M.insert key (target, attr') oldkeys }
423 updateState $ \s -> s { stateKeys = M.insert key (target, attr') oldkeys }
420 return $ return mempty
424 return $ return mempty
421
425
src/Text/Pandoc/Writers/Markdown.hs+44−15
@@ -34,12 +34,12 @@ Conversion of 'Pandoc' documents to markdown-formatted plain text.
34Markdown: <http://daringfireball.net/projects/markdown/>
34Markdown: <http://daringfireball.net/projects/markdown/>
35-}
35-}
36module Text.Pandoc.Writers.Markdown (writeMarkdown, writePlain) where
36module Text.Pandoc.Writers.Markdown (writeMarkdown, writePlain) where
37−import Control.Monad.Except (throwError)
38import Control.Monad.Reader
37import Control.Monad.Reader
39import Control.Monad.State
38import Control.Monad.State
40import Data.Char (chr, isPunctuation, isSpace, ord)
39import Data.Char (chr, isPunctuation, isSpace, ord)
41import Data.Default
40import Data.Default
42import qualified Data.HashMap.Strict as H
41import qualified Data.HashMap.Strict as H
42+import qualified Data.Map as M
43import Data.List (find, group, intersperse, sortBy, stripPrefix, transpose)
43import Data.List (find, group, intersperse, sortBy, stripPrefix, transpose)
44import Data.Maybe (fromMaybe)
44import Data.Maybe (fromMaybe)
45import Data.Monoid (Any (..))
45import Data.Monoid (Any (..))
@@ -52,7 +52,6 @@ import Network.HTTP (urlEncode)
52import Text.HTML.TagSoup (Tag (..), isTagText, parseTags)
52import Text.HTML.TagSoup (Tag (..), isTagText, parseTags)
53import Text.Pandoc.Class (PandocMonad, report)
53import Text.Pandoc.Class (PandocMonad, report)
54import Text.Pandoc.Definition
54import Text.Pandoc.Definition
55−import Text.Pandoc.Error
56import Text.Pandoc.Logging
55import Text.Pandoc.Logging
57import Text.Pandoc.Options
56import Text.Pandoc.Options
58import Text.Pandoc.Parsing hiding (blankline, blanklines, char, space)
57import Text.Pandoc.Parsing hiding (blankline, blanklines, char, space)
@@ -90,7 +89,9 @@ instance Default WriterEnv
90
89
91data WriterState = WriterState { stNotes :: Notes
90data WriterState = WriterState { stNotes :: Notes
92 , stRefs :: Refs
91 , stRefs :: Refs
93− , stKeys :: Set.Set Key
92+ , stKeys :: M.Map Key
93+ (M.Map (Target, Attr) Int)
94+ , stLastIdx :: Int
94 , stIds :: Set.Set String
95 , stIds :: Set.Set String
95 , stNoteNum :: Int
96 , stNoteNum :: Int
96 }
97 }
@@ -98,7 +99,8 @@ data WriterState = WriterState { stNotes :: Notes
98instance Default WriterState
99instance Default WriterState
99 where def = WriterState{ stNotes = []
100 where def = WriterState{ stNotes = []
100 , stRefs = []
101 , stRefs = []
101− , stKeys = Set.empty
102+ , stKeys = M.empty
103+ , stLastIdx = 0
102 , stIds = Set.empty
104 , stIds = Set.empty
103 , stNoteNum = 1
105 , stNoteNum = 1
104 }
106 }
@@ -804,17 +806,44 @@ getReference attr label target = do
804 Just (ref, _, _) -> return ref
806 Just (ref, _, _) -> return ref
805 Nothing -> do
807 Nothing -> do
806 keys <- gets stKeys
808 keys <- gets stKeys
807− label' <- if isEmpty label || getKey label `Set.member` keys
809+ case M.lookup (getKey label) keys of
808− then case find (\n -> not (Key n `Set.member` keys)) $
810+ Nothing -> do -- no other refs with this label
809− map show [1..(10000 :: Integer)] of
811+ (lab', idx) <- if isEmpty label
810− Just x -> return $ text x
812+ then do
811− Nothing ->
813+ i <- (+ 1) <$> gets stLastIdx
812− throwError $ PandocSomeError "no unique label"
814+ modify $ \s -> s{ stLastIdx = i }
815+ return (text (show i), i)
813− else return label
816+ else return (label, 0)
814− modify (\s -> s{ stRefs = (label', target, attr) : stRefs s,
817+ modify (\s -> s{
818+ stRefs = (lab', target, attr) : refs,
819+ stKeys = M.insert (getKey label)
820+ (M.insert (target, attr) idx mempty)
821+ (stKeys s) })
822+ return lab'
823+
824+ Just km -> do -- we have refs with this label
825+ case M.lookup (target, attr) km of
826+ Just i -> do
827+ let lab' = label <> if i == 0
828+ then mempty
829+ else text (show i)
830+ -- make sure it's in stRefs; it may be
831+ -- a duplicate that was printed in a previous
832+ -- block:
833+ when ((lab', target, attr) `notElem` refs) $
834+ modify (\s -> s{
835+ stRefs = (lab', target, attr) : refs })
836+ return lab'
837+ Nothing -> do -- but this one is to a new target
838+ i <- (+ 1) <$> gets stLastIdx
839+ modify $ \s -> s{ stLastIdx = i }
840+ let lab' = text (show i)
841+ modify (\s -> s{
842+ stRefs = (lab', target, attr) : refs,
815− stKeys = Set.insert (getKey label') (stKeys s)
843+ stKeys = M.insert (getKey label)
816− })
844+ (M.insert (target, attr) i km)
845+ (stKeys s) })
817− return label'
846+ return lab'
818
847
819-- | Convert list of Pandoc inline elements to markdown.
848-- | Convert list of Pandoc inline elements to markdown.
820inlineListToMarkdown :: PandocMonad m => WriterOptions -> [Inline] -> MD m Doc
849inlineListToMarkdown :: PandocMonad m => WriterOptions -> [Inline] -> MD m Doc
test/command/3701.mdnew file+60
@@ -0,0 +1,60 @@
1+```
2+% pandoc --reference-location=block -t markdown --reference-links --wrap=preserve
3+[a](u)
4+
5+[a](u)
6+
7+[a](u2)
8+[A](u)
9+[a](u){.foo}
10+
11+[a](u3)
12+^D
13+[a]
14+
15+ [a]: u
16+
17+[a]
18+
19+ [a]: u
20+
21+[a][1]
22+[A][]
23+[a][2]
24+
25+ [1]: u2
26+ [A]: u
27+ [2]: u {.foo}
28+
29+[a][3]
30+
31+ [3]: u3
32+```
33+
34+```
35+% pandoc
36+[a]
37+
38+ [a]: u
39+
40+[a]
41+
42+ [a]: u
43+
44+[a][1]
45+[A][]
46+[a][2]
47+
48+ [1]: u2
49+ [A]: u
50+ [2]: u {.foo}
51+
52+[a][3]
53+
54+ [3]: u3
55+^D
56+<p><a href="u">a</a></p>
57+<p><a href="u">a</a></p>
58+<p><a href="u2">a</a> <a href="u">A</a> <a href="u" class="foo">a</a></p>
59+<p><a href="u3">a</a></p>
60+```