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

[bpfk] dag-cll git updates for Mon Feb 7 20:21:08 EST 2011



commit 2b7ef73d99932ec76086cfd5d219f4076193196e
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date:   Mon Feb 7 16:21:22 2011 -0800

    Everything compiles now; yay.  Still don't touch it.

diff --git a/todocbook/10.xml b/todocbook/10.xml
index 219b492..38d2740 100644
--- a/todocbook/10.xml
+++ b/todocbook/10.xml
@@ -3600,35 +3600,41 @@
             </cmavo-entry>
             <para>etc.</para>
           </cmavo-list>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>MOhI</term>
         <listitem>
           <para>spatial movement flag</para>
           <cmavo-list>
-            <term>mo'i</term>
-            <listitem><para>motion</para></listitem>
+            <cmavo-entry>
+              <cmavo>mo'i</cmavo>
+              <description>motion</description>
+            </cmavo-entry>
           </cmavo-list>
           <para>see <xref linkend="section-direction-cmavo"/></para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>KI</term>
         <listitem>
           <para>set or reset sticky tense</para>
           <cmavo-list>
-            <term>tense+<valsi>ki</valsi></term>
-            <listitem><para>set</para></listitem>
-            <term><valsi>ki</valsi> alone</term>
-            <listitem><para>reset</para></listitem>
+            <cmavo-entry>
+              <cmavo>tense+<valsi>ki</valsi></cmavo>
+              <description>set</description>
+            </cmavo-entry>
+            <cmavo-entry>
+              <cmavo><valsi>ki</valsi> alone</cmavo>
+              <description>reset</description>
+            </cmavo-entry>
           </cmavo-list>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>CUhE</term>
         <listitem>
           <para>tense question, reference point</para>
           <cmavo-list>
             <cmavo-entry>
               <cmavo>cu'e</cmavo>
diff --git a/todocbook/13.xml b/todocbook/13.xml
index c646df7..048d4be 100644
--- a/todocbook/13.xml
+++ b/todocbook/13.xml
@@ -873,26 +873,29 @@
       <cmavo-entry>
         <cmavo>ru'e</cmavo>
         <gismu>ruble</gismu>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>cu'i</cmavo>
         <gismu>cumki</gismu>
       </cmavo-entry>
       <cmavo-entry>
         <compound>nairu'e</compound>
+        <gismu></gismu>
       </cmavo-entry>
       <cmavo-entry>
         <compound>naisai</compound>
+        <gismu></gismu>
       </cmavo-entry>
       <cmavo-entry>
         <compound>naicai</compound>
+        <gismu></gismu>
       </cmavo-entry>
     </cmavo-list>
     <para> <indexterm type="general-imported"><primary>attitude</primary><secondary>scalar</secondary></indexterm>  <indexterm type="general-imported"><primary>scalar attitude</primary></indexterm> A scalar attitude is expressed by using the attitudinal word, and then following it by the desired scalar intensity. The bias creeps in because the 
     
     <quote>negative</quote> emotions take the extra syllable 
     <valsi>nai</valsi> to indicate their negative position on the axis, and thus require a bit more effort to express.</para>
     <para> <indexterm type="general-imported"><primary>attitudinal scale</primary><secondary>usage</secondary></indexterm> Much of this system is optional. You can express an attitude without a scale indicator, if you don't want to stop and think about how strongly you feel. Indeed, for most attitudinals, we've found that either no scalar value is used, or 
     <valsi>cai</valsi> is used to indicate especially high intensity. Less often, 
     
     <valsi>ru'e</valsi> is used for a recognizably weak intensity, and 
diff --git a/todocbook/14.xml b/todocbook/14.xml
index 3e1e992..81db734 100644
--- a/todocbook/14.xml
+++ b/todocbook/14.xml
@@ -1852,27 +1852,27 @@
       <title>
         <anchor xml:id="c14e13d14"/>
       </title>
       <interlinear-gloss>
         <jbo>do djica tu'a ge'i loi ckafi gi loi tcati</jbo>
         <gloss>You desire something-about [truth function?] a-mass-of coffee [or] a-mass-of tea?</gloss>
       </interlinear-gloss>
     </example>
     <para>the answer must be in afterthought form.</para>
     <para> <indexterm type="general-imported"><primary>connective questions</primary><secondary>compared with other languages</secondary></indexterm> There are natural languages, notably Chinese, which employ the Lojbanic form of connective question. The Chinese sentence</para>
-    <example role="interlinear-gloss-example" xml:id="example-random-id-HyVv">
+    <example xml:id="example-random-id-HyVv">
       <title>
         <anchor xml:id="c14e13d15"/>
       </title>
-      <interlinear-gloss>
-        <foreign xml:lang="zh">ni<superscript>3</superscript> zou<superscript>3</superscript> hai<superscript>2</superscript>shi pao</foreign>
-      </interlinear-gloss>
+      <para>
+        <foreignphrase xml:lang="zh">ni<superscript>3</superscript> zou<superscript>3</superscript> hai<superscript>2</superscript>shi pao</foreignphrase>
+      </para>
     </example>
     <para>means 
     <quote>Do you walk or run?</quote>, and is exactly parallel to the Lojban:</para>
     <example role="interlinear-gloss-example" xml:id="example-random-id-3jIq">
       <title>
         <anchor xml:id="c14e13d16"/>
       </title>
       <interlinear-gloss>
         <jbo>do cadzu gi'i bajra</jbo>
         
diff --git a/todocbook/4.xml b/todocbook/4.xml
index 4b2f41e..6b99cf5 100644
--- a/todocbook/4.xml
+++ b/todocbook/4.xml
@@ -586,51 +586,51 @@
     <oldjbophrase>mamta patfu</oldjbophrase> could mean not 
     <quote>grandfather</quote> but simply 
     <quote>father with some motherly attributes</quote>, depending on the culture. If absolute clarity is required, there are ways to expand upon and explain the exact interrelationship between the components; but such detail is usually not needed.</para>
     <para> <indexterm type="general-imported"><primary>tanru</primary><secondary>to lujvo</secondary></indexterm>  <indexterm type="general-imported"><primary>lujvo</primary><secondary>from tanru</secondary></indexterm>  <indexterm type="general-imported"><primary>brivla</primary><secondary>from tanru</secondary></indexterm> When a concept expressed in a tanru proves useful, or is frequently expressed, it is desirable to choose one of the possible meanings of the tanru and assign it to a new brivla. For 
     <xref linkend="example-random-id-xhQP"/>, we would probably choose 
     <quote>user of computers</quote>, and form the new word</para>
     <example role="lujvo-example" xml:id="example-random-id-v5YD">
       <title>
         <anchor xml:id="c4e5d5"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>sampli</jbo>
-      </lujvo>
+      </lujvo-making>
     </example>
     <para>Such a brivla, built from the rafsi which represent its component words, is called a 
     <valsi>lujvo</valsi>. Another example, corresponding to the tanru of 
     <xref linkend="example-random-id-oLE3"/>, would be:</para>
     <example role="lujvo-example" xml:id="example-random-id-aiAR">
       <title>
         <anchor xml:id="c4e5d6"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>bralo'i</jbo>
         <gloss>big-boat</gloss>
         <en>ship</en>
-      </lujvo>
+      </lujvo-making>
     </example>
     <para> <indexterm type="general-imported"><primary>lujvo</primary><secondary>construction of</secondary></indexterm>  <indexterm type="general-imported"><primary>rafsi</primary><secondary>definition</secondary></indexterm>  <indexterm type="general-imported"><primary>lujvo</primary><secondary>unambiguous decomposition of</secondary></indexterm> The lujvo representing a given tanru is built from units representing the component gismu. These units are called 
     <valsi>rafsi</valsi> in Lojban. Each rafsi represents only one gismu. The rafsi are attached together in the order of the words in the tanru, occasionally inserting so-called 
     <quote>hyphen</quote> letters to ensure that the pieces stick together as a single word and cannot accidentally be broken apart into cmavo, gismu, or other word forms. As a result, each lujvo can be readily and accurately recognized, allowing a listener to pick out the word from a string of spoken Lojban, and if necessary, unambiguously decompose the word to a unique source tanru, thus providing a strong clue to its meaning.</para>
     
     <para>The lujvo that can be built from the tanru 
     <oldjbophrase>mamta patfu</oldjbophrase> in 
     <xref linkend="example-random-id-KQ4s"/> is</para>
     <example role="lujvo-example" xml:id="example-random-id-TCUH">
       <title>
         <anchor xml:id="c4e5d7"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>mampa'u</jbo>
-      </lujvo>
+      </lujvo-making>
     </example>
     <para>which refers specifically to the concept 
     <quote>maternal grandfather</quote>. The two gismu that constitute the tanru are represented in 
     <oldjbophrase>mampa'u</oldjbophrase> by the rafsi 
     <rafsi>mam-</rafsi> and 
     <rafsi>-pa'u</rafsi>, respectively; these two rafsi are then concatenated together to form 
     <oldjbophrase>mampa'u</oldjbophrase>.</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 
     
@@ -649,26 +649,26 @@
     
     <xref linkend="section-rafsi"/>.</para>
     <para> <indexterm type="general-imported"><primary>glue in lujvo</primary><secondary>n-hyphen as</secondary></indexterm>  <indexterm type="general-imported"><primary>n-hyphen</primary><secondary>use of</secondary></indexterm>  <indexterm type="general-imported"><primary>glue in lujvo</primary><secondary>r-hyphen as</secondary></indexterm>  <indexterm type="general-imported"><primary>r-hyphen</primary><secondary>use of</secondary></indexterm> An 
     <letteral>r</letteral> (in some cases, an 
     <letteral>n</letteral>) is inserted when a CVV-form rafsi attaches to the beginning of a lujvo in such a way that there is no consonant cluster. For example, in the lujvo</para>
     <example role="lujvo-example" xml:id="example-random-id-3Qtv">
       <title>
         <indexterm type="example-imported"><primary>field rations</primary><secondary>example</secondary></indexterm>
         <anchor xml:id="c4e5d8"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>soirsai</jbo>
         <veljvo>sonci sanmi</veljvo>
         <gloss>soldier meal</gloss>
         <en>field rations</en>
-      </lujvo>
+      </lujvo-making>
     </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 
     <rafsi>soi-</rafsi> and 
     <rafsi>-sai</rafsi> are joined, with the additional 
     
     <letteral>r</letteral> making up the 
     <morphology>rs</morphology> consonant pair needed to make the word a brivla. Without the 
     <letteral>r</letteral>, the word would break up into 
     <oldjbophrase>soi sai</oldjbophrase>, 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>
     
@@ -686,72 +686,72 @@
     <quote>long rafsi</quote>, they are called 
     
     <quote>unreduced lujvo</quote>.</para>
     
     <para>Some examples of unreduced lujvo forms are:</para>
     
     <example xml:id="example-random-id-qj84" role="lujvo-example">
       <title>
         <anchor xml:id="c4e6d1"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>mamtypatfu</jbo>
         <veljvo>mamta patfu</veljvo>
         <gloss><quote>mother father</quote></gloss>
         <en>or <quote>maternal grandfather</quote></en>
-      </lujvo>
+      </lujvo-making>
     </example>
     <example xml:id="example-random-id-qj99" role="lujvo-example">
       <title>
         <anchor xml:id="c4e6d2"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>lerfyliste</jbo>
         <veljvo>lerfu liste</veljvo>
         <gloss><quote>letter list</quote> or a <quote>list of letters</quote></gloss>
         <en>(letters of the alphabet)</en>
