metanorma-ogc 2.9.9 → 2.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 142079bd041b8a880cfb119263cc299b80dcb1caa59656447848113cb67dfd92
-  data.tar.gz: '092ca544076a820250f758b93918f734cb555ac2bf7ec98abe9caaa45f8e7b41'
+  metadata.gz: e08e7cb459d12485f89db319854ae6a94bac1abad1d52f7ba1ed7e3597c32745
+  data.tar.gz: 4f61478dec1ec9b00be6ca94caeb43fbf08f3de93e514b76a5307c712f4d824a
 SHA512:
-  metadata.gz: 3041ccc81ac6053f9010e9fab4788da0a199980ebd0e3fab6be800c51b0d2153df7386af5eb1ec7730835dfc705425fa4a297b90d6d1bf1e6cc1ec34fffb11f6
-  data.tar.gz: 8a2e8df76396229db1556271de5fc752910e31cd56057b8e20ea71aca003bc4e388956cced0b7b6a46b2f2aa1bf42b2a4ead63affaff86c4bd9f3f99becf22e2
+  metadata.gz: 9a1cb4bcb4e5fb52a1b5c14eb6b4068980f12c59e9fd147dc9b66cdc66c4ab55e3a637a1a814711b6ec04c9a48bdd6b966b043a19b149fc2367122c313957350
+  data.tar.gz: 78e3ca0324082f56c695e00680c308df4898701727f0ddbe54f73b59fb7e0c17cbc8cb3bb1562fd57c2e6539c62d1ac491df6481f8defa5c72d8d316e0b31673

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/ogc/html/html_ogc_titlepage.html

@@ -52,6 +52,8 @@
       <span class="label">Submission Date: </span> <span class="value">{{ receiveddate }}</span>
       <span class="label">Approval Date: </span> <span class="value">{{ issueddate }}</span>
       <span class="label">Publication Date: </span> <span class="value">{{ publisheddate }}</span>
+      {% assign doi = bibdata.docidentifier | where: "type", "DOI" | first %}
+      {% if doi %}<span class="label">DOI: <span class="docnumber value">{{ doi.content }}</span></span>{% endif %}
       <span class="label">External identifier of this OGC® document: <span class="docnumber value">{{ externalid }}</span></span>
       <span class="label">Internal identifier of this OGC® document: <span class="docnumber value">{{ docnumber }}</span></span>
       {% if url or html %}

data/lib/isodoc/ogc/html/htmlstyle.css

@@ -143,6 +143,11 @@ a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;
 }
 
+a.TableFootnoteRef, a.FootnoteRef, a.footnote-number,
+sup a, a:has(> sup) {
+  vertical-align: baseline;
+}
+
 .addition {
   color: blue;
 }

data/lib/isodoc/ogc/ogc.standard.xsl

@@ -196,7 +196,7 @@
 			<xsl:for-each select="xalan:nodeset($current_document)">
 				<mnx:doc num="{$num}">
 
-					<xsl:if test="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='recommendation']/mn:title">
+					<xsl:if test="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='recommendation']/mn:title">
 						<xsl:for-each select="//mn:table[.//mn:p[@class = 'RecommendationTitle']]">
 							<xsl:variable name="table_id" select="@id"/>
 							<recommendation alt-text="{.//mn:p[@class = 'RecommendationTitle'][1]}">
@@ -372,7 +372,7 @@
 						<xsl:if test="$contents//mnx:tables/mnx:table">
 							<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
 								<fo:bookmark-title>
-									<xsl:value-of select="$title-list-tables"/>
+									<xsl:value-of select="$toc_title_lists/mnx:doc[@num = 1]/mnx:title-list-tables"/>
 								</fo:bookmark-title>
 								<xsl:for-each select="$contents//mnx:tables/mnx:table">
 									<fo:bookmark internal-destination="{@id}">
@@ -388,7 +388,7 @@
 						<xsl:if test="$contents//mnx:figures/mnx:figure">
 							<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
 								<fo:bookmark-title>
-									<xsl:value-of select="$title-list-figures"/>
+									<xsl:value-of select="$toc_title_lists/mnx:doc[@num = 1]/mnx:title-list-figures"/>
 								</fo:bookmark-title>
 								<xsl:for-each select="$contents//mnx:figures/mnx:figure">
 									<fo:bookmark internal-destination="{@id}">
@@ -404,7 +404,7 @@
 						<xsl:if test="$contents//mnx:examples/mnx:example">
 							<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
 								<fo:bookmark-title>
-									<xsl:value-of select="$title-list-examples"/>
+									<xsl:value-of select="$toc_title_lists/mnx:doc[@num = 1]/mnx:title-list-examples"/>
 								</fo:bookmark-title>
 								<xsl:for-each select="$contents//mnx:examples/mnx:example">
 									<fo:bookmark internal-destination="{@id}">
@@ -420,7 +420,7 @@
 						<xsl:if test="$toc_recommendations//*[normalize-space(@id) != '']">
 							<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
 								<fo:bookmark-title>
-									<xsl:value-of select="$title-list-recommendations"/>
+									<xsl:value-of select="$toc_title_lists/mnx:doc[@num = 1]/mnx:title-list-recommendations"/>
 								</fo:bookmark-title>
 								<xsl:for-each select="$toc_recommendations//*[normalize-space(@id) != '']">
 									<fo:bookmark internal-destination="{@id}">
@@ -977,7 +977,11 @@
 					<xsl:with-param name="value" select="@alt-text"/>
 				</xsl:call-template>
 				<!-- <xsl:copy-of select="node()"/> -->
-				<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:page-number-citation ref-id="{@id}"/>
@@ -1073,7 +1077,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-container line-height="130%" role="TOC">
 						<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:tables/mnx:table">
@@ -1085,7 +1089,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-container line-height="130%" role="TOC">
 						<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:figures/mnx:figure">
@@ -1097,7 +1101,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-container line-height="130%" role="TOC">
 						<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:examples/mnx:example">
@@ -1111,7 +1115,7 @@
 				<!-- List of Recommendations -->
 				<xsl:if test="$toc_recommendations/mnx:doc[@num = $num]/*[normalize-space(@id) != '']">
 					<xsl:call-template name="insertListOf_Title">
-						<xsl:with-param name="title" select="$title-list-recommendations"/>
+						<xsl:with-param name="title" select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-recommendations"/>
 					</xsl:call-template>
 					<fo:block-container line-height="130%" role="TOC">
 						<xsl:for-each select="$toc_recommendations/mnx:doc[@num = $num]/*[normalize-space(@id) != '']">
@@ -2310,45 +2314,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"/>
@@ -3140,7 +3158,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>
 
@@ -3423,7 +3441,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(..)"/>
 
@@ -3468,7 +3486,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__"/> -->
@@ -3546,6 +3564,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"/>
@@ -10983,6 +11005,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>
@@ -11197,7 +11220,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>
@@ -13818,13 +13841,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>
@@ -13875,22 +13898,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>
@@ -14163,15 +14186,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>
 
@@ -14186,15 +14212,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>
 
@@ -14207,15 +14236,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>
 
@@ -14231,6 +14263,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">
@@ -14248,6 +14281,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">
@@ -14269,8 +14303,9 @@
 		</xsl:if><!-- see template addBookmarks -->
 	</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">
@@ -14438,6 +14473,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="."/>