its: Consolidate ITS rules for better performance

5 files changed, 355 insertions, 363 deletions

diff --git a/its/docbook.its b/its/docbook.its
index ed223d3..fb60cfc 100644
--- a/its/docbook.its
+++ b/its/docbook.its
@@ -25,164 +25,161 @@
   </itst:credits>
 
   <!-- Inline by default, might be overridden -->
-  <its:withinTextRule withinText="yes" selector="//abbrev"/>
-  <its:withinTextRule withinText="yes" selector="//accel"/>
-  <its:withinTextRule withinText="yes" selector="//acronym"/>
-  <its:withinTextRule withinText="yes" selector="//action"/>
-  <its:withinTextRule withinText="yes" selector="//affiliation"/>
-  <its:withinTextRule withinText="yes" selector="//anchor"/>
-  <its:withinTextRule withinText="yes" selector="//application"/>
-  <its:withinTextRule withinText="yes" selector="//arg"/>
-  <its:withinTextRule withinText="yes" selector="//audiodata"/>
-  <its:withinTextRule withinText="yes" selector="//audioobject"/>
-  <its:withinTextRule withinText="yes" selector="//authorinitials"/>
-  <its:withinTextRule withinText="yes" selector="//biblioref"/>
-  <its:withinTextRule withinText="yes" selector="//citation"/>
-  <its:withinTextRule withinText="yes" selector="//citebiblioid"/>
-  <its:withinTextRule withinText="yes" selector="//citerefentry"/>
-  <its:withinTextRule withinText="yes" selector="//citerefentry/manvolnum"/>
-  <its:withinTextRule withinText="yes" selector="//citerefentry/refentrytitle"/>
-  <its:withinTextRule withinText="yes" selector="//citetitle"/>
-  <its:withinTextRule withinText="yes" selector="//city"/>
-  <its:withinTextRule withinText="yes" selector="//classname"/>
-  <its:withinTextRule withinText="yes" selector="//co"/>
-  <its:withinTextRule withinText="yes" selector="//code"/>
-  <its:withinTextRule withinText="yes" selector="//col"/>
-  <its:withinTextRule withinText="yes" selector="//colgroup"/>
-  <its:withinTextRule withinText="yes" selector="//collabname"/>
-  <its:withinTextRule withinText="yes" selector="//command"/>
-  <its:withinTextRule withinText="yes" selector="//computeroutput"/>
-  <its:withinTextRule withinText="yes" selector="//constant"/>
-  <its:withinTextRule withinText="yes" selector="//constraint"/>
-  <its:withinTextRule withinText="yes" selector="//contrib"/>
-  <its:withinTextRule withinText="yes" selector="//country"/>
-  <its:withinTextRule withinText="yes" selector="//database"/>
-  <its:withinTextRule withinText="yes" selector="//date"/>
-  <its:withinTextRule withinText="yes" selector="//email"/>
-  <its:withinTextRule withinText="yes" selector="//emphasis"/>
-  <its:withinTextRule withinText="yes" selector="//envar"/>
-  <its:withinTextRule withinText="yes" selector="//errorcode"/>
-  <its:withinTextRule withinText="yes" selector="//errorname"/>
-  <its:withinTextRule withinText="yes" selector="//errortext"/>
-  <its:withinTextRule withinText="yes" selector="//errortype"/>
-  <its:withinTextRule withinText="yes" selector="//exceptionname"/>
-  <its:withinTextRule withinText="yes" selector="//fax"/>
-  <its:withinTextRule withinText="yes" selector="//filename"/>
-  <its:withinTextRule withinText="yes" selector="//firstname"/>
-  <its:withinTextRule withinText="yes" selector="//firstterm"/>
-  <its:withinTextRule withinText="yes" selector="//footnoteref"/>
-  <its:withinTextRule withinText="yes" selector="//foreignphrase"/>
-  <its:withinTextRule withinText="yes" selector="//funcdef"/>
-  <its:withinTextRule withinText="yes" selector="//funcparams"/>
-  <its:withinTextRule withinText="yes" selector="//function"/>
-  <its:withinTextRule withinText="yes" selector="//glossterm"/>
-  <its:withinTextRule withinText="yes" selector="//group"/>
-  <its:withinTextRule withinText="yes" selector="//guibutton"/>
-  <its:withinTextRule withinText="yes" selector="//guiicon"/>
-  <its:withinTextRule withinText="yes" selector="//guilabel"/>
-  <its:withinTextRule withinText="yes" selector="//guimenu"/>
-  <its:withinTextRule withinText="yes" selector="//guimenuitem"/>
-  <its:withinTextRule withinText="yes" selector="//guisubmenu"/>
-  <its:withinTextRule withinText="yes" selector="//hardware"/>
-  <its:withinTextRule withinText="yes" selector="//holder"/>
-  <its:withinTextRule withinText="yes" selector="//honorific"/>
-  <its:withinTextRule withinText="yes" selector="//imagedata"/>
-  <its:withinTextRule withinText="yes" selector="//imageobject"/>
-  <its:withinTextRule withinText="yes" selector="//imageobjectco"/>
-  <its:withinTextRule withinText="yes" selector="//initializer"/>
-  <its:withinTextRule withinText="yes" selector="//inlineequation"/>
-  <its:withinTextRule withinText="yes" selector="//inlinegraphic"/>
-  <its:withinTextRule withinText="yes" selector="//inlinemediaobject"/>
-  <its:withinTextRule withinText="yes" selector="//interface"/>
-  <its:withinTextRule withinText="yes" selector="//interfacename"/>
-  <its:withinTextRule withinText="yes" selector="//jobtitle"/>
-  <its:withinTextRule withinText="yes" selector="//keycap"/>
-  <its:withinTextRule withinText="yes" selector="//keycode"/>
-  <its:withinTextRule withinText="yes" selector="//keycombo"/>
-  <its:withinTextRule withinText="yes" selector="//keysym"/>
-  <its:withinTextRule withinText="yes" selector="//lhs"/>
-  <its:withinTextRule withinText="yes" selector="//lineage"/>
-  <its:withinTextRule withinText="yes" selector="//lineannotation"/>
-  <its:withinTextRule withinText="yes" selector="//link"/>
-  <its:withinTextRule withinText="yes" selector="//literal"/>
-  <its:withinTextRule withinText="yes" selector="//markup"/>
-  <its:withinTextRule withinText="yes" selector="//medialabel"/>
-  <its:withinTextRule withinText="yes" selector="//menuchoice"/>
-  <its:withinTextRule withinText="yes" selector="//methodname"/>
-  <its:withinTextRule withinText="yes" selector="//methodparam"/>
-  <its:withinTextRule withinText="yes" selector="//modifier"/>
-  <its:withinTextRule withinText="yes" selector="//mousebutton"/>
-  <its:withinTextRule withinText="yes" selector="//nonterminal"/>
-  <its:withinTextRule withinText="yes" selector="//olink"/>
-  <its:withinTextRule withinText="yes" selector="//ooclass"/>
-  <its:withinTextRule withinText="yes" selector="//ooexception"/>
-  <its:withinTextRule withinText="yes" selector="//oointerface"/>
-  <its:withinTextRule withinText="yes" selector="//option"/>
-  <its:withinTextRule withinText="yes" selector="//optional"/>
-  <its:withinTextRule withinText="yes" selector="//orgdiv"/>
-  <its:withinTextRule withinText="yes" selector="//orgname"/>
-  <its:withinTextRule withinText="yes" selector="//otheraddr"/>
-  <its:withinTextRule withinText="yes" selector="//othername"/>
-  <its:withinTextRule withinText="yes" selector="//package"/>
-  <its:withinTextRule withinText="yes" selector="//paramdef"/>
-  <its:withinTextRule withinText="yes" selector="//parameter"/>
-  <its:withinTextRule withinText="yes" selector="//personname"/>
-  <its:withinTextRule withinText="yes" selector="//phone"/>
-  <its:withinTextRule withinText="yes" selector="//phrase"/>
-  <its:withinTextRule withinText="yes" selector="//pob"/>
-  <its:withinTextRule withinText="yes" selector="//postcode"/>
-  <its:withinTextRule withinText="yes" selector="//productname"/>
-  <its:withinTextRule withinText="yes" selector="//productnumber"/>
-  <its:withinTextRule withinText="yes" selector="//prompt"/>
-  <its:withinTextRule withinText="yes" selector="//property"/>
-  <its:withinTextRule withinText="yes" selector="//quote"/>
-  <its:withinTextRule withinText="yes" selector="//replaceable"/>
-  <its:withinTextRule withinText="yes" selector="//returnvalue"/>
-  <its:withinTextRule withinText="yes" selector="//revnumber"/>
-  <its:withinTextRule withinText="yes" selector="//revremark"/>
-  <its:withinTextRule withinText="yes" selector="//rhs"/>
-  <its:withinTextRule withinText="yes" selector="//sbr"/>
-  <its:withinTextRule withinText="yes" selector="//sgmltag"/>
-  <its:withinTextRule withinText="yes" selector="//shortaffil"/>
-  <its:withinTextRule withinText="yes" selector="//shortcut"/>
-  <its:withinTextRule withinText="yes" selector="//state"/>
-  <its:withinTextRule withinText="yes" selector="//street"/>
-  <its:withinTextRule withinText="yes" selector="//structfield"/>
-  <its:withinTextRule withinText="yes" selector="//structname"/>
-  <its:withinTextRule withinText="yes" selector="//subscript"/>
-  <its:withinTextRule withinText="yes" selector="//superscript"/>
-  <its:withinTextRule withinText="yes" selector="//surname"/>
-  <its:withinTextRule withinText="yes" selector="//symbol"/>
-  <its:withinTextRule withinText="yes" selector="//systemitem"/>
-  <its:withinTextRule withinText="yes" selector="//termdef"/>
-  <its:withinTextRule withinText="yes" selector="//textobject"/>
-  <its:withinTextRule withinText="yes" selector="//token"/>
-  <its:withinTextRule withinText="yes" selector="//trademark"/>
-  <its:withinTextRule withinText="yes" selector="//type"/>
-  <its:withinTextRule withinText="yes" selector="//ulink"/>
-  <its:withinTextRule withinText="yes" selector="//uri"/>
-  <its:withinTextRule withinText="yes" selector="//userinput"/>
-  <its:withinTextRule withinText="yes" selector="//varargs"/>
-  <its:withinTextRule withinText="yes" selector="//varname"/>
-  <its:withinTextRule withinText="yes" selector="//videodata"/>
-  <its:withinTextRule withinText="yes" selector="//videoobject"/>
-  <its:withinTextRule withinText="yes" selector="//void"/>
-  <its:withinTextRule withinText="yes" selector="//wordasword"/>
-  <its:withinTextRule withinText="yes" selector="//xref"/>
-  <its:withinTextRule withinText="yes" selector="//year"/>
+  <its:withinTextRule withinText="yes" selector="//abbrev |
+                                                 //accel |
+                                                 //acronym |
+                                                 //action |
+                                                 //affiliation |
+                                                 //anchor |
+                                                 //application |
+                                                 //arg |
+                                                 //audiodata |
+                                                 //audioobject |
+                                                 //authorinitials |
+                                                 //biblioref |
+                                                 //citation |
+                                                 //citebiblioid |
+                                                 //citerefentry |
+                                                 //citerefentry/manvolnum |
+                                                 //citerefentry/refentrytitle |
+                                                 //citetitle |
+                                                 //city |
+                                                 //classname |
+                                                 //co |
+                                                 //code |
+                                                 //col |
+                                                 //colgroup |
+                                                 //collabname |
+                                                 //command |
+                                                 //computeroutput |
+                                                 //constant |
+                                                 //constraint |
+                                                 //contrib |
+                                                 //country |
+                                                 //database |
+                                                 //date |
+                                                 //email |
+                                                 //emphasis |
+                                                 //envar |
+                                                 //errorcode |
+                                                 //errorname |
+                                                 //errortext |
+                                                 //errortype |
+                                                 //exceptionname |
+                                                 //fax |
+                                                 //filename |
+                                                 //firstname |
+                                                 //firstterm |
+                                                 //footnoteref |
+                                                 //foreignphrase |
+                                                 //funcdef |
+                                                 //funcparams |
+                                                 //function |
+                                                 //glossterm |
+                                                 //group |
+                                                 //guibutton |
+                                                 //guiicon |
+                                                 //guilabel |
+                                                 //guimenu |
+                                                 //guimenuitem |
+                                                 //guisubmenu |
+                                                 //hardware |
+                                                 //holder |
+                                                 //honorific |
+                                                 //imagedata |
+                                                 //imageobject |
+                                                 //imageobjectco |
+                                                 //initializer |
+                                                 //inlineequation |
+                                                 //inlinegraphic |
+                                                 //inlinemediaobject |
+                                                 //interface |
+                                                 //interfacename |
+                                                 //jobtitle |
+                                                 //keycap |
+                                                 //keycode |
+                                                 //keycombo |
+                                                 //keysym |
+                                                 //lhs |
+                                                 //lineage |
+                                                 //lineannotation |
+                                                 //link |
+                                                 //literal |
+                                                 //markup |
+                                                 //medialabel |
+                                                 //menuchoice |
+                                                 //methodname |
+                                                 //methodparam |
+                                                 //modifier |
+                                                 //mousebutton |
+                                                 //nonterminal |
+                                                 //olink |
+                                                 //ooclass |
+                                                 //ooexception |
+                                                 //oointerface |
+                                                 //option |
+                                                 //optional |
+                                                 //orgdiv |
+                                                 //orgname |
+                                                 //otheraddr |
+                                                 //othername |
+                                                 //package |
+                                                 //paramdef |
+                                                 //parameter |
+                                                 //personname |
+                                                 //phone |
+                                                 //phrase |
+                                                 //pob |
+                                                 //postcode |
+                                                 //productname |
+                                                 //productnumber |
+                                                 //prompt |
+                                                 //property |
+                                                 //quote |
+                                                 //replaceable |
+                                                 //returnvalue |
+                                                 //revnumber |
+                                                 //revremark |
+                                                 //rhs |
+                                                 //sbr |
+                                                 //sgmltag |
+                                                 //shortaffil |
+                                                 //shortcut |
+                                                 //state |
+                                                 //street |
+                                                 //structfield |
+                                                 //structname |
+                                                 //subscript |
+                                                 //superscript |
+                                                 //surname |
+                                                 //symbol |
+                                                 //systemitem |
+                                                 //termdef |
+                                                 //textobject |
+                                                 //token |
+                                                 //trademark |
+                                                 //type |
+                                                 //ulink |
+                                                 //uri |
+                                                 //userinput |
+                                                 //varargs |
+                                                 //varname |
+                                                 //videodata |
+                                                 //videoobject |
+                                                 //void |
+                                                 //wordasword |
+                                                 //xref |
+                                                 //year "/>
 
   <!-- Mark footnotes nested, though itstool treats it as "no" -->
   <its:withinTextRule withinText="nested" selector="//footnote"/>
 
   <!-- Things with (semi-)structured content -->
