metanorma-ogc 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa7220c37ec4c4f57f175cc19ded9faa15b4cef238107d9dbf20fed3350e7964
-  data.tar.gz: 652a56390a308dc6d52c991b6492fbc733275a87b64bdc3b7ebcfd33519e7743
+  metadata.gz: 6d485aa36153e193dceebf844193f8042fce9db6ce93b00e66ac43e7755a541e
+  data.tar.gz: '0692880332b57c821956e5d9ec5e3dd3ddf94e33f8b6b92f8f16b89f72bae1b9'
 SHA512:
-  metadata.gz: a6374615ac10104cb610e08015f44df88f2ba8a2d11f9830dc91cc4055a881d240d50a54f2db3fb253de8ff00a1900cfc4a6e76db5867b939c15b9abf791db35
-  data.tar.gz: e0c934e414bae2c2749033a9b62add64765d0adc44f72711f97c8f48eb1e15ccf311a5c46d7538cdaf5f91acfd39b2e13ab91432a41e593543090b19eb87aa71
+  metadata.gz: f6d4d7d832023e182ef9f0bbe2a4603a5827f7667131f3a27cdc3ebd1a57917483011396f67b160ac91d65576d6d04a73fee200064f2caf0d10736ece807d51c
+  data.tar.gz: 846eb44d909ef21e3a08b3bddcb4171271a92dd65cf4c9d208dac02154228ac1b18699d2a71c0e1e7bc2a7912160dc815429bf5a80873591e0ae3708d5ca1693

data/lib/asciidoctor/ogc/cleanup.rb

@@ -74,23 +74,28 @@ module Asciidoctor
       end
 
       def requirement_metadata_component_tags
-        %w(test-purpose test-method conditions part description reference
-           requirement permission recommendation)
+        %w(test-purpose test-method test-method-type conditions part description
+           reference step requirement permission recommendation)
       end
 
-      def requirement_metadata1(reqt, dlist)
-        ins = super
+      def requirement_metadata1(reqt, dlist, ins)
+        ins1 = super
         dlist.xpath("./dt").each do |e|
-          next unless requirement_metadata_component_tags.include? e.text
+          tag = e&.text&.gsub(/ /, "-")&.downcase
+          next unless requirement_metadata_component_tags.include? tag
 
-          ins.next = requirement_metadata1_component(e)
-          ins = ins.next
+          ins1.next = requirement_metadata1_component(e, tag)
+          ins1 = ins1.next
         end
       end
 
-      def requirement_metadata1_component(term)
+      def requirement_metadata1_component(term, tag)
         val = term.at("./following::dd")
-        val.name = term.text
+        val.name = tag
+        val.xpath("./dl").each do |d|
+          requirement_metadata1(val, d, d)
+          d.remove
+        end
         if %w(requirement permission
               recommendation).include?(term.text) && !val.text.empty?
           val["label"] = val.text.strip
@@ -109,8 +114,8 @@ module Asciidoctor
       end
 
       def requirement_metadata_to_component(reqt)
-        reqt.xpath("./test-method | ./test-purpose | ./conditions | ./part | "\
-                   "./reference")
+        reqt.xpath(".//test-method | .//test-purpose | .//conditions | "\
+                   ".//part | .//test-method-type | .//step | .//reference")
           .each do |c|
           c["class"] = c.name
           c.name = "component"
@@ -125,8 +130,10 @@ module Asciidoctor
       end
 
       def requirement_subparts_to_blocks(reqt)
-        reqt.xpath("./component | ./description").each do |c|
-          %w(p ol ul dl table).include?(c&.elements&.first&.name) and next
+        reqt.xpath(".//component | .//description").each do |c|
+          next if %w(p ol ul dl table component description)
+            .include?(c&.elements&.first&.name)
+
           c.children = "<p>#{c.children.to_xml}</p>"
         end
       end
@@ -140,6 +147,27 @@ module Asciidoctor
           t.remove
         end
       end
+
+      def requirement_cleanup(xmldoc)
+        requirement_type(xmldoc)
+        super
+      end
+
+      def requirement_type(xmldoc)
+        xmldoc.xpath(REQRECPER).each do |r|
+          next unless r["type"]
+
+          r["type"] = case r["type"]
+                      when "requirement", "recommendation", "permission"
+                        "general"
+                      when "requirement_class" then "class"
+                      when "conformance_test" then "verification"
+                      when "conformance_class" then "conformanceclass"
+                      when "abstract_test" then "abstracttest"
+                      else r["type"]
+                      end
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/ogc/converter.rb

@@ -122,6 +122,16 @@ module Asciidoctor
         xml.hi { |s| s << text }
       end
 
+      def example(node)
+        role = node.role || node.attr("style")
+        if %w(requirement_class conformance_test conformance_class
+              abstract_test).include?(role)
+          node.set_attr("type", role)
+          return requirement(node, "requirement")
+        end
+        super
+      end
+
       def presentation_xml_converter(node)
         IsoDoc::Ogc::PresentationXMLConvert.new(html_extract_attributes(node))
       end

data/lib/asciidoctor/ogc/isodoc.rng

@@ -1036,6 +1036,7 @@
       <ref name="svgmap"/>
       <ref name="inputform"/>
       <ref name="toc"/>
+      <ref name="passthrough"/>
     </choice>
   </define>
   <define name="toc">
@@ -1043,6 +1044,14 @@
       <ref name="ul"/>
     </element>
   </define>
+  <define name="passthrough">
+    <element name="passthrough">
+      <optional>
+        <attribute name="formats"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
   <define name="inputform">
     <element name="form">
       <attribute name="id">

data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl

@@ -414,7 +414,7 @@
 							</fo:block>
 						</fo:block-container>	
 								
-						<xsl:if test="//ogc:table[@id and ogc:name]">								
+						<xsl:if test="//ogc:table[@id and ogc:name and contains(ogc:name, '—')]">								
 							<xsl:variable name="title-list-tables">
 								<xsl:call-template name="getTitle">
 									<xsl:with-param name="name" select="'title-list-tables'"/>
@@ -429,7 +429,7 @@
 								</fo:block-container>
 							</fo:block-container>							
 							<fo:block-container line-height="130%">
-								<xsl:for-each select="//ogc:table[@id and ogc:name]">
+								<xsl:for-each select="//ogc:table[@id and ogc:name and contains(ogc:name, '—')]">
 									<fo:block text-align-last="justify" margin-top="2pt" role="TOCI">
 										<fo:basic-link internal-destination="{@id}" fox:alt-text="{ogc:name}">
 											<xsl:apply-templates select="ogc:name" mode="contents"/>										
@@ -443,7 +443,7 @@
 							</fo:block-container>							
 						</xsl:if>
 								
-						<xsl:if test="//ogc:figure[@id and ogc:name]">								
+						<xsl:if test="//ogc:figure[@id and ogc:name and contains(ogc:name, '—')]">								
 							<xsl:variable name="title-list-figures">
 								<xsl:call-template name="getTitle">
 									<xsl:with-param name="name" select="'title-list-figures'"/>
@@ -458,7 +458,7 @@
 							</fo:block-container>
 							
 							<fo:block-container line-height="130%">
-								<xsl:for-each select="//ogc:figure[@id and ogc:name]">
+								<xsl:for-each select="//ogc:figure[@id and ogc:name and contains(ogc:name, '—')]">
 									<fo:block text-align-last="justify" margin-top="2pt" role="TOCI">
 										<fo:basic-link internal-destination="{@id}" fox:alt-text="{ogc:name}">
 											<xsl:apply-templates select="ogc:name" mode="contents"/>										
@@ -910,6 +910,7 @@
 					<xsl:call-template name="insertSectionTitle">
 						<xsl:with-param name="section" select="$section"/>
 						<xsl:with-param name="title" select="$title"/>
+						<xsl:with-param name="level" select="$level"/>
 					</xsl:call-template>
 				</fo:block>
 			</xsl:when>
@@ -1057,10 +1058,13 @@
 	<xsl:template match="ogc:ul | ogc:ol" mode="ul_ol">
 		<fo:block-container margin-left="13mm">
 			<xsl:if test="ancestor::ogc:table">
