texinfo/tp/tests/layout/res_parser/formatting_d...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/12/10 23:50:43

Modified files:
        tp/tests/layout/res_parser/formatting_docbook: formatting.xml 

Log message:
        Regenerate.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.xml?cvsroot=texinfo&r1=1.8&r2=1.9

Patches:
Index: formatting.xml
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- formatting.xml      8 Sep 2012 23:06:30 -0000       1.8
+++ formatting.xml      10 Dec 2012 23:50:43 -0000      1.9
@@ -2521,11 +2521,7 @@
 `<!-- /@w -->`simple-double-<!-- /@w -->-three---four----'<!-- /@w -->'
 
 
-<indexterm role="cp"><primary>&#8211;option</primary></indexterm>
-<indexterm role="cp"><primary>&#8220;</primary></indexterm>
-<indexterm role="fn"><primary>&#8220;</primary></indexterm>
-<indexterm role="fn"><primary>&#8211;foption</primary></indexterm>
-
+<indexterm role="cp"><primary>&#8211;option</primary></indexterm><indexterm 
role="cp"><primary>&#8220;</primary></indexterm><indexterm 
role="fn"><primary>&#8220;</primary></indexterm><indexterm 
role="fn"><primary>&#8211;foption</primary></indexterm>
 @&quot;u &#252; 
 @&quot;{U} &#220; 
 @~n &#241;
@@ -2750,8 +2746,7 @@
 </screen><itemizedlist><screen><!-- comment in itemize -->
 </screen><listitem><screen><emphasis>after emph</emphasis> e--mph item
 </screen></listitem></itemizedlist><screen>
-</screen><itemizedlist><screen></screen><listitem><screen>&#8226; a--n itemize 
line <indexterm role="cp"><primary>index entry within 
itemize</primary></indexterm>
-i--tem 1
+</screen><itemizedlist><screen></screen><listitem><screen>&#8226; a--n itemize 
line <indexterm role="cp"><primary>index entry within 
itemize</primary></indexterm>i--tem 1
 </screen></listitem><listitem><screen>&#8226; a--n itemize line i--tem 2
 </screen></listitem></itemizedlist><screen>
 </screen><orderedlist numeration="arabic"><listitem><screen>e--numerate
@@ -2760,8 +2755,7 @@
 </screen></entry></row></thead><tbody><row><entry><screen>mu--ltitable item 
</screen></entry><entry><screen>multitable tab
 <!-- comment in multitable -->
 </screen></entry></row><row><entry><screen>mu--ltitable item 2 
</screen></entry><entry><screen>multitable tab 2
-<indexterm role="cp"><primary>index entry within 
multitable</primary></indexterm>
-</screen></entry></row><row><entry><screen>lone mu--ltitable item
+<indexterm role="cp"><primary>index entry within 
multitable</primary></indexterm></screen></entry></row><row><entry><screen>lone 
mu--ltitable item
 </screen></entry></row></tbody></tgroup></informaltable><screen>
 </screen><informaltable><tgroup cols="2"><colspec 
colwidth="4*"></colspec><colspec 
colwidth="6*"></colspec><tbody><row><entry><screen>truc 
</screen></entry><entry><screen>bidule
 </screen></entry></row></tbody></tgroup></informaltable><screen>
@@ -2790,8 +2784,7 @@
 <blockquote><screen>def--fn
 </screen></blockquote><screen> 
 </screen><synopsis><indexterm 
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase 
role="category"><emphasis role="bold">fset</emphasis>:</phrase> 
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable> 
<replaceable>g</replaceable></synopsis>
-<screen><indexterm role="cp"><primary>index entry within 
deffn</primary></indexterm>
-</screen><synopsis><indexterm 
role="fn"><primary>truc</primary></indexterm><phrase role="category"><emphasis 
role="bold">cmde</emphasis>:</phrase> <function>truc</function> 
<replaceable></replaceable></synopsis>
+<screen><indexterm role="cp"><primary>index entry within 
deffn</primary></indexterm></screen><synopsis><indexterm 
role="fn"><primary>truc</primary></indexterm><phrase role="category"><emphasis 
role="bold">cmde</emphasis>:</phrase> <function>truc</function> 
<replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable>  </synopsis>
 <synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap2</function> <replaceable></replaceable></synopsis>
@@ -2949,8 +2942,7 @@
 </term><listitem><screen>l--ine
 </screen></listitem></varlistentry></variablelist><screen>
 </screen><variablelist><varlistentry><term><indexterm 
role="fn"><primary>a</primary></indexterm>a
-</term><screen><indexterm role="cp"><primary>index entry between item and 
itemx</primary></indexterm>
-</screen><term><indexterm role="fn"><primary>b</primary></indexterm>b
+</term><screen><indexterm role="cp"><primary>index entry between item and 
itemx</primary></indexterm></screen><term><indexterm 
role="fn"><primary>b</primary></indexterm>b
 </term><listitem><screen>l--ine
 </screen></listitem></varlistentry></variablelist><screen>
 </screen><screen>c--artouche