metanorma-itu 2.7.7 → 2.8.0

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

@@ -703,7 +703,7 @@
 							<xsl:when test="$cover_header_hide = 'false'">
 								<fo:block-container margin-left="13mm">
 									<xsl:call-template name="setWritingMode"/>
-									<fo:block-container margin-left="0mm">
+									<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 
 										<fo:table width="185.5mm" table-layout="fixed" margin-top="11.5mm">
 											<fo:table-column column-width="proportional-column-width(1)"/>
@@ -1244,7 +1244,7 @@
 									</fo:block>
 								</fo:block>
 								<fo:block-container margin-left="10mm">
-									<fo:block-container margin-left="0mm">
+									<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 
 										<fo:block font-size="20pt" font-weight="bold" space-before="30mm">
 											<xsl:value-of select="$i18n_tsb"/>
@@ -2155,38 +2155,15 @@
 				<xsl:otherwise>fo:block</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:element name="{$element-name}">
-			<xsl:attribute name="margin-top">6pt</xsl:attribute>
-
-			<xsl:call-template name="setKeepAttributes"/>
 
-			<xsl:if test="@class='supertitle'">
-				<xsl:attribute name="space-before">36pt</xsl:attribute>
-				<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
-				<xsl:attribute name="margin-top">0pt</xsl:attribute>
-				<xsl:attribute name="font-size">14pt</xsl:attribute>
+		<xsl:variable name="p_styles">
+			<styles xsl:use-attribute-sets="p-style">
+				<xsl:call-template name="refine_p-style"><xsl:with-param name="element-name" select="$element-name"/></xsl:call-template>
+			</styles>
+		</xsl:variable>
 
-			</xsl:if>
-			<xsl:attribute name="text-align">
-				<xsl:choose>
-					<xsl:when test="@class='supertitle'">center</xsl:when>
-					<!-- <xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when> -->
-					<xsl:when test="@align"><xsl:call-template name="setAlignment"/></xsl:when>
-					<xsl:when test="ancestor::*[1][self::mn:td]/@align">
-						<!-- <xsl:value-of select="ancestor::*[1][local-name() = 'td']/@align"/> -->
-						<xsl:call-template name="setAlignment">
-							<xsl:with-param name="align" select="ancestor::*[1][self::mn:td]/@align"/>
-						</xsl:call-template>
-					</xsl:when>
-					<xsl:when test="ancestor::*[1][self::mn:th]/@align">
-						<!-- <xsl:value-of select="ancestor::*[1][local-name() = 'th']/@align"/> -->
-						<xsl:call-template name="setAlignment">
-							<xsl:with-param name="align" select="ancestor::*[1][self::mn:th]/@align"/>
-						</xsl:call-template>
-					</xsl:when>
-					<xsl:otherwise>justify</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
+		<xsl:element name="{$element-name}">
+			<xsl:copy-of select="xalan:nodeset($p_styles)/styles/@*"/>
 
 			<xsl:if test="not(preceding-sibling::*) and parent::mn:li and $doctype = 'service-publication'">
 				<fo:inline padding-right="9mm">
@@ -2234,7 +2211,8 @@
 	<!-- ====== -->
 	<xsl:template match="mn:annex/mn:fmt-title">
 		<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
-		<fo:block font-size="14pt" font-weight="bold" text-align="center" margin-bottom="18pt" role="H1">
+		<fo:block xsl:use-attribute-sets="annex-title-style">
+			<xsl:call-template name="refine_annex-title-style"/>
 			<fo:block>
 				<xsl:apply-templates/>
 				<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
@@ -2262,36 +2240,13 @@
 
 	<!-- Bibliography -->
 	<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
-		<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
-		<fo:block font-size="14pt" font-weight="bold" text-align="center" margin-bottom="18pt" role="H1">
-			<xsl:if test="$doctype = 'implementers-guide'">
-				<xsl:attribute name="text-align">left</xsl:attribute>
-				<xsl:attribute name="font-size">12pt</xsl:attribute>
-				<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-			</xsl:if>
+		<fo:block xsl:use-attribute-sets="references-non-normative-title-style">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="mn:fmt-title" name="title">
 
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
-
-		<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
-
-		<xsl:variable name="font-size">
-			<xsl:choose>
-				<xsl:when test="$level = 1 and $doctype = 'resolution'">14pt</xsl:when>
-				<xsl:when test="$doctype = 'service-publication'">11pt</xsl:when>
-				<xsl:when test="$level &gt;= 2 and $doctype = 'resolution' and ../@inline-header = 'true'">11pt</xsl:when>
-				<xsl:when test="$level = 2">12pt</xsl:when>
-				<xsl:when test="$level &gt;= 3">12pt</xsl:when>
-				<xsl:otherwise>12pt</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
 		<xsl:variable name="element-name">
 			<xsl:choose>
 				<xsl:when test="../@inline-header = 'true'">fo:inline</xsl:when>
@@ -2299,49 +2254,13 @@
 			</xsl:choose>
 		</xsl:variable>
 
-		<xsl:variable name="space-before">
-			<xsl:choose>
-					<xsl:when test="$level = 1 and $doctype = 'service-publication'">12pt</xsl:when>
-					<xsl:when test="$level = '' or $level = 1">18pt</xsl:when>
-					<xsl:when test="$level = 2">12pt</xsl:when>
-					<xsl:otherwise>6pt</xsl:otherwise>
-				</xsl:choose>
-		</xsl:variable>
-
-		<xsl:variable name="space-after">
-			<xsl:choose>
-				<xsl:when test="$level = 1 and $doctype = 'resolution'">24pt</xsl:when>
-				<xsl:when test="$level = 1 and $doctype = 'service-publication'">12pt</xsl:when>
-				<xsl:when test="$level = 2">6pt</xsl:when>
-				<xsl:otherwise>6pt</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
-		<xsl:variable name="text-align">
-			<xsl:choose>
-				<xsl:when test="$level = 1 and $doctype = 'resolution'">center</xsl:when>
-				<xsl:when test="$lang = 'ar'">start</xsl:when>
-				<xsl:otherwise>left</xsl:otherwise>
-			</xsl:choose>
+		<xsl:variable name="title_styles">
+			<styles xsl:use-attribute-sets="title-style"><xsl:call-template name="refine_title-style"><xsl:with-param name="element-name" select="$element-name"/></xsl:call-template></styles>
 		</xsl:variable>
 
 		<xsl:element name="{$element-name}">
-			<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
-			<xsl:attribute name="font-weight">bold</xsl:attribute>
-			<xsl:attribute name="text-align"><xsl:value-of select="$text-align"/></xsl:attribute>
-			<xsl:attribute name="space-before"><xsl:value-of select="$space-before"/></xsl:attribute>
-			<xsl:attribute name="space-after"><xsl:value-of select="$space-after"/></xsl:attribute>
-			<xsl:attribute name="keep-with-next">always</xsl:attribute>
-			<xsl:if test="$element-name = 'fo:inline'">
-				<xsl:attribute name="padding-right">
-					<xsl:choose>
-						<xsl:when test="$level = 2">9mm</xsl:when>
-						<xsl:when test="$level = 3">6.5mm</xsl:when>
-						<xsl:otherwise>4mm</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
+			<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*"/>
+
 			<xsl:apply-templates/>
 			<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
 		</xsl:element>
@@ -2601,7 +2520,7 @@
 								</xsl:if>
 							</xsl:if>
 
-							<fo:block-container margin-left="0mm" margin-right="0mm">
+							<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 								<fo:block>
 
 									<xsl:apply-templates select="node()[not(self::mn:note)]"/>
@@ -5069,6 +4988,10 @@
 		</xsl:element>
 	</xsl:template>
 
+	<!-- show sourcecode's name 'before' or 'after' source code -->
+	<xsl:variable name="sourcecode-name-position"><xsl:text>after</xsl:text>
+	</xsl:variable>
+
 	<xsl:template match="mn:sourcecode" name="sourcecode">
 
 		<xsl:variable name="sourcecode_attributes">
@@ -5092,7 +5015,12 @@
 
 					<xsl:call-template name="refine_sourcecode-container-style"/>
 
-					<fo:block-container margin-left="0mm" role="SKIP">
+					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+
+						<!-- <xsl:if test="$namespace = 'rsd'"> -->
+						<xsl:if test="$sourcecode-name-position = 'before'">
+							<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name BEFORE content -->
+						</xsl:if>
 
 						<fo:block xsl:use-attribute-sets="sourcecode-style">
 
@@ -5114,7 +5042,16 @@
 						</fo:block>
 
 						<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
-						<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
+
+						<!-- <xsl:choose>
+							<xsl:when test="$namespace = 'rsd'"></xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates select="mn:fmt-name" />  --><!-- show sourcecode's name AFTER content -->
+							<!-- </xsl:otherwise>
+						</xsl:choose> -->
+						<xsl:if test="$sourcecode-name-position = 'after'">
+							<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
+						</xsl:if>
 
 					</fo:block-container>
 				</fo:block-container>
@@ -10995,6 +10932,10 @@
 	<!-- image    -->
 	<!-- ====== -->
 
+	<!-- show figure's name 'before' or 'after' image -->
+	<xsl:variable name="figure-name-position"><xsl:text>after</xsl:text>
+	</xsl:variable>
+
 	<xsl:template match="mn:figure" name="figure">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -11007,6 +10948,10 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 
+			<xsl:if test="$figure-name-position = 'before'"> <!-- show figure's name BEFORE image -->
+				<xsl:apply-templates select="mn:fmt-name"/>
+			</xsl:if>
+
 			<!-- Example: Dimensions in millimeters -->
 			<xsl:apply-templates select="mn:note[@type = 'units']"/>
 
@@ -11027,7 +10972,16 @@
 			<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
 				<xsl:call-template name="showFigureKey"/>
 			</xsl:if>
-			<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
+
+			<!-- <xsl:choose>
+				<xsl:when test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'rsd'"></xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="mn:fmt-name" /> --> <!-- show figure's name AFTER image -->
+				<!-- </xsl:otherwise>
+			</xsl:choose> -->
+			<xsl:if test="$figure-name-position = 'after'">
+				<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
+			</xsl:if>
 
 		</fo:block-container>
 	</xsl:template>
@@ -13113,10 +13067,20 @@
 	<!-- ================ -->
 
 	<xsl:attribute-set name="references-non-normative-title-style">
+		<xsl:attribute name="font-size">14pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
+		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_references-non-normative-title-style">
-
+		<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
+		<xsl:if test="$doctype = 'implementers-guide'">
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:attribute name="font-size">12pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -15232,7 +15196,12 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
-	</xsl:attribute-set>
+		<xsl:attribute name="font-size">14pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
+		<xsl:attribute name="role">H1</xsl:attribute>
+	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
 	</xsl:template>
@@ -15243,6 +15212,110 @@
 	<xsl:template name="refine_p-zzSTDTitle1-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="p-style">
