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

[bpfk] dag-cll git updates for Tue Feb 1 00:21:04 EST 2011



commit d2bca4773464f37e9a59fd3921a9bb52de1f254c
Merge: 9d59de4 5d600cf
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date:   Mon Jan 31 20:19:17 2011 -0800

    Merge commit '5d600cf692c0549d9209a32856ce534598f2e6da' into gh-pages

commit 5d600cf692c0549d9209a32856ce534598f2e6da
Author: Eitan Postavsky <eitanp32@gmail.com>
Date:   Sat Jan 8 18:09:05 2011 -0500

    Fixed previous mistakes, namely english examples and hyphens outside jbophrases.

diff --git a/todocbook/4.xml b/todocbook/4.xml
index bc4fef7..6e207d2 100644
--- a/todocbook/4.xml
+++ b/todocbook/4.xml
@@ -621,22 +621,22 @@
       <title>
         <anchor xml:id="c4e5d7"/>
       </title>
       <lujvo>
         <jbo>mampa'u</jbo>
       </lujvo>
     </example>
     <para>which refers specifically to the concept 
     <quote>maternal grandfather</quote>. The two gismu that constitute the tanru are represented in 
     <jbophrase>mampa'u</jbophrase> by the rafsi 
-    <jbophrase role="rafsi">mam</jbophrase>- and 
-    -<jbophrase role="rafsi">pa'u</jbophrase>, respectively; these two rafsi are then concatenated together to form 
+    <jbophrase role="rafsi">mam-</jbophrase> and 
+    <jbophrase role="rafsi">-pa'u</jbophrase>, respectively; these two rafsi are then concatenated together to form 
     <jbophrase>mampa'u</jbophrase>.</para>
     <para> <indexterm type="general-imported"><primary>long rafsi form</primary><secondary>compared with short form in effect on lujvo meaning</secondary></indexterm>  <indexterm type="general-imported"><primary>short rafsi form</primary><secondary>compared with long form in effect on lujvo meaning</secondary></indexterm>  <indexterm type="general-imported"><primary>rafsi form</primary><secondary>effect of choice on meaning of lujvo</secondary></indexterm>  <indexterm type="general-imported"><primary>lujvo</primary><secondary>multiple forms of</secondary></indexterm>  <indexterm type="general-imported"><primary>lujvo</primary><secondary>meaning of</secondary></indexterm> Like gismu, lujvo have only one meaning. When a lujvo is formally entered into a dictionary of the language, a specific definition will be assigned based on one particular interrelationship between the terms. (See 
     <xref linkend="chapter-lujvo"/> for how this has been done.) Unlike gismu, lujvo may have more than one form. This is because there is no difference in meaning between the various rafsi for a gismu when they are used to build a lujvo. A long rafsi may be used, especially in noisy environments, in place of a short rafsi; the result is considered the same lujvo, even though the word is spelled and pronounced differently. Thus the word 
     
     
     <jbophrase>brivla</jbophrase>, built from the tanru 
     <jbophrase>bridi valsi</jbophrase>, is the same lujvo as 
     <jbophrase>brivalsi</jbophrase>, 
     <jbophrase>bridyvla</jbophrase>, and 
     <jbophrase>bridyvalsi</jbophrase>, each of which uses a different combination of rafsi.</para>
@@ -657,22 +657,22 @@
         <anchor xml:id="c4e5d8"/>
       </title>
       <lujvo>
         <jbo>soirsai</jbo>
         <veljvo>sonci sanmi</veljvo>
         <gloss>soldier meal</gloss>
         <en>field rations</en>
       </lujvo>
     </example>
     <para>   <indexterm type="general-imported"><primary>cmavo</primary><secondary>contrasted with same-form rafsi in meaning</secondary></indexterm>  <indexterm type="general-imported"><primary>rafsi</primary><secondary>contrasted with same-form cmavo in meaning</secondary></indexterm> the rafsi 
-    <jbophrase role="rafsi">soi</jbophrase>- and 
-    -<jbophrase role="rafsi">sai</jbophrase> are joined, with the additional 
+    <jbophrase role="rafsi">soi-</jbophrase> and 
+    <jbophrase role="rafsi">-sai</jbophrase> are joined, with the additional 
     
     <jbophrase role="letteral">r</jbophrase> making up the 
     <jbophrase role="morphology">rs</jbophrase> consonant pair needed to make the word a brivla. Without the 
     <jbophrase role="letteral">r</jbophrase>, the word would break up into 
     <jbophrase>soi sai</jbophrase>, two cmavo. The pair of cmavo have no relation to their rafsi lookalikes; they will either be ungrammatical (as in this case), or will express a different meaning from what was intended.</para>
     
     <para>Learning rafsi and the rules for assembling them into lujvo is clearly seen to be necessary for fully using the potential Lojban vocabulary.</para>
     <para> <indexterm type="general-imported"><primary>lujvo</primary><secondary>invention of</secondary></indexterm> Most important, it is possible to invent new lujvo while you speak or write in order to represent a new or unfamiliar concept, one for which you do not know any existing Lojban word. As long as you follow the rules for building these compounds, there is a good chance that you will be understood without explanation.</para>
   </section>
   <section xml:id="section-rafsi">
@@ -772,97 +772,97 @@
     <para> <indexterm type="general-imported"><primary>rafsi</primary><secondary>possible forms for construction of</secondary></indexterm> Here are the only short rafsi forms that can possibly exist for gismu of the form CVC/CV, like <jbophrase>sakli</jbophrase>. The digits in the second column represent the gismu letters used to form the rafsi.</para>
     <informaltable>
       <tgroup cols="3">
         <colspec colnum="1" colname="col1"/>
         <colspec colnum="2" colname="col2"/>
         <colspec colnum="3" colname="col3"/>
         <tbody>
           <row>
             <entry>CVC</entry>
             <entry>123</entry>
-            <entry>-<jbophrase role="rafsi" valid="false">sak</jbophrase>-</entry>
+            <entry>-<jbophrase role="rafsi" valid="false">sak-</jbophrase></entry>
           </row>
           <row>
             <entry>CVC</entry>
             <entry>124</entry>
-            <entry>-<jbophrase role="rafsi">sal</jbophrase>-</entry>
+            <entry><jbophrase role="rafsi">-sal-</jbophrase></entry>
           </row>
           <row>
             <entry>CVV</entry>
             <entry>12'5</entry>
-            <entry>-<jbophrase role="rafsi" valid="false">sa'i</jbophrase>-</entry>
+            <entry>-<jbophrase role="rafsi" valid="false">sa'i-</jbophrase></entry>
             
           </row>
           <row>
             <entry>CVV</entry>
             <entry>125</entry>
-            <entry>-<jbophrase role="rafsi" valid="false">sai</jbophrase>-</entry>
+            <entry>-<jbophrase role="rafsi" valid="false">sai-</jbophrase></entry>
             
           </row>
           <row>
             <entry>CCV</entry>
             <entry>345</entry>
-            <entry>-<jbophrase role="rafsi" valid="false">kli</jbophrase>-</entry>
+            <entry>-<jbophrase role="rafsi" valid="false">kli-</jbophrase></entry>
           </row>
           <row>
             <entry>CCV</entry>
             <entry>132</entry>
-            <entry>-<jbophrase role="rafsi" valid="false">ska</jbophrase>-</entry>
+            <entry>-<jbophrase role="rafsi" valid="false">ska-</jbophrase></entry>
           </row>
         </tbody>
       </tgroup>
     </informaltable>
     <para>(The only actual short rafsi for 
     <jbophrase>sakli</jbophrase> is 
-    -<jbophrase role="rafsi">sal</jbophrase>-.)</para>
+    <jbophrase role="rafsi">-sal-</jbophrase>.)</para>
     <para>For gismu of the form CCVCV, like 
     <jbophrase>blaci</jbophrase>, the only short rafsi forms that can exist are:</para>
     <informaltable>
       <tgroup cols="">
         <colspec colnum="1" colname="col1"/>
         <colspec colnum="2" colname="col2"/>
         <colspec colnum="3" colname="col3"/>
         <tbody>
           <row>
             <entry>CVC</entry>
             <entry>134</entry>
-            <entry>-<jbophrase role="rafsi" valid="false">bac</jbophrase>-</entry>
+            <entry>-<jbophrase role="rafsi" valid="false">bac-</jbophrase></entry>
           </row>
           <row>
             <entry>CVC</entry>
             <entry>234</entry>
             <entry>-<jbophrase role="rafsi" valid="false">lac</jbophrase></entry>
           </row>
           <row>
             <entry>CVV</entry>
             <entry>13'5</entry>
-            <entry>-<jbophrase role="rafsi" valid="false">ba'i</jbophrase>-</entry>
+            <entry>-<jbophrase role="rafsi" valid="false">ba'i-</jbophrase></entry>
           </row>
           <row>
             <entry>CVV</entry>
             <entry>135</entry>
-            <entry>-<jbophrase role="rafsi" valid="false">bai</jbophrase>-</entry>
+            <entry>-<jbophrase role="rafsi" valid="false">bai-</jbophrase></entry>
           </row>
           <row>
             <entry>CVV</entry>
             <entry>23'5</entry>
-            <entry>-<jbophrase role="rafsi" valid="false">la'i</jbophrase>-</entry>
+            <entry>-<jbophrase role="rafsi" valid="false">la'i-</jbophrase></entry>
           </row>
           <row>
             <entry>CVV</entry>
             <entry>235</entry>
-            <entry>-<jbophrase role="rafsi" valid="false">lai</jbophrase>-</entry>
+            <entry>-<jbophrase role="rafsi" valid="false">lai-</jbophrase></entry>
           </row>
           <row>
             <entry>CCV</entry>
             <entry>123</entry>
-            <entry>-<jbophrase role="rafsi" valid="false">bla</jbophrase>-</entry>
+            <entry>-<jbophrase role="rafsi" valid="false">bla-</jbophrase></entry>
           </row>
         </tbody>
       </tgroup>
     </informaltable>
     <para> <indexterm type="general-imported"><primary>rafsi assignments</primary><secondary>non-reassignability of</secondary></indexterm> (In fact, 
     <jbophrase>blaci</jbophrase> 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> <indexterm type="general-imported"><primary>rafsi</primary><secondary>considerations restricting construction of</secondary></indexterm> There are a few restrictions: a CVV-form rafsi without an apostrophe cannot exist unless the vowels make up one of the four diphthongs 
     <jbophrase role="diphthong">ai</jbophrase>, 
     <jbophrase role="diphthong">ei</jbophrase>, 
     <jbophrase role="diphthong">oi</jbophrase>, or 
@@ -944,59 +944,59 @@
     </example>
     <para> <indexterm type="general-imported"><primary>lujvo</primary><secondary>recognizing</secondary></indexterm>  <indexterm type="general-imported"><primary>lujvo form</primary><secondary>number of letters in</secondary></indexterm>  <indexterm type="general-imported"><primary>lujvo form</primary><secondary>consonant cluster requirement in</secondary></indexterm>  <indexterm type="general-imported"><primary>lujvo form</primary><secondary>final letter of</secondary></indexterm>  <indexterm type="general-imported"><primary>lujvo</primary><secondary>summary of form characteristics</secondary></indexterm> 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> <indexterm type="general-imported"><primary>lujvo form</primary><secondary>requirements for hyphen insertion in</secondary></indexterm>  <indexterm type="general-imported"><primary>hyphen letter</primary><secondary>definition</secondary></indexterm>  <indexterm type="general-imported"><primary>hyphens</primary><secondary>use of</secondary></indexterm> 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 
     <jbophrase role="letteral">y</jbophrase> or one of the consonants 
     <jbophrase role="letteral">r</jbophrase> and 
     <jbophrase role="letteral">n</jbophrase>. (The letter 
     <jbophrase role="letteral">l</jbophrase> can also be a hyphen, but is not used as one in lujvo.)</para>
     <para> <indexterm type="general-imported"><primary>lujvo form</primary><secondary>requirements for y-hyphen insertion in</secondary></indexterm> The 
-    <jbophrase role="letteral">y</jbophrase>-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>
+    <jbophrase role="letteral">y-</jbophrase>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> <indexterm type="general-imported"><primary>lujvo</primary><secondary>and consonant pairs</secondary></indexterm> Thus, the tanru 
     <jbophrase>pante tavla</jbophrase> ( 
     <quote>protest talk</quote>) cannot produce the lujvo 
     <jbophrase valid="false">patta'a</jbophrase>, because 
     <jbophrase role="morphology" valid="false">tt</jbophrase> is not a permissible consonant pair; the lujvo must be 
     <jbophrase>patyta'a</jbophrase>. Similarly, the tanru 
     <jbophrase>mudri siclu</jbophrase> ( 
     <quote>wooden whistle</quote>) cannot form the lujvo 
     <jbophrase valid="false">mudsiclu</jbophrase>; instead, 
     <jbophrase>mudysiclu</jbophrase> must be used. (Remember that 
     <jbophrase role="letteral">y</jbophrase> is not counted in determining whether the first five letters of a brivla contain a consonant cluster: this is why.)</para>
     <para> <indexterm type="general-imported"><primary>rafsi</primary><secondary>four-letter</secondary><tertiary>requirement for y-hyphen</tertiary></indexterm> The 
-    <jbophrase role="letteral">y</jbophrase>-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 
+    <jbophrase role="letteral">y-</jbophrase>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="example-random-id-qj84"/> to 
     <xref linkend="example-random-id-qjbP"/>.)</para>
     <para>The lujvo forms 
     <jbophrase>zunlyjamfu</jbophrase>, 
     <jbophrase>zunlyjma</jbophrase>, 
     <jbophrase>zuljamfu</jbophrase>, and 
     <jbophrase>zuljma</jbophrase> are all legitimate and equivalent forms made from the tanru 
     <jbophrase>zunle jamfu</jbophrase> ( 
     <quote>left foot</quote>). Of these, 
     <jbophrase>zuljma</jbophrase> is the preferred one since it is the shortest; it thus is likely to be the form listed in a Lojban dictionary.</para>
     <para> <indexterm type="general-imported"><primary>lujvo form</primary><secondary>requirements for n-hyphen insertion in</secondary></indexterm>  <indexterm type="general-imported"><primary>lujvo form</primary><secondary>requirements for r-hyphen insertion in</secondary></indexterm>  <indexterm type="general-imported"><primary>r-hyphen</primary><secondary>use of</secondary></indexterm> The 
-    <jbophrase role="letteral">r</jbophrase>-hyphen and its close relative, the 
-    <jbophrase role="letteral">n</jbophrase>-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>
+    <jbophrase role="letteral">r-</jbophrase>hyphen and its close relative, the 
+    <jbophrase role="letteral">n-</jbophrase>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 
-    <jbophrase role="letteral">r</jbophrase>-hyphen or 
-    <jbophrase role="letteral">n</jbophrase>-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> <indexterm type="general-imported"><primary>r-hyphen</primary><secondary>contrasted with <jbophrase role="letteral">n</jbophrase>-hyphen in requirements for use</secondary></indexterm>  <indexterm type="general-imported"><primary>n-hyphen</primary><secondary>contrasted with <jbophrase role="letteral">r</jbophrase>-hyphen in requirements for use</secondary></indexterm>  <indexterm type="general-imported"><primary>n-hyphen</primary><secondary>use of</secondary></indexterm> An 
-    <jbophrase role="letteral">n</jbophrase>-hyphen is only used in place of an 
-    <jbophrase role="letteral">r</jbophrase>-hyphen when the following rafsi begins with 
+    <jbophrase role="letteral">r-</jbophrase>hyphen or 
+    <jbophrase role="letteral">n-</jbophrase>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> <indexterm type="general-imported"><primary>r-hyphen</primary><secondary>contrasted with <jbophrase role="letteral">n-</jbophrase>hyphen in requirements for use</secondary></indexterm>  <indexterm type="general-imported"><primary>n-hyphen</primary><secondary>contrasted with <jbophrase role="letteral">r-</jbophrase>hyphen in requirements for use</secondary></indexterm>  <indexterm type="general-imported"><primary>n-hyphen</primary><secondary>use of</secondary></indexterm> An 
+    <jbophrase role="letteral">n-</jbophrase>hyphen is only used in place of an 
+    <jbophrase role="letteral">r-</jbophrase>hyphen when the following rafsi begins with 
     <jbophrase role="letteral">r</jbophrase>. For example, the tanru 
     <jbophrase>rokci renro</jbophrase> ( 
     <quote>rock throw</quote>) cannot be expressed as 
     <jbophrase valid="false">ro'ire'o</jbophrase> (which breaks up into two cmavo), nor can it be 
     <jbophrase valid="false">ro'irre'o</jbophrase> (which has an impermissible double consonant); the 
-    <jbophrase role="letteral">n</jbophrase>-hyphen is required, and the correct form of the hyphenated lujvo is 
+    <jbophrase role="letteral">n-</jbophrase>hyphen is required, and the correct form of the hyphenated lujvo is 
     <jbophrase>ro'inre'o</jbophrase>. The same lujvo could also be expressed without hyphenation as 
     <jbophrase>rokre'o</jbophrase>.</para>
     <para><!-- FIXME: what to do with this indexterm? --><indexterm type="lojban-word-imported"><primary>ZEI selma'o</primary></indexterm><indexterm type="general-imported"><primary>lujvo</primary><secondary>with zei</secondary></indexterm> 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 
     <jbophrase>zei</jbophrase>. Thus,</para>
     <example role="lujvo-example" xml:id="example-random-id-VeGL">
       <title>
         <anchor xml:id="c4e6d12"/>
       </title>
       <lujvo>
         <jbo>bridi zei valsi</jbo>
@@ -1165,27 +1165,27 @@
       </listitem>
       <listitem>
         <para>If the last letter is not a vowel, modify the ending so that the word ends in a vowel, either by removing a final consonant or by adding a suggestively chosen final vowel.</para>
       </listitem>
       <listitem>
         <para>If the first letter is not a consonant, modify the beginning so that the word begins with a consonant, either by removing an initial vowel or adding a suggestively chosen initial consonant.</para>
       </listitem>
       <listitem>
         <para> <indexterm type="general-imported"><primary>fu'ivla categorizer</primary><secondary>selection consideration for</secondary></indexterm>  <indexterm type="general-imported"><primary>l-hyphen</primary><secondary>use of</secondary></indexterm> Prefix the result of steps 1-5 with a 4-letter rafsi that categorizes the fu'ivla into a 
         <quote>topic area</quote>. It is only safe to use a 4-letter rafsi; short rafsi sometimes produce invalid fu'ivla. Hyphenate the rafsi to the rest of the fu'ivla with an 
-        <jbophrase role="letteral">r</jbophrase>-hyphen; if that would produce a double 
+        <jbophrase role="letteral">r-</jbophrase>hyphen; if that would produce a double 
         <jbophrase role="letteral">r</jbophrase>, use an 
-        <jbophrase role="letteral">n</jbophrase>-hyphen instead; if the rafsi ends in 
+        <jbophrase role="letteral">n-</jbophrase>hyphen instead; if the rafsi ends in 
         <jbophrase role="letteral">r</jbophrase> and the rest of the fu'ivla begins with 
         <jbophrase role="letteral">n</jbophrase> (or vice versa), or if the rafsi ends in "r" and the rest of the fu'ivla begins with "tc", "ts", "dj", or "dz" (using "n" would result in a phonotactically impermissible cluster), use an 
-        <jbophrase role="letteral">l</jbophrase>-hyphen. (This is the only use of 
-        <jbophrase role="letteral">l</jbophrase>-hyphen in Lojban.)</para>
+        <jbophrase role="letteral">l-</jbophrase>hyphen. (This is the only use of 
+        <jbophrase role="letteral">l-</jbophrase>hyphen in Lojban.)</para>
         <para>Alternatively, if a CVC-form short rafsi is available it can be used instead of the long rafsi.</para>
         
       </listitem>
       <listitem>
         <para>Remember that the stress necessarily appears on the penultimate (next-to-the-last) syllable.</para>
       </listitem>
     </orderedlist>
     <para>  In this section, the hyphen is set off with commas in the examples, but these commas are not required in writing, and the hyphen need not be pronounced as a separate syllable.</para>
     <para>Here are a few examples:</para>
     <example role="lojbanization-example" xml:id="example-random-id-ufin">
@@ -1197,21 +1197,21 @@
       <lojbanization>       <!-- FIXME: should the commentary sit inside the jbo/gloss/en or outside in para? -->
         <jbo>spaghetti (from English or Italian)</jbo>
         
         <jbo>spageti (Lojbanize)</jbo>
         <jbo>cidj,r,spageti (prefix long rafsi)</jbo>
         
         <jbo>dja,r,spageti (prefix short rafsi)</jbo>
       </lojbanization>
     </example>
     <para>  where 
-    <jbophrase role="rafsi">cidj</jbophrase>- is the 4-letter rafsi for 
+    <jbophrase role="rafsi">cidj-</jbophrase> is the 4-letter rafsi for 
     <jbophrase>cidja</jbophrase>, the Lojban gismu for 
     <quote>food</quote>, thus categorizing 
     <jbophrase>cidjrspageti</jbophrase> as a kind of food. The form with the short rafsi happens to work, but such good fortune cannot be relied on: in any event, it means the same thing.</para>
     <example role="lojbanization-example" xml:id="example-random-id-pzXe">
       <title>
         <indexterm type="example-imported"><primary>maple trees</primary><secondary>example</secondary></indexterm>
         <indexterm type="example-imported"><primary>Acer</primary><secondary>example</secondary></indexterm>
         <indexterm type="example-imported"><primary>maple sugar</primary><secondary>example</secondary></indexterm>
         <anchor xml:id="c4e7d4"/>
       </title>
@@ -1219,22 +1219,22 @@
         <jbo>Acer (the scientific name of maple trees)</jbo>
         
         
         <jbo>acer (Lojbanize)</jbo>
         <jbo>xaceru (add initial consonant and final vowel)</jbo>
         <jbo>tric,r,xaceru (prefix rafsi)</jbo>
         <jbo>ric,r,xaceru (prefix short rafsi)</jbo>
       </lojbanization>
     </example>
     <para>where 
-    <jbophrase role="rafsi">tric</jbophrase>- and 
-    <jbophrase role="rafsi">ric</jbophrase>- are rafsi for 
+    <jbophrase role="rafsi">tric-</jbophrase> and 
+    <jbophrase role="rafsi">ric-</jbophrase> are rafsi for 
     <jbophrase>tricu</jbophrase>, the gismu for 
     <quote>tree</quote>. Note that by the same principles, 
     <quote>maple sugar</quote> could get the fu'ivla 
     
     <jbophrase>saktrxaceru</jbophrase>, or could be represented by the tanru 
     <jbophrase>tricrxaceru sakta</jbophrase>. Technically, 
     <jbophrase>ricrxaceru</jbophrase> and 
     <jbophrase>tricrxaceru</jbophrase> are distinct fu'ivla, but they would surely be given the same meanings if both happened to be in use.</para>
     <example role="lojbanization-example" xml:id="example-random-id-C0YS">
       <title>
@@ -1242,71 +1242,71 @@
         <anchor xml:id="c4e7d5"/>
       </title>
       <lojbanization>
         <jbo>brie (from French)</jbo>
         
         <jbo>bri (Lojbanize)</jbo>
         <jbo>cirl,r,bri (prefix rafsi)</jbo>
       </lojbanization>
     </example>
     <para>  where 
-    <jbophrase role="rafsi">cirl</jbophrase>- represents 
+    <jbophrase role="rafsi">cirl-</jbophrase> represents 
     <jbophrase>cirla</jbophrase> ( 
     <quote>cheese</quote>).</para>
     <example role="lojbanization-example" xml:id="example-random-id-DQju">
       <title>
         <indexterm type="example-imported"><primary>cobra</primary><secondary>example</secondary></indexterm>
         <anchor xml:id="c4e7d6"/>
       </title>
       <lojbanization>
         <jbo>cobra</jbo>
         
         <jbo>kobra (Lojbanize)</jbo>
         <jbo>sinc,r,kobra (prefix rafsi)</jbo>
       </lojbanization>
     </example>
     <para>  where 
-    <jbophrase role="rafsi">sinc</jbophrase>- represents 
+    <jbophrase role="rafsi">sinc-</jbophrase> represents 
     <jbophrase>since</jbophrase> ( 
     <quote>snake</quote>).</para>
     <example role="lojbanization-example" xml:id="example-random-id-TFzH">
       <title>
         <indexterm type="example-imported"><primary>quark</primary><secondary>example</secondary></indexterm>
         <anchor xml:id="c4e7d7"/>
       </title>
       <lojbanization>
         <jbo>quark</jbo>
         
         <jbo>kuark (Lojbanize)</jbo>
         <jbo>kuarka (add final vowel)</jbo>
         <jbo>sask,r,kuarka (prefix rafsi)</jbo>
       </lojbanization>
     </example>
     <para> <indexterm type="general-imported"><primary>allowable diphthongs</primary><secondary>in gismu and lujvo contrasted with in fu'ivla</secondary></indexterm>  <indexterm type="general-imported"><primary>allowable diphthongs</primary><secondary>in fu'ivla contrasted with in gismu and lujvo</secondary></indexterm>  <indexterm type="general-imported"><primary>diphthongs</primary><secondary>in fu'ivla</secondary></indexterm>  <indexterm type="general-imported"><primary>fu'ivla</primary><secondary>diphthongs in</secondary></indexterm> where 
-    <jbophrase role="rafsi">sask</jbophrase>- represents 
+    <jbophrase role="rafsi">sask-</jbophrase> represents 
     <jbophrase>saske</jbophrase> ( 
     <quote>science</quote>). Note the extra vowel 
     <jbophrase role="letteral">a</jbophrase> added to the end of the word, and the diphthong 
     <jbophrase role="diphthong">ua</jbophrase>, which never appears in gismu or lujvo, but may appear in fu'ivla.</para>
     <example role="lojbanization-example" xml:id="example-random-id-FTfQ">
       <title>
         <anchor xml:id="c4e7d8"/>
       </title>
       <lojbanization>
         <foreign>자모 (from Korean)</foreign>
         <jbo>djamo (Lojbanize)</jbo>
         <jbo>lerf,r,djamo (prefix rafsi)</jbo>
         <jbo>ler,l,djamo (prefix rafsi)</jbo>
       </lojbanization>
     </example>
     <para>where 
-    <jbophrase role="rafsi">ler</jbophrase>- represents 
+    <jbophrase role="rafsi">ler-</jbophrase> represents 
     <jbophrase>lerfu</jbophrase> ( 
     <quote>letter</quote>). Note the l-hyphen in "lerldjamo", since "lerndjamo" contains the forbidden cluster "ndj".</para>
     
     <para> <indexterm type="general-imported"><primary>fu'ivla categorizer</primary><secondary>for distinguishing fu'ivla form</secondary></indexterm>  <indexterm type="general-imported"><primary>fu'ivla</primary><secondary>disambiguation of</secondary></indexterm> The use of the prefix helps distinguish among the many possible meanings of the borrowed word, depending on the field. As it happens, 
     <jbophrase>spageti</jbophrase> and 
     <jbophrase>kuarka</jbophrase> are valid Stage 4 fu'ivla, but 
     <jbophrase valid="false">xaceru</jbophrase> looks like a compound cmavo, and 
     <jbophrase valid="false">kobra</jbophrase> like a gismu.</para>
     <para> <indexterm type="general-imported"><primary>fu'ivla categorizer</primary><secondary>for distinguishing specialized meanings</secondary></indexterm> For another example, 
     <quote>integral</quote> has a specific meaning to a mathematician. But the Lojban fu'ivla 
@@ -1316,21 +1316,21 @@
     
     <para>Left uncontrolled, 
     <jbophrase>integrale</jbophrase> 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> <!-- FIXME: there's nowhere for these two indexterms to go --><indexterm type="example-imported"><primary>integral</primary><secondary>architectural concept</secondary><tertiary>example</tertiary></indexterm>  <indexterm type="example-imported"><primary>integral</primary><secondary>mathematical concept</secondary><tertiary>example</tertiary></indexterm> The prefix method would render the mathematical concept as 
     <jbophrase>cmacrntegrale</jbophrase>, if the 
     <jbophrase role="letteral">i</jbophrase> of 
     <jbophrase>integrale</jbophrase> is removed, or something like 
     <jbophrase>cmacrnintegrale</jbophrase>, if a new consonant is added to the beginning; 
-    <jbophrase role="rafsi">cmac</jbophrase>- is the rafsi for 
+    <jbophrase role="rafsi">cmac-</jbophrase> is the rafsi for 
     <jbophrase>cmaci</jbophrase> ( 
     <quote>mathematics</quote>). The architectural sense of 
     <quote>integral</quote> might be conveyed with 
     
     <jbophrase>djinrnintegrale</jbophrase> or 
     <jbophrase>tarmrnintegrale</jbophrase>, where 
     <jbophrase>dinju</jbophrase> and 
     <jbophrase>tarmi</jbophrase> mean 
     <quote>building</quote> and 
     <quote>form</quote> respectively.</para>
@@ -1973,56 +1973,56 @@
     <para>Choose a 3-letter (CVV-form or CCV-form) or 5-letter rafsi for the final gismu in the tanru.</para>
   </listitem>
   <listitem>
     <para>Join the resulting string of rafsi, initially without hyphens.</para>
   </listitem>
   <listitem>
     <para> <indexterm type="general-imported"><primary>hyphens in lujvo</primary><secondary>proscribed where not required</secondary></indexterm> Add hyphen letters where necessary. It is illegal to add a hyphen at a place that is not required by this algorithm. Right-to-left tests are recommended, for reasons discussed below.</para>
     <orderedlist>
       <listitem>
         <para>If there are more than two words in the tanru, put an 
-        <jbophrase role="letteral">r</jbophrase>-hyphen (or an 
-        <jbophrase role="letteral">n</jbophrase>-hyphen) after the first rafsi if it is CVV-form. If there are exactly two words, then put an 
-        <jbophrase role="letteral">r</jbophrase>-hyphen (or an 
-        <jbophrase role="letteral">n</jbophrase>-hyphen) between the two rafsi if the first rafsi is CVV-form, unless the second rafsi is CCV-form (for example, 
+        <jbophrase role="letteral">r-</jbophrase>hyphen (or an 
+        <jbophrase role="letteral">n-</jbophrase>hyphen) after the first rafsi if it is CVV-form. If there are exactly two words, then put an 
+        <jbophrase role="letteral">r-</jbophrase>hyphen (or an 
+        <jbophrase role="letteral">n-</jbophrase>hyphen) between the two rafsi if the first rafsi is CVV-form, unless the second rafsi is CCV-form (for example, 
         <jbophrase>saicli</jbophrase> requires no hyphen). Use an 
-        <jbophrase role="letteral">r</jbophrase>-hyphen unless the letter after the hyphen is 
+        <jbophrase role="letteral">r-</jbophrase>hyphen unless the letter after the hyphen is 
         <jbophrase role="letteral">r</jbophrase>, in which case use an 
-        <jbophrase role="letteral">n</jbophrase>-hyphen. Never use an 
-        <jbophrase role="letteral">n</jbophrase>-hyphen unless it is required.</para>
+        <jbophrase role="letteral">n-</jbophrase>hyphen. Never use an 
+        <jbophrase role="letteral">n-</jbophrase>hyphen unless it is required.</para>
       </listitem>
       <listitem>
         <para>Put a 
-        <jbophrase role="letteral">y</jbophrase>-hyphen between the consonants of any impermissible consonant pair. This will always appear between rafsi.</para>
+        <jbophrase role="letteral">y-</jbophrase>hyphen between the consonants of any impermissible consonant pair. This will always appear between rafsi.</para>
       </listitem>
       <listitem>
         <para> <indexterm type="general-imported"><primary>tosmabru test</primary></indexterm> Put a 
-        <jbophrase role="letteral">y</jbophrase>-hyphen after any 4-letter rafsi form.</para>
+        <jbophrase role="letteral">y-</jbophrase>hyphen after any 4-letter rafsi form.</para>
       </listitem>
     </orderedlist>
   </listitem>
   <listitem>
     <para>Test all forms with one or more initial CVC-form rafsi - with the pattern 
     <quote>CVC ... CVC + X</quote> - for 
     <jbophrase>tosmabru failure</jbophrase>. X must either be a CVCCV long rafsi that happens to have a permissible initial pair as the consonant cluster, or is something which has caused a 
-    <jbophrase role="letteral">y</jbophrase>-hyphen to be installed between the previous CVC and itself by one of the above rules.</para>
+    <jbophrase role="letteral">y-</jbophrase>hyphen to be installed between the previous CVC and itself by one of the above rules.</para>
     <para>The test is as follows:</para>
     <orderedlist>
       <listitem>
-        <para>Examine all the C/C consonant pairs up to the first <jbophrase role="letteral">y</jbophrase>-hyphen, or up to the end of the word in case there are no <jbophrase role="letteral">y</jbophrase>-hyphens.</para>
+        <para>Examine all the C/C consonant pairs up to the first <jbophrase role="letteral">y-</jbophrase>hyphen, or up to the end of the word in case there are no <jbophrase role="letteral">y-</jbophrase>hyphens.</para>
         <para>These consonant pairs are called "joints”.</para>
       </listitem>
       <listitem>
         <para>If all of those joints are permissible initials, then the trial word will break up into a cmavo and a shorter brivla. If not, the word will not break up, and no further hyphens are needed.</para>
       </listitem>
       <listitem>
-        <para>Install a <jbophrase role="letteral">y</jbophrase>-hyphen at the first such joint.</para>
+        <para>Install a <jbophrase role="letteral">y-</jbophrase>hyphen at the first such joint.</para>
       </listitem>
     </orderedlist>
   </listitem>
 </orderedlist>
     <para> <indexterm type="general-imported"><primary>lujvo</primary><secondary>selection of best form of</secondary></indexterm>  <indexterm type="general-imported"><primary>lujvo</primary><secondary>scoring of</secondary></indexterm> Note that the 
     <quote>tosmabru test</quote> implies that the algorithm will be more efficient if rafsi junctures are tested for required hyphens from right to left, instead of from left to right; when the test is required, it cannot be completed until hyphenation to the right has been determined.</para>
     
     
   </section>
   <section xml:id="section-lujvo-scoring">
@@ -2032,73 +2032,73 @@
         <listitem>
           <para>Count the total number of letters, including hyphens and apostrophes; call it 
           <varname>L</varname>.</para>
         </listitem>
         <listitem>
           <para>Count the number of apostrophes; call it 
           <varname>A</varname>.</para>
         </listitem>
         <listitem>
           <para>Count the number of 
-          <jbophrase role="letteral">y</jbophrase>-, 
-          <jbophrase role="letteral">r</jbophrase>-, and 
-          <jbophrase role="letteral">n</jbophrase>-hyphens; call it 
+          <jbophrase role="letteral">y-</jbophrase>, 
+          <jbophrase role="letteral">r-</jbophrase>, and 
+          <jbophrase role="letteral">n-</jbophrase>hyphens; call it 
           
           <varname>H</varname>.</para>
         </listitem>
         <listitem>
           <para>For each rafsi, find the value in the following table. Sum this value over all rafsi; call it 
           <varname>R</varname>: 
           <informaltable>
             <tgroup cols="3">
               <colspec colnum="1" colname="col1"/>
               <colspec colnum="2" colname="col2"/>
               <colspec colnum="3" colname="col3"/>
               <tbody>
                 <row>
                   <entry>CVC/CV (final)</entry>
-                  <entry>(-<jbophrase role="rafsi">sarji</jbophrase>-)</entry>
+                  <entry>(<jbophrase role="rafsi">-sarji-</jbophrase>)</entry>
                   <entry>1</entry>
                 </row>
                 <row>
                   <entry>CVC/C</entry>
-                  <entry>(-<jbophrase role="rafsi">sarj</jbophrase>-)</entry>
+                  <entry>(<jbophrase role="rafsi">-sarj-</jbophrase>)</entry>
                   <entry>2</entry>
                 </row>
                 <row>
                   <entry>CCVCV (final)</entry>
-                  <entry>(-<jbophrase role="rafsi">zbasu</jbophrase>-)</entry>
+                  <entry>(<jbophrase role="rafsi">-zbasu-</jbophrase>)</entry>
                   <entry>3</entry>
                 </row>
                 <row>
                   <entry>CCVC</entry>
-                  <entry>(-<jbophrase role="rafsi">zbas</jbophrase>-)</entry>
+                  <entry>(<jbophrase role="rafsi">-zbas-</jbophrase>)</entry>
                   <entry>4</entry>
                 </row>
                 <row>
                   <entry>CVC</entry>
-                  <entry>(-<jbophrase role="rafsi">nun</jbophrase>-)</entry>
+                  <entry>(<jbophrase role="rafsi">-nun-</jbophrase>)</entry>
                   <entry>5</entry>
                 </row>
                 <row>
                   <entry>CVV with an apostrophe</entry>
-                  <entry>(-<jbophrase role="rafsi">ta'u</jbophrase>-)</entry>
+                  <entry>(<jbophrase role="rafsi">-ta'u-</jbophrase>)</entry>
                   <entry>6</entry>
                 </row>
                 <row>
                   <entry>CCV</entry>
-                  <entry>(-<jbophrase role="rafsi">zba</jbophrase>-)</entry>
+                  <entry>(<jbophrase role="rafsi">-zba-</jbophrase>)</entry>
                   <entry>7</entry>
                 </row>
                 <row>
                   <entry>CVV with no apostrophe</entry>
-                  <entry>(-<jbophrase role="rafsi">sai</jbophrase>-)</entry>
+                  <entry>(<jbophrase role="rafsi">-sai-</jbophrase>)</entry>
                   <entry>8</entry>
                 </row>
               </tbody>
             </tgroup>
           </informaltable>
           </para>
         </listitem>
         <listitem>
           <para>Count the number of vowels, not including 
           <jbophrase role="letteral">y</jbophrase>; call it 
@@ -2156,81 +2156,81 @@
     <para>This section contains examples of making and scoring lujvo. First, we will start with the tanru 
     <jbophrase>gerku zdani</jbophrase> ( 
     <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="section-lujvo-scoring"/>, using every possible rafsi.</para>
     <para>The rafsi for 
     <jbophrase>gerku</jbophrase> are:</para>
     <simplelist type="horiz" columns="4">
-      <member>-<jbophrase role="rafsi">ger</jbophrase>-, </member>
-      <member>-<jbophrase role="rafsi">ge'u</jbophrase>-, </member>
-      <member>-<jbophrase role="rafsi">gerk</jbophrase>-, </member>
-      <member>-<jbophrase role="rafsi">gerku</jbophrase></member>
+      <member><jbophrase role="rafsi">-ger-</jbophrase>, </member>
+      <member><jbophrase role="rafsi">-ge'u-</jbophrase>, </member>
+      <member><jbophrase role="rafsi">-gerk-</jbophrase>, </member>
+      <member><jbophrase role="rafsi">-gerku</jbophrase></member>
     </simplelist>
     <para>The rafsi for 
     <jbophrase>zdani</jbophrase> are:</para>
     <simplelist type="horiz" columns="3">
-      <member>-<jbophrase role="rafsi">zda</jbophrase>-, </member>
-      <member>-<jbophrase role="rafsi">zdan</jbophrase>-, </member>
-      <member>-<jbophrase role="rafsi">zdani</jbophrase>.</member>
+      <member><jbophrase role="rafsi">-zda-</jbophrase>, </member>
+      <member><jbophrase role="rafsi">-zdan-</jbophrase>, </member>
+      <member><jbophrase role="rafsi">-zdani</jbophrase>.</member>
     </simplelist>
     <para>Step 1 of the algorithm directs us to use 
-    -<jbophrase role="rafsi">ger</jbophrase>-, 
-    -<jbophrase role="rafsi">ge'u</jbophrase>- and 
-    -<jbophrase role="rafsi">gerk</jbophrase>- as possible rafsi for 
+    <jbophrase role="rafsi">-ger-</jbophrase>, 
+    <jbophrase role="rafsi">-ge'u-</jbophrase> and 
+    <jbophrase role="rafsi">-gerk-</jbophrase> as possible rafsi for 
     <jbophrase>gerku</jbophrase>; Step 2 directs us to use 
-    -<jbophrase role="rafsi">zda</jbophrase>- and 
-    -<jbophrase role="rafsi">zdani</jbophrase> as possible rafsi for 
+    <jbophrase role="rafsi">-zda-</jbophrase> and 
+    <jbophrase role="rafsi">-zdani</jbophrase> as possible rafsi for 
     <jbophrase>zdani</jbophrase>. The six possible forms of the lujvo are then:</para>
     <simplelist type="vert" columns="1">
-      <member><jbophrase role="rafsi">ger</jbophrase>-<jbophrase role="rafsi">zda</jbophrase></member>
-      <member><jbophrase role="rafsi">ger</jbophrase>-<jbophrase role="rafsi">zdani</jbophrase></member>
-      <member><jbophrase role="rafsi">ge'u</jbophrase>-<jbophrase role="rafsi">zda</jbophrase></member>
-      <member><jbophrase role="rafsi">ge'u</jbophrase>-<jbophrase role="rafsi">zdani</jbophrase></member>
-      <member><jbophrase role="rafsi">gerk</jbophrase>-<jbophrase role="rafsi">zda</jbophrase></member>
-      <member><jbophrase role="rafsi">gerk</jbophrase>-<jbophrase role="rafsi">zdani</jbophrase></member>
+      <member><jbophrase role="rafsi">ger</jbophrase><jbophrase role="rafsi">-zda</jbophrase></member>
+      <member><jbophrase role="rafsi">ger</jbophrase><jbophrase role="rafsi">-zdani</jbophrase></member>
+      <member><jbophrase role="rafsi">ge'u</jbophrase><jbophrase role="rafsi">-zda</jbophrase></member>
+      <member><jbophrase role="rafsi">ge'u</jbophrase><jbophrase role="rafsi">-zdani</jbophrase></member>
+      <member><jbophrase role="rafsi">gerk</jbophrase><jbophrase role="rafsi">-zda</jbophrase></member>
+      <member><jbophrase role="rafsi">gerk</jbophrase><jbophrase role="rafsi">-zdani</jbophrase></member>
     </simplelist>
     <para>We must then insert appropriate hyphens in each case. The first two forms need no hyphenation: 
     
     <jbophrase>ge</jbophrase> cannot fall off the front, because the following word would begin with 
     <jbophrase role="morphology">rz</jbophrase>, which is not a permissible initial consonant pair. So the lujvo forms are 
     <jbophrase>gerzda</jbophrase> and 
     <jbophrase>gerzdani</jbophrase>.</para>
     <para>The third form, 
-    <jbophrase role="rafsi">ge'u</jbophrase>-<jbophrase role="rafsi">zda</jbophrase>, needs no hyphen, because even though the first rafsi is CVV, the second one is CCV, so there is a consonant cluster in the first five letters. So 
+    <jbophrase role="rafsi">ge'u</jbophrase><jbophrase role="rafsi">-zda</jbophrase>, needs no hyphen, because even though the first rafsi is CVV, the second one is CCV, so there is a consonant cluster in the first five letters. So 
     <jbophrase>ge'uzda</jbophrase> is this form of the lujvo.</para>
     <para>The fourth form, 
     <jbophrase valid="false">ge'u-zdani</jbophrase>, however, requires an 
-    <jbophrase role="letteral">r</jbophrase>-hyphen; otherwise, the 
-    <jbophrase role="rafsi">ge'u</jbophrase>- part would fall off as a cmavo. So this form of the lujvo is 
+    <jbophrase role="letteral">r-</jbophrase>hyphen; otherwise, the 
+    <jbophrase role="rafsi">ge'u-</jbophrase> part would fall off as a cmavo. So this form of the lujvo is 
     <jbophrase>ge'urzdani</jbophrase>.</para>
     <para>The last two forms require 
-    <jbophrase role="letteral">y</jbophrase>-hyphens, as all 4-letter rafsi do, and so are 
+    <jbophrase role="letteral">y-</jbophrase>hyphens, as all 4-letter rafsi do, and so are 
     
     <jbophrase>gerkyzda</jbophrase> and 
     <jbophrase>gerkyzdani</jbophrase> respectively.</para>
     <para> <!-- FIXME: there's nowhere for this indexterm to go --><indexterm type="example-imported"><primary>boat class</primary><secondary>example</secondary></indexterm> The scoring algorithm is heavily weighted in favor of short lujvo, so we might expect that 
     <jbophrase>gerzda</jbophrase> would win. Its <varname>L</varname> score is 6, its <varname>A</varname> score is 0, its <varname>H</varname> score is 0, its <varname>R</varname> score is 12, and its <varname>V</varname> 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 
     <jbophrase>gerzda</jbophrase>.</para>
     <para>For the next example, we will use the tanru 
     <jbophrase>bloti klesi</jbophrase> ( 
     <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 
     <jbophrase>bloti</jbophrase> are 
-    -<jbophrase role="rafsi">lot</jbophrase>-, 
-    -<jbophrase role="rafsi">blo</jbophrase>-, and 
-    -<jbophrase role="rafsi">lo'i</jbophrase>-; for 
+    <jbophrase role="rafsi">-lot-</jbophrase>, 
+    <jbophrase role="rafsi">-blo-</jbophrase>, and 
+    <jbophrase role="rafsi">-lo'i-</jbophrase>; for 
     <jbophrase>klesi</jbophrase> they are 
-    -<jbophrase role="rafsi">kle</jbophrase>- and 
-    -<jbophrase role="rafsi">lei</jbophrase>-. 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>
+    <jbophrase role="rafsi">-kle-</jbophrase> and 
+    <jbophrase role="rafsi">-lei-</jbophrase>. 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>
     <simplelist type="horiz" columns="3">
       <member><jbophrase>lotkle</jbophrase></member>
       <member><jbophrase>blokle</jbophrase></member>
       <member><jbophrase>lo'ikle</jbophrase></member>
       
       <member><jbophrase>lotlei</jbophrase></member>
       <member><jbophrase>blolei</jbophrase></member>
       <member><jbophrase>lo'irlei</jbophrase></member>
     </simplelist>
     <para>Only 
@@ -2271,63 +2271,63 @@
     <para> <indexterm type="example-imported"><primary>Logical Language Group</primary><secondary>example</secondary></indexterm> So the form 
     <jbophrase>blolei</jbophrase> is preferred, but only by a tiny margin over 
     <jbophrase>blokle</jbophrase>; "lotlei" and "lotkle" are only slightly worse; 
     <jbophrase>lo'ikle</jbophrase> suffers because of its apostrophe, and 
     <jbophrase>lo'irlei</jbophrase> 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 
     <jbophrase>logji bangu girzu</jbophrase>, or 
     <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 
-    -<jbophrase role="rafsi">loj</jbophrase>- and 
-    -<jbophrase role="rafsi">logj</jbophrase>-; 
-    -<jbophrase role="rafsi">ban</jbophrase>-, 
-    -<jbophrase role="rafsi">bau</jbophrase>-, and 
-    -<jbophrase role="rafsi">bang</jbophrase>-; and 
-    -<jbophrase role="rafsi">gri</jbophrase>- and 
-    -<jbophrase role="rafsi">girzu</jbophrase>, and (for name purposes only) 
-    -<jbophrase role="rafsi">gir</jbophrase>- and 
-    -<jbophrase role="rafsi">girz</jbophrase>-. The resulting 12 lujvo possibilities are:</para>
+    <jbophrase role="rafsi">-loj-</jbophrase> and 
+    <jbophrase role="rafsi">-logj-</jbophrase>; 
+    <jbophrase role="rafsi">-ban-</jbophrase>, 
+    <jbophrase role="rafsi">-bau-</jbophrase>, and 
+    <jbophrase role="rafsi">-bang-</jbophrase>; and 
+    <jbophrase role="rafsi">-gri-</jbophrase> and 
+    <jbophrase role="rafsi">-girzu</jbophrase>, and (for name purposes only) 
+    <jbophrase role="rafsi">-gir-</jbophrase> and 
+    <jbophrase role="rafsi">-girz-</jbophrase>. The resulting 12 lujvo possibilities are:</para>
     <simplelist type="horiz" columns="3">
-      <member><jbophrase role="rafsi">loj</jbophrase>-<jbophrase role="rafsi">ban</jbophrase>-<jbophrase role="rafsi">gri</jbophrase></member>
-      <member><jbophrase role="rafsi">loj</jbophrase>-<jbophrase role="rafsi">bau</jbophrase>-<jbophrase role="rafsi">gri</jbophrase></member>
-      <member><jbophrase role="rafsi">loj</jbophrase>-<jbophrase role="rafsi">bang</jbophrase>-<jbophrase role="rafsi">gri</jbophrase></member>
+      <member><jbophrase role="rafsi">loj</jbophrase><jbophrase role="rafsi">-ban</jbophrase><jbophrase role="rafsi">-gri</jbophrase></member>
+      <member><jbophrase role="rafsi">loj</jbophrase><jbophrase role="rafsi">-bau</jbophrase><jbophrase role="rafsi">-gri</jbophrase></member>
+      <member><jbophrase role="rafsi">loj</jbophrase><jbophrase role="rafsi">-bang</jbophrase><jbophrase role="rafsi">-gri</jbophrase></member>
       
-      <member><jbophrase role="rafsi">logj</jbophrase>-<jbophrase role="rafsi">ban</jbophrase>-<jbophrase role="rafsi">gri</jbophrase></member>
-      <member><jbophrase role="rafsi">logj</jbophrase>-<jbophrase role="rafsi">bau</jbophrase>-<jbophrase role="rafsi">gri</jbophrase></member>
-      <member><jbophrase role="rafsi">logj</jbophrase>-<jbophrase role="rafsi">bang</jbophrase>-<jbophrase role="rafsi">gri</jbophrase></member>
+      <member><jbophrase role="rafsi">logj</jbophrase><jbophrase role="rafsi">-ban</jbophrase><jbophrase role="rafsi">-gri</jbophrase></member>
+      <member><jbophrase role="rafsi">logj</jbophrase><jbophrase role="rafsi">-bau</jbophrase><jbophrase role="rafsi">-gri</jbophrase></member>
+      <member><jbophrase role="rafsi">logj</jbophrase><jbophrase role="rafsi">-bang</jbophrase><jbophrase role="rafsi">-gri</jbophrase></member>
       
-      <member><jbophrase role="rafsi">loj</jbophrase>-<jbophrase role="rafsi">ban</jbophrase>-<jbophrase role="rafsi">girzu</jbophrase></member>
-      <member><jbophrase role="rafsi">loj</jbophrase>-<jbophrase role="rafsi">bau</jbophrase>-<jbophrase role="rafsi">girzu</jbophrase></member>
-      <member><jbophrase role="rafsi">loj</jbophrase>-<jbophrase role="rafsi">bang</jbophrase>-<jbophrase role="rafsi">girzu</jbophrase></member>
+      <member><jbophrase role="rafsi">loj</jbophrase><jbophrase role="rafsi">-ban</jbophrase><jbophrase role="rafsi">-girzu</jbophrase></member>
+      <member><jbophrase role="rafsi">loj</jbophrase><jbophrase role="rafsi">-bau</jbophrase><jbophrase role="rafsi">-girzu</jbophrase></member>
+      <member><jbophrase role="rafsi">loj</jbophrase><jbophrase role="rafsi">-bang</jbophrase><jbophrase role="rafsi">-girzu</jbophrase></member>
       
-      <member><jbophrase role="rafsi">logj</jbophrase>-<jbophrase role="rafsi">ban</jbophrase>-<jbophrase role="rafsi">girzu</jbophrase></member>
-      <member><jbophrase role="rafsi">logj</jbophrase>-<jbophrase role="rafsi">bau</jbophrase>-<jbophrase role="rafsi">girzu</jbophrase></member>
-      <member><jbophrase role="rafsi">logj</jbophrase>-<jbophrase role="rafsi">bang</jbophrase>-<jbophrase role="rafsi">girzu</jbophrase></member>
+      <member><jbophrase role="rafsi">logj</jbophrase><jbophrase role="rafsi">-ban</jbophrase><jbophrase role="rafsi">-girzu</jbophrase></member>
+      <member><jbophrase role="rafsi">logj</jbophrase><jbophrase role="rafsi">-bau</jbophrase><jbophrase role="rafsi">-girzu</jbophrase></member>
+      <member><jbophrase role="rafsi">logj</jbophrase><jbophrase role="rafsi">-bang</jbophrase><jbophrase role="rafsi">-girzu</jbophrase></member>
     </simplelist>
     <para>and the 12 name possibilities are:</para>
     <simplelist type="horiz" columns="3">
-      <member><jbophrase role="rafsi">loj</jbophrase>-<jbophrase role="rafsi">ban</jbophrase>-<jbophrase role="rafsi">gir</jbophrase></member>
-      <member><jbophrase role="rafsi">loj</jbophrase>-<jbophrase role="rafsi">bau</jbophrase>-<jbophrase role="rafsi">gir</jbophrase></member>
-      <member><jbophrase role="rafsi">loj</jbophrase>-<jbophrase role="rafsi">bang</jbophrase>-<jbophrase role="rafsi">gir</jbophrase></member>
+      <member><jbophrase role="rafsi">loj</jbophrase><jbophrase role="rafsi">-ban</jbophrase><jbophrase role="rafsi">-gir</jbophrase></member>
+      <member><jbophrase role="rafsi">loj</jbophrase><jbophrase role="rafsi">-bau</jbophrase><jbophrase role="rafsi">-gir</jbophrase></member>
+      <member><jbophrase role="rafsi">loj</jbophrase><jbophrase role="rafsi">-bang</jbophrase><jbophrase role="rafsi">-gir</jbophrase></member>
       
-      <member><jbophrase role="rafsi">logj</jbophrase>-<jbophrase role="rafsi">ban</jbophrase>-<jbophrase role="rafsi">gir</jbophrase></member>
-      <member><jbophrase role="rafsi">logj</jbophrase>-<jbophrase role="rafsi">bau</jbophrase>-<jbophrase role="rafsi">gir</jbophrase></member>
-      <member><jbophrase role="rafsi">logj</jbophrase>-<jbophrase role="rafsi">bang</jbophrase>-<jbophrase role="rafsi">gir</jbophrase></member>
+      <member><jbophrase role="rafsi">logj</jbophrase><jbophrase role="rafsi">-ban</jbophrase><jbophrase role="rafsi">-gir</jbophrase></member>
+      <member><jbophrase role="rafsi">logj</jbophrase><jbophrase role="rafsi">-bau</jbophrase><jbophrase role="rafsi">-gir</jbophrase></member>
+      <member><jbophrase role="rafsi">logj</jbophrase><jbophrase role="rafsi">-bang</jbophrase><jbophrase role="rafsi">-gir</jbophrase></member>
       
-      <member><jbophrase role="rafsi">loj</jbophrase>-<jbophrase role="rafsi">ban</jbophrase>-<jbophrase role="rafsi">girz</jbophrase></member>
-      <member><jbophrase role="rafsi">loj</jbophrase>-<jbophrase role="rafsi">bau</jbophrase>-<jbophrase role="rafsi">girz</jbophrase></member>
-      <member><jbophrase role="rafsi">loj</jbophrase>-<jbophrase role="rafsi">bang</jbophrase>-<jbophrase role="rafsi">girz</jbophrase></member>
+      <member><jbophrase role="rafsi">loj</jbophrase><jbophrase role="rafsi">-ban</jbophrase><jbophrase role="rafsi">-girz</jbophrase></member>
+      <member><jbophrase role="rafsi">loj</jbophrase><jbophrase role="rafsi">-bau</jbophrase><jbophrase role="rafsi">-girz</jbophrase></member>
+      <member><jbophrase role="rafsi">loj</jbophrase><jbophrase role="rafsi">-bang</jbophrase><jbophrase role="rafsi">-girz</jbophrase></member>
       
-      <member><jbophrase role="rafsi">logj</jbophrase>-<jbophrase role="rafsi">ban</jbophrase>-<jbophrase role="rafsi">girz</jbophrase></member>
-      <member><jbophrase role="rafsi">logj</jbophrase>-<jbophrase role="rafsi">bau</jbophrase>-<jbophrase role="rafsi">girz</jbophrase></member>
-      <member><jbophrase role="rafsi">logj</jbophrase>-<jbophrase role="rafsi">bang</jbophrase>-<jbophrase role="rafsi">girz</jbophrase></member>
+      <member><jbophrase role="rafsi">logj</jbophrase><jbophrase role="rafsi">-ban</jbophrase><jbophrase role="rafsi">-girz</jbophrase></member>
+      <member><jbophrase role="rafsi">logj</jbophrase><jbophrase role="rafsi">-bau</jbophrase><jbophrase role="rafsi">-girz</jbophrase></member>
+      <member><jbophrase role="rafsi">logj</jbophrase><jbophrase role="rafsi">-bang</jbophrase><jbophrase role="rafsi">-girz</jbophrase></member>
     </simplelist>
     <para>After hyphenation, we have:</para>
     <simplelist type="horiz" columns="3">
       <member><jbophrase>lojbangri</jbophrase></member>
       <member><jbophrase>lojbaugri</jbophrase></member>
       <member><jbophrase>lojbangygri</jbophrase></member>
       
       <member><jbophrase>logjybangri</jbophrase></member>
       <member><jbophrase>logjybaugri</jbophrase></member>
       <member><jbophrase>logjybangygri</jbophrase></member>
@@ -2363,42 +2363,42 @@
     <jbophrase>girzu</jbophrase>, producing 
     <jbophrase glossay="false">lojbangirz.</jbophrase></para>
     <para>Finally, here is a four-part lujvo with a cmavo in it, based on the tanru 
     <jbophrase>nakni ke cinse ctuca</jbophrase> or 
     <quote>male (sexual teacher)</quote>. The 
     
     <jbophrase>ke</jbophrase> cmavo ensures the interpretation 
     <quote>teacher of sexuality who is male</quote>, rather than 
     <quote>teacher of male sexuality</quote>. Here are the possible forms of the lujvo, both before and after hyphenation:</para>
     <simplelist type="horiz" columns="2">
-      <member><jbophrase role="rafsi">nak</jbophrase>-<jbophrase role="rafsi">kem</jbophrase>-<jbophrase role="rafsi">cin</jbophrase>-<jbophrase role="rafsi">ctu</jbophrase></member>  
+      <member><jbophrase role="rafsi">nak</jbophrase><jbophrase role="rafsi">-kem</jbophrase><jbophrase role="rafsi">-cin</jbophrase><jbophrase role="rafsi">-ctu</jbophrase></member>  
       <member><jbophrase>nakykemcinctu</jbophrase></member>
       
-      <member><jbophrase role="rafsi">nak</jbophrase>-<jbophrase role="rafsi">kem</jbophrase>-<jbophrase role="rafsi">cin</jbophrase>-<jbophrase role="rafsi">ctuca</jbophrase></member>
+      <member><jbophrase role="rafsi">nak</jbophrase><jbophrase role="rafsi">-kem</jbophrase><jbophrase role="rafsi">-cin</jbophrase><jbophrase role="rafsi">-ctuca</jbophrase></member>
       <member><jbophrase>nakykemcinctuca</jbophrase></member>
       
-      <member><jbophrase role="rafsi">nak</jbophrase>-<jbophrase role="rafsi">kem</jbophrase>-<jbophrase role="rafsi">cins</jbophrase>-<jbophrase role="rafsi">ctu</jbophrase></member>
+      <member><jbophrase role="rafsi">nak</jbophrase><jbophrase role="rafsi">-kem</jbophrase><jbophrase role="rafsi">-cins</jbophrase><jbophrase role="rafsi">-ctu</jbophrase></member>
       <member><jbophrase>nakykemcinsyctu</jbophrase></member>
       
-      <member><jbophrase role="rafsi">nak</jbophrase>-<jbophrase role="rafsi">kem</jbophrase>-<jbophrase role="rafsi">cins</jbophrase>-<jbophrase role="rafsi">ctuca</jbophrase></member>
+      <member><jbophrase role="rafsi">nak</jbophrase><jbophrase role="rafsi">-kem</jbophrase><jbophrase role="rafsi">-cins</jbophrase><jbophrase role="rafsi">-ctuca</jbophrase></member>
       <member><jbophrase>nakykemcinsyctuca</jbophrase></member>
       
-      <member><jbophrase role="rafsi">nakn</jbophrase>-<jbophrase role="rafsi">kem</jbophrase>-<jbophrase role="rafsi">cin</jbophrase>-<jbophrase role="rafsi">ctu</jbophrase></member>
+      <member><jbophrase role="rafsi">nakn</jbophrase><jbophrase role="rafsi">-kem</jbophrase><jbophrase role="rafsi">-cin</jbophrase><jbophrase role="rafsi">-ctu</jbophrase></member>
       <member><jbophrase>naknykemcinctu</jbophrase></member>
       
-      <member><jbophrase role="rafsi">nakn</jbophrase>-<jbophrase role="rafsi">kem</jbophrase>-<jbophrase role="rafsi">cin</jbophrase>-<jbophrase role="rafsi">ctuca</jbophrase></member>
+      <member><jbophrase role="rafsi">nakn</jbophrase><jbophrase role="rafsi">-kem</jbophrase><jbophrase role="rafsi">-cin</jbophrase><jbophrase role="rafsi">-ctuca</jbophrase></member>
       <member><jbophrase>naknykemcinctuca</jbophrase></member>
       
-      <member><jbophrase role="rafsi">nakn</jbophrase>-<jbophrase role="rafsi">kem</jbophrase>-<jbophrase role="rafsi">cins</jbophrase>-<jbophrase role="rafsi">ctu</jbophrase></member>
+      <member><jbophrase role="rafsi">nakn</jbophrase><jbophrase role="rafsi">-kem</jbophrase><jbophrase role="rafsi">-cins</jbophrase><jbophrase role="rafsi">-ctu</jbophrase></member>
       <member><jbophrase>naknykemcinsyctu</jbophrase></member>
       
-      <member><jbophrase role="rafsi">nakn</jbophrase>-<jbophrase role="rafsi">kem</jbophrase>-<jbophrase role="rafsi">cins</jbophrase>-<jbophrase role="rafsi">ctuca</jbophrase></member>
+      <member><jbophrase role="rafsi">nakn</jbophrase><jbophrase role="rafsi">-kem</jbophrase><jbophrase role="rafsi">-cins</jbophrase><jbophrase role="rafsi">-ctuca</jbophrase></member>
       <member><jbophrase>naknykemcinsyctuca</jbophrase></member>
     </simplelist>
     <para> <indexterm type="general-imported"><primary>gismu</primary><secondary>algorithm for</secondary></indexterm> Of these forms, 
     <jbophrase>nakykemcinctu</jbophrase> is the shortest and is preferred by the scoring algorithm. On the whole, however, it might be better to just make a lujvo for 
     <jbophrase>cinse ctuca</jbophrase> (which would be 
     <jbophrase>cinctu</jbophrase>) since the sex of the teacher is rarely important. If there was a reason to specify 
     <quote>male</quote>, then the simpler tanru 
     <jbophrase>nakni cinctu</jbophrase> ( 
     <quote>male sexual-teacher</quote>) would be appropriate. This tanru is actually shorter than the four-part lujvo, since the 
     <jbophrase>ke</jbophrase> required for grouping need not be expressed.</para>
@@ -2583,21 +2583,21 @@
     
     <jbophrase>bradi</jbophrase>, 
     <jbophrase>bredi</jbophrase>, 
     <jbophrase>bridi</jbophrase>, and 
     <jbophrase>brodi</jbophrase> (but fortunately not 
     <jbophrase>brudi</jbophrase>) are all existing gismu.</para>
   </section>
   <section xml:id="section-cultural-gismu">
     <title>Cultural and other non-algorithmic gismu</title>
     <para>The following gismu were not made by the gismu creation algorithm. They are, in effect, coined words similar to fu'ivla. They are exceptions to the otherwise mandatory gismu creation algorithm where there was sufficient justification for such exceptions. Except for the small metric prefixes and the assignable predicates beginning with 
-    <jbophrase role="rafsi">brod</jbophrase>-, they all end in the letter 
+    <jbophrase role="rafsi">brod-</jbophrase>, they all end in the letter 
     <jbophrase role="letteral">o</jbophrase>, which is otherwise a rare letter in Lojban gismu.</para>
     <para> <indexterm type="general-imported"><primary>gismu</primary><secondary>scientific-mathematical</secondary></indexterm> The following gismu represent concepts that are sufficiently unique to Lojban that they were either coined from combining forms of other gismu, or else made up out of whole cloth. These gismu are thus conceptually similar to lujvo even though they are only five letters long; however, unlike lujvo, they have rafsi assigned to them for use in building more complex lujvo. Assigning gismu to these concepts helps to keep the resulting lujvo reasonably short.</para>
     <variablelist>
       <varlistentry>
         <term><jbophrase>broda</jbophrase></term>
         <listitem><para>1st assignable predicate</para></listitem>
       </varlistentry>
       <varlistentry>
         <term><jbophrase>brode</jbophrase></term>
         <listitem><para>2nd assignable predicate</para></listitem>
diff --git a/todocbook/5.xml b/todocbook/5.xml
index 5459ee9..c252915 100644
--- a/todocbook/5.xml
+++ b/todocbook/5.xml
@@ -739,58 +739,52 @@
     <example role="interlinear-gloss-example" xml:id="example-random-id-N5Bt">
       <title>
         <anchor xml:id="c5e6d8"/>
       </title>
       <interlinear-gloss>
         <jbo>ta melbi je nixli ckule</jbo>
         <gloss>That is-a-(beautiful and girl) type-of school.</gloss>
       </interlinear-gloss>
     </example>
     <para>It can be understood as:</para>
-    <example role="english-example" xml:id="example-random-id-FCDa">
+    <example xml:id="example-random-id-FCDa">
       <title>
         <anchor xml:id="c5e6d9"/>
       </title>
-      <english>
-        <en>That is a girls' school and a beautiful school.</en>
-      </english>
+      <para>That is a girls' school and a beautiful school.</para>
     </example>
     <para>or as:</para>
-    <example role="english-example" xml:id="example-random-id-aFxm">
+    <example xml:id="example-random-id-aFxm">
       <title>
         <anchor xml:id="c5e6d10"/>
       </title>
-      <english>
-        <en>That is a school for things which are both girls and beautiful.</en>
-      </english>
+      <para>That is a school for things which are both girls and beautiful.</para>
     </example>
     <para> <indexterm type="general-imported"><primary>logical connectives in tanru</primary><secondary>ambiguity of</secondary></indexterm> The interpretation specified by 
     <xref linkend="example-random-id-FCDa"/> treats the tanru as a sort of abbreviation for:</para>
     <example role="interlinear-gloss-example" xml:id="example-random-id-pHHw">
       <title>
         <anchor xml:id="c5e6d11"/>
       </title>
       <interlinear-gloss>
         <jbo>ta ke melbi ckule ke'e je ke nixli ckule [ke'e]</jbo>
         <gloss>That is-a-( beautiful type-of school ) and ( girl type-of school )</gloss>
       </interlinear-gloss>
     </example>
     <para>whereas the interpretation specified by 
     <xref linkend="example-random-id-aFxm"/> does not. This is a kind of semantic ambiguity for which Lojban does not compel a firm resolution. The way in which the school is said to be of type 
     <quote>beautiful and girl</quote> may entail that it is separately a beautiful school and a girls' school; but the alternative interpretation, that the members of the school are beautiful and girls, is also possible. Still another interpretation is:</para>
-    <example role="english-example" xml:id="example-random-id-2cjH">
+    <example xml:id="example-random-id-2cjH">
       <title>
         <anchor xml:id="c5e6d12"/>
       </title>
-      <english>
-        <en>That is a school for beautiful things and also for girls.</en>
-      </english>
+      <para>That is a school for beautiful things and also for girls.</para>
     </example>
     <para>so while the logical connectives help to resolve the meaning of tanru, they by no means compel a single meaning in and of themselves.</para>
     <para> <indexterm type="general-imported"><primary>logical connectives in tanru</primary><secondary>effect on formal logical manipulations</secondary></indexterm> In general, logical connectives within tanru cannot undergo the formal manipulations that are possible with the related logical connectives that exist outside tanru; see 
     <xref linkend="chapter-connectives"/> for further details.</para>
     <para> <indexterm type="lojban-word-imported"><primary>JA selma'o</primary></indexterm> The logical connective 
     <jbophrase>je</jbophrase> is only one of the fourteen logical connectives that Lojban provides. Here are a few examples of some of the others:</para>
     <example xml:id="example-random-id-qJse" role="interlinear-gloss-example">
       <title>
         <anchor xml:id="c5e6d13"/>
       </title>
diff --git a/todocbook/6.xml b/todocbook/6.xml
index 1c72c00..e65bbd8 100644
--- a/todocbook/6.xml
+++ b/todocbook/6.xml
@@ -1753,23 +1753,23 @@
           </row>
           <row>
             <entry><jbophrase>Lottie </jbophrase>(American pronunciation)</entry>
             <entry><jbophrase valid="false">*latis</jbophrase></entry>
             <entry><jbophrase>LYtis.</jbophrase> or <jbophrase>lotis.</jbophrase></entry>
           </row>
         </tbody>
       </tgroup>
     </informaltable>
     <para><!-- FIXME: these indexterms have nowhere to go --><indexterm type="example-imported"><primary>Doyle</primary><secondary>example</secondary></indexterm>  <indexterm type="example-imported"><primary>Lyra</primary><secondary>example</secondary></indexterm>  <indexterm type="example-imported"><primary>Lottie</primary><secondary>example</secondary></indexterm>  <indexterm type="general-imported"><primary>names</primary><secondary>using rafsi</secondary></indexterm> 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 
-    <jbophrase role="rafsi">loj</jbophrase>- for 
+    <jbophrase role="rafsi">loj-</jbophrase> for 
     <jbophrase>logji</jbophrase> (logical) and 
-    <jbophrase role="rafsi">ban</jbophrase>- for 
+    <jbophrase role="rafsi">ban-</jbophrase> for 
     <jbophrase>bangu</jbophrase> (language) unite to form the name of this language:</para>
     <example role="interlinear-gloss-example" xml:id="example-random-id-uXAY">
       <title>
         <anchor xml:id="c6e12d7"/>
       </title>
       <interlinear-gloss>
         <jbo>lojban.</jbo>
         <en>Lojban</en>
       </interlinear-gloss>
     </example>
diff --git a/todocbook/7.xml b/todocbook/7.xml
index 4548681..af7f0fa 100644
--- a/todocbook/7.xml
+++ b/todocbook/7.xml
@@ -2,65 +2,57 @@
   <title>Brevity Is The Soul Of Language: Pro-sumti And Pro-bridi</title>
   <section xml:id="section-introduction">
     <title>What are pro-sumti and pro-bridi? What are they for?</title>
     <para> <indexterm type="general-imported"><primary>pronouns in English</primary><secondary>as noun abbreviations</secondary></indexterm> Speakers of Lojban, like speakers of other languages, require mechanisms of abbreviation. If every time we referred to something, we had to express a complete description of it, life would be too short to say what we have to say. In English, we have words called 
     <quote>pronouns</quote> which allow us to replace nouns or noun phrases with shorter terms. An English with no pronouns might look something like this:</para>
     
     <example role="english-example" xml:id="example-random-id-KeL4">
       <title>
         <anchor xml:id="c7e1d1"/>
       </title>
-      <english>
-        <en>Speakers of Lojban, like speakers of other languages, require mechanisms of abbreviation. If every time speakers of Lojban referred to a thing to which speakers of Lojban refer, speakers of Lojban had to express a complete description of what speakers of Lojban referred to, life would be too short to say what speakers of Lojban have to say.</en>
-      </english>
+      <para>Speakers of Lojban, like speakers of other languages, require mechanisms of abbreviation. If every time speakers of Lojban referred to a thing to which speakers of Lojban refer, speakers of Lojban had to express a complete description of what speakers of Lojban referred to, life would be too short to say what speakers of Lojban have to say.</para>
     </example>
     <para> <indexterm type="general-imported"><primary>pronouns in English</primary><secondary>as independent of abbreviations</secondary></indexterm> Speakers of this kind of English would get mightily sick of talking. Furthermore, there are uses of pronouns in English which are independent of abbreviation. There is all the difference in the world between:</para>
     
-    <example role="english-example" xml:id="example-random-id-VISf">
+    <example xml:id="example-random-id-VISf">
       <title>                   <!-- FIXME: this indexterm goes in two examples -->
         <indexterm type="example-imported"><primary>shook stick</primary><secondary>example</secondary></indexterm>
         <anchor xml:id="c7e1d2"/>
       </title>
-      <english>
-        <en>John picked up a stick and shook it.</en>
-      </english>
+      <para>John picked up a stick and shook it.</para>
     </example>
     <para>and</para>
-    <example role="english-example" xml:id="example-random-id-GoqJ">
+    <example xml:id="example-random-id-GoqJ">
       <title>
         <anchor xml:id="c7e1d3"/>
       </title>
-      <english>
-        <en>John picked up a stick and shook a stick.</en>
-      </english>
+      <para>John picked up a stick and shook a stick.</para>
     </example>
     <para>
       <xref linkend="example-random-id-GoqJ"/> does not imply that the two sticks are necessarily the same, whereas 
     <xref linkend="example-random-id-VISf"/> requires that they are.</para>
     <para> <indexterm type="lojban-word-imported"><primary>GOhA selma'o</primary></indexterm>  <indexterm type="lojban-word-imported"><primary>KOhA selma'o</primary></indexterm>  <indexterm type="general-imported"><primary>pro-sumti</primary><secondary>series</secondary></indexterm>  <indexterm type="general-imported"><primary>pro-sumti</primary><secondary>compared to pro-bridi as means of abbreviation</secondary></indexterm>  <indexterm type="general-imported"><primary>pro-bridi</primary><secondary>compared to pro-sumti as means of abbreviation</secondary></indexterm>  <indexterm type="general-imported"><primary>pro-bridi</primary><secondary>definition</secondary></indexterm>  <indexterm type="general-imported"><primary>pro-sumti</primary><secondary>definition</secondary></indexterm>  <indexterm type="general-imported"><primary>pro-sumti</primary><secondary>compared to pronouns in usage as abbreviations</secondary></indexterm>  <indexterm type="general-imported"><primary>pronouns</primary><secondary>compared to pro-sumti in usage as abbreviations</secondary></indexterm> In Lojban, we have sumti rather than nouns, so our equivalent of pronouns are called by the hybrid term 
     
     <quote>pro-sumti</quote>. A purely Lojban term would be 
     <jbophrase>sumti cmavo</jbophrase>: all of the pro-sumti are cmavo belonging to selma'o KOhA. In exactly the same way, Lojban has a group of cmavo (belonging to selma'o GOhA) which serve as selbri or full bridi. These may be called 
     <quote>pro-bridi</quote> or 
     <jbophrase>bridi cmavo</jbophrase>. This chapter explains the uses of all the members of selma'o KOhA and GOhA. They fall into a number of groups, known as series: thus, in selma'o KOhA, we have among others the mi-series, the ko'a-series, the da-series, and so on. In each section, a series of pro-sumti is explained, and if there is a corresponding series of pro-bridi, it is explained and contrasted. Many pro-sumti series don't have pro-bridi analogues, however.</para>
     <para> <indexterm type="general-imported"><primary>antecedent of pro-bridi</primary><secondary>definition</secondary></indexterm>  <indexterm type="general-imported"><primary>referent of pro-bridi</primary><secondary>definition</secondary></indexterm>  <indexterm type="general-imported"><primary>antecedent of pro-sumti</primary><secondary>definition</secondary></indexterm>  <indexterm type="general-imported"><primary>referent of pro-sumti</primary><secondary>definition</secondary></indexterm> A few technical terms: The term 
     
     <quote>referent</quote> means the thing to which a pro-sumti (by extension, a pro-bridi) refers. If the speaker of a sentence is James, then the referent of the word 
     <quote>I</quote> is James. On the other hand, the term 
     <quote>antecedent</quote> refers to a piece of language which a pro-sumti (or pro-bridi) implicitly repeats. In</para>
-    <example role="english-example" xml:id="example-random-id-AnBS">
+    <example xml:id="example-random-id-AnBS">
       <title>
         <anchor xml:id="c7e1d4"/>
       </title>
-      <english>
-        <en>John loves himself</en>
-      </english>
+      <para>John loves himself</para>
     </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="section-mi-series">
     <title>Personal pro-sumti: the mi-series</title>
     <para>The following cmavo are discussed in this section:</para>
     <cmavo-list>
@@ -168,27 +160,25 @@
     <quote>we</quote> can mean 
     <jbophrase>mi</jbophrase> or 
     <jbophrase>mi'o</jbophrase> or 
     <jbophrase>mi'a</jbophrase> or even 
     
     <jbophrase>ma'a</jbophrase>, and English-speakers often suffer because they cannot easily distinguish 
     
     <jbophrase>mi'o</jbophrase> from 
     <jbophrase>mi'a</jbophrase>:</para>
     
-    <example role="english-example" xml:id="example-random-id-22dg">
+    <example xml:id="example-random-id-22dg">
       <title>
         <anchor xml:id="c7e2d2"/>
       </title>
-      <english>
-        <en>We're going to the store.</en>
-      </english>
+      <para>We're going to the store.</para>
     </example>
     <para>Does this include the listener or not? There's no way to be sure.</para>
     <para><indexterm type="general-imported"><primary>ko</primary><secondary>use for commands</secondary></indexterm>  <indexterm type="general-imported"><primary>ko</primary><secondary>use for imperatives</secondary></indexterm>  <indexterm type="general-imported"><primary>imperatives</primary><secondary>with ko</secondary></indexterm>  <indexterm type="general-imported"><primary>commands</primary><secondary>with ko</secondary></indexterm> Finally, the cmavo 
     <jbophrase>ko</jbophrase> is logically equivalent to 
     <jbophrase>do</jbophrase>; its referent is the listener. However, its use alters an assertion about the listener into a command to the listener to make the assertion true:</para>
     <example role="interlinear-gloss-example" xml:id="example-random-id-n1Rv">
       <title>
         <anchor xml:id="c7e2d3"/>
       </title>
       <interlinear-gloss>
@@ -395,28 +385,26 @@
         <cmavo>do'i</cmavo>
         <selmaho>KOhA</selmaho>
         <series>di'u-series</series>
         <description>some utterance</description>
       </cmavo-entry>
     </cmavo-list>
     <para> <indexterm type="general-imported"><primary>pro-sumti</primary><secondary>di'u-series</secondary></indexterm>  <indexterm type="general-imported"><primary>this</primary><secondary>as utterance reference in English</secondary></indexterm>  <indexterm type="general-imported"><primary>di'u-series pro-sumti</primary></indexterm>  <indexterm type="general-imported"><primary>utterance pro-sumti (see also di'u-series pro-sumti)</primary></indexterm>  <indexterm type="general-imported"><primary>pro-sumti for utterances</primary></indexterm> 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 
     <quote>that</quote> for this (indeed, the immediately preceding 
     <quote>this</quote> is an example of such a usage):</para>
-    <example role="english-example" xml:id="example-random-id-KNih">
+    <example xml:id="example-random-id-KNih">
       <title>
         <anchor xml:id="c7e4d1"/>
       </title>
-      <english>
-        <en>You don't like cats.</en>
-        <en>That is untrue.</en>
-      </english>
+      <para>You don't like cats.</para>
+      <para>That is untrue.</para>
     </example>
     <para>Here 
     <quote>that</quote> does not refer to something that can be pointed to, but to the preceding sentence 
     <quote>You don't like cats</quote>. In Lojban, therefore, 
     <xref linkend="example-random-id-KNih"/> is rendered:</para>
     <example role="interlinear-gloss-example" xml:id="example-random-id-nTou">
       <title>
         <anchor xml:id="c7e4d2"/>
       </title>
       <interlinear-gloss>
@@ -1238,22 +1226,22 @@
     <jbophrase>ra'o</jbophrase> forces the second 
     <jbophrase>mi</jbophrase> from the original bridi to mean the new speaker rather than the former speaker. This means that 
     <jbophrase>go'e ra'o</jbophrase> would be an acceptable alternative to 
     
     <jbophrase>do go'e</jbophrase> in B's statement in 
     
     <xref linkend="example-random-id-9hf5"/>.</para>
     <para> <indexterm type="general-imported"><primary>go'i-series pro-bridi</primary><secondary>in quotations</secondary></indexterm>  <indexterm type="general-imported"><primary>ri-series pro-sumti</primary><secondary>in quotations</secondary></indexterm> The anaphoric pro-sumti of this section can be used in quotations, but never refer to any of the supporting text outside the quotation, since speakers presumably do not know that they may be quoted by someone else.</para>
     
     <para> <indexterm type="general-imported"><primary>go'i-series pro-bridi</primary><secondary>in quotation series</secondary></indexterm>  <indexterm type="general-imported"><primary>ri-series pro-sumti</primary><secondary>in quotation series</secondary></indexterm> However, a 
-    <jbophrase>ri</jbophrase>-series or 
-    <jbophrase>go'a</jbophrase>-series reference within a quotation can refer to something mentioned in an earlier quotation if the two quotations are closely related in time and context. This allows a quotation to be broken up by narrative material without interfering with the pro-sumti within it. Here's an example:</para>
+    <jbophrase>ri-</jbophrase>series or 
+    <jbophrase>go'a-</jbophrase>series reference within a quotation can refer to something mentioned in an earlier quotation if the two quotations are closely related in time and context. This allows a quotation to be broken up by narrative material without interfering with the pro-sumti within it. Here's an example:</para>
     
     <example role="interlinear-gloss-example" xml:id="example-random-id-LWyE">
       <title>
         <anchor xml:id="c7e6d19"/>
       </title>
       <interlinear-gloss>
         <jbo>la djan. cusku lu mi klama le zarci li'u .i la .alis. cusku lu mi go'i li'u</jbo>
         <gloss>John says [quote] I go-to the store [unquote]. Alice says [quote] I [repeat] [unquote].</gloss>
         <en>John says, <quote>I am going to the store.</quote> Alice says, <quote>Me too.</quote></en>
       </interlinear-gloss>
@@ -1983,21 +1971,21 @@
     <jbophrase>zilpavypinxe</jbophrase> has the same place structure as 
     <jbophrase>zilrelselpinxe</jbophrase>, and 
     <jbophrase>lo zilpavypinxe</jbophrase>, like 
     <jbophrase>lo zilrelselpinxe</jbophrase>, refers to a beverage, and not to a non-existent drinker.</para>
 
     <para> <indexterm type="lojban-word-imported"><primary>bu'a</primary></indexterm><indexterm type="lojban-word-imported"><primary>co'e</primary></indexterm>  <indexterm type="general-imported"><primary>pro-bridi rafsi</primary><secondary>as producing context-dependent meanings</secondary></indexterm> The pro-bridi 
     <jbophrase>co'e</jbophrase>, 
 
     <jbophrase>du</jbophrase>, and 
     <jbophrase>bu'a</jbophrase> also have rafsi, which can be used just as if they were gismu. The resulting lujvo have (except for 
-    <jbophrase>du</jbophrase>-based lujvo) highly context-dependent meanings.</para>
+    <jbophrase>du-</jbophrase>based lujvo) highly context-dependent meanings.</para>
   </section>
   <section xml:id="section-koha-summary">
     <title>KOhA cmavo by series</title>
     <para>mi-series</para>
     <cmavo-list>
       <cmavo-entry>
         <cmavo>mi</cmavo>
         <description>I (rafsi: <jbophrase role="rafsi">mib</jbophrase>)</description>
       </cmavo-entry>
       <cmavo-entry>
diff --git a/todocbook/8.xml b/todocbook/8.xml
index b653cd6..ec4c7de 100644
--- a/todocbook/8.xml
+++ b/todocbook/8.xml
@@ -160,36 +160,32 @@
       </interlinear-gloss>
     </example>
     <para> <indexterm type="general-imported"><primary>poi</primary><secondary>discussion of translation</secondary></indexterm> without any change in meaning. Note that 
     <jbophrase>poi</jbophrase> is translated 
     <quote>which</quote> rather than 
     <quote>such-that</quote> when 
     <jbophrase>ke'a</jbophrase> has been omitted from the x1 place of the relative clause bridi. The word 
     <quote>which</quote> is used in English to introduce English relative clauses: other words that can be used are 
     <quote>who</quote> and 
     <quote>that</quote>, as in:</para>
-    <example role="english-example" xml:id="example-random-id-j5ym">
+    <example xml:id="example-random-id-j5ym">
       <title>
         <anchor xml:id="c8e1d10"/>
       </title>
-      <english>
-        <en>I saw a man who was going to the store.</en>
-      </english>
+      <para>I saw a man who was going to the store.</para>
     </example>
     <para>and</para>
-    <example role="english-example" xml:id="example-random-id-J9yC">
+    <example xml:id="example-random-id-J9yC">
       <title>
         <anchor xml:id="c8e1d11"/>
       </title>
-      <english>
-        <en>The building that the school was located in is large.</en>
-      </english>
+      <para>The building that the school was located in is large.</para>
     </example>
     <para>In 
     <xref linkend="example-random-id-j5ym"/> the relative clause is 
     <quote>who was going to the store</quote>, and in 
     <xref linkend="example-random-id-J9yC"/> 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>
@@ -570,21 +566,21 @@
     <quote>possess</quote> the person! English can't even express this relationship with a possessive - 
     <quote>the cup's friend of mine</quote> looks like nonsense - but Lojban has no trouble doing so.</para>
     
     <para><indexterm type="general-imported"><primary>incidental identification</primary><secondary>expressing with no'u</secondary></indexterm>  <indexterm type="general-imported"><primary>incidental association</primary><secondary>expressing with ne</secondary></indexterm>  <indexterm type="general-imported"><primary>po'u</primary><secondary>compared with no'u</secondary></indexterm>  <indexterm type="general-imported"><primary>pe</primary><secondary>compared with ne</secondary></indexterm>  <indexterm type="general-imported"><primary>no'u</primary><secondary>compared with po'u</secondary></indexterm>  <indexterm type="general-imported"><primary>ne</primary><secondary>compared with pe</secondary></indexterm> Finally, the cmavo 
     <jbophrase>ne</jbophrase> and 
     <jbophrase>no'u</jbophrase> stand to 
     
     <jbophrase>pe</jbophrase> and 
     <jbophrase>po'u</jbophrase>, respectively, as 
     <jbophrase>noi</jbophrase> does to 
-    <jbophrase>poi</jbophrase>- they provide incidental information:</para>
+    <jbophrase>poi-</jbophrase> they provide incidental information:</para>
     <example role="interlinear-gloss-example" xml:id="example-random-id-Arj8">
       <title>
         <anchor xml:id="c8e3d16"/>
       </title>
       <interlinear-gloss>
         <jbo>le blabi gerku ne mi cu batci do</jbo>
         <gloss>The white dog, incidentally-associated-with me, bites you.</gloss>
         <en>The white dog, which is mine, bites you.</en>
       </interlinear-gloss>
     </example>
@@ -611,27 +607,25 @@
         <anchor xml:id="c8e3d18"/>
       </title>
       <interlinear-gloss>
         <jbo>le nanmu po'u la djim. cu terpemci</jbo>
         <gloss>The man who-is Jim is-a-poet.</gloss>
         <en>The man Jim is a poet.</en>
       </interlinear-gloss>
     </example>
     <para>is appropriate. Now I am using the fact that the man I am speaking of is Jim in order to pick out which man I mean.</para>
     <para> <indexterm type="general-imported"><primary>possession</primary><secondary>Lojban usage compared with French and German in omission/inclusion</secondary></indexterm>  <indexterm type="general-imported"><primary>possession</primary><secondary>Lojban usage contrasted with English in omission/inclusion</secondary></indexterm> It is worth mentioning that English sometimes over-specifies possession from the Lojban point of view (and the point of view of many other languages, including ones closely related to English). The idiomatic English sentence</para>
-    <example role="english-example" xml:id="example-random-id-GXyS">
+    <example xml:id="example-random-id-GXyS">
       <title>
         <anchor xml:id="c8e3d19"/>
       </title>
-      <english>
-        <en>The man put his hands in his pockets.</en>
-      </english>
+      <para>The man put his hands in his pockets.</para>
     </example>
     <para>seems strange to a French- or German-speaking person: whose pockets would he put his hands into? and even odder, whose hands would he put into his pockets? In Lojban, the sentence</para>
     <example role="interlinear-gloss-example" xml:id="example-random-id-V4R1">
       <title>
         <anchor xml:id="c8e3d20"/>
       </title>
       <interlinear-gloss>
         <jbo>le nanmu cu punji le xance le daski</jbo>
         <gloss>The man puts the hand at-locus-the pocket.</gloss>
       </interlinear-gloss>
@@ -843,47 +837,47 @@
     <example xml:id="example-random-id-qMct" role="interlinear-gloss-example">
       <title>
         <anchor xml:id="c8e6d3"/>
       </title>
       <interlinear-gloss>
         <jbo>le gerku ku poi blabi cu klama</jbo>
         <gloss>The (dog) which is-white goes.</gloss>
       </interlinear-gloss>
     </example>
     <para>
-    <xref linkend="example-random-id-UmLX"/> 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="example-random-id-qmCQ"/>, on the other hand, may seem more natural to Finnish or Chinese speakers, who put the relative clause first. Note that in 
-    <xref linkend="example-random-id-qmCQ"/>, the elidable terminator 
-    <jbophrase>ku'o</jbophrase> must appear, or the selbri of the relative clause ( 
-    <jbophrase>blabi</jbophrase>) will merge with the selbri of the description ( 
-    <jbophrase>gerku</jbophrase>), resulting in an ungrammatical sentence. The purpose of the form appearing in 
+      <xref linkend="example-random-id-UmLX"/> 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="example-random-id-qmCQ"/>, on the other hand, may seem more natural to Finnish or Chinese speakers, who put the relative clause first. Note that in 
+      <xref linkend="example-random-id-qmCQ"/>, the elidable terminator 
+      <jbophrase>ku'o</jbophrase> must appear, or the selbri of the relative clause ( 
+      <jbophrase>blabi</jbophrase>) will merge with the selbri of the description ( 
+      <jbophrase>gerku</jbophrase>), resulting in an ungrammatical sentence. The purpose of the form appearing in 
     <xref linkend="example-random-id-qMct"/> will be apparent shortly.</para>
     <para>As is explained in detail in 
     <xref linkend="chapter-sumti"/>, 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="example-random-id-3nJN">
       <title>
         <anchor xml:id="c8e6d4"/>
       </title>
       <interlinear-gloss>
         <jbo>re le mu prenu cu klama le zarci</jbo>
         <gloss>Two-of the five persons go to-the market.</gloss>
         <en>Two of the five people [that I have in mind] are going to the market.</en>
         
       </interlinear-gloss>
     </example>
     <para>
-    <jbophrase>mu</jbophrase> is the inner quantifier and 
-    <jbophrase>re</jbophrase> is the outer quantifier. Now what is meant by attaching a relative clause to the sumti 
-    <jbophrase>re le mu prenu</jbophrase>? Suppose the relative clause is 
-    <jbophrase>poi ninmu</jbophrase> (meaning 
+      <jbophrase>mu</jbophrase> is the inner quantifier and 
+      <jbophrase>re</jbophrase> is the outer quantifier. Now what is meant by attaching a relative clause to the sumti 
+      <jbophrase>re le mu prenu</jbophrase>? Suppose the relative clause is 
+      <jbophrase>poi ninmu</jbophrase> (meaning 
     <quote>who are women</quote>). Now the three possible attachment points discussed previously take on significance.</para>
     <example xml:id="example-random-id-qMdb" role="interlinear-gloss-example">
       <title>
         <anchor xml:id="c8e6d5"/>
       </title>
       <interlinear-gloss>
         <jbo>re le poi ninmu ku'o mu prenu cu klama le zarci</jbo>
         <gloss>Two of the such-that([they] are-women) five persons go to-the market.</gloss>
         <en>Two women out of the five persons go to the market.</en>
       </interlinear-gloss>
@@ -1372,21 +1366,21 @@
     <example xml:id="example-random-id-qMHc" role="interlinear-gloss-example">
       <title>
         <anchor xml:id="c8e9d7"/>
       </title>
       <interlinear-gloss>
         <jbo>co'o xirma poi mi zvati</jbo>
         <gloss>Goodbye, horse such-that-(I am-at-it).</gloss>
       </interlinear-gloss>
     </example>
     <para>
-    <xref linkend="example-random-id-qmgV"/> and 
+      <xref linkend="example-random-id-qmgV"/> and 
     <xref linkend="example-random-id-qMHc"/> mean the same thing. In fact, relative clauses can appear in both places.</para>
   </section>
   <section xml:id="section-nesting">
     <title>Relative clauses within relative clauses</title>
     <para> <indexterm type="general-imported"><primary>relative clauses</primary><secondary>relative clauses within</secondary></indexterm> For the most part, these are straightforward and uncomplicated: a sumti that is part of a relative clause bridi may itself be modified by a relative clause:</para>
     <example role="interlinear-gloss-example" xml:id="example-random-id-TGiu">
       <title>
         <anchor xml:id="c8e10d1"/>
       </title>
       <interlinear-gloss>
@@ -1419,25 +1413,25 @@
     <example role="interlinear-gloss-example" xml:id="example-random-id-5TuF">
       <title>
         <anchor xml:id="c8e10d3"/>
       </title>
       <interlinear-gloss>
         <jbo>le prenu poi ke'a goi ko'a zo'u ko'a zvati le kumfa poi ke'a goi ko'e zo'u ko'a zbasu ke'a cu masno</jbo>
         <gloss>The man who (IT = it1 : it1 is-in the room which (IT = it2 : it1 built it2) is-slow.</gloss>
       </interlinear-gloss>
     </example>
     <para>
-    <xref linkend="example-random-id-5TuF"/> is more verbose than 
-    <xref linkend="example-random-id-8RdM"/>, but may be clearer, since it explicitly spells out the two 
-    <jbophrase>ke'a</jbophrase> cmavo, each on its own level, and assigns them to the assignable cmavo 
-    <jbophrase>ko'a</jbophrase> and 
-    <jbophrase>ko'e</jbophrase> (explained in Chapter 
+      <xref linkend="example-random-id-5TuF"/> is more verbose than 
+      <xref linkend="example-random-id-8RdM"/>, but may be clearer, since it explicitly spells out the two 
+      <jbophrase>ke'a</jbophrase> cmavo, each on its own level, and assigns them to the assignable cmavo 
+      <jbophrase>ko'a</jbophrase> and 
+      <jbophrase>ko'e</jbophrase> (explained in Chapter 
     <xref linkend="chapter-sumti"/>).</para>
   </section>
   <section xml:id="section-summary">
     <title>Index of relative clause cmavo</title>
     <para> <indexterm type="general-imported"><primary>relative clauses</primary><secondary>list of cmavo for</secondary></indexterm> Relative clause introducers (selma'o NOI):</para>
     <cmavo-list>
       <cmavo-entry>
         <cmavo>noi</cmavo>
         <description>incidental clauses</description>
       </cmavo-entry>
diff --git a/todocbook/9.xml b/todocbook/9.xml
index c957336..b531aa1 100644
--- a/todocbook/9.xml
+++ b/todocbook/9.xml
@@ -765,21 +765,21 @@
     <para><indexterm type="general-imported"><primary>BAI modal tags</primary><secondary>rationale for</secondary></indexterm> and almost any selbri which represents an action may need to specify a tool. Having to say 
     <jbophrase>fi'o se pilno</jbophrase> frequently would make many Lojban sentences unnecessarily verbose and clunky, so an abbreviation is provided in the language design: the compound cmavo 
     <jbophrase>sepi'o</jbophrase>.</para>
     
     <para> <indexterm type="lojban-word-imported"><primary>SE selma'o</primary></indexterm>  <indexterm type="lojban-word-imported"><primary>BAI selma'o</primary></indexterm>  <indexterm type="general-imported"><primary>conversion</primary><secondary>of BAI cmavo</secondary></indexterm>  <indexterm type="general-imported"><primary>modal tags</primary><secondary>short forms as BAI cmavo</secondary></indexterm>  <indexterm type="general-imported"><primary>fi'o constructs</primary><secondary>short forms as BAI cmavo</secondary></indexterm>  <indexterm type="general-imported"><primary>BAI selma'o</primary><secondary>as short forms for fi'o constructs</secondary></indexterm> Here 
     <jbophrase>se</jbophrase> is used before a cmavo, namely 
     <jbophrase>pi'o</jbophrase>, rather than before a brivla. The meaning of this cmavo, which belongs to selma'o BAI, is exactly the same as that of 
     
     <jbophrase>fi'o pilno fe'u</jbophrase>. Since what we want is a tag based on 
     <jbophrase>se pilno</jbophrase> rather than 
-    <jbophrase>pilno</jbophrase>- the tool, not the tool user - the grammar allows a BAI cmavo to be converted using a SE cmavo. 
+    <jbophrase>pilno-</jbophrase> the tool, not the tool user - the grammar allows a BAI cmavo to be converted using a SE cmavo. 
     <xref linkend="example-random-id-Lu15"/> may therefore be rewritten as:</para>
     <example role="interlinear-gloss-example" xml:id="example-random-id-N32m">
       <title>
         <anchor xml:id="c9e6d1"/>
       </title>
       <interlinear-gloss>
         <jbo>mi viska do sepi'o le zunle kanla</jbo>
         
         <gloss>I see you with-tool: the left eye</gloss>
         <en>I see you using my left eye.</en>
@@ -1283,21 +1283,21 @@
     </example>
     <para>The cmavo 
     <jbophrase>vei</jbophrase> and 
     <jbophrase>ve'o</jbophrase> represent mathematical parentheses, and are required so that 
     <jbophrase>ni'igi</jbophrase> affects more than just the immediately following operand, namely the first 
     <jbophrase>re</jbophrase>. (The right parenthesis, 
     <jbophrase>ve'o</jbophrase>, is an elidable terminator.) As usual, no English translation does 
     <xref linkend="example-random-id-Mfe4"/> justice.</para>
     <para> <indexterm type="general-imported"><primary>modal connectives</primary><secondary>fi'o prohibited in</secondary></indexterm>  <indexterm type="general-imported"><primary>fi'o</primary><secondary>restriction on use</secondary></indexterm> Note: Due to restrictions on the Lojban parsing algorithm, it is not possible to form modal connectives using the 
     
-    <jbophrase>fi'o</jbophrase>-plus-selbri form of modal. Only the predefined modals of selma'o BAI can be compounded as shown in 
+    <jbophrase>fi'o-</jbophrase>plus-selbri form of modal. Only the predefined modals of selma'o BAI can be compounded as shown in 
     <xref linkend="section-causals"/> and 
     <xref linkend="section-modal-connectives"/>.</para>
   </section>
   <section xml:id="section-modal-selbri">
     <title>Modal selbri</title>
     <para>Consider the example:</para>
     <example role="interlinear-gloss-example" xml:id="example-random-id-bT4c">
       <title>
         <anchor xml:id="c9e9d1"/>
       </title>
@@ -1420,21 +1420,21 @@
         <anchor xml:id="c9e9d9"/>
       </title>
       <interlinear-gloss>
         <jbo>bai tu'e mi klama le zarci .i mi cadzu le bisli [tu'u]</jbo>
         <gloss>Under-compulsion [start] I go to-the market. I walk on-the ice [end].</gloss>
       </interlinear-gloss>
     </example>
     <para>means the same thing as 
     <xref linkend="example-random-id-vCzL"/>.</para>
     <para>Note: Either BAI modals or 
-    <jbophrase>fi'o</jbophrase>-plus-selbri modals may correctly be used in any of the constructions discussed in this section.</para>
+    <jbophrase>fi'o-</jbophrase>plus-selbri modals may correctly be used in any of the constructions discussed in this section.</para>
   </section>
   <section xml:id="section-relative-phrases">
     <title>Modal relative phrases; Comparison</title>
     <para>The following cmavo are discussed in this section:</para>
     <cmavo-list>
       <cmavo-entry>
         <cmavo>pe</cmavo>
         <selmaho>GOI</selmaho>
         <description>restrictive relative phrase</description>
       </cmavo-entry>
@@ -1659,21 +1659,21 @@
     <jbophrase>ci'u</jbophrase> ( 
     
     <quote>on scale</quote>), 
     <jbophrase>de'i</jbophrase> ( 
     
     <quote>dated</quote>), 
     <jbophrase>du'i</jbophrase> ( 
     
     <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> <indexterm type="general-imported"><primary>fi'o modals</primary><secondary>usage in relative phrases</secondary></indexterm> Note: The uses of modals discussed in this section are applicable both to BAI modals and to 
