From fbf86a87f49c5b33d57504e917ef178cda996348 Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Tue, 24 Jan 2023 02:51:31 +1100 Subject: [PATCH] version bump --- lib/metanorma/ieee/cleanup_ref.rb | 2 +- lib/metanorma/ieee/version.rb | 2 +- spec/isodoc/blocks_spec.rb | 54 +++--- spec/isodoc/inline_spec.rb | 32 ++-- spec/isodoc/refs_spec.rb | 162 +++++++++--------- spec/isodoc/section_spec.rb | 6 +- spec/isodoc/terms_spec.rb | 40 ++--- spec/isodoc/word_spec.rb | 2 +- spec/isodoc/xref_spec.rb | 4 +- spec/metanorma/refs_spec.rb | 275 +++++++++++++++--------------- spec/metanorma/validate_spec.rb | 2 +- spec/relaton/render_spec.rb | 6 +- spec/spec_helper.rb | 4 + 13 files changed, 296 insertions(+), 295 deletions(-) diff --git a/lib/metanorma/ieee/cleanup_ref.rb b/lib/metanorma/ieee/cleanup_ref.rb index 0b2eb36..689cc51 100644 --- a/lib/metanorma/ieee/cleanup_ref.rb +++ b/lib/metanorma/ieee/cleanup_ref.rb @@ -53,7 +53,7 @@ def designator_or_name(bib) def designator_docid(bib) n = bib.at("./docidentifier[@primary]") || - bib.at("./docidentifier[not(#{OTHERIDS})]") + bib.at("./docidentifier[not(#{skip_docid})]") n or return "ZZZZ" @isodoc.docid_prefix(n["type"], n.children.to_xml) end diff --git a/lib/metanorma/ieee/version.rb b/lib/metanorma/ieee/version.rb index c5ed73c..6f045a2 100644 --- a/lib/metanorma/ieee/version.rb +++ b/lib/metanorma/ieee/version.rb @@ -1,5 +1,5 @@ module Metanorma module IEEE - VERSION = "1.0.3".freeze + VERSION = "1.0.4".freeze end end diff --git a/spec/isodoc/blocks_spec.rb b/spec/isodoc/blocks_spec.rb index 35fd8ef..37d2c9d 100644 --- a/spec/isodoc/blocks_spec.rb +++ b/spec/isodoc/blocks_spec.rb @@ -235,73 +235,73 @@ -

Description

+

Description

-

Rice sample

+

Rice sample

-

Arborio

+

Arborio

-

+

Drago - a

+ a

-

+

Balilla a

-

Thaibonnet

+

Thaibonnet

-

Number of laboratories retained after eliminating outliers

-

+

Number of laboratories retained after eliminating outliers

+

Laboratory count

-

13

+

13

-

11

+

11

-

13

+

13

-

13

+

13

-

Mean value, g/100 g

+

Mean value, g/100 g

-

81,2

+

81,2

-

82,0

+

82,0

-

81,8

+

81,8

-

77,7

+

77,7

-

+

Reproducibility limit, R (= 2,83 @@ -310,16 +310,16 @@

-

2,89

+

2,89

-

0,57

+

0,57

-

2,26

+

2,26

-

6,06

+

6,06

@@ -336,7 +336,7 @@ WORD - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(presxml) expect(xmlpp(Nokogiri::XML(IsoDoc::IEEE::HtmlConvert.new({}) .convert("test", presxml, true)) @@ -528,7 +528,7 @@ OUTPUT - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true).gsub(/</, "<"))) .to be_equivalent_to xmlpp(presxml) expect(xmlpp(strip_guid(Nokogiri::XML(IsoDoc::IEEE::HtmlConvert.new({}) @@ -643,7 +643,7 @@ OUTPUT - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true).gsub(/</, "<"))) .to be_equivalent_to xmlpp(presxml) expect(xmlpp(Nokogiri::XML(IsoDoc::IEEE::HtmlConvert.new({}) @@ -1061,7 +1061,7 @@ OUTPUT expect(xmlpp(Nokogiri::XML( - IsoDoc::IEEE::PresentationXMLConvert.new({}) + IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true), ).at("//xmlns:clause[@id = 'A']").to_xml)) .to be_equivalent_to xmlpp(presxml) diff --git a/spec/isodoc/inline_spec.rb b/spec/isodoc/inline_spec.rb index 291917c..5465bf1 100644 --- a/spec/isodoc/inline_spec.rb +++ b/spec/isodoc/inline_spec.rb @@ -2,7 +2,7 @@ RSpec.describe IsoDoc::IEEE do it "processes eref content" do - output = IsoDoc::IEEE::PresentationXMLConvert.new({}) + output = IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", <<~"INPUT", true) @@ -99,20 +99,20 @@ IEV, 1-2-3 - ISO 712 - ISO 712 + ISO 712 + ISO 712 1 - ISO 712, Table 1 + ISO 712, Table 1 1 1 - ISO 712, Table 1–1 + ISO 712, Table 1–1 @@ -121,7 +121,7 @@ 1 - ISO 712, Clause 1, Table 1 + ISO 712, Clause 1, Table 1 @@ -130,19 +130,19 @@ a - ISO 712, Clause 1, List a) + ISO 712, Clause 1, List a) 1 - ISO 712, Clause 1 + ISO 712, Clause 1 1.5 - ISO 712, 1.5 + ISO 712, 1.5 @@ -152,16 +152,16 @@ - ISO 712, Whole of text + ISO 712, Whole of text 7 - ISO 712, Prelude 7 + ISO 712, Prelude 7 A - ISO/IEC DIR 1 + ISO/IEC DIR 1

@@ -175,8 +175,8 @@ Cereals and cereal products. Cereals and cereal products - ISO 712 - ISO 712, + ISO 712 + ISO 712, @@ -249,7 +249,7 @@

OUTPUT - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(output) end @@ -378,7 +378,7 @@

OUTPUT - xml = Nokogiri::XML(IsoDoc::IEEE::PresentationXMLConvert.new({}) + xml = Nokogiri::XML(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true)) expect(xmlpp(xml.at("//xmlns:foreword").to_xml)) .to be_equivalent_to xmlpp(presxml) diff --git a/spec/isodoc/refs_spec.rb b/spec/isodoc/refs_spec.rb index 00da8c0..b5a2c12 100644 --- a/spec/isodoc/refs_spec.rb +++ b/spec/isodoc/refs_spec.rb @@ -209,89 +209,89 @@ INPUT presxml = <<~"PRESXML" - - - - 2.<tab/>Clause -

- ISO 639:1967 - Aluffi - REF4 - ISO 639:1967 [B3] - Aluffi, Anderson, Hering, Mustaţă and Payne [B2] - REF4 [B1] -

- - - - - Normative References - - REF4 - REF4 - [B1] - 4 - [B1], REF4, - - - Code for the representation of names of languages. - Code for the representation of names of languages - Code for the representation of names of languages - https://www.iso.org/standard/4766.html - https://www.iso.org/contents/data/standard/00/47/4766.detail.rss - ISO 639 - URN urn:iso:std:iso:639:ed-1 - ISO 639, - - - Aluffi, P., D. Anderson, M. Hering, M. Mustaţă, and S. Payne, Facets of Algebraic Geometry: A Collection in Honor of William Fulton's 80th Birthday, first edition, Cambridge, UK: Cambridge University Press, 2022a. - Facets of Algebraic Geometry: A Collection in Honor of William Fulton's 80th Birthday - DOI https://doi.org/10.1017/9781108877831 - ISBN 9781108877831 - - - - Indiana Jones and the Last Crusade. - Indiana Jones and the Last Crusade - Indiana Jones and the Last Crusade - Indiana Jones and the Last Crusade - ISO 639:1967 - [B3] - [B3], ISO 639:1967, - - - - Bibliography - - REF4 - REF4 - [B1] - 4 - [B1]REF4, - - - Aluffi, P., D. Anderson, M. Hering, M. Mustaţă, and S. Payne, Facets of Algebraic Geometry: A Collection in Honor of William Fulton's 80th Birthday, first edition, Cambridge, UK: Cambridge University Press, 2022b. - Facets of Algebraic Geometry: A Collection in Honor of William Fulton's 80th Birthday - DOI https://doi.org/10.1017/9781108877831 - ISBN 9781108877831 - [B2] - [B2] - - - Indiana Jones and the Last Crusade. - Indiana Jones and the Last Crusade - Indiana Jones and the Last Crusade - Indiana Jones and the Last Crusade - ISO 639:1967 - [B3] - [B3]ISO 639:1967, - - - - + + + + 2.<tab/>Clause +

+ ISO 639:1967 + Aluffi + REF4 + ISO 639:1967 [B3] + Aluffi, Anderson, Hering, Mustaţă and Payne [B2] + REF4 [B1] +

+ + + + + Normative References + + Code for the representation of names of languages. + Code for the representation of names of languages + Code for the representation of names of languages + https://www.iso.org/standard/4766.html + https://www.iso.org/contents/data/standard/00/47/4766.detail.rss + ISO 639 + URN urn:iso:std:iso:639:ed-1 + ISO 639, + + + REF4 + REF4 + [B1] + 4 + [B1], REF4, + + + Aluffi, P., D. Anderson, M. Hering, M. Mustaţă, and S. Payne, Facets of Algebraic Geometry: A Collection in Honor of William Fulton's 80th Birthday, first edition, Cambridge, UK: Cambridge University Press, 2022a. + Facets of Algebraic Geometry: A Collection in Honor of William Fulton's 80th Birthday + DOI https://doi.org/10.1017/9781108877831 + ISBN 9781108877831 + + + + Indiana Jones and the Last Crusade. + Indiana Jones and the Last Crusade + Indiana Jones and the Last Crusade + Indiana Jones and the Last Crusade + ISO 639:1967 + [B3] + [B3], ISO 639:1967, + + + + Bibliography + + REF4 + REF4 + [B1] + 4 + [B1]REF4, + + + Aluffi, P., D. Anderson, M. Hering, M. Mustaţă, and S. Payne, Facets of Algebraic Geometry: A Collection in Honor of William Fulton's 80th Birthday, first edition, Cambridge, UK: Cambridge University Press, 2022b. + Facets of Algebraic Geometry: A Collection in Honor of William Fulton's 80th Birthday + DOI https://doi.org/10.1017/9781108877831 + ISBN 9781108877831 + [B2] + [B2] + + + Indiana Jones and the Last Crusade. + Indiana Jones and the Last Crusade + Indiana Jones and the Last Crusade + Indiana Jones and the Last Crusade + ISO 639:1967 + [B3] + [B3]ISO 639:1967, + + + + PRESXML out = Nokogiri::XML( - IsoDoc::IEEE::PresentationXMLConvert.new({}) + IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true), ) expect(xmlpp(out.to_xml)) diff --git a/spec/isodoc/section_spec.rb b/spec/isodoc/section_spec.rb index f384657..a181095 100644 --- a/spec/isodoc/section_spec.rb +++ b/spec/isodoc/section_spec.rb @@ -461,7 +461,7 @@ OUTPUT - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))) .to be_equivalent_to xmlpp(presxml) expect(xmlpp(Nokogiri::XML(IsoDoc::IEEE::HtmlConvert.new({}) @@ -599,7 +599,7 @@ OUTPUT - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))) .to be_equivalent_to xmlpp(presxml) expect(xmlpp(Nokogiri::XML(IsoDoc::IEEE::HtmlConvert.new({}) @@ -1103,7 +1103,7 @@ OUTPUT FileUtils.rm_rf "test.html" FileUtils.rm_rf "test.doc" - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))) .to be_equivalent_to xmlpp(presxml) IsoDoc::IEEE::HtmlConvert.new({}).convert("test", presxml, false) diff --git a/spec/isodoc/terms_spec.rb b/spec/isodoc/terms_spec.rb index 174a760..25f79c2 100644 --- a/spec/isodoc/terms_spec.rb +++ b/spec/isodoc/terms_spec.rb @@ -88,7 +88,7 @@

paddy , <rice>, <in agriculture, dated>: rice retaining - its husk after threshing (3.1ISO 7301:2011, 3.1, modified – The term "cargo rice" is shown as deprecated, and + its husk after threshing (3.1ISO 7301:2011, 3.1, modified – The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here)

@@ -123,7 +123,7 @@ Syn: paddy rice , <in agriculture>; - rough rice. (3.1ISO 7301:2011, 3.1)

+ rough rice. (3.1ISO 7301:2011, 3.1)

cargo rice Example @@ -181,7 +181,7 @@

paddy , <rice>, <in agriculture, dated>: rice retaining - its husk after threshing (ISO 7301:2011, 3.1, modified – + its husk after threshing (ISO 7301:2011, 3.1, modified – The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here)

@@ -209,7 +209,7 @@ Syn: paddy rice , <in agriculture>; - rough rice. (ISO 7301:2011, 3.1) + rough rice. (ISO 7301:2011, 3.1)

DEPRECATED: cargo rice

@@ -288,7 +288,7 @@

paddy , <rice>, <in agriculture, dated>: rice retaining - its husk after threshing (ISO 7301:2011, 3.1, modified – + its husk after threshing (ISO 7301:2011, 3.1, modified – The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here)

@@ -316,7 +316,7 @@ Syn: paddy rice , <in agriculture>; - rough rice. (ISO 7301:2011, 3.1) + rough rice. (ISO 7301:2011, 3.1)

DEPRECATED: cargo rice

@@ -365,7 +365,7 @@ WORD - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(presxml) expect(xmlpp(Nokogiri::XML(IsoDoc::IEEE::HtmlConvert.new({}) .convert("test", presxml, true)) @@ -469,6 +469,7 @@ + x @@ -477,6 +478,7 @@ 1 + @@ -494,7 +496,7 @@ OUTPUT - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(output) end @@ -542,7 +544,7 @@ 3.1 - ISO 7301:2011, 3.1 + ISO 7301:2011, 3.1 , modified – The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here ( @@ -554,7 +556,7 @@ PRESXML - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(presxml) end @@ -610,7 +612,7 @@

For the purposes of this document, the following terms and definitions apply.

paddy, <rice>:

(A) rice retaining its husk after threshing - 3.1ISO 7301:2011, 3.1, modified + 3.1ISO 7301:2011, 3.1, modified – The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here @@ -637,7 +639,7 @@ PRESXML - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(presxml) input = <<~"INPUT" @@ -722,7 +724,7 @@ PRESXML - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(presxml) end @@ -868,7 +870,7 @@ PRESXML - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(presxml) end @@ -935,7 +937,7 @@ PRESXML - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(presxml) end @@ -981,7 +983,7 @@ PRESXML - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(presxml) end @@ -1159,7 +1161,7 @@ PRESXML - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(presxml) end @@ -1271,7 +1273,7 @@ OUTPUT - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(output) end @@ -1340,7 +1342,7 @@ OUTPUT - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(output) end end diff --git a/spec/isodoc/word_spec.rb b/spec/isodoc/word_spec.rb index eaa9653..033f190 100644 --- a/spec/isodoc/word_spec.rb +++ b/spec/isodoc/word_spec.rb @@ -466,7 +466,7 @@

OUTPUT - presxml = IsoDoc::IEEE::PresentationXMLConvert.new({}).convert("test", + presxml = IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options).convert("test", input, true) IsoDoc::IEEE::WordConvert.new({}).convert("test", presxml, false) expect(File.exist?("test.doc")).to be true diff --git a/spec/isodoc/xref_spec.rb b/spec/isodoc/xref_spec.rb index 1e0aa31..734d448 100644 --- a/spec/isodoc/xref_spec.rb +++ b/spec/isodoc/xref_spec.rb @@ -62,7 +62,7 @@ OUTPUT - expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true))).to be_equivalent_to xmlpp(output) end @@ -109,7 +109,7 @@

OUTPUT - expect(xmlpp(Nokogiri::XML(IsoDoc::IEEE::PresentationXMLConvert.new({}) + expect(xmlpp(Nokogiri::XML(IsoDoc::IEEE::PresentationXMLConvert.new(presxml_options) .convert("test", input, true)) .at("//xmlns:foreword").to_xml)) .to be_equivalent_to xmlpp(output) diff --git a/spec/metanorma/refs_spec.rb b/spec/metanorma/refs_spec.rb index 5bda287..eda1632 100644 --- a/spec/metanorma/refs_spec.rb +++ b/spec/metanorma/refs_spec.rb @@ -174,136 +174,131 @@ output = <<~OUTPUT - - - Bibliography -

- Bibliographical references are resources that provide additional or - helpful material but do not need to be understood or used to implement - this standard. Reference to these resources is made for informational - use only. -

- - REF4 - REF4 - [B1] - 4 - - - Symbols for languages, countries and authorities - Symbols for languages, countries and authorities - https://www.iso.org/standard/4765.html - https://www.iso.org/contents/data/standard/00/47/4765.detail.rss - ISO/R 639:1967 - [B2] - urn:iso:std:iso:r:639:ed-1 - 639 - - 1967-11 - - - - - International Organization for Standardization - ISO - www.iso.org - - - 1 - en - - - 95 - 99 - - - 1967 - - - ISO/R - - - - Geneva - - - Indiana Jones and the Last Crusade - Indiana Jones and the Last Crusade - Indiana Jones and the Last Crusade - [B3] - - - - International Organization for Standardization - ISO - - - - - - - Indiana - Jones - - - - - - The “xml2rfc” Version 2 Vocabulary - https://www.rfc-editor.org/info/rfc7749 - RFC 7749 - [B4] - 10.17487/RFC7749 - RFC7749 - - 2016-02 - - - - - - J. Reschke - - - - - - - RFC Series - - - en - - -

- This document defines the “xml2rfc” version 2 vocabulary: an - XML-based language used for writing RFCs and Internet-Drafts. -

-

- Version 2 represents the state of the vocabulary (as implemented by - several tools and as used by the RFC Editor) around 2014. -

-

This document obsoletes RFC 2629.

- - - - RFC7991 - RFC7991 - - - - RFC - 7749 - - XML - IETF - RFC - Internet-Draft - Vocabulary - - - - + + + Bibliography +

Bibliographical references are resources that provide additional or helpful material but do not need to be understood or used to implement this standard. Reference to these resources is made for informational use only.

+ + The “xml2rfc” Version 2 Vocabulary + https://www.rfc-editor.org/info/rfc7749 + RFC 7749 + [B1] + 10.17487/RFC7749 + RFC7749 + + 2016-02 + + + + + + J. Reschke + + + + + + + RFC Publisher + + + + + + RFC Series + + + en + + +

This document defines the “xml2rfc” version 2 vocabulary: an XML-based language used for writing RFCs and Internet-Drafts.

+

Version 2 represents the state of the vocabulary (as implemented by several tools and as used by the RFC Editor) around 2014.

+

This document obsoletes RFC 2629.

+ + + + RFC7991 + RFC7991 + + + + RFC + 7749 + + XML + IETF + RFC + Internet-Draft + Vocabulary + + + Symbols for languages, countries and authorities + Symbols for languages, countries and authorities + https://www.iso.org/standard/4765.html + https://www.iso.org/contents/data/standard/00/47/4765.detail.rss + ISO/R 639:1967 + [B2] + urn:iso:std:iso:r:639:ed-1 + 639 + + 1967-11 + + + + + International Organization for Standardization + ISO + www.iso.org + + + 1 + en + + + 95 + 99 + + + 1967 + + + ISO/R + + + + Geneva + + + Indiana Jones and the Last Crusade + Indiana Jones and the Last Crusade + Indiana Jones and the Last Crusade + [B3] + + + + International Organization for Standardization + ISO + + + + + + + Indiana + Jones + + + + + + REF4 + REF4 + [B4] + 4 + + + + OUTPUT out = Nokogiri::XML(Asciidoctor.convert(input, *OPTIONS)) out.xpath("//xmlns:bibdata | //xmlns:boilerplate | //xmlns:fetched").remove @@ -367,10 +362,10 @@

- +

- +

@@ -384,24 +379,24 @@

- +

- +

Clause

- +

Annex

- +

@@ -456,11 +451,11 @@ Clause

- - + + - - + +

diff --git a/spec/metanorma/validate_spec.rb b/spec/metanorma/validate_spec.rb index 03140d9..f073c95 100644 --- a/spec/metanorma/validate_spec.rb +++ b/spec/metanorma/validate_spec.rb @@ -240,7 +240,7 @@ * [[[iso123,ISO 123]]] _Standard_ INPUT expect(File.read("test.err")) - .to include "Undated reference ISO 123 should not contain "\ + .to include "Undated reference ISO 123 should not contain "\ "specific elements" Asciidoctor.convert(<<~"INPUT", *OPTIONS) diff --git a/spec/relaton/render_spec.rb b/spec/relaton/render_spec.rb index e566a42..35496a5 100644 --- a/spec/relaton/render_spec.rb +++ b/spec/relaton/render_spec.rb @@ -339,7 +339,7 @@ INPUT output = <<~OUTPUT - Ribose Inc., “metanorma-standoc.” September 4, 2019, https://github.com/metanorma/metanorma-standoc. + Ribose Inc., “metanorma-standoc.” 2019, https://github.com/metanorma/metanorma-standoc. OUTPUT expect(renderer.render(input)) .to be_equivalent_to output @@ -477,7 +477,7 @@ INPUT output = <<~OUTPUT - S. Bradner, “Intellectual Property Rights in IETF Technology,” March 2005, RFC Series, https://www.rfc-editor.org/info/rfc3979. + S. Bradner, “Intellectual Property Rights in IETF Technology,” 2005, RFC Series, https://www.rfc-editor.org/info/rfc3979. OUTPUT expect(renderer.render(input)) .to be_equivalent_to output @@ -518,7 +518,7 @@ INPUT output = <<~OUTPUT - <Portes, A., and R. G. Rumbaut, “Children of Immigrants. Longitudinal Sudy (CILS) 1991–2006 ICPSR20520.” Dataset, January 23, 2012, accessed May 6, 2018, https://doi.org/10.3886/ICPSR20520.v2. + <Portes, A., and R. G. Rumbaut, “Children of Immigrants. Longitudinal Sudy (CILS) 1991–2006 ICPSR20520.” Dataset, 2012, accessed May 6, 2018, https://doi.org/10.3886/ICPSR20520.v2. OUTPUT expect(renderer.render(input)) .to be_equivalent_to output diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index af269ba..fff942a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -51,6 +51,10 @@ OPTIONS = [backend: :ieee, header_footer: true].freeze +def presxml_options + { semanticxmlinsert: "false" } +end + def metadata(xml) xml.sort.to_h.delete_if do |_k, v| v.nil? || (v.respond_to?(:empty?) && v.empty?)