diff --git a/doc/guide/appendices/cli-v1vsv2.xml b/doc/guide/appendices/cli-v1vsv2.xml
index 1429e529f..99d2e1b27 100644
--- a/doc/guide/appendices/cli-v1vsv2.xml
+++ b/doc/guide/appendices/cli-v1vsv2.xml
@@ -26,7 +26,7 @@
     </p>
 
     <listing xml:id="listing-v1-manifest">
-      <caption>Example of version 1 project manifest</caption>
+      <title>Example of version 1 project manifest</title>
     <program language="xml">
       <input>
       <![CDATA[
@@ -74,7 +74,7 @@
     </listing>
 
     <listing xml:id="listing-v2-manifest">
-      <caption>Example of version 2 project manifest</caption>
+      <title>Example of version 2 project manifest</title>
     <program language="xml">
       <input>
       <![CDATA[
@@ -117,7 +117,7 @@
     </p>
 
     <listing xml:id="listing-v2-manifest-simple">
-      <caption>Simplified project manifest in version 2 format</caption>
+      <title>Simplified project manifest in version 2 format</title>
     <program language="xml">
       <input>
       <![CDATA[
diff --git a/doc/guide/appendices/editors.xml b/doc/guide/appendices/editors.xml
index 513dcaf6d..4a6944dfb 100644
--- a/doc/guide/appendices/editors.xml
+++ b/doc/guide/appendices/editors.xml
@@ -267,7 +267,7 @@
         <p>Configuration is achieved via a <q>hidden</q> file at the top of your home directory, namely <c>.aspell.conf</c>.  A Mac will try to keep you away from hidden files, which are the ones whose name begins with a period.  Let SublimeText give you an assist here.  In <xref ref="aspell-configuration"/> we show a first run at a useful configuration file.  You <em>definitely</em> want to add the <init>SGML</init> filter, since this is what tells Aspell that you are working on <init>XML</init> files<fn><init>SGML</init> is the precursor of <init>XML</init>.</fn>, so that all element names, attributes, etc. will not be checked.  The remainder is a suggested list of <pretext/> elements to skip.  Suggestions for additions are welcome here.</p>
 
         <listing xml:id="aspell-configuration">
-            <caption>Aspell Configuration File</caption>
+            <title>Aspell Configuration File</title>
 
             <program>
                 <input>
diff --git a/doc/guide/author/processing.xml b/doc/guide/author/processing.xml
index c46aa4112..ade0f5635 100644
--- a/doc/guide/author/processing.xml
+++ b/doc/guide/author/processing.xml
@@ -377,7 +377,7 @@
             </p>
 
             <listing xml:id="cli-project-manifest-example">
-                <caption>Example of a very simple project manifest.</caption>
+                <title>Example of a very simple project manifest.</title>
             <program language="xml">
                 <input>
                 <![CDATA[
@@ -561,7 +561,7 @@
             </p>
 
             <listing xml:id="listing-v2-executables">
-                <caption>Example of version 2 executables file</caption>
+                <title>Example of version 2 executables file</title>
                 <program language="xml">
                   <input>
                   <![CDATA[
diff --git a/doc/guide/author/topics.xml b/doc/guide/author/topics.xml
index b7ad42557..afd706eef 100644
--- a/doc/guide/author/topics.xml
+++ b/doc/guide/author/topics.xml
@@ -2311,7 +2311,7 @@ displayed line, and there are no <c>\\</c>s.  Use <c>\amp</c> to mark the alignm
                         ]]>
                         </input>
                     </program>
-                    <caption>Possible structures for using <tag>mathcmp</tag> within a <tag>test</tag>. The <tag>de-expression</tag> would be replaced by any valid construction as described for the <tag>setup</tag>.</caption>
+                    <title>Possible structures for using <tag>mathcmp</tag> within a <tag>test</tag>. The <tag>de-expression</tag> would be replaced by any valid construction as described for the <tag>setup</tag>.</title>
                 </listing>
 
                 <p>Compound logical structures are created using the <tag>logic</tag> element in the place of a comparison. To specify which operation is being used, the <attr>op</attr> attribute is set to one of <attr>op="and"</attr>, <attr>op="or"</attr>, or <attr>op="not"</attr>. The operations are considered <m>n</m>-ary, meaning that the contents should be one or more comparison elements, which might include additional logic. The <attr>op="and"</attr> will evaluate as true when <em>all</em> of the children comparisons evaluate as true. The <attr>op="or"</attr> will evaluate as true when <em>at least one</em> of the children comparisons evaluates as true. The <attr>op="not"</attr> is technically implemented as the negation of <attr>op="and"</attr>, and so will evaluate as true when <em>at least one</em> of the children comparisons evaluates as <em>false</em>. In the absence of any <tag>logic</tag>, there is always an implicit <attr>op="and"</attr> so that any sequence of comparisons within a single <tag>test</tag>, all comparisons are required to evaluate as true.</p>
@@ -3442,7 +3442,7 @@ displayed line, and there are no <c>\\</c>s.  Use <c>\amp</c> to mark the alignm
 
             <p>A <tag>console</tag> is a transcript of an interactive session in a terminal or console at a command-line.  It is a sequence of the following elements, in this order, possibly repeated many times as a group: <tag>input</tag>, and <tag>output</tag>.  The <tag>output</tag> is optional.  The content of these two elements is treated as verbatim text (see <xref ref="overview-verbatim-literal"/>), subject to all the exceptions for exceptional characters (see <xref ref="overview-exceptional-characters"/>).  A <attr>prompt</attr> attribute on the <tag>input</tag> can be supplied to provide a system prompt distinct from the actual commands.  The default prompt is a dollar sign followed by a space.  If it is more convenient <attr>prompt</attr> may be supplied on the <tag>console</tag>, to be used in each enclosed <tag>input</tag>.  If you do not want any prompts at all, just use an empty value for <attr>prompt</attr>.</p>
 
-            <p>A <tag>program</tag> or <tag>console</tag> may be wrapped in a <tag>listing</tag>, see <xref ref="topic-listing"/>.  This will behave similar to a <tag>figure</tag>, with the <tag>caption</tag> displayed below, and a number assigned.  So, in particular, if your program or console is important enough to cross-reference, it is an enclosing <tag>listing</tag> that serves as the target.</p>
+            <p>A <tag>program</tag> or <tag>console</tag> may be wrapped in a <tag>listing</tag>, see <xref ref="topic-listing"/>.  This will behave similar to a <tag>figure</tag>, with the <tag>title</tag> displayed above, and a number assigned.  So, in particular, if your program or console is important enough to cross-reference, it is an enclosing <tag>listing</tag> that serves as the target.</p>
 
             <p>The <attr>language</attr> attribute may be used to get some degree of language-specific syntax highlighting and/or interactive behavior.  We will eventually provide a table of attribute values here.  They are always lowercase, and a good first guess is likely to succeed.</p>
 
@@ -3921,7 +3921,7 @@ displayed line, and there are no <c>\\</c>s.  Use <c>\amp</c> to mark the alignm
 
     <section xml:id="topic-listing">
         <title>Program Listings</title>
-        <p>A <tag>listing</tag> is really a specialized type of <tag>figure</tag>, whose purpose is to hold computer code.  Just like a figure, it has a <tag>caption</tag> and <tag>title</tag> which behave identically.  However, the enclosed planar content is limited to a <tag>program</tag> or <tag>console</tag> (see <xref ref="topic-program-console"/>).</p>
+        <p>A <tag>listing</tag> is really a specialized type of <tag>figure</tag>, whose purpose is to hold computer code.  It has an optional <tag>title</tag> which is rendered above the listing.  However, the enclosed planar content is limited to a <tag>program</tag> or <tag>console</tag> (see <xref ref="topic-program-console"/>).</p>
     </section>
 
     <section xml:id="topic-named-list">
diff --git a/doc/guide/basics/basics-part.xml b/doc/guide/basics/basics-part.xml
index 0408332b5..f03e3a98c 100644
--- a/doc/guide/basics/basics-part.xml
+++ b/doc/guide/basics/basics-part.xml
@@ -80,7 +80,7 @@
     </p>
 
     <listing xml:id="basics-l-p">
-      <caption>Some basic content of a paragraph</caption>
+      <title>Some basic content of a paragraph</title>
         <idx><h sortby="p"><tag>p</tag></h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h sortby="p"><tag>p</tag></h></idx>
 
@@ -114,7 +114,7 @@
     </p>
 
     <listing xml:id="basics-l-section-primitive">
-      <caption>The general outline of a section as a model division</caption>
+      <title>The general outline of a section as a model division</title>
       <idx><h sortby="section"><tag>section</tag></h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h sortby="section"><tag>section</tag></h></idx>
 <program><input><xi:include href="section.ptx" parse="text"/></input> </program>
@@ -138,7 +138,7 @@
     </p>
 
     <listing xml:id="basics-l-section-sub">
-      <caption>A <tag>section</tag> with <tag>subsection</tag>s.</caption>
+      <title>A <tag>section</tag> with <tag>subsection</tag>s.</title>
       <idx><h sortby="section"><tag>section</tag></h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h sortby="section"><tag>section</tag></h></idx>
       <idx><h sortby="subsection"><tag>subsection</tag></h><h><pretext/> code for</h></idx>
@@ -240,7 +240,7 @@
     </p>
 
     <listing xml:id="basics-l-me">
-      <caption>Displayed equations</caption>
+      <title>Displayed equations</title>
       <idx><h><pretext/> code for</h><h>displayed equation</h></idx>
       <idx><h>equation</h><h>displayed</h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h sortby="me"><tag>me</tag></h></idx>
@@ -262,7 +262,7 @@
     </p>
 
     <listing xml:id="basics-l-md">
-      <caption>Aligned equations</caption>
+      <title>Aligned equations</title>
       <idx><h><pretext/> code for</h><h>aligned equations</h></idx>
       <idx><h>equation</h><h>aligned</h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h sortby="md"><tag>md</tag></h></idx>
@@ -325,7 +325,7 @@
     </p>
 
     <listing xml:id="basics-l-ol">
-      <caption>An ordered list</caption>
+      <title>An ordered list</title>
       <idx><h>list</h><h>ordered</h><h><pretext/> code for</h></idx>
       <idx><h>ordered list</h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h>ordered list</h></idx>
@@ -356,7 +356,7 @@
     </p>
 
     <listing xml:id="basics-l-ul">
-      <caption>An unordered list</caption>
+      <title>An unordered list</title>
       <idx><h>list</h><h>unordered</h><h><pretext/> code for</h></idx>
       <idx><h>unordered list</h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h>unordered list</h></idx>
@@ -409,7 +409,7 @@
     </p>
 
     <listing xml:id="basics-l-theorem">
-      <caption>A theorem</caption>
+      <title>A theorem</title>
       <idx><h sortby="theorem"><tag>theorem</tag></h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h>theorem-like elements (<tag>algorithm</tag>, <tag>claim</tag>, <tag>corollary</tag>, <tag>fact</tag>, <tag>identity</tag>, <tag>lemma</tag>, <tag>proposition</tag>, <tag>theorem</tag>)</h></idx>
       <idx><h>theorem-like elements (<tag>algorithm</tag>, <tag>claim</tag>, <tag>corollary</tag>, <tag>fact</tag>, <tag>identity</tag>, <tag>lemma</tag>, <tag>proposition</tag>, <tag>theorem</tag>)</h><h><pretext/> code for</h></idx>
@@ -457,7 +457,7 @@
     </p>
 
     <listing xml:id="basics-l-definition">
-      <caption>A definition with notation</caption>
+      <title>A definition with notation</title>
       <idx><h sortby="definition"><tag>definition</tag></h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h sortby="definition"><tag>definition</tag></h></idx>
       <idx><h>notation (to be included in a notation list)</h><h><pretext/> code for</h></idx>
@@ -519,7 +519,7 @@
     </aside>
 
     <listing xml:id="basics-l-example-simple">
-      <caption>A simple example</caption>
+      <title>A simple example</title>
       <idx><h>example-like elements (<tag>example</tag>, <tag>problem</tag>, <tag>question</tag>)</h><h>unstructured</h><h><pretext/> code for</h></idx>
             <idx><h sortby="example"><tag>example</tag></h><h>unstructured</h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h>example</h><h>unstructured</h></idx>
@@ -544,7 +544,7 @@
     </p>
 
     <listing xml:id="basics-l-example-structured">
-      <caption>A structured example</caption>
+      <title>A structured example</title>
       <idx><h sortby="example"><tag>example</tag></h><h>structured</h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h>example</h><h>structured</h></idx>
       <idx><h><pretext/> code for</h><h>example-like elements (<tag>example</tag>, <tag>problem</tag>, <tag>question</tag>)</h></idx>
@@ -585,7 +585,7 @@
     </p>
 
     <listing xml:id="basics-l-axiom">
-      <caption>An axiom</caption>
+      <title>An axiom</title>
       <idx><h sortby="remark"><tag>axiom</tag></h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h>axiom-like elements (<tag>assumption</tag>, <tag>axiom</tag>, <tag>conjecture</tag>, <tag>heuristic</tag>, <tag>hypothesis</tag>, <tag>principle</tag>)</h></idx>
       <idx><h>axiom-like elements (<tag>assumption</tag>, <tag>axiom</tag>, <tag>conjecture</tag>, <tag>heuristic</tag>, <tag>hypothesis</tag>, <tag>principle</tag>)</h><h><pretext/> code for</h></idx>
@@ -626,7 +626,7 @@
     </p>
 
     <listing xml:id="basics-l-remark">
-      <caption>A remark</caption>
+      <title>A remark</title>
       <idx><h sortby="remark"><tag>remark</tag></h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h>remark-like elements (<tag>convention</tag>, <tag>insight</tag>, <tag>note</tag>, <tag>observation</tag>, <tag>remark</tag>, <tag>warning</tag>)</h></idx>
       <idx><h>remark-like elements (<tag>convention</tag>, <tag>insight</tag>, <tag>note</tag>, <tag>observation</tag>, <tag>remark</tag>, <tag>warning</tag>)</h><h><pretext/> code for</h></idx>
@@ -661,7 +661,7 @@
     </p>
 
     <listing xml:id="basics-l-project">
-      <caption>A project</caption>
+      <title>A project</title>
       <idx><h sortby="project"><tag>project</tag></h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h>project-like elements
       (<tag>activity</tag>, <tag>exploration</tag>, <tag>investigation</tag>, <tag>project</tag>)</h></idx>
@@ -708,7 +708,7 @@
       </p>
 
       <listing xml:id="basics-l-exercise">
-        <caption>An exercise</caption>
+        <title>An exercise</title>
         <idx><h sortby="exercise"><tag>exercise</tag></h><h><pretext/> code for</h></idx>
         <idx><h>inline exercise</h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h sortby="exercise"><tag>exercise</tag></h><h>inline</h></idx>
@@ -751,7 +751,7 @@
 	such an <tag>exercise</tag>.
       </p>
       <listing xml:id="basics-l-exercise-task">
-        <caption>An exercise with tasks</caption>
+        <title>An exercise with tasks</title>
         <idx><h sortby="exercise"><tag>exercise</tag></h><h
 	sortby="with task">with <tag>task</tag></h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h
@@ -844,7 +844,7 @@
       </p>
 
       <listing xml:id="basics-l-exercisegroup">
-        <caption>Using an <tag>exercisegroup</tag>.</caption>
+        <title>Using an <tag>exercisegroup</tag>.</title>
         <idx><h sortby="exercisegroup"><tag>exercisegroup</tag></h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h sortby="exercisegroup"><tag>exercisegroup</tag></h></idx>
 <program>
@@ -882,7 +882,7 @@
       </p>
 
       <listing xml:id="basics-l-reading-questions">
-        <caption>Structure of <tag>reading-questions</tag>.</caption>
+        <title>Structure of <tag>reading-questions</tag>.</title>
         <idx><h sortby="reading-questions"><tag>reading-questions</tag></h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h sortby="reading-questions"><tag>reading-questions</tag></h></idx>
 <program>
@@ -944,7 +944,7 @@
     </p>
 
     <listing xml:id="basics-l-worksheet">
-        <caption>Structure of <tag>worksheet</tag>.</caption>
+        <title>Structure of <tag>worksheet</tag>.</title>
         <idx><h sortby="worksheet"><tag>worksheet</tag></h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h sortby="worksheet"><tag>worksheet</tag></h></idx>
 	<program>
@@ -980,7 +980,7 @@
     </p>
 
     <listing xml:id="basics-l-porism">
-      <caption>A porism generated using <tag>algorithm</tag> and <tag>rename</tag></caption>
+      <title>A porism generated using <tag>algorithm</tag> and <tag>rename</tag></title>
 
 <program>
 <input><xi:include href="porism.ptx" parse="text"/></input>
@@ -1061,7 +1061,7 @@
         so that's a good option when vector graphic formats like <init>SVG</init> and <init>PDF</init> are not available or appropriate.
       </p>
       <listing xml:id="basics-l-image">
-          <caption>Code to include an image without a number or caption</caption>
+          <title>Code to include an image without a number or caption</title>
           <idx><h sortby="image"><tag>image</tag></h><h><pretext/> code for</h></idx>
           <idx><h><pretext/> code for</h><h sortby="image"><tag>image</tag></h></idx>
           <idx><h sortby="description"><tag>description</tag></h><h sortby="of image">of <tag>image</tag></h></idx>
@@ -1108,7 +1108,7 @@
 	the <tag>figure</tag> but is displayed <em>below</em> the
 	<tag>figure</tag>'s content.</p>
       <listing xml:id="basics-l-figure">
-          <caption>Code to include a figure</caption>
+          <title>Code to include a figure</title>
           <idx><h sortby="figure"><tag>figure</tag></h><h><pretext/> code for</h></idx>
           <idx><h><pretext/> code for</h><h sortby="figure"><tag>figure</tag></h></idx>
           <idx><h sortby="caption"><tag>caption</tag></h><h sortby="of figure">of <tag>figure</tag></h></idx>
@@ -1156,7 +1156,7 @@
       </p>
 
       <listing xml:id="basics-l-sbs">
-        <caption>Code to place things side by side</caption>
+        <title>Code to place things side by side</title>
         <idx><h sortby="sidebyside"><tag>sidebyside</tag></h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h sortby="sidebyside"><tag>sidebyside</tag></h></idx>
         <idx><h sortby="figure"><tag>figure</tag></h><h sortby="inside sidebyside">inside <tag>sidebyside</tag></h></idx>
@@ -1176,7 +1176,7 @@
       <xi:include href="sidebyside.ptx"/>
 
       <listing xml:id="basics-l-sbs2">
-        <caption>A few more bells and whistles for <tag>sidebyside</tag></caption>
+        <title>A few more bells and whistles for <tag>sidebyside</tag></title>
         <idx><h sortby="sidebyside"><tag>sidebyside</tag></h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h sortby="sidebyside"><tag>sidebyside</tag></h></idx>
         <idx><h sortby="figure"><tag>figure</tag></h><h sortby="containing sidebyside">containing <tag>sidebyside</tag></h></idx>
@@ -1199,7 +1199,7 @@
       </p>
 
       <listing xml:id="basics-l-sbsgroup">
-        <caption>Use of <tag>sbsgroup</tag></caption>
+        <title>Use of <tag>sbsgroup</tag></title>
         <idx><h sortby="sbsgroup"><tag>sbsgroup</tag></h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h sortby="sbsgroup"><tag>sbsgroup</tag></h></idx>
 
@@ -1271,7 +1271,7 @@
 </pre>
 
       <listing xml:id="basics-l-tikz">
-        <caption>How to use <tag>latex-image</tag> to invoke TikZ</caption>
+        <title>How to use <tag>latex-image</tag> to invoke TikZ</title>
         <idx><h sortby="latex-image"><tag>latex-image</tag></h><h><pretext/> code for</h></idx>
                 <idx><h><pretext/> code for</h><h sortby="latex-image"><tag>latex-image</tag></h></idx>
                 <idx><h>TikZ</h><h sortby="inside latex-image">inside <tag>latex-image</tag></h></idx>
@@ -1344,7 +1344,7 @@
         Similar to <latex/>, <pretext/> provides a <tag>table</tag> tag and a <tag>tabular</tag> tag. The <tag>tabular</tag> tag is used for producing the array of data, while the <tag>table</tag> tag provides the number and title.
     </p>
     <listing xml:id="basics-l-table">
-      <caption>Code to produce a table</caption>
+      <title>Code to produce a table</title>
       <idx><h sortby="table"><tag>table</tag></h><h><pretext/> code for</h></idx>
       <idx><h><pretext/> code for</h><h sortby="table"><tag>table</tag></h></idx>
       <idx><h sortby="title"><tag>title</tag></h><h sortby="of table">of <tag>table</tag></h></idx>
@@ -1415,7 +1415,7 @@
       </p>
 
       <listing xml:id="basics-l-sage">
-        <caption>SageMath cell</caption>
+        <title>SageMath cell</title>
         <idx><h sortby="sage"><tag>sage</tag></h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h sortby="sage"><tag>sage</tag></h></idx>
 <program>
@@ -1448,7 +1448,7 @@
       </p>
 
       <listing xml:id="basics-l-sageplot">
-        <caption><tag>sageplot</tag> to produce a graphic</caption>
+        <title><tag>sageplot</tag> to produce a graphic</title>
         <idx><h sortby="sageplot"><tag>sageplot</tag></h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h sortby="sageplot"><tag>sageplot</tag></h></idx>
 <program>
@@ -1585,7 +1585,7 @@
       </p>
 
       <listing xml:id="basics-l-aside">
-        <caption>A sample <tag>aside</tag></caption>
+        <title>A sample <tag>aside</tag></title>
         <idx><h sortby="aside"><tag>aside</tag></h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h><tag>aside</tag></h></idx>
 <program>
@@ -1677,7 +1677,7 @@
       </p>
 
       <listing xml:id="basics-l-blockquote">
-        <caption>A sample <tag>blockquote</tag></caption>
+        <title>A sample <tag>blockquote</tag></title>
         <idx><h sortby="blockquote"><tag>blockquote</tag></h><h><pretext/> code for</h></idx>
         <idx><h><pretext/> code for</h><h><tag>blockquote</tag></h></idx>
 <program>
diff --git a/doc/guide/introduction/start-here.xml b/doc/guide/introduction/start-here.xml
index 171e99602..b6226735b 100644
--- a/doc/guide/introduction/start-here.xml
+++ b/doc/guide/introduction/start-here.xml
@@ -95,7 +95,7 @@
             <p>The hierarchical nature of <init>XML</init> is perfect to capture the hierarchical nature of a scholarly document.  Consider the start of a <pretext /> document shown in <xref ref="listing-simple"/>.</p>
 
             <listing xml:id="listing-simple">
-                <caption>Source of a simple <pretext /> book project.</caption>
+                <title>Source of a simple <pretext /> book project.</title>
                 <program language="xml">
                     <input>
                     <![CDATA[
diff --git a/examples/sample-article/sample-article.xml b/examples/sample-article/sample-article.xml
index d8314c87a..c03f028c3 100644
--- a/examples/sample-article/sample-article.xml
+++ b/examples/sample-article/sample-article.xml
@@ -9142,7 +9142,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 </introduction>
 
                 <listing xml:id="program-activecode-python">
-                    <caption>An interactive Python program, using <pubtitle>Runestone</pubtitle></caption>
+                    <title>An interactive Python program, using <pubtitle>Runestone</pubtitle></title>
                     <program xml:id="python-hello-world" label="python-hello-world" interactive='activecode' language="python">
                         <input>
                         print("Hello, World!")
@@ -9151,7 +9151,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 </listing>
 
                 <listing xml:id="program-activecode-python-no-codelens">
-                    <caption>An interactive Python program without codelens.</caption>
+                    <title>An interactive Python program without codelens.</title>
                     <program xml:id="python-hello-world-no-codelens" label="python-hello-world-no-codelens" interactive='activecode' language="python" codelens="no">
                         <input>
                         print("Hello, World!")
@@ -9168,7 +9168,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 </introduction>
 
                 <listing xml:id="program-codelens-python">
-                    <caption>A Python program, stepable with CodeLens</caption>
+                    <title>A Python program, stepable with CodeLens</title>
                     <program xml:id="python-hello-world-code-lens" label="python-hello-world-code-lens" interactive="codelens" language="python">
                         <input>
                         print('Hello, World!')
@@ -10104,10 +10104,10 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 
             <p>Note that the above examples all have slightly different widths (theser are very evident in print with the frames).  As 2-D atomic objects, to place them in the narrative requires the layout features of a <c>sidebyside</c> element.  Then <c>width</c> and/or <c>margin</c> attributes will influence the width of the panel.</p>
 
-            <p>A <c>program</c> may also be nested inside a <c>listing</c>, which behaves similar to a <c>figure</c>.  You can provide a <c>caption</c>, and the listing will be numbered along with tables and figures.  This then makes it possible to cross-reference the listing, such as <xref ref="listing-c-hello" text="type-global" />.  It also removes the requirement of wrapping the <c>program</c> in a <c>sidebyside</c>.  For technical reasons, the three examples above will not split across a page break in PDF output, but the placement inside a <c>listing</c> will allow splits, as you should see in at least one example following.</p>
+            <p>A <c>program</c> may also be nested inside a <c>listing</c>, which behaves similar to a <c>figure</c>.  You can provide a <c>title</c>, and the listing will be numbered along with tables and figures.  This then makes it possible to cross-reference the listing, such as <xref ref="listing-c-hello" text="type-global" />.  It also removes the requirement of wrapping the <c>program</c> in a <c>sidebyside</c>.  For technical reasons, the three examples above will not split across a page break in PDF output, but the placement inside a <c>listing</c> will allow splits, as you should see in at least one example following.</p>
 
             <listing xml:id="listing-c-hello">
-                <caption>C Version of <q>Hello, World!</q></caption>
+                <title>C Version of <q>Hello, World!</q></title>
                 <program language="c">
                     <input>
                     /* Hello World program */
@@ -10125,7 +10125,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             <p>A <tag>program</tag> may include line numbers.</p>
 
             <listing xml:id="program-line-numbers">
-                <caption>A static Java program with line numbers</caption>
+                <title>A static Java program with line numbers</title>
                 <program interactive='no' language="java" line-numbers="yes">
                     <input>
                     import javax.swing.JFrame;  //Importing class JFrame
@@ -10147,7 +10147,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             <p>A <tag>program</tag> may also include highlighted lines.</p>
 
             <listing xml:id="program-highlight-lines">
-                <caption>A static Java program with line numbers</caption>
+                <title>A static Java program with line numbers</title>
                 <program interactive='no' language="java" line-numbers="yes" highlight-lines="1,3-5">
                     <input>
                     import javax.swing.JFrame;  //Importing class JFrame
@@ -10209,7 +10209,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             <p>A specialized version of a program listing is an interactive command/response session at a command-line, where differing fonts are used to differentiate the system prompt, the user's commands, and the system's reaction.  A   <c>console</c> session may be used by itself inside a <c>sidebyside</c>, or it can be wrapped in a listing to get a number and a caption.  As elsewhere, you will need to escape ampersands and angle brackets (such as if you have a command using redirection), using <c>&amp;amp;</c>, <c>&amp;lt;</c>, and <c>&amp;gt;</c> in your source.</p>
 
             <listing xml:id="console-raspberry-pi">
-                <caption>Console Session: <c>int</c> and <c>float</c></caption>
+                <title>Console Session: <c>int</c> and <c>float</c></title>
                 <console prompt="pi@raspberrypi ~/progs/chap02 $ ">
                     <input>gcc -Wall -o intAndFloat intAndFloat.c</input>
                     <input>./intAndFloat</input>
@@ -10234,7 +10234,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             <p>If your console input exceeds more than one line, you can author it across several lines and your choice of line breaks will be reflected in the rendering.  You can decide to indent lines after the first one for clarity, if desired.  You can also decide if your audience needs line-continuation characters or not.</p>
 
             <listing xml:id="console-raspberry-pi-multi">
-                <caption>Console Session: <c>int</c> and <c>float</c> (multi-line input)</caption>
+                <title>Console Session: <c>int</c> and <c>float</c> (multi-line input)</title>
                 <console prompt="pi@raspberrypi ~/progs/chap02 $ ">
                     <input>
                     gcc -Wall
@@ -10253,7 +10253,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             <p>The next listing is just absurdity, to check various characters from <latex /> that are otherwise employed by the code supporting consoles, and some Latin-1 characters.  We test each in a prompt, input, and output.  We use <c>(*</c> and <c>*)</c> as sequences used to escape embedded <latex/> commands, so we test those also.</p>
 
             <listing>
-                <caption>Console Session: problematic <latex /> characters</caption>
+                <title>Console Session: problematic <latex /> characters</title>
                 <console>
                     <input prompt="A backslash \ here  ">A backslash \ here</input>
                     <output>A backslash \ here</output>
@@ -10284,7 +10284,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
             <p>We conclude this section with a longer example of a program listing, an assembly language program from Bob Plantz, included to test a <c>listing</c> breaking across pages in PDF output.</p>
 
             <listing>
-                <caption>A longer program listing</caption>
+                <title>A longer program listing</title>
                 <program>
                     <input>
                     @ structPass2.s
@@ -11992,7 +11992,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 <caption>A <tag>listing</tag> and a <tag>list</tag></caption>
                 <sidebyside margins="5%" widths="40% 45%">
                     <listing>
-                        <caption>A statistical computation</caption>
+                        <title>A statistical computation</title>
                         <program language="r">
                             <input>
                             n_loops &lt;- 10
@@ -12403,7 +12403,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                     <li>inside a <tag>sidebyside</tag>, with size and layout configured, and inside a <tag>figure</tag></li>
                     <li>inside a <tag>sidebyside</tag>, with size and layout configured, with each inside a <tag>listing</tag>, earning different numbers</li>
 
-                    <li>inside a <tag>figure</tag> inside a <tag>sidebyside</tag> inside a <tag>listing</tag>, with size and layout configured, with a number and caption, but now sub-numbered ((a), (b), (c),<ellipsis/>).</li>
+                    <li>inside a <tag>figure</tag> inside a <tag>sidebyside</tag> inside a <tag>listing</tag>, with size and layout configured, with a number and title, but now sub-numbered ((a), (b), (c),<ellipsis/>).</li>
                 </ol>Examples of each, and more.</p>
 
                <p>Programs can be realized in many forms, and can come from a variety of sources.  See <xref ref="section-video" text="type-global"/> for tests of some of that variety.  Here we are testing placement within surroundings and testing the schema for location.  But we do have two videos in each test, one provided as a local file and one embedded from a service.</p>
@@ -12490,10 +12490,10 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                     <input prompt="pi@raspberrypi ~/progs/chap02 $ "/>
                 </console>
 
-                <p>Two <tag>listing</tag>, with <tag>caption</tag>, and no layout control.</p>
+                <p>Two <tag>listing</tag>, with <tag>title</tag>, and no layout control.</p>
 
                 <listing>
-                    <caption>Hello, World! in C</caption>
+                    <title>Hello, World! in C</title>
                         <program language="c">
                             <input>
                             /* Hello World program */
@@ -12509,7 +12509,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 </listing>
 
                 <listing>
-                    <caption>A console session on a Raspberry Pi</caption>
+                    <title>A console session on a Raspberry Pi</title>
                         <console>
                             <input prompt="pi@raspberrypi ~/progs/chap02 $ ">gcc -Wall -o intAndFloat intAndFloat.c</input>
                             <input prompt="pi@raspberrypi ~/progs/chap02 $ ">./intAndFloat</input>
@@ -12523,7 +12523,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 <p>Same two <tag>listing</tag>, but now with layout control on the <tag>program</tag> and <tag>console</tag>.</p>
 
                 <listing>
-                    <caption>Hello, World! in C</caption>
+                    <title>Hello, World! in C</title>
                         <program language="c" margins="40% 20%" width="40%">
                             <input>
                             /* Hello World program */
@@ -12539,7 +12539,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 </listing>
 
                 <listing>
-                    <caption>A console session on a Raspberry Pi</caption>
+                    <title>A console session on a Raspberry Pi</title>
                         <console margins="10% 10%">
                             <input prompt="pi@raspberrypi ~/progs/chap02 $ ">gcc -Wall -o intAndFloat intAndFloat.c</input>
                             <input prompt="pi@raspberrypi ~/progs/chap02 $ ">./intAndFloat</input>
@@ -12631,7 +12631,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 
                 <sidebyside margins="0% 0%" widths="35% 55%" valign="bottom">
                     <listing>
-                        <caption>Hello!</caption>
+                        <title>Hello!</title>
                         <program language="c">
                             <input>
                             /* Hello World program */
@@ -12646,7 +12646,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                         </program>
                     </listing>
                     <listing>
-                        <caption>Raspberry Pi</caption>
+                        <title>Raspberry Pi</title>
                         <console>
                             <input>gcc -Wall -o intAndFloat intAndFloat.c</input>
                             <input>./intAndFloat</input>
@@ -12658,14 +12658,14 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                     </listing>
                 </sidebyside>
 
-                <p>And again, the two-panel <tag>sidebyside</tag> of <tag>listing</tag>, but now inside a <tag>figure</tag> that has a number and a caption.  And then the <tag>listing</tag> are sub-numbered as (a) and (b).</p>
+                <p>And again, the two-panel <tag>sidebyside</tag> of <tag>listing</tag>, but now inside a <tag>figure</tag> that has a number and a title.  And then the <tag>listing</tag> are sub-numbered as (a) and (b).</p>
 
 
                 <figure>
                     <caption>Two Code Listings</caption>
                     <sidebyside margins="0% 0%" widths="35% 55%" valign="bottom">
                         <listing>
-                            <caption>Hello!</caption>
+                            <title>Hello!</title>
                             <program language="c">
                                 <input>
                                 /* Hello World program */
@@ -12680,7 +12680,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                             </program>
                         </listing>
                         <listing>
-                            <caption>Raspberry Pi</caption>
+                            <title>Raspberry Pi</title>
                             <console>
                                 <input>gcc -Wall -o intAndFloat intAndFloat.c</input>
                                 <input>./intAndFloat</input>
diff --git a/examples/sample-book/rune.xml b/examples/sample-book/rune.xml
index 9348ec2b4..a8e9441a9 100644
--- a/examples/sample-book/rune.xml
+++ b/examples/sample-book/rune.xml
@@ -38,7 +38,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <p>Programs in supported languages are made interactive in HTML, on request.</p>
 
         <listing xml:id="program-activecode-python">
-            <caption>An interactive Python program, using <pubtitle>Runestone</pubtitle></caption>
+            <title>An interactive Python program, using <pubtitle>Runestone</pubtitle></title>
             <program xml:id="python-hello-world" interactive='activecode' language="python" label="hello-world">
                 <input>
                 print("Hello, World!")
@@ -50,7 +50,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         </p>
 
         <listing xml:id="program-activecode-python2">
-            <caption>An interactive Python program, using <pubtitle>Runestone</pubtitle></caption>
+            <title>An interactive Python program, using <pubtitle>Runestone</pubtitle></title>
             <program xml:id="python-hello-world2" label="hello-world2">
                 <input>
                 print("Hello, World!")
@@ -61,7 +61,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <p>A C program will only be interactive if hosted on a Runestone server.</p>
 
         <listing xml:id="program-activecode-c">
-            <caption>An C program, interactive on a <pubtitle>Runestone</pubtitle> server</caption>
+            <title>An C program, interactive on a <pubtitle>Runestone</pubtitle> server</title>
             <program xml:id="c-hello-world" interactive='activecode' language="c">
                 <input>
                 #include &lt;stdio.h&gt;
@@ -78,7 +78,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 
         <listing xml:id="program-activecode-java">
             <title>Informal Java <q>Hello, World</q></title>
-            <caption>A Java program, interactive on a <pubtitle>Runestone</pubtitle> server</caption>
+            <title>A Java program, interactive on a <pubtitle>Runestone</pubtitle> server</title>
             <program xml:id="java-hello-world" interactive='activecode' language="java">
                 <title>"hi" in Java</title>
                 <input>
@@ -101,7 +101,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <p>Javascript programs are made interactive in HTML, on request.</p>
 
         <listing xml:id="program-activecode-javascript">
-            <caption>An interactive JavaScript program, using <pubtitle>Runestone</pubtitle></caption>
+            <title>An interactive JavaScript program, using <pubtitle>Runestone</pubtitle></title>
             <program xml:id="javascript-hello-world" interactive='activecode' language="javascript">
                 <input>
                 document.write('Hello, world!');
@@ -112,7 +112,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <p>A <tag>program</tag> is not interactive, by default, no matter where it is hosted.</p>
 
         <listing xml:id="program-static-java">
-            <caption>A static Java program</caption>
+            <title>A static Java program</title>
             <program xml:id="java-static" interactive='no' language="java">
                 <input>
                 import javax.swing.JFrame;  //Importing class JFrame
@@ -134,7 +134,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <p>An Octave program will only be interactive if hosted on a Runestone server.  Octave is meant to be a drop-in replacement for Matlab.</p>
 
         <listing xml:id="program-activecode-octave">
-            <caption>A simple Octave program</caption>
+            <title>A simple Octave program</title>
             <program xml:id="octave-simple" interactive='activecode' language="octave">
                 <input>
                 x = 2 + 2
@@ -146,7 +146,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <p>A language not supported by Runestone Services will be rendered static.</p>
 
         <listing xml:id="program-mistake-pascal">
-            <caption>A Pascal program that cannot be interactive on Runestone</caption>
+            <title>A Pascal program that cannot be interactive on Runestone</title>
             <program xml:id="pascal-mistake" interactive='activecode' language="pascal">
                 <input>
                 program HelloWorld;
@@ -162,7 +162,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <p>If you examine the source, you will also notice the <tag>program</tag> lacks a <attr>language</attr> attribute. It is relying on the <c>docinfo/programs/@language</c> value that is in bookinfo.xml. If present, that attribute will be used for any programs or Runestone interactives that lack a <attr>language</attr>.</p>
 
         <listing xml:id="listing-python-included">
-            <caption>A Python program that defines some statistics</caption>
+            <title>A Python program that defines some statistics</title>
             <program xml:id="python-statistics" interactive='activecode' label="statistics">
                 <input>
                 loan_amount = [1250.0, 500.0, 1450.0, 200.0, 700.0, 100.0, 250.0, 225.0, 1200.0, 150.0, 600.0, 300.0, 700.0, 125.0, 650.0, 175.0, 1800.0, 1525.0, 575.0, 700.0, 1450.0, 400.0, 200.0, 1000.0, 350.0]
@@ -180,7 +180,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
 
         <listing xml:id="program-activecode-java-flags">
             <title>Informal Java <q>Hello, World</q>, with flags</title>
-            <caption>A Java program, interactive on a <pubtitle>Runestone</pubtitle> server, with compiler and linker flags</caption>
+            <title>A Java program, interactive on a <pubtitle>Runestone</pubtitle> server, with compiler and linker flags</title>
             <program xml:id="java-hello-world-flags" interactive='activecode' language="java" compiler-args="-g" linker-args="-s">
                 <title>"hi" in Java</title>
                 <input>
@@ -288,7 +288,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <p>CodeLens is an interactive tool for following program execution, much like a debugger, without the ability to influence flow control or variable values.  For use without a server, traces must be computed beforehand.  First, we have some trivial programs, to provide minimal testing.</p>
 
         <listing xml:id="program-codelens-python">
-            <caption>A Python program, stepable with CodeLens</caption>
+            <title>A Python program, stepable with CodeLens</title>
             <program xml:id="python-hello-world-code-lens" interactive="codelens" language="python">
                 <input>
                 print('Hello, World!')
@@ -297,7 +297,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         </listing>
 
         <listing xml:id="program-codelens-c">
-            <caption>An C program, stepable with CodeLens</caption>
+            <title>An C program, stepable with CodeLens</title>
             <program xml:id="c-hello-world-code-lens" interactive="codelens" language="c">
                 <input>
                 #include &lt;stdio.h&gt;
@@ -311,7 +311,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         </listing>
 
         <listing xml:id="program-codelens-java">
-            <caption>A Java program, stepable with CodeLens</caption>
+            <title>A Java program, stepable with CodeLens</title>
             <program xml:id="java-hello-world-code-lens" interactive="codelens" language="java">
                 <input>
                 public class HelloWorld {
@@ -326,7 +326,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         <p>Now some moderately more complicated programs to find teh prime numbers less than <m>20</m>.  We do not vouch for the quality of these, or even their correctness!</p>
 
         <listing xml:id="sieve-python">
-            <caption><url href="https://www.tutorialspoint.com/python-program-for-sieve-of-eratosthenes" visual="www.tutorialspoint.com/python-program-for-sieve-of-eratosthenes">Sieve of Eratosthenes</url>, Java</caption>
+            <title><url href="https://www.tutorialspoint.com/python-program-for-sieve-of-eratosthenes" visual="www.tutorialspoint.com/python-program-for-sieve-of-eratosthenes">Sieve of Eratosthenes</url>, Java</title>
             <program xml:id="sieve-codelens-python" interactive="codelens" language="python">
                 <input><![CDATA[
                 def SieveOfEratosthenes(n):
@@ -357,7 +357,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         </listing>
 
         <listing xml:id="sieve-cpp">
-            <caption><url href="https://www.tutorialspoint.com/cplusplus-program-to-implement-sieve-of-eratosthenes-to-generate-prime-numbers-between-given-range" visual="www.tutorialspoint.com/cplusplus-program-to-implement-sieve-of-eratosthenes-to-generate-prime-numbers-between-given-range">Sieve of Eratosthenes</url>, C++</caption>
+            <title><url href="https://www.tutorialspoint.com/cplusplus-program-to-implement-sieve-of-eratosthenes-to-generate-prime-numbers-between-given-range" visual="www.tutorialspoint.com/cplusplus-program-to-implement-sieve-of-eratosthenes-to-generate-prime-numbers-between-given-range">Sieve of Eratosthenes</url>, C++</title>
             <program xml:id="sieve-codelens-cpp" interactive="codelens" language="cpp">
                 <input> <![CDATA[
                 #include <stdio.h>
@@ -380,7 +380,7 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
         </listing>
 
         <listing xml:id="sieve-java">
-            <caption><url href="https://www.tutorialspoint.com/Sieve-of-Eratosthenes-in-java" visual="www.tutorialspoint.com/Sieve-of-Eratosthenes-in-java">Sieve of Eratosthenes</url>, Java</caption>
+            <title><url href="https://www.tutorialspoint.com/Sieve-of-Eratosthenes-in-java" visual="www.tutorialspoint.com/Sieve-of-Eratosthenes-in-java">Sieve of Eratosthenes</url>, Java</title>
             <program xml:id="sieve-codelens-java" interactive="codelens" language="java">
                 <input><![CDATA[
                 public class SievePrimeFactors  {