From 403bbc902f2674d4b4f7e02b0a4812ef120ea94e Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Mon, 4 Nov 2024 14:01:14 +1100 Subject: [PATCH 1/2] refactor termdomain from upstream: https://github.com/metanorma/isodoc/issues/606 --- lib/isodoc/ietf/references.rb | 4 ++++ lib/isodoc/ietf/terms.rb | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/isodoc/ietf/references.rb b/lib/isodoc/ietf/references.rb index d7bd7ed..db92994 100644 --- a/lib/isodoc/ietf/references.rb +++ b/lib/isodoc/ietf/references.rb @@ -23,6 +23,10 @@ def bibliography_prep(docxml) i18nhash: @i18n.get) end + def implicit_reference(bib) + bib["hidden"] == "true" + end + def bibliography1(node, out) out.references **attr_code(anchor: node["id"]) do |div| title = node.at(ns("./title")) and div.name do |name| diff --git a/lib/isodoc/ietf/terms.rb b/lib/isodoc/ietf/terms.rb index cf89d9d..3b0394a 100644 --- a/lib/isodoc/ietf/terms.rb +++ b/lib/isodoc/ietf/terms.rb @@ -1,6 +1,10 @@ module IsoDoc module Ietf class RfcConvert < ::IsoDoc::Convert + def set_termdomain(termdomain) + @termdomain = termdomain + end + def definition_parse(node, out) node.children.each { |n| parse(n, out) } end @@ -27,6 +31,10 @@ def admitted_term_parse(node, out) end def term_parse(node, out) + if domain = node.at(ns("./domain")) + set_termdomain(domain.text) + domain["hidden"] = "true" + end name = node.at(ns(".//name")) out.name do |p| name.children.each { |n| parse(n, p) } @@ -38,7 +46,12 @@ def termnote_parse(node, out) end def termdef_parse(node, out) - set_termdomain("") + if domain = node.at(ns("./domain")) + set_termdomain(domain.text) + domain["hidden"] = "true" + else + set_termdomain("") + end node.xpath(ns("./definition")).size > 1 and @isodoc.multidef(node) clause_parse(node, out) From e6d262455d60e568fdcf859b72b8c8e17dce608f Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Mon, 4 Nov 2024 14:01:45 +1100 Subject: [PATCH 2/2] refactor termdomain from upstream: https://github.com/metanorma/isodoc/issues/606 --- Gemfile.devel | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Gemfile.devel diff --git a/Gemfile.devel b/Gemfile.devel new file mode 100644 index 0000000..6c3302b --- /dev/null +++ b/Gemfile.devel @@ -0,0 +1,2 @@ +gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "main" +gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "fix/presxml-oct24"