metanorma-iho 0.4.0 → 0.4.1

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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/iho/isodoc.rng +12 -1
  3. data/lib/isodoc/iho/iho.specification.xsl +25 -9
  4. data/lib/isodoc/iho/iho.standard.xsl +25 -9
  5. data/lib/metanorma/iho/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8d1579affb0725e9ca072a2d6f57bd6330b1782f5085410f92a134df01e7110b
4
- data.tar.gz: f75313120eff7a38ea54df21596fcb8e46899eac2023bb861755edc050850b30
3
+ metadata.gz: 29e8ce80d93fd50b5eadc73e9cb2d59757f2baacf223ef7dd9cf744e05e07f95
4
+ data.tar.gz: 5fa92520fc73f5f905d557f367c5e78026b2f3c7892ffc1499a294f62d08b5b8
5
5
  SHA512:
6
- metadata.gz: 959aa9a734bbe40c2cccdaf083f03da7b223509e184db9f02b73893d8cdfb5cf42f281d9dab61a4da2c88ed867a01ba3496197c515e67fb404409a98914774ba
7
- data.tar.gz: faf55192532d6fc1553bddab53af70f230f322a868d6b0fcb63949224c1562ec5aea7aca2477bb00ee15fa2cdf5c0c4a2cba941eeea0ab07d616781b7294db40
6
+ metadata.gz: 3016aa5d8b8f8ce51e0bdd17afae3bcb4ef3388992b40bc63d57582470797d60722555f03317762af1d7483dae05cdd53182e49e7fa4deed213489d11f552b1b
7
+ data.tar.gz: 754eb34dcca5229486be2f2eb17b6ffaf693299d741f8380a24164b1811abefb2580adaf74198adeb28e8a4b0fc2ce1bf179b5c60892d872997855d9c4a789b1
data/lib/asciidoctor/iho/isodoc.rng CHANGED
@@ -2063,7 +2063,12 @@
2063
2063
  <define name="verbaldefinition">
2064
2064
  <element name="verbaldefinition">
2065
2065
  <oneOrMore>
2066
- <ref name="paragraph"/>
2066
+ <choice>
2067
+ <ref name="paragraph"/>
2068
+ <ref name="dl"/>
2069
+ <ref name="ol"/>
2070
+ <ref name="ul"/>
2071
+ </choice>
2067
2072
  </oneOrMore>
2068
2073
  <zeroOrMore>
2069
2074
  <ref name="termsource"/>
@@ -2163,6 +2168,12 @@
2163
2168
  <value>modified</value>
2164
2169
  </choice>
2165
2170
  </attribute>
2171
+ <attribute name="type">
2172
+ <choice>
2173
+ <value>authoritative</value>
2174
+ <value>lineage</value>
2175
+ </choice>
2176
+ </attribute>
2166
2177
  <ref name="origin"/>
2167
2178
  <optional>
2168
2179
  <ref name="modification"/>
data/lib/isodoc/iho/iho.specification.xsl CHANGED
@@ -817,7 +817,7 @@
817
817
  </xsl:variable>
818
818
  <fo:block line-height="1.1" role="H{$levelTerm}">
819
819
  <fo:block font-weight="bold" keep-with-next="always">
820
- <xsl:apply-templates select="ancestor::iho:term/iho:name" mode="presentation"/>
820
+ <xsl:apply-templates select="ancestor::iho:term[1]/iho:name" mode="presentation"/>
821
821
  </fo:block>
822
822
  <fo:block font-weight="bold" keep-with-next="always">
823
823
  <xsl:apply-templates/>
@@ -2971,6 +2971,7 @@
2971
2971
  <fo:table-cell>
2972
2972
 
2973
2973
  <fo:block margin-top="6pt">
2974
+ <xsl:copy-of select="@id"/>
2974
2975
 
2975
2976
 
2976
2977
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3813,14 +3814,18 @@
3813
3814
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
3814
3815
  <fo:inline><xsl:apply-templates/></fo:inline>
3815
3816
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
3817
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
3816
3818
  <fo:block id="{@id}">
3817
3819
  <xsl:apply-templates/>
3818
3820
  </fo:block>
3819
3821
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3822
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3820
3823
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3821
3824
 
3822
3825
 
3823
-
3826
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3827
+
3828
+ </xsl:if>
3824
3829
  <xsl:apply-templates/>
3825
3830
  </fo:block>
3826
3831
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -4794,7 +4799,8 @@
4794
4799
  </fo:block>
4795
4800
  </fo:table-cell>
4796
4801
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4797
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
4802
+ <fo:block font-size="11pt">
4803
+
4798
4804
  <xsl:apply-templates/>
4799
4805
  </fo:block>
4800
4806
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -4910,13 +4916,15 @@
4910
4916
  <!-- <xsl:apply-templates /> -->
4911
4917
  <xsl:copy-of select="$termsource_text"/>
4912
4918
  </xsl:when>
4913
- <xsl:otherwise>
4919
+ <xsl:otherwise>
4920
+
4914
4921
 
4915
4922
  <xsl:text>[</xsl:text>
4916
4923
 
4917
4924
  <!-- <xsl:apply-templates /> -->
4918
4925
  <xsl:copy-of select="$termsource_text"/>
4919
4926
 
4927
+
4920
4928
  <xsl:text>]</xsl:text>
4921
4929
 
4922
4930
  </xsl:otherwise>
@@ -5000,12 +5008,20 @@
5000
5008
  </xsl:template><xsl:template match="*[local-name() = 'author']">
5001
5009
  <xsl:text>— </xsl:text>
5002
5010
  <xsl:apply-templates/>
5003
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
5011
+ </xsl:template><xsl:variable name="bibitem_hidden_">
5012
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
5013
+ <xsl:copy-of select="."/>
5014
+ </xsl:for-each>
5015
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
5016
+ <xsl:copy-of select="."/>
5017
+ </xsl:for-each>
5018
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
5004
5019
 
5005
5020
  <xsl:variable name="bibitemid">
5006
5021
  <xsl:choose>
5007
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
5008
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5022
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
5023
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
5024
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5009
5025
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
5010
5026
  </xsl:choose>
5011
5027
  </xsl:variable>
@@ -5098,10 +5114,10 @@
5098
5114
  </xsl:choose>
5099
5115
  </xsl:variable>
5100
5116
 
5101
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
5117
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
5102
5118
 
5103
5119
  <xsl:choose>
5104
- <xsl:when test="$language = 'zh'">
5120
+ <xsl:when test="$lang = 'zh'">
5105
5121
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
5106
5122
  </xsl:when>
5107
5123
  <xsl:when test="../../@inline-header = 'true'">
data/lib/isodoc/iho/iho.standard.xsl CHANGED
@@ -817,7 +817,7 @@
817
817
  </xsl:variable>
818
818
  <fo:block line-height="1.1" role="H{$levelTerm}">
819
819
  <fo:block font-weight="bold" keep-with-next="always">
820
- <xsl:apply-templates select="ancestor::iho:term/iho:name" mode="presentation"/>
820
+ <xsl:apply-templates select="ancestor::iho:term[1]/iho:name" mode="presentation"/>
821
821
  </fo:block>
822
822
  <fo:block font-weight="bold" keep-with-next="always">
823
823
  <xsl:apply-templates/>
@@ -2971,6 +2971,7 @@
2971
2971
  <fo:table-cell>
2972
2972
 
2973
2973
  <fo:block margin-top="6pt">
2974
+ <xsl:copy-of select="@id"/>
2974
2975
 
2975
2976
 
2976
2977
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3813,14 +3814,18 @@
3813
3814
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
3814
3815
  <fo:inline><xsl:apply-templates/></fo:inline>
3815
3816
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
3817
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
3816
3818
  <fo:block id="{@id}">
3817
3819
  <xsl:apply-templates/>
3818
3820
  </fo:block>
3819
3821
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3822
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3820
3823
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3821
3824
 
3822
3825
 
3823
-
3826
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3827
+
3828
+ </xsl:if>
3824
3829
  <xsl:apply-templates/>
3825
3830
  </fo:block>
3826
3831
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -4794,7 +4799,8 @@
4794
4799
  </fo:block>
4795
4800
  </fo:table-cell>
4796
4801
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4797
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
4802
+ <fo:block font-size="11pt">
4803
+
4798
4804
  <xsl:apply-templates/>
4799
4805
  </fo:block>
4800
4806
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -4910,13 +4916,15 @@
4910
4916
  <!-- <xsl:apply-templates /> -->
4911
4917
  <xsl:copy-of select="$termsource_text"/>
4912
4918
  </xsl:when>
4913
- <xsl:otherwise>
4919
+ <xsl:otherwise>
4920
+
4914
4921
 
4915
4922
  <xsl:text>[</xsl:text>
4916
4923
 
4917
4924
  <!-- <xsl:apply-templates /> -->
4918
4925
  <xsl:copy-of select="$termsource_text"/>
4919
4926
 
4927
+
4920
4928
  <xsl:text>]</xsl:text>
4921
4929
 
4922
4930
  </xsl:otherwise>
@@ -5000,12 +5008,20 @@
5000
5008
  </xsl:template><xsl:template match="*[local-name() = 'author']">
5001
5009
  <xsl:text>— </xsl:text>
5002
5010
  <xsl:apply-templates/>
5003
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
5011
+ </xsl:template><xsl:variable name="bibitem_hidden_">
5012
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
5013
+ <xsl:copy-of select="."/>
5014
+ </xsl:for-each>
5015
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
5016
+ <xsl:copy-of select="."/>
5017
+ </xsl:for-each>
5018
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
5004
5019
 
5005
5020
  <xsl:variable name="bibitemid">
5006
5021
  <xsl:choose>
5007
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
5008
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5022
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
5023
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
5024
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5009
5025
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
5010
5026
  </xsl:choose>
5011
5027
  </xsl:variable>
@@ -5098,10 +5114,10 @@
5098
5114
  </xsl:choose>
5099
5115
  </xsl:variable>
5100
5116
 
5101
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
5117
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
5102
5118
 
5103
5119
  <xsl:choose>
5104
- <xsl:when test="$language = 'zh'">
5120
+ <xsl:when test="$lang = 'zh'">
5105
5121
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
5106
5122
  </xsl:when>
5107
5123
  <xsl:when test="../../@inline-header = 'true'">
data/lib/metanorma/iho/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IHO
3
- VERSION = "0.4.0".freeze
3
+ VERSION = "0.4.1".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iho
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.0
4
+ version: 0.4.1
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-10-25 00:00:00.000000000 Z
11
+ date: 2021-11-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities