diff --git a/src/guide/xml/changelog.xml b/src/guide/xml/changelog.xml index c56b546405..d5943eca02 100644 --- a/src/guide/xml/changelog.xml +++ b/src/guide/xml/changelog.xml @@ -51,6 +51,15 @@ development continues. fixed #497. + + Support linking on db:arg and db:group elements; + fixed #528. + + + + Provided additional class attributes on various flavors of synopsis to enable + more precise CSS styling. + diff --git a/src/main/xslt/modules/programming.xsl b/src/main/xslt/modules/programming.xsl index 8065134538..147e6e794e 100644 --- a/src/main/xslt/modules/programming.xsl +++ b/src/main/xslt/modules/programming.xsl @@ -735,7 +735,7 @@
-
+ 
         
         package 
@@ -754,7 +754,7 @@
   

     
     
-    

+    

       
         
         class 
@@ -776,7 +776,7 @@
   
   

     
-    

+    

       
         
       

@@ -829,7 +829,7 @@
   
   

     
-    

+    

       
         
       

@@ -918,7 +918,7 @@
   

     
     
-    

+    

       
         
         enum 
@@ -1036,10 +1036,7 @@
     
   
 
-  
-    
-    
-  
+  
 
   
     
diff --git a/src/main/xslt/modules/verbatim.xsl b/src/main/xslt/modules/verbatim.xsl
index 49ca85abc2..48b5908454 100644
--- a/src/main/xslt/modules/verbatim.xsl
+++ b/src/main/xslt/modules/verbatim.xsl
@@ -284,7 +284,7 @@
     
   
 
-  

+  

     
       
         
@@ -314,7 +314,7 @@
     
   
 
-  

+  

     
       
         
@@ -430,7 +430,7 @@
   
 
-  

+  

     
       
       
@@ -597,7 +597,7 @@
   
 
-  

+  

     
       
       
diff --git a/src/test/resources/expected/address.001.html b/src/test/resources/expected/address.001.html
index 8907fc54f8..8ce6d02af6 100644
--- a/src/test/resources/expected/address.001.html
+++ b/src/test/resources/expected/address.001.html
@@ -1,12 +1,12 @@
-Article wrapper
Article wrapper
An address:
Santa Clause
+Article wrapper
Article wrapper
An address:
Santa Clause
 1 Main Street
 North Pole, AK
 12345
-US
Other address fields:
Information:
+US
Other address fields:
Information:
 +1-914-555-1212
 +1-213-555-1212
 
-http://www.example.com/
With a PO Box:
Some Company
+http://www.example.com/
With a PO Box:
Some Company
 P.O. Box 123
 Anytown, XX
 12345

\ No newline at end of file
diff --git a/src/test/resources/expected/address.002.html b/src/test/resources/expected/address.002.html
index 8f70e49bbb..cd47802d0e 100644
--- a/src/test/resources/expected/address.002.html
+++ b/src/test/resources/expected/address.002.html
@@ -1,4 +1,4 @@
-Test: address.002
Test: address.002
An address (in table style):
  |
+Test: address.002
Test: address.002
An address (in table style):
  |
   |
   |
   |
@@ -8,7 +8,7 @@
 North Pole, AK
 12345
 US
-
Other address fields:
  |
+
Other address fields:
  |
   |
   |
   |
@@ -18,7 +18,7 @@
 +1-213-555-1212
 
 http://www.example.com/
-
With a PO Box:
  |
+
With a PO Box:
  |
   |
   |
   |
diff --git a/src/test/resources/expected/book.003.html b/src/test/resources/expected/book.003.html
index 23d67a5759..15e5491b9e 100644
--- a/src/test/resources/expected/book.003.html
+++ b/src/test/resources/expected/book.003.html
@@ -34,8 +34,8 @@
 Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
 Blah blah blah blah blah blah blah blah. Blah blah blah blah.
 Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-
  |A figure. Just to test the numeration.
-
Figure 1.1. A Test Figure
1. First Section
  |A figure. Just to test the numeration.
+
  |A figure. Just to test the numeration.
+
Figure 1.1. A Test Figure
1. First Section
  |A figure. Just to test the numeration.
 
Figure 1.2. Another Test Figure
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
 Blah blah blah blah blah blah blah blah. Blah blah blah blah.
 Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
@@ -53,7 +53,7 @@
 Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
 Blah blah blah blah blah blah blah blah. Blah blah blah blah.
 Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
-
  |An example.
+
  |An example.
 
Example 1.1. Test Example
1.1. First Subsection
Blah blah blah blah. Blah blah blah blah. Blah blah blah blah.
 Blah blah blah blah blah blah blah blah. Blah blah blah blah.
 Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
diff --git a/src/test/resources/expected/book.021.html b/src/test/resources/expected/book.021.html
index 35e7f54080..f8e0f79a12 100644
--- a/src/test/resources/expected/book.021.html
+++ b/src/test/resources/expected/book.021.html
@@ -5,6 +5,6 @@
 But you can fix it changing the self::db:article template in the
 “title-numbered” part of the localization to:
 
-
  |<template match="self::db:article">%l%.%c</template>
+
  |<template match="self::db:article">%l%.%c</template>
 

 
First Article
This article is numbered, so are its sections.
1. First section
1.1. Second section
…
Second Article
This article is not numbered, neither are its sections.
First section
Second section
Third Article
This article is numbered, its sections are not.
First section
Second section
…
Fourth Article
This article is not numbered, but its sections are.
1. First section
1.1. Second section

\ No newline at end of file
diff --git a/src/test/resources/expected/calloutlist.001.html b/src/test/resources/expected/calloutlist.001.html
index f1e07e2504..42a98dd2f5 100644
--- a/src/test/resources/expected/calloutlist.001.html
+++ b/src/test/resources/expected/calloutlist.001.html
@@ -1,4 +1,4 @@
-Article wrapper
Article wrapper
Callouts using co:
  |(let ①loopvar ②((count 1))
+Article wrapper
Article wrapper
Callouts using co:
  |(let ①loopvar ②((count 1))
   |  ③(if (> count 10)
   |    ④#t
   |    (⑤loopvar ⑥(+ count 1))))
diff --git a/src/test/resources/expected/calloutlist.002.html b/src/test/resources/expected/calloutlist.002.html
index 5f59d28994..80c79a3dbd 100644
--- a/src/test/resources/expected/calloutlist.002.html
+++ b/src/test/resources/expected/calloutlist.002.html
@@ -1,4 +1,4 @@
-Article wrapper
Article wrapper
Callouts using co:
   |(let ①loopvar ②((count 1))
+Article wrapper
Article wrapper
Callouts using co:
   |(let ①loopvar ②((count 1))
    |  ③(if (> count 10)
    |    ④#t
    |    (⑤loopvar ⑥(+ count 1))))
diff --git a/src/test/resources/expected/calloutlist.003.html b/src/test/resources/expected/calloutlist.003.html
index 090702d469..aaed926bb0 100644
--- a/src/test/resources/expected/calloutlist.003.html
+++ b/src/test/resources/expected/calloutlist.003.html
@@ -1,4 +1,4 @@
-Unit Test: calloutlist.003
Unit Test: calloutlist.003
Benoit Guillon
Table of Contents
1. Callouts
1.1. Embedded cos
 1 |  <refentry>
+Unit Test: calloutlist.003
Unit Test: calloutlist.003
Benoit Guillon
Table of Contents
1. Callouts
1.1. Embedded cos
 1 |  <refentry>
    |    <info>
    |      <date>2003-10-20</date> ①
    |    </info>
@@ -23,7 +23,7 @@
 Another screen including coref too. The
 first coref is not valid, the second one is valid. It checks
 also that several items in co/@linkends are correctly handled.
-
   | Volume in drive C is SYSTEM         Serial number is 2350:717C
+
   | Volume in drive C is SYSTEM         Serial number is 2350:717C
    | Directory of  C:\
    | 
    |10/17/97   9:04         <DIR>    bin
@@ -47,7 +47,7 @@
   Some sort of Windows 3.1 hack for some 386 processors,
   as I recall.
   
1.2. Programlistingco
This case checks that spaces are added to reach the expected
-column.
1 |This is a line
+column.
1 |This is a line
   |This is another line                                  ①
   |This is a third lien
   |                                                      ②
@@ -59,7 +59,7 @@
 
This programlistingco checks that you can put several markups at different
 column positions into the same line, and that several markups with no column
 specification are both put at the end of the line. The special case of a markup at
-the end of the last line is checked too.
1 |This is a line
+the end of the last line is checked too.
1 |This is a line
   |This is a①no②ther line                                       ④③
   |This is a third lien
   | 
diff --git a/src/test/resources/expected/chapter.003.html b/src/test/resources/expected/chapter.003.html
index 7cca3262ed..55d11943c1 100644
--- a/src/test/resources/expected/chapter.003.html
+++ b/src/test/resources/expected/chapter.003.html
@@ -20,7 +20,7 @@
 is simply a matter of processing your input document
 myfile.xml with
 xslt/docbook.xsl. For example:
-
  |$ saxon myfile.xml -xsl:xslt/docbook.xsl -o:myfile.html
+
  |$ saxon myfile.xml -xsl:xslt/docbook.xsl -o:myfile.html
 
The exact path to docbook.xsl will vary, of course,
 but it’s in the xslt directory of the
 distribution.
ⓘ
Note
The resulting HTML document contains references to CSS stylesheets
@@ -47,14 +47,14 @@
 /home/ndw/xsltng, you can run
 the JAR like this:
java -jar /home/ndw/xsltng/libs/docbook-xslTNG-XXX.jar
Let’s try it out. Open a shell window and change to the samples directory,
 /home/ndw/xsltng/samples assuming you unzipped
-it as described above. Now run the java command:
  |$ java -jar ../libs/docbook-xslTNG-XXX.jar article.xml
+it as described above. Now run the java command:
  |$ java -jar ../libs/docbook-xslTNG-XXX.jar article.xml
   |<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml">
   |…more HTML here...
   |<nav class="bottom"></nav></body></html>
 
That big splash of HTML was your first DocBook document
 formatted by the stylesheets! Slightly more usefully, you can save
 that HTML in a file:
-
  |$ java -jar ../libs/docbook-xslTNG-XXX.jar article.xml \
+
  |$ java -jar ../libs/docbook-xslTNG-XXX.jar article.xml \
   |        -o:article.html
 
If you now open article.html in your
 favorite web browser, you’ll see the transformed sample document
@@ -75,7 +75,7 @@
 the DocBook extension functions.
☝
Important
The script requires the click and
 pygments packages,
 which you must install with pip before
-running the script. For example:
  |python3 -m pip install pygments=2.6.1 click
+running the script. For example:
  |python3 -m pip install pygments=2.6.1 click
 
This script behaves much like the JAR file described in …. In particular,
 it accepts the same
 command line options as Saxon, with the same caveats.
The significant feature of the Python script is that it will
@@ -84,7 +84,7 @@
 have to have installed
 Maven. How you do that varies by platform, but your package
 manager probably has it.
The following command will assure that you’ve downloaded all of
-the necessary dependencies. You only have to do this once.
  |$ mvn org.apache.maven.plugins:maven-dependency-plugin:2.4:get \
+the necessary dependencies. You only have to do this once.
  |$ mvn org.apache.maven.plugins:maven-dependency-plugin:2.4:get \
   |      -Dartifact=org.docbook:docbook-xslTNG:XXX
 
That might take a while.
The script will work through the dependencies that you have
 installed, and the things that they depend on, and construct a Java
@@ -121,12 +121,12 @@
 isolate the environment necessary to run the DocBook xslTNG
 Stylesheets from your local environment.
Using Docker is a three step process. Step 0, you have to have
 installed Docker!
  1. Build the docker image. In the docker directory, run the docker build
-command:
      |$ docker build -t docbook-xsltng .
+command:
      |$ docker build -t docbook-xsltng .
 
    The “-t” option provides a tag for the image;
 you can make this anything you want. There’s a VERSION
-build argument if you want to build a particular release. For example,
      |$ docker build --build-arg VERSION=0.9.14 -t docbook-xsltng .
+build argument if you want to build a particular release. For example,
      |$ docker build --build-arg VERSION=0.9.14 -t docbook-xsltng .
 
    will build a Docker image for the 0.9.14 release of the
-stylesheets irrespective of the version in the Dockerfile.
  2. Run the image, for example:
      |$ docker run docbook-xsltng samples/article.xml
+stylesheets irrespective of the version in the Dockerfile.
  3. Run the image, for example:
      |$ docker run docbook-xsltng samples/article.xml
 
    If you chose a different tag when you built the image, use that
 tag in place of docbook-xsltng in the run
 command. Everything after the container tag becomes options to the
@@ -137,7 +137,7 @@
 container. So the article.xml document isn’t the
 one on your local filesystem.
You can use the Docker facilities for mounting directories to
 change what documents the script can access. For example:
-
  |$ docker run -v /tmp:/output -v /path/to/samples:/input \
+
  |$ docker run -v /tmp:/output -v /path/to/samples:/input \
   |       docbook-xsltng /input/article.xml chunk=index.html \
   |       chunk-output-base-uri=/output/
 
Assuming that the “samples” directory in the distribution is
@@ -168,7 +168,7 @@
 Saxon 10.1 or later.
 Make sure that the docbook-xsltng-version.jar
 file is on your class path and use the Saxon -init option to
-load them:
-init:org.docbook.xsltng.extensions.Register
5.1. Extension function debugging
When an extension function fails, or produces result other than
+load them:
-init:org.docbook.xsltng.extensions.Register
5.1. Extension function debugging
When an extension function fails, or produces result other than
 what you expect, it can be difficult sometimes to work out what
 happened. You can enable debugging messages by setting the the system
 property org.docbook.xsltng.verbose.
Setting the property to the value “true” enables
@@ -227,7 +227,7 @@
 on the page, then you’ll get a “speaker notes” view of the page.
This can be combined with another extension, the use of browser
 local storage, to create a simple presentation system. Add this
 meta tag to the
-info element of your document:
  |<meta xmlns="http://www.w3.org/1999/xhtml"
+info element of your document:
  |<meta xmlns="http://www.w3.org/1999/xhtml"
   |      name="localStorage.key" content="keyname"/>
 
That will cause the pages to keep track of their location using the
 “keyname” property in local storage. This is important
@@ -260,7 +260,7 @@
 and the stylesheets don’t either. You’re free to use “cat” and “dog”
 as effectivity values in the wordsize attribute, if you
 wish. The further you deviate from the nominal meaning, the more
-important it is to document your system!
Consider ….
<para>This is an utterly contrived example of
+important it is to document your system!
Consider ….
<para>This is an utterly contrived example of
 some common text. Options are introduced with the
 <phrase os="windows">/</phrase>
 <phrase os="mac;linux">-</phrase> character.</para>
Example 1.1. A contrived effectivity example
If this document is formatted with the profile-os
diff --git a/src/test/resources/expected/classsynopsis.001.html b/src/test/resources/expected/classsynopsis.001.html
index f4d2c34880..395eba6469 100644
--- a/src/test/resources/expected/classsynopsis.001.html
+++ b/src/test/resources/expected/classsynopsis.001.html
@@ -1,5 +1,5 @@
-Unit test: classsynopsis.001
Unit test: classsynopsis.001
// This is just a made up example.
-// Mostly.
public class Catalog {
+Unit test: classsynopsis.001
Unit test: classsynopsis.001
// This is just a made up example.
+// Mostly.
public class Catalog {
   public static final int BASE = CatalogEntry.addEntryType("BASE", 1);
   public Catalog();
   protected copyReaders(Catalog newCatalog);
diff --git a/src/test/resources/expected/co.001.html b/src/test/resources/expected/co.001.html
index ca91cf3527..6c264205fd 100644
--- a/src/test/resources/expected/co.001.html
+++ b/src/test/resources/expected/co.001.html
@@ -1,4 +1,4 @@
-Unit Test: co.001
Unit Test: co.001
John Himpel
Callouts inside userinput elements.
  |$cp a b①
+Unit Test: co.001
Unit Test: co.001
John Himpel
Callouts inside userinput elements.
  |$cp a b①
   |
   |$mv a b②
   | 
diff --git a/src/test/resources/expected/colors.001.html b/src/test/resources/expected/colors.001.html
index f8b95eb792..aa0257d679 100644
--- a/src/test/resources/expected/colors.001.html
+++ b/src/test/resources/expected/colors.001.html
@@ -2,7 +2,7 @@
 that gets presented in different colors by default today. You are, of course,
 free to add your own CSS which uses color in other places. The primary
 purpose of this document is to test various themes, so it’s most useful
-if the theme picker is enabled.
This is a paragraph of ordinary text.⌖1
Table 1. A Table
nn2n3
111
248
3927
Another paragraph.⌖2
 1 |def _parse_args(self, args):
+if the theme picker is enabled.
This is a paragraph of ordinary text.⌖1
Table 1. A Table
nn2n3
111
248
3927
Another paragraph.⌖2
 1 |def _parse_args(self, args):
    |    done = False
    |    for arg in args:
    |        if done:
@@ -33,11 +33,11 @@
 

 This is a paragraph with the debug class.
Here is a remark.
 The keycap rendering has a drop shadow.
-There’s also color in code.
  |Line one
+There’s also color in code.
  |Line one
   |Line two                                                   ①
   |Line three                                                 
   |Line four
-
There’s also the “monochrome” listing:
   |(defun ndw/insert-date-time (with-tz)
+
There’s also the “monochrome” listing:
   |(defun ndw/insert-date-time (with-tz)
    |  "Insert current date-time string in ISO 8601 format.
    |If WITH-TZ is nil, the time is printed without the timezone;
    |if WITH-TZ is t, the time is printed with the timezone;
diff --git a/src/test/resources/expected/enumsynopsis.001.html b/src/test/resources/expected/enumsynopsis.001.html
index 97af24de70..d9a396519a 100644
--- a/src/test/resources/expected/enumsynopsis.001.html
+++ b/src/test/resources/expected/enumsynopsis.001.html
@@ -1,4 +1,4 @@
-Unit test: enumsynopsis.001
Unit test: enumsynopsis.001
public enum Fruit {
+Unit test: enumsynopsis.001
Unit test: enumsynopsis.001
public enum Fruit {
   APPLE,                       // Of course.
   PEAR,
   TOMATO                       // Famously.
diff --git a/src/test/resources/expected/example.001.html b/src/test/resources/expected/example.001.html
index 008360fdb5..e87cc104cb 100644
--- a/src/test/resources/expected/example.001.html
+++ b/src/test/resources/expected/example.001.html
@@ -1,2 +1,2 @@
-Article wrapper
Article wrapper
  |This is a programlisting in an example.
+Article wrapper
Article wrapper
  |This is a programlisting in an example.
 
Example 1. An Example

\ No newline at end of file
diff --git a/src/test/resources/expected/fit.001.html b/src/test/resources/expected/fit.001.html
index 1c8745654a..580a3a4c02 100644
--- a/src/test/resources/expected/fit.001.html
+++ b/src/test/resources/expected/fit.001.html
@@ -38,7 +38,7 @@
 will be the same.
A system where you have to import the code or add the markup
 inline introduces the risk that the listing being documented will not
 be updated when the underlying resource is updated.
The program below computes the
-“nth” Fibonacci number.
1 |#!/bin/env python
+“nth” Fibonacci number.
1 |#!/bin/env python
   | 
   |"""Computes the n'th Fibonacci number."""
   | 
@@ -55,7 +55,7 @@
 XInclude (and RFC 5147)
 to break the listing into manageable
 fragments for documentation. The listing above, and the one below,
-are lines from the same file.
11 |@click.command()
+are lines from the same file.
11 |@click.command()
    |@click.argument("number", nargs=1,
    |               ③ type=click.IntRange(1, None))
    |def fibonacci(number):
@@ -112,7 +112,7 @@
 The more interesting feature is that
 unlike HTML anchors, they can also have multiple endpoints. Consider
 the following link:
-⌖5
 1 |<phrase xmlns:xlink="http://www.w3.org/1999/xlink"
+⌖5
 1 |<phrase xmlns:xlink="http://www.w3.org/1999/xlink"
    |        xlink:type="extended">
    |  <link xlink:title="DocBook.org"
    |        xlink:label="target"
@@ -188,7 +188,7 @@
 other vocabularies, there’s no reason a DocBook customization couldn’t
 use simplified markup to identify links:

 
-
  |<extended-link>
+
  |<extended-link>
   |  <target title="DocBook.org" href="http://docbook.org/"/>
   |  <target title="DocBook on Wikipedia"
   |          href="http://en.wikipedia.org/wiki/DocBook"/>
diff --git a/src/test/resources/expected/fit.002.html b/src/test/resources/expected/fit.002.html
index 12550b6e27..0e0ded33ca 100644
--- a/src/test/resources/expected/fit.002.html
+++ b/src/test/resources/expected/fit.002.html
@@ -38,7 +38,7 @@
 will be the same.
A system where you have to import the code or add the markup
 inline introduces the risk that the listing being documented will not
 be updated when the underlying resource is updated.
The program below computes the
-“nth” Fibonacci number.
1 |#!/bin/env python
+“nth” Fibonacci number.
1 |#!/bin/env python
   | 
   |"""Computes the n'th Fibonacci number."""
   | 
@@ -55,7 +55,7 @@
 XInclude (and RFC 5147)
 to break the listing into manageable
 fragments for documentation. The listing above, and the one below,
-are lines from the same file.
11 |@click.command()
+are lines from the same file.
11 |@click.command()
    |@click.argument("number", nargs=1,
    |               ③ type=click.IntRange(1, None))
    |def fibonacci(number):
@@ -112,7 +112,7 @@
 The more interesting feature is that
 unlike HTML anchors, they can also have multiple endpoints. Consider
 the following link:
-⌖5
 1 |<phrase xmlns:xlink="http://www.w3.org/1999/xlink"
+⌖5
 1 |<phrase xmlns:xlink="http://www.w3.org/1999/xlink"
    |        xlink:type="extended">
    |  <link xlink:title="DocBook.org"
    |        xlink:label="target"
@@ -188,7 +188,7 @@
 other vocabularies, there’s no reason a DocBook customization couldn’t
 use simplified markup to identify links:

 
-
  |<extended-link>
+
  |<extended-link>
   |  <target title="DocBook.org" href="http://docbook.org/"/>
   |  <target title="DocBook on Wikipedia"
   |          href="http://en.wikipedia.org/wiki/DocBook"/>
diff --git a/src/test/resources/expected/footnote.002.html b/src/test/resources/expected/footnote.002.html
index 803fe4624f..c504487129 100644
--- a/src/test/resources/expected/footnote.002.html
+++ b/src/test/resources/expected/footnote.002.html
@@ -1,7 +1,7 @@
 Article wrapper
Article wrapper
This paragraph contains a footnote1.
Table 1. A table
A CellcA Cella
                A Cell
A Cellb
                A CellbA Cell
A CellA CellA Cellac
-               
a
First footnote.
b
Second footnote.
c
100 Any Street
+               
a
First footnote.
b
Second footnote.
c
100 Any Street
 East Yahoo, XX
This is a longer paragraph.
 It will eventually contain a footnote, but first
 it has enough text to make the footnote appear in the middle of the paragraph.
diff --git a/src/test/resources/expected/footnote.003.html b/src/test/resources/expected/footnote.003.html
index f5da94d30d..edd0b8081a 100644
--- a/src/test/resources/expected/footnote.003.html
+++ b/src/test/resources/expected/footnote.003.html
@@ -1,13 +1,13 @@
 Article wrapper
Article wrapper
This paragraph contains a footnote1.
Table 1. A table
A CellA Cella
                A Cell
A Cellb
                A CellA Cell
A CellA CellA Cellc
-               
a
First footnote.
b
Second footnote.
c
100 Any Street
+               
a
First footnote.
b
Second footnote.
c
100 Any Street
 East Yahoo, XX
This paragraph contains a footnote2.
Table 2. A table
A CellA Cella
                A Cell
A Cellb
                A CellA Cell
A CellA CellA Cellc
-               
a
First footnote.
b
Second footnote.
c
100 Any Street
+               
a
First footnote.
b
Second footnote.
c
100 Any Street
 East Yahoo, XX
This paragraph contains a footnote3.
An HTML Table
A CellA Cella
             A Cell
A Cellb
             A CellA Cell
A CellA CellA Cellc
-            
a
First footnote.
b
Second footnote.
c
100 Any Street
+            
a
First footnote.
b
Second footnote.
c
100 Any Street
 East Yahoo, XX
This paragraph contains a footnote4.
1
This is a footnote.
2
This is a footnote.
3
This is a footnote.
4
This is a footnote.

\ No newline at end of file
diff --git a/src/test/resources/expected/funcsynopsis.001.html b/src/test/resources/expected/funcsynopsis.001.html
index 740c08a8de..007442c9f5 100644
--- a/src/test/resources/expected/funcsynopsis.001.html
+++ b/src/test/resources/expected/funcsynopsis.001.html
@@ -1,8 +1,8 @@
-Article wrapper
Article wrapper
Table of Contents
1. "Default" rendering
A funcsynopsis.
#include <varargs.h>
float rand();
int max(...);
int idiv(n, m);
int n;
int m;
Another.
void qsort(dataptr,
left,
right,
comp);
void *dataptr[]
int left
int right
int (*comp)
+Article wrapper
Article wrapper
Table of Contents
1. "Default" rendering
A funcsynopsis.
#include <varargs.h>
float rand();
int max(...);
int idiv(n, m);
int n;
int m;
Another.
void qsort(dataptr,
left,
right,
comp);
void *dataptr[]
int left
int right
int (*comp)
       (void *, void *)
Another.
int foo_frob_something(foo_frob_parm1,
foo_frob_parm2,
foo_frob_parm3,
parm4,
foo_frob_parm5);
foo_sometype1 foo_frob_parm1
foo_sometype1 foo_frob_parm2
foo_sometype1 foo_frob_parm3
int  (*parm4)
       (int a, int b, int c)
foo_sometype1 foo_frob_parm5
int foo_frob_something(foo_frob_parm1,
foo_frob_parm2,
foo_frob_parm3,
parm4,
foo_frob_parm5);
foo_sometype1 foo_frob_parm1
foo_sometype1 foo_frob_parm2
foo_sometype1 foo_frob_parm3
int  (*parm4)
-      (int a, int b, int c)
foo_sometype1 foo_frob_parm5
2. ANSI Rendering
Another.
#include <varargs.h>
float rand(void);
int max(...);
int idiv(int n, int m);
Another.
void qsort(void *dataptr[],
int left,
int right,
int  (*comp)
+      (int a, int b, int c)
foo_sometype1 foo_frob_parm5
2. ANSI Rendering
Another.
#include <varargs.h>
float rand(void);
int max(...);
int idiv(int n, int m);
Another.
void qsort(void *dataptr[],
int left,
int right,
int  (*comp)
       (void *, void *));
Another.
int foo_frob_something(foo_sometype1 foo_frob_parm1,
foo_sometype1 foo_frob_parm2,
foo_sometype1 foo_frob_parm3,
int (*parm4)
-      (int a, int b, int c),
foo_sometype1 foo_frob_parm5);
3. K&R Rendering
Another.
#include <varargs.h>
float rand();
int max(...);
int idiv(n, m);
int n;
int m;
Another.
void qsort(dataptr,
left,
right,
comp);
void *dataptr[]
int left
int right
int  (*comp)
+      (int a, int b, int c),
foo_sometype1 foo_frob_parm5);
3. K&R Rendering
Another.
#include <varargs.h>
float rand();
int max(...);
int idiv(n, m);
int n;
int m;
Another.
void qsort(dataptr,
left,
right,
comp);
void *dataptr[]
int left
int right
int  (*comp)
       (void *, void *)
Another.
int foo_frob_something(foo_frob_parm1,
foo_frob_parm2,
foo_frob_parm3,
parm4,
foo_frob_parm5);
foo_sometype1 foo_frob_parm1
foo_sometype1 foo_frob_parm2
foo_sometype1 foo_frob_parm3
int (*parm4)
       (int a, int b, int c)
foo_sometype1 foo_frob_parm5

\ No newline at end of file
diff --git a/src/test/resources/expected/glossary.007.html b/src/test/resources/expected/glossary.007.html
index 54a3fca1a0..b942203dd1 100644
--- a/src/test/resources/expected/glossary.007.html
+++ b/src/test/resources/expected/glossary.007.html
@@ -1,6 +1,6 @@
 Mixed Glossary with multiple entries, some from an external glossary
Mixed Glossary with multiple entries, some from an external glossary
Frank Steimke
ⓘ
Note
The test harness is configured to run this test without
 setting the glossary-collection parameter.
This test is essentially the same as glossary.006. The difference is,
-        that the external glossary is referenced by the following processing instruction:
  |<?db glossary-collection='../glosscollection.xml' ?>
+        that the external glossary is referenced by the following processing instruction:
  |<?db glossary-collection='../glosscollection.xml' ?>
 
It checks the glossary-collection machinery when the "internal"
         glossary is not empty, and some glossterms have definitions in the internal and external
         glossaries. The internal entry has priority and should therefore cover / overwrite the
diff --git a/src/test/resources/expected/glossary.008.html b/src/test/resources/expected/glossary.008.html
index 77494cbe09..022f0906ff 100644
--- a/src/test/resources/expected/glossary.008.html
+++ b/src/test/resources/expected/glossary.008.html
@@ -1,7 +1,7 @@
 Mixed Glossary with multiple entries from two external glossaries
Mixed Glossary with multiple entries from two external glossaries
Frank Steimke
ⓘ
Note
The test harness is configured to run this test without
 setting the glossary-collection parameter.
This test is essentially the same as glossary.007. The difference is,
         that we have two external glossaries, both referenced by the following processing
-        instruction:
  |<?db glossary-collection='../glosscollection.xml 
+        instruction:
  |<?db glossary-collection='../glosscollection.xml 
   |                          ../glosscollection2.xml' ?>
 
It checks the glossary-collection machinery when the "internal"
         glossary is not empty, and some glossterms have definitions in the internal and external
diff --git a/src/test/resources/expected/glossary.009.html b/src/test/resources/expected/glossary.009.html
index da80c78a2d..1bf7c7d109 100644
--- a/src/test/resources/expected/glossary.009.html
+++ b/src/test/resources/expected/glossary.009.html
@@ -1,7 +1,7 @@
 Referencing a non-existing external glossary
Referencing a non-existing external glossary
Frank Steimke
ⓘ
Note
The test harness is configured to run this test without
 setting the glossary-collection parameter.
This test is essentially the same as glossary.008 The difference is,
         that we use the following processing instruction, which references one none-existing file
-            glosscollectionx.xml:
  |<?db glossary-collection='../glosscollection.xml
+            glosscollectionx.xml:
  |<?db glossary-collection='../glosscollection.xml
   |                          ../glosscollectionx.xml
   |                          ../glosscollection2.xml' ?>
 
We expect a warning message about the non-existing file, and a glossary with three
diff --git a/src/test/resources/expected/indexterm.005.html b/src/test/resources/expected/indexterm.005.html
index 7f41239fed..b9096f8b5a 100644
--- a/src/test/resources/expected/indexterm.005.html
+++ b/src/test/resources/expected/indexterm.005.html
@@ -1,6 +1,6 @@
 Unit Test: indexterm.005
Unit Test: indexterm.005
Adam Di Carlo
Table of Contents
1. Bizarre Indexterm Test

       This is first test paragraph.
-      
  |#include <stdio.h>
+      
  |#include <stdio.h>
 

          
       
Index
Symbols
  • <stdio.h>, 1

\ No newline at end of file
diff --git a/src/test/resources/expected/informalexample.001.html b/src/test/resources/expected/informalexample.001.html
index 71c96b08c0..e3491ea251 100644
--- a/src/test/resources/expected/informalexample.001.html
+++ b/src/test/resources/expected/informalexample.001.html
@@ -1,2 +1,2 @@
-Article wrapper
Article wrapper
  |This is a programlisting in an informalexample.
+Article wrapper
Article wrapper
  |This is a programlisting in an informalexample.
 

\ No newline at end of file
diff --git a/src/test/resources/expected/iso690.001.html b/src/test/resources/expected/iso690.001.html
index cd8c9a0005..5883c7ff0e 100644
--- a/src/test/resources/expected/iso690.001.html
+++ b/src/test/resources/expected/iso690.001.html
@@ -4,7 +4,7 @@
 for online documents and optional for others.
1. Monographs
Non-serial bibliographic item, i.e. an item either complete in
 one part or complete (or intended to be completed) in a finite number
 of separate parts.
ElementExample
Primary responsibilityLOMINADZE, DG.
TitleCyclotron waves in plasma
-
*Subordinate responsibilityTranslated by AN. Dellis; edited by SM. Hamberger
Edition1st ed.
*Place of publicationOxford
*PublisherPergamon Press
Year of publication1981
*Extent206 p.
*SeriesInternational series in natural philosophy
*NotesTranslation of: Ciklotronnye volny v plasme
Standard numberISBN 0-08-021680-3
Markup:
 1 |<biblioentry role="monograph">
+
*Subordinate responsibilityTranslated by AN. Dellis; edited by SM. Hamberger
Edition1st ed.
*Place of publicationOxford
*PublisherPergamon Press
Year of publication1981
*Extent206 p.
*SeriesInternational series in natural philosophy
*NotesTranslation of: Ciklotronnye volny v plasme
Standard numberISBN 0-08-021680-3
Markup:
 1 |<biblioentry role="monograph">
    |  <author>
    |    <personname>
    |      <surname>Lominadze</surname>
diff --git a/src/test/resources/expected/iso690.002.html b/src/test/resources/expected/iso690.002.html
index a540069ae9..79307c3b65 100644
--- a/src/test/resources/expected/iso690.002.html
+++ b/src/test/resources/expected/iso690.002.html
@@ -4,7 +4,7 @@
 for online documents and optional for others.
1. Serials
Publication, in any medium, issued in successive parts, usually
 having numeric or chronological designations, and intended to be
 continued indefinitely.
ElementExample
TitleCommunications equipment manufacturers
-
ResponsibilityManufacturing and Primary Industries Division, Statistics Canada
EditionPreliminary edition
Issue designation (date and/or n°)1970- 
*Place of publicationOttawa
*PublisherStatistics Canada
Year of publication1971- 
*SeriesAnnual census of manufacturers
*NotesText in English and French
Standard numberISSN 0700-0758
Markup:
 1 |<biblioentry role="serial">
+ResponsibilityManufacturing and Primary Industries Division, Statistics CanadaEditionPreliminary editionIssue designation (date and/or n°)1970- *Place of publicationOttawa*PublisherStatistics CanadaYear of publication1971- *SeriesAnnual census of manufacturers*NotesText in English and FrenchStandard numberISSN 0700-0758
Markup:
 1 |<biblioentry role="serial">
    |  <title>Communications equipment manufacturers</title>
    |  <bibliomisc role="secondary">Manufacturing and Primary Industries Division, Statistics Canada</bibliomisc>
    |  <edition>Preliminary edition</edition>
diff --git a/src/test/resources/expected/iso690.003.html b/src/test/resources/expected/iso690.003.html
index d44100f5a4..4898925cd3 100644
--- a/src/test/resources/expected/iso690.003.html
+++ b/src/test/resources/expected/iso690.003.html
@@ -2,7 +2,7 @@
     table tr td:first-child + td { white-space: nowrap; }
   
Unit Test: iso690.003.xml
Examples are adapted from ISO 690 and ISO 690-2 standards.
Elements marked with * are optional, + marks mandatory elements
 for online documents and optional for others.
1. Parts of monographs
ElementExample
Primary responsibilityPARKER, TJ. and HASWELL, WD.
Title of host documentA text-book of zoology
-
Edition5th ed.
Numeration of the partvol. 1
*Subordinate responsibilityrevised by WD. Lang
*Place of publicationLondon
*PublisherMacmillan
Year of publication1930
Location within hostSection 12, Phylum Mollusca, p. 663-782
Markup:
 1 |<biblioentry role="part">
+Edition5th ed.Numeration of the partvol. 1*Subordinate responsibilityrevised by WD. Lang*Place of publicationLondon*PublisherMacmillanYear of publication1930Location within hostSection 12, Phylum Mollusca, p. 663-782
Markup:
 1 |<biblioentry role="part">
    |  <authorgroup>
    |    <author>
    |      <personname>
diff --git a/src/test/resources/expected/iso690.004.html b/src/test/resources/expected/iso690.004.html
index b3434537ff..fa9fd7ea77 100644
--- a/src/test/resources/expected/iso690.004.html
+++ b/src/test/resources/expected/iso690.004.html
@@ -2,7 +2,7 @@
     table tr td:first-child + td { white-space: nowrap; }
   
Unit Test: iso690.004.xml
Examples are adapted from ISO 690 and ISO 690-2 standards.
Elements marked with * are optional, + marks mandatory elements
 for online documents and optional for others.
1. Contributions to monographs
Contribution is independent unit forming part of a document.
ElementExample
for contribution:
Primary responsibilityWRIGLEY, EA.
TitleParish registers and the historian
for host:
Primary responsibilitySTEEL, DJ.
TitleNational index of parish registers
-
Edition— (not in this example)
*Place of publicationLondon
*PublisherSociety of Genealogists
Year of publication1968
Location within hostvol. 1, p. 155-167
Markup:
 1 |<biblioentry role="contribution">
+Edition— (not in this example)*Place of publicationLondon*PublisherSociety of GenealogistsYear of publication1968Location within hostvol. 1, p. 155-167
Markup:
 1 |<biblioentry role="contribution">
    |  <biblioset relation="part">
    |    <author>
    |      <personname>
diff --git a/src/test/resources/expected/iso690.005.html b/src/test/resources/expected/iso690.005.html
index 4dd7445788..d66f7c58ab 100644
--- a/src/test/resources/expected/iso690.005.html
+++ b/src/test/resources/expected/iso690.005.html
@@ -2,7 +2,7 @@
     table tr td:first-child + td { white-space: nowrap; }
   
Unit Test: iso690.005.xml
Examples are adapted from ISO 690 and ISO 690-2 standards.
Elements marked with * are optional, + marks mandatory elements
 for online documents and optional for others.
1. Articles, etc., in serials
ElementExample
Primary responsibilityWEAVER, William
TitleThe collectors: command performances
*Subordinate responsibilityPhotography by Robert Emmett Bright
Title of host documentArchitectural Digest
-
Edition— (not in this example)
Location within host:
Year, Issue designation, Pagination of the partDecember 1985, vol. 42, no. 12, p. 126-133
Markup:
 1 |<biblioentry role="article">
+Edition— (not in this example)Location within host:Year, Issue designation, Pagination of the partDecember 1985, vol. 42, no. 12, p. 126-133
Markup:
 1 |<biblioentry role="article">
    |  <biblioset relation="article">
    |    <author>
    |      <personname>
diff --git a/src/test/resources/expected/iso690.006.html b/src/test/resources/expected/iso690.006.html
index caf1e0a85f..b8660939d6 100644
--- a/src/test/resources/expected/iso690.006.html
+++ b/src/test/resources/expected/iso690.006.html
@@ -2,7 +2,7 @@
     table tr td:first-child + td { white-space: nowrap; }
   
Unit Test: iso690.006.xml
Examples are adapted from ISO 690 and ISO 690-2 standards.
Elements marked with * are optional, + marks mandatory elements
 for online documents and optional for others.
1. Patent documents
ElementExample
*Primary responsibility (applicant)Carl Zeiss Jena, VEB
*Title of the inventionAnordnung zur lichtelektrischen Erfassung der Mitte eines Lichtfeldes
-
*Subordinate responsibilityErfinder: W. FEIST, C. WAHNERT, E. FEISTAUER
*NotesInt. Cl.3: G02 B 27/14
Identification:
Country or issuing officeSchweiz
Kind of patent documentPatentschrift
Number608 626
Date of publication of cited document1979-01-15
Markup:
 1 |<biblioentry role="patent">
+*Subordinate responsibilityErfinder: W. FEIST, C. WAHNERT, E. FEISTAUER*NotesInt. Cl.3: G02 B 27/14Identification:Country or issuing officeSchweizKind of patent documentPatentschriftNumber608 626Date of publication of cited document1979-01-15
Markup:
 1 |<biblioentry role="patent">
    |  <author>
    |    <orgname>Carl Zeiss Jena, VEB</orgname>
    |  </author>
diff --git a/src/test/resources/expected/iso690.007.html b/src/test/resources/expected/iso690.007.html
index 401f90bf1f..837eed0486 100644
--- a/src/test/resources/expected/iso690.007.html
+++ b/src/test/resources/expected/iso690.007.html
@@ -3,7 +3,7 @@
   
Unit Test: iso690.007.xml
Examples are adapted from ISO 690 and ISO 690-2 standards.
Elements marked with * are optional, + marks mandatory elements
 for online documents and optional for others.
1. Monographs, databases and computer programs
ElementExample
Primary responsibilityCARROLL, Lewis
TitleAlice's Adventures in Wonderland
 
Type of medium[online]
*Subordinate responsibility— (not in this example)
EditionTextinfo ed. 2.1
Place of publication[Dortmund, Germany]
PublisherWindspiel
Date of publicationNovember 1994
Date of update/revision— (not in this example)
+Date of citation[cited 10 February 1995]
*Series— (not in this example)
*Notes— (not in this example)
+
-Availability and accessAvailable from World Wide Web: <http://germany.eu.net/books/carroll/alice/html>
Also available in PostScript and ASCII versions from Internet: <ftp://ftp.Germany.EU.net/pub/books/carroll/>
Standard number— (not in this example)
Markup:
 1 |<biblioentry role="monograph">
+Availability and accessAvailable from World Wide Web: <http://germany.eu.net/books/carroll/alice/html>Also available in PostScript and ASCII versions from Internet: <ftp://ftp.Germany.EU.net/pub/books/carroll/>Standard number— (not in this example)
Markup:
 1 |<biblioentry role="monograph">
    |  <author>
    |    <personname>
    |      <surname>Carroll</surname>
diff --git a/src/test/resources/expected/iso690.008.html b/src/test/resources/expected/iso690.008.html
index 4ee1a38ec5..86e8b3cb11 100644
--- a/src/test/resources/expected/iso690.008.html
+++ b/src/test/resources/expected/iso690.008.html
@@ -2,7 +2,7 @@
     table tr td:first-child + td { white-space: nowrap; }
   
Unit Test: iso690.008.xml
Examples are adapted from ISO 690 and ISO 690-2 standards.
Elements marked with * are optional, + marks mandatory elements
 for online documents and optional for others.
1. Parts of monographs, databases and computer programs
ElementExample
Primary responsibility of host documentCARROLL, Lewis
Title of host documentAlice's Adventures in Wonderland
-
Type of medium[online]
*Subordinate responsibility of host document— (not in this example)
EditionTextinfo ed. 2.2
Place of publication[Dortmund, Germany]
PublisherWindspiel
Date of publicationNovember 1994
Date of update/revision— (not in this example)
+Date of citation[cited 30 March 1995]
Chapter or equivalent designation (of part)Chapter VII
Title (of part)Mad Tea-Party
*Numeration within host document— (not in this example)
Location within host document— (not in this example)
*Notes— (not in this example)
+Availability and accessAvailable from World Wide Web: <http://germany.eu.net/books/carroll/alice_10.html#SEC13>
Standard number— (not in this example)
Markup:
 1 |<biblioentry role="part">
+Type of medium[online]*Subordinate responsibility of host document— (not in this example)EditionTextinfo ed. 2.2Place of publication[Dortmund, Germany]PublisherWindspielDate of publicationNovember 1994Date of update/revision— (not in this example)+Date of citation[cited 30 March 1995]Chapter or equivalent designation (of part)Chapter VIITitle (of part)Mad Tea-Party*Numeration within host document— (not in this example)Location within host document— (not in this example)*Notes— (not in this example)+Availability and accessAvailable from World Wide Web: <http://germany.eu.net/books/carroll/alice_10.html#SEC13>Standard number— (not in this example)
Markup:
 1 |<biblioentry role="part">
    |  <author>
    |    <personname>
    |      <surname>Carroll</surname>
diff --git a/src/test/resources/expected/iso690.009.html b/src/test/resources/expected/iso690.009.html
index c2d8787b13..12316bd4e1 100644
--- a/src/test/resources/expected/iso690.009.html
+++ b/src/test/resources/expected/iso690.009.html
@@ -2,7 +2,7 @@
     table tr td:first-child + td { white-space: nowrap; }
   
Unit Test: iso690.008.xml
Examples are adapted from ISO 690 and ISO 690-2 standards.
Elements marked with * are optional, + marks mandatory elements
 for online documents and optional for others.
1. Contributions to monographs, databases and computer programs
ElementExample
Primary responsibility (of contribution)MCCONNELL, W. H.
Title (of contribution)Constitutional History
Primary responsibility of host document— (not in this example)
Title of host documentThe Canadian Encyclopedia
-
Type of medium[CD-ROM]
*Subordinate responsibility of host document— (not in this example)
EditionMacintosh version 1.1
Place of publicationToronto
PublisherMcClelland & Stewart
Date of publicationc1993
Date of update/revision— (not in this example)
+Date of citation— (not in this example)
*Numeration within host document— (not in this example)
Location within host document— (not in this example)
*Notes— (not in this example)
+Availability and access— (not in this example)
Standard numberISBN 0-7710-1932-7
Markup:
 1 |<biblioentry role="contribution">
+Type of medium[CD-ROM]*Subordinate responsibility of host document— (not in this example)EditionMacintosh version 1.1Place of publicationTorontoPublisherMcClelland & StewartDate of publicationc1993Date of update/revision— (not in this example)+Date of citation— (not in this example)*Numeration within host document— (not in this example)Location within host document— (not in this example)*Notes— (not in this example)+Availability and access— (not in this example)Standard numberISBN 0-7710-1932-7
Markup:
 1 |<biblioentry role="contribution">
    |  <biblioset relation="part">
    |    <author>
    |      <surname>McConnell</surname>
diff --git a/src/test/resources/expected/iso690.010.html b/src/test/resources/expected/iso690.010.html
index f4bc588e2e..5c23e5ae60 100644
--- a/src/test/resources/expected/iso690.010.html
+++ b/src/test/resources/expected/iso690.010.html
@@ -2,7 +2,7 @@
     table tr td:first-child + td { white-space: nowrap; }
   
Unit Test: iso690.009.xml
Examples are adapted from ISO 690 and ISO 690-2 standards.
Elements marked with * are optional, + marks mandatory elements
 for online documents and optional for others.
1. Electronic serials
ElementExample
TitleJournal of Technology Education
-
Type of medium[online]
Edition— (not in this example)
Place of publicationBlacksburg (Va.)
PublisherVirginia Polytechnic Institute and State University
Date of publication1989-
+Date of citation[cited 15 March 1995]
*Series— (not in this example)
*NotesSemi-annual
+Availability and accessAvailable from Internet: <gopher://borg.lib.vt.edu:edu:70/1/jte>
Standard numberISSN 1045-1064
Markup:
 1 |<biblioentry role="serial">
+Type of medium[online]Edition— (not in this example)Place of publicationBlacksburg (Va.)PublisherVirginia Polytechnic Institute and State UniversityDate of publication1989-+Date of citation[cited 15 March 1995]*Series— (not in this example)*NotesSemi-annual+Availability and accessAvailable from Internet: <gopher://borg.lib.vt.edu:edu:70/1/jte>Standard numberISSN 1045-1064
Markup:
 1 |<biblioentry role="serial">
    |  <title>Journal of Technology Education</title>
    |  <bibliomisc role="medium">online</bibliomisc>
    |  <publisher>
diff --git a/src/test/resources/expected/iso690.011.html b/src/test/resources/expected/iso690.011.html
index 87cdb1f6f8..72a850fe6a 100644
--- a/src/test/resources/expected/iso690.011.html
+++ b/src/test/resources/expected/iso690.011.html
@@ -2,7 +2,7 @@
     table tr td:first-child + td { white-space: nowrap; }
   
Unit Test: iso690.010.xml
Examples are adapted from ISO 690 and ISO 690-2 standards.
Elements marked with * are optional, + marks mandatory elements
 for online documents and optional for others.
1. Articles and other contributions
ElementExample
Primary responsibility of contributionPRICE-WILKIN, John
Title of contributionUsing the World-Wide Web to Deliver Complex Electronic Documents: Implications for Libraries
Title SerialsThe Public-Access Computer Systems Review
-
Type of medium[online]
Edition— (not in this example)
Number designation1994, vol. 5, no. 3
Date of update/revision— (not in this example)
+Date of citation[cited 1994-07-28]
Location within host documentpp. 5-21
*Notes— (not in this example)
+Availability and accessAvailable from Internet: <gopher://info.lib.uh.edu:70/00/articles/e-journals/uhlibrary/pacsreview/v5/n3/pricewil.5n3>
Standard numberISSN 1048-6542
Markup:
 1 |<biblioentry role="article">
+Type of medium[online]Edition— (not in this example)Number designation1994, vol. 5, no. 3Date of update/revision— (not in this example)+Date of citation[cited 1994-07-28]Location within host documentpp. 5-21*Notes— (not in this example)+Availability and accessAvailable from Internet: <gopher://info.lib.uh.edu:70/00/articles/e-journals/uhlibrary/pacsreview/v5/n3/pricewil.5n3>Standard numberISSN 1048-6542
Markup:
 1 |<biblioentry role="article">
    |  <biblioset relation="article">
    |    <author>
    |      <personname>
diff --git a/src/test/resources/expected/iso690.012.html b/src/test/resources/expected/iso690.012.html
index 31a2c03cb3..42994aeacc 100644
--- a/src/test/resources/expected/iso690.012.html
+++ b/src/test/resources/expected/iso690.012.html
@@ -2,7 +2,7 @@
     table tr td:first-child + td { white-space: nowrap; }
   
Unit Test: iso690.011.xml
Examples are adapted from ISO 690 and ISO 690-2 standards.
Elements marked with * are optional, + marks mandatory elements
 for online documents and optional for others.
1. Electronic bulletin boards, discussion lists and electronic messages
ElementExample
TitlePACS-L (Public Access Computer Systems Forum)
-
Type of medium[online]
Place of publicationHouston (Tex.)
PublisherUniversity of Houston Libraries
Date of publicationJune 1989-
Date of citation[cited 17 May 1995]
*Notes— (not in this example)
Availability and accessAvailable from Internet: <listserv@unhupvm1.uh.edu>
Markup:
 1 |<biblioentry role="messagesystem">
+Type of medium[online]Place of publicationHouston (Tex.)PublisherUniversity of Houston LibrariesDate of publicationJune 1989-Date of citation[cited 17 May 1995]*Notes— (not in this example)Availability and accessAvailable from Internet: <listserv@unhupvm1.uh.edu>
Markup:
 1 |<biblioentry role="messagesystem">
    |  <title>PACS-L (Public Access Computer Systems Forum)</title>
    |  <bibliomisc role="medium">online</bibliomisc>
    |  <publisher>
diff --git a/src/test/resources/expected/iso690.013.html b/src/test/resources/expected/iso690.013.html
index 82cfd1e997..0871b82e5f 100644
--- a/src/test/resources/expected/iso690.013.html
+++ b/src/test/resources/expected/iso690.013.html
@@ -2,7 +2,7 @@
     table tr td:first-child + td { white-space: nowrap; }
   
Unit Test: iso690.012.xml
Examples are adapted from ISO 690 and ISO 690-2 standards.
Elements marked with * are optional, + marks mandatory elements
 for online documents and optional for others.
1. Electronic messages
ElementExample
Primary responsibility of messagePARKER, Elliot
Title of messageRe: Citing Electronic Journals
Title of host message systemPACS-L (Public Access Computer Systems Forum)
-
Type of medium[online]
*Subordinate responsibility/applicant(s)— (not in this example)
Place of publicationHouston (Tex.)
PublisherUniversity of Houston Libraries
Date of publication24 November 1989; 13:29:35 CST
Date of citation[cited 1 January 1995; 16:15 EST]
*Numeration within host message system— (not in this example)
Location within host message system— (not in this example)
Availability and accessAvailable from Internet: <telnet://brsuser@a.cni.org>
*Notes— (not in this example)
Markup:
 1 |<biblioentry role="message">
+Type of medium[online]*Subordinate responsibility/applicant(s)— (not in this example)Place of publicationHouston (Tex.)PublisherUniversity of Houston LibrariesDate of publication24 November 1989; 13:29:35 CSTDate of citation[cited 1 January 1995; 16:15 EST]*Numeration within host message system— (not in this example)Location within host message system— (not in this example)Availability and accessAvailable from Internet: <telnet://brsuser@a.cni.org>*Notes— (not in this example)
Markup:
 1 |<biblioentry role="message">
    |  <biblioset relation="part">
    |    <author>
    |      <personname>
diff --git a/src/test/resources/expected/lineannotation.001.html b/src/test/resources/expected/lineannotation.001.html
index 3eb8687f7b..78235072eb 100644
--- a/src/test/resources/expected/lineannotation.001.html
+++ b/src/test/resources/expected/lineannotation.001.html
@@ -1,4 +1,4 @@
-Article wrapper
Article wrapper
This article tests lineannotation.
  |This is a
+Article wrapper
Article wrapper
This article tests lineannotation.
  |This is a
   |screen                  annotation 1
   |with several
   |lines that have no      annotation 2
diff --git a/src/test/resources/expected/literallayout.001.html b/src/test/resources/expected/literallayout.001.html
index 171e05f36e..ead1c19483 100644
--- a/src/test/resources/expected/literallayout.001.html
+++ b/src/test/resources/expected/literallayout.001.html
@@ -1,4 +1,4 @@
-Unit test: literallayout.001
Unit test: literallayout.001
LiteralLayout: This is a test
+Unit test: literallayout.001
Unit test: literallayout.001
LiteralLayout: This is a test
   Only a test.
 Had this been a real emegency,
   We would have fled in terror
diff --git a/src/test/resources/expected/literallayout.002.html b/src/test/resources/expected/literallayout.002.html
index 6b300607aa..01f600278e 100644
--- a/src/test/resources/expected/literallayout.002.html
+++ b/src/test/resources/expected/literallayout.002.html
@@ -1,4 +1,4 @@
-Unit test: literallayout.002
Unit test: literallayout.002
+Unit test: literallayout.002
Unit test: literallayout.002
       LiteralLayout: This is a test
     This is a test with     embedded
   markup; but still
diff --git a/src/test/resources/expected/literallayout.003.html b/src/test/resources/expected/literallayout.003.html
index 6b221ec586..0db9113cdb 100644
--- a/src/test/resources/expected/literallayout.003.html
+++ b/src/test/resources/expected/literallayout.003.html
@@ -1,8 +1,8 @@
-Unit test: literallayout.003
Unit test: literallayout.003
LiteralLayout: This is a test
+Unit test: literallayout.003
Unit test: literallayout.003
LiteralLayout: This is a test
   Only a test.
 Had this been a real emegency,
   We would have fled in terror
-And you would not have been informed.
LiteralLayout(monospaced): This is a test
+And you would not have been informed.
LiteralLayout(monospaced): This is a test
   Only a test.
 Had this been a real emegency,
   We would have fled in terror
diff --git a/src/test/resources/expected/literallayout.004.html b/src/test/resources/expected/literallayout.004.html
index 2451011614..999f98c96d 100644
--- a/src/test/resources/expected/literallayout.004.html
+++ b/src/test/resources/expected/literallayout.004.html
@@ -1,12 +1,12 @@
-Unit test: literallayout.004
Unit test: literallayout.004
LiteralLayout: This is a test without literal
+Unit test: literallayout.004
Unit test: literallayout.004
LiteralLayout: This is a test without literal
   Only a test.
 Had this been a real emegency,
   We would have fled in terror
-And you would not have been informed.
LiteralLayout: This is a test with literal
+And you would not have been informed.
LiteralLayout: This is a test with literal
   Only a test.
 Had this been a real emegency,
   We would have fled in terror
-And you would not have been informed.
LiteralLayout(monospaced): This is a test
+And you would not have been informed.
LiteralLayout(monospaced): This is a test
   Only a test.
 Had this been a real emegency,
   We would have fled in terror
diff --git a/src/test/resources/expected/literallayout.005.html b/src/test/resources/expected/literallayout.005.html
index 541dc79448..e7857e31f8 100644
--- a/src/test/resources/expected/literallayout.005.html
+++ b/src/test/resources/expected/literallayout.005.html
@@ -1,4 +1,4 @@
-Unit test: literallayout.004
Unit test: literallayout.004
These literal layouts explicitly use the ‘table’ style.
  |
+Unit test: literallayout.004
Unit test: literallayout.004
These literal layouts explicitly use the ‘table’ style.
  |
   |
   |
   |
@@ -8,7 +8,7 @@
 Had this been a real emegency,
   We would have fled in terror
 And you would not have been informed.
-
  |
+
  |
   |
   |
   |
@@ -18,7 +18,7 @@
 Had this been a real emegency,
   We would have fled in terror
 And you would not have been informed.
-
  |
+
  |
   |
   |
   |
diff --git a/src/test/resources/expected/methodsynopsis.001.html b/src/test/resources/expected/methodsynopsis.001.html
index 2ee46bd7c8..38fdc02899 100644
--- a/src/test/resources/expected/methodsynopsis.001.html
+++ b/src/test/resources/expected/methodsynopsis.001.html
@@ -1,6 +1,6 @@
-Article wrapper
Article wrapper
Here's a methodsynopsis in a classsynopsis:
class Foo {
+Article wrapper
Article wrapper
Here's a methodsynopsis in a classsynopsis:
class Foo {
   public static double getQuote(String symbol,
                                 double price);
 }
Here's a methodsynopsis outside
-a classsynopsis:
public static double getQuote(String symbol,
+a classsynopsis:
public static double getQuote(String symbol,
                               double price);

\ No newline at end of file
diff --git a/src/test/resources/expected/packagesynopsis.001.html b/src/test/resources/expected/packagesynopsis.001.html
index 6e1e7b711b..b20bca9271 100644
--- a/src/test/resources/expected/packagesynopsis.001.html
+++ b/src/test/resources/expected/packagesynopsis.001.html
@@ -1,6 +1,6 @@
-Unit test: packagesynopsis.001
Unit test: packagesynopsis.001
package org.example.package;
-
// This is just a made up example.
-// Mostly.
public class Catalog {
+Unit test: packagesynopsis.001
Unit test: packagesynopsis.001
package org.example.package;
+
// This is just a made up example.
+// Mostly.
public class Catalog {
   public static final int BASE = CatalogEntry.addEntryType("BASE", 1);
   public Catalog();
   protected copyReaders(Catalog newCatalog);
diff --git a/src/test/resources/expected/panelset.001.html b/src/test/resources/expected/panelset.001.html
index 6918e06c4e..3f031de0c2 100644
--- a/src/test/resources/expected/panelset.001.html
+++ b/src/test/resources/expected/panelset.001.html
@@ -1,5 +1,5 @@
 Unit Test: panelset.001
Unit Test: panelset.001
This unit test is an experiment in providing a “panel set” presentation
-for a variable list.
 1 |#!/usr/bin/env python3
+for a variable list.
 1 |#!/usr/bin/env python3
    | 
    |"""This is a wrapper script around the Saxon command line interface.
    |It attempts to make sure that the classpath is correct and that third
@@ -16,7 +16,7 @@
 15 | 
    |class JavaClassRunnerException(Exception):
    |    """Subclass of Exception for errors raised by the runner."""
-
And so on, for another 600 lines or so.
 1 |#!/usr/bin/env python3
+
And so on, for another 600 lines or so.
 1 |#!/usr/bin/env python3
    | 
    |"""This is yet another link checker. Was it better to write my own
    |than find an existing cross-platform version? Maybe not, but it
diff --git a/src/test/resources/expected/para.004.html b/src/test/resources/expected/para.004.html
index afe64e5262..4088583693 100644
--- a/src/test/resources/expected/para.004.html
+++ b/src/test/resources/expected/para.004.html
@@ -1,3 +1,3 @@
-Unit test: para.004
Unit test: para.004
Ordinary paragraph, followed by a paragraph with a program listing.
This is some text followed by a programlisting: 
  |<!-- stuff -->
+Unit test: para.004
Unit test: para.004
Ordinary paragraph, followed by a paragraph with a program listing.
This is some text followed by a programlisting: 
  |<!-- stuff -->
   |and nonsense
 
Ordinary paragraph.

\ No newline at end of file
diff --git a/src/test/resources/expected/presentation.001.html b/src/test/resources/expected/presentation.001.html
index 4d60102cb3..31d7213c2e 100644
--- a/src/test/resources/expected/presentation.001.html
+++ b/src/test/resources/expected/presentation.001.html
@@ -6,7 +6,7 @@
 (or from localhost with
 http), presentation mode can use
 local storage to synchronize display in different browser windows.
  • Add
-
      |<meta xmlns="http://www.w3.org/1999/xhtml"
+
      |<meta xmlns="http://www.w3.org/1999/xhtml"
   |      name="localStorage.key" content="keyName"/>
 
    
 to the info of your document.
  • The key name is irrelevant, but is used to coordinate between windows.
@@ -14,7 +14,7 @@
 1
 
  • Synchronized displays are useful for reading speaker notes in one view
 while presenting the “normal” view to your audience.
Speaker notes
  • Speaker notes can be placed on any page.
  • They are not displayed as part of the normal presentation.
  • They can be revealed by selecting notes view.
Use the speaker-notes role to add speaker notes:
-
  |<para role="speaker-notes">When you present this page
+
  |<para role="speaker-notes">When you present this page
   |observe that the speaker notes are normally hidden, but
   |can be revealed by pressing <keycap>S</keycap>.</para>
 
When you present this page
diff --git a/src/test/resources/expected/programlisting.001.html b/src/test/resources/expected/programlisting.001.html
index ffbce5d036..60adea29ed 100644
--- a/src/test/resources/expected/programlisting.001.html
+++ b/src/test/resources/expected/programlisting.001.html
@@ -1,4 +1,4 @@
-Article wrapper
Article wrapper
1 |ProgramListing: This is a test
+Article wrapper
Article wrapper
1 |ProgramListing: This is a test
   |  Only a test.
   |Had this been a real emegency,
   |  We would have fled in terror
diff --git a/src/test/resources/expected/programlisting.002.html b/src/test/resources/expected/programlisting.002.html
index 519ea7a270..2b603a37c1 100644
--- a/src/test/resources/expected/programlisting.002.html
+++ b/src/test/resources/expected/programlisting.002.html
@@ -1,4 +1,4 @@
-Article wrapper
Article wrapper
 1 |<?xml version="1.0" encoding="utf-8"?>
+Article wrapper
Article wrapper
 1 |<?xml version="1.0" encoding="utf-8"?>
    |<article xmlns="http://docbook.org/ns/docbook" version="5.0">
    |   <title>Article wrapper</title>
    |   <programlisting language="xml"><inlinemediaobject>
diff --git a/src/test/resources/expected/programlisting.003.html b/src/test/resources/expected/programlisting.003.html
index f01e9c8b23..2a1fc85063 100644
--- a/src/test/resources/expected/programlisting.003.html
+++ b/src/test/resources/expected/programlisting.003.html
@@ -1,4 +1,4 @@
-Unit test: programlisting.003
Unit test: programlisting.003
 1 |@rem = '--*-Perl-*--
+Unit test: programlisting.003
Unit test: programlisting.003
 1 |@rem = '--*-Perl-*--
    |@echo off
    |perl.exe %_batchname %$
    |goto endofperl
diff --git a/src/test/resources/expected/programlisting.004.html b/src/test/resources/expected/programlisting.004.html
index e0100bb621..167f1717c7 100644
--- a/src/test/resources/expected/programlisting.004.html
+++ b/src/test/resources/expected/programlisting.004.html
@@ -1,4 +1,4 @@
-Unit Test: programlisting.004
Unit Test: programlisting.004
Stéphane Bortzmeyer
Testing footnote within programlisting.
  |      hostname RTA
+Unit Test: programlisting.004
Unit Test: programlisting.004
Stéphane Bortzmeyer
Testing footnote within programlisting.
  |      hostname RTA
   |      router ospf
   |          ospf router-id 192.134.7.241	1
   |          network 192.134.7.0/24 area 0
diff --git a/src/test/resources/expected/programlisting.005.html b/src/test/resources/expected/programlisting.005.html
index 5ac87ed0a4..594e825b53 100644
--- a/src/test/resources/expected/programlisting.005.html
+++ b/src/test/resources/expected/programlisting.005.html
@@ -1,5 +1,5 @@
 Unit Test: programlisting.005
Unit Test: programlisting.005
A programlisting within a table
Michael Smith
Table 1. Lisp function

-                  
1 |(defun cycle-length (n & (len 1) (top 0))
+                  
1 |(defun cycle-length (n & (len 1) (top 0))
   |  (cond ((= n 1) (values len top))
   |        ((evenp n) (cycle-length (ash n -1) (1+ len) (max top n)))
   |        (t (let ((next (1+ (* 3 n))))
diff --git a/src/test/resources/expected/programlisting.006.html b/src/test/resources/expected/programlisting.006.html
index 539760664e..3e87630eb3 100644
--- a/src/test/resources/expected/programlisting.006.html
+++ b/src/test/resources/expected/programlisting.006.html
@@ -1,4 +1,4 @@
-Article wrapper
Article wrapper
   |@rem = '--*-Perl-*--
+Article wrapper
Article wrapper
   |@rem = '--*-Perl-*--
    |@echo off
    |perl.exe %_batchname %$
    |goto endofperl
diff --git a/src/test/resources/expected/programlisting.007.html b/src/test/resources/expected/programlisting.007.html
index 962efaf34b..57de5663f8 100644
--- a/src/test/resources/expected/programlisting.007.html
+++ b/src/test/resources/expected/programlisting.007.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
This test checks that an external file referenced by
-textobject is correctly handled.
 1 |<?xml version="1.0" encoding="utf-8"?>
+textobject is correctly handled.
 1 |<?xml version="1.0" encoding="utf-8"?>
    |<article xmlns="http://docbook.org/ns/docbook" version="5.0">
    |   <title>Article wrapper</title>
    |   <programlisting linenumbering="unnumbered">@rem = '--*-Perl-*--
diff --git a/src/test/resources/expected/programlisting.008.html b/src/test/resources/expected/programlisting.008.html
index 4003380fbd..014bc47a99 100644
--- a/src/test/resources/expected/programlisting.008.html
+++ b/src/test/resources/expected/programlisting.008.html
@@ -1,5 +1,5 @@
 Unit test: programlisting.008
Unit test: programlisting.008
This test checks that the line numbering control PIs are handled
-correctly.
   |Line one
+correctly.
   |Line one
  2 |Line two
    |Line three
  4 |Line four
@@ -15,7 +15,7 @@
 14 |Line fourteen
    |Line fifteen
 16 |Line sixteen
-
  |Line one
+
  |Line one
   |Line two
   |Line three
   |Line four
diff --git a/src/test/resources/expected/programlisting.009.html b/src/test/resources/expected/programlisting.009.html
index 8bdab96fdb..ae8bde4e82 100644
--- a/src/test/resources/expected/programlisting.009.html
+++ b/src/test/resources/expected/programlisting.009.html
@@ -1,4 +1,4 @@
-Article wrapper
Article wrapper
 1 |#!/usr/bin/perl -- # --*-Perl-*--
+Article wrapper
Article wrapper
 1 |#!/usr/bin/perl -- # --*-Perl-*--
    | 
    |use Getopt::Std;
    | 
@@ -14,7 +14,7 @@
    |$opt = '-p' if $opt_p;
 15 |$opt = '-m' if $opt_m;
 
This paragraph interrupts the listing. The line numbering
-continues in the following listing.
16 |while ($file) {
+continues in the following listing.
16 |while ($file) {
    |    print "Converting $file to $opt linebreaks.\n" if !$opt_q;
    |    open (F, "$file");
    |    binmode F;
diff --git a/src/test/resources/expected/programlisting.010.html b/src/test/resources/expected/programlisting.010.html
index 957ad2cb76..f31bd369c8 100644
--- a/src/test/resources/expected/programlisting.010.html
+++ b/src/test/resources/expected/programlisting.010.html
@@ -1,4 +1,4 @@
-Unit test: programlisting.010
Unit test: programlisting.010
   | 
+Unit test: programlisting.010
Unit test: programlisting.010
   | 
    | 
    | 
    | 
diff --git a/src/test/resources/expected/programlisting.011.html b/src/test/resources/expected/programlisting.011.html
index 73cdcfe458..3dd0946f9f 100644
--- a/src/test/resources/expected/programlisting.011.html
+++ b/src/test/resources/expected/programlisting.011.html
@@ -1,4 +1,4 @@
-Unit test: programlisting.011
Unit test: programlisting.011
1 |ProgramListing: This is a test
+Unit test: programlisting.011
Unit test: programlisting.011
1 |ProgramListing: This is a test
   |  Only a test.
   |Had this been a real emegency,
   |  We would have fled in terror
diff --git a/src/test/resources/expected/programlisting.012.html b/src/test/resources/expected/programlisting.012.html
index 26779ca39e..f2f27cd07c 100644
--- a/src/test/resources/expected/programlisting.012.html
+++ b/src/test/resources/expected/programlisting.012.html
@@ -1,9 +1,9 @@
-Unit test: programlisting.012
Unit test: programlisting.012
A program listing for the language “none”.
1 |ProgramListing: This is a test
+Unit test: programlisting.012
Unit test: programlisting.012
A program listing for the language “none”.
1 |ProgramListing: This is a test
   |  Only a test.
   |Had this been a real emegency,
   |  We would have fled in terror
 5 |And you would not have been informed.
-
A program listing for the language “python” (explicitly).
 1 |    def _check_arg(self, arg):
+
A program listing for the language “python” (explicitly).
 1 |    def _check_arg(self, arg):
    |        if ":" in arg:
    |            pos = arg.index(":")
    |            name = arg[0:pos]
@@ -17,7 +17,7 @@
    |            elif name == "-xsl":
    |                self.stylesheet = arg
    |        self._app_args.append(arg)
-
A program listing without a language specification.
 1 |    def _check_arg(self, arg):
+
A program listing without a language specification.
 1 |    def _check_arg(self, arg):
    |        if ":" in arg:
    |            pos = arg.index(":")
    |            name = arg[0:pos]
@@ -31,14 +31,14 @@
    |            elif name == "-xsl":
    |                self.stylesheet = arg
    |        self._app_args.append(arg)
-
A program listing for the language “xml”
1 |<xsl:function name="f:verbatim-trim-trailing" as="xs:boolean">
+
A program listing for the language “xml”
1 |<xsl:function name="f:verbatim-trim-trailing" as="xs:boolean">
   |  <xsl:param name="context" as="element()"/>
   |  <xsl:variable name="pi" select="f:pi($context, 'verbatim-trim-trailing')"/>
   |  <xsl:sequence select="if ($pi)
 5 |                        then f:is-true($pi)
   |                        else f:is-true($verbatim-trim-trailing-blank-lines)"/>
   |</xsl:function>
-
A program listing for the language “xslt”
1 |<xsl:function name="f:verbatim-trim-trailing" as="xs:boolean">
+
A program listing for the language “xslt”
1 |<xsl:function name="f:verbatim-trim-trailing" as="xs:boolean">
   |  <xsl:param name="context" as="element()"/>
   |  <xsl:variable name="pi" select="f:pi($context, 'verbatim-trim-trailing')"/>
   |  <xsl:sequence select="if ($pi)
diff --git a/src/test/resources/expected/programlisting.013.html b/src/test/resources/expected/programlisting.013.html
index b1d6a80f97..91de5cbf69 100644
--- a/src/test/resources/expected/programlisting.013.html
+++ b/src/test/resources/expected/programlisting.013.html
@@ -1,4 +1,4 @@
-Unit test: programlisting.013
Unit test: programlisting.013
These verbatim listings explicitly use the ‘table’ style.
1 |
+Unit test: programlisting.013
Unit test: programlisting.013
These verbatim listings explicitly use the ‘table’ style.
1 |
   |
   |
   |
@@ -8,7 +8,7 @@
 Had this been a real emegency,
   We would have fled in terror
 And you would not have been informed.
-
A program listing for the language “python” (explicitly).
 1 |
+
A program listing for the language “python” (explicitly).
 1 |
    |
    |
    |
@@ -36,7 +36,7 @@
             elif name == "-xsl":
                 self.stylesheet = arg
         self._app_args.append(arg)
-
A program listing for the language “xml”
1 |
+
A program listing for the language “xml”
1 |
   |
   |
   |
diff --git a/src/test/resources/expected/programlisting.014.html b/src/test/resources/expected/programlisting.014.html
index c8a6dcdde4..1c0233e9c6 100644
--- a/src/test/resources/expected/programlisting.014.html
+++ b/src/test/resources/expected/programlisting.014.html
@@ -1,15 +1,15 @@
 Unit test: programlisting.014
Unit test: programlisting.014
This tests the parameters for trimming leading and trailing blank lines
-from a verbatim environment.
Defaults (trim trailing, not leading):
  | 
+from a verbatim environment.
Defaults (trim trailing, not leading):
  | 
   | 
   | 
   |line four of four
-
Trim trailing, not leading, explicitly:
  | 
+
Trim trailing, not leading, explicitly:
  | 
   | 
   | 
   |line four of four
-
Trim leading, not trailing:
  |line one of four
+
Trim leading, not trailing:
  |line one of four
   | 
   | 
   | 
-
Trim both:
  |line one of one
+
Trim both:
  |line one of one
 

\ No newline at end of file
diff --git a/src/test/resources/expected/programlisting.015.html b/src/test/resources/expected/programlisting.015.html
index 3274f0c09d..a69d23ebbf 100644
--- a/src/test/resources/expected/programlisting.015.html
+++ b/src/test/resources/expected/programlisting.015.html
@@ -12,7 +12,7 @@
 neque pecun modut est neque nonor et imper ned libidig met,
 consectetur adipiscing elit, sed ut labore et dolore magna aliquam
 makes one wonder who would ever read this stuff?
-
 1 |Line 01
+
 1 |Line 01
    |Line 02
    |Line 03
    |Line 04
@@ -24,7 +24,7 @@
 10 |Line 10
    |Line 11
    |Line 12
-
(In a paged media presentation, the entire program listing should be on page 2.)
 1 |Line 01
+
(In a paged media presentation, the entire program listing should be on page 2.)
 1 |Line 01
    |Line 02
    |Line 03
    |Line 04
diff --git a/src/test/resources/expected/programlistingco.001.html b/src/test/resources/expected/programlistingco.001.html
index fa9fe9e090..9d5aca2edd 100644
--- a/src/test/resources/expected/programlistingco.001.html
+++ b/src/test/resources/expected/programlistingco.001.html
@@ -1,4 +1,4 @@
-Article wrapper
Article wrapper
 1 |The first line                                             ①
+Article wrapper
Article wrapper
 1 |The first line                                             ①
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_f_l-lra.html b/src/test/resources/expected/programlistingco.001_l_f_l-lra.html
index df3c15e7b3..7ed6d66c1a 100644
--- a/src/test/resources/expected/programlistingco.001_l_f_l-lra.html
+++ b/src/test/resources/expected/programlistingco.001_l_f_l-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlines,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             ①
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlines,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             ①
    |The second line              
    |The third line               
    |The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_l_f_l-lrf.html b/src/test/resources/expected/programlistingco.001_l_f_l-lrf.html
index f011383897..c670cefefc 100644
--- a/src/test/resources/expected/programlistingco.001_l_f_l-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_l_f_l-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlines,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             ①
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlines,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             ①
    |The second line              
    |The third line               
    |The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_l_f_l.html b/src/test/resources/expected/programlistingco.001_l_f_l.html
index 3783613eb8..5fa098f240 100644
--- a/src/test/resources/expected/programlistingco.001_l_f_l.html
+++ b/src/test/resources/expected/programlistingco.001_l_f_l.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlines
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             ①
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlines
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             ①
    |The second line              
    |The third line               
    |The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_l_f_lc-l-lra.html b/src/test/resources/expected/programlistingco.001_l_f_lc-l-lra.html
index 6305fc9a14..5acd033314 100644
--- a/src/test/resources/expected/programlistingco.001_l_f_lc-l-lra.html
+++ b/src/test/resources/expected/programlistingco.001_l_f_lc-l-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lines,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             ①
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lines,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             ①
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_f_lc-l-lrf.html b/src/test/resources/expected/programlistingco.001_l_f_lc-l-lrf.html
index 2bd7f06151..a7cef325c6 100644
--- a/src/test/resources/expected/programlistingco.001_l_f_lc-l-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_l_f_lc-l-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lines,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             ①
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lines,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             ①
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_f_lc-l.html b/src/test/resources/expected/programlistingco.001_l_f_lc-l.html
index 3b3b3a45a0..61a8f75080 100644
--- a/src/test/resources/expected/programlistingco.001_l_f_lc-l.html
+++ b/src/test/resources/expected/programlistingco.001_l_f_lc-l.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lines
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             ①
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lines
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             ①
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_f_lc-lra.html b/src/test/resources/expected/programlistingco.001_l_f_lc-lra.html
index 13db4dbea7..f79b784816 100644
--- a/src/test/resources/expected/programlistingco.001_l_f_lc-lra.html
+++ b/src/test/resources/expected/programlistingco.001_l_f_lc-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_f_lc-lrf.html b/src/test/resources/expected/programlistingco.001_l_f_lc-lrf.html
index c653115a31..63c2e19e1d 100644
--- a/src/test/resources/expected/programlistingco.001_l_f_lc-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_l_f_lc-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_f_lc.html b/src/test/resources/expected/programlistingco.001_l_f_lc.html
index 5a4690fc1e..edb2c08cd2 100644
--- a/src/test/resources/expected/programlistingco.001_l_f_lc.html
+++ b/src/test/resources/expected/programlistingco.001_l_f_lc.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_f_lra.html b/src/test/resources/expected/programlistingco.001_l_f_lra.html
index 01667bdbf4..cf27f60aa3 100644
--- a/src/test/resources/expected/programlistingco.001_l_f_lra.html
+++ b/src/test/resources/expected/programlistingco.001_l_f_lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             
    |The second line              
    |The third line               
    |The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_l_f_lrf.html b/src/test/resources/expected/programlistingco.001_l_f_lrf.html
index 2c11e4b845..257bde550a 100644
--- a/src/test/resources/expected/programlistingco.001_l_f_lrf.html
+++ b/src/test/resources/expected/programlistingco.001_l_f_lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
   |The first line                                             
    |The second line              
    |The third line               
    |The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_l_t_l-lra.html b/src/test/resources/expected/programlistingco.001_l_t_l-lra.html
index 5ff0f4e978..e489aac96c 100644
--- a/src/test/resources/expected/programlistingco.001_l_t_l-lra.html
+++ b/src/test/resources/expected/programlistingco.001_l_t_l-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlines,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             ①
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlines,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             ①
    |The second line              
    |The third line               
    |The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_l_t_l-lrf.html b/src/test/resources/expected/programlistingco.001_l_t_l-lrf.html
index fa56b5f90a..2f9019c74d 100644
--- a/src/test/resources/expected/programlistingco.001_l_t_l-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_l_t_l-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlines,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             ①
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlines,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             ①
    |The second line              
    |The third line               
    |The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_l_t_l.html b/src/test/resources/expected/programlistingco.001_l_t_l.html
index 816aa4ef9e..9b6ff4506d 100644
--- a/src/test/resources/expected/programlistingco.001_l_t_l.html
+++ b/src/test/resources/expected/programlistingco.001_l_t_l.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlines
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             ①
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlines
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             ①
    |The second line              
    |The third line               
    |The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_l_t_lc-l-lra.html b/src/test/resources/expected/programlistingco.001_l_t_lc-l-lra.html
index 1e997fd325..925d46a49a 100644
--- a/src/test/resources/expected/programlistingco.001_l_t_lc-l-lra.html
+++ b/src/test/resources/expected/programlistingco.001_l_t_lc-l-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lines,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             ①
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lines,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             ①
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_t_lc-l-lrf.html b/src/test/resources/expected/programlistingco.001_l_t_lc-l-lrf.html
index ce9d4a7f34..01439dcba7 100644
--- a/src/test/resources/expected/programlistingco.001_l_t_lc-l-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_l_t_lc-l-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lines,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             ①
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lines,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             ①
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_t_lc-l.html b/src/test/resources/expected/programlistingco.001_l_t_lc-l.html
index 03d694de78..b178ce19c0 100644
--- a/src/test/resources/expected/programlistingco.001_l_t_lc-l.html
+++ b/src/test/resources/expected/programlistingco.001_l_t_lc-l.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lines
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             ①
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lines
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             ①
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_t_lc-lra.html b/src/test/resources/expected/programlistingco.001_l_t_lc-lra.html
index 16d33ccb83..05c846931f 100644
--- a/src/test/resources/expected/programlistingco.001_l_t_lc-lra.html
+++ b/src/test/resources/expected/programlistingco.001_l_t_lc-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_t_lc-lrf.html b/src/test/resources/expected/programlistingco.001_l_t_lc-lrf.html
index b3f0a5fe88..cb4e0a6bc0 100644
--- a/src/test/resources/expected/programlistingco.001_l_t_lc-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_l_t_lc-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_t_lc.html b/src/test/resources/expected/programlistingco.001_l_t_lc.html
index 12b9d9a26d..cf216649df 100644
--- a/src/test/resources/expected/programlistingco.001_l_t_lc.html
+++ b/src/test/resources/expected/programlistingco.001_l_t_lc.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlinecolumn
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             
    |The second line              ②
    |The third line               ③
    |The fourth line              ③
diff --git a/src/test/resources/expected/programlistingco.001_l_t_lra.html b/src/test/resources/expected/programlistingco.001_l_t_lra.html
index 0c87d91741..cea3d993b8 100644
--- a/src/test/resources/expected/programlistingco.001_l_t_lra.html
+++ b/src/test/resources/expected/programlistingco.001_l_t_lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             
    |The second line              
    |The third line               
    |The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_l_t_lrf.html b/src/test/resources/expected/programlistingco.001_l_t_lrf.html
index f5601552b7..3b80101bf1 100644
--- a/src/test/resources/expected/programlistingco.001_l_t_lrf.html
+++ b/src/test/resources/expected/programlistingco.001_l_t_lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             
+listing that follows:
OptionValue
verbatim-stylelines
verbatim-highlightlineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
 1 |The first line                                             
    |The second line              
    |The third line               
    |The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_f_l-lra.html b/src/test/resources/expected/programlistingco.001_p_f_l-lra.html
index 70fa8b4f79..32a3c03462 100644
--- a/src/test/resources/expected/programlistingco.001_p_f_l-lra.html
+++ b/src/test/resources/expected/programlistingco.001_p_f_l-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlines,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlines,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_f_l-lrf.html b/src/test/resources/expected/programlistingco.001_p_f_l-lrf.html
index 406d30324e..92f6209e18 100644
--- a/src/test/resources/expected/programlistingco.001_p_f_l-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_p_f_l-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlines,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlines,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_f_l.html b/src/test/resources/expected/programlistingco.001_p_f_l.html
index b131eefe46..fd653dd6de 100644
--- a/src/test/resources/expected/programlistingco.001_p_f_l.html
+++ b/src/test/resources/expected/programlistingco.001_p_f_l.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlines
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlines
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_f_lc-l-lra.html b/src/test/resources/expected/programlistingco.001_p_f_lc-l-lra.html
index cb390df1d9..8d8e785323 100644
--- a/src/test/resources/expected/programlistingco.001_p_f_lc-l-lra.html
+++ b/src/test/resources/expected/programlistingco.001_p_f_lc-l-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lines,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lines,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_f_lc-l-lrf.html b/src/test/resources/expected/programlistingco.001_p_f_lc-l-lrf.html
index c10c53a175..7f8845adf8 100644
--- a/src/test/resources/expected/programlistingco.001_p_f_lc-l-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_p_f_lc-l-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lines,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lines,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_f_lc-l.html b/src/test/resources/expected/programlistingco.001_p_f_lc-l.html
index 8a2a901259..fefb375004 100644
--- a/src/test/resources/expected/programlistingco.001_p_f_lc-l.html
+++ b/src/test/resources/expected/programlistingco.001_p_f_lc-l.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lines
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lines
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_f_lc-lra.html b/src/test/resources/expected/programlistingco.001_p_f_lc-lra.html
index 49ab9dd7e4..fa97b7cc03 100644
--- a/src/test/resources/expected/programlistingco.001_p_f_lc-lra.html
+++ b/src/test/resources/expected/programlistingco.001_p_f_lc-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_f_lc-lrf.html b/src/test/resources/expected/programlistingco.001_p_f_lc-lrf.html
index 33a8c581c8..21ea89b645 100644
--- a/src/test/resources/expected/programlistingco.001_p_f_lc-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_p_f_lc-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_f_lc.html b/src/test/resources/expected/programlistingco.001_p_f_lc.html
index 4097f73055..303668c4ab 100644
--- a/src/test/resources/expected/programlistingco.001_p_f_lc.html
+++ b/src/test/resources/expected/programlistingco.001_p_f_lc.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_f_lra.html b/src/test/resources/expected/programlistingco.001_p_f_lra.html
index 2d4331abb8..1836690575 100644
--- a/src/test/resources/expected/programlistingco.001_p_f_lra.html
+++ b/src/test/resources/expected/programlistingco.001_p_f_lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_f_lrf.html b/src/test/resources/expected/programlistingco.001_p_f_lrf.html
index 1155f209b3..8171ea9c91 100644
--- a/src/test/resources/expected/programlistingco.001_p_f_lrf.html
+++ b/src/test/resources/expected/programlistingco.001_p_f_lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_t_l-lra.html b/src/test/resources/expected/programlistingco.001_p_t_l-lra.html
index 140900e23f..585ffaae35 100644
--- a/src/test/resources/expected/programlistingco.001_p_t_l-lra.html
+++ b/src/test/resources/expected/programlistingco.001_p_t_l-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlines,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlines,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_t_l-lrf.html b/src/test/resources/expected/programlistingco.001_p_t_l-lrf.html
index ac67cd657d..a4409e5adb 100644
--- a/src/test/resources/expected/programlistingco.001_p_t_l-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_p_t_l-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlines,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlines,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_t_l.html b/src/test/resources/expected/programlistingco.001_p_t_l.html
index f392038fe4..bb00db790d 100644
--- a/src/test/resources/expected/programlistingco.001_p_t_l.html
+++ b/src/test/resources/expected/programlistingco.001_p_t_l.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlines
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlines
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_t_lc-l-lra.html b/src/test/resources/expected/programlistingco.001_p_t_lc-l-lra.html
index 53d784dcf7..e7893dc925 100644
--- a/src/test/resources/expected/programlistingco.001_p_t_lc-l-lra.html
+++ b/src/test/resources/expected/programlistingco.001_p_t_lc-l-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lines,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lines,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_t_lc-l-lrf.html b/src/test/resources/expected/programlistingco.001_p_t_lc-l-lrf.html
index 496c01fe2d..e49bfdccdb 100644
--- a/src/test/resources/expected/programlistingco.001_p_t_lc-l-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_p_t_lc-l-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lines,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lines,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_t_lc-l.html b/src/test/resources/expected/programlistingco.001_p_t_lc-l.html
index dc48fd22ad..af65a54f0f 100644
--- a/src/test/resources/expected/programlistingco.001_p_t_lc-l.html
+++ b/src/test/resources/expected/programlistingco.001_p_t_lc-l.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lines
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lines
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_t_lc-lra.html b/src/test/resources/expected/programlistingco.001_p_t_lc-lra.html
index fd57ac6dbd..4007d4aef3 100644
--- a/src/test/resources/expected/programlistingco.001_p_t_lc-lra.html
+++ b/src/test/resources/expected/programlistingco.001_p_t_lc-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_t_lc-lrf.html b/src/test/resources/expected/programlistingco.001_p_t_lc-lrf.html
index 1ec9fe8306..50d7dad1e9 100644
--- a/src/test/resources/expected/programlistingco.001_p_t_lc-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_p_t_lc-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_t_lc.html b/src/test/resources/expected/programlistingco.001_p_t_lc.html
index 3e569cba6e..dc6a54450b 100644
--- a/src/test/resources/expected/programlistingco.001_p_t_lc.html
+++ b/src/test/resources/expected/programlistingco.001_p_t_lc.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlinecolumn
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_t_lra.html b/src/test/resources/expected/programlistingco.001_p_t_lra.html
index 75b401d723..76de7a5a43 100644
--- a/src/test/resources/expected/programlistingco.001_p_t_lra.html
+++ b/src/test/resources/expected/programlistingco.001_p_t_lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_p_t_lrf.html b/src/test/resources/expected/programlistingco.001_p_t_lrf.html
index 92f4aabafa..98d4ceada0 100644
--- a/src/test/resources/expected/programlistingco.001_p_t_lrf.html
+++ b/src/test/resources/expected/programlistingco.001_p_t_lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
+listing that follows:
OptionValue
verbatim-styleplain
verbatim-highlightlineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line                                             
 The second line              
 The third line               
 The fourth line              
diff --git a/src/test/resources/expected/programlistingco.001_r_f_l-lra.html b/src/test/resources/expected/programlistingco.001_r_f_l-lra.html
index 4ed2692744..e67e369e6b 100644
--- a/src/test/resources/expected/programlistingco.001_r_f_l-lra.html
+++ b/src/test/resources/expected/programlistingco.001_r_f_l-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlines,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlines,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_f_l-lrf.html b/src/test/resources/expected/programlistingco.001_r_f_l-lrf.html
index 34723892b6..109005f098 100644
--- a/src/test/resources/expected/programlistingco.001_r_f_l-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_r_f_l-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlines,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlines,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_f_l.html b/src/test/resources/expected/programlistingco.001_r_f_l.html
index 0b2e2ddab3..c199657c1a 100644
--- a/src/test/resources/expected/programlistingco.001_r_f_l.html
+++ b/src/test/resources/expected/programlistingco.001_r_f_l.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlines
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlines
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_f_lc-l-lra.html b/src/test/resources/expected/programlistingco.001_r_f_lc-l-lra.html
index 59464eade8..fdb5407e21 100644
--- a/src/test/resources/expected/programlistingco.001_r_f_lc-l-lra.html
+++ b/src/test/resources/expected/programlistingco.001_r_f_lc-l-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lines,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lines,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_f_lc-l-lrf.html b/src/test/resources/expected/programlistingco.001_r_f_lc-l-lrf.html
index 71d76bc3f6..4b3a8d7a56 100644
--- a/src/test/resources/expected/programlistingco.001_r_f_lc-l-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_r_f_lc-l-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lines,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lines,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_f_lc-l.html b/src/test/resources/expected/programlistingco.001_r_f_lc-l.html
index f64b91bb59..6d2c6fa37b 100644
--- a/src/test/resources/expected/programlistingco.001_r_f_lc-l.html
+++ b/src/test/resources/expected/programlistingco.001_r_f_lc-l.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lines
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lines
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_f_lc-lra.html b/src/test/resources/expected/programlistingco.001_r_f_lc-lra.html
index b27c83831f..9fab8b641d 100644
--- a/src/test/resources/expected/programlistingco.001_r_f_lc-lra.html
+++ b/src/test/resources/expected/programlistingco.001_r_f_lc-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_f_lc-lrf.html b/src/test/resources/expected/programlistingco.001_r_f_lc-lrf.html
index 9027ba1b8e..7c9f9d7c33 100644
--- a/src/test/resources/expected/programlistingco.001_r_f_lc-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_r_f_lc-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_f_lc.html b/src/test/resources/expected/programlistingco.001_r_f_lc.html
index e8ee199181..a34aa99d4a 100644
--- a/src/test/resources/expected/programlistingco.001_r_f_lc.html
+++ b/src/test/resources/expected/programlistingco.001_r_f_lc.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_f_lra.html b/src/test/resources/expected/programlistingco.001_r_f_lra.html
index fdb968e534..2c4dc682d8 100644
--- a/src/test/resources/expected/programlistingco.001_r_f_lra.html
+++ b/src/test/resources/expected/programlistingco.001_r_f_lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlineranges-all
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_f_lrf.html b/src/test/resources/expected/programlistingco.001_r_f_lrf.html
index 559a552c65..0fac2b9193 100644
--- a/src/test/resources/expected/programlistingco.001_r_f_lrf.html
+++ b/src/test/resources/expected/programlistingco.001_r_f_lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlineranges-first
verbatim-numberedfalse
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_t_l-lra.html b/src/test/resources/expected/programlistingco.001_r_t_l-lra.html
index 1539fd875e..b9a0c56026 100644
--- a/src/test/resources/expected/programlistingco.001_r_t_l-lra.html
+++ b/src/test/resources/expected/programlistingco.001_r_t_l-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlines,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlines,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_t_l-lrf.html b/src/test/resources/expected/programlistingco.001_r_t_l-lrf.html
index 773e613267..8dfd222196 100644
--- a/src/test/resources/expected/programlistingco.001_r_t_l-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_r_t_l-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlines,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlines,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_t_l.html b/src/test/resources/expected/programlistingco.001_r_t_l.html
index d51d286f75..ed241321cd 100644
--- a/src/test/resources/expected/programlistingco.001_r_t_l.html
+++ b/src/test/resources/expected/programlistingco.001_r_t_l.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlines
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlines
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_t_lc-l-lra.html b/src/test/resources/expected/programlistingco.001_r_t_lc-l-lra.html
index 7c40a95340..07c4fa9ba7 100644
--- a/src/test/resources/expected/programlistingco.001_r_t_lc-l-lra.html
+++ b/src/test/resources/expected/programlistingco.001_r_t_lc-l-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lines,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lines,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_t_lc-l-lrf.html b/src/test/resources/expected/programlistingco.001_r_t_lc-l-lrf.html
index 5ac152b642..793fd43713 100644
--- a/src/test/resources/expected/programlistingco.001_r_t_lc-l-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_r_t_lc-l-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lines,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lines,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_t_lc-l.html b/src/test/resources/expected/programlistingco.001_r_t_lc-l.html
index a6b5a55f58..3fadb8b78d 100644
--- a/src/test/resources/expected/programlistingco.001_r_t_lc-l.html
+++ b/src/test/resources/expected/programlistingco.001_r_t_lc-l.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lines
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lines
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_t_lc-lra.html b/src/test/resources/expected/programlistingco.001_r_t_lc-lra.html
index 0f0d49bbc5..92bad84872 100644
--- a/src/test/resources/expected/programlistingco.001_r_t_lc-lra.html
+++ b/src/test/resources/expected/programlistingco.001_r_t_lc-lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_t_lc-lrf.html b/src/test/resources/expected/programlistingco.001_r_t_lc-lrf.html
index aab6ae30e4..945ecb0097 100644
--- a/src/test/resources/expected/programlistingco.001_r_t_lc-lrf.html
+++ b/src/test/resources/expected/programlistingco.001_r_t_lc-lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn,lineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_t_lc.html b/src/test/resources/expected/programlistingco.001_r_t_lc.html
index 1b9760abe4..62e3d39c3d 100644
--- a/src/test/resources/expected/programlistingco.001_r_t_lc.html
+++ b/src/test/resources/expected/programlistingco.001_r_t_lc.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlinecolumn
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_t_lra.html b/src/test/resources/expected/programlistingco.001_r_t_lra.html
index b877b599cf..9783e46a91 100644
--- a/src/test/resources/expected/programlistingco.001_r_t_lra.html
+++ b/src/test/resources/expected/programlistingco.001_r_t_lra.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlineranges-all
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.001_r_t_lrf.html b/src/test/resources/expected/programlistingco.001_r_t_lrf.html
index b927da6eae..5f97d1aba2 100644
--- a/src/test/resources/expected/programlistingco.001_r_t_lrf.html
+++ b/src/test/resources/expected/programlistingco.001_r_t_lrf.html
@@ -1,5 +1,5 @@
 Article wrapper
Article wrapper
These options apply to the
-listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
+listing that follows:
OptionValue
verbatim-styleraw
verbatim-highlightlineranges-first
verbatim-numberedtrue
verbatim-number-every-nth5
verbatim-number-first-linetrue
verbatim-number-minlines5
The first line
 The second line
 The third line
 The fourth line
diff --git a/src/test/resources/expected/programlistingco.002.html b/src/test/resources/expected/programlistingco.002.html
index f0d9ca1001..e0ab1ad476 100644
--- a/src/test/resources/expected/programlistingco.002.html
+++ b/src/test/resources/expected/programlistingco.002.html
@@ -1,14 +1,14 @@
-Unit test: programlistingco.002
Unit test: programlistingco.002
1 |The is the first line
+Unit test: programlistingco.002
Unit test: programlistingco.002
1 |The is the first line
   |In the fourth line a variant selector occurs
   |after the ⚠; it should not be counted.
   |123456789⚠︎1①234567890
 5 |12345678901②234567890
 
The user probably expects the line range marks to line up,
-but they don’t. It’s not clear how to fix that.
  |12345678901234567890                                       ④
+but they don’t. It’s not clear how to fix that.
  |12345678901234567890                                       ④
   |12345678901234567890                                       ④
   |123456789①01②23③4567890                                       ④
   |12345678901234567890                                       ④
-
  |12345678901234567890                                       ①
+
  |12345678901234567890                                       ①
   |12345678901234567890                                       ①
   |123456789②01③23④4567890                                       ①
   |12345678901234567890                                       ①
diff --git a/src/test/resources/expected/programlistingco.003.html b/src/test/resources/expected/programlistingco.003.html
index cecb519ecc..44b503d9e9 100644
--- a/src/test/resources/expected/programlistingco.003.html
+++ b/src/test/resources/expected/programlistingco.003.html
@@ -1,9 +1,9 @@
-Unit test: programlistingco.003
Unit test: programlistingco.003
1 |The first line               ⑤
+Unit test: programlistingco.003
Unit test: programlistingco.003
1 |The first line               ⑤
   |The second line              ⑥
   |The third line
   |The fourth line
 5 |The fifth line
-
An interstitial para.
 6 |The sixth line
+
An interstitial para.
 6 |The sixth line
    |The seventh line
    |The eighth line
    |The ninth line               ⑦
diff --git a/src/test/resources/expected/programlistingco.004.html b/src/test/resources/expected/programlistingco.004.html
index 4f24673012..12f6316d08 100644
--- a/src/test/resources/expected/programlistingco.004.html
+++ b/src/test/resources/expected/programlistingco.004.html
@@ -1,4 +1,4 @@
-Unit test: programlistingco.004
Unit test: programlistingco.004
 1 |    def _check_arg(self, arg)⑤:
+Unit test: programlistingco.004
Unit test: programlistingco.004
 1 |    def _check_arg(self, arg)⑤:
    |        if ":" in arg:       ⑥
    |            pos = arg.index(":")
    |            name = arg[0:pos]
diff --git a/src/test/resources/expected/pygments.001.html b/src/test/resources/expected/pygments.001.html
index 415f73ba9a..65e85b4cbc 100644
--- a/src/test/resources/expected/pygments.001.html
+++ b/src/test/resources/expected/pygments.001.html
@@ -1,7 +1,7 @@
 Unit test: pygments.001
Unit test: pygments.001
This test checks to see if the extension function that runs
-Pygments syntax highlighting works.
  |def printDict(di, format="%-25s %s"):
+Pygments syntax highlighting works.
  |def printDict(di, format="%-25s %s"):
   |    for (key, val) in di.items():
   |        print format % (str(key)+':', val)
-
  |This programlisting has
+
  |This programlisting has
   |no language attribute.
 

\ No newline at end of file
diff --git a/src/test/resources/expected/pygments.002.html b/src/test/resources/expected/pygments.002.html
index bdd1ffd134..9d7af96e77 100644
--- a/src/test/resources/expected/pygments.002.html
+++ b/src/test/resources/expected/pygments.002.html
@@ -1,5 +1,5 @@
 Unit test: pygments.002
Unit test: pygments.002
This test checks to see if the extension function that runs
-Pygments syntax highlighting works.
 1 |    def matching_images(self, iname=None):
+Pygments syntax highlighting works.
 1 |    def matching_images(self, iname=None):
    |        """Filter the image list to the ones that match the
    |        specified iname.
    | 
diff --git a/src/test/resources/expected/pygments.003.html b/src/test/resources/expected/pygments.003.html
index b3e87a3125..c63109e522 100644
--- a/src/test/resources/expected/pygments.003.html
+++ b/src/test/resources/expected/pygments.003.html
@@ -1,5 +1,5 @@
 Unit test: pygments.003
Unit test: pygments.003
This test checks to see if the extension function that runs
-Pygments syntax highlighting works.
  |def printDict(di, format="%-25s %s"):
+Pygments syntax highlighting works.
  |def printDict(di, format="%-25s %s"):
   |    for (key, val) in di.items():
   |        print format % (str(key)+':', val)
   | 
diff --git a/src/test/resources/expected/pygments.004.html b/src/test/resources/expected/pygments.004.html
index a2d3caedd9..33e2c8270c 100644
--- a/src/test/resources/expected/pygments.004.html
+++ b/src/test/resources/expected/pygments.004.html
@@ -1,5 +1,5 @@
 Unit test: pygments.004
Unit test: pygments.004
This test checks to see if the extension function that runs
-Pygments syntax highlighting works.
1 |.error * {
+Pygments syntax highlighting works.
1 |.error * {
   |  background-color: var(--error-color);
   |  color: var(--on-error-color);
   |  padding-left: 2px;
diff --git a/src/test/resources/expected/qandaset.002.html b/src/test/resources/expected/qandaset.002.html
index c1fb393265..4e5bc5da90 100644
--- a/src/test/resources/expected/qandaset.002.html
+++ b/src/test/resources/expected/qandaset.002.html
@@ -1,7 +1,7 @@
-Article wrapper
Article wrapper
1. 
Blah blah blah.
  |// Hello, World
+Article wrapper
Article wrapper
1. 
Blah blah blah.
  |// Hello, World
 
Example 1. 
                   file.name
-               
  |// Goodbye, World
+               
  |// Goodbye, World
 
Example 2. 
                   file2.name
                

\ No newline at end of file
diff --git a/src/test/resources/expected/qandaset.003.html b/src/test/resources/expected/qandaset.003.html
index ca1b5a7f6e..126c317ccc 100644
--- a/src/test/resources/expected/qandaset.003.html
+++ b/src/test/resources/expected/qandaset.003.html
@@ -4,10 +4,10 @@
 Some introductory preamble. Some introductory preamble.
Some introductory preamble. Some introductory preamble.
 Some introductory preamble. Some introductory preamble.
 Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.
Division 1
1.1. 
Blah blah blah.
  |// Hello, World
+Some introductory preamble. Some introductory preamble.
Division 1
1.1. 
Blah blah blah.
  |// Hello, World
 
Example 1. 
                      file.name
-                  
  |// Goodbye, World
+                  
  |// Goodbye, World
 
Example 2. 
                      file2.name
                   
Division 2
Some introductory preamble. Some introductory preamble.
@@ -16,16 +16,16 @@
 Some introductory preamble. Some introductory preamble.
Some introductory preamble. Some introductory preamble.
 Some introductory preamble. Some introductory preamble.
 Some introductory preamble. Some introductory preamble.
-Some introductory preamble. Some introductory preamble.
Division 2.1
2.1.1. 
Blah blah blah.
  |// Hello, World
+Some introductory preamble. Some introductory preamble.
Division 2.1
2.1.1. 
Blah blah blah.
  |// Hello, World
 
Example 1. 
                         file.name
-                     
  |// Goodbye, World
+                     
  |// Goodbye, World
 
Example 2. 
                         file2.name
-                     
Division 2.2
2.2.1. 
Blah blah blah.
  |// Hello, World
+                     
Division 2.2
2.2.1. 
Blah blah blah.
  |// Hello, World
 
Example 1. 
                         file.name
-                     
  |// Goodbye, World
+                     
  |// Goodbye, World
 
Example 2. 
                         file2.name
                      

\ No newline at end of file
diff --git a/src/test/resources/expected/refentry.003.html b/src/test/resources/expected/refentry.003.html
index bc46b64b2f..ecb3a93980 100644
--- a/src/test/resources/expected/refentry.003.html
+++ b/src/test/resources/expected/refentry.003.html
@@ -1,7 +1,7 @@
 Article wrapper
Article wrapper
Lets refer to Fred(3).
 
Name
Less Minimal, Even Less Minimal — Test of a minimal RefEntry.
Synopsis
command [-a |  -alpha]
command [-b |  -beta]
command -c |  
 -charlie
command -d |  
--delta
command --help
Description
This is a less minimal RefEntry.
  |Testing
+-delta
command --help
Description
This is a less minimal RefEntry.
  |Testing
   |Some
   |Text
 
Figure 1. Some Program

\ No newline at end of file
diff --git a/src/test/resources/expected/refentry.004.html b/src/test/resources/expected/refentry.004.html
index d85ada3c2c..4dcdae2d08 100644
--- a/src/test/resources/expected/refentry.004.html
+++ b/src/test/resources/expected/refentry.004.html
@@ -1,7 +1,7 @@
 Article wrapper
Article wrapper
Test an xref to refnamediv:
 Less Minimal.
Name
Less Minimal, Even Less Minimal — Test of a minimal RefEntry.
Synopsis
command [-a |  -alpha]
command [-b |  -beta]
command -c |  
 -charlie
command -d |  
--delta
command --help
Description
This is a less minimal RefEntry.
  |Testing
+-delta
command --help
Description
This is a less minimal RefEntry.
  |Testing
   |Some
   |Text
 
Figure 1. Some Program

\ No newline at end of file
diff --git a/src/test/resources/expected/refentry.007.html b/src/test/resources/expected/refentry.007.html
index a3f38e6ad7..1245136f07 100644
--- a/src/test/resources/expected/refentry.007.html
+++ b/src/test/resources/expected/refentry.007.html
@@ -1,4 +1,4 @@
-Unit Test: refentry.007
Unit Test: refentry.007
Norman Walsh
Table of Contents
I. Reference
Name
FirstName, SecondName — Purpose for FirstName.
ThirdName — Purpose for ThirdName.
Synopsis
#include <varargs.h>
+Unit Test: refentry.007
Unit Test: refentry.007
Norman Walsh
Table of Contents
I. Reference
Name
FirstName, SecondName — Purpose for FirstName.
ThirdName — Purpose for ThirdName.
Synopsis
#include <varargs.h>
 #include <mouteyh.h>
 #include <qlmppzj.h>
float rand();
int max(...);
int idiv(n, m);
int n;
int m;
Another.
void qsort(dataptr,
left,
right,
comp);
void *dataptr[]
int left
int right
int (*comp)
       (void *, void *)
int foo_frob_something(foo_frob_parm1,
foo_frob_parm2,
foo_frob_parm3,
parm4,
foo_frob_parm5);
foo_sometype1 foo_frob_parm1
foo_sometype1 foo_frob_parm2
foo_sometype1 foo_frob_parm3
int  (* parm4 )
@@ -8,36 +8,36 @@
             
Subsection
This is a minimal RefEntry.
The following is a glosslist with a title and a nested variablelist
 
   
My glosslist
glossentry term 1
some glossdef text
glossentry term 2
nested variablelist term 1
some variablelist text
nested variablelist term 2
some more variablelist text

-               
Sub-subsection
This is a minimal RefEntry.
More Description
This is a not-so minimal RefEntry.
  |This is a screen [break here]
+               
Sub-subsection
This is a minimal RefEntry.
More Description
This is a not-so minimal RefEntry.
  |This is a screen [break here]
   |that starts with a line of space. [break here]
   |And it ends with a line of space.
-
normal paragraph here
  |This is a screen [break here]
+
normal paragraph here
  |This is a screen [break here]
   |that does not start with a line of space. [break here]
   |And does not end with a line of space.
 
This is a normal paragraph that contains a screen.
-
  |This is a screen within a normal paragraph [break here]
+
  |This is a screen within a normal paragraph [break here]
   |that does not start with a line of space. [break here]
   |And does not end with a line of space but is followed
   |by a line of space.
 

             
This is another  normal paragraph that contains a screen.
-
  |This is a screen within a normal paragraph [break here]
+
  |This is a screen within a normal paragraph [break here]
   |that does not start with a line of space. [break here]
   |And does not end with a line of space and is not followed
   |by a line of space.
 

             
This is another  normal paragraph that contains a screen.
-
  |This is a screen within a normal paragraph [break here]
+
  |This is a screen within a normal paragraph [break here]
   |that starts with a line of space. [break here]
   |And ends with a line of space but is not followed by a line of space.
 

             
This is another  normal paragraph that contains a screen.
-
  |This is a screen within a normal paragraph [break here]
+
  |This is a screen within a normal paragraph [break here]
   |that starts with a line of space. [break here]
   |And ends with a line of space and is followed by a line of space.
 

             
This is another  normal paragraph that contains a screen.
-
  | 
+
  | 
   | 
   |This is a screen within a normal paragraph [break here]
   |that starts with a 2 lines of space. [break here]
@@ -68,7 +68,7 @@
             
This is a para with a footnote
   1
     and stuff after the
-footnote.