bcfb77e · typeable/pandoc

git.iko.soy/typeable/pandoc

Markdown writer: Avoid spurious blanklines at end of document...

after tables and list, for example.

commitbcfb77e2ab832d97b66e0bd06c35a9a13be437da authorJohn MacFarlane <jgm@berkeley.edu> dateWed 8 Mar 2017, 12:47 (10 years ago) parentb6e7bfa

7 files changed+6−18

compare with master

unifiedsplit

src/Text/Pandoc/Writers/Markdown.hs+1−1 test/command/2834.md−3 test/command/3337.md−3 test/command/3487.md−2 test/tables.markdown−2 test/tables.plain−2 test/writer.opml+5−5

src/Text/Pandoc/Writers/Markdown.hs+1−1

@@ -214,7 +214,7 @@ pandocToMarkdown opts (Pandoc meta blocks) = do

214214 body <- blockListToMarkdown opts blocks'

215215 notesAndRefs' <- notesAndRefs opts

216216 let render' :: Doc -> String

217− render' = render colwidth

217+ render' = render colwidth . chomp

218218 let main = render' $ body <> notesAndRefs'

219219 let context = defField "toc" (render' toc)

220220 $ defField "body" main

test/command/2834.md−3

@@ -26,7 +26,4 @@ Nested grid tables.

2626| | ----------- | |

2727| +------------------------------------------------------------------+ |

2828+-----------------------------------------------------------------------+

29−

30−

31−

3229```

test/command/3337.md−3

@@ -9,8 +9,5 @@

99 a

1010 1 2

1111 --- ---

12−

13−

14−

1512```

1613

test/command/3487.md−2

@@ -8,6 +8,4 @@ Some text

88Some text

1010- element

11−

12−

1311```

test/tables.markdown−2

@@ -74,5 +74,3 @@ Multiline table without column headers:

7474 the blank line between

7575 rows.

7676 ----------- ---------- ------------ --------------------------

77−

78−

test/tables.plain−2

@@ -74,5 +74,3 @@ Multiline table without column headers:

7474 the blank line between

7575 rows.

7676 ----------- ---------- ------------ --------------------------

77−

78−

test/writer.opml+5−5

@@ -31,18 +31,18 @@

3131<outline text="Code Blocks" _note="Code:

 ---- (should be four hyphens)

 sub status {
 print "working";
 }

 this code block is indented by one tab

And:

 this code block is indented by two tabs

 These should not be escaped: \$ \\ \> \[ \{

------------------------------------------------------------------------">

3232</outline>

3333<outline text="Lists">

34− <outline text="Unordered" _note="Asterisks tight:

- asterisk 1
- asterisk 2
- asterisk 3

Asterisks loose:

- asterisk 1

- asterisk 2

- asterisk 3

Pluses tight:

- Plus 1
- Plus 2
- Plus 3

Pluses loose:

- Plus 1

- Plus 2

- Plus 3

Minuses tight:

- Minus 1
- Minus 2
- Minus 3

Minuses loose:

- Minus 1

- Minus 2

- Minus 3

">

34+ <outline text="Unordered" _note="Asterisks tight:

- asterisk 1
- asterisk 2
- asterisk 3

Asterisks loose:

- asterisk 1

- asterisk 2

- asterisk 3

Pluses tight:

- Plus 1
- Plus 2
- Plus 3

Pluses loose:

- Plus 1

- Plus 2

- Plus 3

Minuses tight:

- Minus 1
- Minus 2
- Minus 3

Minuses loose:

- Minus 1

- Minus 2

- Minus 3">

3535 </outline>

36− <outline text="Ordered" _note="Tight:

1. First
2. Second
3. Third

and:

1. One
2. Two
3. Three

Loose using tabs:

1. First

2. Second

3. Third

and using spaces:

1. One

2. Two

3. Three

Multiple paragraphs:

1. Item 1, graf one.

 Item 1. graf two. The quick brown fox jumped over the lazy dog’s
 back.

2. Item 2.

3. Item 3.

">

36+ <outline text="Ordered" _note="Tight:

1. First
2. Second
3. Third

and:

1. One
2. Two
3. Three

Loose using tabs:

1. First

2. Second

3. Third

and using spaces:

1. One

2. Two

3. Three

Multiple paragraphs:

1. Item 1, graf one.

 Item 1. graf two. The quick brown fox jumped over the lazy dog’s
 back.

2. Item 2.

3. Item 3.">

3737 </outline>

38− <outline text="Nested" _note="- Tab
 - Tab
 - Tab

Here’s another:

1. First
2. Second:
 - Fee
 - Fie
 - Foe
3. Third

Same thing but with paragraphs:

1. First

2. Second:

 - Fee
 - Fie
 - Foe

3. Third

">

38+ <outline text="Nested" _note="- Tab
 - Tab
 - Tab

Here’s another:

1. First
2. Second:
 - Fee
 - Fie
 - Foe
3. Third

Same thing but with paragraphs:

1. First

2. Second:

 - Fee
 - Fie
 - Foe

3. Third">

3939 </outline>

40− <outline text="Tabs and spaces" _note="- this is a list item indented with tabs

- this is a list item indented with spaces

 - this is an example list item indented with tabs

 - this is an example list item indented with spaces

">

40+ <outline text="Tabs and spaces" _note="- this is a list item indented with tabs

- this is a list item indented with spaces

 - this is an example list item indented with tabs

 - this is an example list item indented with spaces">

4141 </outline>

4242 <outline text="Fancy list markers" _note="1. begins with 2
2. and now 3

 with a continuation

 1. sublist with roman numerals, starting with 4
 2. more items
 1. a subsublist
 2. a subsublist

Nesting:

1. Upper Alpha
 1. Upper Roman.
 1. Decimal start with 6
 1. Lower alpha with paren

Autonumbering:

1. Autonumber.
2. More.
 1. Nested.

Should not be a list item:

M.A. 2007

B. Williams

------------------------------------------------------------------------">

4343 </outline>

4444</outline>

45−<outline text="Definition Lists" _note="Tight using spaces:

apple 
red fruit

orange 
orange fruit

banana 
yellow fruit

Tight using tabs:

apple 
red fruit

orange 
orange fruit

banana 
yellow fruit

Loose:

apple 
red fruit

orange 
orange fruit

banana 
yellow fruit

Multiple blocks with italics:

*apple* 
red fruit

contains seeds, crisp, pleasant to taste

*orange* 
orange fruit

 { orange code block }

> orange block quote

Multiple definitions, tight:

apple 
red fruit

computer

orange 
orange fruit

bank

Multiple definitions, loose:

apple 
red fruit

computer

orange 
orange fruit

bank

Blank line after term, indented marker, alternate markers:

apple 
red fruit

computer

orange 
orange fruit

1. sublist
2. sublist
">

45+<outline text="Definition Lists" _note="Tight using spaces:

apple 
red fruit

orange 
orange fruit

banana 
yellow fruit

Tight using tabs:

apple 
red fruit

orange 
orange fruit

banana 
yellow fruit

Loose:

apple 
red fruit

orange 
orange fruit

banana 
yellow fruit

Multiple blocks with italics:

*apple* 
red fruit

contains seeds, crisp, pleasant to taste

*orange* 
orange fruit

 { orange code block }

> orange block quote

Multiple definitions, tight:

apple 
red fruit

computer

orange 
orange fruit

bank

Multiple definitions, loose:

apple 
red fruit

computer

orange 
orange fruit

bank

Blank line after term, indented marker, alternate markers:

apple 
red fruit

computer

orange 
orange fruit

1. sublist
2. sublist">

4646</outline>

4747<outline text="HTML Blocks" _note="Simple block on one line:

foo

And nested without indentation:

foo

bar

Interpreted markdown in a table:

This is *emphasized*
And this is **strong**
Here’s a simple block:

foo

This should be a code block, though:

 <div>
 foo
 </div>

As should this:

 <div>foo</div>

Now, nested:

foo

This should just be an HTML comment:

Multiline:

Code block:

 

Just plain comment, with trailing spaces on the line:

Code:

 <hr />

Hr’s:

------------------------------------------------------------------------">

4848</outline>