-  <its:withinTextRule withinText="no" selector="//confgroup/*"/>
-  <its:withinTextRule withinText="no" selector="//biblioentry/*"/>
-  <its:withinTextRule withinText="no" selector="//biblioset/*"/>
-  <its:withinTextRule withinText="yes" selector="//bibliomixed/*"/>
-  <its:withinTextRule withinText="yes" selector="//bibliomset/*"/>
+  <its:withinTextRule withinText="no" selector="//confgroup/* | //biblioentry/* | //biblioset/*"/>
+  <its:withinTextRule withinText="yes" selector="//bibliomixed/* | //bibliomset/*"/>
   <its:withinTextRule withinText="no" selector="//glossentry/*"/>
-  <its:withinTextRule withinText="yes" selector="//indexterm//*"/>
-  <its:withinTextRule withinText="yes" selector="//simplelist[@type = 'inline']/descendant-or-self::*"/>
+  <its:withinTextRule withinText="yes" selector="//indexterm//* |
+                                                 //simplelist[@type = 'inline']/descendant-or-self::*"/>
 
   <!--
   We want to break address off into a translation unit because it's
@@ -198,12 +195,12 @@
   <its:withinTextRule withinText="no" selector="//bookinfo/* | //chapterinfo/* | //articleinfo/*"/>
 
   <!-- These are always verbatim -->
-  <its:preserveSpaceRule space="preserve" selector="//classsynopsisinfo"/>
-  <its:preserveSpaceRule space="preserve" selector="//funcsynopsisinfo"/>
-  <its:preserveSpaceRule space="preserve" selector="//literallayout"/>
-  <its:preserveSpaceRule space="preserve" selector="//programlisting"/>
-  <its:preserveSpaceRule space="preserve" selector="//screen"/>
-  <its:preserveSpaceRule space="preserve" selector="//synopsis"/>
+  <its:preserveSpaceRule space="preserve" selector="//classsynopsisinfo |
+                                                    //funcsynopsisinfo |
+                                                    //literallayout |
+                                                    //programlisting |
+                                                    //screen |
+                                                    //synopsis "/>
 
   <!-- Drop editor remarks -->
   <its:localeFilterRule localeFilterList="" selector="//remark"/>
diff --git a/its/docbook5.its b/its/docbook5.its
index a2f0b1d..8a47948 100644
--- a/its/docbook5.its
+++ b/its/docbook5.its
@@ -24,173 +24,171 @@
   </itst:credits>
 
   <!-- Inline by default, might be overridden -->
-  <its:withinTextRule withinText="yes" selector="//db:abbrev"/>
-  <its:withinTextRule withinText="yes" selector="//db:accel"/>
-  <its:withinTextRule withinText="yes" selector="//db:acronym"/>
-  <its:withinTextRule withinText="yes" selector="//db:affiliation"/>
-  <its:withinTextRule withinText="yes" selector="//db:alt"/>
-  <its:withinTextRule withinText="yes" selector="//db:anchor"/>
-  <its:withinTextRule withinText="yes" selector="//db:application"/>
-  <its:withinTextRule withinText="yes" selector="//db:arg"/>
-  <its:withinTextRule withinText="yes" selector="//db:audiodata"/>
-  <its:withinTextRule withinText="yes" selector="//db:audioobject"/>
-  <its:withinTextRule withinText="yes" selector="//db:authorinitials"/>
-  <its:withinTextRule withinText="yes" selector="//db:biblioref"/>
-  <its:withinTextRule withinText="yes" selector="//db:citation"/>
-  <its:withinTextRule withinText="yes" selector="//db:citebiblioid"/>
-  <its:withinTextRule withinText="yes" selector="//db:citerefentry"/>
-  <its:withinTextRule withinText="yes" selector="//db:citerefentry/db:manvolnum"/>
-  <its:withinTextRule withinText="yes" selector="//db:citerefentry/db:refentrytitle"/>
-  <its:withinTextRule withinText="yes" selector="//db:citetitle"/>
-  <its:withinTextRule withinText="yes" selector="//db:city"/>
-  <its:withinTextRule withinText="yes" selector="//db:classname"/>
-  <its:withinTextRule withinText="yes" selector="//db:co"/>
-  <its:withinTextRule withinText="yes" selector="//db:coref"/>
-  <its:withinTextRule withinText="yes" selector="//db:code"/>
-  <its:withinTextRule withinText="yes" selector="//db:col"/>
-  <its:withinTextRule withinText="yes" selector="//db:colgroup"/>
-  <its:withinTextRule withinText="yes" selector="//db:command"/>
-  <its:withinTextRule withinText="yes" selector="//db:computeroutput"/>
-  <its:withinTextRule withinText="yes" selector="//db:constant"/>
-  <its:withinTextRule withinText="yes" selector="//db:constraint"/>
-  <its:withinTextRule withinText="yes" selector="//db:contrib"/>
-  <its:withinTextRule withinText="yes" selector="//db:country"/>
-  <its:withinTextRule withinText="yes" selector="//db:database"/>
-  <its:withinTextRule withinText="yes" selector="//db:date"/>
-  <its:withinTextRule withinText="yes" selector="//db:email"/>
-  <its:withinTextRule withinText="yes" selector="//db:emphasis"/>
-  <its:withinTextRule withinText="yes" selector="//db:envar"/>
-  <its:withinTextRule withinText="yes" selector="//db:errorcode"/>
-  <its:withinTextRule withinText="yes" selector="//db:errorname"/>
-  <its:withinTextRule withinText="yes" selector="//db:errortext"/>
-  <its:withinTextRule withinText="yes" selector="//db:errortype"/>
-  <its:withinTextRule withinText="yes" selector="//db:exceptionname"/>
-  <its:withinTextRule withinText="yes" selector="//db:fax"/>
-  <its:withinTextRule withinText="yes" selector="//db:filename"/>
-  <its:withinTextRule withinText="yes" selector="//db:firstname"/>
-  <its:withinTextRule withinText="yes" selector="//db:firstterm"/>
-  <its:withinTextRule withinText="yes" selector="//db:footnoteref"/>
-  <its:withinTextRule withinText="yes" selector="//db:foreignphrase"/>
-  <its:withinTextRule withinText="yes" selector="//db:funcdef"/>
-  <its:withinTextRule withinText="yes" selector="//db:funcparams"/>
-  <its:withinTextRule withinText="yes" selector="//db:function"/>
-  <its:withinTextRule withinText="yes" selector="//db:givenname"/>
-  <its:withinTextRule withinText="yes" selector="//db:glossterm"/>
-  <its:withinTextRule withinText="yes" selector="//db:group"/>
-  <its:withinTextRule withinText="yes" selector="//db:guibutton"/>
-  <its:withinTextRule withinText="yes" selector="//db:guiicon"/>
-  <its:withinTextRule withinText="yes" selector="//db:guilabel"/>
-  <its:withinTextRule withinText="yes" selector="//db:guimenu"/>
-  <its:withinTextRule withinText="yes" selector="//db:guimenuitem"/>
-  <its:withinTextRule withinText="yes" selector="//db:guisubmenu"/>
-  <its:withinTextRule withinText="yes" selector="//db:hardware"/>
-  <its:withinTextRule withinText="yes" selector="//db:holder"/>
-  <its:withinTextRule withinText="yes" selector="//db:honorific"/>
-  <its:withinTextRule withinText="yes" selector="//db:imagedata"/>
-  <its:withinTextRule withinText="yes" selector="//db:imageobject"/>
-  <its:withinTextRule withinText="yes" selector="//db:imageobjectco"/>
-  <its:withinTextRule withinText="yes" selector="//db:initializer"/>
-  <its:withinTextRule withinText="yes" selector="//db:inlineequation"/>
-  <its:withinTextRule withinText="yes" selector="//db:inlinemediaobject"/>
-  <its:withinTextRule withinText="yes" selector="//db:interfacename"/>
-  <its:withinTextRule withinText="yes" selector="//db:jobtitle"/>
-  <its:withinTextRule withinText="yes" selector="//db:keycap"/>
-  <its:withinTextRule withinText="yes" selector="//db:keycode"/>
-  <its:withinTextRule withinText="yes" selector="//db:keycombo"/>
-  <its:withinTextRule withinText="yes" selector="//db:keysym"/>
-  <its:withinTextRule withinText="yes" selector="//db:lhs"/>
-  <its:withinTextRule withinText="yes" selector="//db:lineage"/>
-  <its:withinTextRule withinText="yes" selector="//db:lineannotation"/>
-  <its:withinTextRule withinText="yes" selector="//db:link"/>
-  <its:withinTextRule withinText="yes" selector="//db:literal"/>
-  <its:withinTextRule withinText="yes" selector="//db:markup"/>
-  <its:withinTextRule withinText="yes" selector="//db:menuchoice"/>
-  <its:withinTextRule withinText="yes" selector="//db:methodname"/>
-  <its:withinTextRule withinText="yes" selector="//db:methodparam"/>
-  <its:withinTextRule withinText="yes" selector="//db:modifier"/>
-  <its:withinTextRule withinText="yes" selector="//db:mousebutton"/>
-  <its:withinTextRule withinText="yes" selector="//db:multimediaparam"/>
-  <its:withinTextRule withinText="yes" selector="//db:nonterminal"/>
-  <its:withinTextRule withinText="yes" selector="//db:olink"/>
-  <its:withinTextRule withinText="yes" selector="//db:ooclass"/>
-  <its:withinTextRule withinText="yes" selector="//db:ooexception"/>
-  <its:withinTextRule withinText="yes" selector="//db:oointerface"/>
-  <its:withinTextRule withinText="yes" selector="//db:option"/>
-  <its:withinTextRule withinText="yes" selector="//db:optional"/>
-  <its:withinTextRule withinText="yes" selector="//db:org"/>
-  <its:withinTextRule withinText="yes" selector="//db:orgdiv"/>
-  <its:withinTextRule withinText="yes" selector="//db:orgname"/>
-  <its:withinTextRule withinText="yes" selector="//db:otheraddr"/>
-  <its:withinTextRule withinText="yes" selector="//db:othername"/>
-  <its:withinTextRule withinText="yes" selector="//db:package"/>
-  <its:withinTextRule withinText="yes" selector="//db:paramdef"/>
-  <its:withinTextRule withinText="yes" selector="//db:parameter"/>
-  <its:withinTextRule withinText="yes" selector="//db:personname"/>
-  <its:withinTextRule withinText="yes" selector="//db:phone"/>
-  <its:withinTextRule withinText="yes" selector="//db:phrase"/>
-  <its:withinTextRule withinText="yes" selector="//db:pob"/>
-  <its:withinTextRule withinText="yes" selector="//db:postcode"/>
-  <its:withinTextRule withinText="yes" selector="//db:productname"/>
-  <its:withinTextRule withinText="yes" selector="//db:productnumber"/>
-  <its:withinTextRule withinText="yes" selector="//db:prompt"/>
-  <its:withinTextRule withinText="yes" selector="//db:property"/>
-  <its:withinTextRule withinText="yes" selector="//db:quote"/>
-  <its:withinTextRule withinText="yes" selector="//db:replaceable"/>
-  <its:withinTextRule withinText="yes" selector="//db:returnvalue"/>
-  <its:withinTextRule withinText="yes" selector="//db:revnumber"/>
-  <its:withinTextRule withinText="yes" selector="//db:revremark"/>
-  <its:withinTextRule withinText="yes" selector="//db:rhs"/>
-  <its:withinTextRule withinText="yes" selector="//db:sbr"/>
-  <its:withinTextRule withinText="yes" selector="//db:shortaffil"/>
-  <its:withinTextRule withinText="yes" selector="//db:shortcut"/>
-  <its:withinTextRule withinText="yes" selector="//db:state"/>
-  <its:withinTextRule withinText="yes" selector="//db:street"/>
-  <its:withinTextRule withinText="yes" selector="//db:subscript"/>
-  <its:withinTextRule withinText="yes" selector="//db:superscript"/>
-  <its:withinTextRule withinText="yes" selector="//db:surname"/>
-  <its:withinTextRule withinText="yes" selector="//db:symbol"/>
-  <its:withinTextRule withinText="yes" selector="//db:systemitem"/>
-  <its:withinTextRule withinText="yes" selector="//db:tag"/>
-  <its:withinTextRule withinText="yes" selector="//db:termdef"/>
-  <its:withinTextRule withinText="yes" selector="//db:textobject"/>
-  <its:withinTextRule withinText="yes" selector="//db:token"/>
-  <its:withinTextRule withinText="yes" selector="//db:trademark"/>
-  <its:withinTextRule withinText="yes" selector="//db:type"/>
-  <its:withinTextRule withinText="yes" selector="//db:uri"/>
-  <its:withinTextRule withinText="yes" selector="//db:userinput"/>
-  <its:withinTextRule withinText="yes" selector="//db:varargs"/>
-  <its:withinTextRule withinText="yes" selector="//db:varname"/>
-  <its:withinTextRule withinText="yes" selector="//db:videodata"/>
-  <its:withinTextRule withinText="yes" selector="//db:videoobject"/>
-  <its:withinTextRule withinText="yes" selector="//db:void"/>
-  <its:withinTextRule withinText="yes" selector="//db:wordasword"/>
-  <its:withinTextRule withinText="yes" selector="//db:xref"/>
-  <its:withinTextRule withinText="yes" selector="//db:year"/>
+  <its:withinTextRule withinText="yes"
+                      selector="//db:abbrev |
+                                //db:accel |
+                                //db:acronym |
+                                //db:affiliation |
+                                //db:alt |
+                                //db:anchor |
+                                //db:application |
+                                //db:arg |
+                                //db:audiodata |
+                                //db:audioobject |
+                                //db:authorinitials |
+                                //db:biblioref |
+                                //db:citation |
+                                //db:citebiblioid |
+                                //db:citerefentry |
+                                //db:citerefentry/db:manvolnum |
+                                //db:citerefentry/db:refentrytitle |
+                                //db:citetitle |
+                                //db:city |
+                                //db:classname |
+                                //db:co |
+                                //db:coref |
+                                //db:code |
+                                //db:col |
+                                //db:colgroup |
+                                //db:command |
+                                //db:computeroutput |
+                                //db:constant |
+                                //db:constraint |
+                                //db:contrib |
+                                //db:country |
+                                //db:database |
+                                //db:date |
+                                //db:email |
+                                //db:emphasis |
+                                //db:envar |
+                                //db:errorcode |
+                                //db:errorname |
+                                //db:errortext |
+                                //db:errortype |
+                                //db:exceptionname |
+                                //db:fax |
+                                //db:filename |
+                                //db:firstname |
+                                //db:firstterm |
+                                //db:footnoteref |
+                                //db:foreignphrase |
+                                //db:funcdef |
+                                //db:funcparams |
+                                //db:function |
+                                //db:givenname |
+                                //db:glossterm |
+                                //db:group |
+                                //db:guibutton |
+                                //db:guiicon |
+                                //db:guilabel |
+                                //db:guimenu |
+                                //db:guimenuitem |
+                                //db:guisubmenu |
+                                //db:hardware |
+                                //db:holder |
+                                //db:honorific |
+                                //db:imagedata |
+                                //db:imageobject |
+                                //db:imageobjectco |
+                                //db:initializer |
+                                //db:inlineequation |
+                                //db:inlinemediaobject |
+                                //db:interfacename |
+                                //db:jobtitle |
+                                //db:keycap |
+                                //db:keycode |
+                                //db:keycombo |
+                                //db:keysym |
+                                //db:lhs |
+                                //db:lineage |
+                                //db:lineannotation |
+                                //db:link |
+                                //db:literal |
+                                //db:markup |
+                                //db:menuchoice |
+                                //db:methodname |
+                                //db:methodparam |
+                                //db:modifier |
+                                //db:mousebutton |
+                                //db:multimediaparam |
+                                //db:nonterminal |
+                                //db:olink |
+                                //db:ooclass |
+                                //db:ooexception |
+                                //db:oointerface |
+                                //db:option |
+                                //db:optional |
+                                //db:org |
+                                //db:orgdiv |
+                                //db:orgname |
+                                //db:otheraddr |
+                                //db:othername |
+                                //db:package |
+                                //db:paramdef |
+                                //db:parameter |
+                                //db:personname |
+                                //db:phone |
+                                //db:phrase |
+                                //db:pob |
+                                //db:postcode |
+                                //db:productname |
+                                //db:productnumber |
+                                //db:prompt |
+                                //db:property |
+                                //db:quote |
+                                //db:replaceable |
+                                //db:returnvalue |
+                                //db:revnumber |
+                                //db:revremark |
+                                //db:rhs |
+                                //db:sbr |
+                                //db:shortaffil |
+                                //db:shortcut |
+                                //db:state |
+                                //db:street |
+                                //db:subscript |
+                                //db:superscript |
+                                //db:surname |
+                                //db:symbol |
+                                //db:systemitem |
+                                //db:tag |
+                                //db:termdef |
+                                //db:textobject |
+                                //db:token |
+                                //db:trademark |
+                                //db:type |
+                                //db:uri |
+                                //db:userinput |
+                                //db:varargs |
+                                //db:varname |
+                                //db:videodata |
+                                //db:videoobject |
+                                //db:void |
+                                //db:wordasword |
+                                //db:xref |
+                                //db:year "/>
 
   <!-- Mark footnotes nested, though itstool treats it as "no" -->
   <its:withinTextRule withinText="nested" selector="//db:footnote"/>
 
   <!-- Things with (semi-)structured content -->
-  <its:withinTextRule withinText="no" selector="//db:confgroup/*"/>
-  <its:withinTextRule withinText="no" selector="//db:biblioentry/*"/>
-  <its:withinTextRule withinText="no" selector="//db:biblioset/*"/>
-  <its:withinTextRule withinText="yes" selector="//db:bibliomixed/*"/>
-  <its:withinTextRule withinText="yes" selector="//db:bibliomset/*"/>
+  <its:withinTextRule withinText="no" selector="//db:confgroup/* | //db:biblioentry/* | db:biblioset/*"/>
+  <its:withinTextRule withinText="yes" selector="//db:bibliomixed/* | //db:bibliomset/*"/>
   <its:withinTextRule withinText="no" selector="//db:glossentry/*"/>
-  <its:withinTextRule withinText="yes" selector="//db:indexterm//*"/>
-  <its:withinTextRule withinText="yes" selector="//db:simplelist[@type = 'inline']/descendant-or-self::*"/>
+  <its:withinTextRule withinText="yes" selector="//db:indexterm//* |
+                                                 //db:simplelist[@type = 'inline']/descendant-or-self::*"/>
 
   <!-- Above all else, info is not a text run -->
   <its:withinTextRule withinText="no" selector="//db:info/*"/>
 
   <!-- These are always verbatim -->