-      </lujvo>
+      </lujvo-making>
     </example>
     <example xml:id="example-random-id-qj9G" role="lujvo-example">
       <title>
         <anchor xml:id="c4e6d3"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>nancyprali</jbo>
         <veljvo>nanca prali</veljvo>
         <gloss><quote>year profit</quote></gloss>
         <en>or <quote>annual profit</quote></en>
-      </lujvo>
+      </lujvo-making>
     </example>
     <example xml:id="example-random-id-qJbi" role="lujvo-example">
       <title>
         <anchor xml:id="c4e6d4"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>prunyplipe</jbo>
         <veljvo>pruni plipe</veljvo>
         <gloss><quote>elastic (springy) leap</quote></gloss>
         <en>or <quote>spring</quote> (the verb)</en>
-      </lujvo>
+      </lujvo-making>
     </example>
     <example xml:id="example-random-id-qjbP" role="lujvo-example">
       <title>
         <indexterm type="example-imported"><primary>supper</primary><secondary>example</secondary></indexterm>
         <anchor xml:id="c4e6d5"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>vancysanmi</jbo>
         <veljvo>vanci sanmi</veljvo>
         <gloss><quote>evening meal</quote></gloss>
         <en>or <quote>supper</quote></en>
         
-      </lujvo>
+      </lujvo-making>
     </example>
     <para>   <indexterm type="general-imported"><primary>short rafsi</primary></indexterm>  <indexterm type="general-imported"><primary>rafsi</primary><secondary>short</secondary></indexterm> In addition to these two forms, each gismu may have up to three additional short rafsi, three letters long. All short rafsi have one of the forms CVC, CCV, or CVV. The total number of rafsi forms that are assigned to a gismu depends on how useful the gismu is, or is presumed to be, in making lujvo, when compared to other gismu that could be assigned the rafsi.</para>
     <para> <indexterm type="general-imported"><primary>-er</primary><secondary>use of zmadu in forming</secondary></indexterm>  <indexterm type="general-imported"><primary>comparatives</primary><secondary>use of zmadu in forming</secondary></indexterm> For example, 
     <valsi>zmadu</valsi> ( 
     <quote>more than</quote>) has the two short rafsi 
     <rafsi>zma</rafsi> and 
     <rafsi>mau</rafsi> (in addition to its unreduced rafsi 
     
     <rafsi>zmad</rafsi> and 
     <valsi>zmadu</valsi>), because a vast number of lujvo have been created based on 
@@ -810,21 +810,21 @@
           </row>
         </tbody>
       </tgroup>
     </informaltable>
     <para>(The only actual short rafsi for 
     <valsi>sakli</valsi> is 
     <rafsi>-sal-</rafsi>.)</para>
     <para>For gismu of the form CCVCV, like 
     <valsi>blaci</valsi>, the only short rafsi forms that can exist are:</para>
     <informaltable>
-      <tgroup cols="">
+      <tgroup cols="3">
         <colspec colnum="1" colname="col1"/>
         <colspec colnum="2" colname="col2"/>
         <colspec colnum="3" colname="col3"/>
         <tbody>
           <row>
             <entry>CVC</entry>
             <entry>134</entry>
             <entry>-<rafsi>bac-</rafsi></entry>
           </row>
           <row>
@@ -876,77 +876,77 @@
     
     <rafsi>mam</rafsi> is assigned to it.</para>
     <para> <indexterm type="general-imported"><primary>numbers</primary><secondary>rafsi for</secondary></indexterm>  <indexterm type="general-imported"><primary>rafsi for numbers</primary></indexterm> Some cmavo also have associated rafsi, usually CVC-form. For example, the ten common numerical digits, which are all CV form cmavo, each have a CVC-form rafsi formed by adding a consonant to the cmavo. Most cmavo that have rafsi are ones used in composing tanru.</para>
     <para> <indexterm type="general-imported"><primary>fully reduced lujvo</primary><secondary>definition</secondary></indexterm>  <indexterm type="general-imported"><primary>lujvo</primary><secondary>fully reduced</secondary></indexterm> The term for a lujvo made up solely of short rafsi is 
     <quote>fully reduced lujvo</quote>. Here are some examples of fully reduced lujvo:</para>
     
     <example xml:id="example-random-id-qJc2" role="lujvo-example">
       <title>
         <anchor xml:id="c4e6d6"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>cumfri</jbo>
         <veljvo>cumki lifri</veljvo>
         <gloss><quote>possible experience</quote></gloss>
-      </lujvo>
+      </lujvo-making>
     </example>
     <example xml:id="example-random-id-qjcA" role="lujvo-example">
       <title>
         <anchor xml:id="c4e6d7"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>klezba</jbo>
         <veljvo>klesi zbasu</veljvo>
         <gloss><quote>category make</quote></gloss>
-      </lujvo>
+      </lujvo-making>
     </example>
     <example xml:id="example-random-id-qjD7" role="lujvo-example">
       <title>
         <anchor xml:id="c4e6d8"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>kixta'a</jbo>
         <veljvo>krixa tavla</veljvo>
         <gloss><quote>cry-out talk</quote></gloss>
-      </lujvo>
+      </lujvo-making>
     </example>
     <example xml:id="example-random-id-qJDa" role="lujvo-example">
       <title>
         <anchor xml:id="c4e6d9"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>sniju'o</jbo>
         <veljvo>sinxa djuno</veljvo>
         <gloss><quote>sign know</quote></gloss>
-      </lujvo>
+      </lujvo-making>
     </example>
     <para>In addition, the unreduced forms in <xref linkend="example-random-id-qj84"/> and <xref linkend="example-random-id-qj99"/> may be fully reduced to:</para>
     <example xml:id="example-random-id-qjdE" role="lujvo-example">
       <title>
         <anchor xml:id="c4e6d10"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>mampa'u</jbo>
         <veljvo>mamta patfu</veljvo>
         <gloss><quote>mother father</quote></gloss>          
         <en>or <quote>maternal grandfather</quote></en>
-      </lujvo>
+      </lujvo-making>
     </example>
     <example xml:id="example-random-id-qJDg" role="lujvo-example">
       <title>
         <anchor xml:id="c4e6d11"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>lerste</jbo>
         <veljvo>lerfu liste</veljvo>
         <gloss><quote>letter list</quote> or a <quote>list of letters</quote></gloss>
-      </lujvo>
+      </lujvo-making>
     </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 
     <letteral>y</letteral> or one of the consonants 
     <letteral>r</letteral> and 
     <letteral>n</letteral>. (The letter 
     <letteral>l</letteral> 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 
@@ -990,87 +990,87 @@
     <oldjbophrase valid="false">ro'irre'o</oldjbophrase> (which has an impermissible double consonant); the 
     <letteral>n-</letteral>hyphen is required, and the correct form of the hyphenated lujvo is 
     <oldjbophrase>ro'inre'o</oldjbophrase>. The same lujvo could also be expressed without hyphenation as 
     <oldjbophrase>rokre'o</oldjbophrase>.</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 
     <valsi>zei</valsi>. Thus,</para>
     <example role="lujvo-example" xml:id="example-random-id-VeGL">
       <title>
         <anchor xml:id="c4e6d12"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>bridi zei valsi</jbo>
-      </lujvo>
+      </lujvo-making>
     </example>
     <para> <indexterm type="general-imported"><primary>cmavo without rafsi</primary><secondary>method of including in lujvo</secondary></indexterm>  <indexterm type="general-imported"><primary>fu'ivla</primary><secondary>method of including in lujvo</secondary></indexterm>  <indexterm type="general-imported"><primary>cmene</primary><secondary>method of including in lujvo</secondary></indexterm>  <indexterm type="general-imported"><primary>rafsi</primary><secondary>lack of</secondary><tertiary>effect on forming lujvo</tertiary></indexterm>  <indexterm type="general-imported"><primary>lujvo</primary><secondary>from cmavo with no rafsi</secondary></indexterm> is the exact equivalent of 
     <oldjbophrase>brivla</oldjbophrase> (but not necessarily the same as the underlying tanru 
     <oldjbophrase>bridi valsi</oldjbophrase>, which could have other meanings.) Using 
     <valsi>zei</valsi> is the only way to get a cmavo lacking a rafsi, a cmene, or a fu'ivla into a lujvo:</para>
     <example xml:id="example-random-id-qJe1" role="lujvo-example">
       <title>
         <indexterm type="example-imported"><primary>X-ray</primary><secondary>example</secondary></indexterm>
         <anchor xml:id="c4e6d13"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>xy. zei kantu</jbo>
         <en>X ray</en>
-      </lujvo>
+      </lujvo-making>
     </example>
     <example xml:id="example-random-id-qJeE" role="lujvo-example">
       <title>
         <indexterm type="example-imported"><primary>Persian rug</primary><secondary>example</secondary></indexterm>
         <indexterm type="example-imported"><primary>rug</primary><secondary>Persian</secondary><tertiary>example</tertiary></indexterm>
         <anchor xml:id="c4e6d14"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>kulnr,farsi zei lolgai</jbo>
         <gloss>Farsi floor-cover</gloss>
         <en>Persian rug</en>
-      </lujvo>
+      </lujvo-making>
     </example>
     <example xml:id="example-random-id-qJef" role="lujvo-example">
       <title>
         <indexterm type="example-imported"><primary>hepatitis</primary><secondary>example</secondary></indexterm>
         <anchor xml:id="c4e6d15"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>na'e zei .a zei na'e zei by. livgyterbilma</jbo>
         <gloss>non-A, non-B liver-disease</gloss>
         <en>non-A, non-B hepatitis</en>
-      </lujvo>
+      </lujvo-making>
     </example>
     <example xml:id="example-random-id-qJEh" role="lujvo-example">
       <title>
         <indexterm type="example-imported"><primary>Sherman tank</primary><secondary>example</secondary></indexterm>
         <indexterm type="example-imported"><primary>tank</primary><secondary>Sherman</secondary><tertiary>example</tertiary></indexterm>
         <anchor xml:id="c4e6d16"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>.cerman. zei jamkarce</jbo>
         <gloss>Sherman war-car</gloss>
         <en>Sherman tank</en>
-      </lujvo>
+      </lujvo-making>
     </example>
     <para><xref linkend="example-random-id-qJef"/> is particularly noteworthy because the phrase that would be produced by removing the 
     <valsi>zei</valsi>s from it doesn't end with a brivla, and in fact is not even grammatical. As written, the example is a tanru with two components, but by adding a 
     <valsi>zei</valsi> between 
     <oldjbophrase>by.</oldjbophrase> and 
     <oldjbophrase>livgyterbilma</oldjbophrase> to produce</para>
     <example role="lujvo-example" xml:id="example-random-id-Wnaz">
       <title>
         <indexterm type="example-imported"><primary>hepatitis</primary><secondary>example</secondary></indexterm>
         <anchor xml:id="c4e6d17"/>
       </title>
-      <lujvo>
+      <lujvo-making>
         <jbo>na'e zei .a zei na'e zei by. zei livgyterbilma</jbo>
         <en>non-A-non-B-hepatitis</en>
-      </lujvo>
+      </lujvo-making>
     </example>
     <para>the whole phrase would become a single lujvo. The longer lujvo of 
     <xref linkend="example-random-id-Wnaz"/> may be preferable, because its place structure can be built from that of 
     <valsi>bilma</valsi>, whereas the place structure of a lujvo without a brivla must be constructed ad hoc.</para>
     <para> <indexterm type="general-imported"><primary>cmavo</primary><secondary>contrasted with rafsi in usage</secondary></indexterm>  <indexterm type="general-imported"><primary>rafsi</primary><secondary>contrasted with cmavo in usage</secondary></indexterm>  <indexterm type="general-imported"><primary>rafsi</primary><secondary>contrasted with words</secondary></indexterm> Note that rafsi may not be used in 
     <valsi>zei</valsi> phrases, because they are not words. CVV rafsi look like words (specifically cmavo) but there can be no confusion between the two uses of the same letters, because cmavo appear only as separate words or in compound cmavo (which are really just a notation for writing separate but closely related words as if they were one); rafsi appear only as parts of lujvo.</para>
   </section>
   <section xml:id="section-fuhivla">
     <title>fu'ivla</title>
     <para> <indexterm type="general-imported"><primary>lujvo</primary><secondary>unsuitability of for concrete/specific terms and jargon</secondary></indexterm>  <indexterm type="general-imported"><primary>food</primary><secondary>use of fu'ivla for specific</secondary></indexterm>  <indexterm type="general-imported"><primary>animals</primary><secondary>use of fu'ivla for specific</secondary></indexterm>  <indexterm type="general-imported"><primary>plants</primary><secondary>use of fu'ivla for specific</secondary></indexterm>  <indexterm type="general-imported"><primary>jargon</primary><secondary>use of fu'ivla for</secondary></indexterm>  <indexterm type="general-imported"><primary>specific terms</primary><secondary>use of fu'ivla for</secondary></indexterm>  <indexterm type="general-imported"><primary>concrete terms</primary><secondary>use of fu'ivla for</secondary></indexterm>  <indexterm type="general-imported"><primary>fu'ivla</primary><secondary>use of</secondary></indexterm> The use of tanru or lujvo is not always appropriate for very concrete or specific terms (e.g. 
diff --git a/todocbook/7.xml b/todocbook/7.xml
index 8047d26..9382213 100644
--- a/todocbook/7.xml
+++ b/todocbook/7.xml
@@ -2194,47 +2194,45 @@
         <description>sumti question</description>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>ce'u</cmavo>
         <description>abstraction focus</description>
       </cmavo-entry>
     </cmavo-list>
   </section>
   <section xml:id="section-goha-summary">
     <title>GOhA and other pro-bridi by series</title>
-    <cmavo-list>
-    </cmavo-list>
+
     <para>broda-series (not GOhA):</para>
     <cmavo-list>
-      
       <cmavo-entry>
         <cmavo>broda</cmavo>
         <description>is-1; 1st assignable pro-bridi</description>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>brode</cmavo>
         <description>is-2; 2nd assignable pro-bridi</description>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>brodi</cmavo>
         <description>is-3; 3rd assignable pro-bridi</description>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>brodo</cmavo>
         <description>is-4; 4th assignable pro-bridi</description>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>brodu</cmavo>
         <description>is-5; 5th assignable pro-bridi</description>
       </cmavo-entry>
-
     </cmavo-list>
+
     <para>go'i-series</para>
     <cmavo-list>
       <cmavo-entry>
         <cmavo>go'i</cmavo>
         <description>(repeats the last bridi)</description>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>go'a</cmavo>
         <description>(repeats a previous bridi)</description>
       </cmavo-entry>
diff --git a/todocbook/9.xml b/todocbook/9.xml
index 4888fa6..1227f80 100644
--- a/todocbook/9.xml
+++ b/todocbook/9.xml
@@ -1925,21 +1925,21 @@
     <valsi>ki</valsi> of selma'o KI. For example,</para>
     <example role="interlinear-gloss-example" xml:id="example-random-id-1UGf">
       <title>
         <anchor xml:id="c9e14d1"/>
       </title>
       <interlinear-gloss>
         <jbo>mi tavla bau la lojban. bai ki tu'a la frank. .ibabo mi tavla bau la gliban.</jbo>
         <gloss>I speak in-language Lojban compelled-by some-property-of Frank. Afterward, I speak in-language English.</gloss>
       </interlinear-gloss>
     </example>        
-    means the same as:
+    <para>means the same as:</para>
     <example role="interlinear-gloss-example" xml:id="example-random-id-txFr">
       <title>
         <anchor xml:id="c9e14d2"/>
       </title>
       <interlinear-gloss>
         <jbo>mi tavla bau la lojban. bai tu'a la frank. .ibabo mi tavla bau la gliban. bai tu'a la frank.</jbo>
         <gloss>I speak in-language Lojban compelled-by some-property-of Frank. Afterward, I speak in-language English compelled-by some-property-of Frank.</gloss>
       </interlinear-gloss>
     </example>
     <para>In 
@@ -2291,23 +2291,23 @@
         <modal-place se="te">knowing about</modal-place>
         <modal-place se="ve">under epistemology</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>fa'e</cmavo>
         <gismu>fatne</gismu>
         <modal-place>reverse of</modal-place>
         <modal-place se="se">in reversal of</modal-place>
       </cmavo-entry>
       <cmavo-entry>
-        <entry><valsi>fau</valsi></entry>
-        <entry><valsi>fasnu</valsi></entry>
-        <entry>in the event of</entry>
+        <cmavo><valsi>fau</valsi></cmavo>
+        <gismu><valsi>fasnu</valsi></gismu>
+        <modal-place>in the event of</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>fi'e</cmavo>
         <gismu>finti</gismu>
         <modal-place>created by</modal-place>
         <modal-place se="se">creating work</modal-place>
         <modal-place se="te">created for purpose</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>ga'a</cmavo>
@@ -2332,22 +2332,21 @@
       <cmavo-entry>
         <cmavo>ja'i</cmavo>
         <gismu>javni</gismu>
         <modal-place>by rule</modal-place>
         <modal-place se="se">by rule prescribing</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>ji'e</cmavo>
         <gismu>jimte</gismu>
         <modal-place>up to limit</modal-place>
-        <modal-place se="se">as a</modal-place>
-        <entry>limit of</entry>
+        <modal-place se="se">as a limit of</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>ji'o</cmavo>
         <gismu>jitro</gismu>
         <modal-place>under direction</modal-place>
         <modal-place se="se">controlling</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>ji'u</cmavo>
         <gismu>jicmu</gismu>
@@ -2366,22 +2365,21 @@
       <cmavo-entry>
         <cmavo>ka'i</cmavo>
         <gismu>krati</gismu>
         <modal-place>represented by</modal-place>
         <modal-place se="se">on behalf of</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>kai</cmavo>
         <gismu>ckaji</gismu>
         <modal-place>characterizing</modal-place>
-        <modal-place se="se">with</modal-place>
-        <entry>property</entry>
+        <modal-place se="se">with property</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>ki'i</cmavo>
         <gismu>ckini</gismu>
         <modal-place>as relation of</modal-place>
         <modal-place se="se">related to</modal-place>
         <modal-place se="te">with relation</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>ki'u</cmavo>
@@ -2425,22 +2423,21 @@
         <cmavo>ma'e</cmavo>
         <gismu>marji</gismu>
         <modal-place>of material</modal-place>
         <modal-place se="se">made from material</modal-place>
         <modal-place se="te">in material form of</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>ma'i</cmavo>
         <gismu>manri</gismu>
         <modal-place>in reference frame</modal-place>
-        <modal-place se="se">as a</modal-place>
-        <entry>standard for</entry>
+        <modal-place se="se">as a standard of</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>mau</cmavo>
         <gismu>zmadu</gismu>
         <modal-place>exceeded by</modal-place>
         <modal-place se="se">more than</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>me'a</cmavo>
         <gismu>mleca</gismu>
@@ -2477,22 +2474,21 @@
         <gismu>panra</gismu>
         <modal-place>in addition to</modal-place>
         <modal-place se="se">similar to</modal-place>
         <modal-place se="te">similar in pattern</modal-place>
         <modal-place se="ve">similar by standard</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>pa'u</cmavo>
         <gismu>pagbu</gismu>
         <modal-place>with component</modal-place>
-        <modal-place se="se">as a</modal-place>
-        <entry>part of</entry>
+        <modal-place se="se">as a part of</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>pi'o</cmavo>
         <gismu>pilno</gismu>
         <modal-place>used by</modal-place>
         <modal-place se="se">using tool</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>po'i</cmavo>
         <gismu>porsi</gismu>
@@ -2507,28 +2503,30 @@
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>pu'e</cmavo>
         <gismu>pruce</gismu>
         <modal-place>by process</modal-place>
         <modal-place se="se">processing from</modal-place>
         <modal-place se="te">processing into</modal-place>
         <modal-place se="ve">passing through stages</modal-place>
       </cmavo-entry>
       <cmavo-entry>
-        <entry><valsi>ra'a</valsi></entry>
-        <entry><valsi>srana</valsi></entry>
-        <entry>pertained to by concerning</entry>
+        <cmavo><valsi>ra'a</valsi></cmavo>
+        <gismu><valsi>srana</valsi></gismu>
+        <modal-place>pertained to by</modal-place>
+        <modal-place>concerning</modal-place>
       </cmavo-entry>
       <cmavo-entry>
-        <entry><valsi>ra'i</valsi></entry>
-        <entry><valsi>krasi</valsi></entry>
-        <entry>from source as an origin of</entry>
+        <cmavo><valsi>ra'i</valsi></cmavo>
+        <gismu><valsi>krasi</valsi></gismu>
+        <modal-place>from source</modal-place>
+        <modal-place>as an origin of</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>rai</cmavo>
         <gismu>traji</gismu>
         <modal-place>with superlative</modal-place>
         <modal-place se="se">superlative in</modal-place>
         <modal-place se="te">at extreme</modal-place>
         <modal-place se="ve">superlative among</modal-place>
       </cmavo-entry>
       <cmavo-entry>
@@ -2553,22 +2551,21 @@
       <cmavo-entry>
         <cmavo>si'u</cmavo>
         <gismu>sidju</gismu>
         <modal-place>aided by</modal-place>
         <modal-place se="se">assisting in</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>ta'i</cmavo>
         <gismu>tadji</gismu>
         <modal-place>by method</modal-place>
-        <modal-place se="se">as a</modal-place>
-        <entry>method for</entry>
+        <modal-place se="se">as a method for</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>tai</cmavo>
         <gismu>tamsmi</gismu>
         <modal-place>as a form of</modal-place>
         <modal-place se="se">in form</modal-place>
         <modal-place se="te">in form similar to</modal-place>
       </cmavo-entry>
       <cmavo-entry>
         <cmavo>ti'i</cmavo>
diff --git a/todocbook/README-tags b/todocbook/README-tags
index b0bfff5..b697991 100644
--- a/todocbook/README-tags
+++ b/todocbook/README-tags
@@ -103,10 +103,24 @@ not(@glossary) or @glossary != 'false') and ( not(@role) or ( @role !=
 
 <grammar-template>X TENSE le nu Y</grammar-template>
 
 <place-structure>x1 (seller) sells x2 (goods) to x3 (buyer) for x4
 (price)</place-structure>
 
 <inlinemath>(1000 * 6) - (500 * 0) + (100 * 0) - (10 * 15) - 3 =
 5847</inlinemath>
 
 <math>(1000 * L) - (500 * A) + (100 * H) - (10 * R) - V</math>
+
+<lujvo-making>
+  <jbo>zbasai</jbo>
+  <rafsi>zba + sai</rafsi>
+  <score><inlinemath>(1000 * 6) - (500 * 0) + (100 * 0) - (10 * 15) - 3 = 5847</inlinemath></score>
+</lujvo-making>
+
+    <cmavo-list>
+      <cmavo-entry>
+        <cmavo>ba'i</cmavo>
+        <gismu>basti</gismu>
+        <modal-place>replaced by</modal-place>
+        <modal-place se="se">instead of</modal-place>
+      </cmavo-entry>
diff --git a/todocbook/docbook2html_preprocess.xsl b/todocbook/docbook2html_preprocess.xsl
index 65273d7..f6b3a82 100644
--- a/todocbook/docbook2html_preprocess.xsl
+++ b/todocbook/docbook2html_preprocess.xsl
@@ -153,49 +153,49 @@
           ERROR: The following interlinear-gloss needs at least one en line:
         </xsl:text>
         <xsl:copy/>
       </xsl:when>
       -->
       <xsl:otherwise>
         <itemizedlist role="pronunciation">
         <xsl:for-each select=".//jbo">
           <listitem role="pronunciation-jbo">
             <para>
-              <xsl:value-of select=".//text()"/>
+              <xsl:apply-templates select="node()|text()"/>
             </para>
           </listitem>
         </xsl:for-each>
         <xsl:for-each select=".//ipa">
           <listitem role="pronunciation-ipa">
             <para>
-              <xsl:value-of select=".//text()"/>
+              <xsl:apply-templates select="node()|text()"/>
             </para>
           </listitem>
         </xsl:for-each>
         </itemizedlist>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <!-- <en> tags that arn't in <interlinear-gloss> tags -->
   <xsl:template match="example/en[not(boolean(ancestor::interlinear-gloss))]">
     <para>
-      <xsl:value-of select='.//text()'/>
+      <xsl:apply-templates select="node()|text()"/>
     </para>
   </xsl:template>
 
   <!-- <compound-cmavo> tags; placeholder -->
   <xsl:template match="compound-cmavo">
     <simplelist>
       <xsl:for-each select=".//jbo">
         <member>
-          <xsl:value-of select=".//text()"/>
+          <xsl:apply-templates select="node()|text()"/>
         </member>
       </xsl:for-each>
     </simplelist>
   </xsl:template>
 
   <xsl:template match="veljvo">
     <xsl:copy>
       <xsl:text>from </xsl:text>
       <jbophrase> <!-- will this get matched by the jbophrase template? -->
         <xsl:value-of select="."/>
@@ -251,124 +251,156 @@
     -->
     <glossterm linkend='jbogloss-{$slug}'>
       <foreignphrase xml:lang="jbo">
         <xsl:if test="boolean(@role)">
           <xsl:attribute name="role">
             <xsl:value-of select="@role"/>
           </xsl:attribute>
         </xsl:if>
         <indexterm>
           <xsl:attribute name="type">lojban-words</xsl:attribute>
-          <primary><xsl:value-of select="text()"/></primary>
+          <primary>
+            <xsl:apply-templates select="node()|text()"/>
+          </primary>
         </indexterm>
-        <xsl:value-of select="text()"/>
+        <xsl:apply-templates select="node()|text()"/>
       </foreignphrase>
     </glossterm>
   </xsl:template>
 
   <xsl:template match="jbophrase">
     <foreignphrase xml:lang="jbo">
-      <xsl:value-of select="text()"/>
+      <xsl:apply-templates select="node()|text()"/>
     </foreignphrase>
   </xsl:template>
 
   <xsl:template match="morphology">
     <foreignphrase xml:lang="jbo" role="morphology">
-      <xsl:value-of select="text()"/>
+      <xsl:apply-templates select="node()|text()"/>
     </foreignphrase>
   </xsl:template>
 
   <xsl:template match="letteral">
     <foreignphrase xml:lang="jbo" role="letteral">
-      <xsl:value-of select="text()"/>
+      <xsl:apply-templates select="node()|text()"/>
     </foreignphrase>
   </xsl:template>
 
   <xsl:template match="rafsi">
     <foreignphrase xml:lang="jbo" role="rafsi">
-      <xsl:value-of select="text()"/>
+      <xsl:apply-templates select="node()|text()"/>
     </foreignphrase>
   </xsl:template>
 
   <xsl:template match="diphthong">
     <foreignphrase xml:lang="jbo" role="diphthong">
-      <xsl:value-of select="text()"/>
+      <xsl:apply-templates select="node()|text()"/>
     </foreignphrase>
   </xsl:template>
 
   <xsl:template match="grammar-template[not(boolean(parent::title)) and not(boolean(parent::term)) and not(boolean(parent::member)) and not(boolean(parent::secondary))]" priority="100">
     <blockquote role="grammar-template">
       <para>
-        <xsl:value-of select="text()"/>
+        <xsl:apply-templates select="node()|text()"/>
       </para>
     </blockquote>
   </xsl:template>
 
   <xsl:template match="grammar-template" priority="1">
     <phrase role="grammar-template">
-      <xsl:value-of select="text()"/>
+      <xsl:apply-templates select="node()|text()"/>
     </phrase>
   </xsl:template>
 
   <xsl:template match="oldjbophrase[not(boolean(parent::title)) and not(boolean(parent::term)) and not(boolean(parent::member)) and not(boolean(parent::secondary))]" priority="100">
     <blockquote role="oldjbophrase">
       <para>
-        <xsl:value-of select="text()"/>
+        <xsl:apply-templates select="node()|text()"/>
       </para>
     </blockquote>
   </xsl:template>
 
   <xsl:template match="oldjbophrase" priority="1">
     <phrase role="oldjbophrase">
-      <xsl:value-of select="text()"/>
+      <xsl:apply-templates select="node()|text()"/>
     </phrase>
   </xsl:template>
 
   <xsl:template match="place-structure[not(boolean(parent::title)) and not(boolean(parent::term)) and not(boolean(parent::member)) and not(boolean(parent::secondary))]" priority="100">
     <blockquote role="place-structure">
       <para>
-        <xsl:value-of select="text()"/>
+        <xsl:apply-templates select="node()|text()"/>
       </para>
     </blockquote>
   </xsl:template>
 
   <xsl:template match="place-structure" priority="1">
     <phrase>
-      <xsl:value-of select="text()"/>
+      <xsl:apply-templates select="node()|text()"/>
     </phrase>
   </xsl:template>
 
   <xsl:template match="inlinemath" priority="1">
     <inlineequation><mathphrase>
-        <xsl:value-of select="text()"/>
+        <xsl:apply-templates select="node()|text()"/>
     </mathphrase></inlineequation>
   </xsl:template>
 
   <xsl:template match="math" priority="1">
     <informalequation><mathphrase>
-        <xsl:value-of select="text()"/>
+        <xsl:apply-templates select="node()|text()"/>
     </mathphrase></informalequation>
   </xsl:template>
 
+  <xsl:template match="lujvo-making">
+    <informaltable>
+      <tgroup cols="3">
+        <tbody>
+          <row>
+            <xsl:for-each select="jbo">
+              <entry>
+                <xsl:apply-templates select="node()|text()"/>
+              </entry>
+            </xsl:for-each>
+            <xsl:for-each select="rafsi">
+              <entry>
+                <xsl:apply-templates select="node()|text()"/>
+              </entry>
+            </xsl:for-each>
+            <xsl:for-each select="score">
+              <entry>
+                <xsl:apply-templates select="node()|text()"/>
+              </entry>
+            </xsl:for-each>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+  </xsl:template>
+
   <xsl:template match="lojbanization">
     <informaltable>
       <tgroup cols="2">
-        <xsl:for-each select="jbo">
-          <entry>
-            <xsl:value-of select="text()"/>
-          </entry>
-          <xsl:if test="boolean(comment)">
-            <entry>
-              <xsl:value-of select="comment/text()"/>
-            </entry>
-          </xsl:if>
-        </xsl:for-each>
+        <tbody>
+          <row>
+            <xsl:for-each select="jbo">
+              <entry>
+                <xsl:value-of select="text()"/>
+              </entry>
+              <xsl:if test="boolean(comment)">
+                <entry>
+                  <xsl:value-of select="comment/text()"/>
+                </entry>
+              </xsl:if>
+            </xsl:for-each>
+          </row>
+        </tbody>
       </tgroup>
     </informaltable>
   </xsl:template>
 
   <xsl:template match="valsi">
     <xsl:variable name="slug">
       <xsl:call-template name="make_slug">
         <xsl:with-param name="input" select="text()"/>
       </xsl:call-template>
     </xsl:variable>
diff --git a/todocbook/generate_glossary.sh b/todocbook/generate_glossary.sh
index 57b353a..278cc50 100755
--- a/todocbook/generate_glossary.sh
+++ b/todocbook/generate_glossary.sh
@@ -5,25 +5,30 @@ cat <<EOF
 <title>Lojban Word Glossary</title>
 <para>All definitions in this glossary are brief and unofficial.
 Only the published dictionary is a truly official reference for word
 definitions.  These definitions are here simply as a quick reference.
 </para>
 
 <!-- THIS FILE IS AUTOGENERATED.  DO NOT EDIT OR CHECK IN! -->
 
 EOF
 
+TMPFILE="/tmp/generate_glossary.tmp"
+
 IFS='
 '
 initial=''
 indiv=''
-for line in $(xsltproc --nonet --path . --novalid generate_glossary.xsl cll_preglossary.xml | grep -P '\t' | sort | uniq)
+
+xsltproc --nonet --path . --novalid generate_glossary.xsl cll_preglossary.xml | grep -P '\t' | sort | uniq >$TMPFILE
+
+for line in $(cat $TMPFILE)
 do
   slug=$(echo $line | awk -F'\t' '{ print $1 }')
   word=$(echo $line | awk -F'\t' '{ print $2 }' | sed 's/\.//g')
 #  echo "$slug--$word"
   newinitial=$(echo $word | cut -c 1)
 
   if [ "$initial" != "$newinitial" ]
   then
     if [ "$indiv" ]
     then
@@ -32,23 +37,26 @@ do
       indiv=1
     fi
     echo "<glossdiv><title>$newinitial</title>"
     initial=$newinitial
   fi
 
   if [ ! -f jbovlaste.xml -o "$(find jbovlaste.xml -mtime +1)" ]
   then
     echo "jbovlaste file is old; refetching." 1>&2
     wget 'http://jbovlaste.lojban.org/export/xml-export.html?lang=en' -O jbovlaste.xml
+    grep '^<valsi word=' jbovlaste.xml | \
+      sed 's/^<valsi word="\([^"]*\)" /\1 &/' | sort >jbovlaste2.xml
   fi
   
-  definition=$(grep -E "^<valsi word=\"$word\" " jbovlaste.xml | \
+  definition=$(look "$word" jbovlaste2.xml | \
+      sed -e 's/^[^ ]* //' | \
       sed -e 's/.*<definition>//' -e 's;</definition>.*;;' | \
       sed -e 's/\&/\&amp;/g' -e 's/</\&lt;/g' -e 's/>/\&gt;/g' | \
       sed 's/\s\s*/ /g')
 
   if [ ! "$(echo $definition | sed 's/\s*//g')" ]
   then
     definition="NO JBOVLASTE DEFINITION FOR \"$word\" FOUND!"
     echo $definition 1>&2
   fi
 
@@ -61,10 +69,12 @@ do
 </glossentry>
 EOF
 done
 
 cat <<EOF
 
 </glossdiv>
 </glossary>
 
 EOF
+
+rm >$TMPFILE

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