metanorma-ieee 1.1.2 → 1.1.3

data/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.4 -->
+<!-- VERSION v1.2.5 -->
 <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">
@@ -485,6 +485,8 @@
           <choice>
             <text/>
             <ref name="callout"/>
+            <ref name="xref"/>
+            <ref name="eref"/>
           </choice>
         </oneOrMore>
         <zeroOrMore>
@@ -865,6 +867,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -880,6 +883,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -894,6 +898,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -908,6 +913,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -918,6 +924,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -928,6 +935,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -938,6 +946,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -1047,6 +1056,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1060,6 +1071,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1126,6 +1139,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>
@@ -1136,6 +1151,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>

data/lib/metanorma/ieee/validate.rb

@@ -54,7 +54,7 @@ module Metanorma
       def locality_range_validate(root)
         root.xpath("//eref | xref").each do |e|
           e.at(".//localityStack[@connective = 'from'] | .//referenceTo") and
-            @log.add("Style", e, "Cross-reference contains range, "\
+            @log.add("Style", e, "Cross-reference contains range, " \
                                  "should be separate cross-references")
         end
       end
@@ -64,7 +64,7 @@ module Metanorma
         root.xpath("//eref[descendant::locality]").each do |t|
           if !/[:-](\d+{4})$/.match?(t["citeas"])
             @log.add("Style", t,
-                     "Undated reference #{t['citeas']} should not contain "\
+                     "Undated reference #{t['citeas']} should not contain " \
                      "specific elements")
           end
         end
@@ -203,7 +203,7 @@ module Metanorma
           desc = a.at("./description")
           if desc && !desc.text.strip.empty?
             amend_validate1(a, desc.text.strip,
-                            a.at("./newcontent//figure | "\
+                            a.at("./newcontent//figure | " \
                                  "./newcontent//formula"))
           else @log.add("Style", a,
                         "Editorial instruction is missing from change")
@@ -226,9 +226,9 @@ module Metanorma
 
       AMD_VALID_MOD = [
         "'Modify' change description should start with _Change_ or _Replace_",
-        "'Modify' change description for change involving figure or equation "\
+        "'Modify' change description for change involving figure or equation " \
         "should start with _Replace_",
-        "'Modify' change description for change not involving figure or "\
+        "'Modify' change description for change not involving figure or " \
         "equation should start with _Change_",
       ].freeze
 

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IEEE
-    VERSION = "1.1.2".freeze
+    VERSION = "1.1.3".freeze
   end
 end

data/lib/metanorma-ieee.rb

@@ -2,6 +2,7 @@ require "metanorma/ieee"
 require "asciidoctor"
 require "isodoc/ieee"
 require "html2doc/ieee"
+require "html2doc/ieee_wp"
 require "metanorma"
 
 if defined? Metanorma::Registry

data/lib/relaton/render/config.yml

@@ -9,17 +9,17 @@ extenttemplate:
   misc: "{{ volume }}, {{issue}}, {{ page }}, {{ duration }}"
 template:
   # skip authoritative_identifier, it is inserted in front of formattedref within metanorma
-  standard: "{% if home_standard %}{{ title }}.{% else %}{{ creatornames }}, “{{ title }},” {{ extent }},  {{ labels['version'] }}_{{ edition_raw }}, {{date}}, {{labels['updated'] | capitalize }}_{{date_updated}}, {{status }}, {{ authorizer }}, {{ uri }} .{% endif %}"
-  article: "{{creatornames}}, “{{title}},” <em>{{ series }}</em>, {{ extent }}, {{ date }}, {{ labels['viewed'] }}_{{date_accessed}}, {{ uri }} ."
-  book: "{{creatornames}}, <em>{{title}}</em>, {{ edition }}, {{place}}: {{publisher}}, {{date}}, {{ labels['viewed'] }}_{{date_accessed}}, {{ uri }} ."
+  standard: "{% if home_standard %}{{ title }}.{% else %}{{ creatornames }}, “{{ title }},” {{ extent }},  {{ labels['version'] }}_{{ edition_raw }}, {{date}}, {{labels['updated'] | capitalize }}_{{date_updated}}, {{status }}, {{ authorizer }}, {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: ', ' }}{% endif %}{% endif %} .{% endif %}"
+  article: "{{creatornames}}, “{{title}},” <em>{{ series }}</em>, {{ extent }}, {{ date }}, {{ labels['viewed'] }}_{{date_accessed}}, {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: ', ' }}{% endif %}{% endif %} ."
+  book: "{{creatornames}}, <em>{{title}}</em>, {{ edition }}, {{place}}: {{publisher}}, {{date}}, {{ labels['viewed'] }}_{{date_accessed}}, {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: ', ' }}{% endif %}{% endif %} ."
   techreport: book
   booklet: book
   manual: book
   proceedings: book
-  inproceedings: "{{ creatornames }}, “{{ title }},” <em>{{host_title}}</em>, {{place}}, {{extent}}, {{date}}, {{ labels['viewed'] }}_{{date_accessed}}, {{ uri }} ."
-  inbook: "{{ creatornames }}, “{{ title }},” {{ labels['in'] }} {{ host_creatornames}} ({{ host_role}}) : <em>{{host_title}}</em>, {{place}}: {{publisher}}, {{date}}, {{extent}}, {{ labels['viewed'] }}_{{date_accessed}}, {{ uri }} ."
+  inproceedings: "{{ creatornames }}, “{{ title }},” <em>{{host_title}}</em>, {{place}}, {{extent}}, {{date}}, {{ labels['viewed'] }}_{{date_accessed}}, {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: ', ' }}{% endif %}{% endif %} ."
+  inbook: "{{ creatornames }}, “{{ title }},” {{ labels['in'] }} {{ host_creatornames}} ({{ host_role}}) : <em>{{host_title}}</em>, {{place}}: {{publisher}}, {{date}}, {{extent}}, {{ labels['viewed'] }}_{{date_accessed}}, {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: ', ' }}{% endif %}{% endif %} ."
   incollection: inbook
-  thesis: "{{ creatornames }} , “{{ title }}.” {{ medium | capitalize }}, {{ publisher }}, {{ date }}, {{ labels['viewed'] }}_{{date_accessed}}, {{ uri }} ."
+  thesis: "{{ creatornames }} , “{{ title }}.” {{ medium | capitalize }}, {{ publisher }}, {{ date }}, {{ labels['viewed'] }}_{{date_accessed}}, {% if uri %}{{ uri }}{% else %}{% if doi %}DOI: {{ doi | join: ', ' }}{% endif %}{% endif %} ."
   unpublished: thesis
   misc: thesis
   website: thesis

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -224,21 +224,34 @@ files:
 - lib/html2doc/ieee.rb
 - lib/html2doc/ieee/lists.rb
 - lib/html2doc/ieee/notes.rb
+- lib/html2doc/ieee_wp.rb
+- lib/html2doc/ieee_wp/lists.rb
 - lib/isodoc/ieee.rb
 - lib/isodoc/ieee/base_convert.rb
 - lib/isodoc/ieee/html/header.html
 - lib/isodoc/ieee/html/header_amd.html
+- lib/isodoc/ieee/html/header_wp.html
 - lib/isodoc/ieee/html/html_ieee_intro.html
 - lib/isodoc/ieee/html/html_ieee_titlepage.html
 - lib/isodoc/ieee/html/htmlstyle.css
 - lib/isodoc/ieee/html/htmlstyle.scss
 - lib/isodoc/ieee/html/ieee.css
 - lib/isodoc/ieee/html/ieee.scss
+- lib/isodoc/ieee/html/ieee_wp.css
+- lib/isodoc/ieee/html/ieee_wp.scss
 - lib/isodoc/ieee/html/scripts.html
+- lib/isodoc/ieee/html/word_ieee_colophon_wp.html
 - lib/isodoc/ieee/html/word_ieee_intro.html
+- lib/isodoc/ieee/html/word_ieee_intro_wp.html
 - lib/isodoc/ieee/html/word_ieee_titlepage.html
+- lib/isodoc/ieee/html/word_ieee_titlepage_wp.html
 - lib/isodoc/ieee/html/wordstyle.css
 - lib/isodoc/ieee/html/wordstyle.scss
+- lib/isodoc/ieee/html/wordstyle_wp.css
+- lib/isodoc/ieee/html/wordstyle_wp.scss
+- lib/isodoc/ieee/html/wp_image001.emz
+- lib/isodoc/ieee/html/wp_image003.emz
+- lib/isodoc/ieee/html/wp_image008.emz
 - lib/isodoc/ieee/html_convert.rb
 - lib/isodoc/ieee/i18n-en.yaml
 - lib/isodoc/ieee/i18n.rb
@@ -257,6 +270,8 @@ files:
 - lib/isodoc/ieee/word_cleanup.rb
 - lib/isodoc/ieee/word_cleanup_blocks.rb
 - lib/isodoc/ieee/word_convert.rb
+- lib/isodoc/ieee/word_wp_cleanup.rb
+- lib/isodoc/ieee/word_wp_convert.rb
 - lib/isodoc/ieee/xref.rb
 - lib/metanorma-ieee.rb
 - lib/metanorma/ieee.rb
@@ -264,6 +279,7 @@ files:
 - lib/metanorma/ieee/biblio-standoc.rng
 - lib/metanorma/ieee/biblio.rng
 - lib/metanorma/ieee/boilerplate.adoc
+- lib/metanorma/ieee/boilerplate_wp.adoc
 - lib/metanorma/ieee/cleanup.rb
 - lib/metanorma/ieee/cleanup_ref.rb
 - lib/metanorma/ieee/converter.rb