metanorma-iso 2.6.1 → 2.6.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) 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/isodoc/iso/presentation_xref.rb +1 -1
  8. data/lib/metanorma/iso/base.rb +1 -1
  9. data/lib/metanorma/iso/basicdoc.rng +26 -17
  10. data/lib/metanorma/iso/front_id.rb +1 -1
  11. data/lib/metanorma/iso/version.rb +1 -1
  12. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7c067cd90bfc946d6c179fba63a5f83cc0f803aabf6b1ab44c3ae81bd3a948ed
4
- data.tar.gz: 40effc5bdc15f1e0a869b39e211bb2a2355938f58a39e5e46b04358c35c44d38
3
+ metadata.gz: 42ff504ac48bda4f62c1ee4cd49ff6141e13af90f37133a4faa82dc8d748a9a2
4
+ data.tar.gz: 0c25aee1137b842ddd80a3f2f1e864716b87107a890b06d16741440c60b7ac52
5
5
  SHA512:
6
- metadata.gz: 714502eb99f9d9ad48d2b9c4c43c77b00ebcde0d632496a1cbcc8d3ee37345f60322203f8ed76c806b3b6d7a55da86ea44be693379c82e8f8687f3336ecc8bd1
7
- data.tar.gz: f0e71370ae6cfa856e8c533fdb1f87ee61cd62deb20c083e6d9ce15a5b69b4300e10228b67d8cfdc6152119d334354fc8088b92133ecc7359e6082f8a54cbddd
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/isodoc/iso/presentation_xref.rb CHANGED
@@ -138,7 +138,7 @@ module IsoDoc
138
138
  if @xrefs.anchor(target, :type) == "listitem" &&
139
139
  !@xrefs.anchor(target, :refer_list)
140
140
  nested_xref = "%1 %2"
141
- container_label = @xrefs.anchor(container, :label)
141
+ n = @xrefs.anchor(container, :label) and container_label = n
142
142
  end
143
143
  [nested_xref, container_label]
144
144
  end
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/front_id.rb CHANGED
@@ -49,7 +49,7 @@ module Metanorma
49
49
  params2 = iso_id_params_add(node)
50
50
  num = node.attr("docnumber")
51
51
  orig = node.attr("updates") || node.attr("adopted-from")
52
- /^\d+$/.match?(num) or orig ||= num
52
+ /[[:alpha:]]/.match?(num) and orig ||= num
53
53
  orig and orig_id = orig_id_parse(orig)
54
54
  iso_id_params_resolve(params, params2, node, orig_id)
55
55
  end
data/lib/metanorma/iso/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ISO
3
- VERSION = "2.6.1".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.1
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-10 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