-  <its:preserveSpaceRule space="preserve" selector="//db:address"/>
-  <its:preserveSpaceRule space="preserve" selector="//db:classsynopsisinfo"/>
-  <its:preserveSpaceRule space="preserve" selector="//db:funcsynopsisinfo"/>
-  <its:preserveSpaceRule space="preserve" selector="//db:literallayout"/>
-  <its:preserveSpaceRule space="preserve" selector="//db:programlisting"/>
-  <its:preserveSpaceRule space="preserve" selector="//db:screen"/>
-  <its:preserveSpaceRule space="preserve" selector="//db:synopsis"/>
+  <its:preserveSpaceRule space="preserve" selector="//db:address |
+                                                    //db:classsynopsisinfo |
+                                                    //db:funcsynopsisinfo |
+                                                    //db:literallayout |
+                                                    //db:programlisting |
+                                                    //db:screen |
+                                                    //db:synopsis "/>
 
   <!-- Drop editor remarks -->
   <its:localeFilterRule localeFilterList="" selector="//db:remark"/>
diff --git a/its/its.its b/its/its.its
index 8f17c36..2d223c8 100644
--- a/its/its.its
+++ b/its/its.its
@@ -1,6 +1,5 @@
 <its:rules
     xmlns:its="http://www.w3.org/2005/11/its"
     version="2.0">
-  <its:translateRule translate="no" selector="//its:param"/>
-  <its:translateRule translate="no" selector="//its:locNote"/>
+  <its:translateRule translate="no" selector="//its:param | //its:locNote"/>
 </its:rules>
diff --git a/its/mallard.its b/its/mallard.its
index 8ac8878..12fc13d 100644
--- a/its/mallard.its
+++ b/its/mallard.its
@@ -18,19 +18,18 @@
     </mal:credit>
   </itst:credits>
 
-  <its:withinTextRule withinText="yes" selector="//mal:cite//*"/>
-  <its:withinTextRule withinText="yes" selector="//mal:code//*"/>
-  <its:withinTextRule withinText="yes" selector="//mal:desc//*"/>
-  <its:withinTextRule withinText="yes" selector="//mal:email//*"/>
-  <its:withinTextRule withinText="yes" selector="//mal:link//*"/>
-  <its:withinTextRule withinText="yes" selector="//mal:name//*"/>
-  <its:withinTextRule withinText="yes" selector="//mal:p//*"/>
-  <its:withinTextRule withinText="yes" selector="//mal:screen//*"/>
-  <its:withinTextRule withinText="yes" selector="//mal:title//*"/>
-  <its:withinTextRule withinText="yes" selector="//mal:years//*"/>
-
-  <its:preserveSpaceRule space="preserve" selector="//mal:code"/>
-  <its:preserveSpaceRule space="preserve" selector="//mal:screen"/>
+  <its:withinTextRule withinText="yes" selector="//mal:cite//*   |
+                                                 //mal:code//*   |
+                                                 //mal:desc//*   |
+                                                 //mal:email//*  |
+                                                 //mal:link//*   |
+                                                 //mal:name//*   |
+                                                 //mal:p//*      |
+                                                 //mal:screen//* |
+                                                 //mal:title//*  |
+                                                 //mal:years//*  "/>
+
+  <its:preserveSpaceRule space="preserve" selector="//mal:code | //mal:screen "/>
 
   <its:localeFilterRule localeFilterList="" selector="//mal:comment"/>
 
