metanorma-ieee 1.0.5 → 1.0.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/ieee/base_convert.rb +5 -12
- data/lib/isodoc/ieee/html/htmlstyle.css +8 -0
- data/lib/isodoc/ieee/html/htmlstyle.scss +7 -0
- data/lib/isodoc/ieee/ieee.amendment.xsl +406 -137
- data/lib/isodoc/ieee/ieee.standard.xsl +406 -137
- data/lib/isodoc/ieee/presentation_xml_convert.rb +5 -0
- data/lib/isodoc/ieee/word_convert.rb +21 -9
- data/lib/metanorma/ieee/biblio.rng +11 -1
- data/lib/metanorma/ieee/front.rb +2 -2
- data/lib/metanorma/ieee/isodoc.rng +56 -296
- data/lib/metanorma/ieee/version.rb +1 -1
- data/metanorma-ieee.gemspec +1 -1
- metadata +4 -4
@@ -51,17 +51,17 @@ module IsoDoc
|
|
51
51
|
f = isoxml.at(ns("//preface/abstract")) || return
|
52
52
|
page_break(out)
|
53
53
|
out.div **attr_code(id: f["id"], class: "abstract") do |s|
|
54
|
-
clause_name(
|
54
|
+
clause_name(f, f.at(ns("./title")), s, { class: "AbstractTitle" })
|
55
55
|
f.elements.each { |e| parse(e, s) unless e.name == "title" }
|
56
56
|
end
|
57
57
|
end
|
58
58
|
|
59
59
|
def make_body3(body, docxml)
|
60
|
-
body.div
|
60
|
+
body.div class: "WordSectionMiddleTitle" do |_div3|
|
61
61
|
middle_title_ieee(docxml, body)
|
62
62
|
end
|
63
63
|
section_break(body, continuous: true)
|
64
|
-
body.div
|
64
|
+
body.div class: "WordSectionMain" do |div3|
|
65
65
|
middle docxml, div3
|
66
66
|
footnotes div3
|
67
67
|
comments div3
|
@@ -71,7 +71,7 @@ module IsoDoc
|
|
71
71
|
def middle_title(isoxml, out); end
|
72
72
|
|
73
73
|
def middle_title_ieee(_docxml, out)
|
74
|
-
out.p(
|
74
|
+
out.p(class: "IEEEStdsTitle", style: "margin-top:70.0pt") do |p|
|
75
75
|
p << @meta.get[:full_doctitle]
|
76
76
|
@meta.get[:amd] || @meta.get[:corr] and p << "<br/>"
|
77
77
|
@meta.get[:amd] and p << "Amendment #{@meta.get[:amd]}"
|
@@ -81,7 +81,7 @@ module IsoDoc
|
|
81
81
|
end
|
82
82
|
|
83
83
|
def admonition_name_parse(_node, div, name)
|
84
|
-
div.p
|
84
|
+
div.p class: "IEEEStdsWarning", style: "text-align:center;" do |p|
|
85
85
|
p.b do |b|
|
86
86
|
name.children.each { |n| parse(n, b) }
|
87
87
|
end
|
@@ -96,6 +96,18 @@ module IsoDoc
|
|
96
96
|
end
|
97
97
|
end
|
98
98
|
|
99
|
+
def formula_parse(node, out)
|
100
|
+
out.div **formula_attrs(node) do |div|
|
101
|
+
formula_parse1(node, div)
|
102
|
+
formula_where(node.at(ns("./dl")), div)
|
103
|
+
node.children.each do |n|
|
104
|
+
next if %w(stem dl name).include? n.name
|
105
|
+
|
106
|
+
parse(n, div)
|
107
|
+
end
|
108
|
+
end
|
109
|
+
end
|
110
|
+
|
99
111
|
def dt_dd?(node)
|
100
112
|
%w{dt dd}.include? node.name
|
101
113
|
end
|
@@ -109,7 +121,7 @@ module IsoDoc
|
|
109
121
|
end
|
110
122
|
|
111
123
|
def formula_where1(out, dterm, ddefn)
|
112
|
-
out.p
|
124
|
+
out.p class: "IEEEStdsEquationVariableList" do |p|
|
113
125
|
dterm.children.each { |n| parse(n, p) }
|
114
126
|
insert_tab(p, 1)
|
115
127
|
if ddefn.at(ns("./p"))
|
@@ -130,7 +142,7 @@ module IsoDoc
|
|
130
142
|
return if name.nil?
|
131
143
|
|
132
144
|
name&.at(ns("./strong"))&.remove # supplied by CSS list numbering
|
133
|
-
div.h1
|
145
|
+
div.h1 class: "Annex" do |t|
|
134
146
|
annex_name1(name, t)
|
135
147
|
clause_parse_subtitle(name, t)
|
136
148
|
end
|
@@ -139,7 +151,7 @@ module IsoDoc
|
|
139
151
|
def annex_name1(name, out)
|
140
152
|
name.children.each do |c2|
|
141
153
|
if c2.name == "span" && c2["class"] == "obligation"
|
142
|
-
out.span
|
154
|
+
out.span style: "font-weight:normal;" do |s|
|
143
155
|
c2.children.each { |c3| parse(c3, s) }
|
144
156
|
end
|
145
157
|
else parse(c2, out)
|
@@ -158,7 +170,7 @@ module IsoDoc
|
|
158
170
|
end
|
159
171
|
|
160
172
|
def termnote_label(para, name)
|
161
|
-
para.span
|
173
|
+
para.span class: "note_label" do |s|
|
162
174
|
name.children.each { |n| parse(n, s) }
|
163
175
|
s << termnote_delim
|
164
176
|
end
|
@@ -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
|
-
<
|
316
|
+
<optional>
|
317
|
+
<ref name="organization"/>
|
318
|
+
</optional>
|
309
319
|
</element>
|
310
320
|
</define>
|
311
321
|
<define name="affiliationname">
|
data/lib/metanorma/ieee/front.rb
CHANGED
@@ -26,7 +26,7 @@ module Metanorma
|
|
26
26
|
|
27
27
|
def metadata_id(node, xml)
|
28
28
|
id = node.attr("docnumber") || ""
|
29
|
-
xml.docidentifier id, type: "IEEE"
|
29
|
+
xml.docidentifier (node.attr("docidentifier") || id), type: "IEEE"
|
30
30
|
id = node.attr("stdid-pdf") and
|
31
31
|
xml.docidentifier id, type: "IEEE", scope: "PDF"
|
32
32
|
id = node.attr("stdid-print") and
|
@@ -38,7 +38,7 @@ module Metanorma
|
|
38
38
|
publishers = node.attr("publisher") || "IEEE"
|
39
39
|
csv_split(publishers).each do |p|
|
40
40
|
xml.contributor do |c|
|
41
|
-
c.role
|
41
|
+
c.role type: "publisher"
|
42
42
|
c.organization do |a|
|
43
43
|
organization(a, p, true, node, !node.attr("publisher"))
|
44
44
|
end
|
@@ -220,24 +220,7 @@
|
|
220
220
|
<attribute name="id">
|
221
221
|
<data type="ID"/>
|
222
222
|
</attribute>
|
223
|
-
<
|
224
|
-
<attribute name="keep-with-next">
|
225
|
-
<data type="boolean"/>
|
226
|
-
</attribute>
|
227
|
-
</optional>
|
228
|
-
<optional>
|
229
|
-
<attribute name="keep-lines-together">
|
230
|
-
<data type="boolean"/>
|
231
|
-
</attribute>
|
232
|
-
</optional>
|
233
|
-
<optional>
|
234
|
-
<attribute name="tag"/>
|
235
|
-
</optional>
|
236
|
-
<optional>
|
237
|
-
<attribute name="multilingual-rendering">
|
238
|
-
<ref name="MultilingualRenderingType"/>
|
239
|
-
</attribute>
|
240
|
-
</optional>
|
223
|
+
<ref name="BlockAttributes"/>
|
241
224
|
<optional>
|
242
225
|
<ref name="tname"/>
|
243
226
|
</optional>
|
@@ -254,24 +237,7 @@
|
|
254
237
|
<attribute name="id">
|
255
238
|
<data type="ID"/>
|
256
239
|
</attribute>
|
257
|
-
<
|
258
|
-
<attribute name="keep-with-next">
|
259
|
-
<data type="boolean"/>
|
260
|
-
</attribute>
|
261
|
-
</optional>
|
262
|
-
<optional>
|
263
|
-
<attribute name="keep-lines-together">
|
264
|
-
<data type="boolean"/>
|
265
|
-
</attribute>
|
266
|
-
</optional>
|
267
|
-
<optional>
|
268
|
-
<attribute name="tag"/>
|
269
|
-
</optional>
|
270
|
-
<optional>
|
271
|
-
<attribute name="multilingual-rendering">
|
272
|
-
<ref name="MultilingualRenderingType"/>
|
273
|
-
</attribute>
|
274
|
-
</optional>
|
240
|
+
<ref name="BlockAttributes"/>
|
275
241
|
<optional>
|
276
242
|
<attribute name="type">
|
277
243
|
<choice>
|
@@ -299,29 +265,12 @@
|
|
299
265
|
<attribute name="id">
|
300
266
|
<data type="ID"/>
|
301
267
|
</attribute>
|
302
|
-
<
|
303
|
-
<attribute name="keep-with-next">
|
304
|
-
<data type="boolean"/>
|
305
|
-
</attribute>
|
306
|
-
</optional>
|
307
|
-
<optional>
|
308
|
-
<attribute name="keep-lines-together">
|
309
|
-
<data type="boolean"/>
|
310
|
-
</attribute>
|
311
|
-
</optional>
|
268
|
+
<ref name="BlockAttributes"/>
|
312
269
|
<optional>
|
313
270
|
<attribute name="key">
|
314
271
|
<data type="boolean"/>
|
315
272
|
</attribute>
|
316
273
|
</optional>
|
317
|
-
<optional>
|
318
|
-
<attribute name="tag"/>
|
319
|
-
</optional>
|
320
|
-
<optional>
|
321
|
-
<attribute name="multilingual-rendering">
|
322
|
-
<ref name="MultilingualRenderingType"/>
|
323
|
-
</attribute>
|
324
|
-
</optional>
|
325
274
|
<optional>
|
326
275
|
<ref name="tname"/>
|
327
276
|
</optional>
|
@@ -362,24 +311,7 @@
|
|
362
311
|
<optional>
|
363
312
|
<attribute name="number"/>
|
364
313
|
</optional>
|
365
|
-
<
|
366
|
-
<attribute name="keep-with-next">
|
367
|
-
<data type="boolean"/>
|
368
|
-
</attribute>
|
369
|
-
</optional>
|
370
|
-
<optional>
|
371
|
-
<attribute name="keep-lines-together">
|
372
|
-
<data type="boolean"/>
|
373
|
-
</attribute>
|
374
|
-
</optional>
|
375
|
-
<optional>
|
376
|
-
<attribute name="tag"/>
|
377
|
-
</optional>
|
378
|
-
<optional>
|
379
|
-
<attribute name="multilingual-rendering">
|
380
|
-
<ref name="MultilingualRenderingType"/>
|
381
|
-
</attribute>
|
382
|
-
</optional>
|
314
|
+
<ref name="BlockAttributes"/>
|
383
315
|
<optional>
|
384
316
|
<ref name="tname"/>
|
385
317
|
</optional>
|
@@ -427,27 +359,10 @@
|
|
427
359
|
<data type="anyURI"/>
|
428
360
|
</attribute>
|
429
361
|
</optional>
|
430
|
-
<optional>
|
431
|
-
<attribute name="keep-with-next">
|
432
|
-
<data type="boolean"/>
|
433
|
-
</attribute>
|
434
|
-
</optional>
|
435
|
-
<optional>
|
436
|
-
<attribute name="keep-lines-together">
|
437
|
-
<data type="boolean"/>
|
438
|
-
</attribute>
|
439
|
-
</optional>
|
440
362
|
<optional>
|
441
363
|
<attribute name="width"/>
|
442
364
|
</optional>
|
443
|
-
<
|
444
|
-
<attribute name="tag"/>
|
445
|
-
</optional>
|
446
|
-
<optional>
|
447
|
-
<attribute name="multilingual-rendering">
|
448
|
-
<ref name="MultilingualRenderingType"/>
|
449
|
-
</attribute>
|
450
|
-
</optional>
|
365
|
+
<ref name="BlockAttributes"/>
|
451
366
|
<optional>
|
452
367
|
<ref name="colgroup"/>
|
453
368
|
</optional>
|
@@ -485,27 +400,10 @@
|
|
485
400
|
<optional>
|
486
401
|
<attribute name="subsequence"/>
|
487
402
|
</optional>
|
488
|
-
<optional>
|
489
|
-
<attribute name="keep-with-next">
|
490
|
-
<data type="boolean"/>
|
491
|
-
</attribute>
|
492
|
-
</optional>
|
493
|
-
<optional>
|
494
|
-
<attribute name="keep-lines-together">
|
495
|
-
<data type="boolean"/>
|
496
|
-
</attribute>
|
497
|
-
</optional>
|
498
403
|
<optional>
|
499
404
|
<attribute name="class"/>
|
500
405
|
</optional>
|
501
|
-
<
|
502
|
-
<attribute name="tag"/>
|
503
|
-
</optional>
|
504
|
-
<optional>
|
505
|
-
<attribute name="multilingual-rendering">
|
506
|
-
<ref name="MultilingualRenderingType"/>
|
507
|
-
</attribute>
|
508
|
-
</optional>
|
406
|
+
<ref name="BlockAttributes"/>
|
509
407
|
<optional>
|
510
408
|
<ref name="source"/>
|
511
409
|
</optional>
|
@@ -551,27 +449,10 @@
|
|
551
449
|
<optional>
|
552
450
|
<attribute name="subsequence"/>
|
553
451
|
</optional>
|
554
|
-
<optional>
|
555
|
-
<attribute name="keep-with-next">
|
556
|
-
<data type="boolean"/>
|
557
|
-
</attribute>
|
558
|
-
</optional>
|
559
|
-
<optional>
|
560
|
-
<attribute name="keep-lines-together">
|
561
|
-
<data type="boolean"/>
|
562
|
-
</attribute>
|
563
|
-
</optional>
|
564
452
|
<optional>
|
565
453
|
<attribute name="lang"/>
|
566
454
|
</optional>
|
567
|
-
<
|
568
|
-
<attribute name="tag"/>
|
569
|
-
</optional>
|
570
|
-
<optional>
|
571
|
-
<attribute name="multilingual-rendering">
|
572
|
-
<ref name="MultilingualRenderingType"/>
|
573
|
-
</attribute>
|
574
|
-
</optional>
|
455
|
+
<ref name="BlockAttributes"/>
|
575
456
|
<optional>
|
576
457
|
<attribute name="linenums">
|
577
458
|
<data type="boolean"/>
|
@@ -610,29 +491,12 @@
|
|
610
491
|
<optional>
|
611
492
|
<attribute name="subsequence"/>
|
612
493
|
</optional>
|
613
|
-
<optional>
|
614
|
-
<attribute name="keep-with-next">
|
615
|
-
<data type="boolean"/>
|
616
|
-
</attribute>
|
617
|
-
</optional>
|
618
|
-
<optional>
|
619
|
-
<attribute name="keep-lines-together">
|
620
|
-
<data type="boolean"/>
|
621
|
-
</attribute>
|
622
|
-
</optional>
|
623
494
|
<optional>
|
624
495
|
<attribute name="inequality">
|
625
496
|
<data type="boolean"/>
|
626
497
|
</attribute>
|
627
498
|
</optional>
|
628
|
-
<
|
629
|
-
<attribute name="tag"/>
|
630
|
-
</optional>
|
631
|
-
<optional>
|
632
|
-
<attribute name="multilingual-rendering">
|
633
|
-
<ref name="MultilingualRenderingType"/>
|
634
|
-
</attribute>
|
635
|
-
</optional>
|
499
|
+
<ref name="BlockAttributes"/>
|
636
500
|
<ref name="stem"/>
|
637
501
|
<optional>
|
638
502
|
<ref name="dl"/>
|
@@ -651,27 +515,7 @@
|
|
651
515
|
<ref name="Alignments"/>
|
652
516
|
</attribute>
|
653
517
|
</optional>
|
654
|
-
<
|
655
|
-
<attribute name="keep-with-next">
|
656
|
-
<data type="boolean"/>
|
657
|
-
</attribute>
|
658
|
-
</optional>
|
659
|
-
<optional>
|
660
|
-
<attribute name="keep-lines-together">
|
661
|
-
<data type="boolean"/>
|
662
|
-
</attribute>
|
663
|
-
</optional>
|
664
|
-
<optional>
|
665
|
-
<attribute name="tag"/>
|
666
|
-
</optional>
|
667
|
-
<optional>
|
668
|
-
<attribute name="type"/>
|
669
|
-
</optional>
|
670
|
-
<optional>
|
671
|
-
<attribute name="multilingual-rendering">
|
672
|
-
<ref name="MultilingualRenderingType"/>
|
673
|
-
</attribute>
|
674
|
-
</optional>
|
518
|
+
<ref name="BlockAttributes"/>
|
675
519
|
<zeroOrMore>
|
676
520
|
<ref name="TextElement"/>
|
677
521
|
</zeroOrMore>
|
@@ -689,27 +533,10 @@
|
|
689
533
|
<ref name="Alignments"/>
|
690
534
|
</attribute>
|
691
535
|
</optional>
|
692
|
-
<optional>
|
693
|
-
<attribute name="keep-with-next">
|
694
|
-
<data type="boolean"/>
|
695
|
-
</attribute>
|
696
|
-
</optional>
|
697
|
-
<optional>
|
698
|
-
<attribute name="keep-lines-together">
|
699
|
-
<data type="boolean"/>
|
700
|
-
</attribute>
|
701
|
-
</optional>
|
702
|
-
<optional>
|
703
|
-
<attribute name="tag"/>
|
704
|
-
</optional>
|
705
536
|
<optional>
|
706
537
|
<attribute name="type"/>
|
707
538
|
</optional>
|
708
|
-
<
|
709
|
-
<attribute name="multilingual-rendering">
|
710
|
-
<ref name="MultilingualRenderingType"/>
|
711
|
-
</attribute>
|
712
|
-
</optional>
|
539
|
+
<ref name="BlockAttributes"/>
|
713
540
|
<zeroOrMore>
|
714
541
|
<choice>
|
715
542
|
<ref name="TextElement"/>
|
@@ -731,24 +558,7 @@
|
|
731
558
|
<ref name="Alignments"/>
|
732
559
|
</attribute>
|
733
560
|
</optional>
|
734
|
-
<
|
735
|
-
<attribute name="keep-with-next">
|
736
|
-
<data type="boolean"/>
|
737
|
-
</attribute>
|
738
|
-
</optional>
|
739
|
-
<optional>
|
740
|
-
<attribute name="keep-lines-together">
|
741
|
-
<data type="boolean"/>
|
742
|
-
</attribute>
|
743
|
-
</optional>
|
744
|
-
<optional>
|
745
|
-
<attribute name="tag"/>
|
746
|
-
</optional>
|
747
|
-
<optional>
|
748
|
-
<attribute name="multilingual-rendering">
|
749
|
-
<ref name="MultilingualRenderingType"/>
|
750
|
-
</attribute>
|
751
|
-
</optional>
|
561
|
+
<ref name="BlockAttributes"/>
|
752
562
|
<optional>
|
753
563
|
<ref name="quote-source"/>
|
754
564
|
</optional>
|
@@ -828,27 +638,9 @@
|
|
828
638
|
<optional>
|
829
639
|
<attribute name="subsequence"/>
|
830
640
|
</optional>
|
831
|
-
<optional>
|
832
|
-
<attribute name="keep-with-next">
|
833
|
-
<data type="boolean"/>
|
834
|
-
</attribute>
|
835
|
-
</optional>
|
836
|
-
<optional>
|
837
|
-
<attribute name="keep-lines-together">
|
838
|
-
<data type="boolean"/>
|
839
|
-
</attribute>
|
840
|
-
</optional>
|
841
641
|
<optional>
|
842
642
|
<attribute name="type"/>
|
843
643
|
</optional>
|
844
|
-
<optional>
|
845
|
-
<attribute name="tag"/>
|
846
|
-
</optional>
|
847
|
-
<optional>
|
848
|
-
<attribute name="multilingual-rendering">
|
849
|
-
<ref name="MultilingualRenderingType"/>
|
850
|
-
</attribute>
|
851
|
-
</optional>
|
852
644
|
<optional>
|
853
645
|
<attribute name="coverpage">
|
854
646
|
<data type="boolean"/>
|
@@ -859,6 +651,7 @@
|
|
859
651
|
<data type="boolean"/>
|
860
652
|
</attribute>
|
861
653
|
</optional>
|
654
|
+
<ref name="BlockAttributes"/>
|
862
655
|
<oneOrMore>
|
863
656
|
<choice>
|
864
657
|
<ref name="paragraph"/>
|
@@ -1332,14 +1125,7 @@
|
|
1332
1125
|
<optional>
|
1333
1126
|
<attribute name="class"/>
|
1334
1127
|
</optional>
|
1335
|
-
<
|
1336
|
-
<attribute name="tag"/>
|
1337
|
-
</optional>
|
1338
|
-
<optional>
|
1339
|
-
<attribute name="multilingual-rendering">
|
1340
|
-
<ref name="MultilingualRenderingType"/>
|
1341
|
-
</attribute>
|
1342
|
-
</optional>
|
1128
|
+
<ref name="BlockAttributes"/>
|
1343
1129
|
<zeroOrMore>
|
1344
1130
|
<choice>
|
1345
1131
|
<ref name="TextElement"/>
|
@@ -1578,6 +1364,9 @@
|
|
1578
1364
|
<zeroOrMore>
|
1579
1365
|
<ref name="indexsect"/>
|
1580
1366
|
</zeroOrMore>
|
1367
|
+
<optional>
|
1368
|
+
<ref name="colophon"/>
|
1369
|
+
</optional>
|
1581
1370
|
</element>
|
1582
1371
|
</define>
|
1583
1372
|
<define name="misccontainer">
|
@@ -1600,6 +1389,13 @@
|
|
1600
1389
|
</oneOrMore>
|
1601
1390
|
</element>
|
1602
1391
|
</define>
|
1392
|
+
<define name="colophon">
|
1393
|
+
<element name="colophon">
|
1394
|
+
<oneOrMore>
|
1395
|
+
<ref name="content"/>
|
1396
|
+
</oneOrMore>
|
1397
|
+
</element>
|
1398
|
+
</define>
|
1603
1399
|
<define name="foreword">
|
1604
1400
|
<element name="foreword">
|
1605
1401
|
<ref name="Content-Section"/>
|
@@ -1898,7 +1694,10 @@
|
|
1898
1694
|
</zeroOrMore>
|
1899
1695
|
<choice>
|
1900
1696
|
<oneOrMore>
|
1901
|
-
<
|
1697
|
+
<choice>
|
1698
|
+
<ref name="term"/>
|
1699
|
+
<ref name="terms"/>
|
1700
|
+
</choice>
|
1902
1701
|
</oneOrMore>
|
1903
1702
|
<group>
|
1904
1703
|
<zeroOrMore>
|
@@ -1924,14 +1723,7 @@
|
|
1924
1723
|
<optional>
|
1925
1724
|
<attribute name="script"/>
|
1926
1725
|
</optional>
|
1927
|
-
<
|
1928
|
-
<attribute name="tag"/>
|
1929
|
-
</optional>
|
1930
|
-
<optional>
|
1931
|
-
<attribute name="multilingual-rendering">
|
1932
|
-
<ref name="MultilingualRenderingType"/>
|
1933
|
-
</attribute>
|
1934
|
-
</optional>
|
1726
|
+
<ref name="BlockAttributes"/>
|
1935
1727
|
<oneOrMore>
|
1936
1728
|
<ref name="preferred"/>
|
1937
1729
|
</oneOrMore>
|
@@ -2272,24 +2064,7 @@
|
|
2272
2064
|
<optional>
|
2273
2065
|
<attribute name="subsequence"/>
|
2274
2066
|
</optional>
|
2275
|
-
<
|
2276
|
-
<attribute name="keep-with-next">
|
2277
|
-
<data type="boolean"/>
|
2278
|
-
</attribute>
|
2279
|
-
</optional>
|
2280
|
-
<optional>
|
2281
|
-
<attribute name="keep-lines-together">
|
2282
|
-
<data type="boolean"/>
|
2283
|
-
</attribute>
|
2284
|
-
</optional>
|
2285
|
-
<optional>
|
2286
|
-
<attribute name="tag"/>
|
2287
|
-
</optional>
|
2288
|
-
<optional>
|
2289
|
-
<attribute name="multilingual-rendering">
|
2290
|
-
<ref name="MultilingualRenderingType"/>
|
2291
|
-
</attribute>
|
2292
|
-
</optional>
|
2067
|
+
<ref name="BlockAttributes"/>
|
2293
2068
|
<oneOrMore>
|
2294
2069
|
<choice>
|
2295
2070
|
<ref name="paragraph"/>
|
@@ -2306,24 +2081,7 @@
|
|
2306
2081
|
<attribute name="id">
|
2307
2082
|
<data type="ID"/>
|
2308
2083
|
</attribute>
|
2309
|
-
<
|
2310
|
-
<attribute name="keep-with-next">
|
2311
|
-
<data type="boolean"/>
|
2312
|
-
</attribute>
|
2313
|
-
</optional>
|
2314
|
-
<optional>
|
2315
|
-
<attribute name="keep-lines-together">
|
2316
|
-
<data type="boolean"/>
|
2317
|
-
</attribute>
|
2318
|
-
</optional>
|
2319
|
-
<optional>
|
2320
|
-
<attribute name="tag"/>
|
2321
|
-
</optional>
|
2322
|
-
<optional>
|
2323
|
-
<attribute name="multilingual-rendering">
|
2324
|
-
<ref name="MultilingualRenderingType"/>
|
2325
|
-
</attribute>
|
2326
|
-
</optional>
|
2084
|
+
<ref name="BlockAttributes"/>
|
2327
2085
|
<oneOrMore>
|
2328
2086
|
<choice>
|
2329
2087
|
<ref name="formula"/>
|
@@ -2450,14 +2208,7 @@
|
|
2450
2208
|
<optional>
|
2451
2209
|
<attribute name="title"/>
|
2452
2210
|
</optional>
|
2453
|
-
<
|
2454
|
-
<attribute name="tag"/>
|
2455
|
-
</optional>
|
2456
|
-
<optional>
|
2457
|
-
<attribute name="multilingual-rendering">
|
2458
|
-
<ref name="MultilingualRenderingType"/>
|
2459
|
-
</attribute>
|
2460
|
-
</optional>
|
2211
|
+
<ref name="BlockAttributes"/>
|
2461
2212
|
<optional>
|
2462
2213
|
<element name="location">
|
2463
2214
|
<zeroOrMore>
|
@@ -2517,14 +2268,7 @@
|
|
2517
2268
|
</define>
|
2518
2269
|
<define name="imagemap">
|
2519
2270
|
<element name="imagemap">
|
2520
|
-
<
|
2521
|
-
<attribute name="tag"/>
|
2522
|
-
</optional>
|
2523
|
-
<optional>
|
2524
|
-
<attribute name="multilingual-rendering">
|
2525
|
-
<ref name="MultilingualRenderingType"/>
|
2526
|
-
</attribute>
|
2527
|
-
</optional>
|
2271
|
+
<ref name="BlockAttributes"/>
|
2528
2272
|
<ref name="figure"/>
|
2529
2273
|
<zeroOrMore>
|
2530
2274
|
<element name="area">
|
@@ -2570,14 +2314,7 @@
|
|
2570
2314
|
</define>
|
2571
2315
|
<define name="svgmap">
|
2572
2316
|
<element name="svgmap">
|
2573
|
-
<
|
2574
|
-
<attribute name="tag"/>
|
2575
|
-
</optional>
|
2576
|
-
<optional>
|
2577
|
-
<attribute name="multilingual-rendering">
|
2578
|
-
<ref name="MultilingualRenderingType"/>
|
2579
|
-
</attribute>
|
2580
|
-
</optional>
|
2317
|
+
<ref name="BlockAttributes"/>
|
2581
2318
|
<ref name="figure"/>
|
2582
2319
|
<zeroOrMore>
|
2583
2320
|
<element name="target">
|
@@ -2684,6 +2421,29 @@
|
|
2684
2421
|
</oneOrMore>
|
2685
2422
|
</element>
|
2686
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>
|
2687
2447
|
<start>
|
2688
2448
|
<ref name="standard-document"/>
|
2689
2449
|
</start>
|