metanorma-gb 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 855b2e263e1e3ce0fd6b01c5a957258d946d32ca4c8c82e1063273623238c91d
-  data.tar.gz: 4b89c14b7a504a6152865aadf223fea4652d93ff3da642b8a61e84586d206ef5
+  metadata.gz: 4b188cd8949516d5a329e9359dffc4d2d4435093d0828eee08fccb1b4f2fd56f
+  data.tar.gz: dd5f07e29f3929c69cc2eb14f7302caafee0b949f7a847a781f185bcd1aabafa
 SHA512:
-  metadata.gz: 42276795f4c0f2899699b7a2eab5ca2d5d1357d4808c485ce35d04538becc1c6d2fb7d2b53e91a9a8a470726f069c4c690287345cfbdfa5dd657dfa31f71f8b6
-  data.tar.gz: 567eb01aa9b26dce3ad5ad3b431429e5a2ee069f628825aab3f5a38e7f2ac904df66beaca28ef8ff6623369b688b24c8eecef362daa5ed46f5162d33bd4024ea
+  metadata.gz: f6e44b4c312a86af41d5a1a4ab4f5da0ee1e5d6ea68ee5b45d73b2d4911d085d2b2b5cf05c02ae6b15019554b97fb6eaf96e5c002a5e152b4ef5aee56237b6a9
+  data.tar.gz: f954252119693d800bcf4eca0f475f4bed5ef6b514da40972f591dae5d594f6f21b8e3216d7caa590b1c0a290aaa573a10f0d92919a4af35af6d251c6c110f14

data/README.adoc

@@ -1,8 +1,9 @@
 = metanorma-gb: Authoring Chinese standards (GuoBiao, sector...) in AsciiDoc
 
 image:https://img.shields.io/gem/v/metanorma-gb.svg["Gem Version", link="https://rubygems.org/gems/metanorma-gb"]
-image:https://img.shields.io/travis/riboseinc/metanorma-gb/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-gb"]
-image:https://codeclimate.com/github/riboseinc/metanorma-gb/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-gb"]
+image:https://img.shields.io/travis/metanorma/metanorma-gb/master.svg["Build Status", link="https://travis-ci.org/metanorma/metanorma-gb"]
+image:https://ci.appveyor.com/api/projects/status/7i4umln73wqv88vh?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/metanorma-gb"]
+image:https://codeclimate.com/github/metanorma/metanorma-gb/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-gb"]
 
 == Functionality
 
@@ -10,17 +11,17 @@ This gem generates
 https://en.wikipedia.org/wiki/Guobiao_standards[Guobiao standards]
 (Chinese national standards), using AsciiDoc.
 
-This gem implements the https://github.com/riboseinc/gbdoc[GbDoc] data model,
+This gem implements the https://github.com/metanorma/metanorma-model-gb[GbDoc] data model,
 which inherits from
-https://github.com/riboseinc/isodoc-models[IsoDoc and StandardDocument].
+https://github.com/metanorma/metanorma-model-standoc[StandardDocument document model].
 
 The code of this gem inherits from
-https://github.com/riboseinc/metanorma-iso[metanorma-iso], a gem used to
+https://github.com/metanorma/metanorma-iso[metanorma-iso], a gem used to
 generate ISO standards using Asciidoc.
 
 The two standards formats are closely aligned. Refer to the ISO gem
 for guidance, including
-https://github.com/riboseinc/metanorma-iso/wiki/Guidance-for-authoring[IsoDoc: Guidance for authoring]
+https://github.com/metanorma/metanorma-iso/wiki/Guidance-for-authoring[IsoDoc: Guidance for authoring]
 
 The gem can also be used to generate Chinese local or sector standards, which
 have the same format; the gem formats the title page to have the correct
@@ -75,286 +76,18 @@ $ asciidoctor -b gb -r 'metanorma-gb' a.adoc
 
 === Installation
 
-If you are using a Mac, the https://github.com/riboseinc/metanorma-macos-setup
+If you are using a Mac, the https://github.com/metanorma/metanorma-macos-setup
 repository has instructions on setting up your machine to run Metanorma
 scripts such as this one. You need only run the following in a Terminal console:
 
 [source,console]
 ----
-$ bash <(curl -s https://raw.githubusercontent.com/riboseinc/metanorma-macos-setup/master/metanorma-setup)
+$ bash <(curl -s https://raw.githubusercontent.com/metanorma/metanorma-macos-setup/master/metanorma-setup)
 $ gem install metanorma-gb
 ----
 
 
-== Differences from `metanorma-iso`
+== Documentation
 
-=== Document Attributes
+See https://www.metanorma.com/author/gb/[Author Chinese Guobiao standards using Metanorma].
 
-In the following, "GB standard" should be read to refer to any Chinese
-national, sector or local standard. Asterisked document attributes are
-mandatory.
-
-`:title-intro-zh:`, `:title-main-zh:`*, `:title-part-zh:`::
-These are the title introduction, main title, and part title in Chinese.
-The intro and part titles are optional.
-(They replace their French counterparts in
-https://github.com/riboseinc/metanorma-iso[metanorma-iso].)
-This and the other `:title-*` document attributes are used instead
-of the metanorma-standoc `:title:` attribute and the default Asciidoctor title
-(the first line of the document header, prefixed with `=`).
-
-`:title-intro-en:`, `:title-main-en:`*, `:title-part-en:`::
-These are the title introduction, main title, and part title in English.
-The intro and part titles are optional.
-(They form the document subtitle, instead of the document title as in
-https://github.com/riboseinc/metanorma-iso[metanorma-iso].)
-
-`:technical-committee-type:`::
-The type of the technical committee (`technical` or `provisional`).
-
-`:iso-standard:`::
-(optional) A corresponding ISO standard that the GB standard relates to. Format
-is full document code, then optionally comma followed by document title;
-e.g. `ISO/IEC 27001:2013, Information security management systems`
-
-`:equivalence:`::
-(optional, only valid if there is a corresponding `:iso-standard:`)
-The relation of the GB standard to the corresponding ISO standard
-(`equivalent`, `identical`, `nonequivalent`). Defaults to `equivalent`.
-
-`:obsoletes:`::
-(optional)
-A corresponding GB standard that this GB standard obsoletes. Format is full
-document code, then optionally comma followed by document title;
-e.g. `GB/T 22080-2008`
-
-`:obsoletes-parts:`::
-A list of bibliographic localities in the corresponding GB standard that this
-GB standard obsoletes. These are formatted the same way as the localities in
-citations; e.g. `clause 7-9, clause 11`
-
-`:scope:`::
-The scope of the GB standard (`national`, `sector`, `professional`, `local`,
-`enterprise`, `social-group`). Defaults to `national`.
-
-`:mandate:`::
-The mandate of the GB standard (`mandatory`, `recommended`, `guidelines`).
-Defaults to `mandatory`.
-
-`:topic:`::
-The topic of the GB standard (`basic`, `health-and-safety`, `environment-protection`, `engineering-and-construction`, `product`, `method`, `management-techniques`, `other`). Defaults to `basic`.
-
-`:prefix:`::
-The prefix classifying the GB standard.
-(Refer to
-https://github.com/riboseinc/gbdoc/blob/master/models/gb-standard-national-prefix.adoc[GB National Standard Prefixes],
-https://github.com/riboseinc/gbdoc/blob/master/models/gb-standard-sector-prefix.adoc[GB Sector Standard Prefixes],
-https://github.com/riboseinc/gbdoc/blob/master/models/gb-standard-local-prefix.adoc[GB Local Standard Prefixes],
-https://github.com/riboseinc/metanorma-gb/issues/54[GB Social and Enterprise Standard Prefixes].)
-Any `/Z` or `/T` suffix (indicating "recommended" and "guidelines" mandate) is 
-ignored unless the `:mandate:` attribute is not given. Any `Q/` or `T/` prefix for social and enterprise
-standards is ignored unless the `:scope:` attribute is not given.
-
-`:library-ics:`::
-The ICS (International Categorization for Standards) number for the GB standard. There may be more than one ICS for a document; if so, they should be comma-delimited. (Unlike the case for ISO, the ICS identifier is output to the front page of the GB standard.)
-
-`:library-ccs:`::
-The CCS (Chinese Categorization Scheme) code for the GB standard. See https://github.com/riboseinc/cn-ccs-codes
-
-`:plan-number:`::
-The Plan Number (计划单号) for the GB standard.
-
-`:issuer:`::
-The issuer of the standard. This is the authority which authors, manages, and issues the standard. For social standards, this is the social group; for enterprise standards, this is the company. The issuer appears on the standard frontispiece. By default, the issuer is inferred from the prefix of the standard; this attribute overrides the value inferred from the prefix. It is required for social and entperprise standards.
-
-`:publisher:`::
-The publisher of the standard, which distributes the standard. This is distinct from the issuer, the authority which authors, manages, and issues the standard.
-
-`:proposer:`::
-The party which proposed the standard.
-
-`:authority:`::
-The authority which sponsored the standard.
-
-`:author:`::
-The individuals who drafted the standard.
-
-`:author-committee:`::
-The committees which drafted the standard. (Also `:author-committee_2:`, `:author-committee_3:`...)
-
-`:title-font:`::
-The font to use for the standard class and issuer on the (Word) cover page; described in GB/T 1.1 as 
-"custom font". If not provided, the font is inferred from the scope of the standard, aligning
-with existing practice: SimSun for national scope, SimHei for all other scopes.
-
-`:keep-boilerplate:`::
-
-If absent (default), any paragraphs supplied at the start of the Terms and Definitions
-section are deleted, and replaced with standard boilerplate. If present, any such
-paragraphs in the text are retained.
-
-`:standard-logo-img:`::
-User-supplied graphic to overwrite the logo for the standard on the title page.
-
-`:standard-class-img:`::
-User-supplied graphic to overwrite the name of the standard class on the title page.
-
-`:standard-issuer-img:`::
-User-supplied graphic to overwrite the name of the standard issuer on the title page.
-
-=== Language macros
-
-In Terms and Definitions, preferred terms, alternate terms and deprecated terms
-are expected to be given in both Chinese and English. By default, the gem does
-this by detecting space-delimited runs of Han or Latin script text:
-
-[source,asciidoc]
---
-alt:[rough rice 糙米]
---
-
-[source,xml]
---
-<admitted language="zh">糙米</admitted> <admitted language="en">rough rice</admitted>
---
-
-However if there is script mixing in a term -- if the Chinese term contains
-a Latin script acronym or a mathematical expression, for example -- the
-Chinese term will not be detected correctly. To address this, the formatting macros
-`+[zh]#...#+` and `+[en]#...#+` are used. If they are present, then the content
-of those macros is treated as the Chinese and English equivalents of the
-parent node instead:
-
-[source,asciidoc]
---
-=== [en]#XYZ paddy# [zh]#水稻XY#]
-alt:[[en]#rough rice# [zh]#糙米#]
---
-
-[source,xml]
---
-<preferred language="en">XYZ paddy</preferred> <preferred language="zh">水稻XYZ</preferred>
-<admitted language="zh">糙米</admitted> <admitted language="en">rough rice</admitted>
---
-
-Unfortunately no further markup is permitted within the `+[zh]#...#+` and
-`+[en]#...#+` macros by Asciidoctor, and Asciidoctor does not correctly nest
-inline macros within other inline macros (so `+alt:[en:[_xyz_] zh:[xyz]+`
-would not give correct behaviour either.)
-
-Localisation strings can be used anywhere else in the document where the
-grammar permits localised strings (notably in bibliographic data). For example,
-a bibliographic title can be given in two languages as follows. (Note that formatting appears outside the language macros.)
-
-[source,asciidoc]
---
-[[[ISO7301,ISO 7301:2011]]], _[zh]#大米 - 规格# [en]#Rice -- Specification#_
---
-
-[source,xml]
---
-  <bibitem id="ISO7301" type="standard">
-   <title language="zh">大米 - 规格</title> <title language="en">Rice&#x2011;Specification</title>
-  <docidentifier>ISO 7301</docidentifier>
-  <date type="published">
-    <from>2011</from>
-  </date>
-  <contributor>
-    <role type="publisher"/>
-    <organization>
-      <name>International Organization for Standardization</name>
-      <abbreviation>ISO</abbreviation>
-    </organization>
-  </contributor>
-</bibitem>
---
-
-The gem also supports `+[zh-Hant]#...#+` and `+[zh-Hans]#...#+` to
-differentiate traditional and simplified script in ISOXML; `zh-Hant` is
-provisionally supported through changing font in the output.
-
-== Caveats
-
-=== Microsoft Word
-
-The Word output is meticulously aligned to the GB/T 1.1 specification, which is highly
-prescriptive on the positioning of elements on the page. This means that the Word output
-uses http://www.addbalance.com/word/frames_textboxes.htm[frames] and 
-https://en.wikipedia.org/wiki/Vector_Markup_Language[VML] extensively, as the best mechanism 
-Word HTNL has to ensure precise positioning of elements. However, the use of frames
-makes Word documents more cumbersome to edit; it is envisaged that the bulk of document
-editing should be happening in Asciidoctor, with Word treated as a write-only output format.
-
-The use of VML and frames is mostly confined to the cover page, which is the most heavily
-prescribed by GB/T 1.1. However, Word as of 2016 suppresses space before a paragraph
-after a page break (though not a section break--which means that the Foreword, Introduction,
-Document Title, Annex and Bibliography titles would all either lose their mandated initial
-space in Word, or else would all have to be treated as separate sections. For that reason,
-those headings are instead treated by this gem as frames (in-line with their following text),
-which preserve their initial spacing.
-
-=== GB/T 1.1 Compliance
-
-GB/T 1.1-2009 prescribes the format of GB standards meticulously, and is based on ISO/IEC DIR 2-2004
-(though it is not equivalent, and ISO/EIC DIR 2 is less prescriptive about layout). 
-GB issued a template program for generating compliant Word documents
-in 2010; this program no longer executes on Windows. (This gem has extracted its stylesheet for
-use in formatting output, but the stylesheet itself had to be modified in places to comply with
-GB/T 1.1.)
-
-Compliance of GB standards with GB/T 1.1 has been patchy. This has been exacerbated by the fact that
-ISO/IEC DIR 2 was substantially revised in 2011 and again in 2016. Although GB/T 1.1 has not been
-updated to align with ISO/IEC DIR 2-2016, published GB standards increasingly are formatted according
-to ISO in most areas where ISO and GB now conflict.
-
-This gem attempts to align with current best practice of GB standards, and does so in consultation with
-GB. GB/T 19018-2017 has been used as the exemplar standard.
-
-The following area the areas where the gem's Word output aligns with or deviates from GB/T 1.1-2009.
-
-* https://github.com/riboseinc/metanorma-gb/issues/58[Measurements (GB/T 1.1 Annex I.)] The gem
-scrupulously aligns with the measurements prescribed in GB/T, to a greater extent than the 2010
-template tool. As already noted, it makes extensive use of frames to ensure correct vertical positioning
-of headers, and of elements on the cover page.
-
-* https://github.com/riboseinc/metanorma-gb/issues/56[Fonts (GB/T 1.1 Annex J.)] The gem aligns
-with the fonts and font sizes prescribed in GB/T. (The only exception is the standard name, for which a
-point size of 72 is quite unrealistic: 26pt is used instead, in compliance with the preexisting Word 
-template.) For Simplified Chinese script, the gem uses by default SimSun as its "serif" font, and SimHei 
-has its "sans-serif" font; this reflects practice in the 
-Word templates used for GB. For Latin script, it uses Cambria as its serif font, and Calibri as its
-sans-serif font; this is to minimise disruption moving between scripts. (Note that the stylesheets
-make minimal use of boldface and italics, as these are not well-matched with Chinese typography;
-the sans-serif font occupies the niche that boldface occupies in ISO Latin-script documents.)
-+
-GB/T 1.1 prescribes a "custom font" for the standard class and standard issuer on the cover page.
-By default, this is the serif font for standards with national scope, and the sans-serif font for
-all other scopes. All font selections can be overriden in the document attributes (`:bodyfont:`,
-`:headerfont:`, `:titlefont:`.)`
-
-* https://github.com/riboseinc/metanorma-gb/issues/57[Layout (GB/T 1.1 Clause 9.)]. The gem complies
-with GB/T 1.1, with the following exceptions where it follows ISO/IEC DIR 2-2016 practice instead:
-
-** 9.3: There are no separate tables of figures, tables of tables, or tables of annexes. Table of Contents
-indentation in the 2010 stylesheet did not comply with GB/T 1.1.
-
-** 9.5.2: Normal references and Bibliography references are indented like normal paragraphs, instead of
-having a hanging indent ("on overflow they should be indented to the top level"); in fact, GB/T 1.1
-does not follow this in its own references list.
-
-** 9.5.3: Terms and Definitions is aligned with ISO/IEC DIR 2: there is provision for alternate and
-deprecated terms, and term sources are notated in brackets whether they are modified or direct citations
-from the source document, instead of being treated as a note in the latter case. 
-(https://github.com/riboseinc/metanorma-gb/issues/67) Clauses numbers are separated from the term
-source reference by a dash. References to terms defined elsewhere in the Terms and Definitions clause
-are accompanied with clause references.
-
-** 9.9.3: Figure footnotes are not longer treated as footnotes, but are instead merged into the figure
-key, as is done in ISO/IEC DIR 2. Footnote indentation and note indentation in the 2010 stylesheet 
-did not comply with GB/T 1.1.
-
-** 9.9.4: Example labels do not appear on a separate line. Examples like notes have a hanging indent,
-so that their content is left-aligned.
-
-** 9.9.5: Formulas are centered in the page, but are not connected with the formula number with a
-dotted tab.

data/lib/asciidoctor/gb/biblio.rng

@@ -156,9 +156,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="uri"/>
-      </optional>
+      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -246,9 +246,9 @@
       <optional>
         <ref name="abbreviation"/>
       </optional>
-      <optional>
+      <zeroOrMore>
         <ref name="uri"/>
-      </optional>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="org-identifier"/>
       </zeroOrMore>
@@ -469,12 +469,13 @@
       <value>film</value>
       <value>video</value>
       <value>broadcast</value>
-      <value>graphic work</value>
+      <value>graphic_work</value>
       <value>music</value>
       <value>patent</value>
       <value>inbook</value>
       <value>incollection</value>
       <value>inproceedings</value>
+      <value>journal</value>
     </choice>
   </define>
   <define name="BibliographicItem">
@@ -739,39 +740,44 @@
     <element name="series">
       <optional>
         <attribute name="type">
-          <choice>
-            <value>main</value>
-            <value>alt</value>
-          </choice>
+          <ref name="SeriesType"/>
         </attribute>
       </optional>
       <choice>
-        <ref name="btitle"/>
         <ref name="formattedref"/>
+        <group>
+          <ref name="btitle"/>
+          <optional>
+            <ref name="bplace"/>
+          </optional>
+          <optional>
+            <ref name="seriesorganization"/>
+          </optional>
+          <optional>
+            <ref name="abbreviation"/>
+          </optional>
+          <optional>
+            <ref name="seriesfrom"/>
+          </optional>
+          <optional>
+            <ref name="seriesto"/>
+          </optional>
+          <optional>
+            <ref name="seriesnumber"/>
+          </optional>
+          <optional>
+            <ref name="seriespartnumber"/>
+          </optional>
+        </group>
       </choice>
-      <optional>
-        <ref name="bplace"/>
-      </optional>
-      <optional>
-        <ref name="seriesorganization"/>
-      </optional>
-      <optional>
-        <ref name="abbreviation"/>
-      </optional>
-      <optional>
-        <ref name="seriesfrom"/>
-      </optional>
-      <optional>
-        <ref name="seriesto"/>
-      </optional>
-      <optional>
-        <ref name="seriesnumber"/>
-      </optional>
-      <optional>
-        <ref name="seriespartnumber"/>
-      </optional>
     </element>
   </define>
+  <define name="SeriesType">
+    <choice>
+      <value>main</value>
+      <value>alt</value>
+    </choice>
+  </define>
   <define name="seriesorganization">
     <element name="organization">
       <text/>
@@ -849,6 +855,7 @@
           <value>includes</value>
           <value>instance</value>
           <value>partOf</value>
+          <value>hasDraft</value>
         </choice>
       </attribute>
       <element name="bibitem">
@@ -861,9 +868,6 @@
   </define>
   <define name="version">
     <element name="version">
-      <optional>
-        <ref name="vedition"/>
-      </optional>
       <optional>
         <ref name="revision-date"/>
       </optional>

data/lib/asciidoctor/gb/converter.rb

@@ -28,7 +28,7 @@ module Asciidoctor
         result << "</gb-standard>"
         result = textcleanup(result)
         ret1 = cleanup(Nokogiri::XML(result))
-        validate(ret1)
+        validate(ret1) unless @novalid
         ret1.root.add_namespace(nil, GB_NAMESPACE)
         ret1
       end

data/lib/asciidoctor/gb/isodoc.rng

@@ -18,6 +18,7 @@
   of this.
 -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="reqt.rng"/>
   <include href="biblio.rng">
     <define name="status">
       <element name="status">

data/lib/asciidoctor/gb/reqt.rng

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <!--
+    Presupposes isodoc.rnc, is included in it
+    include "isodoc.rnc" { }
+  -->
+  <define name="requirement">
+    <element name="requirement">
+      <ref name="RequirementType"/>
+    </element>
+  </define>
+  <define name="recommendation">
+    <element name="recommendation">
+      <ref name="RequirementType"/>
+    </element>
+  </define>
+  <define name="permission">
+    <element name="permission">
+      <ref name="RequirementType"/>
+    </element>
+  </define>
+  <define name="RequirementType">
+    <optional>
+      <attribute name="obligation">
+        <ref name="ObligationType"/>
+      </attribute>
+    </optional>
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <ref name="reqtitle"/>
+    </optional>
+    <optional>
+      <ref name="label"/>
+    </optional>
+    <optional>
+      <ref name="subject"/>
+    </optional>
+    <optional>
+      <ref name="reqinherit"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="classification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <choice>
+        <ref name="measurementtarget"/>
+        <ref name="specification"/>
+        <ref name="verification"/>
+        <ref name="import"/>
+        <ref name="description"/>
+      </choice>
+    </zeroOrMore>
+    <optional>
+      <ref name="reqt_references"/>
+    </optional>
+    <zeroOrMore>
+      <choice>
+        <ref name="requirement"/>
+        <ref name="recommendation"/>
+        <ref name="permission"/>
+      </choice>
+    </zeroOrMore>
+  </define>
+  <define name="reqtitle">
+    <element name="title">
+      <ref name="FormattedString"/>
+    </element>
+  </define>
+  <define name="label">
+    <element name="label">
+      <text/>
+    </element>
+  </define>
+  <define name="subject">
+    <element name="subject">
+      <text/>
+    </element>
+  </define>
+  <define name="reqinherit">
+    <element name="subject">
+      <text/>
+    </element>
+  </define>
+  <define name="measurementtarget">
+    <element name="measurement-target">
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
+  <define name="specification">
+    <element name="specification">
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
+  <define name="verification">
+    <element name="verification">
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
+  <define name="import">
+    <element name="import">
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
+  <define name="description">
+    <element name="description">
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
+  <define name="reqt_references">
+    <element name="references">
+      <oneOrMore>
+        <ref name="bibitem"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="RequirementSubpart">
+    <optional>
+      <attribute name="type"/>
+    </optional>
+    <optional>
+      <attribute name="exclude">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <oneOrMore>
+      <ref name="BasicBlock"/>
+    </oneOrMore>
+  </define>
+  <define name="ObligationType">
+    <choice>
+      <value>requirement</value>
+      <value>recommendation</value>
+      <value>permission</value>
+    </choice>
+  </define>
+  <define name="classification">
+    <element name="classification">
+      <ref name="classification_tag"/>
+      <ref name="classification_value"/>
+    </element>
+  </define>
+  <define name="classification_tag">
+    <element name="tag">
+      <text/>
+    </element>
+  </define>
+  <define name="classification_value">
+    <element name="value">
+      <text/>
+    </element>
+  </define>
+</grammar>

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.1.3"
+    VERSION = "1.1.4"
   end
 end

data/metanorma-gb.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
     Formerly known as asciidoctor-gb.
   DESCRIPTION
 
-  spec.homepage      = "https://github.com/riboseinc/metanorma-gb"
+  spec.homepage      = "https://github.com/metanorma/metanorma-gb"
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -254,6 +254,7 @@ files:
 - lib/asciidoctor/gb/gbstandard.rng
 - lib/asciidoctor/gb/isodoc.rng
 - lib/asciidoctor/gb/isostandard.rng
+- lib/asciidoctor/gb/reqt.rng
 - lib/asciidoctor/gb/section_input.rb
 - lib/asciidoctor/gb/validate.rb
 - lib/isodoc/gb/gbcleanup.rb
@@ -305,7 +306,7 @@ files:
 - lib/metanorma/gb/processor.rb
 - lib/metanorma/gb/version.rb
 - metanorma-gb.gemspec
-homepage: https://github.com/riboseinc/metanorma-gb
+homepage: https://github.com/metanorma/metanorma-gb
 licenses:
 - BSD-2-Clause
 metadata: {}