isodoc 1.0.23 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 709ee937cab542be14ef994074c62d60df2e26ad5d858fbfd9dc9966f100a9be
-  data.tar.gz: 809faa2a70a8d982909f15794928b19981f5e3aee33da0afdc9fc81d8a4d030b
+  metadata.gz: 50ac1215a8065519d1dbab07c61a8c4e84dbc90923300bef4f6e44e4b9a8a843
+  data.tar.gz: b89e80351f424c11fb7cb2b92c838a8b8b05f2791a1f91a1d531b14611632229
 SHA512:
-  metadata.gz: 3b3a2e409e96f3f4e79723b06ebce456559280855c384ede05cbc15d5f9e217b7673228190190f1df84cc298ed5c89dd08e22a4eb89df5f1ff95fc978bba91e6
-  data.tar.gz: 9d26571df295d108788bd45d527e2a9ac8ef4d8f6cc6b7ec1aabc18c508d505e88a09c909f96b1d252274f293dac1950fba9b52359c30625a4c185658a9536a2
+  metadata.gz: d5ca6cf434f62383545145ccb02adccc060cc9fc5b79478655a5eaa21ca03332f1032baa87abc670935a586fa2cd957f3b8c9358e40802f33dcbc978e8da4b0a
+  data.tar.gz: 01f839c290c1e557a162e2ae43aba2c8ecb291b86664759d72eeacd80b1f338734ce470827cd35485446b589f77b637a5cece6f3118b0855d2494f7537adc1e1

data/lib/isodoc/base_style/reset.scss

@@ -125,5 +125,5 @@ b, strong {
 }
 
 div.document-stage-band, div.document-type-band {
-  background-color: #000000;
+  background-color: #333333;
 }

data/lib/isodoc/function/i18n.rb

@@ -77,8 +77,8 @@ module IsoDoc::Function
     end
 
     # TODO: move to localization file
-    def eref_localities1_zh(target, type, from, to)
-      ret = ", 第#{from.text}" if from
+    def eref_localities1_zh(target, type, from, to, delim)
+      ret = "#{delim} 第#{from.text}" if from
       ret += "–#{to}" if to
       loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
       ret += " #{loc}"
@@ -86,9 +86,9 @@ module IsoDoc::Function
     end
 
     # TODO: move to localization file
-    def eref_localities1(target, type, from, to, lang = "en")
-      return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
-      ret = ","
+    def eref_localities1(target, type, from, to, delim, lang = "en")
+      return l10n(eref_localities1_zh(target, type, from, to, delim)) if lang == "zh"
+      ret = delim
       loc = @locality[type] || type.sub(/^locality:/, "").capitalize
       ret += " #{loc}"
       ret += " #{from.text}" if from

data/lib/isodoc/function/inline.rb

@@ -55,12 +55,12 @@ module IsoDoc::Function
     end
 
     def get_linkend(node)
-      contents = node.children.select { |c| c.name != "locality" }.
+      contents = node.children.select { |c| !%w{locality localityStack}.include? c.name }.
         select { |c| !c.text? || /\S/.match(c) }
       !contents.empty? and
         return Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
       link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
-      link + eref_localities(node.xpath(ns("./locality")), link)
+      link + eref_localities(node.xpath(ns("./locality | ./localityStack")), link)
       # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
       # <locality type="section"><reference>3.1</reference></locality></origin>
     end
@@ -73,16 +73,29 @@ module IsoDoc::Function
 
     def eref_localities(refs, target)
       ret = ""
-      refs.each do |r|
-        ret += if r["type"] == "whole" then l10n(", #{@whole_of_text}")
-               else
-                 eref_localities1(target, r["type"], r.at(ns("./referenceFrom")),
-                                  r.at(ns("./referenceTo")), @lang)
-               end
+      refs.each_with_index do |r, i|
+        delim = ","
+        delim = ";" if r.name == "localityStack" && i>0
+        if r.name == "localityStack"
+          r.elements.each_with_index do |rr, j|
+            ret += eref_localities0(rr, j, target, delim)
+            delim = ","
+          end
+        else
+          ret += eref_localities0(r, i, target, delim)
+          end
       end
       ret
     end
 
+    def eref_localities0(r, i, target, delim)
+      if r["type"] == "whole" then l10n("#{delim} #{@whole_of_text}")
+      else
+        eref_localities1(target, r["type"], r.at(ns("./referenceFrom")),
+                         r.at(ns("./referenceTo")), delim, @lang)
+      end
+    end
+
     def eref_parse(node, out)
       linkend = get_linkend(node)
       if node["type"] == "footnote"
@@ -99,7 +112,7 @@ module IsoDoc::Function
     end
 
     def concept_parse(node, out)
-      content = node.first_element_child.children.select { |c| c.name != "locality" }.
+      content = node.first_element_child.children.select { |c| !%w{locality localityStack}.include? c.name }.
         select { |c| !c.text? || /\S/.match(c) }
       if content.empty?
         out << "[Term defined in "

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.23".freeze
+  VERSION = "1.0.24".freeze
 end

data/spec/isodoc/inline_spec.rb

@@ -126,13 +126,31 @@ RSpec.describe IsoDoc do
       </concept></li>
       <li><concept>
         <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+        <localityStack>
           <locality type='clause'>
             <referenceFrom>3.1</referenceFrom>
           </locality>
+        </localityStack>
+        <localityStack>
           <locality type='figure'>
-            <referenceFrom>a</referenceFrom>
+            <referenceFrom>b</referenceFrom>
+          </locality>
+        </localityStack>
+        </eref>
+      </concept></li>
+      <li><concept>
+        <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+        <localityStack>
+          <locality type='clause'>
+            <referenceFrom>3.1</referenceFrom>
+          </locality>
+        </localityStack>
+        <localityStack>
+          <locality type='figure'>
+            <referenceFrom>b</referenceFrom>
           </locality>
-          <em>word</em>
+        </localityStack>
+        <em>word</em>
         </eref>
       </concept></li>
       <li><concept term='term'>
@@ -180,6 +198,9 @@ RSpec.describe IsoDoc do
                    <li>
                      [Term defined in <a href='#ISO712'>ISO 712, Clause 3.1, Figure a</a>]
                    </li>
+                   <li>
+                     [Term defined in <a href='#ISO712'>ISO 712, Clause 3.1; Figure b</a>]
+                   </li>
                    <li>
                      <i>word</i>
                    </li>
@@ -436,6 +457,8 @@ OUTPUT
     <eref type="inline" bibitemid="ISO712" citeas="ISO 712"/>
     <eref type="inline" bibitemid="ISO712"/>
     <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom></locality></eref>
+    <eref type="inline" bibitemid="ISO712"><localityStack><locality type="table"><referenceFrom>1</referenceFrom></locality></localityStack></eref>
+    <eref type="inline" bibitemid="ISO712"><localityStack><locality type="table"><referenceFrom>1</referenceFrom></locality></localityStack><localityStack><locality type="clause"><referenceFrom>1</referenceFrom></locality></localityStack></eref>
     <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality></eref>
     <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1</referenceFrom></locality><locality type="table"><referenceFrom>1</referenceFrom></locality></eref>
     <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1</referenceFrom></locality></eref>
@@ -469,6 +492,8 @@ OUTPUT
            <a href="#ISO712">ISO 712</a>
            <a href="#ISO712">ISO 712</a>
            <a href="#ISO712">ISO 712, Table 1</a>
+           <a href='#ISO712'>ISO 712, Table 1</a>
+<a href='#ISO712'>ISO 712, Table 1; Clause 1</a>
            <a href="#ISO712">ISO 712, Table 1&#8211;1</a>
            <a href="#ISO712">ISO 712, Clause 1, Table 1</a>
            <a href="#ISO712">ISO 712, Clause 1</a>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.24
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath