metanorma-ogc 1.2.5 → 1.2.10

data/lib/isodoc/ogc/html/wordstyle_wp.css

@@ -84,7 +84,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal {
   margin-left: 0cm;
   line-height: 107%;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -102,7 +102,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
   /* do not put in margin-left, it is specific to list level */
   mso-add-space: auto;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -119,7 +119,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
   /* do not put in margin-left, it is specific to list level */
   line-height: 107%;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -136,7 +136,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
   mso-add-space: auto;
   line-height: 107%;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -153,7 +153,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
   mso-add-space: auto;
   line-height: 107%;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-ansi-language: EN-AU;
   mso-fareast-language: EN-US; }
@@ -166,7 +166,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
   margin-bottom: 0cm;
   margin-left: 0cm;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{footnotefontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -211,7 +211,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter {
   margin-bottom: 0cm;
   margin-left: 0cm;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -224,7 +224,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape {
   margin-bottom: 0cm;
   margin-left: 0cm;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-ansi-language: EN-US;
@@ -240,7 +240,7 @@ p.MsoIndexHeading, li.MsoIndexHeading, div.MsoIndexHeading {
   margin-left: 0cm;
   line-height: 107%;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-ansi-language: EN-US;
   mso-fareast-language: EN-US;
@@ -250,7 +250,7 @@ span.MsoCommentReference {
   mso-style-noshow: yes;
   mso-style-unhide: no;
   mso-style-parent: "";
-  mso-ansi-font-size: 11.0pt;
+  mso-ansi-font-size: {{normalfontsize}};
   mso-bidi-font-size: 8.0pt; }
 
 p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
@@ -261,7 +261,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
   margin-left: 0cm;
   line-height: 107%;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
   mso-bidi-font-family: "Times New Roman";
@@ -422,7 +422,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject {
   margin-bottom: 0cm;
   margin-left: 0cm;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{footnotefontsize}};
   mso-bidi-font-size: 10.0pt;
   font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
@@ -439,7 +439,7 @@ p.MsoAcetate, li.MsoAcetate, div.MsoAcetate {
   margin-bottom: 0cm;
   margin-left: 0cm;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   mso-bidi-font-size: 9.0pt;
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
@@ -526,7 +526,7 @@ h1.Annex
 	mso-hyphenate:none;
 	tab-stops:0.7cm;
 	font-size:12.0pt;
-	mso-bidi-font-size:11.0pt;
+	mso-bidi-font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
         color:#0E1A85;
@@ -606,7 +606,7 @@ h4 {
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
   mso-outline-level: 4;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   color: #1F4E79;
   mso-themecolor: accent1;
@@ -632,7 +632,7 @@ h5 {
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
   mso-outline-level: 5;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   color: #1F4E79;
   mso-themecolor: accent1;
@@ -657,7 +657,7 @@ h6 {
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
   mso-outline-level: 6;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "MS Gothic";
   mso-fareast-theme-font: major-fareast;
@@ -681,7 +681,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   margin-left: 0cm;
   line-height: 107%;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
@@ -699,10 +699,10 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
   margin-top: 8.0pt;
   margin-right: 0cm;
   margin-bottom: 5.0pt;
-  margin-left: 11.0pt;
+  margin-left: {{normalfontsize}};
   line-height: 107%;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
@@ -722,7 +722,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
   margin-left: 22.0pt;
   line-height: 107%;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{normalfontsize}};
   tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
@@ -740,7 +740,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
   mso-style-link: "Footnote Text Char";
   margin: 0cm;
   mso-pagination: widow-orphan;
-  font-size: 11.0pt;
+  font-size: {{footnotefontsize}};
   font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
@@ -1169,7 +1169,7 @@ table.MsoNormalTable {
   mso-para-margin: 0cm;
   mso-para-margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
-  font-size: 10.0pt;
+  font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 
 ol {

data/lib/isodoc/ogc/html/wordstyle_wp.scss

@@ -74,7 +74,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
 	margin-left:0cm;
 	line-height:107%;
 	mso-pagination:widow-orphan;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -91,7 +91,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
         /* do not put in margin-left, it is specific to list level */
         mso-add-space:auto;
         mso-pagination:widow-orphan;
-        font-size:11.0pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -107,7 +107,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
         /* do not put in margin-left, it is specific to list level */
 	line-height:107%;
         mso-pagination:widow-orphan;
-        font-size:11.0pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -123,7 +123,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
         mso-add-space:auto;
 	line-height:107%;
         mso-pagination:widow-orphan;
-        font-size:11.0pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -139,7 +139,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
         mso-add-space:auto;
 	line-height:107%;
         mso-pagination:widow-orphan;
-        font-size:11.0pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -152,7 +152,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
 	margin-bottom:0cm;
 	margin-left:0cm;
 	mso-pagination:widow-orphan;
-	font-size:11.0pt;
+	font-size:$footnotefontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -194,7 +194,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
 	margin-bottom:0cm;
 	margin-left:0cm;
 	mso-pagination:widow-orphan;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -206,7 +206,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
 	margin-bottom:0cm;
 	margin-left:0cm;
         mso-pagination:widow-orphan;
-        font-size:11.0pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-fareast-font-family:"Times New Roman";
         mso-ansi-language:EN-US;
@@ -221,7 +221,7 @@ p.MsoIndexHeading, li.MsoIndexHeading, div.MsoIndexHeading
 	margin-left:0cm;
 	line-height:107%;
 	mso-pagination:widow-orphan;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-ansi-language:EN-US;
 	mso-fareast-language:EN-US;
@@ -230,7 +230,7 @@ span.MsoCommentReference
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
 	mso-style-parent:"";
-	mso-ansi-font-size:11.0pt;
+	mso-ansi-font-size:$normalfontsize;
 	mso-bidi-font-size:8.0pt;}
 p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
 	{mso-style-unhide:no;
@@ -240,7 +240,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
 	margin-left:0cm;
 	line-height:107%;
 	mso-pagination:widow-orphan;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-bidi-font-family:"Times New Roman";
@@ -394,7 +394,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
 	margin-bottom:0cm;
 	margin-left:0cm;
 	mso-pagination:widow-orphan;
-	font-size:11.0pt;
+	font-size:$footnotefontsize;
 	mso-bidi-font-size:10.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
@@ -410,7 +410,7 @@ p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
 	margin-bottom:0cm;
 	margin-left:0cm;
 	mso-pagination:widow-orphan;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	mso-bidi-font-size:9.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
@@ -493,7 +493,7 @@ h1.Annex
 	mso-hyphenate:none;
 	tab-stops:0.7cm;
 	font-size:12.0pt;
-	mso-bidi-font-size:11.0pt;
+	mso-bidi-font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
         color:#0E1A85;
@@ -572,7 +572,7 @@ h4
 	mso-pagination:widow-orphan lines-together;
 	page-break-after:avoid;
 	mso-outline-level:4;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$headerfont;
 	color:#1F4E79;
 	mso-themecolor:accent1;
@@ -597,7 +597,7 @@ h5
 	mso-pagination:widow-orphan lines-together;
 	page-break-after:avoid;
 	mso-outline-level:5;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$headerfont;
 	color:#1F4E79;
 	mso-themecolor:accent1;
@@ -621,7 +621,7 @@ h6
 	mso-pagination:widow-orphan lines-together;
 	page-break-after:avoid;
 	mso-outline-level:6;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-fareast-font-family:"MS Gothic";
 	mso-fareast-theme-font:major-fareast;
@@ -644,7 +644,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
 	margin-left:0cm;
 	line-height:107%;
 	mso-pagination:widow-orphan;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
@@ -661,10 +661,10 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
         margin-top:8.0pt;
 	margin-right:0cm;
 	margin-bottom:5.0pt;
-	margin-left:11.0pt;
+	margin-left:$normalfontsize;
 	line-height:107%;
 	mso-pagination:widow-orphan;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
@@ -683,7 +683,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	margin-left:22.0pt;
 	line-height:107%;
 	mso-pagination:widow-orphan;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
@@ -699,7 +699,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
 	mso-style-link:"Footnote Text Char";
         margin:0cm;
 	mso-pagination:widow-orphan;
-	font-size:11.0pt;
+	font-size:$footnotefontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -1083,7 +1083,7 @@ table.MsoNormalTable
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:$smallerfontsize;
 	font-family:$bodyfont;}
 ol
 	{margin-bottom:0cm;

data/lib/isodoc/ogc/html_convert.rb

@@ -20,7 +20,10 @@ module IsoDoc
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
           headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
-          monospacefont: '"Space Mono",monospace'
+          monospacefont: '"Space Mono",monospace',
+          normalfontsize: "16px",
+          monospacefontsize: "0.8em",
+          footnotefontsize: "0.9em",
         }
       end
 

data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl

@@ -69,7 +69,7 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root font-family="Lato, STIX Two Math, HanSans" font-size="11pt" color="{$color_main}" xml:lang="{$lang}">
+		<fo:root font-family="Lato, STIX Two Math, Source Han Sans" font-size="11pt" color="{$color_main}" xml:lang="{$lang}">
 			<fo:layout-master-set>
 				<!-- Cover page -->
 				<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
@@ -181,13 +181,28 @@
 										<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($doctype))"/>
 									</xsl:call-template>									
 									<xsl:value-of select="$linebreak"/>
+									<xsl:variable name="docsubtype" select="normalize-space(/ogc:ogc-standard/ogc:bibdata/ogc:ext/ogc:docsubtype)"/>
+									<xsl:variable name="docsubtype_str">
+										<xsl:choose>
+											<xsl:when test="$docsubtype = 'implementation'">Implementation</xsl:when>
+											<xsl:when test="$docsubtype = 'conceptual-model'">Conceptual model</xsl:when>
+											<xsl:when test="$docsubtype = 'conceptual-model-and-encoding'">Conceptual model &amp; encoding</xsl:when>
+											<xsl:when test="$docsubtype = 'conceptual-model-and-implementation'">Conceptual model &amp; implementation</xsl:when>
+											<xsl:when test="$docsubtype = 'encoding'">Encoding</xsl:when>
+											<xsl:when test="$docsubtype = 'extension'">Extension</xsl:when>
+											<xsl:when test="$docsubtype = 'profile'">Profile</xsl:when>
+											<xsl:when test="$docsubtype = 'profile-with-extension'">Profile with extension</xsl:when>
+											<xsl:when test="$docsubtype = 'general'">General</xsl:when>
+										</xsl:choose>
+									</xsl:variable>									
 									<xsl:call-template name="addLetterSpacing">
-										<xsl:with-param name="text" select="'Conceptual model &amp; encoding'"/>
+										<xsl:with-param name="text" select="$docsubtype_str"/>
 										<xsl:with-param name="letter-spacing" select="0.25"/>
 									</xsl:call-template>									
 								</fo:block>
 								<fo:block font-size="12pt" font-weight="bold">
-									<xsl:variable name="stage" select="java:toUpperCase(java:java.lang.String.new(//ogc:local_bibdata/ogc:status/ogc:stage))"/>
+									<xsl:variable name="curr_lang" select="/ogc:ogc-standard/ogc:bibdata/ogc:language[@current = 'true']"/>					
+									<xsl:variable name="stage" select="java:toUpperCase(java:java.lang.String.new(/ogc:ogc-standard/ogc:bibdata/ogc:status/ogc:stage[@language = $curr_lang]))"/>									
 									<xsl:call-template name="addLetterSpacing">
 										<xsl:with-param name="text" select="$stage"/>
 									</xsl:call-template>
@@ -1054,13 +1069,13 @@
 						<xsl:otherwise> <!-- for ordered lists -->
 							<xsl:choose>
 								<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)"/>
 								</xsl:when>
 								<xsl:when test="../@type = 'alphabet_upper'">
-									<xsl:number format="A)"/>
+									<xsl:number format="A)" lang="en"/>
 								</xsl:when>
 								
 								<xsl:when test="../@type = 'roman'">
@@ -1313,7 +1328,7 @@
 		<xsl:variable name="sectionNum">
 			<xsl:choose>
 				<xsl:when test="normalize-space($sectionNum_) = '' and local-name() = 'annex'">
-					<xsl:number format="A" count="ogc:annex"/>
+					<xsl:number format="A" count="ogc:annex" lang="en"/>
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:value-of select="$sectionNum_"/>
@@ -1501,13 +1516,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>
 		
@@ -1609,7 +1633,7 @@
 		
 				
 		
-			<xsl:attribute name="font-family">FiraCode</xsl:attribute>			
+			<xsl:attribute name="font-family">Fira Code</xsl:attribute>			
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>			
 			<xsl:attribute name="line-height">113%</xsl:attribute>
 		
@@ -1815,6 +1839,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
 		
 		
@@ -1862,6 +1887,7 @@
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="padding-right">1mm</xsl:attribute>
 				
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
 		
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -1897,6 +1923,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -1946,7 +1973,7 @@
 		
 		
 		
-			<xsl:attribute name="font-family">FiraCode</xsl:attribute>			
+			<xsl:attribute name="font-family">Fira Code</xsl:attribute>			
 		
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
@@ -2024,7 +2051,9 @@
 			<fo:block> </fo:block>				
 		
 		
-		
+		<!-- <xsl:if test="$namespace = 'bipm'">
+			<fo:block>&#xA0;</fo:block>				
+		</xsl:if> -->
 		
 		<!-- $namespace = 'iso' or  -->
 		
@@ -2058,10 +2087,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"/> -->
 		
@@ -2140,16 +2171,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']">
@@ -2162,10 +2202,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>
 			
@@ -2198,6 +2240,7 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
 				
+				
 				<xsl:apply-templates/>				
 			</fo:block>
 		</xsl:if>
@@ -2382,13 +2425,27 @@
 								<xsl:attribute name="border">solid black 0pt</xsl:attribute>
 							
 							
-							<!-- except gb and bipm -->
 							
-								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
 							
 							
+							<!-- except gb -->
+							
+								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
 							
 							
+							<!-- show Note under table in preface (ex. abstract) sections -->
+							<!-- empty, because notes show at page side in main sections -->
+							<!-- <xsl:if test="$namespace = 'bipm'">
+								<xsl:choose>
+									<xsl:when test="ancestor::*[local-name()='preface']">										
+										<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
+									</xsl:when>
+									<xsl:otherwise>										
+									<fo:block/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:if> -->
+							
 							
 							<!-- horizontal row separator -->
 							
@@ -2406,12 +2463,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">
@@ -2429,16 +2496,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>
@@ -2452,7 +2528,11 @@
 								<xsl:attribute name="border">solid black 0pt</xsl:attribute>
 							
 							
-							<!-- except gb and bipm -->
+							
+							
+							
+							
+							<!-- except gb  -->
 							
 								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
 							
@@ -2547,10 +2627,13 @@
 						<xsl:if test="$number mod 2 = 0">
 							<xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
 						</xsl:if>
-					</xsl:if>
-					
+					</xsl:if>					
 				
 				
+				<!-- <xsl:if test="$namespace = 'bipm'">
+					<xsl:attribute name="height">8mm</xsl:attribute>
+				</xsl:if> -->
+				
 			<xsl:apply-templates/>
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='th']">
@@ -2636,7 +2719,8 @@
 				</xsl:attribute>
 			</xsl:if>
 			<xsl:call-template name="display-align"/>
-			<fo:block>								
+			<fo:block>
+								
 				<xsl:apply-templates/>
 			</fo:block>			
 		</fo:table-cell>
@@ -2861,7 +2945,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>
@@ -2871,8 +2961,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">
@@ -2886,9 +2980,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']/*"/>
@@ -2904,9 +3001,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>
@@ -2917,9 +3017,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>
@@ -3045,12 +3148,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"/>
 		
@@ -3167,6 +3290,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']">
@@ -3495,7 +3619,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>
@@ -3530,6 +3665,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>
@@ -3559,6 +3695,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -3612,10 +3749,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>
@@ -3680,6 +3821,8 @@
 						
 						
 						
+						
+						
 						<fo:inline xsl:use-attribute-sets="note-name-style">
 							<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 						</fo:inline>
@@ -3772,7 +3915,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>
@@ -3823,7 +3967,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"/>
@@ -3839,6 +3983,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>
@@ -3856,13 +4002,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>
@@ -3924,8 +4091,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'">
 				
@@ -4396,9 +4599,14 @@
 						<xsl:attribute name="font-weight">bold</xsl:attribute>
 						<xsl:attribute name="padding-right">1mm</xsl:attribute>
 					
-					<xsl:call-template name="getTitle">
-						<xsl:with-param name="name" select="'title-source'"/>
-					</xsl:call-template>
+					
+					
+					
+						<xsl:call-template name="getTitle">
+							<xsl:with-param name="name" select="'title-source'"/>
+						</xsl:call-template>
+					
+					
 					<xsl:text>: </xsl:text>
 				</fo:inline>
 			
@@ -4423,7 +4631,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">
@@ -4548,9 +4757,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/>
@@ -4604,7 +4816,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 id="{@id}">
 			<xsl:apply-templates/>
@@ -4661,7 +4873,8 @@
 			<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">
+					
 					<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>
@@ -4680,6 +4893,10 @@
 		</fo:table-cell>
 	</xsl:template><xsl:template name="processBibitem">
 		
+		
+		<!-- end BIPM bibitem processing-->
+		
+		
 			<!-- start OGC bibtem processing -->
 			<xsl:choose>
 				<xsl:when test="*[local-name() = 'formattedref']">
@@ -5058,13 +5275,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">		
@@ -5130,4 +5356,23 @@
 				<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:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+		
 	</xsl:template></xsl:stylesheet>