diff --git a/its/xhtml.its b/its/xhtml.its
index 0720049..e0a64c9 100644
--- a/its/xhtml.its
+++ b/its/xhtml.its
@@ -6,43 +6,42 @@
 
   <itst:match selector="/html:html"/>
 
-  <its:translateRule translate="no" selector="//html:script"/>
-  <its:translateRule translate="no" selector="//html:style"/>
+  <its:translateRule translate="no" selector="//html:script | //html:style"/>
 
   <its:preserveSpaceRule space="preserve" selector="//html:pre"/>
 
-  <its:withinTextRule withinText="yes" selector="//html:a"/>
-  <its:withinTextRule withinText="yes" selector="//html:abbr"/>
-  <its:withinTextRule withinText="yes" selector="//html:acronym"/>
-  <its:withinTextRule withinText="yes" selector="//html:b"/>
-  <its:withinTextRule withinText="yes" selector="//html:bdo"/>
-  <its:withinTextRule withinText="yes" selector="//html:big"/>
-  <its:withinTextRule withinText="yes" selector="//html:br"/>
-  <its:withinTextRule withinText="yes" selector="//html:center"/>
-  <its:withinTextRule withinText="yes" selector="//html:cite"/>
-  <its:withinTextRule withinText="yes" selector="//html:code"/>
-  <its:withinTextRule withinText="yes" selector="//html:del"/>
-  <its:withinTextRule withinText="yes" selector="//html:dfn"/>
-  <its:withinTextRule withinText="yes" selector="//html:em"/>
-  <its:withinTextRule withinText="yes" selector="//html:font"/>
-  <its:withinTextRule withinText="yes" selector="//html:hr"/>
-  <its:withinTextRule withinText="yes" selector="//html:i"/>
-  <its:withinTextRule withinText="yes" selector="//html:img"/>
-  <its:withinTextRule withinText="yes" selector="//html:ins"/>
-  <its:withinTextRule withinText="yes" selector="//html:isindex"/>
-  <its:withinTextRule withinText="yes" selector="//html:kbd"/>
-  <its:withinTextRule withinText="yes" selector="//html:q"/>
-  <its:withinTextRule withinText="yes" selector="//html:s"/>
-  <its:withinTextRule withinText="yes" selector="//html:samp"/>
-  <its:withinTextRule withinText="yes" selector="//html:small"/>
-  <its:withinTextRule withinText="yes" selector="//html:span"/>
-  <its:withinTextRule withinText="yes" selector="//html:strike"/>
-  <its:withinTextRule withinText="yes" selector="//html:strong"/>
-  <its:withinTextRule withinText="yes" selector="//html:sub"/>
-  <its:withinTextRule withinText="yes" selector="//html:sup"/>
-  <its:withinTextRule withinText="yes" selector="//html:tt"/>
-  <its:withinTextRule withinText="yes" selector="//html:u"/>
-  <its:withinTextRule withinText="yes" selector="//html:var"/>
+  <its:withinTextRule withinText="yes" selector="//html:a |
+                                                 //html:abbr |
+                                                 //html:acronym |
+                                                 //html:b |
+                                                 //html:bdo |
+                                                 //html:big |
+                                                 //html:br |
+                                                 //html:center |
+                                                 //html:cite |
+                                                 //html:code |
+                                                 //html:del |
+                                                 //html:dfn |
+                                                 //html:em |
+                                                 //html:font |
+                                                 //html:hr |
+                                                 //html:i |
+                                                 //html:img |
+                                                 //html:ins |
+                                                 //html:isindex |
+                                                 //html:kbd |
+                                                 //html:q |
+                                                 //html:s |
+                                                 //html:samp |
+                                                 //html:small |
+                                                 //html:span |
+                                                 //html:strike |
+                                                 //html:strong |
+                                                 //html:sub |
+                                                 //html:sup |
+                                                 //html:tt |
+                                                 //html:u |
+                                                 //html:var "/>
 
   <its:externalResourceRefRule externalResourceRefPointer="@src"
                                selector="//html:img | //html:audio | //html:video"/>