metanorma-bipm 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3acf341b606e1c45ba970fa51074d7ff9cb2cfb424a0a4439821af1b5f76f6bf
-  data.tar.gz: 15d7d12f963aee720825f1a4481670efde7430dd02aaca56cebecdb1d7190999
+  metadata.gz: a0e8acf33a7fceea3050a35b6d104de2a50936c05f29a5e30025cad7fe45c835
+  data.tar.gz: 5a7b43fd90b235369e3aa8456821d121ff994dec4a34e9133bdd1e64c5aea236
 SHA512:
-  metadata.gz: cb967276a656a03fde3b69145a43ce1b01805bac6123ca205127317943c89d3154276a4cffd526dde879cc561bc7cf97eba895cd2f9d5b8b8390ddd3041b0e05
-  data.tar.gz: 3d8075a9b34a50e72009eb55498ec16fdab6b075a63af4638dcb95e2c61408bc20199fac99115449c4234c4d8afe3050d3040883a1bd3f2933fd43fb6cb8dc84
+  metadata.gz: 38fed8bc9d7b0b7624d3924d9503d8073fef2fdea8fbb56975642160713d48a053e46073d4ec5a23ca22916cccd6c31d22d0e8a5dc5b9fe62624ecc1fd964adc
+  data.tar.gz: 95b610c7b041e243c14a2c98dfa36aa8647798327b7fff5b8acb5ae6915dc6a0e82a5cdcced4f0b423ae08e351159393e7676f58ebf835a1913a0da4d55846ad

data/.github/workflows/rake.yml

@@ -36,6 +36,9 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
+      - if: matrix.os == 'macos-latest'
+        run: brew install autoconf automake libtool
+
       - uses: actions/cache@v2
         with:
           path: vendor/bundle

data/lib/asciidoctor/bipm/converter.rb

@@ -107,10 +107,9 @@ module Asciidoctor
             t1 << Asciidoctor::Standoc::Utils::asciidoc_sub(
               node.attr("title-#{lang}"))
           end
-          typed_title(node, xml, lang, "cover")
-          typed_title(node, xml, lang, "appendix")
-          typed_title(node, xml, lang, "part")
-          typed_title(node, xml, lang, "subpart")
+          %w(cover appendix annex part subpart).each do |w|
+            typed_title(node, xml, lang, w)
+          end
         end
       end
 

data/lib/asciidoctor/bipm/isodoc.rng

@@ -253,6 +253,9 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="width"/>
+        </optional>
         <optional>
           <ref name="colgroup"/>
         </optional>
@@ -836,6 +839,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -891,9 +897,11 @@
       <element name="code">
         <text/>
       </element>
-      <element name="text">
-        <text/>
-      </element>
+      <optional>
+        <element name="text">
+          <text/>
+        </element>
+      </optional>
     </element>
   </define>
   <define name="standard-document">
@@ -1063,6 +1071,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1116,6 +1127,9 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1218,6 +1232,9 @@
       <optional>
         <attribute name="type"/>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1546,6 +1563,7 @@
           <value>add</value>
           <value>modify</value>
           <value>delete</value>
+          <value>replace</value>
         </choice>
       </attribute>
       <optional>
@@ -1576,6 +1594,11 @@
       </optional>
       <optional>
         <element name="newcontent">
+          <optional>
+            <attribute name="id">
+              <data type="ID"/>
+            </attribute>
+          </optional>
           <zeroOrMore>
             <ref name="BasicBlock"/>
           </zeroOrMore>

data/lib/isodoc/bipm/base_convert.rb

@@ -16,7 +16,7 @@ module IsoDoc
         if @jcgm
           super
         else
-          middle_title(out)
+          middle_title(isoxml, out)
           middle_admonitions(isoxml, out)
           clause isoxml, out
           annex isoxml, out

data/lib/isodoc/bipm/bipm.brochure.xsl

