Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
opoudjis committed Aug 5, 2024
1 parent b5054bb commit 892b72a
Show file tree
Hide file tree
Showing 26 changed files with 1,074 additions and 1,318 deletions.
2 changes: 1 addition & 1 deletion lib/metanorma/standoc/cleanup_bibitem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def fold_notes_into_biblio(refs)

def extract_notes_from_biblio(refs)
refs.xpath("./bibitem").each do |r|
r.xpath("./note[@appended]").reverse.each do |n|
r.xpath("./note[@appended]").reverse_each do |n|
n.delete("appended")
r.next = n
end
Expand Down
2 changes: 1 addition & 1 deletion lib/metanorma/standoc/cleanup_ref.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def biblio_reorder1(refs)
bib = sort_biblio(refs.xpath("./bibitem"))
insert = refs.at("./bibitem")&.previous_element
refs.xpath("./bibitem").each(&:remove)
bib.reverse.each do |b|
bib.reverse_each do |b|
(insert and insert.next = b.to_xml) or
refs.children.first.add_previous_sibling b.to_xml
end
Expand Down
8 changes: 4 additions & 4 deletions lib/metanorma/standoc/ref_queue.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def references_fetch(refs)
def reference_queue(results, size)
(1..size).each.with_object([]) do |_, m|
ref, i, doc = results.pop
m[i.to_i] = { ref: ref }
m[i.to_i] = { ref: }
if doc.is_a?(RelatonBib::RequestError)
@log.add("Bibliography", nil, "Could not retrieve #{ref[:code]}: " \
"no access to online site", severity: 1)
Expand Down Expand Up @@ -69,7 +69,7 @@ def merge_entries(base, add)

def merge_publishers(base, add)
ins = base.at("//contributor[last()]") || base.children[-1]
add.xpath("//contributor[role/@type = 'publisher']").reverse.each do |p|
add.xpath("//contributor[role/@type = 'publisher']").reverse_each do |p|
ins.next = p
end
end
Expand All @@ -80,14 +80,14 @@ def merge_docids(base, add)
v.at("//docidentifier[@primary = 'true']") or
v.at("//docidentifier")["primary"] = true
end
add.xpath("//docidentifier").reverse.each do |p|
add.xpath("//docidentifier").reverse_each do |p|
ins.next = p
end
end

def merge_urls(base, add)
ins = base.at("./uri[last()]") || base.at("./title[last()]")
add.xpath("./uri").reverse.each do |p|
add.xpath("./uri").reverse_each do |p|
ins.next = p
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/metanorma/standoc/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ def versioned(mod, flavour)
end

module Standoc
VERSION = "2.9.1".freeze
VERSION = "2.9.2".freeze
end
end
41 changes: 41 additions & 0 deletions spec/metanorma/refs_fetch_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -923,6 +923,47 @@
</name>
</person>
</contributor>
<relation type="includedIn">
<bibitem>
<title format="text/plain">Multilingualism, Second Language Learning, and Gender</title>
<contributor>
<role type="editor"/>
<person>
<name>
<forename language="en" script="Latn">Aneta</forename>
<surname language="en" script="Latn">Pavlenko</surname>
</name>
</person>
</contributor>
<contributor>
<role type="editor"/>
<person>
<name>
<forename language="en" script="Latn">Adrian</forename>
<surname language="en" script="Latn">Blackledge</surname>
</name>
</person>
</contributor>
<contributor>
<role type="editor"/>
<person>
<name>
<forename language="en" script="Latn">Ingrid</forename>
<surname language="en" script="Latn">Piller</surname>
</name>
</person>
</contributor>
<contributor>
<role type="editor"/>
<person>
<name>
<forename language="en" script="Latn">Marya</forename>
<surname language="en" script="Latn">Teutsch-Dwyer</surname>
</name>
</person>
</contributor>
</bibitem>
</relation>
<relation type="includedIn">
<bibitem type="misc">
<title format="text/plain">Nested Title</title>
Expand Down
42 changes: 20 additions & 22 deletions spec/vcr_cassettes/bipm.yml

Large diffs are not rendered by default.

112 changes: 45 additions & 67 deletions spec/vcr_cassettes/bsi16341.yml

Large diffs are not rendered by default.

150 changes: 75 additions & 75 deletions spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions spec/vcr_cassettes/dated_iso_ref_joint_iso_iec1.yml

Large diffs are not rendered by default.

78 changes: 39 additions & 39 deletions spec/vcr_cassettes/dated_iso_ref_joint_iso_iec2.yml

Large diffs are not rendered by default.

232 changes: 116 additions & 116 deletions spec/vcr_cassettes/doi.yml

Large diffs are not rendered by default.

289 changes: 149 additions & 140 deletions spec/vcr_cassettes/doi2.yml

Large diffs are not rendered by default.

168 changes: 84 additions & 84 deletions spec/vcr_cassettes/dual_refs.yml

Large diffs are not rendered by default.

176 changes: 88 additions & 88 deletions spec/vcr_cassettes/hide_refs.yml

Large diffs are not rendered by default.

114 changes: 12 additions & 102 deletions spec/vcr_cassettes/iev_03-01-02.yml

Large diffs are not rendered by default.

224 changes: 22 additions & 202 deletions spec/vcr_cassettes/iev_103-01-02.yml

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions spec/vcr_cassettes/isobib_get_123.yml

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions spec/vcr_cassettes/isobib_get_123_1.yml

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions spec/vcr_cassettes/isobib_get_123_1_fr.yml

Large diffs are not rendered by default.

94 changes: 47 additions & 47 deletions spec/vcr_cassettes/isobib_get_123_2001_and_iev.yml

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions spec/vcr_cassettes/isobib_get_123_2001a.yml

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions spec/vcr_cassettes/isobib_get_124.yml

Large diffs are not rendered by default.

164 changes: 82 additions & 82 deletions spec/vcr_cassettes/merge_refs.yml

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions spec/vcr_cassettes/rfcbib_get_rfc8341.yml

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions spec/vcr_cassettes/separates_iev_citations_by_top_level_clause.yml

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions spec/vcr_cassettes/std-link.yml

Large diffs are not rendered by default.

0 comments on commit 892b72a

Please sign in to comment.