metanorma-ogc 1.4.1 → 1.4.2

data/lib/isodoc/ogc/ogc.standard.xsl

@@ -364,7 +364,7 @@
 										
 										<xsl:choose>
 											<xsl:when test="@level = 1">
-												<fo:list-block provisional-distance-between-starts="7mm">
+												<fo:list-block provisional-distance-between-starts="8mm">
 													<xsl:if test="@type = 'annex'">
 														<xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
 													</xsl:if>
@@ -393,7 +393,7 @@
 												</fo:list-block>
 											</xsl:when>
 											<xsl:otherwise>
-												<fo:block text-align-last="justify" margin-left="7mm">
+												<fo:block text-align-last="justify" margin-left="8mm">
 													<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
 														<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@section))"/>
 														<xsl:text> </xsl:text>
@@ -579,7 +579,7 @@
 		<xsl:value-of select="translate(., $thinspace, ' ')"/>
 	</xsl:template>
 	
-	<xsl:template match="text()" priority="3" mode="contents">
+	<xsl:template match="ogc:title//text() | ogc:name//text()" priority="3" mode="contents">
 		<xsl:value-of select="translate(., $thinspace, ' ')"/>
 	</xsl:template>
 
@@ -587,7 +587,9 @@
 		<xsl:variable name="content">
 			<xsl:call-template name="add-zero-spaces"/>
 		</xsl:variable>
-		<xsl:value-of select="translate($content, $thinspace, ' ')"/>
+		<!-- add zero-width space in the words like 'adeOfAbstractTransportaonSpace' to split it in the table's cell -->
+		<xsl:variable name="content2" select="java:replaceAll(java:java.lang.String.new($content),'([a-z]{2,})([A-Z])(.?)','$1​$2$3')"/>
+		<xsl:value-of select="translate($content2, $thinspace, ' ')"/>
 	</xsl:template>
 
 
@@ -1057,6 +1059,9 @@
 			<xsl:if test="ancestor::ogc:table">
 				<xsl:attribute name="margin-left">1.5mm</xsl:attribute>
 			</xsl:if>
+			<xsl:if test="ancestor::ogc:ul or ancestor::ogc:ol">
+				<xsl:attribute name="margin-top">10pt</xsl:attribute>
+			</xsl:if>
 			<fo:block-container margin-left="0mm">
 				<fo:list-block provisional-distance-between-starts="12mm" space-after="12pt" line-height="115%">
 					<xsl:if test="ancestor::ogc:table">
@@ -1091,17 +1096,25 @@
 									<xsl:number format="a)" lang="en"/>
 								</xsl:when>
 								<xsl:when test="../@type = 'alphabet'">
-									<xsl:number format="1)"/>
+									<xsl:number format="1."/>
 								</xsl:when>
 								<xsl:when test="../@type = 'alphabet_upper'">
 									<xsl:number format="A)" lang="en"/>
 								</xsl:when>
-								
 								<xsl:when test="../@type = 'roman'">
 									<xsl:number format="i)"/>
 								</xsl:when>
+								<xsl:when test="ancestor::ogc:table">
+									<xsl:variable name="level" select="count(ancestor-or-self::ogc:li[ancestor::ogc:table])"/>
+									<xsl:choose>
+										<xsl:when test="$level = 1"><xsl:number format="a)" lang="en"/></xsl:when>
+										<xsl:when test="$level = 2"><xsl:number format="1."/></xsl:when>
+										<xsl:when test="$level = 3"><xsl:number format="i)"/></xsl:when>
+										<xsl:otherwise><xsl:number format="a)" lang="en"/></xsl:otherwise>
+									</xsl:choose>
+								</xsl:when>
 								<xsl:otherwise>
-									<xsl:number format="1)"/>
+									<xsl:number format="1."/>
 								</xsl:otherwise>
 							</xsl:choose>
 						</xsl:otherwise>
@@ -1110,6 +1123,9 @@
 			</fo:list-item-label>
 			<fo:list-item-body start-indent="body-start()" line-height-shift-adjustment="disregard-shifts">
 				<fo:block margin-bottom="10pt">
+					<xsl:if test="not(following-sibling::*) and not(../following-sibling::*)">
+						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+					</xsl:if>
 					<xsl:apply-templates/>
 				</fo:block>
 			</fo:list-item-body>
@@ -1834,7 +1850,7 @@
 									
 			<xsl:attribute name="text-align">left</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute><!-- normal -->
 			<xsl:attribute name="font-size">11pt</xsl:attribute>
 		
 		
@@ -1994,6 +2010,7 @@
 		
 				
 		
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 			<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -2954,6 +2971,8 @@
 			
 			
 				<xsl:attribute name="border">solid 0pt white</xsl:attribute>
+				<xsl:attribute name="padding-top">1mm</xsl:attribute>			
+				<xsl:attribute name="padding-bottom">1mm</xsl:attribute>			
 			
 			
 			
@@ -5957,6 +5976,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

data/lib/isodoc/ogc/ogc.test-suite.xsl

@@ -364,7 +364,7 @@
 										
 										<xsl:choose>
 											<xsl:when test="@level = 1">
-												<fo:list-block provisional-distance-between-starts="7mm">
+												<fo:list-block provisional-distance-between-starts="8mm">
 													<xsl:if test="@type = 'annex'">
 														<xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
 													</xsl:if>
@@ -393,7 +393,7 @@
 												</fo:list-block>
 											</xsl:when>
 											<xsl:otherwise>
-												<fo:block text-align-last="justify" margin-left="7mm">
+												<fo:block text-align-last="justify" margin-left="8mm">
 													<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
 														<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@section))"/>
 														<xsl:text> </xsl:text>
@@ -579,7 +579,7 @@
 		<xsl:value-of select="translate(., $thinspace, ' ')"/>
 	</xsl:template>
 	
-	<xsl:template match="text()" priority="3" mode="contents">
+	<xsl:template match="ogc:title//text() | ogc:name//text()" priority="3" mode="contents">
 		<xsl:value-of select="translate(., $thinspace, ' ')"/>
 	</xsl:template>
 
@@ -587,7 +587,9 @@
 		<xsl:variable name="content">
 			<xsl:call-template name="add-zero-spaces"/>
 		</xsl:variable>
-		<xsl:value-of select="translate($content, $thinspace, ' ')"/>
+		<!-- add zero-width space in the words like 'adeOfAbstractTransportaonSpace' to split it in the table's cell -->
+		<xsl:variable name="content2" select="java:replaceAll(java:java.lang.String.new($content),'([a-z]{2,})([A-Z])(.?)','$1​$2$3')"/>
+		<xsl:value-of select="translate($content2, $thinspace, ' ')"/>
 	</xsl:template>
 
 
@@ -1057,6 +1059,9 @@
 			<xsl:if test="ancestor::ogc:table">
 				<xsl:attribute name="margin-left">1.5mm</xsl:attribute>
 			</xsl:if>
+			<xsl:if test="ancestor::ogc:ul or ancestor::ogc:ol">
+				<xsl:attribute name="margin-top">10pt</xsl:attribute>
+			</xsl:if>
 			<fo:block-container margin-left="0mm">
 				<fo:list-block provisional-distance-between-starts="12mm" space-after="12pt" line-height="115%">
 					<xsl:if test="ancestor::ogc:table">
@@ -1091,17 +1096,25 @@
 									<xsl:number format="a)" lang="en"/>
 								</xsl:when>
 								<xsl:when test="../@type = 'alphabet'">
-									<xsl:number format="1)"/>
+									<xsl:number format="1."/>
 								</xsl:when>
 								<xsl:when test="../@type = 'alphabet_upper'">
 									<xsl:number format="A)" lang="en"/>
 								</xsl:when>
-								
 								<xsl:when test="../@type = 'roman'">
 									<xsl:number format="i)"/>
 								</xsl:when>
+								<xsl:when test="ancestor::ogc:table">
+									<xsl:variable name="level" select="count(ancestor-or-self::ogc:li[ancestor::ogc:table])"/>
+									<xsl:choose>
+										<xsl:when test="$level = 1"><xsl:number format="a)" lang="en"/></xsl:when>
+										<xsl:when test="$level = 2"><xsl:number format="1."/></xsl:when>
+										<xsl:when test="$level = 3"><xsl:number format="i)"/></xsl:when>
+										<xsl:otherwise><xsl:number format="a)" lang="en"/></xsl:otherwise>
+									</xsl:choose>
+								</xsl:when>
 								<xsl:otherwise>
-									<xsl:number format="1)"/>
+									<xsl:number format="1."/>
 								</xsl:otherwise>
 							</xsl:choose>
 						</xsl:otherwise>
@@ -1110,6 +1123,9 @@
 			</fo:list-item-label>
 			<fo:list-item-body start-indent="body-start()" line-height-shift-adjustment="disregard-shifts">
 				<fo:block margin-bottom="10pt">
+					<xsl:if test="not(following-sibling::*) and not(../following-sibling::*)">
+						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+					</xsl:if>
 					<xsl:apply-templates/>
 				</fo:block>
 			</fo:list-item-body>
@@ -1834,7 +1850,7 @@
 									
 			<xsl:attribute name="text-align">left</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute><!-- normal -->
 			<xsl:attribute name="font-size">11pt</xsl:attribute>
 		
 		
@@ -1994,6 +2010,7 @@
 		
 				
 		
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 			<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -2954,6 +2971,8 @@
 			
 			
 				<xsl:attribute name="border">solid 0pt white</xsl:attribute>
+				<xsl:attribute name="padding-top">1mm</xsl:attribute>			
+				<xsl:attribute name="padding-bottom">1mm</xsl:attribute>			
 			
 			
 			
@@ -5957,6 +5976,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

data/lib/isodoc/ogc/ogc.user-guide.xsl

@@ -364,7 +364,7 @@
 										
 										<xsl:choose>
 											<xsl:when test="@level = 1">
-												<fo:list-block provisional-distance-between-starts="7mm">
+												<fo:list-block provisional-distance-between-starts="8mm">
 													<xsl:if test="@type = 'annex'">
 														<xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
 													</xsl:if>
@@ -393,7 +393,7 @@
 												</fo:list-block>
 											</xsl:when>
 											<xsl:otherwise>
-												<fo:block text-align-last="justify" margin-left="7mm">
+												<fo:block text-align-last="justify" margin-left="8mm">
 													<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
 														<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@section))"/>
 														<xsl:text> </xsl:text>
@@ -579,7 +579,7 @@
 		<xsl:value-of select="translate(., $thinspace, ' ')"/>
 	</xsl:template>
 	
-	<xsl:template match="text()" priority="3" mode="contents">
+	<xsl:template match="ogc:title//text() | ogc:name//text()" priority="3" mode="contents">
 		<xsl:value-of select="translate(., $thinspace, ' ')"/>
 	</xsl:template>
 
@@ -587,7 +587,9 @@
 		<xsl:variable name="content">
 			<xsl:call-template name="add-zero-spaces"/>
 		</xsl:variable>
-		<xsl:value-of select="translate($content, $thinspace, ' ')"/>
+		<!-- add zero-width space in the words like 'adeOfAbstractTransportaonSpace' to split it in the table's cell -->
+		<xsl:variable name="content2" select="java:replaceAll(java:java.lang.String.new($content),'([a-z]{2,})([A-Z])(.?)','$1​$2$3')"/>
+		<xsl:value-of select="translate($content2, $thinspace, ' ')"/>
 	</xsl:template>
 
 
@@ -1057,6 +1059,9 @@
 			<xsl:if test="ancestor::ogc:table">
 				<xsl:attribute name="margin-left">1.5mm</xsl:attribute>
 			</xsl:if>
+			<xsl:if test="ancestor::ogc:ul or ancestor::ogc:ol">
+				<xsl:attribute name="margin-top">10pt</xsl:attribute>
+			</xsl:if>
 			<fo:block-container margin-left="0mm">
 				<fo:list-block provisional-distance-between-starts="12mm" space-after="12pt" line-height="115%">
 					<xsl:if test="ancestor::ogc:table">
@@ -1091,17 +1096,25 @@
 									<xsl:number format="a)" lang="en"/>
 								</xsl:when>
 								<xsl:when test="../@type = 'alphabet'">
-									<xsl:number format="1)"/>
+									<xsl:number format="1."/>
 								</xsl:when>
 								<xsl:when test="../@type = 'alphabet_upper'">
 									<xsl:number format="A)" lang="en"/>
 								</xsl:when>
-								
 								<xsl:when test="../@type = 'roman'">
 									<xsl:number format="i)"/>
 								</xsl:when>
+								<xsl:when test="ancestor::ogc:table">
+									<xsl:variable name="level" select="count(ancestor-or-self::ogc:li[ancestor::ogc:table])"/>
+									<xsl:choose>
+										<xsl:when test="$level = 1"><xsl:number format="a)" lang="en"/></xsl:when>
+										<xsl:when test="$level = 2"><xsl:number format="1."/></xsl:when>
+										<xsl:when test="$level = 3"><xsl:number format="i)"/></xsl:when>
+										<xsl:otherwise><xsl:number format="a)" lang="en"/></xsl:otherwise>
+									</xsl:choose>
+								</xsl:when>
 								<xsl:otherwise>
-									<xsl:number format="1)"/>
+									<xsl:number format="1."/>
 								</xsl:otherwise>
 							</xsl:choose>
 						</xsl:otherwise>
@@ -1110,6 +1123,9 @@
 			</fo:list-item-label>
 			<fo:list-item-body start-indent="body-start()" line-height-shift-adjustment="disregard-shifts">
 				<fo:block margin-bottom="10pt">
+					<xsl:if test="not(following-sibling::*) and not(../following-sibling::*)">
+						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+					</xsl:if>
 					<xsl:apply-templates/>
 				</fo:block>
 			</fo:list-item-body>
@@ -1834,7 +1850,7 @@
 									
 			<xsl:attribute name="text-align">left</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute><!-- normal -->
 			<xsl:attribute name="font-size">11pt</xsl:attribute>
 		
 		
@@ -1994,6 +2010,7 @@
 		
 				
 		
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 			<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -2954,6 +2971,8 @@
 			
 			
 				<xsl:attribute name="border">solid 0pt white</xsl:attribute>
+				<xsl:attribute name="padding-top">1mm</xsl:attribute>			
+				<xsl:attribute name="padding-bottom">1mm</xsl:attribute>			
 			
 			
 			
@@ -5957,6 +5976,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

data/lib/isodoc/ogc/ogc.white-paper.xsl

@@ -5364,6 +5364,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -43,8 +43,10 @@ module IsoDoc
       end
 
       def insert_submitting_orgs(docxml)
-        orgs = []
-        docxml.xpath(ns(submittingorgs_path)).each { |org| orgs << org.text }
+        orgs = docxml.xpath(ns(submittingorgs_path))
+          .each_with_object([]) do |org, m|
+          m << org.text
+        end
         return if orgs.empty?
 
         if a = submit_orgs_append_pt(docxml)
@@ -146,7 +148,8 @@ module IsoDoc
       end
 
       def clause1(elem)
-        return if elem.name == "terms" && elem.parent.name == "annex"
+        return if elem.name == "terms" && elem.parent.name == "annex" &&
+          elem.parent.xpath(ns("./terms")).size == 1
 
         super
       end

data/lib/isodoc/ogc/reqt.rb

@@ -1,4 +1,5 @@
 require "isodoc"
+require "metanorma-utils"
 
 module IsoDoc
   module Ogc
@@ -34,24 +35,25 @@ module IsoDoc
         b = out.add_child("<p class='#{recommendation_class(node)}'></p>").first
         if name = node&.at(ns("./name"))&.remove
           name.children.each { |n| b << n }
-          b << l10n(":")
         end
         if title = node&.at(ns("./title"))&.remove
-          b << l10n(" ") if name
+          b << l10n(": ") if name
           title.children.each { |n| b << n }
         end
       end
 
       def recommend_title(node, out)
         label = node&.at(ns("./label"))&.remove or return
+        label.xpath(ns(".//xref | .//eref | .//quote/source"))
+          .each { |f| xref1(f) }
+        label.xpath(ns(".//concept")).each { |f| concept1(f) }
         b = out.add_child("<tr><td colspan='2'><p></p></td></tr>")
         p = b.at(ns(".//p"))
-        p << label.children
+        p << label.text
       end
 
       def recommendation_attributes1(node)
         out = recommendation_attributes1_head(node, [])
-        out = recommendation_attributes1_component(node, out)
         node.xpath(ns("./classification")).each do |c|
           line = recommendation_attr_keyvalue(c, "tag", "value") and out << line
         end
@@ -68,32 +70,27 @@ module IsoDoc
         out
       end
 
-      def strict_capitalize_phrase(str)
-        str.split(/ /).map do |w|
-          letters = w.chars
-          letters.first.upcase!
-          letters.join
-        end.join(" ")
+      def recommendation_steps(node)
+        node.elements.each { |e| recommendation_steps(e) }
+        return node unless node.at(ns("./component[@class = 'step']"))
+
+        d = node.at(ns("./component[@class = 'step']"))
+        d = d.replace("<ol><li>#{d.children.to_xml}</li></ol>").first
+        node.xpath(ns("./component[@class = 'step']")).each do |f|
+          f = f.replace("<li>#{f.children.to_xml}</li>").first
+          d << f
+        end
       end
 
       def recommendation_attributes1_component(node, out)