@@ -1127,18 +1127,22 @@
 						<fo:block-container font-size="18pt" font-weight="bold" text-align="center">
 							<fo:block>
 								
-								<xsl:variable name="title">
-									<xsl:choose>
-										<xsl:when test="$independentAppendix != ''">
-											<xsl:value-of select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='appendix']"/>
-										</xsl:when>
-										<xsl:otherwise> <!-- doctype = 'guide' -->
-											<xsl:value-of select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='main']"/>
-										</xsl:otherwise>
-									</xsl:choose>
-								</xsl:variable>
+								<!-- <xsl:variable name="title"> -->
+								<xsl:choose>
+									<xsl:when test="$independentAppendix != ''">
+										<xsl:apply-templates select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='appendix']" mode="title"/>
+										<fo:block>
+											<xsl:apply-templates select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='annex']" mode="title"/>
+										</fo:block>
+									</xsl:when>
+									<xsl:otherwise> <!-- doctype = 'guide' -->
+										<xsl:apply-templates select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='main']" mode="title"/>
+									</xsl:otherwise>
+								</xsl:choose>
+								<!-- </xsl:variable> -->
 								
-								<xsl:variable name="mep_text" select="'Mise en pratique'"/>
+								
+								<!-- <xsl:variable name="mep_text" select="'Mise en pratique'"/>
 								
 								<xsl:choose>
 									<xsl:when test="$curr_lang = 'en' and contains($title, $mep_text)">
@@ -1149,7 +1153,7 @@
 									<xsl:otherwise>
 										<xsl:value-of select="$title"/>
 									</xsl:otherwise>
-								</xsl:choose>
+								</xsl:choose> -->
 								
 							</fo:block>
 							
@@ -1161,7 +1165,7 @@
 										<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$curr_lang]),'#',$part_num)"/>
 									</xsl:if>
 									<xsl:text>: </xsl:text>
-									<xsl:value-of select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']"/>
+									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']" mode="title"/>
 								</fo:block>
 							</xsl:if>
 							<xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/>
@@ -1171,7 +1175,7 @@
 										<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang=$curr_lang]),'#',$subpart_num)"/>
 									</xsl:if>
 									<xsl:text>: </xsl:text>
-									<xsl:value-of select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']"/>
+									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']" mode="title"/>
 								</fo:block>
 							</xsl:if>
 							
@@ -1354,71 +1358,130 @@
 					<fo:block font-size="14pt" font-weight="{$weight-bold}" margin-top="4mm"><xsl:value-of select="concat((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:edition, ' ', $edition_str, ' ', $copyrightYear)"/></fo:block>				
 				</fo:block-container>
 				
-				<fo:block-container height="98%" display-align="center">
+				<!-- <fo:block-container height="98%" display-align="center"> -->
+				<fo:block-container absolute-position="fixed" left="12.5mm" top="92mm" height="170mm" width="144mm" display-align="center">
 					<fo:block>
+					
+						<xsl:variable name="title_appendix_fr">
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'appendix']" mode="title"/>
+						</xsl:variable>
+						<xsl:variable name="title_appendix_en">
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'appendix']" mode="title"/>
+						</xsl:variable>
+						<xsl:variable name="title_annex_fr">
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'annex']" mode="title"/>
+						</xsl:variable>
+						<xsl:variable name="title_annex_en">
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'annex']" mode="title"/>
+						</xsl:variable>
+						<xsl:variable name="title_part_fr">
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'part']" mode="title"/>
+						</xsl:variable>
+						<xsl:variable name="title_part_en">
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'part']" mode="title"/>
+						</xsl:variable>
+						<xsl:variable name="title_subpart_fr">
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'subpart']" mode="title"/>
+						</xsl:variable>
+						<xsl:variable name="title_subpart_en">
+							<xsl:apply-templates select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'subpart']" mode="title"/>
+						</xsl:variable>
+						
+						<xsl:variable name="titles_length" select="string-length($title_appendix_fr) +                               string-length($title_appendix_en) +                              string-length($title_annex_fr) +                              string-length($title_annex_en) +                              string-length($title_part_fr) +                              string-length($title_part_en) +                              string-length($title_subpart_fr) +                              string-length($title_subpart_fr)"/>
+																													
+						<xsl:variable name="font-size-number-factor">
+							<xsl:choose>
+								<xsl:when test="$titles_length &gt; 350">0.7</xsl:when>
+								<xsl:when test="$titles_length &gt; 250">0.85</xsl:when>
+								<xsl:otherwise>1</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						
+						<xsl:variable name="space-factor">
+							<xsl:choose>
+								<xsl:when test="$titles_length &gt; 250">0.3</xsl:when>
+								<xsl:otherwise>1</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+						
+						<xsl:variable name="font-size-factor">
+							<xsl:choose>
+								<xsl:when test="$titles_length &gt; 350">0.5</xsl:when>
+								<xsl:when test="$titles_length &gt; 250">0.65</xsl:when>
+								<xsl:otherwise>1</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
+					
 						<!-- Appendix titles processing -->
 						<xsl:variable name="appendix_num" select="normalize-space((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:appendix)"/>
 						<xsl:if test="$appendix_num != ''">
-							<fo:block font-size="17pt" font-weight="{$weight-normal}">Annexe <xsl:value-of select="$appendix_num"/></fo:block>
-							<fo:block font-size="17pt" font-weight="{$weight-bold}">Appendix  <xsl:value-of select="$appendix_num"/></fo:block>
+							<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-normal}">Annexe <xsl:value-of select="$appendix_num"/></fo:block>
+							<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-bold}">Appendix  <xsl:value-of select="$appendix_num"/></fo:block>
 						</xsl:if>
-						
+
+
 						<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type = 'appendix']">
-							<fo:block font-size="30.4pt">
-								<fo:block> </fo:block>
-								<fo:block font-weight="{$weight-normal}"><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'appendix']"/></fo:block>
-								<fo:block> </fo:block>
+							<fo:block font-size="{$font-size-factor * 30.4}pt">
+								<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
+								<fo:block font-weight="{$weight-normal}"><xsl:copy-of select="$title_appendix_fr"/></fo:block>
+								<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
 								<fo:block font-weight="{$weight-bold}">
-									<xsl:variable name="title_en" select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'appendix']"/>
-									<xsl:variable name="mep_text" select="'Mise en pratique'"/>
-									<xsl:choose>
-										<xsl:when test="contains($title_en, $mep_text)">
-											<xsl:value-of select="substring-before($title_en, $mep_text)"/>
-											<xsl:text> </xsl:text><fo:inline font-style="italic"><xsl:value-of select="$mep_text"/></fo:inline><xsl:text> </xsl:text>
-											<xsl:value-of select="substring-after($title_en, $mep_text)"/>
-										</xsl:when>
-										<xsl:otherwise>
-											<xsl:value-of select="$title_en"/>
-										</xsl:otherwise>
-									</xsl:choose>
+									<xsl:copy-of select="$title_appendix_en"/>
 								</fo:block>
 							</fo:block>
 						</xsl:if>
 						<!-- End Appendix titles processing -->
 						
+						<!-- Annex title processing -->
+						<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type = 'annex']">
+							<xsl:variable name="annex_num" select="normalize-space((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:annexid)"/>					
+							<xsl:if test="$annex_num != ''">
+								<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
+								<!-- Annexe -->
+								<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-normal}">Annexe <xsl:value-of select="$annex_num"/></fo:block>
+								<!-- Annex -->
+								<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-bold}">Annex  <xsl:value-of select="$annex_num"/></fo:block>
+							</xsl:if>
+						
+							<fo:block font-size="{$font-size-factor * 30.4}pt">
+								
+								<xsl:if test="normalize-space($title_annex_fr) != ''">
+									<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
+									<fo:block font-weight="{$weight-normal}"><xsl:copy-of select="$title_annex_fr"/></fo:block>
+								</xsl:if>
+								
+								<xsl:if test="normalize-space($title_annex_en) != ''">
+									<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
+									<fo:block font-weight="{$weight-bold}">
+										<xsl:copy-of select="$title_annex_en"/>
+									</fo:block>
+								</xsl:if>
+							</fo:block>
+						</xsl:if>
+						<!-- End Annex titles  processing -->
 						
-						<!-- Part titles processing -->
+						<!--  Part titles processing -->
 						<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type = 'part']">
 							<xsl:variable name="part_num" select="normalize-space((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/>					
 							<xsl:if test="$part_num != ''">
+								<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
 								<!-- Part -->
-								<fo:block font-size="17pt" font-weight="{$weight-normal}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='fr']),'#',$part_num)"/></fo:block>
+								<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-normal}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='fr']),'#',$part_num)"/></fo:block>
 								<!-- Partie -->
-								<fo:block font-size="17pt" font-weight="{$weight-bold}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='en']),'#',$part_num)"/></fo:block>
+								<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-bold}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='en']),'#',$part_num)"/></fo:block>
 							</xsl:if>
 						
-							<fo:block font-size="30.4pt">
+							<fo:block font-size="{$font-size-factor * 30.4}pt">
 								
-								<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'part']">
-									<fo:block> </fo:block>
-									<fo:block font-weight="{$weight-normal}"><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'part']"/></fo:block>
+								<xsl:if test="normalize-space($title_part_fr) != ''">
+									<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
+									<fo:block font-weight="{$weight-normal}"><xsl:copy-of select="$title_part_fr"/></fo:block>
 								</xsl:if>
 								
-								<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'part']">
-									<fo:block> </fo:block>
+								<xsl:if test="normalize-space($title_part_en) != ''">
+									<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
 									<fo:block font-weight="{$weight-bold}">
-										<xsl:variable name="title_en" select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'part']"/>
-										<xsl:variable name="mep_text" select="'Mise en pratique'"/>
-										<xsl:choose>
-											<xsl:when test="contains($title_en, $mep_text)">
-												<xsl:value-of select="substring-before($title_en, $mep_text)"/>
-												<xsl:text> </xsl:text><fo:inline font-style="italic"><xsl:value-of select="$mep_text"/></fo:inline><xsl:text> </xsl:text>
-												<xsl:value-of select="substring-after($title_en, $mep_text)"/>
-											</xsl:when>
-											<xsl:otherwise>
-												<xsl:value-of select="$title_en"/>
-											</xsl:otherwise>
-										</xsl:choose>
+										<xsl:copy-of select="$title_part_en"/>
 									</fo:block>
 								</xsl:if>
 							</fo:block>
@@ -1429,34 +1492,25 @@
 						<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@type = 'subpart']">
 							<xsl:variable name="subpart_num" select="normalize-space((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/>
 							<xsl:if test="$subpart_num != ''">
+								<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
 								<!-- Sub-part -->
-								<fo:block font-size="17pt" font-weight="{$weight-normal}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang='fr']),'#',$subpart_num)"/> <xsl:value-of select="$subpart_num"/></fo:block>
+								<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-normal}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang='fr']),'#',$subpart_num)"/> <xsl:value-of select="$subpart_num"/></fo:block>
 								<!-- Partie de sub -->
-								<fo:block font-size="17pt" font-weight="{$weight-bold}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang='en']),'#',$subpart_num)"/>  <xsl:value-of select="$subpart_num"/></fo:block>
+								<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-bold}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang='en']),'#',$subpart_num)"/>  <xsl:value-of select="$subpart_num"/></fo:block>
 							</xsl:if>
 						
-							<fo:block font-size="30.4pt">
+							<fo:block font-size="{$font-size-factor * 30.4}pt">
 								
-								<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'subpart']">
-									<fo:block> </fo:block>
-									<fo:block font-weight="{$weight-normal}"><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'fr' and @type = 'subpart']"/></fo:block>
+								<xsl:if test="normalize-space($title_subpart_fr) != ''">
+									<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
+									<fo:block font-weight="{$weight-normal}"><xsl:copy-of select="$title_subpart_fr"/></fo:block>
 								</xsl:if>
 								
-								<xsl:if test="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'subpart']">
-									<fo:block> </fo:block>
+								<xsl:if test="normalize-space($title_subpart_en) != ''">
+									<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
 									<fo:block font-weight="{$weight-bold}">
-										<xsl:variable name="title_en" select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'subpart']"/>
-										<xsl:variable name="mep_text" select="'Mise en pratique'"/>
-										<xsl:choose>
-											<xsl:when test="contains($title_en, $mep_text)">
-												<xsl:value-of select="substring-before($title_en, $mep_text)"/>
-												<xsl:text> </xsl:text><fo:inline font-style="italic"><xsl:value-of select="$mep_text"/></fo:inline><xsl:text> </xsl:text>
-												<xsl:value-of select="substring-after($title_en, $mep_text)"/>
-											</xsl:when>
-											<xsl:otherwise>
-												<xsl:value-of select="$title_en"/>
-											</xsl:otherwise>
-										</xsl:choose>
+										<xsl:copy-of select="$title_subpart_en"/>
+										
 									</fo:block>
 								</xsl:if>
 							</fo:block>
@@ -1619,6 +1673,24 @@
 	</xsl:template>
 	<!-- End Cover Pages -->
 		
+	
+	<xsl:template match="bipm:bipm-standard/bipm:bibdata/bipm:title[@language = 'en']/text()" priority="3">
+		<xsl:variable name="mep_text" select="'Mise en pratique'"/>
+		<xsl:choose>
+			<xsl:when test="contains(., $mep_text)">
+				<xsl:value-of select="substring-before(., $mep_text)"/>
+				<xsl:text> </xsl:text><fo:inline font-style="italic"><xsl:value-of select="$mep_text"/></fo:inline><xsl:text> </xsl:text>
+				<xsl:value-of select="substring-after(., $mep_text)"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="."/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
+	
+	
+		
 	<xsl:template name="insertSeparatorPage">
 		<!-- 3 Pages with BIPM Metro logo -->
 		<fo:page-sequence master-reference="document" force-page-count="no-force">
@@ -4578,7 +4650,12 @@
 			
 			<xsl:variable name="table_attributes">
 				<attribute name="table-layout">fixed</attribute>
-				<attribute name="width">100%</attribute>
+				<attribute name="width">
+					<xsl:choose>
+						<xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
+						<xsl:otherwise>100%</xsl:otherwise>
+					</xsl:choose>
+				</attribute>
 				<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
 				<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
 				
@@ -5111,7 +5188,7 @@
 			
 				<xsl:attribute name="font-weight">normal</xsl:attribute>
 				<xsl:attribute name="border">solid black 0pt</xsl:attribute>				
-				<xsl:attribute name="border-top">solid black 0.5pt</xsl:attribute>
+				<!-- <xsl:attribute name="border-top">solid black 0.5pt</xsl:attribute> -->
 				<xsl:attribute name="border-bottom">solid black 0.5pt</xsl:attribute>
 				<xsl:attribute name="height">8mm</xsl:attribute>
 				<xsl:attribute name="padding-top">2mm</xsl:attribute>
@@ -5826,6 +5903,10 @@
 			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='underline']">
+		<fo:inline text-decoration="underline">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
 		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
 			<xsl:apply-templates/>
@@ -7454,6 +7535,8 @@
 		<xsl:value-of select="translate(.,'. ','')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
 		<xsl:value-of select="substring(.,1,1)"/>
+	</xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
+		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -7733,6 +7816,11 @@
 			<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:choose>
+			<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
+				<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
+		</xsl:choose>
 		
 	</xsl:template></xsl:stylesheet>