metanorma-m3aawg 1.5.3 → 1.6.1

data/lib/isodoc/m3aawg/html/wordstyle.scss

@@ -70,7 +70,7 @@
 	margin:0cm;
 	margin-bottom:12.0pt;
 	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;
@@ -85,7 +85,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;}
@@ -100,7 +100,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
         /* 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;}
@@ -115,7 +115,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
         /* 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;}
@@ -130,7 +130,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
         /* 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;}
@@ -141,7 +141,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
 	margin:0cm;
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:$footnotefontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -152,7 +152,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
 	tab-stops:center 216.0pt right 432.0pt;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -163,7 +163,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
         margin-bottom:.0001pt;
         mso-pagination:widow-orphan;
         tab-stops:center 342.1pt right 684.3pt;
-        font-size:11.0pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-fareast-font-family:"Times New Roman";
         mso-ansi-language:EN-US;
@@ -174,7 +174,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
 	tab-stops:center 216.0pt right 432.0pt;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -185,7 +185,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
         margin-bottom:.0001pt;
         mso-pagination:widow-orphan;
         tab-stops:center 342.1pt right 684.3pt;
-        font-size:11.0pt;
+        font-size:$normalfontsize;
         font-family:$bodyfont;
         mso-fareast-font-family:"Times New Roman";
         mso-ansi-language:EN-US;
@@ -230,7 +230,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
 	margin:0cm;
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:$footnotefontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -282,7 +282,7 @@ h1
 	mso-hyphenate:none;
 	tab-stops:20.0pt list 21.6pt left 28.0pt;
 	font-size:13.0pt;
-	mso-bidi-font-size:11.0pt;
+	mso-bidi-font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-font-kerning:0pt;
@@ -310,7 +310,7 @@ h1.Annex
 	mso-hyphenate:none;
 	tab-stops:20.0pt list 21.6pt left 28.0pt;
 	font-size:13.0pt;
-	mso-bidi-font-size:11.0pt;
+	mso-bidi-font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-font-kerning:0pt;
@@ -336,7 +336,7 @@ h1.Annex
         mso-hyphenate:none;
         tab-stops:27.0pt 35.0pt;
         font-size:12.0pt;
-        mso-bidi-font-size:11.0pt;
+        mso-bidi-font-size:$normalfontsize;
         font-family:$headerfont;
         font-weight:bold;
         mso-fareast-font-family:$headerfont;
@@ -363,7 +363,7 @@ h2
 	mso-hyphenate:none;
 	tab-stops:27.0pt 35.0pt;
 	font-size:12.0pt;
-	mso-bidi-font-size:11.0pt;
+	mso-bidi-font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
@@ -388,7 +388,7 @@ h3
 	mso-list:l1 level3 lfo6;
 	mso-hyphenate:none;
 	tab-stops:list 36.0pt left 44.0pt;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
@@ -413,7 +413,7 @@ h4
 	mso-list:l1 level4 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt 57.0pt 68.0pt;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
@@ -438,7 +438,7 @@ h5
 	mso-list:l1 level5 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt list 54.0pt;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
@@ -463,7 +463,7 @@ h6
 	mso-list:l1 level6 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt list 72.0pt;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
@@ -483,7 +483,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
 	mso-pagination:widow-orphan;
 	mso-hyphenate:none;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -506,7 +506,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
 	mso-pagination:widow-orphan;
 	mso-hyphenate:none;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -529,7 +529,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	mso-pagination:widow-orphan;
 	mso-hyphenate:none;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -551,7 +551,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:10.0pt;
+	font-size:$footnotefontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -569,7 +569,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
 	text-align:justify;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
-	font-size:11.0pt;
+	font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -613,7 +613,7 @@ span.Heading3Char
 	mso-style-locked:yes;
 	mso-style-parent:"";
 	mso-style-link:"Heading 3";
-	mso-ansi-font-size:11.0pt;
+	mso-ansi-font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-ascii-font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
@@ -629,7 +629,7 @@ span.Heading4Char
 	mso-style-locked:yes;
 	mso-style-parent:"";
 	mso-style-link:"Heading 4";
-	mso-ansi-font-size:11.0pt;
+	mso-ansi-font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-ascii-font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
@@ -645,7 +645,7 @@ span.Heading5Char
 	mso-style-locked:yes;
 	mso-style-parent:"";
 	mso-style-link:"Heading 5";
-	mso-ansi-font-size:11.0pt;
+	mso-ansi-font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-ascii-font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
@@ -661,7 +661,7 @@ span.Heading6Char
 	mso-style-locked:yes;
 	mso-style-parent:"";
 	mso-style-link:"Heading 6";
-	mso-ansi-font-size:11.0pt;
+	mso-ansi-font-size:$normalfontsize;
 	font-family:$headerfont;
 	mso-ascii-font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
@@ -680,8 +680,8 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	margin-left:0cm;
 	line-height:10.5pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
-	mso-bidi-font-size:11.0pt;
+	font-size:$smallerfontsize;
+	mso-bidi-font-size:$normalfontsize;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -1164,7 +1164,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/m3aawg/html_convert.rb

@@ -1,35 +1,18 @@
 require "isodoc"
+require "isodoc/generic/html_convert"
 require_relative "base_convert"
 require_relative "init"
 
 module IsoDoc
   module M3AAWG
-    # A {Converter} implementation that generates CSAND output, and a document
-    # schema encapsulation of the document for validation
-    class HtmlConvert < IsoDoc::HtmlConvert
-      def initialize(options)
-        @libdir = File.dirname(__FILE__)
-        super
-      end
-
-      def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
-                     '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-                       '"Overpass",sans-serif'),
-          monospacefont: '"Space Mono",monospace'
-        }
+    class HtmlConvert < IsoDoc::Generic::HtmlConvert
+      def configuration
+        Metanorma::M3AAWG.configuration
       end
 
-      def default_file_locations(_options)
-        {
-          htmlstylesheet: html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: html_doc_path("html_m3d_titlepage.html"),
-          htmlintropage: html_doc_path("html_m3d_intro.html"),
-          standardstylesheet: nil,
-          scripts: html_doc_path("scripts.html"),
-        }
+      def initialize(options)
+        #require "byebug"; byebug
+        super
       end
 
       def colophon(body, docxml)
@@ -45,13 +28,6 @@ module IsoDoc
         end
       end
 
-      def googlefonts()
-        <<~HEAD.freeze
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
-        HEAD
-      end
-
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72",
                       "xml:lang": "EN-US", class: "container" }

data/lib/isodoc/m3aawg/i18n.rb

@@ -1,9 +1,8 @@
 module IsoDoc
   module M3AAWG
-    class I18n < IsoDoc::I18n
-      def load_yaml1(lang, script)
-        y = YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-        super.merge(y)
+    class I18n < IsoDoc::Generic::I18n
+      def configuration
+        Metanorma::M3AAWG.configuration
       end
     end
   end

data/lib/isodoc/m3aawg/init.rb

@@ -11,16 +11,13 @@ module IsoDoc
       end
 
       def xref_init(lang, script, klass, labels, options)
-        @xrefs = Xref.new(lang, script, HtmlConvert.new(language: lang, script: script), labels, options)
+        html = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, html, labels, options)
       end
 
       def i18n_init(lang, script, i18nyaml = nil)
         @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
       end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
     end
   end
 end

data/lib/isodoc/m3aawg/m3d.report.xsl

@@ -75,6 +75,10 @@
 
 			<xsl:call-template name="addPDFUAmeta"/>
 			
+			<xsl:call-template name="addBookmarks">
+				<xsl:with-param name="contents" select="$contents"/>
+			</xsl:call-template>
+			
 			<fo:page-sequence master-reference="document" force-page-count="no-force">
 			
 				<fo:static-content flow-name="cover-header">
@@ -218,17 +222,17 @@
 							<fo:table-column column-width="25mm"/>
 							<fo:table-column column-width="155mm"/>
 							<fo:table-body>
-								<xsl:for-each select="xalan:nodeset($contents)//item"><!-- [@display = 'true'][not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->							
+								<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->							
 									<fo:table-row height="6mm">
 										<fo:table-cell>
 											<fo:block font-weight="bold">
-												<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
+												<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
 													<xsl:choose>
 														<xsl:when test="@section = ''">
-															<xsl:apply-templates/>
+															<xsl:apply-templates select="title"/>
 														</xsl:when>
 														<xsl:when test="@type = 'references' and @section = ''">
-															<xsl:apply-templates/>
+															<xsl:apply-templates select="title"/>
 														</xsl:when>
 														<xsl:when test="@level = 1">
 															<xsl:value-of select="@section"/>
@@ -243,12 +247,12 @@
 												<xsl:if test="@level = 1">
 													<xsl:attribute name="font-weight">bold</xsl:attribute>
 												</xsl:if>
-												<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
+												<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
 													<xsl:choose>
 														<xsl:when test="@section = ''"/>
 														<xsl:when test="@type = 'references' and @section = ''"/>
 														<xsl:otherwise>
-															<xsl:apply-templates/>
+															<xsl:apply-templates select="title"/>
 														</xsl:otherwise>
 													</xsl:choose>
 													
@@ -314,9 +318,7 @@
 		</xsl:variable>
 		
 		<xsl:variable name="display">
-			<xsl:choose>
-				<xsl:when test="ancestor-or-self::m3d:bibitem">false</xsl:when>
-				<xsl:when test="ancestor-or-self::m3d:term">false</xsl:when>
+			<xsl:choose>				
 				<xsl:when test="ancestor-or-self::m3d:preface and $level &gt;= 2">false</xsl:when>
 				<xsl:when test="ancestor::m3d:annex and $level &gt;= 3">false</xsl:when>
 				<xsl:when test="$level &lt;= 3">true</xsl:when>
@@ -324,8 +326,15 @@
 			</xsl:choose>
 		</xsl:variable>
 		
+		<xsl:variable name="skip">
+			<xsl:choose>
+				<xsl:when test="ancestor-or-self::m3d:bibitem">true</xsl:when>
+				<xsl:when test="ancestor-or-self::m3d:term">true</xsl:when>				
+				<xsl:otherwise>false</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		
-		<xsl:if test="$display = 'true'">		
+		<xsl:if test="$skip = 'false'">		
 		
 			<xsl:variable name="section">
 				<xsl:call-template name="getSection"/>
@@ -339,12 +348,13 @@
 				<xsl:value-of select="local-name()"/>
 			</xsl:variable>
 			
-			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}">
-				<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" display="{$display}">
+				<title>
+					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+				</title>
+				<xsl:apply-templates mode="contents"/>
 			</item>
-			<xsl:apply-templates mode="contents"/>
 		</xsl:if>	
-		
 	</xsl:template>
 	
 
@@ -859,6 +869,12 @@
 			
 		</title-edition>
 		
+		<title-edition lang="fr">
+			
+				<xsl:text>Édition </xsl:text>
+			
+		</title-edition>
+		
 
 		<title-toc lang="en">
 			
@@ -867,7 +883,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>
 		
@@ -887,13 +908,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>
 		
@@ -955,10 +985,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_"/>
@@ -967,7 +1006,9 @@
 				<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="link-style">
+	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="root-style">
+		
+	</xsl:attribute-set><xsl:attribute-set name="link-style">
 		
 			<xsl:attribute name="color">blue</xsl:attribute>
 			<xsl:attribute name="text-decoration">underline</xsl:attribute>
@@ -1106,6 +1147,7 @@
 				
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
 				
 			<xsl:attribute name="font-size">12pt</xsl:attribute>
@@ -1151,6 +1193,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">
 		
 		
@@ -1222,6 +1265,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 		
@@ -1346,6 +1390,10 @@
 		
 		
 		
+		<!-- <xsl:if test="$namespace = 'bipm'">
+			<fo:block>&#xA0;</fo:block>				
+		</xsl:if> -->
+		
 		<!-- $namespace = 'iso' or  -->
 		
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
@@ -1383,6 +1431,7 @@
 				<xsl:with-param name="table" select="$simple-table"/>
 			</xsl:call-template>
 		</xsl:variable>
+		<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
 		
 		<!-- <xsl:variable name="colwidths2">
 			<xsl:call-template name="calculate-column-widths">
@@ -1404,27 +1453,49 @@
 		<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">			
 			
 			
+						
+						
+						
 			
 			
+									
 			
-						
 			
 			
 			
-			<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:variable>
+			
+			
+			<fo:table id="{@id}" table-omit-footer-at-break="true">
 				
+				<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">					
+					<xsl:attribute name="{@name}">
+						<xsl:value-of select="."/>
+					</xsl:attribute>
+				</xsl:for-each>
 				
+				<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>				
+				<xsl:if test="$isNoteOrFnExist = 'true'">
+					<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
+				</xsl:if>
 				
 				<xsl:for-each select="xalan:nodeset($colwidths)//column">
 					<xsl:choose>
@@ -1448,6 +1519,33 @@
 				
 			</fo:table>
 			
+			<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
+				<xsl:call-template name="insertTableFooterInSeparateTable">
+					<xsl:with-param name="table_attributes" select="$table_attributes"/>
+					<xsl:with-param name="colwidths" select="$colwidths"/>				
+				</xsl:call-template>
+			</xsl:for-each>
+			
+			<!-- insert footer as table -->
+			<!-- <fo:table>
+				<xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
+					<xsl:attribute name="{@name}">
+						<xsl:value-of select="."/>
+					</xsl:attribute>
+				</xsl:for-each>
+				
+				<xsl:for-each select="xalan:nodeset($colwidths)//column">
+					<xsl:choose>
+						<xsl:when test=". = 1 or . = 0">
+							<fo:table-column column-width="proportional-column-width(2)"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<fo:table-column column-width="proportional-column-width({.})"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:for-each>
+			</fo:table>-->
+			
 			
 			
 			
@@ -1457,6 +1555,7 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
 				
+				
 				<xsl:apply-templates/>				
 			</fo:block>
 		</xsl:if>
@@ -1512,6 +1611,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">
@@ -1571,11 +1677,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">
@@ -1600,6 +1709,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'">
@@ -1621,11 +1737,29 @@
 							<!-- fn will be processed inside 'note' processing -->
 							
 							
+							
+							
+							
+							
 							<!-- 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 -->
 							
 							
@@ -1639,6 +1773,88 @@
 			</fo:table-footer>
 		
 		</xsl:if>
+	</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
+		<xsl:param name="table_attributes"/>
+		<xsl:param name="colwidths"/>
+		
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
+		
+		<xsl:if test="$isNoteOrFnExist = 'true'">
+		
+			<xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
+			
+			<fo:table keep-with-previous="always">
+				<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
+					<xsl:choose>
+						<xsl:when test="@name = 'border-top'">
+							<xsl:attribute name="{@name}">0pt solid black</xsl:attribute>
+						</xsl:when>
+						<xsl:when test="@name = 'border'">
+							<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
+							<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:for-each>
+				
+				<xsl:for-each select="xalan:nodeset($colwidths)//column">
+					<xsl:choose>
+						<xsl:when test=". = 1 or . = 0">
+							<fo:table-column column-width="proportional-column-width(2)"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<fo:table-column column-width="proportional-column-width({.})"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:for-each>
+				
+				<fo:table-body>
+					<fo:table-row>
+						<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
+							
+							
+							
+							<!-- fn will be processed inside 'note' processing -->
+							
+							
+							
+							
+							
+							
+							
+							<!-- except gb  -->
+							
+								<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">
@@ -1691,8 +1907,12 @@
 					
 				</xsl:if>
 				
-								
-								
+				
+				
+				
+				<!-- <xsl:if test="$namespace = 'bipm'">
+					<xsl:attribute name="height">8mm</xsl:attribute>
+				</xsl:if> -->
 				
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -1716,6 +1936,7 @@
 			
 			
 			
+			
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
 					<xsl:value-of select="@colspan"/>
@@ -1755,7 +1976,8 @@
 			
 			
 			
-						
+			
+			
 			
 			
 			
@@ -1773,7 +1995,8 @@
 				</xsl:attribute>
 			</xsl:if>
 			<xsl:call-template name="display-align"/>
-			<fo:block>								
+			<fo:block>
+								
 				<xsl:apply-templates/>
 			</fo:block>			
 		</fo:table-cell>
@@ -1785,14 +2008,17 @@
 				
 				
 				
+				
+				
 				<fo:inline padding-right="2mm">
 					
 					
 					
-				
+					
 					<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 						
 				</fo:inline>
+				
 				<xsl:apply-templates mode="process"/>
 			</fo:block>
 		
@@ -1816,6 +2042,7 @@
 					
 					
 					
+					
 					<fo:inline font-size="80%" padding-right="5mm" id="{@id}">
 						
 							<xsl:attribute name="vertical-align">super</xsl:attribute>
@@ -1825,12 +2052,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>
@@ -1867,7 +2097,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>
@@ -1932,7 +2175,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>
@@ -1951,9 +2195,12 @@
 			
 			
 			
+			
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				
+				
 				<xsl:value-of select="@reference"/>
+				
 			</fo:basic-link>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
@@ -1961,7 +2208,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>
@@ -1971,8 +2222,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">
@@ -1986,9 +2240,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']/*"/>
@@ -2004,9 +2261,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>
@@ -2017,9 +2277,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>
@@ -2051,7 +2314,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"/>
@@ -2195,6 +2471,7 @@
 					
 					
 					
+					
 					<xsl:apply-templates/>
 					<!-- <xsl:if test="$namespace = 'gb'">
 						<xsl:if test="ancestor::*[local-name()='formula']">
@@ -2248,6 +2525,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']">
@@ -2261,9 +2539,9 @@
 	</xsl:template><xsl:template match="*[local-name()='tt']">
 		<fo:inline xsl:use-attribute-sets="tt-style">
 			<xsl:variable name="_font-size">
-								
-								
-								
+				
+				
+				
 				
 				
 				
@@ -2275,9 +2553,9 @@
 					</xsl:choose>
 				
 				
-								
 				
-								
+				
+				
 				
 						
 			</xsl:variable>
@@ -2581,7 +2859,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>
@@ -2615,7 +2904,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>
@@ -2645,6 +2935,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -2698,10 +2989,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>
@@ -2709,7 +3004,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">
@@ -2762,6 +3057,8 @@
 						
 						
 						
+						
+						
 						<fo:inline xsl:use-attribute-sets="note-name-style">
 							<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 						</fo:inline>
@@ -2856,7 +3153,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>
@@ -2891,15 +3189,109 @@
 			
 			<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">		
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
-	</xsl:template><xsl:template match="text()" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">		
+		<xsl:apply-templates mode="bookmarks"/>
+		<xsl:text> </xsl:text>
+	</xsl:template><xsl:template match="*[local-name() = 'name']/text()" mode="contents" priority="2">
+		<xsl:value-of select="."/>
+	</xsl:template><xsl:template match="*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |         *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation">
+	</xsl:template><xsl:template match="node()" mode="contents">
+		<xsl:apply-templates mode="contents"/>
+	</xsl:template><xsl:template match="node()" mode="bookmarks">
+		<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() = '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"/>
+		<xsl:if test="xalan:nodeset($contents)//item">
+			<fo:bookmark-tree>
+				<xsl:choose>
+					<xsl:when test="xalan:nodeset($contents)/doc">
+						<xsl:choose>
+							<xsl:when test="count(xalan:nodeset($contents)/doc) &gt; 1">
+								<xsl:for-each select="xalan:nodeset($contents)/doc">
+									<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
+										<fo:bookmark-title>
+											<xsl:variable name="bookmark-title_">
+												<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_) != ''">
+													<xsl:value-of select="normalize-space($bookmark-title_)"/>
+												</xsl:when>
+												<xsl:otherwise>
+													<xsl:choose>
+														<xsl:when test="@lang = 'en'">English</xsl:when>
+														<xsl:when test="@lang = 'fr'">Français</xsl:when>
+														<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
+														<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
+													</xsl:choose>
+												</xsl:otherwise>
+											</xsl:choose>
+										</fo:bookmark-title>
+										<xsl:apply-templates select="contents/item" mode="bookmark"/>
+									</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:for-each>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="xalan:nodeset($contents)/contents/item" mode="bookmark"/>				
+					</xsl:otherwise>
+				</xsl:choose>
+				
+				
+				
+				
+				
+				
+				
+				
+			</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>
+					<xsl:if test="@section != ''">
+						<xsl:value-of select="@section"/> 
+						<xsl:text> </xsl:text>
+					</xsl:if>
+					<xsl:value-of select="normalize-space(title)"/>
+				</fo:bookmark-title>
+				<xsl:apply-templates mode="bookmark"/>				
+		</fo:bookmark>
+	</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>
@@ -2954,7 +3346,7 @@
 					<xsl:apply-templates/>
 				</xsl:otherwise>
 			</xsl:choose>
-	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
+	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
 		<xsl:copy>
@@ -3482,9 +3874,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/>
@@ -3533,13 +3928,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/>
@@ -3558,20 +3954,30 @@
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
-		<fo:block-container margin-left="0mm">
-			<xsl:if test="parent::*[local-name() = 'note']">
-				<xsl:attribute name="margin-left">
-					<xsl:choose>
-						<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
-						<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-				
-			</xsl:if>
-			<fo:block-container margin-left="0mm">
-				<xsl:apply-templates select="." mode="ul_ol"/>
-			</fo:block-container>
-		</fo:block-container>
+		<xsl:choose>
+			<xsl:when test="parent::*[local-name() = 'note']">
+				<fo:block-container>
+					<xsl:attribute name="margin-left">
+						<xsl:choose>
+							<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
+							<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+					
+					
+					<fo:block-container margin-left="0mm">
+						<fo:block>
+							<xsl:apply-templates select="." mode="ul_ol"/>
+						</fo:block>
+					</fo:block-container>
+				</fo:block-container>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block>
+					<xsl:apply-templates select="." mode="ul_ol"/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'errata']">
 		<!-- <row>
 					<date>05-07-2013</date>
@@ -3742,6 +4148,7 @@
 								
 								
 								
+								
 									<xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'title']"/>
 								
 																
@@ -3760,6 +4167,7 @@
 								<xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']/*[local-name() = 'organization']/*[local-name() = 'name']"/>
 							
 							
+							
 						</dc:creator>
 						<dc:description>
 							<xsl:variable name="abstract">
@@ -3767,6 +4175,7 @@
 								
 								
 								
+								
 							</xsl:variable>
 							<xsl:value-of select="normalize-space($abstract)"/>
 						</dc:description>
@@ -3838,13 +4247,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">		
@@ -3867,6 +4285,7 @@
 						
 			
 			
+			
 		</xsl:variable>
 		<xsl:if test="$documentNS != $XSLNS">
 			<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
@@ -3892,4 +4311,40 @@
 				</xsl:otherwise>
 			</xsl:choose>					
 		</xsl:attribute>
+	</xsl:template><xsl:template name="add-letter-spacing">
+		<xsl:param name="text"/>
+		<xsl:param name="letter-spacing" select="'0.15'"/>
+		<xsl:if test="string-length($text) &gt; 0">
+			<xsl:variable name="char" select="substring($text, 1, 1)"/>
+			<fo:inline padding-right="{$letter-spacing}mm">
+				<xsl:if test="$char = '®'">
+					<xsl:attribute name="font-size">58%</xsl:attribute>
+					<xsl:attribute name="baseline-shift">30%</xsl:attribute>
+				</xsl:if>				
+				<xsl:value-of select="$char"/>
+			</fo:inline>
+			<xsl:call-template name="add-letter-spacing">
+				<xsl:with-param name="text" select="substring($text, 2)"/>
+				<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>