git.iko.soy/typeable/pandoc
on master help sign in
Revert changes to hierarchicalizeWithIds.

Revert "hierarchicalize: ensure that sections get ids..." This reverts commit 212406a61d027d85712705e626954e0486a2bc34. Revert "Improve detection of headings in Divs by hierarchicalize." This reverts commit 6e2cfd6c97b1b8657f1f3e2b66090a2c3ba8d887. Revert "Shared.hierarchicalize: improve handling of div and section structure." This reverts commit 345b33762eb4cc6d57d74c76c4757a6166ee5c13.

commit1ccff3339d036db046f37c596bb4ffb6cffbf803 authorJohn MacFarlane <jgm@berkeley.edu> dateSat 7 Sep 2019, 08:45 (7 years ago) parent95a19fc
2 files changed+5−77
compare with master
unifiedsplit
src/Text/Pandoc/Shared.hs+5−21 test/command/3057.md−56
src/Text/Pandoc/Shared.hs+5−21
@@ -523,33 +523,17 @@ hierarchicalizeWithIds (Header level attr@(_,classes,_) title':xs) = do
523523 sectionContents' <- hierarchicalizeWithIds sectionContents
524524 rest' <- hierarchicalizeWithIds rest
525525 return $ Sec level newnum attr title' sectionContents' : rest'
526−hierarchicalizeWithIds (Div (dident,dclasses,dkvs)
527− (Header level (hident,hclasses,hkvs) title' : xs):ys)
528− | not ("columns" `elem` dclasses)
529− , not ("column" `elem` dclasses) = do
530− lastnum <- S.get
531− let lastnum' = take level lastnum
532− let newnum = case length lastnum' of
533− x | "unnumbered" `elem` hclasses -> []
534− | x >= level -> init lastnum' ++ [last lastnum' + 1]
535− | otherwise -> lastnum ++
536− replicate (level - length lastnum - 1) 0 ++ [1]
537− unless (null newnum) $ S.put newnum
538− let attr = (hident, dclasses ++ hclasses, dkvs ++ hkvs)
539− sectionContents' <- hierarchicalizeWithIds $
540− if null dident -- ensure we don't lose an id
541− then xs
542− else [Div (dident,[],[]) xs]
543− rest' <- hierarchicalizeWithIds ys
544− return $ Sec level newnum attr title' sectionContents' : rest'
526+hierarchicalizeWithIds (Div ("refs",classes',kvs')
527+ (Header level (ident,classes,kvs) title' : xs):ys) =
528+ hierarchicalizeWithIds (Header level (ident,"references":classes,kvs)
529+ title' : Div ("refs",classes',kvs') xs : ys)
545530hierarchicalizeWithIds (x:rest) = do
546531 rest' <- hierarchicalizeWithIds rest
547532 return $ Blk x : rest'
548533
549534headerLtEq :: Int -> Block -> Bool
550535headerLtEq level (Header l _ _) = l <= level
551−headerLtEq level (Div ("",classes,[]) (Header l _ _ : _)) =
552− l <= level && "column" `notElem` classes && "columns" `notElem` classes
536+headerLtEq level (Div ("",["references"],[]) (Header l _ _ : _)) = l <= level
553537headerLtEq _ _ = False
554538
555539-- | Generate a unique identifier from a list of inlines.
test/command/3057.mddeleted−56
@@ -1,56 +0,0 @@
1−```
2−% pandoc -f markdown -t docbook
3−<div>
4−# one
5−<div>
6−## two
7−</div>
8−</div>
9−^D
10−<section xml:id="one">
11− <title>one</title>
12− <section xml:id="two">
13− <title>two</title>
14− <para>
15− </para>
16− </section>
17−</section>
18−```
19−
20−```
21−% pandoc -f markdown -t docbook
22−<div>
23−# one
24−<div>
25−# two
26−</div>
27−</div>
28−^D
29−<section xml:id="one">
30− <title>one</title>
31− <section xml:id="two">
32− <title>two</title>
33− <para>
34− </para>
35− </section>
36−</section>
37−```
38−
39−```
40−% pandoc -f markdown -t docbook
41−# one
42−<div>
43−# two
44−</div>
45−^D
46−<section xml:id="one">
47− <title>one</title>
48− <para>
49− </para>
50−</section>
51−<section xml:id="two">
52− <title>two</title>
53− <para>
54− </para>
55−</section>
56−```