isodoc 2.12.9 → 3.0.1

data/lib/isodoc/presentation_function/sourcecode.rb

@@ -12,7 +12,7 @@ module IsoDoc
       ret = ""
       @sourcehighlighter and ret += rouge_css_location
       a = docxml.at(ns("//metanorma-extension/" \
-                       "clause[title = 'user-css']/sourcecode")) and
+                       "clause[title = 'user-css']/sourcecode/body")) and
         ret += "\n#{to_xml(a.children)}"
       ret
     end
@@ -34,7 +34,7 @@ module IsoDoc
 
     def callouts(elem)
       elem.xpath(ns(".//callout")).each do |c|
-        @callouts[c["target"]] = c.children.to_xml
+        @callouts[c["target"]] = to_xml(c.children)
       end
     end
 
@@ -42,36 +42,67 @@ module IsoDoc
       sourcehighlighter_css(docxml)
       @highlighter = sourcehighlighter
       @callouts = {}
-      docxml.xpath(ns("//sourcecode")).each do |f|
+      (docxml.xpath(ns("//sourcecode")) - 
+       docxml.xpath(ns("//metanorma-extension//sourcecode")))
+        .each do |f|
         sourcecode1(f)
       end
     end
 
     def sourcecode1(elem)
-      source_highlight(elem)
+      ret1 = semx_fmt_dup(elem)
+      b = ret1.at(ns(".//body")) and b.replace(b.children)
+      #sourcecode_annot_id(elem)
       source_label(elem)
+      source_highlight(ret1, elem["linenums"] == "true", elem["lang"])
       callouts(elem)
-      annotations(elem)
+      annotations(elem, ret1)
+      fmt_sourcecode(elem, ret1)
     end
 
-    def annotations(elem)
+    def fmt_sourcecode(elem, ret1)
+      ret = Nokogiri::XML::Node.new("fmt-#{elem.name}", elem.document)
+      elem.attributes.each_key { |x| x != "id" and ret[x] = elem[x] }
+      ret1.xpath(ns("./name")).each(&:remove)
+      ret << ret1.children
+      elem << ret
+    end
+
+    # KILL
+    def sourcecode_annot_id(elem)
+      elem.xpath(ns("./annotation")).each do |a|
+        if a["original-id"]
+          a["id"] = a["original-id"]
+          a.delete("original-id")
+        end
+          a.xpath(".//*[@original-id]").each do |n|
+            n["id"] = n["original-id"]
+          n.delete("original-id")
+          end
+        end
+    end
+
+    def annotations(elem, fmt_elem)
       elem.at(ns("./annotation")) or return
       ret = ""
       elem.xpath(ns("./annotation")).each do |a|
-        a.remove
+        id = a['original-id']
+        dd = semx_fmt_dup(a)
+        dd["source"] = a["id"]
         ret += <<~OUT
-          <dt id='#{a['id']}'><span class='c'>#{@callouts[a['id']]}</span></dt>
-          <dd>#{a.children.to_xml}</dd>
+          <dt id='#{id}'><span class='c'>#{@callouts[id]}</span></dt>
+          <dd>#{to_xml dd}</dd>
         OUT
       end
-      elem << "<dl><name>#{@i18n.key}</name>#{ret}</dl>"
+      fmt_elem.xpath(ns("./annotation")).each(&:remove)
+      fmt_elem << "<dl><name>#{@i18n.key}</name>#{ret}</dl>"
     end
 
-    def source_highlight(elem)
+    def source_highlight(elem, linenums, lang)
       @highlighter or return
       markup = source_remove_markup(elem)
-      p = source_lex(elem)
-      elem.children = if elem["linenums"] == "true"
+      p = source_lex(elem, lang)
+      elem.children = if linenums
                         r = sourcecode_table_to_elem(elem, p)
                         source_restore_markup_table(r, markup)
                       else
@@ -140,8 +171,8 @@ module IsoDoc
       r
     end
 
-    def source_lex(elem)
-      lexer = Rouge::Lexer.find(elem["lang"] || "plaintext") ||
+    def source_lex(elem, lang)
+      lexer = Rouge::Lexer.find(lang || "plaintext") ||
         Rouge::Lexer.find("plaintext")
       l = Rouge::Lexers::Escape.new(start: "{^^{", end: "}^^}", lang: lexer)
       source = to_xml(elem.children).gsub(/</, "{^^{<").gsub(/>/, ">}^^}")

data/lib/isodoc/presentation_function/xrefs.rb

@@ -1,5 +1,18 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
+    def fmt_ref(docxml)
+      docxml.xpath(ns("//xref | //eref | //origin | //link")).each do |x|
+        sem_xml_descendant?(x) and next
+        tag = x.name
+        y = Nokogiri::XML::Node.new("fmt-#{tag}", x.document)
+        x.attributes.each_key { |a| y[a] = x[a] }
+        n = semx_fmt_dup(x) # semx/fmt-xref for ease of processing
+        n.children.each { |c| y << c }
+        n << y
+        x.next = n
+      end
+    end
+
     def prefix_container(container, linkend, node, target)
       prefix_container?(container, node) or return linkend
       container_container = @xrefs.anchor(container, :container, false)
@@ -126,7 +139,7 @@ module IsoDoc
 
     def loc2xref(entry)
       if entry[:target]
-        "<xref nested='true' target='#{entry[:target]}'>#{entry[:label]}</xref>"
+        "<fmt-xref nested='true' target='#{entry[:target]}'>#{entry[:label]}</fmt-xref>"
       else
         entry[:label]
       end

data/lib/isodoc/presentation_xml_convert.rb

@@ -28,9 +28,27 @@ module IsoDoc
       @xrefs.klass.info docxml, nil
       conversions(docxml)
       docxml.root["type"] = "presentation"
+      repeat_id_validate(docxml.root)
       docxml.to_xml.gsub("<", "<").gsub(">", ">")
     end
 
+    def repeat_id_validate1(elem)
+        if @doc_ids[elem["id"]]
+          @log.add("Anchors", elem,
+                   "Anchor #{elem['id']} has already been " \
+                   "used at line #{@doc_ids[elem['id']]}", severity: 0)
+        end
+        @doc_ids[elem["id"]] = elem.line
+      end
+
+      def repeat_id_validate(doc)
+        @log or return
+        @doc_ids = {}
+        doc.xpath("//*[@id]").each do |x|
+          repeat_id_validate1(x)
+        end
+      end
+
     def bibitem_lookup(docxml)
       @bibitem_lookup ||= docxml.xpath(ns("//references/bibitem"))
         .each_with_object({}) do |b, m|
@@ -71,7 +89,6 @@ module IsoDoc
     end
 
     def block(docxml)
-      amend docxml
       table docxml
       figure docxml
       sourcecode docxml
@@ -88,15 +105,18 @@ module IsoDoc
       requirement docxml
       recommendation docxml
       requirement_render docxml
+      amend docxml
     end
 
     def inline(docxml)
       bibitem_lookup(docxml) # feeds citeas
-      citeas docxml # feeds xref, eref, origin, quotesource
+      fmt_ref docxml # feeds citeas, xref, eref, origin, concept
+      citeas docxml # feeds xref, eref, origin, concept
       xref docxml
       eref docxml # feeds eref2link
       origin docxml # feeds eref2link
-      quotesource docxml # feeds eref2link
+      #quotesource docxml # feeds eref2link
+      concept docxml
       eref2link docxml
       mathml docxml
       ruby docxml
@@ -114,7 +134,7 @@ module IsoDoc
       termdefinition docxml
       designation docxml
       termsource docxml
-      concept docxml
+      #concept docxml
       related docxml
       termcleanup docxml
     end

data/lib/isodoc/sassc_importer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "sassc"
+require "sassc-embedded"
 
 class SasscImporter < SassC::Importer
   def imports(path, _parent_path)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.12.9".freeze
+  VERSION = "3.0.1".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -134,7 +134,7 @@ module IsoDoc
       def formula_parse1(node, out)
         out.div **attr_code(class: "formula") do |div|
           div.p do |_p|
-            parse(node.at(ns("./stem")), div)
+            parse(node.at(ns("./fmt-stem")), div)
             insert_tab(div, 1)
             if lbl = node&.at(ns("./fmt-name"))&.text
               div << lbl

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -124,6 +124,7 @@ module IsoDoc
 
       def preface_name_anchors(clause, level, title)
         xref = semx(clause, title, clause.name)
+        clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
           { label: nil, level:,
             xref:, title: nil,
@@ -187,6 +188,7 @@ module IsoDoc
         xref = labelled_autonum(@labels["clause"], num)
         label = num
         c = clause_title(clause) and title = semx(clause, c, "title")
+        clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
           { label:, xref:, title:, level:, type: "clause",
             elem: @labels["clause"] }
@@ -207,10 +209,10 @@ module IsoDoc
         label = num
         level == 1 && clause.name == "annex" and
           label = annex_name_lbl(clause, label)
-        xref = labelled_autonum(@labels["annex"], num)
         c = clause_title(clause) and title = semx(clause, c, "title")
+        clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
-          { label:, xref:, title:,
+          { label:, xref: labelled_autonum(@labels["annex"], num), title:,
             elem: @labels["annex"], type: "clause",
             subtype: "annex", value: num.to_s, level: }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.12.9
+  version: 3.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-03 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
@@ -291,19 +291,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: sassc-embedded
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -375,8 +375,8 @@ files:
 - lib/isodoc-yaml/i18n-ru.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc.rb
-- lib/isodoc/base_style/all.css
 - lib/isodoc/base_style/all.scss
+- lib/isodoc/base_style/bands.css
 - lib/isodoc/base_style/bands.scss
 - lib/isodoc/base_style/blocks.css
 - lib/isodoc/base_style/blocks.scss

data/lib/isodoc/base_style/all.css

@@ -1,368 +0,0 @@
-@charset "UTF-8";
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0; }
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  border: 0;
-  font-size: 100%; }
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, tt, var,
-b, u, i, center,
-dl, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  vertical-align: baseline; }
-
-html, body, div, span, applet, object, iframe,
-p, blockquote,
-a, abbr, acronym, address, big, cite,
-del, dfn, em, img, ins, q, s,
-small, strike, strong, sub, sup, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  font-family: {{bodyfont}}; }
-
-code, pre, tt, kbd, samp {
-  font-family: {{monospacefont}};
-  font-variant-ligatures: none; }
-
-code *, pre *, tt *, kbd *, samp * {
-  font-family: {{monospacefont}} !important;
-  font-variant-ligatures: none; }
-
-p code, dt code, li code, label code, legend code, caption code, th code, td code,
-p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
-p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
-p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
-  font-size: {{monospacefontsize}}; }
-
-sub, sup {
-  font-size: 0.75em; }
-
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block; }
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0; }
-
-h1, h2, h3, h4, h5, h6 {
-  font-family: {{headerfont}}; }
-
-.h1, .h2, .h3, .h4, .h5, .h6 {
-  font-family: {{headerfont}}; }
-
-blockquote, q {
-  quotes: none; }
-  blockquote::before, blockquote::after, q::before, q::after {
-    content: '';
-    content: none; }
-
-.h2Annex {
-  font-family: {{headerfont}}; }
-
-dl {
-  display: grid;
-  grid-template-columns: max-content auto; }
-  dl dt p, dl dd p {
-    margin-top: 0; }
-  dl dt {
-    grid-column-start: 1; }
-  dl dd {
-    grid-column-start: 2; }
-
-b, strong {
-  font-weight: bold; }
-
-div.document-stage-band, div.document-type-band {
-  background-color: #333333; }
-
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super; }
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super; }
-
-a.TableFootnoteRef, span.TableFootnoteRef,
-a.FootnoteRef, span.FootnoteRef {
-  vertical-align: super; }
-
-.addition {
-  color: blue; }
-
-.deletion {
-  color: red;
-  text-decoration: line-through; }
-
-ruby {
-  ruby-position: over;
-  -webkit-ruby-position: before; }
-
-ruby ruby {
-  ruby-position: under;
-  -webkit-ruby-position: after; }
-
-/* code highlighting with line numbers */
-table.rouge-line-table td.rouge-gutter {
-  -moz-user-select: none;
-  -ms-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-  padding-right: 1em; }
-
-table.rouge-line-table td.rouge-code {
-  -moz-user-select: all;
-  -ms-user-select: all;
-  -webkit-user-select: all;
-  user-select: all; }
-
-table.rouge-line-table,
-table.rouge-line-table th,
-table.rouge-line-table td {
-  width: auto;
-  border: none;
-  margin: 0;
-  padding: 0;
-  font-size: 100%; }
-
-table.rouge-line-table pre {
-  margin: 0;
-  padding: 0;
-  overflow-x: visible;
-  font-size: 100%; }
-
-/* header § links */
-a.header {
-  color: inherit;
-  text-decoration: none; }
-
-a.header:hover {
-  color: #a53221 !important;
-  background: inherit;
-  box-shadow: none; }
-
-a.header:visited {
-  color: inherit;
-  text-decoration: none; }
-
-a.anchor {
-  position: absolute;
-  z-index: 1001;
-  width: 1.5ex;
-  margin-left: -1.5ex;
-  display: block;
-  text-decoration: none !important;
-  visibility: hidden;
-  text-align: center;
-  font-weight: 400; }
-
-a.anchor::before {
-  content: "\00A7";
-  font-size: .85em;
-  display: block;
-  padding-top: .1em; }
-
-a.anchor:hover {
-  color: #a53221;
-  background: inherit;
-  box-shadow: none; }
-
-h1 > a.anchor:hover,
-h2 > a.anchor:hover,
-h3 > a.anchor:hover,
-h4 > a.anchor:hover,
-h5 > a.anchor:hover,
-h6 > a.anchor:hover,
-.inline-header > a.anchor:hover,
-h1:hover > a.anchor,
-h2:hover > a.anchor,
-h3:hover > a.anchor,
-h4:hover > a.anchor,
-h5:hover > a.anchor,
-h6:hover > a.anchor,
-.inline-header:hover > a.anchor {
-  visibility: visible; }
-
-/* collapsible snippets: collapsible before hidable */
-.hidable {
-  max-height: 0;
-  overflow: hidden;
-  transition: max-height 0.2s ease-out; }
-
-.collapsible {
-  background-color: #777;
-  color: white;
-  cursor: pointer;
-  padding: 3px 0;
-  margin: 0;
-  width: 100%;
-  border: none;
-  text-align: left;
-  outline: none;
-  font-size: 15px; }
-
-.active, .collapsible:hover {
-  background-color: #555; }
-
-.collapsible:after {
-  content: '\25bc';
-  color: white;
-  font-weight: bold;
-  float: right;
-  margin-left: 12px;
-  margin-right: 12px; }
-
-.active:after {
-  content: "\25b2"; }
-
-/* collapsible: */
-.collapsible + .hidable {
-  margin-top: 0; }
-
-.collapsible:not(.active) + .hidable {
-  overflow: hidden;
-  padding: 0; }
-
-#standard-band {
-  background-color: #0AC442; }
-
-#standard {
-  border-bottom: solid 3px #0AC442; }
-
-#directive-band {
-  background-color: #540D6E; }
-
-#directive {
-  border-bottom: solid 3px #540D6E; }
-
-#guide-band {
-  background-color: #D183C9; }
-
-#guide {
-  border-bottom: solid 3px #D183C9; }
-
-#specification-band {
-  background-color: #65AFFF; }
-
-#specification {
-  border-bottom: solid 3px #65AFFF; }
-
-#report-band {
-  background-color: #3A405A; }
-
-#report {
-  border-bottom: solid 3px #3A405A; }
-
-#amendment-band {
-  background-color: #F26430; }
-
-#amendment {
-  border-bottom: solid 3px #F26430; }
-
-#corrigendum-band {
-  background-color: #C84630; }
-
-#corrigendum {
-  border-bottom: solid 3px #C84630; }
-
-#administrative-band {
-  background-color: #BFAE48; }
-
-#administrative {
-  border-bottom: solid 3px #BFAE48; }
-
-#advisory-band {
-  background-color: #BD9391; }
-
-#advisory {
-  border-bottom: solid 3px #BD9391; }
-
-#proposal-band {
-  background-color: #39A0ED; }
-
-#proposal {
-  border-bottom: solid 3px #39A0ED; }
-
-#working-draft-band {
-  background-color: #2D7393; }
-
-#working-draft {
-  border-bottom: solid 3px #2D7393; }
-
-#committee-draft-band {
-  background-color: #2A6B7C; }
-
-#committee-draft {
-  border-bottom: solid 3px #2A6B7C; }
-
-#draft-standard-band {
-  background-color: #1C7F7A; }
-
-#draft-standard {
-  border-bottom: solid 3px #1C7F7A; }
-
-#final-draft-band {
-  background-color: #53C170; }
-
-#final-draft {
-  border-bottom: solid 3px #53C170; }
-
-#published-band {
-  background-color: #069E2D; }
-
-#published {
-  border-bottom: solid 3px #069E2D; }
-
-#withdrawn-band {
-  background-color: #004E64; }
-
-#withdrawn {
-  border-bottom: solid 3px #004E64; }
-
-#cancelled-band {
-  background-color: #2E382E; }
-
-#cancelled {
-  border-bottom: solid 3px #2E382E; }