metanorma-nist 0.1.4 → 0.1.5

data/lib/asciidoctor/nist/biblio.rng

@@ -598,7 +598,7 @@
       <ref name="script"/>
     </zeroOrMore>
     <zeroOrMore>
-      <ref name="abstract"/>
+      <ref name="bibabstract"/>
     </zeroOrMore>
     <optional>
       <ref name="status"/>
@@ -817,7 +817,7 @@
   <define name="medium">
     <element name="medium">
       <optional>
-        <ref name="content"/>
+        <ref name="bcontent"/>
       </optional>
       <optional>
         <ref name="genre"/>
@@ -836,7 +836,7 @@
       </optional>
     </element>
   </define>
-  <define name="content">
+  <define name="bcontent">
     <element name="content">
       <text/>
     </element>
@@ -959,7 +959,7 @@
       <ref name="FormattedString"/>
     </element>
   </define>
-  <define name="abstract">
+  <define name="bibabstract">
     <element name="abstract">
       <ref name="FormattedString"/>
     </element>

data/lib/asciidoctor/nist/converter.rb

@@ -16,7 +16,8 @@ module Asciidoctor
       register_for "nist"
 
       def example(node)
-        return pseudocode_example(node) if node.attr("style") == "pseudocode"
+        role = node.role || node.attr("style")
+        return pseudocode_example(node) if role == "pseudocode"
         super
       end
 
@@ -31,7 +32,8 @@ module Asciidoctor
       end
 
       def table(node)
-        return errata(node) if node.attr("style") == "errata"
+        role = node.role || node.attr("style")
+        return errata(node) if role == "errata"
         super
       end
 
@@ -68,7 +70,8 @@ module Asciidoctor
       end
 
       def dlist(node)
-        return glossary(node) if node.attr("style") == "glossary"
+        role = node.role || node.attr("style")
+        return glossary(node) if role == "glossary"
         super
       end
 
@@ -145,9 +148,9 @@ module Asciidoctor
       end
 
       def clause_parse(attrs, xml, node)
-        attrs[:preface] = true if node.attr("style") == "preface"
-        attrs[:executivesummary] = true if node.attr("style") ==
-          "executive-summary"
+        role = node.role || node.attr("style")
+        attrs[:preface] = true if role == "preface"
+        attrs[:executivesummary] = true if role == "executive-summary"
         super
       end
 
@@ -174,7 +177,7 @@ module Asciidoctor
       end
 
       def section(node)
-        a = { id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node) }
+        a = section_attributes(node)
         noko do |xml|
           case sectiontype(node)
           #when "normative references" then norm_ref_parse(a, xml, node)

data/lib/asciidoctor/nist/front.rb

@@ -182,13 +182,6 @@ module Asciidoctor
         end
       end
 
-      def metadata_keywords(node, xml)
-        return unless node.attr("keywords")
-        node.attr("keywords").split(/,[ ]*/).each do |kw|
-          xml.keyword kw
-        end
-      end
-
       def metadata_source(node, xml)
         super
         node.attr("doc-email") && xml.uri(node.attr("doc-email"), type: "email")
@@ -309,7 +302,6 @@ module Asciidoctor
       def metadata_ext(node, xml)
         metadata_doctype(node, xml)
         metadata_committee(node, xml)
-        metadata_keywords(node, xml)
         metadata_commentperiod(node, xml)
       end
     end

data/lib/asciidoctor/nist/isodoc.rng

@@ -17,14 +17,23 @@
   these elements; we just want one namespace for any child grammars
   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">
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <!-- include "biblio.rnc" { } -->
   <include href="basicdoc.rng">
     <start>
       <ref name="standard-document"/>
     </start>
-    <define name="std_sections">
+    <define name="BibDataExtensionType">
+      <ref name="doctype"/>
+      <zeroOrMore>
+        <ref name="structuredidentifier"/>
+      </zeroOrMore>
+    </define>
+    <define name="TitleType">
+      <text/>
+    </define>
+    <define name="sections">
       <element name="sections">
         <oneOrMore>
           <choice>
@@ -35,12 +44,6 @@
         </oneOrMore>
       </element>
     </define>
-    <define name="BibDataExtensionType">
-      <ref name="doctype"/>
-      <zeroOrMore>
-        <ref name="structuredidentifier"/>
-      </zeroOrMore>
-    </define>
   </include>
   <define name="standard-document">
     <element name="standard-document">
@@ -51,7 +54,7 @@
       <optional>
         <ref name="preface"/>
       </optional>
-      <ref name="std_sections"/>
+      <ref name="sections"/>
       <zeroOrMore>
         <ref name="annex"/>
       </zeroOrMore>
@@ -60,10 +63,6 @@
       </zeroOrMore>
     </element>
   </define>
-  <!--
-    bibdata =
-    element bibdata { BibData }
-  -->
   <define name="preface">
     <element name="preface">
       <oneOrMore>
@@ -77,6 +76,16 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="foreword">
+    <element name="foreword">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
+  <define name="introduction">
+    <element name="introduction">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="boilerplate">
     <element name="boilerplate">
       <optional>
@@ -113,12 +122,6 @@
       <ref name="Content-Section"/>
     </element>
   </define>
-  <!--
-    sections =
-    element sections {
-    ( clause | terms | definitions )+
-    }
-  -->
   <define name="definitions">
     <element name="definitions">
       <optional>
@@ -126,6 +129,12 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <optional>
         <ref name="section-title"/>
       </optional>
@@ -137,25 +146,11 @@
       </oneOrMore>
     </element>
   </define>
-  <!--
-    section-title =
-    element title { TextElement* }
-  -->
   <define name="content">
     <element name="clause">
       <ref name="Content-Section"/>
     </element>
   </define>
-  <define name="foreword">
-    <element name="foreword">
-      <ref name="Content-Section"/>
-    </element>
-  </define>
-  <define name="introduction">
-    <element name="introduction">
-      <ref name="Content-Section"/>
-    </element>
-  </define>
   <define name="abstract">
     <element name="abstract">
       <ref name="Content-Section"/>
@@ -174,18 +169,18 @@
       <ref name="Content-Section"/>
     </element>
   </define>
-  <!--
-    Basic-Section =
-    attribute id { xsd:ID }?,
-    section-title?,
-    BasicBlock?, note*
-  -->
   <define name="Content-Section">
     <optional>
       <attribute name="id">
         <data type="ID"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -217,6 +212,12 @@
         <data type="ID"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -246,6 +247,12 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <attribute name="obligation">
         <choice>
           <value>normative</value>
@@ -270,15 +277,6 @@
       </choice>
     </element>
   </define>
-  <!--
-    references =
-    element references {
-    attribute id { xsd:ID }?,
-    section-title?,
-    BasicBlock*,
-    bibitem*
-    }
-  -->
   <define name="terms">
     <element name="terms">
       <optional>
@@ -286,6 +284,12 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <zeroOrMore>
         <ref name="BasicBlock"/>
       </zeroOrMore>
@@ -427,340 +431,7 @@
       <ref name="paragraph"/>
     </element>
   </define>
-  <!--
-    BasicBlock =  paragraph-with-footnote | table | formula | admonition | ol | ul | dl | figure |
-    quote | sourcecode | example | review | pre
-    
-    paragraph =
-    element p { ParagraphType }
-    
-    Alignments = ( "left" | "right" | "center" | "justified" )
-    
-    ParagraphType =
-    attribute id { xsd:ID },
-    attribute align { Alignments }?,
-    ( TextElement )*, note*
-    
-    paragraph-with-footnote =
-    element p {
-    attribute id { xsd:ID },
-    attribute align { Alignments }?,
-    ( TextElement | fn  )*, note*
-    }
-    
-    note =
-    element note {
-    attribute id { xsd:ID },
-    paragraph+
-    }
-    
-    
-    review =
-    element review {
-    attribute id { xsd:ID },
-    attribute reviewer { text },
-    attribute date { xsd:dateTime }?,
-    attribute from { xsd:IDREF },
-    attribute to { xsd:IDREF }?,
-    paragraph+
-    }
-    
-    formula =
-    element formula {
-    attribute id { xsd:ID },
-    attribute unnumbered { xsd:boolean }?,
-    stem, dl?, note*
-    }
-    
-    quote =
-    element quote {
-    attribute id { xsd:ID },
-    attribute alignment { Alignments }?,
-    quote-source?,
-    quote-author?,
-    paragraph-with-footnote+,
-    note*
-    }
-    
-    quote-source =
-    element source { erefType }
-    
-    quote-author =
-    element author { text }
-    
-    sourcecode =
-    element sourcecode {
-    attribute id { xsd:ID },
-    attribute unnumbered { xsd:boolean }?,
-    attribute lang { text }?,
-    tname?, ( text | callout )+, annotation*, note*
-    }
-    
-    pre =
-    element pre {
-    attribute id { xsd:ID },
-    tname?, text, note*
-    }
-    
-    table =
-    element table {
-    attribute id { xsd:ID },
-    attribute unnumbered { xsd:boolean }?,
-    attribute alt { text }?,
-    attribute uri { xsd:anyURI }?,
-    tname?, thead?, tbody, tfoot?, table-note*, dl?
-    }
-    
-    tname = element name { text }
-    thead = element thead { tr }
-    tfoot = element tfoot { tr }
-    tbody = element tbody { tr+ }
-    
-    table-note = element note { paragraph }
-    
-    tr =
-    element tr { ( td | th )+ }
-    
-    td =
-    element td {
-    attribute colspan { text }?,
-    attribute rowspan { text }?,
-    attribute align { "left" | "right" | "center" }?,
-    (
-    (TextElement )* |
-    paragraph-with-footnote+
-    )
-    }
-    
-    th =
-    element th {
-    attribute colspan { text }?,
-    attribute rowspan { text }?,
-    attribute align { "left" | "right" | "center" }?,
-    (
-    (TextElement )* |
-    paragraph-with-footnote+
-    )
-    }
-    
-    example =
-    element example {
-    attribute id { xsd:ID },
-    attribute unnumbered { xsd:boolean }?,
-    ( formula | ul | ol | dl | quote | sourcecode | paragraph-with-footnote )+,
-    note*
-    }
-    
-    admonition =
-    element admonition {
-    attribute type { AdmonitionType },
-    attribute class { text }?,
-    attribute id { xsd:ID },
-    attribute uri { xsd:anyURI }?,
-    tname?,
-    paragraph-with-footnote*,
-    note*
-    }
-    
-    AdmonitionType = 
-    "warning" | "note" | "tip" | "important" | "caution" | "statement"
-    
-    figure =
-    element figure {
-    attribute id { xsd:ID },
-    attribute unnumbered { xsd:boolean }?,
-    source?, tname?, tclass?, (image | pre | figure*), fn*, dl?, note*
-    }
-    
-    TextElement =
-    text | em | eref | strong | stem | sub | sup | tt | underline | keyword | ruby |
-    strike | smallcap | xref | br | hyperlink | hr | pagebreak | bookmark | image
-    
-    PureTextElement =
-    text | em | strong | sub | sup | tt | underline | strike | smallcap | br 
-    
-    source = element source { TypedUri }
-    
-    em = element em { PureTextElement* }
-    strong = element strong { PureTextElement* }
-    tt = element tt { PureTextElement* }
-    keyword = element keyword { PureTextElement* }
-    sub = element sub { PureTextElement* }
-    sup = element sup { PureTextElement* }
-    strike = element strike { PureTextElement* }
-    underline = element underline { PureTextElement* }
-    smallcap = element smallcap { PureTextElement* }
-    
-    ruby = element ruby { ( PureTextElement | rp | rt )* }
-    rp =   element rp { PureTextElement* }
-    rt =   element rt { PureTextElement* }
-    
-    
-    br = element br { empty }
-    hr = element hr { empty }
-    pagebreak = element pagebreak { empty }
-    
-  -->
-  <!--
-    image =
-    element image {
-    attribute id { xsd:ID },
-    attribute src { xsd:anyURI },
-    attribute mimetype { text },
-    attribute filename { text }?,
-    attribute width { xsd:int | "auto" }?,
-    attribute height { xsd:int | "auto" }?,
-    attribute alt { text }?,
-    attribute longdesc { xsd:anyURI }?
-    }
-    
-    video =
-    element image {
-    attribute id { xsd:ID },
-    attribute src { xsd:anyURI },
-    attribute mimetype { text },
-    attribute filename { text }?,
-    attribute width { xsd:int | "auto" }?,
-    attribute height { xsd:int | "auto" }?,
-    attribute alt { text }?,
-    attribute longdesc { xsd:anyURI }?,
-    altsource*
-    }
-    
-    audio =
-    element image {
-    attribute id { xsd:ID },
-    attribute src { xsd:anyURI },
-    attribute mimetype { text },
-    attribute filename { text }?,
-    attribute alt { text }?,
-    attribute longdesc { xsd:anyURI }?,
-    altsource*
-    }
-    
-    altsource =
-    element altsource {
-    attribute src { xsd:anyURI },
-    attribute mimetype { text },
-    attribute filename { text }?
-    }
-    
-    
-    stem =
-    element stem {
-    attribute type { "MathML" | "AsciiMath" },
-    ( text | AnyElement )+
-    }
-    
-    annotation =
-    element annotation {
-    attribute id { xsd:ID },
-    paragraph
-    }
-    
-    ul =
-    element ul {
-    attribute id { xsd:ID },
-    li+, note*
-    }
-    
-    li =
-    element li { 
-    attribute id { xsd:ID }?,
-    paragraph-with-footnote+ 
-    }
-    
-    ol =
-    element ol {
-    attribute id { xsd:ID },
-    attribute type { ( "roman" | "alphabet" | "arabic" | 
-    "roman_upper" | "alphabet_upper" ) },
-    li+, note*
-    }
-    
-    dl =
-    element dl {
-    attribute id { xsd:ID },
-    (dt, dd)+, note*
-    }
-    
-    dt =
-    element dt { TextElement* }
-    
-    dd =
-    element dd { paragraph-with-footnote* }
-    
-    ext = 
-    element ext { BibDataExtensionType }
-    
-    BibDataExtensionType = 
-    doctype,
-    structuredidentifier*
-    
-    doctype = element doctype { DocumentType }
-  -->
   <define name="structuredidentifier">
-    <a:documentation>bare ID element, used for referencing arbitrary spans of text</a:documentation>
-    <!--
-      bookmark =
-      element bookmark {
-      attribute id { xsd:ID },
-      empty
-      }
-      
-      ReferenceFormat = ( "external" | "inline" | "footnote" | "callout" )
-      
-      eref =
-      element eref { erefType }
-      
-      erefType = 
-      attribute normative { xsd:boolean }?,
-      attribute citeas { text },
-      attribute type { ReferenceFormat },
-      attribute alt { text }?,
-      CitationType,
-      text
-      
-      hyperlink =
-      element link {
-      attribute target { xsd:anyURI },
-      attribute type { ReferenceFormat },
-      attribute alt { text }?,
-      text
-      }
-      
-      xref =
-      element xref {
-      attribute target { xsd:IDREF },
-      attribute type { ReferenceFormat },
-      attribute alt { text }?,
-      text
-      }
-      
-      fn =
-      element fn {
-      attribute reference { text },
-      paragraph+
-      }
-    -->
-    <a:documentation>This is xref with fixed @type="footnote", and @target built in as paragraph+
-@reference replaces ReferenceElement/text
-so &lt;fn reference="2"&gt;&lt;p&gt;This is a footnote&lt;/p&gt;&lt;/fn&gt;
-corresponds to 
-&lt;eref type="footnote" target="fn2"&gt;2&lt;/xref&gt; &lt;p id="fn2"&gt;This is a footnote&lt;/p&gt;</a:documentation>
-    <!--
-      
-      callout =
-      element callout {
-      attribute target { xsd:IDREF },
-      text
-      }
-      
-    -->
-    <a:documentation>This is xref with fixed @type="callout"; the target by convention is in an annotation in the same source code snippet
-so &lt;callout target="xyz"&gt;1&lt;/callout&gt;
-corresponds to &lt;xref type="callout" target="xyz"&gt;1&lt;/xref&gt;
-</a:documentation>
     <element name="structuredidentifier">
       <optional>
         <attribute name="type"/>
@@ -815,11 +486,4 @@ corresponds to &lt;xref type="callout" target="xyz"&gt;1&lt;/xref&gt;
       </optional>
     </element>
   </define>
-  <!--
-    DocumentType = ( "document" )
-    
-    BibData =
-    BibliographicItem,
-    ext?
-  -->
 </grammar>