metanorma-bipm 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33c9548827e5ad2e0940e60b144688acd89bf613056d0f94118ab1f88f1ce16f
-  data.tar.gz: 01a234c220f175bca61b8dd8e30b1e125a2f4b79de0620ee2f703cb09e981b86
+  metadata.gz: c19d03a9129bf06e2f40d1f3ad9f04329a7998fa93a0e0d1d7c1cf868ce757b1
+  data.tar.gz: '04639d86b292cdca3e6bff19e6a483f61d8cd06716da5076226e55b7cca38213'
 SHA512:
-  metadata.gz: d5db0106d17dc5c677e95063a78a22d14c0eb6c8ffc64d4283b807c8d472eac4ada2872c370cb8d1d0378af3f137e034f70899dfc73cde75ef1ad8f2e309dafd
-  data.tar.gz: 55dafeca64ca6df10fd5fc2f945e6b247f7477377fd804e8e1193ea2e642b1e6f283c4af99cd865e555369c78e1a2a32b6e9c0320bf1c4bac4f5401d9adb8278
+  metadata.gz: b0c76364721912ff29ac04abecb60b76f9f8585a52ddbfe5d9e6bcf4e1ac849e9c40207cf83f504273d59838fe3c89090aff8f88ee3edec2016f2d081bf7ed7c
+  data.tar.gz: 5701338ac4a163f068c1304ff70c770c8b37ecdd618d046504e2edf1dd1eb4bca37c37712e7083cd1b5af836cfd822bb5e42803237dc7006502bd0da241b3f98

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

@@ -5224,7 +5224,23 @@
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:element name="page_sequence" namespace="{$namespace_full}">
 				<xsl:attribute name="main_page_sequence"/>
-				<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+
+				<!-- from common <xsl:template name="index-pages"> -->
+				<xsl:variable name="docid">
+					<xsl:call-template name="getDocumentId"/>
+				</xsl:variable>
+
+				<xsl:variable name="current_document_index_id">
+					<xsl:apply-templates select="." mode="index_add_id">
+						<xsl:with-param name="docid" select="$docid"/>
+					</xsl:apply-templates>
+				</xsl:variable>
+				<xsl:variable name="current_document_index">
+					<xsl:apply-templates select="xalan:nodeset($current_document_index_id)" mode="index_update"/>
+				</xsl:variable>
+
+				<!-- xalan:nodeset($current_document_index) -->
+				<xsl:apply-templates select="xalan:nodeset($current_document_index)" mode="update_xml_step_move_pagebreak"/>
 			</xsl:element>
 		</xsl:for-each>
 	</xsl:template>
@@ -6276,6 +6292,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="tt-style">
+		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_tt-style">
@@ -8043,6 +8060,11 @@
 			<!-- Display table's name before table as standalone block -->
 			<!-- $namespace = 'iso' or  -->
 			<xsl:apply-templates select="mn:fmt-name"/> <!-- table's title rendered before table -->
+			<xsl:if test="not(mn:fmt-name)"> <!-- for https://github.com/metanorma/mn-samples-jis/issues/75#issuecomment-3922169930 -->
+				<xsl:apply-templates select="mn:name">
+					<xsl:with-param name="process">true</xsl:with-param>
+				</xsl:apply-templates>
+			</xsl:if>
 			<xsl:call-template name="table_name_fn_display"/>
 
 			<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/mn:tr[1]/mn:td)"/>
@@ -8294,7 +8316,13 @@
 	</xsl:template>
 
 	<!-- table/name-->
-	<xsl:template match="*[local-name()='table']/mn:fmt-name">
+	<xsl:template match="mn:table[not(mn:fmt-name)]/mn:name"> <!-- for https://github.com/metanorma/mn-samples-jis/issues/75#issuecomment-3922169930 -->
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<xsl:call-template name="table_name"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template match="*[local-name()='table']/mn:fmt-name" name="table_name">
 		<xsl:param name="continued"/>
 		<xsl:param name="cols-count"/>
 		<xsl:if test="normalize-space() != ''">
@@ -8757,12 +8785,14 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or ../mn:example or ../mn:dl or ../mn:key or ..//mn:fn[not(parent::mn:fmt-name)] or ../mn:fmt-source or ../mn:p"/>
+		<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or       ../mn:example or       ../mn:dl or       ../mn:key or       (..//mn:fn[not(parent::mn:fmt-name)] and not(ancestor::mn:table[1]//mn:tfoot//mn:fmt-footnote-container)) or       ../mn:fmt-source or ../mn:p"/>
+		<!-- in JIS fmt-footnote-container renders in tfoot, so no need render fn in the separate table -->
 
-		<xsl:variable name="isNoteOrFnExistShowAfterTable">
+		<xsl:variable name="isNoteOrFnExistShowAfterTable_">
 		</xsl:variable>
+		<xsl:variable name="isNoteOrFnExistShowAfterTable" select="normalize-space($isNoteOrFnExistShowAfterTable_)"/>
 
-		<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
+		<xsl:if test="$isNoteOrFnExist = 'true' or $isNoteOrFnExistShowAfterTable = 'true'">
 
 			<xsl:variable name="cols-count">
 				<xsl:choose>
@@ -14405,10 +14435,22 @@
 	<!-- End Highlight syntax styles -->
 
 	<!-- Index section styles -->
+
+	<xsl:attribute-set name="indexsect-region-body-style">
+		<xsl:attribute name="column-count">2</xsl:attribute>
+		<xsl:attribute name="column-gap">10mm</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="indexsect-title-block-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+		<xsl:attribute name="span">all</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="indexsect-title-style">
 		<xsl:attribute name="role">H1</xsl:attribute>
-		<xsl:attribute name="font-size">16pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
+		<xsl:attribute name="font-size">16pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">84pt</xsl:attribute>
 		<xsl:attribute name="margin-left">-18mm</xsl:attribute>
 	</xsl:attribute-set> <!-- indexsect-title-style -->
@@ -14439,6 +14481,27 @@
 		</xsl:for-each>
 	</xsl:variable>
 
+	<xsl:template name="index-pages">
+		<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_index_id">
+			<xsl:apply-templates select="//mn:indexsect" mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
+		</xsl:variable>
+		<xsl:variable name="current_document_index">
+			<xsl:apply-templates select="xalan:nodeset($current_document_index_id)" mode="index_update"/>
+		</xsl:variable>
+
+		<xsl:apply-templates select="xalan:nodeset($current_document_index)" mode="index">
+			<xsl:with-param name="num" select="$num"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
 	<xsl:template match="@*|node()" mode="index_add_id">
 		<xsl:param name="docid"/>
 		<xsl:copy>
@@ -14491,7 +14554,7 @@
 	<xsl:template match="mn:indexsect//mn:li" mode="index_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="index_update"/>
-		<xsl:apply-templates select="node()[not(self::mn:fmt-name)][1]" mode="process_li_element"/>
+			<xsl:apply-templates select="node()[not(self::mn:fmt-name)][1]" mode="process_li_element"/>
 		</xsl:copy>
 	</xsl:template>
 
@@ -14699,11 +14762,24 @@
 	<!-- End of Index processing -->
 	<!-- =================== -->
 
-		<!-- =================== -->
+	<xsl:attribute-set name="form-checkbox-style">
+		<xsl:attribute name="border">0.5pt solid black</xsl:attribute>
+		<xsl:attribute name="background-color">yellow</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:variable name="METANORMA_FORM_START_PREFIX">_metanorma_form_start</xsl:variable>
+	<xsl:variable name="METANORMA_FORM_ITEM_PREFIX">_metanorma_form_item_</xsl:variable>
+	<xsl:variable name="METANORMA_FORM_ITEM_BORDER">1pt solid black</xsl:variable>
+
+	<!-- =================== -->
 	<!-- Form's elements processing -->
 	<!-- =================== -->
 	<xsl:template match="mn:form">
 		<fo:block>
+			<fo:inline>
+				<xsl:attribute name="id"><xsl:value-of select="concat($METANORMA_FORM_START_PREFIX, '___', @id, '___', @name)"/></xsl:attribute>
+				<xsl:value-of select="$hair_space"/>
+			</fo:inline>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -14712,7 +14788,23 @@
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template>
 
-	<xsl:template match="mn:form//mn:input[@type = 'text' or @type = 'date' or @type = 'file' or @type = 'password']">
+	<xsl:template match="mn:form//mn:input[@type = 'text']">
+		<!-- add helper id for mn2pdf class FOPIFFormsHandler  (_metanorma_form_item_border_) -->
+		<fo:inline>
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="add_border_prefix">true</xsl:with-param>
+			</xsl:call-template>
+			<xsl:value-of select="$hair_space"/>
+		</fo:inline>
+		<fo:inline border="{$METANORMA_FORM_ITEM_BORDER}"><!-- don't remove, this border needs for mn2pdf FOPIFFormsHandler -->
+			<fo:inline>
+				<xsl:call-template name="set_id_metanorma_form_item"/>
+				<xsl:call-template name="text_input"/>
+			</fo:inline>
+		</fo:inline>
+	</xsl:template>
+
+	<xsl:template match="mn:form//mn:input[@type = 'date' or @type = 'file' or @type = 'password']">
 		<fo:inline>
 			<xsl:call-template name="text_input"/>
 		</fo:inline>
@@ -14744,7 +14836,20 @@
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:input[@type = 'checkbox']">
-		<fo:inline padding-right="1mm">
+		<xsl:variable name="form_item_type">checkbox</xsl:variable>
+		<!-- add helper id for mn2pdf class FOPIFFormsHandler  (_metanorma_form_item_border_) -->
+		<fo:inline>
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+				<xsl:with-param name="add_border_prefix">true</xsl:with-param>
+			</xsl:call-template>
+			<xsl:value-of select="$hair_space"/>
+		</fo:inline>
+
+		<fo:inline border="{$METANORMA_FORM_ITEM_BORDER}"><!-- don't remove 'border', this border needs for mn2pdf FOPIFFormsHandler -->
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+			</xsl:call-template>
 			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
 				<xsl:attribute name="height">3.5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
@@ -14754,11 +14859,24 @@
 					<polyline points="0,0 80,0 80,80 0,80 0,0" stroke="black" stroke-width="5" fill="white"/>
 				</svg>
 			</fo:instream-foreign-object>
-		</fo:inline>
+		</fo:inline><fo:inline padding-right="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:input[@type = 'radio']">
-		<fo:inline padding-right="1mm">
+		<xsl:variable name="form_item_type">radiobutton</xsl:variable>
+		<!-- add helper id for mn2pdf class FOPIFFormsHandler  (_metanorma_form_item_border_) -->
+		<fo:inline>
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+				<xsl:with-param name="add_border_prefix">true</xsl:with-param>
+			</xsl:call-template>
+			<xsl:value-of select="$hair_space"/>
+		</fo:inline>
+
+		<fo:inline border="{$METANORMA_FORM_ITEM_BORDER}"><!-- don't remove 'border', this border needs for mn2pdf FOPIFFormsHandler -->
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+			</xsl:call-template>
 			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
 				<xsl:attribute name="height">3.5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
@@ -14770,6 +14888,7 @@
 				</svg>
 			</fo:instream-foreign-object>
 		</fo:inline>
+		<fo:inline padding-right="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:select">
@@ -14779,11 +14898,28 @@
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:textarea">
-		<fo:block-container border="1pt solid black" width="50%">
+		<fo:block-container border="{$METANORMA_FORM_ITEM_BORDER}" width="50%">
 			<fo:block> </fo:block>
 		</fo:block-container>
 	</xsl:template>
 
+	<xsl:template name="set_id_metanorma_form_item">
+		<xsl:param name="form_item_type">textfield</xsl:param>
+		<xsl:param name="add_border_prefix">false</xsl:param>
+		<xsl:variable name="border_prefix"><xsl:if test="normalize-space($add_border_prefix) = 'true'">border_</xsl:if></xsl:variable>
+		<xsl:if test="@id">
+			<!-- _metanorma_form_item_border____form_item_type___id___name___value -->
+			<!-- split by '___': [2] - form_item_type, [3] - id, [4] - name, [5] - value -->
+			<xsl:variable name="value">
+				<xsl:choose>
+					<xsl:when test="@type = 'checkbox'"><xsl:value-of select="normalize-space(@checked = 'true')"/><!-- true or false --></xsl:when>
+					<xsl:otherwise><xsl:value-of select="@value"/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:attribute name="id"><xsl:value-of select="concat($METANORMA_FORM_ITEM_PREFIX, $border_prefix, '___', $form_item_type, '___', @id, '___', @name, '___', $value)"/></xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- =================== -->
 	<!-- End Form's elements processing -->
 	<!-- =================== -->
@@ -14864,6 +15000,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-pagenumber-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 		<xsl:attribute name="font-family">Arial</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -16768,7 +16905,12 @@
 		<xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/>
 		<xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/>
 		<xsl:choose>
-			<xsl:when test="$external-destination = 'true' or $internal-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true'">
+				<fo:wrapper role="Reference">
+					<xsl:copy-of select="$element_node"/>
+				</fo:wrapper>
+			</xsl:when>
+			<xsl:when test="$external-destination = 'true'">
 				<xsl:copy-of select="$element_node"/>
 			</xsl:when>
 			<xsl:otherwise>

data/lib/isodoc/bipm/bipm.guide.xsl

@@ -5224,7 +5224,23 @@
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:element name="page_sequence" namespace="{$namespace_full}">
 				<xsl:attribute name="main_page_sequence"/>
-				<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+
+				<!-- from common <xsl:template name="index-pages"> -->
+				<xsl:variable name="docid">
+					<xsl:call-template name="getDocumentId"/>
+				</xsl:variable>
+
+				<xsl:variable name="current_document_index_id">
+					<xsl:apply-templates select="." mode="index_add_id">
+						<xsl:with-param name="docid" select="$docid"/>
+					</xsl:apply-templates>
+				</xsl:variable>
+				<xsl:variable name="current_document_index">
+					<xsl:apply-templates select="xalan:nodeset($current_document_index_id)" mode="index_update"/>
+				</xsl:variable>
+
+				<!-- xalan:nodeset($current_document_index) -->
+				<xsl:apply-templates select="xalan:nodeset($current_document_index)" mode="update_xml_step_move_pagebreak"/>
 			</xsl:element>
 		</xsl:for-each>
 	</xsl:template>
@@ -6276,6 +6292,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="tt-style">
+		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_tt-style">
@@ -8043,6 +8060,11 @@
 			<!-- Display table's name before table as standalone block -->
 			<!-- $namespace = 'iso' or  -->
 			<xsl:apply-templates select="mn:fmt-name"/> <!-- table's title rendered before table -->
+			<xsl:if test="not(mn:fmt-name)"> <!-- for https://github.com/metanorma/mn-samples-jis/issues/75#issuecomment-3922169930 -->
+				<xsl:apply-templates select="mn:name">
+					<xsl:with-param name="process">true</xsl:with-param>
+				</xsl:apply-templates>
+			</xsl:if>
 			<xsl:call-template name="table_name_fn_display"/>
 
 			<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/mn:tr[1]/mn:td)"/>
@@ -8294,7 +8316,13 @@
 	</xsl:template>
 
 	<!-- table/name-->
-	<xsl:template match="*[local-name()='table']/mn:fmt-name">
+	<xsl:template match="mn:table[not(mn:fmt-name)]/mn:name"> <!-- for https://github.com/metanorma/mn-samples-jis/issues/75#issuecomment-3922169930 -->
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<xsl:call-template name="table_name"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template match="*[local-name()='table']/mn:fmt-name" name="table_name">
 		<xsl:param name="continued"/>
 		<xsl:param name="cols-count"/>
 		<xsl:if test="normalize-space() != ''">
@@ -8757,12 +8785,14 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or ../mn:example or ../mn:dl or ../mn:key or ..//mn:fn[not(parent::mn:fmt-name)] or ../mn:fmt-source or ../mn:p"/>
+		<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or       ../mn:example or       ../mn:dl or       ../mn:key or       (..//mn:fn[not(parent::mn:fmt-name)] and not(ancestor::mn:table[1]//mn:tfoot//mn:fmt-footnote-container)) or       ../mn:fmt-source or ../mn:p"/>
+		<!-- in JIS fmt-footnote-container renders in tfoot, so no need render fn in the separate table -->
 
-		<xsl:variable name="isNoteOrFnExistShowAfterTable">
+		<xsl:variable name="isNoteOrFnExistShowAfterTable_">
 		</xsl:variable>
+		<xsl:variable name="isNoteOrFnExistShowAfterTable" select="normalize-space($isNoteOrFnExistShowAfterTable_)"/>
 
-		<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
+		<xsl:if test="$isNoteOrFnExist = 'true' or $isNoteOrFnExistShowAfterTable = 'true'">
 
 			<xsl:variable name="cols-count">
 				<xsl:choose>
@@ -14405,10 +14435,22 @@
 	<!-- End Highlight syntax styles -->
 
 	<!-- Index section styles -->
+
+	<xsl:attribute-set name="indexsect-region-body-style">
+		<xsl:attribute name="column-count">2</xsl:attribute>
+		<xsl:attribute name="column-gap">10mm</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="indexsect-title-block-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+		<xsl:attribute name="span">all</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="indexsect-title-style">
 		<xsl:attribute name="role">H1</xsl:attribute>
-		<xsl:attribute name="font-size">16pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
+		<xsl:attribute name="font-size">16pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">84pt</xsl:attribute>
 		<xsl:attribute name="margin-left">-18mm</xsl:attribute>
 	</xsl:attribute-set> <!-- indexsect-title-style -->
@@ -14439,6 +14481,27 @@
 		</xsl:for-each>
 	</xsl:variable>
 
+	<xsl:template name="index-pages">
+		<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_index_id">
+			<xsl:apply-templates select="//mn:indexsect" mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
+		</xsl:variable>
+		<xsl:variable name="current_document_index">
+			<xsl:apply-templates select="xalan:nodeset($current_document_index_id)" mode="index_update"/>
+		</xsl:variable>
+
+		<xsl:apply-templates select="xalan:nodeset($current_document_index)" mode="index">
+			<xsl:with-param name="num" select="$num"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
 	<xsl:template match="@*|node()" mode="index_add_id">
 		<xsl:param name="docid"/>
 		<xsl:copy>
@@ -14491,7 +14554,7 @@
 	<xsl:template match="mn:indexsect//mn:li" mode="index_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="index_update"/>
-		<xsl:apply-templates select="node()[not(self::mn:fmt-name)][1]" mode="process_li_element"/>
+			<xsl:apply-templates select="node()[not(self::mn:fmt-name)][1]" mode="process_li_element"/>
 		</xsl:copy>
 	</xsl:template>
 
@@ -14699,11 +14762,24 @@
 	<!-- End of Index processing -->
 	<!-- =================== -->
 
-		<!-- =================== -->
+	<xsl:attribute-set name="form-checkbox-style">
+		<xsl:attribute name="border">0.5pt solid black</xsl:attribute>
+		<xsl:attribute name="background-color">yellow</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:variable name="METANORMA_FORM_START_PREFIX">_metanorma_form_start</xsl:variable>
+	<xsl:variable name="METANORMA_FORM_ITEM_PREFIX">_metanorma_form_item_</xsl:variable>
+	<xsl:variable name="METANORMA_FORM_ITEM_BORDER">1pt solid black</xsl:variable>
+
+	<!-- =================== -->
 	<!-- Form's elements processing -->
 	<!-- =================== -->
 	<xsl:template match="mn:form">
 		<fo:block>
+			<fo:inline>
+				<xsl:attribute name="id"><xsl:value-of select="concat($METANORMA_FORM_START_PREFIX, '___', @id, '___', @name)"/></xsl:attribute>
+				<xsl:value-of select="$hair_space"/>
+			</fo:inline>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -14712,7 +14788,23 @@
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template>
 
-	<xsl:template match="mn:form//mn:input[@type = 'text' or @type = 'date' or @type = 'file' or @type = 'password']">
+	<xsl:template match="mn:form//mn:input[@type = 'text']">
+		<!-- add helper id for mn2pdf class FOPIFFormsHandler  (_metanorma_form_item_border_) -->
+		<fo:inline>
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="add_border_prefix">true</xsl:with-param>
+			</xsl:call-template>
+			<xsl:value-of select="$hair_space"/>
+		</fo:inline>
+		<fo:inline border="{$METANORMA_FORM_ITEM_BORDER}"><!-- don't remove, this border needs for mn2pdf FOPIFFormsHandler -->
+			<fo:inline>
+				<xsl:call-template name="set_id_metanorma_form_item"/>
+				<xsl:call-template name="text_input"/>
+			</fo:inline>
+		</fo:inline>
+	</xsl:template>
+
+	<xsl:template match="mn:form//mn:input[@type = 'date' or @type = 'file' or @type = 'password']">
 		<fo:inline>
 			<xsl:call-template name="text_input"/>
 		</fo:inline>
@@ -14744,7 +14836,20 @@
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:input[@type = 'checkbox']">
-		<fo:inline padding-right="1mm">
+		<xsl:variable name="form_item_type">checkbox</xsl:variable>
+		<!-- add helper id for mn2pdf class FOPIFFormsHandler  (_metanorma_form_item_border_) -->
+		<fo:inline>
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+				<xsl:with-param name="add_border_prefix">true</xsl:with-param>
+			</xsl:call-template>
+			<xsl:value-of select="$hair_space"/>
+		</fo:inline>
+
+		<fo:inline border="{$METANORMA_FORM_ITEM_BORDER}"><!-- don't remove 'border', this border needs for mn2pdf FOPIFFormsHandler -->
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+			</xsl:call-template>
 			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
 				<xsl:attribute name="height">3.5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
@@ -14754,11 +14859,24 @@
 					<polyline points="0,0 80,0 80,80 0,80 0,0" stroke="black" stroke-width="5" fill="white"/>
 				</svg>
 			</fo:instream-foreign-object>
-		</fo:inline>
+		</fo:inline><fo:inline padding-right="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:input[@type = 'radio']">
-		<fo:inline padding-right="1mm">
+		<xsl:variable name="form_item_type">radiobutton</xsl:variable>
+		<!-- add helper id for mn2pdf class FOPIFFormsHandler  (_metanorma_form_item_border_) -->
+		<fo:inline>
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+				<xsl:with-param name="add_border_prefix">true</xsl:with-param>
+			</xsl:call-template>
+			<xsl:value-of select="$hair_space"/>
+		</fo:inline>
+
+		<fo:inline border="{$METANORMA_FORM_ITEM_BORDER}"><!-- don't remove 'border', this border needs for mn2pdf FOPIFFormsHandler -->
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+			</xsl:call-template>
 			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
 				<xsl:attribute name="height">3.5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
@@ -14770,6 +14888,7 @@
 				</svg>
 			</fo:instream-foreign-object>
 		</fo:inline>
+		<fo:inline padding-right="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:select">
@@ -14779,11 +14898,28 @@
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:textarea">
-		<fo:block-container border="1pt solid black" width="50%">
+		<fo:block-container border="{$METANORMA_FORM_ITEM_BORDER}" width="50%">
 			<fo:block> </fo:block>
 		</fo:block-container>
 	</xsl:template>
 
+	<xsl:template name="set_id_metanorma_form_item">
+		<xsl:param name="form_item_type">textfield</xsl:param>
+		<xsl:param name="add_border_prefix">false</xsl:param>
+		<xsl:variable name="border_prefix"><xsl:if test="normalize-space($add_border_prefix) = 'true'">border_</xsl:if></xsl:variable>
+		<xsl:if test="@id">
+			<!-- _metanorma_form_item_border____form_item_type___id___name___value -->
+			<!-- split by '___': [2] - form_item_type, [3] - id, [4] - name, [5] - value -->
+			<xsl:variable name="value">
+				<xsl:choose>
+					<xsl:when test="@type = 'checkbox'"><xsl:value-of select="normalize-space(@checked = 'true')"/><!-- true or false --></xsl:when>
+					<xsl:otherwise><xsl:value-of select="@value"/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:attribute name="id"><xsl:value-of select="concat($METANORMA_FORM_ITEM_PREFIX, $border_prefix, '___', $form_item_type, '___', @id, '___', @name, '___', $value)"/></xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- =================== -->
 	<!-- End Form's elements processing -->
 	<!-- =================== -->
@@ -14864,6 +15000,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-pagenumber-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 		<xsl:attribute name="font-family">Arial</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -16768,7 +16905,12 @@
 		<xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/>
 		<xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/>
 		<xsl:choose>
-			<xsl:when test="$external-destination = 'true' or $internal-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true'">
+				<fo:wrapper role="Reference">
+					<xsl:copy-of select="$element_node"/>
+				</fo:wrapper>
+			</xsl:when>
+			<xsl:when test="$external-destination = 'true'">
 				<xsl:copy-of select="$element_node"/>
 			</xsl:when>
 			<xsl:otherwise>