metanorma-itu 2.2.15 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab77aa6538e716fad3b632f16f92ab28b0149ec8252e57fa598a5cab87c4030e
-  data.tar.gz: ed77a2cfe1cad5fd1a92ff1c5c8cfa0e9dd3586f84e6c62775f9229aa2cbc0e8
+  metadata.gz: dd7cb2a16590fe04f51e162637b7fc1be2b6e7b403d04118e8c82b2ad0e4eb66
+  data.tar.gz: 35a5dd96771972460f80fc0f0a83f4c6610b59bd659b08c771b89405ca719e62
 SHA512:
-  metadata.gz: a37ca832fec8d03e30eb7a2f92553efd07d5e2d922c849591588c9e587dc0641b85395aa5a5addbe2d94ab41360102170e6e8c6a8fb5fb1131730eb271a081bb
-  data.tar.gz: 0be40a2c8f7cd9aaf507df6cfc0e03bbc0433503925ef91a099c8ff76a39c88f1e567b675ea273704588757e6ce6c2dd3edd2b425ad7c5cd2a23c211d0e7aaac
+  metadata.gz: 78896c795984c2999c194e6cb21546880ed1df41cbabe7082f773d5086c1f354f5d342eec07f7ae697dd21ab9848aee3b035d4047db3af3c1c4efc9296ccf10f
+  data.tar.gz: 53894e2251b8a69d8c4ff9c37789b600b18907c8a718ac9a5dde34e351e4e36b7b27c1ae40b3808bc885dfa7d1b7cf458d2e3a0ca43474a9ec341bd07760cae8

data/lib/isodoc/itu/base_convert.rb

@@ -1,9 +1,9 @@
 require "isodoc"
 require "fileutils"
-require_relative "./ref"
-require_relative "./xref"
-require_relative "./terms"
-require_relative "./cleanup"
+require_relative "ref"
+require_relative "xref"
+require_relative "terms"
+require_relative "cleanup"
 
 module IsoDoc
   module ITU
@@ -61,7 +61,6 @@ module IsoDoc
       end
 
       def annex_name(annex, name, div)
-        # preceding_floating_titles(name, div)
         r_a = @meta.get[:doctype_original] == "recommendation-annex"
         div.h1 class: r_a ? "RecommendationAnnex" : "Annex" do |t|
           name&.children&.each { |c2| parse(c2, t) }
@@ -74,24 +73,22 @@ module IsoDoc
         info = annex["obligation"] == "informative"
         div.p class: "annex_obligation" do |p|
           p << (info ? @i18n.inform_annex : @i18n.norm_annex)
-            .sub(/%/, @meta.get[:doctype] || "")
+            .sub("%", @meta.get[:doctype] || "")
         end
       end
 
-      def annex(isoxml, out)
-        isoxml.xpath(ns("//annex")).each do |c|
+      def annex(node, out)
           @meta.get[:doctype_original] == "recommendation-annex" or
             page_break(out)
-          out.div **attr_code(id: c["id"], class: "Section3") do |s|
-            annex_name(c, nil, s) unless c.at(ns("./title"))
-            c.elements.each do |c1|
-              if c1.name == "title" then annex_name(c, c1, s)
+          out.div **attr_code(id: node["id"], class: "Section3") do |s|
+            annex_name(node, nil, s) unless node.at(ns("./title"))
+            node.elements.each do |c1|
+              if c1.name == "title" then annex_name(node, c1, s)
               else
                 parse(c1, s)
               end
             end
           end
-        end
       end
 
       def info(isoxml, out)
@@ -100,54 +97,6 @@ module IsoDoc
         super
       end
 
-      def middle_title(isoxml, out)
-        if @meta.get[:doctype] == "Resolution"
-          middle_title_resolution(isoxml, out)
-        else
-          middle_title_recommendation(isoxml, out)
-        end
-      end
-
-      def middle_title_resolution(isoxml, out)
-        res = isoxml.at(ns("//bibdata/title[@type = 'resolution']"))
-        out.p(align: "center", style: "text-align:center;") do |p|
-          res.children.each { |n| parse(n, p) }
-        end
-        out.p(class: "zzSTDTitle2") { |p| p << @meta.get[:doctitle] }
-        middle_title_resolution_subtitle(isoxml, out)
-      end
-
-      def middle_title_resolution_subtitle(isoxml, out)
-        out.p(align: "center", style: "text-align:center;") do |p|
-          p.i do |i|
-            i << "("
-            isoxml.at(ns("//bibdata/title[@type = 'resolution-placedate']"))
-              .children.each { |n| parse(n, i) }
-            i << ")"
-          end
-          isoxml.xpath(ns("//note[@type = 'title-footnote']")).each do |f|
-            footnote_parse(f, p)
-          end
-        end
-      end
-
-      def middle_title_recommendation(isoxml, out)
-        out.p(class: "zzSTDTitle1") do |p|
-          type = @meta.get[:doctype]
-          @meta.get[:unpublished] && @meta.get[:draft_new_doctype] and
-            type = @meta.get[:draft_new_doctype]
-          id = @meta.get[:docnumber] and p << "#{type} #{id}"
-        end
-        out.p(class: "zzSTDTitle2") do |p|
-          p << @meta.get[:doctitle]
-          isoxml.xpath(ns("//note[@type = 'title-footnote']")).each do |f|
-            footnote_parse(f, p)
-          end
-        end
-        s = @meta.get[:docsubtitle] and
-          out.p(class: "zzSTDTitle3") { |p| p << s }
-      end
-
       def note_p_parse(node, div)
         name = node&.at(ns("./name"))&.remove
         div.p do |p|
@@ -180,14 +129,15 @@ module IsoDoc
         super
       end
 
-      # can have supertitle in resolution
-      def clause(isoxml, out)
-        isoxml.xpath(ns(middle_clause(isoxml))).each do |c|
-          clause_core(c, out)
+      def clause_attrs(node)
+        if node["type"] == "keyword"
+          super.merge(class: "Keyword")
+        else super
         end
       end
 
-      def clause_core(clause, out)
+      # can have supertitle in resolution
+      def clause(clause, out)
         out.div **attr_code(clause_attrs(clause)) do |s|
           clause.elements.each do |c1|
             if c1.name == "title" then clause_name(clause, c1, s, nil)
@@ -198,6 +148,7 @@ module IsoDoc
         end
       end
 
+=begin
       def scope(isoxml, out, num)
         return super unless @meta.get[:doctype_original] == "resolution"
 
@@ -205,6 +156,7 @@ module IsoDoc
         clause_core(f, out)
         num + 1
       end
+=end
     end
   end
 end

data/lib/isodoc/itu/html_convert.rb

@@ -57,16 +57,6 @@ module IsoDoc
         end
       end
 
-      def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
-          boilerplate docxml, div3
-          front docxml, div3
-          middle docxml, div3
-          footnotes div3
-          comments div3
-        end
-      end
-
       def authority_cleanup(docxml)
         dest = docxml.at("//div[@id = 'draft-warning-destination']")
         auth = docxml.at("//div[@id = 'draft-warning']")
@@ -74,6 +64,11 @@ module IsoDoc
         super
       end
 
+      def clause(node, out)
+        node["type"] == "keyword" and return
+        super
+      end
+
       include BaseConvert
       include Init
     end

data/lib/isodoc/itu/i18n-ar.yaml

@@ -20,6 +20,7 @@ clause: فقرة
 section: قسم
 summary: ملخص
 annex_subclause: فقرة
+keywords: الكلمات الدالة
 in: في
 to: إلى
 where: ":حيث,"

data/lib/isodoc/itu/i18n-de.yaml

@@ -19,6 +19,7 @@ clause: Klausel
 section: Abschnitt
 summary: Zusammenfassung
 annex_subclause: Klausel
+keywords: Schlüsselwörter
 in: in
 to: bis
 where: "wobei:"

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

@@ -20,6 +20,7 @@ inequality: Inequality
 clause: clause
 section: Section
 annex_subclause: clause
+keywords: Keywords
 in: in
 to: to
 where: "where:"

data/lib/isodoc/itu/i18n-es.yaml

@@ -20,6 +20,7 @@ inequality: Inecuación
 clause: cláusula
 section: Sección
 annex_subclause: cláusula
+keywords: Palabras clave
 in: en
 to: a
 where: "donde:"

data/lib/isodoc/itu/i18n-fr.yaml

@@ -20,6 +20,7 @@ inequality: Inégalité
 clause: article
 section: Section
 annex_subclause: article
+keywords: Mots clés
 in: dans
 to: à
 where: "où:"

data/lib/isodoc/itu/i18n-ru.yaml

@@ -20,6 +20,7 @@ inequality: Неравенство
 clause: пункт
 section: Раздел
 annex_subclause: пункт
+keywords: Ключевые слова
 in: в
 to: до
 where: "где:"

data/lib/isodoc/itu/i18n-zh-Hans.yaml

@@ -20,6 +20,7 @@ inequality: 不等式
 clause: 条款
 section: 节
 annex_subclause: 条款
+keywords: 关键词
 in: in
 to: to
 where:  式中：

data/lib/isodoc/itu/itu.implementers-guide.xsl

@@ -34,17 +34,19 @@
 	<xsl:variable name="contents_">
 		<contents>
 			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:preface/node()" mode="contents"/> -->
-			<xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" mode="contents"/> <!-- @id = 'scope' -->
+			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" mode="contents" /> -->
 
 			<!-- Normative references -->
-			<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" mode="contents"/> <!-- @id = 'references' -->
-
-			<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" mode="contents"/> <!-- @id != 'scope' -->
-
-			<xsl:apply-templates select="/itu:itu-standard/itu:annex" mode="contents"/>
+			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" mode="contents" />
+			
+			<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" mode="contents" />
+				
+			<xsl:apply-templates select="/itu:itu-standard/itu:annex" mode="contents"/> -->
 
 			<!-- Bibliography -->
-			<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]" mode="contents"/> <!-- @id = 'bibliography' -->
+			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]" mode="contents"/> -->
+
+			<xsl:call-template name="processMainSectionsDefault_Contents"/>
 
 			<xsl:apply-templates select="//itu:table" mode="contents"/>
 
@@ -1069,16 +1071,16 @@
 
 				<fo:flow flow-name="xsl-region-body">
 
-					<xsl:if test="$doctype != 'service-publication'">
-						<fo:block-container font-size="14pt">
+					<!-- <xsl:if test="$doctype != 'service-publication' and 1 = 2"> 
+						<fo:block-container font-size="14pt" >
 							<xsl:choose>
 								<xsl:when test="$doctype = 'resolution'">
 									<fo:block text-align="center">
 										<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:title[@type='resolution' and @language = $lang]"/>
 									</fo:block>
 								</xsl:when>
-								<xsl:when test="$doctype = 'implementers-guide'"/>
-								<xsl:when test="$doctype = 'recommendation-supplement'">
+								<xsl:when  test="$doctype = 'implementers-guide'"></xsl:when>
+								<xsl:when  test="$doctype = 'recommendation-supplement'">
 									<fo:block font-weight="bold">
 										<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement-Internal']"/>
 									</fo:block>
@@ -1086,30 +1088,30 @@
 								<xsl:otherwise>
 									<fo:block font-weight="bold">
 										<xsl:value-of select="$doctypeTitle"/>
-										<xsl:text> </xsl:text>
+										<xsl:text>&#xA0;</xsl:text>
 										<xsl:value-of select="$docname"/>
 									</fo:block>
 								</xsl:otherwise>
 							</xsl:choose>
-
+							
 							<fo:block font-weight="bold" text-align="center" margin-top="15pt" margin-bottom="15pt" role="H1">
 								<xsl:value-of select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'main' and @language = $lang]"/>
-
+								
 								<xsl:variable name="subtitle" select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'subtitle' and @language = $lang]"/>
 								<xsl:if test="$subtitle != ''">
 									<fo:block margin-top="18pt" font-weight="normal" font-style="italic">
-										<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
+										<xsl:if test="$lang = 'ar'">
 											<xsl:attribute name="font-style">normal</xsl:attribute>
 										</xsl:if>
 										<xsl:value-of select="$subtitle"/>
-									</fo:block>
+									</fo:block>								
 								</xsl:if>
-
+								
 								<xsl:variable name="resolution-placedate" select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'resolution-placedate' and @language = $lang]"/>
 								<xsl:if test="$doctype = 'resolution' and $resolution-placedate != ''">
 									<fo:block font-size="11pt" margin-top="6pt" font-weight="normal">
 										<fo:inline font-style="italic">
-											<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
+											<xsl:if test="$lang = 'ar'">
 												<xsl:attribute name="font-style">normal</xsl:attribute>
 											</xsl:if>
 											<xsl:text>(</xsl:text><xsl:value-of select="$resolution-placedate"/><xsl:text>)</xsl:text>
@@ -1119,22 +1121,25 @@
 								</xsl:if>
 							</fo:block>
 						</fo:block-container>
-					</xsl:if>
+					</xsl:if> -->
 
 					<!-- Clause(s) -->
 					<fo:block>
 						<!-- Scope -->
-						<xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']"/> <!-- @id = 'scope' -->
+						<!-- <xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" /> -->
 
 						<!-- Normative references -->
-						<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']"/> <!-- @id = 'references' -->
+						<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" />
+							
+						<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" />
+							
+						<xsl:apply-templates select="/itu:itu-standard/itu:annex"/> -->
 
-						<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]"/> <!-- @id != 'scope' -->
+						<!-- Bibliography -->
+						<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]"/> -->
 
-						<xsl:apply-templates select="/itu:itu-standard/itu:annex"/>
+						<xsl:call-template name="processMainSectionsDefault"/>
 
-						<!-- Bibliography -->
-						<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]"/> <!-- @id = 'bibliography' -->
 					</fo:block>
 
 				</fo:flow>
@@ -1286,6 +1291,37 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="itu:clause[@type = 'keyword']" priority="4"/>
+
+	<xsl:template match="itu:sections/itu:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-size="14pt">
+			<xsl:choose>
+				<xsl:when test="$doctype = 'resolution'">
+					<xsl:attribute name="text-align">center</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:attribute name="font-weight">bold</xsl:attribute>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template match="itu:sections/itu:p[@class = 'zzSTDTitle2']" priority="4">
+		<fo:block font-size="14pt" font-weight="bold" text-align="center" margin-top="15pt" margin-bottom="15pt" role="H1">
+			<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
+				<xsl:attribute name="font-style">normal</xsl:attribute>
+			</xsl:if>
+			<!-- Example: <p align="center" class="zzSTDTitle2" displayorder="4"><em>(Hammamet, 2016</em>) -->
+			<xsl:if test="@align = 'center'">
+				<xsl:attribute name="font-size">11pt</xsl:attribute>
+				<xsl:attribute name="margin-top">6pt</xsl:attribute>
+				<xsl:attribute name="font-weight">normal</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="node()">
 		<xsl:apply-templates/>
 	</xsl:template>
@@ -1740,25 +1776,25 @@
 	</xsl:template> -->
 
 	<!-- footnotes for title -->
-	<xsl:template match="itu:bibdata/itu:note[@type = 'title-footnote']" mode="title_footnote">
+	<!-- <xsl:template match="itu:bibdata/itu:note[@type = 'title-footnote']" mode="title_footnote">
 		<xsl:variable name="number" select="position()"/>
 		<fo:footnote>
 			<fo:inline font-size="60%" keep-with-previous.within-line="always" vertical-align="super">
 				<fo:basic-link internal-destination="title_footnote_{$number}" fox:alt-text="titlefootnote  {$number}">
 					<xsl:value-of select="$number"/>
 				</fo:basic-link>
-				<xsl:if test="position() != last()">,</xsl:if><!-- <fo:inline  baseline-shift="20%">,</fo:inline> -->
+				<xsl:if test="position() != last()">,</xsl:if>
 			</fo:inline>
 			<fo:footnote-body>
 				<fo:block font-size="11pt" margin-bottom="12pt" text-align="justify">
 					<fo:inline id="title_footnote_{$number}" font-size="85%" padding-right="2mm" keep-with-next.within-line="always" baseline-shift="30%">
 						<xsl:value-of select="$number"/>
 					</fo:inline>
-					<xsl:apply-templates/>
+					<xsl:apply-templates />
 				</fo:block>
 			</fo:footnote-body>
 		</fo:footnote>
-	</xsl:template>
+	</xsl:template> -->
 
 	<xsl:template match="*[local-name()='tt']" priority="2">
 		<xsl:variable name="element-name">
@@ -6114,6 +6150,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -8204,25 +8243,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
+
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-												<xsl:value-of select="$width_effective"/>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									</xsl:variable>
+											<xsl:variable name="image_width_effective">
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+														<xsl:value-of select="$width_effective"/>
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+											</xsl:variable>
 
-									</xsl:if>
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -11911,7 +11970,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>