[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bpfk] dag-cll git updates for Sat Dec 11 12:21:06 EST 2010



commit 1d70122859c62fd2a8a56c721996d5da64c6f208
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date:   Sat Dec 11 09:15:10 2010 -0800

    Semi-automatic creation of <cmavo-list> tags.

diff --git a/todocbook/10.xml b/todocbook/10.xml
index e88d4fd..839a0e6 100644
--- a/todocbook/10.xml
+++ b/todocbook/10.xml
@@ -92,33 +92,72 @@
     <para>
     <xref linkend="cll_chapter10-section1-example2" />through 
     <xref linkend="cll_chapter10-section1-example5" />are different only in emphasis. Abnormal order, such as 
     <xref linkend="cll_chapter10-section1-example3" />through 
     <xref linkend="cll_chapter10-section1-example5" />exhibit, adds emphasis to the words that have been moved; in this case, the tense cmavo 
     <quote>pu</quote>. Words at either end of the sentence tend to be more noticeable.</para>
   </section>
   <section xml:id="cll_chapter10-section2">
     <title>2. Spatial tenses: FAhA and VA</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     vi      VA                  short distance
-     va      VA                  medium distance
-     vu      VA                  long distance
-
-     zu'a    FAhA                left
-     ri'u    FAhA                right
-     ga'u    FAhA                up
-     ni'a    FAhA                down
-     ca'u    FAhA                front
-     ne'i    FAhA                within
-     be'a    FAhA                north of
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>vi</cmavo>
+        <selmaho>VA</selmaho>
+        <description>short distance</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>va</cmavo>
+        <selmaho>VA</selmaho>
+        <description>medium distance</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>vu</cmavo>
+        <selmaho>VA</selmaho>
+        <description>long distance</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>zu'a</cmavo>
+        <selmaho>FAhA</selmaho>
+        <description>left</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ri'u</cmavo>
+        <selmaho>FAhA</selmaho>
+        <description>right</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ga'u</cmavo>
+        <selmaho>FAhA</selmaho>
+        <description>up</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ni'a</cmavo>
+        <selmaho>FAhA</selmaho>
+        <description>down</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ca'u</cmavo>
+        <selmaho>FAhA</selmaho>
+        <description>front</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ne'i</cmavo>
+        <selmaho>FAhA</selmaho>
+        <description>within</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>be'a</cmavo>
+        <selmaho>FAhA</selmaho>
+        <description>north of</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>(The complete list of FAhA cmavo can be found in 
     <xref linkend="cll_chapter10-section27" />.)</para>
     <para>Why is this section about spatial tenses rather than the more familiar time tenses of 
     <xref linkend="cll_chapter10-section1" />, asks the reader? Because the model to be used in explaining both will be easier to grasp for space than for time. The explanation of time tenses will resume in 
     <xref linkend="cll_chapter10-section4" />.</para>
     <para>English doesn't have mandatory spatial tenses. Although there are plenty of ways in English of showing where an event happens, there is absolutely no need to do so. Considering this fact may give the reader a feel for what the optional Lojban time tenses are like. From the Lojban point of view, space and time are interchangeable, although they are not treated identically.</para>
     <para>Lojban specifies the spatial tense of a bridi (the place at which it occurs) by using words from selma'o FAhA and VA to describe an imaginary journey from the speaker to the place referred to. FAhA cmavo specify the direction taken in the journey, whereas VA cmavo specify the distance gone. For example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-hNAJ">
       <title>
         <anchor xml:id="c10e2d1" />
@@ -238,21 +277,21 @@
       <title>
         <anchor xml:id="c10e3d3" />
         <anchor xml:id="cll_chapter10-section3-example3" />
       </title>
       <interlinear-gloss>
         <jbo>le nanmu zu'avi ga'uvu batci le gerku</jbo>
         <gloss>The man [left] [short distance] [up] [long distance] bites the dog.</gloss>
         <en>Far above a place slightly to the left of me, the man bites the dog.</en>
       </interlinear-gloss>
     </example>
-    <para>A distance can also come at the beginning of the tense construct, without any specified direction. (
+    <para>A distance can also come at the beginning of the tense construct, without any specified direction. ( 
     <xref linkend="cll_chapter10-section2-example1" />, with VA alone, is really a special case of this rule when no directions at all follow.)</para>
     <example role="interlinear-gloss-example" xml:id="random-id-9Tpz">
       <title>
         <anchor xml:id="c10e3d4" />
         <anchor xml:id="cll_chapter10-section3-example4" />
       </title>
       <interlinear-gloss>
         <jbo>le nanmu vi zu'a batci le gerku</jbo>
         <gloss>The man [short distance] [left] bites the dog.</gloss>
         <en>Left of a place near me, the man bites the dog.</en>
@@ -273,29 +312,52 @@
         <gloss>distance downward from a place a short distance in front of me,</gloss>
         <en>the man bites the dog.</en>
       </interlinear-gloss>
     </example>
     <para>Whew! It's a good thing tense constructs are optional: having to say all that could certainly be painful. Note, however, how much shorter the Lojban version of 
     <xref linkend="cll_chapter10-section3-example5" />is than the English version.</para>
   </section>
   <section xml:id="cll_chapter10-section4">
     <title>4. Temporal tenses: PU and ZI</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     pu      PU                  past
-     ca      PU                  present
-     ba      PU                  future
-
-     zi      ZI                  short time distance
-     za      ZI                  medium time distance
-     zu      ZI                  long time distance
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>pu</cmavo>
+        <selmaho>PU</selmaho>
+        <description>past</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ca</cmavo>
+        <selmaho>PU</selmaho>
+        <description>present</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ba</cmavo>
+        <selmaho>PU</selmaho>
+        <description>future</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>zi</cmavo>
+        <selmaho>ZI</selmaho>
+        <description>short time distance</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>za</cmavo>
+        <selmaho>ZI</selmaho>
+        <description>medium time distance</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>zu</cmavo>
+        <selmaho>ZI</selmaho>
+        <description>long time distance</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Now that the reader understands spatial tenses, there are only two main facts to understand about temporal tenses: they work exactly like the spatial tenses, with selma'o PU and ZI standing in for FAhA and VA; and when both spatial and temporal tense cmavo are given in a single tense construct, the temporal tense is expressed first. (If space could be expressed before or after time at will, then certain constructions would be ambiguous.)</para>
     <example role="interlinear-gloss-example" xml:id="random-id-ameb">
       <title>
         <anchor xml:id="c10e4d1" />
         <anchor xml:id="cll_chapter10-section4-example1" />
       </title>
       <interlinear-gloss>
         <jbo>le nanmu pu batci le gerku</jbo>
         <gloss>The man [past] bites the dog.</gloss>
         <en>The man bit the dog.</en>
@@ -364,21 +426,21 @@
         <jbo>le nanmu zu batci le gerku</jbo>
         <gloss>The man [long] bites the dog.</gloss>
         <en>A long time from or before now, the man will bite or bit the dog.</en>
       </interlinear-gloss>
     </example>
     <para>
     <xref linkend="cll_chapter10-section4-example5" />and 
     <xref linkend="cll_chapter10-section4-example6" />are perfectly legitimate, but may not be very much used: 
     <quote>zi</quote>by itself signals an event that happens at a time close to the present, but without saying whether it is in the past or the future. A rough translation might be 
     <quote>about now, but not exactly now</quote>.</para>
-    <para>Because we can move in any direction in space, we are comfortable with the idea of events happening in an unspecified space direction (
+    <para>Because we can move in any direction in space, we are comfortable with the idea of events happening in an unspecified space direction ( 
     <quote>nearby</quote>or 
     <quote>far away</quote>), but we live only from past to future, and the idea of an event which happens 
     <quote>nearby in time</quote>is a peculiar one. Lojban provides lots of such possibilities that don't seem all that useful to English-speakers, even though you can put them together productively; this fact may be a limitation of English.</para>
     <para>Finally, here are examples which combine temporal and spatial tense:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-vtUw">
       <title>
         <anchor xml:id="c10e4d7" />
         <anchor xml:id="cll_chapter10-section4-example7" />
       </title>
       <interlinear-gloss>
@@ -396,29 +458,52 @@
       <interlinear-gloss>
         <jbo>le nanmu batci le gerku puzuvuku</jbo>
         <gloss>The man bites the dog [past] [long time] [long space].</gloss>
         <en>The man bit the dog long ago and far away.</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter10-section5">
     <title>5. Interval sizes: VEhA and ZEhA</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ve'i    VEhA                short space interval
-     ve'a    VEhA                medium space interval
-     ve'u    VEhA                long space interval
-
-     ze'i    ZEhA                short time interval
-     ze'a    ZEhA                medium time interval
-     ze'u    ZEhA                long time interval
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ve'i</cmavo>
+        <selmaho>VEhA</selmaho>
+        <description>short space interval</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ve'a</cmavo>
+        <selmaho>VEhA</selmaho>
+        <description>medium space interval</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ve'u</cmavo>
+        <selmaho>VEhA</selmaho>
+        <description>long space interval</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ze'i</cmavo>
+        <selmaho>ZEhA</selmaho>
+        <description>short time interval</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ze'a</cmavo>
+        <selmaho>ZEhA</selmaho>
+        <description>medium time interval</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ze'u</cmavo>
+        <selmaho>ZEhA</selmaho>
+        <description>long time interval</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>So far, we have considered only events that are usually thought of as happening at a particular point in space and time: a man biting a dog at a specified place and time. But Lojbanic events may be much more 
     <quote>spread out</quote>than that: 
     <quote>mi vasxu</quote>(I breathe) is something which is true during the whole of my life from birth to death, and over the entire part of the earth where I spend my life. The cmavo of VEhA (for space) and ZEhA (for time) can be added to any of the tense constructs we have already studied to specify the size of the space or length of the time over which the bridi is claimed to be true.</para>
     <example role="interlinear-gloss-example" xml:id="random-id-Pgzz">
       <title>
         <anchor xml:id="c10e5d1" />
         <anchor xml:id="cll_chapter10-section5-example1" />
       </title>
       <interlinear-gloss>
         <jbo>le verba ve'i cadzu le bisli</jbo>
@@ -585,26 +670,42 @@
       </interlinear-gloss>
     </example>
     <para>does not imply (as the colloquial English translation does) that the tree is not green now. The vague interval throughout which the tree is, in fact, green may have already started.</para>
     <para>This general principle does not mean that Lojban has no way of indicating that a tree will be green but is not yet green. Indeed, there are several ways of expressing that concept: see 
     <xref linkend="cll_chapter10-section10" />(event contours) and 
     <xref linkend="cll_chapter10-section20" />(logical connection between tenses).</para>
   </section>
   <section xml:id="cll_chapter10-section7">
     <title>7. Dimensionality: VIhA</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     vi'i    VIhA                on a line
-     vi'a    VIhA                in an area
-     vi'u    VIhA                through a volume
-     vi'e    VIhA                throughout a space/time interval
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>vi'i</cmavo>
+        <selmaho>VIhA</selmaho>
+        <description>on a line</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>vi'a</cmavo>
+        <selmaho>VIhA</selmaho>
+        <description>in an area</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>vi'u</cmavo>
+        <selmaho>VIhA</selmaho>
+        <description>through a volume</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>vi'e</cmavo>
+        <selmaho>VIhA</selmaho>
+        <description>throughout a space/time interval</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The cmavo of ZEhA are sufficient to express time intervals. One fundamental difference between space and time, however, is that space is multi-dimensional. Sometimes we want to say not only that something moves over a small interval, but also perhaps that it moves in a line. Lojban allows for this. I can specify that a motion 
     <quote>in a small space</quote>is more specifically 
     <quote>in a short line</quote>, 
     <quote>in a small area</quote>, or 
     <quote>through a small volume</quote>.</para>
     <para>What about the child walking on the ice in 
     <xref linkend="cll_chapter10-section5-example1" />through 
     <xref linkend="cll_chapter10-section5-example3" />? Given the nature of ice, probably the area interpretation is most sensible. I can make this assumption explicit with the appropriate member of selma'o VIhA:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-vKp6">
       <title>
@@ -624,23 +725,27 @@
     <quote>vi'u</quote>. So the cognitive, rather than the physical, dimensionality controls the choice of VIhA cmavo.</para>
     <para>VIhA has a member 
     <quote>vi'e</quote>which indicates a 4-dimensional interval, one that involves both space and time. This allows the spatial tenses to invade, to some degree, the temporal tenses; it is possible to make statements about space-time considered as an Einsteinian whole. (There are presently no cmavo of FAhA assigned to 
     <quote>pastward</quote>and 
     <quote>futureward</quote>considered as space rather than time directions - they could be added, though, if Lojbanists find space-time expression useful.) If a temporal tense cmavo is used in the same tense construct with a 
     <quote>vi'e</quote>interval, the resulting tense may be self-contradictory.</para>
   </section>
   <section xml:id="cll_chapter10-section8">
     <title>8. Movement in space: MOhI</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     mo'i    MOhI                movement flag
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>mo'i</cmavo>
+        <selmaho>MOhI</selmaho>
+        <description>movement flag</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>All the information carried by the tense constructs so far presented has been presumed to be static: the bridi is occurring somewhere or other in space and time, more or less remote from the speaker. Suppose the truth of the bridi itself depends on the result of a movement, or represents an action being done while the speaker is moving? This too can be represented by the tense system, using the cmavo 
     <quote>mo'i</quote>(of selma'o MOhI) plus a spatial direction and optional distance; the direction now refers to a direction of motion rather than a static direction from the speaker.</para>
     <example role="interlinear-gloss-example" xml:id="random-id-d8yP">
       <title>
         <anchor xml:id="c10e8d1" />
         <anchor xml:id="cll_chapter10-section8-example1" />
       </title>
       <interlinear-gloss>
         <jbo>le verba mo'i ri'u cadzu le bisli</jbo>
         <gloss>The child [movement] [right] walks-on the ice.</gloss>
@@ -904,34 +1009,77 @@
     <para>says nothing about whether I might go in future.</para>
     <para>The space equivalent of 
     <quote>ze'e</quote>is 
     <quote>ve'e</quote>, and it can be used in the same way with a quantified space tense: see 
     <xref linkend="cll_chapter10-section11" />for an explanation of space interval modifiers.</para>
   </section>
   <section xml:id="cll_chapter10-section10">
     <title>10. Event contours: ZAhO and 
     <quote>re'u</quote></title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     pu'o    ZAhO                inchoative
-     ca'o    ZAhO                continuitive
-     ba'o    ZAhO                perfective
-     co'a    ZAhO                initiative
-     co'u    ZAhO                cessitive
-     mo'u    ZAhO                completitive
-     za'o    ZAhO                superfective
-     co'i    ZAhO                achievative
-     de'a    ZAhO                pausative
-     di'a    ZAhO                resumptive
-
-     re'u    ROI                 ordinal tense
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>pu'o</cmavo>
+        <selmaho>ZAhO</selmaho>
+        <description>inchoative</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ca'o</cmavo>
+        <selmaho>ZAhO</selmaho>
+        <description>continuitive</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ba'o</cmavo>
+        <selmaho>ZAhO</selmaho>
+        <description>perfective</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>co'a</cmavo>
+        <selmaho>ZAhO</selmaho>
+        <description>initiative</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>co'u</cmavo>
+        <selmaho>ZAhO</selmaho>
+        <description>cessitive</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>mo'u</cmavo>
+        <selmaho>ZAhO</selmaho>
+        <description>completitive</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>za'o</cmavo>
+        <selmaho>ZAhO</selmaho>
+        <description>superfective</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>co'i</cmavo>
+        <selmaho>ZAhO</selmaho>
+        <description>achievative</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>de'a</cmavo>
+        <selmaho>ZAhO</selmaho>
+        <description>pausative</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>di'a</cmavo>
+        <selmaho>ZAhO</selmaho>
+        <description>resumptive</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>re'u</cmavo>
+        <selmaho>ROI</selmaho>
+        <description>ordinal tense</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The cmavo of selma'o ZAhO express the Lojban version of what is traditionally called 
     <quote>aspect</quote>. This is not a notion well expressed by English tenses, but many languages (including Chinese and Russian among Lojban's six source languages) consider it more important than the specification of mere position in time.</para>
     <para>The 
     <quote>event contours</quote>of selma'o ZAhO, with their bizarre keywords, represent the natural portions of an event considered as a process, an occurrence with an internal structure including a beginning, a middle, and an end. Since the keywords are scarcely self-explanatory, each ZAhO will be explained in detail here. Note that from the viewpoint of Lojban syntax, ZAhOs are interval modifiers like TAhEs or ROI compounds; if both are found in a single tense, the TAhE/ROI comes first and the ZAhO afterward. The imaginary journey described by other tense cmavo moves us to the portion of the event-as-process which the ZAhO specifies.</para>
     <para>It is important to understand that ZAhO cmavo, unlike the other tense cmavo, specify characteristic portions of the event, and are seen from an essentially timeless perspective. The 
     <quote>beginning</quote>of an event is the same whether the event is in the speaker's present, past, or future. It is especially important not to confuse the speaker-relative viewpoint of the PU tenses with the event-relative viewpoint of the ZAhO tenses.</para>
     <para>The cmavo 
     <quote>pu'o</quote>, 
     <quote>ca'o</quote>, and 
     <quote>ba'o</quote>(etymologically derived from the PU cmavo) refer to an event that has not yet begun, that is in progress, or that has ended, respectively:</para>
@@ -1113,23 +1261,27 @@
       <interlinear-gloss>
         <jbo>mi paroi pare'u klama le zarci</jbo>
         <gloss>I [one time] [first time] go-to the store.</gloss>
         <en>There is one occasion on which I go to the store for the first time.</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter10-section11">
     <title>11. Space interval modifiers: FEhE</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     fe'e    FEhE                space interval modifier flag
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>fe'e</cmavo>
+        <selmaho>FEhE</selmaho>
+        <description>space interval modifier flag</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Like time intervals, space intervals can also be continuous, discontinuous, or repetitive. Rather than having a whole separate set of selma'o for space interval properties, we instead prefix the flag 
     <quote>fe'e</quote>to the cmavo used for time interval properties. A space interval property would be placed just after the space interval size and/or dimensionality cmavo:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-MFQ7">
       <title>
         <anchor xml:id="c10e11d1" />
         <anchor xml:id="cll_chapter10-section11-example1" />
         <anchor xml:id="c10e11d2" />
         <anchor xml:id="cll_chapter10-section11-example2" />
         <anchor xml:id="c10e11d3" />
         <anchor xml:id="cll_chapter10-section11-example3" />
@@ -1349,23 +1501,27 @@
         <jbo>loi snime cu carvi ca le ze'u dunra</jbo>
         <gloss>Some-of-the-mass-of snow rains [present] the [long time] winter.</gloss>
         <en>Snow falls in the long winter.</en>
       </interlinear-gloss>
     </example>
     <para>claims that during some part of the winter, which is long as winters go, snow falls.</para>
   </section>
   <section xml:id="cll_chapter10-section13">
     <title>13. Sticky and multiple tenses: KI</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ki      KI                  sticky tense set/reset
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ki</cmavo>
+        <selmaho>KI</selmaho>
+        <description>sticky tense set/reset</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>So far we have only considered tenses in isolated bridi. Lojban provides several ways for a tense to continue in effect over more than a single bridi. This property is known as 
     <quote>stickiness</quote>: the tense gets 
     <quote>stuck</quote>and remains in effect until explicitly 
     <quote>unstuck</quote>. In the metaphor of the imaginary journey, the place and time set by a sticky tense may be thought of as a campsite or way-station: it provides a permanent origin with respect to which other tenses are understood. Later imaginary journeys start from that point rather than from the speaker.</para>
     <para>To make a tense sticky, suffix 
     <quote>ki</quote>to it:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-rIuI">
       <title>
         <anchor xml:id="c10e13d1" />
         <anchor xml:id="cll_chapter10-section13-example1" />
@@ -1629,21 +1785,21 @@
         <jbo>John says that George is going to the market.</jbo>
         <jbo>John says that George went to the market.</jbo>
         <jbo>John said that George went to the market.</jbo>
         <jbo>John said that George had gone to the market.</jbo>
       </interlinear-gloss>
     </example>
     <para>In 
     <xref linkend="cll_chapter10-section15-example1" />and 
     <xref linkend="cll_chapter10-section15-example2" />, the tense of the main sentence is the present: 
     <quote>says</quote>. If George goes when John speaks, we get the present tense 
-    <quote>is going</quote>(
+    <quote>is going</quote>( 
     <quote>goes</quote>would be unidiomatic); if George goes before John speaks, we get the past tense 
     <quote>went</quote>. But if the tense of the main sentence is the past, with 
     <quote>said</quote>, then the tense required in the subordinate clause is different. If George goes when John speaks, we get the past tense 
     <quote>went</quote>; if George goes before John speaks, we get the past-perfect tense 
     <quote>had gone</quote>.</para>
     <para>The rule of English, therefore, is that both the tense of the main sentence and the tense of the subordinate clause are understood relative to the speaker of the main sentence (not John, but the person who speaks 
     <xref linkend="cll_chapter10-section15-example1" />through 
     <xref linkend="cll_chapter10-section15-example4" />).</para>
     <para>Lojban, like Russian and Esperanto, uses a different convention. A tense in a subordinate bridi is understood to be relative to the tense already set in the main bridi. Thus 
     <xref linkend="cll_chapter10-section15-example1" />through 
@@ -1897,21 +2053,21 @@
     <xref linkend="cll_chapter10-section17-example1" />through 
     <xref linkend="cll_chapter10-section17-example3" />respectively. The 
     <quote>bo</quote>is required for the same reason as in 
     <xref linkend="cll_chapter10-section16-example2" />: to prevent the 
     <quote>ba</quote>from functioning as a sumti tcita for the following sumti (or, in 
     <xref linkend="cll_chapter10-section17-example5" />, from being attached to the following selbri).</para>
     <para>In addition to the 
     <quote>bo</quote>construction of 
     <xref linkend="cll_chapter10-section17-example4" />through 
     <xref linkend="cll_chapter10-section17-example6" />, there is also a form of tensed logical connective with 
-    <quote>ke ... ke'e</quote>(
+    <quote>ke ... ke'e</quote>( 
     <quote>tu'e ... tu'u</quote>for sentences). The logical connective system makes 
     <xref linkend="cll_chapter10-section17-example7" />through 
     <xref linkend="cll_chapter10-section17-example9" />equivalent in meaning:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-FgKB">
       <title>
         <anchor xml:id="c10e17d7" />
         <anchor xml:id="cll_chapter10-section17-example7" />
         <anchor xml:id="c10e17d8" />
         <anchor xml:id="cll_chapter10-section17-example8" />
         <anchor xml:id="c10e17d9" />
@@ -2044,26 +2200,42 @@
         <en>The child walks on the ice other than to my right.</en>
       </interlinear-gloss>
     </example>
     <para>The use of 
     <quote>-nai</quote>on cmavo of TAhE and ROI has already been discussed in 
     <xref linkend="cll_chapter10-section9" />; this use is also a scalar negation.</para>
   </section>
   <section xml:id="cll_chapter10-section19">
     <title>19. Actuality, potentiality, capability: CAhA</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ca'a    CAhA                actually is
-     ka'e    CAhA                is innately capable of
-     nu'o    CAhA                can but has not
-     pu'i    CAhA                can and has
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ca'a</cmavo>
+        <selmaho>CAhA</selmaho>
+        <description>actually is</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ka'e</cmavo>
+        <selmaho>CAhA</selmaho>
+        <description>is innately capable of</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>nu'o</cmavo>
+        <selmaho>CAhA</selmaho>
+        <description>can but has not</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>pu'i</cmavo>
+        <selmaho>CAhA</selmaho>
+        <description>can and has</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Lojban bridi without tense markers may not necessarily refer to actual events: they may also refer to capabilities or potential events. For example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-HjjN">
       <title>
         <anchor xml:id="c10e19d1" />
         <anchor xml:id="cll_chapter10-section19-example1" />
       </title>
       <interlinear-gloss>
         <jbo>ro datka cu flulimna</jbo>
         <gloss>All ducks are-float-swimmers.</gloss>
         <en>All ducks swim by floating.</en>
@@ -2311,21 +2483,21 @@
       <interlinear-gloss>
         <jbo>mi mo'izu'anai je mo'iri'u cadzu</jbo>
         <gloss>I [motion] [left-not] and [motion] [right] walk.</gloss>
         <en>I walk not leftward but rightward.</en>
         <jbo>mi mo'izu'a naje mo'iri'u cadzu</jbo>
         <gloss>I [motion] [left] not-and [motion] [right] walk.</gloss>
         <en>I walk not leftward but rightward.</en>
       </interlinear-gloss>
     </example>
     <para>There are no forethought logical connections between tenses allowed by the grammar, to keep tenses simpler. Nor is there any way to override simple left-grouping of the connectives, the Lojban default.</para>
-    <para>The non-logical connectives of selma'o JOI, BIhI, and GAhO are also permitted between tenses. One application is to specify intervals not by size, but by their end-points (
+    <para>The non-logical connectives of selma'o JOI, BIhI, and GAhO are also permitted between tenses. One application is to specify intervals not by size, but by their end-points ( 
     <quote>bi'o</quote>belongs to selma'o BIhI, and connects the end-points of an ordered interval, like English 
     <quote>from ... to</quote>):</para>
     <example role="interlinear-gloss-example" xml:id="random-id-KQUM">
       <title>
         <anchor xml:id="c10e20d7" />
         <anchor xml:id="cll_chapter10-section20-example7" />
       </title>
       <interlinear-gloss>
         <jbo>mi puza bi'o bazu vasxu</jbo>
         <gloss>I [past] [medium] from ... to [future] [long] breathe.</gloss>
@@ -2369,24 +2541,32 @@
         <en>George continues to start to write.</en>
         <jbo>mi reroi ca'o xaroi darxi le damri</jbo>
         <gloss>I [twice] [continuitive] [six times] hit the drum.</gloss>
         <en>On two occasions, I continue to beat the drum six times.</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter10-section22">
     <title>22. Conversion of sumti tcita: JAI</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     jai     JAI                 tense conversion
-     fai     FA                  indefinite place
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>jai</cmavo>
+        <selmaho>JAI</selmaho>
+        <description>tense conversion</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>fai</cmavo>
+        <selmaho>FA</selmaho>
+        <description>indefinite place</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Conversion is the regular Lojban process of moving around the places of a place structure. The cmavo of selma'o SE serve this purpose, exchanging the first place with one of the others:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-5L61">
       <title>
         <anchor xml:id="c10e22d1" />
         <anchor xml:id="cll_chapter10-section22-example1" />
         <anchor xml:id="c10e22d2" />
         <anchor xml:id="cll_chapter10-section22-example2" />
       </title>
       <interlinear-gloss>
         <jbo>mi cu klama le zarci</jbo>
@@ -2603,23 +2783,27 @@
        X .i TENSE bo Y
        TENSE gi X gi Y
        Y TENSE le nu X
 </programlisting>
     <para>neglecting the question of what is claimed. In the modal sentence schemata, the modal tag is always followed by Y, the sentence representing the event in the x1 place of the gismu that underlies the BAI. In the tensed sentences, no such simple rule exists.</para>
   </section>
   <section xml:id="cll_chapter10-section24">
     <title>24. Tense questions: 
     <quote>cu'e</quote></title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     cu'e    CUhE                tense question
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>cu'e</cmavo>
+        <selmaho>CUhE</selmaho>
+        <description>tense question</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>There are two main ways to ask questions about tense. The main English tense question words are 
     <quote>When?</quote>and 
     <quote>Where?</quote>. These may be paraphrased respectively as 
     <quote>At what time?</quote>and 
     <quote>At what place?</quote>In these forms, their Lojban equivalents simply involve a tense plus 
     <quote>ma</quote>, the Lojban sumti question:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-FUdc">
       <title>
         <anchor xml:id="c10e24d1" />
         <anchor xml:id="cll_chapter10-section24-example1" />
@@ -2834,46 +3018,26 @@
 
       JAI   tense conversion
             jaica = the time of, jaivi = the place of, etc.
 </programlisting>
   </section>
   <section xml:id="cll_chapter10-section28">
     <title>28. List of spatial directions and direction-like relations</title>
     <para>The following list of FAhA cmavo gives rough English glosses for the cmavo, first when used without 
     <quote>mo'i</quote>to express a direction, and then when used with 
     <quote>mo'i</quote>to express movement in the direction. When possible, the gismu from which the cmavo is derived is also listed.</para>
-    <programlisting xml:space="preserve">
-cmavo   gismu   without mo'i        with mo'i
------   -----   ------------        ---------
-ca'u    crane   in front (of)       forward
-ti'a    trixe   behind              backward
-zu'a    zunle   on the left (of)    leftward
-ri'u    pritu   on the right (of)   rightward
-ga'u    gapru   above               upward(ly)
-ni'a    cnita   below               downward(ly)
-ne'i    nenri   within              into
-ru'u    sruri   surrounding         orbiting
-pa'o    pagre   transfixing         passing through
-ne'a            next to             moving while next to
-te'e            bordering           moving along the border (of)
-re'o            adjacent (to)       along
-fa'a    farna   towards             arriving at
-to'o            away from           departing from
-zo'i            inward (from)       approaching
-ze'o            outward (from)      receding from
-zo'a            tangential (to)     passing (by)
-bu'u            coincident (with)   moving to coincide with
-be'a    berti   north (of)          northward(ly)
-ne'u    snanu   south (of)          southward(ly)
-du'a    stuna   east (of)           eastward(ly)
-vu'a            west (of)           westward(ly)
-</programlisting>
+    <cmavo-list>ca'u crane in front (of) forwardti'a trixe behind backwardzu'a zunle on the left (of) leftwardga'u gapru above upward(ly)ni'a cnita below downward(ly)ne'i nenri within intoru'u sruri surrounding orbitingpa'o pagre transfixing passing throughne'a next to moving while next to
+    <cmavo-entry>
+      <cmavo>te'e</cmavo>
+      <selmaho>bordering</selmaho>
+      <description>moving along the border (of)</description>
+    </cmavo-entry>re'o adjacent (to) alongfa'a farna towards arriving atto'o away from departing fromzo'i inward (from) approachingze'o outward (from) receding fromzo'a tangential (to) passing (by)be'a berti north (of) northward(ly)ne'u snanu south (of) southward(ly)du'a stuna east (of) eastward(ly)vu'a west (of) westward(ly)</cmavo-list>
     <para>Special note on 
     <quote>fa'a</quote>, 
     <quote>to'o</quote>, 
     <quote>zo'i</quote>, and 
     <quote>ze'o</quote>:</para>
     <para>
     <quote>zo'i</quote>and 
     <quote>ze'o</quote>refer to direction towards or away from the speaker's location, or whatever the origin is.</para>
     <para>
     <quote>fa'a</quote>and 
diff --git a/todocbook/11.xml b/todocbook/11.xml
index 567986c..cd51721 100644
--- a/todocbook/11.xml
+++ b/todocbook/11.xml
@@ -71,23 +71,27 @@
     <quote>my going-to the store</quote>rather than 
     <quote>I go-to the store</quote>; likewise, in the glosses of 
     <xref linkend="cll_chapter11-section1-example3" />and 
     <xref linkend="cll_chapter11-section1-example4" />we see 
     <quote>being-a-soldier</quote>rather than 
     <quote>is-a-soldier</quote>. This procedure reflects the desire for more understandable glosses, and does not indicate any change in the Lojban form. A bridi is a bridi, and undergoes no change when it is used as part of an abstraction selbri.</para>
   </section>
   <section xml:id="cll_chapter11-section2">
     <title>2. Event abstraction</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     nu      NU                  event abstractor
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>nu</cmavo>
+        <selmaho>NU</selmaho>
+        <description>event abstractor</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The examples in 
     <xref linkend="cll_chapter11-section1" />made use of 
     <quote>nu</quote>as the abstractor, and it is certainly the most common abstractor in Lojban text. Its purpose is to capture the event or state of the bridi considered as a whole. Do not confuse the 
     <quote>le</quote>description built on a 
     <quote>nu</quote>abstraction with ordinary descriptions based on 
     <quote>le</quote>alone. The following sumti are quite distinct:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-TPFz">
       <title>
         <anchor xml:id="c11e2d1" />
         <anchor xml:id="cll_chapter11-section2-example1" />
@@ -171,21 +175,21 @@
         <jbo>mi nelci le nu mi limna</jbo>
         <en>I like the event-of I swim.</en>
       </interlinear-gloss>
     </example>
     <para>In the proper context, of course, 
     <xref linkend="cll_chapter11-section2-example9" />could refer to the event of somebody else swimming. Its English equivalent, 
     <quote>I like swimming</quote>, can't be interpreted as 
     <quote>I like Frank's swimming</quote>; this is a fundamental distinction between English and Lojban. In Lojban, an omitted sumti can mean whatever the context indicates that it should mean.</para>
     <para>Note that the lack of an explicit NU cmavo in a sumti can sometimes hide an implicit abstraction. In the context of 
     <xref linkend="cll_chapter11-section2-example10" />, the appearance of 
-    <quote>le se nelci</quote>(
+    <quote>le se nelci</quote>( 
     <quote>that which is liked</quote>) is in effect an abstraction:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-sMsx">
       <title>
         <anchor xml:id="c11e2d11" />
         <anchor xml:id="cll_chapter11-section2-example11" />
       </title>
       <interlinear-gloss>
         <jbo>le se nelci cu cafne</jbo>
         <gloss>The liked-thing is-frequent.</gloss>
         <en>The thing which I like happens often.</en>
@@ -215,26 +219,42 @@
     <quote>when</quote>of the English would also be appropriate for a construction involving a Lojban tense, but the Lojban sentence says more than that the studying is concurrent with the ease.)</para>
     <para>The place structure of a 
     <quote>nu</quote>abstraction selbri is simply:</para>
     <programlisting xml:space="preserve">
       x1 is an event of (the bridi)
 </programlisting>
   </section>
   <section xml:id="cll_chapter11-section3">
     <title>3. Types of event abstractions</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     mu'e    NU                  point-event abstractor
-     pu'u    NU                  process abstractor
-     zu'o    NU                  activity abstractor
-     za'i    NU                  state abstractor
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>mu'e</cmavo>
+        <selmaho>NU</selmaho>
+        <description>point-event abstractor</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>pu'u</cmavo>
+        <selmaho>NU</selmaho>
+        <description>process abstractor</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>zu'o</cmavo>
+        <selmaho>NU</selmaho>
+        <description>activity abstractor</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>za'i</cmavo>
+        <selmaho>NU</selmaho>
+        <description>state abstractor</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Event abstractions with 
     <quote>nu</quote>suffice to express all kinds of events, whether long, short, unique, repetitive, or whatever. Lojban also has more finely discriminating machinery for talking about events, however. There are four other abstractors of selma'o NU for talking about four specific types of events, or four ways of looking at the same event.</para>
     <para>An event considered as a point in time is called a 
     <quote>point-event</quote>, or sometimes an 
     <quote>achievement</quote>. (This latter word should be divorced, in this context, from all connotations of success or triumph.) A point-event can be extended in duration, but it is still a point-event if it is thought of as unitary, having no internal structure. The abstractor 
     <quote>mu'e</quote>means 
     <quote>point-event-of</quote>:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-nFR1">
       <title>
         <anchor xml:id="c11e3d1" />
@@ -329,24 +349,32 @@
 <quote>pu'u</quote>: x1 is a process of (the bridi) with stages x2
        
 <quote>za'i</quote>: x1 is a continuous state of (the bridi) being true
        
 <quote>zu'o</quote>: x1 is an activity of (the bridi) consisting of repeated actions x2
 </programlisting>
   </section>
   <section xml:id="cll_chapter11-section4">
     <title>4. Property abstractions</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ka      NU                  property abstractor
-     ce'u    KOhA                abstraction focus
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ka</cmavo>
+        <selmaho>NU</selmaho>
+        <description>property abstractor</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ce'u</cmavo>
+        <selmaho>KOhA</selmaho>
+        <description>abstraction focus</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The things described by 
     <quote>le nu</quote>descriptions (or, to put it another way, the things of which 
     <quote>nu</quote>selbri may correctly be predicated) are only moderately 
     <quote>abstract</quote>. They are still closely tied to happenings in space and time. Properties, however, are much more ethereal. What is 
     <quote>the property of being blue</quote>, or 
     <quote>the property of being a go-er</quote>? They are what logicians call 
     <quote>intensions</quote>. If John has a heart, then 
     <quote>the property of having a heart</quote>is an abstract object which, when applied to John, is true. In fact,</para>
     <example role="interlinear-gloss-example" xml:id="random-id-YSUx">
       <title>
@@ -537,23 +565,27 @@
 </programlisting>
     <para>The place structure of 
     <quote>ka</quote>abstraction selbri is simply:</para>
     <programlisting xml:space="preserve">
        ka: x1 is a property of (the bridi)
 </programlisting>
   </section>
   <section xml:id="cll_chapter11-section5">
     <title>5. Amount abstractions</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ni      NU                  amount abstraction
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ni</cmavo>
+        <selmaho>NU</selmaho>
+        <description>amount abstraction</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Amount abstractions are far more limited than event or property abstractions. They really make sense only if the selbri of the abstracted bridi is subject to measurement of some sort. Thus we can speak of:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-QW2C">
       <title>
         <anchor xml:id="c11e5d1" />
         <anchor xml:id="cll_chapter11-section5-example1" />
       </title>
       <interlinear-gloss>
         <jbo>le ni le pixra cu blanu [kei]</jbo>
         <gloss>the amount-of (the picture being-blue)</gloss>
         <en>the amount of blueness in the picture</en>
@@ -690,23 +722,27 @@
 </programlisting>
     <para>Abstractions using 
     <quote>jei</quote>are the mechanism for fuzzy logic in Lojban; the 
     <quote>jei</quote>abstraction refers to a number between 0 and 1 inclusive (as distinct from 
     <quote>ni</quote>abstractions, which are often on open-ended scales). The detailed conventions for using 
     <quote>jei</quote>in fuzzy-logic contexts have not yet been established.</para>
   </section>
   <section xml:id="cll_chapter11-section7">
     <title>7. Predication/sentence abstraction</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     du'u    NU                  predication abstraction
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>du'u</cmavo>
+        <selmaho>NU</selmaho>
+        <description>predication abstraction</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>There are some selbri which demand an entire predication as a sumti; they make claims about some predication considered as a whole. Logicians call these the 
     <quote>propositional attitudes</quote>, and they include (in English) things like knowing, believing, learning, seeing, hearing, and the like. Consider the English sentence:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-7N2q">
       <title>
         <anchor xml:id="c11e7d1" />
         <anchor xml:id="cll_chapter11-section7-example1" />
       </title>
       <interlinear-gloss>
         <jbo>I know that Frank is a fool.</jbo>
       </interlinear-gloss>
@@ -820,23 +856,27 @@
     <quote>le se du'u</quote>is much the same as 
     <quote>lu'e le du'u</quote>, a symbol for the predication, but 
     <quote>se du'u</quote>can be used as a selbri, whereas 
     <quote>lu'e</quote>is ungrammatical in a selbri. (See 
     <xref linkend="cll_chapter6" />for a discussion of 
     <quote>lu'e</quote>.)</para>
   </section>
   <section xml:id="cll_chapter11-section8">
     <title>8. Indirect questions</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     kau     UI                  indirect question marker
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>kau</cmavo>
+        <selmaho>UI</selmaho>
+        <description>indirect question marker</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>There is an alternative type of sentence involving 
     <quote>du'u</quote>and a selbri expressing a propositional attitude. In addition to sentences like</para>
     <example role="interlinear-gloss-example" xml:id="random-id-Fpid">
       <title>
         <anchor xml:id="c11e8d1" />
         <anchor xml:id="cll_chapter11-section8-example1" />
       </title>
       <interlinear-gloss>
         <jbo>I know that John went to the store.</jbo>
       </interlinear-gloss>
@@ -850,21 +890,21 @@
       <interlinear-gloss>
         <jbo>I know who went to the store.</jbo>
       </interlinear-gloss>
     </example>
     <para>This form is called an 
     <quote>indirect question</quote>in English because the embedded English sentence is a question: 
     <quote>Who went to the store?</quote>A person who says 
     <xref linkend="cll_chapter11-section8-example2" />is claiming to know the answer to this question. Indirect questions can occur with many other English verbs as well: I can wonder, or doubt, or see, or hear, as well as know who went to the store.</para>
     <para>To express indirect questions in Lojban, we use a 
     <quote>le du'u</quote>abstraction, but rather than using a question word like 
-    <quote>who</quote>(
+    <quote>who</quote>( 
     <quote>ma</quote>in Lojban), we use any word that will fit grammatically and mark it with the suffix particle 
     <quote>kau</quote>. This cmavo belongs to selma'o UI, so grammatically it can appear anywhere. The simplest Lojban translation of 
     <xref linkend="cll_chapter11-section8-example2" />is therefore:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-QUxG">
       <title>
         <anchor xml:id="c11e8d3" />
         <anchor xml:id="cll_chapter11-section8-example3" />
       </title>
       <interlinear-gloss>
         <jbo>mi djuno le du'u</jbo>
@@ -960,25 +1000,37 @@
         <en>is at the park.</en>
       </interlinear-gloss>
     </example>
     <para>In addition, 
     <xref linkend="cll_chapter11-section8-example7" />is only a loose paraphrase of 
     <xref linkend="cll_chapter11-section8-example3" />, because it is left to the listener's insight to realize that what is known about the goer-to-the-store is his identity rather than some other of his attributes.</para>
   </section>
   <section xml:id="cll_chapter11-section9">
     <title>9. Minor abstraction types</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     li'i    NU                  experience abstractor
-     si'o    NU                  concept abstractor
-     su'u    NU                  general abstractor
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>li'i</cmavo>
+        <selmaho>NU</selmaho>
+        <description>experience abstractor</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>si'o</cmavo>
+        <selmaho>NU</selmaho>
+        <description>concept abstractor</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>su'u</cmavo>
+        <selmaho>NU</selmaho>
+        <description>general abstractor</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>There are three more abstractors in Lojban, all of them little used so far. The abstractor 
     <quote>li'i</quote>expresses experience:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-FS6r">
       <title>
         <anchor xml:id="c11e9d1" />
         <anchor xml:id="cll_chapter11-section9-example1" />
       </title>
       <interlinear-gloss>
         <jbo>mi morji le li'i mi verba</jbo>
         <en>I remember the experience-of (my being-a-child)</en>
@@ -1069,24 +1121,32 @@
     </example>
     <para>Note the importance of using 
     <quote>kei</quote>after 
     <quote>su'u</quote>when the x2 of 
     <quote>su'u</quote>(or any other abstractor) is being specified; otherwise, the 
     <quote>be lo</quote>ends up inside the abstraction bridi.</para>
   </section>
   <section xml:id="cll_chapter11-section10">
     <title>10. Lojban sumti raising</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     tu'a    LAhE                an abstraction involving
-     jai     JAI                 abstraction conversion
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>tu'a</cmavo>
+        <selmaho>LAhE</selmaho>
+        <description>an abstraction involving</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>jai</cmavo>
+        <selmaho>JAI</selmaho>
+        <description>abstraction conversion</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>It is sometimes inconvenient, in a situation where an abstract description is logically required, to express the abstraction. In English we can say:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-BYp8">
       <title>
         <anchor xml:id="c11e10d1" />
         <anchor xml:id="cll_chapter11-section10-example1" />
       </title>
       <interlinear-gloss>
         <jbo>I try to open the door.</jbo>
       </interlinear-gloss>
     </example>
@@ -1321,21 +1381,22 @@
         <jbo>le ka je ni la frank. ciska cu xlali</jbo>
         <en>The quality and quantity of Frank's writing is bad.</en>
       </interlinear-gloss>
     </example>
     <para>This feature of Lojban has hardly ever been used, and nobody knows what uses it may eventually have.</para>
   </section>
   <section xml:id="cll_chapter11-section13">
     <title>13. Table of abstractors</title>
     <para>The following table gives each abstractor, an English gloss for it, a Lojban gismu which is connected with it (more or less remotely: the associations between abstractors and gismu are meant more as memory hooks than for any kind of inference), the rafsi associated with it, and (on the following line) its place structure.</para>
     <programlisting xml:space="preserve">
-nu      event of        fasnu  nun
+nu      event of        fasnu  nun  
+<!-- skip cmavo list automation -->
        x1 is an event of (the bridi)
 ka      property of     ckaji  kam
        x1 is a property of (the bridi)
 ni      amount of       klani  nil
        x1 is an amount of (the bridi) measured on scale x2
 jei     truth-value of  jetnu  jez
        x1 is a truth-value of (the bridi) under epistemology x2
 li'i    experience of   lifri  liz
        x1 is an experience of (the bridi) to experiencer x2
 si'o    idea of         sidbo  siz
diff --git a/todocbook/12.xml b/todocbook/12.xml
index 88b6773..25470fb 100644
--- a/todocbook/12.xml
+++ b/todocbook/12.xml
@@ -267,21 +267,21 @@
       <title>
         <anchor xml:id="c12e5d2" />
         <anchor xml:id="cll_chapter12-section5-example2" />
       </title>
       <interlinear-gloss>
         <jbo>b1=s1 is a great soldier of army s2 in property b2 by standard b3</jbo>
       </interlinear-gloss>
     </example>
     <para>Some symmetrical veljvo have further equivalent places in addition to the respective first places. Consider the lujvo 
     <quote>tinju'i</quote>, 
-    <quote>to listen</quote>(
+    <quote>to listen</quote>( 
     <quote>to hear attentively, to hear and pay attention</quote>). The place structures of the gismu 
     <quote>tirna</quote>and 
     <quote>jundi</quote>are:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-rFiE">
       <title>
         <anchor xml:id="c12e5d3" />
         <anchor xml:id="cll_chapter12-section5-example3" />
       </title>
       <interlinear-gloss>
         <jbo>
@@ -294,21 +294,21 @@
     <example role="interlinear-gloss-example" xml:id="random-id-EUr1">
       <title>
         <anchor xml:id="c12e5d4" />
         <anchor xml:id="cll_chapter12-section5-example4" />
       </title>
       <interlinear-gloss>
         <jbo>j1=t1 listens to j2=t2 against background noise t3</jbo>
       </interlinear-gloss>
     </example>
     <para>Why so? Because not only is the j1 place (the one who pays attention) equivalent to the t1 place (the hearer), but the j2 place (the thing paid attention to) is equivalent to the t2 place (the thing heard).</para>
-    <para>A substantial minority of lujvo have the property that the first place of the seltau (
+    <para>A substantial minority of lujvo have the property that the first place of the seltau ( 
     <quote>gerku</quote>in this case) is equivalent to a place other than the first place of the tertau; such lujvo are said to be 
     <quote>asymmetrical</quote>. (There is a deliberate parallel here with the terms 
     <quote>asymmetrical tanru</quote>and 
     <quote>symmetrical tanru</quote>used in 
     <xref linkend="cll_chapter5" />.)</para>
     <para>In principle any asymmetrical lujvo could be expressed as a symmetrical lujvo. Consider 
     <quote>gerzda</quote>, discussed in 
     <xref linkend="cll_chapter12-section3" />, where we learned that the g1 place was equivalent to the z2 place. In order to get the places aligned, we could convert 
     <quote>zdani</quote>to 
     <quote>se zdani</quote>(or 
@@ -376,21 +376,21 @@
       <interlinear-gloss>
         <jbo>kl1 goes to destination kl2 from origin kl3 via route kl4</jbo>
         <en>by means of car kl5=ka1 carrying ka2 propelled by ka3.</en>
       </interlinear-gloss>
     </example>
     <para>instead.</para>
   </section>
   <section xml:id="cll_chapter12-section6">
     <title>6. Dependent places</title>
     <para>In order to understand which places, if any, should be completely removed from a lujvo place structure, we need to understand the concept of dependent places. One place of a brivla is said to be dependent on another if its value can be predicted from the values of one or more of the other places. For example, the g2 place of 
-    <quote>gerku</quote>is dependent on the g1 place. Why? Because when we know what fits in the g1 place (Spot, let us say, a well-known dog), then we know what fits in the g2 place (
+    <quote>gerku</quote>is dependent on the g1 place. Why? Because when we know what fits in the g1 place (Spot, let us say, a well-known dog), then we know what fits in the g2 place ( 
     <quote>St. Bernard</quote>, let us say). In other words, when the value of the g1 place has been specified, the value of the g2 place is determined by it. Conversely, since each dog has only one breed, but each breed contains many dogs, the g1 place is not dependent on the g2 place; if we know only that some dog is a St. Bernard, we cannot tell by that fact alone which dog is meant.</para>
     <para>For 
     <quote>zdani</quote>, on the other hand, there is no dependency between the places. When we know the identity of a house-dweller, we have not determined the house, because a dweller may dwell in more than one house. By the same token, when we know the identity of a house, we do not know the identity of its dweller, for a house may contain more than one dweller.</para>
     <para>The rule for eliminating places from a lujvo is that dependent places provided by the seltau are eliminated. Therefore, in 
     <quote>gerzda</quote>the dependent g2 place is removed from the tentative place structure given in 
     <xref linkend="cll_chapter12-section3-example5" />, leaving the place structure:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-zMyY">
       <title>
         <anchor xml:id="c12e6d1" />
         <anchor xml:id="cll_chapter12-section6-example1" />
@@ -549,21 +549,21 @@
     <para>or is the entity being prayed to, resulting in</para>
     <example role="interlinear-gloss-example" xml:id="random-id-uL3V">
       <title>
         <anchor xml:id="c12e7d3" />
         <anchor xml:id="cll_chapter12-section7-example3" />
       </title>
       <interlinear-gloss>
         <jbo>This is a prayer to Dong</jbo>
       </interlinear-gloss>
     </example>
-    <para>We could resolve such problems on a case-by-case basis for each lujvo (
+    <para>We could resolve such problems on a case-by-case basis for each lujvo ( 
     <xref linkend="cll_chapter12-section14" />discusses when this is actually necessary), but case-by-case resolution for run-of-the-mill lujvo makes the task of learning lujvo place structures unmanageable. People need consistent patterns to make sense of what they learn. Such patterns can be found across gismu place structures (see 
     <xref linkend="cll_chapter12-section16" />), and are even more necessary in lujvo place structures. Case-by-case consideration is still necessary; lujvo creation is a subtle art, after all. But it is helpful to take advantage of any available regularities.</para>
     <para>We use two different ordering rules: one for symmetrical lujvo and one for asymmetrical ones. A symmetrical lujvo like 
     <quote>balsoi</quote>(from 
     <xref linkend="cll_chapter12-section5" />) has the places of its tertau followed by whatever places of the seltau survive the elimination process. For 
     <quote>balsoi</quote>, the surviving places of 
     <quote>banli</quote>are b2 and b3, leading to the place structure:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-rv1m">
       <title>
         <anchor xml:id="c12e7d4" />
@@ -899,21 +899,21 @@
     <example role="interlinear-gloss-example" xml:id="random-id-0W5t">
       <title>
         <anchor xml:id="c12e11d5" />
         <anchor xml:id="cll_chapter12-section11-example5" />
       </title>
       <interlinear-gloss>
         <jbo>xamsi ke calku curnu</jbo>
         <en>ocean type-of (shell worm)</en>
       </interlinear-gloss>
     </example>
-    <para>(
+    <para>( 
     <quote>worm</quote>in Lojban refers to any invertebrate), but 
     <quote>xasycakcurnu</quote>has the veljvo</para>
     <example role="interlinear-gloss-example" xml:id="random-id-HEjn">
       <title>
         <anchor xml:id="c12e11d6" />
         <anchor xml:id="cll_chapter12-section11-example6" />
       </title>
       <interlinear-gloss>
         <jbo>[ke] xamsi calku [ke'e] curnu</jbo>
         <en>(ocean shell) type-of worm</en>
@@ -969,21 +969,21 @@
     <quote>na'e brablo</quote>means 
     <quote>other than a big boat</quote>.</para>
     <para>If the lujvo we want to modify with SE has a seltau already starting with a SE rafsi, we can take a shortcut. For instance, 
     <quote>gekmau</quote>means 
     <quote>happier than</quote>, while 
     <quote>selgekmau</quote>means 
     <quote>making people happier than, more enjoyable than, more of a 'se gleki' than</quote>. If something is less enjoyable than something else, we can say it is 
     <quote>se selgekmau</quote>.</para>
     <para>But we can also say it is 
     <quote>selselgekmau</quote>. Two 
-    <quote>se</quote>cmavo in a row cancel each other (
+    <quote>se</quote>cmavo in a row cancel each other ( 
     <quote>se se gleki</quote>means the same as just 
     <quote>gleki</quote>), so there would be no good reason to have 
     <quote>selsel</quote>in a lujvo with that meaning. Instead, we can feel free to interpret 
     <quote>selsel-</quote>as 
     <quote>selkemsel-</quote>. The rafsi combinations 
     <quote>terter-</quote>, 
     <quote>velvel-</quote>and 
     <quote>xelxel-</quote>work in the same way.</para>
     <para>Other SE combinations like 
     <quote>selter-</quote>, although they might conceivably mean 
@@ -1002,21 +1002,21 @@
         <anchor xml:id="cll_chapter12-section12-example1" />
       </title>
       <interlinear-gloss>
         <jbo>k1 comes/goes to k2 from k3 via route k4 by means k5.</jbo>
       </interlinear-gloss>
     </example>
     <para>The selbri 
     <quote>nu klama [kei]</quote>has only one place, the event-of-going, but the full five places exist implicitly between 
     <quote>nu</quote>and 
     <quote>kei</quote>, since a full bridi with all sumti may be placed there. In a lujvo, there is no room for such inside places, and consequently the lujvo 
-    <quote>nunkla</quote>(
+    <quote>nunkla</quote>( 
     <quote>nun-</quote>is the rafsi for 
     <quote>nu</quote>), needs to have six places:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-m60H">
       <title>
         <anchor xml:id="c12e12d2" />
         <anchor xml:id="cll_chapter12-section12-example2" />
       </title>
       <interlinear-gloss>
         <jbo>nu1 is the event of k1's coming/going to k2 from k3 via route k4 by means k5.</jbo>
       </interlinear-gloss>
@@ -1080,21 +1080,21 @@
     <quote>nunsoidji</quote>might be someone who is about to enlist, whereas a 
     <quote>soidji</quote>might be a camp-follower.</para>
     <para>One use of abstract lujvo is to eliminate the need for explicit 
     <quote>kei</quote>in tanru: 
     <quote>nunkalri gasnu</quote>means much the same as 
     <quote>nu kalri kei gasnu</quote>, but is shorter. In addition, many English words ending in 
     <quote>-hood</quote>are represented with 
     <quote>nun-</quote>lujvo, and other words ending in 
     <quote>-ness</quote>or 
     <quote>-dom</quote>are often representable with 
-    <quote>kam-</quote>lujvo (
+    <quote>kam-</quote>lujvo ( 
     <quote>kam-</quote>is the rafsi for 
     <quote>ka</quote>); 
     <quote>kambla</quote>is 
     <quote>blueness</quote>.</para>
     <para>Even though the cmavo of NU are long-scope in nature, governing the whole following bridi, the NU rafsi should generally be used as short-scope modifiers, like the SE and NAhE rafsi discussed in 
     <xref linkend="cll_chapter12-section9" />.</para>
     <para>There is also a rafsi for the cmavo 
     <quote>jai</quote>, namely 
     <quote>jax</quote>, which allows sentences like</para>
     <example role="interlinear-gloss-example" xml:id="random-id-jWYr">
@@ -1196,25 +1196,25 @@
     <xref linkend="cll_chapter12-section5" />, the interpretation of lujvo is constrained by the semantics of gismu and of their sumti places. Now, any asymmetrical lujvo with 
     <quote>gasnu</quote>as its tertau will involve an event abstraction either implicitly or explicitly, since that is how the g2 place of 
     <quote>gasnu</quote>is defined.</para>
     <para>Therefore, if we assume that 
     <quote>nu</quote>is the type of abstraction one would expect to be a 
     <quote>se gasnu</quote>, then the rafsi 
     <quote>nun</quote>and 
     <quote>kez</quote>in 
     <quote>nunctikezgau</quote>are only telling us what we would already have guessed - that the seltau of a 
     <quote>gasnu</quote>lujvo is an event. If we drop these rafsi out, and use instead the shorter lujvo 
-    <quote>ctigau</quote>, rejecting its symmetrical interpretation (
+    <quote>ctigau</quote>, rejecting its symmetrical interpretation ( 
     <quote>someone who both does and eats</quote>; 
     <quote>an eating doer</quote>), we can still deduce that the seltau refers to an event.</para>
     <para>(You can't 
-    <quote>do an eater</quote>/
+    <quote>do an eater</quote>/ 
     <quote>gasnu lo citka</quote>, with the meaning of 
     <quote>do</quote>as 
     <quote>bring about an event</quote>; so the seltau must refer to an event, 
     <quote>nu citka</quote>. The English slang meanings of 
     <quote>do someone</quote>, namely 
     <quote>socialize with someone</quote>and 
     <quote>have sex with someone</quote>, are not relevant to 
     <quote>gasnu</quote>.)</para>
     <para>So we can simply use 
     <quote>ctigau</quote>with the same place structure as 
@@ -1763,21 +1763,21 @@
         <anchor xml:id="c12e16d1" />
         <anchor xml:id="cll_chapter12-section16-example1" />
       </title>
       <interlinear-gloss>
         <jbo>
         <quote>xekri</quote>: xe1 is black</jbo>
       </interlinear-gloss>
     </example>
     <para>Brevity was the most important goal here, reinforced by one interpretation of metaphysical necessity. There is no mention of color standards here, as many people have pointed out; like all color gismu, 
     <quote>xekri</quote>is explicitly subjective. Objective color standards can be brought in by an appropriate BAI tag such as 
-    <quote>ci'u</quote>(
+    <quote>ci'u</quote>( 
     <quote>in system</quote>; see 
     <xref linkend="cll_chapter9" />) or by making a lujvo.</para>
     <example role="interlinear-gloss-example" xml:id="random-id-cuYP">
       <title>
         <anchor xml:id="c12e16d2" />
         <anchor xml:id="cll_chapter12-section16-example2" />
       </title>
       <interlinear-gloss>
         <jbo>
         <quote>jbena</quote>: j1 is born to j2 at time j3 and location j4</jbo>
diff --git a/todocbook/13.xml b/todocbook/13.xml
index aae26f1..ab11fa8 100644
--- a/todocbook/13.xml
+++ b/todocbook/13.xml
@@ -41,25 +41,25 @@
         <jbo>.uu la djan klama</jbo>
         <en>[Alas!] John is coming.</en>
         <jbo>.a'o la djan klama</jbo>
         <en>[Hopefully] John is coming.</en>
         <jbo>.ue la djan klama</jbo>
         <en>[Wow!] John is coming!</en>
         <jbo>.ianai la djan klama</jbo>
         <en>[Nonsense!] John is coming.</en>
       </interlinear-gloss>
     </example>
-    <para>The primary Lojban attitudinals are all the cmavo of the form VV or V'V: one of the few cases where cmavo have been classified solely by their form. There are 39 of these cmavo: all 25 possible vowel pairs of the form V'V, the four standard diphthongs (
+    <para>The primary Lojban attitudinals are all the cmavo of the form VV or V'V: one of the few cases where cmavo have been classified solely by their form. There are 39 of these cmavo: all 25 possible vowel pairs of the form V'V, the four standard diphthongs ( 
     <quote>.ai</quote>, 
     <quote>.au</quote>, 
     <quote>.ei</quote>, and 
-    <quote>.oi</quote>), and the ten more diphthongs that are permitted only in these attitudinal indicators and in names and borrowings (
+    <quote>.oi</quote>), and the ten more diphthongs that are permitted only in these attitudinal indicators and in names and borrowings ( 
     <quote>.ia</quote>, 
     <quote>.ie</quote>, 
     <quote>.ii</quote>, 
     <quote>.io</quote>, 
     <quote>.iu</quote>, 
     <quote>.ua</quote>, 
     <quote>.ue</quote>, 
     <quote>.ui</quote>, 
     <quote>.uo</quote>, and 
     <quote>.uu</quote>). Note that each of these cmavo has a period before it, marking the pause that is mandatory before every word beginning with a vowel. Attitudinals, like most of the other kinds of indicators described in this chapter, belong to selma'o UI.</para>
@@ -87,21 +87,22 @@
     <title>2. Pure emotion indicators</title>
     <para>Attitudinals make no claim: they are expressions of attitude, not of facts or alleged facts. As a result, attitudinals themselves have no truth value, nor do they directly affect the truth value of a bridi that they modify. However, since emotional attitudes are carried in your mind, they reflect reactions to that version of the world that the mind is thinking about; this is seldom identical with the real world. At times, we are thinking about our idealized version of the real world; at other times we are thinking about a potential world that might or might not ever exist.</para>
     <para>Therefore, there are two groups of attitudinals in Lojban. The 
     <quote>pure emotion indicators</quote>express the way the speaker is feeling, without direct reference to what else is said. These indicators comprise the attitudinals which begin with 
     <quote>u</quote>or 
     <quote>o</quote>and many of those beginning with 
     <quote>i</quote>.</para>
     <para>The cmavo beginning with 
     <quote>u</quote>are simple emotions, which represent the speaker's reaction to the world as it is, or as it is perceived to be.</para>
     <programlisting xml:space="preserve">
-       .ua     discovery                         confusion
+       .ua     discovery                         confusion 
+<!-- skip cmavo list automation -->
        .u'a    gain                              loss
        .ue     surprise        no surprise       expectation
        .u'e    wonder                            commonplace
        .ui     happiness                         unhappiness
        .u'i    amusement                         weariness
        .uo     completion                        incompleteness
        .u'o    courage         timidity          cowardice
        .uu     pity                              cruelty
        .u'u    repentance      lack of regret    innocence
 </programlisting>
@@ -174,21 +175,22 @@
     <xref linkend="cll_chapter13-section2-example9" />, John's coming has been anticipated by the speaker. In 
     <xref linkend="cll_chapter13-section2-example7" />and 
     <xref linkend="cll_chapter13-section2-example8" />, no such anticipation has been made, but in 
     <xref linkend="cll_chapter13-section2-example8" />the lack-of-anticipation goes no further - in 
     <xref linkend="cll_chapter13-section2-example7" />, it amounts to actual surprise.</para>
     <para>It is not possible to firmly distinguish the pure emotion words beginning with 
     <quote>o</quote>or 
     <quote>i</quote>from those beginning with 
     <quote>u</quote>, but in general they represent more complex, more ambivalent, or more difficult emotions.</para>
     <programlisting xml:space="preserve">
-       .o'a    pride           modesty           shame
+       .o'a    pride           modesty           shame 
+<!-- skip cmavo list automation -->
        .o'e    closeness       detachment        distance
        .oi     complaint/pain  doing OK          pleasure
        .o'i    caution         boldness          rashness
        .o'o    patience        mere tolerance    anger
        .o'u    relaxation      composure         stress
 </programlisting>
     <para>Here are some examples:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-ch2s">
       <title>
         <anchor xml:id="c13e2d10" />
@@ -244,21 +246,22 @@
     <para>The pure emotion indicators beginning with 
     <quote>i</quote>are those which could not be fitted into the 
     <quote>u</quote>or 
     <quote>o</quote>groups because there was a lack of room, so they are a mixed lot. 
     <quote>.ia</quote>, 
     <quote>.i'a</quote>, 
     <quote>.ie</quote>, and 
     <quote>.i'e</quote>do not appear here, as they belong in 
     <xref linkend="cll_chapter13-section3" />instead.</para>
     <programlisting xml:space="preserve">
-       .ii     fear            nervousness       security
+       .ii     fear            nervousness       security 
+<!-- skip cmavo list automation -->
        .i'i    togetherness                      privacy
        .io     respect                           disrespect
        .i'o    appreciation                      envy
        .iu     love            no love lost      hatred
        .i'u    familiarity                       mystery
 </programlisting>
     <para>Here are some examples:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-jv9q">
       <title>
         <anchor xml:id="c13e2d15" />
@@ -321,21 +324,22 @@
     <quote>i</quote>-series as well.</para>
     <para>In fact, the entire distinction between pure emotions and propositional attitudes is itself a bit shaky: 
     <quote>.u'u</quote>can be seen as a propositional attitude indicator meaning 
     <quote>I regret that ...</quote>, and 
     <quote>.a'e</quote>(discussed below) can be seen as a pure emotion meaning 
     <quote>I'm awake/aware</quote>. The division of the attitudinals into pure-emotion and propositional-attitude classes in this chapter is mostly by way of explanation; it is not intended to permit firm rulings on specific points. Attitudinals are the part of Lojban most distant from the 
     <quote>logical language</quote>aspect.</para>
     <para>Here is the list of propositional attitude indicators grouped by initial letter, starting with those beginning with 
     <quote>a</quote>:</para>
     <programlisting xml:space="preserve">
-       .a'a    attentive       inattentive       avoiding
+       .a'a    attentive       inattentive       avoiding 
+<!-- skip cmavo list automation -->
        .a'e    alertness                         exhaustion
        .ai     intent          indecision        refusal
        .a'i    effort          no real effort    repose
        .a'o    hope                              despair
        .au     desire          indifference      reluctance
        .a'u    interest        no interest       repulsion
 </programlisting>
     <para>Some examples (of a parental kind):</para>
     <example role="interlinear-gloss-example" xml:id="random-id-ctin">
       <title>
@@ -381,21 +385,22 @@
     <para>(In a real-life situation, Examples 3.1-3.7 would also be decorated by various pure emotion indicators, certainly including 
     <quote>.oicai</quote>, but probably also 
     <quote>.iucai</quote>.)</para>
     <para>Splitting off the attitude into an indicator allows the regular bridi grammar to do what it does best: express the relationships between concepts that are intended, desired, hoped for, or whatever. Rephrasing these examples to express the attitude as the main selbri would make for unacceptably heavyweight grammar.</para>
     <para>Here are the propositional attitude indicators beginning with 
     <quote>e</quote>, which stand roughly in the relation to those beginning with 
     <quote>a</quote>as the pure-emotion indicators beginning with 
     <quote>o</quote>do to those beginning with 
     <quote>u</quote>- they are more complex or difficult:</para>
     <programlisting xml:space="preserve">
-       .e'a    permission                        prohibition
+       .e'a    permission                        prohibition 
+<!-- skip cmavo list automation -->
        .e'e    competence                        incompetence
        .ei     obligation                        freedom
        .e'i    constraint      independence      resistance to constraint
        .e'o    request                           negative request
        .e'u    suggestion      no suggestion     warning
 </programlisting>
     <para>More examples (after a good night's sleep):</para>
     <example role="interlinear-gloss-example" xml:id="random-id-CzYV">
       <title>
         <anchor xml:id="c13e3d8" />
@@ -423,21 +428,22 @@
         <gloss>[request] You-imperative of-you-imperative take-care.</gloss>
         <en>Please take care of yourself!</en>
         <jbo>.e'u do klama le panka</jbo>
         <gloss>[suggestion] You go to-the park.</gloss>
         <en>I suggest going to the park.</en>
       </interlinear-gloss>
     </example>
     <para>Finally, the propositional attitude indicators beginning with 
     <quote>i</quote>, which are the overflow from the other sets:</para>
     <programlisting xml:space="preserve">
-       .ia     belief          skepticism        disbelief
+       .ia     belief          skepticism        disbelief 
+<!-- skip cmavo list automation -->
        .i'a    acceptance                        blame
        .ie     agreement                         disagreement
        .i'e    approval        non-approval      disapproval
 </programlisting>
     <para>Still more examples (much, much later):</para>
     <example role="interlinear-gloss-example" xml:id="random-id-Furg">
       <title>
         <anchor xml:id="c13e3d13" />
         <anchor xml:id="cll_chapter13-section3-example13" />
         <anchor xml:id="c13e3d14" />
@@ -497,21 +503,22 @@
     <quote>virtuous</quote>in most cases than their negative counterparts. But these two were felt to be instinctive, distinct, and very powerful emotions that needed to be expressible in a monosyllable when necessary, while their counterparts are less commonly expressed.</para>
     <para>(Why the overt bias? Because there are a lot of attitudinals and they will be difficult to learn as an entire set. By aligning our scales arbitrarily, we give the monosyllable 
     <quote>nai</quote>a useful meaning and make it easier for a novice to recognize at least the positive or negative alignment of an indicator, if not the specific word. Other choices considered were 
     <quote>random</quote>orientation, which would have unknown biases and be difficult to learn, and orientation based on our guesses as to which scale orientations made the most frequent usages shorter, which would be biased in favor of American perceptions of 
     <quote>usefulness</quote>. If bias must exist in our indicator set, it might as well be a known bias that eases learning, and in addition might as well favor a harmonious and positive world-view.)</para>
     <para>In fact, though, each emotional scale has seven positions defined, three 
     <quote>positive</quote>ones (shown below on the left), three 
     <quote>negative</quote>ones (shown below on the right), and a neutral one indicating that no particular attitude on this scale is felt. The following chart indicates the seven positions of the scale and the associated cmavo. All of these cmavo, except 
     <quote>nai</quote>, are in selma'o CAI.</para>
     <programlisting xml:space="preserve">
-       cai       sai       ru'e      cu'i      nairu'e   naisai    naicai
+       cai       sai       ru'e      cu'i      nairu'e   naisai    naicai 
+<!-- skip cmavo list automation -->
        [carmi]   [tsali]   [ruble]   [cumki]
 </programlisting>
     <para>A scalar attitude is expressed by using the attitudinal word, and then following it by the desired scalar intensity. The bias creeps in because the 
     <quote>negative</quote>emotions take the extra syllable 
     <quote>nai</quote>to indicate their negative position on the axis, and thus require a bit more effort to express.</para>
     <para>Much of this system is optional. You can express an attitude without a scale indicator, if you don't want to stop and think about how strongly you feel. Indeed, for most attitudinals, we've found that either no scalar value is used, or 
     <quote>cai</quote>is used to indicate especially high intensity. Less often, 
     <quote>ru'e</quote>is used for a recognizably weak intensity, and 
     <quote>cu'i</quote>is used in response to the attitudinal question 
     <quote>pei</quote>(see 
@@ -574,64 +581,67 @@
     <quote>I'm awed</quote>is not the same as saying 
     <quote>Wow!!!</quote>. The Lojban system is intended to give the effects of an analytical system without the thought involved. Thus, you can simply feel in Lojban.</para>
     <para>A nice feature of this design is that you can be simple or complex, and the system works the same way. The most immediate benefit is in learning. You only need to learn a couple of the scale words and a couple of attitude words, and you're ready to express your emotions Lojbanically. As you learn more, you can express your emotions more thoroughly and more precisely, but even a limited vocabulary offers a broad range of expression.</para>
   </section>
   <section xml:id="cll_chapter13-section6">
     <title>6. Emotional categories</title>
     <para>The Lojban attitudinal system was designed by starting with a long list of English emotion words, far too many to fit into the 39 available VV-form cmavo. To keep the number of cmavo limited, the emotion words in the list were grouped together by common features: each group was then assigned a separate cmavo. This was like making tanru in reverse, and the result is a collection of indicators that can be combined, like tanru, to express very complex emotions. Some examples in a moment.</para>
     <para>The most significant 
     <quote>common feature</quote>we identified was that the emotional words on the list could easily be broken down into six major groups, each of which was assigned its own cmavo:</para>
     <programlisting xml:space="preserve">
-       ro'a    social          asocial           antisocial
+       ro'a    social          asocial           antisocial 
+<!-- skip cmavo list automation -->
        ro'e    mental                            mindless
        ro'i    emotional                         denying emotion
        ro'o    physical                          denying physical
        ro'u    sexual                            sexual abstinence
        re'e    spiritual       secular           sacrilegious
 </programlisting>
     <para>Using these, we were able to assign 
     <quote>o'u</quote>to mark a scale of what we might call 
     <quote>generalized comfort</quote>. When you are comfortable, relaxed, satisfied, you express comfort with 
     <quote>o'u</quote>, possibly followed by a scale indicator to indicate how comfortable you are. The six cmavo given above allow you to turn this scale into six separate ones, should you wish.</para>
     <para>For example, embarrassment is a social discomfort, expressible as 
     <quote>.o'unairo'a</quote>. Some emotions that we label 
     <quote>stress</quote>in English are expressed in Lojban with 
     <quote>.o'unairo'i</quote>. Physical distress can be expressed with 
     <quote>.o'unairo'o</quote>, which makes a nice groan if you say it with feeling. Mental discomfort might be what you feel when you don't know the answer to the test question, but feel that you should. Most adults can recall some instance where we felt sexual discomfort, 
     <quote>o'unairo'u</quote>. Spiritual discomfort, 
     <quote>o'unaire'e</quote>, might be felt by a church-goer who has wandered into the wrong kind of religious building.</para>
     <para>Most of the time when expressing an emotion, you won't categorize it with these words. Emotional expressions should be quickly expressible without having to think about them. However, we sometimes have mixed emotions within this set, as for example emotional discomfort coupled with physical comfort or vice versa.</para>
-    <para>Coupling these six words with our 39 attitude scales, each of which has a positive and negative side, already gives you far more emotional expression words than we have emotional labels in English. Thus, you'll never see a Lojban-English emotional dictionary that covers all the Lojban possibilities. Some may be useless, but others convey emotions that probably never had a word for them before, though many have felt them (
+    <para>Coupling these six words with our 39 attitude scales, each of which has a positive and negative side, already gives you far more emotional expression words than we have emotional labels in English. Thus, you'll never see a Lojban-English emotional dictionary that covers all the Lojban possibilities. Some may be useless, but others convey emotions that probably never had a word for them before, though many have felt them ( 
     <quote>.eiro'u</quote>, for example - look it up).</para>
     <para>You can use scale markers and 
     <quote>nai</quote>on these six category words, and you can also use category words without specifying the emotion. Thus, 
     <quote>I'm trying to concentrate</quote>could be expressed simply as 
     <quote>ro'e</quote>, and if you are feeling anti-social in some non-specific way, 
     <quote>ro'anai</quote>will express it.</para>
     <para>There is a mnemonic device for the six emotion categories, based on moving your arms about. In the following table, your hands begin above your head and move down your body in sequence.</para>
     <programlisting xml:space="preserve">
-       ro'a    hands above head       social
+       ro'a    hands above head       social 
+<!-- skip cmavo list automation -->
        ro'e    hands on head          intellectual
        ro'i    hands on heart         emotional
        ro'o    hands on belly         physical
        ro'u    hands on groin         sexual
        re'e    hands moving around    spiritual
 </programlisting>
     <para>The implicit metaphors 
     <quote>heart</quote>for emotional and 
     <quote>belly</quote>for physical are not really Lojbanic, but they work fine for English-speakers.</para>
   </section>
   <section xml:id="cll_chapter13-section7">
     <title>7. Attitudinal modifiers</title>
     <para>The following cmavo are discussed in this section:</para>
     <programlisting xml:space="preserve">
-    ga'i    [galtu]        hauteur            equal rank      meekness
+    ga'i    [galtu]        hauteur            equal rank      meekness 
+<!-- skip cmavo list automation -->
                            rank                               lack of rank
 
     le'o                   aggressive         passive         defensive
 
     vu'e    [vrude]        virtue (zabna)                     sin (mabla)
 
     se'i    [sevzi]        self-orientation                   other-orientation
 
     ri'e    [zifre]        release            restraint       control
 
@@ -848,23 +858,23 @@
     <para>Within a string of indicators, there will be conventions of interpretation which amount to a kind of second-order grammar. Each of the modifier words is presumed to modify an indicator to the left, if there is one. (There is an 
     <quote>unspecified emotion</quote>word, 
     <quote>ge'e</quote>, reserved to ensure that if you want to express a modifier without a root emotion, it doesn't attach to and modify a previous but distinct emotional expression.)</para>
     <para>For example, 
     <quote>.ieru'e</quote>expresses a weak positive value on the scale of agreement: the speaker agrees (presumably with the listener or with something else just stated), but with the least possible degree of intensity. But 
     <quote>.ie ge'eru'e</quote>expresses agreement (at an unspecified level), followed by some other unstated emotion which is felt at a weak level. A rough English equivalent of 
     <quote>.ie ge'eru'e</quote>might be 
     <quote>I agree, but ...</quote>where the 
     <quote>but</quote>is left hanging. (Again, attitudes aren't always expressed in English by English attitudinals.)</para>
     <para>A scale variable similarly modifies the previous emotion word. You put the scale word for a root emotion word before a modifier, since the latter can have its own scale word. This merely maximizes the amount of information expressible. For example, 
-    <quote>.oinaicu'i ro'ucai</quote>expresses a feeling midway between pain (
-    <quote>.oi</quote>) and pleasure (
-    <quote>.oinai</quote>) which is intensely sexual (
+    <quote>.oinaicu'i ro'ucai</quote>expresses a feeling midway between pain ( 
+    <quote>.oi</quote>) and pleasure ( 
+    <quote>.oinai</quote>) which is intensely sexual ( 
     <quote>ro'u</quote>) in nature.</para>
     <para>The cmavo 
     <quote>nai</quote>is the most tightly bound modifier in the language: it always negates exactly one word - the preceding one. Of all the words used in indicator constructs, 
     <quote>nai</quote>is the only one with any meaning outside the indicator system. If you try to put an indicator between a non-indicator cmavo and its 
     <quote>nai</quote>negator, the 
     <quote>nai</quote>will end up negating the last word of the indicator. The result, though unambiguous, is not what you want. For example,</para>
     <example role="interlinear-gloss-example" xml:id="random-id-9BBA">
       <title>
         <anchor xml:id="c13e8d1" />
         <anchor xml:id="cll_chapter13-section8-example1" />
@@ -935,21 +945,22 @@
     <para>can be interpreted as expressing complaint about the anger, in which case it means 
     <quote>Damn, I snapped at you</quote>; or as expressing both anger and complaint about the listener, in which case it means 
     <quote>I told you, you pest!</quote></para>
     <para>Similarly, an indicator after the final brivla of a tanru may be taken to express an attitude about the particular brivla placed there - as the rules have it - or about the entire bridi which hinges on that brivla. Remembering that indicators are supposedly direct expressions of emotion, this ambiguity is acceptable.</para>
     <para>Even if the scope rules given for indicators turn out to be impractical or unintuitive for use in conversation, they are still useful in written expression. There, where you can go back and put in markers or move words around, the scope rules can be used in lieu of elaborate nuances of body language and intonation to convey the writer's intent.</para>
   </section>
   <section xml:id="cll_chapter13-section10">
     <title>10. Attitude questions; empathy; attitude contours</title>
     <para>The following cmavo are discussed in this section:</para>
     <programlisting xml:space="preserve">
-     pei           attitude question
+     pei           attitude question 
+<!-- skip cmavo list automation -->
      dai           empathy
      bu'o          start emotion       continue emotion    end emotion
 </programlisting>
     <para>You can ask someone how they are feeling with a normal bridi sentence, but you will get a normal bridi answer in response, one which may be true or false. Since the response to a question about emotions is no more logical than the emotion itself, this isn't appropriate.</para>
     <para>The word 
     <quote>pei</quote>is therefore reserved for attitude questions. Asked by itself, it captures all of the denotation of English 
     <quote>How are you?</quote>coupled with 
     <quote>How do you feel?</quote>(which has a slightly different range of usage).</para>
     <para>When asked in the context of discourse, 
     <quote>pei</quote>acts like other Lojban question words - it requests the respondent to 
@@ -1099,21 +1110,22 @@
       </interlinear-gloss>
     </example>
     <para>which is a straightforward bridi claim. 
     <xref linkend="cll_chapter13-section10-example13" />states that you have (or have had) certain emotions; 
     <xref linkend="cll_chapter13-section10-example12" />expresses those emotions directly.</para>
   </section>
   <section xml:id="cll_chapter13-section11">
     <title>11. Evidentials</title>
     <para>The following cmavo are discussed in this section:</para>
     <programlisting xml:space="preserve">
-     ja'o    [jalge]     I conclude
+     ja'o    [jalge]     I conclude 
+<!-- skip cmavo list automation -->
      ca'e                I define
      ba'a    [balvi]     I expect      I experience        I remember
      su'a    [sucta]     I generalize                      I particularize
      ti'e    [tirna]     I hear (hearsay)
      ka'u    [kulnu]     I know by cultural means
      se'o    [senva]     I know by internal experience
      za'a    [zgana]     I observe
      pe'i    [pensi]     I opine
      ru'a    [sruma]     I postulate
      ju'a    [jufra]     I state
@@ -1260,21 +1272,22 @@
     <quote>however</quote>, 
     <quote>summarizing</quote>, 
     <quote>in conclusion</quote>, and 
     <quote>for example</quote>.</para>
     <para>Discursives are not attitudinals: they express no particular emotion. Rather, they are abbreviations for metalinguistic claims that reference the sentence or text they are found in.</para>
     <para>Discursives are most often used at the beginning of sentences, often attached to the 
     <quote>.i</quote>that separates sentences in running discourse, but can (like all other indicators) be attached to single words when it seems necessary or useful.</para>
     <para>The discursives discussed in this section are given in groups, roughly organized by function. First, the 
     <quote>consecutive discourse</quote>group:</para>
     <programlisting xml:space="preserve">
-    ku'i    [karbi]             however/but/in contrast
+    ku'i    [karbi]             however/but/in contrast 
+<!-- skip cmavo list automation -->
     ji'a    [jmina]             additionally
     si'a    [simsa]             similarly
     mi'u    [mintu]             ditto
     po'o                        the only relevant case
 </programlisting>
     <para>These five discursives are mutually exclusive, and therefore they are not usually considered as scales. The first four are used in consecutive discourse. The first, 
     <quote>ku'i</quote>, makes an exception to the previous argument. The second, 
     <quote>ji'a</quote>, adds weight to the previous argument. The third, 
     <quote>si'a</quote>, adds quantity to the previous argument, enumerating an additional example. The fourth, 
     <quote>mi'u</quote>, adds a parallel case to the previous argument, and can also be used in tables or the like to show that something is being repeated from the previous column. It is distinct from 
@@ -1309,40 +1322,42 @@
         <gloss>I hit my cousin at-locus the nose [only].</gloss>
         <en>I hit my cousin only on his nose (nowhere else).</en>
       </interlinear-gloss>
     </example>
     <para>Note that 
     <quote>only</quote>can go before or after what it modifies in English, but 
     <quote>po'o</quote>, as an indicator, always comes afterward.</para>
     <para>Next, the 
     <quote>commentary on words</quote>group:</para>
     <programlisting xml:space="preserve">
-    va'i [valsi]    in other words                   in the same words
+    va'i [valsi]    in other words                   in the same words 
+<!-- skip cmavo list automation -->
     ta'u [tanru]    expanding a tanru                making a tanru
 </programlisting>
     <para>The discursives 
     <quote>va'i</quote>and 
     <quote>ta'u</quote>operate at the level of words, rather than discourse proper, or if you like, they deal with how things are said. An alternative English expression for 
     <quote>va'i</quote>is 
     <quote>rephrasing</quote>; for 
     <quote>va'inai</quote>, 
     <quote>repeating</quote>. Also compare 
     <quote>va'i</quote>with 
     <quote>ke'u</quote>, discussed below.</para>
     <para>The cmavo 
     <quote>ta'u</quote>is a discursive unique to Lojban; it expresses the particularly Lojbanic device of tanru. Since tanru are semantically ambiguous, they are subject to misunderstanding. This ambiguity can be removed by expanding the tanru into some semantically unambiguous structure, often involving relative clauses or the introduction of additional brivla. The discursive 
     <quote>ta'u</quote>marks the transition from the use of a brief but possibly confusing tanru to its fuller, clearer expansion; the discursive 
     <quote>ta'unai</quote>marks a transition in the reverse direction.</para>
     <para>Next, the 
     <quote>commentary on discourse</quote>group:</para>
     <programlisting xml:space="preserve">
-    li'a [klina]    clearly                          obscurely
+    li'a [klina]    clearly                          obscurely 
+<!-- skip cmavo list automation -->
                     obviously
     ba'u [banli]    exaggeration       accuracy      understatement
     zo'o            humorously         dully         seriously
     sa'e [satci]    precisely speaking               loosely speaking
     to'u [tordu]    in brief                         in detail
     do'a [dunda]    generously                       parsimoniously
     sa'u [sampu]    simply                           elaborating
     pa'e [pajni]    justice                          prejudice
     je'u [jetnu]    truly                            falsely
 </programlisting>
@@ -1375,30 +1390,32 @@
     <quote>je'unai</quote>then serves to mark a logical contradiction. In addition, 
     <quote>je'unai</quote>can be used to express one kind of sarcasm or irony, where the speaker pretends to believe what he/she says, but actually wishes the listener to infer a contrary opinion. Other forms of irony can be marked with 
     <quote>zo'o</quote>(humor) or 
     <quote>.ianai</quote>(disbelief).</para>
     <para>When used as a discursive, 
     <quote>su'a</quote>(see 
     <xref linkend="cll_chapter13-section11" />) belongs to this group.</para>
     <para>Next, the 
     <quote>knowledge</quote>group:</para>
     <programlisting xml:space="preserve">
-    ju'o [djuno]    certainly          uncertain     certainly not
+    ju'o [djuno]    certainly          uncertain     certainly not 
+<!-- skip cmavo list automation -->
     la'a [lakne]    probably                         improbably
 </programlisting>
     <para>These two discursives describe the speaker's state of knowledge about the claim of the associated bridi. They are similar to the propositional attitudes of 
     <xref linkend="cll_chapter13-section3" />, as they create a hypothetical world. We may be quite certain that something is true, and label our bridi with 
     <quote>ju'o</quote>; but it may be false all the same.</para>
     <para>Next, the 
     <quote>discourse management</quote>group:</para>
     <programlisting xml:space="preserve">
-    ta'o [tanjo]  by the way                         returning to point
+    ta'o [tanjo]  by the way                         returning to point 
+<!-- skip cmavo list automation -->
     ra'u [ralju]  chiefly              equally       incidentally
     mu'a [mupli]  for example          omitting      end examples
                                         examples
     zu'u          on the one hand                    on the other hand
     ke'u [krefu]  repeating                          continuing
     da'i          supposing                          in fact
 </programlisting>
     <para>This final group is used to perform what may be called 
     <quote>managing the discourse</quote>: providing reference points to help the listener understand the flow from one sentence to the next.</para>
     <para>Other English equivalents of 
@@ -1424,24 +1441,24 @@
     <quote>va'inai</quote>are quite different. Both 
     <quote>ke'u</quote>and 
     <quote>va'i</quote>indicate that the same idea is going to be expressed using different words, but the two cmavo differ in emphasis. Using 
     <quote>ke'u</quote>emphasizes that the content is the same; using 
     <quote>va'i</quote>emphasizes that the words are different. Therefore, 
     <quote>ke'unai</quote>shows that the content is new (and therefore the words are also); 
     <quote>va'inai</quote>shows that the words are the same (and therefore so is the content). One English equivalent of 
     <quote>ke'unai</quote>is 
     <quote>furthermore</quote>.</para>
     <para>The discursive 
-    <quote>da'i</quote>marks the discourse as possibly taking a non-real-world viewpoint (
+    <quote>da'i</quote>marks the discourse as possibly taking a non-real-world viewpoint ( 
     <quote>Supposing that</quote>, 
     <quote>By hypothesis</quote>), whereas 
-    <quote>da'inai</quote>insists on the real-world point of view (
+    <quote>da'inai</quote>insists on the real-world point of view ( 
     <quote>In fact</quote>, 
     <quote>In truth</quote>, 
     <quote>According to the facts</quote>). A common use of 
     <quote>da'i</quote>is to distinguish between:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-v6BU">
       <title>
         <anchor xml:id="c13e12d5" />
         <anchor xml:id="cll_chapter13-section12-example5" />
       </title>
       <interlinear-gloss>
@@ -1477,21 +1494,22 @@
       </interlinear-gloss>
     </example>
     <para>is the equivalent of either 
     <xref linkend="cll_chapter13-section12-example5" />or 
     <xref linkend="cll_chapter13-section12-example6" />.)</para>
   </section>
   <section xml:id="cll_chapter13-section13">
     <title>13. Miscellaneous indicators</title>
     <para>Some indicators do not fall neatly into the categories of attitudinal, evidential, or discursive. This section discusses the following miscellaneous indicators:</para>
     <programlisting xml:space="preserve">
-     ki'a    metalinguistic confusion
+     ki'a    metalinguistic confusion 
+<!-- skip cmavo list automation -->
      na'i    metalinguistic negator
      jo'a    metalinguistic affirmer
      li'o    omitted text (quoted material)
      sa'a    material inserted by editor/narrator
      xu      true-false question
      pau     question premarker                      rhetorical question
      pe'a    figurative language                     literal language
      bi'u    new information                         old information
      ge'e    non-specific indicator
 </programlisting>
@@ -1677,134 +1695,148 @@
     <quote>Hello, X</quote>; 
     <quote>Greetings, X</quote>; indicates a greeting to the listener.</para>
     <programlisting xml:space="preserve">
    co'o                partings
 </programlisting>
     <para>
     <quote>Good-bye, X</quote>; indicates parting from immediate company by either the speaker or the listener. 
     <quote>coico'o</quote>means 
     <quote>greeting in passing</quote>.</para>
     <programlisting xml:space="preserve">
-   ju'i [jundi]        attention     at ease       ignore me/us
+   ju'i [jundi]        attention     at ease       ignore me/us 
+<!-- skip cmavo list automation -->
 </programlisting>
     <para>
     <quote>Attention/Lo/Hark/Behold/Hey!/Listen, X</quote>; indicates an important communication that the listener should listen to.</para>
     <programlisting xml:space="preserve">
-   nu'e [nupre]        promise   release promise   non-promise
+   nu'e [nupre]        promise   release promise   non-promise 
+<!-- skip cmavo list automation -->
 </programlisting>
     <para>
     <quote>I promise, X</quote>; indicates a promise to the listener. In some contexts, 
     <quote>nu'e</quote>may be prefixed to an oath or other formal declaration.</para>
     <programlisting xml:space="preserve">
-   ta'a [tavla]        interruption
+   ta'a [tavla]        interruption 
+<!-- skip cmavo list automation -->
 </programlisting>
     <para>
     <quote>I interrupt, X</quote>, 
     <quote>I desire the floor, X</quote>; a vocative expression to (possibly) interrupt and claim the floor to make a statement or expression. This can be used for both rude and polite interruptions, although rude interruptions will probably tend not to use a vocative at all. An appropriate response to an interruption might be 
     <quote>re'i</quote>(or 
     <quote>re'inai</quote>to ignore the interruption).</para>
     <programlisting xml:space="preserve">
-   pe'u [cpedu]        request
+   pe'u [cpedu]        request 
+<!-- skip cmavo list automation -->
 </programlisting>
     <para>
     <quote>Please, X</quote>; indicates a request to the listener. It is a formal, non-attitudinal, equivalent of 
     <quote>.e'o</quote>with a specific recipient being addressed. On the other hand, 
     <quote>.e'o</quote>may be used when there is no specific listener, but merely a 
     <quote>sense of petition floating in the air</quote>, as it were.</para>
     <programlisting xml:space="preserve">
-   ki'e [ckire]        appreciation                disappreciation
+   ki'e [ckire]        appreciation                disappreciation 
+<!-- skip cmavo list automation -->
                        gratitude                   ingratitude
 </programlisting>
     <para>
     <quote>Thank you, X</quote>; indicates appreciation or gratitude toward the listener. The usual response is 
     <quote>je'e</quote>, but 
     <quote>fi'i</quote>is appropriate on rare occasions: see the explanation of 
     <quote>fi'i</quote>.</para>
     <programlisting xml:space="preserve">
-   fi'i [friti]        welcome,                    unwelcome,
+   fi'i [friti]        welcome,                    unwelcome, 
+<!-- skip cmavo list automation -->
                        offering                    inhospitality
 </programlisting>
     <para>
     <quote>At your service, X</quote>; 
     <quote>Make yourself at home, X</quote>; offers hospitality (possibly in response to thanks, but not necessarily) to the listener. Note that 
     <quote>fi'i</quote>is 
     <emphasis>not</emphasis>the equivalent of American English 
     <quote>You're welcome</quote>as a mechanical response to 
     <quote>Thank you</quote>; that is 
     <quote>je'e</quote>, as noted below.</para>
     <programlisting xml:space="preserve">
-   be'e [benji]        request to send
+   be'e [benji]        request to send 
+<!-- skip cmavo list automation -->
 </programlisting>
     <para>
     <quote>Request to send to X</quote>; indicates that the speaker wishes to express something, and wishes to ensure that the listener is listening. In a telephone conversation, can be used to request the desired conversant(s). A more colloquial equivalent is 
     <quote>Hello? Can I speak to X?</quote>.</para>
     <programlisting xml:space="preserve">
-   re'i [bredi]        ready to receive            not ready
+   re'i [bredi]        ready to receive            not ready 
+<!-- skip cmavo list automation -->
 </programlisting>
     <para>
     <quote>Ready to receive, X</quote>; indicates that the speaker is attentive and awaiting communication from the listener. It can be used instead of 
     <quote>mi'e</quote>to respond when called to the telephone. The negative form can be used to prevent the listener from continuing to talk when the speaker is unable to pay attention: it can be translated 
     <quote>Hold on!</quote>or 
     <quote>Just a minute</quote>.</para>
     <programlisting xml:space="preserve">
-   mu'o [mulno]        completion of utterance     more to follow
+   mu'o [mulno]        completion of utterance     more to follow 
+<!-- skip cmavo list automation -->
 </programlisting>
     <para>
     <quote>Over, X</quote>; indicates that the speaker has completed the current utterance and is ready to hear a response from the listener. The negative form signals that the pause or non-linguistic sound which follows does not represent the end of the current utterance: more colloquially, 
     <quote>I'm not done talking!</quote></para>
     <programlisting xml:space="preserve">
-   je'e [jimpe]        successful receipt          unsuccessful receipt
+   je'e [jimpe]        successful receipt          unsuccessful receipt 
+<!-- skip cmavo list automation -->
 </programlisting>
     <para>
     <quote>Roger, X!</quote>, 
     <quote>I understand</quote>; acknowledges the successful receipt of a communication from the listener. The negative form indicates failure to receive correctly, and is usually followed by 
     <quote>ke'o</quote>. The colloquial English equivalents of 
     <quote>je'e</quote>and 
     <quote>je'enai</quote>are the grunt typically written 
     <quote>uh-huh</quote>and 
     <quote>What?/Excuse me?</quote>. 
     <quote>je'e</quote>is also used to mean 
     <quote>You're welcome</quote>when that is a response to 
     <quote>Thank you</quote>.</para>
     <programlisting xml:space="preserve">
-    vi'o               will comply                 will not comply
+    vi'o               will comply                 will not comply 
+<!-- skip cmavo list automation -->
 </programlisting>
     <para>
     <quote>Wilco, X</quote>, 
     <quote>I understand and will comply</quote>. Similar to 
     <quote>je'e</quote>but signals an intention (similar to 
     <quote>.ai</quote>) to comply with the other speaker's request. This cmavo is the main way of saying 
     <quote>OK</quote>in Lojban, in the usual sense of 
     <quote>Agreed!</quote>, although 
     <quote>.ie</quote>carries some of the same meaning. The negative form indicates that the message was received but that you will not comply: a very colloquial version is 
     <quote>No way!</quote>.</para>
     <programlisting xml:space="preserve">
-    ke'o [krefu]       please repeat               no repeat needed
+    ke'o [krefu]       please repeat               no repeat needed 
+<!-- skip cmavo list automation -->
 </programlisting>
     <para>
     <quote>What did you say, X?</quote>; a request for repetition or clarification due to unsuccessful receipt or understanding. This is the vocative equivalent of 
     <quote>ki'a</quote>, and is related to 
     <quote>je'enai</quote>. The negative form may be rendered 
     <quote>Okay, already; I get the point!</quote></para>
     <programlisting xml:space="preserve">
-    fe'o [fanmo]       end of communication        not done
+    fe'o [fanmo]       end of communication        not done 
+<!-- skip cmavo list automation -->
 </programlisting>
     <para>
     <quote>Over and out, X</quote>; indicates completion of statement(s) and communication directed at the identified person(s). Used to terminate a letter if a signature is not required because the sender has already been identified (as in memos). The negative form means 
     <quote>Wait, hold it, we're not done!</quote>and differs from 
     <quote>mu'onai</quote>in that it means more exchanges are to follow, rather than that the current exchange is incomplete.</para>
     <para>Do not confuse 
     <quote>fe'o</quote>with 
     <quote>fa'o</quote>(selma'o FAhO) which is a mechanical, extra-grammatical signal that a text is complete. One may say 
     <quote>fe'o</quote>to one participant of a multi-way conversation and then go on speaking to the others.</para>
     <programlisting xml:space="preserve">
-    mi'e [cmavo: mi]   self-identification         non-identification
+    mi'e [cmavo: mi]   self-identification         non-identification 
+<!-- skip cmavo list automation -->
 </programlisting>
     <para>
     <quote>And I am X</quote>; a generalized self-vocative. Although grammatically just like the other members of selma'o COI, 
     <quote>mi'e</quote>is quite different semantically. In particular, rather than specifying the listener, the person whose name (or description) follows 
     <quote>mi'e</quote>is taken to be the speaker. Therefore, using 
     <quote>mi'e</quote>specifies the meaning of the pro-sumti 
     <quote>mi</quote>. It can be used to introduce oneself, to close letters, or to identify oneself on the telephone.</para>
     <para>This cmavo is often combined with other members of COI: 
     <quote>fe'omi'e</quote>would be an appropriate closing at the end of a letter; 
     <quote>re'imi'e</quote>would be a self-vocative used in delayed responses, as when called to the phone, or possibly in a roll-call. As long as the 
diff --git a/todocbook/14.xml b/todocbook/14.xml
index a71743f..0db3f01 100644
--- a/todocbook/14.xml
+++ b/todocbook/14.xml
@@ -93,21 +93,21 @@
 <quote>John is not a man, or James is not a woman</quote>         (false, true )  is true;
        
 <quote>John is not a man, or James is a woman</quote>             (false, false)  is false.
 </programlisting>
     <para>Note that the kind of 
     <quote>or</quote>used in this example can also be expressed (in formal English) with 
     <quote>and/or</quote>. There is a different truth table for the kind of 
     <quote>or</quote>that means 
     <quote>either ... or ... but not both</quote>.</para>
     <para>To save space, we will write truth tables in a shorter format henceforth. Let the letters T and F stand for True and False. The rows will always be given in the order shown above: TT, TF, FT, FF for the two sentences. Then it is only necessary to give the four letters from the result column, which can be written TTTF, as can be seen by reading down the third column of the table above. So TTTF is the abbreviated truth table for the 
-    <quote>or</quote>truth function. Here are the 16 possible truth functions, with an English version of what it means to assert that each function is, in fact, true (
+    <quote>or</quote>truth function. Here are the 16 possible truth functions, with an English version of what it means to assert that each function is, in fact, true ( 
     <quote>first</quote>refers to the first sentence, and 
     <quote>second</quote>to the second sentence):</para>
     <programlisting xml:space="preserve">
     TTTT    (always true)
     TTTF    first is true and/or second is true.
     TTFT    first is true if second is true.
     TTFF    first is true whether or not second is true.
     TFTT    first is true only if second is true.
     TFTF    whether or not first is true, second is true.
     TFFT    first is true if and only if second is true.
@@ -808,21 +808,21 @@
     <xref linkend="cll_chapter14-section8-example1" />and 
     <xref linkend="cll_chapter14-section8-example2" />. This rule may be occasionally exploited for special effects, but is tricky to keep straight; in writing intended to be easy to understand, multiple consecutive connectives marked with 
     <quote>bo</quote>should be avoided.</para>
     <para>The use of 
     <quote>bo</quote>, therefore, gets tricky in complex connections of more than three sentences. Looking back at the English translations of 
     <xref linkend="cll_chapter14-section7-example7" />and 
     <xref linkend="cll_chapter14-section7-example8" />, parentheses were used to clarify the grouping. These parentheses have their Lojban equivalents, two sets of them actually. 
     <quote>tu'e</quote>and 
     <quote>tu'u</quote>are used with ijeks, and 
     <quote>ke</quote>and 
-    <quote>ke'e</quote>with eks and other connectives to be discussed later. (
+    <quote>ke'e</quote>with eks and other connectives to be discussed later. ( 
     <quote>ke</quote>and 
     <quote>ke'e</quote>are also used in other roles in the language, but always as grouping markers). Consider the English sentence:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-aqIg">
       <title>
         <anchor xml:id="c14e8d4" />
         <anchor xml:id="cll_chapter14-section8-example4" />
       </title>
       <interlinear-gloss>
         <jbo>I kiss you and you kiss me, if I love you and you love me.</jbo>
       </interlinear-gloss>
@@ -1636,27 +1636,47 @@
         <en>Is-it-true-that Fido is-a-dog or is-a-cat (but not both)?</en>
       </interlinear-gloss>
     </example>
     <para>Given that Fido really is either a dog or a cat, the appropriate answer would be 
     <quote>go'i</quote>; if Fido were a fish, the appropriate answer would be 
     <quote>nago'i</quote>.</para>
     <para>But that is not what an English-speaker who utters 
     <xref linkend="cll_chapter14-section13-example5" />is asking! The true significance of 
     <xref linkend="cll_chapter14-section13-example5" />is that the speaker desires to know the truth value of either of the two underlying bridi (it is presupposed that only one is true).</para>
     <para>Lojban has an elegant mechanism for rendering this kind of question which is very unlike that used in English. Instead of asking about the truth value of the connected bridi, Lojban users ask about the truth function which connects them. This is done by using a special question cmavo: there is one of these for each of the logical connective selma'o, as shown by the following table:</para>
-    <programlisting xml:space="preserve">
-    ge'i    GA         forethought connective question
-    gi'i    GIhA       bridi-tail connective question
-    gu'i    GUhA       tanru forethought connective question
-    je'i    JA         tanru connective question
-    ji      A          sumti connective question
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ge'i</cmavo>
+        <selmaho>GA</selmaho>
+        <description>forethought connective question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>gi'i</cmavo>
+        <selmaho>GIhA</selmaho>
+        <description>bridi-tail connective question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>gu'i</cmavo>
+        <selmaho>GUhA</selmaho>
+        <description>tanru forethought connective question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>je'i</cmavo>
+        <selmaho>JA</selmaho>
+        <description>tanru connective question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ji</cmavo>
+        <selmaho>A</selmaho>
+        <description>sumti connective question</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>(This list unfortunately departs from the pretty regularity of the other cmavo for logical connection. The two-syllable selma'o, GIhA and GUhA, make use of the cmavo ending in 
     <quote>-i</quote>which is not used for a truth function, but 
     <quote>gi</quote>and 
     <quote>.i</quote>were not available, and different cmavo had to be chosen. This table must simply be memorized, like most other non-connective cmavo assignments.)</para>
     <para>One correct translation of 
     <xref linkend="cll_chapter14-section13-example5" />employs a question gihek:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-G1Xs">
       <title>
         <anchor xml:id="c14e13d8" />
         <anchor xml:id="cll_chapter14-section13-example8" />
@@ -2783,21 +2803,21 @@
         <anchor xml:id="c14e19d4" />
         <anchor xml:id="cll_chapter14-section19-example4" />
       </title>
       <interlinear-gloss>
         <jbo>mi jinvi le du'u loi jmive cu zvati la .iupiter.</jbo>
         <gloss>.ijonai mi jinvi le du'u loi jmive cu zvati la .iupiter.</gloss>
         <gloss>I opine the fact-that a-mass-of living-things is-at Jupiter</gloss>
         <en>or-else I opine the fact-that a-mass-of living-things isn't-at Jupiter</en>
       </interlinear-gloss>
     </example>
-    <para>is false, since I have no evidence one way or the other (
+    <para>is false, since I have no evidence one way or the other ( 
     <quote>jinvi</quote>requires some sort of evidence, real or fancied, unlike 
     <quote>krici</quote>).</para>
   </section>
   <section xml:id="cll_chapter14-section20">
     <title>20. Constructs and appropriate connectives</title>
     <para>The following table specifies, for each kind of construct that can be logically or non-logically connected in Lojban, what kind of connective is required for both afterthought and (when possible) forethought modes. An asterisk (*) indicates that tensed connection is permitted.</para>
     <para>A dash indicates that connection of the specified type is not possible.</para>
     <informaltable>
       <tgroup cols="5">
         <colspec colnum="1" colname="col1" />
diff --git a/todocbook/15.xml b/todocbook/15.xml
index efda8d9..5b2016a 100644
--- a/todocbook/15.xml
+++ b/todocbook/15.xml
@@ -511,26 +511,32 @@
       </title>
       <interlinear-gloss>
         <jbo>John is moral</jbo>
         <jbo>John is immoral</jbo>
       </interlinear-gloss>
     </example>
     <para>To be immoral is much more than to just be not moral: it implies the opposite condition. Statements like 
     <xref linkend="cll_chapter15-section3-example15" />are strong negations which not only deny the truth of a statement, but assert its opposite. Since, 
     <quote>opposite</quote>implies a scale, polar negations are a special variety of scalar negations.</para>
     <para>To examine this concept more closely, let us draw a linear scale, showing two examples of how the scale is used:</para>
-    <programlisting xml:space="preserve">
-    Affirmations (positive)      Negations (negative)
-    |-----------|-----------|-----------|-----------|
-    All       Most        Some         Few       None
-    Excellent Good        Fair         Poor     Awful
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>All Most Some</cmavo>
+        <selmaho>Few</selmaho>
+        <description>None</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>Excellent Good Fair</cmavo>
+        <selmaho>Poor</selmaho>
+        <description>Awful</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Some scales are more binary than the examples we diagrammed. Thus we have 
     <quote>not necessary</quote>or 
     <quote>unnecessary</quote>being the polar opposite of necessary. Another scale, especially relevant to Lojban, is interpreted based on situations modified by one's philosophy: 
     <quote>not true</quote>may be equated with 
     <quote>false</quote>in a bi-valued truth-functional logic, while in tri-valued logic an intermediate between 
     <quote>true</quote>and 
     <quote>false</quote>is permitted, and in fuzzy logic a continuous scale exists from true to false. The meaning of 
     <quote>not true</quote>requires a knowledge of which variety of truth scale is being considered.</para>
     <para>We will define the most general form of scalar negation as indicating only that the particular point or value in the scale or range is not valid and that some other (unspecified) point on the scale is correct. This is the intent expressed in most contexts by 
     <quote>not mild</quote>, for example.</para>
@@ -697,21 +703,21 @@
       <interlinear-gloss>
         <jbo>mi na'eke sutra cadzu [ke'e] lemi birka</jbo>
         <gloss>mi na'e (ke sutra cadzu [ke'e]) lemi birka</gloss>
         <en>I other-than-(quickly-walk-on) my-arms.</en>
         <jbo>mi na'eke sutra cadzu be lemi birka [ke'e]</jbo>
         <gloss>mi na'e (ke sutra cadzu be lemi birka [ke'e])</gloss>
         <en>I other-than-(quickly-walk-on my-arms).</en>
       </interlinear-gloss>
     </example>
     <para>The translations show that the negation in 
-    <xref linkend="cll_chapter15-section4-example10" />is more restricted in scope; i.e. less of the sentence is negated with respect to x1 (
+    <xref linkend="cll_chapter15-section4-example10" />is more restricted in scope; i.e. less of the sentence is negated with respect to x1 ( 
     <quote>mi</quote>).</para>
     <para>Logical scope being an important factor in Lojban's claims to be unambiguous, let us indicate the relative precedence of 
     <quote>na'e</quote>as an operator. Grouping with 
     <quote>ke</quote>and 
     <quote>ke'e</quote>, of course, has an overt scope, which is its advantage. 
     <quote>na'e</quote>is very close binding to its brivla. Internal binding of tanru, with 
     <quote>bo</quote>, is not as tightly bound as 
     <quote>na'e</quote>. 
     <quote>co</quote>, the tanru inversion operator has a scope that is longer than all other tanru constructs.</para>
     <para>In short, 
@@ -802,22 +808,22 @@
         <anchor xml:id="cll_chapter15-section4-example17" />
       </title>
       <interlinear-gloss>
         <jbo>lo ca nolraitru be le fasygu'e cu nalkrecau</jbo>
         <gloss>An-actual currently noblest-governor of the French country is-non-hair-without.</gloss>
         <en>The current King of France is a non-bald-one.</en>
       </interlinear-gloss>
     </example>
     <para>
     <xref linkend="cll_chapter15-section4-example16" />and 
-    <xref linkend="cll_chapter15-section4-example17" />express the predicate negation forms using a negation word (
-    <quote>na'e</quote>) or rafsi (
+    <xref linkend="cll_chapter15-section4-example17" />express the predicate negation forms using a negation word ( 
+    <quote>na'e</quote>) or rafsi ( 
     <quote>-nal-</quote>); yet they make positive assertions about the current King of France; ie., that he is other-than-bald or non-bald. This follows from the close binding of 
     <quote>na'e</quote>to the brivla. The lujvo form makes this overt by absorbing the negative marker into the word.</para>
     <para>Since there is no current King of France, it is false to say that he is bald, or non-bald, or to make any other affirmative claim about him. Any sentence about the current King of France containing only a selbri negation is as false as the sentence without the negation. No amount of selbri negations have any effect on the truth value of the sentence, which is invariably 
     <quote>false</quote>, since no affirmative statement about the current King of France can be true. On the other hand, bridi negation does produce a truth:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-Bwdy">
       <title>
         <anchor xml:id="c15e4d18" />
         <anchor xml:id="cll_chapter15-section4-example18" />
       </title>
       <interlinear-gloss>
@@ -1116,21 +1122,21 @@
     <xref linkend="cll_chapter13" />, most indicators have an implicit scale, and 
     <quote>nai</quote>changes the indicator to refer to the opposite end of the scale. Thus 
     <quote>.uinai</quote>expresses unhappiness, and 
     <quote>.ienai</quote>expresses disagreement (not ambivalence, which is expressed with the neutral or undecided intensity as 
     <quote>.iecu'i</quote>).</para>
     <para>Vocative cmavo of selma'o COI are considered a kind of indicator, but one which identifies the listener. Semantically, we could dispense with about half of the COI selma'o words based on the scalar paradigm. For example, 
     <quote>co'o</quote>could be expressed as 
     <quote>coinai</quote>. However, this is not generally done.</para>
     <para>Most of the COI cmavo are used in what are commonly called protocol situations. These protocols are used, for example, in radio conversations, which often take place in a noisy environment. The negatives of protocol words tend to convey diametrically opposite communications situations (as might be expected). Therefore, only one protocol vocative is dependent on 
     <quote>nai</quote>: negative acknowledgement, which is 
-    <quote>je'enai</quote>(
+    <quote>je'enai</quote>( 
     <quote>I didn't get that</quote>).</para>
     <para>Unlike the attitudinal indicators, which tend to be unimportant in noisy situations, the protocol vocatives become more important. So if, in a noisy environment, a protocol listener makes out only 
     <quote>nai</quote>, he or she can presume it is a negative acknowledgement and repeat transmission or otherwise respond accordingly. 
     <xref linkend="cll_chapter13" />provides more detail on this topic.</para>
     <para>The abstractors of selma'o NU follow the pattern of the tenses and modals. NU allows negative abstractions, especially in compound abstractions connected by logical connectives: 
     <quote>su'ujeninai</quote>, which corresponds to 
     <quote>su'u jenai ni</quote>just as 
     <quote>punai je ca</quote>corresponds to 
     <quote>pu naje ca</quote>. It is not clear how much use logically connected abstractors will be: see 
     <xref linkend="cll_chapter13" />.</para>
@@ -1256,22 +1262,22 @@
         <gloss>John previously other-than(went-to)</gloss>
         <en>[both] Paris and Rome.</en>
       </interlinear-gloss>
     </example>
     <para>He might have telephoned the two cities instead of going there. The unnecessary 
     <quote>ke</quote>and 
     <quote>ke'e</quote>would have been essential if the selbri had been a tanru.</para>
   </section>
   <section xml:id="cll_chapter15-section9">
     <title>9. Affirmations</title>
-    <para>There is an explicit positive form for both selma'o NA (
-    <quote>ja'a</quote>) and selma'o NAhE (
+    <para>There is an explicit positive form for both selma'o NA ( 
+    <quote>ja'a</quote>) and selma'o NAhE ( 
     <quote>je'a</quote>), each of which would supplant the corresponding negator in the grammatical position used, allowing one to assert the positive in response to a negative question or statement without confusion. Assuming the same context as in 
     <xref linkend="cll_chapter15-section8" />:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-KhoH">
       <title>
         <anchor xml:id="c15e9d1" />
         <anchor xml:id="cll_chapter15-section9-example1" />
       </title>
       <interlinear-gloss>
         <jbo>xu na go'i</jbo>
         <en>Is-it-true-that [false] [repeat previous]?</en>
@@ -1476,23 +1482,23 @@
     <quote>le'a</quote>has meaning 
     <quote>of category/class/type X</quote>, 
     <quote>ci'u</quote>has meaning 
     <quote>on scale X</quote>, and 
     <quote>ci'e</quote>, based on 
     <quote>ciste</quote>, can be used to talk about universes of discourse defined either as systems or sets of components, as shown in 
     <xref linkend="cll_chapter15-section8" />. 
     <quote>kai</quote>and 
     <quote>la'u</quote>also exist in BAI for discussing other quality and quantity errors.</para>
     <para>We have to make particular note of potential problems in the areas of undue quantity and incorrect scale/category. Assertions about the relationships between gismu are among the basic substance of the language. It is thus invalid to logically require that if something is blue, that it is colored, or if it is not-blue, then it is some other color. In Lojban, 
-    <quote>blanu</quote>(
+    <quote>blanu</quote>( 
     <quote>blue</quote>) is not explicitly defined as a 
-    <quote>skari</quote>(
+    <quote>skari</quote>( 
     <quote>color</quote>). Similarly, it is not implicit that the opposite of 
     <quote>good</quote>is 
     <quote>bad</quote>.</para>
     <para>This mutual independence of gismu is only an ideal. Pragmatically, people will categorize things based on their world-views. We will write dictionary definitions that will relate gismu, unfortunately including some of these world-view assumptions. Lojbanists should try to minimize these assumptions, but this seems a likely area where logical rules will break down (or where Sapir-Whorf effects will be made evident). In terms of negation, however, it is vital that we clearly preserve the capability of denying a presumably obvious scale or category assumption.</para>
     <para>Solecisms, grammatical and spelling errors will be marked by marking the offending word or phrase with 
     <quote>na'i</quote>(in the manner of any selma'o UI cmavo). In this sense, 
     <quote>na'i</quote>becomes equivalent to the English metalinguistic marker 
     <quote>[sic]</quote>. Purists may choose to use ZOI or LOhU/LEhU quotes or 
     <quote>sa'a</quote>-marked corrections to avoid repeating a truly unparsable passage, especially if a computer is to analyze the speech/text. See 
     <xref linkend="cll_chapter19" />for explanations of these usages.</para>
diff --git a/todocbook/16.xml b/todocbook/16.xml
index e9e3649..9174308 100644
--- a/todocbook/16.xml
+++ b/todocbook/16.xml
@@ -506,23 +506,23 @@
         <anchor xml:id="cll_chapter16-section5-example6" />
       </title>
       <interlinear-gloss>
         <jbo>ro da poi prenu cu se batci de poi gerku</jbo>
         <en>Every-X which is-a-person is-bitten-by some-Y which is-a-dog.</en>
       </interlinear-gloss>
     </example>
     <para>using the conversion operator 
     <quote>se</quote>(explained in 
     <xref linkend="cll_chapter5" />) to change the selbri 
-    <quote>batci</quote>(
+    <quote>batci</quote>( 
     <quote>bites</quote>) into 
-    <quote>se batci</quote>(
+    <quote>se batci</quote>( 
     <quote>is bitten by</quote>). The translation given in 
     <xref linkend="cll_chapter16-section5-example4" />uses the corresponding strategy in English, since English does not have prenexes (except in strained 
     <quote>logician's English</quote>). This implies that a sentence with both a universal and an existential variable can't be freely converted with 
     <quote>se</quote>; one must be careful to preserve the order of the variables.</para>
     <para>If a variable occurs more than once, then any 
     <quote>ro</quote>or 
     <quote>poi</quote>decorations are moved only to the first occurrence of the variable when the prenex is dropped. For example,</para>
     <example role="interlinear-gloss-example" xml:id="random-id-4nqt">
       <title>
         <anchor xml:id="c16e5d7" />
diff --git a/todocbook/17.xml b/todocbook/17.xml
index 2d0ff03..818a965 100644
--- a/todocbook/17.xml
+++ b/todocbook/17.xml
@@ -55,33 +55,56 @@
         <para>to get a lerfu word for a consonant, add 
         <quote>y</quote>;</para>
       </listitem>
       <listitem>
         <para>the lerfu word for 
         <quote>'</quote>is 
         <quote>.y'y</quote>.</para>
       </listitem>
     </itemizedlist>
     <para>Therefore, the following table represents the basic Lojban alphabet:</para>
-    <programlisting xml:space="preserve">
-    '      a      b      c      d      e
-    .y'y.  .abu   by.    cy.   dy.    .ebu
-
-    f      g      i      j      k      l
-    fy.    gy.    .ibu   jy.    ky.    ly.
-
-    m      n      o      p      r      s
-    my.    ny.    .obu   py.    ry.    sy.
-
-    t      u      v      x      y      z
-    ty.    .ubu   vy.    xy.    .ybu   zy.
-</programlisting>
+    <cmavo-list>
+    <cmavo-entry>
+      <cmavo>' a b c</cmavo>
+      <selmaho>d</selmaho>
+      <description>e</description>
+    </cmavo-entry>.y'y. .abu by. cy. dy. .ebu
+    <cmavo-entry>
+      <cmavo>f g i j</cmavo>
+      <selmaho>k</selmaho>
+      <description>l</description>
+    </cmavo-entry>
+    <cmavo-entry>
+      <cmavo>fy. gy. .ibu jy.</cmavo>
+      <selmaho>ky.</selmaho>
+      <description>ly.</description>
+    </cmavo-entry>
+    <cmavo-entry>
+      <cmavo>m n o p</cmavo>
+      <selmaho>r</selmaho>
+      <description>s</description>
+    </cmavo-entry>
+    <cmavo-entry>
+      <cmavo>my. ny. .obu py.</cmavo>
+      <selmaho>ry.</selmaho>
+      <description>sy.</description>
+    </cmavo-entry>
+    <cmavo-entry>
+      <cmavo>t u v x</cmavo>
+      <selmaho>y</selmaho>
+      <description>z</description>
+    </cmavo-entry>
+    <cmavo-entry>
+      <cmavo>ty. .ubu vy.</cmavo>
+      <selmaho>xy.</selmaho>
+      <description>.ybu zy.</description>
+    </cmavo-entry></cmavo-list>
     <para>There are several things to note about this table. The consonant lerfu words are a single syllable, whereas the vowel and 
     <quote>'</quote>lerfu words are two syllables and must be preceded by pause (since they all begin with a vowel). Another fact, not evident from the table but important nonetheless, is that 
     <quote>by</quote>and its like are single cmavo of selma'o BY, as is 
     <quote>.y'y</quote>. The vowel lerfu words, on the other hand, are compound cmavo, made from a single vowel cmavo plus the cmavo 
     <quote>bu</quote>(which belongs to its own selma'o, BU). All of the vowel cmavo have other meanings in Lojban (logical connectives, sentence separator, hesitation noise), but those meanings are irrelevant when 
     <quote>bu</quote>follows.</para>
     <para>Here are some illustrations of common Lojban words spelled out using the alphabet above:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-DMIQ">
       <title>
         <anchor xml:id="c17e2d1" />
@@ -118,21 +141,21 @@
     <quote>y</quote>were written (in 
     <xref linkend="cll_chapter17-section2-example1" />and 
     <xref linkend="cll_chapter17-section2-example2" />) with pauses after them. It is not strictly necessary to pause after such lerfu words, but failure to do so can in some cases lead to ambiguities:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-6dMS">
       <title>
         <anchor xml:id="c17e2d3" />
         <anchor xml:id="cll_chapter17-section2-example3" />
       </title>
       <interlinear-gloss>
         <jbo>mi cy. claxu</jbo>
-        <gloss>I lerfu-
+        <gloss>I lerfu- 
         <quote>c</quote>without</gloss>
         <en>I am without (whatever is referred to by) the letter 
         <quote>c</quote>.</en>
       </interlinear-gloss>
     </example>
     <para>without a pause after 
     <quote>cy</quote>would be interpreted as:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-qBLA">
       <title>
         <anchor xml:id="c17e2d4" />
@@ -458,31 +481,31 @@
     <quote>bu</quote>mechanism is extremely open-ended, and it is easy for Lojban users to make up 
     <quote>bu</quote>words without bothering to explain what they mean. Using the 
     <quote>lau</quote>cmavo flags at least the most important of such nonce lerfu words as having a special function: punctuation. (Exactly the same argument applies to the use of 
     <quote>zai</quote>to signal an alphabet shift or 
     <quote>ce'a</quote>to signal a font shift.)</para>
     <para>Since different alphabets require different punctuation marks, the interpretation of a 
     <quote>lau</quote>-marked lerfu word is affected by the current alphabet shift and the current font shift.</para>
   </section>
   <section xml:id="cll_chapter17-section8">
     <title>8. What about Chinese characters?</title>
-    <para>Chinese characters (
-    <quote>han
-    <superscript>4</superscript>zi
+    <para>Chinese characters ( 
+    <quote>han 
+    <superscript>4</superscript>zi 
     <superscript>4</superscript></quote>in Chinese, 
     <quote>kanji</quote>in Japanese) represent an entirely different approach to writing from alphabets or syllabaries. (A syllabary, such as Japanese hiragana or Amharic writing, has one lerfu for each syllable of the spoken language.) Very roughly, Chinese characters represent single elements of meaning; also very roughly, they represent single syllables of spoken Chinese. There is in principle no limit to the number of Chinese characters that can exist, and many thousands are in regular use.</para>
     <para>It is hopeless for Lojban, with its limited lerfu and shift words, to create an alphabet which will match this diversity. However, there are various possible ways around the problem.</para>
     <para>First, both Chinese and Japanese have standard Latin-alphabet representations, known as 
     <quote>pinyin</quote>for Chinese and 
     <quote>romaji</quote>for Japanese, and these can be used. Thus, the word 
-    <quote>han
-    <superscript>4</superscript>zi
+    <quote>han 
+    <superscript>4</superscript>zi 
     <superscript>4</superscript></quote>is conventionally written with two characters, but it may be spelled out as:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-fBfe">
       <title>
         <anchor xml:id="c17e8d1" />
         <anchor xml:id="cll_chapter17-section8-example1" />
       </title>
       <interlinear-gloss>
         <jbo>.y'y.bu .abu ny. vo zy. .ibu vo</jbo>
         <en>
         <quote>h</quote>
@@ -816,21 +839,21 @@
         <quote>vei ... ve'o</quote>parentheses):</para>
       </listitem>
     </itemizedlist>
     <example role="interlinear-gloss-example" xml:id="random-id-bbnL">
       <title>
         <anchor xml:id="c17e11d6" />
         <anchor xml:id="cll_chapter17-section11-example6" />
       </title>
       <interlinear-gloss>
         <jbo>vei ny. [ve'o] lo prenu</jbo>
-        <en>(
+        <en>( 
         <quote>n</quote>) persons</en>
       </interlinear-gloss>
     </example>
     <para>The parentheses are required because 
     <quote>ny. lo prenu</quote>would be two separate sumti, 
     <quote>ny.</quote>and 
     <quote>lo prenu</quote>. In general, any mathematical expression other than a simple number must be in parentheses when used as a quantifier; the right parenthesis mark, the cmavo 
     <quote>ve'o</quote>, can usually be elided.</para>
     <para>All the examples above have exhibited single lerfu words rather than lerfu strings, in accordance with the conventions of ordinary mathematics. A longer lerfu string would still be treated as a single variable or function name: in Lojban, 
     <quote>.abu by. cy.</quote>is not the multiplication 
@@ -935,21 +958,21 @@
         <anchor xml:id="cll_chapter17-section12-example5" />
       </title>
       <interlinear-gloss>
         <jbo>la cribe cu ciska</jbo>
         <gloss>That-named 
         <quote>Bear</quote>writes.</gloss>
         <en>Bear is a writer.</en>
       </interlinear-gloss>
     </example>
     <para>
-    <xref linkend="cll_chapter17-section12-example5" />does not of course refer to a bear (
+    <xref linkend="cll_chapter17-section12-example5" />does not of course refer to a bear ( 
     <quote>le cribe</quote>or 
     <quote>lo cribe</quote>) but to something else, probably a person, named 
     <quote>Bear</quote>. Similarly, 
     <quote>me dy ny. .abu</quote>is a predicate which can be used as a name, producing a kind of acronym which can have pauses between the individual lerfu words.</para>
   </section>
   <section xml:id="cll_chapter17-section13">
     <title>13. Computerized character codes</title>
     <para>Since the first application of computers to non-numerical information, character sets have existed, mapping numbers (called 
     <quote>character codes</quote>) into selected lerfu, digits, and punctuation marks (collectively called 
     <quote>characters</quote>). Historically, these character sets have only covered the English alphabet and a few selected punctuation marks. International efforts have now created Unicode, a unified character set that can represent essentially all the characters in essentially all the world's writing systems. Lojban can take advantage of these encoding schemes by using the cmavo 
@@ -982,62 +1005,120 @@
       <interlinear-gloss>
         <jbo>me'o se'erexarerei sinxa le ka panpi</jbo>
         <en>the-expression [code] 262E is-a-sign-of the quality-of being-at-peace</en>
       </interlinear-gloss>
     </example>
     <para>When a 
     <quote>se'e</quote>string appears in running discourse, some metalinguistic convention must specify whether the number is base 10 or some other base, and which character set is in use.</para>
   </section>
   <section xml:id="cll_chapter17-section14">
     <title>14. List of all auxiliary lerfu-word cmavo</title>
-    <programlisting xml:space="preserve">
-     cmavo   selma'o     meaning
-
-     bu      BU          makes previous word into a lerfu word
-
-     ga'e    BY          upper case shift
-     to'a    BY          lower case shift
-     tau     LAU         case-shift next lerfu word only
-
-     lo'a    BY          Latin/Lojban alphabet shift
-     ge'o    BY          Greek alphabet shift
-     je'o    BY          Hebrew alphabet shift
-     jo'o    BY          Arabic alphabet shift
-     ru'o    BY          Cyrillic alphabet shift
-
-     se'e    BY          following digits are a character code
-     na'a    BY          cancel all shifts
-
-     zai     LAU         following lerfu word specifies alphabet
-     ce'a    LAU         following lerfu word specifies font
-     lau     LAU         following lerfu word is punctuation
-
-     tei     TEI         start compound lerfu word
-     foi     FOI         end compound lerfu word
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>bu</cmavo>
+        <selmaho>BU</selmaho>
+        <description>makes previous word into a lerfu word</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ga'e</cmavo>
+        <selmaho>BY</selmaho>
+        <description>upper case shift</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>to'a</cmavo>
+        <selmaho>BY</selmaho>
+        <description>lower case shift</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>tau</cmavo>
+        <selmaho>LAU</selmaho>
+        <description>case-shift next lerfu word only</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lo'a</cmavo>
+        <selmaho>BY</selmaho>
+        <description>Latin/Lojban alphabet shift</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ge'o</cmavo>
+        <selmaho>BY</selmaho>
+        <description>Greek alphabet shift</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>je'o</cmavo>
+        <selmaho>BY</selmaho>
+        <description>Hebrew alphabet shift</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>jo'o</cmavo>
+        <selmaho>BY</selmaho>
+        <description>Arabic alphabet shift</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ru'o</cmavo>
+        <selmaho>BY</selmaho>
+        <description>Cyrillic alphabet shift</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>se'e</cmavo>
+        <selmaho>BY</selmaho>
+        <description>following digits are a character code</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>na'a</cmavo>
+        <selmaho>BY</selmaho>
+        <description>cancel all shifts</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>zai</cmavo>
+        <selmaho>LAU</selmaho>
+        <description>following lerfu word specifies alphabet</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ce'a</cmavo>
+        <selmaho>LAU</selmaho>
+        <description>following lerfu word specifies font</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lau</cmavo>
+        <selmaho>LAU</selmaho>
+        <description>following lerfu word is punctuation</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>tei</cmavo>
+        <selmaho>TEI</selmaho>
+        <description>start compound lerfu word</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>foi</cmavo>
+        <selmaho>FOI</selmaho>
+        <description>end compound lerfu word</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Note that LAU cmavo must be followed by a BY cmavo or the equivalent, where 
     <quote>equivalent</quote>means: either any Lojban word followed by 
     <quote>bu</quote>, another LAU cmavo (and its required sequel), or a 
     <quote>tei ... foi</quote>compound cmavo.</para>
   </section>
   <section xml:id="cll_chapter17-section15">
     <title>15. Proposed lerfu words - introduction</title>
     <para>The following sections contain tables of proposed lerfu words for some of the standard alphabets supported by the Lojban lerfu system. The first column of each list is the lerfu (actually, a Latin-alphabet name sufficient to identify it). The second column is the proposed name-based lerfu word, and the third column is the proposed lerfu word in the system based on using the cmavo of selma'o BY with a shift word.</para>
     <para>These tables are not meant to be authoritative (several authorities within the Lojban community have niggled over them extensively, disagreeing with each other and sometimes with themselves). They provide a working basis until actual usage is available, rather than a final resolution of lerfu word problems. Probably the system presented here will evolve somewhat before settling down into a final, conventional form.</para>
     <para>For Latin-alphabet lerfu words, see 
     <xref linkend="cll_chapter17-section2" />(for Lojban) and 
     <xref linkend="cll_chapter17-section5" />(for non-Lojban Latin-alphabet lerfu).</para>
   </section>
   <section xml:id="cll_chapter17-section16">
     <title>16. Proposed lerfu words for the Greek alphabet</title>
     <programlisting xml:space="preserve">
-     alpha       .alfas. bu      .abu
+     alpha       .alfas. bu      .abu 
+<!-- skip cmavo list automation -->
      beta        .betas. bu      by
      gamma       .gamas. bu      gy
      delta       .deltas. bu     dy
      epsilon     .Epsilon. bu    .ebu
      zeta        .zetas. bu      zy
      eta         .etas. bu       .e'ebu
      theta       .tetas. bu      ty. bu
      iota        .iotas. bu      .ibu
      kappa       .kapas. bu      ky
      lambda      .lymdas. bu     ly
@@ -1055,21 +1136,22 @@
      psi         .psis. bu       psis. bu
      omega       .omegas. bu     .o'obu
      rough       .dasei,as. bu   .y'y
      smooth      .psiles. bu     xutla bu
 </programlisting>
   </section>
   <section xml:id="cll_chapter17-section17">
     <title>17. Proposed lerfu words for the Cyrillic alphabet</title>
     <para>The second column in this listing is based on the historical names of the letters in Old Church Slavonic. Only those letters used in Russian are shown; other languages require more letters which can be devised as needed.</para>
     <programlisting xml:space="preserve">
-     a           .azys. bu         .abu
+     a           .azys. bu         .abu 
+<!-- skip cmavo list automation -->
      b           .bukys. bu        by
      v           .vedis. bu        vy
      g           .glagolis. bu     gy
      d           .dobros. bu       dy
      e           .iestys. bu       .ebu
      zh          .jivet. bu        jy
      z           .zemlias. bu      zy
      i           .ije,is. bu       .ibu
      short i     .itord. bu        .itord. bu
      k           .kakos. bu        ky
@@ -1092,21 +1174,22 @@
      yeri        .ierys. bu        .y.bu
      soft sign   .ieriys. bu       ranti bu
      reversed e  .ecarn. bu        .ecarn. bu
      yu          .ius. bu          .iubu
      ya          .ias. bu          .iabu
 </programlisting>
   </section>
   <section xml:id="cll_chapter17-section18">
     <title>18. Proposed lerfu words for the Hebrew alphabet</title>
     <programlisting xml:space="preserve">
-     aleph       .alef. bu       .alef. bu
+     aleph       .alef. bu       .alef. bu 
+<!-- skip cmavo list automation -->
      bet         .bet. bu        by
      gimel       .gimel. bu      gy
      daled       .daled. bu      dy
      he          .xex. bu        .y'y
      vav         .vav. bu        vy
      zayin       .zai,in. bu     zy
      khet        .xet. bu        xy. bu
      tet         .tet. bu        ty. bu
      yud         .iud. bu        .iud. bu
      kaf         .kaf. bu        ky
@@ -1132,21 +1215,22 @@
      sheva       .cyVAS. bu      .y.bu
      kholem      .xolem. bu      .obu
      shuruq      .curuk. bu      .u'ubu
 </programlisting>
   </section>
   <section xml:id="cll_chapter17-section19">
     <title>19. Proposed lerfu words for some accent marks and multiple letters</title>
     <para>This list is intended to be suggestive, not complete: there are lerfu such as Polish 
     <quote>dark</quote>l and Maltese h-bar that do not yet have symbols.</para>
     <programlisting xml:space="preserve">
-     acute              .akut. bu
+     acute              .akut. bu 
+<!-- skip cmavo list automation -->
                   or    .pritygal. bu          [pritu galtu]
      grave              .grav. bu
                   or    .zulgal. bu            [zunle galtu]
      circumflex         .cirkumfleks. bu
                   or    .midgal. bu            [midju galtu]
      tilde              .tildes. bu
      macron             .makron. bu
      breve              .brevis. bu
      over-dot           .gapmoc. bu            [gapru mokca]
      umlaut/trema       .relmoc. bu             [re mokca]
@@ -1162,21 +1246,22 @@
 </programlisting>
   </section>
   <section xml:id="cll_chapter17-section20">
     <title>20. Proposed lerfu words for radio communication</title>
     <para>There is a set of English words which are used, by international agreement, as lerfu words (for the English alphabet) over the radio, or in noisy situations where the utmost clarity is required. Formally they are known as the 
     <quote>ICAO Phonetic Alphabet</quote>, and are used even in non-English-speaking countries.</para>
     <para>This table presents the standard English spellings and proposed Lojban versions. The Lojbanizations are not straightforward renderings of the English sounds, but make some concessions both to the English spellings of the words and to the Lojban pronunciations of the lerfu (thus 
     <quote>carlis. bu</quote>, not 
     <quote>tcarlis. bu</quote>).</para>
     <programlisting xml:space="preserve">
-     Alfa        .alfas. bu
+     Alfa        .alfas. bu 
+<!-- skip cmavo list automation -->
      Bravo       .bravos. bu
      Charlie     .carlis. bu
      Delta       .deltas. bu
      Echo        .ekos. bu
      Foxtrot     .fokstrot. bu
      Golf        .golf. bu
      Hotel       .xoTEL. bu
      India       .indias. bu
      Juliet      .juliet. bu
      Kilo        .kilos. bu
diff --git a/todocbook/18.xml b/todocbook/18.xml
index 6483a1b..7aa2c85 100644
--- a/todocbook/18.xml
+++ b/todocbook/18.xml
@@ -1,15 +1,15 @@
 <chapter xml:id="cll_chapter18">
   <title>Chapter 18 lojbau mekso: Mathematical Expressions in Lojban</title>
   <section xml:id="cll_chapter18-section1">
     <title>1. Introductory</title>
-    <para>lojbau mekso (
+    <para>lojbau mekso ( 
     <quote>Lojbanic mathematical-expression</quote>) is the part of the Lojban language that is tailored for expressing statements of a mathematical character, or for adding numerical information to non-mathematical statements. Its formal design goals include:</para>
     <orderedlist>
       <listitem>
         <para>representing all the different forms of expression used by mathematicians in their normal modes of writing, so that a reader can unambiguously read off mathematical text as written with minimal effort and expect a listener to understand it;</para>
       </listitem>
       <listitem>
         <para>providing a vocabulary of commonly used mathematical terms which can readily be expanded to include newly coined words using the full resources of Lojban;</para>
       </listitem>
       <listitem>
         <para>permitting the formulation, both in writing and in speech, of unambiguous mathematical text;</para>
@@ -32,32 +32,72 @@
     </example>
     <para>contains omitted multiplication operators, but there are other possible interpretations for the strings 
     <quote>3x</quote>and 
     <quote>2y</quote>than as mathematical multiplication. Therefore, the Lojban verbal (spoken and written) form of 
     <xref linkend="cll_chapter18-section1-example1" />must not omit the multiplication operators.</para>
     <para>The remainder of this chapter explains (in as much detail as is currently possible) the mekso system. This chapter is by intention complete as regards mekso components, but only suggestive about uses of those components - as of now, there has been no really comprehensive use made of mekso facilities, and many matters must await the test of usage to be fully clarified.</para>
   </section>
   <section xml:id="cll_chapter18-section2">
     <title>2. Lojban numbers</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     pa      PA                  1
-     re      PA                  2
-     ci      PA                  3
-     vo      PA                  4
-     mu      PA                  5
-     xa      PA                  6
-     ze      PA                  7
-     bi      PA                  8
-     so      PA                  9
-     no      PA                  0
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>pa</cmavo>
+        <selmaho>PA</selmaho>
+        <description>1</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>re</cmavo>
+        <selmaho>PA</selmaho>
+        <description>2</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ci</cmavo>
+        <selmaho>PA</selmaho>
+        <description>3</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>vo</cmavo>
+        <selmaho>PA</selmaho>
+        <description>4</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>mu</cmavo>
+        <selmaho>PA</selmaho>
+        <description>5</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>xa</cmavo>
+        <selmaho>PA</selmaho>
+        <description>6</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ze</cmavo>
+        <selmaho>PA</selmaho>
+        <description>7</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>bi</cmavo>
+        <selmaho>PA</selmaho>
+        <description>8</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>so</cmavo>
+        <selmaho>PA</selmaho>
+        <description>9</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>no</cmavo>
+        <selmaho>PA</selmaho>
+        <description>0</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The simplest kind of mekso are numbers, which are cmavo or compound cmavo. There are cmavo for each of the 10 decimal digits, and numbers greater than 9 are made by stringing together the cmavo. Some examples:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-LmPr">
       <title>
         <anchor xml:id="c18e2d1" />
         <anchor xml:id="cll_chapter18-section2-example1" />
       </title>
       <interlinear-gloss>
         <jbo>pa re ci</jbo>
         <gloss>one two three</gloss>
         <gloss>123 ignore</gloss>
@@ -474,24 +514,24 @@
     <quote>(</quote>and 
     <quote>)</quote>to group expressions in any way desired:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-wfFV">
       <title>
         <anchor xml:id="c18e5d10" />
         <anchor xml:id="cll_chapter18-section5-example10" />
       </title>
       <interlinear-gloss>
         <jbo>li vei ny. su'i pa ve'o pi'i vei ny. su'i pa [ve'o] du</jbo>
         <gloss>li ny. [bi'e] te'a re su'i re bi'e pi'i ny. su'i pa</gloss>
-        <gloss>The-number (
-        <quote>n</quote>plus one) times (
+        <gloss>The-number ( 
+        <quote>n</quote>plus one) times ( 
         <quote>n</quote>plus one)</gloss>
-        <gloss>equals the-number n-power-two plus two-times-
+        <gloss>equals the-number n-power-two plus two-times- 
         <quote>n</quote>plus 1.</gloss>
         <en>(n + 1)(n + 1) = n</en>
       </interlinear-gloss>
     </example>
     <para>There are several new usages in 
     <xref linkend="cll_chapter18-section5-example10" />: 
     <quote>te'a</quote>means 
     <quote>raised to the power</quote>, and we also see the use of the lerfu word 
     <quote>ny</quote>, representing the letter 
     <quote>n</quote>. In mekso, letters stand for just what they do in ordinary mathematics: variables. The parser will accept a string of lerfu words (called a 
@@ -552,21 +592,21 @@
     <xref linkend="cll_chapter18-section6-example1" />, three. How do we know how many operands there are in ambiguous circumstances? The usual Lojban solution is employed: an elidable terminator, namely 
     <quote>ku'e</quote>. Here is an example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-IxMG">
       <title>
         <anchor xml:id="c18e6d2" />
         <anchor xml:id="cll_chapter18-section6-example2" />
       </title>
       <interlinear-gloss>
         <jbo>li py. su'i va'a ny. ku'e su'i zy du li xy.</jbo>
         <gloss>The-number 
-        <quote>p</quote>plus negative-of(
+        <quote>p</quote>plus negative-of( 
         <quote>n</quote>) plus 
         <quote>z</quote>equals the-number 
         <quote>x</quote>.</gloss>
         <en>p + -n + z = x</en>
       </interlinear-gloss>
     </example>
     <para>where we know that 
     <quote>va'a</quote>is a forethought operator because there is no operand preceding it.</para>
     <para>
     <quote>va'a</quote>is the numerical negation operator, of selma'o VUhU. In contrast, 
@@ -647,21 +687,22 @@
         <anchor xml:id="c18e7d1" />
         <anchor xml:id="cll_chapter18-section7-example1" />
       </title>
       <interlinear-gloss>
         <jbo>li xy. mleca li mu</jbo>
         <en>The-number x is-less-than the-number 5.</en>
       </interlinear-gloss>
     </example>
     <para>Here is a partial list of selbri useful in mathematical bridi:</para>
     <programlisting xml:space="preserve">
-     du          x1 is identical to x2, x3, x4, ...
+     du          x1 is identical to x2, x3, x4, ... 
+<!-- skip cmavo list automation -->
      dunli       x1 is equal/congruent to x2 in/on property/quality/dimension/quantity x3
      mleca       x1 is less than x2
      zmadu       x1 is greater than x2
      dubjavme'a  x1 is less than or equal to x2         [du ja mleca, equal or less]
      dubjavmau   x1 is greater than or equal to x2      [du ja zmadu, equal or greater]
      tamdu'i     x1 is similar to x2                    [tarmi dunli, shape-equal]
      turdu'i     x1 is isomorphic to x2                 [stura dunli, structure-equal]
      cmima       x1 is a member of set x2
      gripau      x1 is a subset of set x2               [girzu pagbu, set-part]
      na'ujbi     x1 is approximately equal to x2        [namcu jibni, number-near]
@@ -699,46 +740,77 @@
         <jbo>li re su'i re na du li mu</jbo>
         <gloss>the-number 2 + 2 is-not equal-to the-number 5.</gloss>
         <en>2 + 2 ≠ 5</en>
       </interlinear-gloss>
     </example>
     <para>As usual in Lojban, negated bridi say what is false, and do not say anything about what might be true.</para>
   </section>
   <section xml:id="cll_chapter18-section8">
     <title>8. Indefinite numbers</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ro      PA      all
-     so'a    PA      almost all
-     so'e    PA      most
-     so'i    PA      many
-     so'o    PA      several
-     so'u    PA      a few
-     no'o    PA      the typical number of
-     da'a    PA      all but (one) of
-
-     piro    PA+PA   the whole of/all of
-     piso'a  PA+PA   almost the whole of
-     piso'e  PA+PA   most of
-     piso'i  PA+PA   much of
-     piso'o  PA+PA   a small part of
-     piso'u  PA+PA   a tiny part of
-     pino'o  PA+PA   the typical portion of
-
-     rau     PA      enough
-     du'e    PA      too many
-     mo'a    PA      too few
-
-     pirau   PA+PA   enough of
-     pidu'e  PA+PA   too much of
-     pimo'a  PA+PA   too little of
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ro</cmavo>
+        <selmaho>PA</selmaho>
+        <description>all</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>so'a</cmavo>
+        <selmaho>PA</selmaho>
+        <description>almost all</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>so'e</cmavo>
+        <selmaho>PA</selmaho>
+        <description>most</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>so'i</cmavo>
+        <selmaho>PA</selmaho>
+        <description>many</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>so'o</cmavo>
+        <selmaho>PA</selmaho>
+        <description>several</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>so'u</cmavo>
+        <selmaho>PA</selmaho>
+        <description>a few</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>no'o</cmavo>
+        <selmaho>PA</selmaho>
+        <description>the typical number of</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>da'a</cmavo>
+        <selmaho>PA</selmaho>
+        <description>all but (one) of</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>rau</cmavo>
+        <selmaho>PA</selmaho>
+        <description>enough</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>du'e</cmavo>
+        <selmaho>PA</selmaho>
+        <description>too many</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>mo'a</cmavo>
+        <selmaho>PA</selmaho>
+        <description>too few</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Not all the cmavo of PA represent numbers in the usual mathematical sense. For example, the cmavo 
     <quote>ro</quote>means 
     <quote>all</quote>or 
     <quote>each</quote>. This number does not have a definite value in the abstract: 
     <quote>li ro</quote>is undefined. But when used to count or quantify something, the parallel between 
     <quote>ro</quote>and 
     <quote>pa</quote>is clearer:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-fDMt">
       <title>
         <anchor xml:id="c18e8d1" />
@@ -897,21 +969,21 @@
       </title>
       <interlinear-gloss>
         <jbo>li ci vu'u re du li ma'u</jbo>
         <en>the-number 3 − 2 = some-positive-number</en>
         <jbo>li ci vu'u vo du li ni'u</jbo>
         <en>the-number 3 − 4 = some-negative-number</en>
         <jbo>mi ponse ma'u rupnu</jbo>
         <en>I possess a-positive-number-of currency-units.</en>
       </interlinear-gloss>
     </example>
-    <para>All of the numbers discussed so far are objective, even if indefinite. If there are exactly six superpowers (
+    <para>All of the numbers discussed so far are objective, even if indefinite. If there are exactly six superpowers ( 
     <quote>rairgugde</quote>, 
     <quote>superlative-states</quote>) in the world, then 
     <quote>ro rairgugde</quote>means the same as 
     <quote>xa rairgugde</quote>. It is often useful, however, to express subjective indefinite values. The cmavo 
     <quote>rau</quote>(enough), 
     <quote>du'e</quote>(too many), and 
     <quote>mo'a</quote>(too few) are then appropriate:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-TIiE">
       <title>
         <anchor xml:id="c18e8d17" />
@@ -984,21 +1056,21 @@
       </title>
       <interlinear-gloss>
         <jbo>vo no ji'i mu no</jbo>
         <gloss>four zero approximation five zero</gloss>
         <en>roughly 4050 (where the 
         <quote>four thousand</quote>is exact, but the 
         <quote>fifty</quote>is approximate)</en>
       </interlinear-gloss>
     </example>
     <para>If 
-    <quote>ji'i</quote>appears at the end of a number, it indicates that the number has been rounded. In addition, it can then be followed by a sign cmavo (
+    <quote>ji'i</quote>appears at the end of a number, it indicates that the number has been rounded. In addition, it can then be followed by a sign cmavo ( 
     <quote>ma'u</quote>or 
     <quote>ni'u</quote>), which indicate truncation towards positive or negative infinity respectively.</para>
     <example role="interlinear-gloss-example" xml:id="random-id-85C3">
       <title>
         <anchor xml:id="c18e9d3" />
         <anchor xml:id="cll_chapter18-section9-example3" />
         <anchor xml:id="c18e9d4" />
         <anchor xml:id="cll_chapter18-section9-example4" />
         <anchor xml:id="c18e9d5" />
         <anchor xml:id="cll_chapter18-section9-example5" />
@@ -1077,31 +1149,62 @@
     <quote>at least some part of</quote>. The quantifiers 
     <quote>ro</quote>, 
     <quote>su'o</quote>, 
     <quote>piro</quote>, and 
     <quote>pisu'o</quote>are particularly important in Lojban, as they are implicitly used in the descriptions introduced by the cmavo of selma'o LA and LE, as explained in 
     <xref linkend="cll_chapter6" />. Descriptions in general are outside the scope of this chapter.</para>
   </section>
   <section xml:id="cll_chapter18-section10">
     <title>10. Non-decimal and compound bases</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-    ju'u     VUhU    to the base
-
-    dau      PA      hex digit A = 10
-    fei      PA      hex digit B = 11
-    gai      PA      hex digit C = 12
-    jau      PA      hex digit D = 13
-    rei      PA      hex digit E = 14
-    vai      PA      hex digit F = 15
-    pi'e     PA      compound base point
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ju'u</cmavo>
+        <selmaho>VUhU</selmaho>
+        <description>to the base</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>dau</cmavo>
+        <selmaho>PA</selmaho>
+        <description>hex digit A = 10</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>fei</cmavo>
+        <selmaho>PA</selmaho>
+        <description>hex digit B = 11</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>gai</cmavo>
+        <selmaho>PA</selmaho>
+        <description>hex digit C = 12</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>jau</cmavo>
+        <selmaho>PA</selmaho>
+        <description>hex digit D = 13</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>rei</cmavo>
+        <selmaho>PA</selmaho>
+        <description>hex digit E = 14</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>vai</cmavo>
+        <selmaho>PA</selmaho>
+        <description>hex digit F = 15</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>pi'e</cmavo>
+        <selmaho>PA</selmaho>
+        <description>compound base point</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>In normal contexts, Lojban assumes that all numbers are expressed in the decimal (base 10) system. However, other bases are possible, and may be appropriate in particular circumstances.</para>
     <para>To specify a number in a particular base, the VUhU operator 
     <quote>ju'u</quote>is suitable:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-Iw8u">
       <title>
         <anchor xml:id="c18e10d1" />
         <anchor xml:id="cll_chapter18-section10-example1" />
       </title>
       <interlinear-gloss>
         <jbo>li pa no pa no ju'u re du li pa no</jbo>
@@ -1235,31 +1338,57 @@
       <interlinear-gloss>
         <jbo>dei jufra panopi'epapamoi</jbo>
         <gloss>This-utterance is-a-sentence-type-of 10;11th-thing.</gloss>
         <en>This is Sentence 10.11.</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter18-section11">
     <title>11. Special mekso selbri</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     mei     MOI     cardinal selbri
-     moi     MOI     ordinal selbri
-     si'e    MOI     portion selbri
-     cu'o    MOI     probability selbri
-     va'e    MOI     scale selbri
-
-     me      ME      make sumti into selbri
-
-     me'u    MEhU    terminator for ME
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>mei</cmavo>
+        <selmaho>MOI</selmaho>
+        <description>cardinal selbri</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>moi</cmavo>
+        <selmaho>MOI</selmaho>
+        <description>ordinal selbri</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>si'e</cmavo>
+        <selmaho>MOI</selmaho>
+        <description>portion selbri</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>cu'o</cmavo>
+        <selmaho>MOI</selmaho>
+        <description>probability selbri</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>va'e</cmavo>
+        <selmaho>MOI</selmaho>
+        <description>scale selbri</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>me</cmavo>
+        <selmaho>ME</selmaho>
+        <description>make sumti into selbri</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>me'u</cmavo>
+        <selmaho>MEhU</selmaho>
+        <description>terminator for ME</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Lojban possesses a special category of selbri which are based on mekso. The simplest kind of such selbri are made by suffixing a member of selma'o MOI to a number. There are five members of MOI, each of which serves to create number-based selbri with specific place structures.</para>
     <para>The cmavo 
     <quote>mei</quote>creates cardinal selbri. The basic place structure is:</para>
     <programlisting xml:space="preserve">
        x1 is a mass formed from the set x2 of n members, one or more of which is/are x3
 </programlisting>
     <para>A cardinal selbri interrelates a set with a given number of members, the mass formed from that set, and the individuals which make the set up. The mass argument is placed first as a matter of convenience, not logical necessity.</para>
     <para>Some examples:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-ujSA">
       <title>
@@ -1490,23 +1619,27 @@
     <quote>boi</quote>is not used between a number and a member of MOI. As a result, the 
     <quote>me'u</quote>in 
     <xref linkend="cll_chapter18-section11-example13" />could also be replaced by a 
     <quote>boi</quote>, which would serve the same function of preventing the 
     <quote>pa</quote>and 
     <quote>moi</quote>from joining into a compound.</para>
   </section>
   <section xml:id="cll_chapter18-section12">
     <title>12. Number questions</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-      xo      PA      number question
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>xo</cmavo>
+        <selmaho>PA</selmaho>
+        <description>number question</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The cmavo 
     <quote>xo</quote>, a member of selma'o PA, is used to ask questions whose answers are numbers. Like most Lojban question words, it fills the blank where the answer should go. (See 
     <xref linkend="cll_chapter19" />for more on Lojban questions.)</para>
     <example role="interlinear-gloss-example" xml:id="random-id-BJGv">
       <title>
         <anchor xml:id="c18e12d1" />
         <anchor xml:id="cll_chapter18-section12-example1" />
         <anchor xml:id="c18e12d2" />
         <anchor xml:id="cll_chapter18-section12-example2" />
       </title>
@@ -1531,23 +1664,27 @@
         <en>The-number 25 times 6 equals the-number 1?0</en>
       </interlinear-gloss>
     </example>
     <para>to which the correct reply would be 
     <quote>mu</quote>, or 5. The ability to utter bare numbers as grammatical Lojban sentences is primarily intended for giving answers to 
     <quote>xo</quote>questions. (Another use, obviously, is for counting off physical objects one by one.)</para>
   </section>
   <section xml:id="cll_chapter18-section13">
     <title>13. Subscripts</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     xi      XI      subscript
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>xi</cmavo>
+        <selmaho>XI</selmaho>
+        <description>subscript</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Subscripting is a general Lojban feature, not used only in mekso; there are many things that can logically be subscripted, and grammatically a subscript is a free modifier, usable almost anywhere. In particular, of course, mekso variables (lerfu strings) can be subscripted:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-MT0a">
       <title>
         <anchor xml:id="c18e13d1" />
         <anchor xml:id="cll_chapter18-section13-example1" />
       </title>
       <interlinear-gloss>
         <jbo>li xy.boixici du li xy.boixipa su'i xy.boixire</jbo>
         <gloss>The-number x-sub-3 equals the-number x-sub-1 plus x-sub-2.</gloss>
         <en>x</en>
@@ -1590,25 +1727,37 @@
       </interlinear-gloss>
     </example>
     <para>See 
     <xref linkend="cll_chapter18-section17-example10" />for the standard method of specifying multiple subscripts on a single object.</para>
     <para>More information on the uses of subscripts may be found in 
     <xref linkend="cll_chapter19" />.</para>
   </section>
   <section xml:id="cll_chapter18-section14">
     <title>14. Infix operators revisited</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     tu'o    PA      null operand
-     ge'a    VUhU    null operator
-     gei     VUhU    exponential notation
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>tu'o</cmavo>
+        <selmaho>PA</selmaho>
+        <description>null operand</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ge'a</cmavo>
+        <selmaho>VUhU</selmaho>
+        <description>null operator</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>gei</cmavo>
+        <selmaho>VUhU</selmaho>
+        <description>exponential notation</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The infix operators presented so far have always had exactly two operands, and for more or fewer operands forethought notation has been required. However, it is possible to use an operator in infix style even though it has more or fewer than two operands, through the use of a pair of tricks: the null operand 
     <quote>tu'o</quote>and the null operator 
     <quote>ge'a</quote>. The first is suitable when there are too few operands, the second when there are too many. For example, suppose we wanted to express the numerical negation operator 
     <quote>va'a</quote>in infix form. We would use:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-8Uh9">
       <title>
         <anchor xml:id="c18e14d1" />
         <anchor xml:id="cll_chapter18-section14-example1" />
       </title>
       <interlinear-gloss>
@@ -1663,26 +1812,42 @@
       <interlinear-gloss>
         <jbo>papano bi'eju'u re gei pipanopano bi'eju'u re ge'a re</jbo>
         <gloss>(one-one-zero base 2) scientific (point-one-zero-one-zero base 2) with-base 2</gloss>
         <en>.1010</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter18-section15">
     <title>15. Vectors and matrices</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     jo'i    JOhI    start vector
-     te'u    TEhU    end vector
-     pi'a    VUhU    matrix row combiner
-     sa'i    VUhU    matrix column combiner
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>jo'i</cmavo>
+        <selmaho>JOhI</selmaho>
+        <description>start vector</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>te'u</cmavo>
+        <selmaho>TEhU</selmaho>
+        <description>end vector</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>pi'a</cmavo>
+        <selmaho>VUhU</selmaho>
+        <description>matrix row combiner</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>sa'i</cmavo>
+        <selmaho>VUhU</selmaho>
+        <description>matrix column combiner</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>A mathematical vector is a list of numbers, and a mathematical matrix is a table of numbers. Lojban considers matrices to be built up out of vectors, which are in turn built up out of operands.</para>
     <para>
     <quote>jo'i</quote>, the only cmavo of selma'o JOhI, is the vector indicator: it has a syntax reminiscent of a forethought operator, but has very high precedence. The components must be simple operands rather than full expressions (unless parenthesized). A vector can have any number of components; 
     <quote>te'u</quote>is the elidable terminator. An example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-IVDJ">
       <title>
         <anchor xml:id="c18e15d1" />
         <anchor xml:id="cll_chapter18-section15-example1" />
       </title>
       <interlinear-gloss>
@@ -1730,23 +1895,27 @@
     <quote>ma'o</quote>.</para>
     <para>Matrices of more than two dimensions can be built up using either 
     <quote>pi'a</quote>or 
     <quote>sa'i</quote>with an appropriate subscript numbering the dimension. When subscripted, there is no difference between 
     <quote>pi'a</quote>and 
     <quote>sa'i</quote>.</para>
   </section>
   <section xml:id="cll_chapter18-section16">
     <title>16. Reverse Polish notation</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     fu'a    FUhA    reverse Polish flag
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>fu'a</cmavo>
+        <selmaho>FUhA</selmaho>
+        <description>reverse Polish flag</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>So far, the Lojban notational conventions have mapped fairly familiar kinds of mathematical discourse. The use of forethought operators may have seemed odd when applied to 
     <quote>+</quote>, but when applied to 
     <quote>f</quote>they appear as the usual functional notation. Now comes a sharp break. Reverse Polish (RP) notation represents something completely different; even mathematicians don't use it much. (The only common uses of RP, in fact, are in some kinds of calculators and in the implementation of some programming languages.)</para>
     <para>In RP notation, the operator follows the operands. (Polish notation, where the operator precedes its operands, is another name for forethought mekso of the kind explained in 
     <xref linkend="cll_chapter18-section6" />.) The number of operands per operator is always fixed. No parentheses are required or permitted. In Lojban, RP notation is always explicitly marked by a 
     <quote>fu'a</quote>at the beginning of the expression; there is no terminator. Here is a simple example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-V4xe">
       <title>
         <anchor xml:id="c18e16d1" />
         <anchor xml:id="cll_chapter18-section16-example1" />
@@ -1987,36 +2156,52 @@
     <para>You can also combine two operands with 
     <quote>ce'o</quote>, the sequence connective of selma'o JOI, to make a compound subscript:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-eMsd">
       <title>
         <anchor xml:id="c18e17d10" />
         <anchor xml:id="cll_chapter18-section17-example10" />
       </title>
       <interlinear-gloss>
         <jbo>xy. xi vei by. ce'o dy. [ve'o]</jbo>
         <gloss>
-        <quote>x</quote>sub (
+        <quote>x</quote>sub ( 
         <quote>b</quote>sequence 
         <quote>d</quote>)</gloss>
         <en>x</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter18-section18">
     <title>18. Using Lojban resources within mekso</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     na'u    NAhU    selbri to operator
-     ni'e    NIhE    selbri to operand
-     mo'e    MOhE    sumti to operand
-     te'u    TEhU    terminator for all three
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>na'u</cmavo>
+        <selmaho>NAhU</selmaho>
+        <description>selbri to operator</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ni'e</cmavo>
+        <selmaho>NIhE</selmaho>
+        <description>selbri to operand</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>mo'e</cmavo>
+        <selmaho>MOhE</selmaho>
+        <description>sumti to operand</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>te'u</cmavo>
+        <selmaho>TEhU</selmaho>
+        <description>terminator for all three</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>One of the mekso design goals requires the ability to make use of Lojban's vocabulary resources within mekso to extend the built-in cmavo for operands and operators. There are three relevant constructs: all three share the elidable terminator 
     <quote>te'u</quote>(which is also used to terminate vectors marked with 
     <quote>jo'i</quote>)</para>
     <para>The cmavo 
     <quote>na'u</quote>makes a selbri into an operator. In general, the first place of the selbri specifies the result of the operator, and the other unfilled places specify the operands:</para>
     <programlisting xml:space="preserve">
 <anchor xml:id="c18e18d1" />
 <anchor xml:id="cll_chapter18-section18-example1" />18.1)  li na'u tanjo te'u vei pai fe'i re [ve'o] du li ci'i
        The-number the-operator tangent ( 
 <phrase role="IPA">π</phrase> / 2 ) = the-number infinity.
@@ -2071,27 +2256,47 @@
       <interlinear-gloss>
         <jbo>mi viska vei mo'e lo'e lanzu ve'o cinfo</jbo>
         <gloss>I see ( the-typical family )-number-of lions.</gloss>
         <en>I see a pride of lions.</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter18-section19">
     <title>19. Other uses of mekso</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     me'o    LI      the mekso
-     nu'a    NUhA    operator to selbri
-     mai     MAI     utterance ordinal
-     mo'o    MAI     higher order utterance ordinal
-     roi     ROI     quantified tense
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>me'o</cmavo>
+        <selmaho>LI</selmaho>
+        <description>the mekso</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>nu'a</cmavo>
+        <selmaho>NUhA</selmaho>
+        <description>operator to selbri</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>mai</cmavo>
+        <selmaho>MAI</selmaho>
+        <description>utterance ordinal</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>mo'o</cmavo>
+        <selmaho>MAI</selmaho>
+        <description>higher order utterance ordinal</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>roi</cmavo>
+        <selmaho>ROI</selmaho>
+        <description>quantified tense</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>So far we have seen mekso used as sumti (with 
     <quote>li</quote>), as quantifiers (often parenthesized), and in MOI and ME-MOI selbri. There are a few other minor uses of mekso within Lojban.</para>
     <para>The cmavo 
     <quote>me'o</quote>has the same grammatical use as 
     <quote>li</quote>but slightly different semantics. 
     <quote>li</quote>means 
     <quote>the number which is the value of the mekso ...</quote>, whereas 
     <quote>me'o</quote>just means 
     <quote>the mekso ...</quote>So it is true that:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-93Qu">
@@ -2341,23 +2546,23 @@
     <quote>frinu</quote>, meaning 
     <quote>fraction</quote>; therefore, in a context of numeric rafsi, you can use any of the rafsi for 
     <quote>frinu</quote>to indicate a fraction slash.</para>
     <para>A similar convention is used for the cmavo 
     <quote>cu'o</quote>of selma'o MOI, which is closely related to 
     <quote>cunso</quote>(probability); use a rafsi for 
     <quote>cunso</quote>in order to create lujvo based on 
     <quote>cu'o</quote>. The cmavo 
     <quote>mei</quote>and 
     <quote>moi</quote>of MOI have their own rafsi, two each in fact: 
-    <quote>mem</quote>/
+    <quote>mem</quote>/ 
     <quote>mei</quote>and 
-    <quote>mom</quote>/
+    <quote>mom</quote>/ 
     <quote>moi</quote>respectively.</para>
     <para>The grammar of mekso as described so far imposes a rigid distinction between operators and operands. Some flavors of mathematics (lambda calculus, algebra of functions) blur this distinction, and Lojban must have a method of doing the same. An operator can be changed into an operand with 
     <quote>ni'enu'a</quote>, which transforms the operator into a matching selbri and then the selbri into an operand.</para>
     <para>To change an operand into an operator, we use the cmavo 
     <quote>ma'o</quote>, already introduced as a means of changing a lerfu string such as 
     <quote>fy.</quote>into an operator. In fact, 
     <quote>ma'o</quote>can be followed by any mekso operand, using the elidable terminator 
     <quote>te'u</quote>if necessary.</para>
     <para>There is a potential semantic ambiguity in 
     <quote>ma'o fy. [te'u]</quote>if 
@@ -2547,42 +2752,46 @@ rafsi: piz,                cez,           fi'u (from frinu; see
 
        ki'o,               ra'e
        thousands comma,    repeating-decimal indicator
 
        ji'i,               ka'o
        approximation sign, complex number separator
 </programlisting></para>
       </listitem>
       <listitem>
         <para>Indefinite numbers: 
-        <programlisting xml:space="preserve">
-       ro,        so'a,          so'e,           so'i,    so'o,       so'u,     da'a
-       all,       almost all,    most,           many,    several,    few,      all but
-rafsi: rol,       soj,           sor or so'i,    sos,     sot,        daz
-
-       su'e,      su'o
-       at most,   at least
-rafsi: su'e,      su'o
-
-       me'i,      za'u
-       less than, more than
-
-       no'o
-       the typical number
-</programlisting></para>
+        <cmavo-list>
+          <cmavo-entry>
+            <cmavo>ro, so'a, so'e, so'i, so'o,</cmavo>
+            <selmaho>so'u,</selmaho>
+            <description>da'a</description>
+          </cmavo-entry>
+          <cmavo-entry>
+            <cmavo>all, almost all, most, many, several,</cmavo>
+            <selmaho>few,</selmaho>
+            <description>all but</description>
+          </cmavo-entry>
+          <cmavo-entry>
+            <cmavo>rafsi: rol, soj, sor or so'i, sos,</cmavo>
+            <selmaho>sot,</selmaho>
+            <description>daz</description>
+          </cmavo-entry>
+        </cmavo-list></para>
       </listitem>
       <listitem>
         <para>Subjective numbers: 
-        <programlisting xml:space="preserve">
-       rau,       du'e,        mo'a
-       enough,    too many,    too few
-</programlisting></para>
+        <cmavo-list>
+        <cmavo-entry>
+          <cmavo>rau,</cmavo>
+          <selmaho>du'e,</selmaho>
+          <description>mo'a</description>
+        </cmavo-entry>enough, too many, too few</cmavo-list></para>
       </listitem>
       <listitem>
         <para>Miscellaneous: 
         <programlisting xml:space="preserve">
        xo,                 tu'o
        number question,    null operand
 </programlisting></para>
       </listitem>
     </itemizedlist>
   </section>
diff --git a/todocbook/19.xml b/todocbook/19.xml
index a77bb0d..81a2107 100644
--- a/todocbook/19.xml
+++ b/todocbook/19.xml
@@ -1,23 +1,27 @@
 <chapter xml:id="cll_chapter19">
   <title>Chapter 19 Putting It All Together: Notes on the Structure of Lojban Texts</title>
   <section xml:id="cll_chapter19-section1">
     <title>1. Introductory</title>
     <para>This chapter is incurably miscellaneous. It describes the cmavo that specify the structure of Lojban texts, from the largest scale (paragraphs) to the smallest (single words). There are fewer examples than are found in other chapters of this book, since the linguistic mechanisms described are generally made use of in conversation or else in long documents.</para>
     <para>This chapter is also not very self-contained. It makes passing reference to a great many concepts which are explained in full only in other chapters. The alternative would be a chapter on text structure which was as complex as all the other chapters put together. Lojban is a unified language, and it is not possible to understand any part of it (in full) before understanding every part of it (to some degree).</para>
   </section>
   <section xml:id="cll_chapter19-section2">
     <title>2. Sentences: I</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     .i      I       sentence separator
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>.i</cmavo>
+        <selmaho>I</selmaho>
+        <description>sentence separator</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Since Lojban is audio-visually isomorphic, there needs to be a spoken and written way of signaling the end of a sentence and the start of the following one. In written English, a period serves this purpose; in spoken English, a tone contour (rising or falling) usually does the job, or sometimes a long pause. Lojban uses a single separator: the cmavo 
     <quote>.i</quote>(of selma'o I):</para>
     <example role="interlinear-gloss-example" xml:id="random-id-XKAG">
       <title>
         <anchor xml:id="c19e2d1" />
         <anchor xml:id="cll_chapter19-section2-example1" />
       </title>
       <interlinear-gloss>
         <jbo>mi klama le zarci .i do cadzu le bisli</jbo>
         <en>I go to-the store. You walk on-the ice.</en>
@@ -54,26 +58,37 @@
     <quote>.i</quote>. Grouping with 
     <quote>tu'e</quote>and 
     <quote>tu'u</quote>is analogous to grouping with 
     <quote>ke</quote>and 
     <quote>ke'e</quote>to establish the scope of logical or non-logical connectives (see 
     <xref linkend="cll_chapter14" />).</para>
   </section>
   <section xml:id="cll_chapter19-section3">
     <title>3. Paragraphs: NIhO</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ni'o    NIhO    new topic
-     no'i    NIhO    old topic
-
-     da'o    DAhO    cancel cmavo assignments
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ni'o</cmavo>
+        <selmaho>NIhO</selmaho>
+        <description>new topic</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>no'i</cmavo>
+        <selmaho>NIhO</selmaho>
+        <description>old topic</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>da'o</cmavo>
+        <selmaho>DAhO</selmaho>
+        <description>cancel cmavo assignments</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The paragraph is a concept used in writing systems for two purposes: to indicate changes of topic, and to break up the hard-to-read appearance of large blocks of text on the page. The former function is represented in both spoken and written Lojban by the cmavo 
     <quote>ni'o</quote>and 
     <quote>no'i</quote>, both of selma'o NIhO. Of these two, 
     <quote>ni'o</quote>is the more common. By convention, written Lojban is broken into paragraphs just before any 
     <quote>ni'o</quote>or 
     <quote>no'i</quote>, but a very long passage on a single topic might be paragraphed before an 
     <quote>.i</quote>. On the other hand, it is conventional in English to start a new paragraph in dialogue when a new speaker starts, but this convention is not commonly observed in Lojban dialogues. Of course, none of these conventions affect meaning in any way.</para>
     <para>A 
     <quote>ni'o</quote>can take the place of an 
     <quote>.i</quote>as a sentence separator, and in addition signals a new topic or paragraph. Grammatically, any number of 
@@ -105,23 +120,27 @@
     <quote>no'i</quote>also resumes tense and pro-sumti assignments dropped at the previous 
     <quote>ni'o</quote>.</para>
     <para>If a 
     <quote>ni'o</quote>is subscripted, then a 
     <quote>no'i</quote>with the same subscript is assumed to be a continuation of it. A 
     <quote>no'i</quote>may also have a negative subscript, which would specify counting backwards a number of paragraphs and resuming the topic found thereby.</para>
   </section>
   <section xml:id="cll_chapter19-section4">
     <title>4. Topic-comment sentences: ZOhU</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     zo'u    ZOhU    topic/comment separator
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>zo'u</cmavo>
+        <selmaho>ZOhU</selmaho>
+        <description>topic/comment separator</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The normal Lojban sentence is just a bridi, parallel to the normal English sentence which has a subject and a predicate:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-4WsN">
       <title>
         <anchor xml:id="c19e4d1" />
         <anchor xml:id="cll_chapter19-section4-example1" />
       </title>
       <interlinear-gloss>
         <jbo>mi klama le zarci</jbo>
         <en>I went to the market</en>
       </interlinear-gloss>
@@ -130,22 +149,22 @@
     <example role="interlinear-gloss-example" xml:id="random-id-ovFJ">
       <title>
         <anchor xml:id="c19e4d2" />
         <anchor xml:id="cll_chapter19-section4-example2" />
       </title>
       <interlinear-gloss>
         <jbo>zhe</jbo>
       </interlinear-gloss>
     </example>
     <para>The wide space in the first two versions of 
-    <xref linkend="cll_chapter19-section4-example2" />separate the topic (
-    <quote>this news</quote>) from the comment (
+    <xref linkend="cll_chapter19-section4-example2" />separate the topic ( 
+    <quote>this news</quote>) from the comment ( 
     <quote>I know already</quote>).</para>
     <para>Lojban uses the cmavo 
     <quote>zo'u</quote>(of selma'o ZOhU) to separate topic (a sumti) from comment (a bridi):</para>
     <example role="interlinear-gloss-example" xml:id="random-id-p4ww">
       <title>
         <anchor xml:id="c19e4d3" />
         <anchor xml:id="cll_chapter19-section4-example3" />
       </title>
       <interlinear-gloss>
         <jbo>le nuzba zo'u mi ba'o djuno</jbo>
@@ -269,35 +288,87 @@
     <xref linkend="cll_chapter19-section4-example9" />are inherently vague, and this difference between 
     <quote>ponse</quote>(which expects a physical object in x2) and 
     <quote>djica</quote>is ignored. See 
     <xref linkend="cll_chapter19-section9-example3" />for another topic/comment sentence.</para>
     <para>The subject of an English sentence is often the topic as well, but in Lojban the sumti in the x1 place is not necessarily the topic, especially if it is the normal (unconverted) x1 for the selbri. Thus Lojban sentences don't necessarily have a 
     <quote>subject</quote>in the English sense.</para>
   </section>
   <section xml:id="cll_chapter19-section5">
     <title>5. Questions and answers</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     xu      UI      truth question
-     ma      KOhA    sumti question
-     mo      GOhA    bridi question
-     xo      PA      number question
-     ji      A       sumti connective question
-     ge'i    GA      forethought connective question
-     gi'i    GIhA    bridi-tail connective question
-     gu'i    GUhA    tanru forethought connective question
-     je'i    JA      tanru connective question
-     pei     UI      attitude question
-     fi'a    FA      place structure question
-     cu'e    CUhE    tense/modal question
-     pau     UI      question premarker
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>xu</cmavo>
+        <selmaho>UI</selmaho>
+        <description>truth question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ma</cmavo>
+        <selmaho>KOhA</selmaho>
+        <description>sumti question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>mo</cmavo>
+        <selmaho>GOhA</selmaho>
+        <description>bridi question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>xo</cmavo>
+        <selmaho>PA</selmaho>
+        <description>number question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ji</cmavo>
+        <selmaho>A</selmaho>
+        <description>sumti connective question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ge'i</cmavo>
+        <selmaho>GA</selmaho>
+        <description>forethought connective question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>gi'i</cmavo>
+        <selmaho>GIhA</selmaho>
+        <description>bridi-tail connective question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>gu'i</cmavo>
+        <selmaho>GUhA</selmaho>
+        <description>tanru forethought connective question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>je'i</cmavo>
+        <selmaho>JA</selmaho>
+        <description>tanru connective question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>pei</cmavo>
+        <selmaho>UI</selmaho>
+        <description>attitude question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>fi'a</cmavo>
+        <selmaho>FA</selmaho>
+        <description>place structure question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>cu'e</cmavo>
+        <selmaho>CUhE</selmaho>
+        <description>tense/modal question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>pau</cmavo>
+        <selmaho>UI</selmaho>
+        <description>question premarker</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Lojban questions are not at all like English questions. There are two basic types: truth questions, of the form 
     <quote>Is it true that ...</quote>, and fill-in-the-blank questions. Truth questions are marked by preceding the bridi, or following any part of it specifically questioned, with the cmavo 
     <quote>xu</quote>(of selma'o UI):</para>
     <example role="interlinear-gloss-example" xml:id="random-id-2t28">
       <title>
         <anchor xml:id="c19e5d1" />
         <anchor xml:id="cll_chapter19-section5-example1" />
       </title>
       <interlinear-gloss>
         <jbo>xu do klama le zarci</jbo>
@@ -509,23 +580,27 @@
         <para>
         <quote>nai</quote>(to vaguely negate something or other, see 
         <xref linkend="cll_chapter15" />)</para>
       </listitem>
     </itemizedlist>
     <para>Where not needed for the expression of answers, most of these are made grammatical for pragmatic reasons: people will say them in conversation, and there is no reason to rule them out as ungrammatical merely because most of them are vague.</para>
   </section>
   <section xml:id="cll_chapter19-section6">
     <title>6. Subscripts: XI</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     xi      XI      subscript
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>xi</cmavo>
+        <selmaho>XI</selmaho>
+        <description>subscript</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The cmavo 
     <quote>xi</quote>(of selma'o XI) indicates that a subscript (a number, a lerfu string, or a parenthesized mekso) follows. Subscripts can be attached to almost any construction and are placed following the construction (or its terminator word, which is generally required). They are useful either to extend the finite cmavo list to infinite length, or to make more refined distinctions than the standard cmavo list permits. The remainder of this section mentions some places where subscripts might naturally be used.</para>
     <para>Lojban gismu have at most five places:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-GuYz">
       <title>
         <anchor xml:id="c19e6d1" />
         <anchor xml:id="cll_chapter19-section6-example1" />
       </title>
       <interlinear-gloss>
         <jbo>mi cu klama le zarci le zdani le dargu le karce</jbo>
@@ -706,24 +781,32 @@
     </example>
     <para>Finally, as mentioned in 
     <xref linkend="cll_chapter19-section2" />, 
     <quote>ni'o</quote>and 
     <quote>no'i</quote>cmavo with matching subscripts mark the start and the continuation of a given topic respectively. Different topics can be assigned to different subscripts.</para>
     <para>Other uses of subscripts will doubtless be devised in future.</para>
   </section>
   <section xml:id="cll_chapter19-section7">
     <title>7. Utterance ordinals: MAI</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     mai     MAI     utterance ordinal, -thly
-     mo'o    MAI     higher order utterance ordinal
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>mai</cmavo>
+        <selmaho>MAI</selmaho>
+        <description>utterance ordinal, -thly</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>mo'o</cmavo>
+        <selmaho>MAI</selmaho>
+        <description>higher order utterance ordinal</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Numerical free modifiers, corresponding to English 
     <quote>firstly</quote>, 
     <quote>secondly</quote>, and so on, can be created by suffixing 
     <quote>mai</quote>or 
     <quote>mo'o</quote>of selma'o MAI to a number or a lerfu string. Here are some examples:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-ymMz">
       <title>
         <anchor xml:id="c19e7d1" />
         <anchor xml:id="cll_chapter19-section7-example1" />
       </title>
@@ -745,24 +828,32 @@
     <quote>mo'o</quote>enumerates larger subdivisions of a text; 
     <quote>mai</quote>was designed for lists of numbered items, whereas 
     <quote>mo'o</quote>was intended to subdivide structured works. If this chapter were translated into Lojban, it might number each section with 
     <quote>mo'o</quote>: this section would then be introduced with 
     <quote>zemo'o</quote>, or 
     <quote>Section 7.</quote></para>
   </section>
   <section xml:id="cll_chapter19-section8">
     <title>8. Attitude scope markers: FUhE/FUhO</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     fu'e    FUhE    open attitudinal scope
-     fu'o    FUhO    close attitudinal scope
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>fu'e</cmavo>
+        <selmaho>FUhE</selmaho>
+        <description>open attitudinal scope</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>fu'o</cmavo>
+        <selmaho>FUhO</selmaho>
+        <description>close attitudinal scope</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Lojban has a complex system of 
     <quote>attitudinals</quote>, words which indicate the speaker's attitude to what is being said. The attitudinals include indicators of emotion, intensity markers, discursives (which show the structure of discourse), and evidentials (which indicate 
     <quote>how the speaker knows</quote>). Most of these words belong to selma'o UI; the intensity markers belong to selma'o CAI for historical reasons, but the two selma'o are grammatically identical. The individual cmavo of UI and CAI are discussed in 
     <xref linkend="cll_chapter13" />; only the rules for applying them in discourse are presented here.</para>
     <para>Normally, an attitudinal applies to the preceding word only. However, if the preceding word is a structural cmavo which begins or ends a whole construction, then that whole construction is affected by the attitudinal:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-WCHe">
       <title>
         <anchor xml:id="c19e8d1" />
         <anchor xml:id="cll_chapter19-section8-example1" />
         <anchor xml:id="c19e8d2" />
@@ -825,26 +916,42 @@
     <quote>blanu zdani</quote>portion of the three-part tanru 
     <quote>blanu zdani ponse</quote>is marked as a belief of the speaker. Naturally, the attitudinal scope markers do not affect the rules for interpreting multi-part tanru: 
     <quote>blanu zdani</quote>groups first because tanru group from left to right unless overridden with 
     <quote>ke</quote>or 
     <quote>bo</quote>.</para>
     <para>Other attitudinals of more local scope can appear after attitudinals marked by FUhE; these attitudinals are added to the globally active attitudinals rather than superseding them.</para>
   </section>
   <section xml:id="cll_chapter19-section9">
     <title>9. Quotations: LU, LIhU, LOhU, LEhU</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     lu      LU      begin quotation
-     li'u    LIhU    end quotation
-     lo'u    LOhU    begin error quotation
-     le'u    LEhU    end error quotation
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>lu</cmavo>
+        <selmaho>LU</selmaho>
+        <description>begin quotation</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>li'u</cmavo>
+        <selmaho>LIhU</selmaho>
+        <description>end quotation</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lo'u</cmavo>
+        <selmaho>LOhU</selmaho>
+        <description>begin error quotation</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>le'u</cmavo>
+        <selmaho>LEhU</selmaho>
+        <description>end error quotation</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Grammatically, quotations are very simple in Lojban: all of them are sumti, and they all mean something like 
     <quote>the piece of text here quoted</quote>:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-6SBj">
       <title>
         <anchor xml:id="c19e9d1" />
         <anchor xml:id="cll_chapter19-section9-example1" />
       </title>
       <interlinear-gloss>
         <jbo>mi pu cusku lu mi'e djan [li'u]</jbo>
         <gloss>I [past] express [quote] I-am John [unquote]</gloss>
@@ -888,22 +995,22 @@
         <jbo>lu le mlatu cu viska le finpe li'u zo'u lo'u viska le le'u</jbo>
         <gloss>cu selbasti .ei lo'u viska lo le'u</gloss>
         <gloss>[quote] le mlatu cu viska le finpe [unquote] : [quote] viska le [unquote]</gloss>
         <gloss>is-replaced-by [obligation!] [quote] viska lo [unquote].</gloss>
         <en>In the sentence 
         <quote>le mlatu viska le finpe</quote>, 
         <quote>viska le</quote>should be replaced by 
         <quote>viska lo</quote>.</en>
       </interlinear-gloss>
     </example>
-    <para>Note the topic-comment formulation (
-    <xref linkend="cll_chapter19-section4" />) and the indicator applying to the selbri only (
+    <para>Note the topic-comment formulation ( 
+    <xref linkend="cll_chapter19-section4" />) and the indicator applying to the selbri only ( 
     <xref linkend="cll_chapter19-section8" />). Neither 
     <quote>viska le</quote>nor 
     <quote>viska lo</quote>is a valid Lojban utterance, and both require 
     <quote>lo'u</quote>quotation.</para>
     <para>Additionally, pro-sumti or pro-bridi in the quoting sentence can refer to words appearing in the quoted sentence when 
     <quote>lu ... li'u</quote>is used, but not when 
     <quote>lo'u ... le'u</quote>is used:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-x8XL">
       <title>
         <anchor xml:id="c19e9d4" />
@@ -956,25 +1063,37 @@
     <quote>lo'u</quote>quotation. However, it is possible for a 
     <quote>le'u</quote>to occur within a 
     <quote>lo'u ... le'u</quote>quotation by preceding it with the cmavo 
     <quote>zo</quote>, discussed in 
     <xref linkend="cll_chapter19-section10" />. Note that 
     <quote>le'u</quote>is not an elidable terminator; it is required.</para>
   </section>
   <section xml:id="cll_chapter19-section10">
     <title>10. More on quotations: ZO, ZOI</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     zo      ZO      quote single word
-     zoi     ZOI     non-Lojban quotation
-     la'o    ZOI     non-Lojban name
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>zo</cmavo>
+        <selmaho>ZO</selmaho>
+        <description>quote single word</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>zoi</cmavo>
+        <selmaho>ZOI</selmaho>
+        <description>non-Lojban quotation</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>la'o</cmavo>
+        <selmaho>ZOI</selmaho>
+        <description>non-Lojban name</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The cmavo 
     <quote>zo</quote>(of selma'o ZO) is a strong quotation mark for the single following word, which can be any Lojban word whatsoever. Among other uses, 
     <quote>zo</quote>allows a metalinguistic word to be referenced without having it act on the surrounding text. The word must be a morphologically legal (but not necessarily meaningful) single Lojban word; compound cmavo are not permitted. For example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-qxjF">
       <title>
         <anchor xml:id="c19e10d1" />
         <anchor xml:id="cll_chapter19-section10-example1" />
       </title>
       <interlinear-gloss>
         <jbo>zo si cu lojbo valsi</jbo>
@@ -1132,24 +1251,32 @@
       </interlinear-gloss>
     </example>
     <para>Using 
     <quote>la'o</quote>for all names rather than Lojbanizing, however, makes for very cumbersome text. A rough equivalent of 
     <quote>la'o</quote>might be 
     <quote>la me zoi</quote>.</para>
   </section>
   <section xml:id="cll_chapter19-section11">
     <title>11. Contrastive emphasis: BAhE</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ba'e    BAhE    emphasize next word
-     za'e    BAhE    next word is nonce
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ba'e</cmavo>
+        <selmaho>BAhE</selmaho>
+        <description>emphasize next word</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>za'e</cmavo>
+        <selmaho>BAhE</selmaho>
+        <description>next word is nonce</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>English often uses strong stress on a word to single it out for contrastive emphasis, thus</para>
     <example role="interlinear-gloss-example" xml:id="random-id-iW4P">
       <title>
         <anchor xml:id="c19e11d1" />
         <anchor xml:id="cll_chapter19-section11-example1" />
       </title>
       <interlinear-gloss>
         <jbo>I saw George.</jbo>
       </interlinear-gloss>
     </example>
@@ -1238,28 +1365,42 @@
       </interlinear-gloss>
     </example>
     <para>marks a Lojbanization of an English name, where a more appropriate standard form might be something like 
     <quote>la ctiipyris.</quote>, reflecting the country's name in Albanian.</para>
     <para>Before a lujvo or fu'ivla, 
     <quote>za'e</quote>indicates that the word has been made up on the spot and may be used in a sense that is not found in the unabridged dictionary (when we have an unabridged dictionary!).</para>
   </section>
   <section xml:id="cll_chapter19-section12">
     <title>12. Parenthesis and metalinguistic commentary: TO, TOI, SEI</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     to      TO      open parenthesis
-     to'i    TO      open editorial parenthesis
-
-     toi     TOI     close parenthesis
-
-     sei     SEI     metalinguistic bridi marker
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>to</cmavo>
+        <selmaho>TO</selmaho>
+        <description>open parenthesis</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>to'i</cmavo>
+        <selmaho>TO</selmaho>
+        <description>open editorial parenthesis</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>toi</cmavo>
+        <selmaho>TOI</selmaho>
+        <description>close parenthesis</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>sei</cmavo>
+        <selmaho>SEI</selmaho>
+        <description>metalinguistic bridi marker</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The cmavo 
     <quote>to</quote>and 
     <quote>toi</quote>are discursive (non-mathematical) parentheses, for inserting parenthetical remarks. Any text whatsoever can go within the parentheses, and it is completely invisible to its context. It can, however, refer to the context by the use of pro-sumti and pro-bridi: any that have been assigned in the context are still assigned in the parenthetical remarks, but the reverse is not true.</para>
     <example role="interlinear-gloss-example" xml:id="random-id-FHJi">
       <title>
         <anchor xml:id="c19e12d1" />
         <anchor xml:id="cll_chapter19-section12-example1" />
       </title>
       <interlinear-gloss>
         <jbo>doi lisas. mi djica le nu to doi frank. ko sisti toi do viska le mlatu</jbo>
@@ -1398,25 +1539,37 @@
     <quote>sei</quote>and its attached bridi as an editorial insert, not part of the quotation. In a more relaxed style, these 
     <quote>sa'a</quote>cmavo would probably be dropped.</para>
     <para>The elidable terminator for 
     <quote>sei</quote>is 
     <quote>se'u</quote>(of selma'o SEhU); it is rarely needed, except to separate a selbri within the 
     <quote>sei</quote>comment from an immediately following selbri (or component) outside the comment.</para>
   </section>
   <section xml:id="cll_chapter19-section13">
     <title>13. Erasure: SI, SA, SU</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     si      SI      erase word
-     sa      SA      erase phrase
-     su      SU      erase discourse
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>si</cmavo>
+        <selmaho>SI</selmaho>
+        <description>erase word</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>sa</cmavo>
+        <selmaho>SA</selmaho>
+        <description>erase phrase</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>su</cmavo>
+        <selmaho>SU</selmaho>
+        <description>erase discourse</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The cmavo 
     <quote>si</quote>(of selma'o SI) is a metalinguistic operator that erases the preceding word, as if it had never been spoken:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-JErC">
       <title>
         <anchor xml:id="c19e13d1" />
         <anchor xml:id="cll_chapter19-section13-example1" />
       </title>
       <interlinear-gloss>
         <jbo>ti gerku si mlatu</jbo>
         <en>This is-a-dog, er, is-a-cat.</en>
@@ -1584,39 +1737,47 @@
     <quote>su</quote>(of selma'o SU) is yet another metalinguistic operator that erases the entire text. However, if the text involves multiple speakers, then 
     <quote>su</quote>will only erase the remarks made by the one who said it, unless that speaker has said nothing. Therefore 
     <quote>susu</quote>is needed to eradicate a whole discussion in conversation.</para>
     <para>Note: The current machine parser does not implement either 
     <quote>su</quote>or 
     <quote>susu</quote>erasure.</para>
   </section>
   <section xml:id="cll_chapter19-section14">
     <title>14. Hesitation: Y</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     .y.     Y       hesitation noise
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>.y.</cmavo>
+        <selmaho>Y</selmaho>
+        <description>hesitation noise</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Speakers often need to hesitate to think of what to say next or for some extra-linguistic reason. There are two ways to hesitate in Lojban: to pause between words (that is, to say nothing) or to use the cmavo 
     <quote>.y.</quote>(of selma'o Y). This resembles in sound the English hesitation noise written 
     <quote>uh</quote>(or 
     <quote>er</quote>), but differs from it in the requirement for pauses before and after. Unlike a long pause, it cannot be mistaken for having nothing more to say: it holds the floor for the speaker. Since vowel length is not significant in Lojban, the 
     <quote>y</quote>sound can be dragged out for as long as necessary. Furthermore, the sound can be repeated, provided the required pauses are respected.</para>
-    <para>Since the hesitation sound in English is outside the formal language, English-speakers may question the need for a formal cmavo. Speakers of other languages, however, often hesitate by saying (or, if necessary, repeating) a word (
+    <para>Since the hesitation sound in English is outside the formal language, English-speakers may question the need for a formal cmavo. Speakers of other languages, however, often hesitate by saying (or, if necessary, repeating) a word ( 
     <quote>este</quote>in some dialects of Spanish, roughly meaning 
     <quote>that is</quote>), and Lojban's audio-visual isomorphism requires a written representation of all meaningful spoken behavior. Of course, 
     <quote>.y.</quote>has no grammatical significance: it can appear anywhere at all in a Lojban sentence except in the middle of a word.</para>
   </section>
   <section xml:id="cll_chapter19-section15">
     <title>15. No more to say: FAhO</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     fa'o    FAhO    end of text
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>fa'o</cmavo>
+        <selmaho>FAhO</selmaho>
+        <description>end of text</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The cmavo 
     <quote>fa'o</quote>(of selma'o FAhO) is the usually omitted marker for the end of a text; it can be used in computer interaction to indicate the end of input or output, or for explicitly giving up the floor during a discussion. It is outside the regular grammar, and the machine parser takes it as an unconditional signal to stop parsing unless it is quoted with 
     <quote>zo</quote>or with 
     <quote>lo'u ... le'u</quote>. In particular, it is not used at the end of subordinate texts quoted with 
     <quote>lu ... li'u</quote>or parenthesized with 
     <quote>to ... toi</quote>.</para>
   </section>
   <section xml:id="cll_chapter19-section16">
     <title>16. List of cmavo interactions</title>
     <para>The following list gives the cmavo and selma'o that are recognized by the earliest stages of the parser, and specifies exactly which of them interact with which others. All of the cmavo are at least mentioned in this chapter. The cmavo are written in lower case, and the selma'o in UPPER CASE.</para>
@@ -1703,35 +1864,119 @@
         <quote>da'o</quote>, 
         <quote>fu'e</quote>, and 
         <quote>fu'o</quote>are the same as UI, but do not absorb a following 
         <quote>nai</quote>.</para>
       </listitem>
     </itemizedlist>
   </section>
   <section xml:id="cll_chapter19-section17">
     <title>17. List of Elidable Terminators</title>
     <para>The following list shows all the elidable terminators of Lojban. The first column is the terminator, the second column is the selma'o that starts the corresponding construction, and the third column states what kinds of grammatical constructs are terminated. Each terminator is the only cmavo of its selma'o, which naturally has the same name as the cmavo.</para>
-    <programlisting xml:space="preserve">
-     be'o    BE              sumti attached to a tanru unit
-     boi     PA/BY           number or lerfu string
-     do'u    COI/DOI         vocative phrases
-     fe'u    FIhO            ad-hoc modal tags
-     ge'u    GOI             relative phrases
-     kei     NU              abstraction bridi
-     ke'e    KE              groups of various kinds
-     ku      LE/LA           description sumti
-     ku'e    PEhO            forethought mekso
-     ku'o    NOI             relative clauses
-     li'u    LU              quotations
-     lo'o    LI              number sumti
-     lu'u    LAhE/NAhE+BO    sumti qualifiers
-     me'u    ME              tanru units formed from sumti
-     nu'u    NUhI            forethought termsets
-     se'u    SEI/SOI         metalinguistic insertions
-     te'u    various         mekso conversion constructs
-     toi     TO              parenthetical remarks
-     tu'u    TUhE            multiple sentences or paragraphs
-     vau     (none)          simple bridi or bridi-tails
-     ve'o    VEI             mekso parentheses
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>be'o</cmavo>
+        <selmaho>BE</selmaho>
+        <description>sumti attached to a tanru unit</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>boi</cmavo>
+        <selmaho>PA/BY</selmaho>
+        <description>number or lerfu string</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>do'u</cmavo>
+        <selmaho>COI/DOI</selmaho>
+        <description>vocative phrases</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>fe'u</cmavo>
+        <selmaho>FIhO</selmaho>
+        <description>ad-hoc modal tags</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ge'u</cmavo>
+        <selmaho>GOI</selmaho>
+        <description>relative phrases</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>kei</cmavo>
+        <selmaho>NU</selmaho>
+        <description>abstraction bridi</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ke'e</cmavo>
+        <selmaho>KE</selmaho>
+        <description>groups of various kinds</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ku</cmavo>
+        <selmaho>LE/LA</selmaho>
+        <description>description sumti</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ku'e</cmavo>
+        <selmaho>PEhO</selmaho>
+        <description>forethought mekso</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ku'o</cmavo>
+        <selmaho>NOI</selmaho>
+        <description>relative clauses</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>li'u</cmavo>
+        <selmaho>LU</selmaho>
+        <description>quotations</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lo'o</cmavo>
+        <selmaho>LI</selmaho>
+        <description>number sumti</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lu'u</cmavo>
+        <selmaho>LAhE/NAhE+BO</selmaho>
+        <description>sumti qualifiers</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>me'u</cmavo>
+        <selmaho>ME</selmaho>
+        <description>tanru units formed from sumti</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>nu'u</cmavo>
+        <selmaho>NUhI</selmaho>
+        <description>forethought termsets</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>se'u</cmavo>
+        <selmaho>SEI/SOI</selmaho>
+        <description>metalinguistic insertions</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>te'u</cmavo>
+        <selmaho>various</selmaho>
+        <description>mekso conversion constructs</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>toi</cmavo>
+        <selmaho>TO</selmaho>
+        <description>parenthetical remarks</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>tu'u</cmavo>
+        <selmaho>TUhE</selmaho>
+        <description>multiple sentences or paragraphs</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>vau</cmavo>
+        <selmaho>(none)</selmaho>
+        <description>simple bridi or bridi-tails</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ve'o</cmavo>
+        <selmaho>VEI</selmaho>
+        <description>mekso parentheses</description>
+      </cmavo-entry>
+    </cmavo-list>
   </section>
 </chapter>
diff --git a/todocbook/2.xml b/todocbook/2.xml
index 6d1b49d..cff8c80 100644
--- a/todocbook/2.xml
+++ b/todocbook/2.xml
@@ -37,29 +37,26 @@
         <imagedata fileref="file:///epicuser/AISolutions/graphics/AIWorkbench/diagram.png" width="291px" />
       </imageobject>
     </mediaobject>
     <mediaobject>
       <alt>[svg version]</alt>
       <imageobject>
         <imagedata fileref="diagram.svg" />
       </imageobject>
     </mediaobject>
     <!--fallback for text-based browsers w/o css:-->
-    <programlisting xml:space="preserve">
-         bridi (predicate)
-    ______________|________________
-    |                              |
-    John     is the father of    Sam
-    |___|    |______________|   |___|
-       |              |           |
-    sumti      selbri       sumti (argument)
-</programlisting>
+    <cmavo-list>John is the father of Sam| | |
+    <cmavo-entry>
+      <cmavo>sumti</cmavo>
+      <selmaho>selbri</selmaho>
+      <description>sumti (argument)</description>
+    </cmavo-entry></cmavo-list>
     <para>In a relationship, there are a definite number of things being related. In English, for example, 
     <quote>give</quote>has three places: the donor, the recipient and the gift. For example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-DE08">
       <title>
         <anchor xml:id="c2e1d4" />
         <anchor xml:id="cll_chapter2-section1-example4" />
       </title>
       <interlinear-gloss>
         <jbo>John gives Sam the book.</jbo>
       </interlinear-gloss>
@@ -311,21 +308,21 @@
 
 <anchor xml:id="c2e5d7" />
 <anchor xml:id="cll_chapter2-section5-example7" />5.7)   
 <foreignphrase xml:lang="jbo" role="sumti">mi</foreignphrase> 
 <foreignphrase xml:lang="jbo" role="selbri">tavla</foreignphrase> 
 <foreignphrase xml:lang="jbo" role="sumti">zo'e</foreignphrase> 
 <foreignphrase xml:lang="jbo" role="sumti">tu</foreignphrase> 
 <foreignphrase xml:lang="jbo" role="sumti">ti</foreignphrase>
        I talk to someone about that thing yonder in this language.
 </programlisting>
-    <para>(
+    <para>( 
     <xref linkend="cll_chapter2-section5-example7" />is a bit unusual, as there is no easy way to point to a language; one might point to a copy of this book, and hope the meaning gets across!)</para>
     <para>When there are one or more occurrences of the cmavo 
     <quote>zo'e</quote>at the end of a bridi, they may be omitted, a process called 
     <quote>ellipsis</quote>. 
     <xref linkend="cll_chapter2-section5-example5" />and 
     <xref linkend="cll_chapter2-section5-example6" />may be expressed thus:</para>
     <programlisting xml:space="preserve">
 <anchor xml:id="c2e5d8" />
 <anchor xml:id="cll_chapter2-section5-example8" />5.8)   
 <foreignphrase xml:lang="jbo" role="sumti">mi</foreignphrase> 
diff --git a/todocbook/20.xml b/todocbook/20.xml
index 2d5e14d..2f04302 100644
--- a/todocbook/20.xml
+++ b/todocbook/20.xml
@@ -1,1194 +1,1194 @@
 <chapter xml:id="cll_chapter20">
   <title>Chapter 20 A Catalogue of selma'o</title>
   <section xml:id="cll_chapter20-sectionindex.html">
     <title />
     <!--
       <h6>$Revision: 4.3 $<br />
       mkhtml: 1.1</h6>
       -->
     <para>The following paragraphs list all the selma'o of Lojban, with a brief explanation of what each one is about, and reference to the chapter number where each is explained more fully. As usual, all selma'o names are given in capital letters (with “h” serving as the capital of “'”) and are the names of a representative cmavo, often the most important or the first in alphabetical order. One example is given of each selma'o: for selma'o which have several uses, the most common use is shown.</para>
     <bridgehead>
-    <anchor xml:id="A" />selma'o A (
+    <anchor xml:id="A" />selma'o A ( 
     <xref linkend="cll_chapter14-section6" />)</bridgehead>
     <para>Specifies a logical connection (e.g. “and”, “or”, “if”), usually between sumti.</para>
     <programlisting xml:space="preserve">
     la djan. .a la djein. klama le zarci
     John and/or Jane goes to the store.
 </programlisting>
     <para>Also used to create vowel lerfu words when followed with “bu”.</para>
     <bridgehead>
-    <anchor xml:id="BAI" />selma'o BAI (
+    <anchor xml:id="BAI" />selma'o BAI ( 
     <xref linkend="cll_chapter9-section6" />)</bridgehead>
     <para>May be prefixed to a sumti to specify an additional place, not otherwise present in the place structure of the selbri, and derived from a single place of some other selbri.</para>
     <programlisting xml:space="preserve">
     mi tavla bau la lojban.
     I speak in-language Lojban.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="BAhE" />selma'o BAhE (
+    <anchor xml:id="BAhE" />selma'o BAhE ( 
     <xref linkend="cll_chapter19-section11" />)</bridgehead>
     <para>Emphasizes the next single word, or marks it as a nonce word (one invented for the occasion).</para>
     <programlisting xml:space="preserve">
     la ba'e .djordj. klama le zarci
     
 <emphasis>George</emphasis> goes to the store.
     It is George who goes to the store.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="BE" />selma'o BE (
+    <anchor xml:id="BE" />selma'o BE ( 
     <xref linkend="cll_chapter5-section7" />)</bridgehead>
     <para>Attaches sumti which fill the place structure of a single unit making up a tanru. Unless otherwise indicated, the sumti fill the x2, x3, and successive places in that order. 
     <xref linkend="BE" />is most useful in descriptions formed with 
     <xref linkend="LE" />. See 
     <xref linkend="BEI" />, 
     <xref linkend="BEhO" />.</para>
     <programlisting xml:space="preserve">
     mi klama be ta troci
     I am-a-(goer to-that) type-of-trier.
     I try to go to that place.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="BEI" />selma'o BEI (
+    <anchor xml:id="BEI" />selma'o BEI ( 
     <xref linkend="cll_chapter5-section7" />)</bridgehead>
     <para>Separates multiple sumti attached by 
     <xref linkend="BE" />to a tanru unit.</para>
     <programlisting xml:space="preserve">
     mi klama be le zarci bei le zdani be'o troci
     I am-a-(goer to-the store from-the home) type-of-trier.
     I try to go from the home to the market.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="BEhO" />selma'o BEhO (
+    <anchor xml:id="BEhO" />selma'o BEhO ( 
     <xref linkend="cll_chapter5-section7" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="BE" />. Terminates sumti that are attached to a tanru unit.</para>
     <programlisting xml:space="preserve">
     mi klama be le zarci be'o troci
     I am-a-(goer to-the market) type-of-trier.
     I try to go to the market.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="BIhE" />selma'o BIhE (
+    <anchor xml:id="BIhE" />selma'o BIhE ( 
     <xref linkend="cll_chapter18-section5" />)</bridgehead>
     <para>Prefixed to a mathematical operator to mark it as higher priority than other mathematical operators, binding its operands more closely.</para>
     <programlisting xml:space="preserve">
     li ci bi'e pi'u vo su'i mu du li paze
     The-number 3 [priority] times 4 plus 5 equals the-number 17.
     3 × 4 + 5 = 17
 </programlisting>
     <bridgehead>
-    <anchor xml:id="BIhI" />selma'o BIhI (
+    <anchor xml:id="BIhI" />selma'o BIhI ( 
     <xref linkend="cll_chapter14-section16" />)</bridgehead>
     <para>Joins sumti or tanru units (as well as some other things) to form intervals. See 
     <xref linkend="GAhO" />.</para>
     <programlisting xml:space="preserve">
     mi ca sanli la drezdn. bi'i la frankfurt.
     I [present] stand-on-surface Dresden [interval] Frankfurt.
     I am standing between Dresden and Frankfurt.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="BO" />selma'o BO (
+    <anchor xml:id="BO" />selma'o BO ( 
     <xref linkend="cll_chapter5-section3" />, 
     <xref linkend="cll_chapter15-section6" />, 
     <xref linkend="cll_chapter18-section17" />)</bridgehead>
     <para>Joins tanru units, binding them together closely. Also used to bind logically or non-logically connected phrases, sentences, etc. 
     <xref linkend="BO" />is always high precedence and right-grouping.</para>
     <programlisting xml:space="preserve">
     ta cmalu nixli bo ckule
     That is-a-small type-of (girl type-of school).
     That is a small school for girls.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="BOI" />selma'o BOI (
+    <anchor xml:id="BOI" />selma'o BOI ( 
     <xref linkend="cll_chapter18-section6" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="PA" />or 
     <xref linkend="BY" />. Used to terminate a number (string of numeric cmavo) or lerfu string (string of letter words) when another string immediately follows.</para>
     <programlisting xml:space="preserve">
     li re du li vu'u voboi re
     The-number two equals the-number the-difference-of four-and two.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="BU" />selma'o BU (
+    <anchor xml:id="BU" />selma'o BU ( 
     <xref linkend="cll_chapter17-section4" />)</bridgehead>
     <para>A suffix which can be attached to any word, typically a word representing a letter of the alphabet or else a name, to make a word for a symbol or a different letter of the alphabet. In particular, attached to single-vowel cmavo to make words for vowel letters.</para>
     <programlisting xml:space="preserve">
     .abu .ebu .ibu .obu .ubu .ybu
     a, e, i, o, u, y.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="BY" />selma'o BY (
+    <anchor xml:id="BY" />selma'o BY ( 
     <xref linkend="cll_chapter17-section2" />)</bridgehead>
     <para>Words representing the letters of the Lojban alphabet, plus various shift words which alter the interpretation of other letter words. Terminated by BOI.</para>
     <programlisting xml:space="preserve">
     .abu tavla .by le la .ibymym. skami
     A talks-to B about-the of-IBM computers.
     A talks to B about IBM computers.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="CAI" />selma'o CAI (
+    <anchor xml:id="CAI" />selma'o CAI ( 
     <xref linkend="cll_chapter13-section4" />)</bridgehead>
     <para>Indicates the intensity of an emotion: maximum, strong, weak, or not at all. Typically follows another particle which specifies the emotion.</para>
     <programlisting xml:space="preserve">
     .ei cai mi klama le zarci
     [Obligation!] [Intense!] I go-to the market.
     I must go to the market.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="CAhA" />selma'o CAhA (
+    <anchor xml:id="CAhA" />selma'o CAhA ( 
     <xref linkend="cll_chapter10-section19" />)</bridgehead>
     <para>Specifies whether a bridi refers to an actual fact, a potential (achieved or not), or merely an innate capability.</para>
     <programlisting xml:space="preserve">
     ro datka ka'e flulimna
     All ducks [capability] are-float-swimmers.
     All ducks have the capability of swimming by floating.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="CEI" />selma'o CEI (
+    <anchor xml:id="CEI" />selma'o CEI ( 
     <xref linkend="cll_chapter7-section5" />)</bridgehead>
     <para>Assigns a selbri definition to one of the five pro-bridi gismu: “broda”, “brode”, “brodi”, “brodo”, or “brodu”, for later use.</para>
     <programlisting xml:space="preserve">
     ti slasi je mlatu bo cidja lante gacri cei broda
          .i le crino broda cu barda .i le xunre broda cu cmalu
     This is a plastic cat-food can cover, or thingy.
          The green thingy is large. The red thingy is small.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="CEhE" />selma'o CEhE (
+    <anchor xml:id="CEhE" />selma'o CEhE ( 
     <xref linkend="cll_chapter14-section11" />, 
     <xref linkend="cll_chapter16-section7" />)</bridgehead>
     <para>Joins multiple terms into a termset. Termsets are used to associate several terms for logical connectives, for equal quantifier scope, or for special constructs in tenses.</para>
     <programlisting xml:space="preserve">
     mi ce'e do pe'e je la djan. ce'e la djeimyz. cu pendo
     I [,] you [joint] and John [,] James are-friends-of.
     I am a friend of you, and John is a friend of James.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="CO" />selma'o CO (
+    <anchor xml:id="CO" />selma'o CO ( 
     <xref linkend="cll_chapter5-section8" />)</bridgehead>
     <para>When inserted between the components of a tanru, inverts it, so that the following tanru unit modifies the previous one.</para>
     <programlisting xml:space="preserve">
     mi troci co klama le zarci le zdani
     I am-a-trier of-type (goer to-the market from-the house).
     I try to go to the market from the house.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="COI" />selma'o COI (
+    <anchor xml:id="COI" />selma'o COI ( 
     <xref linkend="cll_chapter6-section11" />, 
     <xref linkend="cll_chapter13-section14" />)</bridgehead>
     <para>When prefixed to a name, description, or sumti, produces a vocative: a phrase which indicates who is being spoken to (or who is speaking). Vocatives are used in conversational protocols, including greeting, farewell, and radio communication. Terminated by 
     <xref linkend="DOhU" />. See 
     <xref linkend="DOI" />.</para>
     <programlisting xml:space="preserve">
     coi .djan.
     Greetings, John.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="CU" />selma'o CU (
+    <anchor xml:id="CU" />selma'o CU ( 
     <xref linkend="cll_chapter9-section2" />)</bridgehead>
     <para>Separates the selbri of a bridi from any sumti which precede it. Never strictly necessary, but often useful to eliminate various elidable terminators.</para>
     <programlisting xml:space="preserve">
     le gerku cu klama le zarci
     The dog goes to-the store.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="CUhE" />selma'o CUhE (
+    <anchor xml:id="CUhE" />selma'o CUhE ( 
     <xref linkend="cll_chapter10-section24" />)</bridgehead>
     <para>Forms a question which asks when, where, or in what mode the rest of the bridi is true. See 
     <xref linkend="PU" />, 
     <xref linkend="CAhA" />, 
     <xref linkend="TAhE" />, and 
     <xref linkend="BAI" />.</para>
     <programlisting xml:space="preserve">
     do cu'e klama le zarci
     You [When/Where?] go to-the store?
     When are you going to the store?
 </programlisting>
     <bridgehead>
-    <anchor xml:id="DAhO" />selma'o DAhO (
+    <anchor xml:id="DAhO" />selma'o DAhO ( 
     <xref linkend="cll_chapter7-section13" />)</bridgehead>
     <para>Cancels the assigned significance of all sumti cmavo (of selma'o 
     <xref linkend="KOhA" />) and bridi cmavo (of selma'o 
     <xref linkend="GOhA" />).</para>
     <bridgehead>
-    <anchor xml:id="DOI" />selma'o DOI (
+    <anchor xml:id="DOI" />selma'o DOI ( 
     <xref linkend="cll_chapter13-section14" />)</bridgehead>
     <para>The non-specific vocative indicator. May be used with or without 
     <xref linkend="COI" />. No pause is required between “doi” and a following name. See 
     <xref linkend="DOhU" />.</para>
     <programlisting xml:space="preserve">
     doi frank. mi tavla do
     O Frank, I speak-to you.
     Frank, I’m talking to you.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="DOhU" />selma'o DOhU (
+    <anchor xml:id="DOhU" />selma'o DOhU ( 
     <xref linkend="cll_chapter13-section14" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="COI" />or 
     <xref linkend="DOI" />. Signals the end of a vocative.</para>
     <programlisting xml:space="preserve">
     coi do'u
     Greetings [terminator]
     Greetings, O unspecified one!
 </programlisting>
     <bridgehead>
-    <anchor xml:id="FA" />selma'o FA (
+    <anchor xml:id="FA" />selma'o FA ( 
     <xref linkend="cll_chapter9-section3" />)</bridgehead>
     <para>Prefix for a sumti, indicating which numbered place in the place structure the sumti belongs in; overrides word order.</para>
     <programlisting xml:space="preserve">
     fa mi cu klama fi la .atlantas. fe la bastn. fo le dargu fu le karce
     x1= I go x3= Atlanta x2= Boston x4= the road x5= the car.
     I go from Atlanta to Boston via the road using the car.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="FAhA" />selma'o FAhA (
+    <anchor xml:id="FAhA" />selma'o FAhA ( 
     <xref linkend="cll_chapter10-section2" />)</bridgehead>
     <para>Specifies the direction in which, or toward which (when marked with 
     <xref linkend="MOhI" />) or along which (when prefixed by 
     <xref linkend="VEhA" />or 
     <xref linkend="VIhA" />) the action of the bridi takes place.</para>
     <programlisting xml:space="preserve">
     le nanmu zu'a batci le gerku
     The man [left] bites the dog.
     To my left, the man bites the dog.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="FAhO" />selma'o FAhO (
+    <anchor xml:id="FAhO" />selma'o FAhO ( 
     <xref linkend="cll_chapter19-section15" />)</bridgehead>
     <para>A mechanical signal, outside the grammar, indicating that there is no more text. Useful in talking to computers.</para>
     <bridgehead>
-    <anchor xml:id="FEhE" />selma'o FEhE (
+    <anchor xml:id="FEhE" />selma'o FEhE ( 
     <xref linkend="cll_chapter10-section11" />)</bridgehead>
     <para>Indicates that the following interval modifier (using 
     <xref linkend="TAhE" />, 
     <xref linkend="ROI" />, or 
     <xref linkend="ZAhO" />) refers to space rather than time.</para>
     <programlisting xml:space="preserve">
     ko vi'i fe'e di'i sombo le gurni
     You-imperative [1-dimensional] [space] [regularly] sow the grain.
     Sow the grain in a line and evenly!
 </programlisting>
     <bridgehead>
-    <anchor xml:id="FEhU" />selma'o FEhU (
+    <anchor xml:id="FEhU" />selma'o FEhU ( 
     <xref linkend="cll_chapter9-section5" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="FIhO" />. Indicates the end of an ad hoc modal tag: the tagged sumti immediately follows.</para>
     <programlisting xml:space="preserve">
     mi viska do fi'o kanla [fe'u] le zunle
     I see you [modal] eye: the left-thing
     I see you with the left eye.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="FIhO" />selma'o FIhO (
+    <anchor xml:id="FIhO" />selma'o FIhO ( 
     <xref linkend="cll_chapter9-section5" />)</bridgehead>
     <para>When placed before a selbri, transforms the selbri into a modal tag, grammatically and semantically equivalent to a member of selma'o 
     <xref linkend="BAI" />. Terminated by 
     <xref linkend="FEhU" />.</para>
     <programlisting xml:space="preserve">
     mi viska do fi'o kanla le zunle
     I see you with eye the left-thing
     I see you with my left eye.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="FOI" />selma'o FOI (
+    <anchor xml:id="FOI" />selma'o FOI ( 
     <xref linkend="cll_chapter17-section6" />)</bridgehead>
     <para>Signals the end of a compound alphabet letter word that begins with 
     <xref linkend="TEI" />. Not an elidable terminator.</para>
     <programlisting xml:space="preserve">
     tei .ebu .akut. bu foi
     ( “e” “acute” )
     the letter “e” with an acute accent
 </programlisting>
     <bridgehead>
-    <anchor xml:id="FUhA" />selma'o FUhA (
+    <anchor xml:id="FUhA" />selma'o FUhA ( 
     <xref linkend="cll_chapter18-section16" />)</bridgehead>
     <para>Indicates that the following mathematical expression is to be interpreted as reverse Polish (RP), a mode in which mathematical operators follow their operands.</para>
     <programlisting xml:space="preserve">
     li fu'a reboi re[boi] su'i du li vo
     the-number [RP!] two, two, plus equals the-number four
     2 + 2 = 4
 </programlisting>
     <bridgehead>
-    <anchor xml:id="FUhE" />selma'o FUhE (
+    <anchor xml:id="FUhE" />selma'o FUhE ( 
     <xref linkend="cll_chapter19-section8" />)</bridgehead>
     <para>Indicates that the following indicator(s) of selma'o 
     <xref linkend="UI" />affect not the preceding word, as usual, but rather all following words until a 
     <xref linkend="FUhO" />.</para>
     <programlisting xml:space="preserve">
     mi viska le fu'e .ia blanu zdani fu'o ponse
     I see the [start] [belief] blue house [end] possessor
     I see the owner of a blue house, or what I believe to be one.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="FUhO" />selma'o FUhO (
+    <anchor xml:id="FUhO" />selma'o FUhO ( 
     <xref linkend="cll_chapter19-section8" />)</bridgehead>
     <para>Cancels all indicators of selma'o 
     <xref linkend="UI" />which are in effect.</para>
     <programlisting xml:space="preserve">
     mi viska le fu'e .ia blanu zdani fu'o ponse
     I see the [start] [belief] blue house [end] possessor.
     I see the owner of what I believe to be a blue house.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="GA" />selma'o GA (
+    <anchor xml:id="GA" />selma'o GA ( 
     <xref linkend="cll_chapter14-section5" />)</bridgehead>
     <para>Indicates the beginning of two logically connected sumti, bridi-tails, or various other things. Logical connections include “both ... and”, “either ... or”, “if ... then”, and so on. See 
     <xref linkend="GI" />.</para>
     <programlisting xml:space="preserve">
     ga la djan. nanmu gi la djeimyz. ninmu
     Either John is a man or James is a woman (or both).
 </programlisting>
     <bridgehead>
-    <anchor xml:id="GAhO" />selma'o GAhO (
+    <anchor xml:id="GAhO" />selma'o GAhO ( 
     <xref linkend="cll_chapter14-section16" />)</bridgehead>
     <para>Specifies whether an interval specified by 
     <xref linkend="BIhI" />includes or excludes its endpoints. Used in pairs before and after the 
     <xref linkend="BIhI" />cmavo, to specify the nature of both the left- and the right-hand endpoints.</para>
     <programlisting xml:space="preserve">
     mi ca sanli la drezdn. ga'o bi'i ga'o la frankfurt.
     I [present] stand Dresden [inclusive] [interval] [inclusive] Frankfurt.
     I am standing between Dresden and Frankfurt, inclusive of both.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="GEhU" />selma'o GEhU (
+    <anchor xml:id="GEhU" />selma'o GEhU ( 
     <xref linkend="cll_chapter8-section3" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="GOI" />. Marks the end of a relative phrase. See 
     <xref linkend="KUhO" />.</para>
     <programlisting xml:space="preserve">
     la djan. goi ko'a ge'u blanu
     John (referred to as it-1) is-blue.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="GI" />selma'o GI (
+    <anchor xml:id="GI" />selma'o GI ( 
     <xref linkend="cll_chapter14-section5" />)</bridgehead>
     <para>Separates two logically or non-logically connected sumti, tanru units, bridi-tails, or other things, when the prefix is a forethought connective involving 
     <xref linkend="GA" />, 
     <xref linkend="GUhA" />, or 
     <xref linkend="JOI" />.</para>
     <programlisting xml:space="preserve">
     ge la djan. nanmu gi la djeimyz. ninmu
     (It is true that) both John is a man and James is a woman.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="GIhA" />selma'o GIhA (
+    <anchor xml:id="GIhA" />selma'o GIhA ( 
     <xref linkend="cll_chapter14-section3" />)</bridgehead>
     <para>Specifies a logical connective (e.g. “and”, “or”, “if”) between two bridi-tails: a bridi-tail is a selbri with any associated following sumti, but not including any preceding sumti.</para>
     <programlisting xml:space="preserve">
     mi klama le zarci gi'e nelci la djan.
     I go-to the market and like John.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="GOI" />selma'o GOI (
+    <anchor xml:id="GOI" />selma'o GOI ( 
     <xref linkend="cll_chapter8-section3" />)</bridgehead>
     <para>Specifies the beginning of a relative phrase, which associates a subordinate sumti (following) to another sumti (preceding). Terminated by 
     <xref linkend="GEhU" />See 
     <xref linkend="NOI" />.</para>
     <programlisting xml:space="preserve">
     la djan. goi ko'a cu blanu
     John (referred to as it-1) is blue.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="GOhA" />selma'o GOhA (
+    <anchor xml:id="GOhA" />selma'o GOhA ( 
     <xref linkend="cll_chapter7-section6" />)</bridgehead>
     <para>A general selma'o for all cmavo which can take the place of brivla. There are several groups of these.</para>
     <programlisting xml:space="preserve">
     A: mi klama le zarci
     B: mi go'i
 
     A: I’m going to the market.
     B: Me, too.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="GUhA" />selma'o GUhA (
+    <anchor xml:id="GUhA" />selma'o GUhA ( 
     <xref linkend="cll_chapter14-section3" />)</bridgehead>
     <para>Indicates the beginning of two logically connected tanru units. Takes the place of 
     <xref linkend="GA" />when forming logically-connected tanru. See 
     <xref linkend="GI" />.</para>
     <programlisting xml:space="preserve">
     la .alis. gu'e ricfu gi blanu
     Alice is both rich and blue.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="I" />selma'o I (
+    <anchor xml:id="I" />selma'o I ( 
     <xref linkend="cll_chapter19-section2" />)</bridgehead>
     <para>Separates two sentences from each other.</para>
     <programlisting xml:space="preserve">
     mi klama le zarci .i mi klama le zdani
     I go-to the market. I go-to the office.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="JA" />selma'o JA (
+    <anchor xml:id="JA" />selma'o JA ( 
     <xref linkend="cll_chapter14-section3" />)</bridgehead>
     <para>Specifies a logical connection (e.g. “and”, “or”, “if”) between two tanru units, mathematical operands, tenses, or abstractions.</para>
     <programlisting xml:space="preserve">
     ti blanu je zdani
     This is-blue and a-house.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="JAI" />selma'o JAI (
+    <anchor xml:id="JAI" />selma'o JAI ( 
     <xref linkend="cll_chapter9-section12" />)</bridgehead>
     <para>When followed by a tense or modal, creates a conversion operator attachable to a selbri which exchanges the modal place with the x1 place of the selbri. When alone, is a conversion operator exchanging the x1 place of the selbri (which should be an abstract sumti) with one of the places of the abstracted-over bridi.</para>
     <programlisting xml:space="preserve">
     mi jai gau galfi le bitmu skari
     I am-the-actor-in modifying the wall color.
     I act so as to modify the wall color.
     I change the color of the wall.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="JOI" />selma'o JOI (
+    <anchor xml:id="JOI" />selma'o JOI ( 
     <xref linkend="cll_chapter14-section14" />)</bridgehead>
     <para>Specifies a non-logical connection (e.g. together-with-as-mass, -set, or -sequence) between two sumti, tanru units, or various other things. When immediately followed by 
     <xref linkend="GI" />, provides forethought non-logical connection analogous to 
     <xref linkend="GA" />.</para>
     <programlisting xml:space="preserve">
     la djan. joi la .alis. cu bevri le pipno
     John massed-with Alice carry the piano.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="JOhI" />selma'o JOhI (
+    <anchor xml:id="JOhI" />selma'o JOhI ( 
     <xref linkend="cll_chapter18-section15" />)</bridgehead>
     <para>Indicates that the following mathematical operands (a list terminated by 
     <xref linkend="TEhU" />) form a mathematical vector (one-dimensional array).</para>
     <programlisting xml:space="preserve">
     li jo'i paboi reboi te'u su'i jo'i ciboi voboi du
          li jo'i voboi xaboi
     The-number array( one, two ) plus array( three, four) equals
          the-number array (four, six).
     (1,2) + (3,4) = (4,6)
 </programlisting>
     <bridgehead>
-    <anchor xml:id="KE" />selma'o KE (
+    <anchor xml:id="KE" />selma'o KE ( 
     <xref linkend="cll_chapter5-section5" />)</bridgehead>
     <para>Groups everything between itself and a following 
     <xref linkend="KEhE" />for purposes of logical connection, tanru construction, or other purposes. 
     <xref linkend="KE" />and 
     <xref linkend="KEhE" />are not used for mathematical (see 
     <xref linkend="VEI" />and 
     <xref linkend="VEhO" />) or discursive (see 
     <xref linkend="TO" />and 
     <xref linkend="TOI" />) purposes.</para>
     <programlisting xml:space="preserve">
     ta ke melbi cmalu ke'e nixli ckule
     That is-a-( pretty little ) girl school.
     That is a school for girls who are pretty in their littleness.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="KEI" />selma'o KEI (
+    <anchor xml:id="KEI" />selma'o KEI ( 
     <xref linkend="cll_chapter11-section1" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="NU" />. Marks the end of an abstraction bridi.</para>
     <programlisting xml:space="preserve">
     la djan. cu nu sonci kei djica
     John is-an-(event-of being-a-soldier) type-of desirer.
     John wants to be a soldier.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="KEhE" />selma'o KEhE (
+    <anchor xml:id="KEhE" />selma'o KEhE ( 
     <xref linkend="cll_chapter5-section5" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="KE" />. Marks the end of a grouping.</para>
     <programlisting xml:space="preserve">
     ta ke melbi cmalu ke'e nixli ckule
     That is-a-( pretty little ) girl school.
     That is a school for girls who are pretty in their littleness.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="KI" />selma'o KI (
+    <anchor xml:id="KI" />selma'o KI ( 
     <xref linkend="cll_chapter10-section13" />)</bridgehead>
     <para>When preceded by a tense or modal, makes it “sticky”, so that it applies to all further bridi until reset by another appearance of 
     <xref linkend="KI" />. When alone, eliminates all sticky tenses.</para>
     <bridgehead>
-    <anchor xml:id="KOhA" />selma'o KOhA (
+    <anchor xml:id="KOhA" />selma'o KOhA ( 
     <xref linkend="cll_chapter7-section1" />)</bridgehead>
     <para>A general selma'o which contains all cmavo which can substitute for sumti. These cmavo are divided into several groups.</para>
     <programlisting xml:space="preserve">
     le blanu zdani goi ko'a cu barda .i ko'a na cmamau ti
     The blue house (referred to as it-1) is big.  It-1 is-not smaller-than this-thing.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="KU" />selma'o KU (
+    <anchor xml:id="KU" />selma'o KU ( 
     <xref linkend="cll_chapter6-section2" />, 
     <xref linkend="cll_chapter10-section1" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="LE" />and some uses of 
     <xref linkend="LA" />. Indicates the end of a description sumti. Also used after a tense or modal to indicate that no sumti follows, and in the compound 
-    <xref linkend="NA" />+
+    <xref linkend="NA" />+ 
     <xref linkend="KU" />to indicate natural language-style negation.</para>
     <programlisting xml:space="preserve">
     le prenu ku le zdani ku klama
     The person, to-the house, goes.
     The person goes to the house.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="KUhE" />selma'o KUhE (
+    <anchor xml:id="KUhE" />selma'o KUhE ( 
     <xref linkend="cll_chapter18-section6" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="PEhO" />: indicates the end of a forethought mathematical expression (one in which the operator precedes the operands).</para>
     <programlisting xml:space="preserve">
     li pe'o su'i reboi reboi re[boi] ku'e du li xa
     The number [forethought] the-sum-of two two two [end] equals the-number six.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="KUhO" />selma'o KUhO (
+    <anchor xml:id="KUhO" />selma'o KUhO ( 
     <xref linkend="cll_chapter8-section1" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="NOI" />. Indicates the end of a relative clause.</para>
     <programlisting xml:space="preserve">
     le zdani poi blanu ku'o barda
     The house which is-blue is-big.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="LA" />selma'o LA (
+    <anchor xml:id="LA" />selma'o LA ( 
     <xref linkend="cll_chapter6-section2" />)</bridgehead>
     <para>Descriptors which change name words (or selbri) into sumti which identify people or things by name. Similar to 
     <xref linkend="LE" />. May be terminated with 
     <xref linkend="KU" />if followed by a description selbri.</para>
     <programlisting xml:space="preserve">
     la kikeros. du la tulis.
     Cicero is Tully.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="LAU" />selma'o LAU (
+    <anchor xml:id="LAU" />selma'o LAU ( 
     <xref linkend="cll_chapter17-section14" />)</bridgehead>
     <para>Combines with the following alphabetic letter to represent a single marker: change from lower to upper case, change of font, punctuation, etc.)</para>
     <programlisting xml:space="preserve">
     tau sy. .ibu
     [single-shift] “s” “i”
     Si (chemical symbol for silicon)
 </programlisting>
     <bridgehead>
-    <anchor xml:id="LAhE" />selma'o LAhE (
+    <anchor xml:id="LAhE" />selma'o LAhE ( 
     <xref linkend="cll_chapter6-section10" />)</bridgehead>
     <para>Qualifiers which, when prefixed to a sumti, change it into another sumti with related meaning. Qualifiers can also consist of a cmavo from selma'o 
     <xref linkend="NAhE" />plus 
     <xref linkend="BO" />. Terminated by 
     <xref linkend="LUhU" />.</para>
     <programlisting xml:space="preserve">
     mi viska la'e zoi kuot. A Tale of Two Cities .kuot
     I see that-represented-by the-text “A Tale of Two Cities”.
     I see the book “A Tale of Two Cities”.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="LE" />selma'o LE (
+    <anchor xml:id="LE" />selma'o LE ( 
     <xref linkend="cll_chapter6-section2" />)</bridgehead>
     <para>Descriptors which make selbri into sumti which describe or specify things that fit into the x1 place of the selbri. Terminated by 
     <xref linkend="KU" />. See 
     <xref linkend="LA" />.</para>
     <programlisting xml:space="preserve">
     le gerku cu klama le zdani
     The dog goes-to the house.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="LEhU" />selma'o LEhU (
+    <anchor xml:id="LEhU" />selma'o LEhU ( 
     <xref linkend="cll_chapter19-section9" />)</bridgehead>
     <para>Indicates the end of a quotation begun with 
     <xref linkend="LOhU" />. Not an elidable terminator.</para>
     <programlisting xml:space="preserve">
     lo'u mi du do du mi le'u cu na lojbo drani
     [quote] mi du do du mi [unquote] is-not Lojbanically correct.
     “mi du do du mi” is not correct Lojban.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="LI" />selma'o LI (
+    <anchor xml:id="LI" />selma'o LI ( 
     <xref linkend="cll_chapter18-section5" />)</bridgehead>
     <para>Descriptors which change numbers or other mathematical expressions into sumti which specify numbers or numerical expressions. Terminated by 
     <xref linkend="LOhO" />.</para>
     <programlisting xml:space="preserve">
     li re su'u re na du li vo su'i vo
     The-number 2 minus 2 not equals the-number 4 plus 4.
     2 - 2 ≠ 4 + 4
 </programlisting>
     <bridgehead>
-    <anchor xml:id="LIhU" />selma'o LIhU (
+    <anchor xml:id="LIhU" />selma'o LIhU ( 
     <xref linkend="cll_chapter19-section9" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="LU" />. Indicates the end of a text quotation.</para>
     <programlisting xml:space="preserve">
     mi cusku lu mi klama le zarci li'u
     I express [quote] I go-to the market [end quote].
 </programlisting>
     <bridgehead>
-    <anchor xml:id="LOhO" />selma'o LOhO (
+    <anchor xml:id="LOhO" />selma'o LOhO ( 
     <xref linkend="cll_chapter18-section17" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="LI" />. Indicates the end of a mathematical expression used in a 
     <xref linkend="LI" />description.</para>
     <programlisting xml:space="preserve">
     li vo lo'o li ci lo'o cu zmadu
     The-number 4 [end number], the number 3 [end number], is greater.
     4 &gt; 3
 </programlisting>
     <bridgehead>
-    <anchor xml:id="LOhU" />selma'o LOhU (
+    <anchor xml:id="LOhU" />selma'o LOhU ( 
     <xref linkend="cll_chapter19-section9" />)</bridgehead>
     <para>Indicates the beginning of a quotation (a sumti) which is grammatical as long as the quoted material consists of Lojban words, whether they form a text or not. Terminated by 
     <xref linkend="LEhU" />.</para>
     <programlisting xml:space="preserve">
     do cusku lo'u mi du do du ko'a le'u
     You express [quote] mi du do du ko'a [end quote].
     You said, “mi du do du ko'a”.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="LU" />selma'o LU (
+    <anchor xml:id="LU" />selma'o LU ( 
     <xref linkend="cll_chapter19-section9" />)</bridgehead>
     <para>Indicates the beginning of a quotation (a sumti) which is grammatical only if the quoted material also forms a grammatical Lojban text. Terminated by 
     <xref linkend="LIhU" />.</para>
     <programlisting xml:space="preserve">
     mi cusku lu mi klama le zarci li'u
     I express [quote] I go-to the market [end quote].
 </programlisting>
     <bridgehead>
-    <anchor xml:id="LUhU" />selma'o LUhU (
+    <anchor xml:id="LUhU" />selma'o LUhU ( 
     <xref linkend="cll_chapter6-section10" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="LAhE" />and 
-    <xref linkend="NAhE" />+
+    <xref linkend="NAhE" />+ 
     <xref linkend="BO" />. Indicates the end of a qualified sumti.</para>
     <programlisting xml:space="preserve">
     mi viska la'e lu barda gerku li'u lu'u
     I see the-referent-of [quote] big dog [end quote] [end ref]
     I saw “Big Dog” [not the words, but a book or movie].
 </programlisting>
     <bridgehead>
-    <anchor xml:id="MAI" />selma'o MAI (
+    <anchor xml:id="MAI" />selma'o MAI ( 
     <xref linkend="cll_chapter18-section19" />, 
     <xref linkend="cll_chapter19-section1" />)</bridgehead>
     <para>When suffixed to a number or string of letter words, produces a free modifier which serves as an index number within a text.</para>
     <programlisting xml:space="preserve">
     pamai mi pu klama le zarci
     1-thly, I [past] go to-the market.
     First, I went to the market.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="MAhO" />selma'o MAhO (
+    <anchor xml:id="MAhO" />selma'o MAhO ( 
     <xref linkend="cll_chapter18-section6" />)</bridgehead>
     <para>Produces a mathematical operator from a letter or other operand. Terminated by 
     <xref linkend="TEhU" />. See 
     <xref linkend="VUhU" />.</para>
     <programlisting xml:space="preserve">
     ma'o fy. boi xy.
     [operator] f x
     
 <emphasis>f(x)</emphasis>
 </programlisting>
     <bridgehead>
-    <anchor xml:id="ME" />selma'o ME (
+    <anchor xml:id="ME" />selma'o ME ( 
     <xref linkend="cll_chapter5-section10" />, 
     <xref linkend="cll_chapter18-section1" />)</bridgehead>
     <para>Produces a tanru unit from a sumti, which is applicable to the things referenced by the sumti. Terminated by 
     <xref linkend="MEhU" />.</para>
     <programlisting xml:space="preserve">
     ta me la ford. karce
     That is-a-Ford-type car
     That’s a Ford car.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="MEhU" />selma'o MEhU (
+    <anchor xml:id="MEhU" />selma'o MEhU ( 
     <xref linkend="cll_chapter5-section11" />)</bridgehead>
     <para>The elidable terminator for 
     <xref linkend="ME" />. Indicates the end of a sumti converted to a tanru unit.</para>
     <programlisting xml:space="preserve">
     ta me mi me'u zdani
     That’s a me type of house.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="MOI" />selma'o MOI (
+    <anchor xml:id="MOI" />selma'o MOI ( 
     <xref linkend="cll_chapter5-section11" />, 
     <xref linkend="cll_chapter18-section18" />)</bridgehead>
     <para>Suffixes added to numbers or other quantifiers to make various numerically-based selbri.</para>
     <programlisting xml:space="preserve">
     la djan. joi la frank. cu bruna remei
     John in-a-mass-with Frank are-a-brother-type-of twosome.
     John and Frank are two brothers.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="MOhE" />selma'o MOhE (
+    <anchor xml:id="MOhE" />selma'o MOhE ( 
     <xref linkend="cll_chapter18-section18" />)</bridgehead>
     <para>Produces a mathematical operand from a sumti; used to make dimensioned units. Terminated by 
     <xref linkend="TEhU" />.</para>
     <programlisting xml:space="preserve">
     li mo'e re ratcu su'i mo'e re ractu du li mo'e vo danlu
     The-number two rats plus two rabbits equals the-number four animals.
     2 rats + 2 rabbits = 4 animals.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="MOhI" />selma'o MOhI (
+    <anchor xml:id="MOhI" />selma'o MOhI ( 
     <xref linkend="cll_chapter10-section8" />)</bridgehead>
     <para>A tense flag indicating movement in space, in a direction specified by a following 
     <xref linkend="FAhA" />cmavo.</para>
     <programlisting xml:space="preserve">
     le verba mo'i ri'u cadzu le bisli
     The child [movement] [right] walks-on the ice.
     The child walks toward my right on the ice.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="NA" />selma'o NA (
+    <anchor xml:id="NA" />selma'o NA ( 
     <xref linkend="cll_chapter14-section3" />, 
     <xref linkend="cll_chapter15-section7" />)</bridgehead>
     <para>Contradictory negators, asserting that a whole bridi is false (or true).</para>
     <programlisting xml:space="preserve">
     mi na klama le zarci
     It is not true that I go to the market.
 </programlisting>
     <para>Also used to construct logical connective compound cmavo.</para>
     <bridgehead>
-    <anchor xml:id="NAI" />selma'o NAI (
+    <anchor xml:id="NAI" />selma'o NAI ( 
     <xref linkend="cll_chapter14-section3" />, 
     <xref linkend="cll_chapter15-section7" />)</bridgehead>
     <para>Negates the previous word, but can only be used with certain selma'o as specified by the grammar.</para>
     <bridgehead>
-    <anchor xml:id="NAhE" />selma'o NAhE (
+    <anchor xml:id="NAhE" />selma'o NAhE ( 
     <xref linkend="cll_chapter15-section4" />)</bridgehead>
     <para>Scalar negators, modifying a selbri or a sumti to a value other than the one stated, the opposite of the one stated, etc. Also used with following 
     <xref linkend="BO" />to construct a sumti qualifier; see 
     <xref linkend="LAhE" />.</para>
     <programlisting xml:space="preserve">
     ta na'e blanu zdani
     That is-a-non- blue house.
     That is a house which is other than blue.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="NAhU" />selma'o NAhU (
+    <anchor xml:id="NAhU" />selma'o NAhU ( 
     <xref linkend="cll_chapter18-section18" />)</bridgehead>
     <para>Creates a mathematical operator from a selbri. Terminated by 
     <xref linkend="TEhU" />. See 
     <xref linkend="VUhU" />.</para>
     <programlisting xml:space="preserve">
     li na'u tanjo te'u vei pai fe'i re [ve'o] du li ci'i
     The-number the-operator tangent ( 
 <phrase role="IPA">π</phrase> / 2 ) = the-number infinity.
     tan(
 <phrase role="IPA">π</phrase>/2) = ∞
 </programlisting>
     <bridgehead>
-    <anchor xml:id="NIhE" />selma'o NIhE (
+    <anchor xml:id="NIhE" />selma'o NIhE ( 
     <xref linkend="cll_chapter18-section18" />)</bridgehead>
     <para>Creates a mathematical operand from a selbri, usually a “ni” abstraction. Terminated by 
     <xref linkend="TEhU" />.</para>
     <programlisting xml:space="preserve">
     li ni'e ni clani [te'u] pi'i ni'e ni ganra [te'u] pi'i
          ni'e ni condi te'u du li ni'e ni canlu
     The-number quantity-of length times quantity-of width times
          quantity-of depth equals the-number quantity-of volume.
     Length × Width × Depth = Volume
 </programlisting>
     <bridgehead>
-    <anchor xml:id="NIhO" />selma'o NIhO (
+    <anchor xml:id="NIhO" />selma'o NIhO ( 
     <xref linkend="cll_chapter19-section3" />)</bridgehead>
     <para>Marks the beginning of a new paragraph, and indicates whether it contains old or new subject matter.</para>
     <bridgehead>
-    <anchor xml:id="NOI" />selma'o NOI (
+    <anchor xml:id="NOI" />selma'o NOI ( 
     <xref linkend="cll_chapter8-section1" />)</bridgehead>
     <para>Introduces relative clauses. The following bridi modifies the preceding sumti. Terminated by 
     <xref linkend="KUhO" />. See 
     <xref linkend="GOI" />.</para>
     <programlisting xml:space="preserve">
     le zdani poi blanu cu cmalu
     The house which is blue is small.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="NU" />selma'o NU (
+    <anchor xml:id="NU" />selma'o NU ( 
     <xref linkend="cll_chapter11-section1" />)</bridgehead>
     <para>Abstractors which, when prefixed to a bridi, create abstraction selbri. Terminated by 
     <xref linkend="KEI" />.</para>
     <programlisting xml:space="preserve">
     la djan. cu djica le nu sonci [kei]
     John desires the event-of being-a-soldier.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="NUhA" />selma'o NUhA (
+    <anchor xml:id="NUhA" />selma'o NUhA ( 
     <xref linkend="cll_chapter18-section19" />)</bridgehead>
     <para>Creates a selbri from a mathematical operator. See 
     <xref linkend="VUhU" />.</para>
     <programlisting xml:space="preserve">
     li ni'umu cu nu'a va'a li ma'umu
     The-number -5 is-the-negation-of the-number +5
 </programlisting>
     <bridgehead>
-    <anchor xml:id="NUhI" />selma'o NUhI (
+    <anchor xml:id="NUhI" />selma'o NUhI ( 
     <xref linkend="cll_chapter14-section11" />, 
     <xref linkend="cll_chapter16-section7" />)</bridgehead>
     <para>Marks the beginning of a termset, which is used to make simultaneous claims involving two or more different places of a selbri. Terminated by 
     <xref linkend="NUhU" />.</para>
     <programlisting xml:space="preserve">
     mi klama nu'i ge le zarci le briju nu'u gi le zdani le ckule [nu'u]
     I go [start] to-the market from-the office [joint] and to-the house from-the school.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="NUhU" />selma'o NUhU (
+    <anchor xml:id="NUhU" />selma'o NUhU ( 
     <xref linkend="cll_chapter14-section11" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="NUhI" />. Marks the end of a termset.</para>
     <programlisting xml:space="preserve">
     mi klama nu'i ge le zarci le briju nu'u gi le zdani le ckule [nu'u]
     I go [start] to-the market from-the office [joint] and to-the house from-the school.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="PA" />selma'o PA (
+    <anchor xml:id="PA" />selma'o PA ( 
     <xref linkend="cll_chapter18-section2" />)</bridgehead>
     <para>Digits and related quantifiers (some, all, many, etc.). Terminated by 
     <xref linkend="BOI" />.</para>
     <programlisting xml:space="preserve">
     mi speni re ninmu
     I am-married-to two women.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="PEhE" />selma'o PEhE (
+    <anchor xml:id="PEhE" />selma'o PEhE ( 
     <xref linkend="cll_chapter14-section11" />)</bridgehead>
     <para>Precedes a logical or non-logical connective that joins two termsets. Termsets (see 
     <xref linkend="CEhE" />) are used to associate several terms for logical connectives, for equal quantifier scope, or for special constructs in tenses.</para>
     <programlisting xml:space="preserve">
     mi ce'e do pe'e je la djan. ce'e la djeimyz. cu pendo
     I [,] you [joint] and John [,] James are-friends-of.
     I am a friend of you, and John is a friend of James.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="PEhO" />selma'o PEhO (
+    <anchor xml:id="PEhO" />selma'o PEhO ( 
     <xref linkend="cll_chapter18-section6" />)</bridgehead>
     <para>An optional signal of forethought mathematical operators, which precede their operands. Terminated by 
     <xref linkend="KUhE" />.</para>
     <programlisting xml:space="preserve">
     li vo du li pe'o su'i reboi re
     The-number four equals the-number [forethought] sum-of two two.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="PU" />selma'o PU (
+    <anchor xml:id="PU" />selma'o PU ( 
     <xref linkend="cll_chapter10-section4" />)</bridgehead>
     <para>Specifies simple time directions (future, past, or neither).</para>
     <programlisting xml:space="preserve">
     mi pu klama le zarci
     I [past] go-to the market.
     I went to the market.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="RAhO" />selma'o RAhO (
+    <anchor xml:id="RAhO" />selma'o RAhO ( 
     <xref linkend="cll_chapter7-section6" />)</bridgehead>
     <para>The pro-bridi update flag: changes the meaning of sumti implicitly attached to a pro-bridi (see 
     <xref linkend="GOhA" />) to fit the current context rather than the original context.</para>
     <programlisting xml:space="preserve">
     A: mi ba lumci le mi karce
     B: mi go'i
 
     A: I [future] wash my car.
     B: I do-the-same-thing (i.e. wash A’s car).
 
     A: mi ba lumci le mi karce
     B: mi go'i ra'o
 
     A: I [future] wash my car.
     B: I do-the-corresponding-thing (i.e. wash B’s car).
 </programlisting>
     <bridgehead>
-    <anchor xml:id="ROI" />selma'o ROI (
+    <anchor xml:id="ROI" />selma'o ROI ( 
     <xref linkend="cll_chapter10-section9" />)</bridgehead>
     <para>When suffixed to a number, makes an extensional tense (e.g. once, twice, many times).</para>
     <programlisting xml:space="preserve">
     mi reroi klama le zarci
     I twice go-to the market.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="SA" />selma'o SA (
+    <anchor xml:id="SA" />selma'o SA ( 
     <xref linkend="cll_chapter19-section13" />)</bridgehead>
     <para>Erases the previous phrase or sentence.</para>
     <programlisting xml:space="preserve">
     mi klama sa do klama le zarci
     I go, er, you go-to the market.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="SE" />selma'o SE (
+    <anchor xml:id="SE" />selma'o SE ( 
     <xref linkend="cll_chapter5-section1" />, 
     <xref linkend="cll_chapter9-section4" />)</bridgehead>
     <para>Converts a selbri, rearranging the order of places by exchanging the x1 place with a specified numbered place.</para>
     <programlisting xml:space="preserve">
     le zarci cu se klama mi
     The market is-gone-to by me.
 </programlisting>
     <para>Also used in constructing connective and modal compound cmavo.</para>
     <bridgehead>
-    <anchor xml:id="SEI" />selma'o SEI (
+    <anchor xml:id="SEI" />selma'o SEI ( 
     <xref linkend="cll_chapter19-section12" />)</bridgehead>
     <para>Marks the beginning of metalinguistic insertions which comment on the main bridi. Terminated by 
     <xref linkend="SEhU" />.</para>
     <programlisting xml:space="preserve">
     la frank. prami sei gleki [se'u] la djein.
     Frank loves (he is happy) Jane.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="SEhU" />selma'o SEhU (
+    <anchor xml:id="SEhU" />selma'o SEhU ( 
     <xref linkend="cll_chapter19-section12" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="SEI" />and 
     <xref linkend="SOI" />. Ends metalinguistic insertions.</para>
     <programlisting xml:space="preserve">
     la frank. prami sei gleki se'u la djein.
     Frank loves (he is happy) Jane.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="SI" />selma'o SI (
+    <anchor xml:id="SI" />selma'o SI ( 
     <xref linkend="cll_chapter19-section13" />)</bridgehead>
     <para>Erases the previous single word.</para>
     <programlisting xml:space="preserve">
     mi si do klama le zarci
     I, er, you go to-the market.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="SOI" />selma'o SOI (
+    <anchor xml:id="SOI" />selma'o SOI ( 
     <xref linkend="cll_chapter7-section8" />)</bridgehead>
     <para>Marks reciprocity between two sumti (like “vice versa” in English).</para>
     <programlisting xml:space="preserve">
     mi prami do soi mi
     I love you [reciprocally] me.
     I love you and vice versa.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="SU" />selma'o SU (
+    <anchor xml:id="SU" />selma'o SU ( 
     <xref linkend="cll_chapter19-section13" />)</bridgehead>
     <para>Closes and erases the entire previous discourse.</para>
     <bridgehead>
-    <anchor xml:id="TAhE" />selma'o TAhE (
+    <anchor xml:id="TAhE" />selma'o TAhE ( 
     <xref linkend="cll_chapter10-section9" />)</bridgehead>
     <para>A tense modifier specifying frequencies within an interval of time or space (regularly, habitually, etc.).</para>
     <programlisting xml:space="preserve">
     le verba ta'e klama le ckule
     The child habitually goes to-the school.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="TEI" />selma'o TEI (
+    <anchor xml:id="TEI" />selma'o TEI ( 
     <xref linkend="cll_chapter17-section6" />)</bridgehead>
     <para>Signals the beginning of a compound letter word, which acts grammatically like a single letter. Compound letter words end with the non-elidable selma'o 
     <xref linkend="FOI" />.</para>
     <programlisting xml:space="preserve">
     tei .ebu .akut. bu foi
     ( “e” “acute” )
     the letter “e” with an acute accent
 </programlisting>
     <bridgehead>
-    <anchor xml:id="TEhU" />selma'o TEhU (
+    <anchor xml:id="TEhU" />selma'o TEhU ( 
     <xref linkend="cll_chapter18-section15" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="JOhI" />, 
     <xref linkend="MAhO" />, 
     <xref linkend="MOhE" />, 
     <xref linkend="NAhU" />, or 
     <xref linkend="NIhE" />. Marks the end of a mathematical conversion construct.</para>
     <programlisting xml:space="preserve">
     li jo'i paboi reboi te'u su'i jo'i ciboi voboi du
          li jo'i voboi xaboi
     The-number array (one, two) plus array (three, four) equals
          the-number array( four, six).
     (1,2) + (3,4) = (4,6)
 </programlisting>
     <bridgehead>
-    <anchor xml:id="TO" />selma'o TO (
+    <anchor xml:id="TO" />selma'o TO ( 
     <xref linkend="cll_chapter19-section12" />)</bridgehead>
     <para>Left discursive parenthesis: allows inserting a digression. Terminated by 
     <xref linkend="TOI" />.</para>
     <programlisting xml:space="preserve">
     doi lisas. mi djica le nu to doi frank. ko sisti toi do viska le mlatu
     O Lisa, I desire the event-of ( O Frank, [imperative] stop! ) you see the cat.
     Lisa, I want you to (Frank! Stop!) see the cat.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="TOI" />selma'o TOI (
+    <anchor xml:id="TOI" />selma'o TOI ( 
     <xref linkend="cll_chapter19-section12" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="TO" />. The right discursive parenthesis.</para>
     <programlisting xml:space="preserve">
     doi lisas. mi djica le nu to doi frank. ko sisti toi do viska le mlatu
     O Lisa, I desire the event-of ( O Frank, [imperative] stop! ) you see the cat.
     Lisa, I want you to (Frank! Stop!) see the cat.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="TUhE" />selma'o TUhE (
+    <anchor xml:id="TUhE" />selma'o TUhE ( 
     <xref linkend="cll_chapter19-section2" />)</bridgehead>
     <para>Groups multiple sentences or paragraphs into a logical unit. Terminated by 
     <xref linkend="TUhU" />.</para>
     <programlisting xml:space="preserve">
     lo xagmau zo'u tu'e ganai cidja gi citno .i ganai vanju gi tolci'o [tu'u]
     Is-best : [start] If food, then new. If wine, then old.
     As for what is best: if food, then new [is best]; if wine, then old [is best].
 </programlisting>
     <bridgehead>
-    <anchor xml:id="TUhU" />selma'o TUhU (
+    <anchor xml:id="TUhU" />selma'o TUhU ( 
     <xref linkend="cll_chapter19-section2" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="TUhE" />. Marks the end of a multiple sentence group.</para>
     <bridgehead>
-    <anchor xml:id="UI" />selma'o UI (
+    <anchor xml:id="UI" />selma'o UI ( 
     <xref linkend="cll_chapter13-section1" />)</bridgehead>
     <para>Particles which indicate the speaker’s emotional state or source of knowledge, or the present stage of discourse.</para>
     <programlisting xml:space="preserve">
     .ui la djan. klama
     [Happiness!] John is-coming.
     Hurrah! John is coming!
 </programlisting>
     <bridgehead>
-    <anchor xml:id="VA" />selma'o VA (
+    <anchor xml:id="VA" />selma'o VA ( 
     <xref linkend="cll_chapter10-section2" />)</bridgehead>
     <para>A tense indicating distance in space (near, far, or neither).</para>
     <programlisting xml:space="preserve">
     le nanmu va batci le gerku
     The man [medium distance] bites the dog.
     Over there the man is biting the dog.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="VAU" />selma'o VAU (
+    <anchor xml:id="VAU" />selma'o VAU ( 
     <xref linkend="cll_chapter14-section9" />)</bridgehead>
     <para>Elidable terminator for a simple bridi, or for each bridi-tail of a 
     <xref linkend="GIhA" />logical connection.</para>
     <programlisting xml:space="preserve">
     mi dunda le cukta [vau] gi'e lebna lo rupnu vau do [vau]
     I (give the book) and (take some currency-units) to/from you.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="VEI" />selma'o VEI (
+    <anchor xml:id="VEI" />selma'o VEI ( 
     <xref linkend="cll_chapter18-section5" />)</bridgehead>
     <para>Left mathematical parenthesis: groups mathematical operations. Terminated by 
     <xref linkend="VEhO" />.</para>
     <programlisting xml:space="preserve">
     li vei ny. su'i pa ve'o pi'i vei ny. su'i pa [ve'o] du
          li ny. [bo] te'a re su'i re bo pi'i ny. su'i pa
     The-number (“n” plus one) times (“n” plus one) equals
          the-number n-power-two plus two-times-“n” plus 1.
     (n + 1)(n + 1) = n
 <superscript>2</superscript> + 2n + 1
 </programlisting>
     <bridgehead>
-    <anchor xml:id="VEhA" />selma'o VEhA (
+    <anchor xml:id="VEhA" />selma'o VEhA ( 
     <xref linkend="cll_chapter10-section5" />)</bridgehead>
     <para>A tense indicating the size of an interval in space (long, medium, or short).</para>
     <bridgehead>
-    <anchor xml:id="VEhO" />selma'o VEhO (
+    <anchor xml:id="VEhO" />selma'o VEhO ( 
     <xref linkend="cll_chapter19-section5" />)</bridgehead>
     <para>Elidable terminator for 
     <xref linkend="VEI" />: right mathematical parenthesis.</para>
     <programlisting xml:space="preserve">
     li vei ny. su'i pa ve'o pi'i vei ny. su'i pa [ve'o] du
          li ny. [bo] te'a re su'i re bo pi'i ny. su'i pa
     The-number (“n” plus one) times (“n” plus one) equals
          the-number n-power-two plus two-times-“n” plus 1.
     (n + 1)(n + 1) = n
 <superscript>2</superscript> + 2n + 1
 </programlisting>
     <bridgehead>
-    <anchor xml:id="VIhA" />selma'o VIhA (
+    <anchor xml:id="VIhA" />selma'o VIhA ( 
     <xref linkend="cll_chapter10-section7" />)</bridgehead>
     <para>A tense indicating dimensionality in space (line, plane, volume, or space-time interval).</para>
     <programlisting xml:space="preserve">
     le verba ve'a vi'a cadzu le bisli
     The child [medium space interval] [2-dimensional] walks-on the ice.
     In a medium-sized area, the child walks on the ice.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="VUhO" />selma'o VUhO (
+    <anchor xml:id="VUhO" />selma'o VUhO ( 
     <xref linkend="cll_chapter8-section8" />)</bridgehead>
     <para>Attaches relative clauses or phrases to a whole (possibly connected) sumti, rather than simply to the leftmost portion of the sumti.</para>
     <programlisting xml:space="preserve">
     la frank. ce la djordj. vu'o noi gidva cu zvati le kumfa
     Frank [in-set-with] George, which are-guides, are-in the room.
     Frank and George, who are guides, are in the room.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="VUhU" />selma'o VUhU (
+    <anchor xml:id="VUhU" />selma'o VUhU ( 
     <xref linkend="cll_chapter18-section5" />)</bridgehead>
     <para>Mathematical operators (e.g. +, −). See 
     <xref linkend="MAhO" />.</para>
     <programlisting xml:space="preserve">
     li mu vu'u re du li ci
     The-number 5 minus 2 equals the-number 3.
     5 − 2 = 3
 </programlisting>
     <bridgehead>
-    <anchor xml:id="XI" />selma'o XI (
+    <anchor xml:id="XI" />selma'o XI ( 
     <xref linkend="cll_chapter18-section13" />)</bridgehead>
     <para>The subscript marker: the following number or lerfu string is a subscript for whatever precedes it.</para>
     <programlisting xml:space="preserve">
     xy. xi re
     x sub 2
     x
 <subscript>2</subscript>
 </programlisting>
     <bridgehead>
-    <anchor xml:id="Y" />selma'o Y (
+    <anchor xml:id="Y" />selma'o Y ( 
     <xref linkend="cll_chapter19-section14" />)</bridgehead>
     <para>Hesitation noise: content-free, but holds the floor or continues the conversation. It is different from silence in that silence may be interpreted as having nothing more to say.</para>
     <programlisting xml:space="preserve">
     doi .y. .y. .djan
     O, uh, uh, John!
 </programlisting>
     <bridgehead>
-    <anchor xml:id="ZAhO" />selma'o ZAhO (
+    <anchor xml:id="ZAhO" />selma'o ZAhO ( 
     <xref linkend="cll_chapter10-section10" />)</bridgehead>
     <para>A tense modifier specifying the contour of an event (e.g. beginning, ending, continuing).</para>
     <programlisting xml:space="preserve">
     mi pu'o damba
     I [inchoative] fight.
     I’m on the verge of fighting.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="ZEI" />selma'o ZEI (
+    <anchor xml:id="ZEI" />selma'o ZEI ( 
     <xref linkend="cll_chapter4-section6" />)</bridgehead>
     <para>A morphological glue word, which joins the two words it stands between into the equivalent of a lujvo.</para>
     <programlisting xml:space="preserve">
     ta xy. zei kantu kacma
     That is-an-(X - ray) camera.
     That is an X-ray camera.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="ZEhA" />selma'o ZEhA (
+    <anchor xml:id="ZEhA" />selma'o ZEhA ( 
     <xref linkend="cll_chapter10-section5" />)</bridgehead>
     <para>A tense indicating the size of an interval in time (long, medium, or short).</para>
     <programlisting xml:space="preserve">
     mi puze'a citka
     I [past] [short interval] eat.
     I ate for a little while.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="ZI" />selma'o ZI (
+    <anchor xml:id="ZI" />selma'o ZI ( 
     <xref linkend="cll_chapter10-section4" />)</bridgehead>
     <para>A tense indicating distance in time (a long, medium or short time ago or in the future).</para>
     <programlisting xml:space="preserve">
     mi puzi citka
     I [past] [short distance] eat.
     I ate a little while ago.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="ZIhE" />selma'o ZIhE (
+    <anchor xml:id="ZIhE" />selma'o ZIhE ( 
     <xref linkend="cll_chapter8-section4" />)</bridgehead>
     <para>Joins multiple relative phrases or clauses which apply to the same sumti. Although generally translated with “and”, it is not considered a logical connective.</para>
     <programlisting xml:space="preserve">
     mi ponse pa gerku ku poi blabi zi'e noi mi prami ke'a
     I own one dog such-that it-is-white and such-that-incidentally I love it.
     I own a dog that is white and which, incidentally, I love.
     I own a white dog, which I love.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="ZO" />selma'o ZO (
+    <anchor xml:id="ZO" />selma'o ZO ( 
     <xref linkend="cll_chapter19-section10" />)</bridgehead>
     <para>Single-word quotation: quotes the following single Lojban word.</para>
     <programlisting xml:space="preserve">
     zo si cu lojbo valsi
     The-word “si” is-a-Lojbanic word.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="ZOI" />selma'o ZOI (
+    <anchor xml:id="ZOI" />selma'o ZOI ( 
     <xref linkend="cll_chapter19-section10" />)</bridgehead>
     <para>Non-Lojban quotation: quotes any text using a delimiting word (which can be any single Lojban word) placed before and after the text. The delimiting word must not appear in the text, and must be separated from the text by pauses.</para>
     <programlisting xml:space="preserve">
     zoi kuot. Socrates is mortal .kuot. cu glico jufra
     The-text “Socrates is mortal” is-an-English sentence.
 </programlisting>
     <bridgehead>
-    <anchor xml:id="ZOhU" />selma'o ZOhU (
+    <anchor xml:id="ZOhU" />selma'o ZOhU ( 
     <xref linkend="cll_chapter16-section2" />, 
     <xref linkend="cll_chapter19-section4" />)</bridgehead>
     <para>Separates a logical prenex from a bridi or group of sentences to which it applies. Also separates a topic from a comment in topic/comment sentences.</para>
     <programlisting xml:space="preserve">
     su'o da poi remna ro da poi finpe zo'u da prami de
     For-at-least-one X which is-a-man, for-all Ys which are-fish : X loves Y
     There is a man who loves all fish.
 </programlisting>
   </section>
 </chapter>
diff --git a/todocbook/21.xml b/todocbook/21.xml
index fa14e42..f261cd6 100644
--- a/todocbook/21.xml
+++ b/todocbook/21.xml
@@ -5,25 +5,25 @@
     <para>The following two listings constitute the formal grammar of Lojban. The first version is written in the YACC language, which is used to describe parsers, and has been used to create a parser for Lojban texts. This parser is available from the Logical Language Group. The second listing is in Extended Backus-Naur Form (EBNF) and represents the same grammar in a more human-readable form. (In case of discrepancies, the YACC version is official.) There is a cross-reference listing for each format that shows, for each selma'o and rule, which rules refer to it.</para>
     <para>/* /*Lojban Machine Grammar, Final Baseline The Lojban Machine Grammardocument is explicitly dedicated to the public domain by its author,The Logical Language Group, Inc.</para>
     <para>grammar.300 */</para>
     <para>/* The Lojban machine parsing algorithm is a multi-step process. The YACC machine grammar presented here is an amalgam of those steps, concatenated so as to allow YACC to verify the syntactic ambiguity of the grammar. YACC is used to generate a parser for a portion of the grammar, which is LALR1 (the type of grammar that YACC is designed to identify and process successfully), but most of the rest of the grammar must be parsed using some language-coded processing.</para>
     <bridgehead>Step 1 - Lexing</bridgehead>
     <para>From phonemes, stress, and pause, it is possible to resolve Lojban unambiguously into a stream of words. Any machine processing of speech will have to have some way to deal with ’non-Lojban’ failures of fluent speech, of course. The resolved words can be expressed as a text file using Lojban’s phonetic spelling rules.</para>
     <para>The following steps assume that there is the possibility of non-Lojban text within the Lojban text (delimited appropriately). Such non-Lojban text may not be reducible from speech phonetically. However, step 2 allows the filtering of a phonetically transcribed text stream, to recognize such portions of non-Lojban text where properly delimited, without interference with the parsing algorithm.</para>
     <bridgehead>Step 2 - Filtering</bridgehead>
     <para>From start to end, performing the following filtering and lexing tasks using the given order of precedence in case of conflict:</para>
     <para>a. If the Lojban word “zoi” (selma'o ZOI) is identified, take the following Lojban word (which should be end delimited with a pause for separation from the following non-Lojban text) as an opening delimiter. Treat all text following that delimiter, until that delimiter recurs 
-    <emphasis>after a pause</emphasis>, as grammatically a single token (labelled ’
+    <emphasis>after a pause</emphasis>, as grammatically a single token (labelled ’ 
     <xref linkend="cll_yacc-699" />’ in this grammar). There is no need for processing within this text except as necessary to find the closing delimiter.</para>
-    <para>b. If the Lojban word “zo” (selma'o ZO) is identified, treat the following Lojban word as a token labelled ’
+    <para>b. If the Lojban word “zo” (selma'o ZO) is identified, treat the following Lojban word as a token labelled ’ 
     <xref linkend="cll_yacc-698" />’, instead of lexing it by its normal grammatical function.</para>
-    <para>c. If the Lojban word “lo'u” (selma'o LOhU) is identified, search for the closing delimiter “le'u” (selma'o LEhU), ignoring any such closing delimiters absorbed by the previous two steps. The text between the delimiters should be treated as the single token ’
+    <para>c. If the Lojban word “lo'u” (selma'o LOhU) is identified, search for the closing delimiter “le'u” (selma'o LEhU), ignoring any such closing delimiters absorbed by the previous two steps. The text between the delimiters should be treated as the single token ’ 
     <xref linkend="cll_yacc-697" />’.</para>
     <para>d. Categorize all remaining words into their Lojban selma'o category, including the various delimiters mentioned in the previous steps. In all steps after step 2, only the selma'o token type is significant for each word.</para>
     <para>e. If the word “si” (selma'o SI) is identified, erase it and the previous word (or token, if the previous text has been condensed into a single token by one of the above rules).</para>
     <para>f. If the word “sa” (selma'o SA) is identified, erase it and all preceding text as far back as necessary to make what follows attach to what precedes. (This rule is hard to formalize and may receive further definition later.)</para>
     <para>g. If the word ’su’ (selma'o SU) is identified, erase it and all preceding text back to and including the first preceding token word which is in one of the selma'o: NIhO, LU, TUhE, and TO. However, if speaker identification is available, a SU shall only erase to the beginning of a speaker’s discourse, unless it occurs at the beginning of a speaker’s discourse. (Thus, if the speaker has said something, two adjacent uses of “su” are required to erase the entire conversation.</para>
     <bridgehead>Step 3 - Termination</bridgehead>
     <para>If the text contains a FAhO, treat that as the end-of-text and ignore everything that follows it.</para>
     <bridgehead>Step 4 - Absorption of Grammar-Free Tokens</bridgehead>
     <para>In a new pass, perform the following absorptions (absorption means that the token is removed from the grammar for processing in following steps, and optionally reinserted, grouped with the absorbing token after parsing is completed).</para>
     <para>a. Token sequences of the form any - (ZEI - any) ..., where there may be any number of ZEIs, are merged into a single token of selma'o BRIVLA.</para>
@@ -6900,21 +6900,21 @@ the 900 series rules are found in the lexer.  */
           </para>
         </listitem>
       </varlistentry>
     </variablelist>
   </section>
   <section xml:id="cll_chapter21-section2">
     <title>2. EBNF Grammar of Lojban</title>
     <para>Lojban Machine Grammar, EBNF Version, Final Baseline</para>
     <para>This EBNF document is explicitly dedicated to the public domain by its author, The Logical Language Group, Inc. Contact that organization at: 2904 Beau Lane, Fairfax VA 22031 USA 703-385-0273 (intl: +1 703 385 0273)</para>
     <para>Explanation of notation: All rules have the form:</para>
-    <para>name
+    <para>name 
     <subscript>number</subscript>= bnf-expression</para>
     <para>which means that the grammatical construct “name” is defined by “bnf-expression”. The number cross-references this grammar with the rule numbers in the YACC grammar. The names are the same as those in the YACC grammar, except that subrules are labeled with A, B, C, ... in the YACC grammar and with 1, 2, 3, ... in this grammar. In addition, rule 971 is “simple_tag” in the YACC grammar but “stag” in this grammar, because of its frequent appearance.</para>
     <orderedlist>
       <listitem>
         <para>Names in lower case are grammatical constructs.</para>
       </listitem>
       <listitem>
         <para>Names in UPPER CASE are selma'o (lexeme) names, and are terminals.</para>
       </listitem>
       <listitem>
@@ -6940,904 +6940,904 @@ the 900 series rules are found in the lexer.  */
       </listitem>
       <listitem>
         <para>// encloses an elidable terminator, which may be omitted (without change of meaning) if no grammatical ambiguity results.</para>
       </listitem>
     </orderedlist>
     <variablelist>
       <varlistentry>
         <term>
         <anchor xml:id="b0" />
         <anchor xreflabel="BNF rule #0" xml:id="cll_bnf-0" />
-        <xref linkend="cll_yacc-0" />text
+        <xref linkend="cll_yacc-0" />text 
         <subscript>0</subscript>=</term>
         <listitem>
           <para>[NAI ...] [CMENE ... # | (indicators &amp; free ...)] [joik-jek] text-1 
           <anchor xml:id="b2" />
           <anchor xreflabel="BNF rule #2" xml:id="cll_bnf-2" />
           <xref linkend="cll_yacc-2" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>text-1
+        <term>text-1 
         <subscript>2</subscript>=</term>
         <listitem>
           <para>[(I [jek | joik] [[stag] BO] #) ... | NIhO ... #] [paragraphs] 
           <anchor xml:id="b4" />
           <anchor xreflabel="BNF rule #4" xml:id="cll_bnf-4" />
           <xref linkend="cll_yacc-4" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>paragraphs
+        <term>paragraphs 
         <subscript>4</subscript>=</term>
         <listitem>
           <para>paragraph [NIhO ... # paragraphs] 
           <anchor xml:id="b10" />
           <anchor xreflabel="BNF rule #10" xml:id="cll_bnf-10" />
           <xref linkend="cll_yacc-10" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>paragraph
+        <term>paragraph 
         <subscript>10</subscript>=</term>
         <listitem>
           <para>(statement | fragment) [I # [statement | fragment]] ... 
           <anchor xml:id="b11" />
           <anchor xreflabel="BNF rule #11" xml:id="cll_bnf-11" />
           <xref linkend="cll_yacc-11" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>statement
+        <term>statement 
         <subscript>11</subscript>=</term>
         <listitem>
           <para>statement-1 | prenex statement 
           <anchor xml:id="b12" />
           <anchor xreflabel="BNF rule #12" xml:id="cll_bnf-12" />
           <xref linkend="cll_yacc-12" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>statement-1
+        <term>statement-1 
         <subscript>12</subscript>=</term>
         <listitem>
           <para>statement-2 [I joik-jek [statement-2]] ... 
           <anchor xml:id="b13" />
           <anchor xreflabel="BNF rule #13" xml:id="cll_bnf-13" />
           <xref linkend="cll_yacc-13" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>statement-2
+        <term>statement-2 
         <subscript>13</subscript>=</term>
         <listitem>
           <para>statement-3 [I [jek | joik] [stag] BO # [statement-2]] 
           <anchor xml:id="b14" />
           <anchor xreflabel="BNF rule #14" xml:id="cll_bnf-14" />
           <xref linkend="cll_yacc-14" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>statement-3
+        <term>statement-3 
         <subscript>14</subscript>=</term>
         <listitem>
           <para>sentence | [tag] TUhE # text-1 /TUhU#/ 
           <anchor xml:id="b20" />
           <anchor xreflabel="BNF rule #20" xml:id="cll_bnf-20" />
           <xref linkend="cll_yacc-20" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>fragment
+        <term>fragment 
         <subscript>20</subscript>=</term>
         <listitem>
           <para>ek # | gihek # | quantifier | NA # | terms /VAU#/ | prenex | relative-clauses | links | linkargs 
           <anchor xml:id="b30" />
           <anchor xreflabel="BNF rule #30" xml:id="cll_bnf-30" />
           <xref linkend="cll_yacc-30" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>prenex
+        <term>prenex 
         <subscript>30</subscript>=</term>
         <listitem>
           <para>terms ZOhU # 
           <anchor xml:id="b40" />
           <anchor xreflabel="BNF rule #40" xml:id="cll_bnf-40" />
           <xref linkend="cll_yacc-40" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>sentence
+        <term>sentence 
         <subscript>40</subscript>=</term>
         <listitem>
           <para>[terms [CU #]] bridi-tail 
           <anchor xml:id="b41" />
           <anchor xreflabel="BNF rule #41" xml:id="cll_bnf-41" />
           <xref linkend="cll_yacc-41" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>subsentence
+        <term>subsentence 
         <subscript>41</subscript>=</term>
         <listitem>
           <para>sentence | prenex subsentence 
           <anchor xml:id="b50" />
           <anchor xreflabel="BNF rule #50" xml:id="cll_bnf-50" />
           <xref linkend="cll_yacc-50" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>bridi-tail
+        <term>bridi-tail 
         <subscript>50</subscript>=</term>
         <listitem>
           <para>bridi-tail-1 [gihek [stag] KE # bridi-tail /KEhE#/ tail-terms] 
           <anchor xml:id="b51" />
           <anchor xreflabel="BNF rule #51" xml:id="cll_bnf-51" />
           <xref linkend="cll_yacc-51" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>bridi-tail-1
+        <term>bridi-tail-1 
         <subscript>51</subscript>=</term>
         <listitem>
           <para>bridi-tail-2 [gihek # bridi-tail-2 tail-terms] ... 
           <anchor xml:id="b52" />
           <anchor xreflabel="BNF rule #52" xml:id="cll_bnf-52" />
           <xref linkend="cll_yacc-52" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>bridi-tail-2
+        <term>bridi-tail-2 
         <subscript>52</subscript>=</term>
         <listitem>
           <para>bridi-tail-3 [gihek [stag] BO # bridi-tail-2 tail-terms] 
           <anchor xml:id="b53" />
           <anchor xreflabel="BNF rule #53" xml:id="cll_bnf-53" />
           <xref linkend="cll_yacc-53" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>bridi-tail-3
+        <term>bridi-tail-3 
         <subscript>53</subscript>=</term>
         <listitem>
           <para>selbri tail-terms | gek-sentence 
           <anchor xml:id="b54" />
           <anchor xreflabel="BNF rule #54" xml:id="cll_bnf-54" />
           <xref linkend="cll_yacc-54" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>gek-sentence
+        <term>gek-sentence 
         <subscript>54</subscript>=</term>
         <listitem>
           <para>gek subsentence gik subsentence tail-terms | [tag] KE # gek-sentence /KEhE#/ | NA # gek-sentence 
           <anchor xml:id="b71" />
           <anchor xreflabel="BNF rule #71" xml:id="cll_bnf-71" />
           <xref linkend="cll_yacc-71" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>tail-terms
+        <term>tail-terms 
         <subscript>71</subscript>=</term>
         <listitem>
           <para>[terms] /VAU#/ 
           <anchor xml:id="b80" />
           <anchor xreflabel="BNF rule #80" xml:id="cll_bnf-80" />
           <xref linkend="cll_yacc-80" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>terms
+        <term>terms 
         <subscript>80</subscript>=</term>
         <listitem>
           <para>terms-1 ... 
           <anchor xml:id="b81" />
           <anchor xreflabel="BNF rule #81" xml:id="cll_bnf-81" />
           <xref linkend="cll_yacc-81" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>terms-1
+        <term>terms-1 
         <subscript>81</subscript>=</term>
         <listitem>
           <para>terms-2 [PEhE # joik-jek terms-2] ... 
           <anchor xml:id="b82" />
           <anchor xreflabel="BNF rule #82" xml:id="cll_bnf-82" />
           <xref linkend="cll_yacc-82" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>terms-2
+        <term>terms-2 
         <subscript>82</subscript>=</term>
         <listitem>
           <para>term [CEhE # term] ... 
           <anchor xml:id="b83" />
           <anchor xreflabel="BNF rule #83" xml:id="cll_bnf-83" />
           <xref linkend="cll_yacc-83" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>term
+        <term>term 
         <subscript>83</subscript>=</term>
         <listitem>
           <para>sumti | (tag | FA #) (sumti | /KU#/) | termset | NA KU # 
           <anchor xml:id="b85" />
           <anchor xreflabel="BNF rule #85" xml:id="cll_bnf-85" />
           <xref linkend="cll_yacc-85" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>termset
+        <term>termset 
         <subscript>85</subscript>=</term>
         <listitem>
           <para>NUhI # gek terms /NUhU#/ gik terms /NUhU#/ | NUhI # terms /NUhU#/ 
           <anchor xml:id="b90" />
           <anchor xreflabel="BNF rule #90" xml:id="cll_bnf-90" />
           <xref linkend="cll_yacc-90" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>sumti
+        <term>sumti 
         <subscript>90</subscript>=</term>
         <listitem>
           <para>sumti-1 [VUhO # relative-clauses] 
           <anchor xml:id="b91" />
           <anchor xreflabel="BNF rule #91" xml:id="cll_bnf-91" />
           <xref linkend="cll_yacc-91" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>sumti-1
+        <term>sumti-1 
         <subscript>91</subscript>=</term>
         <listitem>
           <para>sumti-2 [(ek | joik) [stag] KE # sumti /KEhE#/] 
           <anchor xml:id="b92" />
           <anchor xreflabel="BNF rule #92" xml:id="cll_bnf-92" />
           <xref linkend="cll_yacc-92" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>sumti-2
+        <term>sumti-2 
         <subscript>92</subscript>=</term>
         <listitem>
           <para>sumti-3 [joik-ek sumti-3] ... 
           <anchor xml:id="b93" />
           <anchor xreflabel="BNF rule #93" xml:id="cll_bnf-93" />
           <xref linkend="cll_yacc-93" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>sumti-3
+        <term>sumti-3 
         <subscript>93</subscript>=</term>
         <listitem>
           <para>sumti-4 [(ek | joik) [stag] BO # sumti-3] 
           <anchor xml:id="b94" />
           <anchor xreflabel="BNF rule #94" xml:id="cll_bnf-94" />
           <xref linkend="cll_yacc-94" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>sumti-4
+        <term>sumti-4 
         <subscript>94</subscript>=</term>
         <listitem>
           <para>sumti-5 | gek sumti gik sumti-4 
           <anchor xml:id="b95" />
           <anchor xreflabel="BNF rule #95" xml:id="cll_bnf-95" />
           <xref linkend="cll_yacc-95" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>sumti-5
+        <term>sumti-5 
         <subscript>95</subscript>=</term>
         <listitem>
           <para>[quantifier] sumti-6 [relative-clauses] | quantifier selbri /KU#/ [relative-clauses] 
           <anchor xml:id="b97" />
           <anchor xreflabel="BNF rule #97" xml:id="cll_bnf-97" />
           <xref linkend="cll_yacc-97" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>sumti-6
+        <term>sumti-6 
         <subscript>97</subscript>=</term>
         <listitem>
           <para>(LAhE # | NAhE BO #) [relative-clauses] sumti /LUhU#/ | KOhA # | lerfu-string /BOI#/ | LA # [relative-clauses] CMENE ... # | (LA | LE) # sumti-tail /KU#/ | LI # mex /LOhO#/ | ZO any-word # | LU text /LIhU#/ | LOhU any-word ... LEhU # | ZOI any-word anything any-word # 
           <anchor xml:id="b111" />
           <anchor xreflabel="BNF rule #111" xml:id="cll_bnf-111" />
           <xref linkend="cll_yacc-111" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>sumti-tail
+        <term>sumti-tail 
         <subscript>111</subscript>=</term>
         <listitem>
           <para>[sumti-6 [relative-clauses]] sumti-tail-1 | relative-clauses sumti-tail-1 
           <anchor xml:id="b112" />
           <anchor xreflabel="BNF rule #112" xml:id="cll_bnf-112" />
           <xref linkend="cll_yacc-112" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>sumti-tail-1
+        <term>sumti-tail-1 
         <subscript>112</subscript>=</term>
         <listitem>
           <para>[quantifier] selbri [relative-clauses] | quantifier sumti 
           <anchor xml:id="b121" />
           <anchor xreflabel="BNF rule #121" xml:id="cll_bnf-121" />
           <xref linkend="cll_yacc-121" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>relative-clauses
+        <term>relative-clauses 
         <subscript>121</subscript>=</term>
         <listitem>
           <para>relative-clause [ZIhE # relative-clause] ... 
           <anchor xml:id="b122" />
           <anchor xreflabel="BNF rule #122" xml:id="cll_bnf-122" />
           <xref linkend="cll_yacc-122" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>relative-clause
+        <term>relative-clause 
         <subscript>122</subscript>=</term>
         <listitem>
           <para>GOI # term /GEhU#/ | NOI # subsentence /KUhO#/ 
           <anchor xml:id="b130" />
           <anchor xreflabel="BNF rule #130" xml:id="cll_bnf-130" />
           <xref linkend="cll_yacc-130" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>selbri
+        <term>selbri 
         <subscript>130</subscript>=</term>
         <listitem>
           <para>[tag] selbri-1 
           <anchor xml:id="b131" />
           <anchor xreflabel="BNF rule #131" xml:id="cll_bnf-131" />
           <xref linkend="cll_yacc-131" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>selbri-1
+        <term>selbri-1 
         <subscript>131</subscript>=</term>
         <listitem>
           <para>selbri-2 | NA # selbri 
           <anchor xml:id="b132" />
           <anchor xreflabel="BNF rule #132" xml:id="cll_bnf-132" />
           <xref linkend="cll_yacc-132" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>selbri-2
+        <term>selbri-2 
         <subscript>132</subscript>=</term>
         <listitem>
           <para>selbri-3 [CO # selbri-2] 
           <anchor xml:id="b133" />
           <anchor xreflabel="BNF rule #133" xml:id="cll_bnf-133" />
           <xref linkend="cll_yacc-133" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>selbri-3
+        <term>selbri-3 
         <subscript>133</subscript>=</term>
         <listitem>
           <para>selbri-4 ... 
           <anchor xml:id="b134" />
           <anchor xreflabel="BNF rule #134" xml:id="cll_bnf-134" />
           <xref linkend="cll_yacc-134" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>selbri-4
+        <term>selbri-4 
         <subscript>134</subscript>=</term>
         <listitem>
           <para>selbri-5 [joik-jek selbri-5 | joik [stag] KE # selbri-3 /KEhE#/] ... 
           <anchor xml:id="b135" />
           <anchor xreflabel="BNF rule #135" xml:id="cll_bnf-135" />
           <xref linkend="cll_yacc-135" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>selbri-5
+        <term>selbri-5 
         <subscript>135</subscript>=</term>
         <listitem>
           <para>selbri-6 [(jek | joik) [stag] BO # selbri-5] 
           <anchor xml:id="b136" />
           <anchor xreflabel="BNF rule #136" xml:id="cll_bnf-136" />
           <xref linkend="cll_yacc-136" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>selbri-6
+        <term>selbri-6 
         <subscript>136</subscript>=</term>
         <listitem>
           <para>tanru-unit [BO # selbri-6] | [NAhE #] guhek selbri gik selbri-6 
           <anchor xml:id="b150" />
           <anchor xreflabel="BNF rule #150" xml:id="cll_bnf-150" />
           <xref linkend="cll_yacc-150" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>tanru-unit
+        <term>tanru-unit 
         <subscript>150</subscript>=</term>
         <listitem>
           <para>tanru-unit-1 [CEI # tanru-unit-1] ... 
           <anchor xml:id="b151" />
           <anchor xreflabel="BNF rule #151" xml:id="cll_bnf-151" />
           <xref linkend="cll_yacc-151" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>tanru-unit-1
+        <term>tanru-unit-1 
         <subscript>151</subscript>=</term>
         <listitem>
           <para>tanru-unit-2 [linkargs] 
           <anchor xml:id="b152" />
           <anchor xreflabel="BNF rule #152" xml:id="cll_bnf-152" />
           <xref linkend="cll_yacc-152" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>tanru-unit-2
+        <term>tanru-unit-2 
         <subscript>152</subscript>=</term>
         <listitem>
           <para>BRIVLA # | GOhA [RAhO] # | KE # selbri-3 /KEhE#/ | ME # sumti /MEhU#/ [MOI #] | (number | lerfu-string) MOI # | NUhA # mex-operator | SE # tanru-unit-2 | JAI # [tag] tanru-unit-2 | any-word (ZEI any-word) ... | NAhE # tanru-unit-2 | NU [NAI] # [joik-jek NU [NAI] #] ... subsentence /KEI#/ 
           <anchor xml:id="b160" />
           <anchor xreflabel="BNF rule #160" xml:id="cll_bnf-160" />
           <xref linkend="cll_yacc-160" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>linkargs
+        <term>linkargs 
         <subscript>160</subscript>=</term>
         <listitem>
           <para>BE # term [links] /BEhO#/ 
           <anchor xml:id="b161" />
           <anchor xreflabel="BNF rule #161" xml:id="cll_bnf-161" />
           <xref linkend="cll_yacc-161" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>links
+        <term>links 
         <subscript>161</subscript>=</term>
         <listitem>
           <para>BEI # term [links] 
           <anchor xml:id="b300" />
           <anchor xreflabel="BNF rule #300" xml:id="cll_bnf-300" />
           <xref linkend="cll_yacc-300" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>quantifier
+        <term>quantifier 
         <subscript>300</subscript>=</term>
         <listitem>
           <para>number /BOI#/ | VEI # mex /VEhO#/ 
           <anchor xml:id="b310" />
           <anchor xreflabel="BNF rule #310" xml:id="cll_bnf-310" />
           <xref linkend="cll_yacc-310" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>mex
+        <term>mex 
         <subscript>310</subscript>=</term>
         <listitem>
           <para>mex-1 [operator mex-1] ... | FUhA # rp-expression 
           <anchor xml:id="b311" />
           <anchor xreflabel="BNF rule #311" xml:id="cll_bnf-311" />
           <xref linkend="cll_yacc-311" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>mex-1
+        <term>mex-1 
         <subscript>311</subscript>=</term>
         <listitem>
           <para>mex-2 [BIhE # operator mex-1] 
           <anchor xml:id="b312" />
           <anchor xreflabel="BNF rule #312" xml:id="cll_bnf-312" />
           <xref linkend="cll_yacc-312" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>mex-2
+        <term>mex-2 
         <subscript>312</subscript>=</term>
         <listitem>
           <para>operand | [PEhO #] operator mex-2 ... /KUhE#/ 
           <anchor xml:id="b330" />
           <anchor xreflabel="BNF rule #330" xml:id="cll_bnf-330" />
           <xref linkend="cll_yacc-330" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>rp-expression
+        <term>rp-expression 
         <subscript>330</subscript>=</term>
         <listitem>
           <para>rp-operand rp-operand operator 
           <anchor xml:id="b332" />
           <anchor xreflabel="BNF rule #332" xml:id="cll_bnf-332" />
           <xref linkend="cll_yacc-332" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>rp-operand
+        <term>rp-operand 
         <subscript>332</subscript>=</term>
         <listitem>
           <para>operand | rp-expression 
           <anchor xml:id="b370" />
           <anchor xreflabel="BNF rule #370" xml:id="cll_bnf-370" />
           <xref linkend="cll_yacc-370" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>operator
+        <term>operator 
         <subscript>370</subscript>=</term>
         <listitem>
           <para>operator-1 [joik-jek operator-1 | joik [stag] KE # operator /KEhE#/] ... 
           <anchor xml:id="b371" />
           <anchor xreflabel="BNF rule #371" xml:id="cll_bnf-371" />
           <xref linkend="cll_yacc-371" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>operator-1
+        <term>operator-1 
         <subscript>371</subscript>=</term>
         <listitem>
           <para>operator-2 | guhek operator-1 gik operator-2 | operator-2 (jek | joik) [stag] BO # operator-1 
           <anchor xml:id="b372" />
           <anchor xreflabel="BNF rule #372" xml:id="cll_bnf-372" />
           <xref linkend="cll_yacc-372" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>operator-2
+        <term>operator-2 
         <subscript>372</subscript>=</term>
         <listitem>
           <para>mex-operator | KE # operator /KEhE#/ 
           <anchor xml:id="b374" />
           <anchor xreflabel="BNF rule #374" xml:id="cll_bnf-374" />
           <xref linkend="cll_yacc-374" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>mex-operator
+        <term>mex-operator 
         <subscript>374</subscript>=</term>
         <listitem>
           <para>SE # mex-operator | NAhE # mex-operator | MAhO # mex /TEhU#/ | NAhU # selbri /TEhU#/ | VUhU # 
           <anchor xml:id="b381" />
           <anchor xreflabel="BNF rule #381" xml:id="cll_bnf-381" />
           <xref linkend="cll_yacc-381" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>operand
+        <term>operand 
         <subscript>381</subscript>=</term>
         <listitem>
           <para>operand-1 [(ek | joik) [stag] KE # operand /KEhE#/] 
           <anchor xml:id="b382" />
           <anchor xreflabel="BNF rule #382" xml:id="cll_bnf-382" />
           <xref linkend="cll_yacc-382" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>operand-1
+        <term>operand-1 
         <subscript>382</subscript>=</term>
         <listitem>
           <para>operand-2 [joik-ek operand-2] ... 
           <anchor xml:id="b383" />
           <anchor xreflabel="BNF rule #383" xml:id="cll_bnf-383" />
           <xref linkend="cll_yacc-383" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>operand-2
+        <term>operand-2 
         <subscript>383</subscript>=</term>
         <listitem>
           <para>operand-3 [(ek | joik) [stag] BO # operand-2] 
           <anchor xml:id="b385" />
           <anchor xreflabel="BNF rule #385" xml:id="cll_bnf-385" />
           <xref linkend="cll_yacc-385" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>operand-3
+        <term>operand-3 
         <subscript>385</subscript>=</term>
         <listitem>
           <para>quantifier | lerfu-string /BOI#/ | NIhE # selbri /TEhU#/ | MOhE # sumti /TEhU#/ | JOhI # mex-2 ... /TEhU#/ | gek operand gik operand-3 | (LAhE # | NAhE BO #) operand /LUhU#/ 
           <anchor xml:id="b812" />
           <anchor xreflabel="BNF rule #812" xml:id="cll_bnf-812" />
           <xref linkend="cll_yacc-812" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>number
+        <term>number 
         <subscript>812</subscript>=</term>
         <listitem>
           <para>PA [PA | lerfu-word] ... 
           <anchor xml:id="b817" />
           <anchor xreflabel="BNF rule #817" xml:id="cll_bnf-817" />
           <xref linkend="cll_yacc-817" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>lerfu-string
+        <term>lerfu-string 
         <subscript>817</subscript>=</term>
         <listitem>
           <para>lerfu-word [PA | lerfu-word] ... 
           <anchor xml:id="b987" />
           <anchor xreflabel="BNF rule #987" xml:id="cll_bnf-987" />
           <xref linkend="cll_yacc-987" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>lerfu-word
+        <term>lerfu-word 
         <subscript>987</subscript>=</term>
         <listitem>
           <para>BY | any-word BU | LAU lerfu-word | TEI lerfu-string FOI 
           <anchor xml:id="b802" />
           <anchor xreflabel="BNF rule #802" xml:id="cll_bnf-802" />
           <xref linkend="cll_yacc-802" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>ek
+        <term>ek 
         <subscript>802</subscript>=</term>
         <listitem>
           <para>[NA] [SE] A [NAI] 
           <anchor xml:id="b818" />
           <anchor xreflabel="BNF rule #818" xml:id="cll_bnf-818" />
           <xref linkend="cll_yacc-818" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>gihek
+        <term>gihek 
         <subscript>818</subscript>=</term>
         <listitem>
           <para>[NA] [SE] GIhA [NAI] 
           <anchor xml:id="b805" />
           <anchor xreflabel="BNF rule #805" xml:id="cll_bnf-805" />
           <xref linkend="cll_yacc-805" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>jek
+        <term>jek 
         <subscript>805</subscript>=</term>
         <listitem>
           <para>[NA] [SE] JA [NAI] 
           <anchor xml:id="b806" />
           <anchor xreflabel="BNF rule #806" xml:id="cll_bnf-806" />
           <xref linkend="cll_yacc-806" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>joik
+        <term>joik 
         <subscript>806</subscript>=</term>
         <listitem>
           <para>[SE] JOI [NAI] | interval | GAhO interval GAhO 
           <anchor xml:id="b932" />
           <anchor xreflabel="BNF rule #932" xml:id="cll_bnf-932" />
           <xref linkend="cll_yacc-932" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>interval
+        <term>interval 
         <subscript>932</subscript>=</term>
         <listitem>
           <para>[SE] BIhI [NAI] 
           <anchor xml:id="b421" />
           <anchor xreflabel="BNF rule #421" xml:id="cll_bnf-421" />
           <xref linkend="cll_yacc-421" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>joik-ek
+        <term>joik-ek 
         <subscript>421</subscript>=</term>
         <listitem>
           <para>joik # | ek # 
           <anchor xml:id="b422" />
           <anchor xreflabel="BNF rule #422" xml:id="cll_bnf-422" />
           <xref linkend="cll_yacc-422" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>joik-jek
+        <term>joik-jek 
         <subscript>422</subscript>=</term>
         <listitem>
           <para>joik # | jek # 
           <anchor xml:id="b807" />
           <anchor xreflabel="BNF rule #807" xml:id="cll_bnf-807" />
           <xref linkend="cll_yacc-807" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>gek
+        <term>gek 
         <subscript>807</subscript>=</term>
         <listitem>
           <para>[SE] GA [NAI] # | joik GI # | stag gik 
           <anchor xml:id="b808" />
           <anchor xreflabel="BNF rule #808" xml:id="cll_bnf-808" />
           <xref linkend="cll_yacc-808" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>guhek
+        <term>guhek 
         <subscript>808</subscript>=</term>
         <listitem>
           <para>[SE] GUhA [NAI] # 
           <anchor xml:id="b816" />
           <anchor xreflabel="BNF rule #816" xml:id="cll_bnf-816" />
           <xref linkend="cll_yacc-816" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>gik
+        <term>gik 
         <subscript>816</subscript>=</term>
         <listitem>
           <para>GI [NAI] # 
           <anchor xml:id="b491" />
           <anchor xreflabel="BNF rule #491" xml:id="cll_bnf-491" />
           <xref linkend="cll_yacc-491" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>tag
+        <term>tag 
         <subscript>491</subscript>=</term>
         <listitem>
           <para>tense-modal [joik-jek tense-modal] ... 
           <anchor xml:id="b971" />
           <anchor xreflabel="BNF rule #971" xml:id="cll_bnf-971" />
           <xref linkend="cll_yacc-971" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>stag
+        <term>stag 
         <subscript>971</subscript>=</term>
         <listitem>
           <para>simple-tense-modal [(jek | joik) simple-tense-modal] ... 
           <anchor xml:id="b815" />
           <anchor xreflabel="BNF rule #815" xml:id="cll_bnf-815" />
           <xref linkend="cll_yacc-815" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>tense-modal
+        <term>tense-modal 
         <subscript>815</subscript>=</term>
         <listitem>
           <para>simple-tense-modal # | FIhO # selbri /FEhU#/ 
           <anchor xml:id="b972" />
           <anchor xreflabel="BNF rule #972" xml:id="cll_bnf-972" />
           <xref linkend="cll_yacc-972" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>simple-tense-modal
+        <term>simple-tense-modal 
         <subscript>972</subscript>=</term>
         <listitem>
           <para>[NAhE] [SE] BAI [NAI] [KI] | [NAhE] (time [space] | space [time]) &amp; CAhA [KI] | KI | CUhE 
           <anchor xml:id="b1030" />
           <anchor xreflabel="BNF rule #1030" xml:id="cll_bnf-1030" />
           <xref linkend="cll_yacc-1030" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>time
+        <term>time 
         <subscript>1030</subscript>=</term>
         <listitem>
           <para>ZI &amp; time-offset ... &amp; ZEhA [PU [NAI]] &amp; interval-property ... 
           <anchor xml:id="b1033" />
           <anchor xreflabel="BNF rule #1033" xml:id="cll_bnf-1033" />
           <xref linkend="cll_yacc-1033" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>time-offset
+        <term>time-offset 
         <subscript>1033</subscript>=</term>
         <listitem>
           <para>PU [NAI] [ZI] 
           <anchor xml:id="b1040" />
           <anchor xreflabel="BNF rule #1040" xml:id="cll_bnf-1040" />
           <xref linkend="cll_yacc-1040" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>space
+        <term>space 
         <subscript>1040</subscript>=</term>
         <listitem>
           <para>VA &amp; space-offset ... &amp; space-interval &amp; (MOhI space-offset) 
           <anchor xml:id="b1045" />
           <anchor xreflabel="BNF rule #1045" xml:id="cll_bnf-1045" />
           <xref linkend="cll_yacc-1045" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>space-offset
+        <term>space-offset 
         <subscript>1045</subscript>=</term>
         <listitem>
           <para>FAhA [NAI] [VA] 
           <anchor xml:id="b1046" />
           <anchor xreflabel="BNF rule #1046" xml:id="cll_bnf-1046" />
           <xref linkend="cll_yacc-1046" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>space-interval
+        <term>space-interval 
         <subscript>1046</subscript>=</term>
         <listitem>
           <para>((VEhA &amp; VIhA) [FAhA [NAI]]) &amp; space-int-props 
           <anchor xml:id="b1049" />
           <anchor xreflabel="BNF rule #1049" xml:id="cll_bnf-1049" />
           <xref linkend="cll_yacc-1049" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>space-int-props
+        <term>space-int-props 
         <subscript>1049</subscript>=</term>
         <listitem>
           <para>(FEhE interval-property) ... 
           <anchor xml:id="b1051" />
           <anchor xreflabel="BNF rule #1051" xml:id="cll_bnf-1051" />
           <xref linkend="cll_yacc-1051" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>interval-property
+        <term>interval-property 
         <subscript>1051</subscript>=</term>
         <listitem>
           <para>number ROI [NAI] | TAhE [NAI] | ZAhO [NAI] 
           <anchor xml:id="b32" />
           <anchor xreflabel="BNF rule #32" xml:id="cll_bnf-32" />
           <xref linkend="cll_yacc-32" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>free
+        <term>free 
         <subscript>32</subscript>=</term>
         <listitem>
           <para>SEI # [terms [CU #]] selbri /SEhU/ | SOI # sumti [sumti] /SEhU/ | vocative [relative-clauses] selbri [relative-clauses] /DOhU/ | vocative [relative-clauses] CMENE ... # [relative-clauses] /DOhU/ | vocative [sumti] /DOhU/ | (number | lerfu-string) MAI | TO text /TOI/ | XI # (number | lerfu-string) /BOI/ | XI # VEI # mex /VEhO/ 
           <anchor xml:id="b415" />
           <anchor xreflabel="BNF rule #415" xml:id="cll_bnf-415" />
           <xref linkend="cll_yacc-415" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>vocative
+        <term>vocative 
         <subscript>415</subscript>=</term>
         <listitem>
           <para>(COI [NAI]) ... &amp; DOI 
           <anchor xml:id="b411" />
           <anchor xreflabel="BNF rule #411" xml:id="cll_bnf-411" />
           <xref linkend="cll_yacc-411" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>indicators
+        <term>indicators 
         <subscript>411</subscript>=</term>
         <listitem>
           <para>[FUhE] indicator ... 
           <anchor xml:id="b413" />
           <anchor xreflabel="BNF rule #413" xml:id="cll_bnf-413" />
           <xref linkend="cll_yacc-413" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>indicator
+        <term>indicator 
         <subscript>413</subscript>=</term>
         <listitem>
           <para>(UI | CAI) [NAI] | Y | DAhO | FUhO</para>
         </listitem>
       </varlistentry>
     </variablelist>
     <para>The following rules are non-formal:</para>
     <variablelist>
       <varlistentry>
         <term>
         <anchor xml:id="b1100" />
         <anchor xreflabel="BNF rule #1100" xml:id="cll_bnf-1100" />
-        <xref linkend="cll_yacc-1100" />word
+        <xref linkend="cll_yacc-1100" />word 
         <subscript>1100</subscript>=</term>
         <listitem>
           <para>[BAhE] any-word [indicators]</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>any-word =</term>
         <listitem>
           <para>“any single word (no compound cmavo)”</para>
         </listitem>
@@ -7845,21 +7845,21 @@ the 900 series rules are found in the lexer.  */
       <varlistentry>
         <term>anything =</term>
         <listitem>
           <para>“any text at all, whether Lojban or not” 
           <anchor xml:id="b1101" />
           <anchor xreflabel="BNF rule #1101" xml:id="cll_bnf-1101" />
           <xref linkend="cll_yacc-1101" /></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>null
+        <term>null 
         <subscript>1101</subscript>=</term>
         <listitem>
           <para>any-word SI | utterance SA | text SU</para>
         </listitem>
       </varlistentry>
     </variablelist>
     <para>FAhO is a universal terminator and signals the end of parsable input.</para>
   </section>
   <section xml:id="cll_chapter21-section3">
     <title>3. EBNF Cross-Reference</title>
diff --git a/todocbook/3.xml b/todocbook/3.xml
index 5bd54e7..77751ad 100644
--- a/todocbook/3.xml
+++ b/todocbook/3.xml
@@ -237,24 +237,24 @@
     <para>Note in particular that Lojban vowels can be pronounced with either rounded or unrounded lips; typically 
     <quote>o</quote>and 
     <quote>u</quote>are rounded and the others are not, as in English, but this is not a requirement; some people round 
     <quote>y</quote>as well. Lojban consonants can be aspirated or unaspirated. Palatalizing of consonants, as found in Russian and other languages, is not generally acceptable in pronunciation, though a following 
     <quote>i</quote>may cause it.</para>
     <para>The sounds represented by the letters 
     <quote>c</quote>, 
     <quote>g</quote>, 
     <quote>j</quote>, 
     <quote>s</quote>, and 
-    <quote>x</quote>require special attention for speakers of English, either because they are ambiguous in the orthography of English (
+    <quote>x</quote>require special attention for speakers of English, either because they are ambiguous in the orthography of English ( 
     <quote>c</quote>, 
     <quote>g</quote>, 
-    <quote>s</quote>), or because they are strikingly different in Lojban (
+    <quote>s</quote>), or because they are strikingly different in Lojban ( 
     <quote>c</quote>, 
     <quote>j</quote>, 
     <quote>x</quote>). The English 
     <quote>c</quote>represents three different sounds, 
     <phrase role="IPA">[k]</phrase>in 
     <quote>cat</quote>and 
     <phrase role="IPA">[s]</phrase>in 
     <quote>cent</quote>, as well as the 
     <phrase role="IPA">[ʃ]</phrase>of 
     <quote>ocean</quote>. Similarly, English 
@@ -404,25 +404,25 @@
     uu     
 <phrase role="IPA">[wu]</phrase>   a back close vowel with labial on-glide
 
     iy     
 <phrase role="IPA">[jə]</phrase>   a central mid vowel with palatal on-glide
     uy     
 <phrase role="IPA">[wə]</phrase>   a central mid vowel with labial on-glide
 </programlisting>
     <para>(Approximate English equivalents of most of these diphthongs exist: see 
     <xref linkend="cll_chapter3-section11" />for examples.)</para>
-    <para>The first four diphthongs above (
+    <para>The first four diphthongs above ( 
     <quote>ai</quote>, 
     <quote>ei</quote>, 
     <quote>oi</quote>, and 
-    <quote>au</quote>, the ones with off-glides) are freely used in most types of Lojban words; the ten following ones are used only as stand-alone words and in Lojbanized names and borrowings; and the last two (
+    <quote>au</quote>, the ones with off-glides) are freely used in most types of Lojban words; the ten following ones are used only as stand-alone words and in Lojbanized names and borrowings; and the last two ( 
     <quote>iy</quote>and 
     <quote>uy</quote>) are used only in Lojbanized names.</para>
     <para>The syllabic consonants of Lojban, 
     <phrase role="IPA">[l̩]</phrase>, 
     <phrase role="IPA">[m̩]</phrase>, 
     <phrase role="IPA">[n̩]</phrase>, and 
     <phrase role="IPA">[r̩]</phrase>, are variants of the non-syllabic 
     <phrase role="IPA">[l]</phrase>, 
     <phrase role="IPA">[m]</phrase>, 
     <phrase role="IPA">[n]</phrase>, and 
@@ -607,34 +607,31 @@
       kl kr
       ml mr
       pl pr
       sf sk sl sm sn sp sr st
       tc tr ts
       vl vr
       xl xr
       zb zd zg zm zv
 </programlisting>
     <para>Lest this list seem almost random, a pairing of voiced and unvoiced equivalent vowels will show significant patterns which may help in learning:</para>
-    <programlisting xml:space="preserve">
-    pl pr                       fl fr
-    bl br                       vl vr
-
-    cp cf      ct ck cm cn      cl cr
-    jb jv      jd jg jm
-    sp sf      st sk sm sn      sl sr
-    zb zv      zd zg zm
-
-    tc tr      ts               kl kr
-    dj dr      dz               gl gr
-
-    ml mr                       xl xr
-</programlisting>
+    <cmavo-list>cp cf ct ck cm cn cl crsp sf st sk sm sn sl sr
+    <cmavo-entry>
+      <cmavo>tc tr</cmavo>
+      <selmaho>ts</selmaho>
+      <description>kl kr</description>
+    </cmavo-entry>
+    <cmavo-entry>
+      <cmavo>dj dr</cmavo>
+      <selmaho>dz</selmaho>
+      <description>gl gr</description>
+    </cmavo-entry></cmavo-list>
     <para>Note that if both consonants of an initial pair are voiced, the unvoiced equivalent is also permissible, and the voiced pair can be pronounced simply by voicing the unvoiced pair. (The converse is not true: 
     <quote>cn</quote>is a permissible initial pair, but 
     <quote>jn</quote>is not.)</para>
     <para>Consonant triples can occur medially in Lojban words. They are subject to the following rules:</para>
     <orderedlist>
       <listitem>
         <para>The first two consonants must constitute a permissible consonant pair;</para>
       </listitem>
       <listitem>
         <para>The last two consonants must constitute a permissible initial consonant pair;</para>
@@ -805,21 +802,21 @@
     </example>
     <para>This word contains the permissible initial pair 
     <quote>zb</quote>, and so may be syllabicated either between 
     <quote>z</quote>and 
     <quote>b</quote>or before 
     <quote>zb</quote>.</para>
     <para>Stress is a relatively louder pronunciation of one syllable in a word or group of words. Since every syllable has a vowel sound (or diphthong or syllabic consonant) as its nucleus, and the stress is on the vowel sound itself, the terms 
     <quote>stressed syllable</quote>and 
     <quote>stressed vowel</quote>are largely interchangeable concepts.</para>
     <para>Most Lojban words are stressed on the next-to-the-last, or penultimate, syllable. In counting syllables, however, syllables whose vowel is 
-    <quote>y</quote>or which contain a syllabic consonant (
+    <quote>y</quote>or which contain a syllabic consonant ( 
     <quote>l</quote>, 
     <quote>m</quote>, 
     <quote>n</quote>, or 
     <quote>r</quote>) are never counted. (The Lojban term for penultimate stress is 
     <quote>da'amoi terbasna</quote>.) Similarly, syllables created solely by adding a buffer vowel, such as 
     <phrase role="IPA">[ɪ]</phrase>, are not counted.</para>
     <para>There are actually three levels of stress - primary, secondary, and weak. Weak stress is the lowest level, so it really means no stress at all. Weak stress is required for syllables containing 
     <quote>y</quote>, a syllabic consonant, or a buffer vowel.</para>
     <para>Primary stress is required on the penultimate syllable of Lojban content words (called 
     <quote>brivla</quote>). Lojbanized names may be stressed on any syllable, but if a syllable other than the penultimate is stressed, the syllable (or at least its vowel) must be capitalized in writing. Lojban structural words (called 
@@ -1623,17 +1620,17 @@
     <quote>anna</quote>are used for 
     <quote>u</quote>and 
     <quote>i</quote>only when those letters are used to represent glides. Of the additional letters, 
     <quote>r</quote>, 
     <quote>l</quote>, 
     <quote>s</quote>, and 
     <quote>z</quote>are written with 
     <quote>rómen</quote>, 
     <quote>lambe</quote>, 
     <quote>silme</quote>, and 
-    <quote>áre</quote>/
+    <quote>áre</quote>/ 
     <quote>esse</quote>respectively; the inverted forms are used as free variants.</para>
     <para>Lojban, like Quenya, is a vowel-last language, so tehtar are read as following the tengwar on which they are placed. The conventional tehtar are used for the five regular vowels, and the dot below for 
     <quote>y</quote>. The Lojban apostrophe is represented by 
     <quote>halla</quote>. There is no equivalent of the Lojban comma or period.</para>
   </section>
 </chapter>
diff --git a/todocbook/4.xml b/todocbook/4.xml
index a03abe4..525f0e0 100644
--- a/todocbook/4.xml
+++ b/todocbook/4.xml
@@ -24,27 +24,47 @@
           <quote>u</quote>.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>2)</term>
         <listitem>
           <para>VV represents either a diphthong, one of the following: 
           <programlisting xml:space="preserve">
       ai ei oi au
 </programlisting>or a two-syllable vowel pair with an apostrophe separating the vowels, one of the following: 
-          <programlisting xml:space="preserve">
-      a'a    a'e    a'i    a'o    a'u
-      e'a    e'e    e'i    e'o    e'u
-      i'a    i'e    i'i    i'o    i'u
-      o'a    o'e    o'i    o'o    o'u
-      u'a    u'e    u'i    u'o    u'u
-</programlisting></para>
+          <cmavo-list>
+            <cmavo-entry>
+              <cmavo>a'a a'e a'i</cmavo>
+              <selmaho>a'o</selmaho>
+              <description>a'u</description>
+            </cmavo-entry>
+            <cmavo-entry>
+              <cmavo>e'a e'e e'i</cmavo>
+              <selmaho>e'o</selmaho>
+              <description>e'u</description>
+            </cmavo-entry>
+            <cmavo-entry>
+              <cmavo>i'a i'e i'i</cmavo>
+              <selmaho>i'o</selmaho>
+              <description>i'u</description>
+            </cmavo-entry>
+            <cmavo-entry>
+              <cmavo>o'a o'e o'i</cmavo>
+              <selmaho>o'o</selmaho>
+              <description>o'u</description>
+            </cmavo-entry>
+            <cmavo-entry>
+              <cmavo>u'a u'e u'i</cmavo>
+              <selmaho>u'o</selmaho>
+              <description>u'u</description>
+            </cmavo-entry>
+          </cmavo-list></para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>3)</term>
         <listitem>
           <para>C represents a single Lojban consonant, not including the apostrophe, one of 
           <quote>b</quote>, 
           <quote>c</quote>, 
           <quote>d</quote>, 
           <quote>f</quote>, 
@@ -122,42 +142,66 @@
     <quote>Pope John Paul II</quote>.</para>
   </section>
   <section xml:id="cll_chapter4-section2">
     <title>2. cmavo</title>
     <para>The first group of Lojban words discussed in this chapter are the cmavo. They are the structure words that hold the Lojban language together. They often have no semantic meaning in themselves, though they may affect the semantics of brivla to which they are attached. The cmavo include the equivalent of English articles, conjunctions, prepositions, numbers, and punctuation marks. There are over a hundred subcategories of cmavo, known as 
     <quote>selma'o</quote>, each having a specifically defined grammatical usage. The various selma'o are discussed throughout 
     <xref linkend="cll_chapter5" />to 
     <xref linkend="cll_chapter19" />and summarized in 
     <xref linkend="cll_chapter20" />.</para>
     <para>Standard cmavo occur in four forms defined by their word structure. Here are some examples of the various forms:</para>
-    <programlisting xml:space="preserve">
-    V-form      .a      .e     .i      .o     .u
-    CV-form     ba      ce     di      fo     gu
-    VV-form     .au     .ei    .ia     .o'u   .u'e
-    CVV-form    ki'a    pei    mi'o    coi    cu'u
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>V-form .a .e .i</cmavo>
+        <selmaho>.o</selmaho>
+        <description>.u</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CV-form ba ce di</cmavo>
+        <selmaho>fo</selmaho>
+        <description>gu</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>VV-form .au .ei</cmavo>
+        <selmaho>.ia</selmaho>
+        <description>.o'u .u'e</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CVV-form ki'a pei mi'o</cmavo>
+        <selmaho>coi</selmaho>
+        <description>cu'u</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>In addition, there is the cmavo 
     <quote>.y.</quote>(remember that 
     <quote>y</quote>is not a V), which must have pauses before and after it.</para>
     <para>A simple cmavo thus has the property of having only one or two vowels, or of having a single consonant followed by one or two vowels. Words consisting of three or more vowels in a row, or a single consonant followed by three or more vowels, are also of cmavo form, but are reserved for experimental use: a few examples are 
     <quote>ku'a'e</quote>, 
     <quote>sau'e</quote>, and 
     <quote>bai'ai</quote>. All CVV cmavo beginning with the letter 
     <quote>x</quote>are also reserved for experimental use. In general, though, the form of a cmavo tells you little or nothing about its grammatical use.</para>
     <para>
     <quote>Experimental use</quote>means that the language designers will not assign any standard meaning or usage to these words, and words and usages coined by Lojban speakers will not appear in official dictionaries for the indefinite future. Experimental-use words provide an escape hatch for adding grammatical mechanisms (as opposed to semantic concepts) the need for which was not foreseen.</para>
     <para>The cmavo of VV-form include not only the diphthongs and vowel pairs listed in 
     <xref linkend="cll_chapter4-section1" />, but also the following ten additional diphthongs:</para>
-    <programlisting xml:space="preserve">
-            .ia    .ie    .ii    .io    .iu
-            .ua    .ue    .ui    .uo    .uu
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>.ia .ie .ii</cmavo>
+        <selmaho>.io</selmaho>
+        <description>.iu</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>.ua .ue .ui</cmavo>
+        <selmaho>.uo</selmaho>
+        <description>.uu</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>In addition, cmavo can have the form 
     <quote>Cy</quote>, a consonant followed by the letter 
     <quote>y</quote>. These cmavo represent letters of the Lojban alphabet, and are discussed in detail in 
     <xref linkend="cll_chapter17" />.</para>
     <para>Compound cmavo are sequences of cmavo attached together to form a single written word. A compound cmavo is always identical in meaning and in grammatical use to the separated sequence of simple cmavo from which it is composed. These words are written in compound form merely to save visual space, and to ease the reader's burden in identifying when the component cmavo are acting together.</para>
     <para>Compound cmavo, while not visually short like their components, can be readily identified by two characteristics:</para>
     <variablelist>
       <varlistentry>
         <term>1)</term>
         <listitem>
@@ -300,21 +344,21 @@
       </listitem>
       <listitem>
         <para>always are stressed on the next-to-the-last (penultimate) syllable; this implies that they have two or more syllables.</para>
       </listitem>
     </orderedlist>
     <para>The presence of a consonant pair distinguishes brivla from cmavo and their compounds. The final vowel distinguishes brivla from cmene, which always end in a consonant. Thus 
     <quote>da'amei</quote>must be a compound cmavo because it lacks a consonant pair; 
     <quote>lojban.</quote>must be a name because it lacks a final vowel.</para>
     <para>Thus, 
     <quote>bisycla</quote>has the consonant pair 
-    <quote>sc</quote>in the first five non-
+    <quote>sc</quote>in the first five non- 
     <quote>y</quote>letters even though the 
     <quote>sc</quote>actually appears in the form of 
     <quote>syc</quote>. Similarly, the word 
     <quote>ro'inre'o</quote>contains 
     <quote>nr</quote>in the first five letters because the apostrophes are not counted for this purpose.</para>
     <para>The three subtypes of brivla are:</para>
     <orderedlist>
       <listitem>
         <para>gismu, the Lojban primitive roots from which all other brivla are built;</para>
       </listitem>
@@ -437,23 +481,23 @@
         <anchor xml:id="c4e5d2" />
         <anchor xml:id="cll_chapter4-section5-example2" />
       </title>
       <interlinear-gloss>
         <jbo>barda bloti</jbo>
       </interlinear-gloss>
     </example>
     <para>representing roughly the same concept as the English word 
     <quote>ship</quote>.</para>
     <para>The binary metaphor 
-    <quote>father mother</quote>can refer to a paternal grandmother (
+    <quote>father mother</quote>can refer to a paternal grandmother ( 
     <quote>a father-ly type of mother</quote>), while 
-    <quote>mother father</quote>can refer to a maternal grandfather (
+    <quote>mother father</quote>can refer to a maternal grandfather ( 
     <quote>a mother-ly type of father</quote>). In Lojban, these become the tanru</para>
     <example role="interlinear-gloss-example" xml:id="random-id-4wK9">
       <title>
         <anchor xml:id="c4e5d3" />
         <anchor xml:id="cll_chapter4-section5-example3" />
       </title>
       <interlinear-gloss>
         <jbo>patfu mamta</jbo>
       </interlinear-gloss>
     </example>
@@ -610,59 +654,111 @@
         <jbo>vancysanmi</jbo>
         <gloss>from 
         <quote>vanci sanmi</quote></gloss>
         <en>
         <quote>evening meal</quote>or 
         <quote>supper</quote></en>
       </interlinear-gloss>
     </example>
     <para>In addition to these two forms, each gismu may have up to three additional short rafsi, three letters long. All short rafsi have one of the forms CVC, CCV, or CVV. The total number of rafsi forms that are assigned to a gismu depends on how useful the gismu is, or is presumed to be, in making lujvo, when compared to other gismu that could be assigned the rafsi.</para>
     <para>For example, 
-    <quote>zmadu</quote>(
+    <quote>zmadu</quote>( 
     <quote>more than</quote>) has the two short rafsi 
     <quote>zma</quote>and 
     <quote>mau</quote>(in addition to its unreduced rafsi 
     <quote>zmad</quote>and 
     <quote>zmadu</quote>), because a vast number of lujvo have been created based on 
     <quote>zmadu</quote>, corresponding in general to English comparative adjectives ending in 
     <quote>-er</quote>such as 
     <quote>whiter</quote>(Lojban 
     <quote>labmau</quote>). On the other hand, 
-    <quote>bakri</quote>(
+    <quote>bakri</quote>( 
     <quote>chalk</quote>) has no short rafsi and few lujvo.</para>
     <para>There are at most one CVC-form, one CCV-form, and one CVV-form rafsi per gismu. In fact, only a tiny handful of gismu have both a CCV-form and a CVV-form rafsi assigned, and still fewer have all three forms of short rafsi. However, gismu with both a CVC-form and another short rafsi are fairly common, partly because more possible CVC-form rafsi exist. Yet CVC-form rafsi, even though they are fairly easy to remember, cannot be used at the end of a lujvo (because lujvo must end in vowels), so justifying the assignment of an additional short rafsi to many gismu.</para>
     <para>The intention was to use the available 
     <quote>rafsi space</quote>- the set of all possible short rafsi forms - in the most efficient way possible; the goal is to make the most-used lujvo as short as possible (thus maximizing the use of short rafsi), while keeping the rafsi very recognizable to anyone who knows the source gismu. For this reason, the letters in a rafsi have always been chosen from among the five letters of the corresponding gismu. As a result, there are a limited set of short rafsi available for assignment to each gismu. At most seven possible short rafsi are available for consideration (of which at most three can be used, as explained above).</para>
     <para>Here are the only short rafsi forms that can possibly exist for gismu of the form CVC/CV, like 
     <quote>sakli</quote>. The digits in the second column represent the gismu letters used to form the rafsi.</para>
-    <programlisting xml:space="preserve">
-    CVC     123     -sak-
-    CVC     124     -sal-
-    CVV     12'5    -sa'i-
-    CVV     125     -sai-
-    CCV     345     -kli-
-    CCV     132     -ska-
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>CVC</cmavo>
+        <selmaho>123</selmaho>
+        <description>-sak-</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CVC</cmavo>
+        <selmaho>124</selmaho>
+        <description>-sal-</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CVV</cmavo>
+        <selmaho>12'5</selmaho>
+        <description>-sa'i-</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CVV</cmavo>
+        <selmaho>125</selmaho>
+        <description>-sai-</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CCV</cmavo>
+        <selmaho>345</selmaho>
+        <description>-kli-</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CCV</cmavo>
+        <selmaho>132</selmaho>
+        <description>-ska-</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>(The only actual short rafsi for 
     <quote>sakli</quote>is 
     <quote>-sal-</quote>.)</para>
     <para>For gismu of the form CCVCV, like 
     <quote>blaci</quote>, the only short rafsi forms that can exist are:</para>
-    <programlisting xml:space="preserve">
-    CVC     134     -bac-
-    CVC     234     -lac
-    CVV     13'5    -ba'i-
-    CVV     135     -bai-
-    CVV     23'5    -la'i-
-    CVV     235     -lai-
-    CCV     123     -bla-
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>CVC</cmavo>
+        <selmaho>134</selmaho>
+        <description>-bac-</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CVC</cmavo>
+        <selmaho>234</selmaho>
+        <description>-lac</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CVV</cmavo>
+        <selmaho>13'5</selmaho>
+        <description>-ba'i-</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CVV</cmavo>
+        <selmaho>135</selmaho>
+        <description>-bai-</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CVV</cmavo>
+        <selmaho>23'5</selmaho>
+        <description>-la'i-</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CVV</cmavo>
+        <selmaho>235</selmaho>
+        <description>-lai-</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>CCV</cmavo>
+        <selmaho>123</selmaho>
+        <description>-bla-</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>(In fact, 
     <quote>blaci</quote>has none of these short rafsi; they are all assigned to other gismu. Lojban speakers are not free to reassign any of the rafsi; the tables shown here are to help understand how the rafsi were chosen in the first place.)</para>
     <para>There are a few restrictions: a CVV-form rafsi without an apostrophe cannot exist unless the vowels make up one of the four diphthongs 
     <quote>ai</quote>, 
     <quote>ei</quote>, 
     <quote>oi</quote>, or 
     <quote>au</quote>; and a CCV-form rafsi is possible only if the two consonants form a permissible initial consonant pair (see 
     <xref linkend="cll_chapter4-section1" />). Thus 
     <quote>mamta</quote>, which has the same form as 
     <quote>salci</quote>, can only have 
@@ -738,53 +834,53 @@
     <para>As noted above, CVC-form rafsi cannot appear as the final rafsi in a lujvo, because all lujvo must end with one or two vowels. As a brivla, a lujvo must also contain a consonant cluster within the first five letters - this ensures that they cannot be mistaken for compound cmavo. Of course, all lujvo have at least six letters since they have two or more rafsi, each at least three letters long; hence they cannot be confused with gismu.</para>
     <para>When attaching two rafsi together, it may be necessary to insert a hyphen letter. In Lojban, the term 
     <quote>hyphen</quote>always refers to a letter, either the vowel 
     <quote>y</quote>or one of the consonants 
     <quote>r</quote>and 
     <quote>n</quote>. (The letter 
     <quote>l</quote>can also be a hyphen, but is not used as one in lujvo.)</para>
     <para>The 
     <quote>y</quote>-hyphen is used after a CVC-form rafsi when joining it with the following rafsi could result in an impermissible consonant pair, or when the resulting lujvo could fall apart into two or more words (either cmavo or gismu).</para>
     <para>Thus, the tanru 
-    <quote>pante tavla</quote>(
+    <quote>pante tavla</quote>( 
     <quote>protest talk</quote>) cannot produce the lujvo 
     <quote>patta'a</quote>, because 
     <quote>tt</quote>is not a permissible consonant pair; the lujvo must be 
     <quote>patyta'a</quote>. Similarly, the tanru 
-    <quote>mudri siclu</quote>(
+    <quote>mudri siclu</quote>( 
     <quote>wooden whistle</quote>) cannot form the lujvo 
     <quote>mudsiclu</quote>; instead, 
     <quote>mudysiclu</quote>must be used. (Remember that 
     <quote>y</quote>is not counted in determining whether the first five letters of a brivla contain a consonant cluster: this is why.)</para>
     <para>The 
     <quote>y</quote>-hyphen is also used to attach a 4-letter rafsi, formed by dropping the final vowel of a gismu, to the following rafsi. (This procedure was shown, but not explained, in 
     <xref linkend="cll_chapter4-section6-example1" />to 
     <xref linkend="cll_chapter4-section6-example5" />.)</para>
     <para>The lujvo forms 
     <quote>zunlyjamfu</quote>, 
     <quote>zunlyjma</quote>, 
     <quote>zuljamfu</quote>, and 
     <quote>zuljma</quote>are all legitimate and equivalent forms made from the tanru 
-    <quote>zunle jamfu</quote>(
+    <quote>zunle jamfu</quote>( 
     <quote>left foot</quote>). Of these, 
     <quote>zuljma</quote>is the preferred one since it is the shortest; it thus is likely to be the form listed in a Lojban dictionary.</para>
     <para>The 
     <quote>r</quote>-hyphen and its close relative, the 
     <quote>n</quote>-hyphen, are used in lujvo only after CVV-form rafsi. A hyphen is always required in a two-part lujvo of the form CVV-CVV, since otherwise there would be no consonant cluster.</para>
     <para>An 
     <quote>r-</quote>hyphen or 
     <quote>n</quote>-hyphen is also required after the CVV-form rafsi of any lujvo of the form CVV-CVC/CV or CVV-CCVCV since it would otherwise fall apart into a CVV-form cmavo and a gismu. In any lujvo with more than two parts, a CVV-form rafsi in the initial position must always be followed by a hyphen. If the hyphen were to be omitted, the supposed lujvo could be broken into smaller words without the hyphen: because the CVV-form rafsi would be interpreted as a cmavo, and the remainder of the word as a valid lujvo that is one rafsi shorter.</para>
     <para>An 
     <quote>n</quote>-hyphen is only used in place of an 
     <quote>r</quote>-hyphen when the following rafsi begins with 
     <quote>r</quote>. For example, the tanru 
-    <quote>rokci renro</quote>(
+    <quote>rokci renro</quote>( 
     <quote>rock throw</quote>) cannot be expressed as 
     <quote>ro'ire'o</quote>(which breaks up into two cmavo), nor can it be 
     <quote>ro'irre'o</quote>(which has an impermissible double consonant); the 
     <quote>n</quote>-hyphen is required, and the correct form of the hyphenated lujvo is 
     <quote>ro'inre'o</quote>. The same lujvo could also be expressed without hyphenation as 
     <quote>rokre'o</quote>.</para>
     <para>There is also a different way of building lujvo, or rather phrases which are grammatically and semantically equivalent to lujvo. You can make a phrase containing any desired words, joining each pair of them with the special cmavo 
     <quote>zei</quote>. Thus,</para>
     <example role="interlinear-gloss-example" xml:id="random-id-VeGL">
       <title>
@@ -993,90 +1089,90 @@
         <anchor xml:id="cll_chapter4-section7-example5" />
       </title>
       <interlinear-gloss>
         <jbo>brie (from French)</jbo>
         <gloss>bri (Lojbanize)</gloss>
         <en>cirl,r,bri (prefix rafsi)</en>
       </interlinear-gloss>
     </example>
     <para>where 
     <quote>cirl-</quote>represents 
-    <quote>cirla</quote>(
+    <quote>cirla</quote>( 
     <quote>cheese</quote>).</para>
     <example role="interlinear-gloss-example" xml:id="random-id-DQju">
       <title>
         <anchor xml:id="c4e7d6" />
         <anchor xml:id="cll_chapter4-section7-example6" />
       </title>
       <interlinear-gloss>
         <jbo>cobra</jbo>
         <gloss>kobra (Lojbanize)</gloss>
         <en>sinc,r,kobra (prefix rafsi)</en>
       </interlinear-gloss>
     </example>
     <para>where 
     <quote>sinc-</quote>represents 
-    <quote>since</quote>(
+    <quote>since</quote>( 
     <quote>snake</quote>).</para>
     <example role="interlinear-gloss-example" xml:id="random-id-TFzH">
       <title>
         <anchor xml:id="c4e7d7" />
         <anchor xml:id="cll_chapter4-section7-example7" />
       </title>
       <interlinear-gloss>
         <jbo>quark</jbo>
         <gloss>kuark (Lojbanize)</gloss>
         <gloss>kuarka (add final vowel)</gloss>
         <en>sask,r,kuarka (prefix rafsi)</en>
       </interlinear-gloss>
     </example>
     <para>where 
     <quote>sask-</quote>represents 
-    <quote>saske</quote>(
+    <quote>saske</quote>( 
     <quote>science</quote>). Note the extra vowel 
     <quote>a</quote>added to the end of the word, and the diphthong 
     <quote>ua</quote>, which never appears in gismu or lujvo, but may appear in fu'ivla.</para>
     <example role="interlinear-gloss-example" xml:id="random-id-FTfQ">
       <title>
         <anchor xml:id="c4e7d8" />
         <anchor xml:id="cll_chapter4-section7-example8" />
       </title>
       <interlinear-gloss>
         <jbo>자모 (from Korean)</jbo>
         <gloss>djamo (Lojbanize)</gloss>
         <gloss>lerf,r,djamo (prefix rafsi)</gloss>
         <en>ler,l,djamo (prefix rafsi)</en>
       </interlinear-gloss>
     </example>
     <para>where 
     <quote>ler-</quote>represents 
-    <quote>lerfu</quote>(
+    <quote>lerfu</quote>( 
     <quote>letter</quote>). Note the l-hyphen in "lerldjamo", since "lerndjamo" contains the forbidden cluster "ndj".</para>
     <para>The use of the prefix helps distinguish among the many possible meanings of the borrowed word, depending on the field. As it happens, 
     <quote>spageti</quote>and 
     <quote>kuarka</quote>are valid Stage 4 fu'ivla, but 
     <quote>xaceru</quote>looks like a compound cmavo, and 
     <quote>kobra</quote>like a gismu.</para>
     <para>For another example, 
     <quote>integral</quote>has a specific meaning to a mathematician. But the Lojban fu'ivla 
     <quote>integrale</quote>, which is a valid Stage 4 fu'ivla, does not convey that mathematical sense to a non-mathematical listener, even one with an English-speaking background; its source - the English word 
     <quote>integral</quote>- has various other specialized meanings in other fields.</para>
     <para>Left uncontrolled, 
     <quote>integrale</quote>almost certainly would eventually come to mean the same collection of loosely related concepts that English associates with 
     <quote>integral</quote>, with only the context to indicate (possibly) that the mathematical term is meant.</para>
     <para>The prefix method would render the mathematical concept as 
     <quote>cmacrntegrale</quote>, if the 
     <quote>i</quote>of 
     <quote>integrale</quote>is removed, or something like 
     <quote>cmacrnintegrale</quote>, if a new consonant is added to the beginning; 
     <quote>cmac-</quote>is the rafsi for 
-    <quote>cmaci</quote>(
+    <quote>cmaci</quote>( 
     <quote>mathematics</quote>). The architectural sense of 
     <quote>integral</quote>might be conveyed with 
     <quote>djinrnintegrale</quote>or 
     <quote>tarmrnintegrale</quote>, where 
     <quote>dinju</quote>and 
     <quote>tarmi</quote>mean 
     <quote>building</quote>and 
     <quote>form</quote>respectively.</para>
     <para>Here are some fu'ivla representing cultures and related things, shown with more than one rafsi prefix:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-oWGs">
@@ -1595,31 +1691,62 @@
           <quote>r</quote>-, and 
           <quote>n</quote>-hyphens; call it 
           <quote>H</quote>.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>4)</term>
         <listitem>
           <para>For each rafsi, find the value in the following table. Sum this value over all rafsi; call it 
           <quote>R</quote>: 
-          <programlisting xml:space="preserve">
-      CVC/CV (final)               (-sarji)    1
-      CVC/C                        (-sarj-)    2
-      CCVCV (final)                (-zbasu)    3
-      CCVC                         (-zbas-)    4
-      CVC                          (-nun-)     5
-      CVV with an apostrophe       (-ta'u-)    6
-      CCV                          (-zba-)     7
-      CVV with no apostrophe       (-sai-)     8
-      
-</programlisting></para>
+          <cmavo-list>
+            <cmavo-entry>
+              <cmavo>CVC/CV (final)</cmavo>
+              <selmaho>(-sarji)</selmaho>
+              <description>1</description>
+            </cmavo-entry>
+            <cmavo-entry>
+              <cmavo>CVC/C</cmavo>
+              <selmaho>(-sarj-)</selmaho>
+              <description>2</description>
+            </cmavo-entry>
+            <cmavo-entry>
+              <cmavo>CCVCV (final)</cmavo>
+              <selmaho>(-zbasu)</selmaho>
+              <description>3</description>
+            </cmavo-entry>
+            <cmavo-entry>
+              <cmavo>CCVC</cmavo>
+              <selmaho>(-zbas-)</selmaho>
+              <description>4</description>
+            </cmavo-entry>
+            <cmavo-entry>
+              <cmavo>CVC</cmavo>
+              <selmaho>(-nun-)</selmaho>
+              <description>5</description>
+            </cmavo-entry>
+            <cmavo-entry>
+              <cmavo>CVV with an apostrophe</cmavo>
+              <selmaho>(-ta'u-)</selmaho>
+              <description>6</description>
+            </cmavo-entry>
+            <cmavo-entry>
+              <cmavo>CCV</cmavo>
+              <selmaho>(-zba-)</selmaho>
+              <description>7</description>
+            </cmavo-entry>
+            <cmavo-entry>
+              <cmavo>CVV with no apostrophe</cmavo>
+              <selmaho>(-sai-)</selmaho>
+              <description>8</description>
+            </cmavo-entry>
+          </cmavo-list></para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>5)</term>
         <listitem>
           <para>Count the number of vowels, not including 
           <quote>y</quote>; call it 
           <quote>V</quote>.</para>
         </listitem>
       </varlistentry>
@@ -1657,21 +1784,21 @@
         <jbo>zbazbasysarji</jbo>
         <gloss>zba + zbas + y + sarji</gloss>
         <gloss>(1000 * 13) - (500 * 0) + (100 * 1) - (10 * 12) - 4</gloss>
         <en>= 12976</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter4-section13">
     <title>13. lujvo-making examples</title>
     <para>This section contains examples of making and scoring lujvo. First, we will start with the tanru 
-    <quote>gerku zdani</quote>(
+    <quote>gerku zdani</quote>( 
     <quote>dog house</quote>) and construct a lujvo meaning 
     <quote>doghouse</quote>, that is, a house where a dog lives. We will use a brute-force application of the algorithm in 
     <xref linkend="cll_chapter4-section12" />, using every possible rafsi.</para>
     <para>The rafsi for 
     <quote>gerku</quote>are:</para>
     <programlisting xml:space="preserve">
           -ger-, -ge'u-, -gerk-, -gerku
 </programlisting>
     <para>The rafsi for 
     <quote>zdani</quote>are:</para>
@@ -1708,76 +1835,81 @@
     <quote>ge'u-</quote>part would fall off as a cmavo. So this form of the lujvo is 
     <quote>ge'urzdani</quote>.</para>
     <para>The last two forms require 
     <quote>y</quote>-hyphens, as all 4-letter rafsi do, and so are 
     <quote>gerkyzda</quote>and 
     <quote>gerkyzdani</quote>respectively.</para>
     <para>The scoring algorithm is heavily weighted in favor of short lujvo, so we might expect that 
     <quote>gerzda</quote>would win. Its L score is 6, its A score is 0, its H score is 0, its R score is 12, and its V score is 3, for a final score of 5878. The other forms have scores of 7917, 6367, 9506, 8008, and 10047 respectively. Consequently, this lujvo would probably appear in the dictionary in the form 
     <quote>gerzda</quote>.</para>
     <para>For the next example, we will use the tanru 
-    <quote>bloti klesi</quote>(
+    <quote>bloti klesi</quote>( 
     <quote>boat class</quote>) presumably referring to the category (rowboat, motorboat, cruise liner) into which a boat falls. We will omit the long rafsi from the process, since lujvo containing long rafsi are almost never preferred by the scoring algorithm when there are short rafsi available.</para>
     <para>The rafsi for 
     <quote>bloti</quote>are 
     <quote>-lot-</quote>, 
     <quote>-blo-</quote>, and 
     <quote>-lo'i-</quote>; for 
     <quote>klesi</quote>they are 
     <quote>-kle-</quote>and 
     <quote>-lei-</quote>. Both these gismu are among the handful which have both CVV-form and CCV-form rafsi, so there is an unusual number of possibilities available for a two-part tanru:</para>
     <programlisting xml:space="preserve">
-          lotkle      blokle      lo'ikle
+      lotkle      blokle      lo'ikle 
+<!-- not a cmavo list -->
           lotlei      blolei      lo'irlei
 </programlisting>
     <para>Only 
     <quote>lo'irlei</quote>requires hyphenation (to avoid confusion with the cmavo sequence 
     <quote>lo'i lei</quote>). All six forms are valid versions of the lujvo, as are the six further forms using long rafsi; however, the scoring algorithm produces the following results:</para>
     <programlisting xml:space="preserve">
-          lotkle  5878      blokle  5858      lo'ikle  6367
+          lotkle  5878      blokle  5858      lo'ikle  6367 
+<!-- not a cmavo list -->
           lotlei  5867      blolei  5847      lo'irlei 7456
 </programlisting>
     <para>So the form 
     <quote>blolei</quote>is preferred, but only by a tiny margin over 
     <quote>blokle</quote>; "lotlei" and "lotkle" are only slightly worse; 
     <quote>lo'ikle</quote>suffers because of its apostrophe, and 
     <quote>lo'irlei</quote>because of having both apostrophe and hyphen.</para>
     <para>Our third example will result in forming both a lujvo and a name from the tanru 
     <quote>logji bangu girzu</quote>, or 
-    <quote>logical-language group</quote>in English. (
+    <quote>logical-language group</quote>in English. ( 
     <quote>The Logical Language Group</quote>is the name of the publisher of this book and the organization for the promotion of Lojban.)</para>
     <para>The available rafsi are 
     <quote>-loj-</quote>and 
     <quote>-logj-</quote>; 
     <quote>-ban-</quote>, 
     <quote>-bau-</quote>, and 
     <quote>-bang-</quote>; and 
     <quote>-gri-</quote>and 
     <quote>-girzu</quote>, and (for name purposes only) 
     <quote>-gir-</quote>and 
     <quote>-girz-</quote>. The resulting 12 lujvo possibilities are:</para>
     <programlisting xml:space="preserve">
-          loj-ban-gri      loj-bau-gri      loj-bang-gri
+          loj-ban-gri      loj-bau-gri      loj-bang-gri 
+<!-- not a cmavo list -->
           logj-ban-gri     logj-bau-gri     logj-bang-gri
           loj-ban-girzu    loj-bau-girzu    loj-bang-girzu
           logj-ban-girzu   logj-bau-girzu   logj-bang-girzu
 </programlisting>
     <para>and the 12 name possibilities are:</para>
     <programlisting xml:space="preserve">
-          loj-ban-gir.     loj-bau-gir.     loj-bang-gir.
+          loj-ban-gir.     loj-bau-gir.     loj-bang-gir. 
+<!-- not a cmavo list -->
           logj-ban-gir.    logj-bau-gir.    logj-bang-gir.
           loj-ban-girz.    loj-bau-girz.    loj-bang-girz.
           logj-ban-girz.   logj-bau-girz.   logj-bang-girz.
 </programlisting>
     <para>After hyphenation, we have:</para>
     <programlisting xml:space="preserve">
-          lojbangri        lojbaugri        lojbangygri
+          lojbangri        lojbaugri        lojbangygri 
+<!-- not a cmavo list -->
           logjybangri      logjybaugri      logjybangygri
           lojbangirzu      lojbaugirzu      lojbangygirzu
           logjybangirzu    logjybaugirzu    logjybangygirzu
 
           lojbangir.       lojbaugir.       lojbangygir.
           logjybangir.     logjybaugir.     logjybangygir.
           lojbangirz.      lojbaugirz.      lojbangygirz.
           logjybangirz.    logjybaugirz.    logjybangygirz.
 </programlisting>
     <para>The only fully reduced lujvo forms are 
@@ -1799,32 +1931,32 @@
           nakn-kem-cin-ctu         naknykemcinctu
           nakn-kem-cin-ctuca       naknykemcinctuca
           nakn-kem-cins-ctu        naknykemcinsyctu
           nakn-kem-cins-ctuca      naknykemcinsyctuca
 </programlisting>
     <para>Of these forms, 
     <quote>nakykemcinctu</quote>is the shortest and is preferred by the scoring algorithm. On the whole, however, it might be better to just make a lujvo for 
     <quote>cinse ctuca</quote>(which would be 
     <quote>cinctu</quote>) since the sex of the teacher is rarely important. If there was a reason to specify 
     <quote>male</quote>, then the simpler tanru 
-    <quote>nakni cinctu</quote>(
+    <quote>nakni cinctu</quote>( 
     <quote>male sexual-teacher</quote>) would be appropriate. This tanru is actually shorter than the four-part lujvo, since the 
     <quote>ke</quote>required for grouping need not be expressed.</para>
   </section>
   <section xml:id="cll_chapter4-section14">
     <title>14. The gismu creation algorithm</title>
     <para>The gismu were created through the following process:</para>
     <variablelist>
       <varlistentry>
         <term>1)</term>
         <listitem>
-          <para>At least one word was found in each of the six source languages (Chinese, English, Hindi, Spanish, Russian, Arabic) corresponding to the proposed gismu. This word was rendered into Lojban phonetics rather liberally: consonant clusters consisting of a stop and the corresponding fricative were simplified to just the fricative (
+          <para>At least one word was found in each of the six source languages (Chinese, English, Hindi, Spanish, Russian, Arabic) corresponding to the proposed gismu. This word was rendered into Lojban phonetics rather liberally: consonant clusters consisting of a stop and the corresponding fricative were simplified to just the fricative ( 
           <quote>tc</quote>became 
           <quote>c</quote>, 
           <quote>dj</quote>became 
           <quote>j</quote>) and non-Lojban vowels were mapped onto Lojban ones. Furthermore, morphological endings were dropped. The same mapping rules were applied to all six languages for the sake of consistency.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>2)</term>
         <listitem>
           <para>All possible gismu forms were matched against the six source-language forms. The matches were scored as follows: 
diff --git a/todocbook/5.xml b/todocbook/5.xml
index 3e98786..cbfdb30 100644
--- a/todocbook/5.xml
+++ b/todocbook/5.xml
@@ -224,23 +224,27 @@
     <quote>prenu</quote>is the same as that between 
     <quote>cmalu</quote>and 
     <quote>prenu</quote>. 
     <xref linkend="cll_chapter5-section14" />and 
     <xref linkend="cll_chapter5-section15" />contain a partial listing of some types of tanru, with examples.</para>
   </section>
   <section xml:id="cll_chapter5-section3">
     <title>3. Three-part tanru grouping with 
     <quote>bo</quote></title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     bo      BO                  closest scope grouping
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>bo</cmavo>
+        <selmaho>BO</selmaho>
+        <description>closest scope grouping</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Consider the English sentence:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-gCLr">
       <title>
         <anchor xml:id="c5e3d1" />
         <anchor xml:id="cll_chapter5-section3-example1" />
       </title>
       <interlinear-gloss>
         <jbo>That's a little girls' school.</jbo>
       </interlinear-gloss>
     </example>
@@ -442,24 +446,32 @@
     <xref linkend="cll_chapter5-section4-example5" />could have 
     <quote>bo</quote>inserted between 
     <quote>melbi</quote>and 
     <quote>cmalu</quote>with no change in meaning.</para>
   </section>
   <section xml:id="cll_chapter5-section5">
     <title>5. Complex tanru with 
     <quote>ke</quote>and 
     <quote>ke'e</quote></title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ke      KE                  start grouping
-     ke'e    KEhE                end grouping
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ke</cmavo>
+        <selmaho>KE</selmaho>
+        <description>start grouping</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ke'e</cmavo>
+        <selmaho>KEhE</selmaho>
+        <description>end grouping</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>There is, in fact, a fifth grouping of 
     <quote>pretty little girls' school</quote>that cannot be expressed with the resources explained so far. To handle it, we must introduce the grouping parentheses cmavo, 
     <quote>ke</quote>and 
     <quote>ke'e</quote>(belonging to selma'o KE and KEhE respectively). Any portion of a selbri sandwiched between these two cmavo is taken to be a single tanru component, independently of what is adjacent to it. Thus, 
     <xref linkend="cll_chapter5-section4-example2" />can be rewritten in any of the following ways:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-cnjH">
       <title>
         <anchor xml:id="c5e5d1" />
         <anchor xml:id="cll_chapter5-section5-example1" />
         <anchor xml:id="c5e5d2" />
@@ -898,25 +910,37 @@
     <quote>mlatu</quote>outside the 
     <quote>gu'e ... gi</quote>construction. The scope of the 
     <quote>gi</quote>arm extends only to a single brivla or to two or more brivla connected with 
     <quote>bo</quote>or 
     <quote>ke ... ke'e</quote>.</para>
   </section>
   <section xml:id="cll_chapter5-section7">
     <title>7. Linked sumti: 
     <quote>be–bei–be'o</quote></title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     be      BE                  linked sumti marker
-     bei     BEI                 linked sumti separator
-     be'o    BEhO                linked sumti terminator
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>be</cmavo>
+        <selmaho>BE</selmaho>
+        <description>linked sumti marker</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>bei</cmavo>
+        <selmaho>BEI</selmaho>
+        <description>linked sumti separator</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>be'o</cmavo>
+        <selmaho>BEhO</selmaho>
+        <description>linked sumti terminator</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The question of the place structures of selbri has been glossed over so far. This chapter does not attempt to treat place structure issues in detail; they are discussed in 
     <xref linkend="cll_chapter9" />. One grammatical structure related to places belongs here, however. In simple sentences such as 
     <xref linkend="cll_chapter5-section1-example1" />, the place structure of the selbri is simply the defined place structure of the gismu 
     <quote>mamta</quote>. What about more complex selbri?</para>
     <para>For tanru, the place structure rule is simple: the place structure of a tanru is always the place structure of its tertau. Thus, the place structure of 
     <quote>blanu zdani</quote>is that of 
     <quote>zdani</quote>: the x1 place is a house or nest, and the x2 place is its occupants.</para>
     <para>What about the places of 
     <quote>blanu</quote>? Is there any way to get them into the act? In fact, 
     <quote>blanu</quote>has only one place, and this is merged, as it were, with the x1 place of 
@@ -1123,23 +1147,27 @@
     <quote>be'o</quote>, and since there is only one occurrence of 
     <quote>be</quote>, the 
     <quote>be'o</quote>must match it, whereas it may be confusing which occurrence of 
     <quote>le</quote>the 
     <quote>ku</quote>terminates (in fact the second one is correct).</para>
   </section>
   <section xml:id="cll_chapter5-section8">
     <title>8. Inversion of tanru: 
     <quote>co</quote></title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     co      CO                  tanru inversion marker
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>co</cmavo>
+        <selmaho>CO</selmaho>
+        <description>tanru inversion marker</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The standard order of Lojban tanru, whereby the modifier precedes what it modifies, is very natural to English-speakers: we talk of 
     <quote>blue houses</quote>, not of 
     <quote>houses blue</quote>. In other languages, however, such matters are differently arranged, and Lojban supports this reverse order (tertau before seltau) by inserting the particle 
     <quote>co</quote>. 
     <xref linkend="cll_chapter5-section8-example1" />and 
     <xref linkend="cll_chapter5-section8-example2" />mean exactly the same thing:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-YrRz">
       <title>
         <anchor xml:id="c5e8d1" />
         <anchor xml:id="cll_chapter5-section8-example1" />
@@ -1150,24 +1178,24 @@
         <jbo>ta blanu zdani</jbo>
         <gloss>That is-a-blue type-of-house.</gloss>
         <en>That is a blue house.</en>
         <jbo>ta zdani co blanu</jbo>
         <gloss>That is-a-house of-type blue.</gloss>
         <en>That is a blue house.</en>
       </interlinear-gloss>
     </example>
     <para>This change is called 
     <quote>tanru inversion</quote>. In tanru inversion, the element before 
-    <quote>co</quote>(
+    <quote>co</quote>( 
     <quote>zdani</quote>in 
     <xref linkend="cll_chapter5-section8-example2" />) is the tertau, and the element following 
-    <quote>co</quote>(
+    <quote>co</quote>( 
     <quote>blanu</quote>) in 
     <xref linkend="cll_chapter5-section8-example2" />) is the seltau.</para>
     <para>The meaning, and more specifically, the place structure, of a tanru is not affected by inversion: the place structure of 
     <quote>zdani co blanu</quote>is still that of 
     <quote>zdani</quote>. However, the existence of inversion in a selbri has a very special effect on any sumti which follow that selbri. Instead of being interpreted as filling places of the selbri, they actually fill the places (starting with x2) of the seltau. In 
     <xref linkend="cll_chapter5-section7" />, we saw how to fill interior places with 
     <quote>be ... bei ... be'o</quote>, and in fact 
     <xref linkend="cll_chapter5-section8-example3" />and 
     <xref linkend="cll_chapter5-section8-example4" />have the same meaning:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-8GVP">
@@ -1326,29 +1354,57 @@
       <interlinear-gloss>
         <jbo>mi klama be le zarci be'o co sutra</jbo>
         <gloss>I am-a-goer (to the store) of-type quick.</gloss>
         <en>I go to the store quickly.</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter5-section9">
     <title>9. Other kinds of simple selbri</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     go'i    GOhA                repeats the previous bridi
-     du      GOhA                equality
-     nu'a    NUhA                math operator to selbri
-     moi     MOI                 changes number to ordinal selbri
-     mei     MOI                 changes number to cardinal selbri
-     nu      NU                  event abstraction
-     kei     KEI                 terminator for NU
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>go'i</cmavo>
+        <selmaho>GOhA</selmaho>
+        <description>repeats the previous bridi</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>du</cmavo>
+        <selmaho>GOhA</selmaho>
+        <description>equality</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>nu'a</cmavo>
+        <selmaho>NUhA</selmaho>
+        <description>math operator to selbri</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>moi</cmavo>
+        <selmaho>MOI</selmaho>
+        <description>changes number to ordinal selbri</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>mei</cmavo>
+        <selmaho>MOI</selmaho>
+        <description>changes number to cardinal selbri</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>nu</cmavo>
+        <selmaho>NU</selmaho>
+        <description>event abstraction</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>kei</cmavo>
+        <selmaho>KEI</selmaho>
+        <description>terminator for NU</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>So far we have only discussed brivla and tanru built up from brivla as possible selbri. In fact, there are a few other constructions in Lojban which are grammatically equivalent to brivla: they can be used either directly as selbri, or as components in tanru. Some of these types of simple selbri are discussed at length in 
     <xref linkend="cll_chapter7" />, 
     <xref linkend="cll_chapter11" />, and 
     <xref linkend="cll_chapter18" />; but for completeness these types are mentioned here with a brief explanation and an example of their use in selbri.</para>
     <para>The cmavo of selma'o GOhA (with one exception) serve as pro-bridi, providing a reference to the content of other bridi; none of them has a fixed meaning. The most commonly used member of GOhA is probably 
     <quote>go'i</quote>, which amounts to a repetition of the previous bridi, or part of it. If I say:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-2UvG">
       <title>
         <anchor xml:id="c5e9d1" />
         <anchor xml:id="cll_chapter5-section9-example1" />
@@ -1762,21 +1818,21 @@
       <title>
         <anchor xml:id="c5e12d2" />
         <anchor xml:id="cll_chapter5-section12-example2" />
       </title>
       <interlinear-gloss>
         <jbo>la .alis. cu na'e cadzu klama le zarci</jbo>
         <gloss>Alice non- walkingly goes to-the market.</gloss>
         <en>Alice doesn't walk to the market.</en>
       </interlinear-gloss>
     </example>
-    <para>meaning that Alice does go there in some way (
+    <para>meaning that Alice does go there in some way ( 
     <quote>klama</quote>is not negated), but by a means other than that of walking. 
     <xref linkend="cll_chapter5-section12-example1" />negates both 
     <quote>cadzu</quote>and 
     <quote>klama</quote>, suggesting that Alice's relation to the market is something different from walkingly-going; it might be walking without going, or going without walking, or neither.</para>
     <para>Of course, any of the simple selbri types explained in 
     <xref linkend="cll_chapter5-section9" />may be used in place of brivla in any of these examples:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-YB00">
       <title>
         <anchor xml:id="c5e12d3" />
         <anchor xml:id="cll_chapter5-section12-example3" />
diff --git a/todocbook/6.xml b/todocbook/6.xml
index 2794823..6a7a245 100644
--- a/todocbook/6.xml
+++ b/todocbook/6.xml
@@ -112,26 +112,42 @@
     <para>Most of this chapter is about descriptions, as they have the most complicated syntax and usage. Some attention is also given to names, which are closely interwoven with descriptions. Pro-sumti, numbers, and quotations are described in more detail in 
     <xref linkend="cll_chapter7" />, 
     <xref linkend="cll_chapter18" />, and 
     <xref linkend="cll_chapter19" />respectively, so this chapter only gives summaries of their forms and uses. See 
     <xref linkend="cll_chapter6-section13" />through 
     <xref linkend="cll_chapter6-section15" />for these summaries.</para>
   </section>
   <section xml:id="cll_chapter6-section2">
     <title>2. The three basic description types</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     le      LE                  the, the one(s) described as
-     lo      LE                  some, some of those which really are
-     la      LA                  the one(s) named
-     ku      KU                  elidable terminator for LE, LA
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>le</cmavo>
+        <selmaho>LE</selmaho>
+        <description>the, the one(s) described as</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lo</cmavo>
+        <selmaho>LE</selmaho>
+        <description>some, some of those which really are</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>la</cmavo>
+        <selmaho>LA</selmaho>
+        <description>the one(s) named</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ku</cmavo>
+        <selmaho>KU</selmaho>
+        <description>elidable terminator for LE, LA</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The syntax of descriptions is fairly complex, and not all of it can be explained within the confines of this chapter: relative clauses, in particular, are discussed in 
     <xref linkend="cll_chapter8" />. However, most descriptions have just two components: a descriptor belonging to selma'o LE or LA, and a selbri. (The difference between selma'o LE and selma'o LA is not important until 
     <xref linkend="cll_chapter6-section12" />.) Furthermore, the selbri is often just a single brivla. Here is an elementary example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-rBuQ">
       <title>
         <anchor xml:id="c6e2d1" />
         <anchor xml:id="cll_chapter6-section2-example1" />
       </title>
       <interlinear-gloss>
         <jbo>le zarci</jbo>
@@ -155,22 +171,22 @@
         <anchor xml:id="cll_chapter6-section2-example2" />
       </title>
       <interlinear-gloss>
         <jbo>le zarci cu barda</jbo>
         <gloss>One-or-more-specific-things-which-I-describe as 
         <quote>markets</quote>is/are-big.</gloss>
         <gloss>The market is big.</gloss>
         <en>The markets are big.</en>
       </interlinear-gloss>
     </example>
-    <para>Note that English-speakers must state whether a reference to markets is to just one (
-    <quote>the market</quote>) or to more than one (
+    <para>Note that English-speakers must state whether a reference to markets is to just one ( 
+    <quote>the market</quote>) or to more than one ( 
     <quote>the markets</quote>). Lojban requires no such forced choice, so both colloquial translations of 
     <xref linkend="cll_chapter6-section2-example2" />are valid. Only the context can specify which is meant. (This rule does not mean that Lojban has no way of specifying the number of markets in such a case: that mechanism is explained in 
     <xref linkend="cll_chapter6-section7" />.)</para>
     <para>Now consider the following strange-looking example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-PutX">
       <title>
         <anchor xml:id="c6e2d3" />
         <anchor xml:id="cll_chapter6-section2-example3" />
       </title>
       <interlinear-gloss>
@@ -337,25 +353,37 @@
     <quote>ku</quote>unnecessary. There are also a few other uses of 
     <quote>ku</quote>: in the compound negator 
     <quote>naku</quote>(discussed in 
     <xref linkend="cll_chapter15" />) and to terminate place-structure, tense, and modal tags that do not have associated sumti (discussed in 
     <xref linkend="cll_chapter9" />and 
     <xref linkend="cll_chapter10" />).</para>
   </section>
   <section xml:id="cll_chapter6-section3">
     <title>3. Individuals and masses</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     lei     LE                  the mass I describe as
-     loi     LE                  part of the mass of those which really are
-     lai     LA                  the mass of those named
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>lei</cmavo>
+        <selmaho>LE</selmaho>
+        <description>the mass I describe as</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>loi</cmavo>
+        <selmaho>LE</selmaho>
+        <description>part of the mass of those which really are</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lai</cmavo>
+        <selmaho>LA</selmaho>
+        <description>the mass of those named</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>All Lojban sumti are classified by whether they refer to one of three types of objects, known as 
     <quote>individuals</quote>, 
     <quote>masses</quote>, and 
     <quote>sets</quote>. The term 
     <quote>individual</quote>is misleading when used to refer to more than one object, but no less-confusing term has as yet been found. All the descriptions in 
     <xref linkend="cll_chapter6-section1" />and 
     <xref linkend="cll_chapter6-section2" />refer to individuals, whether one or more than one. Consider the following example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-mwhq">
       <title>
         <anchor xml:id="c6e3d1" />
@@ -386,22 +414,22 @@
       </interlinear-gloss>
     </example>
     <para>Here the same three persons are treated not as individuals, but as a so-called 
     <quote>mass entity</quote>, or just 
     <quote>mass</quote>. A mass has the properties of each individual which composes it, and may have other properties of its own as well. This can lead to apparent contradictions. Thus suppose in the piano-moving example above that person 1 has fair skin, whereas person 2 has dark skin. Then it is correct to say that the person-mass has both fair skin and dark skin. Using the mass descriptor 
     <quote>lei</quote>signals that ordinary logical reasoning is not applicable: contradictions can be maintained, and all sorts of other peculiarities may exist. However, we can safely say that a mass inherits only the component properties that are relevant to it; it would be ludicrous to say that a mass of two persons is of molecular dimensions, simply because some of the parts (namely, the molecules) of the persons are that small.</para>
     <para>The descriptors 
     <quote>loi</quote>and 
     <quote>lai</quote>are analogous to 
     <quote>lo</quote>and 
-    <quote>la</quote>respectively, but refer to masses either by property (
-    <quote>loi</quote>) or by name (
+    <quote>la</quote>respectively, but refer to masses either by property ( 
+    <quote>loi</quote>) or by name ( 
     <quote>lai</quote>). A classic example of 
     <quote>loi</quote>use is:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-T1pF">
       <title>
         <anchor xml:id="c6e3d3" />
         <anchor xml:id="cll_chapter6-section3-example3" />
       </title>
       <interlinear-gloss>
         <jbo>loi cinfo cu xabju le fi'ortu'a</jbo>
         <gloss>Part-of-the-mass-of-those-which-really are-lions dwell in-the African-land.</gloss>
@@ -470,25 +498,37 @@
     </example>
     <para>in a context where 
     <quote>la cribe</quote>would be understood as plural, would mean that either Tom Bear or Fred Bear (to make up some names) might have written the book, or that Tom and Fred might have written it as collaborators. Using 
     <quote>la</quote>instead of 
     <quote>lai</quote>in 
     <xref linkend="cll_chapter6-section3-example6" />would give the implication that each of Tom and Fred, considered individually, had written it.</para>
   </section>
   <section xml:id="cll_chapter6-section4">
     <title>4. Masses and sets</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     le'i    LE                  the set described as
-     lo'i    LE                  the set of those which really are
-     la'i    LA                  the set of those named
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>le'i</cmavo>
+        <selmaho>LE</selmaho>
+        <description>the set described as</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lo'i</cmavo>
+        <selmaho>LE</selmaho>
+        <description>the set of those which really are</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>la'i</cmavo>
+        <selmaho>LA</selmaho>
+        <description>the set of those named</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Having said so much about masses, let us turn to sets. Sets are easier to understand than masses, but are more rarely used. Like a mass, a set is an abstract object formed from a number of individuals; however, the properties of a set are not derived from any of the properties of the individuals that compose it.</para>
     <para>Sets have properties like cardinality (how many elements in the set), membership (the relationship between a set and its elements), and set inclusion (the relationship between two sets, one of which - the superset – contains all the elements of the other - the subset). The set descriptors 
     <quote>le'i</quote>, 
     <quote>lo'i</quote>and 
     <quote>la'i</quote>correspond exactly to the mass descriptors 
     <quote>lei</quote>, 
     <quote>loi</quote>, and 
     <quote>lai</quote>except that normally we talk of the whole of a set, not just part of it. Here are some examples contrasting 
     <quote>lo</quote>, 
     <quote>loi</quote>, and 
@@ -536,24 +576,32 @@
     </example>
     <para>Note that the x2 place has been omitted; I am not specifying in exactly which way I am typical - whether in language knowledge, or age, or interests, or something else. If 
     <quote>lo'i</quote>were changed to 
     <quote>lo</quote>in 
     <xref linkend="cll_chapter6-section4-example4" />, the meaning would be something like 
     <quote>I am typical of some Lojban user</quote>, which is nonsense.</para>
   </section>
   <section xml:id="cll_chapter6-section5">
     <title>5. Descriptors for typical objects</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     lo'e    LE                  the typical
-     le'e    LE                  the stereotypical
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>lo'e</cmavo>
+        <selmaho>LE</selmaho>
+        <description>the typical</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>le'e</cmavo>
+        <selmaho>LE</selmaho>
+        <description>the stereotypical</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>As promised in 
     <xref linkend="cll_chapter6-section3" />, Lojban has a method for discriminating between 
     <quote>the lion</quote>who lives in Africa and 
     <quote>the Englishman</quote>who, generally speaking, doesn't live in Africa even though some Englishmen do. The descriptor 
     <quote>lo'e</quote>means 
     <quote>the typical</quote>, as in</para>
     <example role="interlinear-gloss-example" xml:id="random-id-AJKt">
       <title>
         <anchor xml:id="c6e5d1" />
         <anchor xml:id="cll_chapter6-section5-example1" />
@@ -616,24 +664,32 @@
     <para>is probably true to an American, but might be false (not the stereotype) to someone living in India or Russia.</para>
     <para>Note that there is no naming equivalent of 
     <quote>lo'e</quote>and 
     <quote>le'e</quote>, because there is no need, as a rule, for a 
     <quote>typical George</quote>or a 
     <quote>typical Smith</quote>. People or things who share a common name do not, in general, have any other common attributes worth mentioning.</para>
   </section>
   <section xml:id="cll_chapter6-section6">
     <title>6. Quantified sumti</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ro      PA                  all of/each of
-     su'o    PA                  at least (one of)
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ro</cmavo>
+        <selmaho>PA</selmaho>
+        <description>all of/each of</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>su'o</cmavo>
+        <selmaho>PA</selmaho>
+        <description>at least (one of)</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Quantifiers tell us how many: in the case of quantifiers with sumti, how many things we are talking about. In Lojban, quantifiers are expressed by numbers and mathematical expressions: a large topic discussed in some detail in 
     <xref linkend="cll_chapter18" />. For the purposes of this chapter, a simplified treatment will suffice. Our examples will employ either the simple Lojban numbers 
     <quote>pa</quote>, 
     <quote>re</quote>, 
     <quote>ci</quote>, 
     <quote>vo</quote>, and 
     <quote>mu</quote>, meaning 
     <quote>one</quote>, 
     <quote>two</quote>, 
     <quote>three</quote>, 
@@ -762,24 +818,27 @@
       <interlinear-gloss>
         <jbo>mi cusku re lu do cadzu le bisli li'u</jbo>
         <en>I express two-of [quote] you walk-on the ice [unquote].</en>
       </interlinear-gloss>
     </example>
     <para>means that I say the sentence exactly twice, neither more nor less.</para>
   </section>
   <section xml:id="cll_chapter6-section7">
     <title>7. Quantified descriptions</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     piro    PA                  the whole of
-     pisu'o  PA                  a part of
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>piro</cmavo>
+        <selmaho>PA</selmaho>
+        <description>the whole of</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Like other sumti, descriptions can be quantified. When a quantifier appears before a description, it has the same meaning as one appearing before a non-description sumti: it specifies how many things, of all those referred to by the description, are being talked about in this particular bridi. Suppose that context tells us that 
     <quote>le gerku</quote>refers to three dogs. Then we can say that exactly two of them are white as follows:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-WtUh">
       <title>
         <anchor xml:id="c6e7d1" />
         <anchor xml:id="cll_chapter6-section7-example1" />
       </title>
       <interlinear-gloss>
         <jbo>re le gerku cu blabi</jbo>
         <gloss>Two-of the dogs are-white.</gloss>
@@ -1081,36 +1140,62 @@
     </example>
     <para>In each case, 
     <quote>le ci cribe</quote>restricts the bears (or alleged bears) being talked of to some group of three which the speaker has in mind. 
     <xref linkend="cll_chapter6-section9-example3" />says that two of them (which two is not stated) are brown. 
     <xref linkend="cll_chapter6-section9-example4" />says that a specific pair of them are brown. 
     <xref linkend="cll_chapter6-section9-example5" />says that of a specific pair chosen from the original three, one or the other of that pair is brown.</para>
   </section>
   <section xml:id="cll_chapter6-section10">
     <title>10. sumti qualifiers</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     la'e    LAhE                something referred to by
-     lu'e    LAhE                a reference to
-     tu'a    LAhE                an abstraction involving
-     lu'a    LAhE                an individual/member/component of
-     lu'i    LAhE                a set formed from
-     lu'o    LAhE                a mass formed from
-     vu'i    LAhE                a sequence formed from
-
-     na'ebo  NAhE+BO             something other than
-     to'ebo  NAhE+BO             the opposite of
-     no'ebo  NAhE+BO             the neutral form of
-     je'abo  NAhE+BO             that which indeed is
-
-     lu'u    LUhU                elidable terminator for LAhE and NAhE+BO
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>la'e</cmavo>
+        <selmaho>LAhE</selmaho>
+        <description>something referred to by</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lu'e</cmavo>
+        <selmaho>LAhE</selmaho>
+        <description>a reference to</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>tu'a</cmavo>
+        <selmaho>LAhE</selmaho>
+        <description>an abstraction involving</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lu'a</cmavo>
+        <selmaho>LAhE</selmaho>
+        <description>an individual/member/component of</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lu'i</cmavo>
+        <selmaho>LAhE</selmaho>
+        <description>a set formed from</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lu'o</cmavo>
+        <selmaho>LAhE</selmaho>
+        <description>a mass formed from</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>vu'i</cmavo>
+        <selmaho>LAhE</selmaho>
+        <description>a sequence formed from</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>lu'u</cmavo>
+        <selmaho>LUhU</selmaho>
+        <description>elidable terminator for LAhE and NAhE+BO</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Well, that's quite a list of cmavo. What are they all about?</para>
     <para>The above cmavo and compound cmavo are called the 
     <quote>sumti qualifiers</quote>. All of them are either single cmavo of selma'o LAhE, or else compound cmavo involving a scalar negation cmavo of selma'o NAhE immediately followed by 
     <quote>bo</quote>of selma'o BO. Syntactically, you can prefix a sumti qualifier to any sumti and produce another simple sumti. (You may need to add the elidable terminator 
     <quote>lu'u</quote>to show where the qualified sumti ends.)</para>
     <para>Semantically, sumti qualifiers represent short forms of certain common special cases. Suppose you want to say 
     <quote>I see 'The Red Pony'</quote>, where 
     <quote>The Red Pony</quote>is the title of a book. How about:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-6W3v">
       <title>
@@ -1151,22 +1236,22 @@
         <anchor xml:id="cll_chapter6-section10-example3" />
       </title>
       <interlinear-gloss>
         <jbo>mi viska la'e lu le xunre cmaxirma li'u [lu'u]</jbo>
         <en>I see the-referent-of [quote] the red small-horse [unquote].</en>
       </interlinear-gloss>
     </example>
     <para>So when 
     <quote>la'e</quote>is prefixed to a sumti referring to a symbol, it produces a sumti referring to the referent of that symbol. (In computer jargon, 
     <quote>la'e</quote>dereferences a pointer.)</para>
-    <para>By introducing a sumti qualifier, we correct a false sentence (
-    <xref linkend="cll_chapter6-section10-example1" />), which too closely resembles its literal English equivalent, into a true sentence (
+    <para>By introducing a sumti qualifier, we correct a false sentence ( 
+    <xref linkend="cll_chapter6-section10-example1" />), which too closely resembles its literal English equivalent, into a true sentence ( 
     <xref linkend="cll_chapter6-section10-example3" />), without having to change it overmuch; in particular, the structure remains the same. Most of the uses of sumti qualifiers are of this general kind.</para>
     <para>The sumti qualifier 
     <quote>lu'e</quote>provides the converse operation: it can be prefixed to a sumti referring to some thing to produce a sumti referring to a sign or symbol for the thing. For example,</para>
     <example role="interlinear-gloss-example" xml:id="random-id-7ytm">
       <title>
         <anchor xml:id="c6e10d4" />
         <anchor xml:id="cll_chapter6-section10-example4" />
       </title>
       <interlinear-gloss>
         <jbo>mi pu cusku lu'e le vi cukta</jbo>
@@ -1516,29 +1601,37 @@
     <quote>James</quote>(because 
     <quote>mz</quote>is invalid): 
     <quote>djeimyz</quote>will suffice. Similarly, 
     <quote>la</quote>may be replaced by 
     <quote>ly</quote>, 
     <quote>lai</quote>by 
     <quote>ly'i</quote>, 
     <quote>doi</quote>by 
     <quote>do'i</quote>or 
     <quote>dai</quote>. Here are a few examples:</para>
-    <programlisting xml:space="preserve">
-     English name              invalid Lojban name   valid Lojban names
-
-       Doyle                     *doi,l                do'il or dai,l
-       Lyra                      *lairas               ly'iras
-       Lottie                    *latis                LYtis. or lotis.
-
-     (American pronunciation)
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>Doyle</cmavo>
+        <selmaho>*doi,l</selmaho>
+        <description>do'il or dai,l</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>Lyra</cmavo>
+        <selmaho>*lairas</selmaho>
+        <description>ly'iras</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>Lottie</cmavo>
+        <selmaho>*latis</selmaho>
+        <description>LYtis. or lotis.</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Names may be borrowed from other languages or created arbitrarily. Another common practice is to use one or more rafsi, arranged to end with a consonant, to form a name: thus the rafsi 
     <quote>loj-</quote>for 
     <quote>logji</quote>(logical) and 
     <quote>ban-</quote>for 
     <quote>bangu</quote>(language) unite to form the name of this language:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-uXAY">
       <title>
         <anchor xml:id="c6e12d7" />
         <anchor xml:id="cll_chapter6-section12-example7" />
       </title>
@@ -1556,21 +1649,21 @@
     <quote>la</quote>followed by a selbri.</para>
   </section>
   <section xml:id="cll_chapter6-section13">
     <title>13. Pro-sumti summary</title>
     <para>The Lojban pro-sumti are the cmavo of selma'o KOhA. They fall into several classes: personal, definable, quantificational, reflexive, back-counting, indefinite, demonstrative, metalinguistic, relative, question. More details are given in 
     <xref linkend="cll_chapter7" />; this section mostly duplicates information found there, but adds material on the implicit quantifier of each pro-sumti.</para>
     <para>The following examples illustrate each of the classes. Unless otherwise noted below, the implicit quantification for pro-sumti is 
     <quote>ro</quote>(all). In the case of pro-sumti which refer to other sumti, the 
     <quote>ro</quote>signifies 
     <quote>all of those referred to by the other sumti</quote>: thus it is possible to restrict, but not to extend, the quantification of the other sumti.</para>
-    <para>Personal pro-sumti (
+    <para>Personal pro-sumti ( 
     <quote>mi</quote>, 
     <quote>do</quote>, 
     <quote>mi'o</quote>, 
     <quote>mi'a</quote>, 
     <quote>ma'a</quote>, 
     <quote>do'o</quote>, 
     <quote>ko</quote>) refer to the speaker or the listener or both, with or without third parties:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-PHPi">
       <title>
         <anchor xml:id="c6e13d1" />
@@ -1581,21 +1674,21 @@
         <en>I love you.</en>
       </interlinear-gloss>
     </example>
     <para>The personal pro-sumti may be interpreted in context as either representing individuals or masses, so the implicit quantifier may be 
     <quote>pisu'o</quote>rather than 
     <quote>ro</quote>: in particular, 
     <quote>mi'o</quote>, 
     <quote>mi'a</quote>, 
     <quote>ma'a</quote>, and 
     <quote>do'o</quote>specifically represent mass combinations of the individuals (you and I, I and others, you and I and others, you and others) that make them up.</para>
-    <para>Definable pro-sumti (
+    <para>Definable pro-sumti ( 
     <quote>ko'a</quote>, 
     <quote>ko'e</quote>, 
     <quote>ko'i</quote>, 
     <quote>ko'o</quote>, 
     <quote>ko'u</quote>, 
     <quote>fo'a</quote>, 
     <quote>fo'e</quote>, 
     <quote>fo'i</quote>, 
     <quote>fo'o</quote>, 
     <quote>fo'u</quote>) refer to whatever the speaker has explicitly made them refer to. This reference is accomplished with 
@@ -1604,109 +1697,109 @@
     <example role="interlinear-gloss-example" xml:id="random-id-8whK">
       <title>
         <anchor xml:id="c6e13d2" />
         <anchor xml:id="cll_chapter6-section13-example2" />
       </title>
       <interlinear-gloss>
         <jbo>le cribe goi ko'a cu xekri .i ko'a citka le smacu</jbo>
         <en>The bear defined-as it-1 is-black. It-1 eats the mouse.</en>
       </interlinear-gloss>
     </example>
-    <para>Quantificational pro-sumti (
+    <para>Quantificational pro-sumti ( 
     <quote>da</quote>, 
     <quote>de</quote>, 
     <quote>di</quote>) are used as variables in bridi involving predicate logic:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-FVj8">
       <title>
         <anchor xml:id="c6e13d3" />
         <anchor xml:id="cll_chapter6-section13-example3" />
       </title>
       <interlinear-gloss>
         <jbo>ro da poi prenu cu prami pa de poi finpe</jbo>
         <gloss>All somethings-1 which-are persons love one something-2 which-is a-fish.</gloss>
         <en>All persons love a fish (each his/her own).</en>
       </interlinear-gloss>
     </example>
     <para>(This is not the same as 
     <quote>All persons love a certain fish</quote>; the difference between the two is one of quantifier order.) The implicit quantification rules for quantificational pro-sumti are particular to them, and are discussed in detail in 
     <xref linkend="cll_chapter16" />. Roughly speaking, the quantifier is 
     <quote>su'o</quote>(at least one) when the pro-sumti is first used, and 
     <quote>ro</quote>(all) thereafter.</para>
-    <para>Reflexive pro-sumti (
+    <para>Reflexive pro-sumti ( 
     <quote>vo'a</quote>, 
     <quote>vo'e</quote>, 
     <quote>vo'i</quote>, 
     <quote>vo'o</quote>, 
     <quote>vo'u</quote>) refer to the same referents as sumti filling other places in the same bridi, with the effect that the same thing is referred to twice:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-nMse">
       <title>
         <anchor xml:id="c6e13d4" />
         <anchor xml:id="cll_chapter6-section13-example4" />
       </title>
       <interlinear-gloss>
         <jbo>le cribe cu batci vo'a</jbo>
         <gloss>The bear bites what-is-in-the-x1-place.</gloss>
         <en>The bear bites itself.</en>
       </interlinear-gloss>
     </example>
-    <para>Back-counting pro-sumti (
+    <para>Back-counting pro-sumti ( 
     <quote>ri</quote>, 
     <quote>ra</quote>, 
     <quote>ru</quote>) refer to the referents of previous sumti counted backwards from the pro-sumti:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-cjTj">
       <title>
         <anchor xml:id="c6e13d5" />
         <anchor xml:id="cll_chapter6-section13-example5" />
       </title>
       <interlinear-gloss>
         <jbo>mi klama la frankfurt. ri</jbo>
         <gloss>I go to-Frankfurt from-the-referent-of-the-last-sumti</gloss>
         <en>I go from Frankfurt to Frankfurt (by some unstated route).</en>
       </interlinear-gloss>
     </example>
-    <para>Indefinite pro-sumti (
+    <para>Indefinite pro-sumti ( 
     <quote>zo'e</quote>, 
     <quote>zu'i</quote>, 
     <quote>zi'o</quote>) refer to something which is unspecified:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-d5Ee">
       <title>
         <anchor xml:id="c6e13d6" />
         <anchor xml:id="cll_chapter6-section13-example6" />
       </title>
       <interlinear-gloss>
         <jbo>mi klama la frankfurt. zo'e zo'e zo'e</jbo>
         <en>I go to-Frankfurt from-unspecified via-unspecified by-means-unspecified.</en>
       </interlinear-gloss>
     </example>
     <para>The implicit quantifier for indefinite pro-sumti is, well, indefinite. It might be 
     <quote>ro</quote>(all) or 
     <quote>su'o</quote>(at least one) or conceivably even 
     <quote>no</quote>(none), though 
     <quote>no</quote>would require a very odd context indeed.</para>
-    <para>Demonstrative pro-sumti (
+    <para>Demonstrative pro-sumti ( 
     <quote>ti</quote>, 
     <quote>ta</quote>, 
     <quote>tu</quote>) refer to things pointed at by the speaker, or when pointing is not possible, to things near or far from the speaker:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-aqfJ">
       <title>
         <anchor xml:id="c6e13d7" />
         <anchor xml:id="cll_chapter6-section13-example7" />
       </title>
       <interlinear-gloss>
         <jbo>ko muvgau</jbo>
         <gloss>ti ta tu</gloss>
         <gloss>You [imperative] move</gloss>
         <gloss>this-thing from-that-nearby-place to-that-further-away-place.</gloss>
         <en>Move this from there to over there!</en>
       </interlinear-gloss>
     </example>
-    <para>Metalinguistic pro-sumti (
+    <para>Metalinguistic pro-sumti ( 
     <quote>di'u</quote>, 
     <quote>de'u</quote>, 
     <quote>da'u</quote>, 
     <quote>di'e</quote>, 
     <quote>de'e</quote>, 
     <quote>da'e</quote>, 
     <quote>dei</quote>, 
     <quote>do'i</quote>) refer to spoken or written utterances, either preceding, following, or the same as the current utterance.</para>
     <example role="interlinear-gloss-example" xml:id="random-id-8VYF">
       <title>
@@ -1716,37 +1809,37 @@
       <interlinear-gloss>
         <jbo>li re su'i re du li vo</jbo>
         <gloss>.i la'e di'u jetnu</gloss>
         <gloss>The-number two plus two equals the-number four.</gloss>
         <en>The-referent-of the-previous-utterance is-true.</en>
       </interlinear-gloss>
     </example>
     <para>The implicit quantifier for metalinguistic pro-sumti is 
     <quote>su'o</quote>(at least one), because they are considered analogous to 
     <quote>lo</quote>descriptions: they refer to things which really are previous, current, or following utterances.</para>
-    <para>The relative pro-sumti (
+    <para>The relative pro-sumti ( 
     <quote>ke'a</quote>) is used within relative clauses (see 
     <xref linkend="cll_chapter8" />for a discussion of relative clauses) to refer to whatever sumti the relative clause is attached to.</para>
     <example role="interlinear-gloss-example" xml:id="random-id-sf2T">
       <title>
         <anchor xml:id="c6e13d9" />
         <anchor xml:id="cll_chapter6-section13-example9" />
       </title>
       <interlinear-gloss>
         <jbo>mi viska le mlatu ku poi zo'e zbasu ke'a</jbo>
         <gloss>loi slasi</gloss>
         <gloss>I see the cat(s) such-that something-unspecified makes it/them (the cats)</gloss>
         <gloss>from-a-mass-of plastic.</gloss>
         <en>I see the cat(s) made of plastic.</en>
       </interlinear-gloss>
     </example>
-    <para>The question pro-sumti (
+    <para>The question pro-sumti ( 
     <quote>ma</quote>) is used to ask questions which request the listener to supply a sumti which will make the question into a truth:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-9tSb">
       <title>
         <anchor xml:id="c6e13d10" />
         <anchor xml:id="cll_chapter6-section13-example10" />
       </title>
       <interlinear-gloss>
         <jbo>do klama ma</jbo>
         <gloss>You go to-what-sumti?</gloss>
         <en>Where are you going?</en>
diff --git a/todocbook/7.xml b/todocbook/7.xml
index 5895c86..f72bf01 100644
--- a/todocbook/7.xml
+++ b/todocbook/7.xml
@@ -62,21 +62,22 @@
     </example>
     <para>the antecedent of 
     <quote>himself</quote>is 
     <quote>John</quote>; not the person, but a piece of text (a name, in this case). John, the person, would be the referent of 
     <quote>himself</quote>. Not all pro-sumti or pro-bridi have antecedents, but all of them have referents.</para>
   </section>
   <section xml:id="cll_chapter7-section2">
     <title>2. Personal pro-sumti: the mi-series</title>
     <para>The following cmavo are discussed in this section:</para>
     <programlisting xml:space="preserve">
-     mi      KOhA  mi-series     I, me
+     mi      KOhA  mi-series     I, me 
+<!-- skip cmavo list automation -->
      do      KOhA  mi-series     you
      mi'o    KOhA  mi-series     you and I
      mi'a    KOhA  mi-series     I and others, we but not you
      ma'a    KOhA  mi-series     you and I and others
      do'o    KOhA  mi-series     you and others
      ko      KOhA  mi-series     you-imperative
 </programlisting>
     <para>The mi-series of pro-sumti refer to the speaker, the listener, and others in various combinations. 
     <quote>mi</quote>refers to the speaker and perhaps others for whom the speaker speaks; it may be a Lojbanic mass. 
     <quote>do</quote>refers to the listener or listeners. Neither 
@@ -207,21 +208,22 @@
         <en>Show me the person who loves you!</en>
       </interlinear-gloss>
     </example>
     <para>As mentioned in 
     <xref linkend="cll_chapter7-section1" />, some pro-sumti series have corresponding pro-bridi series. However, there is no equivalent of the mi-series among pro-bridi, since a person isn't a relationship.</para>
   </section>
   <section xml:id="cll_chapter7-section3">
     <title>3. Demonstrative pro-sumti: the ti-series</title>
     <para>The following cmavo are discussed in this section:</para>
     <programlisting xml:space="preserve">
-     ti      KOhA  ti-series     this here, a nearby object
+     ti      KOhA  ti-series     this here, a nearby object 
+<!-- skip cmavo list automation -->
      ta      KOhA  ti-series     that there, a medium-distant object
      tu      KOhA  ti-series     that yonder, a far-distant object
 </programlisting>
     <para>It is often useful to refer to things by pointing to them or by some related non-linguistic mechanism. In English, the words 
     <quote>this</quote>and 
     <quote>that</quote>serve this function among others: 
     <quote>this</quote>refers to something pointed at that is near the speaker, and 
     <quote>that</quote>refers to something further away. The Lojban pro-sumti of the ti-series serve the same functions, but more narrowly. The cmavo 
     <quote>ti</quote>, 
     <quote>ta</quote>, and 
@@ -286,21 +288,22 @@
         <jbo>ti noi bloti</jbo>
         <en>this-thing which-incidentally is-a-boat</en>
       </interlinear-gloss>
     </example>
     <para>There are no demonstrative pro-bridi to correspond to the ti-series: you can't point to a relationship.</para>
   </section>
   <section xml:id="cll_chapter7-section4">
     <title>4. Utterance pro-sumti: the di'u-series</title>
     <para>The following cmavo are discussed in this section:</para>
     <programlisting xml:space="preserve">
-     di'u    KOhA  di'u-series   the previous utterance
+     di'u    KOhA  di'u-series   the previous utterance 
+<!-- skip cmavo list automation -->
      de'u    KOhA  di'u-series   an earlier utterance
      da'u    KOhA  di'u-series   a much earlier utterance
      di'e    KOhA  di'u-series   the next utterance
      de'e    KOhA  di'u-series   a later utterance
      da'e    KOhA  di'u-series   a much later utterance
      dei     KOhA  di'u-series   this very utterance
      do'i    KOhA  di'u-series   some utterance
 </programlisting>
     <para>The cmavo of the di'u-series enable us to talk about things that have been, are being, or will be said. In English, it is normal to use 
     <quote>this</quote>and 
@@ -330,26 +333,26 @@
         <en>You (Not!) like the-mass-of cats. The-previous-utterance is-a-false-sentence.</en>
       </interlinear-gloss>
     </example>
     <para>Using 
     <quote>ta</quote>instead of 
     <quote>di'u</quote>would cause the listener to look around to see what the speaker of the second sentence was physically pointing to.</para>
     <para>As with 
     <quote>ti</quote>, 
     <quote>ta</quote>, and 
     <quote>tu</quote>, the cmavo of the di'u-series come in threes: a close utterance, a medium-distance utterance, and a distant utterance, either in the past or in the future. It turned out to be impossible to use the 
-    <quote>i</quote>/
-    <quote>a</quote>/
+    <quote>i</quote>/ 
+    <quote>a</quote>/ 
     <quote>u</quote>vowel convention of the demonstratives in 
     <xref linkend="cll_chapter7-section3" />without causing collisions with other cmavo, and so the di'u-series has a unique 
-    <quote>i</quote>/
-    <quote>e</quote>/
+    <quote>i</quote>/ 
+    <quote>e</quote>/ 
     <quote>a</quote>convention in the first vowel of the cmavo.</para>
     <para>Most references in speech are to the past (what has already been said), so 
     <quote>di'e</quote>, 
     <quote>de'e</quote>, and 
     <quote>da'e</quote>are not very useful when speaking. In writing, they are frequently handy:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-erEL">
       <title>
         <anchor xml:id="c7e4d3" />
         <anchor xml:id="cll_chapter7-section4-example3" />
       </title>
@@ -420,21 +423,22 @@
         <en>I love Jane. And I like the-last-utterance.</en>
       </interlinear-gloss>
     </example>
     <para>says that the speaker likes one of his own sentences.</para>
     <para>There are no pro-bridi corresponding to the di'u-series.</para>
   </section>
   <section xml:id="cll_chapter7-section5">
     <title>5. Assignable pro-sumti and pro-bridi: the ko'a-series and the broda-series</title>
     <para>The following cmavo and gismu are discussed in this section:</para>
     <programlisting xml:space="preserve">
-     ko'a    KOhA    ko'a-series     it-1
+     ko'a    KOhA    ko'a-series     it-1 
+<!-- skip cmavo list automation -->
      ko'e    KOhA    ko'a-series     it-2
      ko'i    KOhA    ko'a-series     it-3
      ko'o    KOhA    ko'a-series     it-4
      ko'u    KOhA    ko'a-series     it-5
      fo'a    KOhA    ko'a-series     it-6
      fo'e    KOhA    ko'a-series     it-7
      fo'i    KOhA    ko'a-series     it-8
      fo'o    KOhA    ko'a-series     it-9
      fo'u    KOhA    ko'a-series     it-10
      broda   BRIVLA  broda-series    is-thing-1
@@ -619,21 +623,22 @@
       </interlinear-gloss>
     </example>
     <para>This usage does not imply that the woman's name is Sam, or even that the speaker usually calls the woman 
     <quote>Sam</quote>. 
     <quote>Sam</quote>is simply a name chosen, as if at random, for use in the current context only.</para>
   </section>
   <section xml:id="cll_chapter7-section6">
     <title>6. Anaphoric pro-sumti and pro-bridi: the ri-series and the go'i-series</title>
     <para>The following cmavo are discussed in this section:</para>
     <programlisting xml:space="preserve">
-     ri      KOhA  ri-series     (repeats last sumti)
+     ri      KOhA  ri-series     (repeats last sumti) 
+<!-- skip cmavo list automation -->
      ra      KOhA  ri-series     (repeats previous sumti)
      ru      KOhA  ri-series     (repeats long-ago sumti)
 
      go'i    GOhA  go'i-series   (repeats last bridi)
      go'a    GOhA  go'i-series   (repeats previous bridi)
      go'u    GOhA  go'i-series   (repeats long-ago bridi)
      go'e    GOhA  go'i-series   (repeats last-but-one bridi)
      go'o    GOhA  go'i-series   (repeats future bridi)
      nei     GOhA  go'i-series   (repeats current bridi)
      no'a    GOhA  go'i-series   (repeats outer bridi)
@@ -903,21 +908,21 @@
     <para>Here the 
     <quote>go'i</quote>repeats 
     <quote>le xekri mlatu cu klama le zarci</quote>, and since 
     <quote>le</quote>makes the x1 place into a description, and the x1 place of this bridi is 
     <quote>le xekri mlatu</quote>, 
     <quote>le go'i</quote>means 
     <quote>le xekri mlatu</quote>.</para>
     <para>The cmavo 
     <quote>go'o</quote>, 
     <quote>nei</quote>, and 
-    <quote>no'a</quote>have been little used so far. They repeat respectively some future bridi, the current bridi, and the bridi that encloses the current bridi (
+    <quote>no'a</quote>have been little used so far. They repeat respectively some future bridi, the current bridi, and the bridi that encloses the current bridi ( 
     <quote>no'a</quote>, unlike the other members of the go'i- series, can repeat non-sentence bridi). Here are a few examples:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-EUmV">
       <title>
         <anchor xml:id="c7e6d13" />
         <anchor xml:id="cll_chapter7-section6-example13" />
       </title>
       <interlinear-gloss>
         <jbo>mi nupre le nu mi go'o</jbo>
         <gloss>.i ba dunda le djini le bersa</gloss>
         <gloss>.i ba dunda le zdani le tixnu</gloss>
@@ -1117,21 +1122,21 @@
         <en>I build using wood.</en>
         <jbo>mi zbasu le dinju zi'o</jbo>
         <gloss>I make the building [without-material].</gloss>
         <en>I make the building.</en>
       </interlinear-gloss>
     </example>
     <para>If 
     <xref linkend="cll_chapter7-section7-example4" />is true, then 
     <xref linkend="cll_chapter7-section7-example5" />through 
     <xref linkend="cll_chapter7-section7-example7" />must be true also. However, 
-    <xref linkend="cll_chapter7-section7-example3" />does not correspond to any sentence with three regular (non-
+    <xref linkend="cll_chapter7-section7-example3" />does not correspond to any sentence with three regular (non- 
     <quote>zi'o</quote>) sumti.</para>
     <para>The pro-bridi 
     <quote>co'e</quote>(which by itself constitutes the co'e-series of selma'o GOhA) represents the elliptical selbri. Lojban grammar does not allow the speaker to merely omit a selbri from a bridi, although any or all sumti may be freely omitted. Being vague about a relationship requires the use of 
     <quote>co'e</quote>as a selbri place-holder:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-uy9R">
       <title>
         <anchor xml:id="c7e7d8" />
         <anchor xml:id="cll_chapter7-section7-example8" />
       </title>
       <interlinear-gloss>
@@ -1146,21 +1151,22 @@
     <quote>zo'e</quote>; the cmavo 
     <quote>do'e</quote>of selma'o BAI (see 
     <xref linkend="cll_chapter9" />) also belongs to the same group of cmavo.</para>
     <para>Note that 
     <quote>do'i</quote>, of the di'u-series, is also a kind of indefinite pro-sumti: it is indefinite in referent, but is restricted to referring only to an utterance.</para>
   </section>
   <section xml:id="cll_chapter7-section8">
     <title>8. Reflexive and reciprocal pro-sumti: the vo'a-series</title>
     <para>The following cmavo are discussed in this section:</para>
     <programlisting xml:space="preserve">
-     vo'a    KOhA  vo'a-series   x1 of this bridi
+     vo'a    KOhA  vo'a-series   x1 of this bridi 
+<!-- skip cmavo list automation -->
      vo'e    KOhA  vo'a-series   x2 of this bridi
      vo'i    KOhA  vo'a-series   x3 of this bridi
      vo'o    KOhA  vo'a-series   x4 of this bridi
      vo'u    KOhA  vo'a-series   x5 of this bridi
 
      soi     SOI                 reciprocity
 
      se'u    SEhU                soi terminator
 </programlisting>
     <para>The cmavo of the vo'a-series are pro-sumti anaphora, like those of the ri-series, but have a specific function. These cmavo refer to the other places of the same bridi; the five of them represent up to five places. The same vo'a-series cmavo mean different things in different bridi. Some examples:</para>
@@ -1244,24 +1250,32 @@
         <gloss>I runningly-go to-this [reciprocity] [x3 of this bridi] from-that</gloss>
         <en>I runningly-go to this from that and vice versa.</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter7-section9">
     <title>9. sumti and bridi questions: 
     <quote>ma</quote>and 
     <quote>mo</quote></title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ma      KOhA                sumti question
-     mo      GOhA                bridi question
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ma</cmavo>
+        <selmaho>KOhA</selmaho>
+        <description>sumti question</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>mo</cmavo>
+        <selmaho>GOhA</selmaho>
+        <description>bridi question</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Lojban questions are more fully explained in 
     <xref linkend="cll_chapter19" />, but 
     <quote>ma</quote>and 
     <quote>mo</quote>are listed in this chapter for completeness. The cmavo 
     <quote>ma</quote>asks for a sumti to make the bridi true:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-Csod">
       <title>
         <anchor xml:id="c7e9d1" />
         <anchor xml:id="cll_chapter7-section9-example1" />
       </title>
@@ -1340,23 +1354,27 @@
         <jbo>ma djuno ma</jbo>
         <gloss>[What sumti] knows [what sumti]?</gloss>
         <en>Who knows what?</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter7-section10">
     <title>10. Relativized pro-sumti: 
     <quote>ke'a</quote></title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ke'a    KOhA                relativized sumti
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ke'a</cmavo>
+        <selmaho>KOhA</selmaho>
+        <description>relativized sumti</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>This pro-sumti is used in relative clauses (explained in 
     <xref linkend="cll_chapter8" />) to indicate how the sumti being relativized fits within the clause. For example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-UNBb">
       <title>
         <anchor xml:id="c7e10d1" />
         <anchor xml:id="cll_chapter7-section10-example1" />
       </title>
       <interlinear-gloss>
         <jbo>mi catlu lo mlatu poi [zo'e] zbasu</jbo>
         <gloss>ke'a lei slasi</gloss>
@@ -1389,23 +1407,27 @@
     <quote>ke'a</quote>appears.</para>
     <para>Note that 
     <quote>ke'a</quote>is used only with relative clauses, and not with other embedded bridi such as abstract descriptions. In the case of relative clauses within relative clauses, 
     <quote>ke'a</quote>may be subscripted to make the difference clear (see 
     <xref linkend="cll_chapter8" />).</para>
   </section>
   <section xml:id="cll_chapter7-section11">
     <title>11. Abstraction focus pro-sumti: 
     <quote>ce'u</quote></title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ce'u    KOhA                abstraction focus
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ce'u</cmavo>
+        <selmaho>KOhA</selmaho>
+        <description>abstraction focus</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The cmavo 
     <quote>ce'u</quote>is used within abstraction bridi, particularly property abstractions introduced by the cmavo 
     <quote>ka</quote>. Abstractions, including the uses of 
     <quote>ce'u</quote>, are discussed in full in 
     <xref linkend="cll_chapter11" />.</para>
     <para>In brief: Every property abstraction specifies a property of one of the sumti in it; that sumti place is filled by using 
     <quote>ce'u</quote>. This convention enables us to distinguish clearly between:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-ELxF">
       <title>
         <anchor xml:id="c7e11d1" />
@@ -1428,21 +1450,22 @@
         <jbo>le ka gleki ce'u</jbo>
         <gloss>the property-of (being-happy about-X)</gloss>
         <en>the property of being that which someone is happy about</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter7-section12">
     <title>12. Bound variable pro-sumti and pro-bridi: the da-series and the bu'a-series</title>
     <para>The following cmavo are discussed in this section:</para>
     <programlisting xml:space="preserve">
-     da      KOhA  da-series     something-1
+     da      KOhA  da-series     something-1 
+<!-- skip cmavo list automation -->
      de      KOhA  da-series     something-2
      di      KOhA  da-series     something-3
 
      bu'a    GOhA  bu'a-series   some-predicate-1
      bu'e    GOhA  bu'a-series   some-predicate-2
      bu'i    GOhA  bu'a-series   some-predicate-3
 </programlisting>
     <para>Bound variables belong to the predicate-logic part of Lojban, and are listed here for completeness only. Their semantics is explained in 
     <xref linkend="cll_chapter16" />. It is worth mentioning that the Lojban translation of 
     <xref linkend="cll_chapter7-section1-example2" />is:</para>
@@ -1454,46 +1477,54 @@
       <interlinear-gloss>
         <jbo>la djan. cu lafti da poi grana ku'o gi'e desygau da</jbo>
         <gloss>John raised something-1 which is-a-stick and shake-did something-1.</gloss>
         <en>John picked up a stick and shook it.</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter7-section13">
     <title>13. Pro-sumti and pro-bridi cancelling</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     da'o    DAhO                cancel all pro-sumti/pro-bridi
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>da'o</cmavo>
+        <selmaho>DAhO</selmaho>
+        <description>cancel all pro-sumti/pro-bridi</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>How long does a pro-sumti or pro-bridi remain stable? In other words, once we know the referent of a pro-sumti or pro-bridi, how long can we be sure that future uses of the same cmavo have the same referent? The answer to this question depends on which series the cmavo belongs to.</para>
     <para>Personal pro-sumti are stable until there is a change of speaker or listener, possibly signaled by a vocative. Assignable pro-sumti and pro-bridi last indefinitely or until rebound with 
     <quote>goi</quote>or 
     <quote>cei</quote>. Bound variable pro-sumti and pro-bridi also generally last until re-bound; details are available in 
     <xref linkend="cll_chapter16" />.</para>
     <para>Utterance pro-sumti are stable only within the utterance in which they appear; similarly, reflexive pro-sumti are stable only within the bridi in which they appear; and 
     <quote>ke'a</quote>is stable only within its relative clause. Anaphoric pro-sumti and pro-bridi are stable only within narrow limits depending on the rules for the particular cmavo.</para>
     <para>Demonstrative pro-sumti, indefinite pro-sumti and pro-bridi, and sumti and bridi questions potentially change referents every time they are used.</para>
     <para>However, there are ways to cancel all pro-sumti and pro-bridi, so that none of them have known referents. (Some, such as 
     <quote>mi</quote>, will acquire the same referent as soon as they are used again after the cancellation.) The simplest way to cancel everything is with the cmavo 
     <quote>da'o</quote>of selma'o DAhO, which is used solely for this purpose; it may appear anywhere, and has no effect on the grammar of texts containing it. One use of 
     <quote>da'o</quote>is when entering a conversation, to indicate that one's pro-sumti assignments have nothing to do with any assignments already made by other participants in the conversation.</para>
     <para>In addition, the cmavo 
     <quote>ni'o</quote>and 
     <quote>no'i</quote>of selma'o NIhO, which are used primarily to indicate shifts in topic, may also have the effect of canceling pro-sumti and pro-bridi assignments, or of reinstating ones formerly in effect. More explanations of NIhO can be found in 
     <xref linkend="cll_chapter19" />.</para>
   </section>
   <section xml:id="cll_chapter7-section14">
     <title>14. The identity predicate: du</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     du      GOhA                identity
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>du</cmavo>
+        <selmaho>GOhA</selmaho>
+        <description>identity</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The cmavo 
     <quote>du</quote>has the place structure:</para>
     <programlisting xml:space="preserve">
        du: x1 is identical with x2, x3, ...
 </programlisting>
     <para>and appears in selma'o GOhA for reasons of convenience: it is not a pro-bridi. 
     <quote>du</quote>serves as mathematical 
     <quote>=</quote>, and outside mathematical contexts is used for defining or identifying. Mathematical examples may be found in 
     <xref linkend="cll_chapter18" />.</para>
     <para>The main difference between</para>
@@ -1707,20 +1738,44 @@
 <quote>com</quote>/
 <quote>co'e</quote>)
      mo        bridi question
      du        identity: x1 is identical to x2, x3 ... (rafsi: 
 <quote>dub</quote>/
 <quote>du'o</quote>)
 </programlisting>
   </section>
   <section xml:id="cll_chapter7-section18">
     <title>18. Other cmavo discussed in this chapter</title>
-    <programlisting xml:space="preserve">
-     goi     GOI                 pro-sumti assignment (ko'a-series)
-     cei     CEI                 pro-bridi assignment (broda-series)
-     ra'o    RAhO                pro-sumti/pro-bridi update
-     soi     SOI                 reciprocity
-     se'u    SEhU                soi terminator
-     da'o    DAhO                cancel all pro-sumti/pro-bridi
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>goi</cmavo>
+        <selmaho>GOI</selmaho>
+        <description>pro-sumti assignment (ko'a-series)</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>cei</cmavo>
+        <selmaho>CEI</selmaho>
+        <description>pro-bridi assignment (broda-series)</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ra'o</cmavo>
+        <selmaho>RAhO</selmaho>
+        <description>pro-sumti/pro-bridi update</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>soi</cmavo>
+        <selmaho>SOI</selmaho>
+        <description>reciprocity</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>se'u</cmavo>
+        <selmaho>SEhU</selmaho>
+        <description>soi terminator</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>da'o</cmavo>
+        <selmaho>DAhO</selmaho>
+        <description>cancel all pro-sumti/pro-bridi</description>
+      </cmavo-entry>
+    </cmavo-list>
   </section>
 </chapter>
diff --git a/todocbook/8.xml b/todocbook/8.xml
index c4ac4d7..8617a9e 100644
--- a/todocbook/8.xml
+++ b/todocbook/8.xml
@@ -1,20 +1,32 @@
 <chapter xml:id="cll_chapter8">
   <title>Chapter 8 Relative Clauses, Which Make sumti Even More Complicated</title>
   <section xml:id="cll_chapter8-section1">
     <title>1. What are you pointing at?</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     poi     NOI                 restrictive relative clause introducer
-     ke'a    GOhA                relative pro-sumti
-     ku'o    KUhO                relative clause terminator
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>poi</cmavo>
+        <selmaho>NOI</selmaho>
+        <description>restrictive relative clause introducer</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ke'a</cmavo>
+        <selmaho>GOhA</selmaho>
+        <description>relative pro-sumti</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ku'o</cmavo>
+        <selmaho>KUhO</selmaho>
+        <description>relative clause terminator</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Let us think about the problem of communicating what it is that we are pointing at when we are pointing at something. In Lojban, we can refer to what we are pointing at by using the pro-sumti 
     <quote>ti</quote>if it is nearby, or 
     <quote>ta</quote>if it is somewhat further away, or 
     <quote>tu</quote>if it is distant. (Pro-sumti are explained in full in 
     <xref linkend="cll_chapter7" />.)</para>
     <para>However, even with the assistance of a pointing finger, or pointing lips, or whatever may be appropriate in the local culture, it is often hard for a listener to tell just what is being pointed at. Suppose one is pointing at a person (in particular, in the direction of his or her face), and says:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-QzhK">
       <title>
         <anchor xml:id="c8e1d1" />
         <anchor xml:id="cll_chapter8-section1-example1" />
@@ -166,23 +178,27 @@
     <quote>who was going to the store</quote>, and in 
     <xref linkend="cll_chapter8-section1-example11" />it is 
     <quote>that the school was located in</quote>. Sometimes 
     <quote>who</quote>, 
     <quote>which</quote>, and 
     <quote>that</quote>are used in literal translations in this chapter in order to make them read more smoothly.</para>
   </section>
   <section xml:id="cll_chapter8-section2">
     <title>2. Incidental relative clauses</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     noi     NOI                 incidental relative clause introducer
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>noi</cmavo>
+        <selmaho>NOI</selmaho>
+        <description>incidental relative clause introducer</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>There are two basic kinds of relative clauses: restrictive relative clauses introduced by 
     <quote>poi</quote>, and incidental (sometimes called simply 
     <quote>non-restrictive</quote>) relative clauses introduced by 
     <quote>noi</quote>. The difference between restrictive and incidental relative clauses is that restrictive clauses provide information that is essential to identifying the referent of the sumti to which they are attached, whereas incidental relative clauses provide additional information which is helpful to the listener but is not essential for identifying the referent of the sumti. All of the examples in 
     <xref linkend="cll_chapter8-section1" />are restrictive relative clauses: the information in the relative clause is essential to identification. (The title of this chapter, though, uses an incidental relative clause.)</para>
     <para>Consider the following examples:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-IU0R">
       <title>
         <anchor xml:id="c8e2d1" />
         <anchor xml:id="cll_chapter8-section2-example1" />
@@ -267,30 +283,57 @@
         <en>Do you see my car, the white one?</en>
       </interlinear-gloss>
     </example>
     <para>So a restrictive relative clause attached to a description can often mean the same as a description involving a tanru. However, 
     <quote>blabi karce</quote>, like all tanru, is somewhat vague: in principle, it might refer to a car which carries white things, or even express some more complicated concept involving whiteness and car-ness; the restrictive relative clause of 
     <xref linkend="cll_chapter8-section2-example5" />can only refer to a car which is white, not to any more complex or extended concept.</para>
   </section>
   <section xml:id="cll_chapter8-section3">
     <title>3. Relative phrases</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     pe      GOI                 restrictive association
-     po      GOI                 restrictive possession
-     po'e    GOI                 restrictive intrinsic possession
-     po'u    GOI                 restrictive identification
-     ne      GOI                 incidental association
-     no'u    GOI                 incidental identification
-
-     ge'u    GEhU                relative phrase terminator
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>pe</cmavo>
+        <selmaho>GOI</selmaho>
+        <description>restrictive association</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>po</cmavo>
+        <selmaho>GOI</selmaho>
+        <description>restrictive possession</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>po'e</cmavo>
+        <selmaho>GOI</selmaho>
+        <description>restrictive intrinsic possession</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>po'u</cmavo>
+        <selmaho>GOI</selmaho>
+        <description>restrictive identification</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ne</cmavo>
+        <selmaho>GOI</selmaho>
+        <description>incidental association</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>no'u</cmavo>
+        <selmaho>GOI</selmaho>
+        <description>incidental identification</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ge'u</cmavo>
+        <selmaho>GEhU</selmaho>
+        <description>relative phrase terminator</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>There are types of relative clauses (those which have a certain selbri) which are frequently wanted in Lojban, and can be expressed using a shortcut called a relative phrase. Relative phrases are introduced by cmavo of selma'o GOI, and consist of a GOI cmavo followed by a single sumti.</para>
     <para>Here is an example of 
     <quote>pe</quote>, plus an equivalent sentence using a relative clause:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-SviE">
       <title>
         <anchor xml:id="c8e3d1" />
         <anchor xml:id="cll_chapter8-section3-example1" />
         <anchor xml:id="c8e3d2" />
         <anchor xml:id="cll_chapter8-section3-example2" />
       </title>
@@ -325,21 +368,21 @@
     <xref linkend="cll_chapter8-section3-example3" />and 
     <xref linkend="cll_chapter8-section3-example4" />contrast with 
     <xref linkend="cll_chapter8-section3-example1" />and 
     <xref linkend="cll_chapter8-section3-example2" />: the chair is more permanently connected with the speaker. A plausible (though not the only possible) contrast between 
     <xref linkend="cll_chapter8-section3-example1" />and 
     <xref linkend="cll_chapter8-section3-example3" />is that 
     <quote>pe mi</quote>would be appropriate for a chair the speaker is currently sitting on (whether or not the speaker owned that chair), and 
     <quote>po mi</quote>for a chair owned by the speaker (whether or not he or she was currently occupying it).</para>
     <para>As a result, the relationship expressed between two sumti by 
     <quote>po</quote>is usually called 
-    <quote>possession</quote>, although it does not necessarily imply ownership, legal or otherwise. The central concept is that of specificity (
+    <quote>possession</quote>, although it does not necessarily imply ownership, legal or otherwise. The central concept is that of specificity ( 
     <quote>steci</quote>in Lojban).</para>
     <para>Here is an example of 
     <quote>po'e</quote>, as well as another example of 
     <quote>po</quote>:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-EARj">
       <title>
         <anchor xml:id="c8e3d5" />
         <anchor xml:id="cll_chapter8-section3-example5" />
         <anchor xml:id="c8e3d6" />
         <anchor xml:id="cll_chapter8-section3-example6" />
@@ -529,23 +572,27 @@
     </example>
     <para>is very natural. Of course, if the man is in fact putting his hands into another's pockets, or another's hands into his pockets, the fact can be specified.</para>
     <para>Finally, the elidable terminator for GOI cmavo is 
     <quote>ge'u</quote>of selma'o GEhU; it is almost never required. However, if a logical connective immediately follows a sumti modified by a relative phrase, then an explicit 
     <quote>ge'u</quote>is needed to allow the connective to affect the relativized sumti rather than the sumti of the relative phrase. (What about the cmavo after which selma'o GOI is named? It is discussed in 
     <xref linkend="cll_chapter7" />, as it is not semantically akin to the other kinds of relative phrases, although the syntax is the same.)</para>
   </section>
   <section xml:id="cll_chapter8-section4">
     <title>4. Multiple relative clauses: 
     <quote>zi'e</quote></title>
-    <programlisting xml:space="preserve">
-     zi'e    ZIhE                relative clause joiner
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>zi'e</cmavo>
+        <selmaho>ZIhE</selmaho>
+        <description>relative clause joiner</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Sometimes it is necessary or useful to attach more than one relative clause to a sumti. This is made possible in Lojban by the cmavo 
     <quote>zi'e</quote>(of selma'o ZIhE), which is used to join one or more relative clauses together into a single unit, thus making them apply to the same sumti. For example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-HBMR">
       <title>
         <anchor xml:id="c8e4d1" />
         <anchor xml:id="cll_chapter8-section4-example1" />
       </title>
       <interlinear-gloss>
         <jbo>le gerku poi blabi zi'e poi batci le nanmu cu klama</jbo>
         <en>The dog which is white and which bites the man goes.</en>
@@ -624,23 +671,27 @@
         <gloss>I [future] eat the beans associated-with me</gloss>
         <gloss>and which are-upon my plate</gloss>
         <gloss>and which-incidentally you gave IT to-me.</gloss>
         <en>I'll eat my beans that are on my plate, the ones you gave me.</en>
       </interlinear-gloss>
     </example>
   </section>
   <section xml:id="cll_chapter8-section5">
     <title>5. Non-veridical relative clauses: 
     <quote>voi</quote></title>
-    <programlisting xml:space="preserve">
-     voi     NOI                 non-veridical relative clause introducer
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>voi</cmavo>
+        <selmaho>NOI</selmaho>
+        <description>non-veridical relative clause introducer</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>There is another member of selma'o NOI which serves to introduce a third kind of relative clause: 
     <quote>voi</quote>. Relative clauses introduced by 
     <quote>voi</quote>are restrictive, like those introduced by 
     <quote>poi</quote>. However, there is a fundamental difference between 
     <quote>poi</quote>and 
     <quote>voi</quote>relative clauses. A 
     <quote>poi</quote>relative clause is said to be veridical, in the same sense that a description using 
     <quote>lo</quote>or 
     <quote>loi</quote>is: it is essential to the interpretation that the bridi actually be true. For example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-pcvP">
@@ -686,21 +737,21 @@
       </interlinear-gloss>
     </example>
     <para>mean essentially the same thing (except that 
     <xref linkend="cll_chapter8-section5-example4" />involves pointing thanks to the use of 
     <quote>ti</quote>, whereas 
     <xref linkend="cll_chapter8-section5-example3" />doesn't), and neither one is self-contradictory: it is perfectly all right to describe something as a man (although perhaps confusing to the listener) even if it actually is a woman.</para>
   </section>
   <section xml:id="cll_chapter8-section6">
     <title>6. Relative clauses and descriptors</title>
     <para>So far, this chapter has described the various kinds of relative clauses (including relative phrases). The list is now complete, and the rest of the chapter will be concerned with the syntax of sumti that include relative clauses. So far, all relative clauses have appeared directly after the sumti to which they are attached. This is the most common position (and originally the only one), but a variety of other placements are also possible which produce a variety of semantic effects.</para>
-    <para>There are actually three places where a relative clause can be attached to a description sumti: after the descriptor (
+    <para>There are actually three places where a relative clause can be attached to a description sumti: after the descriptor ( 
     <quote>le</quote>, 
     <quote>lo</quote>, or whatever), after the embedded selbri but before the elidable terminator (which is 
     <quote>ku</quote>), and after the 
     <quote>ku</quote>. The relative clauses attached to descriptors that we have seen have occupied the second position. Thus 
     <xref linkend="cll_chapter8-section5-example1" />, if written out with all elidable terminators, would appear as:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-UmLX">
       <title>
         <anchor xml:id="c8e6d1" />
         <anchor xml:id="cll_chapter8-section6-example1" />
       </title>
@@ -731,22 +782,22 @@
         <jbo>le poi blabi ku'o gerku cu klama</jbo>
         <en>The such-that (it-is-white) dog goes.</en>
         <jbo>le gerku ku poi blabi cu klama</jbo>
         <en>The (dog) which is-white goes.</en>
       </interlinear-gloss>
     </example>
     <para>
     <xref linkend="cll_chapter8-section6-example1" />will seem most natural to speakers of languages like English, which always puts relative clauses after the noun phrases they are attached to; 
     <xref linkend="cll_chapter8-section6-example2" />, on the other hand, may seem more natural to Finnish or Chinese speakers, who put the relative clause first. Note that in 
     <xref linkend="cll_chapter8-section6-example2" />, the elidable terminator 
-    <quote>ku'o</quote>must appear, or the selbri of the relative clause (
-    <quote>blabi</quote>) will merge with the selbri of the description (
+    <quote>ku'o</quote>must appear, or the selbri of the relative clause ( 
+    <quote>blabi</quote>) will merge with the selbri of the description ( 
     <quote>gerku</quote>), resulting in an ungrammatical sentence. The purpose of the form appearing in 
     <xref linkend="cll_chapter8-section6-example3" />will be apparent shortly.</para>
     <para>As is explained in detail in 
     <xref linkend="cll_chapter6" />, two different numbers (known as the 
     <quote>inner quantifier</quote>and the 
     <quote>outer quantifier</quote>) can be attached to a description. The inner quantifier specifies how many things the descriptor refers to: it appears between the descriptor and the description selbri. The outer quantifier appears before the descriptor, and specifies how many of the things referred to by the descriptor are involved in this particular bridi. In the following example,</para>
     <example role="interlinear-gloss-example" xml:id="random-id-3nJN">
       <title>
         <anchor xml:id="c8e6d4" />
         <anchor xml:id="cll_chapter8-section6-example4" />
@@ -841,21 +892,21 @@
     <quote>la</quote>, indicating that what follows is a selbri used for naming, then the positioning of relative clauses has a different significance. A relative clause inside the 
     <quote>ku</quote>, whether before or after the selbri, is reckoned part of the name; a relative clause outside the 
     <quote>ku</quote>is not. Therefore,</para>
     <example role="interlinear-gloss-example" xml:id="random-id-JYj4">
       <title>
         <anchor xml:id="c8e6d10" />
         <anchor xml:id="cll_chapter8-section6-example10" />
       </title>
       <interlinear-gloss>
         <jbo>mi viska la nanmu poi terpa le ke'a xirma [ku]</jbo>
-        <gloss>I see that-named (
+        <gloss>I see that-named ( 
         <quote>man which fears the of-IT horse</quote>).</gloss>
         <en>I see Man Afraid Of His Horse.</en>
       </interlinear-gloss>
     </example>
     <para>says that the speaker sees a person with a particular name, who does not necessarily fear any horses, whereas</para>
     <example role="interlinear-gloss-example" xml:id="random-id-9GWR">
       <title>
         <anchor xml:id="c8e6d11" />
         <anchor xml:id="cll_chapter8-section6-example11" />
       </title>
@@ -865,21 +916,21 @@
         <quote>Man</quote>) which fears the of-IT horse.</gloss>
         <en>I see the person named 
         <quote>Man</quote>who is afraid of his horse.</en>
       </interlinear-gloss>
     </example>
     <para>refers to one (or more) of those named 
     <quote>Man</quote>, namely the one(s) who are afraid of their horses.</para>
     <para>Finally, so-called indefinite sumti like 
     <quote>re karce</quote>, which means almost the same as 
     <quote>re lo karce</quote>(which in turn means the same as 
-    <quote>re lo ro karce</quote>), can have relative clauses attached; these are taken to be of the outside-the-
+    <quote>re lo ro karce</quote>), can have relative clauses attached; these are taken to be of the outside-the- 
     <quote>ku</quote>variety. Here is an example:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-J11I">
       <title>
         <anchor xml:id="c8e6d12" />
         <anchor xml:id="cll_chapter8-section6-example12" />
       </title>
       <interlinear-gloss>
         <jbo>mi ponse re karce [ku] poi xekri</jbo>
         <en>I possess two cars which-are black.</en>
       </interlinear-gloss>
@@ -1000,23 +1051,27 @@
     <para>Note that 
     <xref linkend="cll_chapter8-section7-example6" />uses 
     <quote>vau</quote>rather than 
     <quote>ku'o</quote>at the end of the relative clause: this terminator ends every simple bridi and is almost always elidable; in this case, though, it is a syllable shorter than the equally valid alternative, 
     <quote>ku'o</quote>.</para>
   </section>
   <section xml:id="cll_chapter8-section8">
     <title>8. Relative clauses and complex sumti: 
     <quote>vu'o</quote></title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     vu'o    VUhO                relative clause attacher
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>vu'o</cmavo>
+        <selmaho>VUhO</selmaho>
+        <description>relative clause attacher</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Normally, relative clauses attach only to simple sumti or parts of sumti: pro-sumti, names and descriptions, pure numbers, and quotations. An example of a relative clause attached to a pure number is:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-sfHA">
       <title>
         <anchor xml:id="c8e8d1" />
         <anchor xml:id="cll_chapter8-section8-example1" />
       </title>
       <interlinear-gloss>
         <jbo>li pai noi na'e frinu namcu</jbo>
         <gloss>The-number pi, incidentally-which is-a-non- fraction number</gloss>
         <en>The irrational number pi</en>
@@ -1114,21 +1169,21 @@
     <para>English is able to resolve the distinction correctly in the case of 
     <xref linkend="cll_chapter8-section8-example5" />and 
     <xref linkend="cll_chapter8-section8-example6" />by making use of number: 
     <quote>who is</quote>rather than 
     <quote>who are</quote>. Lojban doesn't distinguish between singular and plural verbs: 
     <quote>nanmu</quote>can mean 
     <quote>is a man</quote>or 
     <quote>are men</quote>, so another means is required. Furthermore, Lojban's mechanism works correctly in general: if 
     <quote>nanmu</quote>(meaning 
     <quote>is-a-man</quote>) were replaced with 
-    <quote>pu bajra</quote>(
+    <quote>pu bajra</quote>( 
     <quote>ran</quote>), English would have to make the distinction some other way:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-BSqz">
       <title>
         <anchor xml:id="c8e8d7" />
         <anchor xml:id="cll_chapter8-section8-example7" />
         <anchor xml:id="c8e8d8" />
         <anchor xml:id="cll_chapter8-section8-example8" />
       </title>
       <interlinear-gloss>
         <jbo>la frank. .e la djordj. noi pu bajra cu klama le zdani</jbo>
diff --git a/todocbook/9.xml b/todocbook/9.xml
index 57d5c57..dee4c77 100644
--- a/todocbook/9.xml
+++ b/todocbook/9.xml
@@ -17,23 +17,27 @@
 </programlisting>
     <para>The 
     <quote>x1 ... x5</quote>indicates that 
     <quote>klama</quote>is a five-place predicate, and show the natural order (as assigned by the language engineers) of those places: agent, destination, origin, route, means.</para>
     <para>The place structures of brivla are not absolutely stable aspects of the language. The work done so far has attempted to establish a basic place structure on which all users can, at first, agree. In the light of actual experience with the individual selbri of the language, there will inevitably be some degree of change to the brivla place structures.</para>
   </section>
   <section xml:id="cll_chapter9-section2">
     <title>2. Standard bridi form: 
     <quote>cu</quote></title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     cu      CU                  prefixed selbri separator
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>cu</cmavo>
+        <selmaho>CU</selmaho>
+        <description>prefixed selbri separator</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>The most usual way of constructing a bridi from a selbri such as 
     <quote>klama</quote>and an appropriate number of sumti is to place the sumti intended for the x1 place before the selbri, and all the other sumti in order after the selbri, thus:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-Ji94">
       <title>
         <anchor xml:id="c9e2d1" />
         <anchor xml:id="cll_chapter9-section2-example1" />
       </title>
       <interlinear-gloss>
         <jbo>mi cu klama la bastn. la .atlantas. le dargu le karce</jbo>
         <en>I go to-Boston from-Atlanta via-the road using-the car.</en>
@@ -146,28 +150,52 @@
       </interlinear-gloss>
     </example>
     <para>Here the sumti cmavo 
     <quote>zo'e</quote>is used to explicitly fill the x4 place; 
     <quote>zo'e</quote>means 
     <quote>the unspecified thing</quote>and has the same meaning as leaving the place empty: the listener must infer the correct meaning from context.</para>
   </section>
   <section xml:id="cll_chapter9-section3">
     <title>3. Tagging places: FA</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     fa      FA                  tags x1 place
-     fe      FA                  tags x2 place
-     fi      FA                  tags x3 place
-     fo      FA                  tags x4 place
-     fu      FA                  tags x5 place
-     fi'a    FA                  place structure question
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>fa</cmavo>
+        <selmaho>FA</selmaho>
+        <description>tags x1 place</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>fe</cmavo>
+        <selmaho>FA</selmaho>
+        <description>tags x2 place</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>fi</cmavo>
+        <selmaho>FA</selmaho>
+        <description>tags x3 place</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>fo</cmavo>
+        <selmaho>FA</selmaho>
+        <description>tags x4 place</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>fu</cmavo>
+        <selmaho>FA</selmaho>
+        <description>tags x5 place</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>fi'a</cmavo>
+        <selmaho>FA</selmaho>
+        <description>place structure question</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>In sentences like 
     <xref linkend="cll_chapter9-section2-example1" />, it is easy to get lost and forget which sumti falls in which place, especially if the sumti are more complicated than simple names or descriptions. The place structure tags of selma'o FA may be used to help clarify place structures. The five cmavo 
     <quote>fa</quote>, 
     <quote>fe</quote>, 
     <quote>fi</quote>, 
     <quote>fo</quote>, and 
     <quote>fu</quote>may be inserted just before the sumti in the x1 to x5 places respectively:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-yLop">
       <title>
         <anchor xml:id="c9e3d1" />
@@ -357,26 +385,42 @@
     <xref linkend="cll_chapter9-section3-example10" />, but it is actually not necessary, because 
     <quote>fi'a</quote>does not count as a numeric tag; therefore, 
     <quote>le vi rozgu</quote>would necessarily be in the x2 place even if no tag were present, because it immediately follows the selbri.</para>
     <para>There is also another member of FA, namely 
     <quote>fai</quote>, which is discussed in 
     <xref linkend="cll_chapter9-section12" />.</para>
   </section>
   <section xml:id="cll_chapter9-section4">
     <title>4. Conversion: SE</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     se      SE                  2nd place conversion
-     te      SE                  3rd place conversion
-     ve      SE                  4th place conversion
-     xe      SE                  5th place conversion
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>se</cmavo>
+        <selmaho>SE</selmaho>
+        <description>2nd place conversion</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>te</cmavo>
+        <selmaho>SE</selmaho>
+        <description>3rd place conversion</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ve</cmavo>
+        <selmaho>SE</selmaho>
+        <description>4th place conversion</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>xe</cmavo>
+        <selmaho>SE</selmaho>
+        <description>5th place conversion</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>So far we have seen ways to move sumti around within a bridi, but the actual place structure of the selbri has always remained untouched. The conversion cmavo of selma'o SE are incorporated within the selbri itself, and produce a new selbri (called a converted selbri) with a different place structure. In particular, after the application of any SE cmavo, the number and purposes of the places remain the same, but two of them have been exchanged, the x1 place and another. Which place has been exchanged with x1 depends on the cmavo chosen. Thus, for example, when 
     <quote>se</quote>is used, the x1 place is swapped with the x2 place.</para>
     <para>Note that the cmavo of SE begin with consecutive consonants in alphabetical order. There is no 
     <quote>1st place conversion</quote>cmavo, because exchanging the x1 place with itself is a pointless maneuver.</para>
     <para>Here are the place structures of 
     <quote>se klama</quote>:</para>
     <programlisting xml:space="preserve">
        x1 is the destination of x2's going from x3 via x4 using x5
 </programlisting>
     <para>and 
@@ -526,24 +570,32 @@
     <para>(Although no one has made any real use of it, it is perhaps worth noting that compound conversions of the form 
     <quote>setese</quote>, where the first and third cmavo are the same, effectively swap the two given places while leaving the others, including x1, alone: 
     <quote>setese</quote>(or equivalently 
     <quote>tesete</quote>) swap the x2 and x3 places, whereas 
     <quote>texete</quote>(or 
     <quote>xetexe</quote>) swap the x3 and x5 places.)</para>
   </section>
   <section xml:id="cll_chapter9-section5">
     <title>5. Modal places: FIhO, FEhU</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     fi'o    FIhO                modal place prefix
-     fe'u    FEhU                modal terminator
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>fi'o</cmavo>
+        <selmaho>FIhO</selmaho>
+        <description>modal place prefix</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>fe'u</cmavo>
+        <selmaho>FEhU</selmaho>
+        <description>modal terminator</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Sometimes the place structures engineered into Lojban are inadequate to meet the needs of actual speech. Consider the gismu 
     <quote>viska</quote>, whose place structure is:</para>
     <programlisting xml:space="preserve">
        viska: x1 sees x2 under conditions x3
 </programlisting>
     <para>Seeing is a threefold relationship, involving an agent (le viska), an object of sight (le se viska), and an environment that makes seeing possible (le te viska). Seeing is done with one or more eyes, of course; in general, the eyes belong to the entity in the x1 place.</para>
     <para>Suppose, however, that you are blind in one eye and are talking to someone who doesn't know that. You might want to say, 
     <quote>I see you with the left eye.</quote>There is no place in the place structure of 
     <quote>viska</quote>such as 
     <quote>with eye x4</quote>or the like. Lojban allows you to solve the problem by adding a new place, changing the relationship:</para>
@@ -667,21 +719,21 @@
       <title>
         <anchor xml:id="c9e6d2" />
         <anchor xml:id="cll_chapter9-section6-example2" />
       </title>
       <interlinear-gloss>
         <jbo>la .eivn. cu vecnu loi flira cinta ka'a mi</jbo>
         <gloss>Avon sells a-mass-of face paint with-goer me.</gloss>
         <en>I am a traveling cosmetics salesperson for Avon.</en>
       </interlinear-gloss>
     </example>
-    <para>(
+    <para>( 
     <xref linkend="cll_chapter9-section6-example2" />may seem a bit strained, but it illustrates the way in which an existing selbri, 
     <quote>vecnu</quote>in this case, may have a place added to it which might otherwise seem utterly unrelated.)</para>
     <example role="interlinear-gloss-example" xml:id="random-id-sE2t">
       <title>
         <anchor xml:id="c9e6d3" />
         <anchor xml:id="cll_chapter9-section6-example3" />
         <anchor xml:id="c9e6d4" />
         <anchor xml:id="cll_chapter9-section6-example4" />
         <anchor xml:id="c9e6d5" />
         <anchor xml:id="cll_chapter9-section6-example5" />
@@ -727,26 +779,42 @@
     <quote>nanmu</quote>, but its exact significance is vague, and is paralleled in the colloquial translation by the vague English preposition 
     <quote>of</quote>. 
     <xref linkend="cll_chapter9-section6-example7" />also illustrates a modal place bound into a selbri with 
     <quote>be</quote>. This construction is useful when the selbri of a description requires a modal place; this and other uses of 
     <quote>be</quote>are more fully explained in 
     <xref linkend="cll_chapter5" />.</para>
   </section>
   <section xml:id="cll_chapter9-section7">
     <title>7. Modal sentence connection: the causals</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ri'a    BAI                 rinka modal: physical cause
-     ki'u    BAI                 krinu modal: justification
-     mu'i    BAI                 mukti modal: motivation
-     ni'i    BAI                 nibli modal: logical entailment
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ri'a</cmavo>
+        <selmaho>BAI</selmaho>
+        <description>rinka modal: physical cause</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ki'u</cmavo>
+        <selmaho>BAI</selmaho>
+        <description>krinu modal: justification</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>mu'i</cmavo>
+        <selmaho>BAI</selmaho>
+        <description>mukti modal: motivation</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ni'i</cmavo>
+        <selmaho>BAI</selmaho>
+        <description>nibli modal: logical entailment</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>This section has two purposes. On the one hand, it explains the grammatical construct called 
     <quote>modal sentence connection</quote>. On the other, it exemplifies some of the more useful BAI cmavo: the causals. (There are other BAI cmavo which have causal implications: 
     <quote>ja'e</quote>means 
     <quote>with result</quote>, and so 
     <quote>seja'e</quote>means 
     <quote>with cause of unspecified nature</quote>; likewise, 
     <quote>gau</quote>means 
     <quote>with agent</quote>and 
     <quote>tezu'e</quote>means 
     <quote>with purpose</quote>. These other modal cmavo will not be further discussed here, as my purpose is to explain modal sentence connection rather than Lojbanic views of causation.)</para>
@@ -1093,21 +1161,21 @@
     <example role="interlinear-gloss-example" xml:id="random-id-Qc8w">
       <title>
         <anchor xml:id="c9e9d3" />
         <anchor xml:id="cll_chapter9-section9-example3" />
       </title>
       <interlinear-gloss>
         <jbo>mi tavla bau [ku] bai tu'a la frank.</jbo>
         <en>I speak in-some-language under-compulsion-by some-act-by Frank.</en>
       </interlinear-gloss>
     </example>
-    <para>We are also free to move the modal-plus-
+    <para>We are also free to move the modal-plus- 
     <quote>ku</quote>around the bridi:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-2utY">
       <title>
         <anchor xml:id="c9e9d4" />
         <anchor xml:id="cll_chapter9-section9-example4" />
       </title>
       <interlinear-gloss>
         <jbo>bau [ku] bai ku mi tavla</jbo>
         <en>In-some-language under-compulsion I speak.</en>
       </interlinear-gloss>
@@ -1192,26 +1260,42 @@
       </interlinear-gloss>
     </example>
     <para>means the same thing as 
     <xref linkend="cll_chapter9-section9-example8" />.</para>
     <para>Note: Either BAI modals or 
     <quote>fi'o</quote>-plus-selbri modals may correctly be used in any of the constructions discussed in this section.</para>
   </section>
   <section xml:id="cll_chapter9-section10">
     <title>10. Modal relative phrases; Comparison</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     pe      GOI                 restrictive relative phrase
-     ne      GOI                 incidental relative phrase
-     mau     BAI                 zmadu modal
-     me'a    BAI                 mleca modal
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>pe</cmavo>
+        <selmaho>GOI</selmaho>
+        <description>restrictive relative phrase</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>ne</cmavo>
+        <selmaho>GOI</selmaho>
+        <description>incidental relative phrase</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>mau</cmavo>
+        <selmaho>BAI</selmaho>
+        <description>zmadu modal</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>me'a</cmavo>
+        <selmaho>BAI</selmaho>
+        <description>mleca modal</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Relative phrases and clauses are explained in much more detail in 
     <xref linkend="cll_chapter8" />. However, there is a construction which combines a modal with a relative phrase which is relevant to this chapter. Consider the following examples of relative clauses:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-vuYy">
       <title>
         <anchor xml:id="c9e10d1" />
         <anchor xml:id="cll_chapter9-section10-example1" />
         <anchor xml:id="c9e10d2" />
         <anchor xml:id="cll_chapter9-section10-example2" />
       </title>
       <interlinear-gloss>
@@ -1323,21 +1407,21 @@
     <quote>semau</quote>, and 
     <xref linkend="cll_chapter9-section10-example8" />using 
     <quote>mau</quote>rather than 
     <quote>seme'a</quote>, but such usage would be unnecessarily confusing. Like many BAI cmavo, 
     <quote>mau</quote>and 
     <quote>me'a</quote>are more useful when converted with 
     <quote>se</quote>.</para>
     <para>If the 
     <quote>ne</quote>were omitted in 
     <xref linkend="cll_chapter9-section10-example7" />and 
-    <xref linkend="cll_chapter9-section10-example8" />, the modal sumti (
+    <xref linkend="cll_chapter9-section10-example8" />, the modal sumti ( 
     <quote>la meiris.</quote>and 
     <quote>la betis.</quote>respectively) would become attached to the bridi as a whole, producing a very different translation. 
     <xref linkend="cll_chapter9-section10-example8" />would become:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-5QHA">
       <title>
         <anchor xml:id="c9e10d9" />
         <anchor xml:id="cll_chapter9-section10-example9" />
       </title>
       <interlinear-gloss>
         <jbo>la frank. nelci la meiris. seme'a la betis.</jbo>
@@ -1355,27 +1439,27 @@
       <interlinear-gloss>
         <jbo>le ni la frank. nelci la betis. cu zmadu</jbo>
         <gloss>le ni la frank. nelci la meiris.</gloss>
         <gloss>The quantity-of Frank's liking Betty is-more-than</gloss>
         <en>the quantity-of Frank's liking Mary.</en>
       </interlinear-gloss>
     </example>
     <para>The mechanisms explained in this section are appropriate to many modals other than 
     <quote>semau</quote>and 
     <quote>seme'a</quote>. Some other modals that are often associated with relative phrases are: 
-    <quote>seba'i</quote>(
+    <quote>seba'i</quote>( 
     <quote>instead of</quote>), 
-    <quote>ci'u</quote>(
+    <quote>ci'u</quote>( 
     <quote>on scale</quote>), 
-    <quote>de'i</quote>(
+    <quote>de'i</quote>( 
     <quote>dated</quote>), 
-    <quote>du'i</quote>(
+    <quote>du'i</quote>( 
     <quote>as much as</quote>). Some BAI tags can be used equally well in relative phrases or attached to bridi; others seem useful only attached to bridi. But it is also possible that the usefulness of particular BAI modals is an English-speaker bias, and that speakers of other languages may find other BAIs useful in divergent ways.</para>
     <para>Note: The uses of modals discussed in this section are applicable both to BAI modals and to 
     <quote>fi'o</quote>-plus-selbri modals.</para>
   </section>
   <section xml:id="cll_chapter9-section11">
     <title>11. Mixed modal connection</title>
     <para>It is possible to mix logical connection (explained in 
     <xref linkend="cll_chapter14" />) with modal connection, in a way that simultaneously asserts the logical connection and the modal relationship. Consider the sentences:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-4qz4">
       <title>
@@ -1484,24 +1568,32 @@
     <quote>tu'e ... tu'u</quote>portion was an effect, but would not pin down the 
     <quote>mi bevri le dakli</quote>portion as the cause. It is legal for a modal (or a tense; see 
     <xref linkend="cll_chapter10" />) to modify the whole of a 
     <quote>tu'e ... tu'u</quote>construct.</para>
     <para>Note: The uses of modals discussed in this section are applicable both to BAI modals and to 
     <quote>fi'o</quote>-plus-selbri modals.</para>
   </section>
   <section xml:id="cll_chapter9-section12">
     <title>12. Modal conversion: JAI</title>
     <para>The following cmavo are discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     jai     JAI                 modal conversion
-     fai     FA                  modal place structure tag
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>jai</cmavo>
+        <selmaho>JAI</selmaho>
+        <description>modal conversion</description>
+      </cmavo-entry>
+      <cmavo-entry>
+        <cmavo>fai</cmavo>
+        <selmaho>FA</selmaho>
+        <description>modal place structure tag</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>So far, conversion of numbered bridi places with SE and the addition of modal places with BAI have been two entirely separate operations. However, it is possible to convert a selbri in such a way that, rather than exchanging two numbered places, a modal place is made into a numbered place. For example,</para>
     <example role="interlinear-gloss-example" xml:id="random-id-KMMX">
       <title>
         <anchor xml:id="c9e12d1" />
         <anchor xml:id="cll_chapter9-section12-example1" />
       </title>
       <interlinear-gloss>
         <jbo>mi cusku bau la lojban.</jbo>
         <en>I express [something] in-language Lojban.</en>
       </interlinear-gloss>
@@ -1601,23 +1693,27 @@
     <para>
     <xref linkend="cll_chapter9-section13-example2" />says that the relationship between the plant's growth and your watering it is not one of motivation: the plant is not motivated to grow, as plants are not something which can have motivation as a rule. Implicitly, some other relationship between watering and growth exists, but 
     <xref linkend="cll_chapter9-section13-example2" />doesn't say what it is (presumably 
     <quote>ri'a</quote>).</para>
     <para>Note: Modals made with 
     <quote>fi'o</quote>plus a selbri cannot be negated directly. The selbri can itself be negated either with contradictory or with scalar negation, however.</para>
   </section>
   <section xml:id="cll_chapter9-section14">
     <title>14. Sticky modals</title>
     <para>The following cmavo is discussed in this section:</para>
-    <programlisting xml:space="preserve">
-     ki      KI                  stickiness flag
-</programlisting>
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ki</cmavo>
+        <selmaho>KI</selmaho>
+        <description>stickiness flag</description>
+      </cmavo-entry>
+    </cmavo-list>
     <para>Like tenses, modals can be made persistent from the bridi in which they appear to all following bridi. The effect of this 
     <quote>stickiness</quote>is to make the modal, along with its following sumti, act as if it appeared in every successive bridi. Stickiness is put into effect by following the modal (but not any following sumti) with the cmavo 
     <quote>ki</quote>of selma'o KI. For example,</para>
     <example role="interlinear-gloss-example" xml:id="random-id-1UGf">
       <title>
         <anchor xml:id="c9e14d1" />
         <anchor xml:id="cll_chapter9-section14-example1" />
       </title>
       <interlinear-gloss>
         <jbo>mi tavla bau la lojban. bai ki tu'a la frank.</jbo>
@@ -1639,21 +1735,21 @@
         <gloss>I speak in-language Lojban compelled-by some-property-of Frank.</gloss>
         <gloss>Afterward, I speak in-language English</gloss>
         <en>compelled-by some-property-of Frank.</en>
       </interlinear-gloss>
     </example>
     <para>In 
     <xref linkend="cll_chapter9-section14-example1" />, 
     <quote>bai</quote>is made sticky, and so Frank's compelling is made applicable to every following bridi. 
     <quote>bau</quote>is not sticky, and so the language may vary from bridi to bridi, and if not specified in a particular bridi, no assumption can safely be made about its value.</para>
     <para>To cancel stickiness, use the form 
-    <quote>BAI ki ku</quote>, which stops any modal value for the specified BAI from being passed to the next bridi. To cancel stickiness for all modals simultaneously, and also for any sticky tenses that exist (
+    <quote>BAI ki ku</quote>, which stops any modal value for the specified BAI from being passed to the next bridi. To cancel stickiness for all modals simultaneously, and also for any sticky tenses that exist ( 
     <quote>ki</quote>is used for both modals and tenses), use 
     <quote>ki</quote>by itself, either before the selbri or (in the form 
     <quote>ki ku</quote>) anywhere in the bridi:</para>
     <example role="interlinear-gloss-example" xml:id="random-id-sYdo">
       <title>
         <anchor xml:id="c9e14d3" />
         <anchor xml:id="cll_chapter9-section14-example3" />
       </title>
       <interlinear-gloss>
         <jbo>mi ki tavla</jbo>
@@ -1696,21 +1792,21 @@
         <en>Frank runs with-destination the house [joined-to] with-origin the-house.</en>
       </interlinear-gloss>
     </example>
     <para>The cmavo 
     <quote>ce'e</quote>creates a termset containing two terms (termsets are explained in 
     <xref linkend="cll_chapter14" />and 
     <xref linkend="cll_chapter16" />). When a termset contains more than one modal tag derived from a single BAI, the convention is that the two tags are derived from a common event.</para>
   </section>
   <section xml:id="cll_chapter9-section16">
     <title>16. CV'V cmavo of selma'o BAI with irregular forms</title>
-    <para>There are 65 cmavo of selma'o BAI, of which all but one (
+    <para>There are 65 cmavo of selma'o BAI, of which all but one ( 
     <quote>do'e</quote>, discussed in 
     <xref linkend="cll_chapter9-section6" />), are derived directly from selected gismu. Of these 64 cmavo, 36 are entirely regular and have the form CV'V, where C is the first consonant of the corresponding gismu, and the Vs are the two vowels of the gismu. The remaining BAI cmavo, which are irregular in one way or another, are listed in the table below. The table is divided into sub-tables according to the nature of the exception; some cmavo appear in more than one sub-table, and are so noted.</para>
     <programlisting xml:space="preserve">
    cmavo    gismu        comments
 
     Monosyllables of the form CVV:
 
     bai     bapli
     bau     bangu
     cau     claxu
@@ -1761,21 +1857,22 @@
   <section xml:id="cll_chapter9-section17">
     <title>17. Complete table of BAI cmavo with rough English equivalents</title>
     <para>The following table shows all the cmavo belonging to selma'o BAI, and has five columns. The first column is the cmavo itself; the second column is the gismu linked to it. The third column gives an English phrase which indicates the meaning of the cmavo; and the fourth column indicates its meaning when preceded by 
     <quote>se</quote>.</para>
     <para>For those cmavo with meaningful 
     <quote>te</quote>, 
     <quote>ve</quote>, and even 
     <quote>xe</quote>conversions (depending on the number of places of the underlying gismu), the meanings of these are shown on one or two extra rows following the primary row for that cmavo.</para>
     <para>It should be emphasized that the place structures of the gismu control the meanings of the BAI cmavo. The English phrases shown here are only suggestive, and are often too broad or too narrow to correctly specify what the acceptable range of uses for the modal tag are.</para>
     <programlisting xml:space="preserve">
-    ba'i    basti   replaced by                    instead of
+    ba'i    basti   replaced by                    instead of 
+<!-- skip cmavo list automation -->
     bai     bapli   compelled by                   compelling
     bau     bangu   in language                    in language of
     be'i    benji   sent by                        transmitting
                     te=sent to                     ve=with transmit origin
                     xe=transmitted via
     ca'i    catni   by authority of                with authority over
     cau     claxu   lacked by                      without
     ci'e    ciste   in system                      with system function
                     te=of system components
     ci'o    cinmo   felt by                        feeling emotion
diff --git a/todocbook/Makefile b/todocbook/Makefile
index 3e0b4ea..b98915b 100644
--- a/todocbook/Makefile
+++ b/todocbook/Makefile
@@ -1,25 +1,25 @@
 
 web: html/index.html
-	cp docbook2html.css html
+	cp docbook2html.css html/
 	rm -rf ~/www/public_media/docbook-cll-test
 	cp -pr html ~/www/public_media/docbook-cll-test
 
 html/index.html: cll.xml
 	xsltproc --path . --novalid docbook2html_preprocess.xsl cll.xml > cll_postproc.xml
 	xmlto -m docbook2html_config.xsl -o html/ html cll_postproc.xml 2>&1 | grep -v 'No localization exists for "jbo" or "". Using default "en".'
 
 cll.xml: 1.xml 2.xml 3.xml 4.xml 5.xml 6.xml 7.xml 8.xml 9.xml 10.xml 11.xml 12.xml 13.xml 14.xml 15.xml 16.xml 17.xml 18.xml 19.xml 20.xml 21.xml
 	merge.sh
 
 webt: webt.touch
-	cp docbook2html.css html
+	cp docbook2html.css html/
 	rm -rf ~/www/public_media/docbook-cll-test
 	cp -pr html ~/www/public_media/docbook-cll-test
 	touch webt.touch
 
 webt.touch: testing.xml
 	xsltproc --path . --novalid docbook2html_preprocess.xsl testing.xml > testing2.xml
 	xmlto -m docbook2html_config.xsl -o html/ html testing2.xml
 
 me: testing.xml
 	xsltproc --path . --novalid make_examples.xsl testing.xml | \
diff --git a/todocbook/README b/todocbook/README
index b64f600..29aac60 100644
--- a/todocbook/README
+++ b/todocbook/README
@@ -62,11 +62,17 @@ There is now a
   
 to do all the steps to turn the N.xml files into html/.  There is
 actually an extra XSLT preprocessing step now.  The makefile relies
 on:
 
        docbook2html.css
        docbook2html_config.xsl
        docbook2html_preprocess.xsl
        identity.xsl
 
+The third pass was pretty limited, and was basically just:
 
+       make_cmavo.pl
+       massage2.sh
+
+(with the .orig trick as above).  It create the <cmavo-list>
+entries.
diff --git a/todocbook/docbook2html_preprocess.xsl b/todocbook/docbook2html_preprocess.xsl
index 0209d89..70c5eaa 100644
--- a/todocbook/docbook2html_preprocess.xsl
+++ b/todocbook/docbook2html_preprocess.xsl
@@ -6,52 +6,69 @@
   version="1.0">
 
   <!-- Import the identity transformation. -->
   <xsl:import href="identity.xsl"/>
 
   <xsl:output method="xml" doctype-system="dtd/docbook-5.0.dtd" doctype-public="-//OASIS//DTD DocBook XML V5.0//EN" />
 
   <xsl:template name="counted_table">
     <xsl:param name="maximal" select="''"/>
     <xsl:param name="items" select="''"/>
-    <informaltable> <xsl:text>&#10;</xsl:text>
+    <informaltable>
       <tgroup>
         <xsl:attribute name="cols">
           <xsl:value-of select="count(str:tokenize($maximal))"/>
         </xsl:attribute>
         <xsl:for-each select="str:tokenize($maximal)">
           <colspec>
             <xsl:attribute name="colname">
               <xsl:value-of select="concat('col',position())"/>
             </xsl:attribute>
-          </colspec> <xsl:text>&#10;</xsl:text>
+          </colspec>
         </xsl:for-each>
-        <tbody> <xsl:text>&#10;</xsl:text>
+        <tbody>
           <xsl:for-each select="$items/jbo">
-            <row> <xsl:text>&#10;</xsl:text>
+            <row>
               <xsl:for-each select="str:tokenize(.)">
-                <entry><xsl:value-of select="."/></entry> <xsl:text>&#10;</xsl:text>
+                <entry><xsl:value-of select="."/></entry>
               </xsl:for-each>
             </row>
           </xsl:for-each>
           <xsl:for-each select="$items/gloss">
-            <row> <xsl:text>&#10;</xsl:text>
+            <row>
               <xsl:for-each select="str:tokenize(.)">
-                <entry><xsl:value-of select="."/></entry> <xsl:text>&#10;</xsl:text>
+                <entry><xsl:value-of select="."/></entry>
               </xsl:for-each>
             </row>
           </xsl:for-each>
           <xsl:for-each select="$items/en">
             <xsl:variable name="startcol" select="concat('col',1)" />
             <xsl:variable name="endcol" select="concat('col',count(str:tokenize($maximal)))" />
-            <row> <xsl:text>&#10;</xsl:text>
-              <entry namest="{$startcol}" nameend="{$endcol}"><xsl:value-of select="."/></entry> <xsl:text>&#10;</xsl:text>
+            <row>
+              <entry namest="{$startcol}" nameend="{$endcol}"><xsl:value-of select="."/></entry>
+            </row>
+          </xsl:for-each>
+        </tbody>
+      </tgroup>
+    </informaltable>
+  </xsl:template>
+
+  <!-- Turn cmavo-list nodes into tables. -->
+  <xsl:template match="cmavo-list">
+    <informaltable>
+      <tgroup cols="3">
+        <tbody>
+          <xsl:for-each select=".//cmavo-entry">
+            <row>
+              <xsl:for-each select="cmavo|selmaho|description">
+                <entry><xsl:value-of select="."/></entry>
+              </xsl:for-each>
             </row>
           </xsl:for-each>
         </tbody>
       </tgroup>
     </informaltable>
   </xsl:template>
 
   <!-- Turn interlinear-gloss nodes into tables.
 
         Such a node must have at least one jbo entry and at least one en entry.
diff --git a/todocbook/make_cmavo.pl b/todocbook/make_cmavo.pl
new file mode 100755
index 0000000..9e41eb3
--- /dev/null
+++ b/todocbook/make_cmavo.pl
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+
+local $/=undef;
+my $string = <STDIN>;
+close STDIN;
+
+$string =~ s{<programlisting\s*[^>]*>([^<]+)</programlisting>}{
+#print "1: $1\n";
+
+my $matched=0;
+my $crap='';
+foreach my $line (split /\n/, $1) {
+$line =~ s{^\s+}{};
+$line =~ s{\s+$}{};
+if( $line =~ m{^.+\s\s\s\s+\S+.*\s\s\s\s+.+$} ) {
+$matched=1;
+my $newline = $line;
+$newline =~ s{^(.+\S+)\s\s\s\s+(\S+)\s\s\s\s+(.+)$}{<cmavo-entry><cmavo>\1</cmavo><selmaho>\2</selmaho><description>\3</description></cmavo-entry>};
+$crap .= $newline;
+};
+};
+if( $matched ) {
+"<cmavo-list>\n".
+"$crap\n".
+"</cmavo-list>\n";
+} else {
+$&;
+}
+}egs;
+
+print $string;
diff --git a/todocbook/massage2.sh b/todocbook/massage2.sh
new file mode 100755
index 0000000..5a1a090
--- /dev/null
+++ b/todocbook/massage2.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+randnum=0
+
+for file in [0-9]*.xml.orig
+do
+  short=$(echo $file | sed 's/\.orig$//')
+
+  echo "*********************************************************** $short"
+
+  cat $short.orig | make_cmavo.pl | \
+    tidy -config massage.tidy -xml - | \
+    sed -e '/xml version/d' -e '/DOCTYPE book PUBLIC/d' -e '/docbook-5.0.dtd/d' > $short
+
+done

-- 
You received this message because you are subscribed to the Google Groups "BPFK" group.
To post to this group, send email to bpfk-list@googlegroups.com.
To unsubscribe from this group, send email to bpfk-list+unsubscribe@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/bpfk-list?hl=en.