metanorma-bipm 2.8.10 → 2.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d48ce68eca58a03f89efa3ec9786cc63c8d2bdf553c1170c95bebd928827783f
-  data.tar.gz: 55a48fc7d328cc604b37921872fe69175b58d0934dddde9d3699a15e3f999730
+  metadata.gz: c8cace5f622ac07370af170dffc8f8805ba518f96656928c189f1f664e0696df
+  data.tar.gz: 8ec8533476e550db921c7980b6824e261ede18831b929b81d9a5572837958ef7
 SHA512:
-  metadata.gz: 2e1f1063ca440c5b0c0e16997e97dc67c32443c0e6658df28f8b374e946b9f78b6ea52e1ca3389fe52daeffc92f55ebdea253e385e7583ad40bb83512e60f0c6
-  data.tar.gz: 8d5d4fe4b9b422b5b92d5d79492f6a1e0afd02ed634e284ef257c20448fab220f23ea9d85c78b07fc30637f198e15015a6babde9382ad0c9a778de4d0d87124e
+  metadata.gz: e1f225138b83840c80db446bb0508e6e0363e8b4f2278ffc541b2d06c83026e28e5fe2f92dff5729bf72c7e439e488b4fa36f0f45ad7d49c097aea0c39a07844
+  data.tar.gz: 5da4df7467f48769b214f7284e36c1fb3322cfa93577bbfde6e0e94d52fffc58bb196dc37744264d5284985f0427157a828225809aa287ad13d927aee53e914b

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/lib/isodoc/bipm/bipm.brochure.xsl

@@ -41,7 +41,7 @@
 								<xsl:variable name="docid">
 									<xsl:call-template name="getDocumentId"/>
 								</xsl:variable>
-								<mnx:doc id="{$docid}" lang="{$lang}" doctype="{$doctype}" title-part="{$title-part}">
+								<mnx:doc id="{$docid}" lang="{$lang}" doctype="{$doctype}" title-part="{$title-part}" num="{$num}">
 									<xsl:call-template name="generateContents"/>
 								</mnx:doc>
 							</xsl:for-each>
@@ -58,7 +58,7 @@
 								<xsl:variable name="docid">
 									<xsl:call-template name="getDocumentId"/>
 								</xsl:variable>
-								<mnx:doc id="{$docid}" lang="{$lang}">
+								<mnx:doc id="{$docid}" lang="{$lang}" num="{$num}">
 									<xsl:call-template name="generateContents"/>
 								</mnx:doc>
 							</xsl:for-each>
@@ -71,7 +71,8 @@
 				<xsl:variable name="docid">
 					<xsl:call-template name="getDocumentId"/>
 				</xsl:variable>
-				<mnx:doc id="{$docid}" lang="{$lang}">
+				<xsl:variable name="num"><xsl:number level="any" count="mn:metanorma"/></xsl:variable>
+				<mnx:doc id="{$docid}" lang="{$lang}" num="{$num}">
 					<xsl:call-template name="generateContents"/>
 				</mnx:doc>
 			</xsl:otherwise>
@@ -1936,6 +1937,7 @@
 									</fo:table-cell>
 								</fo:table-row>
 							</xsl:if> -->
+							<xsl:variable name="num" select="$contents/mnx:doc[@id = $docid]/@num"/>
 							<xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:item[@display='true' and (@type = 'annex')]"> <!--  or (@level = 2 and @parent = 'annex') -->
 								<xsl:call-template name="insertContentItem">
 									<xsl:with-param name="keep-with-next">true</xsl:with-param>
@@ -1949,7 +1951,7 @@
 							<xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:tables/mnx:table">
 								<xsl:if test="position() = 1">
 									<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>
 								</xsl:if>
 								<xsl:call-template name="insertListOf_Item"/>
@@ -1959,7 +1961,7 @@
 							<xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:figures/mnx:figure">
 								<xsl:if test="position() = 1">
 									<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>
 								</xsl:if>
 								<xsl:call-template name="insertListOf_Item"/>
@@ -1969,7 +1971,7 @@
 							<xsl:for-each select="$contents/mnx:doc[@id = $docid]//mnx:examples/mnx:example">
 								<xsl:if test="position() = 1">
 									<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>
 								</xsl:if>
 								<xsl:call-template name="insertListOf_Item"/>
@@ -2103,7 +2105,11 @@
 											<xsl:with-param name="value" select="@alt-text"/>
 										</xsl:call-template>
 										<fo:inline>
-											<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>
 									</fo:basic-link>
 								</fo:block>
@@ -3948,45 +3954,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"/>
@@ -4760,7 +4780,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>
 
@@ -5043,7 +5063,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(..)"/>
 
@@ -5088,7 +5108,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__"/> -->
@@ -5166,6 +5186,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"/>
@@ -12494,6 +12518,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>
@@ -12708,7 +12733,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>
@@ -15347,13 +15372,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>
@@ -15404,22 +15429,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>
@@ -15692,15 +15717,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>
 
@@ -15715,15 +15743,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>
 
@@ -15736,15 +15767,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>
 
@@ -15760,6 +15794,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">
@@ -15777,7 +15812,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">
@@ -15791,6 +15826,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">
@@ -15814,7 +15850,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>
@@ -15829,8 +15865,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">
@@ -15854,7 +15891,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>
@@ -16027,6 +16064,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="."/>