From da8425598a8ab4a98388e8ee346a2ae7ec540aa0 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 1 Jan 2012 13:48:28 -0800 Subject: New treatment of dashes in --smart mode. * `---` is always em-dash, `--` is always en-dash. * pandoc no longer tries to guess when `-` should be en-dash. * A new option, `--old-dashes`, is provided for legacy documents. Rationale: The rules for en-dash are too complex and language-dependent for a guesser to work reliably. This change gives users greater control. The alternative of using unicode isn't very good, since unicode em- and en- dashes are barely distinguishable in a monospace font. --- tests/rst-reader.native | 4 ++-- tests/testsuite.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/rst-reader.native b/tests/rst-reader.native index 8d273a1d7..e0eb4d438 100644 --- a/tests/rst-reader.native +++ b/tests/rst-reader.native @@ -165,14 +165,14 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ": ,([Str "city"], [[Para [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",Space,Str "USA"]]]) ,([Str "phone"], - [[Para [Str "123",Str "\8211",Str "4567"]]])]] + [[Para [Str "123",Str "-",Str "4567"]]])]] ,DefinitionList [([Str "address"], [[Para [Str "61",Space,Str "Main",Space,Str "St",Str "."]]]) ,([Str "city"], [[Para [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",Space,Str "USA"]]]) ,([Str "phone"], - [[Para [Str "123",Str "\8211",Str "4567"]]])] + [[Para [Str "123",Str "-",Str "4567"]]])] ,Header 1 [Str "HTML",Space,Str "Blocks"] ,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line",Str ":"] ,RawBlock "html" "
foo
\n" diff --git a/tests/testsuite.txt b/tests/testsuite.txt index ccee0764a..3bb5d8cb5 100644 --- a/tests/testsuite.txt +++ b/tests/testsuite.txt @@ -492,9 +492,9 @@ So is 'pine.' Here is some quoted '`code`' and a "[quoted link][1]". -Some dashes: one---two --- three--four -- five. +Some dashes: one---two --- three---four --- five. -Dashes between numbers: 5-7, 255-66, 1987-1999. +Dashes between numbers: 5--7, 255--66, 1987--1999. Ellipses...and...and.... -- cgit v1.2.3