-        node.xpath(ns("./component[not(@class = 'part')]")).each do |c|
-          out << case c["class"]
-                 when "test-purpose" then ["Test Purpose", c.remove.children]
-                 when "test-method" then ["Test Method", c.remove.children]
-                 else [strict_capitalize_phrase(c["class"]), c.remove.children]
-                 end
-        end
-        node.xpath(ns("./component[@class = 'part']")).each_with_index do |c, i|
-          out << [(i + "A".ord).chr.to_s, c.remove.children]
-        end
-        out
+        node = recommendation_steps(node)
+        out << "<tr><td>#{node['label']}</td><td>#{node.children}</td></tr>"
       end
 
       def rec_subj(node)
         case node["type_original"]
-        when "class" then "Target Type"
-        when "conformanceclass" then "Requirements Class"
+        when "class" then "Target type"
+        when "conformanceclass" then "Requirements class"
         when "verification", "abstracttest" then "Requirement"
         else "Subject"
         end
@@ -108,6 +105,7 @@ module IsoDoc
       end
 
       def recommendation_attributes(node, out)
+        recommend_title(node, out)
         recommendation_attributes1(node).each do |i|
           out.add_child("<tr><td>#{i[0]}</td><td>#{i[1]}</td></tr>")
         end
@@ -126,8 +124,11 @@ module IsoDoc
 
         node.elements.size == 1 && node.first_element_child.name == "dl" and
           return reqt_dl(node.first_element_child, out)
+        node.name == "component" and
+          return recommendation_attributes1_component(node, out)
         b = out.add_child("<tr><td colspan='2'></td></tr>").first
-        b.at(ns(".//td")) << (preserve_in_nested_table?(node) ? node : node.children)
+        b.at(ns(".//td")) <<
+          (preserve_in_nested_table?(node) ? node : node.children)
       end
 
       def reqt_dl(node, out)
@@ -146,19 +147,31 @@ module IsoDoc
         node["class"] = klass
         node["type_original"] = node["type"]
         node["type"] = recommend_class(node)
+        recommendation_component_labels(node)
+      end
+
+      def recommendation_component_labels(node)
+        node.xpath(ns("./component[@class = 'part']")).each_with_index do |c, i|
+          c["label"] = (i + "A".ord).chr.to_s
+        end
+        node.xpath(ns("./component[not(@class = 'part')]")).each do |c|
+          c["label"] = case c["class"]
+                       when "test-purpose" then "Test purpose"
+                       when "test-method" then "Test method"
+                       else Metanorma::Utils.strict_capitalize_first(c["class"])
+                       end
+        end
       end
 
       def recommendation_parse1(node, klass)
         recommendation_base(node, klass)
         recommendation_header(node)
         b = node.add_child("<tbody></tbody>").first
-        recommend_title(node, b)
         recommendation_attributes(node, b)
-        node.elements.each do |n|
-          next if %w(thead tbody).include?(n.name)
-
-          requirement_component_parse(n, b)
-        end
+        node.elements.reject do |n|
+          %w(thead tbody classification subject
+             inherit).include?(n.name)
+        end.each { |n| requirement_component_parse(n, b) }
         node.delete("type_original")
       end
 
@@ -191,13 +204,12 @@ module IsoDoc
       def requirement_table_cleanup(docxml)
         docxml.xpath(ns("//table[@type = 'recommendclass']/tbody/tr/td/table"))
           .each do |t|
-          x = t.at(ns("./thead")) and x.replace(x.children)
-          x = t.at(ns("./tbody")) and x.replace(x.children)
-          x = t.at(ns("./tfoot")) and x.replace(x.children)
-          if (x = t.at(ns("./tr/th[@colspan = '2']"))) &&
-              (y = t.at(ns("./tr/td[@colspan = '2']")))
-            requirement_table_cleanup1(x, y)
+          t.xpath(ns("./thead | ./tbody |./tfoot")).each do |x|
+            x.replace(x.children)
           end
+          (x = t.at(ns("./tr/th[@colspan = '2']"))) &&
+            (y = t.at(ns("./tr/td[@colspan = '2']"))) and
+            requirement_table_cleanup1(x, y)
           t.parent.parent.replace(t.children)
         end
       end