metanorma-generic 2.3.0 → 2.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/generic/html/htmlstyle.scss +6 -0
  3. data/lib/metanorma/generic/basicdoc.rng +0 -1
  4. data/lib/metanorma/generic/biblio.rng +12 -2
  5. data/lib/metanorma/generic/converter.rb +1 -0
  6. data/lib/metanorma/generic/front.rb +21 -15
  7. data/lib/metanorma/generic/isodoc.rng +66 -295
  8. data/lib/metanorma/generic/version.rb +1 -1
  9. data/metanorma-generic.gemspec +1 -1
  10. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0dd504b980d302a384bf30ad0cb8bb27f187872d50aebd306a589dddfed2bb1b
4
- data.tar.gz: d5bbbc40fa58ea157bf1c2e04653031598fd4c3c5639930863ee3c00e4213973
3
+ metadata.gz: 4bf92a793e5141d7d7b715f71375bfc2b0de7cab4bc35738485ada265f9f4857
4
+ data.tar.gz: a8fc280993417feb35132d8dbf80f4fe7730a32eec3ff8a04a3343d8998b3837
5
5
  SHA512:
6
- metadata.gz: 2d4f3a66ff3d2b843dd8b0f7da4cef54047f3b5c6a6ebfff78e60e398e8a60e299295b93bbacbc87899ff017c9c6d69b27a9b3d7227f251bf7db952545ec5dbd
7
- data.tar.gz: 400488911c1e7a003ad49d38e162c93dd2ef8eb2c8e5113554424ce1b322ffd9747917360c718c42c75e4029a767fd7fc7cd103112a11f77e74a793230871ceb
6
+ metadata.gz: e1805ec8eaf913758af97730b60689de59dfa9859818be48e3f856b87419d4f20741de99586e944151f92a56674a64709738fb87dea0c420d35202da2422920d
7
+ data.tar.gz: 575184663fb71706e02584764f68762ba94c7c5970877007df786344c8d928e328701bef8a89bdeb3c33158b8b85d47e38cda2b543f614ecbd889cd585ad550f
data/lib/isodoc/generic/html/htmlstyle.scss CHANGED
@@ -82,6 +82,12 @@ div.figure {
82
82
  @include figureBlock();
83
83
  }
84
84
 
85
+ table div.figure {
86
+ padding: 0;
87
+ margin: 0;
88
+ }
89
+
90
+
85
91
  /*
86
92
  Document types + stages
87
93
  */
data/lib/metanorma/generic/basicdoc.rng CHANGED
@@ -522,7 +522,6 @@
522
522
  <value>tip</value>
523
523
  <value>important</value>
524
524
  <value>caution</value>
525
- <value>statement</value>
526
525
  </choice>
527
526
  </define>
528
527
  <define name="figure">
data/lib/metanorma/generic/biblio.rng CHANGED
@@ -216,6 +216,9 @@
216
216
  <optional>
217
217
  <ref name="fullname"/>
218
218
  </optional>
219
+ <zeroOrMore>
220
+ <ref name="credential"/>
221
+ </zeroOrMore>
219
222
  <zeroOrMore>
220
223
  <ref name="affiliation"/>
221
224
  </zeroOrMore>
@@ -232,6 +235,11 @@
232
235
  <ref name="FullNameType"/>
233
236
  </element>
234
237
  </define>
238
+ <define name="credential">
239
+ <element name="credential">
240
+ <text/>
241
+ </element>
242
+ </define>
235
243
  <define name="FullNameType">
236
244
  <choice>
237
245
  <group>
@@ -305,7 +313,9 @@
305
313
  <zeroOrMore>
306
314
  <ref name="affiliationdescription"/>
307
315
  </zeroOrMore>
308
- <ref name="organization"/>
316
+ <optional>
317
+ <ref name="organization"/>
318
+ </optional>
309
319
  </element>
310
320
  </define>
311
321
  <define name="affiliationname">
@@ -1316,7 +1326,7 @@
1316
1326
  <value>commentaryOf</value>
1317
1327
  <value>hasCommentary</value>
1318
1328
  <value>related</value>
1319
- <value>complements</value>
1329
+ <value>hasComplement</value>
1320
1330
  <value>complementOf</value>
