metanorma-iso 2.2.3 → 2.2.4

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -10,7 +10,7 @@ module IsoDoc
         admonition: "Admonition",
         admonitiontitle: "AdmonitionTitle",
         sourcetitle: "SourceTitle",
-        tabletitle: "TableTitle",
+        TableTitle: "Tabletitle",
         titlepagesbhead: "TablePageSubhead",
         NormRef: "RefNorm",
         Biblio: "BiblioEntry",
@@ -240,12 +240,13 @@ module IsoDoc
         end
       end
 
-      def make_FigureWordToC(docxml)
-        super.sub(/FigureTitle,figuretitle/, "Figure title,Annex Figure Title")
+      def table_toc_class
+        ["Table title", "Tabletitle", "Annex Table Title", "AnnexTableTitle"] +
+          super
       end
 
-      def make_TableWordToC(docxml)
-        super.sub(/TableTitle,tabletitle/, "Table title,Annex Table Title")
+      def figure_toc_class
+        ["Figure Title", "Annex Figure Title", "AnnexFigureTitle"] + super
       end
     end
   end

data/lib/isodoc/iso/word_dis_convert.rb

@@ -44,7 +44,7 @@ module IsoDoc
       end
 
       def table_title_attrs(_node)
-        { class: "Tabletitle", style: "text-align:center;" }
+        { class: "TableTitle", style: "text-align:center;" }
       end
 
       def span_parse(node, out)

data/lib/metanorma/iso/isodoc.rng

@@ -1152,7 +1152,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <ref name="BibliographicItem"/>
+      <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
   <define name="image" combine="choice">

data/lib/metanorma/iso/validate.rb

@@ -36,10 +36,10 @@ module Metanorma
             /\b(see| refer to)\s*\Z/mi.match(preceding)
 
           (target = root.at("//*[@id = '#{t['target']}']")) || next
-          if target.at("./ancestor-or-self::*[@obligation = 'normative']")
+          target.at("./ancestor-or-self::*[@obligation = 'normative']") &&
+            !target.at("./ancestor::sections") and
             @log.add("Style", t,
                      "'see #{t['target']}' is pointing to a normative section")
-          end
         end
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.2.3".freeze
+    VERSION = "2.2.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc