metanorma-iso 2.0.4 → 2.0.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/html/header.html +42 -33
  3. data/lib/isodoc/iso/html/isodoc.css +9 -7
  4. data/lib/isodoc/iso/html/isodoc.scss +7 -5
  5. data/lib/isodoc/iso/html/style-human.css +0 -1
  6. data/lib/isodoc/iso/html/style-human.scss +0 -1
  7. data/lib/isodoc/iso/html/style-iso.css +0 -1
  8. data/lib/isodoc/iso/html/style-iso.scss +0 -1
  9. data/lib/isodoc/iso/html/word_iso_titlepage.html +12 -11
  10. data/lib/isodoc/iso/html/wordstyle.css +46 -19
  11. data/lib/isodoc/iso/html/wordstyle.scss +52 -25
  12. data/lib/isodoc/iso/i18n-en.yaml +7 -2
  13. data/lib/isodoc/iso/i18n-fr.yaml +5 -2
  14. data/lib/isodoc/iso/i18n-ru.yaml +5 -2
  15. data/lib/isodoc/iso/i18n-zh-Hans.yaml +6 -2
  16. data/lib/isodoc/iso/init.rb +1 -2
  17. data/lib/isodoc/iso/iso.amendment.xsl +704 -328
  18. data/lib/isodoc/iso/iso.international-standard.xsl +704 -328
  19. data/lib/isodoc/iso/presentation_xml_convert.rb +58 -21
  20. data/lib/metanorma/iso/boilerplate-fr.xml +5 -6
  21. data/lib/metanorma/iso/boilerplate-ru.xml +4 -6
  22. data/lib/metanorma/iso/boilerplate.xml +5 -6
  23. data/lib/metanorma/iso/cleanup.rb +43 -10
  24. data/lib/metanorma/iso/front_id.rb +1 -0
  25. data/lib/metanorma/iso/processor.rb +14 -7
  26. data/lib/metanorma/iso/validate.rb +29 -1
  27. data/lib/metanorma/iso/validate_image.rb +3 -3
  28. data/lib/metanorma/iso/validate_list.rb +122 -0
  29. data/lib/metanorma/iso/validate_section.rb +39 -32
  30. data/lib/metanorma/iso/validate_style.rb +32 -2
  31. data/lib/metanorma/iso/validate_title.rb +13 -1
  32. data/lib/metanorma/iso/version.rb +1 -1
  33. data/metanorma-iso.gemspec +1 -1
  34. data/spec/isodoc/inline_spec.rb +127 -10
  35. data/spec/isodoc/postproc_spec.rb +2 -4
  36. data/spec/isodoc/terms_spec.rb +4 -4
  37. data/spec/metanorma/cleanup_spec.rb +11 -11
  38. data/spec/metanorma/refs_spec.rb +273 -61
  39. data/spec/metanorma/section_spec.rb +18 -26
  40. data/spec/metanorma/validate_spec.rb +448 -17
  41. data/spec/spec_helper.rb +6 -4
  42. data/spec/vcr_cassettes/docrels.yml +393 -0
  43. data/spec/vcr_cassettes/withdrawn_iso.yml +301 -0
  44. metadata +8 -5
@@ -361,7 +361,7 @@ h1.Annex
361
361
  font-size:$normalfontsize;
362
362
  font-weight: normal ;
363
363
  {% else %}
364
- font-size:13.0pt;
364
+ font-size:11.0pt;
365
365
  font-weight:bold;
366
366
  {% endif %}
367
367
  mso-bidi-font-size:$normalfontsize;
@@ -398,7 +398,7 @@ h2
398
398
  font-size:$normalfontsize;
399
399
  font-weight: normal ;
400
400
  {% else %}
401
- font-size:13.0pt;
401
+ font-size:11.0pt;
402
402
  font-weight:bold;
403
403
  {% endif %}
404
404
  font-family:$headerfont;
@@ -1102,6 +1102,26 @@ p.Tablebody, li.Tablebody, div.Tablebody
1102
1102
  mso-ascii-font-family:$bodyfont;
1103
1103
  mso-fareast-font-family:"SimSun",serif;
1104
1104
  mso-hansi-font-family:$bodyfont;}
1105
+ p.TOCTitle, li.TOCTitle, div.TOCTitle
1106
+ {mso-style-name:"TOC Title";
1107
+ mso-style-unhide:no;
1108
+ margin-top:0in;
1109
+ margin-right:0in;
1110
+ margin-bottom:$normalfontsize;
1111
+ margin-left:0in;
1112
+ text-align:left;
1113
+ page-break-after:avoid;
1114
+ mso-pagination:none;
1115
+ mso-hyphenate:none;
1116
+ mso-layout-grid-align:none;
1117
+ font-size:$normalfontsize;
1118
+ mso-bidi-font-size:10.0pt;
1119
+ font-weight:bold;
1120
+ font-family:$headerfont;
1121
+ mso-fareast-font-family:$headerfont;
1122
+ mso-bidi-font-family:$headerfont;
1123
+ mso-fareast-language:EN-US;}
1124
+
1105
1125
  /* Page Definitions */
1106
1126
  @page
1107
1127
  {mso-mirror-margins:yes;
@@ -1112,21 +1132,23 @@ p.Tablebody, li.Tablebody, div.Tablebody
1112
1132
  mso-facing-pages:yes;
1113
1133
  }
1114
1134
  @page WordSection1
1115
- {size:595.0pt 842.0pt;
1116
- margin:72.0pt 90.0pt 72.0pt 90.0pt;
1117
- mso-header-margin:35.4pt;
1118
- mso-footer-margin:35.4pt;
1135
+ {size:595.3pt 841.9pt;
1136
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1137
+ mso-header-margin:35.45pt;
1138
+ mso-footer-margin:0cm;
1139
+ mso-gutter-margin:1.0cm;
1119
1140
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eha;
1120
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") ha;
1121
1141
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") efa;
1142
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") fa;
1122
1143
  mso-paper-source:0;}
1123
1144
  div.WordSection1
1124
1145
  {page:WordSection1;}
1125
1146
  @page WordSection2
1126
1147
  {size:595.3pt 841.9pt;
1127
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
1128
- mso-header-margin:35.45pt;
1129
- mso-footer-margin:14.2pt;
1148
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1149
+ mso-header-margin:35.45pt;
1150
+ mso-footer-margin:0cm;
1151
+ mso-gutter-margin:1.0cm;
1130
1152
  mso-page-numbers:roman-lower;
1131
1153
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1132
1154
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -1135,9 +1157,10 @@ div.WordSection1
1135
1157
  mso-paper-source:0;}
1136
1158
  @page WordSection2L
1137
1159
  {size:841.9pt 595.3pt;
1138
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
1139
- mso-header-margin:35.45pt;
1140
- mso-footer-margin:14.2pt;
1160
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1161
+ mso-header-margin:35.45pt;
1162
+ mso-footer-margin:0cm;
1163
+ mso-gutter-margin:1.0cm;
1141
1164
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
1142
1165
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
1143
1166
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
@@ -1145,9 +1168,10 @@ div.WordSection1
1145
1168
  mso-paper-source:0;}
1146
1169
  @page WordSection2P
1147
1170
  {size:595.3pt 841.9pt;
1148
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
1149
- mso-header-margin:35.45pt;
1150
- mso-footer-margin:14.2pt;
1171
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1172
+ mso-header-margin:35.45pt;
1173
+ mso-footer-margin:0cm;
1174
+ mso-gutter-margin:1.0cm;
1151
1175
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1152
1176
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
1153
1177
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
@@ -1157,9 +1181,10 @@ div.WordSection2
1157
1181
  {page:WordSection2;}
1158
1182
  @page WordSection3
1159
1183
  {size:595.3pt 841.9pt;
1160
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
1161
- mso-header-margin:35.45pt;
1162
- mso-footer-margin:14.2pt;
1184
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1185
+ mso-header-margin:35.45pt;
1186
+ mso-footer-margin:0cm;
1187
+ mso-gutter-margin:1.0cm;
1163
1188
  mso-page-numbers:1;
1164
1189
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1165
1190
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -1168,9 +1193,10 @@ div.WordSection2
1168
1193
  mso-paper-source:0;}
1169
1194
  @page WordSection3L
1170
1195
  {size:841.9pt 595.3pt;
1171
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
1172
- mso-header-margin:35.45pt;
1173
- mso-footer-margin:14.2pt;
1196
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1197
+ mso-header-margin:35.45pt;
1198
+ mso-footer-margin:0cm;
1199
+ mso-gutter-margin:1.0cm;
1174
1200
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
1175
1201
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
1176
1202
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
@@ -1178,9 +1204,10 @@ div.WordSection2
1178
1204
  mso-paper-source:0;}
1179
1205
  @page WordSection3P
1180
1206
  {size:595.3pt 841.9pt;
1181
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
1182
- mso-header-margin:35.45pt;
1183
- mso-footer-margin:14.2pt;
1207
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1208
+ mso-header-margin:35.45pt;
1209
+ mso-footer-margin:0cm;
1210
+ mso-gutter-margin:1.0cm;
1184
1211
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1185
1212
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
1186
1213
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
@@ -4,14 +4,16 @@ term_def_boilerplate: |
4
4
 
5
5
  <ul>
6
6
  <li> <p>ISO Online browsing platform: available at
7
- <link target="http://www.iso.org/obp"/></p> </li>
7
+ <link target="https://www.iso.org/obp"/></p></li>
8
8
  <li> <p>IEC Electropedia: available at
9
- <link target="http://www.electropedia.org"/>
9
+ <link target="https://www.electropedia.org"/>
10
10
  </p> </li> </ul>
11
11
  all_rights_reserved: All rights reserved
12
12
  reference_number: Reference Number
13
13
  price_based_on: Price based on % pages
14
14
  under_preparation: Under preparation. (Stage at the time of publication %).
15
+ withdrawn: Withdrawn.
16
+ cancelled_and_replaced: Cancelled and replaced by %.
15
17
  table_of_contents: Contents
16
18
  date: Date
17
19
  index: Index
@@ -19,6 +21,9 @@ see: see
19
21
  see_also: see also
20
22
  secretariat: Secretariat
21
23
  edition: edition
24
+ termsrelated: Terms related to
25
+ multiple_and: "%1 and %2"
26
+ multiple_or: "%1 or %2"
22
27
  doctype_dict:
23
28
  international-standard: International Standard
24
29
  technical-specification: Technical Specification
@@ -4,20 +4,23 @@ term_def_boilerplate: |
4
4
  suivantes:</p>
5
5
  <ul>
6
6
  <li> <p>ISO Online browsing platform: disponible à l'adresse
7
- <link target="http://www.iso.org/obp"/></p> </li>
7
+ <link target="https://www.iso.org/obp"/></p></li>
8
8
  <li> <p>IEC Electropedia: disponible à l'adresse
9
- <link target="http://www.electropedia.org"/>
9
+ <link target="https://www.electropedia.org"/>
10
10
  </p> </li> </ul>
11
11
  all_rights_reserved: Tous droits réservés
12
12
  reference_number: Numéro de référence
13
13
  price_based_on: Prix basé sur % pages
14
14
  under_preparation: En cours d'élaboration. (Stade au moment de la publication %).
15
+ withdrawn: Retiré.
16
+ cancelled_and_replaced: Annulé et remplacé par %.
15
17
  date: Date
16
18
  index: Index
17
19
  see: voir
18
20
  see_also: voir aussi
19
21
  secretariat: Secrétariat
20
22
  edition: édition
23
+ termsrelated: Termes liés
21
24
  doctype_dict:
22
25
  international-standard: Norme internationale
23
26
  technical-specification: Spécification technique
@@ -3,14 +3,16 @@ term_def_boilerplate: |
3
3
 
4
4
  <ul>
5
5
  <li> <p>ИСО, Интернет-онлайн-платформа: доступна на
6
- <link target="http://www.iso.org/obp"/></p> </li>
6
+ <link target="https://www.iso.org/obp"/></p></li>
7
7
  <li> <p>МЭК Electropedia: доступна на
8
- <link target="http://www.electropedia.org"/>
8
+ <link target="https://www.electropedia.org"/>
9
9
  </p> </li> </ul>
10
10
  all_rights_reserved: Все права защищены
11
11
  reference_number: Ссылочный номер
12
12
  price_based_on: Цена рассчитана на % стр.
13
13
  under_preparation: В стадии подготовки. (Стадия на момент публикации %).
14
+ withdrawn: Отозван.
15
+ cancelled_and_replaced: Отменено и заменено на %.
14
16
  table_of_contents: Содержание
15
17
  date: Дата
16
18
  index: Алфавитный указатель
@@ -19,6 +21,7 @@ see_also: см. также
19
21
  secretariat: Секретариат
20
22
  scope: Область применения
21
23
  edition: издание
24
+ termsrelated: Термины, связанные
22
25
  doctype_dict:
23
26
  international-standard: Международный Стандарт
24
27
  technical-specification: Техническая Спецификация
@@ -2,19 +2,23 @@ term_def_boilerplate: |
2
2
  <p>ISO和IEC用于标准化的术语数据库地址如下:</p>
3
3
  <ul>
4
4
  <li> <p>ISO在线浏览平台:
5
- 位于<link target="http://www.iso.org/obp"/></p></li>
5
+ 位于<link target="https://www.iso.org/obp"/></p></li>
6
6
  <li> <p>IEC Electropedia:
7
- 位于<link target="http://www.electropedia.org"/>
7
+ 位于<link target="https://www.electropedia.org"/>
8
8
  </p> </li> </ul>
9
9
  all_rights_reserved: 版权所有
10
10
  reference_number: 参考编号
11
11
  price_based_on: 价格基于%页
12
12
  under_preparation: 制定中(出版时最新状态为%)
13
+ withdrawn: 撤回 .
14
+ cancelled_and_replaced: 已取消并由%取代。
13
15
  date: 日期
14
16
  index: 索引
15
17
  see: 见
16
18
  see_also: 另见
17
19
  secretariat: 秘书处
20
+ edition: 版
21
+ termsrelated: 相关术语
18
22
  doctype_dict:
19
23
  international-standard: 国际标准
20
24
  technical-specification: 技术规格
@@ -10,7 +10,7 @@ module IsoDoc
10
10
  @meta = Metadata.new(lang, script, i18n)
11
11
  end
12
12
 
13
- def xref_init(lang, script, klass, i18n, options)
13
+ def xref_init(lang, script, _klass, i18n, options)
14
14
  html = HtmlConvert.new(language: lang, script: script)
15
15
  @xrefs = Xref.new(lang, script, html, i18n, options)
16
16
  end
@@ -30,4 +30,3 @@ module IsoDoc
30
30
  end
31
31
  end
32
32
  end
33
-