metanorma-m3d 1.3.14 → 1.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3fa4961e8470cb1a8f288a2fbd9ca59016dfc3357c402ef5bb98bf14c1de8ca
-  data.tar.gz: c141569d2cf4547e85b8d5a6703c40509f1aeb25fb076c25d943f25d2ce00e6d
+  metadata.gz: b2fc164b54927b1d911b3f0752064b8dd6120254e391658506aaafa61d0c558b
+  data.tar.gz: d39d1d5e728602eeaa38432774afafad2ad8b56c98f698389246f6834fe417b6
 SHA512:
-  metadata.gz: 714dacdb7e801613c6ab200ed23cc972844733fd71a28e0bff4a16f11e2a6eff826fedbd0033fa31a22883be25b35e22945ff1787d98b5c70ee72fba4aeabc97
-  data.tar.gz: dba2916ab0e6e19e4ecdc52948bf133def1e69cc05984e69cce10444c33bce08762e1e1503e0e33ea35eac434ab4e381d031e1a4ffa1b6a4b66aff3483ac7892
+  metadata.gz: f59bf7e09b01f5da05a504fd694bdceca41f8198486a8236b04f5ec115c93ea3e93b00ebff746ed014b742f786871fb6bfa0a7f663912f370ca17edc107b4b60
+  data.tar.gz: 8d3c1cd71c1479c1b604a8590288dce0935b53a0fd20cf948de469002b247359f0b07c87774a1e566d2a4311bb5f1b1890f771eac60583ffda80e6208af2569c

data/lib/asciidoctor/m3d/converter.rb

@@ -90,7 +90,7 @@ module Asciidoctor
       def doctype(node)
         d = node.attr("doctype")
         unless %w{policy best-practices supporting-document report}.include? d
-          warn "#{d} is not a legal document type: reverting to 'report'"
+          @log.add("Document Attributes", nil, "#{d} is not a legal document type: reverting to 'report'")
           d = "report"
         end
         d
@@ -108,6 +108,7 @@ module Asciidoctor
           pdf_converter(node).convert filename unless node.attr("nodoc")
           word_converter(node).convert filename unless node.attr("nodoc")
         end
+        @log.write(@filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end

data/lib/asciidoctor/m3d/isodoc.rng

@@ -645,6 +645,11 @@
     <optional>
       <attribute name="script"/>
     </optional>
+    <optional>
+      <attribute name="inline-header">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="obligation">
         <choice>

data/lib/asciidoctor/m3d/validate.rb

@@ -14,7 +14,7 @@ module Asciidoctor
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(proposal working-draft committee-draft draft-standard final-draft
         published withdrawn).include? stage or
-          warn "Document Attributes: #{stage} is not a recognised status"
+        @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
       end
     end
   end

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

@@ -2,7 +2,7 @@
     0 CSS RESET
 */
 
-/* http://meyerweb.com/eric/tools/css/reset/ 
+/* http://meyerweb.com/eric/tools/css/reset/
    v2.0 | 20110126
    License: none (public domain)
 */
@@ -15,188 +15,56 @@ Gray: #69C5DC
 Light Gray: #F5F6F6
 */
 
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-        margin: 0;
-        padding: 0;
-}
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-        border: 0;
-        font-size: 100%;
-}
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, tt, var,
-b, u, i, center,
-dl, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-        vertical-align: baseline;
-}
-
+@import 'base_style/all';
 
-html, body, div, span, applet, object, iframe,
-p, blockquote, 
-a, abbr, acronym, address, big, cite, 
-del, dfn, em, img, ins, q, s, 
-small, strike, strong, sub, sup, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  font-family: $bodyfont;
+body {
+    @include bodyStyle1(15px, 1.4em, #1d1d1d, #ffffff, 300);
 }
 
-code, pre, tt, kbd, samp {
-  font-family: $monospacefont;
-  font-variant-ligatures: none;
+#report {
+    border-bottom: none;
 }
 
-code *, pre *, tt *, kbd *, samp * {
-  font-family: $monospacefont !important;
-  font-variant-ligatures: none;
+main {
+    margin: 0 3em 0 6em;
 }
 
-h1, h2, h3, h4, h5, h6, .h2Annex {
-  font-family: $headerfont;
-}
+#toc {
+    @include toc(#69C5DC, #69C5DC, #69C5DC);
+    @include sidebarToc();
 
-dl {
-  display: grid;
-  grid-template-columns: max-content auto;
-}
+    .toc-active a {
+        color: white;
+    }
 
-dt {
-  grid-column-start: 1;
+    ul {
+        a:hover {
+            color: white;
+        }
+    }
 }
 
-dd {
-  grid-column-start: 2;
+nav {
+    @include sidebarNav(#f7f7f7, 323px, 45px);
 }
 
-dd p, dt p {
-  margin-top: 0px;
+#toggle {
+    @include sidebarNavToggle(white, #69C5DC)
 }
 
+#myBtn {
+    @include toTopBtn(white, #69C5DC);
 
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section {
-	display: block;
-}
-body {
-	line-height: 1;
-}
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
+    a.anchorjs-link {
+        @include anchorLink(#485094)
+    }
 }
 
- 
-/*
-    1. HTML & Body
-*/
-
-  body { 
-    margin: 0;
-    margin-left: auto;
-    margin-right: auto;
-    max-width: 100%;
-    color: #1d1d1d;
-    font-weight: 300;
-    font-size: 15px;
-    line-height: 1.4em;
-    background-color: #ffffff;
-  }
-
-  main {margin: 0 3em 0 6em;}
-
-  #toc{
-    font-family: $bodyfont;
-    font-weight: 400;
-  }
-
 /*
     2. Responsive navigation layout
 */
 
-
 @media screen and (min-width: 768px) {
-    nav {
-        position: fixed;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        width: 323px;
-        font-size: 0.9em;
-        overflow: auto;
-        padding: 0 0 0 45px;
-        margin-right: 30px;
-        background-color:#f7f7f7; 
-    }
-
-    #toggle {
-        position: fixed;
-        height: 100%;
-        width: 30px;
-        background-color:#69C5DC;
-        color: white!important;
-        cursor: pointer;
-        z-index: 100;
-    }
-
-    #toggle span {
-        text-align: center;
-        width: 100%;
-        position: absolute;             
-        top: 50%;
-        transform: translate(0, -50%);
-        
-    }
-
     .container {
         padding-left: 360px;
     }
@@ -210,72 +78,19 @@ table {
     }
 
     ul#toc-list {
-        padding:0;
-        margin:0;
-    }
-}
-
-@media screen and (max-width: 768px) {
-    #toc {
-        padding: 0 1.5em 0 1.5em;
-        overflow: visible;
+        padding: 0;
+        margin: 0;
     }
 
     nav {
-         padding-left: 3em;
+        padding-left: 45px;
     }
 }
-  
-  div.figure > img {
-    margin-left: auto;
-margin-right: auto;
-display: block;
-max-width: 100%;
-height: auto;
-  }
-
-
-
-#toc ul {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-}
-
-#toc li a {
-    padding: 5px 10px;
-}
-
-#toc a {
-    color: #69C5DC;
-    text-decoration: none;
-    display: block;
-}
-
-#toc a:hover {
-    box-shadow: none;
-    color: white;
-}
-
-#toc .h2 {
-    padding-left: 30px;
-}
 
-#toc .h3 {
-    padding-left: 50px;
-}
-
-#toc .toc-active a {
-    color: white;
-}
-
-#toc .toc-active, #toc li:hover {
-    background: #69C5DC;
-    box-shadow: inset -5px 0px 10px -5px #69C5DC!important;
-}
-
-#toc li:hover a {
-    color: white;
+div.figure {
+    @include figureBlock();
+    padding: 1.2em 1.2em 1.2em 2.2em;
+    margin: 2em 0 2em -1em;
 }
 
 /*
@@ -283,66 +98,25 @@ height: auto;
 */
 
 .document-type-band {
-    left:0;
-    top:180px;
-    height: 100%;
-    position: fixed;
-    display: block;
-    z-index: 99;
-    /*box-shadow: -5px 0px 10px #1d1d1d*/
-
+    @include docBand(2, null, 180px);
 }
 
 .document-stage-band {
-    left:0;
-    top:0;
-    height: 100%;
-    position: fixed;
-    display: block;
-    z-index: 98;
-    box-shadow: -5px 0px 10px #1d1d1d
-}
-
-.document-type {
-    position: relative;
-    width: 25px;
-}
-
-.document-stage {
-    position: relative;
-    width: 25px;
+    @include docBand(1, 150);
 }
 
-p.document-type, p.document-stage {
-    color: white;
-    text-transform: uppercase;
-    font-size: 0.9em;
-    font-weight: 400;
-    letter-spacing: 0.05em;
-    margin:0;
-    margin-left: 6px;
-    writing-mode:tb-rl;
-	-webkit-transform:rotate(180deg);
-	-moz-transform:rotate(180deg);
-	-o-transform: rotate(180deg);
-	white-space:nowrap;
-	display:block;
-    bottom:0;
-}
-
-p.document-type {
-    font-weight: 400;
-    height: 120;
+p.document-type,
+p.document-stage {
+    @include docBandTitle(120);
 }
 
 #governance-band p.document-type {
-    font-weight: 400;
-    height: 230px!important;
+    height: 230px !important;
 }
 
 p.document-stage {
     font-weight: 300;
-    height:160px;
+    height: 160px;
 }
 
 #standard-band {
@@ -370,12 +144,8 @@ p.document-stage {
 }
 
 .coverpage-maturity {
-    font-family: $bodyfont;
-    font-weight: 400;
-    font-size: 1em;
-    margin: 0 0 2em 0;
-    text-transform: uppercase;
-    }
+    @include coverpageStageBlock();
+}
 
 #proposal {
     border-bottom: solid 3px #00BFFF;
@@ -440,7 +210,7 @@ p.document-stage {
 /*
     3.1 Titles
 */
-  
+
   h1,h2,h3,h4,h5,h6 {
     font-family: $headerfont;
     color: black;
@@ -450,7 +220,7 @@ p.document-stage {
   }
 
   h1 {
-    font-size: 1.4em; 
+    font-size: 1.4em;
     text-transform: uppercase;
     margin-top: 2em;
   }
@@ -458,11 +228,11 @@ p.document-stage {
   h1#content {
       margin-top: 2em;
   }
-  
+
   h2 {
-    font-size: 1.3em; 
+    font-size: 1.3em;
   }
-  
+
   h3 {
     font-size: 1.1em;
   }
@@ -472,8 +242,8 @@ p.document-stage {
     float: left;
     padding-right: 4px;
     margin-left: -20px;
-    font-family: "Font Awesome 5 Free"; 
-    font-weight: 900; 
+    font-family: "Font Awesome 5 Free";
+    font-weight: 900;
     font-size: 0.8em;
     color: #cfcfcf;
     content: "\f0c1";
@@ -497,7 +267,7 @@ p.document-stage {
     line-height: 1.7em;
     margin: 0;
   }
-  
+
   p.AltTerms {
     font-style: italic;
     margin: 0;
@@ -512,45 +282,16 @@ span.obligation {
 /*
     3.2 Links
 */
-  
-    a, a:visited{
-        text-decoration: none;
-        color: #69C5DC;
-    }
-      
-    a:hover {
-        color: white;
-        background: #69C5DC;
-        box-shadow: 3px 0 0 #69C5DC, -3px 0 0 #69C5DC;
-        /* padding: 2px 0 2px 0; */
-    }
-
-    ::selection {
-        background: #69C5DC; /* WebKit/Blink Browsers */
-        color: white;
-      }
-      ::-moz-selection {
-        background: #69C5DC; /* Gecko Browsers */
-        color: white;
-      }
-
-      .contact-info a:hover {
-          color: #69C5DC;
-          text-decoration: underline;
-          background: none;
-          box-shadow: 0 0 0 0;
-      }
-
+@include elementStyles(#69C5DC, #69C5DC, white);
 
-      
 /*
     3.3 Lists
 */
-        
+
     ul, ol {
     margin-left: 0.5em;
   }
-      
+
 #toc ul {
   margin-bottom: 0.25em; }
 
@@ -562,12 +303,9 @@ span.obligation {
     3.4 Rules
 */
 
-    .rule {
-        width: 100%;
-        height: 1px;
-        background-color: #F22E15;
-        margin: 2em 0;
-      }
+.rule {
+    @include rule(1px, #F22E15)
+}
 
 /*
     3.5 Bibliograhy
@@ -582,27 +320,26 @@ p.Biblio, p.NormRef {
     3.6 Source Code + figures
 */
 
-pre {
-    font-family: $monospacefont;
-    font-variant-ligatures: none;
-  }
-
-.figure, pre, .pseudocode {
-    font-size: 0.8em;
-    line-height: 1.6em;
-    padding: 1.5em;
-    background-color: #F5F6F6;
-    border-left: solid 5px #69C5DC;
-    color: rgb(91, 94, 95);
+.figure,
+pre,
+.pseudocode {
+    @include pseudocodeBlock(#F5F6F6);
     padding: 1.2em 1.2em 1.2em 2.2em;
-    margin: 2em 0 2em -1em;;
-    overflow: auto;
+    margin: 2em 0 2em -1em;
+    color: rgb(91, 94, 95);
+    border-left: solid 5px #69C5DC;
 }
 
-.FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
-    font-weight: 700;
-    font-size: 1em;
-    text-align: center;
+pre {
+    @include monospaceBlockStyle()
+}
+
+@include admonitionBlock();
+@include recommendationBlock();
+
+.FigureTitle,
+.SourceTitle {
+    @include blockTitle()
 }
 
 /*
@@ -631,56 +368,35 @@ pre {
 */
 
 .example {
-    background-color: #F5F6F6;
+    @include exampleBlock(#e1eef1, #424242, 1.2em);
     border-left: solid 5px #69C5DC;
     color: rgb(91, 94, 95);
-    padding: 1.2em;
     margin: 2em 0 2em -1em;
-    padding-left: 2em;
-}
-
-.example p {
-    margin: 0;
-}
-
-.example .example-title {
-    font-weight: 700;
-    text-transform: uppercase;
-    margin-top:0;
-    margin-left:-1.5em;
-}
 
+    .example-title {
+        margin-top: 0;
+    }
+    p {
+        margin: 0;
+    }
 
-.example pre, .example .pseudocode {
-      background: none;
+    pre,
+    .pseudocode {
+        background: none;
+    }
 }
 
 /*
     3.9 Tables
 */
 
-table, th, td {
-  border: none!important;
-  font-size: 0.95em;
-}
-
 table {
-  border-collapse: collapse;
-  width: 100%;
-  font-weight: 300;
-  margin: 1em 0 2em 0;
-  margin-left: auto;
-  margin-right: auto;
-  padding-right: 2em;
-  border: solid 1px #F5F6F6!important;
-}
-
-td, th {
-  padding: 1em;
-}
-
-td.header {
-  font-weight: 400;
+    @include table(solid 1px #F5F6F6 !important);
+    th,
+    td {
+        border: none !important;
+        font-size: 0.95em;
+    }
 }
 
 tr:nth-child(even) {
@@ -718,17 +434,12 @@ a.footnote-number {
 */
 
 .Quote {
-    background-color: #F5F6F6;
-    border-left: solid 5px #69C5DC;
-    color: rgb(91, 94, 95);
-    padding: 1.2em 1.2em 1.2em 2.2em;
-    margin: 2em 0 2em -1em;;
-    font-style: italic;
+    @include blockquoteBlock(#f7f7f7);
 }
 
-.QuoteAttribution
-        {text-align:right;}
-
+.QuoteAttribution {
+    text-align:right;
+}
 
 /*
     3.12 Formulas
@@ -832,19 +543,19 @@ p {
       padding-bottom: 0.5em;
       font-family: $headerfont;
       font-size: 1.5em;
-	font-weight: 900; 
+	font-weight: 900;
   }
 
   .coverpage-date {
       font-family: $headerfont;
-	font-weight: 900; 
+	font-weight: 900;
   }
-  
+
   .prefatory-section {
     padding: 0 2em 0 3em;
   }
-  
-  
+
+
   .zzSTDTitle1, .MsoCommentText {
     display: none;
   }
@@ -872,15 +583,15 @@ p {
       font-weight: 300;
       display: block;
   }
- 
- /* 
+
+ /*
   .coverpage-tc-name {
     font-size: 1.2em;
     line-height: 1.2em;
     margin: 0.25em 0;
   }
   */
-  
+
 /*
     4.2 Document Identity
 */
@@ -921,8 +632,8 @@ p {
     background-size: 240px 80px;
     margin: auto;
   }
-  
-  
+
+
   .coverpage-title .title-second {
     display: none;
   }
@@ -957,13 +668,13 @@ h2 {
     border-bottom: solid 1px #69C5DC;
     color: black;
 }
-  
-  
+
+
 /*
     4.3 Draft Warning
 */
 
-  
+
   .coverpage-warning {
     border-top: solid 1px #F22E15;
     border-bottom: solid 1px #F22E15;
@@ -971,7 +682,7 @@ h2 {
     color: black;
     padding: 1em;
   }
-  
+
   .coverpage-warning .title {
     color: #F22E15;
     font-family: $headerfont;
@@ -980,56 +691,27 @@ h2 {
     font-size: 1.2em;
   }
 
-  
-  
+
+
 /*
     4.4 Copyright
-*/  
+*/
 
   .copyright {
     padding: 1em;
     font-size: 0.8em;
     text-align: left;
   }
-  
-  
-  .contact-info {color: black;}
-  
 
 
-/*
-    5.0 Other styles
-*/
+  .contact-info {color: black;}
 
 
 
 /*
-To top button
+    5.0 Other styles
 */
 
-#myBtn {
-    font-family: $monospacefont;
-    font-variant-ligatures: none;
-    display: none;
-    position: fixed;
-    bottom: 20px;
-    right: 30px;
-    z-index: 99;
-    font-size: 12px;
-    border: none;
-    outline: none;
-    background-color: #69C5DC;
-    opacity: 0.15;
-    color: white;
-    cursor: pointer;
-    padding: 10px 15px 10px 15px;
-    border-radius: 4px;
-  }
-  
-  #myBtn:hover {
-    opacity: 1;
-  }
-
 a.anchorjs-link:hover {
   background: none;
   color: #485094;

data/lib/metanorma/m3d/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3d
-    VERSION = "1.3.14"
+    VERSION = "1.3.15"
   end
 end

data/metanorma-m3d.gemspec

@@ -49,5 +49,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3d
 version: !ruby/object:Gem::Version
-  version: 1.3.14
+  version: 1.3.15
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -262,20 +262,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: metanorma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 description: |
   metanorma-m3d lets you write M3AAWG Documents (M3D) in AsciiDoc syntax.