metanorma-ogc 1.4.1 → 1.4.2

data/lib/isodoc/ogc/base_convert.rb

@@ -15,7 +15,7 @@ module IsoDoc
       end
 
       def hi_parse(node, out)
-        out.span **{class: "hi"} do |e|
+        out.span **{ class: "hi" } do |e|
           node.children.each { |n| parse(n, e) }
         end
       end
@@ -27,23 +27,58 @@ module IsoDoc
 
       def term_cleanup(docxml)
         docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child(" ")
-          h2.add_child(d.remove)
+          term_cleanup_merge_termnum(d)
+          term_cleanup_merge_admitted(d)
         end
         docxml
       end
 
+      def term_cleanup_merge_termnum(term)
+        h2 = term.at("./preceding-sibling::*[@class = 'TermNum'][1]")
+        term["class"] = h2["class"]
+        term["id"] = h2["id"]
+        term.children.first.previous = " "
+        term.children.first.previous = h2.remove.children
+      end
+
+      def term_cleanup_merge_admitted(term)
+        term.xpath("./following-sibling::p[@class = 'AltTerms' or "\
+                   "@class = 'DeprecatedTerms']").each do |a|
+          term << " "
+          term << a.children
+          a.remove
+        end
+      end
+
+      def deprecated_term_parse(node, out)
+        out.p **{ class: "DeprecatedTerms" } do |p|
+          node.children.each { |c| parse(c, p) }
+          p << "&#xa0;"
+          p.span **{ class: "AdmittedLabel" } do |s|
+            s << l10n(@i18n.deprecated)
+          end
+        end
+      end
+
+      def admitted_term_parse(node, out)
+        out.p **{ class: "AltTerms" } do |p|
+          node.children.each { |c| parse(c, p) }
+          p << "&#xa0;"
+          p.span **{ class: "AdmittedLabel" } do |s|
+            s << l10n(@i18n.admitted)
+          end
+        end
+      end
+
       def example_parse(node, out)
         name = node.at(ns("./name"))
-        example_name_parse(node, out, name) #if name
+        example_name_parse(node, out, name) # if name
         super
       end
 
-      def example_label(node, div, name)
-      end
+      def example_label(node, div, name); end
 
-      def example_name_parse(node, div, name)
+      def example_name_parse(_node, div, name)
         div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
           name&.children&.each { |n| parse(n, p) }
         end
@@ -56,6 +91,7 @@ module IsoDoc
 
       def is_clause?(name)
         return true if name == "submitters"
+
         super
       end
 
@@ -84,8 +120,8 @@ module IsoDoc
       def make_tr_attr(td, row, totalrows, header)
         ret = super
         if td.at("./ancestor::xmlns:table[@class = 'recommendation'] | "\
-            "./ancestor::xmlns:table[@class = 'requirement'] | "\
-            "./ancestor::xmlns:table[@class = 'permission']")
+                 "./ancestor::xmlns:table[@class = 'requirement'] | "\
+                 "./ancestor::xmlns:table[@class = 'permission']")
           ret[:style] = "vertical-align:top;"
           ret[:class] = "recommend"
         end
@@ -94,6 +130,7 @@ module IsoDoc
 
       def para_class(node)
         return node["class"] if node["class"]
+
         super
       end
     end

data/lib/isodoc/ogc/html/htmlstyle.css

@@ -784,6 +784,12 @@ ul > li {
   ul > li:first-child {
     margin-top: 1em; }
 
+ul ul > li:first-child {
+  margin-top: 0; }
+
+ol ul > li:first-child {
+  margin-top: 0; }
+
 span.keyword {
   font-weight: 600; }
 
@@ -865,6 +871,10 @@ p.AltTerms {
   font-size: 24px;
   margin-top: 1em; }
 
+span.AdmittedLabel {
+  color: #00335b;
+  background-color: #CFE2F3; }
+
 /* Links, selection */
 a, a:visited {
   text-decoration: none;

data/lib/isodoc/ogc/html/htmlstyle.scss

@@ -273,6 +273,13 @@ ul {
   }
 }
 
+ul ul > li:first-child {
+      margin-top: 0;
+}
+ol ul > li:first-child {
+      margin-top: 0;
+}
+
 
 span.keyword {
   font-weight: 600;
@@ -363,6 +370,11 @@ p.AltTerms {
   margin-top: 1em;
 }
 
+span.AdmittedLabel {
+    color: #00335b;
+    background-color: #CFE2F3;
+}
+
 
 /* Links, selection */
 

data/lib/isodoc/ogc/html/ogc.css

@@ -851,3 +851,7 @@ div.warning p {
 
 span.hi {
   background-color: yellow; }
+
+span.AdmittedLabel {
+  color: #00335b;
+  background-color: #CFE2F3; }

data/lib/isodoc/ogc/html/ogc.scss

@@ -809,3 +809,7 @@ padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
 span.hi {
   background-color: yellow;
 }
+span.AdmittedLabel {
+    color: #00335b;
+    background-color: #CFE2F3;
+}

data/lib/isodoc/ogc/i18n-en.yaml

@@ -1,13 +1,14 @@
+admitted: ADMITTED
 foreword: Preface
 submitters: Submitters
-recommendationtest: Recommendation Test
-requirementtest: Requirement Test
-permissiontest: Permission Test
-recommendationclass: Recommendations Class
-requirementclass: Requirements Class
-permissionclass: Permissions Class
-abstracttest: Abstract Test
-conformanceclass: Conformance Class
+recommendationtest: Recommendation test
+requirementtest: Requirement test
+permissiontest: Permission test
+recommendationclass: Recommendations class
+requirementclass: Requirements class
+permissionclass: Permissions class
+abstracttest: Abstract test
+conformanceclass: Conformance class
 example: Example
 security_empty: No security considerations have been made for this %.
 internal_terms_boilerplate: |
@@ -24,6 +25,7 @@ internal_external_terms_boilerplate: |
         <p>This document also uses terms defined in the OGC Standard for Modular specifications (<link target="https://portal.opengeospatial.org/files/?artifact_id=34762">OGC 08-131r3</link>), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.</p>
           <p>For the purposes of this document, the terms and definitions
             given in % and the following additionally apply.</p>
+term_defined_in: "(%)"
 stage_dict:
   swg-draft: Candidate SWG Draft
   oab-review: Candidate OAB Review Draft

data/lib/isodoc/ogc/ogc.abstract-specification-topic.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.best-practice.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.change-request-supporting-document.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">