metanorma-cc 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66c15830e8c03cdf33a31399e79c7c877c8571d01e026ce58ed957f3775af78d
-  data.tar.gz: 34da7c69025deca892b3f0ce14c6085d1006ccf9e046c60ab77fb79d1a0cf849
+  metadata.gz: b2b31d0ca70ffb8903d190d7d3087f046dea778e8f7b053f547c77575df1d3a1
+  data.tar.gz: 21528facf9965a72f2aea590f444a4865ecf763e25dc6e2a868a23070c8b9946
 SHA512:
-  metadata.gz: 4d793ea61e587754be9e0875b925a4574604aec112bc557333c1fb5e8d2bb50836126e82c83c9ae0f1f32dec0b5a200d897fc4aaf03272c08256f2c21c5846dd
-  data.tar.gz: 026f27420bc99c78745abf79453b6a8cefe5699f91347a9a6695f0e642e3ab4d412bee6719ddbb0b0e641fcd06e89c23037d6af0d2bd153e7868fcabdafbf06a
+  metadata.gz: 8eda576b445cfb830153034c92892d889fd337e8796eb123283336cfb1c8d13cb8278ae32cb9f833ace1c96e8350bbe4bfb5f0f2adb0a344bd25120d0e1a66cc
+  data.tar.gz: df11767ebbdd870b1b98e70376e385c8fb93cee07b021beb58a58187c2b8c212e6da7f09963879eb7b292903995102bd9c3c257be9eb8f623d32a78bf22b9977

data/lib/isodoc/cc/base_convert.rb

@@ -1,10 +1,10 @@
 require "isodoc"
 
 module IsoDoc
-  module CC
+  module Cc
     module BaseConvert
       def configuration
-        Metanorma::CC.configuration
+        Metanorma::Cc.configuration
       end
     end
   end

data/lib/isodoc/cc/cc.standard.xsl

@@ -355,21 +355,21 @@
 
 	<xsl:template name="insertListOf_Item">
 		<fo:block role="TOCI">
-			<fo:list-block provisional-distance-between-starts="8mm">
-				<fo:list-item>
-					<fo:list-item-label end-indent="label-end()">
+			<fo:list-block provisional-distance-between-starts="8mm" role="SKIP">
+				<fo:list-item role="SKIP">
+					<fo:list-item-label end-indent="label-end()" role="SKIP">
 						<fo:block/>
 					</fo:list-item-label>
-					<fo:list-item-body start-indent="body-start()">
-						<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
+					<fo:list-item-body start-indent="body-start()" role="SKIP">
+						<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm" role="SKIP">
 							<fo:basic-link internal-destination="{@id}">
 								<xsl:call-template name="setAltText">
 									<xsl:with-param name="value" select="@alt-text"/>
 								</xsl:call-template>
 								<xsl:apply-templates select="." mode="contents"/>
-								<fo:inline keep-together.within-line="always">
+								<fo:inline keep-together.within-line="always" role="SKIP">
 									<fo:leader leader-pattern="dots"/>
-									<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
+									<fo:inline role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
 								</fo:inline>
 							</fo:basic-link>
 						</fo:block>
@@ -380,10 +380,12 @@
 	</xsl:template>
 
 	<xsl:template match="csd:preface//csd:clause[@type = 'toc']" priority="3">
-		<fo:block-container font-weight="bold" line-height="115%">
+		<fo:block-container font-weight="bold" line-height="115%" role="SKIP">
+			<!-- render 'Contents' outside if role="TOC" -->
+			<xsl:apply-templates select="*[local-name() = 'title']"/>
 			<fo:block role="TOC">
 
-				<xsl:apply-templates/>
+				<xsl:apply-templates select="node()[not(local-name() = 'title')]"/>
 
 				<xsl:if test="count(*) = 1 and *[local-name() = 'title']"> <!-- if there isn't user ToC -->
 
@@ -394,33 +396,35 @@
 								<xsl:attribute name="margin-top">6pt</xsl:attribute>
 							</xsl:if>
 