-    <jbophrase>fi'o</jbophrase>-plus-selbri modals.</para>
+    <jbophrase>fi'o-</jbophrase>plus-selbri modals.</para>
   </section>
   <section xml:id="section-mixed-connection">
     <title>Mixed modal connection</title>
     <para>It is possible to mix logical connection (explained in 
     <xref linkend="chapter-connectives"/>) 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="example-random-id-4qz4">
       <title>
         <anchor xml:id="c9e11d1"/>
       </title>
       <interlinear-gloss>
@@ -1774,21 +1774,21 @@
     <xref linkend="example-random-id-qmRL"/> and 
     <xref linkend="example-random-id-qMSb"/>, because 
     <jbophrase>ke ... ke'e</jbophrase> cannot extend across more than one sentence. It would also be possible to change the 
     <jbophrase>.ijeseri'abo</jbophrase> to 
     <jbophrase>.ije seri'a</jbophrase>, which would show that the 
     <jbophrase>tu'e ... tu'u</jbophrase> portion was an effect, but would not pin down the 
     <jbophrase>mi bevri le dakli</jbophrase> portion as the cause. It is legal for a modal (or a tense; see 
     <xref linkend="chapter-tenses"/>) to modify the whole of a 
     <jbophrase>tu'e ... tu'u</jbophrase> construct.</para>
     <para> <indexterm type="general-imported"><primary>fi'o</primary><secondary>mixed modal connection with</secondary></indexterm> Note: The uses of modals discussed in this section are applicable both to BAI modals and to 
-    <jbophrase>fi'o</jbophrase>-plus-selbri modals.</para>
+    <jbophrase>fi'o-</jbophrase>plus-selbri modals.</para>
   </section>
   <section xml:id="section-jai">
     <title>Modal conversion: JAI</title>
     <para>The following cmavo are discussed in this section:</para>
     <cmavo-list>
       <cmavo-entry>
         <cmavo>jai</cmavo>
         <selmaho>JAI</selmaho>
         <description>modal conversion</description>
         
@@ -1862,21 +1862,21 @@
       <interlinear-gloss>
         <jbo>mi jai se krinu le nu mi viska le cukta kei [fai le nu mi lebna le cukta]</jbo>
         <gloss>I am-justified by the event-of (I see the book) [namely, the event-of (I take the book)]</gloss>
         <en>I am justified in taking the book by seeing the book.</en>
       </interlinear-gloss>
     </example>
     <para> <indexterm type="general-imported"><primary>modal conversion without modal</primary><secondary>as vague</secondary></indexterm> 
     <xref linkend="example-random-id-qMse"/>, with the bracketed part omitted, allows us to say that 
     <quote>I am justified</quote> whereas in fact it is my action that is justified. This construction is vague, but useful in representing natural-language methods of expression.</para>
     <para> <indexterm type="general-imported"><primary>fi'o</primary><secondary>and modal conversion</secondary></indexterm>  <indexterm type="general-imported"><primary>modal conversion with fi'o</primary></indexterm> Note: The uses of modals discussed in this section are applicable both to BAI modals and to 
-    <jbophrase>fi'o</jbophrase>-plus-selbri modals.</para>
+    <jbophrase>fi'o-</jbophrase>plus-selbri modals.</para>
   </section>
   <section xml:id="section-negation">
     <title>Modal negation</title>
     <para> <indexterm type="general-imported"><primary>modals</primary><secondary>negation of</secondary></indexterm>  <indexterm type="general-imported"><primary>negation of modals</primary></indexterm> Negation is explained in detail in 
     <xref linkend="chapter-negation"/>. There are two forms of negation in Lojban: contradictory and scalar negation. Contradictory negation expresses what is false, whereas scalar negation says that some alternative to what has been stated is true. A simple example is the difference between 
     <quote>John didn't go to Paris</quote> (contradictory negation) and 
     <quote>John went to (somewhere) other than Paris</quote> (scalar negation).</para>
     <para><indexterm type="general-imported"><primary>modals</primary><secondary>contradictory negation of</secondary></indexterm>  <indexterm type="general-imported"><primary>negation of modals</primary><secondary>contradictory</secondary></indexterm> Contradictory negation involving BAI cmavo is performed by appending 
     <jbophrase>-nai</jbophrase> (of selma'o NAI) to the BAI. A common use of modals with 
     <jbophrase>-nai</jbophrase> is to deny a causal relationship:</para>
diff --git a/todocbook/TODO b/todocbook/TODO
index d974368..9d2c4df 100644
--- a/todocbook/TODO
+++ b/todocbook/TODO
@@ -19,29 +19,20 @@ Zort: Chapters 3 to 9 (they contain FIXMEs though; the typical FIXME
 Ignore Chapter 2 for now.
 
  ------
 
 If you have any trouble, add a FIXME comment, like so:
 
 <!-- FIXME: detailed explanation here -->
 
  ------
 
-Fix the chapter name so it's just the second part, i.e.
-
-    <title>Chapter 5
-      <quote>Pretty Little Girls' School</quote>: The Structure Of Lojban selbri</title>
-
-becomes:
-
-    <title><quote>Pretty Little Girls' School</quote>: The Structure Of Lojban selbri</title>
-
 Make sure the <interlinear-gloss> bits look right in the output (which
 is why the columns are so spaced out).
 
  ------
 
 Fix IDs/tags.  A command like the following should do the trick:
 
   sed -i 's/"cll_chapter8-section1"/"chapter-relative-clauses-section-poi"/g' [0-9]*.xml
 
 BUT FIRST: check that it doesn't already exist:
@@ -61,22 +52,22 @@ using - based slugs rather than _ based, so drop all special
 characters, lowercase, replace space with -.
 
 Make sure that the ids for chapters have "chapter-" at the start,
 "section-" for the sections, and "example-" for the examples; we
 might need them for auto-processing.
 
 Do this for all sections.  Feel free to do it for examples too if an
 example has an obvious title, but it's much less important there, so
 not worth spending time on for the first pass.
 
-References to examples should be changed to <xref>s, using the random
-id of the example in question, e.g. <xref linkend="example-random-id-qjmr"/>
+References to examples in the text should be changed to <xref>s, using
+the random id of the example in question, e.g. <xref linkend="example-random-id-qjmr"/>
 
 The important thing here is that *NOTHING* mentions a fixed number!
 *NOWHERE* in the docbook should *ANYTHING* be aware that it is in
 chapter 20 or section 7 or anything like that.  This is to give us
 the freedom to move things around later.
 
 Numeric-based stuff will all be autogenerated during processing,
 based on the current state of the docs.
 
 THERE IS ONE EXCEPTION: DO NOT change anchors that are one to three
@@ -115,25 +106,23 @@ role="diphthong", and role="rafsi".
 change it, or think it's actually correct in some particular place,
 post to the BPFK list.
 
  ------
 
 If an example/interlinear-gloss consists solely of English, replace
 the <interlinear-gloss>...</interlinear-gloss> with <para>...</para>
 
  ------
 
-
-Make sure all the components of <example>s are appropriate wrapped in
-<jbo>, <gloss>, <en>, or <ipa> (if it doesn't fit one of those, make
-up a tag and report it). Many of the non-three-part examples are
-messed up like this.
+Make sure all the components of <example>s are appropriately wrapped in
+<jbo>, <gloss>, <en>, <ipa>, or <foreign> (if it doesn't fit one of
+those, make up a tag and report it).
 
  ------
  
 Entries like <indexterm type="lojban-word-imported"> (NOTE the type)
 probably need to be destroyed; there should be a bit of Lojban near
 them that can be wrapped in <jbophrase>, to exactly the same effect
 as the <indexterm> entry.  If you can't find such a correspondance,
 add a FIXME comment.
 
  ------
@@ -175,32 +164,33 @@ All such indexterm entries should end up in the example itself, like so:
 - It seems that there is a problem with the cmavo lists at the
   beginning of sections having missing entries; in particular, ones
   wwith + in the selma'o, maybe?; they need to be manually checked
 - lojban words, lojban phrases, terms of art ("abstraction"),
   others?... should each have their own index
 - cll_chapter5-section1 should be content-words-brivla or so ; those
   IDs should not change when things are moved around
 - list the members of each selma'o in chapter 20
 - make sure the examples that aren't interlinear glosses don't have
   that as their role
-   - so far there's also pronunciation-example,
-   compound-cmavo-example, lujvo-making-example, lojbanization-example
+   - so far there's pronunciation-example,
+   compound-cmavo-example, lujvo-making-example,
+   lojbanization-example, english-example
 - <phrase role="IPA">∞</phrase> is *not* IPA
 - <@xalbo> I do think having distinct structures for quoted correct
   lojban and for intentionally incorrect lojban (if there's any, but
   I would expect there is) would probably be a good thing. <@xalbo>
   (found one: search for djeimz) <@xalbo> I see three cases, though
   I don't know if they're all represented in the text: valid, good
   lojban, invalid lojban, and something in between ({lo nanmu
   bajra}, for instance; maybe worth flagging with a "this isn't what
   you think it is" type of thing
-  - use <jbophrase valid="false">...</jbophrase> for purposely na
+  - use <jbophrase valid="false">...</jbophrase> for purposeful na
       gendra and <jbophrase valid="iffy">...</jbophrase> for na smudra
 - In the mediaobjects in chapter 1, can we do better than <alt>The
   picture for chapter 20</alt> in terms of non-numerical cross
   referencing?
 - Replace chapter xrefs with section xrefs
 - Fix all FIXMEs; in particular the output of:
   grep 'FIXME:' [0-9]*.xml | grep -v 'TAG SPOT'
 
 ==================
   Display

-- 
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.