git.iko.soy/typeable/pandoc
on master help sign in
Shared.makeSections: better behavior in some corner cases.

When a div surrounds multiple sections at the same level, or a section of highre level followed by one of lower level, then we just leave it as a div and create a new div for the section. Closes #5846, closes #5761.

commita796b655cd2046c1297d800e328ed9ef58251405 authorJohn MacFarlane <jgm@berkeley.edu> dateTue 29 Oct 2019, 21:24 (7 years ago) parent4756681
2 files changed+177−3
compare with master
unifiedsplit
src/Text/Pandoc/Shared.hs+7−3 test/command/5846.md+170
src/Text/Pandoc/Shared.hs+7−3
@@ -1,12 +1,13 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
22{-# LANGUAGE CPP #-}
33{-# LANGUAGE DeriveDataTypeable #-}
44{-# LANGUAGE FlexibleContexts #-}
55{-# LANGUAGE MultiParamTypeClasses #-}
66{-# LANGUAGE ScopedTypeVariables #-}
77{-# LANGUAGE ViewPatterns #-}
8−{-# LANGUAGE FlexibleInstances #-}
8+{-# LANGUAGE FlexibleInstances #-}
99{-# LANGUAGE TypeSynonymInstances #-}
10+{-# LANGUAGE LambdaCase #-}
1011{- |
1112 Module : Text.Pandoc.Shared
1213 Copyright : Copyright (C) 2006-2019 John MacFarlane
@@ -533,7 +534,10 @@ makeSections numbering mbBaseLevel bs =
533534 return $
534535 Div divattr (Header level' attr title' : sectionContents') : rest'
535536 go (Div (dident,dclasses,dkvs)
536− (Header level (ident,classes,kvs) title':ys) : xs) = do
537+ (Header level (ident,classes,kvs) title':ys) : xs)
538+ | all (\case
539+ Header level' _ _ -> level' > level
540+ _ -> True) ys = do
537541 inner <- go (Header level (ident,classes,kvs) title':ys)
538542 let inner' =
539543 case inner of
test/command/5846.mdnew file+170
@@ -0,0 +1,170 @@
1+```
2+% pandoc --section-divs
3+::: {.mydiv}
4+# header 1a
5+
6+one
7+
8+# header 1b
9+
10+two
11+:::
12+^D
13+<div class="mydiv">
14+<section id="header-1a" class="level1">
15+<h1>header 1a</h1>
16+<p>one</p>
17+</section>
18+<section id="header-1b" class="level1">
19+<h1>header 1b</h1>
20+<p>two</p>
21+</section>
22+</div>
23+```
24+
25+```
26+% pandoc --section-divs
27+::: mydiv
28+# head 1
29+## head 1.1
30+# head 2
31+:::
32+
33+## head 2.1
34+^D
35+<div class="mydiv">
36+<section id="head-1" class="level1">
37+<h1>head 1</h1>
38+<section id="head-1.1" class="level2">
39+<h2>head 1.1</h2>
40+</section>
41+</section>
42+<section id="head-2" class="level1">
43+<h1>head 2</h1>
44+</section>
45+</div>
46+<section id="head-2.1" class="level2">
47+<h2>head 2.1</h2>
48+</section>
49+```
50+
51+```
52+% pandoc --section-divs
53+# One
54+## One A
55+::: fence
56+## One B
57+# Two
58+:::
59+^D
60+<section id="one" class="level1">
61+<h1>One</h1>
62+<section id="one-a" class="level2">
63+<h2>One A</h2>
64+</section>
65+<div class="fence">
66+<section id="one-b" class="level2">
67+<h2>One B</h2>
68+</section>
69+<section id="two" class="level1">
70+<h1>Two</h1>
71+</section>
72+</div>
73+</section>
74+```
75+
76+```
77+% pandoc --section-divs
78+# Beginning
79+
80+::: exterior
81+
82+At first...
83+
84+:::
85+
86+In the beginning...
87+
88+::: interior
89+
90+# Middle
91+
92+So it continued...
93+
94+:::
95+
96+# Ending
97+
98+::: exterior
99+
100+And finally...
101+
102+:::
103+^D
104+<section id="beginning" class="level1">
105+<h1>Beginning</h1>
106+<div class="exterior">
107+<p>At first…</p>
108+</div>
109+<p>In the beginning…</p>
110+</section>
111+<section id="middle" class="level1 interior">
112+<h1>Middle</h1>
113+<p>So it continued…</p>
114+</section>
115+<section id="ending" class="level1">
116+<h1>Ending</h1>
117+<div class="exterior">
118+<p>And finally…</p>
119+</div>
120+</section>
121+```
122+
123+```
124+% pandoc --section-divs
125+::: part
126+# One
127+# Two
128+:::
129+::: part
130+# Three
131+# Four
132+# Five
133+:::
134+::: part
135+# Six
136+# Seven
137+# Eight
138+:::
139+^D
140+<div class="part">
141+<section id="one" class="level1">
142+<h1>One</h1>
143+</section>
144+<section id="two" class="level1">
145+<h1>Two</h1>
146+</section>
147+</div>
148+<div class="part">
149+<section id="three" class="level1">
150+<h1>Three</h1>
151+</section>
152+<section id="four" class="level1">
153+<h1>Four</h1>
154+</section>
155+<section id="five" class="level1">
156+<h1>Five</h1>
157+</section>
158+</div>
159+<div class="part">
160+<section id="six" class="level1">
161+<h1>Six</h1>
162+</section>
163+<section id="seven" class="level1">
164+<h1>Seven</h1>
165+</section>
166+<section id="eight" class="level1">
167+<h1>Eight</h1>
168+</section>
169+</div>
170+```