metanorma-nist 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fccac1954f210d0d2d8c3bc75a3061c258e6845506b8bac3459eedbf5d96081
-  data.tar.gz: 6e83a19e2381028a6542f3df7d18a44665c3139639125d64f9a08a796a8aee31
+  metadata.gz: 6a69082cb58bde5a1305caea0316414723f519a71c550efe43ac3e894f028436
+  data.tar.gz: 73b99485a31a90a15e6936d688fc4c677a2d948e95bc1896d822d7b02cda37f6
 SHA512:
-  metadata.gz: cd062e38d19de3e2b1661726c3817cddbc83f24bcd4778e407fff66b19d0e6201f430f243ac8b53e831ee8718b62eccb35807620cdfea45991266f312d544d62
-  data.tar.gz: 35e16075338432c4b5c33568a2f0e474b0a3f7a37f8b18105d4950608f69e90f26d75ab088ce5c0c5a38e40372e836409e41024dd8b37df1489ac0d4337e16c9
+  metadata.gz: 59de2efb8bb15621e6479ba749b94228d0c61b0b244da02a6c95dc63668797c890090c49abe386a913ef096664b771a42e99b53d39ed698d4d30e45b2e324393
+  data.tar.gz: 108786af3a06da4539acb195f2d42c21b66fb0d7b05543ed800202c117a98531c1cd83ec1f31f3a8249ef7429458407c7d7991fc41052cb3c522ed47762d9afd

data/lib/asciidoctor/nist/isodoc.rng

@@ -42,7 +42,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>

data/lib/isodoc/nist/base_convert.rb

@@ -127,7 +127,6 @@ module IsoDoc
       def info(isoxml, out)
         @meta.series isoxml, out
         @meta.commentperiod isoxml, out
-        @meta.note isoxml, out
         super
       end
 

data/lib/isodoc/nist/html/htmlstyle.css

@@ -9,7 +9,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0; }

data/lib/isodoc/nist/metadata.rb

@@ -230,6 +230,7 @@ module IsoDoc
         note = xml.at(ns("//bibdata/note[@type = "\
                          "'withdrawal-announcement-link']"))&.text and
                         set(:withdrawal_announcement_link, note)
+        super
       end
     end
   end

data/lib/isodoc/nist/nist.cswp.xsl

@@ -51,7 +51,7 @@
 
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root font-family="Times New Roman, STIX2Math" font-size="12pt" xml:lang="{$lang}">
+		<fo:root font-family="Times New Roman, STIX Two Math" font-size="12pt" xml:lang="{$lang}">
 			<fo:layout-master-set>
 				<!-- Cover pages -->
 				<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
@@ -83,6 +83,10 @@
 			</fo:layout-master-set>
 
 			<xsl:call-template name="addPDFUAmeta"/>
+			
+			<xsl:call-template name="addBookmarks">
+				<xsl:with-param name="contents" select="$contents"/>
+			</xsl:call-template>
 
 			<!-- cover page -->
 			<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
@@ -429,9 +433,17 @@
 				<xsl:otherwise>true</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
+
+
+		<xsl:variable name="skip">
+			<xsl:choose>
+				<xsl:when test="ancestor-or-self::nist:bibitem">true</xsl:when>
+				<xsl:when test="ancestor-or-self::nist:term">true</xsl:when>				
+				<xsl:otherwise>false</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		
-		
-		<xsl:if test="$display = 'true'">		
+		<xsl:if test="$skip = 'false'">
 		
 			<xsl:variable name="section">
 				<xsl:call-template name="getSection"/>
@@ -445,12 +457,13 @@
 				<xsl:value-of select="local-name()"/>
 			</xsl:variable>
 			
-			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}">
-				<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" display="{$display}">
+				<title>
+					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+				</title>
+				<xsl:apply-templates mode="contents"/>
 			</item>
-			<xsl:apply-templates mode="contents"/>
-		</xsl:if>	
-		
+		</xsl:if>
 	</xsl:template>
 	
 
@@ -1104,7 +1117,12 @@
 			
 			
 		</title-toc>
-		<title-toc lang="fr">Sommaire</title-toc>
+		<title-toc lang="fr">
+			
+				<xsl:text>Sommaire</xsl:text>
+			
+			
+			</title-toc>
 		
 			<title-toc lang="zh">Contents</title-toc>
 		
@@ -1192,10 +1210,19 @@
 		
 	</xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:template name="getTitle">
 		<xsl:param name="name"/>
-		<xsl:variable name="lang">
-			<xsl:call-template name="getLang"/>
+		<xsl:param name="lang"/>
+		<xsl:variable name="lang_">
+			<xsl:choose>
+				<xsl:when test="$lang != ''">
+					<xsl:value-of select="$lang"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:call-template name="getLang"/>
+				</xsl:otherwise>
+			</xsl:choose>
 		</xsl:variable>
-		<xsl:variable name="title_" select="$titles/*[local-name() = $name][@lang = $lang]"/>
+		<xsl:variable name="language" select="normalize-space($lang_)"/>
+		<xsl:variable name="title_" select="$titles/*[local-name() = $name][@lang = $language]"/>
 		<xsl:choose>
 			<xsl:when test="normalize-space($title_) != ''">
 				<xsl:value-of select="$title_"/>
@@ -1341,6 +1368,7 @@
 				
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
 		
 		
@@ -1561,6 +1589,8 @@
 		
 		
 		
+		
+		
 		<!-- $namespace = 'iso' or  -->
 		
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -1596,6 +1626,7 @@
 				<xsl:with-param name="table" select="$simple-table"/>
 			</xsl:call-template>
 		</xsl:variable>
+		<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
 		
 		<!-- <xsl:variable name="colwidths2">
 			<xsl:call-template name="calculate-column-widths">
@@ -1616,40 +1647,62 @@
 		
 		<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">			
 			
+			
 				<xsl:attribute name="space-after">6pt</xsl:attribute>
 			
+						
+						
+						
 			
 			
+				<xsl:if test="ancestor::*[local-name()='annex'] or ancestor::*[local-name()='preface']">
+					<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
+					<xsl:attribute name="font-size">10pt</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="not(ancestor::*[local-name()='annex'] or ancestor::*[local-name()='preface'])">
+					<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
+					<xsl:attribute name="font-size">12pt</xsl:attribute>
+				</xsl:if>
+				<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 			
+									
 			
-						
 			
 			
 			
-			<fo:table id="{@id}" table-layout="fixed" width="100%" margin-left="{$margin-left}mm" margin-right="{$margin-left}mm" table-omit-footer-at-break="true">
-				
-				
-				
-				
-				
-				
-					<xsl:if test="ancestor::*[local-name()='annex'] or ancestor::*[local-name()='preface']">
-						<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
-						<xsl:attribute name="font-size">10pt</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="not(ancestor::*[local-name()='annex'] or ancestor::*[local-name()='preface'])">
-						<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
-						<xsl:attribute name="font-size">12pt</xsl:attribute>
-					</xsl:if>
-					<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			
+			
+			
+			<xsl:variable name="table_attributes">
+				<attribute name="table-layout">fixed</attribute>
+				<attribute name="width">100%</attribute>
+				<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
+				<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
 				
 				
 				
 				
+								
+								
+								
 				
+								
 				
+			</xsl:variable>
+			
+			
+			<fo:table id="{@id}" table-omit-footer-at-break="true">
 				
+				<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">					
+					<xsl:attribute name="{@name}">
+						<xsl:value-of select="."/>
+					</xsl:attribute>
+				</xsl:for-each>
 				
+				<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>				
+				<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>
 				
 				<xsl:for-each select="xalan:nodeset($colwidths)//column">
 					<xsl:choose>
@@ -1673,6 +1726,33 @@
 				
 			</fo:table>
 			
+			<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
+				<xsl:call-template name="insertTableFooterInSeparateTable">
+					<xsl:with-param name="table_attributes" select="$table_attributes"/>
+					<xsl:with-param name="colwidths" select="$colwidths"/>				
+				</xsl:call-template>
+			</xsl:for-each>
+			
+			<!-- insert footer as table -->
+			<!-- <fo:table>
+				<xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
+					<xsl:attribute name="{@name}">
+						<xsl:value-of select="."/>
+					</xsl:attribute>
+				</xsl:for-each>
+				
+				<xsl:for-each select="xalan:nodeset($colwidths)//column">
+					<xsl:choose>
+						<xsl:when test=". = 1 or . = 0">
+							<fo:table-column column-width="proportional-column-width(2)"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<fo:table-column column-width="proportional-column-width({.})"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:for-each>
+			</fo:table>-->
+			
 			
 			
 			
@@ -1737,6 +1817,13 @@
 						<xsl:for-each select="xalan:nodeset($table)//tr">
 							<xsl:variable name="td_text">
 								<xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
+								
+								<!-- <xsl:if test="$namespace = 'bipm'">
+									<xsl:for-each select="*[local-name()='td'][$curr-col]//*[local-name()='math']">									
+										<word><xsl:value-of select="normalize-space(.)"/></word>
+									</xsl:for-each>
+								</xsl:if> -->
+								
 							</xsl:variable>
 							<xsl:variable name="words">
 								<xsl:variable name="string_with_added_zerospaces">
@@ -1796,11 +1883,14 @@
 		<xsl:value-of select="*[local-name()='origin']/@citeas"/>
 	</xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
 		<xsl:value-of select="@target"/>
+	</xsl:template><xsl:template match="*[local-name()='math']" mode="td_text">
+		<xsl:variable name="math_text" select="normalize-space(.)"/>
+		<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
 	</xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
 		<xsl:param name="cols-count"/>
 		<!-- font-weight="bold" -->
 		<fo:table-header>
-						
+			
 			<xsl:apply-templates/>
 		</fo:table-header>
 	</xsl:template><xsl:template name="table-header-title">
@@ -1825,6 +1915,13 @@
 	</xsl:template><xsl:template match="*[local-name()='tfoot']"/><xsl:template match="*[local-name()='tfoot']" mode="process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template name="insertTableFooter">
+		<xsl:param name="cols-count"/>
+		<xsl:if test="../*[local-name()='tfoot']">
+			<fo:table-footer>			
+				<xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
+			</fo:table-footer>
+		</xsl:if>
+	</xsl:template><xsl:template name="insertTableFooter2">
 		<xsl:param name="cols-count"/>
 		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
 		<xsl:if test="../*[local-name()='tfoot'] or           $isNoteOrFnExist = 'true'">
@@ -1846,11 +1943,15 @@
 							<!-- fn will be processed inside 'note' processing -->
 							
 							
-							<!-- except gb -->
+							
+							<!-- except gb and bipm -->
 							
 								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
 							
 							
+							
+							
+							
 							<!-- horizontal row separator -->
 							
 							
@@ -1864,6 +1965,84 @@
 			</fo:table-footer>
 		
 		</xsl:if>
+	</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
+		<xsl:param name="table_attributes"/>
+		<xsl:param name="colwidths"/>
+		
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
+		
+		<xsl:if test="$isNoteOrFnExist = 'true'">
+		
+			<xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
+			
+			<fo:table keep-with-previous="always">
+				<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
+					<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:for-each select="xalan:nodeset($colwidths)//column">
+					<xsl:choose>
+						<xsl:when test=". = 1 or . = 0">
+							<fo:table-column column-width="proportional-column-width(2)"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<fo:table-column column-width="proportional-column-width({.})"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:for-each>
+				
+				<fo:table-body>
+					<fo:table-row>
+						<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
+							
+							
+							
+							<!-- fn will be processed inside 'note' processing -->
+							
+							
+							
+							<!-- except gb and bipm -->
+							
+								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
+							
+							
+							<!-- <xsl:if test="$namespace = 'bipm'">
+								<xsl:choose>
+									<xsl:when test="ancestor::*[local-name()='preface']">
+										show Note under table in preface (ex. abstract) sections
+										<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
+									</xsl:when>
+									<xsl:otherwise>
+										empty, because notes show at page side in main sections
+									<fo:block/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:if> -->
+							
+							
+							<!-- horizontal row separator -->
+							
+							
+							<!-- fn processing -->
+							<xsl:call-template name="fn_display"/>
+							
+						</fo:table-cell>
+					</fo:table-row>
+				</fo:table-body>
+				
+			</fo:table>
+		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='tbody']">
 		
 		<xsl:variable name="cols-count">
@@ -1919,8 +2098,8 @@
 					
 				</xsl:if>
 				
-								
-								
+				
+				
 				
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -1948,6 +2127,7 @@
 			
 			
 			
+			
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
 					<xsl:value-of select="@colspan"/>
@@ -1987,7 +2167,7 @@
 			
 			
 			
-						
+			
 			
 			
 			
@@ -1998,6 +2178,7 @@
 					<xsl:attribute name="font-weight">normal</xsl:attribute>
 				</xsl:if>
 			
+			
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
 					<xsl:value-of select="@colspan"/>
@@ -2021,14 +2202,17 @@
 				
 				
 				
+				
+				
 				<fo:inline padding-right="2mm">
 					
 					
 					
-				
+					
 					<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 						
 				</fo:inline>
+				
 				<xsl:apply-templates mode="process"/>
 			</fo:block>
 		
@@ -2052,6 +2236,7 @@
 					
 					
 					
+					
 					<fo:inline font-size="80%" padding-right="5mm" id="{@id}">
 						
 							<xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -2063,14 +2248,17 @@
 						
 							<xsl:attribute name="font-size">10pt</xsl:attribute>
 						
+						
 						<xsl:value-of select="@reference"/>
 						
+						
 					</fo:inline>
 					<fo:inline>
 						
 							<xsl:attribute name="font-size">10pt</xsl:attribute>
 						
-						<xsl:apply-templates/>
+						<!-- <xsl:apply-templates /> -->
+						<xsl:copy-of select="./node()"/>
 					</fo:inline>
 				</fo:block>
 			</xsl:if>
@@ -2107,7 +2295,20 @@
 		<xsl:variable name="following_dl_colwidths">
 			<xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
 				<xsl:variable name="html-table">
-					<xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
+					<xsl:variable name="doc_ns">
+						
+					</xsl:variable>
+					<xsl:variable name="ns">
+						<xsl:choose>
+							<xsl:when test="normalize-space($doc_ns)  != ''">
+								<xsl:value-of select="normalize-space($doc_ns)"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:value-of select="substring-before(name(/*), '-')"/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
 					<xsl:element name="{$ns}:table">
 						<xsl:for-each select="*[local-name() = 'dl'][1]">
 							<tbody>
@@ -2172,7 +2373,8 @@
 												<xsl:attribute name="margin-bottom">0</xsl:attribute>
 											</xsl:if>
 											
-											<xsl:apply-templates/>
+											<!-- <xsl:apply-templates /> -->
+											<xsl:copy-of select="./node()"/>
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
@@ -2196,9 +2398,12 @@
 			
 				<xsl:attribute name="text-decoration">underline</xsl:attribute>
 			
+			
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				
+				
 				<xsl:value-of select="@reference"/>
+				
 			</fo:basic-link>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
@@ -2304,7 +2509,20 @@
 								</xsl:choose>
 								<!-- create virtual html table for dl/[dt and dd] -->
 								<xsl:variable name="html-table">
-									<xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
+									<xsl:variable name="doc_ns">
+										
+									</xsl:variable>
+									<xsl:variable name="ns">
+										<xsl:choose>
+											<xsl:when test="normalize-space($doc_ns)  != ''">
+												<xsl:value-of select="normalize-space($doc_ns)"/>
+											</xsl:when>
+											<xsl:otherwise>
+												<xsl:value-of select="substring-before(name(/*), '-')"/>
+											</xsl:otherwise>
+										</xsl:choose>
+									</xsl:variable>
+									<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
 									<xsl:element name="{$ns}:table">
 										<tbody>
 											<xsl:apply-templates mode="dl"/>
@@ -2464,6 +2682,7 @@
 					
 					
 					
+					
 					<xsl:apply-templates/>
 					<!-- <xsl:if test="$namespace = 'gb'">
 						<xsl:if test="ancestor::*[local-name()='formula']">
@@ -2530,18 +2749,18 @@
 	</xsl:template><xsl:template match="*[local-name()='tt']">
 		<fo:inline xsl:use-attribute-sets="tt-style">
 			<xsl:variable name="_font-size">
-								
-								
-								
 				
 				
 				
 				
 				
 				
-								
 				
-								
+				
+				
+				
+				
+				
 				
 						
 			</xsl:variable>
@@ -2879,7 +3098,7 @@
 		<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(substring($str, 1, 1)))"/>
 		<xsl:value-of select="substring($str, 2)"/>		
 	</xsl:template><xsl:template match="mathml:math">
-		<fo:inline font-family="STIX2Math">
+		<fo:inline font-family="STIX Two Math"> <!--  -->
 			<xsl:variable name="mathml">
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
@@ -2973,7 +3192,7 @@
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'xref']">
 		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
-						
+			
 			<xsl:apply-templates/>
 		</fo:basic-link>
 	</xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
@@ -3183,18 +3402,9 @@
 									<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
 										<fo:bookmark-title>
 											<xsl:variable name="bookmark-title_">
-												<xsl:choose>
-													<xsl:when test="@lang = 'en'">
-														
-														
-														</xsl:when>
-													<xsl:when test="@lang = 'fr'">
-														
-														
-													</xsl:when>
-													<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
-													<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
-												</xsl:choose>
+												<xsl:call-template name="getLangVersion">
+													<xsl:with-param name="lang" select="@lang"/>
+												</xsl:call-template>
 											</xsl:variable>
 											<xsl:choose>
 												<xsl:when test="normalize-space($bookmark-title_) != ''">
@@ -3236,6 +3446,20 @@
 				
 			</fo:bookmark-tree>
 		</xsl:if>
+	</xsl:template><xsl:template name="getLangVersion">
+		<xsl:param name="lang"/>
+		<xsl:choose>
+			<xsl:when test="$lang = 'en'">
+				
+				
+				</xsl:when>
+			<xsl:when test="$lang = 'fr'">
+				
+				
+			</xsl:when>
+			<xsl:when test="$lang = 'de'">Deutsche</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="item" mode="bookmark">
 		<fo:bookmark internal-destination="{@id}" starting-state="hide">
 				<fo:bookmark-title>
@@ -3254,7 +3478,7 @@
 					<xsl:if test="nist:dl">
 						<xsl:attribute name="space-before">12pt</xsl:attribute>
 					</xsl:if>
-								
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -3889,6 +4113,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'clause']">
 		<fo:block>
 			<xsl:call-template name="setId"/>			
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'definitions']">
@@ -3926,6 +4151,7 @@
 						</xsl:choose>
 					</xsl:attribute>
 					
+					
 					<fo:block-container margin-left="0mm">
 						<fo:block>
 							<xsl:apply-templates select="." mode="ul_ol"/>
@@ -4111,6 +4337,7 @@
 								
 								
 								
+								
 																
 							</xsl:variable>
 							<xsl:choose>
@@ -4125,6 +4352,7 @@
 						<dc:creator>
 							
 							
+							
 								<xsl:for-each select="/*/*[local-name() = 'bibdata']/*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
 									<xsl:value-of select="*[local-name() = 'person']/*[local-name() = 'name']/*[local-name() = 'completename']"/>
 									<xsl:if test="position() != last()">; </xsl:if>
@@ -4139,6 +4367,7 @@
 									<xsl:copy-of select="/*/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
 								
 								
+								
 							</xsl:variable>
 							<xsl:value-of select="normalize-space($abstract)"/>
 						</dc:description>