metanorma-taste 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66c6fca3398a09bd581387f5a36fccc1a04151b8f616ac8bce1a301c687a2447
-  data.tar.gz: 7d1147c97d3e40c7e9b26367216822877c509911b281e70cdf907972e7fe2586
+  metadata.gz: eca330c6ecac8898e33460d368b0305ee83b2f44f08182a389231122d5970d7b
+  data.tar.gz: d775c3b890c30c6270f3e650a03324900a3b0fadcd4c01ee0fb50d2e5be78e46
 SHA512:
-  metadata.gz: '086f36349333fceefdb181e8095fb0f8f658dc6c54717f04e9ae80c1fd770045177fffd090a72769e69e42984da69cf477a5d2a2c0476d48a412c4024a87ffad'
-  data.tar.gz: 7156be9b7217c51494e65fc3e7607a6b043a78b345187879d61cf361ac4b44693bd550759f5c47596bb42a6eaac3f57122b381fb643d9092d3dbb037c4520c35
+  metadata.gz: db98365c339648ba8c6c36dd693f8d22b3b97a3370768d16677457bbd190462fdc6923813509ea4749d2b60a801a3b3328ee28ca476df1336a4f9e7c1eb52801
+  data.tar.gz: d51259cd69eefc681da4867d946fe075c27bd150201150003d673d5052245fc10bb7fb93d34c874444bd0788ac22cf8e5cbca9151f9c618a2a1fe508cde58b9f

data/.rubocop.yml

@@ -2,6 +2,15 @@
 # See https://github.com/metanorma/cimas
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
+  # .rubocop_todo.yml MUST be the last entry. inherit_from is last-wins:
+  # if listed before oss-guides, the shared config's stricter Metrics/
+  # (MethodLength, BlockLength, etc.) rules override the todo's per-file
+  # grandfathering, and the todo becomes inert on those cops. Empirically
+  # verified on suma 2026-07-06: with todo listed first, 34 Metrics/* offenses
+  # remained; moved last, cleared. Every gem in the metanorma-org fleet
+  # already ships a `.rubocop_todo.yml` on its live tree (audited 2026-07-06,
+  # 54/54 have it), so this reference is safe to emit unconditionally.
+  - .rubocop_todo.yml
 
 # Rubocop plugins enabled centrally so every metanorma-org gem picks them up
 # on cimas sync — best practice belongs at the shared-template layer, not

data/README.adoc

@@ -604,6 +604,30 @@ These include:
 * `doctype`: mapping of taste doctypes to native base flavor doctypes
 * `stage`: mapping of taste stages to native base flavor stages
 
+=== Stage repertoire contract
+
+When a taste defines `stages:`, its stage repertoire supersedes the base
+flavor's: input stages are validated against the taste's stage names, an
+unrecognised stage is reported and replaced with the taste's default stage,
+and the base stages the taste maps to are advertised to the flavor as valid
+(through the `:docstage-valid:` document attribute), so the flavor does not
+report them as unrecognised in turn.
+
+The `base:` values of taste stages must respect the base flavor's native
+stage semantics:
+
+* For flavors with free-form stage names (Metanorma Generic and its
+  derivatives, such as Ribose), any string is acceptable as a `base:` stage;
+  draft-ness is controlled by the `published:` flag of the stage.
+* For flavors whose machinery interprets stage values — above all ISO, where
+  document identifiers (pubid) and cover/boilerplate logic are keyed to the
+  numeric harmonized stage codes — `base:` values must be drawn from the
+  flavor's native repertoire (for ISO: numeric stage codes such as `30`,
+  `60`). A stage the flavor cannot interpret will degrade identifier
+  generation to a warning (the taste's own docidentifier template is used
+  instead), but stage-keyed rendering logic will treat the document as a
+  draft.
+
 
 == Data model
 

data/data/csa/csa.standard.xsl

@@ -373,7 +373,11 @@
 								<xsl:call-template name="setAltText">
 									<xsl:with-param name="value" select="@alt-text"/>
 								</xsl:call-template>
-								<xsl:apply-templates select="." mode="contents"/>
+								<xsl:variable name="item">
+									<!-- mnx:table/mn:fmt-name, mnx:figure/mn:fmt-name, mnx:example/mn:fmt-name -->
+									<xsl:apply-templates select="mn:fmt-name" mode="contents_item"/>
+								</xsl:variable>
+								<xsl:apply-templates select="xalan:nodeset($item)/node()"/>
 								<fo:inline keep-together.within-line="always">
 									<fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
 									<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
@@ -425,7 +429,7 @@
 						<!-- List of Tables -->
 						<xsl:if test="$contents/mnx:doc[@num = $num]//mnx:tables/mnx:table">
 							<xsl:call-template name="insertListOf_Title">
-								<xsl:with-param name="title" select="$title-list-tables"/>
+								<xsl:with-param name="title" select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-tables"/>
 							</xsl:call-template>
 							<fo:block role="TOC">
 								<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:tables/mnx:table">
@@ -437,7 +441,7 @@
 						<!-- List of Figures -->
 						<xsl:if test="$contents/mnx:doc[@num = $num]//mnx:figures/mnx:figure">
 							<xsl:call-template name="insertListOf_Title">
-								<xsl:with-param name="title" select="$title-list-figures"/>
+								<xsl:with-param name="title" select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-figures"/>
 							</xsl:call-template>
 							<fo:block role="TOC">
 								<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:figures/mnx:figure">
@@ -449,7 +453,7 @@
 						<!-- List of Examples -->
 						<xsl:if test="$contents/mnx:doc[@num = $num]//mnx:examples/mnx:example">
 							<xsl:call-template name="insertListOf_Title">
-								<xsl:with-param name="title" select="$title-list-examples"/>
+								<xsl:with-param name="title" select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-examples"/>
 							</xsl:call-template>
 							<fo:block role="TOC">
 								<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:examples/mnx:example">
@@ -887,45 +891,59 @@
 
 	<xsl:variable name="ace_tag">ace-tag_</xsl:variable>
 
-	<xsl:variable name="title-list-tables">
-		<xsl:variable name="toc_table_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='table']/mn:title"/>
-		<xsl:value-of select="$toc_table_title"/>
-		<xsl:if test="normalize-space($toc_table_title) = ''">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">toc_tables</xsl:with-param>
-			</xsl:call-template>
-		</xsl:if>
-	</xsl:variable>
+	<xsl:variable name="toc_title_lists_">
+		<xsl:for-each select="//mn:metanorma">
+			<xsl:variable name="num"><xsl:number level="any" count="mn:metanorma"/></xsl:variable>
+			<xsl:variable name="docid"><xsl:call-template name="getDocumentId"/></xsl:variable>
+			<xsl:variable name="current_document">
+				<xsl:copy-of select="."/>
+			</xsl:variable>
+			<xsl:for-each select="xalan:nodeset($current_document)">
+				<mnx:doc id="{$docid}" num="{$num}">
+					<mnx:title-list-tables>
+						<xsl:variable name="toc_table_title" select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='table']/mn:title"/>
+						<xsl:value-of select="$toc_table_title"/>
+						<xsl:if test="normalize-space($toc_table_title) = ''">
+							<xsl:call-template name="getLocalizedString">
+								<xsl:with-param name="key">toc_tables</xsl:with-param>
+							</xsl:call-template>
+						</xsl:if>
+					</mnx:title-list-tables>
 
-	<xsl:variable name="title-list-figures">
-		<xsl:variable name="toc_figure_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='figure']/mn:title"/>
-		<xsl:value-of select="$toc_figure_title"/>
-		<xsl:if test="normalize-space($toc_figure_title) = ''">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">toc_figures</xsl:with-param>
-			</xsl:call-template>
-		</xsl:if>
-	</xsl:variable>
+					<mnx:title-list-figures>
+						<xsl:variable name="toc_figure_title" select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='figure']/mn:title"/>
+						<xsl:value-of select="$toc_figure_title"/>
+						<xsl:if test="normalize-space($toc_figure_title) = ''">
+							<xsl:call-template name="getLocalizedString">
+								<xsl:with-param name="key">toc_figures</xsl:with-param>
+							</xsl:call-template>
+						</xsl:if>
+					</mnx:title-list-figures>
 
-	<xsl:variable name="title-list-examples">
-		<xsl:variable name="toc_example_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title"/>
-		<xsl:value-of select="$toc_example_title"/>
-		<xsl:if test="normalize-space($toc_example_title) = ''">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">toc_examples</xsl:with-param>
-			</xsl:call-template>
-		</xsl:if>
-	</xsl:variable>
+					<mnx:title-list-examples>
+						<xsl:variable name="toc_example_title" select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='example']/mn:title"/>
+						<xsl:value-of select="$toc_example_title"/>
+						<xsl:if test="normalize-space($toc_example_title) = ''">
+							<xsl:call-template name="getLocalizedString">
+								<xsl:with-param name="key">toc_examples</xsl:with-param>
+							</xsl:call-template>
+						</xsl:if>
+					</mnx:title-list-examples>
 
-	<xsl:variable name="title-list-recommendations">
-		<xsl:variable name="toc_requirement_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='requirement']/mn:title"/>
-		<xsl:value-of select="$toc_requirement_title"/>
-		<xsl:if test="normalize-space($toc_requirement_title) = ''">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">toc_recommendations</xsl:with-param>
-			</xsl:call-template>
-		</xsl:if>
+					<mnx:title-list-recommendations>
+						<xsl:variable name="toc_requirement_title" select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='requirement']/mn:title"/>
+						<xsl:value-of select="$toc_requirement_title"/>
+						<xsl:if test="normalize-space($toc_requirement_title) = ''">
+							<xsl:call-template name="getLocalizedString">
+								<xsl:with-param name="key">toc_recommendations</xsl:with-param>
+							</xsl:call-template>
+						</xsl:if>
+					</mnx:title-list-recommendations>
+				</mnx:doc>
+			</xsl:for-each>
+		</xsl:for-each>
 	</xsl:variable>
+	<xsl:variable name="toc_title_lists" select="xalan:nodeset($toc_title_lists_)"/>
 
 	<xsl:variable name="bibdata">
 		<xsl:copy-of select="//mn:metanorma/mn:bibdata"/>
@@ -1709,7 +1727,7 @@
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
 
-	<xsl:template match="mn:semx" mode="update_xml_step1">
+	<xsl:template match="mn:semx[not(@element = 'name')]" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
 
@@ -1992,7 +2010,7 @@
 	<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
 	<xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::mn:bibdata or      ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or      ancestor::mn:sourcecode or      (ancestor::mn:tt and ancestor::mn:table and string-length() &gt; 20) or     ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     ancestor::mn:name or ancestor::mn:fmt-name or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not( (ancestor::mn:bibdata and not(ancestor::mn:title)) or      ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or      ancestor::mn:sourcecode or      (ancestor::mn:tt and ancestor::mn:table and string-length() &gt; 20) or     ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     ancestor::mn:name or (ancestor::mn:fmt-name and not(ancestor::mn:semx[@element = 'name'])) or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<xsl:variable name="parent" select="local-name(..)"/>
 
@@ -2037,7 +2055,7 @@
 		<xsl:variable name="text">
 			<xsl:element name="text" namespace="{$namespace_full}">
 				<xsl:choose>
-					<xsl:when test="ancestor::mn:table"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells -->
+					<xsl:when test="ancestor::mn:table and not(ancestor::mn:fmt-name)"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells -->
 					<xsl:otherwise>
 						<xsl:variable name="text_" select="java:replaceAll(java:java.lang.String.new(.), $regex_standard_reference, concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
 						<!-- <xsl:value-of select="$text__"/> -->
@@ -2115,6 +2133,10 @@
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
+	<xsl:template match="mn:semx" mode="update_xml_enclose_keep-together_within-line">
+		<xsl:apply-templates mode="update_xml_enclose_keep-together_within-line"/>
+	</xsl:template>
+
 	<xsl:template name="replace_text_tags">
 		<xsl:param name="tag_open"/>
 		<xsl:param name="tag_close"/>
@@ -9356,6 +9378,7 @@
 		<xsl:variable name="svg_content">
 			<xsl:apply-templates select="." mode="svg_update"/>
 		</xsl:variable>
+		<!-- <svg_content><xsl:copy-of select="$svg_content"/></svg_content> -->
 
 		<xsl:variable name="alt-text">
 			<xsl:choose>
@@ -9570,7 +9593,7 @@
 		</xsl:copy>
 	</xsl:template>
 
-	<xsl:template match="mn:image/@href" mode="svg_update">
+	<xsl:template match="*[local-name() = 'image']/@href" mode="svg_update">
 		<xsl:attribute name="href" namespace="http://www.w3.org/1999/xlink">
 			<xsl:value-of select="."/>
 		</xsl:attribute>
@@ -12150,13 +12173,13 @@
 
 	<xsl:template name="processTablesFigures_Contents">
 		<xsl:param name="always"/>
-		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='table']/mn:title) or normalize-space($always) = 'true'">
+		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='table']/mn:title) or normalize-space($always) = 'true'">
 			<xsl:call-template name="processTables_Contents"/>
 		</xsl:if>
-		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='figure']/mn:title) or normalize-space($always) = 'true'">
+		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='figure']/mn:title) or normalize-space($always) = 'true'">
 			<xsl:call-template name="processFigures_Contents"/>
 		</xsl:if>
-		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title)">
+		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='example']/mn:title)">
 			<xsl:call-template name="processExamples_Contents"/>
 		</xsl:if>
 	</xsl:template>
@@ -12207,22 +12230,22 @@
 
 	<xsl:template name="processExamples_Contents">
 		<mnx:examples>
-			<xsl:for-each select="//mn:example[@id and mn:fmt-name and not(@unnumbered = 'true') and normalize-space(@id) != '']">
-				<xsl:choose>
-					<xsl:when test="mn:fmt-name">
-						<xsl:variable name="fmt_name">
-							<xsl:apply-templates select="mn:fmt-name" mode="update_xml_step1"/>
-						</xsl:variable>
-						<mnx:example id="{@id}" alt-text="{normalize-space($fmt_name)}">
-							<xsl:copy-of select="$fmt_name"/>
-						</mnx:example>
-					</xsl:when>
-					<xsl:otherwise>
-						<mnx:example id="{@id}" alt-text="{mn:name}">
-							<xsl:copy-of select="mn:name"/>
-						</mnx:example>
-					</xsl:otherwise>
-				</xsl:choose>
+			<xsl:for-each select="//mn:example[@id and mn:fmt-name and normalize-space(@id) != '']">
+				<!-- https://github.com/metanorma/metanorma-pdfa/issues/32#issuecomment-4929133938:
+				//example/fmt-xref-label[@container] + //example/fmt-name/span[@class = 'fmt-caption-delim'] + //example/name, 
+				with the last two elements dropped if //example/name does not exist. -->
+				<xsl:variable name="example_name">
+					<xsl:apply-templates select="mn:name/node()" mode="update_xml_step1"/>
+				</xsl:variable>
+				<mnx:example id="{@id}" alt-text="{normalize-space($example_name)}">
+					<xsl:element name="fmt-name" namespace="{$namespace_full}">
+						<xsl:value-of select="mn:fmt-xref-label[@container]"/>
+						<xsl:if test="normalize-space($example_name) != ''">
+							<xsl:value-of select="mn:fmt-name/mn:span[@class = 'fmt-caption-delim']"/>
+							<xsl:copy-of select="$example_name"/>
+						</xsl:if>
+					</xsl:element>
+				</mnx:example>
 			</xsl:for-each>
 		</mnx:examples>
 	</xsl:template>
@@ -12495,15 +12518,18 @@
 
 										<xsl:call-template name="insertFigureBookmarks">
 											<xsl:with-param name="contents" select="mnx:contents"/>
+											<xsl:with-param name="num" select="@num"/>
 										</xsl:call-template>
 
 										<xsl:call-template name="insertTableBookmarks">
 											<xsl:with-param name="contents" select="mnx:contents"/>
+											<xsl:with-param name="num" select="@num"/>
 											<xsl:with-param name="lang" select="@lang"/>
 										</xsl:call-template>
 
 										<xsl:call-template name="insertExampleBookmarks">
 											<xsl:with-param name="contents" select="mnx:contents"/>
+											<xsl:with-param name="num" select="@num"/>
 											<xsl:with-param name="lang" select="@lang"/>
 										</xsl:call-template>
 
@@ -12518,15 +12544,18 @@
 
 									<xsl:call-template name="insertFigureBookmarks">
 										<xsl:with-param name="contents" select="mnx:contents"/>
+										<xsl:with-param name="num" select="@num"/>
 									</xsl:call-template>
 
 									<xsl:call-template name="insertTableBookmarks">
 										<xsl:with-param name="contents" select="mnx:contents"/>
+										<xsl:with-param name="num" select="@num"/>
 										<xsl:with-param name="lang" select="@lang"/>
 									</xsl:call-template>
 
 									<xsl:call-template name="insertExampleBookmarks">
 										<xsl:with-param name="contents" select="mnx:contents"/>
+										<xsl:with-param name="num" select="@num"/>
 										<xsl:with-param name="lang" select="@lang"/>
 									</xsl:call-template>
 
@@ -12539,15 +12568,18 @@
 
 						<xsl:call-template name="insertFigureBookmarks">
 							<xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
+							<xsl:with-param name="num" select="@num"/>
 						</xsl:call-template>
 
 						<xsl:call-template name="insertTableBookmarks">
 							<xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
+							<xsl:with-param name="num" select="@num"/>
 							<xsl:with-param name="lang" select="@lang"/>
 						</xsl:call-template>
 
 						<xsl:call-template name="insertExampleBookmarks">
 							<xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
+							<xsl:with-param name="num" select="@num"/>
 							<xsl:with-param name="lang" select="@lang"/>
 						</xsl:call-template>
 
@@ -12563,6 +12595,7 @@
 
 	<xsl:template name="insertFigureBookmarks">
 		<xsl:param name="contents"/>
+		<xsl:param name="num"/>
 		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
 		<xsl:if test="$contents_nodes/mnx:figure">
 			<fo:bookmark internal-destination="{$contents_nodes/mnx:figure[1]/@id}" starting-state="hide">
@@ -12580,7 +12613,7 @@
 			<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
 
 				<xsl:variable name="bookmark-title">
-							<xsl:value-of select="$title-list-figures"/>
+							<xsl:value-of select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-figures"/>
 				</xsl:variable>
 				<fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
 				<xsl:for-each select="$contents_nodes//mnx:figures/mnx:figure">
@@ -12594,6 +12627,7 @@
 
 	<xsl:template name="insertTableBookmarks">
 		<xsl:param name="contents"/>
+		<xsl:param name="num"/>
 		<xsl:param name="lang"/>
 		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
 		<xsl:if test="$contents_nodes/mnx:table">
@@ -12617,7 +12651,7 @@
 			<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
 
 				<xsl:variable name="bookmark-title">
-							<xsl:value-of select="$title-list-tables"/>
+							<xsl:value-of select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-tables"/>
 				</xsl:variable>
 
 				<fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
@@ -12632,8 +12666,9 @@
 		</xsl:if>
 	</xsl:template> <!-- insertTableBookmarks -->
 
-		<xsl:template name="insertExampleBookmarks">
+	<xsl:template name="insertExampleBookmarks">
 		<xsl:param name="contents"/>
+		<xsl:param name="num"/>
 		<xsl:param name="lang"/>
 		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
 		<xsl:if test="$contents_nodes/mnx:example">
@@ -12657,7 +12692,7 @@
 			<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
 
 				<xsl:variable name="bookmark-title">
-							<xsl:value-of select="$title-list-examples"/>
+							<xsl:value-of select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-examples"/>
 				</xsl:variable>
 
 				<fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
@@ -12818,6 +12853,18 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="mn:tt" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'keep-together_within-line']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="mn:stem" mode="contents_item"/>
 	<xsl:template match="mn:fmt-stem" mode="contents_item">
 		<xsl:copy-of select="."/>

data/data/oiml/config.yaml

@@ -16,6 +16,16 @@ base-override:
     #presentation-metadata-backcover-text: expresslang.org
     output-extensions: xml,html,pdf,doc
     fonts: Futura PT Book;Futura PT Demi;Futura PT Light
+  bibliography-sort:
+  - abbrev: OIML
+    rank: 1
+    name: International Organization of Legal Metrology
+  - abbrev: ISO
+    rank: 2
+    name: International Organization for Standardization
+  - abbrev: IEC
+    rank: 3
+    name: International Electrotechnical Commission
 doctypes:
   # OIML G
 - taste: international-guide

data/data/pdfa/config.yaml

@@ -16,13 +16,13 @@ base-override:
     publisher_abbr: PDF Association
     presentation-metadata-color-secondary: '#d03f4e'  # PDFa logo red - good contrast for WCAG Level AA
     presentation-metadata-backcover-text: https://pdfa.org
-    body-font: "'Source Sans 3', 'Helvetica Neue', Helvetica, sans-serif"
-    header-font: "'Source Sans 3', 'Helvetica Neue', Helvetica, sans-serif"
-    monospace-font: "'Noto Sans Mono', Courier, monospace"
-    fonts: Source Sans 3;Source Sans 3 SemiBold;Source Sans Pro
+    body-font: "'Source Sans 3', sans-serif"
+    header-font: "'Source Sans 3', sans-serif"
+    monospace-font: "'Source Code Pro', monospace"
+    fonts: "Source Sans 3 ExtraLight;Source Sans 3 Light;Source Sans 3;Source Sans 3 Medium;Source Sans 3 SemiBold;Source Sans 3 ExtraBold;Source Sans 3 Black;Source Code Pro ExtraLight;Source Code Pro Light;Source Code Pro;Source Code Pro Medium;Source Code Pro SemiBold;Source Code Pro ExtraBold;Source Code Pro Black;STIX Two Math;Arial;Courier New"
     output-extensions: xml,html,pdf
     toclevels-html: 6
-    docidentifier: '{{ doctype_abbr }}-{{ docnumeric | prepend: "000" | slice: -3,3 }} {% if draft %}v{{ draft }}{% endif %} {% if edition %}ed. {{ edition }}{% endif %}'
+    docidentifier: '{{ doctype_abbr }}-{{ docnumeric | prepend: "000" | slice: -3,3 }}{% if bibdata.status.stage.abbreviation %}-{{ bibdata.status.stage.abbreviation }}{% endif %} {% if draft %}v{{ draft }}{% endif %} {% if edition %}ed. {{ edition }}{% endif %}'
 doctypes:
 - taste: specification # Specification # The name goes into i18n.yaml
   base: standard

data/data/pdfa/htmlcoverpage.html

@@ -39,7 +39,7 @@
 
   <div class="docidentifier">
     <p><b>
-    {{doctype_display}} : {{ docnumber }} {%if stage_display %} - <span style="color:red">{{stage_display}}</span>{% endif %}
+    {{doctype_display}} : {{ docnumber }} {%if stage_display %} - <span style="color:red">{{stage_display}}{% if bibdata.status.stage.abbreviation %} ({{ bibdata.status.stage.abbreviation }}){% endif %}</span>{% endif %}
     </b></p>
   </div>
   <hr/>

data/data/pdfa/htmlstylesheet-override.scss

@@ -1,10 +1,19 @@
 :root {
-  --ribose-primary-color: #d03f4e; /* PDFa logo red. Required for WCAG Level AA colour contrast */
+  --color_blue: rgb(22, 97, 173); /* copied from ribose.standard.xsl */
+  --logo_yellow: rgb(202,152,49);
+	--logo_green: rgb(139,152,91);
+	--logo_red: rgb(208,63,78); /* only logo color with sufficient contrast for WCAG Level AA */
+	--logo_blue: rgb(72,145,175);
+  --proportional_font: 'Source Sans 3', sans-serif;
+  --small-text-reduction: 85%;
+  --monospaced_font: 'Source Code Pro', monospace;
+  --mono_font-reduction: 90%;
+  --ribose-primary-color: var(--logo_red); /* used by base flavor styling */
 }
 
 a {
   text-decoration: underline; /* WCAG - all links must be clearly visible */
-  color: #d03f4e; /* PDFa logo red */
+  color: var(--logo_red)
 }
 
 img { /* Make images more responsive */
@@ -16,52 +25,121 @@ body {
   line-height: 1.5; /* WCAG level AA requires minimum line height of 1.5 */
 }
 
-tt, td tt, p tt { /* override 0.8em formatting elsewhere */
-  font-size: 100%;
+p { /* Compress whitespace but equally top and bottom */
+  margin-top: 1mm;
+  margin-bottom: 1mm;
+}
+
+tt, td tt, p tt, li tt { /* override 0.8em formatting elsewhere */
+  font-size: 1em;
 }
 
-figure, pre, .pseudocode { /* incl. source code */
+/* FIGURES, EXAMPLES, SOURCE CODE, ETC. */
+
+figure { /* incl. source code */
+  display: block;
   line-height: 1.5; /* WCAG level AA requires minimum line height of 1.5 */
-  margin-top: 0cm; 
-  padding-top: 0.1em;
-  margin-bottom: 0cm; 
-  padding-bottom: 0.1em;
+  font-size: 100%;
+  margin-top: 0; 
+  padding: 0;
+  padding-left: 2mm;
+  margin-bottom: 0; 
 }
 
-table > caption {
-  font-weight: bold;
+figure svg { /* avoid excessive up-scaling of SVGs */
+  width: auto;
+  height: auto;
+  max-width:  800px;  /* hard ceiling - never too wide for wide figures */
+  max-height: 500px;  /* hard ceiling - never too tall for tall figures */
 }
 
-th {
-  color: white;
-  background-color: blue;
+figure picture { /* images */
+  display: block;      /* picture must be block for margin: auto to work */
+  width: fit-content;  /* shrink-wrap to the img's natural size */
 }
 
-tbody tr:nth-child(even) {
-    background-color: LightGray; /* Light grey for even rows - not header */
+.figdl dt {
+  color: var(--color_blue);
+  font-weight: bolder; /* may slightly hide some PDF notation */
 }
 
-/* Level 1: Square bullet, red */
-ul > li::before {
-  content: "\25A0";  /* Black square */
-  color: #d03f4e;    /* PDFa logo red */
-  font-size: 90%;
+/* Collapsible examples - title */
+summary {
+  color: var(--color_blue);
 }
 
-/* Level 2: Diamond bullet, blue */
-ul ul > li::before {
-  content: "\25C6";  /* Diamond */
-  color: #489aaf;    /* PDFa logo blue */
-  font-size: 100%;
+.example {
+  margin-left: 3mm;
+  padding: 2mm;
+  margin-top: 2mm;
+  border-left: 2pt solid var(--color_blue);
+  text-transform: none; /* PDF is case-sensitive! Never force uppercase! */
+  background-color: #D6FFFE; /* Very pale blue */
+}
+
+.example .example-title {
+  color: var(--color_blue);
+  margin-left: 0;
+  font-weight: normal;
+  text-transform: none; /* PDF is case-sensitive! Never force uppercase! */
 }
 
-/* Level 3: Circle bullet, green */
-ul ul ul > li::before {
-  content: "\25CF";  /* Filled circle */
-  color: #8b9856;    /* PDFa logo green */
+.sourcecode {
+  background-color: rgb(230, 230, 230);
+}
+
+figcaption.SourceTitle { /* Revert the title back from smaller monospaced font */
+  font-family: var(--proportional_font) !important;
   font-size: 110%;
+  font-weight: normal;
+  text-align: left !important;
+  margin-top: 2mm;
+  margin-bottom: 2mm; 
+  color: var(--color_blue);
+  order: -1; /* move to top */
+}
+
+pre { /* Rouge source code blocks */
+  font-size: var(--mono_font-reduction);
+  line-height: 1.5; /* required by WCAG Level AA minimum, override from elsewhere */
+  margin: 0;
+  margin-left: 2mm;
+  margin-right: 2mm;
+  padding: 1mm;
+  padding-left: 2mm;
 }
 
+/* TABLES - need to hard override some explicit style formatting on the HTML tags */
+/* Can also use DataTables.js classes - https://datatables.net/manual/styling/classes */
+
+table {
+  border: 2pt solid var(--color_blue) !important; /* thick */
+}
+
+table th { /* Table headers */
+  border: 2pt solid var(--color_blue) !important; /* thick */
+}
+
+table > caption {
+  font-weight: normal; /* Retain PDF notation formatting */
+  margin-top: 2mm; /* Close spacing at top */
+  padding: 2mm;
+  color: var(--color_blue);
+}
+
+table td {
+  padding: 0;
+  padding-left: 1mm;
+  border: 0.75pt solid var(--color_blue) !important; /* thin */
+  margin-top: 1mm; /* Close up spacing */
+}
+
+table.layout { /* class="layout" implies an invisible table used to influence layout */
+  border: none !important;
+}
+
+/* COVER MATERIAL */
+
 .logo { /* cover page logo */
   text-align: center;
 }
@@ -77,30 +155,107 @@ ul ul ul > li::before {
   font-size: 32pt;
 }
 
-#toc li a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
+/* NAVIGATION MENU */
+
+/* Avoid bullets on ToC items */
+#toc li::before, #toc li::marker {
+  content: none;
+  display: inside;
+}
+#toc li a, #toc > ul :is(.h1) li a {
+  text-transform: none; /* PDF is case-sensitive! Never force nav bookmark text uppercase! */
+  padding: 1pt;
+}
+
+#toc li a, #toc > ul :is(.h2, .h3, .h4, .h5, .h6) li a {
   text-transform: none; /* PDF is case-sensitive! Never force nav bookmark text uppercase! */
+  padding-top: 0.25pt;
+  padding-bottom: 0.25pt;
+}
+
+#toc > ul :is(.h1) { /* H1's in bookmarks are bolder blue (not outright bold!) */
+  color: var(--color_blue);
+  font-weight: bolder; /* may slightly hide some PDF notation */
+}
+
+/* HEADINGS */
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+  text-transform: none; /* PDF is case-sensitive! Never force headings uppercase! */
+  font-weight: bolder;  /* may slightly hide some PDF notation */
 }
 
 h1, .h1 {
-  text-transform: none; /* PDF is case-sensitive! Never force uppercase! */
+  margin-top: 3mm; /* tighten up spacing */ 
 }
 
-.example .example-title {
-  text-transform: none; /* PDF is case-sensitive! Never force uppercase! */
+/* UNORDERED LIST BULLETS */
+
+/* Null out other CSS that uses legacy ::before */
+ul > li::before {
+  content: none;
+  display: outside;
+  width: auto;
+  margin: 0;
+  padding: 0;
 }
 
-.example {
-  text-transform: none; /* PDF is case-sensitive! Never force uppercase! */
-  font-size: 90%; 
-  background-color: #D6FFFE; /* Very pale blue */
+/* Level 1: Square bullet, logo red followed by EM space (U+2003) */
+ul > li::marker {
+  content: "■\2003";
+  color: var(--logo_red);
 }
 
-.sourcecode {
-  font-size: 90%; 
+/* Level 2: Diamond bullet, logo blue followed by EM space (U+2003) */
+ul ul > li::marker {
+  content: "◆\2003";  
+  color: var(--logo_blue);
 }
 
-figcaption .SourceTitle { /* Revert the title back from monospaced font */
-  font-family: 'Source Sans 3', 'Helvetica Neue', Helvetica, sans-serif;
+/* Level 3: Circle bullet, logo green followed by EM space (U+2003) */
+ul ul ul > li::marker {
+  content: "●\2003";
+  color: var(--logo_green);
+  font-size: 120%;
+}
+
+/* Level 4: Square bullet, logo red followed by EM space (U+2003) */
+ul ul ul ul > li::marker {
+  content: "■\2003";
+  color: var(--logo_yellow);
+}
+
+/* Level 5: Diamond bullet, logo blue followed by EM space (U+2003) */
+ul ul ul ul ul > li::marker {
+  content: "◆\2003";  
+  color: var(--logo_blue);
+}
+
+/* Level 6: Circle bullet, logo green followed by EM space (U+2003) */
+ul ul ul ul ul ul > li::marker {
+  content: "●\2003";
+  color: var(--logo_green);
+  font-size: 120%;
+}
+
+/* Space out unordered list items */
+div.ul_wrap:has(> ul > li) {
+  margin-top: 2mm;
+  margin-bottom: 2mm;
+  margin-left: 4mm;
+}
+
+/* Block quotes */
+.Quote {
+  width: 95%;
+  margin-left: 15mm;
+  margin-right: 5mm;
+  margin-top: 0;
+  padding: 2mm;
+}
+
+.QuoteAttribution {
+  text-align: right;
 }
 
 span.TermNum {
@@ -108,135 +263,157 @@ span.TermNum {
 }
 
 .requirement {
-  color: Red; 
+  color: rgb(255, 0, 0); 
   font-weight: bold;
   text-transform: uppercase; /* Uppercase "SHALL" a-la RFCs */
 }
 
 .recommendation {
-  color: DarkOrange;
+  color: rgb(255, 140, 0);
   font-weight: bold;
   text-transform: uppercase; /* Uppercase "SHOULD" a-la RFCs */
 }
 
-.pdf-keyword {
-  font-family: 'Courier New', Courier, monospace;
-  background-color: #e2e29f;
-  color: Blue; 
-  font-weight: bold;
+.pdf-version { 
+  color: rgb(0, 0, 255); 
+  font-style: italic; 
+  font-weight: lighter; 
 }
+.pdf-version::before { content: "(PDF "; }
+.pdf-version::after  { content: ")"; }
 
 .pdf-operator {
-  font-family: 'Courier New', Courier, monospace;
-  background-color: #e2e29f;
-  color: Red; 
+  font-family: var(--monospaced_font);
+  font-size: var(--mono_font-reduction);
+  padding: 1pt;
+  background-color: rgb(224, 224, 175);
+  color: rgb(255, 0, 0); 
   font-weight: bold;
 }
 
-.pdf-version { 
-  font-style: italic; 
-  font-weight: lighter; 
-  color: blue; 
+.pdf-keyword {
+  font-family: var(--monospaced_font);
+  font-size: var(--mono_font-reduction);
+  padding: 1pt;
+  background-color: rgb(224, 224, 175);
+  color: rgb(0, 0, 255); 
+  font-weight: bold;
 }
-.pdf-version::before { content: "(PDF "; }
-.pdf-version::after  { content: ")"; }
 
 /* Base admonition styling */
-.Note, .note, .Admonition  {
-  font-size: 86%;
-  margin-left: 8.5mm;
-  margin-right: 0.5mm;
-  margin-top: 6pt;
-  margin-bottom: 6pt;
-  padding: 1mm;
-  padding-left: 1.5mm;
-  padding-right: 1.5mm;
-  border-left: 4pt solid;
+.Note, .Admonition  {
+  font-size: var(--small-text-reduction);
+	background-color: rgb(252, 251, 212);
+	border-left: 4pt solid rgb(255, 200, 36);
+  margin: 2mm;
+  margin-left: 3mm;
+  padding: 1.5mm;
 }
 
-.note_label {
-  font-weight: bold; /* the "NOTE 1" text before the body of a note */
+.note_label, .termnote_label {
+  font-weight: bold; /* the "NOTE 1" or "Note to entry" text before the body of a note*/
 }
 
 .AdmonitionTitle { /* titles of all admonitions */
   text-align: left;
   text-transform: none; /* PDF is case sensitive! */
-  font-weight: bold;
+  font-weight: bold; /* may hide some PDF notation */
 }
 
 /* Tip admonition */
 .AdmonitionTip {
-  background-color: #f5ebce; /* rgb(245,235,206) */
-  border-left-width: 4pt;
-  border-left-color: #d03f4e; /* rgb(208,63,78) - PDFa red */
+  background-color: rgb(245,235,206);
+  border-left-color: rgb(208,63,78);
 }
 
-.AdmonitionTip .AdmonitionTitle {
-  color: #d03f4e;
+.AdmonitionTip.AdmonitionTitle {
+  color: rgb(208,63,78);
+  text-align: left !important; /* HTML has hard-coded style to center */
 }
 
 /* Warning admonition */
 .AdmonitionWarning {
-  background-color: #fff5e6; /* rgb(255,245,230) */
-  border-left-width: 4pt;
-  border-left-color: #ff8c00; /* rgb(255,140,0) - dark orange */
+  background-color: rgb(255,245,230);
+  border-left-color: rgb(255,140,0);
 }
 
-.AdmonitionWarning .AdmonitionTitle {
-  color: #ff8c00;
+.AdmonitionWarning.AdmonitionTitle {
+  color: rgb(255,140,0);
+  text-align: left !important; /* HTML has hard-coded style to center */
 }
 
 /* Caution admonition */
 .AdmonitionCaution {
-  background-color: #fffacd; /* rgb(255,250,205) */
-  border-left-width: 4pt;
-  border-left-color: #b8860b; /* rgb(184,134,11) - dark goldenrod */
+  background-color: rgb(255,250,205);
+  border-left-color: rgb(184,134,11);
 }
 
-.AdmonitionCaution .AdmonitionTitle {
-  color: #b8860b;
+.AdmonitionCaution.AdmonitionTitle {
+  color: rgb(184,134,11);
+  text-align: left !important; /* HTML has hard-coded style to center */
 }
 
 /* Important admonition */
 .AdmonitionImportant {
-  background-color: #ffe6e6; /* rgb(255,230,230) */
-  border-left-width: 4pt;
-  border-left-color: #ff0000; /* rgb(255,0,0) - red */
+  background-color: rgb(255,230,230);
+  border-left-color: rgb(255,0,0);
 }
 
-.AdmonitionImportant .AdmonitionTitle {
-  color: #ff0000;
+.AdmonitionImportant.AdmonitionTitle {
+  color: rgb(255,0,0);
+  text-align: left !important; /* HTML has hard-coded style to center */
 }
 
 /* Safety-precaution admonition */
 .AdmonitionSafetyPrecaution {
-  background-color: #e6f5e6; /* rgb(230,245,230) */
-  border-left-width: 4pt;
-  border-left-color: #008000; /* rgb(0,128,0) - green */
+  background-color:rgb(230,245,230);
+  border-left-color: rgb(0,128,0);
 }
 
-.AdmonitionSafetyPrecaution .AdmonitionTitle {
-  color: #008000;
+.AdmonitionSafetyPrecaution.AdmonitionTitle {
+  color: rgb(0,128,0);
+  text-align: left !important; /* HTML has hard-coded style to center */
 }
 
 /* Editorial admonition */
 .AdmonitionEditorial {
-  background-color: #f0f0f0; /* rgb(240,240,240) */
-  border-left-width: 4pt;
-  border-left-color: #808080; /* rgb(128,128,128) - gray */
+  background-color: rgb(240,240,240);
+  border-left-color: rgb(128,128,128);
 }
 
-.AdmonitionEditorial .AdmonitionTitle {
-  color: #808080;
+.AdmonitionEditorial.AdmonitionTitle {
+  color: rgb(128,128,128);
+  text-align: left !important; /* HTML has hard-coded style to center */
 }
 
 /* Box admonition */
 .AdmonitionBox {
-  background-color: #9addda; /* rgb(154, 221, 218) */
+  background-color: rgb(154, 221, 218);
   border: 2pt solid black;
-  border-left: none;
 }
 
 .AdmonitionBox.AdmonitionTitle {
-  border: none;
+  border: none; /* do not additionally border the box admonition title */
+  text-align: left !important; /* HTML has hard-coded style to center */
 }
+
+/* Other admonition */
+.AdmonitionOther {
+  background-color: rgb(240,240,240);
+  border-left-color: rgb(80, 80, 80);
+}
+
+.AdmonitionOther.AdmonitionTitle {
+  color: rgb(80, 80, 80);
+  text-align: left !important; /* HTML has hard-coded style to center */
+}
+
+p.Biblio { /* hanging indent for bibliographic entries */
+  margin-left: 8.5mm;
+  text-indent: -5mm;
+}
+
+.Biblio.note_label {
+  margin-top: 0;
+  margin-left: 5mm;
+}

data/data/pdfa/i18n.yaml

@@ -15,10 +15,11 @@ term_def_boilerplate: |
   * Glossary of general PDF terms: available at https://pdfa.org/glossary-of-pdf-terms/[]
   * Glossary of PDF accessibility terminology: available at https://pdfa.org/resource/glossary-of-accessibility-terminology-in-pdf/[]
 
+# Not used by pdfa.xsl "getLocalizedString"!
 stage_dict:
   draft: Draft
   release-candidate: Release Candidate
-  published: Published
+  published:
 
 admonition:  # see https://github.com/metanorma/isodoc/issues/760
   tip: Tip
@@ -27,18 +28,21 @@ admonition:  # see https://github.com/metanorma/isodoc/issues/760
   caution: Caution
   important: IMPORTANT!
   safety precautions: SECURITY!
-  editorial: Editor Note
+  editorial: Editor's Note
 
 abstract: Summary
-foreword: Preface
-clause: Section
-formula: Equation
+foreword: preface
+clause: section # not capitalized
+formula: equation
 subclause: sub-section
-section: Section
-annex: Appendix
-table_of_contents: Table of Contents
+section: section
+edition: edition # cover page word
+annex: Appendix # not capitalized, used in citations
+table_of_contents: Table of Contents # not capitalized by MN
 annex_subclause: sub-section
-termsdef: Definitions
-termsdefsymbolsabbrev: Definitions, acronyms and abbreviations
-termsdefsymbols: Definitions, acronyms and abbreviations
-termsdefabbrev: Definitions, acronyms and abbreviations
+termsdef: Definitions # not capitalized by MN
+termsdefsymbolsabbrev: Definitions, acronyms, symbols, and abbreviations
+termsdefsymbols: Definitions, acronyms, and symbols
+termsdefabbrev: Definitions, acronyms, and abbreviations
+draft: Draft
+release-candidate: Release Candidate

data/data/pdfa/pdfa.xsl

@@ -301,15 +301,15 @@
 		<fo:block role="P/Title">
 			<!-- Main title of doc -->
 			<fo:block font-size="{$font_size}pt" font-weight="bold" font-style="{$font_style}" role="SKIP">
-				<fo:block role="SKIP"><xsl:apply-templates select="xalan:nodeset($bibdata)//mn:bibdata/mn:title[@type = 'intro' and @language = $curr_lang]/node()"/></fo:block>
+				<fo:block role="SKIP"><xsl:apply-templates select="mn:metanorma/mn:bibdata/mn:title[@type = 'intro' and @language = $curr_lang]/node()"/></fo:block>
 			</fo:block>
 			<!-- Subtitle of doc -->
 			<fo:block font-size="{$font_size - 2}pt" font-style="{$font_style}" role="SKIP">
-				<fo:block role="SKIP"><xsl:apply-templates select="xalan:nodeset($bibdata)//mn:bibdata/mn:title[@type = 'main' and @language = $curr_lang][last()]/node()"/></fo:block>
+				<fo:block role="SKIP"><xsl:apply-templates select="mn:metanorma/mn:bibdata/mn:title[@type = 'main' and @language = $curr_lang][last()]/node()"/></fo:block>
 			</fo:block>
 			<!-- Part title -->
 			<fo:block font-size="{$font_size - 8}pt" font-style="{$font_style}" role="SKIP">
-				<fo:block role="SKIP"><xsl:apply-templates select="xalan:nodeset($bibdata)//mn:bibdata/mn:title[@type = 'part' and @language = $curr_lang]/node()"/></fo:block>
+				<fo:block role="SKIP"><xsl:apply-templates select="mn:metanorma/mn:bibdata/mn:title[@type = 'part' and @language = $curr_lang]/node()"/></fo:block>
 			</fo:block>
 		</fo:block>
 	</xsl:template>
@@ -386,7 +386,10 @@
 			<xsl:variable name="current_document"><xsl:copy-of select="."/></xsl:variable>
 			<xsl:for-each select="xalan:nodeset($current_document)">
 				<mnx:doc num="{$num}">
-					<title><xsl:apply-templates select="mn:metanorma/mn:bibdata/mn:title[@type = 'main'][last()]/node()"/></title>
+					<xsl:variable name="bibdata">
+						<xsl:apply-templates select="mn:metanorma/mn:bibdata" mode="update_xml_enclose_keep-together_within-line"/>
+					</xsl:variable>
+					<title><xsl:apply-templates select="xalan:nodeset($bibdata)/mn:bibdata/mn:title[@type = 'main'][last()]/node()"/></title>
 				</mnx:doc>
 			</xsl:for-each>
 		</xsl:for-each>
@@ -506,11 +509,6 @@
 	<xsl:attribute-set name="refine_term-kind-style"><?extend?>
 		<xsl:attribute name="font-weight">normal</xsl:attribute>
 	</xsl:attribute-set>
-
- <xsl:template name="refine_title-style"><?extend?>
-		<xsl:attribute name="color"><xsl:value-of select="$color_secondary"/></xsl:attribute>
-		<xsl:attribute name="font-weight">normal</xsl:attribute>
-	</xsl:attribute-set>
   
 	<!-- Suppress the boxes with text that appear to the right of preferred / admitted terms -->
 	<xsl:template name="display_term_kind">
@@ -574,15 +572,7 @@
 	<xsl:template name="refine_tt-style"><?extend?>
 		<xsl:attribute name="font-size"><xsl:value-of select="$mono_font-reduction"/></xsl:attribute>
 	</xsl:template>
-	
-	<xsl:template name="refine_list-item-label-style"><?extend?>
-		<xsl:if test="parent::mn:ul">
-			<xsl:attribute name="color"><xsl:value-of select="$color_secondary"/></xsl:attribute>
-			<xsl:copy-of select="@color"/>
-			<xsl:copy-of select="@font-size"/>
-		</xsl:if>
-	</xsl:template>
-	
+		
 	<xsl:template name="refine_sourcecode-style"><?extend?>
 		<xsl:attribute name="font-size">85%</xsl:attribute>
 	</xsl:template>
@@ -658,7 +648,7 @@
 		<xsl:apply-templates/>
 	</xsl:template>
 
-	<xsl:template match="mn:admonition[@type = 'warning']/*/mn:fmt-name']">
+	<xsl:template match="mn:admonition[@type = 'warning']/*/mn:fmt-name">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="color">rgb(255,140,0)</xsl:attribute>		
@@ -916,4 +906,29 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template name="refine_list-item-label-style"><?extend?>
+			<xsl:if test="parent::mn:ul">
+				<xsl:if test="count(ancestor::mn:ul) mod 4 = 1">
+					<xsl:attribute name="font-size">90%</xsl:attribute>
+					<xsl:attribute name="color"><xsl:value-of select="$logo_red"/></xsl:attribute>
+					<xsl:copy-of select="@font-size"/>
+					<xsl:copy-of select="@color"/>
+				</xsl:if>
+				<xsl:if test="count(ancestor::mn:ul) mod 4 = 2">
+					<xsl:attribute name="color"><xsl:value-of select="$logo_blue"/></xsl:attribute>
+					<xsl:copy-of select="@color"/>
+				</xsl:if>
+				<xsl:if test="count(ancestor::mn:ul) mod 4 = 3">
+					<xsl:attribute name="font-size">110%</xsl:attribute>
+					<xsl:attribute name="color"><xsl:value-of select="$logo_green"/></xsl:attribute>
+					<xsl:copy-of select="@font-size"/>
+					<xsl:copy-of select="@color"/>
+				</xsl:if>
+				<xsl:if test="count(ancestor::mn:ul) mod 4 = 0">
+					<xsl:attribute name="color"><xsl:value-of select="$logo_yellow"/></xsl:attribute>
+					<xsl:copy-of select="@color"/>
+				</xsl:if>
+			</xsl:if>
+	</xsl:template>
+
 </xsl:stylesheet>

data/lib/metanorma/taste/base.rb

@@ -145,6 +145,7 @@ module Metanorma
         # Add attributes from different sources
         add_file_based_overrides(override_attrs)
         add_base_configuration_overrides(override_attrs, attrs)
+        add_bibliography_sort_overrides(override_attrs)
         apply_doctype_overrides(attrs, override_attrs)
         apply_stage_overrides(attrs, override_attrs)
         apply_committee_overrides(attrs, override_attrs)
@@ -254,6 +255,19 @@ module Metanorma
         end
       end
 
+      # Emit the publisher bibliography sort order as
+      # :sort-biblio-<abbrev>: <rank>: <name> document attributes, one per
+      # configured publisher. The shared Metanorma::Standoc::Ref sort helpers
+      # read these to override the base flavour's built-in publisher ranking.
+      def add_bibliography_sort_overrides(override_attrs)
+        items = @config.base_override&.bibliography_sort or return
+        items.each do |item|
+          item.abbrev.to_s.empty? and next
+          override_attrs <<
+            ":sort-biblio-#{item.abbrev}: #{item.rank}: #{item.name}"
+        end
+      end
+
       # If config base attribute already appears as a document attribute,
       # and expect it to be additive, add the old value before the config value
       def add_base_configuration_additive(config_key, attr_key, attrs)

data/lib/metanorma/taste/base_override.rb

@@ -3,6 +3,7 @@
 require "lutaml/model"
 require_relative "filename_attributes"
 require_relative "value_attributes"
+require_relative "biblio_sort_item"
 
 module Metanorma
   module Taste
@@ -11,10 +12,12 @@ module Metanorma
     class BaseOverride < Lutaml::Model::Serializable
       attribute :filename_attributes, FilenameAttributes
       attribute :value_attributes, ValueAttributes
+      attribute :bibliography_sort, BiblioSortItem, collection: true
 
       key_value do
         map "filename-attributes", to: :filename_attributes
         map "value-attributes", to: :value_attributes
+        map "bibliography-sort", to: :bibliography_sort
       end
     end
   end

data/lib/metanorma/taste/biblio_sort_item.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Metanorma
+  module Taste
+    # Model for a single publisher bibliography sort-rank entry. A taste lists
+    # these to override the base flavour's built-in publisher sort order for the
+    # bibliography (e.g. OIML ranks OIML ahead of ISO/IEC). Each entry compiles
+    # to a :sort-biblio-<abbrev>: <rank>: <name> document attribute, consumed by
+    # the shared Metanorma::Standoc::Ref sort helpers.
+    class BiblioSortItem < Lutaml::Model::Serializable
+      attribute :abbrev, :string
+      attribute :name, :string
+      attribute :rank, :integer
+
+      key_value do
+        map "abbrev", to: :abbrev
+        map "name", to: :name
+        map "rank", to: :rank
+      end
+    end
+  end
+end

data/lib/metanorma/taste/stage.rb

@@ -15,12 +15,14 @@ module Metanorma
       # @param attrs [Array<String>] The attributes array (modified in place)
       # @param override_attrs [Array<String>] Array to append override attributes to
       def apply_stage_overrides(attrs, override_attrs)
+        add_valid_stages_attribute(override_attrs)
         stage_index = find_stage_attribute_index(attrs)
         stage_index ||= insert_default_stage(attrs)
         return unless stage_index
 
         current_stage = extract_stage_value(attrs[stage_index])
-        stage_config = find_stage_configuration(current_stage)
+        stage_config = find_stage_configuration(current_stage) ||
+          fallback_stage_configuration(current_stage)
         return unless stage_config
 
         # Transform the stage attribute
@@ -30,6 +32,40 @@ module Metanorma
         add_stage_specific_overrides(override_attrs, stage_config)
       end
 
+      # Advertise the base stages this taste can emit, as the
+      # :docstage-valid: document attribute: when a taste defines
+      # stages, its repertoire supersedes the base flavour's for stage
+      # validation (the flavour would otherwise warn about the mapped
+      # base stages as unrecognised).
+      #
+      # @param override_attrs [Array<String>] Array to append override attributes to
+      def add_valid_stages_attribute(override_attrs)
+        bases = @config.stages&.map(&:base)&.compact&.uniq
+        bases.nil? || bases.empty? and return
+        override_attrs << ":docstage-valid: #{bases.join(',')}"
+      end
+
+      # A stage not in the taste's repertoire: the taste's stages
+      # supersede the base flavour's, so warn and fall back to the
+      # taste's default stage (nil if none is flagged default, in which
+      # case the unknown stage passes through unchanged).
+      #
+      # @param current_stage [String] The unrecognised input stage
+      # @return [StageConfig, nil] The default stage configuration
+      def fallback_stage_configuration(current_stage)
+        @config.stages.nil? || @config.stages.empty? and return nil
+        warn_unrecognised_stage(current_stage)
+        @config.stages.detect { |dt| dt.default == "true" }
+      end
+
+      # Kernel#warn, not Metanorma::Util.log: the latter goes to stdout
+      # and only when Metanorma.configuration.logs opts into :warning,
+      # which would silently swallow a validation warning.
+      def warn_unrecognised_stage(stage)
+        warn "[metanorma-taste] WARNING: #{stage} is not a recognised " \
+             "status for taste #{@flavor}; reverting to default stage"
+      end
+
       # Find the index of the stage attribute in the attributes array
       #
       # @param attrs [Array<String>] The attributes array

data/lib/metanorma/taste/version.rb

@@ -2,6 +2,6 @@
 
 module Metanorma
   module Taste
-    VERSION = "1.0.10"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-taste
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
@@ -128,6 +128,7 @@ files:
 - lib/metanorma/taste.rb
 - lib/metanorma/taste/base.rb
 - lib/metanorma/taste/base_override.rb
+- lib/metanorma/taste/biblio_sort_item.rb
 - lib/metanorma/taste/committee.rb
 - lib/metanorma/taste/committee_config.rb
 - lib/metanorma/taste/doctype.rb