metanorma-ieee 1.6.13 → 1.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 040d8a4d5f82f4885d3c664a2e578d1fe09779d9d9d859b99ddb6c255063fc1b
-  data.tar.gz: 85f374a9a188ac0c19b20aff633689cd73bccb8d11b87fef93ab7f789f6de18a
+  metadata.gz: ddb0a44ce950881c6419e32522921aa3eeeac3eddd44034241ed38dc76b16780
+  data.tar.gz: d97a19b2f181e37d71ef878dcb6166e90e277c35f119a826a9d87f5473e0f1f6
 SHA512:
-  metadata.gz: 4b55c48a11df1184e7862227459744e16eeb255b25b5f8d35cddf5833d7c19fa93b814a2f16291d90d7f10426f9d90485bd2891a84bd7f91ce22e04e36d338e8
-  data.tar.gz: dde948124ac484a17882783a1504bc14f2f0fb15d549c90ebd9e313298a9bdfe460d0d64b7040717ef499462a00b586c16201071d54439a371ed277cdbcd3039
+  metadata.gz: 898d9b571436c42dae6ab55cf802d704ebc14952c556f9d5964d8482b6a3bf0bfb4902c9e321a7b68ad20723e6288244e1cdc21d7ece6e86f2b2e957d6d4718a
+  data.tar.gz: 7c773c727f88c1222014e8665ae665d1b02c725518083cb16a7aa2137b38702ffb3718b38c2f44e95e562813403ee008efcb43fb4c82ad1080cb854a87de1d60

data/.rubocop.yml

@@ -2,9 +2,30 @@
 # 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
+# per-repo. Per ronaldtse feedback on metanorma/ci#332.
+plugins:
+  - rubocop-rspec
+  - rubocop-performance
+  - rubocop-rake
 
 # local repo-specific modifications
 # ...
 
 AllCops:
-  TargetRubyVersion: 3.4
+  # 3.3 matches the org-wide minimum being pushed via #274 (Raise minimum
+  # Ruby version to 3.3 due to EOL of 3.2 on 2026-03-31). Was 3.4 before
+  # this commit — 3.4 was above the org's stated minimum and would have
+  # applied Rubocop rules that fail-close on gems still targeting 3.3.
+  TargetRubyVersion: 3.3

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

@@ -150,6 +150,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/ieee/ieee.amendment.xsl

@@ -1449,33 +1449,33 @@
 							</xsl:choose>
 
 							<!-- List of Tables -->
-							<xsl:for-each select="$contents//mnx:tables/mnx:table">
+							<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:tables/mnx:table">
 								<xsl:if test="position() = 1">
 									<!-- <fo:block break-after="page"/> -->
 									<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"/>
 							</xsl:for-each>
 
 							<!-- List of Figures -->
-							<xsl:for-each select="$contents//mnx:figures/mnx:figure">
+							<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:figures/mnx:figure">
 								<xsl:if test="position() = 1">
 									<!-- <fo:block break-after="page"/> -->
 									<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"/>
 							</xsl:for-each>
 
 							<!-- List of Examples -->
-							<xsl:for-each select="$contents//mnx:examples/mnx:example">
+							<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:examples/mnx:example">
 								<xsl:if test="position() = 1">
 									<!-- <fo:block break-after="page"/> -->
 									<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"/>
@@ -2173,7 +2173,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 font-weight="normal" leader-pattern="dots"/>
 										<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
@@ -2204,7 +2208,7 @@
 
 	</xsl:template>
 
-	<xsl:template match="mnx:figures/mnx:figure/mn:fmt-name/text()[1] |         mnx:tables/mnx:table/mn:fmt-name/text()[1]" mode="contents" priority="3">
+	<xsl:template match="mnx:figures/mnx:figure/mn:fmt-name/text()[1] |         mnx:tables/mnx:table/mn:fmt-name/text()[1]" mode="contents_item" priority="3">
 		<xsl:choose>
 			<xsl:when test="$current_template = 'standard' and contains(.,'—')"><xsl:value-of select="substring-after(.,'—')"/></xsl:when>
 			<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
@@ -3901,45 +3905,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"/>
@@ -4714,7 +4732,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>
 
@@ -5100,7 +5118,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(..)"/>
 
@@ -5145,7 +5163,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__"/> -->
@@ -5223,6 +5241,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"/>
@@ -9478,6 +9500,12 @@
 					<style name="{$key}-left"><xsl:value-of select="$value"/></style>
 					<style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
 				</xsl:if>
+				<xsl:if test="$key = 'page-break-inside' and $value = 'avoid'">
+					<style name="keep-together.within-page">always</style>
+				</xsl:if>
+				<xsl:if test="$key = 'page-break-after' and $value = 'always'">
+					<style name="break-after">page</style>
+				</xsl:if>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -9521,6 +9549,11 @@
 
 			<fo:block role="SKIP">
 
+				<xsl:variable name="styles">
+					<styles><xsl:call-template name="setTableStyles"/></styles>
+				</xsl:variable>
+				<xsl:copy-of select="xalan:nodeset($styles)/styles/@break-after"/>
+
 				<xsl:if test="$isGenerateTableIF = 'true'">
 					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
 				</xsl:if>
@@ -11682,9 +11715,25 @@
 	<!-- ====== -->
 	<!-- ====== -->
 
-	<xsl:attribute-set name="quote-style">
+	<xsl:attribute-set name="quote-container-style">
 		<xsl:attribute name="margin-left">12mm</xsl:attribute>
 		<xsl:attribute name="margin-right">12mm</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_quote-container-style">
+		<xsl:if test="parent::mn:note">
+			<xsl:if test="not(ancestor::mn:table)">
+				<xsl:attribute name="margin-left">5mm</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:attribute-set name="quote-style">
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
+
 	</xsl:attribute-set> <!-- quote-style -->
 
 	<xsl:template name="refine_quote-style">
@@ -11692,6 +11741,7 @@
 
 	<xsl:attribute-set name="quote-source-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
+		<xsl:attribute name="margin-right">-12mm</xsl:attribute>
 	</xsl:attribute-set> <!-- quote-source-style -->
 
 	<xsl:template name="refine_quote-source-style">
@@ -11714,12 +11764,9 @@
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
-			<xsl:if test="parent::mn:note">
-				<xsl:if test="not(ancestor::mn:table)">
-					<xsl:attribute name="margin-left">5mm</xsl:attribute>
-				</xsl:if>
-			</xsl:if>
-			<fo:block-container margin-left="0mm" role="SKIP">
+			<fo:block-container xsl:use-attribute-sets="quote-container-style">
+				<xsl:call-template name="refine_quote-container-style"/>
+
 				<fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
 
 					<xsl:call-template name="refine_quote-style"/>
@@ -11731,14 +11778,16 @@
 					</fo:block-container>
 				</fo:block-container>
 				<xsl:if test="mn:author or mn:fmt-source or mn:attribution">
-					<fo:block xsl:use-attribute-sets="quote-source-style">
-						<xsl:call-template name="refine_quote-source-style"/>
-						<!-- — ISO, ISO 7301:2011, Clause 1 -->
-						<xsl:apply-templates select="mn:author"/>
-						<xsl:apply-templates select="mn:fmt-source"/>
-						<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
-						<xsl:apply-templates select="mn:attribution/mn:p/node()"/>
-					</fo:block>
+					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+						<fo:block xsl:use-attribute-sets="quote-source-style">
+							<xsl:call-template name="refine_quote-source-style"/>
+							<!-- — ISO, ISO 7301:2011, Clause 1 -->
+							<xsl:apply-templates select="mn:author"/>
+							<xsl:apply-templates select="mn:fmt-source"/>
+							<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
+							<xsl:apply-templates select="mn:attribution/mn:p/node()"/>
+						</fo:block>
+					</fo:block-container>
 				</xsl:if>
 
 			</fo:block-container>
@@ -12535,6 +12584,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>
@@ -12749,7 +12799,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>
@@ -15432,13 +15482,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>
@@ -15489,22 +15539,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>
@@ -15777,15 +15827,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>
 
@@ -15800,15 +15853,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>
 
@@ -15821,15 +15877,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>
 
@@ -15845,6 +15904,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">
@@ -15862,7 +15922,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">
@@ -15876,6 +15936,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">
@@ -15899,7 +15960,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>
@@ -15914,8 +15975,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">
@@ -15939,7 +16001,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>
@@ -16100,6 +16162,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="."/>
@@ -17034,6 +17108,10 @@
 		<fo:block break-after="page"/>
 	</xsl:template>
 
+	<xsl:template match="mn:pagebreak[ancestor::mn:table]" priority="2">
+		<fo:block break-after="page"/>
+	</xsl:template>
+
 	<xsl:variable name="font_main_root_style">
 		<root-style xsl:use-attribute-sets="root-style">
 		</root-style>