Remove newline in <filename> content and other

Having a newline in <filename> CDATA breaks conversion to PDF.
Only took two hours to find out.

diff --git a/doc/querymodel.xml b/doc/querymodel.xml
index 0dbcebe..d7a7f84 100644 (file)
--- a/doc/querymodel.xml
+++ b/doc/querymodel.xml
@@ -142,7 +142,6 @@
 
  </section>
 
-  
   <section id="querymodel-rpn">
    <title>&acro.rpn; queries and semantics</title>
    <para>
@@ -215,15 +214,6 @@
          <entry>Extension to the &acro.bib1; attribute set.</entry>
          <entry>predefined</entry>
         </row>
-        <!--
-        <row>
-       <entry>&acro.idxpath;</entry>
-       <entry><literal>idxpath</literal></entry>
-       <entry>Hardwired &acro.xpath; like attribute set, only available for
-       indexing with the &acro.grs1; record model</entry>
-       <entry>deprecated</entry>
-       </row>
-        -->
        </tbody>
       </tgroup>
      </table>
@@ -680,8 +670,8 @@
       via ASN.1. Practically no &acro.z3950; clients supports this. Fortunately
       they don't have to - &zebra; allows retrieval of this information
       in other formats:
-      <literal>&acro.sutrs;</literal>, <literal>&acro.xml;</literal>, 
-      <literal>&acro.grs1;</literal> and  <literal>ASN.1</literal> Explain.
+      &acro.sutrs;, &acro.xml;, 
+      &acro.grs1; and  <literal>ASN.1</literal> Explain.
      </para>
      
      <para>
@@ -835,7 +825,7 @@
 
    <section id="querymodel-bib1-nonuse">
      <title>&zebra; general Bib1 Non-Use Attributes (type 2-6)</title>
-    
+
     <section id="querymodel-bib1-relation">
      <title>Relation Attributes (type 2)</title>
      
@@ -1038,7 +1028,7 @@
       </para>
      </note>
     </section>
-    
+
     <section id="querymodel-bib1-structure">
      <title>Structure Attributes (type 4)</title>
    
@@ -1052,8 +1042,7 @@
      <para> 
       The possible values of the  
       <literal>structure attribute (type 4)</literal> can be defined
-      using the configuration file <filename>
-      tab/default.idx</filename>.
+      using the configuration file <filename>tab/default.idx</filename>.
       The default configuration is summarized in this table.
      </para>
 
@@ -1151,7 +1140,6 @@
        </tbody>
       </tgroup>
      </table>
-     
     <para>
      The structure attribute values 
      <literal>Word list (6)</literal>
@@ -1184,7 +1172,7 @@
       Z> find @attr 1=Body-of-text @attr 2=102 @attr 4=105 "bach salieri teleman"
      </screen>
     </para>
-    
+
     <para>
      The structure attribute value 
      <literal>Local number (107)</literal>
@@ -1219,6 +1207,7 @@
      </note>
     </section>
     
+
     <section id="querymodel-bib1-truncation">
      <title>Truncation Attributes (type = 5)</title>
 
@@ -1407,7 +1396,7 @@
      </para>
      <para>
       The <literal>Complete subfield (2)</literal> is a reminiscent
-      from the  happy <literal>&acro.marc;</literal>
+      from the  happy &acro.marc;
       binary format days. &zebra; does not support it, but maps silently
       to <literal>Complete field (3)</literal>.
      </para>
@@ -1420,10 +1409,10 @@
       </para>
      </note>
     </section>
-   </section>
-  
+
    </section>
 
+   </section>
 
   <section id="querymodel-zebra">
    <title>Extended &zebra; &acro.rpn; Features</title>
@@ -1654,12 +1643,7 @@
       search result. It is a way for a client to name an &acro.apt; part of a
       query. 
      </para>
-     <!--
-     <para>
-     <screen>
-    </screen>
-    </para>
-     -->
+
      <warning>
       <para>
        Experimental. Do not use in production code.
@@ -2054,7 +2038,7 @@
       <emphasis>Numeric use attributes</emphasis> are mapped 
       to the &zebra; internal
       string index according to the attribute set definition in use.
-      The default attribute set is <literal>&acro.bib1;</literal>, and may be
+      The default attribute set is &acro.bib1;, and may be
       omitted in the &acro.pqf; query.
      </para>
      
@@ -2069,7 +2053,7 @@
       Z> find  @attr 1=BodyOfText serenade
       Z> find  @attr 1=bO-d-Y-of-tE-x-t serenade
       Z> find  @attr 1=1010 serenade
-      Z> find  @attrset &acro.bib1; @attr 1=1010 serenade
+      Z> find  @attrset bib1 @attr 1=1010 serenade
       Z> find  @attrset bib1 @attr 1=1010 serenade
       Z> find  @attrset Bib1 @attr 1=1010 serenade
       Z> find  @attrset b-I-b-1 @attr 1=1010 serenade
@@ -2099,7 +2083,7 @@
       ignored. The above mentioned name normalization applies.
       String index names are defined in the
       used indexing  filter configuration files, for example in the
-      <literal>&acro.grs1;</literal> 
+      &acro.grs1;
       <filename>*.abs</filename> configuration files, or in the
       <literal>alvis</literal> filter &acro.xslt; indexing stylesheets.
      </para>
@@ -2114,8 +2098,8 @@
      </para>
 
      <para>
-      Finally, <literal>&acro.xpath;</literal> access points are only
-      available using the <literal>&acro.grs1;</literal> filter for indexing.
+      Finally, &acro.xpath; access points are only
+      available using the &acro.grs1; filter for indexing.
       These access point names must start with the character
       <literal>'/'</literal>, they are <emphasis>not
       normalized</emphasis>, but passed unaltered to the &zebra; internal
@@ -2510,7 +2494,7 @@
 
    <para>
     Exhaustive information can be found in the
-    Section <ulink url="&url.yaz.cql2pqf;">&acro.cql; to &acro.rpn; conversion"</ulink>
+    Section <ulink url="&url.yaz.cql2pqf;">&acro.cql; to &acro.rpn; conversion</ulink>
     in the &yaz; manual.
    </para> 
   <!--