metanorma-bipm 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64a23fe1ec38fdd6edc912843f0a71d26426842674e27859c968e3973cff519b
-  data.tar.gz: a9b8f00c4ebaff5fd36d32390e0edbe7aed2fc63a31aaec9af7b949c82656d03
+  metadata.gz: 9e92f453fd51171c023324636e3d16215d4d2af372c2975da080d9b7f81f5ded
+  data.tar.gz: 7066c446be4aa7b01e18c685b7c86b0e6bfd8883fc702e984d8a9fb0448df04f
 SHA512:
-  metadata.gz: 6e3d8a6280a0cfebaba1b33c7bbc3e02dfe011d4a0545738b519e52d0b6211d2c0a3e2a087588cb7acbcbb095d69c8830685a498e170c3a3d584f156cea17df3
-  data.tar.gz: fc3870e78f57d64b19214f1b4b444ae83b49b7d46d42cc17f2d0df344972fc8bc2c94b9190a5b2bc3c23095f2c49bd1683da006cf9c3dc90c6de9d513d882e7d
+  metadata.gz: 7c11d1f4e93dde04a7f46498906bd8143a8bc7a3fb917e86706436894cc2989a7b4ac373c29ae29061f4e0d5967216c45b1e4724cac84ba664eb1fd4ec052cbb
+  data.tar.gz: 28999ac1b868021ed0fe9aa63ba01f3dee7d66a3e111586624f5576f72962c06ea993be25cd52cd9d64ffa3fdbe035b6daf196fdc2e08b05ddce506ad9a31f43

data/.gitignore

@@ -0,0 +1 @@
+.rubocop-https--*

data/.rubocop.yml

@@ -0,0 +1,14 @@
+# This project follows the Ribose OSS style guide.
+# https://github.com/riboseinc/oss-guides
+# All project-specific additions and overrides should be specified in this file.
+inherit_from:
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+
+# local repo-specific modifications
+
+AllCops:
+  DisplayCopNames: false
+  StyleGuideCopsOnly: false
+  TargetRubyVersion: 2.4
+Rails:
+  Enabled: true

data/lib/asciidoctor/bipm/biblio.rng

@@ -124,7 +124,7 @@
           <value>application/tei+xml</value>
           <value>text/x-asciidoc</value>
           <value>text/markdown</value>
-          <value>application/x-isodoc+xml</value>
+          <value>application/x-metanorma+xml</value>
           <text/>
         </choice>
       </attribute>
@@ -452,6 +452,7 @@
       <attribute name="type">
         <choice>
           <value>isni</value>
+          <value>orcid</value>
           <value>uri</value>
         </choice>
       </attribute>
@@ -461,10 +462,7 @@
   <define name="org-identifier">
     <element name="identifier">
       <attribute name="type">
-        <choice>
-          <value>orcid</value>
-          <value>uri</value>
-        </choice>
+        <data type="string" datatypeLibrary=""/>
       </attribute>
       <text/>
     </element>
@@ -1106,7 +1104,7 @@
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>
-      <value>cited</value>
+      <value>cites</value>
       <value>isCitedIn</value>
     </choice>
   </define>

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

@@ -254,6 +254,28 @@
 					</fo:repeatable-page-master-alternatives>
 				</fo:page-sequence-master>
 				
+				<!-- Document pages (landscape orientation) -->
+				<fo:simple-page-master master-name="document-landscape-odd" page-width="{$pageHeight}" page-height="{$pageWidth}">
+					<fo:region-body margin-top="25.4mm" margin-bottom="22mm" margin-left="31.7mm" margin-right="40mm"/>
+					<fo:region-before region-name="header-odd" extent="25.4mm"/> 
+					<fo:region-after region-name="footer" extent="22mm"/> <!-- debug:  background-color="green" -->
+					<fo:region-start region-name="left-region" extent="17mm"/>
+					<fo:region-end region-name="right-region" extent="26.5mm"/>
+				</fo:simple-page-master>
+				<fo:simple-page-master master-name="document-landscape-even" page-width="{$pageHeight}" page-height="{$pageWidth}">
+					<fo:region-body margin-top="25.4mm" margin-bottom="22mm" margin-left="31.7mm" margin-right="40mm"/>
+					<fo:region-before region-name="header-even" extent="25.4mm"/> 
+					<fo:region-after region-name="footer" extent="22mm"/> <!-- debug:  background-color="green" -->
+					<fo:region-start region-name="left-region" extent="17mm"/>
+					<fo:region-end region-name="right-region" extent="26.5mm"/>
+				</fo:simple-page-master>
+				<fo:page-sequence-master master-name="document-landscape">
+					<fo:repeatable-page-master-alternatives>						
+						<fo:conditional-page-master-reference odd-or-even="even" master-reference="document-landscape-even"/>
+						<fo:conditional-page-master-reference odd-or-even="odd" master-reference="document-landscape-odd"/>
+					</fo:repeatable-page-master-alternatives>
+				</fo:page-sequence-master>
+				
 				<!-- Index pages -->
 				<fo:simple-page-master master-name="index-odd" page-width="{$pageWidth}" page-height="{$pageHeight}">
 					<fo:region-body margin-top="25.4mm" margin-bottom="22mm" margin-left="31.7mm" margin-right="41.7mm" column-count="2" column-gap="10mm"/>
@@ -329,10 +351,14 @@
 									<xsl:apply-templates select="xalan:nodeset($current_document)" mode="flatxml"/>
 								</xsl:variable> -->
 								
-								<xsl:variable name="flatxml">
+								<xsl:variable name="flatxml_">
 									<xsl:apply-templates select="." mode="flatxml"/>
 								</xsl:variable>
 								
+								<xsl:variable name="flatxml">
+									<xsl:apply-templates select="xalan:nodeset($flatxml_)" mode="pagebreak"/>
+								</xsl:variable>
+								
 								<!-- flatxml=<xsl:copy-of select="$flatxml"/> -->
 								
 								<xsl:apply-templates select="xalan:nodeset($flatxml)/bipm:bipm-standard" mode="bipm-standard">
@@ -356,10 +382,14 @@
 									<xsl:apply-templates select="xalan:nodeset($current_document)" mode="flatxml"/>
 								</xsl:variable> -->
 								
-								<xsl:variable name="flatxml">
+								<xsl:variable name="flatxml_">
 									<xsl:apply-templates select="." mode="flatxml"/>
 								</xsl:variable>
 								
+								<xsl:variable name="flatxml">
+									<xsl:apply-templates select="xalan:nodeset($flatxml_)" mode="pagebreak"/>
+								</xsl:variable>
+								
 								<xsl:apply-templates select="xalan:nodeset($flatxml)/bipm:bipm-standard" mode="bipm-standard">
 									<xsl:with-param name="curr_docnum" select="$num"/>
 								</xsl:apply-templates>
@@ -372,10 +402,14 @@
 				</xsl:when>			
 				<xsl:otherwise>
 				
-					<xsl:variable name="flatxml">
+					<xsl:variable name="flatxml_">
 						<xsl:apply-templates mode="flatxml"/>
 					</xsl:variable>
-				
+
+					<xsl:variable name="flatxml">
+						<xsl:apply-templates select="xalan:nodeset($flatxml_)" mode="pagebreak"/>
+					</xsl:variable>
+					
 					<!-- flatxml=<xsl:copy-of select="$flatxml"/> -->
 					
 					<!-- indexes=<xsl:copy-of select="$indexes"/> -->
@@ -861,8 +895,82 @@
 	<!-- END: Flattening xml for fit notes at page sides (margins) -->
 	<!-- ================================= -->	
 	
+	<!-- ================================= -->
+	<!-- Page breaks processing (close previous elements (clause) and start new) -->
+	<!-- ================================= -->	
+	<xsl:template match="@*|node()" mode="pagebreak">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="pagebreak"/>
+		</xsl:copy>
+	</xsl:template>
 	
+	<xsl:template match="node()[bipm:pagebreak[@orientation]]" mode="pagebreak">
+		<xsl:variable name="element_name" select="local-name()"/>
+		<xsl:for-each select="bipm:pagebreak[@orientation]">
+			<xsl:variable name="pagebreak_id" select="generate-id()"/>
+			<xsl:variable name="pagebreak_previous_orientation" select="preceding-sibling::bipm:pagebreak[@orientation][1]/@orientation"/>
+			
+			<!-- copy elements before page break -->
+			<xsl:element name="{$element_name}" namespace="https://www.metanorma.org/ns/bipm">
+				<xsl:if test="not(preceding-sibling::bipm:pagebreak[@orientation])">
+					<xsl:apply-templates select="../@*" mode="pagebreak"/>
+				</xsl:if>
+				<xsl:if test="$pagebreak_previous_orientation != ''">
+					<xsl:attribute name="orientation"><xsl:value-of select="$pagebreak_previous_orientation"/></xsl:attribute>
+				</xsl:if>
+				
+				<xsl:apply-templates select="preceding-sibling::node()[following-sibling::bipm:pagebreak[@orientation][1][generate-id(.) = $pagebreak_id]][not(local-name() = 'pagebreak' and @orientation)]" mode="pagebreak"/>
+			</xsl:element>
+			
+			<!-- copy elements after last page break -->
+			<xsl:if test="position() = last() and following-sibling::node()">
+				<xsl:element name="{$element_name}" namespace="https://www.metanorma.org/ns/bipm">
+					<xsl:attribute name="orientation"><xsl:value-of select="@orientation"/></xsl:attribute>
+					<xsl:apply-templates select="following-sibling::node()" mode="pagebreak"/>
+				</xsl:element>
+			</xsl:if>
+			
+		</xsl:for-each>
+		
+	</xsl:template>
 	
+	<xsl:template match="bipm:pagebreak2" mode="pagebreak">
+		<xsl:variable name="orientation" select="normalize-space(@orientation)"/>
+		<xsl:variable name="tree">
+			<xsl:for-each select="ancestor::*[ancestor::bipm:sections or ancestor::bipm:annex or ancestor::bipm:preface]">
+				<element pos="{position()}">					
+					<xsl:value-of select="name()"/>
+				</element>
+			</xsl:for-each>
+		</xsl:variable>
+		<!-- close preceding elements -->
+		<xsl:for-each select="xalan:nodeset($tree)//element">
+			<xsl:sort data-type="number" order="descending" select="@pos"/>
+			<xsl:text disable-output-escaping="yes">&lt;/</xsl:text>
+				<xsl:value-of select="."/>				
+			<xsl:text disable-output-escaping="yes">&gt;</xsl:text>
+		</xsl:for-each>
+		<!-- open elements -->
+		<xsl:for-each select="xalan:nodeset($tree)//element">
+			<xsl:text disable-output-escaping="yes">&lt;</xsl:text>
+				<xsl:value-of select="."/>
+				<xsl:for-each select="@*[local-name() != 'pos']">
+					<xsl:text> </xsl:text>
+					<xsl:value-of select="local-name()"/>
+					<xsl:text>="</xsl:text>
+					<xsl:value-of select="."/>
+					<xsl:text>"</xsl:text>
+				</xsl:for-each>
+				<xsl:if test="position() = 1">
+					<xsl:text> orientation="</xsl:text><xsl:value-of select="$orientation"/><xsl:text>"</xsl:text>
+				</xsl:if>
+			<xsl:text disable-output-escaping="yes">&gt;</xsl:text>
+		</xsl:for-each>
+		
+	</xsl:template>
+	<!-- ================================= -->
+	<!-- END: Page breaks processing  -->
+	<!-- ================================= -->	
 	
 	<xsl:template match="bipm:bipm-standard"/>
 	<xsl:template match="bipm:bipm-standard" mode="bipm-standard">
@@ -1072,12 +1180,11 @@
 				
 				
 				<!-- Document Pages -->
-				
 				<xsl:apply-templates select="bipm:sections/*" mode="sections"/>
 				
 				
-				
 				<!-- Normative references  -->
+				
 				<xsl:apply-templates select="bipm:bibliography/bipm:references[@normative='true']" mode="sections"/>
 
 				<xsl:apply-templates select="bipm:annex" mode="sections"/>
@@ -1085,6 +1192,9 @@
 				<!-- Bibliography -->
 				<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
 				
+				<!-- Document Control -->
+				<xsl:apply-templates select="bipm:doccontrol" mode="sections"/> 
+				
 				<!-- Index -->
 				<!-- <xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:clause[@type = 'index']" mode="index" /> -->
 				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index"/>
