BIPM xslt updated for metanorma/metanorma-bipm#102 for header border

metanorma · Jan 7, 2021 · bafe641 · bafe641
1 parent e8e0b71
commit bafe641
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/xslt_src/bipm.brochure.presentation.core.xsl b/xslt_src/bipm.brochure.presentation.core.xsl
@@ -1697,9 +1697,6 @@
 	</xsl:template>
 	<!-- End Cover Pages -->
 
-	<xsl:template match="bipm:title" mode="title">
-		<fo:inline><xsl:apply-templates /></fo:inline>
-	</xsl:template>
 
 	<xsl:template match="bipm:bipm-standard/bipm:bibdata/bipm:title[@language = 'en']/text()" priority="3">
 		<xsl:variable name="mep_text" select="'Mise en pratique'"/>

diff --git a/xslt_src/common.presentation.xsl b/xslt_src/common.presentation.xsl
@@ -2349,7 +2349,7 @@
 			<xsl:if test="$namespace = 'bipm'">
 				<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>
@@ -6154,6 +6154,11 @@
 	<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>
 
 	<!-- convert YYYY-MM-DD to 'Month YYYY' or 'Month DD, YYYY' -->
 	<xsl:template name="convertDate">
@@ -6512,7 +6517,12 @@
 			<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>