-							<fo:list-block>
-								<xsl:attribute name="provisional-distance-between-starts">
-									<xsl:choose>
-										<!-- skip 0 section without subsections -->
-										<xsl:when test="@section != ''">8mm</xsl:when> <!-- and not(@display-section = 'false') -->
-										<xsl:otherwise>0mm</xsl:otherwise>
-									</xsl:choose>
-								</xsl:attribute>
-								<fo:list-item>
-									<fo:list-item-label end-indent="label-end()">
-										<fo:block>
-											<xsl:value-of select="@section"/>
-										</fo:block>
-									</fo:list-item-label>
-									<fo:list-item-body start-indent="body-start()">
-										<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
-											<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
-												<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>
-									</fo:list-item-body>
-								</fo:list-item>
-							</fo:list-block>
+							<fo:basic-link internal-destination="{@id}" fox:alt-text="{@section} {title}"> <!-- link at this level needs for PDF structure tags -->
+								<fo:list-block role="SKIP">
+									<xsl:attribute name="provisional-distance-between-starts">
+										<xsl:choose>
+											<!-- skip 0 section without subsections -->
+											<xsl:when test="@section != ''">8mm</xsl:when> <!-- and not(@display-section = 'false') -->
+											<xsl:otherwise>0mm</xsl:otherwise>
+										</xsl:choose>
+									</xsl:attribute>
+									<fo:list-item role="SKIP">
+										<fo:list-item-label end-indent="label-end()" role="SKIP">
+											<fo:block role="SKIP" id="__internal_layout__toc_label_{@id}">
+												<xsl:value-of select="@section"/>
+											</fo:block>
+										</fo:list-item-label>
+										<fo:list-item-body start-indent="body-start()" role="SKIP">
+											<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm" role="SKIP">
+												<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}" role="SKIP">
+													<xsl:apply-templates select="title"/>
+													<fo:inline keep-together.within-line="always" role="SKIP">
+														<fo:leader leader-pattern="dots"/>
+														<fo:inline role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
+													</fo:inline>
+												</fo:basic-link>
+											</fo:block>
+										</fo:list-item-body>
+									</fo:list-item>
+								</fo:list-block>
+							</fo:basic-link>
 						</fo:block>
 					</xsl:for-each>
 
@@ -3961,7 +3965,8 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="current_fn_number_text">
-			<xsl:value-of select="$current_fn_number"/>
+
+					<xsl:value-of select="$current_fn_number"/>
 
 		</xsl:variable>
 
@@ -3997,8 +4002,10 @@
 
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
-						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}" role="Lbl">
-							<xsl:copy-of select="$current_fn_number_text"/>
+						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}"> <!-- note: role="Lbl" removed in https://github.com/metanorma/mn2pdf/issues/291 -->
+							<fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
+								<xsl:copy-of select="$current_fn_number_text"/>
+							</fo:inline>
 						</fo:basic-link>
 					</xsl:with-param>
 				</xsl:call-template>
@@ -4279,7 +4286,7 @@
 
 			<xsl:call-template name="refine_fn-reference-style"/>
 
-			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
+			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="footnote {@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				<xsl:if test="ancestor::*[local-name()='table'][1]/@id"> <!-- for footnotes in tables -->
 					<xsl:attribute name="internal-destination">
 						<xsl:value-of select="concat(@reference, '_', ancestor::*[local-name()='table'][1]/@id)"/>
@@ -5280,9 +5287,19 @@
 		</fo:inline>
 	</xsl:template>
 
-	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
+	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]" name="smallcaps">
+		<xsl:param name="txt"/>
 		<!-- <xsl:variable name="text" select="normalize-space(.)"/> --> <!-- https://github.com/metanorma/metanorma-iso/issues/1115 -->
-		<xsl:variable name="text" select="."/>
+		<xsl:variable name="text">
+			<xsl:choose>
+				<xsl:when test="$txt != ''">
+					<xsl:value-of select="$txt"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<xsl:variable name="ratio_">
 			0.75
 		</xsl:variable>
