version bump

metanorma · May 22, 2023 · 5353379 · 5353379
1 parent 1507bf2
commit 5353379
Show file tree

Hide file tree

Showing 13 changed files with 363 additions and 497 deletions.
diff --git a/lib/metanorma/ieee/cleanup_ref.rb b/lib/metanorma/ieee/cleanup_ref.rb
@@ -118,7 +118,7 @@ def biblio_renumber1(bib, idx)
         end
       end
 
-      def select_docid(ref)
+      def select_docid(ref, type = nil)
         ret = super
         if %w(standard techreport).include?(ref["type"]) then ret
         else

diff --git a/lib/metanorma/ieee/isodoc.rng b/lib/metanorma/ieee/isodoc.rng
@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.1 -->
+<!-- VERSION v1.2.2 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -211,6 +211,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <ref name="CitationType"/>
       <oneOrMore>
         <ref name="PureTextElement"/>
@@ -2136,6 +2139,7 @@
     <choice>
       <value>identical</value>
       <value>modified</value>
+      <value>adapted</value>
       <value>restyled</value>
       <value>context-added</value>
       <value>generalisation</value>

diff --git a/lib/metanorma/ieee/version.rb b/lib/metanorma/ieee/version.rb
@@ -1,5 +1,5 @@
 module Metanorma
   module IEEE
-    VERSION = "1.0.10".freeze
+    VERSION = "1.0.11".freeze
   end
 end
diff --git a/metanorma-ieee.gemspec b/metanorma-ieee.gemspec
@@ -27,6 +27,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "metanorma-standoc", "~> 2.4.2"
   spec.add_dependency "mnconvert", "~> 1.20"
+  #spec.add_dependency "pubid-ieee", "~> 0.1.1"
+  #spec.add_dependency "pubid-iso", "~> 0.5.3"
+  #spec.add_dependency "relaton-iso", "~> 1.15.4"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

diff --git a/spec/isodoc/inline_spec.rb b/spec/isodoc/inline_spec.rb
@@ -94,75 +94,21 @@
               <clause type="toc" id="_" displayorder="1"> <title depth="1">Contents</title> </clause>
             <foreword displayorder='2'>
               <p>
-                <eref bibitemid='IEV' citeas='IEV' type='inline'>
-                  <locality type='clause'>
-                    <referenceFrom>1-2-3</referenceFrom>
-                  </locality>
-                  IEV, 1-2-3
-                </eref>
-                <eref bibitemid='ISO712' citeas='ISO 712' type='inline'>ISO&#xa0;712</eref>
-                <eref bibitemid='ISO712' type='inline'>ISO&#xa0;712</eref>
-                <eref bibitemid='ISO712' type='inline'>
-                  <locality type='table'>
-                    <referenceFrom>1</referenceFrom>
-                  </locality>
-                  ISO&#xa0;712, Table 1
-                </eref>
-                <eref bibitemid='ISO712' type='inline'>
-                  <locality type='table'>
-                    <referenceFrom>1</referenceFrom>
-                    <referenceTo>1</referenceTo>
-                  </locality>
-                  ISO&#xa0;712, Table 1&#x2013;1
-                </eref>
-                <eref bibitemid='ISO712' type='inline'>
-                  <locality type='clause'>
-                    <referenceFrom>1</referenceFrom>
-                  </locality>
-                  <locality type='table'>
-                    <referenceFrom>1</referenceFrom>
-                  </locality>
-                  ISO&#xa0;712, Clause 1, Table 1
-                </eref>
-                <eref bibitemid='ISO712' type='inline'>
-                  <locality type='clause'>
-                    <referenceFrom>1</referenceFrom>
-                  </locality>
-                  <locality type='list'>
-                    <referenceFrom>a</referenceFrom>
-                  </locality>
-                  ISO&#xa0;712, Clause 1, List a)
-                </eref>
-                <eref bibitemid='ISO712' type='inline'>
-                  <locality type='clause'>
-                    <referenceFrom>1</referenceFrom>
-                  </locality>
-                  ISO&#xa0;712, Clause 1
-                </eref>
-                <eref bibitemid='ISO712' type='inline'>
-                  <locality type='clause'>
-                    <referenceFrom>1.5</referenceFrom>
-                  </locality>
-                  ISO&#xa0;712, 1.5
-                </eref>
-                <eref bibitemid='ISO712' type='inline'>
-                  <locality type='table'>
-                    <referenceFrom>1</referenceFrom>
-                  </locality>
-                  A
-                </eref>
-                <eref bibitemid='ISO712' type='inline'>
-                  <locality type='whole'/>
-                  ISO&#xa0;712, Whole of text
-                </eref>
-                <eref bibitemid='ISO712' type='inline'>
-                  <locality type='locality:prelude'>
-                    <referenceFrom>7</referenceFrom>
-                  </locality>
-                  ISO&#xa0;712, Prelude 7
-                </eref>
-                <eref bibitemid='ISO712' citeas='ISO 712' type='inline'>A</eref>
-                <eref bibitemid='ISO712' citeas='ISO/IEC DIR 1' type='inline'>ISO/IEC&#xa0;DIR&#xa0;1</eref>
+               <eref bibitemid="IEV" citeas="IEV" type="inline"><locality type="clause"><referenceFrom>1-2-3</referenceFrom></locality>IEV, 1-2-3</eref>
+               <xref type="inline" target="ISO712">ISO 712</xref>
+               <xref type="inline" target="ISO712">ISO 712</xref>
+               <xref type="inline" target="ISO712">ISO 712, Table 1</xref>
+               <xref type="inline" target="ISO712">ISO 712, Table 1–1</xref>
+               <xref type="inline" target="ISO712">ISO 712, Clause 1, Table 1</xref>
+               <xref type="inline" target="ISO712">ISO 712, Clause 1, List a)</xref>
+               <xref type="inline" target="ISO712">ISO 712, Clause 1</xref>
+               <xref type="inline" target="ISO712">ISO 712, 1.5</xref>
+               <xref type="inline" target="ISO712">
+                 A</xref>
+               <xref type="inline" target="ISO712">ISO 712, Whole of text</xref>
+               <xref type="inline" target="ISO712">ISO 712, Prelude 7</xref>
+               <xref type="inline" target="ISO712">A</xref>
+               <xref type="inline" target="ISO712">ISO/IEC DIR 1</xref>
               </p>
             </foreword>
           </preface>

diff --git a/spec/isodoc/refs_spec.rb b/spec/isodoc/refs_spec.rb
@@ -215,12 +215,12 @@
            <clause id="A" inline-header="false" obligation="normative" displayorder="3">
              <title depth="1">2.<tab/>Clause</title>
              <p id="_">
-               <eref type="inline" bibitemid="ref1" citeas="ISO 639:1967">ISO 639:1967</eref>
-               <eref type="inline" bibitemid="ref2" citeas="Aluffi">Aluffi</eref>
-               <eref type="inline" bibitemid="ref3" citeas="REF4">REF4</eref>
-               <eref type="inline" bibitemid="ref4" citeas="ISO 639:1967">ISO 639:1967 [B3]</eref>
-               <eref type="inline" bibitemid="ref5" citeas="[B2]">Aluffi, Anderson, Hering, Mustaţă and Payne [B2]</eref>
-               <eref type="inline" bibitemid="ref6" citeas="[B1]">REF4 [B1]</eref>
+             <xref type="inline" target="ref1">ISO 639:1967</xref>
+              <xref type="inline" target="ref2">Aluffi</xref>
+              <xref type="inline" target="ref3">REF4</xref>
+              <xref type="inline" target="ref4">ISO 639:1967 [B3]</xref>
+              <xref type="inline" target="ref5">Aluffi, Anderson, Hering, Mustaţă and Payne [B2]</xref>
+              <xref type="inline" target="ref6">REF4 [B1]</xref>
              </p>
            </clause>
          </sections>