metanorma-iso 2.2.1 → 2.2.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (119) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/html/header-dis.html +111 -29
  3. data/lib/isodoc/iso/html/isodoc-dis.css +65 -64
  4. data/lib/isodoc/iso/html/isodoc-dis.scss +65 -64
  5. data/lib/isodoc/iso/html/style-human.css +2 -3
  6. data/lib/isodoc/iso/html/style-human.scss +0 -1
  7. data/lib/isodoc/iso/html/style-iso.css +2 -3
  8. data/lib/isodoc/iso/html/style-iso.scss +0 -1
  9. data/lib/isodoc/iso/html/wordstyle-dis.css +10 -4
  10. data/lib/isodoc/iso/html/wordstyle-dis.scss +10 -4
  11. data/lib/isodoc/iso/i18n-en.yaml +13 -8
  12. data/lib/isodoc/iso/i18n-fr.yaml +9 -3
  13. data/lib/isodoc/iso/i18n-ru.yaml +9 -2
  14. data/lib/isodoc/iso/i18n-zh-Hans.yaml +1 -2
  15. data/lib/isodoc/iso/iso.amendment.xsl +226 -40
  16. data/lib/isodoc/iso/iso.international-standard.xsl +226 -40
  17. data/lib/isodoc/iso/presentation_bibdata.rb +13 -9
  18. data/lib/isodoc/iso/presentation_xml_convert.rb +5 -3
  19. data/lib/isodoc/iso/presentation_xref.rb +10 -7
  20. data/lib/isodoc/iso/sections.rb +1 -1
  21. data/lib/isodoc/iso/word_convert.rb +6 -4
  22. data/lib/isodoc/iso/word_dis_cleanup.rb +24 -3
  23. data/lib/isodoc/iso/word_dis_convert.rb +4 -1
  24. data/lib/metanorma/iso/base.rb +2 -1
  25. data/lib/metanorma/iso/basicdoc.rng +0 -27
  26. data/lib/metanorma/iso/biblio-standoc.rng +164 -0
  27. data/lib/metanorma/iso/biblio.rng +50 -18
  28. data/lib/metanorma/iso/isodoc.rng +68 -206
  29. data/lib/metanorma/iso/isostandard-amd.rng +3 -54
  30. data/lib/metanorma/iso/isostandard-compile.rng +7 -0
  31. data/lib/metanorma/iso/isostandard.rng +1 -195
  32. data/lib/metanorma/iso/relaton-iso.rng +225 -0
  33. data/lib/metanorma/iso/validate.rb +6 -6
  34. data/lib/metanorma/iso/version.rb +1 -1
  35. data/lib/metanorma/requirements/modspec.rb +22 -38
  36. data/metanorma-iso.gemspec +5 -2
  37. metadata +7 -86
  38. data/.github/workflows/rake.yml +0 -15
  39. data/.github/workflows/release.yml +0 -24
  40. data/.github/workflows/ubuntu.yml +0 -41
  41. data/Rakefile +0 -8
  42. data/bin/rspec +0 -17
  43. data/spec/assets/header.html +0 -7
  44. data/spec/assets/html.css +0 -2
  45. data/spec/assets/htmlcover.html +0 -4
  46. data/spec/assets/htmlintro.html +0 -5
  47. data/spec/assets/i18n.yaml +0 -2
  48. data/spec/assets/iso.adoc +0 -10
  49. data/spec/assets/iso.headless.html +0 -33
  50. data/spec/assets/iso.xml +0 -71
  51. data/spec/assets/rice_image1.png +0 -0
  52. data/spec/assets/scripts.html +0 -3
  53. data/spec/assets/std.css +0 -2
  54. data/spec/assets/word.css +0 -2
  55. data/spec/assets/wordcover.html +0 -3
  56. data/spec/assets/wordintro.html +0 -4
  57. data/spec/examples/103_01_02.html +0 -247
  58. data/spec/examples/english.yaml +0 -69
  59. data/spec/examples/iso_123_.xml +0 -45
  60. data/spec/examples/iso_123_all_parts.xml +0 -45
  61. data/spec/examples/iso_123_no_year_note.xml +0 -46
  62. data/spec/examples/iso_124_.xml +0 -41
  63. data/spec/examples/iso_216_.xml +0 -47
  64. data/spec/examples/iso_iec_12382_.xml +0 -48
  65. data/spec/examples/rice.adoc +0 -714
  66. data/spec/examples/rice.preview.html +0 -1870
  67. data/spec/examples/rice.sh +0 -4
  68. data/spec/examples/rice_img/1000-1_ed2amd3fig1a.png +0 -0
  69. data/spec/examples/rice_img/1000-1_ed2amd3fig1b.png +0 -0
  70. data/spec/examples/rice_img/1000-1_ed2amd3fig2.png +0 -0
  71. data/spec/examples/rice_img/1000-1_ed2amd3fig3.png +0 -0
  72. data/spec/examples/rice_img/1000-1_ed2amd3fig4.png +0 -0
  73. data/spec/examples/rice_img/1000-1_ed2amd3fig5_f.png +0 -0
  74. data/spec/examples/rice_img/1000-1_ed2amd3figA.png +0 -0
  75. data/spec/examples/rice_img/1000-1_ed2amd3figA1.png +0 -0
  76. data/spec/examples/rice_img/1000-1_ed2amd3figA2.png +0 -0
  77. data/spec/examples/rice_img/1000-1_ed2amd3figTab1.png +0 -0
  78. data/spec/examples/rice_img/1000-1_ed2amd3figTab2.png +0 -0
  79. data/spec/examples/rice_img/1001_ed2amd3fig1.png +0 -0
  80. data/spec/examples/rice_img/ISO_1213_1.png +0 -0
  81. data/spec/examples/rice_img/SL1000-1_ed2amd3fig1.png +0 -0
  82. data/spec/examples/rice_img/rice_image1.png +0 -0
  83. data/spec/examples/rice_img/rice_image2.png +0 -0
  84. data/spec/examples/rice_img/rice_image3_1.png +0 -0
  85. data/spec/examples/rice_img/rice_image3_2.png +0 -0
  86. data/spec/examples/rice_img/rice_image3_3.png +0 -0
  87. data/spec/isodoc/amd_spec.rb +0 -986
  88. data/spec/isodoc/blocks_spec.rb +0 -1174
  89. data/spec/isodoc/i18n_spec.rb +0 -1579
  90. data/spec/isodoc/inline_spec.rb +0 -1060
  91. data/spec/isodoc/iso_spec.rb +0 -255
  92. data/spec/isodoc/metadata_spec.rb +0 -701
  93. data/spec/isodoc/postproc_spec.rb +0 -1089
  94. data/spec/isodoc/ref_spec.rb +0 -439
  95. data/spec/isodoc/section_spec.rb +0 -998
  96. data/spec/isodoc/table_spec.rb +0 -420
  97. data/spec/isodoc/terms_spec.rb +0 -314
  98. data/spec/isodoc/word_dis_spec.rb +0 -2064
  99. data/spec/isodoc/xref_spec.rb +0 -1747
  100. data/spec/metanorma/amd_spec.rb +0 -724
  101. data/spec/metanorma/base_spec.rb +0 -1384
  102. data/spec/metanorma/blank_spec.rb +0 -38
  103. data/spec/metanorma/blocks_spec.rb +0 -624
  104. data/spec/metanorma/cleanup_spec.rb +0 -1645
  105. data/spec/metanorma/inline_spec.rb +0 -203
  106. data/spec/metanorma/lists_spec.rb +0 -197
  107. data/spec/metanorma/macros_spec.rb +0 -99
  108. data/spec/metanorma/processor_spec.rb +0 -161
  109. data/spec/metanorma/refs_spec.rb +0 -672
  110. data/spec/metanorma/section_spec.rb +0 -492
  111. data/spec/metanorma/table_spec.rb +0 -329
  112. data/spec/metanorma/validate_spec.rb +0 -2153
  113. data/spec/relaton/render_spec.rb +0 -568
  114. data/spec/requirements/requirement_components_spec.rb +0 -622
  115. data/spec/requirements/requirements_spec.rb +0 -1681
  116. data/spec/requirements/xref_spec.rb +0 -1211
  117. data/spec/spec_helper.rb +0 -313
  118. data/spec/vcr_cassettes/docrels.yml +0 -385
  119. data/spec/vcr_cassettes/withdrawn_iso.yml +0 -295
@@ -1735,7 +1735,7 @@ span.aucollab
1735
1735
  mso-ascii-font-family:Cambria;
1736
1736
  mso-hansi-font-family:Cambria;
1737
1737
  border:none;
1738
- {% if stage_int >= 40 and stage_int < 60 %}background:silver;{% endif %}
1738
+ background:silver;
1739
1739
  }
1740
1740
  span.audeg
1741
1741
  {mso-style-name:au_deg;
@@ -1746,7 +1746,7 @@ span.audeg
1746
1746
  mso-ascii-font-family:Cambria;
1747
1747
  mso-hansi-font-family:Cambria;
1748
1748
  border:none;
1749
- {% if stage_int >= 40 and stage_int < 60 %}background:yellow;{% endif %}
1749
+ background:yellow;
1750
1750
  }
1751
1751
  span.aufname
1752
1752
  {mso-style-name:au_fname;
@@ -1757,7 +1757,7 @@ span.aufname
1757
1757
  mso-ascii-font-family:Cambria;
1758
1758
  mso-hansi-font-family:Cambria;
1759
1759
  border:none;
1760
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFFFCC;{% endif %}
1760
+ background:#FFFFCC;
1761
1761
  }
1762
1762
  span.aurole
1763
1763
  {mso-style-name:au_role;
@@ -1768,7 +1768,7 @@ span.aurole
1768
1768
  mso-ascii-font-family:Cambria;
1769
1769
  mso-hansi-font-family:Cambria;
1770
1770
  border:none;
1771
- {% if stage_int >= 40 and stage_int < 60 %}background:olive;{% endif %}
1771
+ background:olive;
1772
1772
  }
1773
1773
  span.ausuffix
1774
1774
  {mso-style-name:au_suffix;
@@ -1779,7 +1779,7 @@ span.ausuffix
1779
1779
  mso-ascii-font-family:Cambria;
1780
1780
  mso-hansi-font-family:Cambria;
1781
1781
  border:none;
1782
- {% if stage_int >= 40 and stage_int < 60 %}background:fuchsia;{% endif %}
1782
+ background:fuchsia;
1783
1783
  }
1784
1784
  span.ausurname
1785
1785
  {mso-style-name:au_surname;
@@ -1790,7 +1790,7 @@ span.ausurname
1790
1790
  mso-ascii-font-family:Cambria;
1791
1791
  mso-hansi-font-family:Cambria;
1792
1792
  border:none;
1793
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCFF99;{% endif %}
1793
+ background:#CCFF99;
1794
1794
  }
1795
1795
  span.bibbase
1796
1796
  {mso-style-name:bib_base;
@@ -1807,7 +1807,7 @@ span.bibarticle
1807
1807
  mso-ascii-font-family:Cambria;
1808
1808
  mso-hansi-font-family:Cambria;
1809
1809
  border:none;
1810
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCFFFF;{% endif %}
1810
+ background:#CCFFFF;
1811
1811
  }
1812
1812
  span.bibcomment
1813
1813
  {mso-style-name:bib_comment;
@@ -1831,7 +1831,7 @@ span.bibdoi
1831
1831
  mso-ascii-font-family:Cambria;
1832
1832
  mso-hansi-font-family:Cambria;
1833
1833
  border:none;
1834
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCFFCC;{% endif %}
1834
+ background:#CCFFCC;
1835
1835
  }
1836
1836
  span.bibetal
1837
1837
  {mso-style-name:bib_etal;
@@ -1841,7 +1841,7 @@ span.bibetal
1841
1841
  mso-ascii-font-family:Cambria;
1842
1842
  mso-hansi-font-family:Cambria;
1843
1843
  border:none;
1844
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCFF99;{% endif %}
1844
+ background:#CCFF99;
1845
1845
  }
1846
1846
  span.bibfname
1847
1847
  {mso-style-name:bib_fname;
@@ -1851,7 +1851,7 @@ span.bibfname
1851
1851
  mso-ascii-font-family:Cambria;
1852
1852
  mso-hansi-font-family:Cambria;
1853
1853
  border:none;
1854
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFFFCC;{% endif %}
1854
+ background:#FFFFCC;
1855
1855
  }
1856
1856
  span.bibfpage
1857
1857
  {mso-style-name:bib_fpage;
@@ -1861,7 +1861,7 @@ span.bibfpage
1861
1861
  mso-ascii-font-family:Cambria;
1862
1862
  mso-hansi-font-family:Cambria;
1863
1863
  border:none;
1864
- {% if stage_int >= 40 and stage_int < 60 %}background:#E6E6E6;{% endif %}
1864
+ background:#E6E6E6;
1865
1865
  }
1866
1866
  span.bibissue
1867
1867
  {mso-style-name:bib_issue;
@@ -1871,7 +1871,7 @@ span.bibissue
1871
1871
  mso-ascii-font-family:Cambria;
1872
1872
  mso-hansi-font-family:Cambria;
1873
1873
  border:none;
1874
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFFFAB;{% endif %}
1874
+ background:#FFFFAB;
1875
1875
  }
1876
1876
  span.bibjournal
1877
1877
  {mso-style-name:bib_journal;
@@ -1881,7 +1881,7 @@ span.bibjournal
1881
1881
  mso-ascii-font-family:Cambria;
1882
1882
  mso-hansi-font-family:Cambria;
1883
1883
  border:none;
1884
- {% if stage_int >= 40 and stage_int < 60 %}background:#F9DECF;{% endif %}
1884
+ background:#F9DECF;
1885
1885
  }
1886
1886
  span.biblpage
1887
1887
  {mso-style-name:bib_lpage;
@@ -1891,7 +1891,7 @@ span.biblpage
1891
1891
  mso-ascii-font-family:Cambria;
1892
1892
  mso-hansi-font-family:Cambria;
1893
1893
  border:none;
1894
- {% if stage_int >= 40 and stage_int < 60 %}background:#D9D9D9;{% endif %}
1894
+ background:#D9D9D9;
1895
1895
  }
1896
1896
  span.bibnumber
1897
1897
  {mso-style-name:bib_number;
@@ -1901,7 +1901,7 @@ span.bibnumber
1901
1901
  mso-ascii-font-family:Cambria;
1902
1902
  mso-hansi-font-family:Cambria;
1903
1903
  border:none;
1904
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCCCFF;{% endif %}
1904
+ background:#CCCCFF;
1905
1905
  }
1906
1906
  span.biborganization
1907
1907
  {mso-style-name:bib_organization;
@@ -1911,7 +1911,7 @@ span.biborganization
1911
1911
  mso-ascii-font-family:Cambria;
1912
1912
  mso-hansi-font-family:Cambria;
1913
1913
  border:none;
1914
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCFF99;{% endif %}
1914
+ background:#CCFF99;
1915
1915
  }
1916
1916
  span.bibsuffix
1917
1917
  {mso-style-name:bib_suffix;
@@ -1928,7 +1928,7 @@ span.bibsuppl
1928
1928
  mso-ascii-font-family:Cambria;
1929
1929
  mso-hansi-font-family:Cambria;
1930
1930
  border:none;
1931
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFCC66;{% endif %}
1931
+ background:#FFCC66;
1932
1932
  }
1933
1933
  span.bibsurname
1934
1934
  {mso-style-name:bib_surname;
@@ -1938,7 +1938,7 @@ span.bibsurname
1938
1938
  mso-ascii-font-family:Cambria;
1939
1939
  mso-hansi-font-family:Cambria;
1940
1940
  border:none;
1941
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCFF99;{% endif %}
1941
+ background:#CCFF99;
1942
1942
  }
1943
1943
  span.bibunpubl
1944
1944
  {mso-style-name:bib_unpubl;
@@ -1955,7 +1955,7 @@ span.biburl
1955
1955
  mso-ascii-font-family:Cambria;
1956
1956
  mso-hansi-font-family:Cambria;
1957
1957
  border:none;
1958
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCFF66;{% endif %}
1958
+ background:#CCFF66;
1959
1959
  }
1960
1960
  span.bibvolume
1961
1961
  {mso-style-name:bib_volume;
@@ -1965,7 +1965,7 @@ span.bibvolume
1965
1965
  mso-ascii-font-family:Cambria;
1966
1966
  mso-hansi-font-family:Cambria;
1967
1967
  border:none;
1968
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCECFF;{% endif %}
1968
+ background:#CCECFF;
1969
1969
  }
1970
1970
  span.bibyear
1971
1971
  {mso-style-name:bib_year;
@@ -1975,7 +1975,7 @@ span.bibyear
1975
1975
  mso-ascii-font-family:Cambria;
1976
1976
  mso-hansi-font-family:Cambria;
1977
1977
  border:none;
1978
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFCCFF;{% endif %}
1978
+ background:#FFCCFF;
1979
1979
  }
1980
1980
  span.citebase
1981
1981
  {mso-style-name:cite_base;
@@ -1992,7 +1992,7 @@ span.citebib
1992
1992
  mso-ascii-font-family:Cambria;
1993
1993
  mso-hansi-font-family:Cambria;
1994
1994
  border:none;
1995
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCFFFF;{% endif %}
1995
+ background:#CCFFFF;
1996
1996
  }
1997
1997
  span.citebox
1998
1998
  {mso-style-name:cite_box;
@@ -2009,7 +2009,7 @@ span.citeen
2009
2009
  mso-ascii-font-family:Cambria;
2010
2010
  mso-hansi-font-family:Cambria;
2011
2011
  border:none;
2012
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFFF99;{% endif %}
2012
+ background:#FFFF99;
2013
2013
  vertical-align:super;}
2014
2014
  span.citefig
2015
2015
  {mso-style-name:cite_fig;
@@ -2020,7 +2020,7 @@ span.citefig
2020
2020
  mso-hansi-font-family:Cambria;
2021
2021
  color:windowtext;
2022
2022
  border:none;
2023
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCFFCC;{% endif %}
2023
+ background:#CCFFCC;
2024
2024
  }
2025
2025
  span.citefn
2026
2026
  {mso-style-name:cite_fn;
@@ -2032,7 +2032,7 @@ span.citefn
2032
2032
  mso-hansi-font-family:Cambria;
2033
2033
  color:windowtext;
2034
2034
  border:none;
2035
- {% if stage_int >= 40 and stage_int < 60 %}background:#FF99CC;{% endif %}
2035
+ background:#FF99CC;
2036
2036
  vertical-align:baseline;}
2037
2037
  span.citetbl
2038
2038
  {mso-style-name:cite_tbl;
@@ -2043,7 +2043,7 @@ span.citetbl
2043
2043
  mso-hansi-font-family:Cambria;
2044
2044
  color:windowtext;
2045
2045
  border:none;
2046
- {% if stage_int >= 40 and stage_int < 60 %}background:#FF9999;{% endif %}
2046
+ background:#FF9999;
2047
2047
  }
2048
2048
  span.stdbase
2049
2049
  {mso-style-name:std_base;
@@ -2060,7 +2060,7 @@ span.bibextlink
2060
2060
  mso-ascii-font-family:Cambria;
2061
2061
  mso-hansi-font-family:Cambria;
2062
2062
  border:none;
2063
- {% if stage_int >= 40 and stage_int < 60 %}background:#6CCE9D;{% endif %}
2063
+ background:#6CCE9D;
2064
2064
  }
2065
2065
  span.citeeq
2066
2066
  {mso-style-name:cite_eq;
@@ -2070,7 +2070,7 @@ span.citeeq
2070
2070
  mso-ascii-font-family:Cambria;
2071
2071
  mso-hansi-font-family:Cambria;
2072
2072
  border:none;
2073
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFAE37;{% endif %}
2073
+ background:#FFAE37;
2074
2074
  }
2075
2075
  span.bibmedline
2076
2076
  {mso-style-name:bib_medline;
@@ -2087,7 +2087,7 @@ span.citetfn
2087
2087
  mso-ascii-font-family:Cambria;
2088
2088
  mso-hansi-font-family:Cambria;
2089
2089
  border:none;
2090
- {% if stage_int >= 40 and stage_int < 60 %}background:#FBBA79;{% endif %}
2090
+ background:#FBBA79;
2091
2091
  }
2092
2092
  span.auprefix
2093
2093
  {mso-style-name:au_prefix;
@@ -2098,7 +2098,7 @@ span.auprefix
2098
2098
  mso-ascii-font-family:Cambria;
2099
2099
  mso-hansi-font-family:Cambria;
2100
2100
  border:none;
2101
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFCC99;{% endif %}
2101
+ background:#FFCC99;
2102
2102
  }
2103
2103
  span.citeapp
2104
2104
  {mso-style-name:cite_app;
@@ -2108,7 +2108,7 @@ span.citeapp
2108
2108
  mso-ascii-font-family:Cambria;
2109
2109
  mso-hansi-font-family:Cambria;
2110
2110
  border:none;
2111
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCFF33;{% endif %}
2111
+ background:#CCFF33;
2112
2112
  }
2113
2113
  span.citesec
2114
2114
  {mso-style-name:cite_sec;
@@ -2118,7 +2118,7 @@ span.citesec
2118
2118
  mso-ascii-font-family:Cambria;
2119
2119
  mso-hansi-font-family:Cambria;
2120
2120
  border:none;
2121
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFCCCC;{% endif %}
2121
+ background:#FFCCCC;
2122
2122
  }
2123
2123
  span.stddocNumber
2124
2124
  {mso-style-name:std_docNumber;
@@ -2128,7 +2128,7 @@ span.stddocNumber
2128
2128
  mso-ascii-font-family:Cambria;
2129
2129
  mso-hansi-font-family:Cambria;
2130
2130
  border:none;
2131
- {% if stage_int >= 40 and stage_int < 60 %}background:#F2DBDB;{% endif %}
2131
+ background:#F2DBDB;
2132
2132
  }
2133
2133
  span.stddocPartNumber
2134
2134
  {mso-style-name:std_docPartNumber;
@@ -2138,7 +2138,7 @@ span.stddocPartNumber
2138
2138
  mso-ascii-font-family:Cambria;
2139
2139
  mso-hansi-font-family:Cambria;
2140
2140
  border:none;
2141
- {% if stage_int >= 40 and stage_int < 60 %}background:#EAF1DD;{% endif %}
2141
+ background:#EAF1DD;
2142
2142
  }
2143
2143
  span.stddocTitle
2144
2144
  {mso-style-name:std_docTitle;
@@ -2148,7 +2148,7 @@ span.stddocTitle
2148
2148
  mso-ascii-font-family:Cambria;
2149
2149
  mso-hansi-font-family:Cambria;
2150
2150
  border:none;
2151
- {% if stage_int >= 40 and stage_int < 60 %}background:#FDE9D9;{% endif %}
2151
+ background:#FDE9D9;
2152
2152
  font-style:italic;
2153
2153
  mso-bidi-font-style:normal;}
2154
2154
  span.aumember
@@ -2160,7 +2160,7 @@ span.aumember
2160
2160
  mso-ascii-font-family:Cambria;
2161
2161
  mso-hansi-font-family:Cambria;
2162
2162
  border:none;
2163
- {% if stage_int >= 40 and stage_int < 60 %}background:#FF99CC;{% endif %}
2163
+ background:#FF99CC;
2164
2164
  }
2165
2165
  span.stdfootnote
2166
2166
  {mso-style-name:std_footnote;
@@ -2170,7 +2170,7 @@ span.stdfootnote
2170
2170
  mso-ascii-font-family:Cambria;
2171
2171
  mso-hansi-font-family:Cambria;
2172
2172
  border:none;
2173
- {% if stage_int >= 40 and stage_int < 60 %}background:#F2F2F2;{% endif %}
2173
+ background:#F2F2F2;
2174
2174
  }
2175
2175
  span.stdpublisher
2176
2176
  {mso-style-name:std_publisher;
@@ -2180,7 +2180,8 @@ span.stdpublisher
2180
2180
  mso-ascii-font-family:Cambria;
2181
2181
  mso-hansi-font-family:Cambria;
2182
2182
  border:none;
2183
- {% if stage_int >= 40 and stage_int < 60 %}background:#C6D9F1;{% endif %}
2183
+ background:#C6D9F1;
2184
+ background:#C6D9F1;
2184
2185
  }
2185
2186
  span.stdsection
2186
2187
  {mso-style-name:std_section;
@@ -2190,7 +2191,7 @@ span.stdsection
2190
2191
  mso-ascii-font-family:Cambria;
2191
2192
  mso-hansi-font-family:Cambria;
2192
2193
  border:none;
2193
- {% if stage_int >= 40 and stage_int < 60 %}background:#E5DFEC;{% endif %}
2194
+ background:#E5DFEC;
2194
2195
  }
2195
2196
  span.stdyear
2196
2197
  {mso-style-name:std_year;
@@ -2200,7 +2201,7 @@ span.stdyear
2200
2201
  mso-ascii-font-family:Cambria;
2201
2202
  mso-hansi-font-family:Cambria;
2202
2203
  border:none;
2203
- {% if stage_int >= 40 and stage_int < 60 %}background:#DAEEF3;{% endif %}
2204
+ background:#DAEEF3;
2204
2205
  }
2205
2206
  span.stddocumentType
2206
2207
  {mso-style-name:std_documentType;
@@ -2210,7 +2211,7 @@ span.stddocumentType
2210
2211
  mso-ascii-font-family:Cambria;
2211
2212
  mso-hansi-font-family:Cambria;
2212
2213
  border:none;
2213
- {% if stage_int >= 40 and stage_int < 60 %}background:#7DE1DF;{% endif %}
2214
+ background:#7DE1DF;
2214
2215
  }