1321
1331
  <value>obsoletes</value>
1322
1332
  <value>obsoletedBy</value>
data/lib/metanorma/generic/converter.rb CHANGED
@@ -32,6 +32,7 @@ module Metanorma
32
32
  template = configuration.docid_template ||
33
33
  "{{ organization_name_short }} {{ docnumeric }}"
34
34
  docid = xmldoc.at("//bibdata/docidentifier")
35
+ docid&.text&.empty? or return
35
36
  id = boilerplate_isodoc(xmldoc).populate_template(template, nil)
36
37
  (id.empty? and docid.remove) or docid.children = id
37
38
  end
data/lib/metanorma/generic/front.rb CHANGED
@@ -9,7 +9,7 @@ module Metanorma
9
9
  if !configuration.organization_name_long.empty? &&
10
10
  !configuration.organization_name_short.empty? &&
11
11
  configuration.organization_name_long !=
12
- configuration.organization_name_short
12
+ configuration.organization_name_short
13
13
  { configuration.organization_name_long =>
14
14
  configuration.organization_name_short }
15
15
  else
@@ -23,13 +23,14 @@ module Metanorma
23
23
 
24
24
  def metadata_committee(node, xml)
25
25
  return unless node.attr("committee")
26
+
26
27
  xml.editorialgroup do |a|
27
28
  a.committee node.attr("committee"),
28
- **attr_code(type: node.attr("committee-type"))
29
+ **attr_code(type: node.attr("committee-type"))
29
30
  i = 2
30
- while node.attr("committee_#{i}") do
31
+ while node.attr("committee_#{i}")
31
32
  a.committee node.attr("committee_#{i}"),
32
- **attr_code(type: node.attr("committee-type_#{i}"))
33
+ **attr_code(type: node.attr("committee-type_#{i}"))
33
34
  i += 1
34
35
  end
35
36
  end
@@ -38,16 +39,16 @@ module Metanorma
38
39
  def metadata_status(node, xml)
39
40
  xml.status do |s|
40
41
  s.stage ( node.attr("status") || node.attr("docstage") ||
41
- configuration.default_stage || "published" )
42
+ configuration.default_stage || "published")
42
43
  x = node.attr("substage") and s.substage x
43
44
  x = node.attr("iteration") and s.iteration x
44
45
  end
45
46
  end
46
47
 
47
48
  def metadata_id(node, xml)
48
- xml.docidentifier **{ type:
49
- configuration.organization_name_short } do |i|
50
- i << "DUMMY"
49
+ xml.docidentifier type:
50
+ configuration.organization_name_short do |i|
51
+ i << (node.attr("docidentifier") || "")
51
52
  end
52
53
  xml.docnumber { |i| i << node.attr("docnumber") }
53
54
  end
@@ -72,8 +73,9 @@ module Metanorma
72
73
 
73
74
  def metadata_ext_hash(node, ext, hash)
74
75
  hash.each do |k, v|
75
- next if EXT_STRUCT.include?(k) || !v&.is_a?(Hash) && !node.attr(k)
76
- if v&.is_a?(Hash) && v["_list"]
76
+ next if EXT_STRUCT.include?(k) || (!v.is_a?(Hash) && !node.attr(k))
77
+
78
+ if v.is_a?(Hash) && v["_list"]
77
79
  csv_split(node.attr(k), ",").each do |val|
78
80
  metadata_ext_hash1(k, val, ext, v, node)
79
81
  end
@@ -84,21 +86,25 @@ module Metanorma
84
86
  end
85
87
 
86
88
  def metadata_ext_hash1(key, value, ext, hash, node)
87
- return if hash&.is_a?(Hash) && hash["_attribute"]
88
- is_hash = hash&.is_a?(Hash) &&
89
- !hash.keys.reject { |n| EXT_STRUCT.include?(n) }.empty?
89
+ return if hash.is_a?(Hash) && hash["_attribute"]
90
+
91
+ is_hash = hash.is_a?(Hash) &&
92
+ !hash.keys.reject { |n| EXT_STRUCT.include?(n) }.empty?
90
93
  return if !is_hash && (value.nil? || value.empty?)
91
- name = hash&.is_a?(Hash) ? (hash["_output"] || key) : key
94
+
95
+ name = hash.is_a?(Hash) ? (hash["_output"] || key) : key
92
96
  ext.send name, **attr_code(metadata_ext_attrs(hash, node)) do |e|
93
- is_hash ? metadata_ext_hash(node, e, hash) : (e << value)
97
+ is_hash ? metadata_ext_hash(node, e, hash) : (e << value)
94
98
  end
95
99
  end
96
100
 
97
101
  def metadata_ext_attrs(hash, node)
98
102
  return {} unless hash.is_a?(Hash)
103
+
99
104
  ret = {}
100
105
  hash.each do |k, v|
101
106
  next unless v.is_a?(Hash) && v["_attribute"]
107
+
102
108
  ret[(v["_output"] || k).to_sym] = node.attr(k)
103
109
  end
104
110
  ret
data/lib/metanorma/generic/isodoc.rng CHANGED
@@ -66,6 +66,7 @@
66
66
  <value>caution</value>
67
67
  <value>statement</value>
68
68
  <value>editorial</value>
69
+ <value>box</value>
69
70
  </choice>
70
71
  </define>
71
72
  <define name="index">
@@ -219,24 +220,7 @@
219
220
  <attribute name="id">
220
221
  <data type="ID"/>
221
222
  </attribute>
222
- <optional>
223
- <attribute name="keep-with-next">
224
- <data type="boolean"/>
225
- </attribute>
226
- </optional>
227
- <optional>
228
- <attribute name="keep-lines-together">
229
- <data type="boolean"/>
230
- </attribute>
231
- </optional>
232
- <optional>
233
- <attribute name="tag"/>
234
- </optional>
235
- <optional>
236
- <attribute name="multilingual-rendering">
237
- <ref name="MultilingualRenderingType"/>
238
- </attribute>
239
- </optional>
223
+ <ref name="BlockAttributes"/>
240
224
  <optional>
241
225
  <ref name="tname"/>
242
226
  </optional>
@@ -253,24 +237,7 @@
253
237
  <attribute name="id">
254
238
  <data type="ID"/>
255
239
  </attribute>
256
- <optional>
257
- <attribute name="keep-with-next">
258
- <data type="boolean"/>
259
- </attribute>
260
- </optional>
261
- <optional>
262
- <attribute name="keep-lines-together">
263
- <data type="boolean"/>
264
- </attribute>
265
- </optional>
266
- <optional>
267
- <attribute name="tag"/>
268
- </optional>
269
- <optional>
270
- <attribute name="multilingual-rendering">
271
- <ref name="MultilingualRenderingType"/>
272
- </attribute>
273
- </optional>
240
+ <ref name="BlockAttributes"/>
274
241
  <optional>
275
242
  <attribute name="type">
276
243
  <choice>
@@ -298,29 +265,12 @@
298
265
  <attribute name="id">
299
266
  <data type="ID"/>
300
267
  </attribute>
301
- <optional>
302
- <attribute name="keep-with-next">
303
- <data type="boolean"/>
304
- </attribute>
305
- </optional>
306
- <optional>
307
- <attribute name="keep-lines-together">
308
- <data type="boolean"/>
309
- </attribute>
310
- </optional>
268
+ <ref name="BlockAttributes"/>
311
269
  <optional>
312
270
  <attribute name="key">
313
271
  <data type="boolean"/>
314
272
  </attribute>
315
273
  </optional>
316
- <optional>
317
- <attribute name="tag"/>
318
- </optional>
319
- <optional>
320
- <attribute name="multilingual-rendering">
321
- <ref name="MultilingualRenderingType"/>
322
- </attribute>
323
- </optional>
324
274
  <optional>
325
275
  <ref name="tname"/>
326
276
  </optional>
@@ -361,24 +311,7 @@
361
311
  <optional>
362
312
  <attribute name="number"/>
363
313
  </optional>
364
- <optional>
365
- <attribute name="keep-with-next">
366
- <data type="boolean"/>
367
- </attribute>
368
- </optional>
369
- <optional>
370
- <attribute name="keep-lines-together">
371
- <data type="boolean"/>
372
- </attribute>
373
- </optional>
374
- <optional>
375
- <attribute name="tag"/>
376
- </optional>
377
- <optional>
378
- <attribute name="multilingual-rendering">
379
- <ref name="MultilingualRenderingType"/>
380
- </attribute>
381
- </optional>
314
+ <ref name="BlockAttributes"/>
382
315
  <optional>
383
316
  <ref name="tname"/>
384
317
  </optional>
@@ -426,27 +359,10 @@
426
359
  <data type="anyURI"/>
427
360
  </attribute>
428
361
  </optional>
429
- <optional>
430
- <attribute name="keep-with-next">
431
- <data type="boolean"/>
432
- </attribute>
433
- </optional>
434
- <optional>
435
- <attribute name="keep-lines-together">
436
- <data type="boolean"/>
437
- </attribute>
438
- </optional>
439
362
  <optional>
440
363
  <attribute name="width"/>
441
364
  </optional>
442
- <optional>
443
- <attribute name="tag"/>
444
- </optional>
445
- <optional>
446
- <attribute name="multilingual-rendering">
447
- <ref name="MultilingualRenderingType"/>
448
- </attribute>
449
- </optional>
365
+ <ref name="BlockAttributes"/>
450
366
  <optional>
451
367
  <ref name="colgroup"/>
452
368
  </optional>
@@ -484,27 +400,10 @@
484
400
  <optional>
485
401
  <attribute name="subsequence"/>
486
402
  </optional>
487
- <optional>
488
- <attribute name="keep-with-next">
489
- <data type="boolean"/>
490
- </attribute>
491
- </optional>
492
- <optional>
493
- <attribute name="keep-lines-together">
494
- <data type="boolean"/>
495
- </attribute>
496
- </optional>
497
403
  <optional>
498
404
  <attribute name="class"/>
499
405
  </optional>
500
- <optional>
501
- <attribute name="tag"/>
502
- </optional>
503
- <optional>
504
- <attribute name="multilingual-rendering">
505
- <ref name="MultilingualRenderingType"/>
506
- </attribute>
507
- </optional>
406
+ <ref name="BlockAttributes"/>
508
407
  <optional>
509
408
  <ref name="source"/>
510
409
  </optional>
@@ -550,25 +449,13 @@
550
449
  <optional>
551
450
  <attribute name="subsequence"/>
552
451
  </optional>
553
- <optional>
554
- <attribute name="keep-with-next">
555
- <data type="boolean"/>
556
- </attribute>
557
- </optional>
558
- <optional>
559
- <attribute name="keep-lines-together">
560
- <data type="boolean"/>
561
- </attribute>
562
- </optional>
563
452
  <optional>
564
453
  <attribute name="lang"/>
565
454
  </optional>
455
+ <ref name="BlockAttributes"/>
566
456
  <optional>
567
- <attribute name="tag"/>
568
- </optional>
569
- <optional>
570
- <attribute name="multilingual-rendering">
571
- <ref name="MultilingualRenderingType"/>
457
+ <attribute name="linenums">
458
+ <data type="boolean"/>
572
459
  </attribute>
573
460
  </optional>
574
461
  <optional>
@@ -604,29 +491,12 @@
604
491
  <optional>
605
492
  <attribute name="subsequence"/>
606
493
  </optional>
607
- <optional>
608
- <attribute name="keep-with-next">
609
- <data type="boolean"/>
610
- </attribute>
611
- </optional>
612
- <optional>
613
- <attribute name="keep-lines-together">
614
- <data type="boolean"/>
615
- </attribute>
616
- </optional>
617
494
  <optional>
618
495
  <attribute name="inequality">
619
496
  <data type="boolean"/>
620
497
  </attribute>
621
498
  </optional>
622
- <optional>
623
- <attribute name="tag"/>
624
- </optional>
625
- <optional>
626
- <attribute name="multilingual-rendering">
627
- <ref name="MultilingualRenderingType"/>
628
- </attribute>
629
- </optional>
499
+ <ref name="BlockAttributes"/>
630
500
  <ref name="stem"/>
631
501
  <optional>
632
502
  <ref name="dl"/>
@@ -645,27 +515,7 @@
645
515
  <ref name="Alignments"/>
646
516
  </attribute>
647
517
  </optional>
