metanorma-ogc 2.3.7 → 2.3.8

data/lib/isodoc/ogc/ogc.best-practice.xsl

@@ -46,6 +46,8 @@
 			<xsl:otherwise>rgb(246, 223, 140)</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
+	<xsl:variable name="color_dl_dt">rgb(215,243,255)</xsl:variable>
+	<xsl:variable name="color_dl_dd">rgb(242,251,255)</xsl:variable>
 	<xsl:variable name="color_blue">rgb(33, 55, 92)</xsl:variable>
 
 	<xsl:variable name="toc_recommendations_">
@@ -845,9 +847,8 @@
 	</xsl:template>
 
 	<!-- ====== -->
-	<!-- title      -->
+	<!-- title  -->
 	<!-- ====== -->
-
 	<xsl:template match="ogc:title" name="title">
 
 		<xsl:variable name="level">
@@ -957,9 +958,9 @@
 				</xsl:element>
 			</xsl:otherwise>
 		</xsl:choose>
-
 	</xsl:template>
 	<!-- ====== -->
+	<!-- END: title  -->
 	<!-- ====== -->
 
 	<xsl:template match="ogc:p" name="paragraph">
@@ -993,6 +994,9 @@
 			</xsl:if>
 			<xsl:if test="ancestor::ogc:dd and not(ancestor::ogc:table)">
 				<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
+				<xsl:if test="not(ancestor::ogc:dd[1]/following-sibling::ogc:dt)">
+					<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+				</xsl:if>
 			</xsl:if>
 
 			<xsl:apply-templates>
@@ -2180,6 +2184,13 @@
 	<!-- ========================== -->
 	<!-- Definition's list styles -->
 	<!-- ========================== -->
+
+	<xsl:attribute-set name="dl-block-style">
+
+			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="dt-row-style">
 
 			<xsl:attribute name="min-height">8.5mm</xsl:attribute>
@@ -2187,6 +2198,11 @@
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="dt-cell-style">
+
+			<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
+			<xsl:attribute name="padding-right">5mm</xsl:attribute>
+			<xsl:attribute name="padding-left">1mm</xsl:attribute>
+
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="dt-block-style">
@@ -2207,6 +2223,9 @@
 
 	<xsl:attribute-set name="dd-cell-style">
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
+
+			<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
+
 	</xsl:attribute-set>
 
 	<!-- ========================== -->
@@ -2352,6 +2371,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>
@@ -2904,7 +2927,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>
@@ -3271,7 +3294,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>
@@ -3315,7 +3338,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>
 
