Move common groff functions to Text.Pandoc.Writers.Groff

(unexported module).  These are used in both the man and ms
writers.

Moved groffEscape out of Text.Pandoc.Writers.Shared [cancels earlier
API change from adding it, which was after last release].

This fixes strong/code combination on man (should be `\f[CB]` not
`\f[BC]`), mentioned in #4973.

Updated tests.

Closes #4975.

6 files changed, 65 insertions, 64 deletions

diff --git a/test/command/3568.md b/test/command/3568.md
index 919972ed3..f88c2fe9a 100644
--- a/test/command/3568.md
+++ b/test/command/3568.md
@@ -10,7 +10,7 @@ normal `code` normal.
 normal \f[I]italic \f[BI]bold in the middle\f[I] only italic\f[R]
 normal.
 .PP
-normal \f[B]bold \f[BC]code\f[B] more bold\f[R] normal.
+normal \f[B]bold \f[CB]code\f[B] more bold\f[R] normal.
 .PP
 normal \f[C]code\f[R] normal.
 ```
diff --git a/test/command/4550.md b/test/command/4550.md
index bf3afce5b..45ed21a00 100644
--- a/test/command/4550.md
+++ b/test/command/4550.md
@@ -3,5 +3,5 @@
 A ‘simple’ example
 ^D
 .LP
-A ‘simple’ example
+A \[oq]simple\[cq] example
 ```
diff --git a/test/tables.man b/test/tables.man
index 8c9385b4f..7d4d4cd03 100644
--- a/test/tables.man
+++ b/test/tables.man
@@ -135,7 +135,7 @@ T}
 .PP
 Multiline table with caption:
 .PP
-Here's the caption. It may span multiple lines.
+Here\[cq]s the caption. It may span multiple lines.
 .TS
 tab(@);
 cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).
@@ -165,7 +165,7 @@ row
 T}@T{
 5.0
 T}@T{
-Here's another one.
+Here\[cq]s another one.
 Note the blank line between rows.
 T}
 .TE
@@ -201,7 +201,7 @@ row
 T}@T{
 5.0
 T}@T{
-Here's another one.
+Here\[cq]s another one.
 Note the blank line between rows.
 T}
 .TE
@@ -261,7 +261,7 @@ row
 T}@T{
 5.0
 T}@T{
-Here's another one.
+Here\[cq]s another one.
 Note the blank line between rows.
 T}
 .TE
diff --git a/test/tables.ms b/test/tables.ms
index 6d9138c64..90662aaad 100644
--- a/test/tables.ms
+++ b/test/tables.ms
@@ -135,7 +135,7 @@ T}
 .LP
 Multiline table with caption:
 .PP
-Here’s the caption. It may span multiple lines.
+Here\[cq]s the caption. It may span multiple lines.
 .TS
 delim(@@) tab(	);
 cw(10.5n) lw(9.6n) rw(11.4n) lw(24.5n).
@@ -165,7 +165,7 @@ row
 T}	T{
 5.0
 T}	T{
-Here’s another one.
+Here\[cq]s another one.
 Note the blank line between rows.
 T}
 .TE
@@ -201,7 +201,7 @@ row
 T}	T{
 5.0
 T}	T{
-Here’s another one.
+Here\[cq]s another one.
 Note the blank line between rows.
 T}
 .TE
@@ -261,7 +261,7 @@ row
 T}	T{
 5.0
 T}	T{
-Here’s another one.
+Here\[cq]s another one.
 Note the blank line between rows.
 T}
 .TE
diff --git a/test/writer.man b/test/writer.man
index 3cb0276fa..12b51c071 100644
--- a/test/writer.man
+++ b/test/writer.man
@@ -2,7 +2,7 @@
 .hy
 .PP
 This is a set of tests for pandoc.
-Most of them are adapted from John Gruber's markdown test suite.
+Most of them are adapted from John Gruber\[cq]s markdown test suite.
 .PP
    *   *   *   *   *
 .SH Headers
@@ -22,15 +22,15 @@ with no blank line
    *   *   *   *   *
 .SH Paragraphs
 .PP
-Here's a regular paragraph.
+Here\[cq]s a regular paragraph.
 .PP
 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.
+Here\[cq]s one with a bullet.
 * criminey.
 .PP
 There should be a hard line break
@@ -42,7 +42,7 @@ here.
    *   *   *   *   *
 .SH Block Quotes
 .PP
-E\-mail style:
+E-mail style:
 .RS
 .PP
 This is a block quote.
@@ -55,7 +55,7 @@ Code in a block quote:
 .nf
 \f[C]
 sub\ status\ {
-\ \ \ \ print\ "working";
+\ \ \ \ print\ \[dq]working\[dq];
 }
 \f[R]
 .fi
@@ -88,10 +88,10 @@ Code:
 .IP
 .nf
 \f[C]
-\-\-\-\-\ (should\ be\ four\ hyphens)
+----\ (should\ be\ four\ hyphens)
 
 sub\ status\ {
-\ \ \ \ print\ "working";
+\ \ \ \ print\ \[dq]working\[dq];
 }
 
 this\ code\ block\ is\ indented\ by\ one\ tab
@@ -200,7 +200,7 @@ Item 1, graf one.
 .PP
 Item 1.
 graf two.
-The quick brown fox jumped over the lazy dog's back.
+The quick brown fox jumped over the lazy dog\[cq]s back.
 .RE
 .IP "2." 3
 Item 2.
@@ -218,7 +218,7 @@ Tab
 .RE
 .RE
 .PP
-Here's another:
+Here\[cq]s another:
 .IP "1." 3
 First
 .IP "2." 3
@@ -308,7 +308,7 @@ Nested.
 .PP
 Should not be a list item:
 .PP
-M.A.\ 2007
+M.A.\~2007
 .PP
 B.
 Williams
@@ -459,7 +459,7 @@ Interpreted markdown in a table:
 This is \f[I]emphasized\f[R]
 And this is \f[B]strong\f[R]
 .PP
-Here's a simple block:
+Here\[cq]s a simple block:
 .PP
 foo
 .PP
@@ -492,7 +492,7 @@ Code block:
 .IP
 .nf
 \f[C]
-<!\-\-\ Comment\ \-\->
+<!--\ Comment\ -->
 \f[R]
 .fi
 .PP
@@ -506,7 +506,7 @@ Code:
 \f[R]
 .fi
 .PP
-Hr's:
+Hr\[cq]s:
 .PP
    *   *   *   *   *
 .SH Inline Markup
@@ -530,12 +530,12 @@ This is code: \f[C]>\f[R], \f[C]$\f[R], \f[C]\\\f[R], \f[C]\\$\f[R],
 .PP
 [STRIKEOUT:This is \f[I]strikeout\f[R].]
 .PP
-Superscripts: a^bc^d a^\f[I]hello\f[R]^ a^hello\ there^.
+Superscripts: a^bc^d a^\f[I]hello\f[R]^ a^hello\~there^.
 .PP
-Subscripts: H~2~O, H~23~O, H~many\ of\ them~O.
+Subscripts: H~2~O, H~23~O, H~many\~of\~them~O.
 .PP
 These should not be superscripts or subscripts, because of the unescaped
-spaces: a^b c^d, a~b c~d.
+spaces: a\[ha]b c\[ha]d, a\[ti]b c\[ti]d.
 .PP
    *   *   *   *   *
 .SH Smart quotes, ellipses, dashes
@@ -548,7 +548,7 @@ spaces: a^b c^d, a~b c~d.
 `Oak,' `elm,' and `beech' are names of trees.
 So is `pine.'
 .PP
-`He said, \[lq]I want to go.\[rq]' Were you alive in the 70's?
+`He said, \[lq]I want to go.\[rq]' Were you alive in the 70\[cq]s?
 .PP
 Here is some quoted `\f[C]code\f[R]' and a \[lq]quoted
 link (http://example.com/?foo=1&bar=2)\[rq].
@@ -571,19 +571,19 @@ 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's some display math:
+Here\[cq]s some display math:
 .RS
-$$\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)\-f(x)}{h}$$
+$$\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}$$
 .RE
 .IP \[bu] 2
-Here's one that has a line break in it:
+Here\[cq]s one that has a line break in it:
 \f[I]α\f[R] + \f[I]ω\f[R] × \f[I]x\f[R]^2^.
 .PP
-These shouldn't be math:
+These shouldn\[cq]t be math:
 .IP \[bu] 2
-To get the famous equation, write \f[C]$e\ =\ mc^2$\f[R].
+To get the famous equation, write \f[C]$e\ =\ mc\[ha]2$\f[R].
 .IP \[bu] 2
 $22,000 is a \f[I]lot\f[R] of money.
 So is $34,000.
@@ -593,7 +593,7 @@ Shoes ($20) and socks ($5).
 .IP \[bu] 2
 Escaped \f[C]$\f[R]: $73 \f[I]this should be emphasized\f[R] 23$.
 .PP
-Here's a LaTeX table:
+Here\[cq]s a LaTeX table:
 .PP
    *   *   *   *   *
 .SH Special Characters
@@ -622,7 +622,7 @@ This & that.
 .PP
 Backslash: \\
 .PP
-Backtick: `
+Backtick: \`
 .PP
 Asterisk: *
 .PP
@@ -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
@@ -700,13 +700,14 @@ Foo bar (/url/).
 Foo biz (/url/).
 .SS With ampersands
 .PP
-Here's a link with an ampersand in the URL (http://example.com/?foo=1&bar=2).
+Here\[cq]s a link with an ampersand in the
+URL (http://example.com/?foo=1&bar=2).
 .PP
-Here's a link with an amersand in the link text: AT&T (http://att.com/).
+Here\[cq]s a link with an amersand in the link text: AT&T (http://att.com/).
 .PP
-Here's an inline link (/script?foo=1&bar=2).
+Here\[cq]s an inline link (/script?foo=1&bar=2).
 .PP
-Here's an inline link in pointy braces (/script?foo=1&bar=2).
+Here\[cq]s an inline link in pointy braces (/script?foo=1&bar=2).
 .SS Autolinks
 .PP
 With an ampersand: <http://example.com/?foo=1&bar=2>
@@ -717,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]
@@ -744,8 +745,8 @@ Here is a movie [IMAGE: movie (movie.jpg)] icon.
 .SH Footnotes
 .PP
 Here is a footnote reference,[1] and another.[2] This should \f[I]not\f[R] be
-a footnote reference, because it contains a space.[^my note] Here is an inline
-note.[3]
+a footnote reference, because it contains a space.[\[ha]my note] Here is an
+inline note.[3]
 .RS
 .PP
 Notes can go in quotes.[4]
@@ -762,7 +763,7 @@ It can go anywhere after the footnote reference.
 It need not be placed at the end of the document.
 .SS [2]
 .PP
-Here's the long note.
+Here\[cq]s the long note.
 This one contains multiple blocks.
 .PP
 Subsequent blocks are indented to show that they belong to the footnote (as
diff --git a/test/writer.ms b/test/writer.ms
index e7ac44bb9..8480f5520 100644
--- a/test/writer.ms
+++ b/test/writer.ms
@@ -75,7 +75,7 @@ July 17, 2006
 .1C
 .LP
 This is a set of tests for pandoc.
-Most of them are adapted from John Gruber’s markdown test suite.
+Most of them are adapted from John Gruber\[cq]s markdown test suite.
 .HLINE
 .SH 1
 Headers
@@ -126,7 +126,7 @@ Paragraphs
 .pdfhref O 1 "Paragraphs"
 .pdfhref M "paragraphs"
 .LP
-Here’s a regular paragraph.
+Here\[cq]s a regular paragraph.
 .PP
 In Markdown 1.0.0 and earlier.
 Version 8.
@@ -134,7 +134,7 @@ This line turns into a list item.
 Because a hard-wrapped line in the middle of a paragraph looked like a list
 item.
 .PP
-Here’s one with a bullet.
+Here\[cq]s one with a bullet.
 * criminey.
 .PP
 There should be a hard line break
@@ -314,7 +314,7 @@ Item 1, graf one.
 .PP
 Item 1.
 graf two.
-The quick brown fox jumped over the lazy dog’s back.
+The quick brown fox jumped over the lazy dog\[cq]s back.
 .RE
 .IP " 2." 4
 Item 2.
@@ -335,7 +335,7 @@ Tab
 .RE
 .RE
 .LP
-Here’s another:
+Here\[cq]s another:
 .IP " 1." 4
 First
 .IP " 2." 4
@@ -570,7 +570,7 @@ Interpreted markdown in a table:
 This is \f[I]emphasized\f[R]
 And this is \f[B]strong\f[R]
 .PP
-Here’s a simple block:
+Here\[cq]s a simple block:
 .LP
 foo
 .LP
@@ -617,7 +617,7 @@ Code:
 \f[]
 .fi
 .LP
-Hr’s:
+Hr\[cq]s:
 .HLINE
 .SH 1
 Inline Markup
@@ -666,7 +666,7 @@ Smart quotes, ellipses, dashes
 `Oak,' `elm,' and `beech' are names of trees.
 So is `pine.'
 .PP
-`He said, \[lq]I want to go.\[rq]' Were you alive in the 70’s?
+`He said, \[lq]I want to go.\[rq]' Were you alive in the 70\[cq]s?
 .PP
 Here is some quoted `\f[C]code\f[R]' and a \[lq]\c
 .pdfhref W -D "http://example.com/?foo=1&bar=2" -A "\c" \
@@ -695,14 +695,14 @@ LaTeX
 .IP \[bu] 3
 @p@-Tree
 .IP \[bu] 3
-Here’s some display math:
+Here\[cq]s some display math:
 .EQ
 d over {d x} f ( x ) = lim sub {h -> 0} {f ( x + h ) \[u2212] f ( x )} over h
 .EN
 .IP \[bu] 3
-Here’s one that has a line break in it: @alpha + omega times x sup 2@.
+Here\[cq]s one that has a line break in it: @alpha + omega times x sup 2@.
 .LP
-These shouldn’t be math:
+These shouldn\[cq]t be math:
 .IP \[bu] 3
 To get the famous equation, write \f[C]$e\ =\ mc\[ha]2$\f[R].
 .IP \[bu] 3
@@ -714,7 +714,7 @@ Shoes ($20) and socks ($5).
 .IP \[bu] 3
 Escaped \f[C]$\f[R]: $73 \f[I]this should be emphasized\f[R] 23$.
 .LP
-Here’s a LaTeX table:
+Here\[cq]s a LaTeX table:
 .HLINE
 .SH 1
 Special Characters
@@ -885,22 +885,22 @@ With ampersands
 .pdfhref O 2 "With ampersands"
 .pdfhref M "with-ampersands"
 .LP
-Here’s a \c
+Here\[cq]s a \c
 .pdfhref W -D "http://example.com/?foo=1&bar=2" -A "\c" \
  -- "link with an ampersand in the URL"
 \&.
 .PP
-Here’s a link with an amersand in the link text: \c
+Here\[cq]s a link with an amersand in the link text: \c
 .pdfhref W -D "http://att.com/" -A "\c" \
  -- "AT&T"
 \&.
 .PP
-Here’s an \c
+Here\[cq]s an \c
 .pdfhref W -D "/script?foo=1&bar=2" -A "\c" \
  -- "inline link"
 \&.
 .PP
-Here’s an \c
+Here\[cq]s an \c
 .pdfhref W -D "/script?foo=1&bar=2" -A "\c" \
  -- "inline link in pointy braces"
 \&.
@@ -967,7 +967,7 @@ It need not be placed at the end of the document.
 .FE
 and another.\**
 .FS
-Here’s the long note.
+Here\[cq]s the long note.
 This one contains multiple blocks.
 .PP
 Subsequent blocks are indented to show that they belong to the footnote (as