648
- <optional>
649
- <attribute name="keep-with-next">
650
- <data type="boolean"/>
651
- </attribute>
652
- </optional>
653
- <optional>
654
- <attribute name="keep-lines-together">
655
- <data type="boolean"/>
656
- </attribute>
657
- </optional>
658
- <optional>
659
- <attribute name="tag"/>
660
- </optional>
661
- <optional>
662
- <attribute name="type"/>
663
- </optional>
664
- <optional>
665
- <attribute name="multilingual-rendering">
666
- <ref name="MultilingualRenderingType"/>
667
- </attribute>
668
- </optional>
518
+ <ref name="BlockAttributes"/>
669
519
  <zeroOrMore>
670
520
  <ref name="TextElement"/>
671
521
  </zeroOrMore>
@@ -683,27 +533,10 @@
683
533
  <ref name="Alignments"/>
684
534
  </attribute>
685
535
  </optional>
686
- <optional>
687
- <attribute name="keep-with-next">
688
- <data type="boolean"/>
689
- </attribute>
690
- </optional>
691
- <optional>
692
- <attribute name="keep-lines-together">
693
- <data type="boolean"/>
694
- </attribute>
695
- </optional>
696
- <optional>
697
- <attribute name="tag"/>
698
- </optional>
699
536
  <optional>
700
537
  <attribute name="type"/>
701
538
  </optional>
702
- <optional>
703
- <attribute name="multilingual-rendering">
704
- <ref name="MultilingualRenderingType"/>
705
- </attribute>
706
- </optional>
539
+ <ref name="BlockAttributes"/>
707
540
  <zeroOrMore>
708
541
  <choice>
709
542
  <ref name="TextElement"/>
@@ -725,24 +558,7 @@
725
558
  <ref name="Alignments"/>
726
559
  </attribute>
727
560
  </optional>
728
- <optional>
729
- <attribute name="keep-with-next">
730
- <data type="boolean"/>
731
- </attribute>
732
- </optional>
733
- <optional>
734
- <attribute name="keep-lines-together">
735
- <data type="boolean"/>
736
- </attribute>
737
- </optional>
738
- <optional>
739
- <attribute name="tag"/>
740
- </optional>
741
- <optional>
742
- <attribute name="multilingual-rendering">
743
- <ref name="MultilingualRenderingType"/>
744
- </attribute>
745
- </optional>
561
+ <ref name="BlockAttributes"/>
746
562
  <optional>
747
563
  <ref name="quote-source"/>
748
564
  </optional>
@@ -822,27 +638,9 @@
822
638
  <optional>
823
639
  <attribute name="subsequence"/>
824
640
  </optional>
825
- <optional>
826
- <attribute name="keep-with-next">
827
- <data type="boolean"/>
828
- </attribute>
829
- </optional>
830
- <optional>
831
- <attribute name="keep-lines-together">
832
- <data type="boolean"/>
833
- </attribute>
834
- </optional>
835
641
  <optional>
836
642
  <attribute name="type"/>
837
643
  </optional>
838
- <optional>
839
- <attribute name="tag"/>
840
- </optional>
841
- <optional>
842
- <attribute name="multilingual-rendering">
843
- <ref name="MultilingualRenderingType"/>
844
- </attribute>
845
- </optional>
846
644
  <optional>
847
645
  <attribute name="coverpage">
848
646
  <data type="boolean"/>
@@ -853,6 +651,7 @@
853
651
  <data type="boolean"/>
854
652
  </attribute>
855
653
  </optional>
654
+ <ref name="BlockAttributes"/>
856
655
  <oneOrMore>
857
656
  <choice>
858
657
  <ref name="paragraph"/>
@@ -1238,6 +1037,11 @@
1238
1037
  </define>
1239
1038
  <define name="concept">
1240
1039
  <element name="concept">
1040
+ <optional>
1041
+ <attribute name="bold">
1042
+ <data type="boolean"/>
1043
+ </attribute>
1044
+ </optional>
1241
1045
  <optional>
1242
1046
  <attribute name="ital">
1243
1047
  <data type="boolean"/>
@@ -1321,14 +1125,7 @@
1321
1125
  <optional>
1322
1126
  <attribute name="class"/>
1323
1127
  </optional>
1324
- <optional>
1325
- <attribute name="tag"/>
1326
- </optional>
1327
- <optional>
1328
- <attribute name="multilingual-rendering">
1329
- <ref name="MultilingualRenderingType"/>
1330
- </attribute>
1331
- </optional>
1128
+ <ref name="BlockAttributes"/>
1332
1129
  <zeroOrMore>
1333
1130
  <choice>
1334
1131
  <ref name="TextElement"/>
@@ -1567,10 +1364,13 @@
1567
1364
  <zeroOrMore>
1568
1365
  <ref name="indexsect"/>
1569
1366
  </zeroOrMore>
1367
+ <optional>
1368
+ <ref name="colophon"/>
1369
+ </optional>
1570
1370
  </element>
1571
1371
  </define>
1572
1372
  <define name="misccontainer">
1573
- <element name="misc-container">
1373
+ <element name="metanorma-extension">
1574
1374
  <oneOrMore>
1575
1375
  <ref name="AnyElement"/>
1576
1376
  </oneOrMore>
@@ -1589,6 +1389,13 @@
1589
1389
  </oneOrMore>
1590
1390
  </element>
1591
1391
  </define>
1392
+ <define name="colophon">
1393
+ <element name="colophon">
1394
+ <oneOrMore>
1395
+ <ref name="content"/>
1396
+ </oneOrMore>
1397
+ </element>
1398
+ </define>
1592
1399
  <define name="foreword">
1593
1400
  <element name="foreword">
1594
1401
  <ref name="Content-Section"/>
@@ -1887,7 +1694,10 @@
1887
1694
  </zeroOrMore>
1888
1695
  <choice>
1889
1696
  <oneOrMore>
1890
- <ref name="term"/>
1697
+ <choice>
1698
+ <ref name="term"/>
1699
+ <ref name="terms"/>
1700
+ </choice>
1891
1701
  </oneOrMore>
1892
1702
  <group>
1893
1703
  <zeroOrMore>
@@ -1913,14 +1723,7 @@
1913
1723
  <optional>
1914
1724
  <attribute name="script"/>
1915
1725
  </optional>
1916
- <optional>
1917
- <attribute name="tag"/>
1918
- </optional>
1919
- <optional>
1920
- <attribute name="multilingual-rendering">
1921
- <ref name="MultilingualRenderingType"/>
1922
- </attribute>
1923
- </optional>
1726
+ <ref name="BlockAttributes"/>
1924
1727
  <oneOrMore>
1925
1728
  <ref name="preferred"/>
1926
1729
  </oneOrMore>
@@ -2261,24 +2064,7 @@
2261
2064
  <optional>
2262
2065
  <attribute name="subsequence"/>
2263
2066
  </optional>
2264
- <optional>
2265
- <attribute name="keep-with-next">
2266
- <data type="boolean"/>
2267
- </attribute>
2268
- </optional>
2269
- <optional>
2270
- <attribute name="keep-lines-together">
2271
- <data type="boolean"/>
2272
- </attribute>
2273
- </optional>
2274
- <optional>
2275
- <attribute name="tag"/>
2276
- </optional>
2277
- <optional>
2278
- <attribute name="multilingual-rendering">
2279
- <ref name="MultilingualRenderingType"/>
2280
- </attribute>
2281
- </optional>
2067
+ <ref name="BlockAttributes"/>
2282
2068
  <oneOrMore>
2283
2069
  <choice>
2284
2070
  <ref name="paragraph"/>
@@ -2295,24 +2081,7 @@
2295
2081
  <attribute name="id">
2296
2082
  <data type="ID"/>
2297
2083
  </attribute>
2298
- <optional>
2299
- <attribute name="keep-with-next">
2300
- <data type="boolean"/>
2301
- </attribute>
2302
- </optional>
2303
- <optional>
2304
- <attribute name="keep-lines-together">
2305
- <data type="boolean"/>
2306
- </attribute>
2307
- </optional>
2308
- <optional>
2309
- <attribute name="tag"/>
2310
- </optional>
2311
- <optional>
2312
- <attribute name="multilingual-rendering">
2313
- <ref name="MultilingualRenderingType"/>
2314
- </attribute>
2315
- </optional>
2084
+ <ref name="BlockAttributes"/>
2316
2085
  <oneOrMore>
2317
2086
  <choice>
2318
2087
  <ref name="formula"/>
@@ -2439,14 +2208,7 @@
2439
2208
  <optional>
2440
2209
  <attribute name="title"/>
2441
2210
  </optional>
2442
- <optional>
2443
- <attribute name="tag"/>
2444
- </optional>
2445
- <optional>
2446
- <attribute name="multilingual-rendering">
2447
- <ref name="MultilingualRenderingType"/>
2448
- </attribute>
2449
- </optional>
2211
+ <ref name="BlockAttributes"/>
2450
2212
  <optional>
2451
2213
  <element name="location">
2452
2214
  <zeroOrMore>
@@ -2506,14 +2268,7 @@
2506
2268
  </define>
2507
2269
  <define name="imagemap">
2508
2270
  <element name="imagemap">
2509
- <optional>
2510
- <attribute name="tag"/>
2511
- </optional>
2512
- <optional>
2513
- <attribute name="multilingual-rendering">
2514
- <ref name="MultilingualRenderingType"/>
2515
- </attribute>
2516
- </optional>
2271
+ <ref name="BlockAttributes"/>
2517
2272
  <ref name="figure"/>
2518
2273
  <zeroOrMore>
2519
2274
  <element name="area">
@@ -2559,14 +2314,7 @@
2559
2314
  </define>
2560
2315
  <define name="svgmap">
2561
2316
  <element name="svgmap">
2562
- <optional>
2563
- <attribute name="tag"/>
2564
- </optional>
2565
- <optional>
2566
- <attribute name="multilingual-rendering">
2567
- <ref name="MultilingualRenderingType"/>
2568
- </attribute>
2569
- </optional>
2317
+ <ref name="BlockAttributes"/>
2570
2318
  <ref name="figure"/>
2571
2319
  <zeroOrMore>
2572
2320
  <element name="target">
@@ -2653,7 +2401,7 @@
2653
2401
  <value>full</value>
2654
2402
  <value>short</value>
2655
2403
  <value>id</value>
2656
- <value>modspec</value>
2404
+ <text/>
2657
2405
  </choice>
2658
2406
  </define>
2659
2407
  <define name="erefTypeWithConnective">
@@ -2673,6 +2421,29 @@
2673
2421
  </oneOrMore>
2674
2422
  </element>
2675
2423
  </define>
2424
+ <define name="BlockAttributes">
2425
+ <optional>
2426
+ <attribute name="keep-with-next">
2427
+ <data type="boolean"/>
2428
+ </attribute>
2429
+ </optional>
2430
+ <optional>
2431
+ <attribute name="keep-lines-together">
2432
+ <data type="boolean"/>
2433
+ </attribute>
2434
+ </optional>
2435
+ <optional>
2436
+ <attribute name="tag"/>
2437
+ </optional>
2438
+ <optional>
2439
+ <attribute name="multilingual-rendering">
2440
+ <ref name="MultilingualRenderingType"/>
2441
+ </attribute>
2442
+ </optional>
2443
+ <optional>
2444
+ <attribute name="columns"/>
2445
+ </optional>
2446
+ </define>
2676
2447
  <start>
2677
2448
  <ref name="standard-document"/>
2678
2449
  </start>
data/lib/metanorma/generic/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Generic
3
- VERSION = "2.3.0".freeze
3
+ VERSION = "2.4.0".freeze
4
4
  end
5
5
  end
data/metanorma-generic.gemspec CHANGED
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
28
28
  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
29
29
 
30
30
  spec.add_dependency "htmlentities", "~> 4.3.4"
31
- spec.add_dependency "metanorma-standoc", "~> 2.3.0"
31
+ spec.add_dependency "metanorma-standoc", "~> 2.4.0"
32
32
  spec.add_dependency "ruby-jing"
33
33
 
34
34
  spec.add_development_dependency "debug"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-generic
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 2.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-12-05 00:00:00.000000000 Z
11
+ date: 2023-03-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 2.3.0
33
+ version: 2.4.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 2.3.0
40
+ version: 2.4.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: ruby-jing
43
43
  requirement: !ruby/object:Gem::Requirement