metanorma-ogc 1.4.3 → 1.5.0

data/lib/isodoc/ogc/ogc.user-guide.xsl

@@ -1658,6 +1658,8 @@
 		
 		<title-list-figures lang="en">List of Figures</title-list-figures>
 		
+		<title-table-figures lang="en">Table of Figures</title-table-figures>
+		
 		<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
 		
 		<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -1987,6 +1989,11 @@
 		
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
+		
+		
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="note-p-style">
 		
 		
@@ -3119,9 +3126,8 @@
 				
 				<!-- Table's note name (NOTE, for example) -->
 
-				<fo:inline padding-right="2mm">
+				<fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
 					
-				
 					
 					
 					
@@ -3749,6 +3755,8 @@
 			<xsl:if test="$font-size != ''">
 				<xsl:attribute name="font-size">
 					<xsl:choose>
+						<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+						<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
 						<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
 						<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
 					</xsl:choose>
@@ -4556,6 +4564,7 @@
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="image-style">
 					
+					
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -4922,7 +4931,7 @@
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="node()" mode="contents">
 		<xsl:apply-templates mode="contents"/>
@@ -5015,41 +5024,72 @@
 				
 				
 				
-					<xsl:if test="//*[local-name() = 'figure'][@id and *[local-name() = 'name']]">					
-						<fo:bookmark internal-destination="{//*[local-name() = 'figure'][@id and *[local-name() = 'name']][1]/@id}" starting-state="hide">
-							<fo:bookmark-title>Figures</fo:bookmark-title>
-							<xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name']]">
+				
+				
+				
+				
+				
+					<xsl:variable name="list_of_tables_">
+						<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name'] and contains(*[local-name() = 'name'], '—')]">
+							<table id="{@id}"><xsl:apply-templates select="*[local-name() = 'name']" mode="bookmarks"/></table>
+						</xsl:for-each>
+					</xsl:variable>
+					<xsl:variable name="list_of_tables" select="xalan:nodeset($list_of_tables_)"/>
+					
+					<xsl:variable name="list_of_figures_">
+						<xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name'] and contains(*[local-name() = 'name'], '—')]">
+							<figure id="{@id}"><xsl:apply-templates select="*[local-name() = 'name']" mode="bookmarks"/></figure>
+						</xsl:for-each>
+					</xsl:variable>
+					<xsl:variable name="list_of_figures" select="xalan:nodeset($list_of_figures_)"/>
+										
+					<xsl:if test="$list_of_tables//table or $list_of_figures/figure or //*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']]">
+						<fo:bookmark internal-destination="empty_bookmark">
+							<fo:bookmark-title>—————</fo:bookmark-title>
+						</fo:bookmark>
+					</xsl:if>
+					
+					<xsl:if test="$list_of_tables//table">
+						<fo:bookmark internal-destination="empty_bookmark" starting-state="hide"> <!-- {$list_of_tables//table[1]/@id} -->
+							<fo:bookmark-title>
+								<xsl:call-template name="getTitle">
+									<xsl:with-param name="name" select="'title-list-tables'"/>
+								</xsl:call-template>
+							</fo:bookmark-title>
+							<xsl:for-each select="$list_of_tables//table">
 								<fo:bookmark internal-destination="{@id}">
-									<fo:bookmark-title><xsl:apply-templates select="*[local-name() = 'name']/text()" mode="bookmarks"/></fo:bookmark-title>
+									<fo:bookmark-title><xsl:value-of select="."/></fo:bookmark-title>
 								</fo:bookmark>
 							</xsl:for-each>
-						</fo:bookmark>					
+						</fo:bookmark>
 					</xsl:if>
-				
-				
-									
-					<xsl:if test="//*[local-name() = 'table'][@id and *[local-name() = 'name']]">					
-						<fo:bookmark internal-destination="{//*[local-name() = 'table'][@id and *[local-name() = 'name']][1]/@id}" starting-state="hide">
+
+					<xsl:if test="$list_of_figures//figure">
+						<fo:bookmark internal-destination="empty_bookmark" starting-state="hide"> <!-- {$list_of_figures//figure[1]/@id} -->
 							<fo:bookmark-title>
-								<xsl:choose>
-									<xsl:when test="@lang = 'fr'">Tableaux</xsl:when>
-									<xsl:otherwise>Tables</xsl:otherwise>
-								</xsl:choose>
+								
+									<xsl:call-template name="getTitle">
+										<xsl:with-param name="name" select="'title-list-figures'"/>
+									</xsl:call-template>
+								
+								
 							</fo:bookmark-title>
-							<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name']]">
+							<xsl:for-each select="$list_of_figures//figure">
 								<fo:bookmark internal-destination="{@id}">
-									<fo:bookmark-title><xsl:apply-templates select="*[local-name() = 'name']//text()" mode="bookmarks"/></fo:bookmark-title>
+									<fo:bookmark-title><xsl:value-of select="."/></fo:bookmark-title>
 								</fo:bookmark>
 							</xsl:for-each>
-						</fo:bookmark>					
+						</fo:bookmark>
 					</xsl:if>
-				
-				
-				
-				
+
+					
 					<xsl:if test="//*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']]">							
-						<fo:bookmark internal-destination="{//*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']][1]/@id}" starting-state="hide">
-							<fo:bookmark-title>Recommendations</fo:bookmark-title>
+						<fo:bookmark internal-destination="empty_bookmark" starting-state="hide"> <!-- {//*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']][1]/@id} -->
+							<fo:bookmark-title>
+								<xsl:call-template name="getTitle">
+									<xsl:with-param name="name" select="'title-list-recommendations'"/>
+								</xsl:call-template>
+							</fo:bookmark-title>
 							<xsl:for-each select="//*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']]">
 								<xsl:variable name="table_id" select="@id"/>
 								<fo:bookmark internal-destination="{@id}">
@@ -5057,8 +5097,7 @@
 								</fo:bookmark>
 							</xsl:for-each>
 						</fo:bookmark>
-							
-						</xsl:if>
+					</xsl:if>
 				
 				
 				
@@ -5256,12 +5295,16 @@
 				<xsl:if test="$font-size != ''">
 					<xsl:attribute name="font-size">
 						<xsl:choose>
+							<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+							<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
 							<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
 							<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
 				</xsl:if>
 				
+				
+				
 				<xsl:apply-templates/>			
 			</fo:block>
 				
@@ -5617,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.white-paper.xsl

@@ -243,7 +243,10 @@
 								<fo:block font-size="11pt" margin-top="8pt"> </fo:block>
 								<fo:block font-size="11pt" margin-top="8pt"> </fo:block>							
 								<fo:block xsl:use-attribute-sets="title-toc-style">
-									<xsl:text>Table of Figures</xsl:text>
+									<!-- <xsl:text>Table of Figures</xsl:text> -->
+									<xsl:call-template name="getTitle">
+										<xsl:with-param name="name" select="'title-table-figures'"/>
+									</xsl:call-template>
 								</fo:block>
 								<xsl:for-each select="//ogc:figure[@id and ogc:name] | //ogc:table[@id and ogc:name]">
 									<fo:block margin-top="8pt" margin-bottom="5pt" text-align-last="justify" role="TOCI">
@@ -1014,6 +1017,8 @@
 		
 		<title-list-figures lang="en">List of Figures</title-list-figures>
 		
+		<title-table-figures lang="en">Table of Figures</title-table-figures>
+		
 		<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
 		
 		<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -1357,6 +1362,11 @@
 		
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
+		
+		
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="note-p-style">
 		
 		
@@ -2472,9 +2482,8 @@
 				
 				<!-- Table's note name (NOTE, for example) -->
 
-				<fo:inline padding-right="2mm">
+				<fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
 					
-				
 					
 					
 					
@@ -3103,6 +3112,8 @@
 			<xsl:if test="$font-size != ''">
 				<xsl:attribute name="font-size">
 					<xsl:choose>
+						<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+						<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
 						<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
 						<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
 					</xsl:choose>
@@ -3908,6 +3919,7 @@
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="image-style">
 					
+					
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -4274,7 +4286,7 @@
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="node()" mode="contents">
 		<xsl:apply-templates mode="contents"/>
@@ -4367,22 +4379,46 @@
 				
 				
 				
-					<xsl:if test="//*[local-name() = 'figure'][@id and *[local-name() = 'name']]">					
-						<fo:bookmark internal-destination="{//*[local-name() = 'figure'][@id and *[local-name() = 'name']][1]/@id}" starting-state="hide">
-							<fo:bookmark-title>Figures</fo:bookmark-title>
-							<xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name']]">
+				
+				
+				
+				
+				
+				
+					<xsl:variable name="list_of_tables_figures_">
+						<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name']] | //*[local-name() = 'figure'][@id and *[local-name() = 'name']]">
+							<table_figure id="{@id}"><xsl:apply-templates select="*[local-name() = 'name']" mode="bookmarks"/></table_figure>
+						</xsl:for-each>
+					</xsl:variable>
+					<xsl:variable name="list_of_tables_figures" select="xalan:nodeset($list_of_tables_figures_)"/>
+				
+					
+					<xsl:if test="$list_of_tables_figures/table_figure">
+						<fo:bookmark internal-destination="empty_bookmark">
+							<fo:bookmark-title>—————</fo:bookmark-title>
+						</fo:bookmark>
+					</xsl:if>
+					
+					<xsl:if test="$list_of_tables_figures//table_figure">
+						<fo:bookmark internal-destination="empty_bookmark" starting-state="hide"> <!-- {$list_of_figures//figure[1]/@id} -->
+							<fo:bookmark-title>
+								
+								
+									<xsl:call-template name="getTitle">
+										<xsl:with-param name="name" select="'title-table-figures'"/>
+									</xsl:call-template>
+								
+							</fo:bookmark-title>
+							<xsl:for-each select="$list_of_tables_figures//table_figure">
 								<fo:bookmark internal-destination="{@id}">
-									<fo:bookmark-title><xsl:apply-templates select="*[local-name() = 'name']/text()" mode="bookmarks"/></fo:bookmark-title>
+									<fo:bookmark-title><xsl:value-of select="."/></fo:bookmark-title>
 								</fo:bookmark>
 							</xsl:for-each>
-						</fo:bookmark>					
+						</fo:bookmark>
 					</xsl:if>
 				
 				
 				
-				
-				
-				
 			</fo:bookmark-tree>
 		</xsl:if>
 	</xsl:template><xsl:template name="insertFigureBookmarks">
@@ -4576,12 +4612,16 @@
 				<xsl:if test="$font-size != ''">
 					<xsl:attribute name="font-size">
 						<xsl:choose>
+							<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+							<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
 							<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
 							<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
 				</xsl:if>
 				
+				
+				
 				<xsl:apply-templates/>			
 			</fo:block>
 				
@@ -4937,6 +4977,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/reqt.rb

@@ -49,7 +49,7 @@ module IsoDoc
         label.xpath(ns(".//concept")).each { |f| concept1(f) }
         b = out.add_child("<tr><td colspan='2'><p></p></td></tr>")
         p = b.at(ns(".//p"))
-        p << label.text
+        p << label.children.to_xml
       end
 
       def recommendation_attributes1(node)
@@ -80,6 +80,7 @@ module IsoDoc
           f = f.replace("<li>#{f.children.to_xml}</li>").first
           d << f
         end
+        node
       end
 
       def recommendation_attributes1_component(node, out)

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.4.3".freeze
+    VERSION = "1.5.0".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -25,8 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "iso-639"
-  spec.add_dependency "isodoc", "~> 1.7.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.11.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -24,34 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -300,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Metanorma for the Open Geospatial Consortium.