-				<xsl:attribute name="margin-left">1.5mm</xsl:attribute>
+				<xsl:attribute name="margin-left">4mm</xsl:attribute>
 			</xsl:if>
 			<xsl:if test="ancestor::ogc:ul or ancestor::ogc:ol">
 				<xsl:attribute name="margin-top">10pt</xsl:attribute>
+				<xsl:if test="ancestor::ogc:table">
+					<xsl:attribute name="margin-top">1mm</xsl:attribute>
+				</xsl:if>
 			</xsl:if>
 			<fo:block-container margin-left="0mm">
 				<fo:list-block provisional-distance-between-starts="12mm" space-after="12pt" line-height="115%">
@@ -1069,6 +1073,9 @@
 					</xsl:if>
 					<xsl:if test="ancestor::ogc:ul | ancestor::ogc:ol">
 						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+						<xsl:if test="ancestor::ogc:table[not(@class)]">
+							<xsl:attribute name="space-after">1mm</xsl:attribute>
+						</xsl:if>
 					</xsl:if>
 					<xsl:if test="following-sibling::*[1][local-name() = 'ul' or local-name() = 'ol']">
 						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
@@ -1104,17 +1111,14 @@
 								<xsl:when test="../@type = 'roman'">
 									<xsl:number format="i)"/>
 								</xsl:when>
-								<xsl:when test="ancestor::ogc:table">
-									<xsl:variable name="level" select="count(ancestor-or-self::ogc:li[ancestor::ogc:table])"/>
+								<xsl:otherwise>
+									<xsl:variable name="level" select="count(ancestor-or-self::ogc:li)"/>
 									<xsl:choose>
 										<xsl:when test="$level = 1"><xsl:number format="a)" lang="en"/></xsl:when>
 										<xsl:when test="$level = 2"><xsl:number format="1."/></xsl:when>
 										<xsl:when test="$level = 3"><xsl:number format="i)"/></xsl:when>
 										<xsl:otherwise><xsl:number format="a)" lang="en"/></xsl:otherwise>
 									</xsl:choose>
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:number format="1."/>
 								</xsl:otherwise>
 							</xsl:choose>
 						</xsl:otherwise>
@@ -1123,6 +1127,9 @@
 			</fo:list-item-label>
 			<fo:list-item-body start-indent="body-start()" line-height-shift-adjustment="disregard-shifts">
 				<fo:block margin-bottom="10pt">
+					<xsl:if test="ancestor::ogc:table[not(@class)]">
+						<xsl:attribute name="margin-bottom">1mm</xsl:attribute>
+					</xsl:if>
 					<xsl:if test="not(following-sibling::*) and not(../following-sibling::*)">
 						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 					</xsl:if>
@@ -1274,7 +1281,6 @@
 	
 	<xsl:template match="ogc:figure" priority="2">
 		<fo:block-container id="{@id}" margin-top="12pt" margin-bottom="12pt">			
-			<xsl:apply-templates select="ogc:name" mode="presentation"/>			
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
@@ -1282,6 +1288,7 @@
 			<xsl:for-each select="ogc:note">
 				<xsl:call-template name="note"/>
 			</xsl:for-each>
+			<xsl:apply-templates select="ogc:name" mode="presentation"/>
 		</fo:block-container>
 	</xsl:template>
 
@@ -1442,6 +1449,7 @@
 	<xsl:template name="insertSectionTitle">
 		<xsl:param name="section"/>
 		<xsl:param name="title"/>
+		<xsl:param name="level">1</xsl:param>
 		<fo:block>
 			<fo:block font-size="18pt" color="{$color_blue}" keep-with-next="always" line-height="150%">
 				<xsl:if test="$section != ''">
@@ -1452,10 +1460,24 @@
 						</xsl:call-template>						
 					</fo:inline>
 				</xsl:if>
-				<xsl:apply-templates select="xalan:nodeset($title)" mode="titlesmall"/>
+				<xsl:choose>
+					<xsl:when test="$level = 1">
+						<xsl:apply-templates select="xalan:nodeset($title)" mode="titlesmall"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="xalan:nodeset($title)" mode="titlesimple"/>
+					</xsl:otherwise>
+				</xsl:choose>
 				
 				<xsl:variable name="variant-title">
-					<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="titlesmall"/>
+					<xsl:choose>
+						<xsl:when test="$level = 1">
+							<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="titlesmall"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="titlesimple"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:variable>
 				<xsl:if test="normalize-space($variant-title) != ''">
 					<fo:inline padding-right="5mm"> </fo:inline>
@@ -1474,25 +1496,59 @@
 		</xsl:call-template>
 	</xsl:template>
 	
+	<xsl:template match="text()" mode="titlesimple">
+		<xsl:value-of select="."/>
+	</xsl:template>
+	
 	<xsl:template match="ogc:strong" mode="titlesmall">
 		<xsl:apply-templates mode="titlesmall"/>		
 	</xsl:template>
+	<xsl:template match="ogc:strong" mode="titlesimple">
+		<xsl:apply-templates mode="titlesimple"/>		
+	</xsl:template>
 	
 	<xsl:template match="ogc:em" mode="titlesmall">
 		<fo:inline font-style="italic"><xsl:apply-templates mode="titlesmall"/></fo:inline>
 	</xsl:template>
+	<xsl:template match="ogc:em" mode="titlesimple">
+		<fo:inline font-style="italic"><xsl:apply-templates mode="titlesimple"/></fo:inline>
+	</xsl:template>
 	
 	<xsl:template match="ogc:fn" mode="titlesmall">
 		<xsl:call-template name="fn"/>
 	</xsl:template>
+	<xsl:template match="ogc:fn" mode="titlesimple">
+		<xsl:call-template name="fn"/>
+	</xsl:template>
 	<xsl:template match="ogc:tab " mode="titlesmall">
 		<xsl:apply-templates select="."/>
 	</xsl:template>
+	<xsl:template match="ogc:tab " mode="titlesimple">
+		<xsl:apply-templates select="."/>
+	</xsl:template>
 	
 	<xsl:template match="ogc:br" mode="titlesmall">
 		<xsl:value-of select="$linebreak"/>
 	</xsl:template>
-	
+	<xsl:template match="ogc:br" mode="titlesimple">
+		<xsl:value-of select="$linebreak"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'name']/text()[1]" priority="2">
+		<!-- 0xA0 to space replacement -->
+		<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
+		<xsl:variable name="separator" select="' — '"/>
+		<xsl:choose>
+			<xsl:when test="contains($text, $separator)">
+				<fo:inline font-weight="bold"><xsl:value-of select="substring-before($text, $separator)"/></fo:inline>
+				<xsl:value-of select="$separator"/>
+				<xsl:value-of select="substring-after($text, $separator)"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$text"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
 	
 	<xsl:template name="insertOrangeHorizontalLine">		
 		<fo:block-container width="12.7mm" border-top="1pt solid {$color_orange}" margin-top="3mm">
@@ -1850,7 +1906,8 @@
 									
 			<xsl:attribute name="text-align">left</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-			<xsl:attribute name="font-weight">bold</xsl:attribute><!-- normal -->
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+			<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
 			<xsl:attribute name="font-size">11pt</xsl:attribute>
 		
 		
@@ -2010,10 +2067,14 @@
 		
 				
 		
-			<xsl:attribute name="font-weight">bold</xsl:attribute>
-			<xsl:attribute name="margin-top">12pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-			<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
+			<!-- <xsl:attribute name="margin-top">12pt</xsl:attribute> -->
+			<xsl:attribute name="margin-top">6pt</xsl:attribute>
+			<!-- <xsl:attribute name="margin-bottom">6pt</xsl:attribute> -->
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			<!-- <xsl:attribute name="keep-with-next">always</xsl:attribute> -->
+			<xsl:attribute name="keep-with-previous">always</xsl:attribute>
+			<xsl:attribute name="text-align">center</xsl:attribute>
 		
 		
 		
@@ -2107,13 +2168,20 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="list-style">
 		
-	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
+	</xsl:attribute-set><xsl:attribute-set name="toc-style">
+		<xsl:attribute name="line-height">135%</xsl:attribute>
+	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:template name="OLD_processPrefaceSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
-	</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
+	</xsl:template><xsl:template name="processPrefaceSectionsDefault_Contents">
+		<xsl:for-each select="/*/*[local-name()='preface']/*">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="." mode="contents"/>
+		</xsl:for-each>
+	</xsl:template><xsl:template name="OLD_processMainSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>			
 		
 		<!-- Normative references  -->
@@ -2126,13 +2194,33 @@
 		<!-- Bibliography -->
 		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] |       /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
 		
-	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
+	</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
+		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="." mode="contents"/>
+		</xsl:for-each>
+		
+		<xsl:for-each select="/*/*[local-name()='annex']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="." mode="contents"/>
+		</xsl:for-each>
+		
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="." mode="contents"/>
+		</xsl:for-each>
+	</xsl:template><xsl:template name="OLD_processPrefaceSectionsDefault">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
-	</xsl:template><xsl:template name="processMainSectionsDefault">			
+	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
+		<xsl:for-each select="/*/*[local-name()='preface']/*">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="."/>
+		</xsl:for-each>
+	</xsl:template><xsl:template name="OLD_processMainSectionsDefault">			
 		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
 		
 		<!-- Normative references  -->
@@ -2144,6 +2232,22 @@
 		<xsl:apply-templates select="/*/*[local-name()='annex']"/>
 		<!-- Bibliography -->
 		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
+	</xsl:template><xsl:template name="processMainSectionsDefault">
+		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="."/>
+			
+		</xsl:for-each>
+		
+		<xsl:for-each select="/*/*[local-name()='annex']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="."/>
+		</xsl:for-each>
+		
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="."/>
+		</xsl:for-each>
 	</xsl:template><xsl:template match="text()">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name()='br']">
@@ -4699,6 +4803,13 @@
 			</xsl:attribute>
 			<xsl:apply-templates mode="svg_update"/>
 		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3">
+		<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
+		<xsl:for-each select="*[local-name() = 'svg']">
+			<xsl:call-template name="image_svg">
+				<xsl:with-param name="name" select="$name"/>
+			</xsl:call-template>
+		</xsl:for-each>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
 		<xsl:variable name="svg_content" select="document(@src)"/>
 		<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
@@ -4803,7 +4914,7 @@
 			</fo:basic-link>
 		 </fo:block>
 	  </fo:block-container>
-	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">		
+	</xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">		
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">		
@@ -5530,14 +5641,15 @@
 		</xsl:if>
 	</xsl:template><xsl:variable name="localized.source">
 		<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">source</xsl:with-param>
-			</xsl:call-template>
+			<xsl:with-param name="key">source</xsl:with-param>
+		</xsl:call-template>
 	</xsl:variable><xsl:template match="*[local-name() = 'origin']">
 		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
 			<xsl:if test="normalize-space(@citeas) = ''">
 				<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
 			</xsl:if>
 			
+				<xsl:text>[</xsl:text>
 				<fo:inline>
 					
 						<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -5547,18 +5659,18 @@
 					
 					
 					
-					
-						<xsl:call-template name="getTitle">
-							<xsl:with-param name="name" select="'title-source'"/>
-						</xsl:call-template>
+						<xsl:value-of select="$localized.source"/>
 						<xsl:text>: </xsl:text>
 					
 					
+					
+					
 				</fo:inline>
 			
 			<fo:inline xsl:use-attribute-sets="origin-style">
 				<xsl:apply-templates/>
 			</fo:inline>
+			<xsl:text>]</xsl:text>
 			</fo:basic-link>
 	</xsl:template><xsl:template match="*[local-name() = 'modification']/*[local-name() = 'p']">
 		<fo:inline><xsl:apply-templates/></fo:inline>
@@ -5625,6 +5737,9 @@
 						
 					</xsl:if>	
 					
+					<xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
+					<xsl:variable name="text" select="normalize-space()"/>
+					
 					
             
 					<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
@@ -5638,7 +5753,9 @@
 							
 							
 						</xsl:if>
-
+						
+						
+						
 						<xsl:apply-templates/>
 					</fo:basic-link>
 							
@@ -6287,9 +6404,97 @@
 		<fo:block-container border="1pt solid black" width="50%">
 			<fo:block> </fo:block>
 		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name() = 'toc']">
+		<xsl:param name="colwidths"/>
+		<xsl:variable name="colwidths_">
+			<xsl:choose>
+				<xsl:when test="not($colwidths)">
+					<xsl:variable name="toc_table_simple">
+						<tbody>
+							<xsl:apply-templates mode="toc_table_width"/>
+						</tbody>
+					</xsl:variable>
+					<xsl:variable name="cols-count" select="count(xalan:nodeset($toc_table_simple)/*/tr[1]/td)"/>
+					<xsl:call-template name="calculate-column-widths">
+						<xsl:with-param name="cols-count" select="$cols-count"/>
+						<xsl:with-param name="table" select="$toc_table_simple"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="$colwidths"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<fo:block role="TOCI" space-after="16pt">
+			<fo:table width="100%" table-layout="fixed">
+				<xsl:for-each select="xalan:nodeset($colwidths_)/column">
+					<fo:table-column column-width="proportional-column-width({.})"/>
+				</xsl:for-each>
+				<fo:table-body>
+					<xsl:apply-templates/>
+				</fo:table-body>
+			</fo:table>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']">
+		<fo:table-row min-height="5mm">
+			<xsl:apply-templates/>
+		</fo:table-row>
+	</xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']/*[local-name() = 'p']">
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'xref']" priority="3">
+		<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
+		<xsl:variable name="target" select="@target"/>
+		<xsl:for-each select="*[local-name() = 'tab']">
+			<xsl:variable name="current_id" select="generate-id()"/>
+			<fo:table-cell>
+				<fo:block>
+					<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
+						<xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]">
+							<xsl:choose>
+								<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
+								<xsl:otherwise><xsl:apply-templates select="."/></xsl:otherwise>
+							</xsl:choose>
+						</xsl:for-each>
+					</fo:basic-link>
+				</fo:block>
+			</fo:table-cell>
+		</xsl:for-each>
+		<!-- last column - for page numbers -->
+		<fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
+			<fo:block>
+				<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
+					<fo:page-number-citation ref-id="{$target}"/>
+				</fo:basic-link>
+			</fo:block>
+		</fo:table-cell>
+	</xsl:template><xsl:template match="*" mode="toc_table_width">
+		<xsl:apply-templates mode="toc_table_width"/>
+	</xsl:template><xsl:template match="*[local-name() = 'clause'][@type = 'toc']/*[local-name() = 'title']" mode="toc_table_width"/><xsl:template match="*[local-name() = 'clause'][not(@type = 'toc')]/*[local-name() = 'title']" mode="toc_table_width"/><xsl:template match="*[local-name() = 'li']" mode="toc_table_width">
+		<tr>
+			<xsl:apply-templates mode="toc_table_width"/>
+		</tr>
+	</xsl:template><xsl:template match="*[local-name() = 'xref']" mode="toc_table_width">
+		<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
+		<xsl:for-each select="*[local-name() = 'tab']">
+			<xsl:variable name="current_id" select="generate-id()"/>
+			<td>
+				<xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]">
+					<xsl:copy-of select="."/>
+				</xsl:for-each>
+			</td>
+		</xsl:for-each>
+		<td>333</td> <!-- page number, just for fill -->
 	</xsl:template><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
 		<fo:inline padding-right="5mm"> </fo:inline>
 		<fo:inline><xsl:apply-templates/></fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'blacksquare']" name="blacksquare">
+		<fo:inline padding-right="2.5mm" baseline-shift="5%">
+			<fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad">
+					<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 2 2">
+						<rect x="0" y="0" width="2" height="2" fill="black"/>
+					</svg>
+				</fo:instream-foreign-object>	
+		</fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>