relaton-iso-bib 0.9.1 → 1.1.1

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/grammars/basicdoc.rng +12 -56
  3. data/grammars/biblio.rng +144 -49
  4. data/grammars/isodoc.rng +592 -29
  5. data/grammars/isostandard.rng +145 -472
  6. data/lib/relaton_iso_bib/iso_bibliographic_item.rb +9 -4
  7. data/lib/relaton_iso_bib/version.rb +1 -1
  8. data/lib/relaton_iso_bib/xml_parser.rb +10 -17
  9. data/relaton_iso_bib.gemspec +5 -4
  10. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cc16104d81250d1f82f14f6669717534d95816e6045ab920d3d38b0df268e869
4
- data.tar.gz: 3ea95c8823f08b683a7c9c028fa2dfecc1283b5146939824b8c5f0b6435bb4f6
3
+ metadata.gz: ad71b0b622c9135047f563a8408c72de0daaf015e6b51d4190cea7bdc31bd799
4
+ data.tar.gz: d44e8d718863a37f4a14f942935798746b0fc0e760f4f252ff603e90feecb0e9
5
5
  SHA512:
6
- metadata.gz: 6c457b38bd1f99f79c332ff19248808763f1cd9dc6da2ef44bcc74b5c698e9656b0e20feb459ff697ee3c88edd76641f14e8abd2a9d0f6647338364fdeb6778f
7
- data.tar.gz: 010f6a15eb06e829ed8bbb34cc1ed5e50614951758d736c0775d526f5ccc0a58c70c195b06b642a262319e63ed2a959631754650f64ac7b1ea270503d36aa568
6
+ metadata.gz: a2eb7356df7887db0e56622f0790edff531b3c52163f1fdb8a6bab592280e5d59a3b3008d21b1865abfe52968bf53d85760389d3e6fa9bb12c657b84da0230ea
7
+ data.tar.gz: e6ddce5c5ebc885424582ba63ab3a313034acdf9d3c8f9c154a6c18fc7692f083d0667cf7fc9f0cf97a233bc9567a56c4b7f4af22ce4e4b7b4309c57be518896
data/grammars/basicdoc.rng CHANGED
@@ -1,10 +1,9 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
- <include href="biblio.rng" />
3
+ <include href="biblio.rng"/>
4
4
  <start>
5
5
  <ref name="document"/>
6
6
  </start>
7
- <!-- </include> -->
8
7
  <define name="document">
9
8
  <element name="document">
10
9
  <optional>
@@ -43,12 +42,6 @@
43
42
  <data type="ID"/>
44
43
  </attribute>
45
44
  </optional>
46
- <optional>
47
- <attribute name="language"/>
48
- </optional>
49
- <optional>
50
- <attribute name="script"/>
51
- </optional>
52
45
  <optional>
53
46
  <ref name="section-title"/>
54
47
  </optional>
@@ -195,14 +188,6 @@
195
188
  <data type="boolean"/>
196
189
  </attribute>
197
190
  </optional>
198
- <optional>
199
- <attribute name="subsequence"/>
200
- </optional>
201
- <optional>
202
- <attribute name="inequality">
203
- <data type="boolean"/>
204
- </attribute>
205
- </optional>
206
191
  <ref name="stem"/>
207
192
  <optional>
208
193
  <ref name="dl"/>
@@ -256,9 +241,6 @@
256
241
  <data type="boolean"/>
257
242
  </attribute>
258
243
  </optional>
259
- <optional>
260
- <attribute name="subsequence"/>
261
- </optional>
262
244
  <optional>
263
245
  <attribute name="lang"/>
264
246
  </optional>
@@ -303,15 +285,9 @@
303
285
  <data type="boolean"/>
304
286
  </attribute>
305
287
  </optional>
306
- <optional>
307
- <attribute name="subsequence"/>
308
- </optional>
309
288
  <optional>
310
289
  <attribute name="alt"/>
311
290
  </optional>
312
- <optional>
313
- <attribute name="summary"/>
314
- </optional>
315
291
  <optional>
316
292
  <attribute name="uri">
317
293
  <data type="anyURI"/>
@@ -337,9 +313,12 @@
337
313
  </define>
338
314
  <define name="tname">
339
315
  <element name="name">
340
- <oneOrMore>
341
- <ref name="PureTextElement"/>
342
- </oneOrMore>
316
+ <text/>
317
+ </element>
318
+ </define>
319
+ <define name="tclass">
320
+ <element name="name">
321
+ <text/>
343
322
  </element>
344
323
  </define>
345
324
  <define name="thead">
@@ -438,12 +417,6 @@
438
417
  <data type="boolean"/>
439
418
  </attribute>
440
419
  </optional>
441
- <optional>
442
- <attribute name="subsequence"/>
443
- </optional>
444
- <optional>
445
- <ref name="tname"/>
446
- </optional>
447
420
  <oneOrMore>
448
421
  <choice>
449
422
  <ref name="formula"/>
@@ -507,26 +480,18 @@
507
480
  <data type="boolean"/>
508
481
  </attribute>
509
482
  </optional>
510
- <optional>
511
- <attribute name="subsequence"/>
512
- </optional>
513
- <optional>
514
- <attribute name="class"/>
515
- </optional>
516
483
  <optional>
517
484
  <ref name="source"/>
518
485
  </optional>
519
486
  <optional>
520
487
  <ref name="tname"/>
521
488
  </optional>
489
+ <optional>
490
+ <ref name="tclass"/>
491
+ </optional>
522
492
  <choice>
523
493
  <ref name="image"/>
524
- <ref name="video"/>
525
- <ref name="audio"/>
526
494
  <ref name="pre"/>
527
- <oneOrMore>
528
- <ref name="paragraph-with-footnote"/>
529
- </oneOrMore>
530
495
  <zeroOrMore>
531
496
  <ref name="figure"/>
532
497
  </zeroOrMore>
@@ -813,9 +778,6 @@
813
778
  <optional>
814
779
  <attribute name="alt"/>
815
780
  </optional>
816
- <optional>
817
- <attribute name="title"/>
818
- </optional>
819
781
  <optional>
820
782
  <attribute name="longdesc">
821
783
  <data type="anyURI"/>
@@ -824,7 +786,7 @@
824
786
  </element>
825
787
  </define>
826
788
  <define name="video">
827
- <element name="video">
789
+ <element name="image">
828
790
  <attribute name="id">
829
791
  <data type="ID"/>
830
792
  </attribute>
@@ -854,9 +816,6 @@
854
816
  <optional>
855
817
  <attribute name="alt"/>
856
818
  </optional>
857
- <optional>
858
- <attribute name="title"/>
859
- </optional>
860
819
  <optional>
861
820
  <attribute name="longdesc">
862
821
  <data type="anyURI"/>
@@ -868,7 +827,7 @@
868
827
  </element>
869
828
  </define>
870
829
  <define name="audio">
871
- <element name="audio">
830
+ <element name="image">
872
831
  <attribute name="id">
873
832
  <data type="ID"/>
874
833
  </attribute>
@@ -882,9 +841,6 @@
882
841
  <optional>
883
842
  <attribute name="alt"/>
884
843
  </optional>
885
- <optional>
886
- <attribute name="title"/>
887
- </optional>
888
844
  <optional>
889
845
  <attribute name="longdesc">
890
846
  <data type="anyURI"/>
data/grammars/biblio.rng CHANGED
@@ -49,11 +49,17 @@
49
49
  </define>
50
50
  <define name="stage">
51
51
  <element name="stage">
52
+ <optional>
53
+ <attribute name="abbreviation"/>
54
+ </optional>
52
55
  <text/>
53
56
  </element>
54
57
  </define>
55
58
  <define name="substage">
56
59
  <element name="substage">
60
+ <optional>
61
+ <attribute name="abbreviation"/>
62
+ </optional>
57
63
  <text/>
58
64
  </element>
59
65
  </define>
@@ -82,7 +88,7 @@
82
88
  <text/>
83
89
  </element>
84
90
  </define>
85
- <define name="LocalizedString">
91
+ <define name="LocalizedString1">
86
92
  <optional>
87
93
  <!-- multiple languages and scripts possible: comma delimit them if so -->
88
94
  <attribute name="language"/>
@@ -92,6 +98,16 @@
92
98
  </optional>
93
99
  <text/>
94
100
  </define>
101
+ <define name="LocalizedString">
102
+ <choice>
103
+ <ref name="LocalizedString1"/>
104
+ <oneOrMore>
105
+ <element name="variant">
106
+ <ref name="LocalizedString1"/>
107
+ </element>
108
+ </oneOrMore>
109
+ </choice>
110
+ </define>
95
111
  <!--
96
112
  Unlike UML, change type to format: type is overloaded
97
113
  Would be need if plain were default value and could omit the attribute
@@ -115,7 +131,7 @@
115
131
  </optional>
116
132
  <ref name="LocalizedStringOrXsAny"/>
117
133
  </define>
118
- <define name="LocalizedStringOrXsAny">
134
+ <define name="LocalizedStringOrXsAny1">
119
135
  <optional>
120
136
  <!-- multiple languages and scripts possible: comma delimit them if so -->
121
137
  <attribute name="language"/>
@@ -130,6 +146,16 @@
130
146
  </choice>
131
147
  </oneOrMore>
132
148
  </define>
149
+ <define name="LocalizedStringOrXsAny">
150
+ <choice>
151
+ <ref name="LocalizedStringOrXsAny1"/>
152
+ <oneOrMore>
153
+ <element name="variant">
154
+ <ref name="LocalizedStringOrXsAny1"/>
155
+ </element>
156
+ </oneOrMore>
157
+ </choice>
158
+ </define>
133
159
  <define name="contributor">
134
160
  <element name="contributor">
135
161
  <zeroOrMore>
@@ -452,9 +478,14 @@
452
478
  <attribute name="bibitemid">
453
479
  <data type="IDREF"/>
454
480
  </attribute>
455
- <zeroOrMore>
456
- <ref name="locality"/>
457
- </zeroOrMore>
481
+ <choice>
482
+ <zeroOrMore>
483
+ <ref name="locality"/>
484
+ </zeroOrMore>
485
+ <zeroOrMore>
486
+ <ref name="localityStack"/>
487
+ </zeroOrMore>
488
+ </choice>
458
489
  <optional>
459
490
  <ref name="date"/>
460
491
  </optional>
@@ -469,6 +500,25 @@
469
500
  <ref name="BibItemLocality"/>
470
501
  </element>
471
502
  </define>
503
+ <define name="localityStack">
504
+ <element name="localityStack">
505
+ <zeroOrMore>
506
+ <ref name="locality"/>
507
+ </zeroOrMore>
508
+ </element>
509
+ </define>
510
+ <define name="sourceLocality">
511
+ <element name="sourceLocality">
512
+ <ref name="BibItemLocality"/>
513
+ </element>
514
+ </define>
515
+ <define name="sourceLocalityStack">
516
+ <element name="sourceLocalityStack">
517
+ <zeroOrMore>
518
+ <ref name="sourceLocality"/>
519
+ </zeroOrMore>
520
+ </element>
521
+ </define>
472
522
  <define name="BibItemLocality">
473
523
  <attribute name="type">
474
524
  <ref name="LocalityType"/>
@@ -611,9 +661,9 @@
611
661
  <optional>
612
662
  <ref name="status"/>
613
663
  </optional>
614
- <optional>
664
+ <zeroOrMore>
615
665
  <ref name="copyright"/>
616
- </optional>
666
+ </zeroOrMore>
617
667
  <zeroOrMore>
618
668
  <ref name="docrelation"/>
619
669
  </zeroOrMore>
@@ -703,21 +753,11 @@
703
753
  </define>
704
754
  <define name="TypedTitleString">
705
755
  <optional>
706
- <attribute name="type">
707
- <ref name="TitleType"/>
708
- </attribute>
756
+ <attribute name="type"/>
709
757
  </optional>
710
758
  <ref name="FormattedString"/>
711
759
  </define>
712
- <define name="TitleType">
713
- <choice>
714
- <value>alternative</value>
715
- <value>original</value>
716
- <value>unofficial</value>
717
- <value>subtitle</value>
718
- <value>main</value>
719
- </choice>
720
- </define>
760
+ <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
721
761
  <define name="TypedUri">
722
762
  <optional>
723
763
  <attribute name="type"/>
@@ -747,6 +787,8 @@
747
787
  <value>unchanged</value>
748
788
  <value>circulated</value>
749
789
  <value>adapted</value>
790
+ <value>vote-started</value>
791
+ <value>vote-ended</value>
750
792
  </choice>
751
793
  </define>
752
794
  <define name="bdate">
@@ -979,7 +1021,17 @@
979
1021
  <optional>
980
1022
  <ref name="to"/>
981
1023
  </optional>
982
- <ref name="owner"/>
1024
+ <oneOrMore>
1025
+ <ref name="owner"/>
1026
+ </oneOrMore>
1027
+ <optional>
1028
+ <ref name="copyright_scope"/>
1029
+ </optional>
1030
+ </element>
1031
+ </define>
1032
+ <define name="copyright_scope">
1033
+ <element name="scope">
1034
+ <text/>
983
1035
  </element>
984
1036
  </define>
985
1037
  <define name="from">
@@ -999,38 +1051,63 @@
999
1051
  </define>
1000
1052
  <define name="DocRelationType">
1001
1053
  <choice>
1002
- <value>obsoletes</value>
1003
- <value>obsoletedBy</value>
1004
- <value>supersedes</value>
1005
- <value>supersededBy</value>
1006
- <value>updates</value>
1007
- <value>updatedBy</value>
1008
- <value>complements</value>
1009
- <value>derivedFrom</value>
1010
- <value>translatedFrom</value>
1011
- <value>hasTranslation</value>
1012
- <value>adoptedFrom</value>
1013
- <value>equivalent</value>
1014
- <value>identical</value>
1015
- <value>nonequivalent</value>
1016
- <value>includedIn</value>
1017
1054
  <value>includes</value>
1018
- <value>instance</value>
1019
- <value>instanceOf</value>
1020
- <value>partOf</value>
1055
+ <value>includedIn</value>
1021
1056
  <value>hasPart</value>
1022
- <value>hasDraft</value>
1023
- <value>draftOf</value>
1057
+ <value>partOf</value>
1024
1058
  <value>merges</value>
1059
+ <value>mergedInto</value>
1025
1060
  <value>splits</value>
1026
- <value>amends</value>
1027
- <value>amendedBy</value>
1028
- <value>corrects</value>
1029
- <value>correctedBy</value>
1030
- <value>revises</value>
1031
- <value>revisedBy</value>
1061
+ <value>splitInto</value>
1062
+ <value>instance</value>
1063
+ <value>hasInstance</value>
1064
+ <value>exemplarOf</value>
1065
+ <value>hasExemplar</value>
1066
+ <value>manifestationOf</value>
1067
+ <value>hasManifestation</value>
1068
+ <value>reproductionOf</value>
1069
+ <value>hasReproduction</value>
1070
+ <value>reprintOf</value>
1071
+ <value>hasReprint</value>
1072
+ <value>expressionOf</value>
1073
+ <value>hasExpression</value>
1074
+ <value>translatedFrom</value>
1075
+ <value>hasTranslation</value>
1076
+ <value>arrangementOf</value>
1077
+ <value>hasArrangement</value>
1078
+ <value>abridgementOf</value>
1079
+ <value>hasAbridgement</value>
1080
+ <value>annotationOf</value>
1081
+ <value>hasAnnotation</value>
1082
+ <value>draftOf</value>
1083
+ <value>hasDraft</value>
1084
+ <value>editionOf</value>
1085
+ <value>hasEdition</value>
1086
+ <value>updates</value>
1087
+ <value>updatedBy</value>
1088
+ <value>derivedFrom</value>
1089
+ <value>derives</value>
1032
1090
  <value>describes</value>
1033
1091
  <value>describedBy</value>
1092
+ <value>catalogues</value>
1093
+ <value>cataloguedBy</value>
1094
+ <value>hasSuccessor</value>
1095
+ <value>successorOf</value>
1096
+ <value>adaptedFrom</value>
1097
+ <value>hasAdaptation</value>
1098
+ <value>adoptedFrom</value>
1099
+ <value>adoptedAs</value>
1100
+ <value>reviewOf</value>
1101
+ <value>hasReview</value>
1102
+ <value>commentaryOf</value>
1103
+ <value>hasCommentary</value>
1104
+ <value>related</value>
1105
+ <value>complements</value>
1106
+ <value>complementOf</value>
1107
+ <value>obsoletes</value>
1108
+ <value>obsoletedBy</value>
1109
+ <value>cited</value>
1110
+ <value>isCitedIn</value>
1034
1111
  </choice>
1035
1112
  </define>
1036
1113
  <define name="docrelation">
@@ -1038,12 +1115,30 @@
1038
1115
  <attribute name="type">
1039
1116
  <ref name="DocRelationType"/>
1040
1117
  </attribute>
1118
+ <optional>
1119
+ <element name="description">
1120
+ <ref name="FormattedString"/>
1121
+ </element>
1122
+ </optional>
1041
1123
  <element name="bibitem">
1042
1124
  <ref name="BibliographicItem"/>
1043
1125
  </element>
1044
- <zeroOrMore>
1045
- <ref name="locality"/>
1046
- </zeroOrMore>
1126
+ <choice>
1127
+ <zeroOrMore>
1128
+ <ref name="locality"/>
1129
+ </zeroOrMore>
1130
+ <zeroOrMore>
1131
+ <ref name="localityStack"/>
1132
+ </zeroOrMore>
1133
+ </choice>
1134
+ <choice>
1135
+ <zeroOrMore>
1136
+ <ref name="sourceLocality"/>
1137
+ </zeroOrMore>
1138
+ <zeroOrMore>
1139
+ <ref name="sourceLocalityStack"/>
1140
+ </zeroOrMore>
1141
+ </choice>
1047
1142
  </element>
1048
1143
  </define>
1049
1144
  <define name="version">