@@ -1238,7 +1348,6 @@
 				<xsl:apply-templates select="bipm:preface/*" mode="sections"/> <!-- bipm:clause -->
 				
 				<!-- Document Pages -->
-				
 				<xsl:apply-templates select="bipm:sections/*" mode="sections"/>
 				<!-- <xsl:call-template name="sections_appendix"/> --> <!-- without pagebreaks  -->
 				
@@ -1250,6 +1359,9 @@
 				
 				<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
 				
+				<!-- Document Control -->
+				<xsl:apply-templates select="bipm:doccontrol" mode="sections"/> 
+				
 				<!-- Index -->
 				<!-- <xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:clause[@type = 'index']" mode="index" /> -->
 				<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index"/>
@@ -1963,11 +2075,14 @@
 	
 	<xsl:template match="node()" mode="sections">
 		<fo:page-sequence master-reference="document" force-page-count="no-force">
+			<xsl:if test="@orientation = 'landscape'">
+				<xsl:attribute name="master-reference">document-landscape</xsl:attribute>
+			</xsl:if>
+
 			<xsl:call-template name="insertFootnoteSeparator"/>
 			
 			<xsl:variable name="header-title">
 				<xsl:choose>
-					
 					<xsl:when test="local-name(..) = 'sections'">
 						<xsl:choose>
 							<xsl:when test="./bipm:title[1]/*[local-name() = 'tab']">
@@ -2008,6 +2123,7 @@
 			</xsl:variable>
 			<xsl:call-template name="insertHeaderFooter">
 				<xsl:with-param name="header-title" select="$header-title"/>
+				<xsl:with-param name="orientation" select="@orientation"/>
 			</xsl:call-template>
 			
 			<fo:flow flow-name="xsl-region-body">
@@ -2479,13 +2595,25 @@
 		<xsl:variable name="space-before-value" select="normalize-space($space-before)"/>			
 			
 		<fo:table table-layout="fixed" width="174mm" line-height="135%">
+			<xsl:if test="@orientation = 'landscape'">
+				<xsl:attribute name="width">261mm</xsl:attribute> <!-- 87 = (297 - 210) -->
+			</xsl:if>
 			<xsl:call-template name="setId"/>
 			<xsl:if test="$space-before-value != ''">
 				<xsl:attribute name="space-before"><xsl:value-of select="$space-before-value"/></xsl:attribute>
 			</xsl:if>
-			<fo:table-column column-width="137mm"/>
+			
+			<xsl:choose>
+				<xsl:when test="@orientation = 'landscape'"> 
+					<fo:table-column column-width="224mm"/> <!-- +87  -->
+				</xsl:when>
+				<xsl:otherwise>
+					<fo:table-column column-width="137mm"/>
+				</xsl:otherwise>
+			</xsl:choose>
 			<fo:table-column column-width="5mm"/>
 			<fo:table-column column-width="32mm"/>
+			
 			<fo:table-body>
 				
 				<xsl:variable name="total_rows" select="count(*)"/>
@@ -3296,7 +3424,7 @@
 
 	<!-- set height for sup -->
 	<!-- <xsl:template match="mathml:msup[count(*) = 2 and count(mathml:mrow) = 2]/mathml:mrow[1][count(*) = 1 and mathml:mtext and (mathml:mtext/text() != '' and mathml:mtext/text() != ' ' and mathml:mtext/text() != '&#xa0;')]/mathml:mtext" mode="mtext"> -->
-	<xsl:template match="mathml:msup[count(*) = 2 and count(mathml:mrow) = 2]/mathml:mrow[1][count(*) = 1]/*" mode="mathml" priority="2">
+	<xsl:template match="mathml:msup[count(*) = 2 and count(mathml:mrow) = 2]/mathml:mrow[1][count(*) = 1 and not(mathml:mfenced)]/*" mode="mathml" priority="3">
 		<xsl:copy>
 			<xsl:apply-templates select="@*|node()" mode="mathml"/>
 		</xsl:copy>
@@ -3327,23 +3455,49 @@
 		<mrow>
 			<mtext>Cu</mtext>
 		</mrow>
-	</mfenced>
-		to: 
+	</mfenced> 
+	to:
+	<mfenced open="(" close=")" separators="">
+		<mathml:mo rspace="-0.35em"></mathml:mo>
+		<mathml:mspace width="-0.15em"/>
+		<mrow>
+			<mtext>Cu</mtext>
+		</mrow>
+		<mathml:mspace width="-0.1em"/>
+	</mfenced> 
+	-->
+	<xsl:template match="mathml:mfenced[count(*) = 1]" mode="mathml" priority="2"> 
+		<xsl:if test="preceding-sibling::*">
+			<mathml:mo rspace="-0.35em"/><!-- decrease space before opening bracket -->
+		</xsl:if>
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="mathml"/>
+			<xsl:if test="not(@separators)">
+				<xsl:attribute name="separators"/>
+			</xsl:if>
+			<mathml:mspace width="-0.15em"/> <!-- decrease space between opening brackets  and inside text-->
+			<xsl:apply-templates mode="mathml"/>
+			<mathml:mspace width="-0.1em"/> <!-- decrease space between inside text and closing brackets -->
+		</xsl:copy>
+	</xsl:template>
+		
+	<!-- to: 
 		<mrow>
 			<mtext>(Cu)</mtext>
 		</mrow> -->
-	<xsl:template match="mathml:mfenced[count(*) = 1 and *[count(*) = 1] and */*[count(*) = 0]] |                  mathml:mfenced[count(*) = 1 and *[count(*) = 1] and */*[count(*) = 1] and */*/*[count(*) = 0]]" mode="mathml" priority="2">
+		<!-- <xsl:template match="mathml:mfenced[count(*) = 1 and *[count(*) = 1] and */*[count(*) = 0]] |
+																	mathml:mfenced[count(*) = 1 and *[count(*) = 1] and */*[count(*) = 1] and */*/*[count(*) = 0]]" mode="mathml" priority="2">
 		<xsl:apply-templates mode="mathml"/>
 	</xsl:template>
-		
-	<xsl:template match="mathml:mfenced[count(*) = 1]/*[count(*) = 1]/*[count(*) = 0] |                  mathml:mfenced[count(*) = 1]/*[count(*) = 1]/*[count(*) = 1]/*[count(*) = 0]" mode="mathml" priority="2"> <!-- [not(following-sibling::*) and not(preceding-sibling::*)] -->
+	<xsl:template match="mathml:mfenced[count(*) = 1]/*[count(*) = 1]/*[count(*) = 0] |
+																	mathml:mfenced[count(*) = 1]/*[count(*) = 1]/*[count(*) = 1]/*[count(*) = 0]" mode="mathml" priority="2"> 
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="mathml"/>
 			<xsl:value-of select="ancestor::mathml:mfenced[1]/@open"/>
 			<xsl:value-of select="."/>
 			<xsl:value-of select="ancestor::mathml:mfenced[1]/@close"/>
 		</xsl:copy>
-	</xsl:template>
+	</xsl:template> -->
 
 	<!-- Decrease height of / and | -->
 	<xsl:template match="mathml:mo[normalize-space(text()) = '/' or normalize-space(text()) = '|']" mode="mathml">
@@ -3356,6 +3510,20 @@
 		</xsl:copy>
 	</xsl:template>
 	
+	<!-- Decrease a distance before and after of delta -->
+	<xsl:template match="mathml:mo[normalize-space(text()) = 'Δ']" mode="mathml">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="mathml"/>
+			<xsl:if test="not(@rspace)">
+				<xsl:attribute name="rspace">0em</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="not(@lspace) and (preceding-sibling::*[1][local-name() = 'mo'] or not(preceding-sibling::*))">
+				<xsl:attribute name="lspace">0em</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates mode="mathml"/>
+		</xsl:copy>
+	</xsl:template>
+	
 	<xsl:template match="mathml:mi[string-length(normalize-space()) &gt; 1]" mode="mathml" priority="2">
 		<xsl:if test="preceding-sibling::* and preceding-sibling::*[1][not(local-name() = 'mfenced' or local-name() = 'mo')]">
 			<mathml:mspace width="0.3em"/>
@@ -3367,7 +3535,8 @@
 	</xsl:template>
 
 	<xsl:template name="insertHeaderFooter">
-		<xsl:param name="header-title"/>		
+		<xsl:param name="header-title"/>
+		<xsl:param name="orientation"/>
 		<fo:static-content flow-name="header-odd">			
 			<fo:block-container font-family="Arial" font-size="8pt" padding-top="12.5mm">
 				<fo:block text-align="right">
@@ -3382,9 +3551,12 @@
 				</fo:block>
 			</fo:block-container>
 			<fo:block-container font-size="1pt" border-top="0.5pt solid black" margin-left="81mm" width="86mm">
-					<fo:block> </fo:block>
-				</fo:block-container>
-			</fo:static-content>		
+				<xsl:if test="$orientation = 'landscape'">
+					<xsl:attribute name="margin-left">168mm</xsl:attribute>
+				</xsl:if>
+				<fo:block> </fo:block>
+			</fo:block-container>
+		</fo:static-content>		
 		<fo:static-content flow-name="header-even">
 			<fo:block-container font-family="Arial" font-size="8pt" padding-top="12.5mm">
 				<fo:block>
@@ -4635,7 +4807,7 @@
 					
 									
 										
-						<xsl:if test="not(ancestor::*[local-name()='preface']) and not(ancestor::*[local-name()='note_side']) and not(ancestor::*[local-name() = 'annex'] and .//*[local-name() = 'xref'][@pagenumber])">
+						<xsl:if test="not(ancestor::*[local-name()='preface']) and not(ancestor::*[local-name()='note_side']) and not(ancestor::*[local-name() = 'annex'] and .//*[local-name() = 'xref'][@pagenumber]) and not(ancestor::*[local-name() = 'doccontrol'])">
 							<attribute name="border-top">0.5pt solid black</attribute>
 							<attribute name="border-bottom">0.5pt solid black</attribute>
 						</xsl:if>
@@ -4751,6 +4923,9 @@
 					<xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
 						<xsl:attribute name="margin-top">0pt</xsl:attribute>
 					</xsl:if>
+					<xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
+						<xsl:attribute name="margin-top">0pt</xsl:attribute>
+					</xsl:if>
 				
 				<xsl:apply-templates/>				
 			</fo:block>
@@ -5187,10 +5362,21 @@
 				<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>
-				<xsl:if test="ancestor::*[local-name() = 'annex'] and ancestor::*[local-name() = 'table']//*[local-name() = 'xref'][@pagenumber]"><!-- for Annex ToC -->
+				<xsl:if test="(ancestor::*[local-name() = 'annex'] and ancestor::*[local-name() = 'table']//*[local-name() = 'xref'][@pagenumber]) or ancestor::*[local-name() = 'doccontrol']"><!-- for Annex ToC -->
 					<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
 					<xsl:attribute name="border-bottom">solid black 0pt</xsl:attribute>
 				</xsl:if>
+				<xsl:if test="ancestor::*[local-name() = 'doccontrol']">
+					<xsl:attribute name="text-align">
+						<xsl:choose>
+							<xsl:when test="@align">
+								<xsl:value-of select="@align"/>
+							</xsl:when>
+							<xsl:otherwise>left</xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+					<xsl:attribute name="display-align">before</xsl:attribute>
+				</xsl:if>
 			
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
@@ -5247,6 +5433,9 @@
 				<xsl:if test="not(ancestor::*[local-name()='tr']/following-sibling::*[local-name()='tr'])"> <!-- last row -->
 					<xsl:attribute name="padding-bottom">2mm</xsl:attribute>
 				</xsl:if>
+				<xsl:if test="ancestor::*[local-name() = 'doccontrol']">
+					<xsl:attribute name="display-align">before</xsl:attribute>
+				</xsl:if>
 			
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
@@ -6265,7 +6454,7 @@
 			</xsl:variable>
 			<fo:instream-foreign-object fox:alt-text="Math">
 				
-					<xsl:if test="ancestor::*[local-name() = 'formula']">
+					<xsl:if test="local-name(../..) = 'formula'">
 						<xsl:attribute name="width">95%</xsl:attribute>
 						<xsl:attribute name="content-height">100%</xsl:attribute>
 						<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -7621,8 +7810,8 @@
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'bookmark']">
-		<fo:inline id="{@id}"/>
+	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
+		<fo:inline id="{@id}" font-size="1pt"/>
 	</xsl:template><xsl:template match="*[local-name() = 'errata']">
 		<!-- <row>
 					<date>05-07-2013</date>