metanorma-nist 1.2.6 → 1.2.11

data/lib/isodoc/nist/html_convert.rb

@@ -25,7 +25,10 @@ module IsoDoc
                      '"Libre Baskerville",serif'),
                      headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
                                   '"Libre Baskerville",serif'),
-                                  monospacefont: '"Space Mono",monospace'
+                                  monospacefont: '"Space Mono",monospace',
+                                  normalfontsize: "14px",
+                                  footnotefontsize: "0.9em",
+                                  monospacefontsize: "0.8em",
         }
       end
 
@@ -46,6 +49,14 @@ module IsoDoc
         HEAD
       end
 
+      def html_head()
+        super + <<~HEAD.freeze
+        <link rel="stylesheet" href="https://pages.nist.gov/nist-header-footer/css/nist-combined.css">
+      <script src="https://pages.nist.gov/nist-header-footer/js/jquery-1.9.0.min.js" type="text/javascript" defer="defer"></script>
+      <script src="https://pages.nist.gov/nist-header-footer/js/nist-header-footer.js" type="text/javascript" defer="defer"></script>
+        HEAD
+      end
+
       def toclevel
         ret = toclevel_classes.map do |l|
           "#{l}:not(:empty):not(.TermNum):not(.noTOC):not(.AbstractTitle):"\

data/lib/isodoc/nist/metadata.rb

@@ -9,11 +9,9 @@ module IsoDoc
         super
         here = File.dirname(__FILE__)
         set(:logo_nist, File.expand_path(File.join(here, "html", "logo.png")))
-        set(:logo_cswp,
-            File.expand_path(File.join(here, "html", "logo_cswp.png")))
+        set(:logo_cswp, File.expand_path(File.join(here, "html", "logo_cswp.png")))
         set(:logo_commerce,
-            File.expand_path(File.join(here, "html",
-                                       "commerce-logo-color.png")))
+            File.expand_path(File.join(here, "html", "commerce-logo-color.png")))
         set(:logo_commerce_word,
             File.expand_path(File.join(here, "html", "deptofcommerce.png")))
       end
@@ -57,12 +55,9 @@ module IsoDoc
         ixml.xpath(ns("//bibdata/date")).each do |d|
           val = Common::date_range(d)
           next if val == "XXX"
-          set("#{d['type']}date_monthyear".to_sym,
-              daterange_proc(val, :monthyr))
-          set("#{d['type']}date_mmddyyyy".to_sym,
-              daterange_proc(val, :mmddyyyy))
-          set("#{d['type']}date_MMMddyyyy".to_sym,
-              daterange_proc(val, :MMMddyyyy))
+          set("#{d['type']}date_monthyear".to_sym, daterange_proc(val, :monthyr))
+          set("#{d['type']}date_mmddyyyy".to_sym, daterange_proc(val, :mmddyyyy))
+          set("#{d['type']}date_MMMddyyyy".to_sym, daterange_proc(val, :MMMddyyyy))
         end
         withdrawal_pending(ixml)
         most_recent_date(ixml)
@@ -101,13 +96,18 @@ module IsoDoc
       end
 
       def series(ixml, _out)
-        series = ixml.at(ns("//bibdata/series[@type = 'main']/title"))&.text and
-          set(:series, series)
-        seriesabbr =
-          ixml.at(ns("//bibdata/series[@type = 'main']/abbreviation"))&.text
+        series = ixml.at(ns("//bibdata/series[@type = 'main']/title"))&.text and set(:series, series)
+        seriesabbr = ixml.at(ns("//bibdata/series[@type = 'main']/abbreviation"))&.text
         set(:seriesabbr, seriesabbr) if seriesabbr
-        subs = ixml.at(ns("//bibdata/series[@type = 'secondary']/"\
-                          "title"))&.text and set(:subseries, subs)
+        subs = ixml.at(ns("//bibdata/series[@type = 'secondary']/title"))&.text
+        abbr = ixml.at(ns("//bibdata/series[@type = 'secondary']/abbreviation"))&.text
+        if (seriesabbr == "NIST CSTS")
+          subs and set(:series, subs)
+          abbr and set(:seriesabbr, abbr)
+        else
+          subs and set(:subseries, subs)
+          abbr and set(:subseriesabbr, abbr)
+        end
       end
 
       def mmddyyyy(isodate)
@@ -129,8 +129,7 @@ module IsoDoc
         super
         a = xml.at(ns("//bibdata/uri[@type = 'email']")) and set(:email, a.text)
         a = xml.at(ns("//bibdata/uri[@type = 'doi']")) and set(:doi, a.text)
-        a = xml.at(ns("//bibdata/uri[@type = 'uri' or not(@type)]")) and
-          set(:url, a.text)
+        a = xml.at(ns("//bibdata/uri[@type = 'uri' or not(@type)]")) and set(:url, a.text)
       end
 
       def relations1(ixml, type)
@@ -157,35 +156,28 @@ module IsoDoc
       def superseding_doc(ixml)
         d = ixml.at(ns("//bibdata/relation[@type = 'obsoletedBy']/bibitem"))
         return unless d
-        set(:superseding_status,
-            status_print(d.at(ns("./status/stage"))&.text || "final"))
+        set(:superseding_status, status_print(d.at(ns("./status/stage"))&.text || "final"))
         superseding_iteration(d)
         docid = d.at(ns("./docidentifier[@type = 'NIST']"))&.text and
           set(:superseding_docidentifier, docid)
         docid_long = d.at(ns("./docidentifier[@type = 'nist-long']"))&.text and
           set(:superseding_docidentifier_long, docid_long)
         superseding_dates(d)
-        doi = d.at(ns("./uri[@type = 'doi']"))&.text and
-          set(:superseding_doi, doi)
-        uri = d.at(ns("./uri[@type = 'uri']"))&.text and
-          set(:superseding_uri, uri)
+        doi = d.at(ns("./uri[@type = 'doi']"))&.text and set(:superseding_doi, doi)
+        uri = d.at(ns("./uri[@type = 'uri']"))&.text and set(:superseding_uri, uri)
         superseding_titles(ixml, d)
         authors = d.xpath(ns("./contributor[role/@type = 'author']/person"))
-        authors.empty? and authors =
-          ixml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person"))
+        authors.empty? and authors = ixml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person"))
         set(:superseding_authors, extract_person_names(authors))
       end
 
       def superseding_titles(ixml, d)
         if title = d.at(ns("./title[@type = 'main']"))&.text
           set(:superseding_title, d.at(ns("./title[@type = 'main']"))&.text)
-          set(:superseding_subtitle,
-              d.at(ns("./title[@type = 'subtitle']"))&.text)
+          set(:superseding_subtitle, d.at(ns("./title[@type = 'subtitle']"))&.text)
         else
-          set(:superseding_title,
-              ixml.at(ns("//bibdata/title[@type = 'main']"))&.text)
-          set(:superseding_subtitle,
-              ixml.at(ns("//bibdata/title[@type = 'subtitle']"))&.text)
+          set(:superseding_title, ixml.at(ns("//bibdata/title[@type = 'main']"))&.text)
+          set(:superseding_subtitle, ixml.at(ns("//bibdata/title[@type = 'subtitle']"))&.text)
         end
       end
 
@@ -200,8 +192,7 @@ module IsoDoc
           set(:superseding_iteration_ordinal, "Final")
           set(:superseding_iteration_code, "FPD")
         else
-          set(:superseding_iteration_ordinal,
-              iter.to_i.localize.to_rbnf_s("SpelloutRules", "spellout-ordinal"))
+          set(:superseding_iteration_ordinal, iter.to_i.localize.to_rbnf_s("SpelloutRules", "spellout-ordinal"))
           set(:superseding_iteration_code, "#{iter}PD")
         end
       end
@@ -223,12 +214,9 @@ module IsoDoc
       end
 
       def note(xml, _out)
-        note = xml.at(ns("//bibdata/note[@type = 'additional-note']"))&.text and
-          set(:additional_note, note)
-        note = xml.at(ns("//bibdata/note[@type = 'withdrawal-note']"))&.text and
-          set(:withdrawal_note, note)
-        note = xml.at(ns("//bibdata/note[@type = "\
-                         "'withdrawal-announcement-link']"))&.text and
+        note = xml.at(ns("//bibdata/note[@type = 'additional-note']"))&.text and set(:additional_note, note)
+        note = xml.at(ns("//bibdata/note[@type = 'withdrawal-note']"))&.text and set(:withdrawal_note, note)
+        note = xml.at(ns("//bibdata/note[@type = 'withdrawal-announcement-link']"))&.text and
                         set(:withdrawal_announcement_link, note)
         super
       end

data/lib/isodoc/nist/metadata_id.rb

@@ -73,8 +73,7 @@ module IsoDoc
 
       def docid(ixml, _out)
         docid = ixml.at(ns("//bibdata/docidentifier[@type = 'NIST']"))&.text
-        docid_long = ixml.at(ns("//bibdata/docidentifier"\
-                                "[@type = 'nist-long']"))&.text
+        docid_long = ixml.at(ns("//bibdata/docidentifier[@type = 'nist-long']"))&.text
         set(:docidentifier, docid)
         set(:docidentifier_long, docid_long)
         set(:docidentifier_undated, stripdate(docid))
@@ -86,8 +85,7 @@ module IsoDoc
 
       def stripdate(id)
         return if id.nil?
-        id.sub(/ \((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[^)]+\)$/,
-               "")
+        id.sub(/ \((Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[^)]+\)$/, "")
       end
 
       def draft_prefix(ixml)
@@ -117,9 +115,7 @@ module IsoDoc
 
       def draftinfo(draft, revdate)
         draftinfo = ""
-        if draft
-          draftinfo = " #{@labels["draft_label"]} #{draft}"
-        end
+        draft and draftinfo = " #{@labels["draft_label"]} #{draft}"
         @i18n.l10n(draftinfo, @lang, @script)
       end
     end

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

@@ -151,19 +151,35 @@
 							<xsl:for-each select="/nist:nist-standard/nist:bibdata/nist:contributor[nist:role/@type = 'author']">
 								<xsl:value-of select="nist:person/nist:name/nist:completename"/>
 								<xsl:variable name="org-name" select="nist:person/nist:affiliation/nist:organization/nist:name"/>
+								<xsl:variable name="subdivision">
+									<xsl:for-each select="nist:person/nist:affiliation/nist:organization/nist:subdivision">
+										<xsl:value-of select="."/>
+										<xsl:if test="position() != last()">, </xsl:if>
+									</xsl:for-each>
+								</xsl:variable>
+								<xsl:variable name="following_subdivision">
+									<xsl:for-each select="following-sibling::nist:contributor[nist:role/@type = 'author'][1]/nist:person/nist:affiliation/nist:organization/nist:subdivision">
+										<xsl:value-of select="."/>
+										<xsl:if test="position() != last()">, </xsl:if>
+									</xsl:for-each>
+								</xsl:variable>
 								<xsl:variable name="org-address" select="nist:person/nist:affiliation/nist:organization/nist:address/nist:formattedAddress"/>
-								<xsl:if test="concat(following-sibling::nist:contributor[nist:role/@type = 'author'][1]/nist:person/nist:affiliation/nist:organization/nist:name,                         following-sibling::nist:contributor[nist:role/@type = 'author'][1]/nist:person/nist:affiliation/nist:organization/nist:address/nist:formattedAddress) !=                  concat($org-name, $org-address)">
-																	
-									<xsl:for-each select="xalan:tokenize($org-name, ',')">
+								<xsl:if test="concat(following-sibling::nist:contributor[nist:role/@type = 'author'][1]/nist:person/nist:affiliation/nist:organization/nist:name,                         $following_subdivision,                         following-sibling::nist:contributor[nist:role/@type = 'author'][1]/nist:person/nist:affiliation/nist:organization/nist:address/nist:formattedAddress) !=                  concat($org-name, $subdivision, $org-address)">
+									<!-- <xsl:for-each select="xalan:tokenize($org-name, ',')">
 										<fo:block>
 											<fo:inline font-style="italic">
 												<xsl:value-of select="."/>
-												<!-- <xsl:if test="normalize-space($org-address) != ''">
-													<fo:inline>, <xsl:value-of select="$org-address"/></fo:inline>
-												</xsl:if> -->
 											</fo:inline>
 										</fo:block>
-									</xsl:for-each>
+									</xsl:for-each> -->
+									<fo:block font-style="italic">
+										<xsl:value-of select="$org-name"/>
+									</fo:block>
+									<xsl:if test="normalize-space($subdivision) != ''">
+										<fo:block font-style="italic">
+											<xsl:value-of select="$subdivision"/>
+										</fo:block>
+									</xsl:if>
 									
 									<xsl:if test="normalize-space($org-address) != ''">
 										<fo:block>
@@ -558,30 +574,23 @@
 	<!-- Bibliography -->
 	<!-- ============================= -->
 
-
-	<!-- Example: [ITU-T A.23]	ITU-T A.23, Recommendation ITU-T A.23, Annex A (2014), Guide for ITU-T and ISO/IEC JTC 1 cooperation. -->
+		<!-- 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="nist:bibitem">
-
 		<fo:list-block margin-bottom="12pt" provisional-distance-between-starts="12mm">
 			<fo:list-item>
 				<fo:list-item-label end-indent="label-end()">
 					<fo:block>
 						<fo:inline id="{@id}">
 							<!-- <xsl:number format="[1]"/> -->
-							<xsl:value-of select="nist:docidentifier"/>
+							<xsl:value-of select="nist:docidentifier[@display = 'true']"/>
 						</fo:inline>
 					</fo:block>
 				</fo:list-item-label>
 				<fo:list-item-body start-indent="body-start()">
 					<fo:block>
-						<xsl:choose>
-							<xsl:when test="nist:title[@type = 'main' and @language = 'en']">
-								<xsl:apply-templates select="nist:title[@type = 'main' and @language = 'en']"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates select="nist:title"/>
-							</xsl:otherwise>
-						</xsl:choose>
 						<xsl:apply-templates select="nist:formattedref"/>
 					</fo:block>
 				</fo:list-item-body>
@@ -589,6 +598,9 @@
 		</fo:list-block>
 	</xsl:template>
 
+	<xsl:template match="nist:formattedref">
+		<xsl:apply-templates/>
+	</xsl:template>
 	<!-- ============================= -->
 	<!-- ============================= -->
 
@@ -618,6 +630,11 @@
 		</fo:block>
 	</xsl:template>
 	
+	<xsl:template match="nist:references">
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
 	<xsl:template match="nist:references/nist:title">
 		<fo:block-container color="white" background-color="{$color}" margin-bottom="12pt" keep-with-next="always" height="5mm" margin-left="-0.5mm" margin-right="-0.5mm">
 			<fo:block font-family="Arial" font-size="12pt" font-weight="bold" margin-left="1mm" padding-top="0.3mm">
@@ -685,14 +702,14 @@
 			</xsl:variable>
 			<fo:inline font-size="60%" keep-with-previous.within-line="always" vertical-align="super">
 				<fo:basic-link internal-destination="footnote_{@reference}_{$number}" fox:alt-text="footnote {@reference} {$number}">
-					<xsl:value-of select="$number + count(//nist:bibitem/nist:note)"/>
+					<xsl:value-of select="$number + count(//nist:bibitem//nist:note)"/>
 				</fo:basic-link>
 			</fo:inline>
 			<fo:footnote-body>
 				<fo:block-container margin-left="3mm">
 					<fo:block font-size="9pt" font-family="Times New Roman" font-style="normal" font-weight="normal" margin-left="-3mm" margin-top="6pt" margin-bottom="12pt" start-indent="0mm" text-indent="-2mm" line-height="10pt" page-break-inside="avoid">
 						<fo:inline id="footnote_{@reference}_{$number}" font-size="75%" keep-with-next.within-line="always" vertical-align="super" padding-right="1mm"> <!-- alignment-baseline="hanging" -->
-							<xsl:value-of select="$number + count(//nist:bibitem/nist:note)"/>
+							<xsl:value-of select="$number + count(//nist:bibitem//nist:note)"/>
 						</fo:inline>
 						<xsl:for-each select="nist:p">
 							<xsl:apply-templates/>
@@ -725,78 +742,6 @@
 	</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="nist:annex//nist:bibitem">
-		<fo:block id="{@id}" margin-top="6pt" margin-left="12mm" text-indent="-12mm">
-				<xsl:if test="nist:formattedref">
-					<xsl:choose>
-						<xsl:when test="nist: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="nist: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="nist:formattedref"/>
-										</fo:block>
-									</fo:list-item-body>
-								</fo:list-item>
-							</fo:list-block>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:apply-templates select="nist:formattedref"/>
-							<xsl:apply-templates select="nist:docidentifier[@type != 'metanorma' or not(@type)]" mode="process"/>
-						</xsl:otherwise>
-					</xsl:choose>
-
-
-				</xsl:if>
-				<xsl:if test="nist:title">
-					<xsl:for-each select="nist:contributor">
-						<xsl:value-of select="nist:organization/nist:name"/>
-						<xsl:if test="position() != last()">, </xsl:if>
-					</xsl:for-each>
-					<xsl:text> (</xsl:text>
-
-					<xsl:value-of select="$date"/>
-					<xsl:text>) </xsl:text>
-					<fo:inline font-style="italic"><xsl:value-of select="nist:title"/></fo:inline>
-					<xsl:if test="nist:contributor[nist:role/@type='publisher']/nist:organization/nist:name">
-						<xsl:text> (</xsl:text><xsl:value-of select="nist:contributor[nist:role/@type='publisher']/nist:organization/nist:name"/><xsl:text>)</xsl:text>
-					</xsl:if>
-					<xsl:text>, </xsl:text>
-					<xsl:value-of select="$date"/>
-					<xsl:text>. </xsl:text>
-					<xsl:value-of select="nist:docidentifier"/>
-					<xsl:value-of select="$linebreak"/>
-					<xsl:value-of select="nist:uri"/>
-				</xsl:if>
-		</fo:block>
-	</xsl:template>
-
-	<xsl:template match="nist:annex//nist:bibitem//nist:formattedref">
-		<xsl:apply-templates/>
-	</xsl:template>
-
-	<xsl:template match="nist:docidentifier[@type = 'metanorma']" mode="process">
-		<xsl:apply-templates/>
-	</xsl:template>
-	<xsl:template match="nist:docidentifier[@type != 'metanorma' or not(@type)]" mode="process">
-		<xsl:text> [</xsl:text><xsl:apply-templates/><xsl:text>]</xsl:text>
-	</xsl:template>
-	<xsl:template match="nist:docidentifier"/>
-
-
 	<xsl:template match="nist:ul | nist:ol" mode="ul_ol">
 		<fo:list-block>
 			<xsl:apply-templates/>
@@ -849,7 +794,7 @@
 									<xsl:number format="1."/>
 								</xsl:when>
 								<xsl:when test="../@type = 'arabic'">
-									<xsl:number format="a)"/>
+									<xsl:number format="a)" lang="en"/>
 								</xsl:when>
 								<xsl:when test="../@type = 'alphabet'">
 									<xsl:number format="1)"/>
@@ -857,7 +802,7 @@
 								<xsl:when test="ancestor::*[nist:annex]">
 									<xsl:choose>
 										<xsl:when test="$level = 1">
-											<xsl:number format="a)"/>
+											<xsl:number format="a)" lang="en"/>
 										</xsl:when>
 										<xsl:when test="$level = 2">
 											<xsl:number format="i)"/>
@@ -1142,13 +1087,22 @@
 		<title-part lang="en">
 			
 			
+			
 		</title-part>
 		<title-part lang="fr">
 			
 			
+			
 		</title-part>		
 		<title-part lang="zh">第 # 部分:</title-part>
 		
+		<title-subpart lang="en">			
+			
+		</title-subpart>
+		<title-subpart lang="fr">		
+			
+		</title-subpart>
+		
 		<title-modified lang="en">modified</title-modified>
 		<title-modified lang="fr">modifiée</title-modified>
 		
@@ -1448,6 +1402,7 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
 				
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
 		
 		
@@ -1472,6 +1427,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 		
@@ -1590,7 +1546,9 @@
 		
 		
 		
-		
+		<!-- <xsl:if test="$namespace = 'bipm'">
+			<fo:block>&#xA0;</fo:block>				
+		</xsl:if> -->
 		
 		<!-- $namespace = 'iso' or  -->
 		
@@ -1622,10 +1580,12 @@
 		
 		
 		<xsl:variable name="colwidths">
-			<xsl:call-template name="calculate-column-widths">
-				<xsl:with-param name="cols-count" select="$cols-count"/>
-				<xsl:with-param name="table" select="$simple-table"/>
-			</xsl:call-template>
+			<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
+				<xsl:call-template name="calculate-column-widths">
+					<xsl:with-param name="cols-count" select="$cols-count"/>
+					<xsl:with-param name="table" select="$simple-table"/>
+				</xsl:call-template>
+			</xsl:if>
 		</xsl:variable>
 		<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
 		
@@ -1676,7 +1636,12 @@
 			
 			<xsl:variable name="table_attributes">
 				<attribute name="table-layout">fixed</attribute>
-				<attribute name="width">100%</attribute>
+				<attribute name="width">
+					<xsl:choose>
+						<xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
+						<xsl:otherwise>100%</xsl:otherwise>
+					</xsl:choose>
+				</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>
 				
@@ -1705,16 +1670,25 @@
 					<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>
-						<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>
+				<xsl:choose>
+					<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
+						<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
+							<fo:table-column column-width="{@width}"/>
+						</xsl:for-each>
+					</xsl:when>
+					<xsl:otherwise>
+						<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>
+					</xsl:otherwise>
+				</xsl:choose>
 				
 				<xsl:choose>
 					<xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -1727,10 +1701,12 @@
 				
 			</fo:table>
 			
+			<xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>				
 			<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:with-param name="colgroup" select="$colgroup"/>				
 				</xsl:call-template>
 			</xsl:for-each>
 			
@@ -1763,6 +1739,7 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
 				
+				
 				<xsl:apply-templates/>				
 			</fo:block>
 		</xsl:if>
@@ -1983,12 +1960,22 @@
 	</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
 		<xsl:param name="table_attributes"/>
 		<xsl:param name="colwidths"/>
+		<xsl:param name="colgroup"/>
 		
 		<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)"/>
+			<xsl:variable name="cols-count">
+				<xsl:choose>
+					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
+						<xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
 			
 			<fo:table keep-with-previous="always">
 				<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -2006,16 +1993,25 @@
 					</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>
+				<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>
+						<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>
+					</xsl:otherwise>
+				</xsl:choose>
 				
 				<fo:table-body>
 					<fo:table-row>
@@ -2119,6 +2115,7 @@
 				
 				
 				
+				
 				<!-- <xsl:if test="$namespace = 'bipm'">
 					<xsl:attribute name="height">8mm</xsl:attribute>
 				</xsl:if> -->
@@ -2212,7 +2209,8 @@
 				</xsl:attribute>
 			</xsl:if>
 			<xsl:call-template name="display-align"/>
-			<fo:block>								
+			<fo:block>
+								
 				<xsl:apply-templates/>
 			</fo:block>			
 		</fo:table-cell>
@@ -2433,7 +2431,13 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='dl']">
-		<fo:block-container margin-left="0mm">
+		<fo:block-container>
+			
+				<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
+					<xsl:attribute name="margin-left">0mm</xsl:attribute>
+				</xsl:if>
+			
+			
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -2443,8 +2447,12 @@
 				</xsl:attribute>
 				
 			</xsl:if>
-			<fo:block-container margin-left="0mm">
-	
+			<fo:block-container>
+				
+					<xsl:attribute name="margin-left">0mm</xsl:attribute>
+					<xsl:attribute name="margin-right">0mm</xsl:attribute>
+				
+				
 				<xsl:variable name="parent" select="local-name(..)"/>
 				
 				<xsl:variable name="key_iso">
@@ -2458,9 +2466,12 @@
 							<fo:block margin-bottom="12pt" text-align="left">
 								
 								<xsl:variable name="title-where">
-									<xsl:call-template name="getTitle">
-										<xsl:with-param name="name" select="'title-where'"/>
-									</xsl:call-template>
+									
+									
+										<xsl:call-template name="getTitle">
+											<xsl:with-param name="name" select="'title-where'"/>
+										</xsl:call-template>
+									
 								</xsl:variable>
 								<xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
 								<xsl:apply-templates select="*[local-name()='dt']/*"/>
@@ -2476,9 +2487,12 @@
 							
 							
 							<xsl:variable name="title-where">
-								<xsl:call-template name="getTitle">
-									<xsl:with-param name="name" select="'title-where'"/>
-								</xsl:call-template>
+								
+								
+									<xsl:call-template name="getTitle">
+										<xsl:with-param name="name" select="'title-where'"/>
+									</xsl:call-template>
+																
 							</xsl:variable>
 							<xsl:value-of select="$title-where"/>
 						</fo:block>
@@ -2489,9 +2503,12 @@
 							
 							
 							<xsl:variable name="title-key">
-								<xsl:call-template name="getTitle">
-									<xsl:with-param name="name" select="'title-key'"/>
-								</xsl:call-template>
+								
+								
+									<xsl:call-template name="getTitle">
+										<xsl:with-param name="name" select="'title-key'"/>
+									</xsl:call-template>
+								
 							</xsl:variable>
 							<xsl:value-of select="$title-key"/>
 						</fo:block>
@@ -2625,12 +2642,32 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template name="getMaxLength_dt">
-		<xsl:for-each select="*[local-name()='dt']">
-			<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
-			<xsl:if test="position() = 1">
-				<xsl:value-of select="string-length(normalize-space(.))"/>
-			</xsl:if>
-		</xsl:for-each>
+		<xsl:variable name="lengths">
+			<xsl:for-each select="*[local-name()='dt']">
+				<xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
+				<xsl:variable name="attributes">
+					<xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
+					<xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
+				</xsl:variable>
+				<length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="maxLength">
+			<!-- <xsl:for-each select="*[local-name()='dt']">
+				<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
+				<xsl:if test="position() = 1">
+					<xsl:value-of select="string-length(normalize-space(.))"/>
+				</xsl:if>
+			</xsl:for-each> -->
+			<xsl:for-each select="xalan:nodeset($lengths)/length">
+				<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:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
+		<xsl:value-of select="$maxLength"/>
 	</xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
 		<xsl:param name="key_iso"/>
 		
@@ -2758,6 +2795,7 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
 		<fo:inline font-weight="bold">
+			
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='sup']">
@@ -2797,6 +2835,10 @@
 			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='underline']">
+		<fo:inline text-decoration="underline">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
 		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
 			<xsl:apply-templates/>
@@ -3086,7 +3128,18 @@
 				<xsl:with-param name="previousRow" select="$newRow"/>
 		</xsl:apply-templates>
 	</xsl:template><xsl:template name="getLang">
-		<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+		<xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
+		<xsl:variable name="language">
+			<xsl:choose>
+				<xsl:when test="$language_current != ''">
+					<xsl:value-of select="$language_current"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		
 		<xsl:choose>
 			<xsl:when test="$language = 'English'">en</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
@@ -3121,6 +3174,7 @@
 		<xsl:value-of select="substring($str, 2)"/>		
 	</xsl:template><xsl:template match="mathml:math">
 		<fo:inline font-family="STIX Two Math"> <!--  -->
+			
 			<xsl:variable name="mathml">
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
@@ -3150,6 +3204,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -3203,10 +3258,14 @@
 		</fo:inline>		
 	</xsl:template><xsl:template match="*[local-name() = 'modification']">
 		<xsl:variable name="title-modified">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-modified'"/>
-			</xsl:call-template>
+			
+			
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-modified'"/>
+				</xsl:call-template>
+			
 		</xsl:variable>
+		
 		<xsl:choose>
 			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
 			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
@@ -3361,7 +3420,8 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']">
-		<fo:block-container id="{@id}">
+		<fo:block-container id="{@id}">			
+			
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
@@ -3412,7 +3472,7 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -3428,6 +3488,8 @@
 											<xsl:variable name="bookmark-title_">
 												<xsl:call-template name="getLangVersion">
 													<xsl:with-param name="lang" select="@lang"/>
+													<xsl:with-param name="doctype" select="@doctype"/>
+													<xsl:with-param name="title" select="@title-part"/>
 												</xsl:call-template>
 											</xsl:variable>
 											<xsl:choose>
@@ -3445,13 +3507,34 @@
 											</xsl:choose>
 										</fo:bookmark-title>
 										<xsl:apply-templates select="contents/item" mode="bookmark"/>
+										
+										<xsl:call-template name="insertFigureBookmarks">
+											<xsl:with-param name="contents" select="contents"/>
+										</xsl:call-template>
+										
+										<xsl:call-template name="insertTableBookmarks">
+											<xsl:with-param name="contents" select="contents"/>
+											<xsl:with-param name="lang" select="@lang"/>
+										</xsl:call-template>
+										
 									</fo:bookmark>
 									
 								</xsl:for-each>
 							</xsl:when>
 							<xsl:otherwise>
 								<xsl:for-each select="xalan:nodeset($contents)/doc">
+								
 									<xsl:apply-templates select="contents/item" mode="bookmark"/>
+									
+									<xsl:call-template name="insertFigureBookmarks">
+										<xsl:with-param name="contents" select="contents"/>
+									</xsl:call-template>
+										
+									<xsl:call-template name="insertTableBookmarks">
+										<xsl:with-param name="contents" select="contents"/>
+										<xsl:with-param name="lang" select="@lang"/>
+									</xsl:call-template>
+									
 								</xsl:for-each>
 							</xsl:otherwise>
 						</xsl:choose>
@@ -3470,8 +3553,44 @@
 				
 			</fo:bookmark-tree>
 		</xsl:if>
+	</xsl:template><xsl:template name="insertFigureBookmarks">
+		<xsl:param name="contents"/>
+		<xsl:if test="xalan:nodeset($contents)/figure">
+			<fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
+				<fo:bookmark-title>Figures</fo:bookmark-title>
+				<xsl:for-each select="xalan:nodeset($contents)/figure">
+					<fo:bookmark internal-destination="{@id}">
+						<fo:bookmark-title>
+							<xsl:value-of select="normalize-space(title)"/>
+						</fo:bookmark-title>
+					</fo:bookmark>
+				</xsl:for-each>
+			</fo:bookmark>	
+		</xsl:if>
+	</xsl:template><xsl:template name="insertTableBookmarks">
+		<xsl:param name="contents"/>
+		<xsl:param name="lang"/>
+		<xsl:if test="xalan:nodeset($contents)/table">
+			<fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
+				<fo:bookmark-title>
+					<xsl:choose>
+						<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
+						<xsl:otherwise>Tables</xsl:otherwise>
+					</xsl:choose>
+				</fo:bookmark-title>
+				<xsl:for-each select="xalan:nodeset($contents)/table">
+					<fo:bookmark internal-destination="{@id}">
+						<fo:bookmark-title>
+							<xsl:value-of select="normalize-space(title)"/>
+						</fo:bookmark-title>
+					</fo:bookmark>
+				</xsl:for-each>
+			</fo:bookmark>	
+		</xsl:if>
 	</xsl:template><xsl:template name="getLangVersion">
 		<xsl:param name="lang"/>
+		<xsl:param name="doctype" select="''"/>
+		<xsl:param name="title" select="''"/>
 		<xsl:choose>
 			<xsl:when test="$lang = 'en'">
 				
@@ -3963,7 +4082,8 @@
 			<fo:block-container margin-left="0mm">
 		
 				<fo:block xsl:use-attribute-sets="quote-style">
-					<xsl:apply-templates select=".//*[local-name() = 'p']"/>
+					<!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
+					<xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
 				</fo:block>
 				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
 					<fo:block xsl:use-attribute-sets="quote-source-style">
@@ -4089,9 +4209,12 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
 		<xsl:variable name="title-deprecated">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-deprecated'"/>
-			</xsl:call-template>
+			
+			
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-deprecated'"/>
+				</xsl:call-template>
+			
 		</xsl:variable>
 		<fo:block xsl:use-attribute-sets="deprecates-style">
 			<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
@@ -4144,7 +4267,7 @@
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
 		
 			<fo:block break-after="page"/>
 		
@@ -4203,7 +4326,10 @@
 			<fo:table-column column-width="107mm"/>
 			<fo:table-column column-width="15mm"/>
 			<fo:table-body>
-				<fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
+				<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
+					
+						<xsl:attribute name="font-family">Arial</xsl:attribute>
+					
 					<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
 					<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
 					<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -4221,6 +4347,10 @@
 			<fo:block><xsl:apply-templates/></fo:block>
 		</fo:table-cell>
 	</xsl:template><xsl:template name="processBibitem">
+		
+		
+		<!-- end BIPM bibitem processing-->
+		
 		 
 		
 		
@@ -4279,6 +4409,8 @@
 		<xsl:value-of select="translate(.,'. ','')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
 		<xsl:value-of select="substring(.,1,1)"/>
+	</xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
+		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -4463,13 +4595,22 @@
 	</xsl:template><xsl:template name="split">
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>
+		<xsl:param name="normalize-space" select="'true'"/>
 		<xsl:if test="string-length($pText) &gt;0">
 		<item>
-			<xsl:value-of select="normalize-space(substring-before(concat($pText, ','), $sep))"/>
+			<xsl:choose>
+				<xsl:when test="$normalize-space = 'true'">
+					<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
+				</xsl:otherwise>
+			</xsl:choose>
 		</item>
 		<xsl:call-template name="split">
 			<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
 			<xsl:with-param name="sep" select="$sep"/>
+			<xsl:with-param name="normalize-space" select="$normalize-space"/>
 		</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template name="getDocumentId">		
@@ -4535,4 +4676,28 @@
 				<xsl:with-param name="letter-spacing" select="$letter-spacing"/>
 			</xsl:call-template>
 		</xsl:if>
+	</xsl:template><xsl:template name="repeat">
+		<xsl:param name="char" select="'*'"/>
+		<xsl:param name="count"/>
+		<xsl:if test="$count &gt; 0">
+			<xsl:value-of select="$char"/>
+			<xsl:call-template name="repeat">
+				<xsl:with-param name="char" select="$char"/>
+				<xsl:with-param name="count" select="$count - 1"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template><xsl:template name="getLocalizedString">
+		<xsl:param name="key"/>		
+		
+		<xsl:variable name="curr_lang">
+			<xsl:call-template name="getLang"/>
+		</xsl:variable>
+		
+		<xsl:choose>
+			<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
+				<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
+		</xsl:choose>
+		
 	</xsl:template></xsl:stylesheet>