metanorma-itu 2.5.4 → 2.5.5

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

@@ -6131,7 +6131,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>
 
@@ -6167,8 +6168,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>
@@ -6455,7 +6458,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)"/>
@@ -7499,9 +7502,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>
@@ -8947,9 +8960,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>
@@ -8976,6 +8992,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 -->
 	<!-- ======================== -->
@@ -9006,7 +9030,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>
 
@@ -9035,7 +9059,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>
@@ -11523,12 +11550,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>
@@ -12260,14 +12289,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_)"/>
 
@@ -12293,13 +12325,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' -->
@@ -14525,7 +14559,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">
@@ -14546,6 +14581,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) -->
@@ -14556,14 +14594,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>
@@ -14610,10 +14652,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"/>
@@ -14621,7 +14684,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/itu/metadata.rb

@@ -2,7 +2,7 @@ require "twitter_cldr"
 require_relative "metadata_date"
 
 module IsoDoc
-  module ITU
+  module Itu
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, locale, labels)
         super
@@ -12,7 +12,7 @@ module IsoDoc
         set(:logo_word, fileloc(n))
         set(:logo_sp, fileloc("logo-sp.png"))
         set(:logo_small, fileloc("logo-small.png"))
-        @isodoc = IsoDoc::ITU::HtmlConvert.new({})
+        @isodoc = IsoDoc::Itu::HtmlConvert.new({})
       end
 
       def fileloc(file)

data/lib/isodoc/itu/metadata_date.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  module ITU
+  module Itu
     class Metadata < IsoDoc::Metadata
       def monthyr(isodate)
         m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate

data/lib/isodoc/itu/pdf_convert.rb

@@ -2,7 +2,7 @@ require "isodoc"
 require "fileutils"
 
 module IsoDoc
-  module ITU
+  module Itu
     # A {Converter} implementation that generates PDF HTML output, and a
     # document schema encapsulation of the document for validation
     class PdfConvert < IsoDoc::XslfoPdfConvert

data/lib/isodoc/itu/presentation_bibdata.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  module ITU
+  module Itu
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
       def bibdata_i18n(bib)
         super

data/lib/isodoc/itu/presentation_contribution.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  module ITU
+  module Itu
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
       def contribution_table_insert_pt(docxml)
         docxml.at(ns("//preface")) || docxml.at(ns("//sections"))

data/lib/isodoc/itu/presentation_preface.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  module ITU
+  module Itu
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
       def insert_preface_sections(docxml)
         if @doctype == "contribution"

data/lib/isodoc/itu/presentation_ref.rb

@@ -6,7 +6,7 @@ require_relative "presentation_bibdata"
 require_relative "presentation_preface"
 
 module IsoDoc
-  module ITU
+  module Itu
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
       def bibrender_formattedref(formattedref, _xml)
         formattedref << "." unless /\.$/.match?(formattedref.text)

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -19,7 +19,7 @@ module Nokogiri
 end
 
 module IsoDoc
-  module ITU
+  module Itu
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
       def initialize(options)
         @hierarchical_assets = options[:hierarchicalassets]

data/lib/isodoc/itu/ref.rb

@@ -3,7 +3,7 @@ require_relative "metadata"
 require "fileutils"
 
 module IsoDoc
-  module ITU
+  module Itu
     module BaseConvert
       def nonstd_bibitem(list, bibitem, _ordinal, biblio)
         list.tr **attr_code(iso_bibitem_entry_attrs(bibitem, biblio)) do |ref|

data/lib/isodoc/itu/terms.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  module ITU
+  module Itu
     module BaseConvert
       def termdef_parse1(node, div, defn, source)
         div.p **{ class: "TermNum", id: node["id"] } do |p|

data/lib/isodoc/itu/word_cleanup.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  module ITU
+  module Itu
     class WordConvert < IsoDoc::WordConvert
       def word_preface_cleanup(docxml)
         docxml.xpath("//h1[@class = 'AbstractTitle'] | "\

data/lib/isodoc/itu/word_convert.rb

@@ -4,7 +4,7 @@ require_relative "word_cleanup"
 require "fileutils"
 
 module IsoDoc
-  module ITU
+  module Itu
     class WordConvert < IsoDoc::WordConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)

data/lib/isodoc/itu/xref.rb

@@ -3,7 +3,7 @@ require "fileutils"
 require_relative "xref_section"
 
 module IsoDoc
-  module ITU
+  module Itu
     class Counter < IsoDoc::XrefGen::Counter
       def print
         ret = super or return nil

data/lib/isodoc/itu/xref_section.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  module ITU
+  module Itu
     class Xref < IsoDoc::Xref
       def clause_order_annex(docxml)
         if docxml.at(ns("//bibdata/ext/structuredidentifier/annexid"))

data/lib/isodoc/itu.rb

@@ -6,6 +6,6 @@ require "isodoc/itu/word_convert"
 require "isodoc/itu/presentation_xml_convert"
 
 module IsoDoc
-  module ITU
+  module Itu
   end
 end

data/lib/metanorma/itu/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/itu/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/itu/cleanup.rb

@@ -1,7 +1,7 @@
 require_relative "cleanup_section"
 
 module Metanorma
-  module ITU
+  module Itu
     class Converter < Standoc::Converter
       def table_cleanup(xmldoc)
         super

data/lib/metanorma/itu/cleanup_section.rb

@@ -1,5 +1,5 @@
 module Metanorma
-  module ITU
+  module Itu
     class Converter < Standoc::Converter
       def sections_cleanup(xml)
         super

data/lib/metanorma/itu/converter.rb

@@ -7,7 +7,7 @@ require_relative "./validate"
 require_relative "./cleanup"
 
 module Metanorma
-  module ITU
+  module Itu
     class Converter < Standoc::Converter
       XML_ROOT_TAG = "itu-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/itu".freeze
@@ -140,22 +140,22 @@ module Metanorma
       end
 
       def presentation_xml_converter(node)
-        IsoDoc::ITU::PresentationXMLConvert
+        IsoDoc::Itu::PresentationXMLConvert
           .new(html_extract_attributes(node)
-          .merge(output_formats: ::Metanorma::ITU::Processor.new
+          .merge(output_formats: ::Metanorma::Itu::Processor.new
           .output_formats))
       end
 
       def html_converter(node)
-        IsoDoc::ITU::HtmlConvert.new(html_extract_attributes(node))
+        IsoDoc::Itu::HtmlConvert.new(html_extract_attributes(node))
       end
 
       def pdf_converter(node)
-        IsoDoc::ITU::PdfConvert.new(pdf_extract_attributes(node))
+        IsoDoc::Itu::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def doc_converter(node)
-        IsoDoc::ITU::WordConvert.new(doc_extract_attributes(node))
+        IsoDoc::Itu::WordConvert.new(doc_extract_attributes(node))
       end
     end
   end

data/lib/metanorma/itu/front.rb

@@ -2,7 +2,7 @@ require "fileutils"
 require_relative "./front_id"
 
 module Metanorma
-  module ITU
+  module Itu
     class Converter < Standoc::Converter
       def metadata_status(node, xml)
         stage = node.attr("status") || node.attr("docstage") || "published"
@@ -228,6 +228,7 @@ module Metanorma
       def metadata_ext(node, xml)
         metadata_doctype(node, xml)
         metadata_subdoctype(node, xml)
+        metadata_flavor(node, xml)
         metadata_committee(node, xml)
         metadata_ics(node, xml)
         metadata_recommendationstatus(node, xml)

data/lib/metanorma/itu/front_id.rb

@@ -1,5 +1,5 @@
 module Metanorma
-  module ITU
+  module Itu
     class Converter < Standoc::Converter
       def metadata_id(node, xml)
         provisional_id(node, xml)

data/lib/metanorma/itu/processor.rb

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

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

@@ -70,6 +70,7 @@
       <optional>
         <ref name="docsubtype"/>
       </optional>
+      <ref name="flavor"/>
       <oneOrMore>
         <ref name="editorialgroup"/>
       </oneOrMore>

data/lib/metanorma/itu/validate.rb

@@ -1,5 +1,5 @@
 module Metanorma
-  module ITU
+  module Itu
     class Converter < Standoc::Converter
       def bibdata_validate(doc)
         doctype_validate(doc)

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
-  module ITU
-    VERSION = "2.5.4".freeze
+  module Itu
+    VERSION = "2.5.5".freeze
   end
 end

data/lib/metanorma/itu.rb

@@ -3,7 +3,7 @@ require "metanorma/itu/processor"
 require "metanorma/itu/converter"
 
 module Metanorma
-  module ITU
+  module Itu
     ORGANIZATION_NAME_SHORT = "ITU"
     ORGANIZATION_NAME_LONG = "International Telecommunication Union"
   end

data/lib/metanorma-itu.rb

@@ -4,5 +4,5 @@ require "isodoc/itu"
 require "metanorma"
 
 if defined? Metanorma::Registry
-  Metanorma::Registry.instance.register(Metanorma::ITU::Processor)
+  Metanorma::Registry.instance.register(Metanorma::Itu::Processor)
 end