Use .EX/.EE to typeset code blocks

go-md2man.1.md

@@ -2,22 +2,27 @@ go-md2man 1 "January 2015" go-md2man "User Manual"
 ==================================================
 
 # NAME
-  go-md2man - Convert markdown files into manpages
+go-md2man - Convert markdown files into manpages
 
 # SYNOPSIS
-  go-md2man -in=[/path/to/md/file] -out=[/path/to/output]
+**go-md2man** [**-in**=*/path/to/md/file*] [**-out**=*/path/to/output*]
 
-# Description
-  go-md2man converts standard markdown formatted documents into manpages. It is
-  written purely in Go so as to reduce dependencies on 3rd party libs.
+# DESCRIPTION
+**go-md2man** converts standard markdown formatted documents into manpages. It is
+written purely in Go so as to reduce dependencies on 3rd party libs.
 
-  By default, the input is stdin and the output is stdout.
+By default, the input is stdin and the output is stdout.
 
-# Example
-  Convert the markdown file "go-md2man.1.md" into a manpage.
+# EXAMPLES
+Convert the markdown file *go-md2man.1.md* into a manpage:
+```
+go-md2man < go-md2man.1.md > go-md2man.1
+```
 
-    go-md2man -in=go-md2man.1.md -out=go-md2man.1.out
+Same, but using command line arguments instead of shell redirection:
+```
+go-md2man -in=go-md2man.1.md -out=go-md2man.1
+```
 
 # HISTORY
-  January 2015, Originally compiled by Brian Goff( cpuguy83@gmail.com )
-
+January 2015, Originally compiled by Brian Goff (cpuguy83@gmail.com).

md2man/roff.go

@@ -7,13 +7,13 @@
 	"os"
 	"strings"
 
 	"github.com/russross/blackfriday/v2"
 )
 
 // roffRenderer implements the blackfriday.Renderer interface for creating
 // roff format (manpages) from markdown text
 type roffRenderer struct {
 	extensions   blackfriday.Extensions
 	listCounters []int
 	firstHeader  bool
 	firstDD      bool
@@ -37,8 +37,8 @@
 	linkCloseTag     = "\\[ra]"
 	codespanTag      = "\\fB\\fC"
 	codespanCloseTag = "\\fR"
-	codeTag          = "\n.PP\n.RS\n\n.nf\n"
-	codeCloseTag     = "\n.fi\n.RE\n"
+	codeTag          = "\n.EX\n"
+	codeCloseTag     = "\n.EE\n"
 	quoteTag         = "\n.PP\n.RS\n"
 	quoteCloseTag    = "\n.RE\n"
 	listTag          = "\n.RS\n"
@@ -69,12 +69,12 @@
 }
 
 // GetExtensions returns the list of extensions used by this renderer implementation
 func (r *roffRenderer) GetExtensions() blackfriday.Extensions {
 	return r.extensions
 }
 
 // RenderHeader handles outputting the header at document start
 func (r *roffRenderer) RenderHeader(w io.Writer, ast *blackfriday.Node) {
 	// disable hyphenation
 	out(w, ".nh\n")
 }

md2man/roff_test.go

@@ -3,13 +3,24 @@
 import (
 	"testing"
 
 	"github.com/russross/blackfriday/v2"
 )
 
 type TestParams struct {
 	extensions blackfriday.Extensions
 }
 
+func TestCodeBlocks(t *testing.T) {
+	tests := []string{
+		"```\nsome code\n```\n",
+		".nh\n\n.EX\nsome code\n\n.EE\n",
+
+		"```bash\necho foo\n```\n",
+		".nh\n\n.EX\necho foo\n\n.EE\n",
+	}
+	doTestsParam(t, tests, TestParams{blackfriday.FencedCode})
+}
+
 func TestEmphasis(t *testing.T) {
 	var tests = []string{
 		"nothing inline\n",