aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2018-12-13 11:24:51 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2018-12-13 11:24:51 -0800
commitee60ba5252360d2efbf9cf30197236a21a15a924 (patch)
treea12e19de123f516b38afdf78b30bdc8743016edf
parente4340b384fc6390cbebcc4dcc6f5039af893d6dd (diff)
downloadpandoc-ee60ba5252360d2efbf9cf30197236a21a15a924.tar.gz
Man/Ms writers: don't escape `-` as `\-`.
For discussion see https://groups.google.com/forum/#!msg/pandoc-discuss/B-oiCXcQOVo/WO-BXVpICAAJ The `\-` gets rendered in HTML and PDF as a unicode minus sign.
-rw-r--r--src/Text/Pandoc/RoffChar.hs1
-rw-r--r--test/writer.man20
-rw-r--r--test/writer.ms18
3 files changed, 19 insertions, 20 deletions
diff --git a/src/Text/Pandoc/RoffChar.hs b/src/Text/Pandoc/RoffChar.hs
index 52d991d32..1b171b6c2 100644
--- a/src/Text/Pandoc/RoffChar.hs
+++ b/src/Text/Pandoc/RoffChar.hs
@@ -53,7 +53,6 @@ standardEscapes =
, ('`', "\\[ga]")
, ('^', "\\[ha]")
, ('~', "\\[ti]")
- , ('-', "\\-") -- minus; - will be interpreted as hyphen U+2010
, ('\\', "\\[rs]")
, ('@', "\\[at]") -- because we use @ as a table and math delimiter
, ('\x2026', "\\&...") -- because u2026 doesn't render on tty
diff --git a/test/writer.man b/test/writer.man
index 4dab58c21..413512c73 100644
--- a/test/writer.man
+++ b/test/writer.man
@@ -27,7 +27,7 @@ Here\[cq]s a regular paragraph.
In Markdown 1.0.0 and earlier.
Version 8.
This line turns into a list item.
-Because a hard\-wrapped line in the middle of a paragraph looked like a list
+Because a hard-wrapped line in the middle of a paragraph looked like a list
item.
.PP
Here\[cq]s one with a bullet.
@@ -42,7 +42,7 @@ here.
* * * * *
.SH Block Quotes
.PP
-E\-mail style:
+E-mail style:
.RS
.PP
This is a block quote.
@@ -88,7 +88,7 @@ Code:
.IP
.nf
\f[C]
-\-\-\-\- (should be four hyphens)
+---- (should be four hyphens)
sub status {
print \[dq]working\[dq];
@@ -454,7 +454,7 @@ Code block:
.IP
.nf
\f[C]
-<!\-\- Comment \-\->
+<!-- Comment -->
\f[R]
.fi
.PP
@@ -533,11 +533,11 @@ Ellipses\&...and\&...and\&....
.IP \[bu] 2
223
.IP \[bu] 2
-\f[I]p\f[R]\-Tree
+\f[I]p\f[R]-Tree
.IP \[bu] 2
Here\[cq]s some display math:
.RS
-$$\[rs]frac{d}{dx}f(x)=\[rs]lim_{h\[rs]to 0}\[rs]frac{f(x+h)\-f(x)}{h}$$
+$$\[rs]frac{d}{dx}f(x)=\[rs]lim_{h\[rs]to 0}\[rs]frac{f(x+h)-f(x)}{h}$$
.RE
.IP \[bu] 2
Here\[cq]s one that has a line break in it:
@@ -602,7 +602,7 @@ Left paren: (
.PP
Right paren: )
.PP
-Greater\-than: >
+Greater-than: >
.PP
Hash: #
.PP
@@ -612,7 +612,7 @@ Bang: !
.PP
Plus: +
.PP
-Minus: \-
+Minus: -
.PP
* * * * *
.SH Links
@@ -680,13 +680,13 @@ In a list?
.IP \[bu] 2
It should.
.PP
-An e\-mail address: <nobody@nowhere.net>
+An e-mail address: <nobody@nowhere.net>
.RS
.PP
Blockquoted: <http://example.com/>
.RE
.PP
-Auto\-links should not occur here: \f[C]<http://example.com/>\f[R]
+Auto-links should not occur here: \f[C]<http://example.com/>\f[R]
.IP
.nf
\f[C]
diff --git a/test/writer.ms b/test/writer.ms
index 2afeb6ae2..0c66a3019 100644
--- a/test/writer.ms
+++ b/test/writer.ms
@@ -131,7 +131,7 @@ Here\[cq]s a regular paragraph.
In Markdown 1.0.0 and earlier.
Version 8.
This line turns into a list item.
-Because a hard\-wrapped line in the middle of a paragraph looked like a list
+Because a hard-wrapped line in the middle of a paragraph looked like a list
item.
.PP
Here\[cq]s one with a bullet.
@@ -146,7 +146,7 @@ Block Quotes
.pdfhref O 1 "Block Quotes"
.pdfhref M "block-quotes"
.LP
-E\-mail style:
+E-mail style:
.RS
.LP
This is a block quote.
@@ -194,7 +194,7 @@ Code:
.IP
.nf
\f[C]
-\-\-\-\- (should be four hyphens)
+---- (should be four hyphens)
sub status {
print \[dq]working\[dq];
@@ -603,7 +603,7 @@ Code block:
.IP
.nf
\f[C]
-<!\-\- Comment \-\->
+<!-- Comment -->
\f[]
.fi
.LP
@@ -693,7 +693,7 @@ LaTeX
.IP \[bu] 3
@223@
.IP \[bu] 3
-@p@\-Tree
+@p@-Tree
.IP \[bu] 3
Here\[cq]s some display math:
.EQ
@@ -763,7 +763,7 @@ Left paren: (
.PP
Right paren: )
.PP
-Greater\-than: >
+Greater-than: >
.PP
Hash: #
.PP
@@ -773,7 +773,7 @@ Bang: !
.PP
Plus: +
.PP
-Minus: \-
+Minus: -
.HLINE
.SH 1
Links
@@ -923,7 +923,7 @@ In a list?
.IP \[bu] 3
It should.
.LP
-An e\-mail address: \c
+An e-mail address: \c
.pdfhref W -D "mailto:nobody%40nowhere.net" -A "\c" \
-- "nobody\[at]nowhere.net"
\&
@@ -935,7 +935,7 @@ Blockquoted: \c
\&
.RE
.LP
-Auto\-links should not occur here: \f[C]<http://example.com/>\f[R]
+Auto-links should not occur here: \f[C]<http://example.com/>\f[R]
.IP
.nf
\f[C]