@@ -6728,9 +6745,12 @@
 					<xsl:apply-templates/>
 				</xsl:when>
 				<xsl:otherwise>
+					<xsl:variable name="alt_text">
+						<xsl:call-template name="getAltText"/>
+					</xsl:variable>
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
-							<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
+							<fo:basic-link external-destination="{$target}" fox:alt-text="{$alt_text}">
 								<xsl:if test="$isLinkToEmbeddedFile = 'true'">
 									<xsl:attribute name="role">Annot</xsl:attribute>
 								</xsl:if>
@@ -6757,6 +6777,14 @@
 		</fo:inline>
 	</xsl:template> <!-- link -->
 
+	<xsl:template name="getAltText">
+		<xsl:choose>
+			<xsl:when test="normalize-space(.) = ''"><xsl:value-of select="@target"/></xsl:when>
+			<xsl:otherwise><xsl:value-of select="normalize-space(translate(normalize-space(), ' —', ' -'))"/></xsl:otherwise>
+			<!-- <xsl:otherwise><xsl:value-of select="@target"/></xsl:otherwise> -->
+		</xsl:choose>
+	</xsl:template>
+
 	<!-- ======================== -->
 	<!-- Appendix processing -->
 	<!-- ======================== -->
@@ -6787,7 +6815,7 @@
 	<xsl:template match="*[local-name() = 'callout']">
 		<xsl:choose>
 			<xsl:when test="normalize-space(@target) = ''">&lt;<xsl:apply-templates/>&gt;</xsl:when>
-			<xsl:otherwise><fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link></xsl:otherwise>
+			<xsl:otherwise><fo:basic-link internal-destination="{@target}" fox:alt-text="{normalize-space()}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link></xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
 
@@ -6816,7 +6844,10 @@
 	<xsl:template match="*[local-name() = 'xref']">
 		<xsl:call-template name="insert_basic_link">
 			<xsl:with-param name="element">
-				<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
+				<xsl:variable name="alt_text">
+					<xsl:call-template name="getAltText"/>
+				</xsl:variable>
+				<fo:basic-link internal-destination="{@target}" fox:alt-text="{$alt_text}" xsl:use-attribute-sets="xref-style">
 					<xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
 						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 					</xsl:if>
@@ -9297,12 +9328,14 @@
 
 					<xsl:when test="contains(normalize-space($fo_element), 'list')">
 
-						<xsl:variable name="provisional_distance_between_starts">
+						<xsl:variable name="provisional_distance_between_starts_">
 							7
 						</xsl:variable>
-						<xsl:variable name="indent">
+						<xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
+						<xsl:variable name="indent_">
 							0
 						</xsl:variable>
+						<xsl:variable name="indent" select="normalize-space($indent_)"/>
 
 						<fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
 							<fo:list-item>
@@ -10032,14 +10065,17 @@
 			</xsl:when>
 			<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
 
-				<xsl:variable name="label">
+				<xsl:variable name="type" select="../@type"/>
 
-					<xsl:variable name="type" select="../@type"/>
+				<xsl:variable name="label">
 
 					<xsl:variable name="style_prefix_">
 						<xsl:if test="$type = 'roman'">
 							 <!-- Example: (i) -->
 						</xsl:if>
+						<xsl:if test="$type = 'alphabet'">
+
+						</xsl:if>
 					</xsl:variable>
 					<xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
 
@@ -10065,13 +10101,15 @@
 					<xsl:if test="$style_prefix != '' and not(starts-with(@label, $style_prefix))">
 						<xsl:value-of select="$style_prefix"/>
 					</xsl:if>
+
 					<xsl:value-of select="@label"/>
+
 					<xsl:if test="not(java:endsWith(java:java.lang.String.new(@label),$style_suffix))">
 						<xsl:value-of select="$style_suffix"/>
 					</xsl:if>
 				</xsl:variable>
 
-				<xsl:value-of select="normalize-space($label)"/>
+						<xsl:value-of select="normalize-space($label)"/>
 
 			</xsl:when>
 			<xsl:otherwise> <!-- for ordered lists 'ol' -->
@@ -12273,7 +12311,8 @@
 			<xsl:variable name="description" select="normalize-space($bibitem_attachment/*[local-name() = 'formattedref'])"/>
 			<xsl:variable name="filename" select="java:org.metanorma.fop.Util.getFilenameFromPath(@name)"/>
 			<!-- Todo: need update -->
-			<xsl:variable name="afrelationship" select="normalize-space($bibitem_attachment//*[local-name() = 'span'][@class = 'pdf-AFRelationship'])"/>
+			<xsl:variable name="afrelationship" select="normalize-space($bibitem_attachment//*[local-name() = 'classification'][@type = 'pdf-AFRelationship'])"/>
+			<xsl:variable name="volatile" select="normalize-space($bibitem_attachment//*[local-name() = 'classification'][@type = 'pdf-volatile'])"/>
 
 			<pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" filename="{$filename}" link-as-file-annotation="true">
 				<xsl:attribute name="src">
@@ -12294,6 +12333,9 @@
 				<xsl:if test="$afrelationship != ''">
 					<xsl:attribute name="afrelationship"><xsl:value-of select="$afrelationship"/></xsl:attribute>
 				</xsl:if>
+				<xsl:if test="$volatile != ''">
+					<xsl:attribute name="volatile"><xsl:value-of select="$volatile"/></xsl:attribute>
+				</xsl:if>
 			</pdf:embedded-file>
 		</xsl:for-each>
 		<!-- references to external attachments (no binary-encoded within the Metanorma XML file) -->
@@ -12304,14 +12346,18 @@
 				<xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
 				<xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
 				<!-- Todo: need update -->
-			<xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'span'][@class = 'pdf-AFRelationship'])"/>
+				<xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'classification'][@type = 'pdf-AFRelationship'])"/>
+				<xsl:variable name="volatile" select="normalize-space(.//*[local-name() = 'classification'][@type = 'pdf-volatile'])"/>
 				<pdf:embedded-file xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" src="{$url}" filename="{$attachment_name}" link-as-file-annotation="true">
 					<xsl:if test="$description != ''">
 						<xsl:attribute name="description"><xsl:value-of select="$description"/></xsl:attribute>
 					</xsl:if>
 					<xsl:if test="$afrelationship != ''">
-					<xsl:attribute name="afrelationship"><xsl:value-of select="$afrelationship"/></xsl:attribute>
-				</xsl:if>
+						<xsl:attribute name="afrelationship"><xsl:value-of select="$afrelationship"/></xsl:attribute>
+					</xsl:if>
+					<xsl:if test="$volatile != ''">
+						<xsl:attribute name="volatile"><xsl:value-of select="$volatile"/></xsl:attribute>
+					</xsl:if>
 				</pdf:embedded-file>
 			</xsl:for-each>
 		</xsl:if>
@@ -12358,10 +12404,31 @@
 							<xsl:value-of select="$level_total - 2"/>
 						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'sections'] and self::*[local-name() = 'title']">
-							<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause'][2]/*[local-name() = 'title']/@depth)"/>
+							<!-- determine 'depth' depends on upper clause with title/@depth -->
+							<!-- <xsl:message>title=<xsl:value-of select="."/></xsl:message> -->
+							<xsl:variable name="clause_with_depth_depth" select="ancestor::*[local-name() = 'clause'][*[local-name() = 'title']/@depth][1]/*[local-name() = 'title']/@depth"/>
+							<!-- <xsl:message>clause_with_depth_depth=<xsl:value-of select="$clause_with_depth_depth"/></xsl:message> -->
+							<xsl:variable name="clause_with_depth_level" select="count(ancestor::*[local-name() = 'clause'][*[local-name() = 'title']/@depth][1]/ancestor::*)"/>
+							<!-- <xsl:message>clause_with_depth_level=<xsl:value-of select="$clause_with_depth_level"/></xsl:message> -->
+							<xsl:variable name="curr_level" select="count(ancestor::*) - 1"/>
+							<!-- <xsl:message>curr_level=<xsl:value-of select="$curr_level"/></xsl:message> -->
+							<!-- <xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause'][2]/*[local-name() = 'title']/@depth)"/> -->
+							<xsl:variable name="curr_clause_depth" select="number($clause_with_depth_depth) + (number($curr_level) - number($clause_with_depth_level)) "/>
+							<!-- <xsl:message>curr_clause_depth=<xsl:value-of select="$curr_clause_depth"/></xsl:message> -->
 							<xsl:choose>
-								<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
-									<xsl:value-of select="number($upper_clause_depth + 1)"/>
+								<xsl:when test="string(number($curr_clause_depth)) != 'NaN'">
+									<xsl:value-of select="number($curr_clause_depth)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$level_total - 2"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'sections'] and self::*[local-name() = 'name'] and parent::*[local-name() = 'term']">
+							<xsl:variable name="upper_terms_depth" select="normalize-space(ancestor::*[local-name() = 'terms'][1]/*[local-name() = 'title']/@depth)"/>
+							<xsl:choose>
+								<xsl:when test="string(number($upper_terms_depth)) != 'NaN'">
+									<xsl:value-of select="number($upper_terms_depth + 1)"/>
 								</xsl:when>
 								<xsl:otherwise>
 									<xsl:value-of select="$level_total - 2"/>
@@ -12369,7 +12436,7 @@
 							</xsl:choose>
 						</xsl:when>
 						<xsl:when test="ancestor::*[local-name() = 'sections']">
-							<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause'][1]/*[local-name() = 'title']/@depth)"/>
+							<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[local-name() = 'clause' or local-name() = 'terms'][1]/*[local-name() = 'title']/@depth)"/>
 							<xsl:choose>
 								<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
 									<xsl:value-of select="number($upper_clause_depth + 1)"/>

data/lib/isodoc/cc/html_convert.rb

@@ -4,7 +4,7 @@ require_relative "init"
 require "isodoc"
 
 module IsoDoc
-  module CC
+  module Cc
     # A {Converter} implementation that generates CC output, and a document
     # schema encapsulation of the document for validation
     class HtmlConvert < IsoDoc::Generic::HtmlConvert

data/lib/isodoc/cc/i18n.rb

@@ -1,8 +1,8 @@
 module IsoDoc
-  module CC
+  module Cc
     class I18n < IsoDoc::Generic::I18n
       def configuration
-        Metanorma::CC.configuration
+        Metanorma::Cc.configuration
       end
     end
   end

data/lib/isodoc/cc/init.rb

@@ -4,7 +4,7 @@ require_relative "xref"
 require_relative "i18n"
 
 module IsoDoc
-  module CC
+  module Cc
     module Init
       def metadata_init(lang, script, locale, i18n)
         @meta = Metadata.new(lang, script, locale, i18n)

data/lib/isodoc/cc/metadata.rb

@@ -2,10 +2,10 @@ require "isodoc"
 require "metanorma/cc"
 
 module IsoDoc
-  module CC
+  module Cc
     class Metadata < IsoDoc::Generic::Metadata
       def configuration
-        Metanorma::CC.configuration
+        Metanorma::Cc.configuration
       end
 
       def initialize(lang, script, locale, labels)

data/lib/isodoc/cc/pdf_convert.rb

@@ -3,7 +3,7 @@ require "metanorma-generic"
 require "isodoc"
 
 module IsoDoc
-  module CC
+  module Cc
     class PdfConvert < IsoDoc::Generic::PdfConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)

data/lib/isodoc/cc/presentation_xml_convert.rb

@@ -3,7 +3,7 @@ require "metanorma-generic"
 require "isodoc"
 
 module IsoDoc
-  module CC
+  module Cc
     class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
       def annex1(elem)
         lbl = @xrefs.anchor(elem["id"], :label)

data/lib/isodoc/cc/word_convert.rb

@@ -4,7 +4,7 @@ require_relative "init"
 require "isodoc"
 
 module IsoDoc
-  module CC
+  module Cc
     # A {Converter} implementation that generates CSD output, and a document
     # schema encapsulation of the document for validation
     class WordConvert < IsoDoc::Generic::WordConvert

data/lib/isodoc/cc/xref.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  module CC
+  module Cc
     class Xref < IsoDoc::Generic::Xref
     end
   end

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

@@ -72,6 +72,9 @@ standards defining organization, and that is rendered in a distinct manner</a:do
 from other documents in the same doctype</a:documentation>
       </ref>
     </optional>
+    <ref name="flavor">
+      <a:documentation>Flavour of Metanorma used to process this document</a:documentation>
+    </ref>
     <optional>
       <ref name="editorialgroup">
         <a:documentation>Groups associated with the production of the standards document, typically within
@@ -113,6 +116,16 @@ a standards definition organization</a:documentation>
   <define name="DocumentSubtype">
     <text/>
   </define>
+  <define name="flavor">
+    <element name="flavor">
+      <ref name="MetanormaFlavor"/>
+    </element>
+  </define>
+  <define name="MetanormaFlavor">
+    <a:documentation>This is in fact an enum, as of this writing: standoc iso generic ietf ieee itu nist ogc csa cc iho ribose jis iec bsi bipm plateau.
+However we prefer not to hardcode it, given ongoing extension.</a:documentation>
+    <text/>
+  </define>
   <define name="editorialgroup">
     <a:documentation>A group associated with the production of the standards document, typically within
 a standards definition organization</a:documentation>

data/lib/metanorma/cc/biblio.rng

@@ -1382,18 +1382,7 @@ Applies whether the resource has already been created or not, and whether it is
   <define name="bdate">
     <a:documentation>Significant date in the lifecycle of the bibliographic item, including its production and its access</a:documentation>
     <element name="date">
-      <attribute name="type">
-        <a:documentation>The phase of the production of or access to a bibliographic item</a:documentation>
-        <choice>
-          <ref name="BibliographicDateType"/>
-          <text/>
-        </choice>
-      </attribute>
-      <optional>
-        <attribute name="text">
-          <a:documentation>An optional textual description of the date, especially when a Gregorian date is not applicable</a:documentation>
-        </attribute>
-      </optional>
+      <ref name="bDateAttributes"/>
       <optional>
         <choice>
           <group>
@@ -1416,6 +1405,20 @@ Applies whether the resource has already been created or not, and whether it is
       </optional>
     </element>
   </define>
+  <define name="bDateAttributes">
+    <attribute name="type">
+      <a:documentation>The phase of the production of or access to a bibliographic item</a:documentation>
+      <choice>
+        <ref name="BibliographicDateType"/>
+        <text/>
+      </choice>
+    </attribute>
+    <optional>
+      <attribute name="text">
+        <a:documentation>An optional textual description of the date, especially when a Gregorian date is not applicable</a:documentation>
+      </attribute>
+    </optional>
+  </define>
   <define name="docidentifier">
     <a:documentation>An identifier of a bibliographic item in an international standard scheme</a:documentation>
     <element name="docidentifier">
@@ -1884,6 +1887,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
+      <value>preliminaryDraftOf</value>
+      <value>hasPreliminaryDraft</value>
+      <value>revisionDraftOf</value>
+      <value>hasRevisionDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>

data/lib/metanorma/cc/converter.rb

@@ -8,12 +8,12 @@ require "metanorma/generic/converter"
 require_relative "validate_section"
 
 module Metanorma
-  module CC
+  module Cc
     class Converter < Metanorma::Generic::Converter
       register_for "cc"
 
       def configuration
-        Metanorma::CC.configuration
+        Metanorma::Cc.configuration
       end
 
       def metadata_committee(node, xml)
@@ -43,23 +43,23 @@ module Metanorma
       end
 
       def html_converter(node)
-        IsoDoc::CC::HtmlConvert.new(html_extract_attributes(node))
+        IsoDoc::Cc::HtmlConvert.new(html_extract_attributes(node))
       end
 
       def pdf_converter(node)
         return if node.attr("no-pdf")
 
-        IsoDoc::CC::PdfConvert.new(pdf_extract_attributes(node))
+        IsoDoc::Cc::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def doc_converter(node)
-        IsoDoc::CC::WordConvert.new(doc_extract_attributes(node))
+        IsoDoc::Cc::WordConvert.new(doc_extract_attributes(node))
       end
 
       def presentation_xml_converter(node)
-        IsoDoc::CC::PresentationXMLConvert
+        IsoDoc::Cc::PresentationXMLConvert
           .new(doc_extract_attributes(node)
-          .merge(output_formats: ::Metanorma::CC::Processor.new.output_formats))
+          .merge(output_formats: ::Metanorma::Cc::Processor.new.output_formats))
       end
     end
   end

data/lib/metanorma/cc/processor.rb

@@ -1,10 +1,10 @@
 require "metanorma/processor"
 
 module Metanorma
-  module CC
+  module Cc
     class Processor < Metanorma::Generic::Processor
       def configuration
-        Metanorma::CC.configuration
+        Metanorma::Cc.configuration
       end
 
       def initialize
@@ -22,20 +22,20 @@ module Metanorma
       end
 
       def version
-        "Metanorma::CC #{Metanorma::CC::VERSION}"
+        "Metanorma::Cc #{Metanorma::Cc::VERSION}"
       end
 
       def output(isodoc_node, inname, outname, format, options={})
         options_preprocess(options)
         case format
         when :html
-          IsoDoc::CC::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Cc::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::CC::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Cc::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::CC::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Cc::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :presentation
-          IsoDoc::CC::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Cc::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/cc/relaton-cc.rng

@@ -24,6 +24,7 @@
       <optional>
         <ref name="docsubtype"/>
       </optional>
+      <ref name="flavor"/>
       <ref name="editorialgroup"/>
       <zeroOrMore>
         <ref name="ics"/>

data/lib/metanorma/cc/validate_section.rb

@@ -2,7 +2,7 @@ require "nokogiri"
 require "metanorma-generic"
 
 module Metanorma
-  module CC
+  module Cc
     class Converter < Metanorma::Generic::Converter
       def section_validate(doc)
         advisory = doc.root.at("//bibdata/ext[doctype = 'advisory']")

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
-  module CC
-    VERSION = "2.5.3".freeze
+  module Cc
+    VERSION = "2.5.4".freeze
   end
 end

data/lib/metanorma/cc.rb

@@ -3,7 +3,7 @@ require "metanorma-generic"
 require_relative "./cc/processor"
 
 module Metanorma
-  module CC
+  module Cc
     class Configuration < Metanorma::Generic::Configuration
       def initialize(*args)
         super
@@ -28,5 +28,5 @@ module Metanorma
     configure {}
   end
 end
-Metanorma::Registry.instance.register(Metanorma::CC::Processor)
+Metanorma::Registry.instance.register(Metanorma::Cc::Processor)
 

data/lib/metanorma-cc.rb

@@ -8,5 +8,5 @@ require "metanorma"
 
 if defined? Metanorma::Registry
   require_relative "metanorma/cc"
-  Metanorma::Registry.instance.register(Metanorma::CC::Processor)
+  Metanorma::Registry.instance.register(Metanorma::Cc::Processor)
 end

data/metanorma-cc.gemspec

@@ -4,7 +4,7 @@ require "metanorma/cc/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "metanorma-cc"
-  spec.version       = Metanorma::CC::VERSION
+  spec.version       = Metanorma::Cc::VERSION
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic