metanorma-ogc 1.2.4 → 1.2.9

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
 
@@ -68,6 +71,7 @@ module IsoDoc
           keywords docxml, div3
           foreword docxml, div3
           introduction docxml, div3
+          security docxml, div3
           submittingorgs docxml, div3
           submitters docxml, div3
           preface docxml, div3

data/lib/isodoc/ogc/i18n-en.yaml

@@ -9,3 +9,13 @@ permissionclass: Permission Class
 abstracttest: Abstract Test
 conformanceclass: Conformance Class
 example: Example
+security_empty: No security considerations have been made for this standard.
+stage_dict:
+  swg-draft: Candidate SWG Draft
+  oab-review: Candidate OAB Review Draft
+  public-rfc: Candidate Public RFC Draft
+  tc-vote: Candidate TC Vote Draft
+  approved: Approved
+  published: Approved
+  deprecated: Deprecated
+  retired: Retired

data/lib/isodoc/ogc/init.rb

@@ -32,7 +32,7 @@ module IsoDoc
           ns("./contributor[role/@type = 'publisher']/organization"\
              "[name = 'Open Geospatial Consortium']"))
         status = ref.at(ns("./status/stage"))&.text or return
-        return if %w(published deprecated retired).include? status
+        return if %w(approved published deprecated retired).include? status
         true
       end
     end

data/lib/isodoc/ogc/metadata.rb

@@ -66,7 +66,7 @@ module IsoDoc
       end
 
       def unpublished(status)
-        !%w(published deprecated retired).include?(status.downcase)
+        !%w(approved deprecated retired).include?(status.downcase)
       end
 
       def version(isoxml, _out)

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

@@ -36,10 +36,11 @@
 			<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:abstract" mode="contents"/>
 			<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[@type = 'keywords']" mode="contents"/>
 			<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:foreword" mode="contents"/>
+			<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[@type = 'security']" mode="contents"/>
 			<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[@type = 'submitting_orgs']" mode="contents"/>
 			<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:submitters" mode="contents"/>
 			<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:introduction" mode="contents"/>			
-			<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[not(@type = 'submitting_orgs') and not(@type = 'keywords')]" mode="contents"/>
+			<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[not(@type = 'security') and not(@type = 'submitting_orgs') and not(@type = 'keywords')]" mode="contents"/>
 			<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:acknowledgements" mode="contents"/>
 			
 			
@@ -68,7 +69,7 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root font-family="Lato, STIX2Math, 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}">
@@ -180,14 +181,30 @@
 										<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="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="'APPROVED'"/>
+										<xsl:with-param name="text" select="$stage"/>
 									</xsl:call-template>
 								</fo:block>
 							</fo:block>
@@ -494,10 +511,17 @@
 							<fo:block break-after="page"/>
 						</xsl:if>
 						<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:foreword"/>
+						
+						<xsl:if test="/ogc:ogc-standard/ogc:preface/ogc:clause[@type = 'security']">
+							<fo:block break-after="page"/>
+						</xsl:if>
+						<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[@type = 'security']"/>
+						
 						<xsl:if test="/ogc:ogc-standard/ogc:preface/ogc:clause[@type = 'submitting_orgs']">
 							<fo:block break-after="page"/>
 						</xsl:if>
 						<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[@type = 'submitting_orgs']"/>
+						
 						<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:submitters"/>
 						<xsl:if test="/ogc:ogc-standard/ogc:preface/ogc:introduction">
 							<fo:block break-after="page"/>
@@ -506,7 +530,7 @@
 						
 						
 						
-						<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[not(@type = 'submitting_orgs') and not(@type = 'keywords')]"/>
+						<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:clause[not(@type = 'security') and not(@type = 'submitting_orgs') and not(@type = 'keywords')]"/>
 						<xsl:apply-templates select="/ogc:ogc-standard/ogc:preface/ogc:acknowledgements"/>
 					</fo:block>
 				</fo:flow>
@@ -547,7 +571,7 @@
 		<xsl:value-of select="translate(., $thinspace, ' ')"/>
 	</xsl:template>
 	
-	<xsl:template match="text()" priority="1" mode="contents">
+	<xsl:template match="text()" priority="3" mode="contents">
 		<xsl:value-of select="translate(., $thinspace, ' ')"/>
 	</xsl:template>
 
