metanorma-ribose 2.8.6 → 2.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2571d1ca01b6acf476e35f899955ec7e081f3ea4df7197ea9145bff49f827979
-  data.tar.gz: 6e2ebbb436ad464296d0bc6cf4e4bb4df472ac25d2bb7cea5fc59f3d357debf8
+  metadata.gz: 77aa22f23bce2580656b32140d0f798a346343f7909d374b8d125e0ee0808a5c
+  data.tar.gz: b7f8a1be9b229e045a028793e4bc774b6840e7926616805dd3aa84596f0fbe75
 SHA512:
-  metadata.gz: ed2af4162cf2ba0e7cb9e8242faa6be31dc820921b3d0e3c7e9908354b1c7d996812dce82a53d96f57d4db891f694215d8e6b94e68850dc3abc5ac610fec2a88
-  data.tar.gz: 525a4c589e82c122986564d5d9b11f43fffe0c7fa5358df1e1e6e906d94699422cdb01afc0d40101bcd4f731ff58aecdd4930d5c9191c52314d5b91afe3f07a2
+  metadata.gz: 37b836b133d6db726d9711902ec92505fea0d0de873466b9d7ae7882a7064aa04106edee3c04544072c9e262c30233482ee940398c92603bc1a18798c4833d53
+  data.tar.gz: 871c6504223f35262f071edcdafa7b8144a86485e217dd9cbb979b7ce2c5f685e7cad73fe09cc4dae8962681dfd52314a437bb8a1ec7043fbe2e3cf0562ab8ee

data/.rubocop.yml

@@ -3,8 +3,20 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.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/ribose/html/htmlstyle.css

@@ -593,7 +593,9 @@ main {
     background-color: var(--ribose-primary-color);
     color: white !important;
     cursor: pointer;
-    z-index: 100;
+    left: 0;
+    top: 0;
+    z-index: 103;
   }
   #toggle span {
     text-align: center;
@@ -906,6 +908,10 @@ h3, .h3 {
   font-weight: 100;
 }
 
+span.TermNum {
+  font-weight: bold;
+}
+
 .TermNum, .Terms, .AltTerms {
   color: var(--ribose-primary-color);
 }

data/lib/isodoc/ribose/html/htmlstyle.scss

@@ -253,6 +253,10 @@ h3, .h3 {
   font-weight: 100;
 }
 
+span.TermNum {
+  font-weight: bold;
+}
+
 .TermNum, .Terms, .AltTerms {
   color: var(--ribose-primary-color);
 }

data/lib/isodoc/ribose/ribose.standard.xsl

@@ -255,19 +255,11 @@
 
 					<xsl:call-template name="inner-cover-page"/>
 
-					<!-- ToC pages -->
+					<!-- ToC and boilerplate pages -->
 					<xsl:variable name="toc_and_boilerplate">
-						<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:clause[@type = 'toc']">
+						<xsl:call-template name="toc_and_boilerplate">
 							<xsl:with-param name="num" select="$num"/>
-						</xsl:apply-templates>
-
-						<!-- <xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:copyright-statement"/>
-						
-						<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement"/>
-						
-						<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement"/> -->
-
-						<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/*"/>
+						</xsl:call-template>
 					</xsl:variable>
 
 					<xsl:if test="normalize-space($toc_and_boilerplate) != ''">
@@ -476,6 +468,21 @@
 	<xsl:template name="inner-cover-page">
 	</xsl:template>
 
+	<xsl:template name="toc_and_boilerplate">
+		<xsl:param name="num"/>
+		<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:clause[@type = 'toc']">
+			<xsl:with-param name="num" select="$num"/>
+		</xsl:apply-templates>
+		<fo:block break-after="page"/>
+
+		<!-- <xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:copyright-statement"/>
+		<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement"/>
+		<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement"/> -->
+
+		<fo:block margin-bottom="12pt" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
+		<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/*"/>
+	</xsl:template>
+
 	<xsl:template name="back-page">
 	</xsl:template>
 
@@ -630,18 +637,29 @@
 								</fo:block>
 							</xsl:if>
 
+							<!-- 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:call-template>
+								<fo:block role="TOC">
+									<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:examples/mnx:example">
+										<xsl:call-template name="insertListOf_Item"/>
+									</xsl:for-each>
+								</fo:block>
+							</xsl:if>
+
 						</fo:block-container>
 					</fo:block-container>
 
-					<fo:block break-after="page"/>
 				</xsl:if>
 			</xsl:if>
-			<fo:block margin-bottom="12pt" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="mn:preface/mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
 		<fo:block xsl:use-attribute-sets="toc-title-style">
+			<xsl:call-template name="refine_toc-title-style"/>
 			<!-- <xsl:call-template name="getLocalizedString">
 				<xsl:with-param name="key">table_of_contents</xsl:with-param>
 			</xsl:call-template> -->
@@ -941,34 +959,43 @@
 
 			<fo:inline xsl:use-attribute-sets="term-preferred-style"><xsl:call-template name="refine_term-preferred-style"/><xsl:apply-templates/></fo:inline>
 
-			<xsl:variable name="term_kind">
+			<xsl:call-template name="display_term_kind"/>
+
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template name="display_term_kind">
+		<xsl:call-template name="term_kind"/>
+	</xsl:template>
+
+	<xsl:template name="term_kind">
+		<xsl:variable name="kind" select="substring-after(local-name(), 'fmt-')"/>
+
+		<fo:inline-container text-align="center" width="29mm">
+			<xsl:attribute name="background-color">
 				<xsl:choose>
-					<xsl:when test="self::mn:fmt-deprecates">
-						<xsl:call-template name="getLocalizedString">
-							<xsl:with-param name="key">deprecated</xsl:with-param>
-						</xsl:call-template>
-					</xsl:when>
-					<xsl:otherwise><xsl:value-of select="substring-after(local-name(), 'fmt-')"/></xsl:otherwise>
+					<xsl:when test="$kind = 'preferred'">rgb(255, 240, 198)</xsl:when>
+					<xsl:when test="$kind = 'deprecates'">rgb(252, 221, 194)</xsl:when>
+					<xsl:when test="$kind = 'admitted'">rgb(208, 223, 239)</xsl:when>
 				</xsl:choose>
-			</xsl:variable>
-			<xsl:variable name="kind" select="local-name()"/>
-
-			<fo:inline-container text-align="center" width="29mm">
-				<xsl:attribute name="background-color">
+			</xsl:attribute>
+			<fo:block padding-top="1mm" padding-bottom="0.5mm">
+				<fo:inline xsl:use-attribute-sets="term-kind-style">
+					<xsl:call-template name="refine_term-kind-style"/>
+					<xsl:variable name="term_kind_display">
 					<xsl:choose>
-						<xsl:when test="$kind = 'fmt-preferred'">rgb(255, 240, 198)</xsl:when>
-						<xsl:when test="$kind = 'fmt-deprecates'">rgb(252, 221, 194)</xsl:when>
-						<xsl:when test="$kind = 'fmt-admitted'">rgb(208, 223, 239)</xsl:when>
+						<xsl:when test="self::mn:fmt-deprecates">
+							<xsl:call-template name="getLocalizedString">
+								<xsl:with-param name="key">deprecated</xsl:with-param>
+							</xsl:call-template>
+						</xsl:when>
+						<xsl:otherwise><xsl:value-of select="substring-after(local-name(), 'fmt-')"/></xsl:otherwise>
 					</xsl:choose>
-				</xsl:attribute>
-				<fo:block padding-top="1mm" padding-bottom="0.5mm">
-					<fo:inline xsl:use-attribute-sets="term-kind-style">
-						<xsl:call-template name="refine_term-kind-style"/>
-						<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($term_kind))"/>
-					</fo:inline>
-				</fo:block>
-			</fo:inline-container>
-		</fo:block>
+				</xsl:variable>
+					<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($term_kind_display))"/>
+				</fo:inline>
+			</fo:block>
+		</fo:inline-container>
 	</xsl:template>
 
 	<xsl:template match="mn:references[not(@normative='true')]" priority="3">
@@ -1479,6 +1506,16 @@
 		</xsl:if>
 	</xsl:variable>
 
+	<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>
+
 	<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"/>
@@ -2357,6 +2394,14 @@
 
 	<xsl:template match="@semx-id | @anchor" mode="update_xml_step1"/>
 
+	<xsl:template match="mn:pagebreak" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
+			<xsl:attribute name="from_source_xml">true</xsl:attribute>
+			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- END: update new Presentation XML -->
 
 	<!-- =========================================================================== -->
@@ -2394,6 +2439,7 @@
 			<xsl:for-each select="ancestor-or-self::*[ancestor::mn:preface or ancestor::mn:sections or ancestor-or-self::mn:annex]">
 				<xsl:if test="following-sibling::*">false</xsl:if>
 			</xsl:for-each>
+			<xsl:if test="@from_source_xml = 'true'">false</xsl:if>
 		</xsl:variable>
 
 		<xsl:if test="contains($isLast, 'false')">
@@ -3308,7 +3354,8 @@
 		<xsl:attribute name="line-height">113%</xsl:attribute>
 	</xsl:attribute-set> <!-- sourcecode-style -->
 
-	<xsl:template name="refine_sourcecode-style"> <!-- background for image -->
+	<xsl:template name="refine_sourcecode-style">
+		<xsl:call-template name="setKeepAttributes"/> <!-- background for image -->
 		<xsl:if test="starts-with((mn:fmt-name//text())[1], 'Figure ')">
 			<xsl:attribute name="background-color">rgb(236,242,246)</xsl:attribute>
 			<xsl:attribute name="padding-left">11mm</xsl:attribute>
@@ -4083,10 +4130,38 @@
 	<xsl:template name="refine_strike-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="hr-block-style">
+		<xsl:attribute name="font-size">1pt</xsl:attribute>
+		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+		<xsl:attribute name="padding-top">-2pt</xsl:attribute>
+		<xsl:attribute name="space-after">4pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_hr-block-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="hr-style">
+		<xsl:attribute name="leader-pattern">rule</xsl:attribute>
+		<xsl:attribute name="leader-length">100%</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_hr-style">
+	</xsl:template>
+
 	<xsl:template match="mn:br">
 		<xsl:value-of select="$linebreak"/>
 	</xsl:template>
 
+	<xsl:template match="mn:hr">
+		<fo:block xsl:use-attribute-sets="hr-block-style">
+			<xsl:call-template name="refine_hr-block-style"/>
+			<fo:leader xsl:use-attribute-sets="hr-style">
+				<xsl:call-template name="refine_hr-style"/>
+			</fo:leader>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="mn:em">
 		<fo:inline xsl:use-attribute-sets="em-style">
 			<xsl:call-template name="refine_em_style"/>
@@ -5348,6 +5423,7 @@
 	     text line 1
 			 text line 2
 	-->
+	<xsl:variable name="example_display_in"><!-- don't change here, only for override xsl --></xsl:variable> <!-- block or inline -->
 	<xsl:template match="mn:example" name="example">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
@@ -5357,7 +5433,8 @@
 			<xsl:call-template name="refine_example-style"/>
 
 			<xsl:variable name="fo_element">
-				<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>inline
+				<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>
+				<xsl:if test="normalize-space($example_display_in) != ''"><xsl:value-of select="$example_display_in"/></xsl:if>inline
 			</xsl:variable>
 
 			<fo:block-container margin-left="0mm" role="SKIP">
@@ -6919,6 +6996,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_)"/>
@@ -6962,6 +7045,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>
@@ -9132,11 +9220,27 @@
 	<!-- ====== -->
 	<!-- ====== -->
 
-	<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="margin-top">12pt</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		<xsl:attribute name="margin-left">13mm</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 name="margin-top">12pt</xsl:attribute>
+
 	</xsl:attribute-set> <!-- quote-style -->
 
 	<xsl:template name="refine_quote-style">
@@ -9144,7 +9248,8 @@
 
 	<xsl:attribute-set name="quote-source-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
-		<xsl:attribute name="margin-right">25mm</xsl:attribute>
+		<xsl:attribute name="margin-right">-12mm</xsl:attribute>
+		<xsl:attribute name="margin-right">13mm</xsl:attribute>
 	</xsl:attribute-set> <!-- quote-source-style -->
 
 	<xsl:template name="refine_quote-source-style">
@@ -9167,12 +9272,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"/>
@@ -9184,14 +9286,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>
@@ -12798,7 +12902,7 @@
 	<xsl:template name="refine_toc-pagenumber-style">
 	</xsl:template>
 
-	<!-- List of Figures, Tables -->
+	<!-- List of Figures, Tables, Examples -->
 	<xsl:attribute-set name="toc-listof-title-style">
 		<!-- <xsl:attribute name="font-size">13pt</xsl:attribute> -->
 		<xsl:attribute name="role">H2</xsl:attribute> <!-- TOCI -->
@@ -12906,6 +13010,9 @@
 		<xsl:if test="(//mn:metanorma/mn:metanorma-extension/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:call-template name="processExamples_Contents"/>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template name="processTables_Contents">
@@ -12952,7 +13059,29 @@
 		</mnx:figures>
 	</xsl:template>
 
-	<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name |                mn:table/mn:name | mnx:table/mn:name |               mn:permission/mn:name | mnx:permission/mn:name |               mn:recommendation/mn:name | mnx:recommendation/mn:name |               mn:requirement/mn:name | mnx:requirement/mn:name" mode="contents">
+	<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>
+		</mnx:examples>
+	</xsl:template>
+
+	<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name |                mn:table/mn:name | mnx:table/mn:name |               mn:example/mn:name | mnx:example/mn:name |               mn:permission/mn:name | mnx:permission/mn:name |               mn:recommendation/mn:name | mnx:recommendation/mn:name |               mn:requirement/mn:name | mnx:requirement/mn:name" mode="contents">
 		<xsl:if test="not(following-sibling::*[1][self::mn:fmt-name])">
 			<xsl:apply-templates mode="contents"/>
 			<xsl:text> </xsl:text>
@@ -12961,40 +13090,40 @@
 
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="contents"/>
 
-	<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name |               mn:table/mn:fmt-name | mnx:table/mn:fmt-name |               mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name |               mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name |               mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
+	<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name |               mn:table/mn:fmt-name | mnx:table/mn:fmt-name |               mn:example/mn:fmt-name | mnx:example/mn:fmt-name |               mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name |               mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name |               mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
-	<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name |                mn:table/mn:name | mnx:table/mn:name |               mn:permission/mn:name | mnx:permission/mn:name |               mn:recommendation/mn:name | mnx:recommendation/mn:name |               mn:requirement/mn:name | mnx:requirement/mn:name |               mn:sourcecode/mn:name" mode="bookmarks">
+	<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name |                mn:table/mn:name | mnx:table/mn:name |               mn:example/mn:name | mnx:example/mn:name |               mn:permission/mn:name | mnx:permission/mn:name |               mn:recommendation/mn:name | mnx:recommendation/mn:name |               mn:requirement/mn:name | mnx:requirement/mn:name |               mn:sourcecode/mn:name" mode="bookmarks">
 		<xsl:if test="not(following-sibling::*[1][self::mn:fmt-name])">
 			<xsl:apply-templates mode="bookmarks"/>
 			<xsl:text> </xsl:text>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name |                mn:table/mn:fmt-name | mnx:table/mn:fmt-name |                mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name |                mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name |                mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name |                mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
+	<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name |                mn:table/mn:fmt-name | mnx:table/mn:fmt-name |                mn:example/mn:fmt-name | mnx:example/mn:fmt-name |                mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name |                mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name |                mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name |                mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
-	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:name/text() |    *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:name/text()" mode="contents" priority="2">
+	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:name/text() |    *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:name/text()" mode="contents" priority="2">
 		<xsl:if test="not(../following-sibling::*[1][self::mn:fmt-name])">
 			<xsl:value-of select="."/>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() |   *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
+	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() |   *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template>
 
-	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:name//text() |    *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:name//text()" mode="bookmarks" priority="2">
+	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:name//text() |    *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:name//text()" mode="bookmarks" priority="2">
 		<xsl:if test="not(../following-sibling::*[1][self::mn:fmt-name])">
 			<xsl:value-of select="."/>
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() |    *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
+	<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() |    *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template>
 
@@ -13227,6 +13356,11 @@
 											<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="lang" select="@lang"/>
+										</xsl:call-template>
+
 									</fo:bookmark>
 
 								</xsl:for-each>
@@ -13245,6 +13379,11 @@
 										<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="lang" select="@lang"/>
+									</xsl:call-template>
+
 								</xsl:for-each>
 							</xsl:otherwise>
 						</xsl:choose>
@@ -13261,6 +13400,11 @@
 							<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="lang" select="@lang"/>
+						</xsl:call-template>
+
 					</xsl:otherwise>
 				</xsl:choose>
 
@@ -13341,6 +13485,46 @@
 			</fo:bookmark>
 		</xsl:if>
 	</xsl:template> <!-- insertTableBookmarks -->
+
+		<xsl:template name="insertExampleBookmarks">
+		<xsl:param name="contents"/>
+		<xsl:param name="lang"/>
+		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
+		<xsl:if test="$contents_nodes/mnx:example">
+			<fo:bookmark internal-destination="{$contents_nodes/mnx:example[1]/@id}" starting-state="hide">
+				<fo:bookmark-title>
+					<xsl:choose>
+						<xsl:when test="$lang = 'fr'">Exemples</xsl:when>
+						<xsl:otherwise>Examples</xsl:otherwise>
+					</xsl:choose>
+				</fo:bookmark-title>
+				<xsl:for-each select="$contents_nodes/mnx:example">
+					<fo:bookmark internal-destination="{@id}">
+						<fo:bookmark-title>
+							<xsl:value-of select="normalize-space(mnx:title)"/>
+						</fo:bookmark-title>
+					</fo:bookmark>
+				</xsl:for-each>
+			</fo:bookmark>
+		</xsl:if>
+		<xsl:if test="$contents_nodes//mnx:examples/mnx:example">
+			<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
+
+				<xsl:variable name="bookmark-title">
+							<xsl:value-of select="$title-list-examples"/>
+				</xsl:variable>
+
+				<fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
+
+				<xsl:for-each select="$contents_nodes//mnx:examples/mnx:example">
+					<fo:bookmark internal-destination="{@id}">
+						<!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
+						<fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
+					</fo:bookmark>
+				</xsl:for-each>
+			</fo:bookmark>
+		</xsl:if>
+	</xsl:template> <!-- insertExampleBookmarks -->
 	<!-- End Bookmarks -->
 
 	<!-- ============================ -->
@@ -14318,6 +14502,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>