metanorma-iec 1.2.5 → 1.2.10

data/lib/isodoc/iec/html_convert.rb

@@ -16,6 +16,8 @@ module IsoDoc
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Arial",sans-serif'),
         headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
         monospacefont: ('"Courier New",monospace'),
+        monospacefontsize: "1.0em",
+        footnotefontsize: "0.9em",
         }
       end
 
@@ -36,6 +38,12 @@ module IsoDoc
         docxml
       end
 
+      def authority_cleanup(docxml)
+        auth = docxml.at("//div[@id = 'boilerplate-feedback' or @class = 'boilerplate-feedback']")
+        auth&.remove
+        super
+      end
+
       include BaseConvert
       include Init
     end

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

@@ -5,6 +5,7 @@ IEC: INTERNATIONAL ELECTROTECHNICAL COMMISSION
 formula: Equation
 inequality: Inequality
 section_iev: Section
+price-code: Price Code
 term_def_boilerplate: |
       <p>ISO and IEC maintain terminological databases for use in
       standardization at the following addresses:</p>
@@ -16,3 +17,19 @@ term_def_boilerplate: |
       <li> <p>ISO Online browsing platform: available at
         <link target="http://www.iso.org/obp"/></p> </li>
       </ul>
+doctype_dict:
+  international-standard: International Standard
+  technical-specification: Technical Specification
+  technical-report: Technical Report
+  publicly-available-specification: Publicly Available Specification
+  international-workshop-agreement: International Workshop Agreement
+  guide: Guide
+  interpretation-sheet: Interpretation Sheet
+function_dict:
+  emc: Basic EMC Publication
+  safety: Basic Safety Publication
+  environment: Basic Environment Publication
+  quality-assurance: Basic Quality Assurance Publication
+horizontal_dict:
+  "true": Horizontal Standard
+  "false": 

data/lib/isodoc/iec/i18n-fr.yaml

@@ -5,6 +5,7 @@ formula: Equation
 inequality: Inégalité
 IEC: COMMISSION ELECTROTECHNIQUE INTERNATIONALE
 section_iev: Section
+price-code: Code prix
 term_def_boilerplate: |
       <p>L'ISO et l'IEC tiennent à jour des bases de données terminologiques
       destinées à être utilisées en normalisation, consultables aux adresses
@@ -16,3 +17,20 @@ term_def_boilerplate: |
       <li> <p>ISO Online browsing platform: disponible à l'adresse
         <link target="http://www.iso.org/obp"/></p> </li>
       </ul>
+doctype_dict:
+  international-standard: Norme international
+  technical-specification: Spécification technique
+  technical-report: Rapport technique
+  publicly-available-specification: Spécification disponible publiquement
+  international-workshop-agreement: Accord internationale d’atelier
+  guide: Guide
+  interpretation-sheet: Feuille d’interprétation
+function_dict:
+  emc: Publication fondamentale en CEM
+  safety: Publication fondamentale de sécurité
+  environment: Publication fondamentale sur l’environnement
+  quality-assurance: Publication fondamentale sur l’assurance de la qualité
+horizontal_dict:
+  "true": Norme horizontale
+  "false":
+

data/lib/isodoc/iec/iec.international-standard.xsl

@@ -32,7 +32,7 @@
 	<xsl:variable name="title-main-fr" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr' and @type = 'title-main']"/>
 	<xsl:variable name="part" select="/iec:iec-standard/iec:bibdata/iec:ext/iec:structuredidentifier/iec:project-number/@part"/>
 	
-	<xsl:variable name="doctype_uppercased" select="java:toUpperCase(java:java.lang.String.new(translate(/iec:iec-standard/iec:bibdata/iec:ext/iec:doctype,'-',' ')))"/>
+	<xsl:variable name="doctype_uppercased" select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:ext/iec:doctype[@language = $lang]))"/>
 	 
 	
 	 	
@@ -136,7 +136,7 @@
 		<xsl:call-template name="namespaceCheck"/>
 		<!-- https://stackoverflow.com/questions/25261949/xsl-fo-letter-spacing-with-text-align -->
 		<!-- https://xmlgraphics.apache.org/fop/knownissues.html -->
-		<fo:root font-family="Arial, Times New Roman, STIX2Math, HanSans" font-size="10pt" xml:lang="{$lang}">
+		<fo:root font-family="Arial, Times New Roman, STIX Two Math, Source Han Sans" font-size="10pt" xml:lang="{$lang}">
 			<fo:layout-master-set>
 				<!-- cover pages -->
 				<fo:simple-page-master master-name="cover" page-width="{$pageWidth}" page-height="{$pageHeight}">
@@ -146,6 +146,13 @@
 					<fo:region-start region-name="left-region" extent="18mm"/>
 					<fo:region-end region-name="right-region" extent="20.5mm"/>
 				</fo:simple-page-master>
+				<fo:simple-page-master master-name="cover_2nd" page-width="{$pageWidth}" page-height="{$pageHeight}">
+					<fo:region-body margin-top="17.5mm" margin-bottom="12.5mm" margin-left="25mm" margin-right="25mm" column-count="2" column-gap="5mm"/>
+					<fo:region-before region-name="header" extent="17.5mm"/> 
+					<fo:region-after region-name="footer" extent="12.5mm" precedence="true"/>
+					<fo:region-start region-name="left-region" extent="25mm"/>
+					<fo:region-end region-name="right-region" extent="25mm"/>
+				</fo:simple-page-master>
 				
 				<fo:simple-page-master master-name="cover-FDIS" page-width="{$pageWidth}" page-height="{$pageHeight}">
 					<fo:region-body margin-top="17.5mm" margin-bottom="29mm" margin-left="18mm" margin-right="19mm"/>
@@ -218,222 +225,230 @@
 				</fo:page-sequence>
 				
 				<!-- 2nd Cover Page -->
-				<fo:page-sequence master-reference="cover" force-page-count="no-force">
+				<fo:page-sequence master-reference="cover_2nd" force-page-count="no-force" font-size="8pt">
 					<fo:flow flow-name="xsl-region-body">
-						<fo:block-container margin-left="7mm" margin-right="4.5mm" border="0.5pt solid black" margin-top="7mm">
-							<fo:block-container margin-left="2.5mm" margin-right="2.5mm" margin-top="1mm" margin-bottom="1mm">
-								<fo:block-container margin-left="0mm" margin-right="0mm">
-									<fo:table table-layout="fixed" width="100%">
-										<fo:table-column column-width="20mm"/>
-										<fo:table-column column-width="130mm"/>
-										<fo:table-body>
-											<fo:table-row>
-												<fo:table-cell>
-													<fo:block>
-														<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="17.8mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
-													</fo:block>
-												</fo:table-cell>
-												<fo:table-cell font-size="10pt" font-weight="bold" display-align="after">
-													<fo:block margin-bottom="3pt">THIS PUBLICATION IS COPYRIGHT PROTECTED</fo:block>
-													<fo:block margin-bottom="10pt">
-														<!-- Example: Copyright © 2014 IEC, Geneva, Switzerland -->
-														<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-year']"/>
-													</fo:block>
-												</fo:table-cell>
-											</fo:table-row>
-										</fo:table-body>
-									</fo:table>
-									<fo:block font-size="8pt">
-										<fo:block margin-bottom="8pt" text-align="justify">
-										<!-- Example: All rights reserved. Unless otherwise specified, no part of this publication may be reproduced or utilized in any form
-	or by any means, electronic or mechanical, including photocopying and microfilm, without permission in writing from
-	either IEC or IEC's member National Committee in the country of the requester. If you have any questions about IEC
-	copyright or have an enquiry about obtaining additional rights to this publication, please contact the address below or
-	your local IEC member National Committee for further information. -->
-										<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-message']"/>
-										</fo:block>
-										<fo:block margin-bottom="8pt" text-align="justify">Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne peut être reproduite
-	ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique ou mécanique, y compris la photocopie
-	et les microfilms, sans l'accord écrit de l'IEC ou du Comité national de l'IEC du pays du demandeur. Si vous avez des
-	questions sur le copyright de l'IEC ou si vous désirez obtenir des droits supplémentaires sur cette publication, utilisez
-	les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pays de résidence.</fo:block>
-									
-										<xsl:variable name="telpos" select="count(/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']/text()[contains(., 'Tel.')]/preceding-sibling::node())"/>
+						<fo:block span="all">
+							<fo:block-container border="0.5pt solid black" margin-top="7mm">
+								<fo:block-container margin-left="2.5mm" margin-right="2.5mm" margin-top="1mm" margin-bottom="1mm">
+									<fo:block-container margin-left="0mm" margin-right="0mm">
 										<fo:table table-layout="fixed" width="100%">
-											<fo:table-column column-width="59mm"/>
-											<fo:table-column column-width="90mm"/>
+											<fo:table-column column-width="20mm"/>
+											<fo:table-column column-width="130mm"/>
 											<fo:table-body>
 												<fo:table-row>
 													<fo:table-cell>
 														<fo:block>
-															<!-- Example: IEC Central Office
-																3, rue de Varembé
-																CH-1211 Geneva 20
-																Switzerland -->
-															<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-name']" mode="coverpage"/>
-															<xsl:choose>
-																<xsl:when test="$telpos != 0">
-																	<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']/node()[position() &lt; $telpos]" mode="coverpage"/>
-																</xsl:when>
-																<xsl:otherwise>
-																	<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']" mode="coverpage"/>
-																</xsl:otherwise>
-															</xsl:choose>
+															<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="17.8mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
 														</fo:block>
 													</fo:table-cell>
-													<fo:table-cell>
-														<fo:block>
-															<!-- Example: Tel.: +41 22 919 02 11
-															 Fax: +41 22 919 0
-															 info@iec.ch
-															www.iec.ch -->
-															<xsl:choose>
-																<xsl:when test="$telpos != 0">
-																	<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']/node()[position() &gt; $telpos]" mode="coverpage"/>
-																</xsl:when>
-																<xsl:otherwise> </xsl:otherwise>
-															</xsl:choose>
+													<fo:table-cell font-size="10pt" font-weight="bold" display-align="after">
+														<fo:block margin-bottom="3pt">THIS PUBLICATION IS COPYRIGHT PROTECTED</fo:block>
+														<fo:block margin-bottom="10pt">
+															<!-- Example: Copyright © 2014 IEC, Geneva, Switzerland -->
+															<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-year']"/>
 														</fo:block>
 													</fo:table-cell>
 												</fo:table-row>
 											</fo:table-body>
 										</fo:table>
-									
-									</fo:block>
+										<fo:block>
+											<fo:block margin-bottom="8pt" text-align="justify">
+											<!-- Example: All rights reserved. Unless otherwise specified, no part of this publication may be reproduced or utilized in any form
+		or by any means, electronic or mechanical, including photocopying and microfilm, without permission in writing from
+		either IEC or IEC's member National Committee in the country of the requester. If you have any questions about IEC
+		copyright or have an enquiry about obtaining additional rights to this publication, please contact the address below or
+		your local IEC member National Committee for further information. -->
+											<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-message']"/>
+											</fo:block>
+											<fo:block margin-bottom="8pt" text-align="justify">Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne peut être reproduite
+		ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique ou mécanique, y compris la photocopie
+		et les microfilms, sans l'accord écrit de l'IEC ou du Comité national de l'IEC du pays du demandeur. Si vous avez des
+		questions sur le copyright de l'IEC ou si vous désirez obtenir des droits supplémentaires sur cette publication, utilisez
+		les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pays de résidence.</fo:block>
+										
+											<xsl:variable name="telpos" select="count(/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']/text()[contains(., 'Tel.')]/preceding-sibling::node())"/>
+											<fo:table table-layout="fixed" width="100%">
+												<fo:table-column column-width="59mm"/>
+												<fo:table-column column-width="90mm"/>
+												<fo:table-body>
+													<fo:table-row>
+														<fo:table-cell>
+															<fo:block>
+																<!-- Example: IEC Central Office
+																	3, rue de Varembé
+																	CH-1211 Geneva 20
+																	Switzerland -->
+																<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-name']" mode="coverpage"/>
+																<xsl:choose>
+																	<xsl:when test="$telpos != 0">
+																		<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']/node()[position() &lt; $telpos]" mode="coverpage"/>
+																	</xsl:when>
+																	<xsl:otherwise>
+																		<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']" mode="coverpage"/>
+																	</xsl:otherwise>
+																</xsl:choose>
+															</fo:block>
+														</fo:table-cell>
+														<fo:table-cell>
+															<fo:block>
+																<!-- Example: Tel.: +41 22 919 02 11
+																 Fax: +41 22 919 0
+																 info@iec.ch
+																www.iec.ch -->
+																<xsl:choose>
+																	<xsl:when test="$telpos != 0">
+																		<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:copyright-statement/iec:clause/iec:p[@id = 'boilerplate-address']/node()[position() &gt; $telpos]" mode="coverpage"/>
+																	</xsl:when>
+																	<xsl:otherwise> </xsl:otherwise>
+																</xsl:choose>
+															</fo:block>
+														</fo:table-cell>
+													</fo:table-row>
+												</fo:table-body>
+											</fo:table>
+										
+										</fo:block>
+									</fo:block-container>
 								</fo:block-container>
 							</fo:block-container>
-						</fo:block-container>
+						</fo:block>
 						
-						<fo:block-container margin-left="7mm" margin-right="4.5mm" margin-top="6pt">
-							<fo:block-container font-size="8pt" text-align="justify" margin-left="0mm" margin-right="0mm">
-								
-								<fo:block font-weight="bold">About the IEC</fo:block>
-								<fo:block margin-bottom="6pt">The International Electrotechnical Commission (IEC) is the leading global organization that prepares and publishes
-		International Standards for all electrical, electronic and related technologies.</fo:block>
-							
-							<fo:block font-weight="bold">About IEC publications</fo:block>
-							<fo:block margin-bottom="6pt">The technical content of IEC publications is kept under constant review by the IEC. Please make sure that you have the
-		latest edition, a corrigenda or an amendment might have been published.</fo:block>
-								
-								<fo:table table-layout="fixed" width="100%" margin-bottom="12pt">
-									<fo:table-column column-width="82mm"/>
-									<fo:table-column column-width="78mm"/>
-									<fo:table-body>
-										<fo:table-row border-bottom="0.5pt solid black">
-											<fo:table-cell padding-right="5mm">
-												<fo:block font-weight="bold">IEC Catalogue - <fo:inline color="blue">webstore.iec.ch/catalogue</fo:inline></fo:block>
-												<fo:block margin-bottom="6pt">
-													<xsl:text>The stand-alone application for consulting the entire
-													bibliographical information on IEC International Standards,
-													Technical Specifications, Technical Reports and other
-													documents. Available for PC, Mac OS, Android Tablets and
-													iPad.</xsl:text>
-												</fo:block>
-												<fo:block font-weight="bold">IEC publications search - <fo:inline color="blue">www.iec.ch/searchpub</fo:inline></fo:block>
-												<fo:block margin-bottom="6pt">
-													<xsl:text>The advanced search enables to find IEC publications by a
-													variety of criteria (reference number, text, technical
-													committee,…). It also gives information on projects, replaced
-													and withdrawn publications.</xsl:text>
-												</fo:block>
-												<fo:block font-weight="bold">IEC Just Published - <fo:inline color="blue">webstore.iec.ch/justpublished</fo:inline></fo:block>
-												<fo:block margin-bottom="6pt">
-													<xsl:text>Stay up to date on all new IEC publications. Just Published
-													details all new publications released. Available online and
-													also once a month by email.</xsl:text>
-												</fo:block>
-											</fo:table-cell>
-											<fo:table-cell>
-												<fo:block font-weight="bold">Electropedia - <fo:inline color="blue">www.electropedia.org</fo:inline></fo:block>
-												<fo:block margin-bottom="6pt">
-													<xsl:text>The world's leading online dictionary of electronic and
-														electrical terms containing more than 30 000 terms and
-														definitions in English and French, with equivalent terms in 14
-														additional languages. Also known as the International
-														Electrotechnical Vocabulary (IEV) online.</xsl:text>
-												</fo:block>
-												<fo:block font-weight="bold">IEC Glossary - <fo:inline color="blue">std.iec.ch/glossary</fo:inline></fo:block>
-												<fo:block margin-bottom="6pt">
-													<xsl:text>More than 55 000 electrotechnical terminology entries in
-														English and French extracted from the Terms and Definitions
-														clause of IEC publications issued since 2002. Some entries
-														have been collected from earlier publications of IEC TC 37,
-														77, 86 and CISPR.</xsl:text>
-												</fo:block>
-												<fo:block font-weight="bold">IEC Customer Service Centre - <fo:inline color="blue">webstore.iec.ch/csc</fo:inline></fo:block>
-												<fo:block margin-bottom="6pt">
-													<xsl:text>If you wish to give us your feedback on this publication or
-														need further assistance, please contact the Customer Service
-														Centre: </xsl:text><fo:inline color="blue">csc@iec.ch</fo:inline>.
-												</fo:block>
-											</fo:table-cell>
-										</fo:table-row>
-									</fo:table-body>
-								</fo:table>
-								<fo:block font-weight="bold">A propos de l'IEC</fo:block>
-									<fo:block margin-bottom="6pt">La Commission Electrotechnique Internationale (IEC) est la première organisation mondiale qui élabore et publie des
-	Normes internationales pour tout ce qui a trait à l'électricité, à l'électronique et aux technologies apparentées.</fo:block>
+						<xsl:apply-templates select="/iec:iec-standard/iec:boilerplate/iec:feedback-statement"/>
+						<fo:block span="all" border-bottom="0.5pt solid black"/>
+						
+						<!-- <fo:block span="all">
+							<fo:block-container margin-top="6pt">
+								<fo:block-container text-align="justify" margin-left="0mm" margin-right="0mm">
+									
+									<fo:block font-weight="bold">About the IEC</fo:block>
+									<fo:block margin-bottom="6pt">The International Electrotechnical Commission (IEC) is the leading global organization that prepares and publishes
+			International Standards for all electrical, electronic and related technologies.</fo:block>
 								
-								<fo:block font-weight="bold">A propos des publications IEC</fo:block>
-								<fo:block margin-bottom="6pt">Le contenu technique des publications IEC est constamment revu. Veuillez vous assurer que vous possédez l’édition la
-	plus récente, un corrigendum ou amendement peut avoir été publié.</fo:block>
+								<fo:block font-weight="bold">About IEC publications</fo:block>
+								<fo:block margin-bottom="6pt">The technical content of IEC publications is kept under constant review by the IEC. Please make sure that you have the
+			latest edition, a corrigenda or an amendment might have been published.</fo:block>
+									
+									<fo:table table-layout="fixed" width="100%" margin-bottom="12pt">
+										<fo:table-column column-width="82mm"/>
+										<fo:table-column column-width="78mm"/>
+										<fo:table-body>
+											<fo:table-row border-bottom="0.5pt solid black">
+												<fo:table-cell padding-right="5mm">
+													<fo:block font-weight="bold">IEC Catalogue - <fo:inline color="blue">webstore.iec.ch/catalogue</fo:inline></fo:block>
+													<fo:block margin-bottom="6pt">
+														<xsl:text>The stand-alone application for consulting the entire
+														bibliographical information on IEC International Standards,
+														Technical Specifications, Technical Reports and other
+														documents. Available for PC, Mac OS, Android Tablets and
+														iPad.</xsl:text>
+													</fo:block>
+													<fo:block font-weight="bold">IEC publications search - <fo:inline color="blue">www.iec.ch/searchpub</fo:inline></fo:block>
+													<fo:block margin-bottom="6pt">
+														<xsl:text>The advanced search enables to find IEC publications by a
+														variety of criteria (reference number, text, technical
+														committee,…). It also gives information on projects, replaced
+														and withdrawn publications.</xsl:text>
+													</fo:block>
+													<fo:block font-weight="bold">IEC Just Published - <fo:inline color="blue">webstore.iec.ch/justpublished</fo:inline></fo:block>
+													<fo:block margin-bottom="6pt">
+														<xsl:text>Stay up to date on all new IEC publications. Just Published
+														details all new publications released. Available online and
+														also once a month by email.</xsl:text>
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block font-weight="bold">Electropedia - <fo:inline color="blue">www.electropedia.org</fo:inline></fo:block>
+													<fo:block margin-bottom="6pt">
+														<xsl:text>The world's leading online dictionary of electronic and
+															electrical terms containing more than 30 000 terms and
+															definitions in English and French, with equivalent terms in 14
+															additional languages. Also known as the International
+															Electrotechnical Vocabulary (IEV) online.</xsl:text>
+													</fo:block>
+													<fo:block font-weight="bold">IEC Glossary - <fo:inline color="blue">std.iec.ch/glossary</fo:inline></fo:block>
+													<fo:block margin-bottom="6pt">
+														<xsl:text>More than 55 000 electrotechnical terminology entries in
+															English and French extracted from the Terms and Definitions
+															clause of IEC publications issued since 2002. Some entries
+															have been collected from earlier publications of IEC TC 37,
+															77, 86 and CISPR.</xsl:text>
+													</fo:block>
+													<fo:block font-weight="bold">IEC Customer Service Centre - <fo:inline color="blue">webstore.iec.ch/csc</fo:inline></fo:block>
+													<fo:block margin-bottom="6pt">
+														<xsl:text>If you wish to give us your feedback on this publication or
+															need further assistance, please contact the Customer Service
+															Centre: </xsl:text><fo:inline color="blue">csc@iec.ch</fo:inline>.
+													</fo:block>
+												</fo:table-cell>
+											</fo:table-row>
+										</fo:table-body>
+									</fo:table>
+									
+									<fo:block font-weight="bold">A propos de l'IEC</fo:block>
+										<fo:block margin-bottom="6pt">La Commission Electrotechnique Internationale (IEC) est la première organisation mondiale qui élabore et publie des
+		Normes internationales pour tout ce qui a trait à l'électricité, à l'électronique et aux technologies apparentées.</fo:block>
+									
+									<fo:block font-weight="bold">A propos des publications IEC</fo:block>
+									<fo:block margin-bottom="6pt">Le contenu technique des publications IEC est constamment revu. Veuillez vous assurer que vous possédez l’édition la
+		plus récente, un corrigendum ou amendement peut avoir été publié.</fo:block>
 
-								<fo:table table-layout="fixed" width="100%">
-									<fo:table-column column-width="82mm"/>
-									<fo:table-column column-width="78mm"/>
-									<fo:table-body>
-										<fo:table-row>
-											<fo:table-cell padding-right="5mm">
-												<fo:block font-weight="bold">Catalogue IEC - <fo:inline color="blue">webstore.iec.ch/catalogue</fo:inline></fo:block>
-												<fo:block margin-bottom="6pt">
-													<xsl:text>Application autonome pour consulter tous les renseignements
-														bibliographiques sur les Normes internationales,
-														Spécifications techniques, Rapports techniques et autres
-														documents de l'IEC. Disponible pour PC, Mac OS, tablettes
-														Android et iPad.</xsl:text>
-												</fo:block>
-												<fo:block font-weight="bold">Recherche de publications IEC - <fo:inline color="blue">www.iec.ch/searchpub</fo:inline></fo:block>
-												<fo:block margin-bottom="6pt">
-													<xsl:text>La recherche avancée permet de trouver des publications IEC
-														en utilisant différents critères (numéro de référence, texte,
-														comité d’études,…). Elle donne aussi des informations sur les
-														projets et les publications remplacées ou retirées.</xsl:text>
-												</fo:block>
-												<fo:block font-weight="bold">IEC Just Published - <fo:inline color="blue">webstore.iec.ch/justpublished</fo:inline></fo:block>
-												<fo:block margin-bottom="6pt">
-													<xsl:text>Restez informé sur les nouvelles publications IEC. Just
-														Published détaille les nouvelles publications parues.
-														Disponible en ligne et aussi une fois par mois par email.</xsl:text>
-												</fo:block>
-											</fo:table-cell>
-											<fo:table-cell>
-												<fo:block font-weight="bold">Electropedia - <fo:inline color="blue">www.electropedia.org</fo:inline></fo:block>
-												<fo:block margin-bottom="6pt">
-													<xsl:text>Le premier dictionnaire en ligne de termes électroniques et
-														électriques. Il contient plus de 30 000 termes et définitions en
-														anglais et en français, ainsi que les termes équivalents dans
-														14 langues additionnelles. Egalement appelé Vocabulaire
-														Electrotechnique International (IEV) en ligne.</xsl:text>
-												</fo:block>
-												<fo:block font-weight="bold">Glossaire IEC - <fo:inline color="blue">std.iec.ch/glossary</fo:inline></fo:block>
-												<fo:block margin-bottom="6pt">
-													<xsl:text>Plus de 55 000 entrées terminologiques électrotechniques, en
-														anglais et en français, extraites des articles Termes et
-														Définitions des publications IEC parues depuis 2002. Plus
-														certaines entrées antérieures extraites des publications des
-														CE 37, 77, 86 et CISPR de l'IEC.</xsl:text>
-												</fo:block>
-												<fo:block font-weight="bold">Service Clients - <fo:inline color="blue">webstore.iec.ch/csc</fo:inline></fo:block>
-												<fo:block margin-bottom="6pt">
-													<xsl:text>Si vous désirez nous donner des commentaires sur cette
-															publication ou si vous avez des questions contactez-nous: </xsl:text><fo:inline color="blue">csc@iec.ch</fo:inline>.
-												</fo:block>
-											</fo:table-cell>
-										</fo:table-row>
-									</fo:table-body>
-								</fo:table>
+									<fo:table table-layout="fixed" width="100%">
+										<fo:table-column column-width="82mm"/>
+										<fo:table-column column-width="78mm"/>
+										<fo:table-body>
+											<fo:table-row>
+												<fo:table-cell padding-right="5mm">
+													<fo:block font-weight="bold">Catalogue IEC - <fo:inline color="blue">webstore.iec.ch/catalogue</fo:inline></fo:block>
+													<fo:block margin-bottom="6pt">
+														<xsl:text>Application autonome pour consulter tous les renseignements
+															bibliographiques sur les Normes internationales,
+															Spécifications techniques, Rapports techniques et autres
+															documents de l'IEC. Disponible pour PC, Mac OS, tablettes
+															Android et iPad.</xsl:text>
+													</fo:block>
+													<fo:block font-weight="bold">Recherche de publications IEC - <fo:inline color="blue">www.iec.ch/searchpub</fo:inline></fo:block>
+													<fo:block margin-bottom="6pt">
+														<xsl:text>La recherche avancée permet de trouver des publications IEC
+															en utilisant différents critères (numéro de référence, texte,
+															comité d’études,…). Elle donne aussi des informations sur les
+															projets et les publications remplacées ou retirées.</xsl:text>
+													</fo:block>
+													<fo:block font-weight="bold">IEC Just Published - <fo:inline color="blue">webstore.iec.ch/justpublished</fo:inline></fo:block>
+													<fo:block margin-bottom="6pt">
+														<xsl:text>Restez informé sur les nouvelles publications IEC. Just
+															Published détaille les nouvelles publications parues.
+															Disponible en ligne et aussi une fois par mois par email.</xsl:text>
+													</fo:block>
+												</fo:table-cell>
+												<fo:table-cell>
+													<fo:block font-weight="bold">Electropedia - <fo:inline color="blue">www.electropedia.org</fo:inline></fo:block>
+													<fo:block margin-bottom="6pt">
+														<xsl:text>Le premier dictionnaire en ligne de termes électroniques et
+															électriques. Il contient plus de 30 000 termes et définitions en
+															anglais et en français, ainsi que les termes équivalents dans
+															14 langues additionnelles. Egalement appelé Vocabulaire
+															Electrotechnique International (IEV) en ligne.</xsl:text>
+													</fo:block>
+													<fo:block font-weight="bold">Glossaire IEC - <fo:inline color="blue">std.iec.ch/glossary</fo:inline></fo:block>
+													<fo:block margin-bottom="6pt">
+														<xsl:text>Plus de 55 000 entrées terminologiques électrotechniques, en
+															anglais et en français, extraites des articles Termes et
+															Définitions des publications IEC parues depuis 2002. Plus
+															certaines entrées antérieures extraites des publications des
+															CE 37, 77, 86 et CISPR de l'IEC.</xsl:text>
+													</fo:block>
+													<fo:block font-weight="bold">Service Clients - <fo:inline color="blue">webstore.iec.ch/csc</fo:inline></fo:block>
+													<fo:block margin-bottom="6pt">
+														<xsl:text>Si vous désirez nous donner des commentaires sur cette
+																publication ou si vous avez des questions contactez-nous: </xsl:text><fo:inline color="blue">csc@iec.ch</fo:inline>.
+													</fo:block>
+												</fo:table-cell>
+											</fo:table-row>
+										</fo:table-body>
+									</fo:table>
+								</fo:block-container>
 							</fo:block-container>
-						</fo:block-container>
+						</fo:block> -->
 					</fo:flow>
 				</fo:page-sequence>
 			</xsl:if>
@@ -471,12 +486,22 @@
 									<fo:table-row border-bottom="0.5pt solid {$color_gray}" height="16mm">
 										<fo:table-cell font-size="8pt" text-align="right" display-align="center">
 											<fo:block>
-												<fo:block color="{$color_blue}" margin-bottom="3pt">PRICE CODE</fo:block>
-												<fo:block>CODE PRIX</fo:block>
+												<fo:block color="{$color_blue}" margin-bottom="3pt">
+													<!-- PRICE CODE -->
+													<xsl:variable name="price_code">
+														<xsl:call-template name="getLocalizedString">
+															<xsl:with-param name="key">price-code</xsl:with-param>																			
+														</xsl:call-template>
+													</xsl:variable>
+													<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($price_code))"/>
+												</fo:block>
+												<xsl:if test="$lang != 'fr'">
+													<fo:block>CODE PRIX</fo:block>
+												</xsl:if>
 											</fo:block>
 										</fo:table-cell>
 										<fo:table-cell font-size="25pt" font-weight="bold" color="{$color_gray}" text-align="right" display-align="center">
-											<fo:block padding-top="1mm">XC</fo:block>
+											<fo:block padding-top="1mm"><xsl:value-of select="/iec:iec-standard/iec:bibdata/iec:ext/iec:price-code"/></fo:block>
 										</fo:table-cell>
 									</fo:table-row>
 								</fo:table-body>
@@ -490,8 +515,10 @@
 								<xsl:text> </xsl:text>
 								<fo:inline keep-together.within-line="always"><fo:leader leader-pattern="space"/>
 									<xsl:text> </xsl:text>
-									<!-- <xsl:value-of select="/iec:iec-standard/iec:bibdata/iec:isbn"/> -->
-									<xsl:text>Example: ISBN 978-2-8322-1532-6</xsl:text>
+									<xsl:if test="/iec:iec-standard/iec:bibdata/iec:docidentifier[@type='ISBN']">
+										<!-- <xsl:text>Example: ISBN 978-2-8322-1532-6</xsl:text> -->
+										<xsl:value-of select="/iec:iec-standard/iec:bibdata/iec:docidentifier[@type='ISBN']"/>
+									</xsl:if>
 								</fo:inline>
 							</fo:block>
 							<fo:block-container margin-left="1.5mm">
@@ -746,13 +773,28 @@
 															<xsl:with-param name="text" select="'Functions concerned:'"/>
 														</xsl:call-template>
 													</fo:block>
+													<!-- function: { emc | safety | environment | quality-assurance } -->
 													<fo:block font-size="6.5pt">
-														<xsl:call-template name="insertCheckBoxOff"/>
+														<xsl:choose>
+															<xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:function = 'emc'">
+																<xsl:call-template name="insertCheckBoxOn"/>
+															</xsl:when>
+															<xsl:otherwise>
+																<xsl:call-template name="insertCheckBoxOff"/>
+															</xsl:otherwise>
+														</xsl:choose>
 														<xsl:call-template name="addLetterSpacingSmallCaps">
 															<xsl:with-param name="text" select="'EMC'"/>
 														</xsl:call-template>
 														<fo:inline padding-right="33mm"> </fo:inline>
-														<xsl:call-template name="insertCheckBoxOff"/>
+														<xsl:choose>
+															<xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:function = 'environment'">
+																<xsl:call-template name="insertCheckBoxOn"/>
+															</xsl:when>
+															<xsl:otherwise>
+																<xsl:call-template name="insertCheckBoxOff"/>
+															</xsl:otherwise>
+														</xsl:choose>
 														<xsl:call-template name="addLetterSpacingSmallCaps">
 															<xsl:with-param name="text" select="'Environment'"/>
 														</xsl:call-template>
@@ -761,12 +803,26 @@
 												<fo:table-cell padding="1.5mm" padding-bottom="0mm">
 													<fo:block font-size="6.5pt" margin-bottom="6pt"> </fo:block>
 													<fo:block font-size="6.5pt">
-														<xsl:call-template name="insertCheckBoxOff"/>
+														<xsl:choose>
+															<xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:function = 'quality-assurance'">
+																<xsl:call-template name="insertCheckBoxOn"/>
+															</xsl:when>
+															<xsl:otherwise>
+																<xsl:call-template name="insertCheckBoxOff"/>
+															</xsl:otherwise>
+														</xsl:choose>
 														<xsl:call-template name="addLetterSpacingSmallCaps">
 															<xsl:with-param name="text" select="'Quality assurance'"/>
 														</xsl:call-template>
 														<fo:inline padding-right="13mm"> </fo:inline>
-														<xsl:call-template name="insertCheckBoxOn"/>
+														<xsl:choose>
+															<xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:function = 'safety'">
+																<xsl:call-template name="insertCheckBoxOn"/>
+															</xsl:when>
+															<xsl:otherwise>
+																<xsl:call-template name="insertCheckBoxOff"/>
+															</xsl:otherwise>
+														</xsl:choose>
 														<xsl:call-template name="addLetterSpacingSmallCaps">
 															<xsl:with-param name="text" select="'Safety'"/>
 														</xsl:call-template>
@@ -1086,14 +1142,15 @@
 					
 					</fo:block>
 				</fo:block-container> 
-				<xsl:if test="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr']">
+				<xsl:if test="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr'] and $lang != 'fr'">
 					<fo:block-container height="26mm" margin-top="10pt" display-align="after">
 						<xsl:if test="$stage &gt;= 60">
 							<xsl:attribute name="width">100mm</xsl:attribute>
 						</xsl:if>
 						<fo:block color="{$color_gray}">
 							<xsl:if test="$stage &gt;= 60">
-								<xsl:text>NORME INTERNATIONALE</xsl:text>
+								<!-- <xsl:text>NORME INTERNATIONALE</xsl:text> -->
+								<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:ext/iec:doctype[@language = 'fr']))"/>
 							</xsl:if>
 						</fo:block>
 					</fo:block-container>
@@ -1104,21 +1161,39 @@
 			<fo:block-container margin-left="0mm">
 				<fo:block-container height="6mm">
 					<fo:block text-align="right" margin-top="-4.5mm" margin-right="-1mm">
-						<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Colour-Inside))}" width="19mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo IEC"/>
+						<xsl:if test="/iec:iec-standard/iec:bibdata/iec:ext/iec:accessibility-color-inside = 'true'">
+							<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Colour-Inside))}" width="19mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo IEC"/>
+						</xsl:if>
 					</fo:block>
 				</fo:block-container>
 				<fo:block-container border-bottom="0.5pt solid {$color_gray}" margin-top="4mm" margin-bottom="16pt" height="14mm" display-align="center">
 					<fo:block font-size="10pt" color="{$color_blue}" margin-bottom="4pt">
-						Example: BASIC EMC PUBLICATION
+						<xsl:choose>
+							<xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal = 'true'">
+								<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal[@language = $lang]))"/>
+							</xsl:when>
+							<xsl:otherwise><!-- horizontal is false -->
+								<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:ext/iec:function[@language = $lang]))"/>
+							</xsl:otherwise>
+						</xsl:choose>
+						<!-- Example: BASIC EMC PUBLICATION -->
 						<!-- HORIZONTAL STANDARD -->
 						<!-- Basic EMC Publication
 						Basic Safety Publication
 						Basic Environment Publication
 						Basic Quality Assurance Publication -->
 					</fo:block>
-					<xsl:if test="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr']">
+					<xsl:if test="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr'] and $lang != 'fr'">
 						<fo:block font-size="10pt" margin-bottom="10pt">
-							Example: PUBLICATION FONDAMENTALE EN CEM
+							<xsl:choose>
+								<xsl:when test="/iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal = 'true'">
+									<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:ext/iec:horizontal[@language = 'fr']))"/>
+								</xsl:when>
+								<xsl:otherwise><!-- horizontal is false -->
+									<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:ext/iec:function[@language = 'fr']))"/>
+								</xsl:otherwise>
+							</xsl:choose>
+							<!-- Example: PUBLICATION FONDAMENTALE EN CEM -->
 							<!-- NORME HORIZONTALE -->
 						</fo:block>
 					</xsl:if>
@@ -1367,6 +1442,35 @@
 		<xsl:apply-templates/>			
 	</xsl:template>
 	
+	
+	<xsl:template match="iec:feedback-statement//iec:clause/iec:title" priority="2">
+		<fo:block font-weight="bold" keep-with-next="always"><xsl:apply-templates/></fo:block>
+	</xsl:template>
+	
+	<xsl:template match="iec:feedback-statement//iec:clause/iec:p" priority="2">
+		<fo:block margin-bottom="6pt"><xsl:apply-templates/></fo:block>	
+	</xsl:template>
+	
+	<xsl:template match="iec:feedback-statement/iec:clause[not(iec:clause)]" priority="2">
+		<fo:block span="all" text-align="justify">
+			<xsl:if test="not(preceding-sibling::iec:clause)">
+				<xsl:attribute name="margin-top">6pt</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+	
+	<xsl:template match="iec:feedback-statement/iec:clause[iec:clause]" priority="2">
+		<fo:block text-align="justify">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+	<xsl:template match="iec:feedback-statement/iec:clause/iec:clause" priority="3">
+		<fo:block text-align="justify">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+	
 	<!-- ============================= -->
 	<!-- CONTENTS                                       -->
 	<!-- ============================= -->
@@ -1819,10 +1923,10 @@
 						<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="a)"/>
+									<xsl:number format="a)" lang="en"/>
 								</xsl:when>
 								<xsl:otherwise>
 									<xsl:number format="1)"/>
@@ -2163,7 +2267,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>
 		
@@ -2185,15 +2294,24 @@
 			
 				<xsl:text>Part #: </xsl:text>
 			
+			
 		</title-part>
 		<title-part lang="fr">
 			
 			
 				<xsl:text>Partie #:  </xsl:text>
 			
+			
 		</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>
 		
@@ -2255,10 +2373,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_"/>
@@ -2398,6 +2525,7 @@
 				
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
 		
 		
@@ -2440,6 +2568,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">
 		
 		
@@ -2520,6 +2649,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 		
@@ -2646,6 +2776,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"/>
@@ -2678,11 +2812,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">
@@ -2704,37 +2841,105 @@
 		<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">			
 			
 			
+			
+				<xsl:attribute name="font-size">8pt</xsl:attribute>
 				<xsl:attribute name="space-after">12pt</xsl:attribute>
 				<xsl:if test="ancestor::*[local-name() = 'preface']">
 					<xsl:attribute name="space-after">16pt</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:attribute name="border">0.5pt solid black</xsl:attribute>
-				
+			
+			
+			<xsl:variable name="table_attributes">
+				<attribute name="table-layout">fixed</attribute>
+				<attribute name="width">100%</attribute>
+				<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
+				<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
 				
 				
+					<attribute name="border">0.5pt solid black</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:if test="ancestor::*[local-name()='preface']"> -->
-					<xsl:attribute name="font-size">8pt</xsl:attribute>
+				<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>
@@ -2746,17 +2951,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>-->
 			
 			
 			
@@ -2767,6 +2962,7 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
 				
+				
 				<xsl:apply-templates/>				
 			</fo:block>
 		</xsl:if>
@@ -2822,6 +3018,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">
@@ -2881,11 +3084,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">
@@ -2910,6 +3116,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'">
@@ -2937,11 +3150,29 @@
 								</xsl:if>
 							
 							
+							
+							
+							
+							
 							<!-- 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 -->
 							
 								<xsl:if test="../*[local-name()='note']">
@@ -2961,6 +3192,119 @@
 			</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}">
+							
+							
+								<xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
+							
+							
+							<!-- fn will be processed inside 'note' processing -->
+							
+								<xsl:if test="../*[local-name()='note']">
+									<fo:block margin-bottom="6pt"> </fo:block>
+								</xsl:if>
+							
+							
+							
+							
+							
+							
+							
+							<!-- 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 -->
+							
+								<xsl:if test="../*[local-name()='note']">
+									<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
+										<fo:block font-size="1pt"> </fo:block>
+									</fo:block-container>
+								</xsl:if>
+							
+							
+							<!-- 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">
@@ -3019,8 +3363,12 @@
 					
 				</xsl:if>
 				
-								
-								
+				
+				
+				
+				<!-- <xsl:if test="$namespace = 'bipm'">
+					<xsl:attribute name="height">8mm</xsl:attribute>
+				</xsl:if> -->
 				
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -3052,6 +3400,7 @@
 			
 			
 			
+			
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
 					<xsl:value-of select="@colspan"/>
@@ -3097,7 +3446,7 @@
 					<xsl:attribute name="border">solid black 0</xsl:attribute>
 				</xsl:if>
 			
-						
+			
 			
 				<xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
 				<xsl:if test="ancestor::*[local-name()='preface']">
@@ -3109,6 +3458,7 @@
 			
 			
 			
+			
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
 					<xsl:value-of select="@colspan"/>
@@ -3120,7 +3470,8 @@
 				</xsl:attribute>
 			</xsl:if>
 			<xsl:call-template name="display-align"/>
-			<fo:block>								
+			<fo:block>
+								
 				<xsl:apply-templates/>
 			</fo:block>			
 		</fo:table-cell>
@@ -3135,14 +3486,17 @@
 					<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 				
 				
+				
+				
 				<fo:inline padding-right="2mm">
 					
 					
 					
-				
+					
 					<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 						
 				</fo:inline>
+				
 				<xsl:apply-templates mode="process"/>
 			</fo:block>
 		
@@ -3171,6 +3525,7 @@
 						<xsl:attribute name="margin-left">6mm</xsl:attribute>
 					
 					
+					
 					<fo:inline font-size="80%" padding-right="5mm" id="{@id}">
 						
 						
@@ -3181,12 +3536,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>
@@ -3223,7 +3581,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>
@@ -3297,7 +3668,8 @@
 											
 												<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
 											
-											<xsl:apply-templates/>
+											<!-- <xsl:apply-templates /> -->
+											<xsl:copy-of select="./node()"/>
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
@@ -3322,9 +3694,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']">
@@ -3332,7 +3707,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>
@@ -3342,8 +3721,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">
@@ -3361,9 +3743,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>
@@ -3386,9 +3771,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>
@@ -3402,9 +3790,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>
@@ -3438,7 +3829,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"/>
@@ -3586,6 +3990,7 @@
 					
 					
 					
+					
 					<xsl:apply-templates/>
 					<!-- <xsl:if test="$namespace = 'gb'">
 						<xsl:if test="ancestor::*[local-name()='formula']">
@@ -3639,6 +4044,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']">
@@ -3652,18 +4058,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>
@@ -3967,7 +4373,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>
@@ -4001,7 +4418,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>
@@ -4031,6 +4449,11 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
+				<xsl:if test="ancestor::*[local-name()='feedback-statement']">
+					<xsl:attribute name="color">blue</xsl:attribute>
+				</xsl:if>
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -4084,10 +4507,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>
@@ -4095,7 +4522,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">
@@ -4148,6 +4575,8 @@
 						
 						
 						
+						
+						
 						<fo:inline xsl:use-attribute-sets="note-name-style">
 							<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 						</fo:inline>
@@ -4238,7 +4667,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>
@@ -4289,7 +4719,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"/>
@@ -4303,18 +4733,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'">
-														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: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_) != ''">
@@ -4376,13 +4797,27 @@
 								</fo:bookmark>
 							</xsl:for-each>
 						</fo:bookmark>					
-					</xsl:if>					
+					</xsl:if>
 				
 				
 				
 				
 			</fo:bookmark-tree>
 		</xsl:if>
+	</xsl:template><xsl:template name="getLangVersion">
+		<xsl:param name="lang"/>
+		<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:template><xsl:template match="item" mode="bookmark">
 		<fo:bookmark internal-destination="{@id}" starting-state="hide">
 				<fo:bookmark-title>
@@ -4397,7 +4832,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>
@@ -4834,9 +5269,14 @@
 			
 				<fo:inline>
 					
-					<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>
 			
@@ -4987,9 +5427,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/>
@@ -5031,13 +5474,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/>
@@ -5066,6 +5510,7 @@
 						</xsl:choose>
 					</xsl:attribute>
 					
+					
 					<fo:block-container margin-left="0mm">
 						<fo:block>
 							<xsl:apply-templates select="." mode="ul_ol"/>
@@ -5093,7 +5538,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>
@@ -5111,6 +5557,10 @@
 			<fo:block><xsl:apply-templates/></fo:block>
 		</fo:table-cell>
 	</xsl:template><xsl:template name="processBibitem">
+		
+		
+		<!-- end BIPM bibitem processing-->
+		
 		 
 		
 		
@@ -5251,6 +5701,7 @@
 								
 								
 								
+								
 																
 							</xsl:variable>
 							<xsl:choose>
@@ -5265,6 +5716,7 @@
 						<dc:creator>
 							
 							
+							
 						</dc:creator>
 						<dc:description>
 							<xsl:variable name="abstract">
@@ -5274,6 +5726,7 @@
 								
 								
 								
+								
 							</xsl:variable>
 							<xsl:value-of select="normalize-space($abstract)"/>
 						</dc:description>
@@ -5345,13 +5798,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">		
@@ -5417,4 +5879,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>