@@ -3416,6 +3439,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/*)"/>
@@ -3772,7 +3800,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 -->
@@ -3815,7 +3843,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">
 
@@ -3885,6 +3913,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">
 
@@ -4542,7 +4571,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"/>
 
@@ -4550,6 +4579,18 @@
 						<xsl:attribute name="margin-left">0mm</xsl:attribute>
 					</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>
@@ -4983,6 +5024,11 @@
 		<xsl:param name="split_keep-within-line"/>
 
 		<fo:table-row xsl:use-attribute-sets="dt-row-style">
+
+				<xsl:if test="not(following-sibling::ogc:dt) or ancestor::ogc:sourcecode"> <!-- last item -->
+					<xsl:attribute name="min-height">3mm</xsl:attribute>
+				</xsl:if>
+
 			<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"/>
@@ -5004,8 +5050,17 @@
 				<!-- 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:attribute name="padding-left">6mm</xsl:attribute>
+					<!-- <xsl:attribute name="padding-left">6.5mm</xsl:attribute> -->
+
 			</xsl:if>
 
+				<xsl:if test="not(ancestor::ogc:sourcecode)">
+					<!-- <xsl:attribute name="border-left">1pt solid <xsl:value-of select="$color_design"/></xsl:attribute> -->
+					<xsl:attribute name="background-color"><xsl:value-of select="$color_dl_dt"/></xsl:attribute>
+				</xsl:if>
+
 			<fo:block xsl:use-attribute-sets="dt-block-style">
 				<xsl:copy-of select="@id"/>
 
@@ -5013,6 +5068,13 @@
 					<xsl:attribute name="margin-top">0</xsl:attribute>
 				</xsl:if>
 
+					<xsl:if test="ancestor::ogc:sourcecode">
+						<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="not(following-sibling::ogc:dt)"> <!-- last dt -->
+						<xsl:attribute name="margin-bottom">0</xsl:attribute>
+					</xsl:if>
+
 				<xsl:apply-templates>
 					<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
 				</xsl:apply-templates>
@@ -5032,6 +5094,10 @@
 				<xsl:attribute name="border">0.1pt solid black</xsl:attribute>
 			</xsl:if>
 
+				<xsl:if test="not(ancestor::ogc:sourcecode)">
+					<xsl:attribute name="background-color"><xsl:value-of select="$color_dl_dd"/></xsl:attribute>
+				</xsl:if>
+
 			<fo:block>
 
 				<xsl:if test="$isGenerateTableIF = 'true'">
@@ -5451,6 +5517,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>
@@ -6960,6 +7027,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"/>
@@ -8120,9 +8194,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 -->
 
 							<xsl:if test="parent::*[local-name() = 'example']">
@@ -8158,11 +8234,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>
@@ -8594,6 +8681,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/>
@@ -9300,13 +9391,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>
 
@@ -10537,6 +10623,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/ogc/ogc.change-request-supporting-document.xsl

@@ -46,6 +46,8 @@
 			<xsl:otherwise>rgb(246, 223, 140)</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
+	<xsl:variable name="color_dl_dt">rgb(215,243,255)</xsl:variable>
+	<xsl:variable name="color_dl_dd">rgb(242,251,255)</xsl:variable>
 	<xsl:variable name="color_blue">rgb(33, 55, 92)</xsl:variable>
 
 	<xsl:variable name="toc_recommendations_">
@@ -845,9 +847,8 @@
 	</xsl:template>
 
 	<!-- ====== -->
-	<!-- title      -->
+	<!-- title  -->
 	<!-- ====== -->
-
 	<xsl:template match="ogc:title" name="title">
 
 		<xsl:variable name="level">
@@ -957,9 +958,9 @@
 				</xsl:element>
 			</xsl:otherwise>
 		</xsl:choose>
-
 	</xsl:template>
 	<!-- ====== -->
+	<!-- END: title  -->
 	<!-- ====== -->
 
 	<xsl:template match="ogc:p" name="paragraph">
@@ -993,6 +994,9 @@
 			</xsl:if>
 			<xsl:if test="ancestor::ogc:dd and not(ancestor::ogc:table)">
 				<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
+				<xsl:if test="not(ancestor::ogc:dd[1]/following-sibling::ogc:dt)">
+					<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+				</xsl:if>
 			</xsl:if>
 
 			<xsl:apply-templates>
@@ -2180,6 +2184,13 @@
 	<!-- ========================== -->
 	<!-- Definition's list styles -->
 	<!-- ========================== -->
+
+	<xsl:attribute-set name="dl-block-style">
+
+			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="dt-row-style">
 
 			<xsl:attribute name="min-height">8.5mm</xsl:attribute>
@@ -2187,6 +2198,11 @@
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="dt-cell-style">
+
+			<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
+			<xsl:attribute name="padding-right">5mm</xsl:attribute>
+			<xsl:attribute name="padding-left">1mm</xsl:attribute>
+
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="dt-block-style">
@@ -2207,6 +2223,9 @@
 
 	<xsl:attribute-set name="dd-cell-style">
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
+
+			<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
+
 	</xsl:attribute-set>
 
 	<!-- ========================== -->
@@ -2352,6 +2371,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>
@@ -2904,7 +2927,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>
@@ -3271,7 +3294,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>
@@ -3315,7 +3338,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>
 
@@ -3416,6 +3439,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/*)"/>
@@ -3772,7 +3800,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 -->
@@ -3815,7 +3843,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">
 
@@ -3885,6 +3913,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">
 
@@ -4542,7 +4571,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"/>
 
@@ -4550,6 +4579,18 @@
 						<xsl:attribute name="margin-left">0mm</xsl:attribute>
 					</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>
@@ -4983,6 +5024,11 @@
 		<xsl:param name="split_keep-within-line"/>
 
 		<fo:table-row xsl:use-attribute-sets="dt-row-style">
+
+				<xsl:if test="not(following-sibling::ogc:dt) or ancestor::ogc:sourcecode"> <!-- last item -->
+					<xsl:attribute name="min-height">3mm</xsl:attribute>
+				</xsl:if>
+
 			<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"/>
@@ -5004,8 +5050,17 @@
 				<!-- 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:attribute name="padding-left">6mm</xsl:attribute>
+					<!-- <xsl:attribute name="padding-left">6.5mm</xsl:attribute> -->
+
 			</xsl:if>
 
+				<xsl:if test="not(ancestor::ogc:sourcecode)">
+					<!-- <xsl:attribute name="border-left">1pt solid <xsl:value-of select="$color_design"/></xsl:attribute> -->
+					<xsl:attribute name="background-color"><xsl:value-of select="$color_dl_dt"/></xsl:attribute>
+				</xsl:if>
+
 			<fo:block xsl:use-attribute-sets="dt-block-style">
 				<xsl:copy-of select="@id"/>
 
@@ -5013,6 +5068,13 @@
 					<xsl:attribute name="margin-top">0</xsl:attribute>
 				</xsl:if>
 
+					<xsl:if test="ancestor::ogc:sourcecode">
+						<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="not(following-sibling::ogc:dt)"> <!-- last dt -->
+						<xsl:attribute name="margin-bottom">0</xsl:attribute>
+					</xsl:if>
+
 				<xsl:apply-templates>
 					<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
 				</xsl:apply-templates>
@@ -5032,6 +5094,10 @@
 				<xsl:attribute name="border">0.1pt solid black</xsl:attribute>
 			</xsl:if>
 
+				<xsl:if test="not(ancestor::ogc:sourcecode)">
+					<xsl:attribute name="background-color"><xsl:value-of select="$color_dl_dd"/></xsl:attribute>
+				</xsl:if>
+
 			<fo:block>
 
 				<xsl:if test="$isGenerateTableIF = 'true'">
@@ -5451,6 +5517,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>
@@ -6960,6 +7027,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"/>
@@ -8120,9 +8194,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 -->
 
 							<xsl:if test="parent::*[local-name() = 'example']">
@@ -8158,11 +8234,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>
@@ -8594,6 +8681,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/>
@@ -9300,13 +9391,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>
 
@@ -10537,6 +10623,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 -->
 	<!-- =========================================================================== -->