7ace7dd · typeable/pandoc

git.iko.soy/typeable/pandoc

Markdown writer: Fixed incorrect word wrapping.

Previously pandoc would sometimes wrap lines too early due to this bug. Closes #3277.

commit7ace7dd66b3b82edaafeb822d8d0f9318feb8b79 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 4 Dec 2016, 17:13 (10 years ago) parent733b1f3

4 files changed+7−7

compare with master

unifiedsplit

src/Text/Pandoc/Writers/Markdown.hs+1−1 tests/writer.markdown+2−2 tests/writer.opml+2−2 tests/writer.plain+2−2

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

@@ -858,7 +858,7 @@ avoidBadWrapsInList (x:xs) = x : avoidBadWrapsInList xs

858858

859859isOrderedListMarker :: String -> Bool

860860isOrderedListMarker xs = (last xs `elem` ['.',')']) &&

861− isRight (runParserT (anyOrderedListMarker >> eof)

861+ isRight (runParser (anyOrderedListMarker >> eof)

862862 defaultParserState "" xs)

863863

864864isRight :: Either a b -> Bool

tests/writer.markdown+2−2

@@ -548,8 +548,8 @@ LaTeX

548548These shouldn’t be math:

549549

550550- To get the famous equation, write `$e = mc^2$`.

551−- \$22,000 is a *lot* of money. So is \$34,000. (It worked if “lot”

552− is emphasized.)

551+- \$22,000 is a *lot* of money. So is \$34,000. (It worked if “lot” is

552+ emphasized.)

553553- Shoes (\$20) and socks (\$5).

554554- Escaped `$`: \$73 *this should be emphasized* 23\$.

555555

tests/writer.opml+2−2

@@ -33,7 +33,7 @@

3333<outline text="Lists">

3434 <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>

3838 <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>

@@ -50,7 +50,7 @@

5050</outline>

5151<outline text="Smart quotes, ellipses, dashes" _note="“Hello,” said the spider. “‘Shelob’ is my name.”

‘A’, ‘B’, and ‘C’ are letters.

‘Oak,’ ‘elm,’ and ‘beech’ are names of trees. So is ‘pine.’

‘He said, “I want to go.”’ Were you alive in the 70’s?

Here is some quoted ‘`code`’ and a “[quoted
link](http://example.com/?foo=1&bar=2)”.

Some dashes: one—two — three—four — five.

Dashes between numbers: 5–7, 255–66, 1987–1999.

Ellipses…and…and….

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

5252</outline>

53−<outline text="LaTeX" _note="- \cite[22-23]{smith.1899}
- $2+2=4$
- $x \in y$
- $\alpha \wedge \omega$
- $223$
- $p$-Tree
- Here’s some display math:
 $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$
- Here’s one that has a line break in it:
 $\alpha + \omega \times x^2$.

These shouldn’t be math:

- To get the famous equation, write `$e = mc^2$`.
- \$22,000 is a *lot* of money. So is \$34,000. (It worked if “lot”
 is emphasized.)
- Shoes (\$20) and socks (\$5).
- Escaped `$`: \$73 *this should be emphasized* 23\$.

Here’s a LaTeX table:

\begin{tabular}{|l|l|}\hline
Animal & Number \\ \hline
Dog & 2 \\
Cat & 1 \\ \hline
\end{tabular}

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

53+<outline text="LaTeX" _note="- \cite[22-23]{smith.1899}
- $2+2=4$
- $x \in y$
- $\alpha \wedge \omega$
- $223$
- $p$-Tree
- Here’s some display math:
 $$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$$
- Here’s one that has a line break in it:
 $\alpha + \omega \times x^2$.

These shouldn’t be math:

- To get the famous equation, write `$e = mc^2$`.
- \$22,000 is a *lot* of money. So is \$34,000. (It worked if “lot” is
 emphasized.)
- Shoes (\$20) and socks (\$5).
- Escaped `$`: \$73 *this should be emphasized* 23\$.

Here’s a LaTeX table:

\begin{tabular}{|l|l|}\hline
Animal & Number \\ \hline
Dog & 2 \\
Cat & 1 \\ \hline
\end{tabular}

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

5454</outline>

5555<outline text="Special Characters" _note="Here is some unicode:

- I hat: Î
- o umlaut: ö
- section: §
- set membership: ∈
- copyright: ©

AT&T has an ampersand in their name.

AT&T is another way to write it.

This & that.

4 &lt; 5.

6 &gt; 5.

Backslash: \\

Backtick: \`

Asterisk: \*

Underscore: \_

Left brace: {

Right brace: }

Left bracket: \[

Right bracket: \]

Left paren: (

Right paren: )

Greater-than: &gt;

Hash: \#

Period: .

Bang: !

Plus: +

Minus: -

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

5656</outline>

tests/writer.plain+2−2

@@ -498,8 +498,8 @@ LATEX

498498These shouldn’t be math:

499499

500500- To get the famous equation, write $e = mc^2$.

501−- $22,000 is a _lot_ of money. So is $34,000. (It worked if “lot”

502− is emphasized.)

501+- $22,000 is a _lot_ of money. So is $34,000. (It worked if “lot” is

502+ emphasized.)

503503- Shoes ($20) and socks ($5).

504504- Escaped $: $73 _this should be emphasized_ 23$.

505505