metanorma-ogc 1.2.7 → 1.2.8

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

@@ -69,7 +69,7 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root font-family="Lato, STIX Two Math, HanSans" font-size="11pt" color="{$color_main}" xml:lang="{$lang}">
+		<fo:root font-family="Lato, STIX Two Math, Source Han Sans" font-size="11pt" color="{$color_main}" xml:lang="{$lang}">
 			<fo:layout-master-set>
 				<!-- Cover page -->
 				<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
@@ -1633,7 +1633,7 @@
 		
 				
 		
-			<xsl:attribute name="font-family">FiraCode</xsl:attribute>			
+			<xsl:attribute name="font-family">Fira Code</xsl:attribute>			
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>			
 			<xsl:attribute name="line-height">113%</xsl:attribute>
 		
@@ -1922,6 +1922,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -1971,7 +1972,7 @@
 		
 		
 		
-			<xsl:attribute name="font-family">FiraCode</xsl:attribute>			
+			<xsl:attribute name="font-family">Fira Code</xsl:attribute>			
 		
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
@@ -3233,6 +3234,7 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
 		<fo:inline font-weight="bold">
+			
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='sup']">
@@ -3637,6 +3639,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -3856,7 +3859,8 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']">
-		<fo:block-container id="{@id}">
+		<fo:block-container id="{@id}">			
+			
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
@@ -3907,7 +3911,7 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -4696,7 +4700,7 @@
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
 		
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>

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

@@ -91,7 +91,7 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root font-family="Arial, STIX Two Math, HanSans" font-size="11pt" xml:lang="{$lang}">
+		<fo:root font-family="Arial, STIX Two Math, Source Han Sans" font-size="11pt" xml:lang="{$lang}">
 			<fo:layout-master-set>
 				
 				<!-- Document pages -->
@@ -124,7 +124,7 @@
 						</fo:block-container>
 					</fo:block-container>
 					
-					<fo:block font-family="Lato Light" font-size="14pt" font-style="italic" margin-top="6pt" color="rgb(21, 43, 77)">
+					<fo:block font-family="Lato" font-weight="300" font-size="14pt" font-style="italic" margin-top="6pt" color="rgb(21, 43, 77)">
 						<xsl:text>Additional context, inspirational quote, etc. fits into this subheading area</xsl:text>
 					</fo:block>
 					
@@ -1328,6 +1328,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 		
@@ -2631,6 +2632,7 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
 		<fo:inline font-weight="bold">
+			
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='sup']">
@@ -3035,6 +3037,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -3252,7 +3255,8 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']">
-		<fo:block-container id="{@id}">
+		<fo:block-container id="{@id}">			
+			
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
@@ -3303,7 +3307,7 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -4067,7 +4071,7 @@
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
 		
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -148,6 +148,19 @@ module IsoDoc
         recommendation_to_table(docxml)
       end
 
+      def section(docxml)
+        super
+        references(docxml)
+      end
+
+      def references(docxml)
+        docxml.xpath(ns("//bibitem/date")).each do |d|
+          d.xpath(ns("./on | ./from | ./to")).each do |d1|
+            d1.children = d1.text.sub(/^(\d\d\d\d).*$/, "\\1")
+          end
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/ogc/word_convert.rb

@@ -21,7 +21,11 @@ module IsoDoc
                      '"Times New Roman",serif'),
                      headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
                                   '"Times New Roman",serif'),
-                                  monospacefont: '"Courier New",monospace'
+                                  monospacefont: '"Courier New",monospace',
+                                  normalfontsize: "10.5pt",
+                                  monospacefontsize: "10.0pt",
+                                  footnotefontsize: "10.0pt",
+                                  smallerfontsize: "10.0pt",
         }
       end
 
@@ -47,6 +51,8 @@ module IsoDoc
           @doctype = "white-paper"
           options[:bodyfont] = '"Arial",sans-serif'
           options[:headerfont] = '"Lato",sans-serif'
+          options[:normalfontsize] = "11.0pt"
+          options[:footnotefontsize] = "11.0pt"
         end
         super
       end

data/lib/metanorma/ogc.rb

@@ -3,6 +3,13 @@ require "metanorma/ogc/processor"
 
 module Metanorma
   module Ogc
+    def self.fonts_used
+      {
+        html: ["Overpass", "SpaceMono"],
+        doc: ["Times New Roman", "Cambria Math", "HanSans", "Courier New"],
+        pdf: ["Lato", "Arial"],
+      }
+    end
 
     ORGANIZATION_NAME_SHORT = "OGC"
     ORGANIZATION_NAME_LONG = "Open Geospatial Consortium"

data/lib/metanorma/ogc/fonts_manifest.yaml

@@ -0,0 +1,6 @@
+---
+Arial:
+Courier New:
+Times New Roman:
+Overpass:
+Space Mono:

data/lib/metanorma/ogc/processor.rb

@@ -2,14 +2,6 @@ require "metanorma/processor"
 
 module Metanorma
   module Ogc
-    def self.fonts_used
-      {
-        doc: ["Arial", "Courier New", "Times New Roman"],
-        pdf: ["Arial", "Courier New", "Times New Roman"],
-        html: ["Overpass", "Space Mono"]
-      }
-    end
-
     class Processor < Metanorma::Processor
 
       def initialize

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.2.7"
+    VERSION = "1.2.8"
   end
 end

data/metanorma-ogc.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "metanorma-standoc", "~> 1.6.0"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "isodoc", "~> 1.3.0"
   spec.add_dependency "iso-639"
 
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: iso-639
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +277,7 @@ files:
 - lib/isodoc/ogc/xref.rb
 - lib/metanorma-ogc.rb
 - lib/metanorma/ogc.rb
+- lib/metanorma/ogc/fonts_manifest.yaml
 - lib/metanorma/ogc/processor.rb
 - lib/metanorma/ogc/version.rb
 - metanorma-ogc.gemspec