diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b844b143 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +Gemfile.lock diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..b6446a7a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "cgpm-resolutions"] + path = sources/cgpm-resolutions + url = https://github.com/metanorma/cgpm-resolutions.git +[submodule "sources/cipm-resolutions"] + path = sources/cipm-resolutions + url = https://github.com/metanorma/cipm-resolutions diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 032f983b..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,318 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - asciidoctor (2.0.10) - asciimath (2.0.1) - bibtex-ruby (5.1.4) - latex-decode (~> 0.0) - camertron-eprun (1.1.1) - cldr-plurals-runtime-rb (1.0.1) - cliver (0.3.2) - cnccs (0.1.6) - concurrent-ruby (1.1.7) - css_parser (1.7.1) - addressable - descriptive_statistics (2.5.1) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - down (5.1.1) - addressable (~> 2.5) - faraday (1.0.1) - multipart-post (>= 1.2, < 3) - ffi (1.13.1) - ffi-compiler2 (2.0.0) - ffi (>= 1.0.0) - rake - fontist (1.3.0) - down (~> 5.0) - libmspack (~> 0.1.0) - rubyzip (~> 2.3.0) - thor (~> 1.0.1) - gb-agencies (0.0.7) - git (1.7.0) - rchardet (~> 1.8) - html2doc (1.0.4) - asciimath (~> 2.0.0) - htmlentities (~> 4.3.4) - image_size - mime-types - nokogiri (>= 1.10.4) - thread_safe - uuidtools - htmlentities (4.3.4) - http-cookie (1.0.3) - domain_name (~> 0.5) - iev (0.2.4) - nokogiri (>= 1.10.4) - image_size (2.1.0) - iso-639 (0.3.5) - iso639 (1.3.2) - isodoc (1.2.3) - asciimath - html2doc (~> 1.0.0) - htmlentities (~> 4.3.4) - liquid - metanorma (~> 1.1.0) - nokogiri (>= 1.10.4) - roman-numerals - thread_safe - uuidtools - isoics (0.1.9) - latex-decode (0.3.1) - libmspack (0.1.0) - ffi - ffi-compiler2 (>= 2.0.0) - liquid (4.0.3) - mathml2asciimath (0.0.10) - htmlentities (~> 4.3.4) - nokogiri (>= 1.10.4) - metanorma (1.1.4) - asciidoctor - htmlentities - mn2pdf (~> 1) - nokogiri - relaton-cli (~> 1.3.0) - metanorma-cc (1.5.2) - isodoc (~> 1.2.0) - metanorma-standoc (~> 1.5.0) - metanorma-cli (1.3.7.1) - fontist (~> 1.3.0) - git (~> 1.5) - isodoc (~> 1.2.0) - metanorma (~> 1.1.0) - metanorma-cc (~> 1.5.0) - metanorma-csa (~> 1.6.0) - metanorma-gb (~> 1.5.0) - metanorma-generic (~> 1.6.0) - metanorma-iec (~> 1.2.0) - metanorma-ietf (~> 2.2.0) - metanorma-iho (~> 0.2.0) - metanorma-iso (~> 1.5.0) - metanorma-itu (~> 1.2.0) - metanorma-m3aawg (~> 1.5.0) - metanorma-nist (~> 1.2.0) - metanorma-ogc (~> 1.2.0) - metanorma-standoc (~> 1.5.0) - metanorma-un (~> 0.5.0) - relaton-cli (>= 0.8.2) - thor (~> 1.0) - metanorma-csa (1.6.2) - htmlentities (~> 4.3.4) - image_size - isodoc (~> 1.2.0) - metanorma-standoc (~> 1.5.0) - mime-types - ruby-jing - thread_safe - uuidtools - metanorma-gb (1.5.4) - gb-agencies (~> 0.0.4) - htmlentities (~> 4.3.4) - isodoc (~> 1.2.0) - metanorma-iso (~> 1.5.0) - twitter_cldr (~> 4.4.4) - metanorma-generic (1.6.2) - htmlentities (~> 4.3.4) - isodoc (~> 1.2.0) - metanorma-standoc (~> 1.5.0) - ruby-jing - metanorma-iec (1.2.2) - isodoc (~> 1.2.0) - metanorma-iso (~> 1.5.0) - ruby-jing - metanorma-ietf (2.2.2) - isodoc (~> 1.2.0) - mathml2asciimath - metanorma-standoc (~> 1.5.0) - metanorma-iho (0.2.2) - htmlentities (~> 4.3.4) - isodoc (~> 1.2.0) - metanorma-generic (~> 1.6.0) - metanorma-standoc (~> 1.5.0) - metanorma-iso (1.5.5) - isodoc (~> 1.2.0) - metanorma-standoc (~> 1.5.0) - mn2sts (~> 1.2.0) - ruby-jing - tokenizer (~> 0.3.0) - twitter_cldr - metanorma-itu (1.2.2) - htmlentities (~> 4.3.4) - isodoc (~> 1.2.0) - metanorma-standoc (~> 1.5.0) - ruby-jing - metanorma-m3aawg (1.5.2) - htmlentities (~> 4.3.4) - isodoc (~> 1.2.0) - metanorma-standoc (~> 1.5.0) - thread_safe - metanorma-nist (1.2.2) - htmlentities (~> 4.3.4) - iso-639 - isodoc (~> 1.2.0) - metanorma-standoc (~> 1.5.0) - ruby-jing - twitter_cldr - tzinfo-data - metanorma-ogc (1.2.2) - iso-639 - isodoc (~> 1.2.0) - metanorma-standoc (~> 1.5.0) - metanorma-standoc (1.5.2) - asciidoctor (~> 2.0.0) - concurrent-ruby - iev (~> 0.2.1) - isodoc (~> 1.2.0) - mathml2asciimath - mimemagic - relaton (~> 1.3.0) - relaton-iev (~> 1.0.0) - ruby-jing - sterile (~> 1.0.14) - unicode2latex (~> 0.0.1) - metanorma-un (0.5.2) - iso-639 - isodoc (~> 1.2.0) - metanorma-standoc (~> 1.5.0) - roman-numerals - twitter_cldr - mime-types (3.3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) - mimemagic (0.3.5) - mini_portile2 (2.4.0) - mn2pdf (1.19) - mn2sts (1.2.0) - multipart-post (2.1.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - nokogiri-styles (0.1.2) - nokogiri - optout (0.0.2) - premailer (1.13.1) - addressable - css_parser (>= 1.6.0) - htmlentities (>= 4.0.0) - ptools (1.4.0) - public_suffix (4.0.5) - rake (13.0.1) - rchardet (1.8.0) - relaton (1.3.0) - relaton-calconnect (~> 1.3.0) - relaton-gb (~> 1.3.0) - relaton-iec (~> 1.3.0) - relaton-ieee (~> 1.3.0) - relaton-ietf (~> 1.3.0) - relaton-iho (~> 1.3.0) - relaton-iso (~> 1.3.0) - relaton-itu (~> 1.3.0) - relaton-nist (~> 1.3.0) - relaton-ogc (~> 1.3.0) - relaton-omg (~> 1.3.0) - relaton-un (~> 1.3.0) - relaton-w3c (~> 1.3.0) - relaton-bib (1.3.1) - addressable - bibtex-ruby - iso639 - nokogiri - relaton-calconnect (1.3.0) - faraday - relaton-bib (~> 1.3.0) - relaton-cli (1.3.0) - liquid - relaton (~> 1.3.0) - thor - relaton-gb (1.3.0) - cnccs (~> 0.1.1) - gb-agencies (~> 0.0.1) - relaton-iso-bib (>= 1.3.0) - relaton-iec (1.3.0) - addressable - relaton-iso-bib (~> 1.3.0) - relaton-ieee (1.3.0) - faraday (~> 1.0.0) - relaton-bib (~> 1.3.0) - relaton-ietf (1.3.0) - relaton-bib (~> 1.3.0) - relaton-iev (1.0.0) - relaton (~> 1) - relaton-iho (1.3.0) - relaton-bib (~> 1.3.0) - relaton-iso (1.3.0) - relaton-iec (~> 1.3.0) - relaton-iso-bib (~> 1.3.0) - relaton-iso-bib (1.3.0) - isoics (~> 0.1.6) - relaton-bib (~> 1.3.0) - relaton-itu (1.3.0) - relaton-bib (~> 1.3.0) - relaton-nist (1.3.1) - relaton-bib (~> 1.3.0) - rubyzip - relaton-ogc (1.3.0) - faraday (~> 1.0.0) - relaton-iso-bib (~> 1.3.0) - relaton-omg (1.3.0) - relaton-bib (~> 1.3.0) - relaton-un (1.3.0) - faraday - http-cookie - relaton-bib (~> 1.3.0) - unf_ext (>= 0.0.7.7) - relaton-w3c (1.3.0) - relaton-bib (>= 1.3.0) - reverse_adoc (0.2.9) - mathml2asciimath - mimemagic - nokogiri (>= 1.10.4) - word-to-markdown - reverse_markdown (1.4.0) - nokogiri - roman-numerals (0.3.0) - ruby-jing (0.0.1) - optout (>= 0.0.2) - rubyzip (2.3.0) - stepmod-utils (0.2.0) - ptools (~> 1.3) - reverse_adoc (>= 0.2.9) - thor (>= 0.20.3) - sterile (1.0.17) - nokogiri (>= 1.10.8) - sys-proctable (1.2.6) - ffi - thor (1.0.1) - thread_safe (0.3.6) - tokenizer (0.3.0) - twitter_cldr (4.4.5) - camertron-eprun - cldr-plurals-runtime-rb (~> 1.0) - tzinfo - tzinfo (2.0.2) - concurrent-ruby (~> 1.0) - tzinfo-data (1.2020.1) - tzinfo (>= 1.0.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.7) - unicode2latex (0.0.4) - uuidtools (2.2.0) - word-to-markdown (1.1.8) - cliver (~> 0.3) - descriptive_statistics (~> 2.5) - nokogiri-styles (~> 0.1) - premailer (~> 1.8) - reverse_markdown (~> 1.0) - sys-proctable (~> 1.0) - -PLATFORMS - ruby - -DEPENDENCIES - metanorma-cli - stepmod-utils - -BUNDLED WITH - 2.1.4 diff --git a/sources/cgpm-resolutions b/sources/cgpm-resolutions new file mode 160000 index 00000000..017be263 --- /dev/null +++ b/sources/cgpm-resolutions @@ -0,0 +1 @@ +Subproject commit 017be26311b189c6f81d7db686dffc299c4b8e5c diff --git a/sources/cipm-resolutions b/sources/cipm-resolutions new file mode 160000 index 00000000..de6d8786 --- /dev/null +++ b/sources/cipm-resolutions @@ -0,0 +1 @@ +Subproject commit de6d8786a71fe02ee620f7fb1d63c35c042ed0b3 diff --git a/sources/sections-a1-yaml/00-foreword.adoc b/sources/sections-a1-yaml/00-foreword.adoc new file mode 100644 index 00000000..e331554f --- /dev/null +++ b/sources/sections-a1-yaml/00-foreword.adoc @@ -0,0 +1,9 @@ +.Foreword + +This appendix lists those decisions of the CGPM and the CIPM that bear directly upon definitions of the units of the SI, prefixes defined for use as part of the SI, and conventions for the writing of unit symbols and numbers. It is not a complete list of CGPM and CIPM decisions. For a complete list, reference must be made to successive volumes of the _Comptes Rendus des Séances de la Conférence Générale des Poids et Mesures_ (CR) and _Procès-Verbaux des Séances du Comité International des Poids et Mesures_ (PV) or, for recent decisions, to _Metrologia_. + +Since the SI is not a static convention, but evolves following developments in the science of measurement, some decisions have been abrogated or modified; others have been clarified by additions. Decisions that have been subject to such changes are identified by an asterisk (*) and are linked by a note to the modifying decision. + +The original text of each decision (or its translation) is shown in a different font (sans serif) of normal weight to distinguish it from the main text. The asterisks and notes were added by the BIPM to make the text more understandable. They do not form part of the original text. + +The decisions of the CGPM and CIPM are listed in this appendix in strict chronological order, from 1889 to 2018, in order to preserve the continuity with which they were taken. However in order to make it easy to locate decisions related to particular topics a table of contents is included below, ordered by subject, with page references to the particular meetings at which decisions relating to each subject were taken. \ No newline at end of file diff --git a/sources/sections-a1-yaml/00-toc.adoc b/sources/sections-a1-yaml/00-toc.adoc new file mode 100644 index 00000000..30367c7d --- /dev/null +++ b/sources/sections-a1-yaml/00-toc.adoc @@ -0,0 +1,258 @@ +== Table of Contents of Appendix 1 + +*Decisions relating to the establishment of the SI page* + +9^th^ CGPM, 1948:: decision to establish the SI + +10^th^ CGPM, 1954:: decision on the first six base units + +CIPM 1956:: decision to adopt the name "Système International d'Unités" + +[align=left] +11^th^ CGPM, 1960:: confirms the name and the abbreviation "SI", + +names prefixes from tera to pico, + +establishes the supplementary units rad and sr, + +lists some derived units + +CIPM, 1969:: declarations concerning base, supplementary, derived and coherent units, and the use of prefixes + +CIPM, 2001:: "SI units" and "units of the SI" + +23^rd^ CGPM, 2007:: possible redefinition of certain base units of the International System of Units, the SI + +24^th^ CGPM, 2011:: possible future revision of the International System of Units, the SI + +25^th^ CGPM, 2014:: future revision of the International System of Units, the SI + +26^th^ CGPM, 2018:: revision of the International System of Units, the SI (to enter into force on 20 May 2019) + + +*Decisions relating to the base units of the SI* + +*Length* + +1^st^ CGPM, 1889:: sanction of the prototype metre + +7^th^ CGPM, 1927:: definition and use of the prototype metre + +10^th^ CGPM, 1954:: metre adopted as a base unit + +11^th^ CGPM, 1960:: redefinition of the metre in terms of krypton 86 radiation + +15^th^ CGPM, 1975:: recommends value for the speed of light + +[align=left] +17^th^ CGPM, 1983:: redefinition of the metre using the speed of light, + +realization of the definition of the metre + +CIPM, 2002:: specifies the rules for the practical realization of the definition of the metre + +CIPM, 2003:: revision of the list of recommended radiations + +CIPM, 2005:: revision of the list of recommended radiations + +CIPM, 2007:: revision of the list of recommended radiations + +23^th^ CGPM, 2007:: revision of the _mise en pratique_ of the definition of the metre and development of new optical frequency standards + +CIPM, 2009:: updates to the list of standard frequencies + +24^th^ CGPM, 2011:: possible future revision of the International System of Units, the SI + +24^th^ CGPM, 2011:: revision of the _mise en pratique_ of the definition of the metre and development of new optical frequency standards + +CIPM, 2013:: updates to the list of standard frequencies + +26^th^ CGPM, 2018:: revision of the International System of Units, the SI (to enter into force on 20 May 2019) + +*Mass* + +1^st^ CGPM, 1889:: sanction of the prototype kilogram + +3^rd^ CGPM, 1901:: declaration on distinguishing mass and weight, and on the conventional value of stem:[g_n] + +10^th^ CGPM, 1954:: kilogram adopted as a base unit + +CIPM, 1967:: declaration on applying prefixes to the gram + +21^st^ CGPM, 1999:: future redefinition of the kilogram + +23^rd^ CGPM, 2007:: possible redefinition of certain base units of the International System of Units (SI) + +24^th^ CGPM, 2011:: possible future revision of the International System of Units, the SI + +25^th^ CGPM, 2014:: future revision of the International System of Units, the SI + +26^th^ CGPM, 2018:: revision of the International System of Units, the SI (to enter into force on 20 May 2019) + +*Time* + +10^th^ CGPM, 1954:: second adopted as a base unit + +CIPM, 1956:: definition of the second as a fraction of the tropical year 1900 + +11^th^ CGPM, 1960:: ratifies the CIPM 1956 definition of the second + +CIPM, 1964:: declares the caesium 133 hyperfine transition to be the recommended standard + +12^th^ CGPM, 1964:: empowers CIPM to investigate atomic and molecular frequency standards + +13^th^ CGPM, 1967/68:: defines the second in terms of the caesium transition + +CCDS, 1970:: defines International Atomic Time, TAI + +14^th^ CGPM, 1971:: requests the CIPM to define and establish International Atomic Time, TAI + +15^th^ CGPM, 1975:: endorses the use of Coordinated Universal Time, UTC + +CIPM, 2006:: secondary representations of the second + +23^rd^ CGPM, 2007:: on the revision of the _mise en pratique_ of the definition of the metre and the development of new optical frequency standards + +CIPM, 2009:: updates to the list of standard frequencies + +24^th^ CGPM, 2011:: possible future revision of the International System of Units, the SI + +24^th^ CGPM, 2011:: revision of the _mise en pratique_ of the metre and the development of new optical frequency standards + +CIPM, 2013:: updates to the list of standard frequencies + +CIPM, 2015:: updates to the list of standard frequencies + +26^th^ CGPM, 2018:: revision of the International System of Units, the SI (to enter into force on 20 May 2019) + + +*Electrical units* + +CIPM, 1946:: definitions of coherent electrical units in the metre-kilogram-second (MKS) system of units (to enter into force on 1 January 1948) + +10^th^ CGPM, 1954:: ampere adopted as a base unit + +14^th^ CGPM, 1971:: adopts the name siemens, symbol stem:[S], for electrical conductance + +18^th^ CGPM, 1987:: forthcoming adjustment to the representations of the volt and of the ohm + +CIPM, 1988:: conventional value of the Josephson constant defined (to enter into force on 1 January 1990) + +CIPM, 1988:: conventional value of the von Klitzing constant defined (to enter into force on 1 January 1990) + +23^rd^ CGPM, 2007:: possible redefinition of certain base units of the International System of Units (SI) + +24^th^ CGPM, 2011:: possible future revision of the International System of Units, the SI + +25^th^ CGPM, 2014:: future revision of the International System of Units, the SI + +26^th^ CGPM, 2018:: revision of the International System of Units, the SI (to enter into force on 20 May 2019) + + +*Thermodynamic temperature* + +9^th^ CGPM, 1948:: adopts the triple point of water as the thermodynamic reference point, adopts the zero of Celsius temperature to be 0.01 degree below the triple point + +CIPM, 1948:: adopts the name degree Celsius for the Celsius temperature scale + +10^th^ CGPM, 1954:: defines thermodynamic temperature such that the triple point of water is stem:[273.16] degrees Kelvin exactly, defines standard atmosphere + +10^th^ CGPM, 1954:: degree Kelvin adopted as a base unit + +13^th^ CGPM, 1967/68:: decides formal definition of the kelvin, symbol stem:[K] + +CIPM, 1989:: the International Temperature Scale of 1990, ITS-90 + +CIPM, 2005:: note added to the definition of the kelvin concerning the isotopic composition of water + +23^rd^ CGPM, 2007:: clarification of the definition of the kelvin, unit of thermodynamic temperature + +23^rd^ CGPM, 2007:: possible redefinition of certain base units of the International System of Units (SI) + +24^th^ CGPM, 2011:: possible future revision of the International System of Units, the SI + +25^th^ CGPM, 2014:: future revision of the International System of Units, the SI + +26^th^ CGPM, 2018:: revision of the International System of Units, the SI (to enter into force on 20 May 2019) + +*Amount of substance* + +14^th^ CGPM, 1971:: definition of the mole, symbol stem:[mol], as a seventh base unit, and rules for its use + +21^st^ CGPM, 1999:: adopts the special name katal, kat + +23^rd^ CGPM, 2007:: on the possible redefinition of certain base units of the International System of Units (SI) + +24^th^ CGPM, 2011:: possible future revision of the International System of Units, the SI + +25^th^ CGPM, 2014:: future revision of the International System of Units, the SI + +26^th^ CGPM, 2018:: revision of the International System of Units, the SI (to enter into force on 20 May 2019) + +*Luminous intensity* + +CIPM, 1946:: definition of photometric units, new candle and new lumen (to enter into force on 1 January 1948) + +10^th^ CGPM, 1954:: candela adopted as a base unit + +13^th^ CGPM, 1967/68:: defines the candela, symbol stem:[cd], in terms of a black body radiator + +16^th^ CGPM, 1979:: redefines the candela in terms of monochromatic radiation + +24^th^ CGPM, 2011:: possible future revision of the International System of Units, the SI + +26^th^ CGPM, 2018:: revision of the International System of Units, the SI (to enter into force on 20 May 2019) + + +*Decisions relating to SI derived and supplementary units* + +*SI derived units* + +12^th^ CGPM, 1964:: accepts the continued use of the curie as a non-SI unit + +13^th^ CGPM, 1967/68:: lists some examples of derived units + +15^th^ CGPM, 1975:: adopts the special names becquerel, Bq, and gray, Gy + +16^th^ CGPM, 1979:: adopts the special name sievert, Sv + +CIPM, 1984:: decides to clarify the relationship between absorbed dose (SI unit gray) and dose equivalent (SI unit sievert) + +CIPM, 2002:: modifies the relationship between absorbed dose and dose equivalent + +*Supplementary units* + +CIPM, 1980:: decides to interpret supplementary units as dimensionless derived units + +20^th^ CGPM, 1995:: decides to abrogate the class of supplementary units, and confirms the CIPM interpretation that they are dimensionless derived units + + +*Decisions concerning terminology and the acceptance of units for use with the SI page* + +*SI prefixes* + +12^th^ CGPM, 1964:: decides to add femto and atto to the list of prefixes + +15^th^ CGPM, 1975:: decides to add peta and exa to the list of prefixes + +19^th^ CGPM, 1991:: decides to add zetta, zepto, yotta, and yocto to the list of prefixes + +*Unit symbols and numbers* + +9^th^ CGPM, 1948:: decides rules for printing unit symbols + +*Unit names* + +13^th^ CGPM, 1967/68:: abrogates the use of the micron and new candle as units accepted for use with the SI + +*The decimal marker* + +22^nd^ CGPM, 2003:: decides to allow the use of the point or the comma on the line as the decimal marker + +*Units accepted for use with the SI: an example, the litre* + +3^rd^ CGPM, 1901:: defines the litre as the volume of 1 kg of water + +11^th^ CGPM, 1960:: requests the CIPM to report on the difference between the litre and the cubic decimetre + +CIPM, 1961:: recommends that volume be expressed in SI units and not in litres + +12^th^ CGPM, 1964:: abrogates the former definition of the litre, recommends that litre may be used as a special name for the cubic decimetre + +16^th^ CGPM, 1979:: decides, as an exception, to allow both stem:[l] and stem:[L] as symbols for the litre \ No newline at end of file diff --git a/sources/sections-a1-yaml/01-meeting-01.adoc b/sources/sections-a1-yaml/01-meeting-01.adoc new file mode 100644 index 00000000..030bc554 --- /dev/null +++ b/sources/sections-a1-yaml/01-meeting-01.adoc @@ -0,0 +1,28 @@ + + +[yaml2text,cgpm-resolutions/meetings-en/meeting-01.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/03-meeting-03.adoc b/sources/sections-a1-yaml/03-meeting-03.adoc new file mode 100644 index 00000000..f435529a --- /dev/null +++ b/sources/sections-a1-yaml/03-meeting-03.adoc @@ -0,0 +1,27 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-03.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/07-meeting-07.adoc b/sources/sections-a1-yaml/07-meeting-07.adoc new file mode 100644 index 00000000..9b7a1ee8 --- /dev/null +++ b/sources/sections-a1-yaml/07-meeting-07.adoc @@ -0,0 +1,19 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-07.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/08-meeting-08.adoc b/sources/sections-a1-yaml/08-meeting-08.adoc new file mode 100644 index 00000000..479626c3 --- /dev/null +++ b/sources/sections-a1-yaml/08-meeting-08.adoc @@ -0,0 +1,29 @@ + + +[yaml2text,cgpm-resolutions/meetings-en/meeting-08.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/09-meeting-09.adoc b/sources/sections-a1-yaml/09-meeting-09.adoc new file mode 100644 index 00000000..2eeb1acd --- /dev/null +++ b/sources/sections-a1-yaml/09-meeting-09.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-09.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- \ No newline at end of file diff --git a/sources/sections-a1-yaml/10-meeting-10.adoc b/sources/sections-a1-yaml/10-meeting-10.adoc new file mode 100644 index 00000000..2a9de741 --- /dev/null +++ b/sources/sections-a1-yaml/10-meeting-10.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-10.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- \ No newline at end of file diff --git a/sources/sections-a1-yaml/11-meeting-11.adoc b/sources/sections-a1-yaml/11-meeting-11.adoc new file mode 100644 index 00000000..0bfb006b --- /dev/null +++ b/sources/sections-a1-yaml/11-meeting-11.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-11.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/12-meeting-12.adoc b/sources/sections-a1-yaml/12-meeting-12.adoc new file mode 100644 index 00000000..a600bc5d --- /dev/null +++ b/sources/sections-a1-yaml/12-meeting-12.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-12.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/13-meeting-13.adoc b/sources/sections-a1-yaml/13-meeting-13.adoc new file mode 100644 index 00000000..76b48184 --- /dev/null +++ b/sources/sections-a1-yaml/13-meeting-13.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-13.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/14-meeting-14.adoc b/sources/sections-a1-yaml/14-meeting-14.adoc new file mode 100644 index 00000000..0728a5ed --- /dev/null +++ b/sources/sections-a1-yaml/14-meeting-14.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-14.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/15-meeting-15.adoc b/sources/sections-a1-yaml/15-meeting-15.adoc new file mode 100644 index 00000000..188a4eee --- /dev/null +++ b/sources/sections-a1-yaml/15-meeting-15.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-15.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/16-meeting-16.adoc b/sources/sections-a1-yaml/16-meeting-16.adoc new file mode 100644 index 00000000..cbe9ba0f --- /dev/null +++ b/sources/sections-a1-yaml/16-meeting-16.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-16.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/17-meeting-17.adoc b/sources/sections-a1-yaml/17-meeting-17.adoc new file mode 100644 index 00000000..472e0692 --- /dev/null +++ b/sources/sections-a1-yaml/17-meeting-17.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-17.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/18-meeting-18.adoc b/sources/sections-a1-yaml/18-meeting-18.adoc new file mode 100644 index 00000000..5a7c490e --- /dev/null +++ b/sources/sections-a1-yaml/18-meeting-18.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-18.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/19-meeting-19.adoc b/sources/sections-a1-yaml/19-meeting-19.adoc new file mode 100644 index 00000000..f867bc1d --- /dev/null +++ b/sources/sections-a1-yaml/19-meeting-19.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-19.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/20-meeting-20.adoc b/sources/sections-a1-yaml/20-meeting-20.adoc new file mode 100644 index 00000000..9aaadc68 --- /dev/null +++ b/sources/sections-a1-yaml/20-meeting-20.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-20.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/21-meeting-21.adoc b/sources/sections-a1-yaml/21-meeting-21.adoc new file mode 100644 index 00000000..0861a344 --- /dev/null +++ b/sources/sections-a1-yaml/21-meeting-21.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-21.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/22-meeting-22.adoc b/sources/sections-a1-yaml/22-meeting-22.adoc new file mode 100644 index 00000000..1bca78d2 --- /dev/null +++ b/sources/sections-a1-yaml/22-meeting-22.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-22.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/23-meeting-23.adoc b/sources/sections-a1-yaml/23-meeting-23.adoc new file mode 100644 index 00000000..71422978 --- /dev/null +++ b/sources/sections-a1-yaml/23-meeting-23.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-23.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/24-meeting-24.adoc b/sources/sections-a1-yaml/24-meeting-24.adoc new file mode 100644 index 00000000..7d088029 --- /dev/null +++ b/sources/sections-a1-yaml/24-meeting-24.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-24.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/25-meeting-25.adoc b/sources/sections-a1-yaml/25-meeting-25.adoc new file mode 100644 index 00000000..d8d360ba --- /dev/null +++ b/sources/sections-a1-yaml/25-meeting-25.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-25.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/26-meeting-26.adoc b/sources/sections-a1-yaml/26-meeting-26.adoc new file mode 100644 index 00000000..fa05c9c7 --- /dev/null +++ b/sources/sections-a1-yaml/26-meeting-26.adoc @@ -0,0 +1,28 @@ + +[yaml2text,cgpm-resolutions/meetings-en/meeting-26.yml,data] +---- +== {{data.metadata.title}}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{resolution.title}} + +[align=center] +link:{{resolution.url}}[*Resolution {{resolution.identifier}}*] + + +{resolution.approvals.*,item,EOF} +{item.message} +{EOF} + +{resolution.considerations.*,item,EOF} +* {item.message} +{EOF} + +{resolution.actions.*,item,EOF} +* {item.message} +{EOF} + + +{% endfor %} +---- diff --git a/sources/sections-a1-yaml/resolutions.yml b/sources/sections-a1-yaml/resolutions.yml new file mode 100644 index 00000000..5058078b --- /dev/null +++ b/sources/sections-a1-yaml/resolutions.yml @@ -0,0 +1,23 @@ +--- +- meetings-en/meeting-01.yml +- meetings-en/meeting-03.yml +- meetings-en/meeting-07.yml +- meetings-en/meeting-08.yml +- meetings-en/meeting-09.yml +- meetings-en/meeting-10.yml +- meetings-en/meeting-11.yml +- meetings-en/meeting-12.yml +- meetings-en/meeting-13.yml +- meetings-en/meeting-14.yml +- meetings-en/meeting-15.yml +- meetings-en/meeting-16.yml +- meetings-en/meeting-17.yml +- meetings-en/meeting-18.yml +- meetings-en/meeting-19.yml +- meetings-en/meeting-20.yml +- meetings-en/meeting-21.yml +- meetings-en/meeting-22.yml +- meetings-en/meeting-23.yml +- meetings-en/meeting-24.yml +- meetings-en/meeting-25.yml +- meetings-en/meeting-26.yml diff --git a/sources/si-a1-yaml-nested.adoc b/sources/si-a1-yaml-nested.adoc new file mode 100644 index 00000000..584b38a4 --- /dev/null +++ b/sources/si-a1-yaml-nested.adoc @@ -0,0 +1,57 @@ += Decisions of the CGPM and the CIPM +:appendix: 1 +:partnumber: 1 +:edition: 9 +:copyright-year: 2019 +:revdate: 2019-05-20 +:language: en +:title-en: Decisions of the CGPM and the CIPM +:title-fr: Décisions de la CGPM et du CIPM +:doctype: appendix +:committee: bipm +:docstage: 60 +:docsubstage: 60 +:imagesdir: images +:mn-document-class: bipm +:mn-output-extensions: xml,html,doc,pdf,rxl +:local-cache-only: +:data-uri-image: + + +include::sections-a1-yaml/00-foreword.adoc[] + +include::sections-a1-yaml/00-toc.adoc[] + +[yaml2text,sections-a1-yaml/resolutions.yml,paths] +---- +{% for path in paths %} + +[yaml2text,cgpm-resolutions/{{ path }},data] +-- + +== {{ data.metadata.title }}, {{ data.metadata.date | split: "-" | first }} + +{% for resolution in data.resolutions %} + +=== {{ resolution.title }} + +[align=center] +*Resolution {{ resolution.identifier }}* + +{% for approval in resolution.approvals %} +{{ approval.message }} +{% endfor %} + +{% for consideration in resolution.considerations %} +{{ consideration.message }} +{% endfor %} + +{% for action in resolution.actions %} +{{ action.message }} +{% endfor %} + +{% endfor %} +-- + +{% endfor %} +---- diff --git a/sources/si-a1-yaml.adoc b/sources/si-a1-yaml.adoc new file mode 100644 index 00000000..efc985fb --- /dev/null +++ b/sources/si-a1-yaml.adoc @@ -0,0 +1,68 @@ += Decisions of the CGPM and the CIPM +:appendix: 1 +:partnumber: 1 +:edition: 9 +:copyright-year: 2019 +:revdate: 2019-05-20 +:language: en +:title-en: Decisions of the CGPM and the CIPM +:title-fr: Décisions de la CGPM et du CIPM +:doctype: appendix +:committee: bipm +:docstage: 60 +:docsubstage: 60 +:imagesdir: images +:mn-document-class: bipm +:mn-output-extensions: xml,html,doc,pdf,rxl +:local-cache-only: +:data-uri-image: + + +include::sections-a1-yaml/00-foreword.adoc[] + +include::sections-a1-yaml/00-toc.adoc[] + +include::sections-a1-yaml/01-meeting-01.adoc[] + +include::sections-a1-yaml/03-meeting-03.adoc[] + +include::sections-a1-yaml/07-meeting-07.adoc[] + +include::sections-a1-yaml/08-meeting-08.adoc[] + +include::sections-a1-yaml/09-meeting-09.adoc[] + +include::sections-a1-yaml/10-meeting-10.adoc[] + +include::sections-a1-yaml/11-meeting-11.adoc[] + +include::sections-a1-yaml/12-meeting-12.adoc[] + +include::sections-a1-yaml/13-meeting-13.adoc[] + +include::sections-a1-yaml/14-meeting-14.adoc[] + +include::sections-a1-yaml/15-meeting-15.adoc[] + +include::sections-a1-yaml/16-meeting-16.adoc[] + +include::sections-a1-yaml/17-meeting-17.adoc[] + +include::sections-a1-yaml/18-meeting-18.adoc[] + +include::sections-a1-yaml/19-meeting-19.adoc[] + +include::sections-a1-yaml/20-meeting-20.adoc[] + +include::sections-a1-yaml/21-meeting-21.adoc[] + +include::sections-a1-yaml/22-meeting-22.adoc[] + +include::sections-a1-yaml/23-meeting-23.adoc[] + +include::sections-a1-yaml/24-meeting-24.adoc[] + +include::sections-a1-yaml/25-meeting-25.adoc[] + +include::sections-a1-yaml/26-meeting-26.adoc[] +