stage display; metanorma/metanorma-iso#241

metanorma · Nov 26, 2018 · 21a30e6 · 21a30e6
1 parent a97dbb5
commit 21a30e6
Show file tree

Hide file tree

Showing 10 changed files with 1,338 additions and 1,339 deletions.
diff --git a/lib/asciidoctor/m3d/isostandard.rng b/lib/asciidoctor/m3d/isostandard.rng
@@ -744,6 +744,9 @@
     </define>
     <define name="preface">
       <element name="preface">
+        <optional>
+          <ref name="preface_abstract"/>
+        </optional>
         <ref name="foreword"/>
         <optional>
           <ref name="introduction"/>
@@ -811,6 +814,11 @@
       </optional>
     </element>
   </define>
+  <define name="preface_abstract">
+    <element name="abstract">
+      <ref name="Basic-Section"/>
+    </element>
+  </define>
   <define name="foreword">
     <element name="foreword">
       <ref name="Basic-Section"/>

diff --git a/lib/isodoc/m3d/html/html_m3d_titlepage.html b/lib/isodoc/m3d/html/html_m3d_titlepage.html
@@ -51,10 +51,10 @@
   </div>
 
   <div class="coverpage-stage-block" >
-    <span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{{ status }}</span>
+    <span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{% if unpublished %}{{ status }}{% endif %}</span>
 </div>
 
-{% if status != "Published" and status != "Withdrawn" %}
+{% if unpublished %}
   <div class="coverpage-warning">
     <span class="title">Warning for Drafts</span>
 

diff --git a/lib/isodoc/m3d/html/word_m3d_titlepage.html b/lib/isodoc/m3d/html/word_m3d_titlepage.html
@@ -22,37 +22,32 @@
 
 <p class="MsoNormal" align="center" style='text-align:center;border:none;
 mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-lang="EN-GB" style='font-size:40.0pt'>{{ stageabbr }} stage<o:p></o:p></span></p>
+lang="EN-GB" style='font-size:40.0pt'>{% if unpublished %}{{ status }}{% endif %}<o:p></o:p></span></p>
 
 </div>
 
 <p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
 
+{% if unpublished %}
 <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
 mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
 margin-left:4.25pt;margin-right:4.25pt'>
 
 <p class="MsoNormal" align="center" style='margin-bottom:6.0pt;text-align:center;
 border:none;mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:
 1.0pt 4.0pt 1.0pt 4.0pt'><b style='mso-bidi-font-weight:normal'><span
-lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>Warning for WDs
-and CDs<o:p></o:p></span></b></p>
+lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>Warning for Drafts<o:p></o:p></span></b></p>
 
 <p class="MsoNormal" style='margin-bottom:6.0pt;border:none;mso-border-alt:solid windowtext .5pt;
 padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang="EN-GB"
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt;mso-bidi-font-weight:bold'>This
-document is not an ISO International Standard. It is distributed for review and
-comment. It is subject to change without notice and may not be referred to as
-an International Standard.<o:p></o:p></span></p>
-
-<p class="MsoNormal" style='border:none;mso-border-alt:solid windowtext .5pt;
-padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span lang="EN-GB"
-style='font-size:10.0pt;mso-bidi-font-size:11.0pt;mso-bidi-font-weight:bold'>Recipients
-of this draft are invited to submit, with their comments, notification of any
-relevant patent rights of which they are aware and to provide supporting
-documentation.</span><span lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-size:
-11.0pt'><o:p></o:p></span></p>
+style='font-size:10.0pt;mso-bidi-font-size:11.0pt;mso-bidi-font-weight:bold'>This document is not an M3AAWG Standard. It is distributed for review and
+    comment, and is subject to change without notice and may not be referred to as
+    a Standard. Recipients of this draft are invited to submit, with their
+    comments, notification of any relevant patent rights of which they are aware
+    and to provide supporting documentation.
+<o:p></o:p></span></p>
 
 </div>
+{% endif %}
 
 
diff --git a/lib/isodoc/m3d/m3dhtmlconvert.rb b/lib/isodoc/m3d/m3dhtmlconvert.rb
@@ -84,11 +84,6 @@ def make_body(xml, docxml)
       def html_toc(docxml)
         docxml
       end
-
-      def info(isoxml, out)
-        @meta.url isoxml, out
-        super
-      end
     end
   end
 end

diff --git a/lib/isodoc/m3d/m3dpdfconvert.rb b/lib/isodoc/m3d/m3dpdfconvert.rb
@@ -84,11 +84,6 @@ def make_body(xml, docxml)
       def html_toc(docxml)
         docxml
       end
-
-      def info(isoxml, out)
-        @meta.url isoxml, out
-        super
-      end
     end
   end
 end

diff --git a/lib/isodoc/m3d/m3dwordconvert.rb b/lib/isodoc/m3d/m3dwordconvert.rb
@@ -60,11 +60,6 @@ def title(isoxml, _out)
         main = isoxml&.at(ns("//title[@language='en']"))&.text
         set_metadata(:doctitle, main)
       end
-
-      def info(isoxml, out)
-        @meta.url isoxml, out
-        super
-      end
     end
   end
 end
diff --git a/lib/isodoc/m3d/metadata.rb b/lib/isodoc/m3d/metadata.rb
@@ -40,6 +40,10 @@ def status_abbr(status)
         end
       end
 
+            def unpublished(status)
+        %w(published withdrawn).include? status.downcase
+      end
+
       def version(isoxml, _out)
         super
         revdate = get[:revdate]
@@ -66,11 +70,6 @@ def monthyr(isodate)
         return isodate unless m && m[:yr] && m[:mo]
         return "#{MONTHS[m[:mo].to_sym]} #{m[:yr]}"
       end
-
-      def url(isoxml, _out)
-        url = isoxml.at(ns("//bibdata/source"))
-        set(:url, url.text) if url
-      end
     end
   end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,11 +84,6 @@ def make_body(xml, docxml) @@
           def html_toc(docxml)
             docxml
           end
-          def info(isoxml, out)
-            @meta.url isoxml, out
-            super
-          end
         end
       end
     end
@@ Expand Down @@