5a6399d · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Markdown writer: fewer unneeded escapes for `#`.

5a6399dJohn MacFarlane5 years ago

src/Text/Pandoc/Writers/Markdown/Inline.hs+11−2

compare with master

unifiedsplit

@@ -43,7 +43,11 @@ import Text.Pandoc.Writers.Markdown.Types (MarkdownVariant(..),

43-- | Escape special characters for Markdown.

44escapeText :: WriterOptions -> Text -> Text

45escapeText opts = T.pack . go . T.unpack

46− where

46+ where

47+ startsWithSpace (' ':_) = True

48+ startsWithSpace ('\t':_) = True

49+ startsWithSpace [] = True

50+ startsWithSpace _ = False

47 go [] = []

51 go [] = []

48 go (c:cs) =

52 go (c:cs) =

49 case c of

53 case c of

@@ -59,7 +63,10 @@ escapeText opts = T.pack . go . T.unpack

59 | isAlphaNum d || d == '_' || d == '{'

63 | isAlphaNum d || d == '_' || d == '{'

60 -> '\\':'@':go cs

64 -> '\\':'@':go cs

61 _ -> '@':go cs

65 _ -> '@':go cs

66+ '#' | isEnabled Ext_space_in_atx_header opts

67+ , startsWithSpace cs

68+ -> '\\':'#':go cs

62− _ | c `elem` ['\\','`','*','_','[',']','#'] ->

69+ _ | c `elem` ['\\','`','*','_','[',']'] ->

63 '\\':c:go cs

70 '\\':c:go cs

64 '|' | isEnabled Ext_pipe_tables opts -> '\\':'|':go cs

71 '|' | isEnabled Ext_pipe_tables opts -> '\\':'|':go cs

65 '^' | isEnabled Ext_superscript opts -> '\\':'^':go cs

72 '^' | isEnabled Ext_superscript opts -> '\\':'^':go cs

@@ -81,6 +88,8 @@ escapeText opts = T.pack . go . T.unpack

81 | isEnabled Ext_intraword_underscores opts

88 | isEnabled Ext_intraword_underscores opts

82 , isAlphaNum c

89 , isAlphaNum c

83 , isAlphaNum x -> c : '_' : x : go xs

90 , isAlphaNum x -> c : '_' : x : go xs

91+ '#':xs -> c : '#' : go xs

92+ '>':xs -> c : '>' : go xs

84 _ -> c : go cs

93 _ -> c : go cs

86attrsToMarkdown :: Attr -> Doc Text

95attrsToMarkdown :: Attr -> Doc Text

test/command/3792.md+1−1

@@ -6,7 +6,7 @@ and properly escaped.

6ok

7^D

8---

9−title: \<this\> \*that\*

9+title: \<this> \*that\*

10---

12ok

test/command/4164.md+1−1

@@ -26,6 +26,6 @@ Here is inline html:

27Here is inline html:

29−\<div\> \<balise\> bla bla \</div\>

29+\<div> \<balise> bla bla \</div>

31```

test/command/7208.md+1−1

@@ -2,5 +2,5 @@

2% pandoc -t gfm

3\<hi\>

4^D

5−\<hi\>

5+\<hi>

6```

test/command/biblatex-sigfridsson.md+1−1

@@ -90,7 +90,7 @@ references:

90 - family: Ryde

91 given: Ulf

92 container-title: Journal of Computational Chemistry

93− doi: "10.1002/(SICI)1096-987X(199803)19:4\\<377::AID-JCC1\\>3.0.CO;2-P"

93+ doi: "10.1002/(SICI)1096-987X(199803)19:4\\<377::AID-JCC1>3.0.CO;2-P"

94 id: sigfridsson

95 issue: 4

96 issued: 1998

test/writer.opml+1−1

@@ -52,7 +52,7 @@

52</outline>

53<outline text="LaTeX" _note="- 
- 2 + 2 = 4
- *x* ∈ *y*
- *α* ∧ *ω*
- 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: *α* + *ω* × *x*².

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:

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

54</outline>

55−<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: -

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

55+<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: -

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

56</outline>

57<outline text="Links">

58 <outline text="Explicit" _note="Just a [URL](/url/).

[URL and title](/url/ "title").

[URL and title](/url/ "title preceded by two spaces").

[URL and title](/url/ "title preceded by a tab").

[URL and title](/url/ "title with "quotes" in it")

[URL and title](/url/ "title with single quotes")

[with\_underscore](/url/with_underscore)

[Email link](mailto:nobody@nowhere.net)

[Empty]().">