metanorma-standoc 2.7.4 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67faf1005268886a18a869cd5cae9b22989946d6999317d446798521bd9b6728
-  data.tar.gz: b3127ed75c593c211bda46f42cb1fe744f59b04337977a71e0213f2b1e6997a8
+  metadata.gz: 9d3fc596438edd06d1a0bbfa6ca008e650e22e9230048259f4b0696bde8a1087
+  data.tar.gz: 3b5c3569a642d7da4b61cb98aa999a2ad526e4f43265489bd99fa59c659e5d48
 SHA512:
-  metadata.gz: bd52c09a6b065f0d097c277ec332c8d0b4dd9406fb6a71e42dfb514ba35b03b4d6f2316e6f808e55f99249b8b8c7f488fb137c65e044cb5b9abff2b8015d9824
-  data.tar.gz: 61b6e99444cbd529626fcce026356070d5898f9607ef2239bbfd72d9445f15a81f8b06a5801057293d2838af8d300908365d566acd3ef66c3aedab0e9324c6d9
+  metadata.gz: 483f649b259da9b1a6b44736eb78979b3e06ad5ae29f666e0e2416ef3aa2193b22ea13b9aa14f2ac6b249020f6226f8912ab95cd2860458df767be62f6198127
+  data.tar.gz: ba5da0a5a7af09d8da8237fabeeb9bfe813e3d43d21295e04ea0b2f0bc9c0011d52a7da2c55df2a00fad8fe2568bd14e5e57b28fa761c0ed2535d72f0a22eeb4

data/Gemfile

@@ -4,12 +4,6 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-group :development, :test do
-  gem "rspec"
-end
-
-if File.exist? "Gemfile.devel"
-  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
-end
-
 gemspec
+
+eval_gemfile("Gemfile.devel") rescue nil

data/lib/isodoc/html/htmlstyle.css

@@ -140,6 +140,14 @@ a.FootnoteRef, span.FootnoteRef {
   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;

data/lib/metanorma/standoc/base.rb

@@ -87,18 +87,22 @@ module Metanorma
       end
 
       def init_toc(node)
-        @htmltoclevels = node.attr("htmltoclevels") ||
+        @htmltoclevels = node.attr("toclevels-html") ||
+          node.attr("htmltoclevels") ||
           node.attr("toclevels") || toc_default[:html_levels]
-        @doctoclevels = node.attr("doctoclevels") ||
-          node.attr("toclevels") || toc_default[:word_levels]
-        @toclevels = node.attr("toclevels") || toc_default[:word_levels]
+        @doctoclevels = node.attr("toclevels-doc") ||
+          node.attr("doctoclevels") || node.attr("toclevels") ||
+          toc_default[:word_levels]
+        @pdftoclevels = node.attr("toclevels-pdf") ||
+          node.attr("toclevels") || toc_default[:pdf_levels]
+        @toclevels = node.attr("toclevels") || toc_default[:html_levels]
         @tocfigures = node.attr("toc-figures")
         @toctables = node.attr("toc-tables")
         @tocrecommendations = node.attr("toc-recommendations")
       end
 
       def toc_default
-        { word_levels: 2, html_levels: 2 }
+        { word_levels: 2, html_levels: 2, pdf_levels: 2 }
       end
 
       def init_output(node)

data/lib/metanorma/standoc/basicdoc.rng

@@ -715,27 +715,36 @@
   </define>
   <define name="ruby">
     <element name="ruby">
-      <zeroOrMore>
-        <choice>
-          <ref name="PureTextElement"/>
-          <ref name="rp"/>
-          <ref name="rt"/>
-        </choice>
-      </zeroOrMore>
+      <choice>
+        <ref name="ruby_pronunciation"/>
+        <ref name="ruby_annotation"/>
+      </choice>
+      <choice>
+        <text/>
+        <ref name="ruby"/>
+      </choice>
     </element>
   </define>
-  <define name="rp">
-    <element name="rp">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_pronunciation">
+    <element name="pronunciation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
-  <define name="rt">
-    <element name="rt">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_annotation">
+    <element name="annotation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
   <define name="br">

data/lib/metanorma/standoc/cleanup_toc.rb

@@ -78,7 +78,7 @@ module Metanorma
       end
 
       def toc_metadata(xmldoc)
-        @htmltoclevels || @doctoclevels || @toclevels or return
+        @htmltoclevels || @doctoclevels || @pdftoclevels || @toclevels or return
         ins = add_misc_container(xmldoc)
         toc_metadata1(ins)
       end
@@ -86,7 +86,8 @@ module Metanorma
       def toc_metadata1(ins)
         [[@toclevels, "TOC Heading Levels"],
          [@htmltoclevels, "HTML TOC Heading Levels"],
-         [@doctoclevels, "DOC TOC Heading Levels"]].each do |n|
+         [@doctoclevels, "DOC TOC Heading Levels"],
+         [@pdftoclevels, "PDF TOC Heading Levels"]].each do |n|
           n[0] and ins << "<presentation-metadata><name>#{n[1]}</name>" \
                           "<value>#{n[0]}</value></presentation-metadata>"
         end

data/lib/metanorma/standoc/front_contributor.rb

@@ -22,7 +22,12 @@ module Metanorma
 
       def personal_role(node, contrib, suffix)
         type = node.attr("role#{suffix}")&.downcase || "author"
-        contrib.role type: type
+        desc = node.attr("role-description#{suffix}")
+        contrib.role type: type do |r|
+          desc and r.description do |d|
+            d << desc
+          end
+        end
       end
 
       def personal_contact(node, suffix, person)

data/lib/metanorma/standoc/macros_inline.rb

@@ -52,25 +52,32 @@ module Metanorma
       use_dsl
       named :ruby
       parse_content_as :text
-      option :pos_attrs, %w(rpbegin rt rpend)
-
-      # for example, html5ruby:楽聖少女[がくせいしょうじょ]
-      def process(_parent, target, attributes)
-        rpbegin = "("
-        rpend = ")"
-        if (attributes.size == 1) && attributes.key?("text")
-          rt = attributes["text"]
-        elsif (attributes.size == 2) && attributes.key?(1) &&
-            attributes.key?("rpbegin")
-          rt = attributes[1] || ""
-        else
-          rpbegin = attributes["rpbegin"]
-          rt = attributes["rt"]
-          rpend = attributes["rpend"]
+
+      # ruby:{annotation}[lang=ja,script=Hira,type=pronunciation|annotation,text]
+
+      def preprocess_attrs(text)
+        ret = {}
+        while m = /^(?<key>lang|script|type)=(?<val>[^,]+),(?<rest>.+)$/
+            .match(text)
+          text = m[:rest]
+          ret[m[:key].to_sym] = m[:val]
         end
+        ret[:text] = text
+        ret[:type] ||= "pronunciation"
+        ret[:type] == "annotation" or ret[:type] = "pronunciation"
+        ret
+      end
 
-        "<ruby>#{target}<rp>#{rpbegin}</rp><rt>#{rt}</rt>" \
-          "<rp>#{rpend}</rp></ruby>"
+      def process(parent, target, attributes)
+        args = preprocess_attrs(attributes["text"])
+        out = Nokogiri::XML(
+          create_block(parent, :paragraph, [args[:text]], {},
+                       subs: [:macros], content_model: :simple).convert,
+        ).root.children.to_xml # force recurse macros
+        attrs = " value='#{target}'"
+        x = args[:lang] and attrs += " lang='#{x}'"
+        x = args[:script] and attrs += " script='#{x}'"
+        "<ruby><#{args[:type]} #{attrs}/>#{out}</ruby>"
       end
     end
 

data/lib/metanorma/standoc/render.rb

@@ -17,8 +17,9 @@ module Metanorma
           scripts_override: node.attr("scripts-override"),
           scripts_pdf: node.attr("scripts-pdf"),
           datauriimage: node.attr("data-uri-image") != "false",
-          htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
-          doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
+          htmltoclevels: @htmltoclevels,
+          doctoclevels: @doctoclevels,
+          pdftoclevels: @pdftoclevels,
           breakupurlsintables: node.attr("break-up-urls-in-tables"),
           suppressasciimathdup: node.attr("suppress-asciimath-dup") == "true",
           bare: node.attr("bare"),
@@ -62,8 +63,9 @@ module Metanorma
           wordintropage: node.attr("wordintropage"),
           ulstyle: node.attr("ulstyle"),
           olstyle: node.attr("olstyle"),
-          htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
-          doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
+          htmltoclevels: @htmltoclevels,
+          doctoclevels: @doctoclevels,
+          pdftoclevels: @pdftoclevels,
           breakupurlsintables: node.attr("break-up-urls-in-tables"),
           suppressasciimathdup: node.attr("suppress-asciimath-dup"),
           bare: node.attr("bare"),

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.7.4".freeze
+    VERSION = "2.7.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-10 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable