metanorma-standoc 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6821b17f6ce6a902c1413023414907d3fca23e9831c8f30eb2b9239577481e2
-  data.tar.gz: 88ab1712fe03b4f927240dd6237fe353353dd8cbd46f3a62f602b91493d93535
+  metadata.gz: a5ab9cbdae658ec4088c0670d2ce1a117799a9325dbb8b8aa24e59b44e94e24c
+  data.tar.gz: da30d4d7b276b67e2363643e8ae1296a352bc4acee0ef9f2727da00ad276b3cc
 SHA512:
-  metadata.gz: ff45bc86d56ac270f2a91dcbd3473b91f4051466aea45cc8c0c5af607241dbebc9f54e7628bee5009a05b5d59704940312c64a8fa274c922dbcb4cc0d3a66280
-  data.tar.gz: 636e2808978f3f227ce50906b47180d3d96baf4fa667166a086be67cc1a5310b240f0c5dede99715faea6f99b8124739a1ab6a75a9784e6a5f90827c15595b4e
+  metadata.gz: e8600c60d56d27820da72dbc7259db4e3a91a3e362a4cefa0a5497b545076dab93277e87c5a0368f3037249ed79b5421e92300a8847bcf7c5bdcaca2392a3eab
+  data.tar.gz: 216bdaa7621b5b722f65a7d86eabbeaf65788df7f135927d04044838c6db31d50999155de829df6e57f5563a4f201121f36cde9c9c023a9af546019ab65d848e

data/Gemfile

@@ -10,4 +10,3 @@ if File.exist? 'Gemfile.devel'
   eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
 end
 
-gem "reline", "~> 0.2.8.pre.11"

data/lib/isodoc/html/htmlstyle.css

@@ -243,59 +243,65 @@ body {
 /*
     2. Responsive navigation layout
 */
-#toc {
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   font-family: {{bodyfont}};
   font-weight: 400; }
-  #toc ul {
+  #toc ul, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
     margin: 0;
     padding: 0;
     list-style: none; }
-    #toc ul li a {
+    #toc ul li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
       padding: 5px 10px; }
-    #toc ul a {
+    #toc ul a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
       color: #485094;
       text-decoration: none;
       display: block; }
-      #toc ul a:hover {
+      #toc ul a:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
         box-shadow: none;
         color: #485094; }
-  #toc .h2 {
+  #toc .h2, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
     padding-left: 30px; }
-  #toc .h3 {
+  #toc .h3, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
     padding-left: 50px; }
-  #toc .toc-active, #toc li:hover {
+  #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
     background: #C70039;
     box-shadow: inset -5px 0px 10px -5px #C70039 !important; }
-    #toc .toc-active a, #toc li:hover a {
+    #toc .toc-active a, #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: #485094; }
   @media print {
-    #toc .toc-active, #toc li:hover {
+    #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
       background: white;
       box-shadow: none !important; }
-    #toc .toc-active a {
+    #toc .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
       color: #485094; }
-    #toc li:hover a {
+    #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: black; } }
   @media screen and (max-width: 768px) {
-    #toc {
+    #toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
       padding: 0 1.5em;
       overflow: visible; } }
-  #toc .toc-active a {
+  #toc .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
     color: white; }
   #toc .toc-active,
-  #toc li:hover {
+  #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active,
+  #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
     box-shadow: none !important; }
     #toc .toc-active a,
-    #toc li:hover a {
+    #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a,
+    #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: white;
       background: none;
       box-shadow: none; }
-  #toc li a {
+  #toc li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
     text-transform: uppercase; }
-  #toc ul a:hover {
+  #toc ul a:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
     box-shadow: none;
     color: white; }
 
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  margin-top: 0;
+  margin-bottom: 0; }
+
 @media screen and (min-width: 768px) {
   nav {
     position: fixed;
@@ -349,7 +355,7 @@ body {
     display: none; }
   h1.toc-contents {
     margin-top: 1em; }
-  ul#toc-list {
+  ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0;
     margin: 0; } }
 

data/lib/isodoc/html/htmlstyle.scss

@@ -48,7 +48,7 @@ body {
     2. Responsive navigation layout
 */
 
-#toc {
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   @include toc(#485094, #C70039, #485094);
   @include sidebarToc();
 
@@ -79,6 +79,11 @@ body {
   }
 }
 
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+   margin-top: 0;
+   margin-bottom: 0;
+ }
+
 nav {
   @include sidebarNav(#f7f7f7, 323px, 45px);
 }
@@ -100,7 +105,7 @@ nav {
     margin-top: 1em;
   }
 
-  ul#toc-list {
+  ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0;
     margin: 0;
   }

data/lib/metanorma/standoc/base.rb

@@ -66,6 +66,7 @@ module Metanorma
         @htmltoclevels = node.attr("htmltoclevels")
         @doctoclevels = node.attr("doctoclevels")
         @toclevels = node.attr("toclevels")
+        @metadata_attrs = metadata_attrs(node)
       end
 
       def document(node)
@@ -135,6 +136,19 @@ module Metanorma
         end
       end
 
+      def metadata_attrs(node)
+        node.attributes.each_with_object([]) do |(k, v), ret|
+          %w(presentation semantic).each do |t|
+            next unless /^#{t}-metadata-/.match?(k)
+
+            k = k.sub(/^#{t}-metadata-/, "")
+            csv_split(v, ",")&.each do |c|
+              ret << "<#{t}-metadata><#{k}>#{c}</#{k}></#{t}-metadata>"
+            end
+          end
+        end.join
+      end
+
       private
 
       def outputdir(node)

data/lib/metanorma/standoc/cleanup.rb

@@ -63,6 +63,7 @@ module Metanorma
         svgmap_cleanup(xmldoc)
         boilerplate_cleanup(xmldoc)
         toc_cleanup(xmldoc)
+        metadata_cleanup(xmldoc)
         smartquotes_cleanup(xmldoc)
         variant_cleanup(xmldoc)
         para_cleanup(xmldoc)
@@ -135,12 +136,22 @@ module Metanorma
 
       def variant_space_cleanup(xmldoc)
         xmldoc.xpath("//*[variant]").each do |c|
-          if c&.next&.text? && c&.next&.next&.name == "variant"
+          next if c.next.nil? || c.next.next.nil?
+
+          if c.next.text? && c.next.next.name == "variant"
             c.next.text.gsub(/\s/, "").empty? and
               c.next.remove
           end
         end
       end
+
+      def metadata_cleanup(xmldoc)
+        return if @metadata_attrs.nil? || @metadata_attrs.empty?
+
+        ins = xmldoc.at("//misc-container") ||
+          xmldoc.at("//bibdata").after("<misc-container/>").next_element
+        ins << @metadata_attrs
+      end
     end
   end
 end

data/lib/metanorma/standoc/converter.rb

@@ -30,6 +30,7 @@ module Metanorma
         preprocessor Metanorma::Plugin::Lutaml::LutamlUmlDatamodelDescriptionPreprocessor
         inline_macro Metanorma::Standoc::PreferredTermInlineMacro
         inline_macro Metanorma::Standoc::AltTermInlineMacro
+        inline_macro Metanorma::Standoc::AdmittedTermInlineMacro
         inline_macro Metanorma::Standoc::DeprecatedTermInlineMacro
         inline_macro Metanorma::Standoc::RelatedTermInlineMacro
         inline_macro Metanorma::Standoc::DomainTermInlineMacro

data/lib/metanorma/standoc/macros_terms.rb

@@ -27,6 +27,19 @@ module Metanorma
       end
     end
 
+    class AdmittedTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :admitted
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted,
+                                      attrs["text"]).convert
+        %{<admitted><expression><name>#{out}</name></expression></admitted>}
+      end
+    end
+
     class DeprecatedTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :deprecated

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.0.0".freeze
+    VERSION = "2.0.1".freeze
   end
 end