metanorma-itu 1.3.10 → 1.3.11

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 (16) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/itu/converter.rb +3 -7
  3. data/lib/asciidoctor/itu/isodoc.rng +17 -2
  4. data/lib/isodoc/itu/html/htmlstyle.css +6 -0
  5. data/lib/isodoc/itu/html/htmlstyle.scss +7 -0
  6. data/lib/isodoc/itu/itu.implementers-guide.xsl +4 -3
  7. data/lib/isodoc/itu/itu.in-force.xsl +4 -3
  8. data/lib/isodoc/itu/itu.recommendation-annex.xsl +4 -3
  9. data/lib/isodoc/itu/itu.recommendation-supplement.xsl +4 -3
  10. data/lib/isodoc/itu/itu.recommendation.xsl +4 -3
  11. data/lib/isodoc/itu/itu.resolution.xsl +4 -3
  12. data/lib/isodoc/itu/itu.service-publication.xsl +4 -3
  13. data/lib/isodoc/itu/itu.technical-paper.xsl +4 -3
  14. data/lib/isodoc/itu/itu.technical-report.xsl +4 -3
  15. data/lib/metanorma/itu/version.rb +1 -1
  16. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c9fedf3f6b88ed3fec5d058a59d289f893646fbcdea430d5f628c2c5f4801b4e
4
- data.tar.gz: e569b3339b3437a5ac5db0b72a94fa6b6c8647e64d64e7c6690a3af5c9cc57b2
3
+ metadata.gz: ad435d6188b9f2e881c84f0d43a6c35fd2bb4d6c993d1d796b830f755a2d3e33
4
+ data.tar.gz: 95409047e659d65a1c4b0102ebf910d69fe062ab4731511060625ed78ddb362c
5
5
  SHA512:
6
- metadata.gz: b7870e02cd137d2f25bc39b552dee726ec92144e45b60a3aaf733285eb2394a5cb040f0a38eeef43a0f7fca7f5fca54326c780e4c9c2a0a502667ee497d7ae54
7
- data.tar.gz: 02d819038572881fb4882a20cc4a5ee18c96853226e8ca6820600391af390230128cbf32842660ede1e756976efbbfbcc73990bbb4caa51551f9943f20f2aa04
6
+ metadata.gz: 8a3db12e7809503cd242cb1c1f3b6d1b1a579ebbed62fb7ba91c357bdc264b601aefa5e64dee6c0aa2d3cf0a2afd2a01c5e6f43c98343dbc5d0b742aa3472c96
7
+ data.tar.gz: bd64d897084265a9be463d56dcf31dde685b7e36ab56f75016d89d2ad7dc486816e393557c8c84a013e4fd06567c4b8ce4ffcd695d15597ada66b12295f5c006
data/lib/asciidoctor/itu/converter.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  require "asciidoctor"
2
2
  require "asciidoctor/standoc/converter"
3
3
  require "fileutils"
4
+ require "metanorma-utils"
4
5
  require_relative "./front"
5
6
  require_relative "./validate"
6
7
  require_relative "./cleanup"
@@ -107,16 +108,11 @@ module Asciidoctor
107
108
  return unless node.attr("keywords")
108
109
 
109
110
  node.attr("keywords").split(/, */).sort.each_with_index do |kw, i|
110
- xml.keyword (i.zero? ? strict_capitalize(kw) : kw)
111
+ kw_out = i.zero? ? Metanorma::Utils.strict_capitalize_first(kw) : kw
112
+ xml.keyword kw_out
111
113
  end
112
114
  end
113
115
 
114
- def strict_capitalize(str)
115
- letters = str.split("")
116
- letters.first.upcase!
117
- letters.join
118
- end
119
-
120
116
  def clause_parse(attrs, xml, node)
121
117
  node.option?("unnumbered") and attrs[:unnumbered] = true
122
118
  case sectiontype1(node)
data/lib/asciidoctor/itu/isodoc.rng CHANGED
@@ -990,6 +990,16 @@
990
990
  <data type="boolean"/>
991
991
  </attribute>
992
992
  </optional>
993
+ <optional>
994
+ <attribute name="linkmention">
995
+ <data type="boolean"/>
996
+ </attribute>
997
+ </optional>
998
+ <optional>
999
+ <attribute name="linkref">
1000
+ <data type="boolean"/>
1001
+ </attribute>
1002
+ </optional>
993
1003
  <optional>
994
1004
  <element name="refterm">
995
1005
  <zeroOrMore>
@@ -1700,7 +1710,9 @@
1700
1710
  <zeroOrMore>
1701
1711
  <ref name="termgrammar"/>
1702
1712
  </zeroOrMore>
1703
- <ref name="definition"/>
1713
+ <oneOrMore>
1714
+ <ref name="termdefinition"/>
1715
+ </oneOrMore>
1704
1716
  <zeroOrMore>
1705
1717
  <ref name="termnote"/>
1706
1718
  </zeroOrMore>
@@ -1763,7 +1775,7 @@
1763
1775
  </oneOrMore>
1764
1776
  </element>
1765
1777
  </define>
1766
- <define name="definition">
1778
+ <define name="termdefinition">
1767
1779
  <element name="definition">
1768
1780
  <oneOrMore>
1769
1781
  <choice>
@@ -1772,6 +1784,9 @@
1772
1784
  <ref name="formula"/>
1773
1785
  </choice>
1774
1786
  </oneOrMore>
1787
+ <zeroOrMore>
1788
+ <ref name="termsource"/>
1789
+ </zeroOrMore>
1775
1790
  </element>
1776
1791
  </define>
1777
1792
  <define name="termnote">
data/lib/isodoc/itu/html/htmlstyle.css CHANGED
@@ -1005,6 +1005,12 @@ ul > li {
1005
1005
  ul > li:first-child {
1006
1006
  margin-top: 1em; }
1007
1007
 
1008
+ ul ul > li:first-child {
1009
+ margin-top: 0; }
1010
+
1011
+ ol ul > li:first-child {
1012
+ margin-top: 0; }
1013
+
1008
1014
  /* Bibliograhy */
1009
1015
  p.Biblio, p.NormRef {
1010
1016
  margin-top: 1em;
data/lib/isodoc/itu/html/htmlstyle.scss CHANGED
@@ -358,6 +358,13 @@ ul {
358
358
  }
359
359
  }
360
360
 
361
+ ul ul > li:first-child {
362
+ margin-top: 0;
363
+ }
364
+ ol ul > li:first-child {
365
+ margin-top: 0;
366
+ }
367
+
361
368
 
362
369
  /* Bibliograhy */
363
370
 
data/lib/isodoc/itu/itu.implementers-guide.xsl CHANGED
@@ -125,10 +125,10 @@
125
125
 
126
126
  <xsl:template match="/">
127
127
  <xsl:call-template name="namespaceCheck"/>
128
- <fo:root xsl:use-attribute-sets="root-style">
129
- <xsl:if test="$lang != 'ar'">
128
+ <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
129
+ <!-- <xsl:if test="$lang != 'ar'">
130
130
  <xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
131
- </xsl:if>
131
+ </xsl:if> -->
132
132
  <xsl:if test="$doctype = 'resolution'">
133
133
  <xsl:attribute name="font-size">11pt</xsl:attribute>
134
134
  </xsl:if>
@@ -6752,6 +6752,7 @@
6752
6752
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
6753
6753
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
6754
6754
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
6755
+
6755
6756
  <xsl:apply-templates/>
6756
6757
  </fo:block>
6757
6758
  </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
data/lib/isodoc/itu/itu.in-force.xsl CHANGED
@@ -125,10 +125,10 @@
125
125
 
126
126
  <xsl:template match="/">
127
127
  <xsl:call-template name="namespaceCheck"/>
128
- <fo:root xsl:use-attribute-sets="root-style">
129
- <xsl:if test="$lang != 'ar'">
128
+ <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
129
+ <!-- <xsl:if test="$lang != 'ar'">
130
130
  <xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
131
- </xsl:if>
131
+ </xsl:if> -->
132
132
  <xsl:if test="$doctype = 'resolution'">
133
133
  <xsl:attribute name="font-size">11pt</xsl:attribute>
134
134
  </xsl:if>
@@ -6752,6 +6752,7 @@
6752
6752
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
6753
6753
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
6754
6754
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
6755
+
6755
6756
  <xsl:apply-templates/>
6756
6757
  </fo:block>
6757
6758
  </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
data/lib/isodoc/itu/itu.recommendation-annex.xsl CHANGED
@@ -125,10 +125,10 @@
125
125
 
126
126
  <xsl:template match="/">
127
127
  <xsl:call-template name="namespaceCheck"/>
128
- <fo:root xsl:use-attribute-sets="root-style">
129
- <xsl:if test="$lang != 'ar'">
128
+ <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
129
+ <!-- <xsl:if test="$lang != 'ar'">
130
130
  <xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
131
- </xsl:if>
131
+ </xsl:if> -->
132
132
  <xsl:if test="$doctype = 'resolution'">
133
133
  <xsl:attribute name="font-size">11pt</xsl:attribute>
134
134
  </xsl:if>
@@ -6752,6 +6752,7 @@
6752
6752
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
6753
6753
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
6754
6754
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
6755
+
6755
6756
  <xsl:apply-templates/>
6756
6757
  </fo:block>
6757
6758
  </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
data/lib/isodoc/itu/itu.recommendation-supplement.xsl CHANGED
@@ -125,10 +125,10 @@
125
125
 
126
126
  <xsl:template match="/">
127
127
  <xsl:call-template name="namespaceCheck"/>
128
- <fo:root xsl:use-attribute-sets="root-style">
129
- <xsl:if test="$lang != 'ar'">
128
+ <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
129
+ <!-- <xsl:if test="$lang != 'ar'">
130
130
  <xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
131
- </xsl:if>
131
+ </xsl:if> -->
132
132
  <xsl:if test="$doctype = 'resolution'">
133
133
  <xsl:attribute name="font-size">11pt</xsl:attribute>
134
134
  </xsl:if>
@@ -6752,6 +6752,7 @@
6752
6752
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
6753
6753
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
6754
6754
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
6755
+
6755
6756
  <xsl:apply-templates/>
6756
6757
  </fo:block>
6757
6758
  </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
data/lib/isodoc/itu/itu.recommendation.xsl CHANGED
@@ -125,10 +125,10 @@
125
125
 
126
126
  <xsl:template match="/">
127
127
  <xsl:call-template name="namespaceCheck"/>
128
- <fo:root xsl:use-attribute-sets="root-style">
129
- <xsl:if test="$lang != 'ar'">
128
+ <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
129
+ <!-- <xsl:if test="$lang != 'ar'">
130
130
  <xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
131
- </xsl:if>
131
+ </xsl:if> -->
132
132
  <xsl:if test="$doctype = 'resolution'">
133
133
  <xsl:attribute name="font-size">11pt</xsl:attribute>
134
134
  </xsl:if>
@@ -6752,6 +6752,7 @@
6752
6752
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
6753
6753
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
6754
6754
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
6755
+
6755
6756
  <xsl:apply-templates/>
6756
6757
  </fo:block>
6757
6758
  </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
data/lib/isodoc/itu/itu.resolution.xsl CHANGED
@@ -125,10 +125,10 @@
125
125
 
126
126
  <xsl:template match="/">
127
127
  <xsl:call-template name="namespaceCheck"/>
128
- <fo:root xsl:use-attribute-sets="root-style">
129
- <xsl:if test="$lang != 'ar'">
128
+ <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
129
+ <!-- <xsl:if test="$lang != 'ar'">
130
130
  <xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
131
- </xsl:if>
131
+ </xsl:if> -->
132
132
  <xsl:if test="$doctype = 'resolution'">
133
133
  <xsl:attribute name="font-size">11pt</xsl:attribute>
134
134
  </xsl:if>
@@ -6752,6 +6752,7 @@
6752
6752
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
6753
6753
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
6754
6754
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
6755
+
6755
6756
  <xsl:apply-templates/>
6756
6757
  </fo:block>
6757
6758
  </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
data/lib/isodoc/itu/itu.service-publication.xsl CHANGED
@@ -125,10 +125,10 @@
125
125
 
126
126
  <xsl:template match="/">
127
127
  <xsl:call-template name="namespaceCheck"/>
128
- <fo:root xsl:use-attribute-sets="root-style">
129
- <xsl:if test="$lang != 'ar'">
128
+ <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
129
+ <!-- <xsl:if test="$lang != 'ar'">
130
130
  <xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
131
- </xsl:if>
131
+ </xsl:if> -->
132
132
  <xsl:if test="$doctype = 'resolution'">
133
133
  <xsl:attribute name="font-size">11pt</xsl:attribute>
134
134
  </xsl:if>
@@ -6752,6 +6752,7 @@
6752
6752
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
6753
6753
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
6754
6754
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
6755
+
6755
6756
  <xsl:apply-templates/>
6756
6757
  </fo:block>
6757
6758
  </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
data/lib/isodoc/itu/itu.technical-paper.xsl CHANGED
@@ -125,10 +125,10 @@
125
125
 
126
126
  <xsl:template match="/">
127
127
  <xsl:call-template name="namespaceCheck"/>
128
- <fo:root xsl:use-attribute-sets="root-style">
129
- <xsl:if test="$lang != 'ar'">
128
+ <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
129
+ <!-- <xsl:if test="$lang != 'ar'">
130
130
  <xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
131
- </xsl:if>
131
+ </xsl:if> -->
132
132
  <xsl:if test="$doctype = 'resolution'">
133
133
  <xsl:attribute name="font-size">11pt</xsl:attribute>
134
134
  </xsl:if>
@@ -6752,6 +6752,7 @@
6752
6752
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
6753
6753
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
6754
6754
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
6755
+
6755
6756
  <xsl:apply-templates/>
6756
6757
  </fo:block>
6757
6758
  </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
data/lib/isodoc/itu/itu.technical-report.xsl CHANGED
@@ -125,10 +125,10 @@
125
125
 
126
126
  <xsl:template match="/">
127
127
  <xsl:call-template name="namespaceCheck"/>
128
- <fo:root xsl:use-attribute-sets="root-style">
129
- <xsl:if test="$lang != 'ar'">
128
+ <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
129
+ <!-- <xsl:if test="$lang != 'ar'">
130
130
  <xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
131
- </xsl:if>
131
+ </xsl:if> -->
132
132
  <xsl:if test="$doctype = 'resolution'">
133
133
  <xsl:attribute name="font-size">11pt</xsl:attribute>
134
134
  </xsl:if>
@@ -6752,6 +6752,7 @@
6752
6752
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
6753
6753
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
6754
6754
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
6755
+
6755
6756
  <xsl:apply-templates/>
6756
6757
  </fo:block>
6757
6758
  </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
data/lib/metanorma/itu/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ITU
3
- VERSION = "1.3.10".freeze
3
+ VERSION = "1.3.11".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-itu
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.10
4
+ version: 1.3.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-08-30 00:00:00.000000000 Z
11
+ date: 2021-09-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities