Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@opoudjis
opoudjis committed Apr 22, 2024
1 parent 315d6a2 commit fd00f0f
Show file tree
Hide file tree
Showing 12 changed files with 1,203 additions and 1,273 deletions.
45 changes: 22 additions & 23 deletions lib/metanorma/ieee/biblio.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<text/>
</element>
</define>
<define name="LocalizedString1">
<define name="LocalizedStringAttrs">
<optional>
<!-- multiple languages and scripts possible: comma delimit them if so -->
<attribute name="language"/>
Expand All @@ -106,6 +106,10 @@
<optional>
<attribute name="script"/>
</optional>
</define>
<define name="LocalizedString1">
<!-- multiple languages and scripts possible: comma delimit them if so -->
<ref name="LocalizedStringAttrs"/>
<text/>
</define>
<define name="LocalizedString">
Expand Down Expand Up @@ -142,16 +146,8 @@
<ref name="LocalizedStringOrXsAny"/>
</define>
<define name="LocalizedStringOrXsAny1">
<optional>
<!-- multiple languages and scripts possible: comma delimit them if so -->
<attribute name="language"/>
</optional>
<optional>
<attribute name="locale"/>
</optional>
<optional>
<attribute name="script"/>
</optional>
<!-- multiple languages and scripts possible: comma delimit them if so -->
<ref name="LocalizedStringAttrs"/>
<oneOrMore>
<choice>
<text/>
Expand Down Expand Up @@ -208,6 +204,7 @@
</define>
<define name="roledescription">
<element name="description">
<ref name="LocalizedStringAttrs"/>
<oneOrMore>
<ref name="TextElement"/>
</oneOrMore>
Expand Down Expand Up @@ -335,6 +332,7 @@
</define>
<define name="affiliationdescription">
<element name="description">
<ref name="LocalizedStringAttrs"/>
<oneOrMore>
<ref name="TextElement"/>
</oneOrMore>
Expand Down Expand Up @@ -948,6 +946,7 @@
<optional>
<attribute name="type"/>
</optional>
<ref name="LocalizedStringAttrs"/>
<zeroOrMore>
<ref name="TextElement"/>
</zeroOrMore>
Expand Down Expand Up @@ -1041,15 +1040,7 @@
<data type="boolean"/>
</attribute>
</optional>
<optional>
<attribute name="language"/>
</optional>
<optional>
<attribute name="locale"/>
</optional>
<optional>
<attribute name="script"/>
</optional>
<ref name="LocalizedStringAttrs"/>
<oneOrMore>
<ref name="TextElement"/>
</oneOrMore>
Expand Down Expand Up @@ -1277,16 +1268,23 @@
<optional>
<attribute name="type"/>
</optional>
<ref name="LocalizedStringAttrs"/>
<oneOrMore>
<ref name="TextElement"/>
</oneOrMore>
</element>
</define>
<define name="bibabstract">
<element name="abstract">
<oneOrMore>
<ref name="TextElement"/>
</oneOrMore>
<ref name="LocalizedStringAttrs"/>
<choice>
<oneOrMore>
<ref name="BasicBlock"/>
</oneOrMore>
<oneOrMore>
<ref name="TextElement"/>
</oneOrMore>
</choice>
</element>
</define>
<define name="copyright">
Expand Down Expand Up @@ -1391,6 +1389,7 @@
</attribute>
<optional>
<element name="description">
<ref name="LocalizedStringAttrs"/>
<oneOrMore>
<ref name="TextElement"/>
</oneOrMore>
Expand Down
153 changes: 37 additions & 116 deletions lib/metanorma/ieee/isodoc.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
these elements; we just want one namespace for any child grammars
of this.
-->
<!-- VERSION v1.3.0 -->
<!-- VERSION v1.3.1 -->
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<include href="reqt.rng"/>
<include href="basicdoc.rng">
Expand Down Expand Up @@ -1346,38 +1346,41 @@
</oneOrMore>
</element>
</define>
<define name="Section-Attributes">
<optional>
<attribute name="id">
<data type="ID"/>
</attribute>
</optional>
<optional>
<attribute name="language"/>
</optional>
<optional>
<attribute name="script"/>
</optional>
<optional>
<attribute name="inline-header">
<data type="boolean"/>
</attribute>
</optional>
<optional>
<attribute name="number"/>
</optional>
<optional>
<attribute name="branch-number"/>
</optional>
<optional>
<attribute name="obligation">
<choice>
<value>normative</value>
<value>informative</value>
</choice>
</attribute>
</optional>
</define>
<define name="reference-clause">
<element name="clause">
<optional>
<attribute name="id">
<data type="ID"/>
</attribute>
</optional>
<optional>
<attribute name="language"/>
</optional>
<optional>
<attribute name="script"/>
</optional>
<optional>
<attribute name="inline-header">
<data type="boolean"/>
</attribute>
</optional>
<optional>
<attribute name="number"/>
</optional>
<optional>
<attribute name="branch-number"/>
</optional>
<optional>
<attribute name="obligation">
<choice>
<value>normative</value>
<value>informative</value>
</choice>
</attribute>
</optional>
<ref name="Section-Attributes"/>
<optional>
<ref name="section-title"/>
</optional>
Expand Down Expand Up @@ -1566,36 +1569,7 @@
</element>
</define>
<define name="Content-Section">
<optional>
<attribute name="id">
<data type="ID"/>
</attribute>
</optional>
<optional>
<attribute name="language"/>
</optional>
<optional>
<attribute name="script"/>
</optional>
<optional>
<attribute name="inline-header">
<data type="boolean"/>
</attribute>
</optional>
<optional>
<attribute name="obligation">
<choice>
<value>normative</value>
<value>informative</value>
</choice>
</attribute>
</optional>
<optional>
<attribute name="number"/>
</optional>
<optional>
<attribute name="branch-number"/>
</optional>
<ref name="Section-Attributes"/>
<optional>
<attribute name="type"/>
</optional>
Expand All @@ -1617,39 +1591,10 @@
</element>
</define>
<define name="Clause-Section">
<optional>
<attribute name="id">
<data type="ID"/>
</attribute>
</optional>
<optional>
<attribute name="language"/>
</optional>
<optional>
<attribute name="script"/>
</optional>
<optional>
<attribute name="inline-header">
<data type="boolean"/>
</attribute>
</optional>
<optional>
<attribute name="obligation">
<choice>
<value>normative</value>
<value>informative</value>
</choice>
</attribute>
</optional>
<ref name="Section-Attributes"/>
<optional>
<attribute name="type"/>
</optional>
<optional>
<attribute name="number"/>
</optional>
<optional>
<attribute name="branch-number"/>
</optional>
<optional>
<ref name="section-title"/>
</optional>
Expand Down Expand Up @@ -1730,34 +1675,10 @@
</define>
<define name="terms">
<element name="terms">
<optional>
<attribute name="id">
<data type="ID"/>
</attribute>
</optional>
<optional>
<attribute name="language"/>
</optional>
<optional>
<attribute name="script"/>
</optional>
<ref name="Section-Attributes"/>
<optional>
<attribute name="type"/>
</optional>
<optional>
<attribute name="number"/>
</optional>
<optional>
<attribute name="branch-number"/>
</optional>
<optional>
<attribute name="obligation">
<choice>
<value>normative</value>
<value>informative</value>
</choice>
</attribute>
</optional>
<optional>
<ref name="section-title"/>
</optional>
Expand Down
2 changes: 1 addition & 1 deletion lib/metanorma/ieee/version.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Metanorma
module IEEE
VERSION = "1.2.7".freeze
VERSION = "1.2.8".freeze
end
end
42 changes: 21 additions & 21 deletions spec/metanorma/refs_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -745,27 +745,27 @@
[bibliography]
== Normative References
* [[[ref1,ISO/IEC 27001]]] REF5
* [[[ref2,ISO 10642]]] REF5
* [[[ref3,IEC 61131-3]]] REF5
* [[[ref4,ITU-T G.984.2]]] REF5
* [[[ref5,ITU-R P.839]]] REF5
* [[[ref6,IEEE Std 81-1983]]] REF5
* [[[ref7,IEEE 43-2013 Redline]]] REF5
* [[[ref8,FIPS 140-2]]] REF5
* [[[ref9,NIST SP 800-171]]] REF5
* [[[ref10,W3C XPTR]]] REF5
* [[[ref11,ETSI GS NFV 002]]] REFS
* [[[ref21,ISO/IEC 2382]]] REF5
* [[[ref22,ISO 639]]] REF5
* [[[ref23,IEC 60050]]] REF5
* [[[ref24,ITU-T K.20]]] REF5
* [[[ref25,ITU-R P.838]]] REF5
* [[[ref26,IEEE Std 194-1977]]] REF5
* [[[ref28,FIPS 140-3]]] REF5
* [[[ref29,NIST SP 800-30]]] REF5
* [[[ref30,W3C XML]]] REF5
* [[[ref31,ETSI GS ZSM 012 V1.1.1]]] REFS
* [[[ref1,ISO/IEC 27001]]] REF01
* [[[ref2,ISO 10642]]] REF02
* [[[ref3,IEC 61131-3]]] REF03
* [[[ref4,ITU-T G.984.2]]] REF04
* [[[ref5,ITU-R P.839]]] REF05
* [[[ref6,IEEE Std 81-1983]]] REF06
* [[[ref7,IEEE 43-2013 Redline]]] REF07
* [[[ref8,FIPS 140-2]]] REF08
* [[[ref9,NIST SP 800-171]]] REF09
* [[[ref10,W3C XPTR]]] REF10
* [[[ref11,ETSI GS NFV 002]]] REF11
* [[[ref21,ISO/IEC 2382]]] REF12
* [[[ref22,ISO 639]]] REF13
* [[[ref23,IEC 60050]]] REF14
* [[[ref24,ITU-T K.20]]] REF15
* [[[ref25,ITU-R P.838]]] REF16
* [[[ref26,IEEE Std 194-1977]]] REF17
* [[[ref28,FIPS 140-3]]] REF18
* [[[ref29,NIST SP 800-30]]] REF19
* [[[ref30,W3C XML]]] REF20
* [[[ref31,ETSI GS ZSM 012 V1.1.1]]] REF21
INPUT
output = <<~OUTPUT
<bibliography>
Expand Down
Loading

0 comments on commit fd00f0f

Please sign in to comment.