metanorma-m3aawg 1.6.0 → 1.6.1

data/lib/isodoc/m3aawg/m3d.report.xsl

@@ -1265,6 +1265,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+		
 				
 		
 		
@@ -2524,6 +2525,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']">
@@ -2933,6 +2935,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
+			
 			<xsl:choose>
 				<xsl:when test="$target = ''">
 					<xsl:apply-templates/>
@@ -3150,7 +3153,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>
@@ -3201,7 +3205,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"/>
@@ -3931,7 +3935,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/metanorma/m3aawg/fonts_manifest.yaml

@@ -0,0 +1,5 @@
+---
+Overpass:
+Space Mono:
+Garamond:
+Courier New:

data/lib/metanorma/m3aawg/processor.rb

@@ -2,14 +2,6 @@ require "metanorma/processor"
 
 module Metanorma
   module M3AAWG
-    def self.fonts_used
-      {
-        html: ["Overpass", "Space Mono"],
-        doc: ["Garamond", "Courier New"],
-        pdf: ["Garamond", "Courier New"]
-      }
-    end
-
     class Processor < Metanorma::Generic::Processor
        def configuration
         Metanorma::Ribose.configuration

data/lib/metanorma/m3aawg/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3AAWG
-    VERSION = "1.6.0"
+    VERSION = "1.6.1"
   end
 end

data/metanorma-m3d.gemspec

@@ -31,8 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "thread_safe"
 
-  spec.add_dependency "metanorma-generic", "~> 1.7.0"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "metanorma-generic", "~> 1.8.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "~> 2.4.0"

data/metanorma.yml

@@ -6,6 +6,8 @@ xml_root_tag: m3d-standard
 html_bodyfont: '"Overpass",sans-serif'
 html_headerfont: '"Overpass",sans-serif'
 html_monospacefont: '"Space Mono",monospace'
+html_normalfontsize: "15px"
+html_footnotefontsize: "0.9em"
 i18nyaml: lib/isodoc/m3aawg/i18n-en.yaml
 validate_rng_file: lib/asciidoctor/m3aawg/m3d.rng
 htmlcoverpage: lib/isodoc/m3aawg/html/html_m3d_titlepage.html
@@ -15,6 +17,10 @@ scripts: lib/isodoc/m3aawg/html/scripts.html
 word_bodyfont: '"Garamond",serif'
 word_headerfont: '"Garamond",serif'
 word_monospacefont: '"Courier New",monospace'
+word_normalfontsize: "11.0pt"
+word_monospacefontsize: "9.0pt"
+word_smallerfontsize: "10.0pt"
+word_footnotefontsize: "10.0pt"
 standardstylesheet: lib/isodoc/m3aawg/html/m3d.scss
 header: lib/isodoc/m3aawg/html/header.html
 wordcoverpage: ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3aawg
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 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: htmlentities
@@ -44,28 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.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: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +253,7 @@ files:
 - lib/isodoc/m3aawg/xref.rb
 - lib/metanorma-m3aawg.rb
 - lib/metanorma/m3aawg.rb
+- lib/metanorma/m3aawg/fonts_manifest.yaml
 - lib/metanorma/m3aawg/processor.rb
 - lib/metanorma/m3aawg/version.rb
 - metanorma-m3d.gemspec