isodoc 3.6.2 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bf1ffcc456d731a2c304e57a434c843fb15c35160b1a9f986edd708d6c69778
-  data.tar.gz: ac599e110c10a0ea9937d2068f01feff1cace361da16668a2effb79d01a8e71f
+  metadata.gz: 9e9e4612fb1a8151ba500dfc561dca2f22434b6b4981b842a3188d1203226a85
+  data.tar.gz: d7cd554782c88320a59b7bf5d0240c7d81deffdfb4e90861618d01e9f6690c7d
 SHA512:
-  metadata.gz: a10380f99ba7cb208b32ef3c4631e5ca4cb41173c77c925d069cb17c72dcfd4c55bdd0a63a23080ecb0c0d6783e08b2e351bfc694c7280ade2b960779da8c1be
-  data.tar.gz: b394e8f2e6e78fe1f1c00b9df1f1d233b053118daee4e70e6927009725afddb851031d47ed52272cdf09a8931d6710e47b83b478b99c97725c4a57e21f766356
+  metadata.gz: 3fc09b5a526d031454b9c28f43e1bd1d682120bc9c3014ecc49deb9b9d82728e79f6b0e6410e1b3c5c0913a06499bc6b36b21ee447c8597e37152bd571182a54
+  data.tar.gz: 8dac1e10327f3b69ec52011f5ab4754726cc0973b31bcfebf594778672b5f487b3caba951bb636df3266959853c00fcdbf1b40940ab6e71885dc2c23c1a554f3

data/lib/isodoc/base_style/nav.scss

@@ -131,7 +131,9 @@
     background-color: $colorBg;
     color: $colorFg !important;
     cursor: pointer;
-    z-index: 100;
+    left: 0;
+    top: 0;
+    z-index: 103;
 
     span {
       text-align: center;

data/lib/isodoc/base_style/scripts.html

@@ -13,24 +13,51 @@
       const jqToggle = $('#toggle');
       const animationSpeed = 'slow';
 
+      if(!jqNav.length || !jqToggle.length) {
+        return;
+      }
+
+      const navWidthExpanded = jqNav.outerWidth();
+      const bodyPaddingLeftExpanded =
+        parseFloat(jqBody.css('paddingLeft')) > 0 ?
+          jqBody.css('paddingLeft') : navWidthExpanded + 'px';
+      const expandedToggleLeft = navWidthExpanded + 'px';
+      let bandWidth = 0;
+
+      $('.document-stage-band:visible, .document-type-band:visible')
+        .each(function() {
+          const bounds = this.getBoundingClientRect();
+          bandWidth = Math.max(bandWidth, bounds.right);
+        });
+
+      const toggleWidth = jqToggle.outerWidth();
+      const collapsedToggleLeft = bandWidth + 'px';
+      const collapsedBodyPaddingLeft = bandWidth + toggleWidth + 'px';
+      jqToggle.css({
+        'left': jqNav.is(':visible') ? expandedToggleLeft : collapsedToggleLeft,
+        'top': '0px'
+      });
+
       jqToggle.on('click', function() {
         const isNavVisible = jqNav.is(':visible');
-        const fullNavWidth = jqNav.outerWidth();
-        const navLeft = isNavVisible ? '-' + fullNavWidth + 'px' : '0px';
-        const bodyMarginLeft = isNavVisible ? '0px' : fullNavWidth + 'px';
+        const navLeft = isNavVisible ? '-' + navWidthExpanded + 'px' : '0px';
+        const bodyPaddingLeft =
+          isNavVisible ? collapsedBodyPaddingLeft : bodyPaddingLeftExpanded;
+        const toggleLeft =
+          isNavVisible ? collapsedToggleLeft : expandedToggleLeft;
 
-        // Stop current animations
         jqNav.stop(true, true);
         jqBody.stop(true, true);
+        jqToggle.stop(true, true);
 
         if(!isNavVisible) {
-            jqNav.show();
+          jqNav.show();
         }
         jqNav.animate({'left': navLeft}, animationSpeed, function() {
           if(isNavVisible) {jqNav.hide()}
         });
-        jqBody.animate({'marginLeft': bodyMarginLeft}, animationSpeed);
-
+        jqBody.animate({'paddingLeft': bodyPaddingLeft}, animationSpeed);
+        jqToggle.animate({'left': toggleLeft}, animationSpeed);
       });
     })();
   </script>
@@ -215,4 +242,3 @@ for (i = 0; i < coll.length; i++) {
   });
 }
 </script>
-

data/lib/isodoc/presentation_function/docid_semantic.rb

@@ -0,0 +1,65 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    # Wrap token sub-spans of a standard docidentifier (publisher, document
+    # number, part, year, ...) in <span class="..."> markers for CSS styling.
+    # Flavors opt in by overriding `annotate_docid?`; they customise span
+    # class naming via `std_docid_span_classes`. Pubid parsing is shared.
+    def std_docid_semantic(id)
+      annotate_docid?(id) or return id
+      id.nil? || id.empty? || id == "IEV" || /^\[?\d+\]?$/.match?(id) and
+        return id
+      nbsp = id.include?("\u00a0")
+      bracket = id.match?(/\A\[.+\]\Z/m)
+      id = id.gsub("\u00a0", " ").sub(/\A\[(.+)\]\Z/m, "\\1")
+      ret = std_docid_span_classes(std_docid_semantic_parse(id))
+      std_docid_semantic_restore_format(ret, nbsp, bracket)
+    end
+
+    def std_docid_semantic_parse(id)
+      parsed = Pubid::Registry.parse(id)
+      # Pubid::Ieee in particular happily parses any "letters+digits" token
+      # as an IEEE Std identifier and synthesises an "IEEE Std" prefix that
+      # wasn't in the input (e.g. "REF4" -> "IEEE Std REF4"). Refuse to
+      # annotate when the parser has invented structure not present in the
+      # input -- detected by a non-identity round-trip.
+      return id if parsed.to_s != id
+      parsed.to_s(annotated: true)
+    rescue Pubid::Core::Errors::ParseError
+      std_docid_semantic_full(id)
+    end
+
+    # Regex-based fallback when Pubid::Registry cannot parse the id. Emits
+    # the same generic class names that Pubid uses (publisher, docnumber,
+    # part, year) so that flavors' `std_docid_span_classes` remaps work
+    # uniformly across both the Pubid-parse path and this fallback.
+    def std_docid_semantic_full(ident)
+      ident
+        .sub(/^([^0-9]+)(\p{Zs}|$)/, '<span class="publisher">\1</span>\2')
+        .sub(/([0-9]+)/, '<span class="docnumber">\1</span>')
+        .sub(/-([0-9]+)/, '-<span class="part">\1</span>')
+        .sub(/:([0-9]{4})(?!\d)/, ':<span class="year">\1</span>')
+    end
+
+    # Default: pass through Pubid's generic class names unchanged. Flavors
+    # override to remap (e.g. ISO -> "stdpublisher", IEEE -> "std_publisher").
+    def std_docid_span_classes(id)
+      id
+    end
+
+    def std_docid_semantic_restore_format(id, nbsp, bracket)
+      nbsp and Nokogiri::XML(id).traverse do |n|
+        n.text? or next
+        n.replace(n.text.gsub(" ", "\u00a0"))
+      end
+      bracket and id = "[#{id}]"
+      id
+    end
+
+    # Flavors opt in by overriding to return true. Default is off so that
+    # downstream consumers of IsoDoc::PresentationXMLConvert that have not
+    # explicitly opted in (ITU, NIST, OGC, ...) keep their current behaviour.
+    def annotate_docid?(_id)
+      false
+    end
+  end
+end

data/lib/isodoc/presentation_function/refs.rb

@@ -160,14 +160,15 @@ module IsoDoc
 
     # if ids is just a number, only use that ([1] Non-Standard)
     # else, use both ordinal, as prefix, and ids
+    # The footnote (datefn) always lands between the bracketed ordinal and
+    # the <tab/>, regardless of whether the docidentifier is present, so
+    # placement stays consistent across bibitems.
     def biblio_ref_entry_code(ordinal, ids, _standard, datefn, _bib)
       ret = esc(ids[:ordinal]) || esc(ids[:content]) || esc(ids[:metanorma]) ||
         "[#{esc ordinal.to_s}]"
+      ret = prefix_bracketed_ref("#{ret}#{datefn}")
       if ids[:sdo] && !ids[:sdo].empty?
-        ret = prefix_bracketed_ref(ret)
-        ret += "#{esc ids[:sdo]}#{datefn}, "
-      else
-        ret = prefix_bracketed_ref("#{ret}#{datefn}")
+        ret += "#{esc ids[:sdo]}, "
       end
       ret
     end

data/lib/isodoc/presentation_xml_convert.rb

@@ -16,6 +16,7 @@ require_relative "presentation_function/annex"
 require_relative "presentation_function/title"
 require_relative "presentation_function/refs"
 require_relative "presentation_function/docid"
+require_relative "presentation_function/docid_semantic"
 require_relative "presentation_function/index"
 require_relative "presentation_function/bibdata"
 require_relative "presentation_function/metadata"

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.6.2".freeze
+  VERSION = "3.6.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-15 00:00:00.000000000 Z
+date: 2026-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -264,6 +264,7 @@ files:
 - lib/isodoc/presentation_function/concepts.rb
 - lib/isodoc/presentation_function/designations.rb
 - lib/isodoc/presentation_function/docid.rb
+- lib/isodoc/presentation_function/docid_semantic.rb
 - lib/isodoc/presentation_function/erefs.rb
 - lib/isodoc/presentation_function/erefs_locality.rb
 - lib/isodoc/presentation_function/footnotes.rb