metanorma-bipm 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a1ef96d5f6cd34d377978917795f2315a03d3dc22cfa8b6eb931f91779c73b9
-  data.tar.gz: e4eb34b75c7e6fb39f4fc0c8c3a98d3215d7937485412181075f2be34bf1d9e3
+  metadata.gz: 205fd9f76c51e56ca1a9ad226a3826c6d1d53223e67f2c4eb2328b845c8f6c7f
+  data.tar.gz: 240426d2487d51cdb00864a1d47e73d2265eab2d921aad53ce30f2cb9510de61
 SHA512:
-  metadata.gz: 03b290c2727ecd5dd098f659ba3b651d464ca2c283080e9a28debb859f11b152910dbfa5cd256ce3f86fcf8f6569eb40ccf5bfb24b0d1e456d50ae15d7e0f019
-  data.tar.gz: 941016b0572027edcb82228d5e3b33a1b6de0b7ff8db2e0fd548eb26f887c9b8450271c11503134b4cb336702e9423c534d8ae6f22f6543a0d7424f986a9b23d
+  metadata.gz: 9ef9e81c0c40b06723046ccbebfc660f7154811a487e365bc1993d8ee350c1c67390b07aa0b595d125fdd2a82db25bb5d51e7644fadbec5960ead34cf829dab2
+  data.tar.gz: 4d456540b3e439e459456151d7053874a6b94dd352cbc9d19bf2370cfddbd824e88b292835a71c2b7a90a1bb04caf10ed463d89c81f3dcf434bf8ef1f00cd85c

data/lib/isodoc/bipm/base_convert.rb

@@ -52,6 +52,10 @@ module IsoDoc
         else super
         end
       end
+
+      def table_footnote?(node)
+        super && !node.ancestors.map(&:name).include?("quote")
+      end
     end
   end
 end

data/lib/isodoc/bipm/bipm.brochure.xsl

@@ -617,6 +617,8 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'clause']/*[local-name() = 'fmt-footnote-container']" priority="3" mode="update_xml_pres"/>
+
 	<!-- ================================= -->
 	<!-- Flattening xml for fit notes at page sides (margins) -->
 	<!-- ================================= -->
@@ -714,6 +716,8 @@
 			<xsl:if test="local-name() = 'title' and @depth = 3 and       ../bipm:clause/bipm:title/@depth = 4 and count(following-sibling::*[1][local-name() = 'note']) &gt; 0">
 				<!-- then move here footnotes from clause level 4 -->
 				<xsl:for-each select="../bipm:clause//bipm:fn[ancestor::bipm:quote or not(ancestor::bipm:table)]">
+					<!-- <debug><xsl:for-each select="ancestor::*"><xsl:value-of select="local-name()"/>@<xsl:value-of select="@id"/><xsl:text>/</xsl:text></xsl:for-each>
+					</debug> -->
 					<xsl:call-template name="fn_to_note_side"/>
 				</xsl:for-each>
 			</xsl:if>
@@ -798,51 +802,17 @@
 	<xsl:template match="bipm:fn" mode="fn_to_xref">
 		<xsl:element name="xref" namespace="https://www.metanorma.org/ns/standoc">
 
-			<xsl:attribute name="target">
-				<xsl:call-template name="fn_reference_to_xref_target"/>
-			</xsl:attribute>
-			<!-- <xsl:copy-of select="@target"/> -->
-
-			<xsl:variable name="curr_clause_id" select="normalize-space(ancestor::bipm:clause[1]/@id)"/>
-			<xsl:variable name="curr_annex_id" select="normalize-space(ancestor::bipm:annex[1]/@id)"/>
-
-			<xsl:variable name="number">
-				<xsl:choose>
-					<xsl:when test="$curr_clause_id != ''">
-						<xsl:number count="bipm:fn[ancestor::bipm:clause[1]/@id = $curr_clause_id][ancestor::bipm:quote or not(ancestor::bipm:table)]" level="any"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:number count="bipm:fn[ancestor::bipm:annex[1]/@id = $curr_annex_id]"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
+			<xsl:copy-of select="@target"/>
 
 			<xsl:element name="sup_fn" namespace="https://www.metanorma.org/ns/standoc">
-				<xsl:value-of select="concat('(',$number,')')"/>
-				<!-- <xsl:value-of select="concat('(',normalize-space(./*[local-name() = 'fmt-fn-label']),')')"/> -->
+				<!-- <xsl:value-of select="concat('(',$number,')')"/> -->
 			<!-- https://github.com/metanorma/isodoc/issues/658#issuecomment-2726450824 -->
-			<!-- <xsl:apply-templates select="*[local-name() = 'fmt-fn-label']/node()" mode="flatxml"/> -->
+			<xsl:apply-templates select="*[local-name() = 'fmt-fn-label']/node()" mode="flatxml"/>
 			</xsl:element>
 
 		</xsl:element>
 	</xsl:template>
 
-	<!-- <xsl:template match="*[local-name() = 'fmt-fn-label']//*[local-name() = 'sup']" mode="flatxml">
-		<xsl:element name="sup_fn" namespace="https://www.metanorma.org/ns/standoc">
-			<xsl:apply-templates mode="flatxml"/>
-		</xsl:element>
-	</xsl:template> -->
-
-	<xsl:template name="fn_reference_to_xref_target">
-		<xsl:variable name="lang" select="ancestor::bipm:metanorma/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
-		<xsl:variable name="gen_id" select="generate-id()"/>
-		<xsl:variable name="curr_clause_id" select="ancestor::bipm:clause[1]/@id"/>
-		<xsl:variable name="number">
-			<xsl:number count="bipm:fn[ancestor::bipm:clause[1]/@id = $curr_clause_id][ancestor::bipm:quote or not(ancestor::bipm:table)]" level="any"/>
-		</xsl:variable>
-		<xsl:value-of select="concat($lang, '_footnote_', @reference, '_', $number, '_', $gen_id)"/>
-	</xsl:template>
-
 	<xsl:template match="bipm:preface/bipm:clause[not(@type = 'toc')][position() &gt; 1]" mode="flatxml">
 		<xsl:copy-of select="."/>
 	</xsl:template>
@@ -943,30 +913,15 @@
 		<xsl:element name="note_side" namespace="https://www.metanorma.org/ns/standoc">
 
 			<xsl:attribute name="id">
-				<xsl:call-template name="fn_reference_to_xref_target"/>
-				<!-- <xsl:value-of select="@target"/> -->
+				<xsl:value-of select="@target"/>
 			</xsl:attribute>
 
 			<xsl:variable name="curr_id" select="@target"/>
 
-			<xsl:variable name="curr_clause_id" select="normalize-space(ancestor::bipm:clause[1]/@id)"/>
-			<xsl:variable name="curr_annex_id" select="normalize-space(ancestor::bipm:annex[1]/@id)"/>
-
-			<xsl:variable name="number">
-				<xsl:choose>
-					<xsl:when test="$curr_clause_id != ''">
-						<xsl:number count="bipm:fn[ancestor::bipm:clause[1]/@id = $curr_clause_id][ancestor::bipm:quote or not(ancestor::bipm:table)]" level="any"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:number count="bipm:fn[ancestor::bipm:annex[1]/@id = $curr_annex_id]"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-
 			<xsl:element name="sup_fn" namespace="https://www.metanorma.org/ns/standoc">
-				<xsl:value-of select="concat('(',$number,')')"/>
+				<!-- <xsl:value-of select="concat('(',$number,')')"/> -->
 			<!-- https://github.com/metanorma/isodoc/issues/658#issuecomment-2726450824 -->
-			<!-- <xsl:apply-templates select="*[local-name() = 'fmt-fn-label']/node()" mode="flatxml"/> -->
+			<xsl:apply-templates select="*[local-name() = 'fmt-fn-label']/node()" mode="flatxml"/>
 			</xsl:element>
 			<xsl:text> </xsl:text>
 
@@ -1000,6 +955,10 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fn']/*[local-name() = 'fmt-fn-label']/*[local-name() = 'sup']" priority="5" mode="flatxml">
+		<xsl:apply-templates mode="flatxml"/>
+	</xsl:template>
+
 	<!-- ================================= -->
 	<!-- END: Flattening xml for fit notes at page sides (margins) -->
 	<!-- ================================= -->
@@ -7342,6 +7301,8 @@
 			 <xsl:attribute name="min-height">5mm</xsl:attribute>
 			 </xsl:if>
 
+		<xsl:call-template name="setColors"/>
+
 	</xsl:template> <!-- setTableRowAttributes -->
 	<!-- ===================== -->
 	<!-- END Table's row processing -->
@@ -7393,6 +7354,7 @@
 			</xsl:attribute>
 		</xsl:if>
 		<xsl:call-template name="display-align"/>
+		<xsl:call-template name="setColors"/>
 	</xsl:template>
 
 	<xsl:template name="display-align">
@@ -7408,6 +7370,29 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setColors">
+		<xsl:variable name="styles__">
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="concat(@style,';')"/>
+				<xsl:with-param name="sep" select="';'"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="quot">"</xsl:variable>
+		<xsl:variable name="styles_">
+			<xsl:for-each select="xalan:nodeset($styles__)/item">
+				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
+				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
+				<xsl:if test="$key = 'color' or $key = 'background-color'">
+					<style name="{$key}"><xsl:value-of select="$value"/></style>
+				</xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
+		<xsl:for-each select="$styles/style">
+			<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
+		</xsl:for-each>
+	</xsl:template>
+
 	<!-- cell in table body, footer -->
 	<xsl:template match="*[local-name()='td']" name="td">
 		<fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" -->
@@ -7419,12 +7404,12 @@
 
 			<xsl:call-template name="refine_table-cell-style"/>
 
+			<xsl:call-template name="setTableCellAttributes"/>
+
 			<xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
 
-			<xsl:call-template name="setTableCellAttributes"/>
-
 			<xsl:if test="$isGenerateTableIF = 'true'">
 				<xsl:attribute name="border">1pt solid black</xsl:attribute> <!-- border is mandatory, to determine page width -->
 				<xsl:attribute name="text-align">left</xsl:attribute>
@@ -9225,7 +9210,7 @@
 		<xsl:choose>
 			<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:apply-templates/></xsl:when>
 			<xsl:when test="following-sibling::*[2][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']">
-				<fo:inline keep-with-next.within-line="always"><xsl:apply-templates/></fo:inline>
+				<fo:inline keep-with-next.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:apply-templates/>
@@ -9233,7 +9218,7 @@
 		</xsl:choose>
 	</xsl:template>
 	<xsl:template match="text()[not(ancestor::*[local-name() = 'table']) and preceding-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear'] and   following-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']]" priority="2">
-		<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
+		<fo:inline keep-with-next.within-line="always" role="SKIP"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
@@ -10298,24 +10283,26 @@
 			<xsl:apply-templates select="." mode="mathml"/>
 		</xsl:variable>
 
-		<fo:instream-foreign-object fox:alt-text="Math">
+		<fo:instream-foreign-object fox:alt-text="Math" fox:actual-text="Math">
 
 			<xsl:call-template name="refine_mathml_insteam_object_style"/>
 
-			<!-- put MathML in Actual Text -->
-			<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
-			<xsl:attribute name="fox:actual-text">
-				<xsl:value-of select="$mathml_content"/>
-			</xsl:attribute>
-
-			<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
-			<xsl:if test="normalize-space($asciimath_text_) != ''">
-			<!-- put Mathin Alternate Text -->
-				<xsl:attribute name="fox:alt-text">
-					<xsl:value-of select="$asciimath_text_"/>
+			<xsl:if test="$isGenerateTableIF = 'false'">
+				<!-- put MathML in Actual Text -->
+				<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
+				<xsl:attribute name="fox:actual-text">
+					<xsl:value-of select="$mathml_content"/>
 				</xsl:attribute>
+
+				<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
+				<xsl:if test="normalize-space($asciimath_text_) != ''">
+				<!-- put Mathin Alternate Text -->
+					<xsl:attribute name="fox:alt-text">
+						<xsl:value-of select="$asciimath_text_"/>
+					</xsl:attribute>
+				</xsl:if>
+				<!-- </xsl:if> -->
 			</xsl:if>
-			<!-- </xsl:if> -->
 
 			<xsl:copy-of select="xalan:nodeset($mathml)"/>
 
@@ -12099,6 +12086,8 @@
 	<xsl:template match="*[local-name() = 'origin']" mode="contents"/>
 	<xsl:template match="*[local-name() = 'erefstack ']" mode="contents"/>
 
+	<xsl:template match="*[local-name() = 'requirement'] |             *[local-name() = 'recommendation'] |              *[local-name() = 'permission']" mode="contents" priority="3"/>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="bookmarks"/>
 	<xsl:template match="*[local-name() = 'fmt-stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
@@ -12120,6 +12109,8 @@
 	<xsl:template match="*[local-name() = 'origin']" mode="bookmarks"/>
 	<xsl:template match="*[local-name() = 'erefstack ']" mode="bookmarks"/>
 
+	<xsl:template match="*[local-name() = 'requirement'] |             *[local-name() = 'recommendation'] |              *[local-name() = 'permission']" mode="bookmarks" priority="3"/>
+
 	<!-- Bookmarks -->
 	<xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -14014,21 +14005,32 @@
 	<!-- ========== -->
 
 	<xsl:variable name="reviews_">
-		<xsl:for-each select="//*[local-name() = 'review'][@from]">
+		<xsl:for-each select="//*[local-name() = 'review'][not(parent::*[local-name() = 'review-container'])][@from]">
 			<xsl:copy>
 				<xsl:copy-of select="@from"/>
 				<xsl:copy-of select="@id"/>
 			</xsl:copy>
 		</xsl:for-each>
+		<xsl:for-each select="//*[local-name() = 'fmt-review-start'][@source]">
+			<xsl:copy>
+				<xsl:copy-of select="@source"/>
+				<xsl:copy-of select="@id"/>
+			</xsl:copy>
+		</xsl:for-each>
 	</xsl:variable>
 	<xsl:variable name="reviews" select="xalan:nodeset($reviews_)"/>
 
 	<xsl:template name="addReviewHelper">
-		<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
-		<xsl:variable name="curr_id" select="@id"/>
-		<xsl:variable name="review_id" select="normalize-space($reviews//*[local-name() = 'review'][@from = $curr_id]/@id)"/>
-		<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
-			<fo:block keep-with-next="always" line-height="0.1" id="{$review_id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$review_id}" fox:alt-text="Annot___{$review_id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+		<xsl:if test="$isGenerateTableIF = 'false'">
+			<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
+			<xsl:variable name="curr_id" select="@id"/>
+			<!-- <xsl:variable name="review_id" select="normalize-space(/@id)"/> -->
+			<xsl:for-each select="$reviews//*[local-name() = 'review'][@from = $curr_id]"> <!-- $reviews//*[local-name() = 'fmt-review-start'][@source = $curr_id] -->
+				<xsl:variable name="review_id" select="normalize-space(@id)"/>
+				<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
+					<fo:block keep-with-next="always" line-height="0.1" id="{$review_id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$review_id}" fox:alt-text="Annot___{$review_id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+				</xsl:if>
+			</xsl:for-each>
 		</xsl:if>
 		<!-- <fo:block>
 			<curr_id><xsl:value-of select="$curr_id"/></curr_id>
@@ -14167,14 +14169,61 @@
 
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'review']"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
+	<!-- document text (not figures, or tables) footnotes -->
+	<xsl:variable name="reviews_container_">
+		<xsl:for-each select="//*[local-name() = 'review-container']/*[local-name() = 'fmt-review-body']">
+			<xsl:variable name="update_xml_step1">
+				<xsl:apply-templates select="." mode="update_xml_step1"/>
+			</xsl:variable>
+			<xsl:apply-templates select="xalan:nodeset($update_xml_step1)" mode="update_xml_enclose_keep-together_within-line"/>
+		</xsl:for-each>
+	</xsl:variable>
+	<xsl:variable name="reviews_container" select="xalan:nodeset($reviews_container_)"/>
+
+	<xsl:template match="*[local-name() = 'review-container']"/>
+
+	<!-- for old Presentation XML (before https://github.com/metanorma/isodoc/issues/670) -->
+	<xsl:template match="*[local-name() = 'review'][not(parent::*[local-name() = 'review-container'])]">  <!-- 'review' will be processed in mn2pdf/review.xsl -->
+		<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
+		<xsl:if test="$isGenerateTableIF = 'false'">
+		<xsl:choose>
+			<!-- if there isn't the attribute '@from', then -->
+			<xsl:when test="$id_from = ''">
+				<fo:block id="{@id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
+			<xsl:when test="ancestor::*[local-name() = 'metanorma'] and not(ancestor::*[local-name() = 'metanorma']//*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+			<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+		</xsl:choose>
+		</xsl:if>
+	</xsl:template>
+
+	<!-- for new Presentation XML (https://github.com/metanorma/isodoc/issues/670) -->
+	<xsl:template match="*[local-name() = 'fmt-review-start']" name="fmt-review-start"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
 		<!-- comment 2019-11-29 -->
 		<!-- <fo:block font-weight="bold">Review:</fo:block>
 		<xsl:apply-templates /> -->
 
-		<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
+		<xsl:variable name="id_from" select="normalize-space(current()/@source)"/>
 
-		<xsl:if test="1 = 1">
+		<xsl:variable name="source" select="normalize-space(@source)"/>
+
+		<xsl:if test="$isGenerateTableIF = 'false'">
+		<!-- <xsl:variable name="id_from" select="normalize-space(current()/@from)"/> -->
+
+		<!-- <xsl:if test="@source = @end"> -->
+		<!-- following-sibling::node()[1][local-name() = 'bookmark'][@id = $source] and
+				following-sibling::node()[2][local-name() = 'fmt-review-end'][@source = $source] -->
+			<!-- <fo:block id="{$source}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$source}" fox:alt-text="Annot___{$source}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block> -->
+			<fo:block id="{@id}" font-size="1pt" role="SKIP" keep-with-next="always" line-height="0.1"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+		<!-- </xsl:if> -->
+		</xsl:if>
+
+		<xsl:if test="1 = 2">
 		<xsl:choose>
 			<!-- if there isn't the attribute '@from', then -->
 			<xsl:when test="$id_from = ''">
@@ -14182,10 +14231,10 @@
 			</xsl:when>
 			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
 			<xsl:when test="ancestor::*[local-name() = 'metanorma'] and not(ancestor::*[local-name() = 'metanorma']//*[@id = $id_from])">
-				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+				<fo:block id="{$id_from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$id_from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
 			</xsl:when>
 			<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
-				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+				<fo:block id="{$id_from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$id_from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
 			</xsl:when>
 		</xsl:choose>
 		</xsl:if>
@@ -14236,16 +14285,21 @@
 		<xsl:variable name="list_level">
 			<xsl:choose>
 				<xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
-				<xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
+				<xsl:when test="$ul_labels/label[@level = 3]"><xsl:value-of select="$list_level_ mod 3"/></xsl:when>
+				<xsl:when test="$list_level_ mod 2 = 0">2</xsl:when>
+				<xsl:otherwise><xsl:value-of select="$list_level_ mod 2"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
 				<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
 			</xsl:when>
-			<xsl:when test="$list_level mod 3 = 0">
+			<xsl:when test="$list_level mod 3 = 0 and $ul_labels/label[@level = 3]">
 				<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
 			</xsl:when>
+			<xsl:when test="$list_level mod 3 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
+			</xsl:when>
 			<xsl:when test="$list_level mod 2 = 0">
 				<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
 			</xsl:when>
@@ -14790,10 +14844,22 @@
 	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/>
 
 	<xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
-		<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
-		<fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
-		<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
-		<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
+		<xsl:variable name="bookmark_id" select="@id"/>
+		<xsl:choose>
+			<!-- Example:
+				<fmt-review-start id="_7ef81cf7-3f6c-4ed4-9c1f-1ba092052bbd" source="_dda23915-8574-ef1e-29a1-822d465a5b97" target="_ecfb2210-3b1b-46a2-b63a-8b8505be6686" end="_dda23915-8574-ef1e-29a1-822d465a5b97" author="" date="2025-03-24T00:00:00Z"/>
+				<bookmark id="_dda23915-8574-ef1e-29a1-822d465a5b97"/>
+				<fmt-review-end id="_f336a8d0-08a8-4b7f-a1aa-b04688ed40c1" source="_dda23915-8574-ef1e-29a1-822d465a5b97" target="_ecfb2210-3b1b-46a2-b63a-8b8505be6686" start="_dda23915-8574-ef1e-29a1-822d465a5b97" author="" date="2025-03-24T00:00:00Z"/> -->
+			<xsl:when test="1 = 2 and preceding-sibling::node()[local-name() = 'fmt-review-start'][@source = $bookmark_id] and        following-sibling::node()[local-name() = 'fmt-review-end'][@source = $bookmark_id]">
+				<!-- skip here, see the template 'fmt-review-start' -->
+			</xsl:when>
+			<xsl:otherwise>
+				<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
+				<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[local-name() = 'fmt-review-start'][@source = $bookmark_id] and        following-sibling::node()[local-name() = 'fmt-review-end'][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
+				<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
+				<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 	<!-- =================== -->
 	<!-- End of Index processing -->
@@ -16139,6 +16205,9 @@
 	<xsl:template match="*[local-name() = 'svgmap']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'svgmap']" mode="update_xml_pres"/>
 
+	<xsl:template match="*[local-name() = 'review-container']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'review-container']" mode="update_xml_pres"/>
+
 	<!-- END: update new Presentation XML -->
 
 	<!-- =========================================================================== -->