From 7d5b25d6d65306b1f2eb77417a9010951d1e17a8 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 18 Oct 2018 23:47:58 -0700
Subject: [PATCH] GroffChar: fixed interpretation of `\-`.
It is the ascii - sign, not the unicode hyphen.
---
src/Text/Pandoc/GroffChar.hs | 2 +-
test/writer.man | 20 ++++++++++----------
test/writer.ms | 18 +++++++++---------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/Text/Pandoc/GroffChar.hs b/src/Text/Pandoc/GroffChar.hs
index 8664c627f..97ff0b100 100644
--- a/src/Text/Pandoc/GroffChar.hs
+++ b/src/Text/Pandoc/GroffChar.hs
@@ -48,8 +48,8 @@ essentialEscapes = Map.fromList
, ('^', "\\[ha]")
, ('@', "\\[at]")
, ('\\', "\\[rs]")
+ , ('-', "\\-") -- minus; - will be interpreted as hyphen U+2010
, ('\x2026', "\\&...") -- because u2026 doesn't render on tty
- , ('\x2212', "\\-") -- minus
]
characterCodes :: [(Char, String)]
diff --git a/test/writer.man b/test/writer.man
index 4fb00e87d..ce9f3a23f 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];
@@ -492,7 +492,7 @@ Code block:
.IP
.nf
\f[C]
-<!--\ Comment\ -->
+<!\-\-\ Comment\ \-\->
\f[R]
.fi
.PP
@@ -571,11 +571,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:
@@ -640,7 +640,7 @@ Left paren: (
.PP
Right paren: )
.PP
-Greater-than: >
+Greater\-than: >
.PP
Hash: #
.PP
@@ -650,7 +650,7 @@ Bang: !
.PP
Plus: +
.PP
-Minus: -
+Minus: \-
.PP
* * * * *
.SH Links
@@ -718,13 +718,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 910c76cd4..12a7fc778 100644
--- a/test/writer.ms
+++ b/test/writer.ms
@@ -131,7 +131,7 @@ Here’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’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’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]