resolving conflicts; more fixes to #400

chapters/01.xml

@@ -219,7 +219,7 @@
         </td></tr>
         <tr><td><link linkend="chapter-relative-clauses-picture">Chapter 8</link></td><td>
             <interlinear-gloss>
-              <jbo>ko viska re prenu poi bruna la santas.</jbo>
+              <jbo>ko viska re prenu poi bruna la .santas.</jbo>
               <gloss>[You!] see two persons who-are brothers-of that-named Santa.</gloss>
             </interlinear-gloss>
         </td></tr>

chapters/02.xml

@@ -241,11 +241,11 @@
     <valsi>la</valsi>:</para>
     <informaltable>
           <tr>
-            <td><jbophrase>la meris.</jbophrase></td>
+            <td><jbophrase>la .meris.</jbophrase></td>
             <td>the one/ones named Mary</td>
           </tr>
           <tr>
-            <td><jbophrase>la djan.</jbophrase></td>
+            <td><jbophrase>la .djan.</jbophrase></td>
             <td>the one/ones named John</td>
           </tr>
     </informaltable>
@@ -1346,7 +1346,7 @@
       <title>
         <anchor xml:id="c2e14d1"/>
       </title>
-      <jbophrase>doi djan.</jbophrase>
+      <jbophrase>doi .djan.</jbophrase>
     </example>
     <para role="noindent">means 
     <quote>Oh, John, I'm talking to you</quote>. It also has the effect of setting the value of 
@@ -1362,14 +1362,13 @@
     <valsi>coi</valsi> means 
     <quote>hello</quote> and 
     <valsi>co'o</valsi> means 
-    <quote>good-bye</quote>. Either word may stand alone, they may follow one another, or either may be followed by a pause and a cmevla. (Vocative phrases with 
-    <valsi>doi</valsi> do not need a pause before a cmevla.)</para>
+    <quote>good-bye</quote>. Either word may stand alone, they may follow one another, or either may be followed a Lojbanized name surrounded by pauses.</para>
     <example xml:id="example-random-id-qIWX" role="interlinear-gloss-example">
       <title>
         <anchor xml:id="c2e14d2"/>
       </title>
       <interlinear-gloss>
-        <jbo>coi. djan.</jbo>
+        <jbo>coi .djan.</jbo>
         <gloss>Hello, John.</gloss>
       </interlinear-gloss>
     </example>
@@ -1378,7 +1377,7 @@
         <anchor xml:id="c2e14d3"/>
       </title>
       <interlinear-gloss>
-        <jbo>co'o. djan.</jbo>
+        <jbo>co'o .djan.</jbo>
         <gloss>Good-bye, John.</gloss>
       </interlinear-gloss>
     </example>

chapters/03.xml

@@ -48,7 +48,7 @@
 
     <para> <indexterm type="general"><primary>stress</primary><secondary>showing non-standard</secondary></indexterm>  <indexterm type="general"><primary>capital letters</primary><secondary>use of</secondary></indexterm> Capital letters are used only to represent non-standard stress, which can appear only in the representation of Lojbanized names. Thus the English name 
     <quote>Josephine</quote>, as normally pronounced, is Lojbanized as 
-    <cmevla>DJOsefin.</cmevla>, pronounced 
+    <cmevla>.DJOsefin.</cmevla>, pronounced 
     <phrase role="IPA">['dʒosɛfinʔ]</phrase>. (See 
     <xref linkend="section-basic-phonetics"/> for an explanation of the symbols within square brackets.) Technically, it is sufficient to capitalize the vowel letter, in this case 
 
@@ -326,7 +326,7 @@
 
     <phrase role="IPA">[ʔ]</phrase>) is considered a pause of shortest length. A pause (or glottal stop) may appear between any two words, and in certain cases &ndash; explained in detail in 
 
-    <xref linkend="section-pauses"/> &ndash; must occur. In particular, a word beginning with a vowel is always preceded by a pause, and a word ending in a consonant is always followed by a pause.</para>
+    <xref linkend="section-pauses"/> &ndash; must occur. In particular, a word beginning with a vowel is always preceded by a pause, and a word ending in a consonant is always surrounded by pauses.</para>
     <para> <indexterm type="general"><primary>period</primary><secondary>optional</secondary></indexterm> Technically, the period is an optional reminder to the reader of a mandatory pause that is dictated by the rules of the language; because these rules are unambiguous, a missing period can be inferred from otherwise correct text. Periods are included only as an aid to the reader.</para>
     <para> <indexterm type="general"><primary>period</primary><secondary>within a word</secondary></indexterm> A period also may be found apparently embedded in a word. When this occurs, such a written string is not one word but two, written together to indicate that the writer intends a unitary meaning for the compound. It is not really necessary to use a space between words if a period appears.</para>
     <para> <indexterm type="general"><primary>pause</primary><secondary>contrasted with syllable break</secondary></indexterm>  <indexterm type="general"><primary>syllable break</primary><secondary>contrasted with pause</secondary></indexterm>  <indexterm type="general"><primary>syllable break</primary><secondary>representation in Lojban</secondary></indexterm>  <indexterm type="general"><primary>comma</primary><secondary>definition of</secondary></indexterm> The comma is used to indicate a syllable break within a word, generally one that is not obvious to the reader. Such a comma is written to separate syllables, but indicates that there must be no pause between them, in contrast to the period. Between two vowels, a comma indicates that some type of glide may be necessary to avoid a pause that would split the two syllables into separate words. It is always legal to use the apostrophe (IPA 
@@ -534,7 +534,7 @@
         <anchor xml:id="c3e4d1"/>
       </title>
       <pronunciation>
-        <jbo>brlgan.</jbo>
+        <jbo>.brlgan.</jbo>
         <ipa>[br̩l gan]</ipa>
         <comment>or</comment>
         <ipa>[brl̩ gan]</ipa>
@@ -547,7 +547,7 @@
 
   <indexterm type="general"><primary>syllabic consonants</primary><secondary>final in word</secondary></indexterm> Syllabic consonants are treated as consonants rather than vowels from the standpoint of Lojban morphology. Thus Lojbanized names, which are generally required to end in a consonant, are allowed to end with a syllabic consonant. An example is 
 
-    <cmevla>rl.</cmevla>, which is an approximation of the English name 
+    <cmevla>.rl.</cmevla>, which is an approximation of the English name 
     <quote>Earl</quote>, and has two syllabic consonants.</para>
 
 
@@ -623,8 +623,8 @@
         <anchor xml:id="c3e5d1"/>
       </title>
       <pronunciation>
-        <jbo>meiin.</jbo>
-        <jbo role="pronunciation">mei,in.</jbo>
+        <jbo>.meiin.</jbo>
+        <jbo role="pronunciation">.mei,in.</jbo>
       </pronunciation>
     </example>
     <para role="indent">
@@ -636,7 +636,7 @@
         <anchor xml:id="c3e5d2"/>
       </title>
       <pronunciation>
-        <jbo role="pronunciation">me,iin.</jbo>
+        <jbo role="pronunciation">.me,iin.</jbo>
       </pronunciation>
     </example>
     <para role="noindent">which contains the vowel 
@@ -757,15 +757,15 @@
         <anchor xml:id="c3e6d1"/>
       </title>
       <pronunciation>
-        <jbo>djeimyz.</jbo>
+        <jbo>.djeimyz.</jbo>
         <ipa>[dʒɛj məzʔ]</ipa>
         <natlang>James</natlang>
       </pronunciation>
     </example>
     <para role="indent">The regular English pronunciation of 
     <quote>James</quote>, which is 
     <phrase role="IPA">[dʒɛjmz]</phrase>, would Lojbanize as 
-    <cmevla valid="false">djeimz.</cmevla>, which contains a forbidden consonant pair.</para>
+    <cmevla valid="false">.djeimz.</cmevla>, which contains a forbidden consonant pair.</para>
   </section>
   <section xml:id="section-initial-pairs">
     <title><anchor xml:id="c3s7"/>Initial Consonant Pairs</title>