metanorma-ogc 1.4.0 → 1.4.1

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

@@ -32,6 +32,7 @@
 		<xsl:attribute name="margin-top">18pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
 		<xsl:attribute name="line-height">110%</xsl:attribute>
+		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set>
 	
 	<xsl:attribute-set name="title-depth2-style">
@@ -42,6 +43,7 @@
 		<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>		
 		<xsl:attribute name="line-height">110%</xsl:attribute>
+		<xsl:attribute name="role">H2</xsl:attribute>
 	</xsl:attribute-set>
 	
 	<xsl:attribute-set name="title-depth3-style">
@@ -51,7 +53,8 @@
 		<xsl:attribute name="color">rgb(21, 43, 77)</xsl:attribute>
 		<xsl:attribute name="margin-top">6pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
-		<xsl:attribute name="keep-with-next">always</xsl:attribute>		
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="role">H3</xsl:attribute>
 	</xsl:attribute-set>
 	
 	<xsl:attribute-set name="empty-style">
@@ -126,7 +129,7 @@
 					
 					<fo:block-container margin-left="-12mm" margin-right="-9mm">
 						<fo:block-container margin-left="0mm" margin-right="0mm">
-							<fo:block font-size="36pt" background-color="{$color}" color="white" margin-left="2.5mm" padding-top="1mm" padding-left="1mm">
+							<fo:block font-size="36pt" background-color="{$color}" color="white" margin-left="2.5mm" padding-top="1mm" padding-left="1mm" role="H1">
 								<xsl:apply-templates select="/ogc:ogc-standard/ogc:bibdata/ogc:title/node()"/>
 							</fo:block>
 						</fo:block-container>
@@ -216,43 +219,45 @@
 					<fo:block break-after="page"/>
 					
 					<fo:block-container line-height="1.08" font-family="Lato">
-						<fo:block xsl:use-attribute-sets="title-toc-style">
-							<xsl:text>Table of Contents</xsl:text>
-						</fo:block>
-						<xsl:variable name="margin-left">3.9</xsl:variable>
-						<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']">
-							<fo:block margin-top="8pt" margin-bottom="5pt" margin-left="{(@level - 1) * $margin-left}mm" text-align-last="justify">
-								<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
-									<xsl:if test="@section != ''">
-										<xsl:value-of select="@section"/><xsl:text> </xsl:text>
-									</xsl:if>
-									<xsl:apply-templates select="title"/>
-									<fo:inline keep-together.within-line="always">
-										<fo:leader leader-pattern="dots"/>
-										<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
-									</fo:inline>
-								</fo:basic-link>
+						<fo:block role="TOC">
+							<fo:block xsl:use-attribute-sets="title-toc-style" role="H1">
+								<xsl:text>Table of Contents</xsl:text>
 							</fo:block>
-						</xsl:for-each>
-						
-						<xsl:if test="//ogc:figure[@id and ogc:name] or //ogc:table[@id and ogc:name]">
-							<fo:block font-size="11pt" margin-top="8pt"> </fo:block>
-							<fo:block font-size="11pt" margin-top="8pt"> </fo:block>							
-							<fo:block xsl:use-attribute-sets="title-toc-style">
-								<xsl:text>Table of Figures</xsl:text>
-							</fo:block>
-							<xsl:for-each select="//ogc:figure[@id and ogc:name] | //ogc:table[@id and ogc:name]">
-								<fo:block margin-top="8pt" margin-bottom="5pt" text-align-last="justify">
-									<fo:basic-link internal-destination="{@id}" fox:alt-text="{ogc:name}">
-										<xsl:apply-templates select="ogc:name" mode="contents"/>										
+							<xsl:variable name="margin-left">3.9</xsl:variable>
+							<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']">
+								<fo:block margin-top="8pt" margin-bottom="5pt" margin-left="{(@level - 1) * $margin-left}mm" text-align-last="justify" role="TOCI">
+									<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
+										<xsl:if test="@section != ''">
+											<xsl:value-of select="@section"/><xsl:text> </xsl:text>
+										</xsl:if>
+										<xsl:apply-templates select="title"/>
 										<fo:inline keep-together.within-line="always">
 											<fo:leader leader-pattern="dots"/>
-											<fo:page-number-citation ref-id="{@id}"/>
+											<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
 										</fo:inline>
 									</fo:basic-link>
 								</fo:block>
 							</xsl:for-each>
-						</xsl:if>						
+							
+							<xsl:if test="//ogc:figure[@id and ogc:name] or //ogc:table[@id and ogc:name]">
+								<fo:block font-size="11pt" margin-top="8pt"> </fo:block>
+								<fo:block font-size="11pt" margin-top="8pt"> </fo:block>							
+								<fo:block xsl:use-attribute-sets="title-toc-style">
+									<xsl:text>Table of Figures</xsl:text>
+								</fo:block>
+								<xsl:for-each select="//ogc:figure[@id and ogc:name] | //ogc:table[@id and ogc:name]">
+									<fo:block margin-top="8pt" margin-bottom="5pt" text-align-last="justify" role="TOCI">
+										<fo:basic-link internal-destination="{@id}" fox:alt-text="{ogc:name}">
+											<xsl:apply-templates select="ogc:name" mode="contents"/>										
+											<fo:inline keep-together.within-line="always">
+												<fo:leader leader-pattern="dots"/>
+												<fo:page-number-citation ref-id="{@id}"/>
+											</fo:inline>
+										</fo:basic-link>
+									</fo:block>
+								</xsl:for-each>
+							</xsl:if>
+						</fo:block>
 					</fo:block-container>
 				
 					
@@ -417,7 +422,10 @@
 	</xsl:template>
 	
 	<xsl:template match="ogc:license-statement//ogc:title">
-		<fo:block font-family="Lato" text-align="center" font-weight="bold" margin-top="4pt">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:block font-family="Lato" text-align="center" font-weight="bold" margin-top="4pt" role="H{$level}">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -450,7 +458,10 @@
 	</xsl:template>
 		
 	<xsl:template match="ogc:copyright-statement//ogc:title | ogc:legal-statement//ogc:title">
-		<fo:block font-family="Lato" text-align="center" font-weight="bold">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:block font-family="Lato" text-align="center" font-weight="bold" role="H{$level}">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -489,8 +500,9 @@
 	<!-- ====== -->
 	
 	<xsl:template match="ogc:annex/ogc:title">
-		<fo:block xsl:use-attribute-sets="title-depth1-style">			
+		<fo:block xsl:use-attribute-sets="title-depth1-style" role="H1">			
 			<xsl:apply-templates/>
+			<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 		</fo:block>
 	</xsl:template>
 	
@@ -520,7 +532,7 @@
 						</fo:inline>
 					</xsl:when>
 					<xsl:otherwise>
-						<fo:inline font-family="Lato">
+						<fo:inline font-family="Lato" role="H{$level}">
 							<xsl:apply-templates/>
 						</fo:inline>
 					</xsl:otherwise>
@@ -531,21 +543,25 @@
 					<xsl:when test="$level = 1">
 						<fo:block xsl:use-attribute-sets="title-depth1-style">
 							<xsl:apply-templates/>
+							<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 						</fo:block>
 					</xsl:when>
 					<xsl:when test="$level = 2">
 						<fo:block xsl:use-attribute-sets="title-depth2-style">
 							<xsl:apply-templates/>
+							<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 						</fo:block>
 					</xsl:when>
 					<xsl:when test="$level = 3">
 						<fo:block xsl:use-attribute-sets="title-depth3-style">
 							<xsl:apply-templates/>
+							<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 						</fo:block>
 					</xsl:when>
 					<xsl:otherwise>
-						<fo:block font-family="Lato">
+						<fo:block font-family="Lato" role="H{$level}">
 							<xsl:apply-templates/>
+							<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 						</fo:block>
 					</xsl:otherwise>
 				</xsl:choose>
@@ -751,7 +767,10 @@
 				<xsl:otherwise>12pt</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<fo:block font-size="{$font-size}">
+		<xsl:variable name="levelTerm">
+			<xsl:call-template name="getLevelTermName"/>
+		</xsl:variable>
+		<fo:block font-size="{$font-size}" role="H{$levelTerm}">
 			<fo:block font-weight="bold" keep-with-next="always">
 				<xsl:apply-templates select="ancestor::ogc:term/ogc:name" mode="presentation"/>
 			</fo:block>
@@ -861,13 +880,13 @@
 			</fo:block>
 		</fo:static-content>
 		
-		<fo:static-content flow-name="header">
+		<fo:static-content flow-name="header" role="artifact">
 			<fo:block-container height="16.5mm" background-color="{$color}">
 				<fo:block> </fo:block>
 			</fo:block-container>
 		</fo:static-content>
 		
-		<fo:static-content flow-name="footer">
+		<fo:static-content flow-name="footer" role="artifact">
 			<fo:block-container height="100%" display-align="after">
 				<fo:block-container height="23.5mm" background-color="{$color}" color="rgb(231, 230, 230)" display-align="after">
 					<fo:block-container margin-left="1in" margin-right="1in">
@@ -1072,6 +1091,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
 		<xsl:attribute name="white-space">pre</xsl:attribute>
 		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
+		<xsl:attribute name="role">Code</xsl:attribute>
 		
 		
 		
@@ -1124,8 +1144,13 @@
 		
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		
-	</xsl:attribute-set><xsl:attribute-set name="requirement-subject-style">
-	</xsl:attribute-set><xsl:attribute-set name="requirement-inherit-style">
+	</xsl:attribute-set><xsl:attribute-set name="subject-style">
+	</xsl:attribute-set><xsl:attribute-set name="inherit-style">
+	</xsl:attribute-set><xsl:attribute-set name="description-style">
+	</xsl:attribute-set><xsl:attribute-set name="specification-style">
+	</xsl:attribute-set><xsl:attribute-set name="measurement-target-style">
+	</xsl:attribute-set><xsl:attribute-set name="verification-style">
+	</xsl:attribute-set><xsl:attribute-set name="import-style">
 	</xsl:attribute-set><xsl:attribute-set name="recommendation-style">
 		
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -1365,7 +1390,8 @@
 				
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
+	</xsl:attribute-set><xsl:attribute-set name="quote-style">
+		<xsl:attribute name="role">BlockQuote</xsl:attribute>
 		
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
 			<xsl:attribute name="margin-left">13mm</xsl:attribute>
@@ -1576,7 +1602,9 @@
 			<!-- Display table's name before table as standalone block -->
 			<!-- $namespace = 'iso' or  -->
 			
-					
+			
+			
+			
 			
 				<xsl:call-template name="fn_name_display"/>
 			
@@ -3466,16 +3494,68 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 			
+			
+			
 			<xsl:variable name="mathml">
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
 			<fo:instream-foreign-object fox:alt-text="Math">
 				
 				
+				<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
+				<xsl:variable name="comment_text_">
+					<xsl:choose>
+						<xsl:when test="normalize-space($comment_text_following) != ''">
+							<xsl:value-of select="$comment_text_following"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="normalize-space(translate(.,' ⁢','  '))"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable> 
+				<xsl:variable name="comment_text" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
+				
+				<xsl:if test="normalize-space($comment_text) != ''">
+				<!-- put Mathin Alternate Text -->
+					<xsl:attribute name="fox:alt-text">
+						<xsl:value-of select="java:org.metanorma.fop.Util.unescape($comment_text)"/>
+					</xsl:attribute>
+				</xsl:if>
+				
+				<xsl:variable name="mathml_content">
+					<xsl:apply-templates select="." mode="mathml_actual_text"/>
+				</xsl:variable>
+				<!-- put MathML in Actual Text -->
+				<xsl:attribute name="fox:actual-text">
+					<xsl:value-of select="$mathml_content"/>
+				</xsl:attribute>
+				
+				
 				<!-- <xsl:copy-of select="."/> -->
 				<xsl:copy-of select="xalan:nodeset($mathml)"/>
 			</fo:instream-foreign-object>			
 		</fo:inline>
+	</xsl:template><xsl:template match="mathml:*" mode="mathml_actual_text">
+		<!-- <xsl:text>a+b</xsl:text> -->
+		<xsl:text>&lt;</xsl:text>
+		<xsl:value-of select="local-name()"/>
+		<xsl:if test="local-name() = 'math'">
+			<xsl:text> xmlns="http://www.w3.org/1998/Math/MathML"</xsl:text>
+		</xsl:if>
+		<xsl:for-each select="@*">
+			<xsl:text> </xsl:text>
+			<xsl:value-of select="local-name()"/>
+			<xsl:text>="</xsl:text>
+			<xsl:value-of select="."/>
+			<xsl:text>"</xsl:text>
+		</xsl:for-each>
+		<xsl:text>&gt;</xsl:text>		
+		<xsl:apply-templates mode="mathml_actual_text"/>		
+		<xsl:text>&lt;/</xsl:text>
+		<xsl:value-of select="local-name()"/>
+		<xsl:text>&gt;</xsl:text>
+	</xsl:template><xsl:template match="text()" mode="mathml_actual_text">
+		<xsl:value-of select="normalize-space()"/>
 	</xsl:template><xsl:template match="@*|node()" mode="mathml">
 		<xsl:copy>
 				<xsl:apply-templates select="@*|node()" mode="mathml"/>
@@ -3537,7 +3617,10 @@
 		</fo:block>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='appendix']/*[local-name()='title']"/><xsl:template match="*[local-name()='appendix']/*[local-name()='title']" mode="process">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:inline role="H{$level}"><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='appendix']//*[local-name()='example']" priority="2">
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">			
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -3572,9 +3655,10 @@
 			
 		</xsl:variable>
 		
+    <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
 		<xsl:choose>
-			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
-			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
+			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text>—</xsl:text></xsl:if></xsl:when>
+			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text> — </xsl:text></xsl:if></xsl:otherwise>
 		</xsl:choose>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'xref']">
@@ -3724,7 +3808,10 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
 		<xsl:if test="normalize-space() != ''">
-			<fo:inline>
+			<xsl:variable name="level">
+				<xsl:call-template name="getLevelTermName"/>
+			</xsl:variable>
+			<fo:inline role="H{$level}">
 				<xsl:apply-templates/>
 				<!-- <xsl:if test="$namespace = 'gb' or $namespace = 'ogc'">
 					<xsl:text>.</xsl:text>
@@ -4366,6 +4453,7 @@
 							</xsl:when>
 							<xsl:otherwise>
 								<xsl:apply-templates/>
+								<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 							</xsl:otherwise>
 						</xsl:choose>
 					</fo:block>
@@ -4514,14 +4602,6 @@
 			<fo:block>
 				<fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/>
 			</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
-		<fo:block xsl:use-attribute-sets="requirement-subject-style">
-			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
-		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'inherit']">
-		<fo:block xsl:use-attribute-sets="requirement-inherit-style">
-			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
-		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'recommendation']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">			
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -4538,6 +4618,38 @@
 		<fo:block xsl:use-attribute-sets="recommendation-label-style">
 			<xsl:apply-templates/>
 		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
+		<fo:block xsl:use-attribute-sets="subject-style">
+			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'subject']">
+		<fo:block xsl:use-attribute-sets="subject-style">
+			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
+		<fo:block xsl:use-attribute-sets="inherit-style">
+			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
+		<fo:block xsl:use-attribute-sets="description-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
+		<fo:block xsl:use-attribute-sets="specification-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
+		<fo:block xsl:use-attribute-sets="measurement-target-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
+		<fo:block xsl:use-attribute-sets="verification-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
+		<fo:block xsl:use-attribute-sets="import-style">
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
 		<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
 			<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
@@ -5560,6 +5672,9 @@
 		<fo:block-container border="1pt solid black" width="50%">
 			<fo:block> </fo:block>
 		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
+		<fo:inline padding-right="5mm"> </fo:inline>
+		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -5798,6 +5913,26 @@
 				<xsl:value-of select="$level"/>
 			</xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="getLevelTermName">
+		<xsl:choose>
+			<xsl:when test="normalize-space(../@depth) != ''">
+				<xsl:value-of select="../@depth"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="title_level_">
+					<xsl:for-each select="../preceding-sibling::*[local-name() = 'title'][1]">
+						<xsl:call-template name="getLevel"/>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:variable name="title_level" select="normalize-space($title_level_)"/>
+				<xsl:choose>
+					<xsl:when test="$title_level != ''"><xsl:value-of select="$title_level + 1"/></xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="getLevel"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="split">
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -20,15 +20,15 @@ module IsoDoc
 
       def preface_init_insert_pt(docxml)
         docxml.at(ns("//preface")) ||
-          docxml.at(ns("//sections")).
-          add_previous_sibling("<preface> </preface>").first
+          docxml.at(ns("//sections"))
+            .add_previous_sibling("<preface> </preface>").first
       end
 
       def submit_orgs_append_pt(docxml)
         docxml.at(ns("//introduction")) ||
-        docxml.at(ns("//foreword")) ||
-        docxml.at(ns("//preface/clause[@type = 'keywords']")) ||
-        docxml.at(ns("//preface/abstract"))
+          docxml.at(ns("//foreword")) ||
+          docxml.at(ns("//preface/clause[@type = 'keywords']")) ||
+          docxml.at(ns("//preface/abstract"))
       end
 
       def insert_security(docxml)
@@ -37,8 +37,8 @@ module IsoDoc
         if a = submit_orgs_append_pt(docxml)
           a.next = s
         else
-          preface_init_insert_pt(docxml)&.children&.first&.
-            add_previous_sibling(s)
+          preface_init_insert_pt(docxml)&.children&.first
+            &.add_previous_sibling(s)
         end
       end
 
@@ -46,33 +46,34 @@ module IsoDoc
         orgs = []
         docxml.xpath(ns(submittingorgs_path)).each { |org| orgs << org.text }
         return if orgs.empty?
+
         if a = submit_orgs_append_pt(docxml)
           a.next = submitting_orgs_clause(orgs)
         else
-          preface_init_insert_pt(docxml)&.children&.first&.
-            add_previous_sibling(submitting_orgs_clause(orgs))
+          preface_init_insert_pt(docxml)&.children&.first
+            &.add_previous_sibling(submitting_orgs_clause(orgs))
         end
       end
 
       def submitting_orgs_clause(orgs)
-        <<~END
-        <clause id="_#{UUIDTools::UUID.random_create}" type="submitting_orgs">
-        <title>Submitting Organizations</title>
-        <p>The following organizations submitted this Document to the
-           Open Geospatial Consortium (OGC):</p>
-         <ul>#{orgs.map { |m| "<li>#{m}</li>" }.join("\n")}</ul>
-         </clause>
-        END
-      end
-
-      def keyword_clause(kw)
-        <<~END
-        <clause id="_#{UUIDTools::UUID.random_create}" type="keywords">
-        <title>Keywords</title>
-        <p>The following are keywords to be used by search engines and
-            document catalogues.</p>
-        <p>#{kw.join(", ")}</p></clause>
-        END
+        <<~SUBMITTING
+          <clause id="_#{UUIDTools::UUID.random_create}" type="submitting_orgs">
+          <title>Submitting Organizations</title>
+          <p>The following organizations submitted this Document to the
+             Open Geospatial Consortium (OGC):</p>
+           <ul>#{orgs.map { |m| "<li>#{m}</li>" }.join("\n")}</ul>
+           </clause>
+        SUBMITTING
+      end
+
+      def keyword_clause(kwords)
+        <<~KEYWORDS
+          <clause id="_#{UUIDTools::UUID.random_create}" type="keywords">
+          <title>Keywords</title>
+          <p>The following are keywords to be used by search engines and
+              document catalogues.</p>
+          <p>#{kwords.join(', ')}</p></clause>
+        KEYWORDS
       end
 
       def insert_keywords(docxml)
@@ -81,28 +82,29 @@ module IsoDoc
         if abstract = docxml.at(ns("//preface/abstract"))
           abstract.next = keyword_clause(kw)
         else
-          preface_init_insert_pt(docxml)&.children&.first&.
-            add_previous_sibling(keyword_clause(kw))
+          preface_init_insert_pt(docxml)&.children&.first
+            &.add_previous_sibling(keyword_clause(kw))
         end
       end
 
-      def example1(f)
-        lbl = @xrefs.anchor(f['id'], :label, false) or return
-        prefix_name(f, "&nbsp;&mdash; ", l10n("#{@i18n.example} #{lbl}"), "name")
+      def example1(elem)
+        lbl = @xrefs.anchor(elem["id"], :label, false) or return
+        prefix_name(elem, "&nbsp;&mdash; ", l10n("#{@i18n.example} #{lbl}"),
+                    "name")
       end
 
-      def recommendation1(f, type)
-        type = recommendation_class_label(f)
-        label = f&.at(ns("./label"))&.text
-        if inject_crossreference_reqt?(f, label)
+      def recommendation1(elem, _type)
+        type = recommendation_class_label(elem)
+        label = elem&.at(ns("./label"))&.text
+        if inject_crossreference_reqt?(elem, label)
           n = @xrefs.anchor(@xrefs.reqtlabels[label], :xref, false)
           lbl = (n.nil? ? type : n)
-          f&.at(ns("./title"))&.remove # suppress from display if embedded
+          elem&.at(ns("./title"))&.remove # suppress from display if embedded
         else
-          n = @xrefs.anchor(f['id'], :label, false)
+          n = @xrefs.anchor(elem["id"], :label, false)
           lbl = (n.nil? ? type : l10n("#{type} #{n}"))
         end
-        prefix_name(f, "", lbl, "name")
+        prefix_name(elem, "", lbl, "name")
       end
 
       # embedded reqts xref to top level reqts via label lookup
@@ -126,23 +128,29 @@ module IsoDoc
         end
       end
 
-      def annex1(f)
-        lbl = @xrefs.anchor(f['id'], :label)
-        if t = f.at(ns("./title"))
+      def annex1(elem)
+        lbl = @xrefs.anchor(elem["id"], :label)
+        if t = elem.at(ns("./title"))
           t.children = "<strong>#{t.children.to_xml}</strong>"
         end
-        prefix_name(f, "<br/>", lbl, "title")
+        prefix_name(elem, "<br/>", lbl, "title")
       end
 
       def clause(docxml)
         super
         docxml.xpath(ns("//foreword | //preface/abstract | "\
-                        "//submitters | //introduction | //acknowledgements")).
-                       each do |f|
+                        "//submitters | //introduction | //acknowledgements"))
+          .each do |f|
           clause1(f)
         end
       end
 
+      def clause1(elem)
+        return if elem.name == "terms" && elem.parent.name == "annex"
+
+        super
+      end
+
       def block(docxml)
         super
         recommendation_to_table(docxml)
@@ -166,4 +174,3 @@ module IsoDoc
     end
   end
 end
-