cd38d4a · typeable/pandoc

git.iko.soy/typeable/pandoc

Markdown smart typography: Em dashes no longer eat surrounding whitespace.

Resolves Issue #69. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1279 788f1e2b-df1e-0410-8736-df70ead52e1b

commitcd38d4ae79b41972960fd038c7c7cfbfe2dae92a authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSun 8 Jun 2008, 03:20 (18 years ago) parentefb9fd8

12 files changed+12−13

compare with master

unifiedsplit

Text/Pandoc/Readers/Markdown.hs+1−2 tests/testsuite.native+1−1 tests/writer.context+1−1 tests/writer.docbook+1−1 tests/writer.html+1−1 tests/writer.latex+1−1 tests/writer.man+1−1 tests/writer.markdown+1−1 tests/writer.native+1−1 tests/writer.rst+1−1 tests/writer.rtf+1−1 tests/writer.texinfo+1−1

Text/Pandoc/Readers/Markdown.hs+1−2

@@ -851,8 +851,7 @@ dash = enDash <|> emDash

851851

852852enDash = try $ char '-' >> notFollowedBy (noneOf "0123456789") >> return EnDash

853853

854−emDash = try $ skipSpaces >> oneOfStrings ["---", "--"] >>

855− skipSpaces >> return EmDash

854+emDash = oneOfStrings ["---", "--"] >> return EmDash

856855

857856whitespace = do

858857 sps <- many1 (oneOf spaceChars)

tests/testsuite.native+1−1

@@ -275,7 +275,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane

275275, Para [Quoted SingleQuote [Str "Oak,"],Space,Quoted SingleQuote [Str "elm,"],Space,Str "and",Space,Quoted SingleQuote [Str "beech"],Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees",Str ".",Space,Str "So",Space,Str "is",Space,Quoted SingleQuote [Str "pine",Str "."]]

276276, Para [Quoted SingleQuote [Str "He",Space,Str "said,",Space,Quoted DoubleQuote [Str "I",Space,Str "want",Space,Str "to",Space,Str "go",Str "."]],Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",Space,Str "70",Apostrophe,Str "s?"]

277277, Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Quoted SingleQuote [Code "code"],Space,Str "and",Space,Str "a",Space,Quoted DoubleQuote [Link [Str "quoted",Space,Str "link"] ("http://example.com/?foo=1&bar=2","")],Str "."]

278−, Para [Str "Some",Space,Str "dashes:",Space,Str "one",EmDash,Str "two",EmDash,Str "three",EmDash,Str "four",EmDash,Str "five",Str "."]

278+, Para [Str "Some",Space,Str "dashes:",Space,Str "one",EmDash,Str "two",Space,EmDash,Space,Str "three",EmDash,Str "four",Space,EmDash,Space,Str "five",Str "."]

279279, Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5",EnDash,Str "7,",Space,Str "255",EnDash,Str "66,",Space,Str "1987",EnDash,Str "1999",Str "."]

280280, Para [Str "Ellipses",Ellipses,Str "and",Ellipses,Str "and",Ellipses,Str "."]

281281, HorizontalRule

tests/writer.context+1−1

@@ -616,7 +616,7 @@ is \quote{pine.}

616616Here is some quoted \quote{\type{code}} and a

617617\quotation{\useURL[3][http://example.com/?foo=1&bar=2][][quoted link]\from[3]}.

618618

619−Some dashes: one---two---three---four---five.

619+Some dashes: one---two --- three---four --- five.

620620

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

622622

tests/writer.docbook+1−1

@@ -829,7 +829,7 @@ These should not be escaped: \$ \\ \> \[ \{

829829 <quote><ulink url="http://example.com/?foo=1&bar=2">quoted link</ulink></quote>.

830830 </para>

831831 <para>

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

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

833833 </para>

834834 <para>

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

tests/writer.html+1−1

@@ -708,7 +708,7 @@ Blah

708708 >quoted link</a

709709 >”.</p

710710 ><p

711− >Some dashes: one—two—three—four—five.</p

711+ >Some dashes: one—two — three—four — five.</p

712712 ><p

713713 >Dashes between numbers: 5–7, 255–66, 1987–1999.</p

714714 ><p

tests/writer.latex+1−1

@@ -551,7 +551,7 @@ c\ensuremath{\sim}d.

551551Here is some quoted `\verb!code!' and a

552552``\href{http://example.com/?foo=1&bar=2}{quoted link}''.

553553

554−Some dashes: one---two---three---four---five.

554+Some dashes: one---two --- three---four --- five.

555555

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

557557

tests/writer.man+1−1

@@ -537,7 +537,7 @@ unescaped spaces: a^b c^d, a~b c~d\.

537537Here is some quoted `\f[B]code\f[]' and a

538538\[lq]quoted link (http://example.com/?foo=1&bar=2)\[rq]\.

539539.PP

540−Some dashes: one\[em]two\[em]three\[em]four\[em]five\.

540+Some dashes: one\[em]two \[em] three\[em]four \[em] five\.

541541.PP

542542Dashes between numbers: 5\[en]7, 255\[en]66, 1987\[en]1999\.

543543.PP

tests/writer.markdown+1−1

@@ -480,7 +480,7 @@ unescaped spaces: a\^b c\^d, a\~b c\~d.

480480Here is some quoted '`code`' and a

481481"[quoted link](http://example.com/?foo=1&bar=2)".

482482

483−Some dashes: one--two--three--four--five.

483+Some dashes: one--two -- three--four -- five.

484484

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

486486

tests/writer.native+1−1

@@ -275,7 +275,7 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane

278−, Para [Str "Some",Space,Str "dashes:",Space,Str "one",EmDash,Str "two",EmDash,Str "three",EmDash,Str "four",EmDash,Str "five",Str "."]

278+, Para [Str "Some",Space,Str "dashes:",Space,Str "one",EmDash,Str "two",Space,EmDash,Space,Str "three",EmDash,Str "four",Space,EmDash,Space,Str "five",Str "."]

279279, Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5",EnDash,Str "7,",Space,Str "255",EnDash,Str "66,",Space,Str "1987",EnDash,Str "1999",Str "."]

280280, Para [Str "Ellipses",Ellipses,Str "and",Ellipses,Str "and",Ellipses,Str "."]

281281, HorizontalRule

tests/writer.rst+1−1

@@ -609,7 +609,7 @@ Smart quotes, ellipses, dashes

609609Here is some quoted '``code``' and a

610610"`quoted link <http://example.com/?foo=1&bar=2>`_".

611611

612−Some dashes: one--two--three--four--five.

612+Some dashes: one--two -- three--four -- five.

613613

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

615615

tests/writer.rtf+1−1

@@ -235,7 +235,7 @@ emphasized link

235235quoted link

236236}}}

237237\u8221".\par}

238−{\pard \ql \f0 \sa180 \li0 \fi0 Some dashes: one\u8212-two\u8212-three\u8212-four\u8212-five.\par}

238+{\pard \ql \f0 \sa180 \li0 \fi0 Some dashes: one\u8212-two \u8212- three\u8212-four \u8212- five.\par}

239239{\pard \ql \f0 \sa180 \li0 \fi0 Dashes between numbers: 5\u8211-7, 255\u8211-66, 1987\u8211-1999.\par}

240240{\pard \ql \f0 \sa180 \li0 \fi0 Ellipses\u8230?and\u8230?and\u8230?.\par}

241241{\pard \qc \f0 \sa180 \li0 \fi0 \emdash\emdash\emdash\emdash\emdash\par}

tests/writer.texinfo+1−1

@@ -688,7 +688,7 @@ These should not be superscripts or subscripts@comma{} because of the unescaped

688688

689689Here is some quoted `@code{code}' and a ``@uref{http://example.com/?foo=1&bar=2,quoted link}''.

690690

691−Some dashes: one---two---three---four---five.

691+Some dashes: one---two --- three---four --- five.

692692

693693Dashes between numbers: 5--7@comma{} 255--66@comma{} 1987--1999.

694694