metanorma-m3d 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa5fb7e55885855c5a70ea3bba3b6e623effee1b6e293e1692ca6c4438b4faa6
-  data.tar.gz: 17d89b5221d09b681323630ed9347cd47c37372c45d874f8c000bf25892d2bd3
+  metadata.gz: 30df42e555b35d457646503608db2e4f67ba0bc63d00199ea0a50af214876513
+  data.tar.gz: 44b1db3b3aa09934b058d991edbe413f274e5074a53daea822e023a4c9da2be8
 SHA512:
-  metadata.gz: 4ba75765b002aa5b9db0ce56ab8766f7c6689fc97b8c135916bd9c01388f87a6269b585d9fd7f17ad6e3fc83d8f09277aca51899044d464c7007820ff509d00e
-  data.tar.gz: a08aea9c50f24c6d8297a4454f5bee7d5da3791b8529a78f8007678e2dd0983e5d06cfd65b61359b42b0bc7952fabc148a4dd76a8dc65ad5c5d8c80494de2d29
+  metadata.gz: dbdfb18d70b86fed27b6336dfac5c809a483cee655b36e46d838ef54ea4513b87a828ba67f0eb51d37e6826b1e137df3527a6d2aa1ce81b5e4904ea5c087331f
+  data.tar.gz: 525d3f6f20176a010d21411329eb62a7c64114eaa0f2a718a23666ea0a6784ee72a982fdb426a709f9737c0ab7266b320d251c2318e91e8ddb29410eac15d7af

data/lib/asciidoctor/m3d/basicdoc.rng

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng"/>
-  <start>
-    <ref name="document"/>
-  </start>
+  <include href="biblio.rng">
+    <start>
+      <ref name="document"/>
+    </start>
+  </include>
   <define name="document">
     <element name="document">
       <optional>

data/lib/asciidoctor/m3d/biblio.rng

@@ -33,6 +33,9 @@
       <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
     </data>
   </define>
+  <start>
+    <ref name="relaton_collection"/>
+  </start>
   <define name="status">
     <element name="status">
       <ref name="stage"/>

data/lib/isodoc/m3d/base_convert.rb

@@ -8,12 +8,12 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
       end
       
-      def add_image(filenames)
-        filenames.each do |filename|
-          FileUtils.cp html_doc_path(filename), File.join(@localdir, filename)
-          @files_to_delete << File.join(@localdir, filename)
-        end
-      end
+      #def add_image(filenames)
+        #filenames.each do |filename|
+          #FileUtils.cp html_doc_path(filename), File.join(@localdir, filename)
+          #@files_to_delete << File.join(@localdir, filename)
+        #end
+      #end
 
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|

data/lib/isodoc/m3d/html/header.html

@@ -138,7 +138,7 @@ background:#E0E0E0'><o:p>&nbsp;</o:p></span></p>
 
 <div style='mso-element:header' id=fh1>
 
-<p class=MsoHeader><img width="323" height="39" src="logo.jpg"></img>
+  <p class=MsoHeader><img width="323" height="39" src="{{ logo_word }}"></img>
 <!--[if gte vml 1]><v:line id="_x0000_s2049" alt=""
  style='position:absolute;flip:y;z-index:251659264;mso-wrap-style:none;
  mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;

data/lib/isodoc/m3d/html/html_m3d_titlepage.html

@@ -16,7 +16,7 @@
   <div class="coverpage">
     <div class="wrapper-top">
 
-  <div class="coverpage-logo"> <img src="m3-logo.png" alt="m3 logo"/> </div>
+      <div class="coverpage-logo"> <img src="{{ logo_html }}" alt="m3 logo"/> </div>
   <div class="coverpage-doc-identity">
     <div class="doc-number">
       <span class="docnumber">{{ docnumber }}</span>

data/lib/isodoc/m3d/html/m3d.scss

@@ -511,10 +511,6 @@ table.dl
 	margin-right:0cm;
 	margin-bottom:11.0pt;
 	margin-left:20.15pt;}
-ol
-	{margin-bottom:0cm;}
-ul
-	{margin-bottom:0cm;}
 table.MsoISOTable
 	{mso-style-name:"Table ISO";
 	mso-tstyle-rowband-size:0;
@@ -535,8 +531,6 @@ table.MsoISOTable
 	mso-border-insidev:.75pt solid windowtext;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
-table.MsoISOTable tr
-    {page-break-inside:avoid;}
 table.MsoISOTable th
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
@@ -563,19 +557,10 @@ table.MsoTableGrid
 	mso-pagination:widow-orphan;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
-td { page-break-inside:avoid; }
-tr { page-break-after:avoid; }
-span.stem
-    {font-family:"Cambria Math",serif;
-    mso-ascii-font-family:"Cambria Math";
-    font-style:italic;}
 div.formula
     {tab-stops:right 487.45pt;}
 body 
     {tab-interval:36.0pt;}
-dt
-    {page-break-inside:avoid;
-    page-break-after:avoid}
 .coverpage_docnumber
     {text-align:right;
     font-size:14.0pt;

data/lib/isodoc/m3d/html/wordstyle.scss

@@ -1051,106 +1051,43 @@ div.colophon
 	margin-left:162.0pt;
 	text-indent:-18.0pt;}
 
-p.ListContLevel1, li.ListContLevel1, div.ListContLevel1
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:18.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel2, li.ListContLevel2, div.ListContLevel2
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:36.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel3, li.ListContLevel3, div.ListContLevel3
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:54.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel4, li.ListContLevel4, div.ListContLevel4
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:72.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel5, li.ListContLevel5, div.ListContLevel5
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:90.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel6, li.ListContLevel6, div.ListContLevel6
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:108.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel7, li.ListContLevel7, div.ListContLevel7
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:126.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel8, li.ListContLevel8, div.ListContLevel8
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:144.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel9, li.ListContLevel9, div.ListContLevel9
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:162.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-
+div.ListContLevel1
+        {mso-style-priority:34;
+        margin-left:18.0pt;
+        margin-right:0cm;}
+div.ListContLevel2
+        {mso-style-priority:34;
+        margin-top:0cm;
+        margin-left:36.0pt;
+        margin-right:0cm;}
+div.ListContLevel3
+        {mso-style-priority:34;
+        margin-left:54.0pt;
+        margin-right:0cm;}
+div.ListContLevel4
+        {mso-style-priority:34;
+        margin-left:72.0pt;
+        margin-right:0cm;}
+div.ListContLevel5
+        {mso-style-priority:34;
+        margin-left:90.0pt;
+        margin-right:0cm;}
+div.ListContLevel6
+        {mso-style-priority:34;
+        margin-left:108.0pt;
+        margin-right:0cm;}
+div.ListContLevel7
+        {mso-style-priority:34;
+        margin-left:126.0pt;
+        margin-right:0cm;}
+div.ListContLevel8
+        {mso-style-priority:34;
+        margin-left:144.0pt;
+        margin-right:0cm;}
+div.ListContLevel9
+        {mso-style-priority:34;
+        margin-left:162.0pt;
+        margin-right:0cm;}
 
 table.MsoNormalTable
 	{mso-style-name:"Table Normal";
@@ -1165,12 +1102,6 @@ table.MsoNormalTable
 	mso-pagination:widow-orphan;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
-br.section
-    {page-break-before:always;
-    mso-break-type:section-break;}
-br.pagebreak
-    {page-break-before:always;
-    mso-special-character:line-break;}
 ol
 	{margin-bottom:0cm;
 	margin-left:18pt;}

data/lib/isodoc/m3d/html_convert.rb

@@ -11,10 +11,10 @@ module IsoDoc
         super
       end
 
-      def convert1(docxml, filename, dir)
-        add_image(%w(logo.jpg m3-logo.png))
-        super
-      end
+      #def convert1(docxml, filename, dir)
+      #  add_image(%w(logo.jpg m3-logo.png))
+      #  super
+      #end
 
       def default_fonts(options)
         {

data/lib/isodoc/m3d/metadata.rb

@@ -7,6 +7,11 @@ module IsoDoc
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, labels)
         super
+        here = File.dirname(__FILE__)
+        set(:logo_html,
+            File.expand_path(File.join(here, "html", "m3-logo.png")))
+        set(:logo_word,
+            File.expand_path(File.join(here, "html", "logo.jpg")))
       end
 
       def title(isoxml, _out)

data/lib/isodoc/m3d/pdf_convert.rb

@@ -11,10 +11,10 @@ module IsoDoc
         super
       end
 
-      def convert1(docxml, filename, dir)
-        add_image(%w(logo.jpg m3-logo.png))
-        super
-      end
+      #def convert1(docxml, filename, dir)
+        #add_image(%w(logo.jpg m3-logo.png))
+        #super
+      #end
 
       def default_fonts(options)
         {

data/lib/isodoc/m3d/word_convert.rb

@@ -12,10 +12,10 @@ module IsoDoc
         super
       end
 
-      def convert1(docxml, filename, dir)
-        FileUtils.cp html_doc_path("logo.jpg"), File.join(@localdir, "logo.jpg")
-        super
-      end
+      #def convert1(docxml, filename, dir)
+        #FileUtils.cp html_doc_path("logo.jpg"), File.join(@localdir, "logo.jpg")
+        #super
+      #end
 
       def default_fonts(options)
         {

data/lib/metanorma/m3d/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3d
-    VERSION = "1.3.6"
+    VERSION = "1.3.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3d
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath