metanorma-iso 2.6.2 → 2.6.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +2 -8
  3. data/lib/isodoc/iso/html/style-human.css +8 -0
  4. data/lib/isodoc/iso/html/style-iso.css +8 -0
  5. data/lib/isodoc/iso/iso.amendment.xsl +2 -2
  6. data/lib/isodoc/iso/iso.international-standard.xsl +2 -2
  7. data/lib/metanorma/iso/base.rb +1 -1
  8. data/lib/metanorma/iso/basicdoc.rng +26 -17
  9. data/lib/metanorma/iso/version.rb +1 -1
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 85dd2f0b01b3caeba6d25048c6fa0b50776406891f5fd8b45e16b4b4f69951fd
4
- data.tar.gz: 4a196c7e691bdd0be6d6eac55c8c1cb75b4d80d4922de8a25f6106b2c5ab0633
3
+ metadata.gz: 42ff504ac48bda4f62c1ee4cd49ff6141e13af90f37133a4faa82dc8d748a9a2
4
+ data.tar.gz: 0c25aee1137b842ddd80a3f2f1e864716b87107a890b06d16741440c60b7ac52
5
5
  SHA512:
6
- metadata.gz: 1eb03bf96ccec2d8c609567c7637a2a6c1e5e85e89e1af67b7fdc39f91cacdc363161300c9c2a2cecfa81112dacddbf571835ffab5a79d367f0d7750fb951f13
7
- data.tar.gz: 88813a9ab5b8fa5e6a060a8a4073211eb5454de8ade8c65c01b3dbb675ea366c2a729e31c70602d6c72c8b68eae269ed0bd233026f3ec04db8a4066b0c4dfb45
6
+ metadata.gz: f6c5182d1ba3431432f225fe815da40ab9876bfddb57472873511d8a03d8fddc727c0cead2ecaf1ce27730cec97ba7d0d498cc6e7ccdea47d159087b3da5582e
7
+ data.tar.gz: 8667df175c997de98d6bbcbe695e5e12de3f692fe180861f64db69d933eb5a0ad239eb52e1419765dc612e20325398cec17b914804a5e39916f773cf9761a359
data/Gemfile CHANGED
@@ -4,12 +4,6 @@ Encoding.default_internal = Encoding::UTF_8
4
4
  source "https://rubygems.org"
5
5
  git_source(:github) { |repo| "https://github.com/#{repo}" }
6
6
 
7
- group :development, :test do
8
- gem "rspec"
9
- end
10
-
11
- if File.exist? "Gemfile.devel"
12
- eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
13
- end
14
-
15
7
  gemspec
8
+
9
+ eval_gemfile("Gemfile.devel") rescue nil
data/lib/isodoc/iso/html/style-human.css CHANGED
@@ -139,6 +139,14 @@ a.FootnoteRef, span.FootnoteRef {
139
139
  color: red;
140
140
  text-decoration: line-through; }
141
141
 
142
+ ruby {
143
+ ruby-position: over;
144
+ -webkit-ruby-position: before; }
145
+
146
+ ruby ruby {
147
+ ruby-position: under;
148
+ -webkit-ruby-position: after; }
149
+
142
150
  /* code highlighting with line numbers */
143
151
  table.rouge-line-table td.rouge-gutter {
144
152
  -moz-user-select: none;
data/lib/isodoc/iso/html/style-iso.css CHANGED
@@ -139,6 +139,14 @@ a.FootnoteRef, span.FootnoteRef {
139
139
  color: red;
140
140
  text-decoration: line-through; }
141
141
 
142
+ ruby {
143
+ ruby-position: over;
144
+ -webkit-ruby-position: before; }
145
+
146
+ ruby ruby {
147
+ ruby-position: under;
148
+ -webkit-ruby-position: after; }
149
+
142
150
  /* code highlighting with line numbers */
143
151
  table.rouge-line-table td.rouge-gutter {
144
152
  -moz-user-select: none;
data/lib/isodoc/iso/iso.amendment.xsl CHANGED
@@ -12001,10 +12001,10 @@
12001
12001
 
12002
12002
  <xsl:variable name="toc_level">
12003
12003
  <!-- https://www.metanorma.org/author/ref/document-attributes/ -->
12004
- <xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
12004
+ <xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
12005
12005
  <xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
12006
12006
  <xsl:choose>
12007
- <xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
12007
+ <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
12008
12008
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
12009
12009
  <xsl:otherwise><!-- default value -->
12010
12010
  3
data/lib/isodoc/iso/iso.international-standard.xsl CHANGED
@@ -12001,10 +12001,10 @@
12001
12001
 
12002
12002
  <xsl:variable name="toc_level">
12003
12003
  <!-- https://www.metanorma.org/author/ref/document-attributes/ -->
12004
- <xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
12004
+ <xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
12005
12005
  <xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
12006
12006
  <xsl:choose>
12007
- <xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
12007
+ <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
12008
12008
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
12009
12009
  <xsl:otherwise><!-- default value -->
12010
12010
  3
data/lib/metanorma/iso/base.rb CHANGED
@@ -61,7 +61,7 @@ module Metanorma
61
61
  end
62
62
 
63
63
  def toc_default
64
- { word_levels: 3, html_levels: 2 }
64
+ { word_levels: 3, html_levels: 2, pdf_levels: 3 }
65
65
  end
66
66
 
67
67
  def ol_attrs(node)
data/lib/metanorma/iso/basicdoc.rng CHANGED
@@ -715,27 +715,36 @@
715
715
  </define>
716
716
  <define name="ruby">
717
717
  <element name="ruby">
718
- <zeroOrMore>
719
- <choice>
720
- <ref name="PureTextElement"/>
721
- <ref name="rp"/>
722
- <ref name="rt"/>
723
- </choice>
724
- </zeroOrMore>
718
+ <choice>
719
+ <ref name="ruby_pronunciation"/>
720
+ <ref name="ruby_annotation"/>
721
+ </choice>
722
+ <choice>
723
+ <text/>
724
+ <ref name="ruby"/>
725
+ </choice>
725
726
  </element>
726
727
  </define>
727
- <define name="rp">
728
- <element name="rp">
729
- <zeroOrMore>
730
- <ref name="PureTextElement"/>
731
- </zeroOrMore>
728
+ <define name="ruby_pronunciation">
729
+ <element name="pronunciation">
730
+ <attribute name="value"/>
731
+ <optional>
732
+ <attribute name="script"/>
733
+ </optional>
734
+ <optional>
735
+ <attribute name="lang"/>
736
+ </optional>
732
737
  </element>
733
738
  </define>
734
- <define name="rt">
735
- <element name="rt">
736
- <zeroOrMore>
737
- <ref name="PureTextElement"/>
738
- </zeroOrMore>
739
+ <define name="ruby_annotation">
740
+ <element name="annotation">
741
+ <attribute name="value"/>
742
+ <optional>
743
+ <attribute name="script"/>
744
+ </optional>
745
+ <optional>
746
+ <attribute name="lang"/>
747
+ </optional>
739
748
  </element>
740
749
  </define>
741
750
  <define name="br">
data/lib/metanorma/iso/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ISO
3
- VERSION = "2.6.2".freeze
3
+ VERSION = "2.6.4".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iso
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.6.2
4
+ version: 2.6.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-12-11 00:00:00.000000000 Z
11
+ date: 2023-12-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc