Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

On hold: Restructure English Appendix 1 to import cgpm-resolutions #22

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9cc9d78
Add restrusctured Appendix 1 for yaml files inclusion
manuelfuenmayor Sep 22, 2020
dfdeae3
Add rearrange Appendix 1 for yaml files inclusion
manuelfuenmayor Sep 22, 2020
5e36548
Merge branch 'yaml-inclusion' of github.com:metanorma/bipm-si-brochur…
manuelfuenmayor Sep 22, 2020
920c1b4
Add cgpm-resolutions submodule
manuelfuenmayor Sep 22, 2020
e5ce524
Delete Gemfile.lock
manuelfuenmayor Sep 22, 2020
f8db30d
Move cgpm-resolutions inside sources
ronaldtse Sep 23, 2020
d2fb793
Add nested yaml2text SI appendix 1
ronaldtse Sep 23, 2020
a010e83
Remove debug statements
ronaldtse Sep 23, 2020
4aee4ff
Add cipm-resolutions
ronaldtse Sep 23, 2020
4d491f9
Add .gitignore file
manuelfuenmayor Sep 23, 2020
9493097
Update si-a1-yaml.adoc file
manuelfuenmayor Sep 23, 2020
f8881d6
Update 01-meeting-01.adoc
anermina Sep 24, 2020
388422d
Update 03-meeting-03.adoc
anermina Sep 24, 2020
e07a04e
Update 07-meeting-07.adoc
anermina Sep 24, 2020
2319db5
Delete 08-meeting-08.adoc
anermina Sep 24, 2020
d693f36
Merge branch 'yaml-inclusion' of github.com:metanorma/bipm-si-brochur…
manuelfuenmayor Sep 24, 2020
ec43d6d
Add modifications in cgpm-resolutions submodule
manuelfuenmayor Sep 25, 2020
14699a2
Update cgpm-resolutions submodule -- reset commit
manuelfuenmayor Sep 27, 2020
cfa4aee
Add 08-meeting-08.adoc file
manuelfuenmayor Sep 29, 2020
5eccae7
Insert resolution number in yaml2text blocks
manuelfuenmayor Sep 29, 2020
92a8593
Update cgpm-resolutions submodules -- new commits added
manuelfuenmayor Sep 29, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Gemfile.lock
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
318 changes: 0 additions & 318 deletions Gemfile.lock

This file was deleted.

1 change: 1 addition & 0 deletions sources/cgpm-resolutions
Submodule cgpm-resolutions added at 017be2
1 change: 1 addition & 0 deletions sources/cipm-resolutions
Submodule cipm-resolutions added at de6d87
9 changes: 9 additions & 0 deletions sources/sections-a1-yaml/00-foreword.adoc
Original file line number Diff line number Diff line change
@@ -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.
Loading