@@ -853,11 +877,20 @@
 			<xsl:when test="$level = 2">
 				<fo:block space-before="24pt" margin-bottom="10pt">
 					<xsl:attribute name="keep-with-next">always</xsl:attribute>		
-					<!-- <xsl:variable name="title">
-						<xsl:apply-templates/>
-					</xsl:variable> -->
+					<xsl:variable name="title">							
+						<xsl:choose>
+							<xsl:when test="*[local-name() = 'tab']">
+								<xsl:copy-of select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:copy-of select="."/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:variable name="section" select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>					
 					<xsl:call-template name="insertSectionTitle">
-						<xsl:with-param name="title" select="."/>
+						<xsl:with-param name="section" select="$section"/>
+						<xsl:with-param name="title" select="$title"/>
 					</xsl:call-template>
 				</fo:block>
 			</xsl:when>
@@ -1002,8 +1035,14 @@
 	
 	<xsl:template match="ogc:ul | ogc:ol" mode="ul_ol">
 		<fo:block-container margin-left="13mm">
+			<xsl:if test="ancestor::ogc:table">
+				<xsl:attribute name="margin-left">1.5mm</xsl:attribute>
+			</xsl:if>
 			<fo:block-container margin-left="0mm">
 				<fo:list-block provisional-distance-between-starts="12mm" space-after="12pt" line-height="115%">
+					<xsl:if test="ancestor::ogc:table">
+						<xsl:attribute name="provisional-distance-between-starts">5mm</xsl:attribute>
+					</xsl:if>
 					<xsl:if test="ancestor::ogc:ul | ancestor::ogc:ol">
 						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 					</xsl:if>
@@ -1030,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'">
@@ -1289,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_"/>
@@ -1363,9 +1402,18 @@
 	</xsl:template>
 	
 	<xsl:template name="insertSectionTitle">
+		<xsl:param name="section"/>
 		<xsl:param name="title"/>
 		<fo:block>
 			<fo:block font-size="18pt" color="{$color_blue}" keep-with-next="always" line-height="150%">
+				<xsl:if test="$section != ''">
+					<fo:inline padding-right="2mm">
+						<xsl:call-template name="addLetterSpacing">
+							<xsl:with-param name="text" select="$section"/>
+							<xsl:with-param name="letter-spacing" select="0.6"/>
+						</xsl:call-template>						
+					</fo:inline>
+				</xsl:if>
 				<xsl:apply-templates select="xalan:nodeset($title)" mode="titlesmall"/>
 			</fo:block>
 			<xsl:call-template name="insertOrangeHorizontalLine"/>
@@ -1374,9 +1422,9 @@
 	
 	<xsl:template match="text()" mode="titlesmall">
 		<xsl:call-template name="addLetterSpacing">
-				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new(.))"/>
-				<xsl:with-param name="letter-spacing" select="0.6"/>
-			</xsl:call-template>
+			<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new(.))"/>
+			<xsl:with-param name="letter-spacing" select="0.6"/>
+		</xsl:call-template>
 	</xsl:template>
 	
 	<xsl:template match="ogc:strong" mode="titlesmall">
@@ -1443,7 +1491,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>
 		
@@ -1463,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>
 		
@@ -1531,10 +1593,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_"/>
@@ -1562,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>
 		
@@ -1722,6 +1793,7 @@
 				
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
 				
 			<xsl:attribute name="font-size">12pt</xsl:attribute>
@@ -1767,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">
 		
 		
@@ -1849,6 +1922,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>
@@ -1898,7 +1972,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>
@@ -1976,6 +2050,10 @@
 			<fo:block> </fo:block>				
 		
 		
+		<!-- <xsl:if test="$namespace = 'bipm'">
+			<fo:block>&#xA0;</fo:block>				
+		</xsl:if> -->
+		
 		<!-- $namespace = 'iso' or  -->
 		
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -2008,11 +2086,14 @@
 		
 		
 		<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"/> -->
 		
 		<!-- <xsl:variable name="colwidths2">
 			<xsl:call-template name="calculate-column-widths">
@@ -2034,38 +2115,108 @@
 		<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">			
 			
 			
-			
+						
+						
+						
 			
 			
 			
 				<xsl:attribute name="margin-left">0mm</xsl:attribute>
 				<xsl:attribute name="margin-right">0mm</xsl:attribute>
 				<xsl:attribute name="space-after">12pt</xsl:attribute>
-						
+									
 			
+				<xsl:if test="ancestor::*[local-name()='sections']">
+					<xsl:attribute name="font-size">9pt</xsl:attribute>
+				</xsl:if>
 			
 			
-			<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: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:attribute name="margin-left">0mm</xsl:attribute>
-					<xsl:attribute name="margin-right">0mm</xsl:attribute>
 				
 				
 				
+					<attribute name="margin-left">0mm</attribute>
+					<attribute name="margin-right">0mm</attribute>
+								
+								
+								
 				
+								
 				
+			</xsl:variable>
+			
+			
+			<fo:table id="{@id}" table-omit-footer-at-break="true">
 				
-					<xsl:if test="ancestor::*[local-name()='sections']">
-						<xsl:attribute name="font-size">9pt</xsl:attribute>
-					</xsl:if>
+				<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: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']">
+						<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates/>
+					</xsl:otherwise>
+				</xsl:choose>
 				
+			</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>
+			
+			<!-- 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>
@@ -2077,17 +2228,7 @@
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:for-each>
-				
-				<xsl:choose>
-					<xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
-						<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:apply-templates/>
-					</xsl:otherwise>
-				</xsl:choose>
-				
-			</fo:table>
+			</fo:table>-->
 			
 			
 			
@@ -2098,6 +2239,7 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
 				
+				
 				<xsl:apply-templates/>				
 			</fo:block>
 		</xsl:if>
@@ -2153,6 +2295,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">
@@ -2212,11 +2361,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">
@@ -2241,6 +2393,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'">
@@ -2264,11 +2423,29 @@
 							
 								<xsl:attribute name="border">solid black 0pt</xsl:attribute>
 							
+							
+							
+							
+							
 							<!-- 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 -->
 							
 							
@@ -2282,6 +2459,109 @@
 			</fo:table-footer>
 		
 		</xsl:if>
+	</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">
+				<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">
+					<xsl:choose>
+						<xsl:when test="@name = 'border-top'">
+							<xsl:attribute name="{@name}">0pt solid black</xsl:attribute>
+						</xsl:when>
+						<xsl:when test="@name = 'border'">
+							<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
+							<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:for-each>
+				
+				<xsl:choose>
+					<xsl:when test="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>
+						<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 -->
+							
+							
+								<xsl:attribute name="border">solid black 0pt</xsl:attribute>
+							
+							
+							
+							
+							
+							
+							<!-- except gb  -->
+							
+								<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">
@@ -2334,7 +2614,7 @@
 					
 				</xsl:if>
 				
-								
+				
 				
 					<xsl:attribute name="min-height">8.5mm</xsl:attribute>
 					<xsl:if test="$parent-name = 'thead'">
@@ -2346,8 +2626,12 @@
 						<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>
@@ -2366,8 +2650,8 @@
 			
 			
 							
-				<xsl:attribute name="border">solid black 0pt</xsl:attribute>
-				
+				<xsl:attribute name="border">solid black 0pt</xsl:attribute>				
+			
 			
 			
 			
@@ -2413,7 +2697,7 @@
 			
 			
 			
-						
+			
 			
 			
 				<xsl:attribute name="border">solid 0pt white</xsl:attribute>
@@ -2422,6 +2706,7 @@
 			
 			
 			
+			
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
 					<xsl:value-of select="@colspan"/>
@@ -2433,7 +2718,8 @@
 				</xsl:attribute>
 			</xsl:if>
 			<xsl:call-template name="display-align"/>
-			<fo:block>								
+			<fo:block>
+								
 				<xsl:apply-templates/>
 			</fo:block>			
 		</fo:table-cell>
@@ -2445,14 +2731,17 @@
 				
 				
 				
+				
+				
 				<fo:inline padding-right="2mm">
 					
 					
 					
-				
+					
 					<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 						
 				</fo:inline>
+				
 				<xsl:apply-templates mode="process"/>
 			</fo:block>
 		
@@ -2482,6 +2771,7 @@
 					
 					
 					
+					
 					<fo:inline font-size="80%" padding-right="5mm" id="{@id}">
 						
 							<xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -2491,12 +2781,15 @@
 						
 						
 						
+						
 						<xsl:value-of select="@reference"/>
 						
+						
 					</fo:inline>
 					<fo:inline>
 						
-						<xsl:apply-templates/>
+						<!-- <xsl:apply-templates /> -->
+						<xsl:copy-of select="./node()"/>
 					</fo:inline>
 				</fo:block>
 			</xsl:if>
@@ -2533,7 +2826,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>
@@ -2598,7 +2904,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>
@@ -2619,6 +2926,7 @@
 			
 			
 			
+			
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				
 					<xsl:attribute name="internal-destination">
@@ -2626,7 +2934,9 @@
 						<xsl:value-of select="ancestor::*[local-name()='table'][1]/@id"/>
 					</xsl:attribute>
 				
+				
 				<xsl:value-of select="@reference"/>
+				
 			</fo:basic-link>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
@@ -2634,7 +2944,11 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='dl']">
-		<fo:block-container margin-left="0mm">
+		<fo:block-container>
+			
+				<xsl:attribute name="margin-left">0mm</xsl:attribute>
+			
+			
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -2644,8 +2958,11 @@
 				</xsl:attribute>
 				
 			</xsl:if>
-			<fo:block-container margin-left="0mm">
-	
+			<fo:block-container>
+				
+					<xsl:attribute name="margin-left">0mm</xsl:attribute>
+				
+				
 				<xsl:variable name="parent" select="local-name(..)"/>
 				
 				<xsl:variable name="key_iso">
@@ -2659,9 +2976,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']/*"/>
@@ -2677,9 +2997,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>
@@ -2690,9 +3013,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>
@@ -2724,7 +3050,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"/>
@@ -2873,6 +3212,7 @@
 						<xsl:attribute name="margin-top">0pt</xsl:attribute>
 						<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 					
+					
 					<xsl:apply-templates/>
 					<!-- <xsl:if test="$namespace = 'gb'">
 						<xsl:if test="ancestor::*[local-name()='formula']">
@@ -2926,6 +3266,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']">
@@ -2939,18 +3280,18 @@
 	</xsl:template><xsl:template match="*[local-name()='tt']">
 		<fo:inline xsl:use-attribute-sets="tt-style">
 			<xsl:variable name="_font-size">
-								
-								
-								
 				
 				
 				
 				
 				
 				
-								
+				
+				
+				
+				
 				10
-								
+				
 				
 						
 			</xsl:variable>
@@ -3254,7 +3595,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>
@@ -3288,7 +3640,8 @@
 		<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>
@@ -3318,6 +3671,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -3371,10 +3725,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>
@@ -3382,7 +3740,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">
@@ -3439,6 +3797,8 @@
 						
 						
 						
+						
+						
 						<fo:inline xsl:use-attribute-sets="note-name-style">
 							<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 						</fo:inline>
@@ -3531,7 +3891,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>
@@ -3582,7 +3943,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"/>
@@ -3596,18 +3957,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_) != ''">
@@ -3669,7 +4021,7 @@
 								</fo:bookmark>
 							</xsl:for-each>
 						</fo:bookmark>					
-					</xsl:if>					
+					</xsl:if>
 				
 				
 				
@@ -3692,6 +4044,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>
@@ -3706,7 +4072,7 @@
 	</xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |         *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation">
 		<xsl:if test="normalize-space() != ''">			
 			<fo:block xsl:use-attribute-sets="figure-name-style">
-								
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -4150,9 +4516,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>
 			
@@ -4302,9 +4673,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/>
@@ -4351,13 +4725,14 @@
 	</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']">
 		<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/>
@@ -4386,6 +4761,7 @@
 						</xsl:choose>
 					</xsl:attribute>
 					
+					
 					<fo:block-container margin-left="0mm">
 						<fo:block>
 							<xsl:apply-templates select="." mode="ul_ol"/>
@@ -4413,7 +4789,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>
@@ -4432,6 +4809,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']">
@@ -4709,6 +5090,7 @@
 						<dc:title>
 							<xsl:variable name="title">
 								
+								
 																
 									<xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = 'en']"/>
 								
@@ -4727,6 +5109,7 @@
 						<dc:creator>
 							
 							
+							
 						</dc:creator>
 						<dc:description>
 							<xsl:variable name="abstract">
@@ -4736,6 +5119,7 @@
 								
 									<xsl:copy-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'abstract']//text()"/>									
 								
+								
 							</xsl:variable>
 							<xsl:value-of select="normalize-space($abstract)"/>
 						</dc:description>
@@ -4807,13 +5191,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">		
@@ -4879,4 +5272,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>