metanorma-iso 2.0.1 → 2.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/html/style-human.css +16 -15
  3. data/lib/isodoc/iso/html/style-human.scss +3 -2
  4. data/lib/isodoc/iso/html/style-iso.css +18 -17
  5. data/lib/isodoc/iso/html/style-iso.scss +3 -2
  6. data/lib/isodoc/iso/iso.amendment.xsl +258 -82
  7. data/lib/isodoc/iso/iso.international-standard.xsl +258 -82
  8. data/lib/metanorma/iso/biblio.rng +2 -2
  9. data/lib/metanorma/iso/isodoc.rng +69 -1
  10. data/lib/metanorma/iso/version.rb +1 -1
  11. data/spec/metanorma/base_spec.rb +138 -127
  12. data/spec/vcr_cassettes/docrels.yml +21 -216
  13. metadata +2 -2
data/lib/metanorma/iso/isodoc.rng CHANGED
@@ -32,6 +32,43 @@
32
32
  <ref name="DocumentType"/>
33
33
  </element>
34
34
  </define>
35
+ <define name="index">
36
+ <element name="index">
37
+ <optional>
38
+ <attribute name="to">
39
+ <data type="IDREF"/>
40
+ </attribute>
41
+ </optional>
42
+ <element name="primary">
43
+ <oneOrMore>
44
+ <choice>
45
+ <ref name="PureTextElement"/>
46
+ <ref name="stem"/>
47
+ </choice>
48
+ </oneOrMore>
49
+ </element>
50
+ <optional>
51
+ <element name="secondary">
52
+ <oneOrMore>
53
+ <choice>
54
+ <ref name="PureTextElement"/>
55
+ <ref name="stem"/>
56
+ </choice>
57
+ </oneOrMore>
58
+ </element>
59
+ </optional>
60
+ <optional>
61
+ <element name="tertiary">
62
+ <oneOrMore>
63
+ <choice>
64
+ <ref name="PureTextElement"/>
65
+ <ref name="stem"/>
66
+ </choice>
67
+ </oneOrMore>
68
+ </element>
69
+ </optional>
70
+ </element>
71
+ </define>
35
72
  <define name="bibitem">
36
73
  <element name="bibitem">
37
74
  <attribute name="id">
@@ -1027,6 +1064,26 @@
1027
1064
  </zeroOrMore>
1028
1065
  </element>
1029
1066
  </define>
1067
+ <define name="sub">
1068
+ <element name="sub">
1069
+ <zeroOrMore>
1070
+ <choice>
1071
+ <ref name="PureTextElement"/>
1072
+ <ref name="stem"/>
1073
+ </choice>
1074
+ </zeroOrMore>
1075
+ </element>
1076
+ </define>
1077
+ <define name="sup">
1078
+ <element name="sup">
1079
+ <zeroOrMore>
1080
+ <choice>
1081
+ <ref name="PureTextElement"/>
1082
+ <ref name="stem"/>
1083
+ </choice>
1084
+ </zeroOrMore>
1085
+ </element>
1086
+ </define>
1030
1087
  <define name="pagebreak">
1031
1088
  <element name="pagebreak">
1032
1089
  <optional>
@@ -2216,7 +2273,18 @@
2216
2273
  <ref name="MultilingualRenderingType"/>
2217
2274
  </attribute>
2218
2275
  </optional>
2219
- <ref name="paragraph"/>
2276
+ <oneOrMore>
2277
+ <choice>
2278
+ <ref name="formula"/>
2279
+ <ref name="ul"/>
2280
+ <ref name="ol"/>
2281
+ <ref name="dl"/>
2282
+ <ref name="quote"/>
2283
+ <ref name="sourcecode"/>
2284
+ <ref name="paragraph"/>
2285
+ <ref name="figure"/>
2286
+ </choice>
2287
+ </oneOrMore>
2220
2288
  </element>
2221
2289
  </define>
2222
2290
  <define name="termsource">
data/lib/metanorma/iso/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ISO
3
- VERSION = "2.0.1".freeze
3
+ VERSION = "2.0.2".freeze
4
4
  end
5
5
  end
data/spec/metanorma/base_spec.rb CHANGED
@@ -675,7 +675,7 @@ RSpec.describe Metanorma::ISO do
675
675
  :docfile: test.adoc
676
676
  :nodoc:
677
677
  :novalid:
678
- :amends: ISO 123;ISO 124
678
+ :amends: ISO 123;ISO 125
679
679
  :obsoletes: ABC 1
680
680
  :successor-of: ABC 2
681
681
  :manifestation-of: ABC 3
@@ -744,16 +744,16 @@ RSpec.describe Metanorma::ISO do
744
744
  <docidentifier>ABC 3</docidentifier>
745
745
  </bibitem>
746
746
  </relation>
747
- <relation type='annotationOf'>
747
+ <relation type='related'>
748
748
  <bibitem>
749
749
  <title>--</title>
750
- <docidentifier>ABC 3a</docidentifier>
750
+ <docidentifier>ABC 4</docidentifier>
751
751
  </bibitem>
752
752
  </relation>
753
- <relation type='related'>
753
+ <relation type='annotationOf'>
754
754
  <bibitem>
755
755
  <title>--</title>
756
- <docidentifier>ABC 4</docidentifier>
756
+ <docidentifier>ABC 3a</docidentifier>
757
757
  </bibitem>
758
758
  </relation>
759
759
  <relation type='updates'>
@@ -872,128 +872,139 @@ RSpec.describe Metanorma::ISO do
872
872
  <place>Geneva</place>
873
873
  </bibitem>
874
874
  </relation>
875
- <relation type='updates'>
876
- <description>amends</description>
877
- <bibitem type='standard'>
878
- <fetched/>
879
- <title type='title-intro' format='text/plain' language='en' script='Latn'>Latex, rubber</title>
880
- <title type='title-main' format='text/plain' language='en' script='Latn'>Determination of total solids content</title>
881
- <title type='main' format='text/plain' language='en' script='Latn'>Latex, rubber&#8201;&#8212;&#8201;Determination of total solids content</title>
882
- <title type='title-intro' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc</title>
883
- <title type='title-main' format='text/plain' language='fr' script='Latn'>D&#233;termination des mati&#232;res solides totales</title>
884
- <title type='main' format='text/plain' language='fr' script='Latn'>
885
- Latex de caoutchouc&#8201;&#8212;&#8201;D&#233;termination des
886
- mati&#232;res solides totales
887
- </title>
888
- <uri type='src'>https://www.iso.org/standard/61884.html</uri>
889
- <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
890
- <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
891
- <docidentifier type='ISO'>ISO 124</docidentifier>
892
- <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7:en,fr</docidentifier>
893
- <docnumber>124</docnumber>
894
- <contributor>
895
- <role type='publisher'/>
896
- <organization>
897
- <name>International Organization for Standardization</name>
898
- <abbreviation>ISO</abbreviation>
899
- <uri>www.iso.org</uri>
900
- </organization>
901
- </contributor>
902
- <edition>7</edition>
903
- <language>en</language>
904
- <language>fr</language>
905
- <script>Latn</script>
906
- <status>
907
- <stage>90</stage>
908
- <substage>93</substage>
909
- </status>
910
- <copyright>
911
- <from>2014</from>
912
- <owner>
913
- <organization>
914
- <name>ISO</name>
915
- </organization>
916
- </owner>
917
- </copyright>
918
- <relation type='obsoletes'>
919
- <bibitem type='standard'>
920
- <formattedref format='text/plain'>ISO 124:2011</formattedref>
921
- </bibitem>
922
- </relation>
923
- <relation type='instance'>
924
- <bibitem type='standard'>
925
- <fetched/>
926
- <title type='title-intro' format='text/plain' language='en' script='Latn'>Latex, rubber</title>
927
- <title type='title-main' format='text/plain' language='en' script='Latn'>Determination of total solids content</title>
928
- <title type='main' format='text/plain' language='en' script='Latn'>Latex, rubber&#8201;&#8212;&#8201;Determination of total solids content</title>
929
- <title type='title-intro' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc</title>
930
- <title type='title-main' format='text/plain' language='fr' script='Latn'>D&#233;termination des mati&#232;res solides totales</title>
931
- <title type='main' format='text/plain' language='fr' script='Latn'>
932
- Latex de caoutchouc&#8201;&#8212;&#8201;D&#233;termination des
933
- mati&#232;res solides totales
934
- </title>
935
- <uri type='src'>https://www.iso.org/standard/61884.html</uri>
936
- <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
937
- <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
938
- <docidentifier type='ISO'>ISO 124:2014</docidentifier>
939
- <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7:en,fr</docidentifier>
940
- <docnumber>124</docnumber>
941
- <date type='published'>
942
- <on>2014-03</on>
943
- </date>
944
- <contributor>
945
- <role type='publisher'/>
946
- <organization>
947
- <name>International Organization for Standardization</name>
948
- <abbreviation>ISO</abbreviation>
949
- <uri>www.iso.org</uri>
950
- </organization>
951
- </contributor>
952
- <edition>7</edition>
953
- <language>en</language>
954
- <language>fr</language>
955
- <script>Latn</script>
956
- <abstract format='text/plain' language='en' script='Latn'>
957
- ISO 124:2014 specifies methods for the determination of the total
958
- solids content of natural rubber field and concentrated latices
959
- and synthetic rubber latex. These methods are not necessarily
960
- suitable for latex from natural sources other than the Hevea
961
- brasiliensis, for vulcanized latex, for compounded latex, or for
962
- artificial dispersions of rubber.
963
- </abstract>
964
- <abstract format='text/plain' language='fr' script='Latn'>
965
- L&#8217;ISO 124:2014 sp&#233;cifie des m&#233;thodes pour la
966
- d&#233;termination des mati&#232;res solides totales dans le latex
967
- de plantation, le latex de concentr&#233; de caoutchouc naturel et
968
- le latex de caoutchouc synth&#233;tique. Ces m&#233;thodes ne
969
- conviennent pas n&#233;cessairement au latex d&#8217;origine
970
- naturelle autre que celui de l&#8217;Hevea brasiliensis, au latex
971
- vulcanis&#233;, aux m&#233;langes de latex, ou aux dispersions
972
- artificielles de caoutchouc.
973
- </abstract>
974
- <status>
975
- <stage>90</stage>
976
- <substage>93</substage>
977
- </status>
978
- <copyright>
979
- <from>2014</from>
980
- <owner>
981
- <organization>
982
- <name>ISO</name>
983
- </organization>
984
- </owner>
985
- </copyright>
986
- <relation type='obsoletes'>
987
- <bibitem type='standard'>
988
- <formattedref format='text/plain'>ISO 124:2011</formattedref>
989
- </bibitem>
990
- </relation>
991
- <place>Geneva</place>
992
- </bibitem>
993
- </relation>
994
- <place>Geneva</place>
995
- </bibitem>
996
- </relation>
875
+ <relation type='updates'>
876
+ <description>amends</description>
877
+ <bibitem type='standard'>
878
+ <fetched/>
879
+ <title type='title-intro' format='text/plain' language='en' script='Latn'>Natural rubber latex concentrate</title>
880
+ <title type='title-main' format='text/plain' language='en' script='Latn'>Determination of alkalinity</title>
881
+ <title type='main' format='text/plain' language='en' script='Latn'>
882
+ Natural rubber latex concentrate&#8201;&#8212;&#8201;Determination of
883
+ alkalinity
884
+ </title>
885
+ <title type='title-intro' format='text/plain' language='fr' script='Latn'>Latex concentr&#233; de caoutchouc naturel</title>
886
+ <title type='title-main' format='text/plain' language='fr' script='Latn'>D&#233;termination de l&#8217;alcalinit&#233;</title>
887
+ <title type='main' format='text/plain' language='fr' script='Latn'>
888
+ Latex concentr&#233; de caoutchouc
889
+ naturel&#8201;&#8212;&#8201;D&#233;termination de
890
+ l&#8217;alcalinit&#233;
891
+ </title>
892
+ <uri type='src'>https://www.iso.org/standard/72849.html</uri>
893
+ <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
894
+ <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
895
+ <docidentifier type='ISO'>ISO 125</docidentifier>
896
+ <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7:en,fr</docidentifier>
897
+ <docnumber>125</docnumber>
898
+ <contributor>
899
+ <role type='publisher'/>
900
+ <organization>
901
+ <name>International Organization for Standardization</name>
902
+ <abbreviation>ISO</abbreviation>
903
+ <uri>www.iso.org</uri>
904
+ </organization>
905
+ </contributor>
906
+ <edition>7</edition>
907
+ <language>en</language>
908
+ <language>fr</language>
909
+ <script>Latn</script>
910
+ <status>
911
+ <stage>60</stage>
912
+ <substage>60</substage>
913
+ </status>
914
+ <copyright>
915
+ <from>2020</from>
916
+ <owner>
917
+ <organization>
918
+ <name>ISO</name>
919
+ </organization>
920
+ </owner>
921
+ </copyright>
922
+ <relation type='obsoletes'>
923
+ <bibitem type='standard'>
924
+ <formattedref format='text/plain'>ISO 125:2011</formattedref>
925
+ </bibitem>
926
+ </relation>
927
+ <relation type='instance'>
928
+ <bibitem type='standard'>
929
+ <fetched/>
930
+ <title type='title-intro' format='text/plain' language='en' script='Latn'>Natural rubber latex concentrate</title>
931
+ <title type='title-main' format='text/plain' language='en' script='Latn'>Determination of alkalinity</title>
932
+ <title type='main' format='text/plain' language='en' script='Latn'>
933
+ Natural rubber latex concentrate&#8201;&#8212;&#8201;Determination
934
+ of alkalinity
935
+ </title>
936
+ <title type='title-intro' format='text/plain' language='fr' script='Latn'>Latex concentr&#233; de caoutchouc naturel</title>
937
+ <title type='title-main' format='text/plain' language='fr' script='Latn'>D&#233;termination de l&#8217;alcalinit&#233;</title>
938
+ <title type='main' format='text/plain' language='fr' script='Latn'>
939
+ Latex concentr&#233; de caoutchouc
940
+ naturel&#8201;&#8212;&#8201;D&#233;termination de
941
+ l&#8217;alcalinit&#233;
942
+ </title>
943
+ <uri type='src'>https://www.iso.org/standard/72849.html</uri>
944
+ <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
945
+ <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
946
+ <docidentifier type='ISO'>ISO 125:2020</docidentifier>
947
+ <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7:en,fr</docidentifier>
948
+ <docnumber>125</docnumber>
949
+ <date type='published'>
950
+ <on>2020-02</on>
951
+ </date>
952
+ <contributor>
953
+ <role type='publisher'/>
954
+ <organization>
955
+ <name>International Organization for Standardization</name>
956
+ <abbreviation>ISO</abbreviation>
957
+ <uri>www.iso.org</uri>
958
+ </organization>
959
+ </contributor>
960
+ <edition>7</edition>
961
+ <language>en</language>
962
+ <language>fr</language>
963
+ <script>Latn</script>
964
+ <abstract format='text/plain' language='en' script='Latn'>
965
+ This document specifies a method for the determination of the
966
+ alkalinity of natural rubber latex concentrate. The method is not
967
+ necessarily suitable for latices from natural sources other than
968
+ Hevea brasiliensis or for synthetic rubber latices, compounded
969
+ latex, vulcanized latex or artificial dispersions of rubber. NOTE
970
+ A method for the determination of the alkalinity of
971
+ polychloroprene latex is specified in ISO 13773.
972
+ </abstract>
973
+ <abstract format='text/plain' language='fr' script='Latn'>
974
+ Le pr&#233;sent document sp&#233;cifie une m&#233;thode de
975
+ d&#233;termination de l&#8217;alcalinit&#233; du latex
976
+ concentr&#233; de caoutchouc naturel. La m&#233;thode ne convient
977
+ pas n&#233;cessairement aux latex d&#8217;origine naturelle autres
978
+ que l&#8217;Hevea brasiliensis ou aux latex de caoutchouc de
979
+ synth&#232;se, aux latex formul&#233;s, aux latex vulcanis&#233;s
980
+ ou aux dispersions artificielles de caoutchouc. NOTE Une
981
+ m&#233;thode de d&#233;termination de l&#8217;alcalinit&#233; du
982
+ latex de polychloropr&#232;ne est sp&#233;cifi&#233;e dans
983
+ l&#8217;ISO 13773.
984
+ </abstract>
985
+ <status>
986
+ <stage>60</stage>
987
+ <substage>60</substage>
988
+ </status>
989
+ <copyright>
990
+ <from>2020</from>
991
+ <owner>
992
+ <organization>
993
+ <name>ISO</name>
994
+ </organization>
995
+ </owner>
996
+ </copyright>
997
+ <relation type='obsoletes'>
998
+ <bibitem type='standard'>
999
+ <formattedref format='text/plain'>ISO 125:2011</formattedref>
1000
+ </bibitem>
1001
+ </relation>
1002
+ <place>Geneva</place>
1003
+ </bibitem>
1004
+ </relation>
1005
+ <place>Geneva</place>
1006
+ </bibitem>
1007
+ </relation>
997
1008
  <relation type='obsoletes'>
998
1009
  <description>replaces</description>
999
1010
  <bibitem>