From 8eee838dba9a896ad5cfa5d051b89cab99f9b265 Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Mon, 16 Sep 2024 12:27:49 +1000 Subject: [PATCH] version bump --- lib/isodoc/presentation_function/section.rb | 7 ++----- lib/isodoc/presentation_function/terms.rb | 1 - lib/isodoc/version.rb | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/isodoc/presentation_function/section.rb b/lib/isodoc/presentation_function/section.rb index 0c864bee..7aa24180 100644 --- a/lib/isodoc/presentation_function/section.rb +++ b/lib/isodoc/presentation_function/section.rb @@ -39,14 +39,13 @@ def floattitle(docxml) p = "//clause | //annex | //appendix | //introduction | //foreword | " \ "//preface/abstract | //acknowledgements | //terms | " \ "//definitions | //references | //colophon | //indexsect" - docxml.xpath(ns(p)).each do |f| - floattitle1(f) - end + docxml.xpath(ns(p)).each { |f| floattitle1(f) } # top-level docxml.xpath(ns("//sections | //preface | //colophon")) .each { |f| floattitle1(f) } end + # TODO not currently doing anything with the @depth attribute of floating-title def floattitle1(elem) elem.xpath(ns(".//floating-title")).each do |p| p.name = "p" @@ -192,7 +191,6 @@ def preface_move1(clause, preface, float, prev, xpath) preface.elements.each do |x| ((x.name == "floating-title" || x.at(xpath)) && xpath != "./self::*[not(following-sibling::*)]") or prev = x - # after.include?(x.name) or next x.at(xpath) or next clause == prev and break prev ||= preface.children.first @@ -245,7 +243,6 @@ def toc(docxml) def toc_refs(docxml) docxml.xpath(ns("//toc//xref[text()]")).each do |x| lbl = @xrefs.anchor(x["target"], :label) or next - #x.children.first.previous = "#{lbl}" x.add_first_child "#{lbl}" end end diff --git a/lib/isodoc/presentation_function/terms.rb b/lib/isodoc/presentation_function/terms.rb index 36b7e6c5..391d5af9 100644 --- a/lib/isodoc/presentation_function/terms.rb +++ b/lib/isodoc/presentation_function/terms.rb @@ -9,7 +9,6 @@ def designation(docxml) end def deprecates(elem) - #elem.children.first.previous = @i18n.l10n("#{@i18n.deprecated}: ") elem.add_first_child @i18n.l10n("#{@i18n.deprecated}: ") end diff --git a/lib/isodoc/version.rb b/lib/isodoc/version.rb index 652a0549..6edb6c46 100644 --- a/lib/isodoc/version.rb +++ b/lib/isodoc/version.rb @@ -1,3 +1,3 @@ module IsoDoc - VERSION = "2.11.2".freeze + VERSION = "2.11.3".freeze end