metanorma-bipm 2.2.7 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa230620357f920249eabd398c0ff5ba7d466a84e0ab618f74d2ba9cb49d111f
-  data.tar.gz: f76edf3fc5a2acc792664bf728e3ba66c929e72602c9589250cd4ea0ef89e48c
+  metadata.gz: 18aade47b63bc0551b4439a34d7d0cb0fd4f5f42bfdb926054c8ba64676d74c1
+  data.tar.gz: 8c08b33bfa3563c8e38f7476143de4e30522d69369a24e6155ead528cae370e1
 SHA512:
-  metadata.gz: 24caba048d9114054309d7e93ac6e275c195e1821f4678539bab3585626fede38658d5ade32295334fd8f19f55b6c34f6ae0037cda350a344215fdb73a8f907c
-  data.tar.gz: dbc666c0d77b8d29dda0a2f45806a925ee8dfe8a43ad3e042aca15ac070ec42c7ec12bfabbca6e8f065487d457b4dc73efd8ab2892a7095c8a1312f38795b623
+  metadata.gz: 485d5311a31adb2a4e1ea103e515693253c11c08fa8eb0164c01b59b1ab658d7c8140423f5ee2d7d1f652f9a2b488a3ebaa8abeaf0a475e82382daea11f25f51
+  data.tar.gz: 67cb70e9a0da69535856eab4f4b13323df59cb5fd716365124be8ae684ab3631ed6fee79265217f4e61f3b550604d29b5b059ac3a4768f1e7307b060f1a03d25

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

@@ -4508,11 +4508,17 @@
 	<!-- ========================== -->
 	<!-- Definition's list styles -->
 	<!-- ========================== -->
+
+	<xsl:attribute-set name="dl-block-style">
+
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="dt-row-style">
 
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="dt-cell-style">
+
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="dt-block-style">
@@ -4532,6 +4538,7 @@
 
 	<xsl:attribute-set name="dd-cell-style">
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
+
 	</xsl:attribute-set>
 
 	<!-- ========================== -->
@@ -4651,6 +4658,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:attribute-set name="figure-source-style">
+
+	</xsl:attribute-set>
+
 	<!-- Formula's styles -->
 	<xsl:attribute-set name="formula-style">
 		<xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -5197,7 +5208,7 @@
 
 	<xsl:template name="processTables_Contents">
 		<tables>
-			<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
+			<xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
 				<table id="{@id}" alt-text="{*[local-name() = 'name']}">
 					<xsl:copy-of select="*[local-name() = 'name']"/>
 				</table>
@@ -5566,7 +5577,7 @@
 						</xsl:attribute>
 					</xsl:for-each>
 
-					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>
+					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
 					<xsl:if test="$isNoteOrFnExist = 'true'">
 						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
 					</xsl:if>
@@ -5610,7 +5621,7 @@
 									<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
 								</xsl:when>
 								<xsl:otherwise>
-									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note and dl which render separaterely -->
+									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl') and not(local-name() = 'source')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
 								</xsl:otherwise>
 							</xsl:choose>
 
@@ -5731,6 +5742,11 @@
 		</xsl:if>
 	</xsl:template> <!-- table/name -->
 
+	<!-- SOURCE: ... -->
+	<xsl:template match="*[local-name()='table']/*[local-name() = 'source']" priority="2">
+		<xsl:call-template name="termsource"/>
+	</xsl:template>
+
 	<xsl:template name="calculate-columns-numbers">
 		<xsl:param name="table-row"/>
 		<xsl:variable name="columns-count" select="count($table-row/*)"/>
@@ -6087,7 +6103,7 @@
 		</fo:table-header>
 	</xsl:template> <!-- thead -->
 
-	<!-- template is using for iso, jcgm, bsi only -->
+	<!-- template is using for iec, iso, jcgm, bsi only -->
 	<xsl:template name="table-header-title">
 		<xsl:param name="cols-count"/>
 		<!-- row for title -->
@@ -6130,7 +6146,7 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source']"/>
 
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
 
@@ -6210,6 +6226,7 @@
 
 										<xsl:apply-templates select="../*[local-name()='dl']"/>
 										<xsl:apply-templates select="../*[local-name()='note']"/>
+										<xsl:apply-templates select="../*[local-name()='source']"/>
 
 								<xsl:variable name="isDisplayRowSeparator">
 
@@ -6901,7 +6918,7 @@
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		<!-- <dl><xsl:copy-of select="."/></dl> -->
-		<fo:block-container>
+		<fo:block-container xsl:use-attribute-sets="dl-block-style">
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
@@ -6912,6 +6929,18 @@
 						<xsl:attribute name="margin-left">6.5mm</xsl:attribute><!-- 8 mm -->
 					</xsl:if>
 
+			<xsl:if test="ancestor::*[local-name() = 'sourcecode']">
+				<!-- set font-size as sourcecode font-size -->
+				<xsl:variable name="sourcecode_attributes">
+					<xsl:call-template name="get_sourcecode_attributes"/>
+				</xsl:variable>
+				<xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@font-size">
+					<xsl:attribute name="{local-name()}">
+						<xsl:value-of select="."/>
+					</xsl:attribute>
+				</xsl:for-each>
+			</xsl:if>
+
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -7343,6 +7372,7 @@
 		<xsl:param name="split_keep-within-line"/>
 
 		<fo:table-row xsl:use-attribute-sets="dt-row-style">
+
 			<xsl:call-template name="insert_dt_cell">
 				<xsl:with-param name="key_iso" select="$key_iso"/>
 				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -7364,6 +7394,7 @@
 				<!-- border is mandatory, to calculate real width -->
 				<xsl:attribute name="border">0.1pt solid black</xsl:attribute>
 				<xsl:attribute name="text-align">left</xsl:attribute>
+
 			</xsl:if>
 
 			<fo:block xsl:use-attribute-sets="dt-block-style">
@@ -7806,6 +7837,7 @@
 				<fo:inline>
 					<xsl:for-each select="$styles/style">
 						<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
+
 					</xsl:for-each>
 					<xsl:apply-templates/>
 				</fo:inline>
@@ -9373,6 +9405,13 @@
 		</fo:block>
 	</xsl:template>
 
+	<!-- SOURCE: ... -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2">
+
+				<xsl:call-template name="termsource"/>
+
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'image']">
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
@@ -10516,9 +10555,11 @@
 								<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 							</xsl:if>
 
-							<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+							<xsl:apply-templates select="node()[not(local-name() = 'name' or local-name() = 'dl')]"/>
 						</fo:block>
 
+						<xsl:apply-templates select="*[local-name() = 'dl']"/> <!-- Key table -->
+
 								<xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
 
 					</fo:block-container>
@@ -10550,11 +10591,22 @@
 	<!-- add sourcecode highlighting -->
 	<xsl:template match="*[local-name()='sourcecode']//*[local-name()='span'][@class]" priority="2">
 		<xsl:variable name="class" select="@class"/>
+
+		<!-- Example: <1> -->
+		<xsl:variable name="is_callout">
+			<xsl:if test="parent::*[local-name() = 'dt']">
+				<xsl:variable name="dt_id" select="../@id"/>
+				<xsl:if test="ancestor::*[local-name() = 'sourcecode']//*[local-name() = 'callout'][@target = $dt_id]">true</xsl:if>
+			</xsl:if>
+		</xsl:variable>
+
 		<xsl:choose>
 			<xsl:when test="$sourcecode_css//class[@name = $class]">
 				<fo:inline>
 					<xsl:apply-templates select="$sourcecode_css//class[@name = $class]" mode="css"/>
+					<xsl:if test="$is_callout = 'true'">&lt;</xsl:if>
 					<xsl:apply-templates/>
+					<xsl:if test="$is_callout = 'true'">&gt;</xsl:if>
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
@@ -10978,6 +11030,10 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'div']">
+		<fo:block><xsl:apply-templates/></fo:block>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] |           *[local-name() = 'div'][@type = 'requirement-inherit'] |           *[local-name() = 'div'][@type = 'recommendation-inherit'] |           *[local-name() = 'div'][@type = 'permission-inherit']">
 		<fo:block xsl:use-attribute-sets="inherit-style">
 			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
@@ -11678,13 +11734,8 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'deprecates']">
-		<xsl:variable name="title-deprecated">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">deprecated</xsl:with-param>
-			</xsl:call-template>
-		</xsl:variable>
 		<fo:block xsl:use-attribute-sets="deprecates-style">
-			<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
+			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
@@ -12906,6 +12957,23 @@
 	<xsl:template match="*[local-name() = 'stem'] | *[local-name() = 'image']" mode="update_xml_step1">
 		<xsl:copy-of select="."/>
 	</xsl:template>
+
+	<!-- add @id, redundant for table auto-layout algorithm -->
+	<xsl:template match="*[local-name() = 'dl' or local-name() = 'table'][not(@id)]" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:call-template name="add_id"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template name="add_id">
+		<xsl:if test="not(@id)">
+			<!-- add @id - first element with @id plus '_element_name' -->
+			<xsl:attribute name="id"><xsl:value-of select="(.//*[@id])[1]/@id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- =========================================================================== -->
 	<!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
 	<!-- =========================================================================== -->

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

@@ -4508,11 +4508,17 @@
 	<!-- ========================== -->
 	<!-- Definition's list styles -->
 	<!-- ========================== -->
+
+	<xsl:attribute-set name="dl-block-style">
+
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="dt-row-style">
 
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="dt-cell-style">
+
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="dt-block-style">
@@ -4532,6 +4538,7 @@
 
 	<xsl:attribute-set name="dd-cell-style">
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
+
 	</xsl:attribute-set>
 
 	<!-- ========================== -->
@@ -4651,6 +4658,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:attribute-set name="figure-source-style">
+
+	</xsl:attribute-set>
+
 	<!-- Formula's styles -->
 	<xsl:attribute-set name="formula-style">
 		<xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -5197,7 +5208,7 @@
 
 	<xsl:template name="processTables_Contents">
 		<tables>
-			<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
+			<xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
 				<table id="{@id}" alt-text="{*[local-name() = 'name']}">
 					<xsl:copy-of select="*[local-name() = 'name']"/>
 				</table>
@@ -5566,7 +5577,7 @@
 						</xsl:attribute>
 					</xsl:for-each>
 
-					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>
+					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
 					<xsl:if test="$isNoteOrFnExist = 'true'">
 						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
 					</xsl:if>
@@ -5610,7 +5621,7 @@
 									<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
 								</xsl:when>
 								<xsl:otherwise>
-									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note and dl which render separaterely -->
+									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl') and not(local-name() = 'source')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
 								</xsl:otherwise>
 							</xsl:choose>
 
@@ -5731,6 +5742,11 @@
 		</xsl:if>
 	</xsl:template> <!-- table/name -->
 
+	<!-- SOURCE: ... -->
+	<xsl:template match="*[local-name()='table']/*[local-name() = 'source']" priority="2">
+		<xsl:call-template name="termsource"/>
+	</xsl:template>
+
 	<xsl:template name="calculate-columns-numbers">
 		<xsl:param name="table-row"/>
 		<xsl:variable name="columns-count" select="count($table-row/*)"/>
@@ -6087,7 +6103,7 @@
 		</fo:table-header>
 	</xsl:template> <!-- thead -->
 
-	<!-- template is using for iso, jcgm, bsi only -->
+	<!-- template is using for iec, iso, jcgm, bsi only -->
 	<xsl:template name="table-header-title">
 		<xsl:param name="cols-count"/>
 		<!-- row for title -->
@@ -6130,7 +6146,7 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source']"/>
 
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
 
@@ -6210,6 +6226,7 @@
 
 										<xsl:apply-templates select="../*[local-name()='dl']"/>
 										<xsl:apply-templates select="../*[local-name()='note']"/>
+										<xsl:apply-templates select="../*[local-name()='source']"/>
 
 								<xsl:variable name="isDisplayRowSeparator">
 
@@ -6901,7 +6918,7 @@
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		<!-- <dl><xsl:copy-of select="."/></dl> -->
-		<fo:block-container>
+		<fo:block-container xsl:use-attribute-sets="dl-block-style">
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
@@ -6912,6 +6929,18 @@
 						<xsl:attribute name="margin-left">6.5mm</xsl:attribute><!-- 8 mm -->
 					</xsl:if>
 
+			<xsl:if test="ancestor::*[local-name() = 'sourcecode']">
+				<!-- set font-size as sourcecode font-size -->
+				<xsl:variable name="sourcecode_attributes">
+					<xsl:call-template name="get_sourcecode_attributes"/>
+				</xsl:variable>
+				<xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@font-size">
+					<xsl:attribute name="{local-name()}">
+						<xsl:value-of select="."/>
+					</xsl:attribute>
+				</xsl:for-each>
+			</xsl:if>
+
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -7343,6 +7372,7 @@
 		<xsl:param name="split_keep-within-line"/>
 
 		<fo:table-row xsl:use-attribute-sets="dt-row-style">
+
 			<xsl:call-template name="insert_dt_cell">
 				<xsl:with-param name="key_iso" select="$key_iso"/>
 				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -7364,6 +7394,7 @@
 				<!-- border is mandatory, to calculate real width -->
 				<xsl:attribute name="border">0.1pt solid black</xsl:attribute>
 				<xsl:attribute name="text-align">left</xsl:attribute>
+
 			</xsl:if>
 
 			<fo:block xsl:use-attribute-sets="dt-block-style">
@@ -7806,6 +7837,7 @@
 				<fo:inline>
 					<xsl:for-each select="$styles/style">
 						<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
+
 					</xsl:for-each>
 					<xsl:apply-templates/>
 				</fo:inline>
@@ -9373,6 +9405,13 @@
 		</fo:block>
 	</xsl:template>
 
+	<!-- SOURCE: ... -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2">
+
+				<xsl:call-template name="termsource"/>
+
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'image']">
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
@@ -10516,9 +10555,11 @@
 								<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 							</xsl:if>
 
-							<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+							<xsl:apply-templates select="node()[not(local-name() = 'name' or local-name() = 'dl')]"/>
 						</fo:block>
 
+						<xsl:apply-templates select="*[local-name() = 'dl']"/> <!-- Key table -->
+
 								<xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
 
 					</fo:block-container>
@@ -10550,11 +10591,22 @@
 	<!-- add sourcecode highlighting -->
 	<xsl:template match="*[local-name()='sourcecode']//*[local-name()='span'][@class]" priority="2">
 		<xsl:variable name="class" select="@class"/>
+
+		<!-- Example: <1> -->
+		<xsl:variable name="is_callout">
+			<xsl:if test="parent::*[local-name() = 'dt']">
+				<xsl:variable name="dt_id" select="../@id"/>
+				<xsl:if test="ancestor::*[local-name() = 'sourcecode']//*[local-name() = 'callout'][@target = $dt_id]">true</xsl:if>
+			</xsl:if>
+		</xsl:variable>
+
 		<xsl:choose>
 			<xsl:when test="$sourcecode_css//class[@name = $class]">
 				<fo:inline>
 					<xsl:apply-templates select="$sourcecode_css//class[@name = $class]" mode="css"/>
+					<xsl:if test="$is_callout = 'true'">&lt;</xsl:if>
 					<xsl:apply-templates/>
+					<xsl:if test="$is_callout = 'true'">&gt;</xsl:if>
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
@@ -10978,6 +11030,10 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'div']">
+		<fo:block><xsl:apply-templates/></fo:block>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] |           *[local-name() = 'div'][@type = 'requirement-inherit'] |           *[local-name() = 'div'][@type = 'recommendation-inherit'] |           *[local-name() = 'div'][@type = 'permission-inherit']">
 		<fo:block xsl:use-attribute-sets="inherit-style">
 			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
@@ -11678,13 +11734,8 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'deprecates']">
-		<xsl:variable name="title-deprecated">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">deprecated</xsl:with-param>
-			</xsl:call-template>
-		</xsl:variable>
 		<fo:block xsl:use-attribute-sets="deprecates-style">
-			<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
+			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
@@ -12906,6 +12957,23 @@
 	<xsl:template match="*[local-name() = 'stem'] | *[local-name() = 'image']" mode="update_xml_step1">
 		<xsl:copy-of select="."/>
 	</xsl:template>
+
+	<!-- add @id, redundant for table auto-layout algorithm -->
+	<xsl:template match="*[local-name() = 'dl' or local-name() = 'table'][not(@id)]" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:call-template name="add_id"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template name="add_id">
+		<xsl:if test="not(@id)">
+			<!-- add @id - first element with @id plus '_element_name' -->
+			<xsl:attribute name="id"><xsl:value-of select="(.//*[@id])[1]/@id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- =========================================================================== -->
 	<!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
 	<!-- =========================================================================== -->