Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
opoudjis committed Nov 11, 2024
1 parent 4c6f4ec commit cd07014
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 13 deletions.
2 changes: 0 additions & 2 deletions Gemfile.devel

This file was deleted.

14 changes: 13 additions & 1 deletion lib/metanorma/ribose/biblio.rng
Original file line number Diff line number Diff line change
Expand Up @@ -1783,9 +1783,21 @@ that the `number` given for the series applies to the second iteration of number
May be used to differentiate rendering of notes in bibliographies</a:documentation>
</attribute>
</optional>
<ref name="LocalizedMarkedUpString">
<ref name="LocalizedStringAttributes">
<a:documentation>The content of the note</a:documentation>
</ref>
<choice>
<oneOrMore>
<ref name="BasicBlockNoId">
<a:documentation>Multiple blocks of content</a:documentation>
</ref>
</oneOrMore>
<oneOrMore>
<ref name="TextElement">
<a:documentation>Single block of content</a:documentation>
</ref>
</oneOrMore>
</choice>
</element>
</define>
<define name="bibabstract">
Expand Down
12 changes: 6 additions & 6 deletions lib/metanorma/ribose/isodoc.rng
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.4 -->
<!-- VERSION v1.4.0 -->
<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 @@ -326,7 +326,7 @@ normative or informative references, some split references into sections organiz
<a:documentation>Content of note</a:documentation>
<oneOrMore>
<choice>
<ref name="paragraph"/>
<ref name="paragraph-with-footnote"/>
<ref name="ul"/>
<ref name="ol"/>
<ref name="dl"/>
Expand Down Expand Up @@ -412,7 +412,7 @@ normative or informative references, some split references into sections organiz
<element name="note">
<ref name="OptionalId"/>
<oneOrMore>
<ref name="paragraph"/>
<ref name="paragraph-with-footnote"/>
</oneOrMore>
</element>
</define>
Expand Down Expand Up @@ -1977,7 +1977,7 @@ used in document amendments</a:documentation>
<oneOrMore>
<choice>
<a:documentation>Content of the verbal representation of the term</a:documentation>
<ref name="paragraph"/>
<ref name="paragraph-with-footnote"/>
<ref name="dl"/>
<ref name="ol"/>
<ref name="ul"/>
Expand Down Expand Up @@ -2015,7 +2015,7 @@ used in document amendments</a:documentation>
<oneOrMore>
<choice>
<a:documentation>Content of the term note</a:documentation>
<ref name="paragraph"/>
<ref name="paragraph-with-footnote"/>
<ref name="ul"/>
<ref name="ol"/>
<ref name="dl"/>
Expand All @@ -2037,7 +2037,7 @@ used in document amendments</a:documentation>
<ref name="dl"/>
<ref name="quote"/>
<ref name="sourcecode"/>
<ref name="paragraph"/>
<ref name="paragraph-with-footnote"/>
<ref name="figure"/>
</choice>
</oneOrMore>
Expand Down
2 changes: 1 addition & 1 deletion lib/metanorma/ribose/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Metanorma
module Ribose
VERSION = "2.5.5".freeze
VERSION = "2.5.6".freeze
end
end
2 changes: 1 addition & 1 deletion metanorma-ribose.gemspec
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(">= 3.1.0")

spec.add_dependency "metanorma-generic", "~> 2.7.0"
spec.add_dependency "metanorma-generic", "~> 2.7.2"

spec.add_development_dependency "debug"
spec.add_development_dependency "equivalent-xml", "~> 0.6"
Expand Down
3 changes: 1 addition & 2 deletions spec/isodoc/html_convert_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</rsd-standard>
INPUT

output = <<~"OUTPUT"
output =
{:accesseddate=>"XXX",
:adapteddate=>"XXX",
:agency=>"Fred",
Expand Down Expand Up @@ -107,7 +107,6 @@
:updateddate=>"XXX",
:vote_endeddate=>"XXX",
:vote_starteddate=>"XXX"}
OUTPUT

docxml, = csdc.convert_init(input, "test", true)
expect(htmlencode(metadata(csdc.info(docxml, nil)).to_s)
Expand Down

0 comments on commit cd07014

Please sign in to comment.