metanorma-un 0.9.1 → 0.9.4

data/lib/isodoc/un/un.plenary.xsl

@@ -14,7 +14,7 @@
 		<contents>			
 			<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
 			<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
-			<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
+			<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements' and local-name() != 'note' and local-name() != 'admonition']" mode="contents"/>
 			<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
 			
 			<xsl:apply-templates select="/un:un-standard/un:sections/*" mode="contents"/>
@@ -289,10 +289,10 @@
 					</xsl:if>
 					
 					<!-- Preface Pages (except Abstract, that showed in Summary on cover page`) -->
-					<xsl:if test="/un:un-standard/un:preface/*[not(local-name() = 'abstract')]">
+					<xsl:if test="/un:un-standard/un:preface/*[not(local-name() = 'abstract' or local-name() != 'note' or local-name() != 'admonition')]">
 						<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
 						<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
-						<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
+						<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements' and local-name() != 'note' and local-name() != 'admonition']"/>
 						<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
 						<fo:block break-after="page"/>
 					</xsl:if>
@@ -682,86 +682,8 @@
 		</fo:block-container>
 	</xsl:template>
 
-	<!-- Examples:
-	[b-ASM]	b-ASM, http://www.eecs.umich.edu/gasm/ (accessed 20 March 2018).
-	[b-Börger & Stärk]	b-Börger & Stärk, Börger, E., and Stärk, R. S. (2003), Abstract State Machines: A Method for High-Level System Design and Analysis, Springer-Verlag.
-	-->
-	<xsl:template match="un:annex//un:bibitem">
-		<fo:block id="{@id}" margin-top="6pt" margin-left="12mm" text-indent="-12mm">
-				<xsl:if test="un:formattedref">
-					<xsl:choose>
-						<xsl:when test="un:docidentifier[@type = 'metanorma']">
-							<xsl:attribute name="margin-left">0</xsl:attribute>
-							<xsl:attribute name="text-indent">0</xsl:attribute>
-							<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-							<!-- create list -->
-							<fo:list-block>
-								<fo:list-item>
-									<fo:list-item-label end-indent="label-end()">
-										<fo:block>
-											<xsl:apply-templates select="un:docidentifier[@type = 'metanorma']" mode="process"/>
-										</fo:block>
-									</fo:list-item-label>
-									<fo:list-item-body start-indent="body-start()">
-										<fo:block margin-left="3mm">
-											<xsl:apply-templates select="un:formattedref"/>
-										</fo:block>
-									</fo:list-item-body>
-								</fo:list-item>
-							</fo:list-block>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:apply-templates select="un:formattedref"/>
-							<xsl:apply-templates select="un:docidentifier[(@type != 'metanorma' and @type != 'metanorma-ordinal') or not(@type)]" mode="process"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:if>
-				<xsl:if test="un:title">
-					<xsl:for-each select="un:contributor">
-						<xsl:value-of select="un:organization/un:name"/>
-						<xsl:if test="position() != last()">, </xsl:if>
-					</xsl:for-each>
-					<xsl:text> (</xsl:text>
-					<xsl:variable name="date">
-						<xsl:choose>
-							<xsl:when test="un:date[@type='issued']">
-								<xsl:value-of select="un:date[@type='issued']/un:on"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:value-of select="un:date/un:on"/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:variable>
-					<xsl:value-of select="$date"/>
-					<xsl:text>) </xsl:text>
-					<fo:inline font-style="italic"><xsl:value-of select="un:title"/></fo:inline>
-					<xsl:if test="un:contributor[un:role/@type='publisher']/un:organization/un:name">
-						<xsl:text> (</xsl:text><xsl:value-of select="un:contributor[un:role/@type='publisher']/un:organization/un:name"/><xsl:text>)</xsl:text>
-					</xsl:if>
-					<xsl:text>, </xsl:text>
-					<xsl:value-of select="$date"/>
-					<xsl:text>. </xsl:text>
-					<xsl:value-of select="un:docidentifier"/>
-					<xsl:value-of select="$linebreak"/>
-					<xsl:value-of select="un:uri"/>
-				</xsl:if>
-		</fo:block>
-	</xsl:template>
-	
-	<xsl:template match="un:annex//un:bibitem//un:formattedref">
-		<xsl:apply-templates/>
-	</xsl:template>
-	
-	<xsl:template match="un:docidentifier[@type = 'metanorma' or @type = 'metanorma-ordinal']" mode="process">
-		<xsl:apply-templates/>
-	</xsl:template>
-	<xsl:template match="un:docidentifier[(@type != 'metanorma' and @type != 'metanorma-ordinal') or not(@type)]" mode="process">
-		<xsl:text> [</xsl:text><xsl:apply-templates/><xsl:text>]</xsl:text>
-	</xsl:template>
-	<xsl:template match="un:docidentifier"/>
 
 	
-	
 	<xsl:template match="un:dl" priority="2">
 		<fo:block-container margin-left="0mm">
 			<xsl:if test="parent::*[local-name() = 'note']">
@@ -836,14 +758,41 @@
 		<xsl:text>iVBORw0KGgoAAAANSUhEUgAAAJkAAAAmCAYAAADXwDkaAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA+lpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJNaWNyb3NvZnTCriBXb3JkIDIwMTYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MzM0NUVBQ0U2RUMzMTFFQUIzQjg4RDg3OEE1NEI2QzAiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MzM0NUVBQ0Y2RUMzMTFFQUIzQjg4RDg3OEE1NEI2QzAiPiA8ZGM6Y3JlYXRvcj4gPHJkZjpTZXE+IDxyZGY6bGk+RGhhbmplZTwvcmRmOmxpPiA8L3JkZjpTZXE+IDwvZGM6Y3JlYXRvcj4gPGRjOnRpdGxlPiA8cmRmOkFsdD4gPHJkZjpsaSB4bWw6bGFuZz0ieC1kZWZhdWx0Ij4xODAxNzYzPC9yZGY6bGk+IDwvcmRmOkFsdD4gPC9kYzp0aXRsZT4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVm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</xsl:text>
 	</xsl:variable>
 	
-<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:param name="table_if">false</xsl:param><xsl:param name="table_widths"/><xsl:variable name="table_widths_from_if" select="xalan:nodeset($table_widths)"/><xsl:param name="table_if_debug">false</xsl:param><xsl:variable name="isGenerateTableIF_">
+<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:param name="table_if">false</xsl:param><xsl:param name="table_widths"/><xsl:variable name="table_widths_from_if" select="xalan:nodeset($table_widths)"/><xsl:variable name="table_widths_from_if_calculated_">
+		<xsl:for-each select="$table_widths_from_if//table">
+			<xsl:copy>
+				<xsl:copy-of select="@*"/>
+				<xsl:call-template name="calculate-column-widths-autolayout-algorithm"/>
+			</xsl:copy>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="table_widths_from_if_calculated" select="xalan:nodeset($table_widths_from_if_calculated_)"/><xsl:param name="table_if_debug">false</xsl:param><xsl:variable name="isGenerateTableIF_">
 		false
 	</xsl:variable><xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/><xsl:variable name="lang">
 		<xsl:call-template name="getLang"/>
-	</xsl:variable><xsl:variable name="pageWidth_">
-		210
+	</xsl:variable><xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/><xsl:variable name="papersize_width_">
+		<xsl:choose>
+			<xsl:when test="$papersize = 'letter'">215.9</xsl:when>
+			<xsl:when test="$papersize = 'a4'">210</xsl:when>
+		</xsl:choose>
+	</xsl:variable><xsl:variable name="papersize_width" select="normalize-space($papersize_width_)"/><xsl:variable name="papersize_height_">
+		<xsl:choose>
+			<xsl:when test="$papersize = 'letter'">279.4</xsl:when>
+			<xsl:when test="$papersize = 'a4'">297</xsl:when>
+		</xsl:choose>
+	</xsl:variable><xsl:variable name="papersize_height" select="normalize-space($papersize_height_)"/><xsl:variable name="pageWidth_">
+		<xsl:choose>
+			<xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
+			<xsl:otherwise>
+				210
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_">
-		297
+		<xsl:choose>
+			<xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
+			<xsl:otherwise>
+				297
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="marginLeftRight1_">
 		40
 	</xsl:variable><xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/><xsl:variable name="marginLeftRight2_">
@@ -955,7 +904,8 @@
 				<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:attribute-set name="root-style">
+	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable><xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable><xsl:variable name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable><xsl:attribute-set name="root-style">
+		
 		
 		
 		
@@ -972,7 +922,8 @@
 		
 		
 		
-			<xsl:attribute name="font-family">Times New Roman, STIX Two Math, Source Han Sans</xsl:attribute>
+			<xsl:attribute name="font-family">Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_serif"/></xsl:attribute>
+			<xsl:attribute name="font-family-generic">Serif</xsl:attribute>
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 		
 	</xsl:attribute-set><xsl:template name="insertRootStyle">
@@ -986,17 +937,60 @@
 		</xsl:variable>
 		<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
 		
+		<xsl:variable name="font_family_generic" select="$root-style_/root-style/@font-family-generic"/>
+		
 		<xsl:for-each select="$root-style_/root-style/@*">
+		
 			<xsl:choose>
-				<xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
+				<xsl:when test="local-name() = 'font-family-generic'"><!-- skip, it's using for determine 'sans' or 'serif' --></xsl:when>
+				<xsl:when test="local-name() = 'font-family'">
+				
+					<xsl:variable name="font_regional_prefix">
+						<xsl:choose>
+							<xsl:when test="$font_family_generic = 'Sans'">Noto Sans</xsl:when>
+							<xsl:otherwise>Noto Serif</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+				
 					<xsl:attribute name="{local-name()}">
-						<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
+					
+						<xsl:variable name="font_extended">
+							<xsl:choose>
+								<xsl:when test="$lang = 'zh'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
+								<xsl:when test="$lang = 'hk'"><xsl:value-of select="$font_regional_prefix"/> HK</xsl:when>
+								<xsl:when test="$lang = 'jp'"><xsl:value-of select="$font_regional_prefix"/> JP</xsl:when>
+								<xsl:when test="$lang = 'kr'"><xsl:value-of select="$font_regional_prefix"/> KR</xsl:when>
+								<xsl:when test="$lang = 'sc'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
+								<xsl:when test="$lang = 'tc'"><xsl:value-of select="$font_regional_prefix"/> TC</xsl:when>
+							</xsl:choose>
+						</xsl:variable>
+						<xsl:if test="normalize-space($font_extended) != ''">
+							<xsl:value-of select="$font_regional_prefix"/><xsl:text>, </xsl:text>
+							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
+						</xsl:if>
+					
+						<xsl:value-of select="."/>
+						
+						<xsl:if test="$additional_fonts != ''">
+							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+						</xsl:if>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:copy-of select="."/>
 				</xsl:otherwise>
 			</xsl:choose>
+		
+			<!-- <xsl:choose>
+				<xsl:when test="local-name() = 'font-family'">
+					<xsl:attribute name="{local-name()}">
+						<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
+					</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose> -->
 		</xsl:for-each>
 	</xsl:template><xsl:attribute-set name="copyright-statement-style">
 		
@@ -1067,13 +1061,14 @@
 		
 		
 		
+		
 				
 		
 		
 		
 		
 		
-			<xsl:attribute name="font-family">Courier New</xsl:attribute>			
+			<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>			
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		
@@ -1085,7 +1080,10 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-style">
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		
 		
 	</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
 		
@@ -1111,6 +1109,7 @@
 		
 		
 		
+		
 
 	</xsl:attribute-set><xsl:attribute-set name="example-style">
 		
@@ -1126,6 +1125,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="example-body-style">
 		
 		
@@ -1145,6 +1145,7 @@
 		
 		
 		
+		
 				
 		
 			<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -1181,10 +1182,12 @@
 		
 		
 		
+		
 				
 				
 	</xsl:attribute-set><xsl:variable name="table-border_">
 		
+		
 	</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -1207,6 +1210,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
 			<xsl:attribute name="font-size">8pt</xsl:attribute>
 					
@@ -1236,6 +1240,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="border-top">0.5pt solid black</xsl:attribute>
 		
 		
@@ -1245,6 +1250,7 @@
 		
 		
 		
+				
 		
 				
 		
@@ -1331,6 +1337,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="display-align">before</xsl:attribute>
 			<xsl:attribute name="padding-left">0mm</xsl:attribute>
 			<xsl:attribute name="padding-top">2mm</xsl:attribute>
@@ -1352,7 +1359,7 @@
 		
 		
 		
-
+		
 		
 		
 		
@@ -1367,6 +1374,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="table-fn-style">
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		
@@ -1375,6 +1383,8 @@
 		
 		
 		
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -1390,6 +1400,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="vertical-align">super</xsl:attribute>
 		
 	</xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
@@ -1426,6 +1437,27 @@
 		
 		
 		
+		
+	</xsl:attribute-set><xsl:attribute-set name="dl-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			
+		
+		
+		
+		
+		
+				
+		
+		
+		
+		
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+				
+		
+		
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="dd-cell-style">
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
@@ -1457,6 +1489,7 @@
 		
 		
 				
+				
 		
 		
 		
@@ -1496,7 +1529,8 @@
 		
 		
 		
-				
+		
+		
 		
 		
 		
@@ -1512,6 +1546,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="termnote-style">
 		
 		
+				
 		
 		
 					
@@ -1524,6 +1559,8 @@
 				
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="termnote-p-style">
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">
 		<xsl:attribute name="margin-left">12mm</xsl:attribute>
 		<xsl:attribute name="margin-right">12mm</xsl:attribute>
@@ -1564,6 +1601,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
 		
 		
+		
 				
 		
 		
@@ -1608,6 +1646,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
 		
@@ -1630,17 +1669,16 @@
 	</xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
+		<xsl:attribute name="width">100%</xsl:attribute>
+		<xsl:attribute name="content-height">100%</xsl:attribute>
+		<xsl:attribute name="scaling">uniform</xsl:attribute>			
 		
 		
 		
-			<xsl:attribute name="width">100%</xsl:attribute>
-			<xsl:attribute name="content-height">100%</xsl:attribute>
 			<xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
-			<xsl:attribute name="scaling">uniform</xsl:attribute>
 		
 		
-				
-
+		
 	</xsl:attribute-set><xsl:attribute-set name="tt-style">
 		
 		
@@ -1718,10 +1756,29 @@
 		
 		
 		
+		
 			<xsl:attribute name="provisional-distance-between-starts">4mm</xsl:attribute>
 			<xsl:attribute name="margin-left">-8mm</xsl:attribute>
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="list-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			
+		
+		
+		
+		
+				
+		
+		
+		
+		
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+				
+		
+		
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="list-item-style">
 		
 		
@@ -1765,6 +1822,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="font-size">60%</xsl:attribute>
 			<xsl:attribute name="vertical-align">super</xsl:attribute>
 		
@@ -1791,6 +1849,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="font-size">9pt</xsl:attribute>
 			<xsl:attribute name="text-align">justify</xsl:attribute>
 			<xsl:attribute name="line-height">125%</xsl:attribute>
@@ -1815,6 +1874,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="font-size">60%</xsl:attribute>
 			<xsl:attribute name="vertical-align">super</xsl:attribute>
 			<xsl:attribute name="padding-right">8mm</xsl:attribute>
@@ -1834,6 +1894,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="border">0.25pt solid black</xsl:attribute>
 			<xsl:attribute name="margin-left">-3mm</xsl:attribute>
 			<xsl:attribute name="margin-right">-3mm</xsl:attribute>
@@ -1842,6 +1903,9 @@
 		
 		
 	</xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
+		
 		
 		
 		
@@ -1886,6 +1950,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="text-align">justify</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 			<xsl:attribute name="line-height">122%</xsl:attribute>
@@ -1921,6 +1986,10 @@
 		
 		
 		
+		<!-- <xsl:if test="$namespace = 'ieee'">
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
+		</xsl:if> -->
 		
 		
 		
@@ -1947,6 +2016,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
 		
 		
@@ -1973,6 +2043,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="vertical-align">super</xsl:attribute>
 		
 	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
@@ -1993,6 +2064,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="font-size">60%</xsl:attribute>
 			<xsl:attribute name="vertical-align">super</xsl:attribute>
 		
@@ -2011,6 +2083,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
 		
 		
@@ -2122,13 +2195,13 @@
 		
 	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
-			<xsl:for-each select="/*/*[local-name()='preface']/*">
+			<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 				<node id="{@id}"/>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
 		
-		<xsl:for-each select="/*/*[local-name()='preface']/*">
+		<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			
 			<!-- process Section's title -->
@@ -2194,7 +2267,7 @@
 			</xsl:for-each>
 		</figures>
 	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
-		<xsl:for-each select="/*/*[local-name()='preface']/*">
+		<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
@@ -2442,6 +2515,8 @@
 				
 				
 				
+				
+				
 			
 				
 				
@@ -2486,6 +2561,8 @@
 						
 						
 						
+						
+						
 					</xsl:element>
 				</xsl:variable>
 				
@@ -2628,23 +2705,29 @@
 	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
-			<fo:block xsl:use-attribute-sets="table-name-style">
-
-				
-				
-				
+		
+			
 				
-				<xsl:choose>
-					<xsl:when test="$continued = 'true'"> 
+					<fo:block xsl:use-attribute-sets="table-name-style">
+
 						
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:apply-templates/>
-					</xsl:otherwise>
-				</xsl:choose>
-				
+						
+						
+						
+						<xsl:choose>
+							<xsl:when test="$continued = 'true'"> 
+								
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates/>
+							</xsl:otherwise>
+						</xsl:choose>
+						
+						
+					</fo:block>
+			
 				
-			</fo:block>
+			
 		</xsl:if>
 	</xsl:template><xsl:template name="calculate-columns-numbers">
 		<xsl:param name="table-row"/>
@@ -2807,8 +2890,9 @@
 			<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
 		</xsl:if>
 	</xsl:template><xsl:template name="calculate-column-widths-autolayout-algorithm">
-		<xsl:param name="table"/>
-		<xsl:param name="if">false</xsl:param> <!-- via intermediate format -->
+		<xsl:param name="parent_table_page-width"/> <!-- for nested tables, in re-calculate step -->
+		
+		<!-- via intermediate format -->
 
 		<!-- The algorithm uses two passes through the table data and scales linearly with the size of the table -->
 	 
@@ -2819,9 +2903,8 @@
 		<!-- get current table id -->
 		<xsl:variable name="table_id" select="@id"/>
 		<!-- find table by id in the file 'table_widths' -->
-		<xsl:variable name="table-if_" select="$table_widths_from_if//table[@id = $table_id]"/>
-		<xsl:variable name="table-if" select="xalan:nodeset($table-if_)"/>
-		
+	<!-- 	<xsl:variable name="table-if_" select="$table_widths_from_if//table[@id = $table_id]"/>
+		<xsl:variable name="table-if" select="xalan:nodeset($table-if_)"/> -->
 		
 		<!-- table='<xsl:copy-of select="$table"/>' -->
 		<!-- table_id='<xsl:value-of select="$table_id"/>\ -->
@@ -2829,24 +2912,13 @@
 		<!-- table_widths_from_if='<xsl:copy-of select="$table_widths_from_if"/>' -->
 		
 		<xsl:variable name="table_with_cell_widths_">
-			<xsl:choose>
-				<xsl:when test="$if = 'true' and normalize-space($table-if) != ''"> <!-- if we read column's width from IF and there is table in IF -->
-				
-					<!-- Example: <column>10</column>
-							<column>11</column> 
-					-->
-					<xsl:apply-templates select="$table-if" mode="determine_cell_widths-if"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="xalan:nodeset($table)" mode="determine_cell_widths"/>
-				</xsl:otherwise>
-			</xsl:choose>
+			<xsl:apply-templates select="." mode="determine_cell_widths-if"/> <!-- read column's width from IF -->
 		</xsl:variable>
 		<xsl:variable name="table_with_cell_widths" select="xalan:nodeset($table_with_cell_widths_)"/>
 		
-		<xsl:if test="$table_if_debug = 'true'">
+		<!-- <xsl:if test="$table_if_debug = 'true'">
 			<xsl:copy-of select="$table_with_cell_widths"/>
-		</xsl:if>
+		</xsl:if> -->
 		
 		
 		<!-- The minimum and maximum cell widths are then used to determine the corresponding minimum and maximum widths for the columns. -->
@@ -2892,8 +2964,12 @@
 		
 		<xsl:variable name="page_width">
 			<xsl:choose>
-				<xsl:when test="$if = 'true'"><xsl:value-of select="$table-if/@page-width"/></xsl:when>
-				<xsl:otherwise>75</xsl:otherwise>
+				<xsl:when test="$parent_table_page-width != ''">
+					<xsl:value-of select="$parent_table_page-width"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="@page-width"/>
+				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
 		
@@ -2901,9 +2977,6 @@
 			<table_width>
 				<xsl:copy-of select="$table_widths"/>
 			</table_width>
-			<!-- <debug>$table_widths/@width_min=<xsl:value-of select="$table_widths/table/@width_min"/></debug>
-			<debug>$table_widths/@width_max=<xsl:value-of select="$table_widths/table/@width_max"/></debug>
-			 -->
 			<debug>$page_width=<xsl:value-of select="$page_width"/></debug>
 		</xsl:if>
 		
@@ -2914,11 +2987,11 @@
 			<xsl:when test="$table_widths/table/@width_min &gt;= $page_width and 1 = 2"> <!-- this condition isn't working see case 3 below -->
 				<!-- call old algorithm -->
 				<case1/>
-				<xsl:variable name="cols-count" select="count(xalan:nodeset($table)/*/tr[1]/td)"/>
+				<!-- <xsl:variable name="cols-count" select="count(xalan:nodeset($table)/*/tr[1]/td)"/>
 				<xsl:call-template name="calculate-column-widths-proportional">
 					<xsl:with-param name="cols-count" select="$cols-count"/>
 					<xsl:with-param name="table" select="$table"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
 			</xsl:when>
 			<!-- 2. The maximum table width fits within the available space. In this case, set the columns to their maximum widths. -->
 			<xsl:when test="$table_widths/table/@width_max &lt;= $page_width">
@@ -2962,95 +3035,49 @@
 			<xsl:otherwise><unknown_case/></xsl:otherwise>
 		</xsl:choose>
 		
+	</xsl:template><xsl:template name="get-calculated-column-widths-autolayout-algorithm">
 		
-	</xsl:template><xsl:template match="@*|node()" mode="determine_cell_widths">
-		<xsl:copy>
-				<xsl:apply-templates select="@*|node()" mode="determine_cell_widths"/>
-		</xsl:copy>
-	</xsl:template><xsl:template match="td | th" mode="determine_cell_widths">
-		<xsl:copy>
-			<xsl:copy-of select="@*"/>
+		<!-- if nested 'dl' or 'table' -->
+		<xsl:variable name="parent_table_id" select="normalize-space(ancestor::*[local-name() = 'table' or local-name() = 'dl'][1]/@id)"/>
+		<parent_table_id><xsl:value-of select="$parent_table_id"/></parent_table_id>
 			
-			 <!-- The maximum width is given by the widest line.  -->
-			<xsl:variable name="widths_max">
-				<xsl:for-each select=".//*[local-name() = 'p']">
-					<xsl:call-template name="add_width"/>
-				</xsl:for-each>
-				<xsl:if test="not(*[local-name() = 'p'])">
-					<xsl:call-template name="add_width"/>
-				</xsl:if>
-			</xsl:variable>
-			<xsl:variable name="width_max">
-				<xsl:for-each select="xalan:nodeset($widths_max)//width">
-					<xsl:sort select="." data-type="number" order="descending"/>
-					<xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if>
-				</xsl:for-each>
-			</xsl:variable>
-			<xsl:attribute name="width_max">
-				<xsl:value-of select="$width_max"/>
-			</xsl:attribute>
+		<parent_element><xsl:value-of select="local-name(..)"/></parent_element>
 			
-			<!-- The minimum width is given by the widest text element (word, image, etc.) -->
-			<!-- To do: image width -->
-			<xsl:variable name="td_text">
-				<xsl:apply-templates select="." mode="td_text"/>
-			</xsl:variable>
-			<xsl:variable name="words">
-				<xsl:variable name="string_with_added_zerospaces">
-					<xsl:call-template name="add-zero-spaces-java">
-						<xsl:with-param name="text" select="$td_text"/>
-					</xsl:call-template>
+		<xsl:variable name="parent_table_page-width_">
+			<xsl:if test="$parent_table_id != ''">
+				<!-- determine column number in the parent table -->
+				<xsl:variable name="parent_table_column_number">
+					<xsl:choose>
+						<xsl:when test="parent::*[local-name() = 'dd']">2</xsl:when>
+						<xsl:otherwise> <!-- parent is table -->
+							<xsl:value-of select="count(ancestor::*[local-name() = 'td'][1]/preceding-sibling::*[local-name() = 'td']) + 1"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:variable>
-				<xsl:call-template name="tokenize">
-					<xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​­', '  '))"/> <!-- replace zero-width-space and soft-hyphen to space -->
-				</xsl:call-template>
-			</xsl:variable>
-			
-			<xsl:variable name="max_word_length">
-				<xsl:call-template name="max_length">
-					<xsl:with-param name="words" select="xalan:nodeset($words)"/>
-				</xsl:call-template>
-			</xsl:variable>
-			<xsl:variable name="width_min">
-				<xsl:value-of select="$max_word_length"/>
-			</xsl:variable>
-			<xsl:attribute name="width_min">
-				<xsl:value-of select="$width_min"/>
-			</xsl:attribute>
-			<!-- width_max="1" width_min="1.5"> --> <!-- see 'tokenize' template, multiply 1.5 for all latin capitals -->
-			<xsl:if test="$width_min &gt; $width_max">
-				<xsl:attribute name="width_max">
-					<xsl:value-of select="$width_min"/>
-				</xsl:attribute>
+				<!-- find table by id in the file 'table_widths' and get all Nth `<column>...</column> -->
+				<xsl:value-of select="$table_widths_from_if_calculated//table[@id = $parent_table_id]/column[number($parent_table_column_number)]"/>
 			</xsl:if>
-			<xsl:if test="$width_min = 0">
-				<xsl:attribute name="width_min">1</xsl:attribute>
-			</xsl:if>
-			
-			<xsl:apply-templates select="node()" mode="determine_cell_widths"/>
-			
-		</xsl:copy>
-	</xsl:template><xsl:template name="add_width">
-		<xsl:variable name="p_text"><xsl:apply-templates select="." mode="td_text"/></xsl:variable>
-		<xsl:variable name="p_text_len_" select="string-length(normalize-space($p_text))"/>
-		
-		<xsl:variable name="p_text_len">
-			<xsl:choose>
-				<xsl:when test="normalize-space(translate($p_text, concat($upper,'0123456789'), '')) = ''"> <!-- english word in CAPITAL letters -->
-					<xsl:value-of select="$p_text_len_ * 1.5"/>
-				</xsl:when>
-				<xsl:otherwise><xsl:value-of select="$p_text_len_"/></xsl:otherwise>
-			</xsl:choose>
 		</xsl:variable>
+		<xsl:variable name="parent_table_page-width" select="normalize-space($parent_table_page-width_)"/>
 		
-		<xsl:variable name="math_addon_text">
-			<xsl:for-each select=".//*[local-name() = 'math']">
-				<xsl:apply-templates mode="td_text"/>
-			</xsl:for-each>
-		</xsl:variable>
-		<xsl:variable name="math_addon_length" select="string-length(normalize-space($math_addon_text)) * 0.2"/> <!-- plus 20% -->
+		<!-- get current table id -->
+		<xsl:variable name="table_id" select="@id"/>
+		
+		<xsl:choose>
+			<xsl:when test="$parent_table_id = '' or $parent_table_page-width = ''">
+				<!-- find table by id in the file 'table_widths' and get all `<column>...</column> -->
+				<xsl:copy-of select="$table_widths_from_if_calculated//table[@id = $table_id]/node()"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<!-- recalculate columns width based on parent table width -->
+				<xsl:for-each select="$table_widths_from_if//table[@id = $table_id]">
+					<xsl:call-template name="calculate-column-widths-autolayout-algorithm">
+						<xsl:with-param name="parent_table_page-width" select="$parent_table_page-width"/> <!-- padding-left = 2mm  = 50000-->
+					</xsl:call-template>
+				</xsl:for-each>
+			</xsl:otherwise>
+		</xsl:choose>
 		
-		<width><xsl:value-of select="$p_text_len + $math_addon_length"/></width>
 	</xsl:template><xsl:template match="@*|node()" mode="determine_cell_widths-if">
 		<xsl:copy>
 				<xsl:apply-templates select="@*|node()" mode="determine_cell_widths-if"/>
@@ -3098,12 +3125,18 @@
 		<fo:table-row>
 			<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
 				
-				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
-					<xsl:with-param name="continued">true</xsl:with-param>
-				</xsl:apply-templates>
 				
 				
 				
+						<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
+							<xsl:with-param name="continued">true</xsl:with-param>
+						</xsl:apply-templates>
+						
+						
+				
+					
+				
+				
 			</fo:table-cell>
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">		
@@ -3143,77 +3176,91 @@
 				</xsl:choose>
 			</xsl:variable>
 			
-			<fo:table keep-with-previous="always">
-				<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
-					<xsl:variable name="name" select="local-name()"/>
+			
+			<xsl:variable name="tableWithNotesAndFootnotes">
+			
+				<fo:table keep-with-previous="always">
+					<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
+						<xsl:variable name="name" select="local-name()"/>
+						<xsl:choose>
+							<xsl:when test="$name = 'border-top'">
+								<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
+							</xsl:when>
+							<xsl:when test="$name = 'border'">
+								<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+								<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
+					
+					
+					
 					<xsl:choose>
-						<xsl:when test="$name = 'border-top'">
-							<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
-						</xsl:when>
-						<xsl:when test="$name = 'border'">
-							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
-							<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+						<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
+							<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
+								<fo:table-column column-width="{@width}"/>
+							</xsl:for-each>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
+							<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
+							<xsl:call-template name="insertTableColumnWidth">
+								<xsl:with-param name="colwidths" select="$colwidths"/>
+							</xsl:call-template>
 						</xsl:otherwise>
 					</xsl:choose>
-				</xsl:for-each>
-				
-				
-				
-				<xsl:choose>
-					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
-						<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
-							<fo:table-column column-width="{@width}"/>
-						</xsl:for-each>
-					</xsl:when>
-					<xsl:otherwise>
-						<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
-						<xsl:call-template name="insertTableColumnWidth">
-							<xsl:with-param name="colwidths" select="$colwidths"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-				
-				<fo:table-body>
-					<fo:table-row>
-						<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
-							
-							
+					
+					<fo:table-body>
+						<fo:table-row>
+							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
+								
+								
 
-							
-							
-							<!-- fn will be processed inside 'note' processing -->
-							
-							
-							
-							
-							
-							
-							<!-- for BSI (not PAS) display Notes before footnotes -->
-							
-							
-							<!-- except gb and bsi  -->
-							
-									<xsl:apply-templates select="../*[local-name()='note']"/>
 								
-							
-							
-							<!-- horizontal row separator -->
-							
-							
-							<!-- fn processing -->
-							<xsl:call-template name="table_fn_display"/>
-							
-							<!-- for PAS display Notes after footnotes -->
-							
-							
-						</fo:table-cell>
-					</fo:table-row>
-				</fo:table-body>
-				
-			</fo:table>
+								
+								<!-- fn will be processed inside 'note' processing -->
+								
+								
+								
+								
+								
+								
+								<!-- for BSI (not PAS) display Notes before footnotes -->
+								
+								
+								<!-- except gb and bsi  -->
+								
+										<xsl:apply-templates select="../*[local-name()='note']"/>
+									
+								
+								
+								<!-- horizontal row separator -->
+								
+								
+								<!-- fn processing -->
+								
+										<xsl:call-template name="table_fn_display"/>
+									
+								
+								
+								<!-- for PAS display Notes after footnotes -->
+								
+								
+							</fo:table-cell>
+						</fo:table-row>
+					</fo:table-body>
+					
+				</fo:table>
+			</xsl:variable>
+			
+			<xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
+				<xsl:copy-of select="$tableWithNotesAndFootnotes"/>
+			</xsl:if>
+			
+			
+			
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='tbody']">
 		
@@ -3302,6 +3349,9 @@
 			
 			
 
+
+			
+
 			
 			
 			<xsl:call-template name="setTableRowAttributes"/>
@@ -3321,6 +3371,8 @@
 		
 			
 		
+			
+		
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -3406,6 +3458,8 @@
 			
 			
 			
+			
+			
 
 			
 			
@@ -3481,7 +3535,11 @@
 		
 		<xsl:variable name="gen_id" select="generate-id(.)"/>
 		<xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
-		<xsl:variable name="reference" select="@reference"/>
+		<xsl:variable name="reference_">
+			<xsl:value-of select="@reference"/>
+			<xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if>
+		</xsl:variable>
+		<xsl:variable name="reference" select="normalize-space($reference_)"/>
 		<!-- fn sequence number in document -->
 		<xsl:variable name="current_fn_number">
 			<xsl:choose>
@@ -3501,6 +3559,7 @@
 		<xsl:variable name="footnote_inline">
 			<fo:inline xsl:use-attribute-sets="fn-num-style">
 				
+				
 				<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
 					<xsl:value-of select="$current_fn_number_text"/>
 				</fo:basic-link>
@@ -3522,8 +3581,12 @@
 							<fo:block xsl:use-attribute-sets="fn-body-style">
 								
 								
+								
 								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
 									
+									
+									
+									
 									<xsl:value-of select="$current_fn_number_text"/>
 								</fo:inline>
 								<xsl:apply-templates/>
@@ -3556,7 +3619,7 @@
 						<xsl:copy-of select="node()"/>
 					</fn>
 				</xsl:for-each>
-				<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
+				<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='boilerplate']/* |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
 					<xsl:sort select="@displayorder" data-type="number"/>
 					<xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] |      .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
 						<!-- copy unique fn -->
@@ -3836,11 +3899,19 @@
 						
 						
 						
+						
+						<xsl:if test="ancestor::*[local-name() = 'dd' or local-name() = 'td']">
+							<xsl:attribute name="margin-top">0</xsl:attribute>
+						</xsl:if>
+						
 						<fo:block>
 							
 							
 							
 							
+							<xsl:apply-templates select="*[local-name() = 'name']">
+								<xsl:with-param name="process">true</xsl:with-param>
+							</xsl:apply-templates>
 							
 							<xsl:if test="$isGenerateTableIF = 'true'">
 								<!-- to determine start of table -->
@@ -3863,6 +3934,7 @@
 								</xsl:choose>
 								
 								
+								
 								<xsl:choose>
 									<xsl:when test="$isGenerateTableIF = 'true'">
 										<!-- generate IF for table widths -->
@@ -3991,6 +4063,18 @@
 				</xsl:if> <!-- END: a few components -->
 			</fo:block-container>
 		</fo:block-container>
+		
+		<xsl:if test="$isGenerateTableIF = 'true'"> <!-- process nested 'dl' -->
+			<xsl:apply-templates select="*[local-name() = 'dd']/*[local-name() = 'dl']"/>
+		</xsl:if>
+		
+	</xsl:template><xsl:template match="*[local-name() = 'dl']/*[local-name() = 'name']">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<fo:block xsl:use-attribute-sets="dl-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
 	</xsl:template><xsl:template name="setColumnWidth_dl">
 		<xsl:param name="colwidths"/>		
 		<xsl:param name="maxlength_dt"/>
@@ -3999,6 +4083,11 @@
 		<!-- <colwidths><xsl:copy-of select="$colwidths"/></colwidths> -->
 		
 		<xsl:choose>
+			<xsl:when test="xalan:nodeset($colwidths)/autolayout">
+				<xsl:call-template name="insertTableColumnWidth">
+					<xsl:with-param name="colwidths" select="$colwidths"/>
+				</xsl:call-template>
+			</xsl:when>
 			<xsl:when test="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table -->
 				<fo:table-column column-width="50%"/>
 				<fo:table-column column-width="50%"/>
@@ -4251,12 +4340,24 @@
 			</td>
 			<td>
 				
-						<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()"/>
+						<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/>
+						
+						<!-- get paragraphs from nested 'dl' -->
+						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/>
+						
 					
 			</td>
 		</tr>
 		
-	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if"/><xsl:template match="*[local-name()='em']">
+	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if"/><xsl:template match="*[local-name()='dl']" mode="dl_if_nested">
+		<xsl:for-each select="*[local-name() = 'dt']">
+			<p>
+				<xsl:copy-of select="node()"/>
+				<xsl:text> </xsl:text>
+				<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'p']/node()"/>
+			</p>
+		</xsl:for-each>
+	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if_nested"/><xsl:template match="*[local-name()='em']">
 		<fo:inline font-style="italic">
 			<xsl:apply-templates/>
 		</fo:inline>
@@ -4287,7 +4388,7 @@
 				
 				
 				
-				
+				 <!-- 10 -->
 				
 				
 				
@@ -5159,6 +5260,13 @@
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
 			
+			<xsl:if test="starts-with(normalize-space(@target), 'mailto:')">
+				<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
+			</xsl:if>
+			
+			
+			
+			
 			
 			
 			
@@ -5386,6 +5494,7 @@
 				
 
 				
+				
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
 				<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -5407,6 +5516,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 						<xsl:text>:</xsl:text>
 					
 					
@@ -5426,6 +5536,7 @@
 				</xsl:when>
 				<xsl:otherwise>
 					
+					
 									
 						<xsl:text> – </xsl:text>
 					
@@ -5437,7 +5548,19 @@
 			<xsl:value-of select="$suffix"/>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<xsl:variable name="num"><xsl:number/></xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
+				<fo:inline xsl:use-attribute-sets="termnote-p-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="termnote-p-style">						
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'terms']">
 		<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
 		<fo:block id="{@id}">
@@ -6192,6 +6315,9 @@
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 				
 				
+				
+				
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -6252,9 +6378,9 @@
 					<xsl:apply-templates/>
 				</xsl:otherwise>
 			</xsl:choose>
-	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
+	</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
 		<xsl:copy>
@@ -6325,9 +6451,12 @@
 						
 						
 						
+						<!-- 9 -->
 						
 						
-						
+						<!-- <xsl:if test="$namespace = 'ieee'">							
+							<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
+						</xsl:if> -->
 						
 								
 						
@@ -6409,7 +6538,7 @@
 		<xsl:for-each select="xalan:nodeset($text_step4)/node()">
 			<xsl:choose>
 				<xsl:when test="local-name() = 'interspers'"> <!-- word with length more than 30 will be interspersed with zero-width space -->
-					<xsl:call-template name="interspers">
+					<xsl:call-template name="interspers-java">
 						<xsl:with-param name="str" select="."/>
 					</xsl:call-template>
 				</xsl:when>
@@ -6459,6 +6588,10 @@
 				<xsl:with-param name="char" select="$char"/>
 			</xsl:call-template>
 		</xsl:if>
+	</xsl:template><xsl:template name="interspers-java">
+		<xsl:param name="str"/>
+		<xsl:param name="char" select="$zero_width_space"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($str),'([^ -.:=_—])',concat('$1', $char))"/> <!-- insert $char after each char excep space, - . : = _ etc. -->
 	</xsl:template><xsl:template match="*" mode="syntax_highlight">
 		<xsl:apply-templates mode="syntax_highlight"/>
 	</xsl:template><xsl:variable name="syntax_highlight_styles_">
@@ -6768,10 +6901,14 @@
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
 		<xsl:variable name="element">inline
 			
+			
 		</xsl:variable>		
 		<xsl:choose>			
 			<xsl:when test="contains($element, 'block')">
 				<fo:block xsl:use-attribute-sets="example-p-style">
+				
+					
+						
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
@@ -6879,6 +7016,7 @@
 					</xsl:if>
 					<fo:block xsl:use-attribute-sets="example-p-style">
 						
+						
 							<xsl:if test="$num = 1">
 								<xsl:attribute name="margin-left">5mm</xsl:attribute>
 							</xsl:if>
@@ -7039,6 +7177,8 @@
 					
 					
 					
+					
+					
 					<fo:basic-link fox:alt-text="{@citeas}">
 						<xsl:if test="normalize-space(@citeas) = ''">
 							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -7103,6 +7243,7 @@
 			
 			
 			
+			
 				<xsl:choose>
 					<xsl:when test="ancestor::un:sections and $depth = 1">12</xsl:when>
 					<xsl:when test="ancestor::un:sections">8</xsl:when>					
@@ -7418,6 +7559,11 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
+	
+		<xsl:apply-templates select="*[local-name() = 'name']">
+			<xsl:with-param name="process">true</xsl:with-param>
+		</xsl:apply-templates>
+	
 		<fo:list-block xsl:use-attribute-sets="list-style">
 		
 			
@@ -7428,12 +7574,23 @@
 
 			
 			
+			<xsl:if test="*[local-name() = 'name']">
+				<xsl:attribute name="margin-top">0pt</xsl:attribute>
+			</xsl:if>
+			
 			<xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
 		</fo:list-block>
 		<!-- <xsl:for-each select="./iho:note">
 			<xsl:call-template name="note"/>
 		</xsl:for-each> -->
 		<xsl:apply-templates select="./*[local-name() = 'note']"/>
+	</xsl:template><xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<fo:block xsl:use-attribute-sets="list-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='li']">
 		<fo:list-item xsl:use-attribute-sets="list-item-style">
 			<xsl:copy-of select="@id"/>
@@ -7445,6 +7602,8 @@
 				
 					
 				
+					
+				
 					<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 					<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
 						<xsl:call-template name="append_add-style"/>
@@ -7700,7 +7859,7 @@
 				</fo:block>
 			
 
-	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
 		
 		
 				<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
@@ -7711,22 +7870,11 @@
 	</xsl:template><xsl:template name="processBibitem">
 		
 		
+				<!-- start UNECE bibitem processing -->
 				<fo:inline padding-right="5mm">[<xsl:value-of select="un:docidentifier"/>]</fo:inline><xsl:value-of select="un:docidentifier"/>
-				<xsl:if test="un:title">
-					<fo:inline font-style="italic">
-						<xsl:text>, </xsl:text>
-						<xsl:choose>
-							<xsl:when test="un:title[@type = 'main' and @language = 'en']">
-								<xsl:apply-templates select="un:title[@type = 'main' and @language = 'en']"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates select="un:title"/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</fo:inline>
-				</xsl:if>
+				<xsl:text> </xsl:text>
 				<xsl:apply-templates select="un:formattedref"/>
-
+				<!-- END UNECE bibitem processing -->
 			
 	</xsl:template><xsl:template name="processBibitemDocId">
 		<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
@@ -8034,12 +8182,16 @@
 				<fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
 					
 					
+					
+					
 				
 					
 					
 							<fo:block-container xsl:use-attribute-sets="admonition-container-style">
 							
 								
+							
+								
 										<fo:block-container margin-left="0mm" margin-right="0mm">
 											<fo:block>
 												<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
@@ -8051,25 +8203,32 @@
 				</fo:block-container>
 			
 	</xsl:template><xsl:template name="displayAdmonitionName">
-		
+		<xsl:param name="sep"/> <!-- Example: ' - ' -->
+		<!-- <xsl:choose>
+			<xsl:when test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
+				<xsl:choose>
+					<xsl:when test="@type='important'"><xsl:apply-templates select="@type"/></xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise>
 				<xsl:apply-templates select="*[local-name() = 'name']"/>
 				<xsl:if test="not(*[local-name() = 'name'])">
 					<xsl:apply-templates select="@type"/>
 				</xsl:if>
-			
-	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
-		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name() = 'admonition']/@type">
-		<xsl:variable name="admonition_type_">
-			<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">admonition.<xsl:value-of select="."/></xsl:with-param>
-			</xsl:call-template>
+			</xsl:otherwise>
+		</xsl:choose> -->
+		<xsl:variable name="name">
+			<xsl:apply-templates select="*[local-name() = 'name']"/>
 		</xsl:variable>
-		<xsl:variable name="admonition_type" select="normalize-space(java:toUpperCase(java:java.lang.String.new($admonition_type_)))"/>
-		<xsl:value-of select="$admonition_type"/>
-		<xsl:if test="$admonition_type = ''">
-			<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
+		<xsl:copy-of select="$name"/>
+		<xsl:if test="normalize-space($name) != ''">
+			<xsl:value-of select="$sep"/>
 		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
+		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
 		
 				<fo:block xsl:use-attribute-sets="admonition-p-style">
@@ -8240,6 +8399,8 @@
 			</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name() = 'lang_none']">
+		<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
 	</xsl:template><xsl:template name="printEdition">
 		<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
 		<xsl:text> </xsl:text>
@@ -8346,6 +8507,27 @@
 			</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="getMonthLocalizedByNum">
+		<xsl:param name="num"/>
+		<xsl:variable name="monthStr">
+			<xsl:choose>
+				<xsl:when test="$num = '01'">january</xsl:when>
+				<xsl:when test="$num = '02'">february</xsl:when>
+				<xsl:when test="$num = '03'">march</xsl:when>
+				<xsl:when test="$num = '04'">april</xsl:when>
+				<xsl:when test="$num = '05'">may</xsl:when>
+				<xsl:when test="$num = '06'">june</xsl:when>
+				<xsl:when test="$num = '07'">july</xsl:when>
+				<xsl:when test="$num = '08'">august</xsl:when>
+				<xsl:when test="$num = '09'">september</xsl:when>
+				<xsl:when test="$num = '10'">october</xsl:when>
+				<xsl:when test="$num = '11'">november</xsl:when>
+				<xsl:when test="$num = '12'">december</xsl:when>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:call-template name="getLocalizedString">
+			<xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param>
+		</xsl:call-template>
 	</xsl:template><xsl:template name="insertKeywords">
 		<xsl:param name="sorting" select="'true'"/>
 		<xsl:param name="charAtEnd" select="'.'"/>
@@ -8417,7 +8599,7 @@
 					<dc:description>
 						<xsl:variable name="abstract">
 							
-									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
+									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>									
 								
 						</xsl:variable>
 						<xsl:value-of select="normalize-space($abstract)"/>
@@ -8539,6 +8721,7 @@
 			
 			
 			
+			
 				<xsl:value-of select="document('')//*/namespace::un"/>