2215
2216
  span.bibalt-year
2216
2217
  {mso-style-name:bib_alt-year;
@@ -2221,7 +2222,7 @@ span.bibalt-year
2221
2222
  mso-ascii-font-family:Cambria;
2222
2223
  mso-hansi-font-family:Cambria;
2223
2224
  border:none;
2224
- {% if stage_int >= 40 and stage_int < 60 %}background:#CC99FF;{% endif %}
2225
+ background:#CC99FF;
2225
2226
  }
2226
2227
  span.bibbook
2227
2228
  {mso-style-name:bib_book;
@@ -2231,7 +2232,7 @@ span.bibbook
2231
2232
  mso-ascii-font-family:Cambria;
2232
2233
  mso-hansi-font-family:Cambria;
2233
2234
  border:none;
2234
- {% if stage_int >= 40 and stage_int < 60 %}background:#99CCFF;{% endif %}
2235
+ background:#99CCFF;
2235
2236
  }
2236
2237
  span.bibchapterno
2237
2238
  {mso-style-name:bib_chapterno;
@@ -2241,7 +2242,7 @@ span.bibchapterno
2241
2242
  mso-ascii-font-family:Cambria;
2242
2243
  mso-hansi-font-family:Cambria;
2243
2244
  border:none;
2244
- {% if stage_int >= 40 and stage_int < 60 %}background:#D9D9D9;{% endif %}
2245
+ background:#D9D9D9;
2245
2246
  }
2246
2247
  span.bibchaptertitle
2247
2248
  {mso-style-name:bib_chaptertitle;
@@ -2251,7 +2252,7 @@ span.bibchaptertitle
2251
2252
  mso-ascii-font-family:Cambria;
2252
2253
  mso-hansi-font-family:Cambria;
2253
2254
  border:none;
2254
- {% if stage_int >= 40 and stage_int < 60 %}background:#FF9D5B;{% endif %}
2255
+ background:#FF9D5B;
2255
2256
  }
2256
2257
  span.bibed-etal
2257
2258
  {mso-style-name:bib_ed-etal;
@@ -2261,7 +2262,7 @@ span.bibed-etal
2261
2262
  mso-ascii-font-family:Cambria;
2262
2263
  mso-hansi-font-family:Cambria;
2263
2264
  border:none;
2264
- {% if stage_int >= 40 and stage_int < 60 %}background:#00F4EE;{% endif %}
2265
+ background:#00F4EE;
2265
2266
  }
2266
2267
  span.bibed-fname
2267
2268
  {mso-style-name:bib_ed-fname;
@@ -2271,7 +2272,7 @@ span.bibed-fname
2271
2272
  mso-ascii-font-family:Cambria;
2272
2273
  mso-hansi-font-family:Cambria;
2273
2274
  border:none;
2274
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFFFB7;{% endif %}
2275
+ background:#FFFFB7;
2275
2276
  }
2276
2277
  span.bibeditionno
2277
2278
  {mso-style-name:bib_editionno;
@@ -2281,7 +2282,7 @@ span.bibeditionno
2281
2282
  mso-ascii-font-family:Cambria;
2282
2283
  mso-hansi-font-family:Cambria;
2283
2284
  border:none;
2284
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFCC00;{% endif %}
2285
+ background:#FFCC00;
2285
2286
  }
2286
2287
  span.bibed-organization
2287
2288
  {mso-style-name:bib_ed-organization;
@@ -2291,7 +2292,7 @@ span.bibed-organization
2291
2292
  mso-ascii-font-family:Cambria;
2292
2293
  mso-hansi-font-family:Cambria;
2293
2294
  border:none;
2294
- {% if stage_int >= 40 and stage_int < 60 %}background:#FCAAC3;{% endif %}
2295
+ background:#FCAAC3;
2295
2296
  }
2296
2297
  span.bibed-suffix
2297
2298
  {mso-style-name:bib_ed-suffix;
@@ -2301,7 +2302,7 @@ span.bibed-suffix
2301
2302
  mso-ascii-font-family:Cambria;
2302
2303
  mso-hansi-font-family:Cambria;
2303
2304
  border:none;
2304
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCFFCC;{% endif %}
2305
+ background:#CCFFCC;
2305
2306
  }
2306
2307
  span.bibed-surname
2307
2308
  {mso-style-name:bib_ed-surname;
@@ -2311,7 +2312,7 @@ span.bibed-surname
2311
2312
  mso-ascii-font-family:Cambria;
2312
2313
  mso-hansi-font-family:Cambria;
2313
2314
  border:none;
2314
- {% if stage_int >= 40 and stage_int < 60 %}background:yellow;{% endif %}
2315
+ background:yellow;
2315
2316
  }
2316
2317
  span.bibinstitution
2317
2318
  {mso-style-name:bib_institution;
@@ -2321,7 +2322,7 @@ span.bibinstitution
2321
2322
  mso-ascii-font-family:Cambria;
2322
2323
  mso-hansi-font-family:Cambria;
2323
2324
  border:none;
2324
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCFFCC;{% endif %}
2325
+ background:#CCFFCC;
2325
2326
  }
2326
2327
  span.bibisbn
2327
2328
  {mso-style-name:bib_isbn;
@@ -2330,7 +2331,7 @@ span.bibisbn
2330
2331
  font-family:$bodyfont;
2331
2332
  mso-ascii-font-family:Cambria;
2332
2333
  mso-hansi-font-family:Cambria;
2333
- {% if stage_int >= 40 and stage_int < 60 %}background:#D9D9D9;{% endif %}
2334
+ background:#D9D9D9;
2334
2335
  }
2335
2336
  span.biblocation
2336
2337
  {mso-style-name:bib_location;
@@ -2340,7 +2341,7 @@ span.biblocation
2340
2341
  mso-ascii-font-family:Cambria;
2341
2342
  mso-hansi-font-family:Cambria;
2342
2343
  border:none;
2343
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFCCCC;{% endif %}
2344
+ background:#FFCCCC;
2344
2345
  }
2345
2346
  span.bibpagecount
2346
2347
  {mso-style-name:bib_pagecount;
@@ -2350,7 +2351,7 @@ span.bibpagecount
2350
2351
  mso-ascii-font-family:Cambria;
2351
2352
  mso-hansi-font-family:Cambria;
2352
2353
  border:none;
2353
- {% if stage_int >= 40 and stage_int < 60 %}background:lime;{% endif %}
2354
+ background:lime;
2354
2355
  }
2355
2356
  span.bibpatent
2356
2357
  {mso-style-name:bib_patent;
@@ -2360,7 +2361,7 @@ span.bibpatent
2360
2361
  mso-ascii-font-family:Cambria;
2361
2362
  mso-hansi-font-family:Cambria;
2362
2363
  border:none;
2363
- {% if stage_int >= 40 and stage_int < 60 %}background:#66FFCC;{% endif %}
2364
+ background:#66FFCC;
2364
2365
  }
2365
2366
  span.bibpublisher
2366
2367
  {mso-style-name:bib_publisher;
@@ -2370,7 +2371,7 @@ span.bibpublisher
2370
2371
  mso-ascii-font-family:Cambria;
2371
2372
  mso-hansi-font-family:Cambria;
2372
2373
  border:none;
2373
- {% if stage_int >= 40 and stage_int < 60 %}background:#FF99CC;{% endif %}
2374
+ background:#FF99CC;
2374
2375
  }
2375
2376
  span.bibreportnum
2376
2377
  {mso-style-name:bib_reportnum;
@@ -2380,7 +2381,7 @@ span.bibreportnum
2380
2381
  mso-ascii-font-family:Cambria;
2381
2382
  mso-hansi-font-family:Cambria;
2382
2383
  border:none;
2383
- {% if stage_int >= 40 and stage_int < 60 %}background:#CCCCFF;{% endif %}
2384
+ background:#CCCCFF;
2384
2385
  }
2385
2386
  span.bibschool
2386
2387
  {mso-style-name:bib_school;
@@ -2390,7 +2391,7 @@ span.bibschool
2390
2391
  mso-ascii-font-family:Cambria;
2391
2392
  mso-hansi-font-family:Cambria;
2392
2393
  border:none;
2393
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFCC66;{% endif %}
2394
+ background:#FFCC66;
2394
2395
  }
2395
2396
  span.bibseries
2396
2397
  {mso-style-name:bib_series;
@@ -2399,7 +2400,7 @@ span.bibseries
2399
2400
  font-family:$bodyfont;
2400
2401
  mso-ascii-font-family:Cambria;
2401
2402
  mso-hansi-font-family:Cambria;
2402
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFCC99;{% endif %}
2403
+ background:#FFCC99;
2403
2404
  }
2404
2405
  span.bibseriesno
2405
2406
  {mso-style-name:bib_seriesno;
@@ -2408,7 +2409,7 @@ span.bibseriesno
2408
2409
  font-family:$bodyfont;
2409
2410
  mso-ascii-font-family:Cambria;
2410
2411
  mso-hansi-font-family:Cambria;
2411
- {% if stage_int >= 40 and stage_int < 60 %}background:#FFFF99;{% endif %}
2412
+ background:#FFFF99;
2412
2413
  }
2413
2414
  span.bibtrans
2414
2415
  {mso-style-name:bib_trans;
@@ -2417,7 +2418,7 @@ span.bibtrans
2417
2418
  font-family:$bodyfont;
2418
2419
  mso-ascii-font-family:Cambria;
2419
2420
  mso-hansi-font-family:Cambria;
2420
- {% if stage_int >= 40 and stage_int < 60 %}background:#99CC00;{% endif %}
2421
+ background:#99CC00;
2421
2422
  }
2422
2423
  span.stdsuppl
2423
2424
  {mso-style-name:std_suppl;
@@ -2427,7 +2428,7 @@ span.stdsuppl
2427
2428
  mso-ascii-font-family:Cambria;
2428
2429
  mso-hansi-font-family:Cambria;
2429
2430
  border:none;
2430
- {% if stage_int >= 40 and stage_int < 60 %}background:#F6FBB5;{% endif %}
2431
+ background:#F6FBB5;
2431
2432
  }
2432
2433
  span.citesection
2433
2434
  {mso-style-name:cite_section;
@@ -2437,7 +2438,7 @@ span.citesection
2437
2438
  mso-ascii-font-family:Cambria;
2438
2439
  mso-hansi-font-family:Cambria;
2439
2440
  border:none;
2440
- {% if stage_int >= 40 and stage_int < 60 %}background:#FF7C80;{% endif %}
2441
+ background:#FF7C80;
2441
2442
  }
2442
2443
 
2443
2444
  p.BaseText, li.BaseText, div.BaseText
@@ -438,8 +438,7 @@ li p {
438
438
  display: none; }
439
439
 
440
440
  p.AltTerms {
441
- margin-bottom: 0;
442
- margin-left: 2em; }
441
+ margin-bottom: 0; }
443
442
 
444
443
  p.Terms {
445
444
  margin-top: 0em; }
@@ -582,7 +581,7 @@ div.figure {
582
581
  font-weight: 700;
583
582
  font-size: 1em;
584
583
  text-align: center; }
585
- div.figure > img {
584
+ div.figure > img, div.figure > svg {
586
585
  margin-left: auto;
587
586
  margin-right: auto;
588
587
  display: block;
@@ -253,7 +253,6 @@ li p {
253
253
 
254
254
  p.AltTerms {
255
255
  margin-bottom: 0;
256
- margin-left: 2em;
257
256
  }
258
257
 
259
258
  p.Terms {
@@ -385,8 +385,7 @@ li p {
385
385
  line-height: 1.2; }
386
386
 
387
387
  p.AltTerms {
388
- margin-bottom: 0;
389
- margin-left: 2em; }
388
+ margin-bottom: 0; }
390
389
 
391
390
  p.Terms {
392
391
  margin-top: 0em; }
@@ -534,7 +533,7 @@ div.figure {
534
533
  font-weight: 700;
535
534
  font-size: 1em;
536
535
  text-align: center; }
537
- div.figure > img {
536
+ div.figure > img, div.figure > svg {
538
537
  margin-left: auto;
539
538
  margin-right: auto;
540
539
  display: block;
@@ -192,7 +192,6 @@ li p {
192
192
 
193
193
  p.AltTerms {
194
194
  margin-bottom: 0;
195
- margin-left: 2em;
196
195
  }
197
196
 
198
197
  p.Terms {
@@ -1760,10 +1760,12 @@ p.TOCTitle, li.TOCTitle, div.TOCTitle {
1760
1760
  margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1761
1761
  mso-header-margin: 35.45pt;
1762
1762
  mso-footer-margin: 14.2pt;
1763
- mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eha;
1764
- mso-header: url("file:///C:/Doc/FILENAME_files/header.html") ha;
1765
- mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") efa;
1766
- mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") fa;
1763
+ mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh1;
1764
+ mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1;
1765
+ mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1;
1766
+ mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f1;
1767
+ mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
1768
+ mso-first-footer: url("file:///C:/Doc/FILENAME_files/header.html") ff1;
1767
1769
  mso-paper-source: 0; }
1768
1770
 
1769
1771
  div.WordSection1 {
@@ -1779,6 +1781,8 @@ div.WordSection1 {
1779
1781
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
1780
1782
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef2;
1781
1783
  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f2;
1784
+ mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
1785
+ mso-first-footer: url("file:///C:/Doc/FILENAME_files/header.html") ff1;
1782
1786
  mso-paper-source: 0; }
1783
1787
 
1784
1788
  /* Does ISO DIS differentiate */
@@ -1817,6 +1821,8 @@ div.WordSection2 {
1817
1821
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
1818
1822
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef3;
1819
1823
  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
1824
+ mso-first-header: url("file:///C:/Doc/FILENAME_files/header.html") fh1;
1825
+ mso-first-footer: url("file:///C:/Doc/FILENAME_files/header.html") ff1;
1820
1826
  mso-paper-source: 0; }
1821
1827
 
1822
1828
  @page WordSection3L {
@@ -1665,10 +1665,12 @@ p.TOCTitle, li.TOCTitle, div.TOCTitle
1665
1665
  margin:39.7pt 53.85pt 1.0cm 53.85pt;
1666
1666
  mso-header-margin:35.45pt;
1667
1667
  mso-footer-margin:14.2pt;
1668
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eha;
1669
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") ha;
1670
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") efa;
1671
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") fa;
1668
+ mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh1;
1669
+ mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
1670
+ mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
1671
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f1;
1672
+ mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
1673
+ mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff1;
1672
1674
  mso-paper-source:0;}
1673
1675
  div.WordSection1
1674
1676
  {page:WordSection1;}
@@ -1682,6 +1684,8 @@ div.WordSection1
1682
1684
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
1683
1685
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
1684
1686
  mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
1687
+ mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
1688
+ mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff1;
1685
1689
  mso-paper-source:0;}
1686
1690
  /* Does ISO DIS differentiate */
1687
1691
  @page WordSection2L
@@ -1716,6 +1720,8 @@ div.WordSection2
1716
1720
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
1717
1721
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
1718
1722
  mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
1723
+ mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh1;
1724
+ mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff1;
1719
1725
  mso-paper-source:0;}
1720
1726
  @page WordSection3L
1721
1727
  {size:841.9pt 595.3pt;