Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
opoudjis committed Jan 9, 2024
1 parent a6a0b0f commit 627862d
Show file tree
Hide file tree
Showing 5 changed files with 1,254 additions and 1,147 deletions.
8 changes: 3 additions & 5 deletions lib/isodoc/ieee/presentation_terms.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ def unwrap_multidef(coll)

def unwrap_definition(docxml)
docxml.xpath(ns(".//definition/verbal-definition")).each do |v|
next unless v.elements.all? { |e| %w(termsource p).include?(e.name) }

v.elements.all? { |e| %w(termsource p).include?(e.name) } or next
p = v.xpath(ns("./p"))
v.children =
"<p>#{p.map(&:children).map { |x| to_xml(x) }.join("\n")}</p>" \
Expand Down Expand Up @@ -73,7 +72,7 @@ def sort_terms_key(term)
"./preferred/graphical-symbol/figure/@id | " \
"./preferred"))
f = term.at(ns("./field-of-application")) || term.at(ns("./domain"))
HTMLEntities.new.decode("#{sort_terms_key1(d)} :: #{sort_terms_key1(f)}")
@c.decode("#{sort_terms_key1(d)} :: #{sort_terms_key1(f)}")
end

def sort_terms_key1(elem)
Expand Down Expand Up @@ -190,8 +189,7 @@ def collapse_term_template(opt)
end

def collapse_unwrap_definition(defn)
return nil if defn.nil?

defn.nil? and return nil
s = defn.remove.xpath(ns("./termsource"))
p = defn.at(ns("./p"))
!s.empty? && p and p << s.map(&:remove).map(&:children)
Expand Down
2 changes: 0 additions & 2 deletions lib/metanorma/ieee/validate.rb
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ def figure_name_validate(xmldoc, xrefs)
(xmldoc.xpath("//figure") - xmldoc.xpath("//table//figure"))
.each do |f|
(i = f.at("./image") and !i["src"]&.start_with?("data:")) or next

num = xrefs.anchor(f["id"], :label)
base = File.basename(i["src"], ".*")
base == "#{pref}_fig#{num}" or
Expand All @@ -170,7 +169,6 @@ def table_figure_name_validate(xmldoc, xrefs)
xmldoc.xpath("//table[.//figure]").each do |t|
xmldoc.xpath(".//figure").each do |f|
(i = f.at("./image") and !i["src"]&.start_with?("data:")) or next

num = tablefigurenumber(t, f, xrefs)
base = File.basename(i["src"])
base == num or
Expand Down
2 changes: 1 addition & 1 deletion lib/metanorma/ieee/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Metanorma
module IEEE
VERSION = "1.1.10".freeze
VERSION = "1.2.0".freeze
end
end
2 changes: 1 addition & 1 deletion metanorma-ieee.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]
spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")

spec.add_dependency "metanorma-standoc", "~> 2.7.0"
spec.add_dependency "metanorma-standoc", "~> 2.8.0"
spec.add_dependency "mnconvert", "~> 1.20"
#spec.add_dependency "pubid-ieee", "~> 0.1.1"
#spec.add_dependency "pubid-iso", "~> 0.5.3"
Expand Down
2,387 changes: 1,249 additions & 1,138 deletions spec/vcr_cassettes/availability.yml

Large diffs are not rendered by default.

0 comments on commit 627862d

Please sign in to comment.