metanorma-iho 0.2.16 → 0.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +3 -13
- data/.hound.yml +5 -0
- data/.rubocop.yml +3 -7
- data/lib/asciidoctor/iho/biblio.rng +1 -0
- data/lib/asciidoctor/iho/converter.rb +8 -6
- data/lib/asciidoctor/iho/iho.rng +3 -0
- data/lib/asciidoctor/iho/isodoc.rng +321 -4
- data/lib/isodoc/iho/base_convert.rb +40 -46
- data/lib/isodoc/iho/html/htmlstyle.css +7 -0
- data/lib/isodoc/iho/iho.specification.xsl +503 -67
- data/lib/isodoc/iho/iho.standard.xsl +503 -67
- data/lib/isodoc/iho/init.rb +4 -4
- data/lib/isodoc/iho/xref.rb +1 -2
- data/lib/metanorma/iho/version.rb +1 -1
- data/metanorma-iho.gemspec +3 -3
- data/metanorma.yml +3 -0
- metadata +19 -18
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: aaadb9f1a37db3c3b5aff92d2a593b365194c6d4e1435d06a7334766511adb1c
|
|
4
|
+
data.tar.gz: fb552d20da927d65e91ad726ef7926fc7a1617cdee4cc71cfab8807d64a79888
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 664a4bdc46f48822c6eb58ad3e258498dd8ff33da546168b905a4c5299643a1f0e3b7928167457139b7db70c2572f37305318f31f78ffb74824f6f78e9c7d2e0
|
|
7
|
+
data.tar.gz: 475f2b786a53d4641fc6ebc0d8ab08c142d6c3dacf3053d5046497d7d8e63b2125b0104729d390b6d88097adace7536c061d269bc06f2374483b26015dcd85a6
|
data/.github/workflows/rake.yml
CHANGED
|
@@ -4,7 +4,7 @@ name: rake
|
|
|
4
4
|
|
|
5
5
|
on:
|
|
6
6
|
push:
|
|
7
|
-
branches: [ master, main
|
|
7
|
+
branches: [ master, main ]
|
|
8
8
|
tags: [ v* ]
|
|
9
9
|
pull_request:
|
|
10
10
|
|
|
@@ -16,19 +16,9 @@ jobs:
|
|
|
16
16
|
strategy:
|
|
17
17
|
fail-fast: false
|
|
18
18
|
matrix:
|
|
19
|
-
ruby: [ '2.7', '2.6', '2.5', '2.4' ]
|
|
19
|
+
ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
|
|
20
20
|
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
|
21
21
|
experimental: [ false ]
|
|
22
|
-
include:
|
|
23
|
-
- ruby: '3.0'
|
|
24
|
-
os: 'ubuntu-latest'
|
|
25
|
-
experimental: true
|
|
26
|
-
- ruby: '3.0'
|
|
27
|
-
os: 'windows-latest'
|
|
28
|
-
experimental: true
|
|
29
|
-
- ruby: '3.0'
|
|
30
|
-
os: 'macos-latest'
|
|
31
|
-
experimental: true
|
|
32
22
|
steps:
|
|
33
23
|
- uses: actions/checkout@master
|
|
34
24
|
|
|
@@ -49,5 +39,5 @@ jobs:
|
|
|
49
39
|
with:
|
|
50
40
|
token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
|
51
41
|
repository: ${{ github.repository }}
|
|
52
|
-
event-type:
|
|
42
|
+
event-type: tests-passed
|
|
53
43
|
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
|
data/.hound.yml
ADDED
data/.rubocop.yml
CHANGED
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
#
|
|
2
|
-
# https://github.com/
|
|
3
|
-
# All project-specific additions and overrides should be specified in this file.
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
|
+
# See https://github.com/metanorma/cimas
|
|
4
3
|
inherit_from:
|
|
5
4
|
- https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
|
|
6
5
|
|
|
7
6
|
# local repo-specific modifications
|
|
7
|
+
# ...
|
|
8
8
|
|
|
9
9
|
AllCops:
|
|
10
|
-
DisplayCopNames: false
|
|
11
|
-
StyleGuideCopsOnly: false
|
|
12
10
|
TargetRubyVersion: 2.4
|
|
13
|
-
Rails:
|
|
14
|
-
Enabled: true
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
require "asciidoctor/standoc/converter"
|
|
2
|
-
require
|
|
2
|
+
require "asciidoctor/generic/converter"
|
|
3
3
|
|
|
4
4
|
module Asciidoctor
|
|
5
5
|
module IHO
|
|
@@ -7,8 +7,8 @@ module Asciidoctor
|
|
|
7
7
|
# schema encapsulation of the document for validation
|
|
8
8
|
#
|
|
9
9
|
class Converter < Asciidoctor::Generic::Converter
|
|
10
|
-
XML_ROOT_TAG =
|
|
11
|
-
XML_NAMESPACE =
|
|
10
|
+
XML_ROOT_TAG = "iho-standard".freeze
|
|
11
|
+
XML_NAMESPACE = "https://www.metanorma.org/ns/iho".freeze
|
|
12
12
|
|
|
13
13
|
register_for "iho"
|
|
14
14
|
|
|
@@ -33,7 +33,7 @@ module Asciidoctor
|
|
|
33
33
|
M: "Miscellaneous",
|
|
34
34
|
P: "Periodic",
|
|
35
35
|
S: "Standards and Specifications",
|
|
36
|
-
}
|
|
36
|
+
}.freeze
|
|
37
37
|
|
|
38
38
|
def metadata_series(node, xml)
|
|
39
39
|
series = node.attr("series") or return
|
|
@@ -59,7 +59,8 @@ module Asciidoctor
|
|
|
59
59
|
|
|
60
60
|
def metadata_committee(node, xml)
|
|
61
61
|
unless node.attr("workgroup")
|
|
62
|
-
@log.add("AsciiDoc Input", nil,
|
|
62
|
+
@log.add("AsciiDoc Input", nil,
|
|
63
|
+
"Missing workgroup attribute for document")
|
|
63
64
|
return
|
|
64
65
|
end
|
|
65
66
|
metadata_committee1(node, xml)
|
|
@@ -75,7 +76,7 @@ module Asciidoctor
|
|
|
75
76
|
end
|
|
76
77
|
end
|
|
77
78
|
i = 2
|
|
78
|
-
while node.attr("workgroup_#{i}")
|
|
79
|
+
while node.attr("workgroup_#{i}")
|
|
79
80
|
xml.editorialgroup do |a|
|
|
80
81
|
a.committee do |n|
|
|
81
82
|
n.abbreviation node.attr("committee_#{i}").upcase
|
|
@@ -102,6 +103,7 @@ module Asciidoctor
|
|
|
102
103
|
|
|
103
104
|
def pdf_converter(node)
|
|
104
105
|
return nil if node.attr("no-pdf")
|
|
106
|
+
|
|
105
107
|
IsoDoc::IHO::PdfConvert.new(html_extract_attributes(node))
|
|
106
108
|
end
|
|
107
109
|
|
data/lib/asciidoctor/iho/iho.rng
CHANGED
|
@@ -45,6 +45,11 @@
|
|
|
45
45
|
<optional>
|
|
46
46
|
<attribute name="alt"/>
|
|
47
47
|
</optional>
|
|
48
|
+
<optional>
|
|
49
|
+
<attribute name="updatetype">
|
|
50
|
+
<data type="boolean"/>
|
|
51
|
+
</attribute>
|
|
52
|
+
</optional>
|
|
48
53
|
<text/>
|
|
49
54
|
</element>
|
|
50
55
|
</define>
|
|
@@ -86,6 +91,35 @@
|
|
|
86
91
|
<text/>
|
|
87
92
|
</element>
|
|
88
93
|
</define>
|
|
94
|
+
<define name="erefType">
|
|
95
|
+
<optional>
|
|
96
|
+
<attribute name="normative">
|
|
97
|
+
<data type="boolean"/>
|
|
98
|
+
</attribute>
|
|
99
|
+
</optional>
|
|
100
|
+
<attribute name="citeas"/>
|
|
101
|
+
<attribute name="type">
|
|
102
|
+
<ref name="ReferenceFormat"/>
|
|
103
|
+
</attribute>
|
|
104
|
+
<optional>
|
|
105
|
+
<attribute name="alt"/>
|
|
106
|
+
</optional>
|
|
107
|
+
<optional>
|
|
108
|
+
<attribute name="case">
|
|
109
|
+
<choice>
|
|
110
|
+
<value>capital</value>
|
|
111
|
+
<value>lowercase</value>
|
|
112
|
+
</choice>
|
|
113
|
+
</attribute>
|
|
114
|
+
</optional>
|
|
115
|
+
<optional>
|
|
116
|
+
<attribute name="droploc">
|
|
117
|
+
<data type="boolean"/>
|
|
118
|
+
</attribute>
|
|
119
|
+
</optional>
|
|
120
|
+
<ref name="CitationType"/>
|
|
121
|
+
<text/>
|
|
122
|
+
</define>
|
|
89
123
|
<define name="ul">
|
|
90
124
|
<element name="ul">
|
|
91
125
|
<attribute name="id">
|
|
@@ -514,6 +548,9 @@
|
|
|
514
548
|
</define>
|
|
515
549
|
<define name="BibDataExtensionType">
|
|
516
550
|
<ref name="doctype"/>
|
|
551
|
+
<optional>
|
|
552
|
+
<ref name="docsubtype"/>
|
|
553
|
+
</optional>
|
|
517
554
|
<optional>
|
|
518
555
|
<ref name="editorialgroup"/>
|
|
519
556
|
</optional>
|
|
@@ -775,8 +812,100 @@
|
|
|
775
812
|
<ref name="paragraph"/>
|
|
776
813
|
</element>
|
|
777
814
|
</define>
|
|
815
|
+
<define name="em">
|
|
816
|
+
<element name="em">
|
|
817
|
+
<zeroOrMore>
|
|
818
|
+
<choice>
|
|
819
|
+
<ref name="PureTextElement"/>
|
|
820
|
+
<ref name="stem"/>
|
|
821
|
+
<ref name="index"/>
|
|
822
|
+
</choice>
|
|
823
|
+
</zeroOrMore>
|
|
824
|
+
</element>
|
|
825
|
+
</define>
|
|
826
|
+
<define name="strong">
|
|
827
|
+
<element name="strong">
|
|
828
|
+
<zeroOrMore>
|
|
829
|
+
<choice>
|
|
830
|
+
<ref name="PureTextElement"/>
|
|
831
|
+
<ref name="stem"/>
|
|
832
|
+
<ref name="index"/>
|
|
833
|
+
</choice>
|
|
834
|
+
</zeroOrMore>
|
|
835
|
+
</element>
|
|
836
|
+
</define>
|
|
837
|
+
<define name="tt">
|
|
838
|
+
<element name="tt">
|
|
839
|
+
<zeroOrMore>
|
|
840
|
+
<choice>
|
|
841
|
+
<ref name="PureTextElement"/>
|
|
842
|
+
<ref name="index"/>
|
|
843
|
+
</choice>
|
|
844
|
+
</zeroOrMore>
|
|
845
|
+
</element>
|
|
846
|
+
</define>
|
|
847
|
+
<define name="keyword">
|
|
848
|
+
<element name="keyword">
|
|
849
|
+
<zeroOrMore>
|
|
850
|
+
<choice>
|
|
851
|
+
<ref name="PureTextElement"/>
|
|
852
|
+
<ref name="index"/>
|
|
853
|
+
</choice>
|
|
854
|
+
</zeroOrMore>
|
|
855
|
+
</element>
|
|
856
|
+
</define>
|
|
857
|
+
<define name="strike">
|
|
858
|
+
<element name="strike">
|
|
859
|
+
<zeroOrMore>
|
|
860
|
+
<choice>
|
|
861
|
+
<ref name="PureTextElement"/>
|
|
862
|
+
<ref name="index"/>
|
|
863
|
+
</choice>
|
|
864
|
+
</zeroOrMore>
|
|
865
|
+
</element>
|
|
866
|
+
</define>
|
|
867
|
+
<define name="underline">
|
|
868
|
+
<element name="underline">
|
|
869
|
+
<zeroOrMore>
|
|
870
|
+
<choice>
|
|
871
|
+
<ref name="PureTextElement"/>
|
|
872
|
+
<ref name="index"/>
|
|
873
|
+
</choice>
|
|
874
|
+
</zeroOrMore>
|
|
875
|
+
</element>
|
|
876
|
+
</define>
|
|
877
|
+
<define name="smallcap">
|
|
878
|
+
<element name="smallcap">
|
|
879
|
+
<zeroOrMore>
|
|
880
|
+
<choice>
|
|
881
|
+
<ref name="PureTextElement"/>
|
|
882
|
+
<ref name="index"/>
|
|
883
|
+
</choice>
|
|
884
|
+
</zeroOrMore>
|
|
885
|
+
</element>
|
|
886
|
+
</define>
|
|
887
|
+
<define name="pagebreak">
|
|
888
|
+
<element name="pagebreak">
|
|
889
|
+
<optional>
|
|
890
|
+
<attribute name="orientation">
|
|
891
|
+
<choice>
|
|
892
|
+
<value>landscape</value>
|
|
893
|
+
<value>portrait</value>
|
|
894
|
+
</choice>
|
|
895
|
+
</attribute>
|
|
896
|
+
</optional>
|
|
897
|
+
</element>
|
|
898
|
+
</define>
|
|
778
899
|
</include>
|
|
779
900
|
<!-- end overrides -->
|
|
901
|
+
<define name="docsubtype">
|
|
902
|
+
<element name="docsubtype">
|
|
903
|
+
<ref name="DocumentSubtype"/>
|
|
904
|
+
</element>
|
|
905
|
+
</define>
|
|
906
|
+
<define name="DocumentSubtype">
|
|
907
|
+
<text/>
|
|
908
|
+
</define>
|
|
780
909
|
<define name="colgroup">
|
|
781
910
|
<element name="colgroup">
|
|
782
911
|
<oneOrMore>
|
|
@@ -793,7 +922,35 @@
|
|
|
793
922
|
<value>internal</value>
|
|
794
923
|
</define>
|
|
795
924
|
<define name="TextElement" combine="choice">
|
|
796
|
-
<
|
|
925
|
+
<choice>
|
|
926
|
+
<ref name="concept"/>
|
|
927
|
+
<ref name="add"/>
|
|
928
|
+
<ref name="del"/>
|
|
929
|
+
</choice>
|
|
930
|
+
</define>
|
|
931
|
+
<define name="add">
|
|
932
|
+
<element name="add">
|
|
933
|
+
<choice>
|
|
934
|
+
<ref name="PureTextElement"/>
|
|
935
|
+
<ref name="eref"/>
|
|
936
|
+
<ref name="stem"/>
|
|
937
|
+
<ref name="keyword"/>
|
|
938
|
+
<ref name="xref"/>
|
|
939
|
+
<ref name="hyperlink"/>
|
|
940
|
+
</choice>
|
|
941
|
+
</element>
|
|
942
|
+
</define>
|
|
943
|
+
<define name="del">
|
|
944
|
+
<element name="del">
|
|
945
|
+
<choice>
|
|
946
|
+
<ref name="PureTextElement"/>
|
|
947
|
+
<ref name="eref"/>
|
|
948
|
+
<ref name="stem"/>
|
|
949
|
+
<ref name="keyword"/>
|
|
950
|
+
<ref name="xref"/>
|
|
951
|
+
<ref name="hyperlink"/>
|
|
952
|
+
</choice>
|
|
953
|
+
</element>
|
|
797
954
|
</define>
|
|
798
955
|
<define name="concept">
|
|
799
956
|
<element name="concept">
|
|
@@ -814,8 +971,170 @@
|
|
|
814
971
|
<ref name="permission"/>
|
|
815
972
|
<ref name="imagemap"/>
|
|
816
973
|
<ref name="svgmap"/>
|
|
974
|
+
<ref name="inputform"/>
|
|
975
|
+
</choice>
|
|
976
|
+
</define>
|
|
977
|
+
<define name="inputform">
|
|
978
|
+
<element name="form">
|
|
979
|
+
<attribute name="id">
|
|
980
|
+
<data type="ID"/>
|
|
981
|
+
</attribute>
|
|
982
|
+
<attribute name="name"/>
|
|
983
|
+
<attribute name="action"/>
|
|
984
|
+
<zeroOrMore>
|
|
985
|
+
<choice>
|
|
986
|
+
<ref name="TextElement"/>
|
|
987
|
+
<ref name="FormInput"/>
|
|
988
|
+
</choice>
|
|
989
|
+
</zeroOrMore>
|
|
990
|
+
</element>
|
|
991
|
+
</define>
|
|
992
|
+
<define name="FormInput">
|
|
993
|
+
<choice>
|
|
994
|
+
<ref name="input"/>
|
|
995
|
+
<ref name="formlabel"/>
|
|
996
|
+
<ref name="select"/>
|
|
997
|
+
<ref name="textarea"/>
|
|
998
|
+
</choice>
|
|
999
|
+
</define>
|
|
1000
|
+
<define name="InputType">
|
|
1001
|
+
<choice>
|
|
1002
|
+
<value>button</value>
|
|
1003
|
+
<value>checkbox</value>
|
|
1004
|
+
<value>date</value>
|
|
1005
|
+
<value>file</value>
|
|
1006
|
+
<value>password</value>
|
|
1007
|
+
<value>radio</value>
|
|
1008
|
+
<value>submit</value>
|
|
1009
|
+
<value>text</value>
|
|
817
1010
|
</choice>
|
|
818
1011
|
</define>
|
|
1012
|
+
<define name="input">
|
|
1013
|
+
<element name="input">
|
|
1014
|
+
<attribute name="type">
|
|
1015
|
+
<ref name="InputType"/>
|
|
1016
|
+
</attribute>
|
|
1017
|
+
<optional>
|
|
1018
|
+
<attribute name="checked">
|
|
1019
|
+
<data type="boolean"/>
|
|
1020
|
+
</attribute>
|
|
1021
|
+
</optional>
|
|
1022
|
+
<optional>
|
|
1023
|
+
<attribute name="disabled">
|
|
1024
|
+
<data type="boolean"/>
|
|
1025
|
+
</attribute>
|
|
1026
|
+
</optional>
|
|
1027
|
+
<optional>
|
|
1028
|
+
<attribute name="readonly">
|
|
1029
|
+
<data type="boolean"/>
|
|
1030
|
+
</attribute>
|
|
1031
|
+
</optional>
|
|
1032
|
+
<optional>
|
|
1033
|
+
<attribute name="maxlength">
|
|
1034
|
+
<data type="int"/>
|
|
1035
|
+
</attribute>
|
|
1036
|
+
</optional>
|
|
1037
|
+
<optional>
|
|
1038
|
+
<attribute name="minlength">
|
|
1039
|
+
<data type="int"/>
|
|
1040
|
+
</attribute>
|
|
1041
|
+
</optional>
|
|
1042
|
+
<optional>
|
|
1043
|
+
<attribute name="name"/>
|
|
1044
|
+
</optional>
|
|
1045
|
+
<optional>
|
|
1046
|
+
<attribute name="value"/>
|
|
1047
|
+
</optional>
|
|
1048
|
+
<optional>
|
|
1049
|
+
<attribute name="id">
|
|
1050
|
+
<data type="ID"/>
|
|
1051
|
+
</attribute>
|
|
1052
|
+
</optional>
|
|
1053
|
+
</element>
|
|
1054
|
+
</define>
|
|
1055
|
+
<define name="formlabel">
|
|
1056
|
+
<element name="label">
|
|
1057
|
+
<attribute name="for">
|
|
1058
|
+
<data type="IDREF"/>
|
|
1059
|
+
</attribute>
|
|
1060
|
+
<zeroOrMore>
|
|
1061
|
+
<ref name="PureTextElement"/>
|
|
1062
|
+
</zeroOrMore>
|
|
1063
|
+
</element>
|
|
1064
|
+
</define>
|
|
1065
|
+
<define name="select">
|
|
1066
|
+
<element name="select">
|
|
1067
|
+
<optional>
|
|
1068
|
+
<attribute name="name"/>
|
|
1069
|
+
</optional>
|
|
1070
|
+
<optional>
|
|
1071
|
+
<attribute name="value"/>
|
|
1072
|
+
</optional>
|
|
1073
|
+
<optional>
|
|
1074
|
+
<attribute name="id">
|
|
1075
|
+
<data type="ID"/>
|
|
1076
|
+
</attribute>
|
|
1077
|
+
</optional>
|
|
1078
|
+
<optional>
|
|
1079
|
+
<attribute name="disabled">
|
|
1080
|
+
<data type="boolean"/>
|
|
1081
|
+
</attribute>
|
|
1082
|
+
</optional>
|
|
1083
|
+
<optional>
|
|
1084
|
+
<attribute name="multiple">
|
|
1085
|
+
<data type="boolean"/>
|
|
1086
|
+
</attribute>
|
|
1087
|
+
</optional>
|
|
1088
|
+
<optional>
|
|
1089
|
+
<attribute name="size">
|
|
1090
|
+
<data type="int"/>
|
|
1091
|
+
</attribute>
|
|
1092
|
+
</optional>
|
|
1093
|
+
<oneOrMore>
|
|
1094
|
+
<ref name="option"/>
|
|
1095
|
+
</oneOrMore>
|
|
1096
|
+
</element>
|
|
1097
|
+
</define>
|
|
1098
|
+
<define name="option">
|
|
1099
|
+
<element name="option">
|
|
1100
|
+
<optional>
|
|
1101
|
+
<attribute name="disabled">
|
|
1102
|
+
<data type="boolean"/>
|
|
1103
|
+
</attribute>
|
|
1104
|
+
</optional>
|
|
1105
|
+
<optional>
|
|
1106
|
+
<attribute name="value"/>
|
|
1107
|
+
</optional>
|
|
1108
|
+
<zeroOrMore>
|
|
1109
|
+
<ref name="PureTextElement"/>
|
|
1110
|
+
</zeroOrMore>
|
|
1111
|
+
</element>
|
|
1112
|
+
</define>
|
|
1113
|
+
<define name="textarea">
|
|
1114
|
+
<element name="textarea">
|
|
1115
|
+
<optional>
|
|
1116
|
+
<attribute name="name"/>
|
|
1117
|
+
</optional>
|
|
1118
|
+
<optional>
|
|
1119
|
+
<attribute name="value"/>
|
|
1120
|
+
</optional>
|
|
1121
|
+
<optional>
|
|
1122
|
+
<attribute name="id">
|
|
1123
|
+
<data type="ID"/>
|
|
1124
|
+
</attribute>
|
|
1125
|
+
</optional>
|
|
1126
|
+
<optional>
|
|
1127
|
+
<attribute name="rows">
|
|
1128
|
+
<data type="int"/>
|
|
1129
|
+
</attribute>
|
|
1130
|
+
</optional>
|
|
1131
|
+
<optional>
|
|
1132
|
+
<attribute name="cols">
|
|
1133
|
+
<data type="int"/>
|
|
1134
|
+
</attribute>
|
|
1135
|
+
</optional>
|
|
1136
|
+
</element>
|
|
1137
|
+
</define>
|
|
819
1138
|
<define name="bibliography">
|
|
820
1139
|
<element name="bibliography">
|
|
821
1140
|
<oneOrMore>
|
|
@@ -888,9 +1207,7 @@
|
|
|
888
1207
|
</define>
|
|
889
1208
|
<define name="IsoWorkgroup">
|
|
890
1209
|
<optional>
|
|
891
|
-
<attribute name="number"
|
|
892
|
-
<data type="int"/>
|
|
893
|
-
</attribute>
|
|
1210
|
+
<attribute name="number"/>
|
|
894
1211
|
</optional>
|
|
895
1212
|
<optional>
|
|
896
1213
|
<attribute name="type"/>
|