+		<xsl:attribute name="margin-top">6pt</xsl:attribute>
+	</xsl:attribute-set> <!-- p-style -->
+
+	<xsl:template name="refine_p-style">
+		<xsl:param name="element-name"/>
+		<xsl:param name="margin"/>
+		<xsl:call-template name="setKeepAttributes"/>
+
+		<xsl:if test="@class='supertitle'">
+			<xsl:attribute name="space-before">36pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
+			<xsl:attribute name="margin-top">0pt</xsl:attribute>
+			<xsl:attribute name="font-size">14pt</xsl:attribute>
+		</xsl:if>
+		<xsl:attribute name="text-align">
+			<xsl:choose>
+				<xsl:when test="@class='supertitle'">center</xsl:when>
+				<!-- <xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when> -->
+				<xsl:when test="@align"><xsl:call-template name="setAlignment"/></xsl:when>
+				<xsl:when test="ancestor::*[1][self::mn:td]/@align">
+					<!-- <xsl:value-of select="ancestor::*[1][local-name() = 'td']/@align"/> -->
+					<xsl:call-template name="setAlignment">
+						<xsl:with-param name="align" select="ancestor::*[1][self::mn:td]/@align"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:when test="ancestor::*[1][self::mn:th]/@align">
+					<!-- <xsl:value-of select="ancestor::*[1][local-name() = 'th']/@align"/> -->
+					<xsl:call-template name="setAlignment">
+						<xsl:with-param name="align" select="ancestor::*[1][self::mn:th]/@align"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>justify</xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+		<!-- $namespace = 'itu' -->
+
+	</xsl:template> <!-- refine_p-style -->
+
+	<xsl:attribute-set name="title-style">
+		<!-- Note: font-size for level 1 title -->
+		<xsl:attribute name="font-size">12pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="text-align">left</xsl:attribute>
+		<xsl:attribute name="space-before">18pt</xsl:attribute>
+		<xsl:attribute name="space-after">6pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+	</xsl:attribute-set> <!-- title-style -->
+
+	<xsl:template name="refine_title-style">
+		<xsl:param name="element-name"/>
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
+
+		<xsl:if test="$level = 1">
+			<xsl:if test="$doctype = 'resolution'">
+				<xsl:attribute name="font-size">14pt</xsl:attribute>
+				<xsl:attribute name="text-align">center</xsl:attribute>
+				<xsl:attribute name="space-after">24pt</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="$doctype = 'service-publication'">
+				<xsl:attribute name="space-before">12pt</xsl:attribute>
+				<xsl:attribute name="space-after">12pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="$level = 2">
+			<xsl:attribute name="space-before">12pt</xsl:attribute>
+			<xsl:attribute name="space-after">6pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$level &gt;= 2">
+			<xsl:if test="$doctype = 'resolution' and ../@inline-header = 'true'">
+				<xsl:attribute name="font-size">11pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="$level &gt;= 3">
+			<xsl:attribute name="space-before">6pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$doctype = 'service-publication'">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$lang = 'ar'">
+			<xsl:attribute name="text-align">start</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$element-name = 'fo:inline'">
+			<xsl:attribute name="padding-right">
+				<xsl:choose>
+					<xsl:when test="$level = 2">9mm</xsl:when>
+					<xsl:when test="$level = 3">6.5mm</xsl:when>
+					<xsl:otherwise>4mm</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+		</xsl:if>
+		<!-- $namespace = 'itu' -->
+		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
+	</xsl:template> <!-- refine_title-style -->
+
 	<xsl:template name="processPrefaceSectionsDefault">
 		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -15581,6 +15654,12 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="reset-margins-style">
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="clause-style">
 
 	</xsl:attribute-set>
@@ -16601,8 +16680,9 @@
 
 	<xsl:template name="setTextAlignment">
 		<xsl:param name="default">left</xsl:param>
+		<xsl:param name="skip_default">false</xsl:param>
 		<xsl:variable name="align" select="normalize-space(@align)"/>
-		<xsl:attribute name="text-align">
+		<xsl:variable name="text_align">
 			<xsl:choose>
 				<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
 				<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
@@ -16610,9 +16690,13 @@
 				<xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
 				<xsl:when test="ancestor::mn:td/@align"><xsl:value-of select="ancestor::mn:td/@align"/></xsl:when>
 				<xsl:when test="ancestor::mn:th/@align"><xsl:value-of select="ancestor::mn:th/@align"/></xsl:when>
+				<xsl:when test="$skip_default = 'true'"/>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
-		</xsl:attribute>
+		</xsl:variable>
+		<xsl:if test="normalize-space($text_align) != ''">
+			<xsl:attribute name="text-align"><xsl:value-of select="$text_align"/></xsl:attribute>
+		</xsl:if>
 		<xsl:if test="$align = 'indent'">
 			<xsl:attribute name="margin-left">7mm</xsl:attribute>
 		</xsl:if>
@@ -16620,8 +16704,10 @@
 
 	<xsl:template name="setBlockAttributes">
 		<xsl:param name="text_align_default">left</xsl:param>
+		<xsl:param name="skip_text_align_default">false</xsl:param>
 		<xsl:call-template name="setTextAlignment">
 			<xsl:with-param name="default" select="$text_align_default"/>
+			<xsl:with-param name="skip_default" select="$skip_text_align_default"/>
 		</xsl:call-template>
 		<xsl:call-template name="setKeepAttributes"/>
 		<xsl:if test="node()[1][self::mn:span][contains(@style, 'line-height')]">

data/lib/isodoc/itu/presentation_ref.rb

@@ -84,15 +84,17 @@ module IsoDoc
 
       def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, _bib)
         ret = (idents[:metanorma] || idents[:ordinal] || idents[:sdo]).to_s
-        ret.empty? and return ret
-        /^\[.+\]$/.match?(ret) or ret = "[#{ret}]"
+        ret.empty? and return ""
+        ret = ret.sub(/^\[(.+)\]$/, "\\1")
+        ret = "[#{esc ret}]"
         ret += datefn
         ret.gsub("-", "‑").gsub(/ /, " ")
       end
 
       def biblio_ref_entry_code(_ordinal, idents, _id, _standard, datefn, _bib)
         ret = (idents[:metanorma] || idents[:ordinal] || idents[:sdo]).to_s
-        /^\[.+\]$/.match?(ret) or ret = "[#{ret}]"
+        ret = ret.sub(/^\[(.+)\]$/, "\\1")
+        ret = "[#{esc ret}]"
         ret += datefn
         ret.empty? and return ret
         ret.gsub("-", "‑").gsub(/ /, " ")

data/lib/metanorma/itu/converter.rb

@@ -152,3 +152,5 @@ module Metanorma
     end
   end
 end
+
+require_relative "log"

data/lib/metanorma/itu/log.rb

@@ -0,0 +1,47 @@
+module Metanorma
+  module Itu
+    class Converter
+      ITU_LOG_MESSAGES = {
+        # rubocop:disable Naming/VariableNumber
+        "ITU_1": { category: "Document Attributes",
+                   error: "%s is not a recognised document type",
+                   severity: 2 },
+        "ITU_2": { category: "Document Attributes",
+                   error: "%s is not a recognised status",
+                   severity: 2 },
+        "ITU_3": { category: "Document Attributes",
+                   error: "Title includes series name %s",
+                   severity: 2 },
+        "ITU_4": { category: "Style",
+                   error: "Requirement possibly in preface: %s",
+                   severity: 2 },
+        "ITU_6": { category: "Document Attributes",
+                   error: "Recommendation Status %s inconsistent with AAP",
+                   severity: 2 },
+        "ITU_7": { category: "Document Attributes",
+                   error: "Recommendation Status %s inconsistent with TAP",
+                   severity: 2 },
+        "ITU_8": { category: "Style",
+                   error: "%s does not match ITU document identifier conventions",
+                   severity: 2 },
+        "ITU_9": { category: "Style",
+                   error: "Unnumbered clause out of place",
+                   severity: 2 },
+        "ITU_10": { category: "Style",
+                    error: "No Summary has been provided",
+                    severity: 2 },
+        "ITU_11": { category: "Style",
+                    error: "No Keywords have been provided",
+                    severity: 2 },
+        "ITU_12": { category: "Style",
+                    error: "(terms) %s: %s",
+                    severity: 2 },
+      }.freeze
+      # rubocop:enable Naming/VariableNumber
+
+      def log_messages
+        super.merge(ITU_LOG_MESSAGES)
+      end
+    end
+  end
+end

data/lib/metanorma/itu/validate.rb

@@ -12,16 +12,14 @@ module Metanorma
            focus-group implementers-guide technical-paper technical-report
            joint-itu-iso-iec service-publication
            contribution).include? @doctype or
-          @log.add("Document Attributes", nil,
-                   "#{@doctype} is not a recognised document type")
+          @log.add("ITU_1", nil, params: [@doctype])
       end
 
       def stage_validate(xmldoc)
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(in-force superseded in-force-prepublished withdrawn
            draft).include? stage or
-          @log.add("Document Attributes", nil,
-                   "#{stage} is not a recognised status")
+          @log.add("ITU_2", nil, params: [stage])
       end
 
       def content_validate(doc)
@@ -41,8 +39,7 @@ module Metanorma
         xmldoc.xpath("//bibdata/series/title").each do |s|
           series = s.text.sub(/^[A-Z]: /, "")
           t.downcase.include?(series.downcase) and
-            @log.add("Document Attributes", nil,
-                     "Title includes series name #{series}")
+            @log.add("ITU_3", nil, params: [series])
         end
       end
 
@@ -61,8 +58,7 @@ module Metanorma
         xmldoc.xpath("//preface/*").each do |c|
           extract_text(c).split(/\.\s+/).each do |t|
             /\b(shall|must)\b/i.match(t) and
-              @log.add("Style", c,
-                       "Requirement possibly in preface: #{t.strip}")
+              @log.add("ITU_4", c, params: [t.strip])
           end
         end
       end
@@ -71,35 +67,33 @@ module Metanorma
       # Supplanted by rendering
       def numbers_validate(xmldoc); end
 
-      def style_two_regex_not_prev(node, text, regex, regex_prev, warning)
-        text.nil? and return
-        arr = text.split(/\W+/)
-        arr.each_index do |i|
-          m_prev = i.zero? ? nil : regex_prev.match(arr[i - 1])
-          if !regex.match?(arr[i]) && m_prev.nil?
-            @log.add("Style", node, "#{warning}: #{m[:num]}")
-          end
-        end
-      end
+      #       def style_two_regex_not_prev(node, text, regex, regex_prev, warning)
+      #         text.nil? and return
+      #         arr = text.split(/\W+/)
+      #         arr.each_index do |i|
+      #           m_prev = i.zero? ? nil : regex_prev.match(arr[i - 1])
+      #           if !regex.match?(arr[i]) && m_prev.nil?
+      #             @log.add("Style", node, "#{warning}: #{m[:num]}")
+      #             # ID = ITU_5
+      #           end
+      #         end
+      #       end
 
       def approval_validate(xmldoc)
         s = xmldoc.at("//bibdata/ext/recommendationstatus/approvalstage") or
           return
         process = s["process"]
         (process == "aap") && %w(determined in-force).include?(s.text) and
-          @log.add("Document Attributes", nil,
-                   "Recommendation Status #{s.text} inconsistent with AAP")
+          @log.add("ITU_6", nil, params: [s.text])
         (process == "tap") && !%w(determined in-force).include?(s.text) and
-          @log.add("Document Attributes", nil,
-                   "Recommendation Status #{s.text} inconsistent with TAP")
+          @log.add("ITU_7", nil, params: [s.text])
       end
 
       def itu_identifier_validate(xmldoc)
         xmldoc.xpath("//bibdata/docidentifier[@type = 'ITU']").each do |x|
           /^SG \d+/.match?(x.text) ||
             /^ITU-[RTD] [AD-VX-Z]\.\d+(\.\d+)?$/.match?(x.text) or
-            @log.add("Style", nil, "#{x.text} does not match ITU document " \
-                                   "identifier conventions")
+            @log.add("ITU_8", nil, params: [x.text])
         end
       end
 
@@ -114,16 +108,16 @@ module Metanorma
           next if (@doctype == "resolution") && (c.parent.name == "sections") &&
             !c.at("./preceding-sibling::clause")
 
-          @log.add("Style", c, "Unnumbered clause out of place")
+          @log.add("ITU_9", c)
         end
       end
 
       # Editing Guidelines 7.2, 7.3
       def section_check(xmldoc)
         xmldoc.at("//bibdata/abstract") or
-          @log.add("Style", nil, "No Summary has been provided")
+          @log.add("ITU_10", nil)
         xmldoc.at("//bibdata/keyword") or
-          @log.add("Style", nil, "No Keywords have been provided")
+          @log.add("ITU_11", nil)
       end
 
       def termdef_style(xmldoc)
@@ -139,7 +133,7 @@ module Metanorma
       end
 
       def termdef_warn(text, regex, node, term, msg)
-        regex.match(text) && @log.add("Style", node, "#{term}: #{msg}")
+        regex.match(text) && @log.add("ITU_12", node, params: [term, msg])
       end
     end
   end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Itu
-    VERSION = "2.7.7".freeze
+    VERSION = "2.8.0".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -1,3 +1,3 @@
 template:
   # skip authoritative identifier, it is inserted in front of formattedref within metanorma
-  standard: "<em>{{ title }}</em> ,_{{ edition | capitalize_first }} . {{ extent }}." 
+  standard: "<em>{{ title }}</em> ,_{{ edition | capitalize_first }} $$$ {{ extent }}"