metanorma-itu 2.1.9 → 2.1.11

data/lib/isodoc/itu/itu.technical-report.xsl

@@ -395,10 +395,18 @@
 									</xsl:variable>
 									<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($tsb_full))"/>
 								</fo:block>
-								<fo:block-container height="20mm" display-align="center">
+								<fo:block-container height="20mm" display-align="center" width="90%">
 									<fo:block font-weight="bold">
 										<!-- complements -->
 										<!-- To do: Example: COMPLEMENT  TO  ITU-T  RECOMMENDATIONS  F.69  (06/1994) AND  F.68  (11/1988) -->
+										<fo:inline>COMPLEMENT TO ITU-T RECOMMENDATIONS  </fo:inline>
+										<xsl:for-each select="/*/itu:bibdata/itu:relation[@type = 'complements']">
+											<xsl:value-of select="translate(itu:bibitem/itu:docidentifier, ' ', ' ')"/>
+											<xsl:choose>
+												<xsl:when test="count(following-sibling::itu:relation[@type = 'complements']) = 1"> AND </xsl:when>
+												<xsl:when test="following-sibling::itu:relation[@type = 'complements']">, </xsl:when>
+											</xsl:choose>
+										</xsl:for-each>
 									</fo:block>
 								</fo:block-container>
 								<fo:block-container>
@@ -678,7 +686,7 @@
 										<fo:table-cell>
 											<fo:block> </fo:block>
 										</fo:table-cell>
-										<fo:table-cell font-size="16pt" number-columns-spanned="3" border-bottom="0.5mm solid black" padding-right="2mm" display-align="after">
+										<fo:table-cell font-size="16pt" number-columns-spanned="3" border-bottom="0.5mm solid black" display-align="after">
 											<fo:block-container>
 												<xsl:call-template name="setWritingMode"/>
 												<fo:block padding-bottom="7mm">
@@ -722,8 +730,18 @@
 															</xsl:if>
 														</fo:block>
 													</xsl:if>
+													<xsl:if test="$doctype = 'focus-group'">
+														<xsl:attribute name="padding-bottom">0mm</xsl:attribute>
+														<xsl:attribute name="border-bottom">1pt solid black</xsl:attribute>
+													</xsl:if>
 													<fo:block text-transform="uppercase">
-														<xsl:variable name="series_title" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:series[@type = 'main']/itu:title[@type = 'full'])"/>
+														<xsl:variable name="series_title_full" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:series[@type = 'main']/itu:title[@type = 'full'])"/>
+														<xsl:variable name="series_title">
+															<xsl:value-of select="$series_title_full"/>
+															<xsl:if test="$series_title_full = ''">
+																<xsl:value-of select="normalize-space(/itu:itu-standard/itu:bibdata/itu:series[@type = 'main']/itu:title[@type != 'full' and @type != 'abbrev'])"/>
+															</xsl:if>
+														</xsl:variable>
 														<xsl:if test="$series_title != ''">
 															<xsl:variable name="title">
 																<xsl:if test="$doctype != 'resolution'">
@@ -1296,6 +1314,7 @@
 		</fo:block>
 		<xsl:apply-templates/>
 	</xsl:template>
+	<xsl:template match="itu:itu-standard/itu:preface/itu:abstract[@id = '_summary']/itu:title" priority="4"/>
 
 	<xsl:template match="itu:preface/itu:clause" priority="3">
 		<xsl:if test="$doctype != 'service-publication'">
@@ -3053,8 +3072,6 @@
 	<xsl:attribute-set name="bibitem-non-normative-style">
 
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
-			<xsl:attribute name="margin-left">14mm</xsl:attribute>
-			<xsl:attribute name="text-indent">-14mm</xsl:attribute>
 
 	</xsl:attribute-set> <!-- bibitem-non-normative-style -->
 
@@ -5548,8 +5565,17 @@
 		</fo:inline>
 	</xsl:template> <!-- tt -->
 
+	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
-		<xsl:call-template name="add_spaces_to_sourcecode"/>
+		<xsl:choose>
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+				 <!-- url -->
+				<xsl:call-template name="add-zero-spaces-link-java"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="add_spaces_to_sourcecode"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='underline']">
@@ -5905,8 +5931,11 @@
 
 	<xsl:template name="add-zero-spaces-link-java">
 		<xsl:param name="text" select="."/>
+
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
+		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -8865,7 +8894,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -9711,28 +9740,42 @@
 					<xsl:attribute name="text-indent">0mm</xsl:attribute>
 				</xsl:if>
 
+				<xsl:variable name="docidentifier_metanorma" select="normalize-space(itu:docidentifier[@type = 'metanorma'])"/>
+				<xsl:variable name="docidentifier_metanorma_ordinal" select="normalize-space(itu:docidentifier[@type = 'metanorma-ordinal'])"/>
+
 				<xsl:variable name="bibitem_label">
-					<xsl:value-of select="itu:docidentifier[@type = 'metanorma']"/>
-					<xsl:if test="not(itu:docidentifier[@type = 'metanorma'])">
+					<xsl:value-of select="$docidentifier_metanorma"/>
+					<xsl:if test="$docidentifier_metanorma = ''">
 						<fo:inline padding-right="5mm">
-							<xsl:text>[</xsl:text>
-								<xsl:value-of select="itu:docidentifier[not(@type = 'metanorma-ordinal')]"/>
-							<xsl:text>] </xsl:text>
+							<xsl:variable name="docidentifier" select="normalize-space(itu:docidentifier[not(@type = 'metanorma-ordinal')])"/>
+							<xsl:choose>
+								<xsl:when test="$docidentifier != ''">
+									<xsl:text>[</xsl:text>
+										<xsl:value-of select="$docidentifier"/>
+									<xsl:text>] </xsl:text>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$docidentifier_metanorma_ordinal"/>
+								</xsl:otherwise>
+							</xsl:choose>
 						</fo:inline>
 					</xsl:if>
 				</xsl:variable>
 
 				<xsl:variable name="bibitem_body">
-					<xsl:text> </xsl:text>
-					<xsl:choose>
-						<xsl:when test="itu:docidentifier[@type = 'metanorma']">
-							<xsl:value-of select="itu:docidentifier[not(@type) or not(@type = 'metanorma' or @type = 'metanorma-ordinal')]"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="itu:docidentifier[not(@type = 'metanorma-ordinal')]"/>
-						</xsl:otherwise>
-					</xsl:choose>
-					<xsl:if test="itu:formattedref and not(itu:docidentifier[@type = 'metanorma'])">, </xsl:if>
+					<xsl:variable name="docidentifier">
+						<xsl:text> </xsl:text>
+						<xsl:choose>
+							<xsl:when test="$docidentifier_metanorma != ''">
+								<xsl:value-of select="itu:docidentifier[not(@type) or not(@type = 'metanorma' or @type = 'metanorma-ordinal')]"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:value-of select="itu:docidentifier[not(@type = 'metanorma-ordinal')]"/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:value-of select="$docidentifier"/>
+					<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
 					<xsl:apply-templates select="itu:formattedref"/>
 				</xsl:variable>
 
@@ -9749,9 +9792,27 @@
 							</fo:table-body>
 						</fo:table>
 					</xsl:when> <!-- $doctype = 'implementers-guide' -->
-					<xsl:otherwise>
+					<xsl:when test="$bibitem_label != $docidentifier_metanorma_ordinal">
+						<xsl:attribute name="margin-left">14mm</xsl:attribute>
+						<xsl:attribute name="text-indent">-14mm</xsl:attribute>
 						<xsl:copy-of select="$bibitem_label"/>
 						<xsl:copy-of select="$bibitem_body"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<fo:list-block provisional-distance-between-starts="14mm">
+							<fo:list-item>
+								<fo:list-item-label end-indent="label-end()">
+									<fo:block>
+										<xsl:copy-of select="$bibitem_label"/>
+									</fo:block>
+								</fo:list-item-label>
+								<fo:list-item-body start-indent="body-start()">
+									<fo:block>
+										<xsl:copy-of select="$bibitem_body"/>
+									</fo:block>
+								</fo:list-item-body>
+							</fo:list-item>
+						</fo:list-block>
 					</xsl:otherwise>
 				</xsl:choose>
 
@@ -10339,7 +10400,7 @@
 
 	<xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<!-- enclose standard's number into tag 'keep-together_within-line' -->
 		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -11,8 +11,8 @@ module IsoDoc
         super
       end
 
-      def prefix_container(container, linkend, _target)
-        l10n("#{linkend} #{@i18n.get['in']} #{@xrefs.anchor(container, :xref)}")
+      def prefix_container(container, linkend, node, _target)
+        l10n("#{linkend} #{@i18n.get['in']} #{anchor_xref(node, container)}")
       end
 
       def eref(docxml)
@@ -175,13 +175,12 @@ module IsoDoc
       end
 
       def annex1(elem)
-        return super unless elem&.at(ns("//bibdata/ext/doctype"))&.text ==
+        return super unless elem.at(ns("//bibdata/ext/doctype"))&.text ==
           "resolution"
 
         lbl = @xrefs.anchor(elem["id"], :label)
-        subhead = (@i18n.l10n("(#{@i18n.get['to']} ") +
-                   elem.at(ns("//bibdata/title[@type = 'resolution']"))
-                     .children.to_xml + @i18n.l10n(")"))
+        res = elem.at(ns("//bibdata/title[@type = 'resolution']"))
+        subhead = @i18n.l10n("(#{@i18n.get['to']} #{res.children.to_xml})")
         elem.elements.first.previous =
           "<p class='supertitle'>#{lbl}<br/>#{subhead}</p>"
         t = elem.at(ns("./title")) and

data/lib/isodoc/itu/xref.rb

@@ -97,21 +97,24 @@ module IsoDoc
         end
       end
 
-      def sequential_figure_body(subfignum, counter, block)
+      def sequential_figure_body(subfignum, counter, block, klass)
         label = counter.print
         label &&= label +
           (subfignum.zero? ? "" : "#{hierfigsep}#{(subfignum + 96).chr}")
         @anchors[block["id"]] = anchor_struct(
-          label, nil, @labels["figure"], "figure", block["unnumbered"]
+          label, nil, @labels[klass] || klass.capitalize, klass,
+          block["unnumbered"]
         )
       end
 
-      def hierarchical_figure_body(num, subfignum, counter, block)
+      def hierarchical_figure_body(num, subfignum, counter, block, klass)
         label = "#{num}#{hiersep}#{counter.print}" +
           (subfignum.zero? ? "" : "#{hierfigsep}#{(subfignum + 96).chr}")
 
-        @anchors[block["id"]] = anchor_struct(label, nil, @labels["figure"],
-                                              "figure", block["unnumbered"])
+        @anchors[block["id"]] = anchor_struct(
+          label, nil, @labels[klass] || klass.capitalize,
+          klass, block["unnumbered"]
+        )
       end
 
       def sequential_formula_names(clause)

data/lib/isodoc/itu/xref_section.rb

@@ -16,12 +16,13 @@ module IsoDoc
         end
       end
 
-      def annex_name_anchors(clause, num)
+      def annex_name_anchors(clause, num, level)
         lbl = annextype(clause)
-        { label: annex_name_lbl(clause, num),
-          elem: lbl,
-          type: "clause", value: num.to_s, level: 1,
-          xref: l10n("#{lbl} #{num}") }
+        @anchors[clause["id"]] =
+          { label: annex_name_lbl(clause, num),
+            elem: lbl,
+            type: "clause", value: num.to_s, level: level,
+            xref: l10n("#{lbl} #{num}") }
       end
 
       def annex_names1(clause, num, level)
@@ -38,7 +39,7 @@ module IsoDoc
       end
 
       def clause_names(docxml, sect_num)
-        docxml.xpath(ns("//sections/clause[not(@unnumbered = 'true')]"\
+        docxml.xpath(ns("//sections/clause[not(@unnumbered = 'true')]" \
                         "[not(@type = 'scope')][not(descendant::terms)]"))
           .each do |c|
           section_names(c, sect_num, 1)
@@ -65,10 +66,11 @@ module IsoDoc
       end
 
       def section_names1(clause, num, level)
+        x = @doctype == "resolution" ? num : l10n("#{@labels['clause']} #{num}")
         @anchors[clause["id"]] =
           { label: num, level: level,
             elem: @doctype == "resolution" ? "" : @labels["clause"],
-            xref: @doctype == "resolution" ? num : l10n("#{@labels['clause']} #{num}") }
+            xref: x }
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           i.increment(c)

data/lib/metanorma/itu/basicdoc.rng

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng">
-    <start>
-      <ref name="document"/>
-    </start>
-  </include>
   <define name="document">
     <element name="document">
       <optional>
@@ -1125,26 +1120,4 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="ext">
-    <element name="ext">
-      <ref name="BibDataExtensionType"/>
-    </element>
-  </define>
-  <define name="BibDataExtensionType">
-    <ref name="doctype"/>
-  </define>
-  <define name="doctype">
-    <element name="doctype">
-      <ref name="DocumentType"/>
-    </element>
-  </define>
-  <define name="DocumentType">
-    <value>document</value>
-  </define>
-  <define name="BibData">
-    <ref name="BibliographicItem"/>
-    <optional>
-      <ref name="ext"/>
-    </optional>
-  </define>
 </grammar>

data/lib/metanorma/itu/biblio-standoc.rng

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <!--
+    Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
+    of relaton
+    
+    Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
+    (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
+  -->
+  <include href="biblio.rng">
+    <define name="BibData">
+      <ref name="BibliographicItem"/>
+      <optional>
+        <ref name="ext"/>
+      </optional>
+    </define>
+  </include>
+  <define name="ext">
+    <element name="ext">
+      <ref name="BibDataExtensionType"/>
+    </element>
+  </define>
+  <define name="BibDataExtensionType">
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
+    <ref name="doctype"/>
+    <optional>
+      <ref name="docsubtype"/>
+    </optional>
+    <optional>
+      <ref name="editorialgroup"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="ics"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="structuredidentifier"/>
+    </zeroOrMore>
+  </define>
+  <define name="doctype">
+    <element name="doctype">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
+      <ref name="DocumentType"/>
+    </element>
+  </define>
+  <define name="DocumentType">
+    <value>document</value>
+  </define>
+  <define name="docsubtype">
+    <element name="subdoctype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
+  <define name="editorialgroup">
+    <element name="editorialgroup">
+      <oneOrMore>
+        <ref name="technical-committee"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="technical-committee">
+    <element name="technical-committee">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
+  <define name="IsoWorkgroup">
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
+    <text/>
+  </define>
+  <define name="ics">
+    <element name="ics">
+      <element name="code">
+        <text/>
+      </element>
+      <optional>
+        <element name="text">
+          <text/>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="structuredidentifier">
+    <element name="structuredidentifier">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <oneOrMore>
+        <element name="agency">
+          <text/>
+        </element>
+      </oneOrMore>
+      <optional>
+        <element name="class">
+          <text/>
+        </element>
+      </optional>
+      <element name="docnumber">
+        <text/>
+      </element>
+      <optional>
+        <element name="partnumber">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="edition">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="version">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="supplementtype">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="supplementnumber">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="language">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="year">
+          <text/>
+        </element>
+      </optional>
+    </element>
+  </define>
+</grammar>

data/lib/metanorma/itu/biblio.rng

@@ -33,9 +33,10 @@
       <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
     </data>
   </define>
-  <start>
-    <ref name="bibitem"/>
-  </start>
+  <!-- start = bibitem -->
+  <define name="BibData">
+    <ref name="BibliographicItem"/>
+  </define>
   <define name="status">
     <element name="status">
       <ref name="stage"/>
@@ -170,27 +171,25 @@
   </define>
   <define name="contributor">
     <element name="contributor">
-      <zeroOrMore>
+      <oneOrMore>
         <ref name="role"/>
-      </zeroOrMore>
+      </oneOrMore>
       <ref name="ContributorInfo"/>
     </element>
   </define>
   <define name="role">
     <element name="role">
-      <optional>
-        <attribute name="type">
-          <choice>
-            <value>author</value>
-            <value>performer</value>
-            <value>publisher</value>
-            <value>editor</value>
-            <value>adapter</value>
-            <value>translator</value>
-            <value>distributor</value>
-          </choice>
-        </attribute>
-      </optional>
+      <attribute name="type">
+        <choice>
+          <value>author</value>
+          <value>performer</value>
+          <value>publisher</value>
+          <value>editor</value>
+          <value>adapter</value>
+          <value>translator</value>
+          <value>distributor</value>
+        </choice>
+      </attribute>
       <zeroOrMore>
         <ref name="roledescription"/>
       </zeroOrMore>
@@ -512,6 +511,17 @@
   </define>
   <define name="localityStack">
     <element name="localityStack">
+      <optional>
+        <attribute name="connective">
+          <choice>
+            <value>and</value>
+            <value>or</value>
+            <value>from</value>
+            <value>to</value>
+            <value/>
+          </choice>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="locality"/>
       </zeroOrMore>
@@ -524,6 +534,17 @@
   </define>
   <define name="sourceLocalityStack">
     <element name="sourceLocalityStack">
+      <optional>
+        <attribute name="connective">
+          <choice>
+            <value>and</value>
+            <value>or</value>
+            <value>from</value>
+            <value>to</value>
+            <value/>
+          </choice>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="sourceLocality"/>
       </zeroOrMore>
@@ -626,6 +647,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
     <optional>
       <ref name="fetched"/>
     </optional>
@@ -720,6 +744,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
     <optional>
       <ref name="fetched"/>
     </optional>