metanorma-iso 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37a689d47337189ccb75b778d9452f91b171b6b56c16480ce1bc593114205517
-  data.tar.gz: a7234ed37edccea8e3186341ac9395fdd4d0279147265b7a7ed696a65ece1501
+  metadata.gz: 2f22c94d1c862cca77258350af0650f8b736410dc43faa81491fb81e4d5c1181
+  data.tar.gz: f63dbc9d704fb62c6dce58a35c415342c3b706c5fd808c8523f6092215e90c99
 SHA512:
-  metadata.gz: 373fc89b917011e0faf4f099f487277966e9e4727042c593ff46dbf80b36b76ea2574509e315eb2e0f478de60e68820ccd16d5de4113600dda0ea6e73673dc70
-  data.tar.gz: 71cb3917f0c13efe5c6a8b8afbc7770d0201ddb90ef6b9e576ceb21d9b87d8aaefdbab4ba0aea7262e6a2edfa43052cefb364bc3a8e8052610ad4b28b743c9b8
+  metadata.gz: 7829b974b2acc494439813ea14e184f7b1c0bdda2d8f6c2aefb7154963a64d0371fb0cdf93908a50e78bc7cb5fa958226ca6d2fe44da3088fefe6ecd287fc877
+  data.tar.gz: bb8bab6f488ca2d35314567a483c69f08ec4500c633d2a8b0d32ca2e869a453d8485ac2bd25beeabb7a904547e27a5df0d615995f16f2457d74e20010ca589f5

data/.travis.yml

@@ -8,14 +8,8 @@ rvm:
   - ruby-head
 before_install:
   - gem install bundler -v 2.0.1
-  - unset _JAVA_OPTIONS
-  - wget "http://downloads.sourceforge.net/project/plantuml/plantuml.jar?r=&ts=1424308684&use_mirror=jaist" -O plantuml.jar
-  - sudo mkdir -p /opt/plantuml
-  - sudo cp plantuml.jar /opt/plantuml
-  - echo "#! /bin/sh" > plantuml.sh
-  - echo 'exec java -jar /opt/plantuml/plantuml.jar "$@"' >> plantuml.sh
-  - sudo install -m 755 -D plantuml.sh /usr/bin/plantuml
-  - plantuml -version
+  - travis_retry sudo apt-get update
+  - sudo bash -c "curl -L https://raw.githubusercontent.com/metanorma/plantuml-install/master/ubuntu.sh | bash"
 matrix:
   allow_failures:
     - rvm: ruby-head

data/README.adoc

@@ -1,8 +1,9 @@
 = Metanorma-ISO: Metanorma processor for ISO standards
 
 image:https://img.shields.io/gem/v/metanorma-iso.svg["Gem Version", link="https://rubygems.org/gems/metanorma-iso"]
-image:https://img.shields.io/travis/riboseinc/metanorma-iso/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-iso"]
-image:https://codeclimate.com/github/riboseinc/metanorma-iso/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-iso"]
+image:https://img.shields.io/travis/metanorma/metanorma-iso/master.svg["Build Status", link="https://travis-ci.org/metanorma/metanorma-iso"]
+image:https://ci.appveyor.com/api/projects/status/hnc1wnc8i9nquqqb?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/metanorma-iso"]
+image:https://codeclimate.com/github/metanorma/metanorma-iso/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-iso"]
 
 WARNING: This gem is still under development.
 
@@ -10,7 +11,7 @@ _Formerly known as_ `asciidoctor-iso`.
 
 == Functionality and Approach
 
-For the conceptual underpinnings of this gem, and the other gems in the Metanorma suite, see the https://github.com/riboseinc/metanorma-model-standoc/blob/master/README.adoc[metanorma-standoc README].
+For the conceptual underpinnings of this gem, and the other gems in the Metanorma suite, see the https://github.com/metanorma/metanorma-model-standoc/blob/master/README.adoc[metanorma-standoc README].
 
 == Outputs
 
@@ -54,13 +55,13 @@ The gem then converts the XML into HTML and DOC.
 
 === 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-iso
 $ gem install metanorma-cli 
 ----
@@ -68,177 +69,7 @@ $ gem install metanorma-cli
 The metanorma-cli gem is the command-line interface for the Metanorma tool suite
 (incorporating the `metanorma` executable seen above).
 
-=== Content Warnings
+== Documentation
 
-The gem also realises several format
-checks as prescribed in ISO/IEC DIR 2:2018, and warns the user about them in the
-console:
-
-* Numbers with what looks like dots instead of commas for decimal points.
-
-* Groups of numbers without spacing for every three digits. (The gem attempts
-to ignore ISO references.)
-
-* No space before percent sign.
-
-* No bracketing of tolerance in percentage (e.g. `15 ± 7 % .`)
-
-* No recommendations, permissions or requirements (detected by keyword) in:
-foreword, scope, introduction, term examples and examples, notes, footnotes.
-
-* No subclauses that are the only child of a clause. (In clauses, annexes, or
-scopes.)
-
-* 5 levels of subclause nesting. (Never actuated, AsciiDoc only permits 4
-levels of subsections.)
-
-* Non-ISO/IEC reference turning up as normative.
-
-* Term definition starts with an article, or ends with a period.
-
-* Title intro or title part appears in only one of French or English.
-
-In addition, the gem checks all terms cited from the IEV Electropedia against
-the online IEV Electropedia entry, and issues a warning if the term is different.
-
-The document model for ISO Standards contains all the structures described
-in http://www.iec.ch/members_experts/refdocs/iec/isoiecdir-2%7Bed7.0%7Den.pdf[ISO/IEC DIR 2 "Principles and rules for the structure and drafting of ISO and IEC documents"]. 
-It is expressed as a
-link:lib/metanorma/iso/isostandard.rnc[Relax NG Compact schema]; actual
-validation occurs against its link:lib/metanorma/iso/isostandard.rng[full Relax
-NG counterpart]. 
-
-[[model_additions]]
-== Asciidoctor model additions
-
-Refer also to https://github.com/riboseinc/metanorma-standoc/blob/master/README.adoc; this section lists additions specific only to metanorma-iso
-
-=== Additional warning types
-
-Asciidoctor natively supports the ISO admonitions "Caution", "Warning", and "Important"
-through its admonition syntax:
-
-[source,asciidoctor]
---
-CAUTION: This is a single-block caution
-
-[WARNING]
-====
-This is a
-
-multiple-block warning
-====
---
-
-If the admonitions "Danger" and "Safety Precaution" are needed, they should be indicated
-through a `type` attribute, which will override the admonition type appearing in the Asciidoc:
-
-[source,asciidoctor]
---
-[type=Danger]
-CAUTION: This is a single-block caution
-
-[WARNING,type=Safety Precaution]
-====
-This is a
-
-multiple-block warning
-====
---
-
-=== Bibliography
-
-ISO treats dated and undated references as separate (an undated reference is taken to
-refer to the latest published edition of that reference.) if reference is to be made to
-both an undated and a dated version of an ISO reference, these need to be explicitly listed as
-separate references.
-
-For automated bibliography integration, see the https://github.com/riboseinc/metanorma-model-standoc/blob/master/README.adoc[metanorma-standoc README].
-
-[[document-attributes]]
-== Document Attributes
-
-The gem uses the document attributes defined for metanorma-standoc (see
-the https://github.com/riboseinc/metanorma-model-standoc/blob/master/README.adoc[metanorma-standoc README]).
-
-The following document attributes are specific to ISO:
-
-`:tc-docnumber:`:: The document number assigned by the Technical committee
-
-`:partnumber:`:: The ISO document part number. (This can be "part-subpart" if this is an IEC document.)
-
-`:title-intro-en:`:: The introductory component of the English title of the
-document. 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-main-en:`:: The main component of the English title of the document
-(mandatory). 
-
-`:title-part-en:`:: The English title of the document part
-
-`:title-intro-fr:`:: The introductory component of the French title of the
-document. (This document template presupposes authoring in English; a different
-template will be needed for French, including French titles of document
-components such as annexes.)
-
-`:title-main-fr:`:: The main component of the French title of the document
-(mandatory). 
-
-`:title-part-fr:`:: The French title of the document part
-
-`:doctype:`:: Has its possible values defined by 
-https://www.iso.org/deliverables-all.html[ISO deliverables: The different types of ISO publications]
-(mandatory). The permitted types are:
-`international-standard, technical-specification, technical-report,
-publicly-available-specification, international-workshop-agreement, guide`.
-
-`:docstage:`:: The stage code for the document status (see
-https://www.iso.org/stage-codes.html[International harmonized stage codes]).
-This attribute and `:docsubstage:` replace the `:status:` attribute of
-metanorma-standoc.
-
-`:docsubstage:`:: The substage code for the document status (see
-https://www.iso.org/stage-codes.html[International harmonized stage codes])
-
-`:iteration:`:: The iteration of a stage, in case there have been multiple drafts
-(e.g. `2` on a `CD`: this is the second iteration through the `CD` stage).
-
-`:secretariat:`:: The national body acting as the secretariat for the document
-in the deafting stage
-
-`:technical-committee-number:`:: The number of the relevant ISO technical
-committee (also `:technical-committee-number_2:`, `:technical-committee-number_3:`...;
-the same applies for all technical-committee, subcommittee and workgroup attributes)
-
-`:technical-committee-type:``:: The type of the relevant technical committee. Defaults
-to `TC` if not supplied. Values: `TC1, `PC`, `JTC`, `JPC`.
-
-`:technical-committee:`:: The name of the relevant ISO technical committee
-(mandatory)
-
-`:subcommittee-number:`:: The number of the relevant ISO subcommittee
-
-`:subcommittee-type:`:: The type of the relevant ISO subcommittee. Defaults to
-`SC` if not supplied. Values: `SC`, `JSC`.
-
-`:subcommittee:`:: The name of the relevant ISO subcommittee
-
-`:workgroup-number:`:: The number of the relevant ISO workgroup
-
-`:workgroup-type:`:: The type of the relevant ISO workgroup. Defaults to `WG` if
-not supplied. Example values: `JWG`, `JAG`, `AG` (advisory group), `AHG`, `SWG`, 
-`SG`, `MA` (maintenance agency), `CORG`, `JCG`, `CAG`
-
-`:workgroup:`:: The name of the relevant ISO workgroup
-
-== Examples
-
-The gem has been tested to date against the
-https://www.iso.org/publication/PUB100407.html["Rice document"], the ISO's
-model document of an international standard. Sample representation of the Rice document
-in Asciidoctor, and output formats, are included in the https://github.com/riboseinc/isodoc-rice
-repository.
-
-See also `link:spec/metanorma-iso[]` for individual features.
+See https://www.metanorma.com/author/iso/[The ISO flavor of Metanorma].
 

data/appveyor.yml

@@ -0,0 +1,30 @@
+version: '{build}'
+
+environment:
+  matrix:
+    - RUBY_VERSION: 25
+    - RUBY_VERSION: 24
+    - RUBY_VERSION: 23
+    - RUBY_VERSION: _trunk
+
+matrix:
+  allow_failures:
+    - RUBY_VERSION: _trunk
+
+install:
+  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
+  - refreshenv
+
+build_script:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle update
+  - bundle install
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake
+

data/docs/adopting-spec.adoc

@@ -1,12 +1,12 @@
 = How can I adopt the StanDoc specification for my own publications?
 
-TIP: Copy the RSD schema from https://github.com/riboseinc/metanorma-model-iso/blob/master/grammars/rsd.rng. You may need to adapt some of the enums in the model, or in the ISO Standards model that it inherits; but in the first instance, you can just ignore the differences—and ignore the validation feedback that the toolset gives.
+TIP: Copy the RSD schema from https://github.com/metanorma/metanorma-model-iso/blob/master/grammars/rsd.rng. You may need to adapt some of the enums in the model, or in the ISO Standards model that it inherits; but in the first instance, you can just ignore the differences—and ignore the validation feedback that the toolset gives.
 
 The Standoc specification is expressed in http://www.relaxng.org[RelaxNG schema for XML], and is intended to be customisable for different types of publication. The customisation of Standoc relies on inheritance, with the following schemas embedded hierarchically:
 
-* https://github.com/riboseinc/bib-models[Relaton]: bibliography
-* https://github.com/riboseinc/basicdoc-models[BasicDoc]: block-level and inline formatting
-* https://github.com/riboseinc/metanorma-standoc[StanDoc]: organisation of sections for a generic standards document
+* https://github.com/metanorma/relaton-models[Relaton]: bibliography
+* https://github.com/metanorma/basicdoc-models[BasicDoc]: block-level and inline formatting
+* https://github.com/metanorma/metanorma-standoc[StanDoc]: organisation of sections for a generic standards document
 * Models specific to standards
 
 Specialisation of a model consists of:
@@ -19,7 +19,7 @@ To adapt the schema for your publication set,
 
 * Get familiar with the Standoc set of models, and identify any elements that you would want to represent differently for your documents (different types, different enums), or enhance for your documents (additional element attributes, additional elements)
 * Create a grammar inheriting from StanDoc or from a specific standard, which expresses what is distinctive about your grammar.
-** We recommend starting your modelling in UML, as an effective communication tool; compare the UML models for Standoc standards at https://github.com/riboseinc/metanorma-model-iso
+** We recommend starting your modelling in UML, as an effective communication tool; compare the UML models for Standoc standards at https://github.com/metanorma/metanorma-model-iso
 ** The tool suite expects to validate against a set of schemas expressed in RelaxNG. We have been authoring grammars in RelaxNG Compact, as a more human-readable format, then compiling those grammars to RelaxNG using https://github.com/relaxng/jing-trang[jing-trang]. You can choose to use a different schema language, but you will need to customise the tool chain to validate against that form of schema instead.
 ** In order to make schema inheritance easier, we have avoided using namespaces for the individual schemas; a namespace is added to the standards-specific schema at the very end of the inheritance chain.
 

data/docs/adopting-toolchain.adoc

@@ -2,11 +2,11 @@
 
 [TIP]
 ====
-The easiest way to adopt StanDoc is to use the metanorma-acme gem: https://github.com/riboseinc/metanorma-acme, supplying your own stylesheets and HTML files for styling.
+The easiest way to adopt StanDoc is to use the metanorma-acme gem: https://github.com/metanorma/metanorma-acme, supplying your own stylesheets and HTML files for styling.
 
 If you wish to create a custom gem, in order to customise behaviour further:
 
-* Clone the metanorma-sample gem: https://github.com/riboseinc/metanorma-sample.
+* Clone the metanorma-sample gem: https://github.com/metanorma/metanorma-sample.
 * Change the namespace for RSD documents (`RSD_NAMESPACE = "https://open.ribose.com/standards/rsd"`) to a namespace specific to your organisation's document standard.
 * Change any references to `sample` or `Sample` in the gem to your organisation's document standard.
 * Change the styling of the document outputs (`.../lib/isodoc/XXX/html`).
@@ -26,7 +26,7 @@ The customisations needed for `Isodoc::Sample` are more extensive. Three base cl
 
 * `Isodoc::Metadata` processes the metadata about the document stored in `//bibdata`. This information typically ends up in the document title page, as opposed to the document body. For that reason, metadata is extracted into a hash, which is passed to document output (title page, Word header) via the https://shopify.github.io/liquid/[Liquid template language].
 * `Isodoc::HtmlConvert` converts Standoc XML to HTML.
-* `Isodoc::WordConvert` converts Standoc XML to Word HTML; the https://github.com/riboseinc/html2doc[html2doc] gem then converts this to a .doc document.
+* `Isodoc::WordConvert` converts Standoc XML to Word HTML; the https://github.com/metanorma/html2doc[html2doc] gem then converts this to a .doc document.
 
 The `Isodoc::HtmlConvert` and `Isodoc::WordConvert` overlap substantially, as both use variants of HTML. However there is no reason not to make substantially different rendering choices in the HTML and Word branches of the code.
 

data/docs/asciiiso-syntax.adoc

@@ -4,7 +4,7 @@ AsciiISO is syntax based on AsciiDoc, with some extensions specific to authoring
 
 == ISO specific syntax
 
-TIP: Full details of Asciidoctor-ISO–specific markup and conventions is given in the https://github.com/riboseinc/metanorma-iso/blob/master/README.adoc[Asciidoctor-ISO Readme] and the https://github.com/riboseinc/metanorma-iso/wiki/Guidance-for-authoring[Guidance for authoring].
+TIP: Full details of Asciidoctor-ISO–specific markup and conventions is given in the https://github.com/metanorma/metanorma-iso/blob/master/README.adoc[Asciidoctor-ISO Readme] and the https://github.com/metanorma/metanorma-iso/wiki/Guidance-for-authoring[Guidance for authoring].
 
 The sections that have a fixed position according to ISO/IEC DIR 2 (Introduction, Scope, Normative References, Terms and Definitions, Symbols and Abbreviations, Bibliography) need to be titled as such, as first-level headings.
 
@@ -16,7 +16,7 @@ Syntax includes the following; the links are to the Asciidoctor User Manual. All
 
 === https://asciidoctor.org/docs/user-manual/#doc-header[Document header]
 
-Attributes of the document, which typically appear in the coverpage (if at all), rather than in the document proper. The permitted attributes for all Metanorma documents, and their expected values, are documented in the https://github.com/riboseinc/metanorma-standoc#document-attributes[metanorma-standoc Readme]; each standards-specific gem adds documentation of its own specific attributes (e.g. https://github.com/riboseinc/metanorma-iso#document-attributes). 
+Attributes of the document, which typically appear in the coverpage (if at all), rather than in the document proper. The permitted attributes for all Metanorma documents, and their expected values, are documented in the https://github.com/metanorma/metanorma-standoc#document-attributes[metanorma-standoc Readme]; each standards-specific gem adds documentation of its own specific attributes (e.g. https://github.com/metanorma/metanorma-iso#document-attributes). 
 
 Note that the initial title line and author line expected in Asciidoctor are ignored in favour of specific document attributes, although they still need to be supplied for the document to be valid.
 

data/docs/guidance.adoc

@@ -8,16 +8,16 @@ The documents you will be authoring will be in the http://asciidoctor.org[Asciid
 
 * http://asciidoctor.org/docs/user-manual/[Asciidoctor User Manual] will be your companion.
 * https://www.metanorma.com/software/metanorma-iso/docs/asciiiso-syntax/[AsciiISO syntax] provides a quick reference for both standard Asciidoctor markup and custom ISO-related features.
-* See also https://github.com/riboseinc/metanorma-iso#asciidoctor-model-additions[Additions to markup made for ISO standards] in README Metanorma-ISO.
+* See also https://github.com/metanorma/metanorma-iso#asciidoctor-model-additions[Additions to markup made for ISO standards] in README Metanorma-ISO.
 
-We have tried to make things easier for you by preparing an https://github.com/riboseinc/metanorma-iso/blob/master/spec/examples/rice.adoc[AsciiDoc version] of the ISO Standard exemplar, the https://www.iso.org/publication/PUB100407.html["Rice document"].
+We have tried to make things easier for you by preparing an https://github.com/metanorma/metanorma-iso/blob/master/spec/examples/rice.adoc[AsciiDoc version] of the ISO Standard exemplar, the https://www.iso.org/publication/PUB100407.html["Rice document"].
 If you use this document as a template for your own ISO standard document, you will find most of the formatting you need illustrated there.
 
 == Output in different languages
 
 Metanorma allows generation of standards in different languages; the language of the document is specified in the `:language:` document attribute (and `:script:`, for languages with more than one script).
 
-For each language, language-specific templated text is specified for the boilerplate, labels and cross-references that are included in document output. Metanorma has predefined templates for English, Chinese (Simplified) and French. You can specify your own language by providing your own http://www.yaml.org/spec/1.2/spec.html[YAML] template file, and linking to it with the `:i18nyaml` document attribute. The YAML template you provide needs to match https://github.com/riboseinc/isodoc/blob/master/lib/isodoc/i18n-en.yaml, substituting translations for each of the fields given.
+For each language, language-specific templated text is specified for the boilerplate, labels and cross-references that are included in document output. Metanorma has predefined templates for English, Chinese (Simplified) and French. You can specify your own language by providing your own http://www.yaml.org/spec/1.2/spec.html[YAML] template file, and linking to it with the `:i18nyaml` document attribute. The YAML template you provide needs to match https://github.com/metanorma/isodoc/blob/master/lib/isodoc/i18n-en.yaml, substituting translations for each of the fields given.
 
 The Chinese (Simplified) template also localises punctuation and spacing, mapping them away from the default Latin punctuation used elsewhere in the gem.
 
@@ -56,7 +56,7 @@ The tool also validates terms cited from the Internatinal Electrotechnical Vocab
 
 == Document header
 
-The core metadata about the standard comes from the Asciidoctor document header (the list of colon-delimited attributes at the start of the document). The https://github.com/riboseinc/metanorma-standoc#document-attributes[metanorma-standoc README] and the README of each standard-specific gem documents what those fields should be. Use the Rice document as a template, and be careful about sticking to the guidelines on populating them.
+The core metadata about the standard comes from the Asciidoctor document header (the list of colon-delimited attributes at the start of the document). The https://github.com/metanorma/metanorma-standoc#document-attributes[metanorma-standoc README] and the README of each standard-specific gem documents what those fields should be. Use the Rice document as a template, and be careful about sticking to the guidelines on populating them.
 
 You will need to use the `:stem:` document attribute in if you have any AsciiMath or MathML to include in the document; otherwise they will not be detected.
 
@@ -142,7 +142,7 @@ The bracketed reference numbers are expected to be correct and in order: they ar
 
 ==== Relaton Reference Fetching
 
-The https://github.com/riboseinc/relaton[`relaton`] can fetch bibliographic entries for any standards known to have online bibliographic databases (ISO, IEC, IETF, GB). Any bibliographic entry recognised through its document identifier prefix will by default have its bibliographic entry fetched by that gem. The fetched data overrides any content about the item provided in the document, since the online bibliography is treated as the source of truth for that standards document.
+The https://github.com/metanorma/relaton[`relaton`] can fetch bibliographic entries for any standards known to have online bibliographic databases (ISO, IEC, IETF, GB). Any bibliographic entry recognised through its document identifier prefix will by default have its bibliographic entry fetched by that gem. The fetched data overrides any content about the item provided in the document, since the online bibliography is treated as the source of truth for that standards document.
 
 ==== Cross-References
 
@@ -168,7 +168,7 @@ TIP: ISO clause references in particular will suppress the word "Clause" before
 
 === Terms and Definitions
 
-// TODO: This paragraph will be removed when https://github.com/riboseinc/metanorma-iso/issues/222 is implemented
+// TODO: This paragraph will be removed when https://github.com/metanorma/metanorma-iso/issues/222 is implemented
 
 The title of a top-level Terms and Definitions clause is populated automatically, overriding the title provided by the user: if it contains a Symbols and Abbreviated Terms subclause, it is titled _Terms, definitions, symbols and abbreviated terms_, otherwise it is titled _Terms and definitions_. A Terms and Definitions clause will be recognised if either title is given, regardless of case. Symbols and Abbreviated Terms subclauses are also automatically titled; other subclauses of Terms and Definitions clauses are not.
 
@@ -418,7 +418,7 @@ Notes that are not at the end of a clause are folded into the preceding block, i
 
 === Reviewer Notes
 
-We have introduced a mechanism in the gem to annotate arbitrary blocks of text, using Asciidoctor sidebars and anchors for the beginning and end of the annotation; see https://github.com/riboseinc/metanorma-standoc#reviewer-notes[discussion in the metanorma-standoc README].
+We have introduced a mechanism in the gem to annotate arbitrary blocks of text, using Asciidoctor sidebars and anchors for the beginning and end of the annotation; see https://github.com/metanorma/metanorma-standoc#reviewer-notes[discussion in the metanorma-standoc README].
 
 == Cross-references
 

data/docs/htmloutput.adoc

@@ -22,7 +22,7 @@ The `body` of the HTML document is divided into the following parts:
 
 === Body markup
 
-Within the body of the document, different blocks and inline spans of the Metanorma document model (https://github.com/riboseinc/metanorma-model-standoc[Standoc XML], https://github.com/riboseinc/basicdoc-models[BasicDoc XML]) are represented by different CSS classes, as follows:
+Within the body of the document, different blocks and inline spans of the Metanorma document model (https://github.com/metanorma/metanorma-model-standoc[Standoc XML], https://github.com/metanorma/basicdoc-models[BasicDoc XML]) are represented by different CSS classes, as follows:
 
 ==== Sections
 
@@ -86,11 +86,11 @@ All images for an HTML document `{filename}.html` are moved to the folder `{file
 
 === Word HTML and Word HTML CSS
 
-The Word HTML documented here is what is used by the gems to generate DOC output. For more on why Word HTML is used, instead of OOXML or HTML 5 embedded into DOCX, see https://github.com/riboseinc/html2doc/wiki/Why-not-docx%3F
+The Word HTML documented here is what is used by the gems to generate DOC output. For more on why Word HTML is used, instead of OOXML or HTML 5 embedded into DOCX, see https://github.com/metanorma/html2doc/wiki/Why-not-docx%3F
 
 Word HTML, and the Word HTML version of CSS, are restricted compared to the HTML and CSS you are likely familiar with. Word HTML is a subset of HTML 4; Word HTML CSS has a weakened set of selectors, and a range of Microsoft-specific extensions (prefixed with `@` or `mso-`). The weakened set of selectors means you cannot assume that classes are inherited by their children; normal CSS would apply formatting on a `div` class to its child paragraphs, but Word HTML would expect you to repeat that class definition for `p`.
 
-Some of the necessary caveats are listed in https://github.com/riboseinc/html2doc/blob/master/README.adoc. The styling of lists in particular is quite different to normal CSS, and requires a Word-specific selector to define list styles (the `:ulstyle ` and `:olstyle ` parameter of `WordConvert.new()`).
+Some of the necessary caveats are listed in https://github.com/metanorma/html2doc/blob/master/README.adoc. The styling of lists in particular is quite different to normal CSS, and requires a Word-specific selector to define list styles (the `:ulstyle ` and `:olstyle ` parameter of `WordConvert.new()`).
 
 Word HTML and CSS is not well-documented (even though there is a 1500 page manual from Microsoft); fortunately saving Word documents to HTML will reveal the Word HTML and Word HTML CSS that can be used to generate the same formatting. The stylesheets need to follow the conventions of Word HTML, and should be formulated by saving Word documents as HTML, and extracting their CSS stylesheets. Note that the CSS is prefixed with a set of font definitions; these too should be obtained by saving Word documents as HTML.
 
@@ -100,7 +100,7 @@ The headers and footers of a Word document are defined in Word HTML in a separat
 
 The `head` of the Word HTML document contains two stylesheets (the `:wordstylesheet` and `:standardsheet` parameter of `WordConvert.new()`). The `:wordstylesheet` is intended as generic Word markup, while `:standardsheet` is intended to contain styling specific to the standard. No scripts are supported in Word HTML. 
 
-The other elements of the Word HTML head are populated by the https://github.com/riboseinc/html2doc[html2doc gem]: a reference to a manifest of included files (specifically images and the header file), and settings to open the document in Print View at 100% magnification.
+The other elements of the Word HTML head are populated by the https://github.com/metanorma/html2doc[html2doc gem]: a reference to a manifest of included files (specifically images and the header file), and settings to open the document in Print View at 100% magnification.
 
 The `body` of the Word HTML document is divided into the following parts:
 

data/docs/outputs.adoc

@@ -30,7 +30,7 @@ when you save a Word document as HTML.)
 Using DOC HTML makes it much easier to generate documents with
 the advanced formatting requirements of Metanorma (including complex tables, formulas, footnotes, headers and footers, 
 nested list numbering and crossreferences) than generating either native DOCX (in OOXML), or the DOCX flavour of MHT. For more
-on the choice to use DOC, see https://github.com/riboseinc/html2doc/wiki/Why-not-docx%3F
+on the choice to use DOC, see https://github.com/metanorma/html2doc/wiki/Why-not-docx%3F
 
 The constraint on using DOC, however, imposes some constraints. 
 

data/docs/quickstart.adoc

@@ -8,18 +8,18 @@ Metanorma takes text in the _Asciidoctor markup language_ as input (consult the
 Metanorma makes some adjustments to the text format for its requirements;
 these adjustments (which we refer to as _Metanorma Asciidoctor_, or AsciiISO) are documented in relevant sections of this documentation.
 Metanorma uses Asciidoctor to generate _Metanorma XML_, as an intermediate, semantic representation of standards content.
-Metanorma XML in turn is processed by the https://github.com/riboseinc/isodoc[isodoc] gem to generate output in Microsoft Word (`.doc`) and HTML (`.html`).
+Metanorma XML in turn is processed by the https://github.com/metanorma/isodoc[isodoc] gem to generate output in Microsoft Word (`.doc`) and HTML (`.html`).
 
 == Even quicker summary
 
 In order to start a new Metanorma document, or migrate your document from Word:
 
 . Install <<installation>> (for your specific Metanorma standards class)
-. Clone the https://github.com/riboseinc/isodoc-rice/[AsciiISO Rice]
+. Clone the https://github.com/metanorma/isodoc-rice/[AsciiISO Rice]
 
 To migrate:
 
-. Use our https://github.com/riboseinc/reverse_asciidoctor[reverse_asciidoctor] gem to help you convert a Word document into Asciidoctor. Be warned that the conversion will not be 100% clean, and you will have to manually fix some syntax (especially if your Word document contains an index, stray anchors, and equations).
+. Use our https://github.com/metanorma/reverse_asciidoctor[reverse_asciidoctor] gem to help you convert a Word document into Asciidoctor. Be warned that the conversion will not be 100% clean, and you will have to manually fix some syntax (especially if your Word document contains an index, stray anchors, and equations).
 . Move the content back to the cloned isodoc-rice.
 . The isodoc-rice repository is set up for the ISO standards class; if you are not working with ISO, change its makefile to refer to the correct standards class (e.g. from `bundle exec metanorma -t iso -x doc,xml,html $^` to `bundle exec metanorma -t rsd -x doc,xml,html $^`
 
@@ -29,15 +29,15 @@ To migrate:
 
 As of this writing, Metanorma supports the following standards classes:
 
-* https://github.com/riboseinc/metanorma-iso[ISO and IEC] (`iso`)
-* https://github.com/riboseinc/metanorma-gb[Chinese National standards] (`gb`)
-* https://github.com/riboseinc/metanorma-csd[Calconnect] (`csd`)
-* https://github.com/riboseinc/metanorma-csand[Cloud Security Alliance] (`csand`)
-* https://github.com/riboseinc/metanorma-m3d[Messaging, Malware and Mobile Anti-Abuse Working Group (M^3^AAWG)] (`m3d`)
-* https://github.com/riboseinc/metanorma-rsd[Ribose] (`rsd`)
-* https://github.com/riboseinc/metanorma-acme[Acme (shell for user-customised standards)] (`acme`)
-* https://github.com/riboseinc/metanorma-mpfd[Mandatory Provident Fund Schemes Authority, Hong Kong (MPFA)] (`mpfd`)
-* https://github.com/riboseinc/metanorma-unece[United Nations Economic Commission for Europe] (`unece`)
+* https://github.com/metanorma/metanorma-iso[ISO and IEC] (`iso`)
+* https://github.com/metanorma/metanorma-gb[Chinese National standards] (`gb`)
+* https://github.com/metanorma/metanorma-csd[Calconnect] (`csd`)
+* https://github.com/metanorma/metanorma-csand[Cloud Security Alliance] (`csand`)
+* https://github.com/metanorma/metanorma-m3d[Messaging, Malware and Mobile Anti-Abuse Working Group (M^3^AAWG)] (`m3d`)
+* https://github.com/metanorma/metanorma-rsd[Ribose] (`rsd`)
+* https://github.com/metanorma/metanorma-acme[Acme (shell for user-customised standards)] (`acme`)
+* https://github.com/metanorma/metanorma-mpfd[Mandatory Provident Fund Schemes Authority, Hong Kong (MPFA)] (`mpfd`)
+* https://github.com/metanorma/metanorma-unece[United Nations Economic Commission for Europe] (`unece`)
 
 == Installing on Linux and macOS
 
@@ -56,7 +56,7 @@ you can install it from Github:
 
 [source,console]
 --
-git clone https://github.com/riboseinc/metanorma-cli.git
+git clone https://github.com/metanorma/metanorma-cli.git
 cd metanorma-cli
 gem build *.gemspec
 gem install *.gem
@@ -107,7 +107,7 @@ This will generate two files from the `new_standard.adoc` document (provided it
 * `new_standard.doc`, a Word document
   (currently in the pre-2007 `.doc` format, but Microsoft Word will open it fine).
 
-Both these files are generated via an intermediate XML file, `new_standard.xml`, which represents the structure of the document as it is formally defined by the standards body, and captured in the https://github.com/riboseinc/metanorma-model-iso[Metanorma XML schema].
+Both these files are generated via an intermediate XML file, `new_standard.xml`, which represents the structure of the document as it is formally defined by the standards body, and captured in the https://github.com/metanorma/metanorma-model-iso[Metanorma XML schema].
 
 Even if there are no errors in the Asciidoctor syntax, the document may still raise warnings to the console as it is being validated. The validation comes from the formal definition of the standard class (e.g. ISO/IEC DIR 2 in the case of ISO and IEC), and consists of two parts: warnings about document content (e.g., for ISO, requiring space before a percentage sign; requiring that the scope not contain text that looks like a recommendation); and warnings about document structure. The latter are generated by running the generated XML against the ISOXML schema, and report the line numbers of the XML document where issues are observed.
 
@@ -132,7 +132,7 @@ and edit it, observing how it approaches various formatting tasks.
 The https://www.iso.org/publication/PUB100407.html["Rice document"]
 is the ISO's model document of an international standard.
 An Metanorma-ISO version of the document is available
-at https://github.com/riboseinc/isodoc-rice/.
+at https://github.com/metanorma/isodoc-rice/.
 We suggest downloading the site, and editing it.
 
 The `iso-rice-en.adoc` document consists of a document header,
@@ -149,11 +149,11 @@ as well as _the syntax extensions and conventions_ that are specific to Metanorm
 
 - See also https://asciidoctor.org/docs/user-manual/[Asciidoctor User Manual]
   documenting Asciidoctor itself
-  and https://github.com/riboseinc/metanorma-iso/blob/master/README.adoc[Metanorma-ISO README].
+  and https://github.com/metanorma/metanorma-iso/blob/master/README.adoc[Metanorma-ISO README].
 
 == Migrating existing documents from Microsoft Word
 
-. Use our https://github.com/riboseinc/reverse_asciidoctor[reverse_asciidoctor]
+. Use our https://github.com/metanorma/reverse_asciidoctor[reverse_asciidoctor]
 gem to help you convert a Word document into AsciiISO.
 +
 You will likely have to manually clean up some syntax
@@ -165,11 +165,11 @@ don’t rely on the automatic conversion to be 100% correct.
 
 - See also https://asciidoctor.org/docs/user-manual/[Asciidoctor User Manual]
   documenting Asciidoctor itself
-  and https://github.com/riboseinc/metanorma-iso/blob/master/README.adoc[Metanorma-ISO README].
+  and https://github.com/metanorma/metanorma-iso/blob/master/README.adoc[Metanorma-ISO README].
 
 == Migrating existing documents from Microsoft Word:
 
-. Use our https://github.com/riboseinc/reverse_asciidoctor[reverse_asciidoctor]
+. Use our https://github.com/metanorma/reverse_asciidoctor[reverse_asciidoctor]
   gem to help you convert a Word document into AsciiISO.
 
   You will likely have to manually clean up some syntax