Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@opoudjis
opoudjis committed Jan 9, 2024
1 parent 18f3e02 commit 17102c0
Show file tree
Hide file tree
Showing 7 changed files with 158 additions and 91 deletions.
99 changes: 91 additions & 8 deletions lib/metanorma/cc/basicdoc.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,89 @@
<ref name="pagebreak"/>
<ref name="hr"/>
<ref name="bookmark"/>
<ref name="amend"/>
</choice>
</define>
<define name="amend">
<element name="amend">
<ref name="AmendType"/>
</element>
</define>
<define name="AmendType">
<optional>
<attribute name="id">
<data type="ID"/>
</attribute>
</optional>
<attribute name="change">
<choice>
<value>add</value>
<value>modify</value>
<value>delete</value>
<value>replace</value>
</choice>
</attribute>
<optional>
<attribute name="path"/>
</optional>
<optional>
<attribute name="path_end"/>
</optional>
<optional>
<attribute name="title"/>
</optional>
<optional>
<element name="location">
<zeroOrMore>
<choice>
<ref name="locality"/>
<ref name="localityStack"/>
</choice>
</zeroOrMore>
</element>
</optional>
<optional>
<element name="description">
<zeroOrMore>
<ref name="BasicBlock"/>
</zeroOrMore>
</element>
</optional>
<optional>
<element name="newcontent">
<optional>
<attribute name="id">
<data type="ID"/>
</attribute>
</optional>
<zeroOrMore>
<ref name="BasicBlock"/>
</zeroOrMore>
</element>
</optional>
<zeroOrMore>
<ref name="classification"/>
</zeroOrMore>
<zeroOrMore>
<ref name="contributor"/>
</zeroOrMore>
</define>
<define name="classification">
<element name="classification">
<ref name="classification_tag"/>
<ref name="classification_value"/>
</element>
</define>
<define name="classification_tag">
<element name="tag">
<text/>
</element>
</define>
<define name="classification_value">
<element name="value">
<text/>
</element>
</define>
<define name="paragraph">
<element name="p">
<ref name="ParagraphType"/>
Expand Down Expand Up @@ -939,18 +1020,12 @@
</optional>
<optional>
<attribute name="width">
<choice>
<data type="int"/>
<value>auto</value>
</choice>
<ref name="ImageSize"/>
</attribute>
</optional>
<optional>
<attribute name="height">
<choice>
<data type="int"/>
<value>auto</value>
</choice>
<ref name="ImageSize"/>
</attribute>
</optional>
<optional>
Expand All @@ -965,6 +1040,14 @@
</attribute>
</optional>
</define>
<define name="ImageSize">
<choice>
<data type="string">
<param name="pattern">\d+([.]\d+)?(%?)</param>
</data>
<value>auto</value>
</choice>
</define>
<define name="video">
<element name="video">
<attribute name="id">
Expand Down
45 changes: 44 additions & 1 deletion lib/metanorma/cc/biblio-standoc.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,42 @@
-->
<include href="biblio.rng">
<define name="BibData">
<ref name="BibliographicItem"/>
<ref name="StandardBibliographicItem"/>
<optional>
<ref name="ext"/>
</optional>
</define>
<define name="docrelation">
<element name="relation">
<attribute name="type">
<ref name="DocRelationType"/>
</attribute>
<optional>
<element name="description">
<ref name="FormattedString"/>
</element>
</optional>
<element name="bibitem">
<ref name="StandardReducedBibliographicItem"/>
</element>
<choice>
<zeroOrMore>
<ref name="locality"/>
</zeroOrMore>
<zeroOrMore>
<ref name="localityStack"/>
</zeroOrMore>
</choice>
<choice>
<zeroOrMore>
<ref name="sourceLocality"/>
</zeroOrMore>
<zeroOrMore>
<ref name="sourceLocalityStack"/>
</zeroOrMore>
</choice>
</element>
</define>
</include>
<define name="ext">
<element name="ext">
Expand Down Expand Up @@ -161,4 +192,16 @@
</optional>
</element>
</define>
<define name="StandardBibliographicItem">
<ref name="BibliographicItem"/>
<zeroOrMore>
<ref name="amend"/>
</zeroOrMore>
</define>
<define name="StandardReducedBibliographicItem">
<ref name="ReducedBibliographicItem"/>
<zeroOrMore>
<ref name="amend"/>
</zeroOrMore>
</define>
</grammar>
11 changes: 11 additions & 0 deletions lib/metanorma/cc/biblio.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,9 @@
</element>
</define>
<define name="FullNameType">
<optional>
<ref name="name_abbreviation"/>
</optional>
<choice>
<group>
<zeroOrMore>
Expand All @@ -266,6 +269,11 @@
<ref name="variantname"/>
</zeroOrMore>
</define>
<define name="name_abbreviation">
<element name="abbreviation">
<ref name="LocalizedString"/>
</element>
</define>
<define name="prefix">
<element name="prefix">
<ref name="LocalizedString"/>
Expand Down Expand Up @@ -870,6 +878,9 @@
<optional>
<ref name="validity"/>
</optional>
<optional>
<ref name="depiction"/>
</optional>
</define>
<define name="btitle">
<element name="title">
Expand Down
74 changes: 10 additions & 64 deletions lib/metanorma/cc/isodoc.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,19 @@
these elements; we just want one namespace for any child grammars
of this.
-->
<!-- VERSION v1.2.9 -->
<!-- VERSION v1.2.12 -->
<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">
<define name="amend">
<element name="amend">
<ref name="BlockAttributes"/>
<ref name="AmendType"/>
<zeroOrMore>
<ref name="autonumber"/>
</zeroOrMore>
</element>
</define>
<define name="admonition">
<element name="admonition">
<attribute name="type">
Expand Down Expand Up @@ -2319,69 +2328,6 @@
<ref name="CitationType"/>
</element>
</define>
<define name="amend">
<element name="amend">
<optional>
<attribute name="id">
<data type="ID"/>
</attribute>
</optional>
<attribute name="change">
<choice>
<value>add</value>
<value>modify</value>
<value>delete</value>
<value>replace</value>
</choice>
</attribute>
<optional>
<attribute name="path"/>
</optional>
<optional>
<attribute name="path_end"/>
</optional>
<optional>
<attribute name="title"/>
</optional>
<ref name="BlockAttributes"/>
<optional>
<element name="location">
<zeroOrMore>
<ref name="locality"/>
</zeroOrMore>
</element>
</optional>
<zeroOrMore>
<ref name="autonumber"/>
</zeroOrMore>
<optional>
<element name="description">
<zeroOrMore>
<ref name="BasicBlock"/>
</zeroOrMore>
</element>
</optional>
<optional>
<element name="newcontent">
<optional>
<attribute name="id">
<data type="ID"/>
</attribute>
</optional>
<zeroOrMore>
<ref name="BasicBlock"/>
</zeroOrMore>
</element>
</optional>
<optional>
<element name="description">
<zeroOrMore>
<ref name="BasicBlock"/>
</zeroOrMore>
</element>
</optional>
</element>
</define>
<define name="autonumber">
<element name="autonumber">
<attribute name="type">
Expand Down
16 changes: 0 additions & 16 deletions lib/metanorma/cc/reqt.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,20 +207,4 @@
<value>permission</value>
</choice>
</define>
<define name="classification">
<element name="classification">
<ref name="classification_tag"/>
<ref name="classification_value"/>
</element>
</define>
<define name="classification_tag">
<element name="tag">
<text/>
</element>
</define>
<define name="classification_value">
<element name="value">
<text/>
</element>
</define>
</grammar>
2 changes: 1 addition & 1 deletion lib/metanorma/cc/version.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Metanorma
module CC
VERSION = "2.3.6".freeze
VERSION = "2.4.0".freeze
end
end
2 changes: 1 addition & 1 deletion metanorma-cc.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]
spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")

spec.add_dependency "metanorma-generic", "~> 2.5.4"
spec.add_dependency "metanorma-generic", "~> 2.6.0"

spec.add_development_dependency "debug"
spec.add_development_dependency "equivalent-xml", "~> 0.6"
Expand Down

0 comments on commit 17102c0

Please sign in to comment.