metanorma-standoc 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5a2ad92a10730612ba26466f6508a0359c4a12ecd7f973618f0b01d80a83b83
-  data.tar.gz: 395911c6e85240c42682d2a14e310162dd19fbe4a863478d0c90067e32aa6650
+  metadata.gz: c28586f6cbbdce97320f86d86391330303b318424fd94cdedd0a17d239633bd5
+  data.tar.gz: afcc7583ee3eaf02efa769fb9ff9820a752f48d65b99643d36f83c2c55989233
 SHA512:
-  metadata.gz: 17a60dd786a93b4982d2c9408b3308af6b9b31bb852aae30143da11a62c8a35715a77cdbba3bc899445987e646a4a7550ab6942662522c744fb38e76661f9d0e
-  data.tar.gz: 121aa21c43db0262c907b54b0e03f033a319f54756a7dbaca9d0da94fbd3fe85700d576327ab3d581329c4d6a606a2d76f0fefd6ad949db3fc10bad6116f2b05
+  metadata.gz: f35a328f0c079cdc665db0ea7c2b8dff76d83ad95db2964cde1a5e6c7d28527ab053a2f0396318edee9f56ef4c4af38c0435b858adb722b594024c6ea5826798
+  data.tar.gz: 51ae02a66b26288cfd206edac4d123cf1e2052a2e5fef3a966b506804b48ed21a8499eac4fe02be68753c7b160d15f4a6340b53de91738c578ea9a208bf3440b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.1.3)
+    metanorma-standoc (1.1.4)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       html2doc (~> 0.8.0)
@@ -10,6 +10,7 @@ PATH
       relaton (~> 0.3.1)
       ruby-jing
       sterile (~> 1.0.14)
+      unicode2latex (~> 0.0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -22,7 +23,7 @@ GEM
     asciidoctor (1.5.8)
     asciimath (1.0.8)
     ast (2.4.0)
-    byebug (10.0.2)
+    byebug (11.0.0)
     cnccs (0.1.3)
     coderay (1.1.2)
     concurrent-ruby (1.1.4)
@@ -81,7 +82,7 @@ GEM
       algoliasearch
       iecbib (~> 0.2.1)
       iso-bib-item (~> 0.4.2)
-    isodoc (0.9.17)
+    isodoc (0.9.18)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -95,15 +96,16 @@ GEM
       thread_safe
       uuidtools
     isoics (0.1.7)
-    json (2.1.0)
+    json (2.2.0)
     liquid (4.0.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.3.7)
+    metanorma (0.3.9)
       asciidoctor
+      htmlentities
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
@@ -116,7 +118,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     optout (0.0.2)
-    parallel (1.13.0)
+    parallel (1.14.0)
     parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
@@ -163,7 +165,7 @@ GEM
     ruby-xslt (0.9.10)
     ruby_deep_clone (0.8.0)
     ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
     sass (3.7.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -183,7 +185,8 @@ GEM
     thor (0.20.3)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.5.0)
+    unicode2latex (0.0.1)
     uuidtools (2.1.5)
     vcr (4.0.0)
     webmock (3.5.1)

data/README.adoc

@@ -449,6 +449,158 @@ This generates the following ISO XML:
 </clause>
 --
 
+=== Requirements, Recommendations, and Permissions
+
+Requirements, Recommendations, and Permissions are encoded as Asciidoctor examples,
+with the style attribute value indicating that it is a Requirement, Recommendation, or Permission:
+
+[source,asciidoctor]
+--
+[permission]
+====
+I recommend this
+====
+--
+
+(In the following, "requirement" shall be used as the cover-all term.)
+
+The named attributes `subject` and `label` may be used to indicate the subject of the
+requirement, and the conventional label assigned to the requirement. The named attribute
+`classification` may be used to give an arbitrary number of key-value pairs of tags describing
+the requirement; key-value pairs are delimited by semicolon, key and value are delimited by
+colon, multiple values are delimited by comma, 
+and key and value are both intended to be tokens (containing no punctuation). The `obligation`
+attribute can contain one or more of "requirement", "permission", "recommendation", comma-delimited:
+it can be used to override the obligation in the tag name. The `inherit`
+attribute may be used to reference the label of a requirement that is imported or
+presupposed by this requirement:
+
+[source,asciidoctor]
+--
+[recommendation,label="/ogc/recommendation/wfs/2",subject="user",inherit="/ss/584/2015/level/1",classification="control-class:Technical;priority:P0;family:System and Communications Protection,System and Communications Protocols",obligation="permission,recommendation"]
+====
+I recommend this
+====
+--
+
+Requirements can be nested, as is the case with any delimited block in Asciidoctor,
+by adding one more delimiter symbol than its containing block:
+
+[source,asciidoctor]
+--
+[permission]
+====
+I permit this
+=====
+Example 2
+=====
+[permission]
+=====
+I also permit this
+=====
+====
+--
+
+The internal structure of a requirement can also be marked up to make it machine-readable,
+although this is not expected to be reflected in rendering. 
+
+Any text not wrapped in a named open block is considered to be part of a description.
+Any text in a named open block allowed under Metanorma is considered to be a separate
+subpart of the requirement: that includes the measurement target  (for quantitative requirements),
+the verification steps, imports (code stubs), and specifications (which may be considered
+the object of the requirement). These blocks can have types, referring to the conventions
+or computer frameworks that they follow.
+
+Text in a named open block may be include or consist of machine readable code; any such
+code needs to be wrapped in turn in a source code element, which is expected to
+contain an attribute giving the computer language the block is expressed in.
+(The notion of "language" may be expanded to include a particular computer framework
+that the code is to be run under.)
+`[sourcecode,text]` is taken as meaning that the block is still human readable.
+The language of a source code block is likely to be distinct from the type of named block
+it is contained in.
+
+By default, both named blocks and descriptions will be included in the document output.
+Often, though not always, the named blocks contain machine-readable code which is not
+intended to be included in the document output, but is supplemental to the human-readable
+description. That is signalled through the options attribute `exclude` on the named block.
+
+The label attribute is always rendered if present. The subject attribute is never rendered.
+
+[source,asciidoctor]
+--
+[recommendation,label="/ogc/recommendation/wfs/2",subject="user"]
+====
+I recommend _this_.
+[specification,type="tabular"]
+---
+This is the object of the recommendation:
+|===
+|Object |Value
+|Mission | Accomplished
+|===
+---
+As for the measurement targets,
+[measurement-target]
+---
+The measurement target shall be measured as:
+[stem]
+++++
+r/1 = 0
+++++
+---
+[verification,type="comprehensive"]
+---
+The following code will be run for verification:
+[source,CoreRoot]
+----
+CoreRoot(success): HttpResponse
+if (success)
+  recommendation(label: success-response)
+end
+----
+---
+
+[import%exclude]
+---
+[source,CoreRoot]
+----
+success-response()
+----
+---
+====
+--
+
+=== STEM expressions
+
+Like Asciidoctor proper, Metanorma Asciidoctor accepts mathematical input
+in either LaTeX or AsciiMath, following the conventions of Asciidoctor:
+
+* The document attribute `:stem:` means any markup tagged as `[stem]`
+(`stem:[...]`, or `[stem]` before a block delimited with `++++`)
+is interpreted as AsciiMath.
+* The document attribute `:stem: latexmath` means any markup tagged as `[stem]`
+(`stem:[...]`, or `[stem]` before a block delimited with `++++`)
+is interpreted as LaTeX.
+* Any markup tagged as `[asciimath]`
+(`asciimath:[...]`, or `[asciimath]` before a block delimited with `++++`)
+is interpreted as AsciiMath.
+* Any markup tagged as `[latexmath]`
+(`latexmath:[...]`, or `[latexmath]` before a block delimited with `++++`)
+is interpreted as LaTeX.
+
+In addition, stem markup that contains MathML markup (as detected by an initial
+`<math ... >`) is interpreted as MathML.
+
+MathML is used as the internal representation of STEM expressions in Metanorma:
+AsciiMath and LaTeX in Metanorma Asciidoctor are converted into MathML,
+using the https://github.com/asciidoctor/asciimath[asciimath] gem and the
+https://dlmf.nist.gov/LaTeXML/manual/commands/latexmlmath.html[latexmath]
+processor of LaTeXML, respectively. 
+
+NOTE: latexmath is much slower than other available LaTeX to MathML converters,
+but is also more accurate.
+
 === PlantUML
 
 The http://plantuml.com[PlantUML] diagramming tool is integrated with Asciidoctor

data/lib/asciidoctor/standoc/base.rb

@@ -17,6 +17,8 @@ module Asciidoctor
         inline_macro Asciidoctor::Standoc::AltTermInlineMacro
         inline_macro Asciidoctor::Standoc::DeprecatedTermInlineMacro
         inline_macro Asciidoctor::Standoc::DomainTermInlineMacro
+        block Asciidoctor::Standoc::ToDoAdmonitionBlock
+        treeprocessor Asciidoctor::Standoc::ToDoInlineAdmonitionBlock
         block Asciidoctor::Standoc::PlantUMLBlockMacro
       end
 

data/lib/asciidoctor/standoc/biblio.rng

@@ -18,6 +18,21 @@
   of this.
 -->
 <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">
+  <!--
+    https://www.myintervals.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/
+    iso8601date = xsd:string { pattern = "([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([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])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?" }
+    Somewhat dumbed down for XSD regex:
+  -->
+  <define name="ISO8601DateTime">
+    <data type="string">
+      <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])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24:?00)([\.,]\d+)?)?((:?)[0-5]\d([.,]\d+)?)?([zZ]|([\+\-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?</param>
+    </data>
+  </define>
+  <define name="ISO8601Date">
+    <data type="string">
+      <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>
   <define name="status">
     <element name="status">
       <ref name="LocalizedString"/>
@@ -375,10 +390,7 @@
   </define>
   <define name="date">
     <element name="date">
-      <choice>
-        <data type="gYear"/>
-        <data type="date"/>
-      </choice>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="locality">
@@ -561,10 +573,7 @@
   </define>
   <define name="fetched">
     <element name="fetched">
-      <choice>
-        <data type="dateTime"/>
-        <data type="date"/>
-      </choice>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validity">
@@ -582,26 +591,17 @@
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <choice>
-        <data type="dateTime"/>
-        <data type="date"/>
-      </choice>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <choice>
-        <data type="dateTime"/>
-        <data type="date"/>
-      </choice>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <choice>
-        <data type="dateTime"/>
-        <data type="date"/>
-      </choice>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">
@@ -632,10 +632,7 @@
       <attribute name="text"/>
     </optional>
     <optional>
-      <choice>
-        <data type="gYear"/>
-        <data type="date"/>
-      </choice>
+      <ref name="ISO8601Date"/>
     </optional>
   </define>
   <define name="bdate">
@@ -660,25 +657,16 @@
       <choice>
         <group>
           <element name="from">
-            <choice>
-              <data type="gYear"/>
-              <data type="date"/>
-            </choice>
+            <ref name="ISO8601Date"/>
           </element>
           <optional>
             <element name="to">
-              <choice>
-                <data type="gYear"/>
-                <data type="date"/>
-              </choice>
+              <ref name="ISO8601Date"/>
             </element>
           </optional>
         </group>
         <element name="on">
-          <choice>
-            <data type="gYear"/>
-            <data type="date"/>
-          </choice>
+          <ref name="ISO8601Date"/>
         </element>
       </choice>
     </element>
@@ -791,20 +779,12 @@
   </define>
   <define name="seriesfrom">
     <element name="from">
-      <choice>
-        <data type="dateTime"/>
-        <data type="date"/>
-        <data type="gYear"/>
-      </choice>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="seriesto">
     <element name="to">
-      <choice>
-        <data type="dateTime"/>
-        <data type="date"/>
-        <data type="gYear"/>
-      </choice>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="seriesnumber">
@@ -899,7 +879,7 @@
   </define>
   <define name="revision-date">
     <element name="revision-date">
-      <data type="date"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="draft">
@@ -922,10 +902,12 @@
   <define name="AnyElement">
     <element>
       <anyName/>
-      <choice>
-        <text/>
-        <ref name="AnyElement"/>
-      </choice>
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
 </grammar>

data/lib/asciidoctor/standoc/blocks.rb

@@ -14,6 +14,8 @@ module Asciidoctor
       # treated as a single block.
       # We append each contained block to its parent
       def open(node)
+        Utils::reqt_subpart(node.attr("style")) and
+          return requirement_subpart(node)
         result = []
         node.blocks.each do |b|
           result << send(b.context, b)
@@ -21,6 +23,16 @@ module Asciidoctor
         result
       end
 
+      def requirement_subpart(node)
+        name = node.attr("style")
+        noko do |xml|
+          xml.send name, **attr_code(exclude: node.option?("exclude"),
+                                     type: node.attr("type")) do |o|
+            o << node.content
+          end
+        end.join("\n")
+      end
+
       def literal(node)
         noko do |xml|
           xml.figure **id_attr(node) do |f|
@@ -35,7 +47,7 @@ module Asciidoctor
         stem_content = node.lines.join("\n")
         noko do |xml|
           xml.formula **id_attr(node) do |s|
-            stem_parse(stem_content, s)
+            stem_parse(stem_content, s, node.style.to_sym)
           end
         end
       end
@@ -61,6 +73,24 @@ module Asciidoctor
         end
       end
 
+      def todo_attrs(node)
+        date = node.attr("date") || Date.today.iso8601.gsub(/\+.*$/, "")
+        date += "T00:00:00Z" unless /T/.match date
+        {
+          reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
+          id: Utils::anchor_or_uuid(node),
+          date: date,
+        }
+      end
+
+      def todo(node)
+        noko do |xml|
+          xml.review **attr_code(todo_attrs(node)) do |r|
+            wrap_in_para(node, r)
+          end
+        end
+      end
+
       def termnote(n)
         noko do |xml|
           xml.termnote **id_attr(n) do |ex|
@@ -95,6 +125,7 @@ module Asciidoctor
       def admonition(node)
         return termnote(node) if in_terms?
         return note(node) if node.attr("name") == "note"
+        return todo(node) if node.attr("name") == "todo"
         noko do |xml|
           xml.admonition **admonition_attrs(node) do |a|
             node.title.nil? or a.name { |name| name << node.title }
@@ -113,6 +144,9 @@ module Asciidoctor
 
       def example(node)
         return term_example(node) if in_terms?
+        return requirement(node, "recommendation") if node.attr("style") == "recommendation"
+        return requirement(node, "requirement") if node.attr("style") == "requirement"
+        return requirement(node, "permission") if node.attr("style") == "permission"
         noko do |xml|
           xml.example **id_attr(node) do |ex|
             wrap_in_para(node, ex)
@@ -120,6 +154,46 @@ module Asciidoctor
         end.join("\n")
       end
 
+      def req_classif_parse(classif)
+        ret = []
+        classif.split(/;\s*/).each do |c|
+          c1 = c.split(/:\s*/)
+          next unless c1.size == 2
+          c1[1].split(/,\s*/).each { |v| ret << [ c1[0], v ] }
+        end
+        ret
+      end
+
+      def requirement_classification(classif, ex)
+        req_classif_parse(classif).each do |r|
+          ex.classification do |c|
+            c.tag r[0]
+            c.value r[1]
+          end
+        end
+      end
+
+      def reqt_attributes(node)
+        {
+          id: Utils::anchor_or_uuid,
+          obligation: node.attr("obligation")
+        }
+      end
+
+      def requirement(node, obligation)
+        classif = node.attr("classification")
+        noko do |xml|
+          xml.send obligation, **attr_code(reqt_attributes(node)) do |ex|
+            ex.title node.title if node.title
+            ex.label node.attr("label") if node.attr("label")
+            ex.subject node.attr("subject") if node.attr("subject")
+            ex.inherit node.attr("inherit") if node.attr("inherit")
+            requirement_classification(classif, ex) if classif
+            wrap_in_para(node, ex)
+          end
+        end.join("\n")
+      end
+
       def preamble(node)
         noko do |xml|
           xml.foreword do |xml_abstract|

data/lib/asciidoctor/standoc/cleanup.rb

@@ -53,6 +53,7 @@ module Asciidoctor
         docidentifier_cleanup(xmldoc)
         bookmark_cleanup(xmldoc)
         smartquotes_cleanup(xmldoc)
+        requirement_cleanup(xmldoc)
         xmldoc
       end
 

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -153,7 +153,6 @@ module Asciidoctor
       end
 
       ELEMS_ALLOW_NOTES =
-        # %w[p formula quote sourcecode example admonition ul ol dl figure]
         %w[p formula ul ol dl figure].freeze
 
       # if a note is at the end of a section, it is left alone
@@ -228,6 +227,30 @@ module Asciidoctor
           r["obligation"] = r.at("./ancestor::*/@obligation").text
         end
       end
+
+      def requirement_cleanup(x)
+        x.xpath("//requirement | //recommendation | //permission").each do |r|
+          r.children.each do |e|
+            unless e.element? && (Utils::reqt_subpart(e.name) || 
+                %w(requirement recommnedation permission).include?(e.name))
+              t = Nokogiri::XML::Element.new("description", x)
+              e.before(t)
+              t.children = e.remove
+            end
+          end
+          requirement_cleanup1(r)
+        end
+      end
+
+      def requirement_cleanup1(r)
+        while d = r.at("./description[following-sibling::*[1][self::description]]")
+          n = d.next.remove
+          d << n.children
+        end
+        r.xpath("./description[not(./*) and normalize-space(.)='']").each do |d|
+          d.replace("\n")
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/inline.rb

@@ -1,5 +1,6 @@
 require "asciidoctor/extensions"
 require "htmlentities"
+require "unicode2latex"
 
 module Asciidoctor
   module Standoc
@@ -92,13 +93,25 @@ module Asciidoctor
         noko { |xml| xml.hr }.join("\n")
       end
 
-      def stem_parse(text, xml)
+      def xml_encode(text)
+        HTMLEntities.new.encode(text, :basic, :hexadecimal).
+            gsub(/&amp;gt;/, ">").gsub(/\&amp;lt;/, "<").gsub(/&amp;amp;/, "&").
+            gsub(/&gt;/, ">").gsub(/&lt;/, "<").gsub(/&amp;/, "&").
+            gsub(/&quot;/, '"').gsub(/&#xa;/, "\n")
+      end
+
+      def stem_parse(text, xml, style)
         if /&lt;([^:>&]+:)?math(\s+[^>&]+)?&gt; |
           <([^:>&]+:)?math(\s+[^>&]+)?>/x.match text
-          math = HTMLEntities.new.encode(text, :basic, :hexadecimal).
-            gsub(/&amp;gt;/, ">").gsub(/\&amp;lt;/, "<").gsub(/&amp;amp;/, "&").
-            gsub(/&gt;/, ">").gsub(/&lt;/, "<").gsub(/&amp;/, "&")
+          math = xml_encode(text)
           xml.stem math, **{ type: "MathML" }
+        elsif style == :latexmath
+          out = Unicode2LaTeX::unicode2latex(text).gsub(/'/, '\\').gsub(/\n/, " ")
+          File.open(".tex", "w") { |file| file.write(out) }
+          latex = `cat .tex | latexmlmath --preload=amsmath  -- -`
+          xml.stem **{ type: "MathML" } do |s|
+            s << latex.sub(/<\?[^>]+>/, "")
+          end
         else
           xml.stem text, **{ type: "AsciiMath" }
         end
@@ -114,7 +127,8 @@ module Asciidoctor
           when :single then xml << "'#{node.text}'"
           when :superscript then xml.sup { |s| s << node.text }
           when :subscript then xml.sub { |s| s << node.text }
-          when :asciimath then stem_parse(node.text, xml)
+          when :asciimath then stem_parse(node.text, xml, :asciimath)
+          when :latexmath then stem_parse(node.text, xml, :latexmath)
           else
             case node.role
               # the following three are legacy, they are now handled by macros

data/lib/asciidoctor/standoc/isodoc.rng

@@ -927,7 +927,12 @@
           <value>AsciiMath</value>
         </choice>
       </attribute>
-      <text/>
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="annotation">

data/lib/asciidoctor/standoc/macros.rb

@@ -40,6 +40,33 @@ module Asciidoctor
       end
     end
 
+    class ToDoAdmonitionBlock < Extensions::BlockProcessor
+      use_dsl
+      named :TODO
+      on_contexts :example, :paragraph
+
+      def process parent, reader, attrs
+        attrs['name'] = 'todo'
+        attrs['caption'] = 'TODO'
+        create_block parent, :admonition, reader.lines, attrs, content_model: :compound
+      end
+    end
+
+    class ToDoInlineAdmonitionBlock < Extensions::Treeprocessor
+      def process document
+        (document.find_by context: :paragraph).each do |para|
+          next unless /^TODO: /.match para.lines[0]
+          parent = para.parent
+          para.set_attr("name", "todo")
+          para.set_attr("caption", "TODO")
+          para.lines[0].sub!(/^TODO: /, "")
+          todo = Block.new parent, :admonition, attributes: para.attributes,
+            source: para.lines, content_model: :compound
+          parent.blocks[parent.blocks.index(para)] = todo
+        end
+      end
+    end
+
     class PlantUMLBlockMacroBackend
       # https://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
       def self.plantuml_installed?

data/lib/asciidoctor/standoc/utils.rb

@@ -84,6 +84,11 @@ module Asciidoctor
           end
           result.reject(&:empty?)
         end
+
+        def reqt_subpart(x)
+          %w(specification measurement-target verification import label
+             subject inherit classification title).include? x
+        end
       end
 
       def convert(node, transform = nil, opts = {})

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.1.3".freeze
+    VERSION = "1.1.4".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "html2doc", "~> 0.8.0"
+  spec.add_dependency "unicode2latex", "~> 0.0.1"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug"

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -49,6 +49,17 @@ RSpec.describe Asciidoctor::Standoc do
       ++++
       <mml:math><mml:msub xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"> <mml:mrow> <mml:mrow> <mml:mi mathvariant="bold-italic">F</mml:mi> </mml:mrow> </mml:mrow> <mml:mrow> <mml:mrow> <mml:mi mathvariant="bold-italic">&#x0391;</mml:mi> </mml:mrow> </mml:mrow> </mml:msub> </mml:math>
       ++++
+
+      [latexmath]
+      ++++
+      M =
+      \\begin{bmatrix}
+      -\\sin λ_0 & \\cos λ_0 & 0 \\\\
+      -\\sin φ_0 \\cos λ_0 & -\\sin φ_0 \\sin λ_0 & \\cos φ_0 \\\\
+      \\cos φ_0 \\cos λ_0 & \\cos φ_0 \\sin λ_0 & \\sin φ_0
+      \\end{bmatrix}
+      ++++
+
     INPUT
             #{BLANK_HDR}
        <sections>
@@ -59,8 +70,165 @@ RSpec.describe Asciidoctor::Standoc do
 
        <formula id="_">
          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub> <mrow> <mrow> <mi mathvariant="bold-italic">F</mi> </mrow> </mrow> <mrow> <mrow> <mi mathvariant="bold-italic">Α</mi> </mrow> </mrow> </msub> </math></stem>
-       </stem>
        </formula>
+              <formula id="_">
+         <stem type="MathML">
+       <math xmlns="http://www.w3.org/1998/Math/MathML" alttext="M=\\begin{bmatrix}-\\sin\\lambda_{0}&amp;\\cos\\lambda_{0}&amp;0\\\\&#10;-\\sin\\varphi_{0}\\cos\\lambda_{0}&amp;-\\sin\\varphi_{0}\\sin\\lambda_{0}&amp;\\cos\\varphi_{0%&#10;}\\\\&#10;\\cos\\varphi_{0}\\cos\\lambda_{0}&amp;\\cos\\varphi_{0}\\sin\\lambda_{0}&amp;\\sin\\varphi_{0}%&#10;\\end{bmatrix}" display="block">
+         <mrow>
+           <mi>M</mi>
+           <mo>=</mo>
+           <mrow>
+             <mo>[</mo>
+             <mtable columnspacing="5pt" displaystyle="true" rowspacing="0pt">
+               <mtr>
+                 <mtd columnalign="center">
+                   <mrow>
+                     <mo>-</mo>
+                     <mrow>
+                       <mi>sin</mi>
+                       <mo>⁡</mo>
+                       <msub>
+                         <mi>λ</mi>
+                         <mn>0</mn>
+                       </msub>
+                     </mrow>
+                   </mrow>
+                 </mtd>
+                 <mtd columnalign="center">
+                   <mrow>
+                     <mi>cos</mi>
+                     <mo>⁡</mo>
+                     <msub>
+                       <mi>λ</mi>
+                       <mn>0</mn>
+                     </msub>
+                   </mrow>
+                 </mtd>
+                 <mtd columnalign="center">
+                   <mn>0</mn>
+                 </mtd>
+               </mtr>
+               <mtr>
+                 <mtd columnalign="center">
+                   <mrow>
+                     <mo>-</mo>
+                     <mrow>
+                       <mrow>
+                         <mi>sin</mi>
+                         <mo>⁡</mo>
+                         <msub>
+                           <mi>φ</mi>
+                           <mn>0</mn>
+                         </msub>
+                       </mrow>
+                       <mo>⁢</mo>
+                       <mrow>
+                         <mi>cos</mi>
+                         <mo>⁡</mo>
+                         <msub>
+                           <mi>λ</mi>
+                           <mn>0</mn>
+                         </msub>
+                       </mrow>
+                     </mrow>
+                   </mrow>
+                 </mtd>
+                 <mtd columnalign="center">
+                   <mrow>
+                     <mo>-</mo>
+                     <mrow>
+                       <mrow>
+                         <mi>sin</mi>
+                         <mo>⁡</mo>
+                         <msub>
+                           <mi>φ</mi>
+                           <mn>0</mn>
+                         </msub>
+                       </mrow>
+                       <mo>⁢</mo>
+                       <mrow>
+                         <mi>sin</mi>
+                         <mo>⁡</mo>
+                         <msub>
+                           <mi>λ</mi>
+                           <mn>0</mn>
+                         </msub>
+                       </mrow>
+                     </mrow>
+                   </mrow>
+                 </mtd>
+                 <mtd columnalign="center">
+                   <mrow>
+                     <mi>cos</mi>
+                     <mo>⁡</mo>
+                     <msub>
+                       <mi>φ</mi>
+                       <mn>0</mn>
+                     </msub>
+                   </mrow>
+                 </mtd>
+               </mtr>
+               <mtr>
+                 <mtd columnalign="center">
+                   <mrow>
+                     <mrow>
+                       <mi>cos</mi>
+                       <mo>⁡</mo>
+                       <msub>
+                         <mi>φ</mi>
+                         <mn>0</mn>
+                       </msub>
+                     </mrow>
+                     <mo>⁢</mo>
+                     <mrow>
+                       <mi>cos</mi>
+                       <mo>⁡</mo>
+                       <msub>
+                         <mi>λ</mi>
+                         <mn>0</mn>
+                       </msub>
+                     </mrow>
+                   </mrow>
+                 </mtd>
+                 <mtd columnalign="center">
+                   <mrow>
+                     <mrow>
+                       <mi>cos</mi>
+                       <mo>⁡</mo>
+                       <msub>
+                         <mi>φ</mi>
+                         <mn>0</mn>
+                       </msub>
+                     </mrow>
+                     <mo>⁢</mo>
+                     <mrow>
+                       <mi>sin</mi>
+                       <mo>⁡</mo>
+                       <msub>
+                         <mi>λ</mi>
+                         <mn>0</mn>
+                       </msub>
+                     </mrow>
+                   </mrow>
+                 </mtd>
+                 <mtd columnalign="center">
+                   <mrow>
+                     <mi>sin</mi>
+                     <mo>⁡</mo>
+                     <msub>
+                       <mi>φ</mi>
+                       <mn>0</mn>
+                     </msub>
+                   </mrow>
+                 </mtd>
+               </mtr>
+             </mtable>
+             <mo>]</mo>
+           </mrow>
+         </mrow>
+       </math></stem>
+       </formula>
+       </sections></standard-document>
        </sections>
        </standard-document>
     OUTPUT
@@ -651,5 +819,176 @@ RSpec.describe Asciidoctor::Standoc do
       OUTPUT
     end
 
+        it "processes recommendation" do
+    input = <<~"INPUT"
+      #{ASCIIDOC_BLANK_HDR}
+      [recommendation,label="/ogc/recommendation/wfs/2",subject="user",inherit="/ss/584/2015/level/1"]
+      ====
+      I recommend this
+      ====
+    INPUT
+             output = <<~"OUTPUT"
+            #{BLANK_HDR}
+       <sections>
+  <recommendation id="_">
+  <label>/ogc/recommendation/wfs/2</label>
+<subject>user</subject>
+<inherit>/ss/584/2015/level/1</inherit>
+  <description><p id="_">I recommend this</p></description>
+</recommendation>
+       </sections>
+       </standard-document>
+    OUTPUT
+
+    expect(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))).to be_equivalent_to output
+  end
+
+    it "processes requirement" do
+    input = <<~"INPUT"
+      #{ASCIIDOC_BLANK_HDR}
+      [requirement]
+      .Title
+      ====
+      I recommend this
+      ====
+    INPUT
+             output = <<~"OUTPUT"
+            #{BLANK_HDR}
+       <sections>
+  <requirement id="_"><title>Title</title>
+  <description><p id="_">I recommend this</p></description>
+</requirement>
+       </sections>
+       </standard-document>
+    OUTPUT
+
+    expect(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))).to be_equivalent_to output
+  end
+
+        it "processes permission" do
+    input = <<~"INPUT"
+      #{ASCIIDOC_BLANK_HDR}
+      [permission]
+      ====
+      I recommend this
+      ====
+    INPUT
+             output = <<~"OUTPUT"
+            #{BLANK_HDR}
+       <sections>
+  <permission id="_">
+  <description><p id="_">I recommend this</p></description>
+</permission>
+       </sections>
+       </standard-document>
+    OUTPUT
+
+    expect(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))).to be_equivalent_to output
+  end
+
+
+       it "processes nested permissions" do
+    input = <<~"INPUT"
+      #{ASCIIDOC_BLANK_HDR}
+      [permission]
+      ====
+      I permit this
+
+      =====
+      Example 2
+      =====
+
+      [permission]
+      =====
+      I also permit this
+      =====
+      ====
+    INPUT
+             output = <<~"OUTPUT"
+            #{BLANK_HDR}
+       <sections>
+         <permission id="_"><description><p id="_">I permit this</p>
+<example id="_">
+  <p id="_">Example 2</p>
+</example></description>
+<permission id="_">
+  <description><p id="_">I also permit this</p></description>
+</permission></permission>
+</sections>
+</standard-document>
+    OUTPUT
+
+    expect(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))).to be_equivalent_to output
+  end
+
+        it "processes recommendation with internal markup of structure" do
+    input = <<~"INPUT"
+      #{ASCIIDOC_BLANK_HDR}
+      [recommendation,label="/ogc/recommendation/wfs/2",subject="user",classification="control-class:Technical;priority:P0;family:System and Communications Protection,System and Communications Protocols",obligation="permission,recommendation"]
+      ====
+      I recommend _this_.
+
+      [specification,type="tabular"]
+      --
+      This is the object of the recommendation:
+      |===
+      |Object |Value
+      |Mission | Accomplished
+      |===
+      -- 
+
+      As for the measurement targets,
+
+      [measurement-target]
+      --
+      The measurement target shall be measured as:
+      [stem]
+      ++++
+      r/1 = 0
+      ++++
+      --
+
+      [verification]
+      --
+      The following code will be run for verification:
+
+      [source,CoreRoot]
+      ----
+      CoreRoot(success): HttpResponse
+      if (success)
+        recommendation(label: success-response)
+      end
+      ----
+      --
+      
+      [import%exclude]
+      --
+      [source,CoreRoot]
+      ----
+      success-response()
+      ----
+      --
+      ====
+    INPUT
+             output = <<~"OUTPUT"
+            #{BLANK_HDR}
+       <sections>
+       <recommendation id="_"  obligation="permission,recommendation"><label>/ogc/recommendation/wfs/2</label><subject>user</subject>
+<classification><tag>control-class</tag><value>Technical</value></classification><classification><tag>priority</tag><value>P0</value></classification><classification><tag>family</tag><value>System and Communications Protection</value></classification><classification><tag>family</tag><value>System and Communications Protocols</value></classification>
+        <description><p id="_">I recommend <em>this</em>.</p>
+       </description><specification exclude="false" type="tabular"><p id="_">This is the object of the recommendation:</p><table id="_">  <tbody>    <tr>      <td align="left">Object</td>      <td align="left">Value</td>    </tr>    <tr>      <td align="left">Mission</td>      <td align="left">Accomplished</td>    </tr>  </tbody></table></specification><description>
+       <p id="_">As for the measurement targets,</p>
+       </description><measurement-target exclude="false"><p id="_">The measurement target shall be measured as:</p><formula id="_">  <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mfrac><mi>r</mi><mn>1</mn></mfrac><mo>=</mo><mn>0</mn></math></stem></formula></measurement-target>
+       <verification exclude="false"><p id="_">The following code will be run for verification:</p><sourcecode  lang="CoreRoot" id="_">CoreRoot(success): HttpResponse
+if (success)
+  recommendation(label: success-response)
+end</sourcecode></verification>
+       <import exclude="true">  <sourcecode  lang="CoreRoot" id="_">success-response()</sourcecode></import></recommendation>
+       </sections>
+       </standard-document>
+    OUTPUT
+
+    expect(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))).to be_equivalent_to output
+  end
 
 end

data/spec/asciidoctor-standoc/macros_spec.rb

@@ -18,6 +18,33 @@ RSpec.describe Asciidoctor::Standoc do
     OUTPUT
   end
 
+  it "processes the TODO custom admonition" do
+    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      #{ASCIIDOC_BLANK_HDR}
+      TODO: Note1
+
+      [TODO]
+      ====
+      Note2
+      ====
+
+      [TODO]
+      Note3
+    INPUT
+            #{BLANK_HDR}
+            <sections><review reviewer="(Unknown)" id="_" date="#{Date.today}T00:00:00Z">
+         <p id="_"/>
+       </review>
+       <review reviewer="(Unknown)" id="_" date="#{Date.today}T00:00:00Z">
+         <p id="_">Note2</p>
+       </review>
+       <review reviewer="(Unknown)" id="_" date="#{Date.today}T00:00:00Z">
+         <p id="_">Note3</p>
+       </review></sections>
+       </standard-document>
+    OUTPUT
+  end
+
   it "processes the PlantUML macro" do
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
@@ -115,7 +142,6 @@ Alice &lt;-- Bob: another authentication Response
     OUTPUT
   end
 
-
   private
 
   def mock_plantuml_disabled

data/spec/metanorma/processor_spec.rb

@@ -60,7 +60,7 @@ RSpec.describe Metanorma::Standoc::Processor do
        <li> <p>IEC Electropedia: available at
          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
        </p> </li> </ul>
-       <h2 class="TermNum" id="J">1.1</h2>
+       <h2 class="TermNum" id="J">1.1.</h2>
          <p class="Terms" style="text-align:left;">Term2</p>
        </div>
            </main>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: unicode2latex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement