Skip to content

Commit

Permalink
feat: create independent folder for version 1.08 (thank you @anermina)
Browse files Browse the repository at this point in the history
  • Loading branch information
ronaldtse committed Dec 11, 2024
1 parent 6b039a2 commit 39a9f35
Show file tree
Hide file tree
Showing 35 changed files with 151 additions and 99 deletions.
10 changes: 0 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
Encoding.default_external = Encoding::UTF_8
Encoding.default_internal = Encoding::UTF_8

source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}" }

if File.exist? "Gemfile.devel"
eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
end
#
# gem "debug"

gem "metanorma-cli"
21 changes: 13 additions & 8 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -63,27 +63,32 @@ See https://www.metanorma.org/install/

== Building the documents

Run the following commands to build the full collection of the documents.
=== Full set

Run the following command to build the full collection of the documents.

[source,sh]
----
metanorma site generate --agree-to-terms
metanorma collection collection.yml
$ bundle exec metanorma site generate --agree-to-terms
----

=== SI Brochure

If you wish only to generate the bilingual SI Brochure, the following will
suffice. (the `brochure.yml` file does not compile any MEP documents)

=== Method 1: all in one

This method will generate the bilingual SI Brochure in one command.
.Compile document in single language
[source,sh]
----
$ bundle exec metanorma sources/si-brochure/1.07/si-brochure-en.adoc
----

.Compile collection with dual languages
[source,sh]
----
bundle exec metanorma site generate -c brochure.yml --agree-to-terms
$ bundle exec metanorma collection --agree-to-terms sources/si-brochure/1.07/collection.yml
----

=== Method 2: individual document generation

This method generates the English and French SI Brochures separately, and
then combines them together into the bilingual version.
Expand Down
8 changes: 1 addition & 7 deletions brochure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@
metanorma:
source:
files:

# Prerequisites of the SI Brochure collection
- sources/si-brochure-en.adoc
- sources/si-brochure-fr.adoc

# The SI Brochure collection
- collection.yml
- sources/si-brochure/1.07/collection.yml

collection:
organization: "BIPM - Bureau International des Poids et Mesures"
Expand Down
104 changes: 50 additions & 54 deletions metanorma.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,61 @@
metanorma:
source:
files:
# - sources/rec-values/mep-wgfs-nm237-115In_1267THz.adoc
# - sources/rec-values/mep-wgfs-nm243-H_1233THz.adoc
# - sources/rec-values/mep-wgfs-nm266-199Hg_1129THz.adoc
# - sources/rec-values/mep-wgfs-nm267-27Al_1121THz.adoc
# - sources/rec-values/mep-wgfs-nm282-199Hg_1065THz.adoc
# - sources/rec-values/mep-wgfs-nm436-171Yb_688THz.adoc
# - sources/rec-values/mep-wgfs-nm467-171Yb_642THz.adoc
# - sources/rec-values/mep-wgfs-nm515-I2.adoc
# - sources/rec-values/mep-wgfs-nm531-I2.adoc
# - sources/rec-values/mep-wgfs-nm532-I2.adoc
# - sources/rec-values/mep-wgfs-nm543-I2.adoc
# - sources/rec-values/mep-wgfs-nm576-I2.adoc
# - sources/rec-values/mep-wgfs-nm578-171Yb_518THz.adoc
# - sources/rec-values/mep-wgfs-nm606-Kr.adoc
# - sources/rec-values/mep-wgfs-nm612-I2.adoc
# - sources/rec-values/mep-wgfs-nm633-HeNe.adoc
# - sources/rec-values/mep-wgfs-nm633-I2.adoc
# - sources/rec-values/mep-wgfs-nm640-I2.adoc
# - sources/rec-values/mep-wgfs-nm657-Ca.adoc
# - sources/rec-values/mep-wgfs-nm674-88Sr_445THz.adoc
# - sources/rec-values/mep-wgfs-nm698-87Sr_429THz.adoc
# - sources/rec-values/mep-wgfs-nm698-88Sr_429THz.adoc
# - sources/rec-values/mep-wgfs-nm729-Ca_411THz.adoc
# - sources/rec-values/mep-wgfs-nm778-Rb.adoc
# - sources/rec-values/mep-wgfs-nm780-Rb.adoc
# - sources/rec-values/mep-wgfs-um10_3-OsO4.adoc
# - sources/rec-values/mep-wgfs-um1_54-C2H2.adoc
# - sources/rec-values/mep-wgfs-um3_39-CH4.adoc
# - sources/rec-values/mep-wgfs-spectral-lamp.adoc
# - sources/rec-values/mep-wgfs-cm4_4-Rb_6-835GHz.adoc
#
# - sources/guide-ccem-ampere-realization-en.adoc
# - sources/guide-ccl-metre-realization-1-en.adoc
# - sources/guide-ccl-metre-realization-2-en.adoc
# - sources/guide-ccl-metre-realization-3-en.adoc
# - sources/guide-ccm-kilogram-calibration-en.adoc
# - sources/guide-ccm-kilogram-dissemination-en.adoc
# - sources/mep-ampere-definition-en.adoc
# - sources/mep-candela-rapport-en.adoc
# - sources/mep-candela-definition-en.adoc
# - sources/mep-kelvin-absolute-en.adoc
# - sources/mep-kelvin-absolute-uncertainty-en.adoc
# - sources/mep-kelvin-definition-en.adoc
# - sources/mep-kelvin-lt-johnson-noise-en.adoc
# - sources/mep-kelvin-relative-en.adoc
# - sources/mep-kilogram-definition-en.adoc
# - sources/mep-metre-definition-en.adoc
# - sources/mep-mole-definition-en.adoc
# - sources/mep-second-definition-en.adoc
- sources/rec-values/mep-wgfs-nm237-115In_1267THz.adoc
- sources/rec-values/mep-wgfs-nm243-H_1233THz.adoc
- sources/rec-values/mep-wgfs-nm266-199Hg_1129THz.adoc
- sources/rec-values/mep-wgfs-nm267-27Al_1121THz.adoc
- sources/rec-values/mep-wgfs-nm282-199Hg_1065THz.adoc
- sources/rec-values/mep-wgfs-nm436-171Yb_688THz.adoc
- sources/rec-values/mep-wgfs-nm467-171Yb_642THz.adoc
- sources/rec-values/mep-wgfs-nm515-I2.adoc
- sources/rec-values/mep-wgfs-nm531-I2.adoc
- sources/rec-values/mep-wgfs-nm532-I2.adoc
- sources/rec-values/mep-wgfs-nm543-I2.adoc
- sources/rec-values/mep-wgfs-nm576-I2.adoc
- sources/rec-values/mep-wgfs-nm578-171Yb_518THz.adoc
- sources/rec-values/mep-wgfs-nm606-Kr.adoc
- sources/rec-values/mep-wgfs-nm612-I2.adoc
- sources/rec-values/mep-wgfs-nm633-HeNe.adoc
- sources/rec-values/mep-wgfs-nm633-I2.adoc
- sources/rec-values/mep-wgfs-nm640-I2.adoc
- sources/rec-values/mep-wgfs-nm657-Ca.adoc
- sources/rec-values/mep-wgfs-nm674-88Sr_445THz.adoc
- sources/rec-values/mep-wgfs-nm698-87Sr_429THz.adoc
- sources/rec-values/mep-wgfs-nm698-88Sr_429THz.adoc
- sources/rec-values/mep-wgfs-nm729-Ca_411THz.adoc
- sources/rec-values/mep-wgfs-nm778-Rb.adoc
- sources/rec-values/mep-wgfs-nm780-Rb.adoc
- sources/rec-values/mep-wgfs-um10_3-OsO4.adoc
- sources/rec-values/mep-wgfs-um1_54-C2H2.adoc
- sources/rec-values/mep-wgfs-um3_39-CH4.adoc
- sources/rec-values/mep-wgfs-spectral-lamp.adoc
- sources/rec-values/mep-wgfs-cm4_4-Rb_6-835GHz.adoc

- sources/guide-ccem-ampere-realization-en.adoc
- sources/guide-ccl-metre-realization-1-en.adoc
- sources/guide-ccl-metre-realization-2-en.adoc
- sources/guide-ccl-metre-realization-3-en.adoc
- sources/guide-ccm-kilogram-calibration-en.adoc
- sources/guide-ccm-kilogram-dissemination-en.adoc
- sources/mep-ampere-definition-en.adoc
- sources/mep-candela-rapport-en.adoc
- sources/mep-candela-definition-en.adoc
- sources/mep-kelvin-absolute-en.adoc
- sources/mep-kelvin-absolute-uncertainty-en.adoc
- sources/mep-kelvin-definition-en.adoc
- sources/mep-kelvin-lt-johnson-noise-en.adoc
- sources/mep-kelvin-relative-en.adoc
- sources/mep-kilogram-definition-en.adoc
- sources/mep-metre-definition-en.adoc
- sources/mep-mole-definition-en.adoc
- sources/mep-second-definition-en.adoc

- sources/sib-a4-en.adoc
- sources/sib-a4-fr.adoc

# Prerequisites of the SI Brochure collection
- sources/si-brochure-en.adoc
- sources/si-brochure-fr.adoc

# The SI Brochure collection
- collection.yml
- sources/si-brochure/1.07/collection.yml

collection:
organization: "BIPM - Bureau International des Poids et Mesures"
Expand Down
Binary file removed sources/images/si-brochure/img01.gif
Binary file not shown.
59 changes: 59 additions & 0 deletions sources/si-brochure/1.08/collection.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
---
directives:
- documents-inline

bibdata:
title:
- language: en
content: The International System of Units (SI)
- language: fr
content: Le Système international d’unités (SI)

type: standard

docid:
type: bipm
id: BIPM SI Brochure

edition: "9"

date:
- type: updated
value: "2020-09-17"

copyright:
owner:
name: Bureau International des Poids et Mesures
abbreviation: BIPM
from: 2020

ext:
doctype: brochure

output_folder: brochure

coverpage: sources/collection_cover.html

format:
- xml
- html
- presentation
- pdf

manifest:
level: brochure
title: BIPM SI Brochure

docref:
- file: si-brochure-fr.adoc
identifier: si-brochure-fr

- file: si-brochure-fr.adoc
identifier: si-brochure-en

prefatory-content:
|


final-content:
|
8 changes: 8 additions & 0 deletions sources/si-brochure/1.08/collection_cover.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<html>
<head></head>
<body>
<h1>{{ doctitle }}</h1>
<h2>{{ docnumber }}</h2>
<nav>{{ navigation }}</nav>
</body>
</html>
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ March 2019
| | |
a|
[%unnumbered]
image::si-brochure/sig-inglis.jpg[]
image::sig-inglis.jpg[]
a|
[%unnumbered]
image::si-brochure/sig-ullrich.jpg[]
image::sig-ullrich.jpg[]
a|
[%unnumbered]
image::si-brochure/sig-milton.jpg[]
image::sig-milton.jpg[]
^a| B.&#xa0;Inglis +
President, CIPM ^a| J.&#xa0;Ullrich +
President, CCU ^a| M.J.T. Milton +
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Symbols for units are treated as mathematical entities. In expressing the value
The axes of a graph may also be labelled in this way, so that the tick marks are labelled only with numbers, as in the graph below. [[numerical_value]] [[quantity_calculus]]

[%unnumbered]
image::si-brochure/img01.gif[]
image::img01.png[]

==== Quantity symbols and unit symbols (((non-SI units)))

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ mars 2019
| | |
a|
[%unnumbered]
image::si-brochure/sig-inglis.jpg[]
image::sig-inglis.jpg[]
a|
[%unnumbered]
image::si-brochure/sig-ullrich.jpg[]
image::sig-ullrich.jpg[]
a|
[%unnumbered]
image::si-brochure/sig-milton.jpg[]
image::sig-milton.jpg[]
^a| B.&#xa0;Inglis +
Président du CIPM ^a| J.&#xa0;Ullrich +
Président du CCU ^a| M.J.T. Milton +
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ graduations soient uniquement identifiées par des nombres, comme illustré sur
ci-dessous. [[calcul_formel]]

[%unnumbered]
image:si-brochure/img01.png[]
image::img01.png[]


==== Symboles des grandeurs et unités (((unité(s),symboles)))
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
= The International System of Units (SI)
:docnumber: Brochure
:partnumber: 1
:edition: 9
:copyright-year: 2019
:revdate: 2019-05-20
:edition: 10
:copyright-year: 2020
:revdate: 2020-09-17
:language: en
:draft: v1.07
:draft: v1.08
:title-en: The International System of Units
:title-fr: Le Système international d’unités
:title-cover-en: The International System of Units (SI)
Expand Down Expand Up @@ -43,7 +43,7 @@ include::sections-en/99-bibliography.adoc[]
[appendix]
== Decisions of the CGPM and the CIPM

include::sib-a1-en.adoc[leveloffset=+1,lines=21..-1]
include::../../sib-a1-en.adoc[leveloffset=+1,lines=21..-1]

include::sections-en/a2-important-units.adoc[]

Expand All @@ -52,6 +52,6 @@ include::sections-en/a3-photochemical.adoc[]
[appendix]
== Historical notes on the development of the International System of Units and its base units

include::sib-a4-en.adoc[leveloffset=+1,lines=22..-1]
include::../../sib-a4-en.adoc[leveloffset=+1,lines=22..-1]

include::sections-en/a5-sigles.adoc[]
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
= Le Système international d’unités
:docnumber: Brochure
:partnumber: 1
:edition: 9
:copyright-year: 2019
:revdate: 2019-05-20
:edition: 10
:copyright-year: 2020
:revdate: 2020-09-17
:language: fr
:draft: v1.07
:draft: v1.08
:title-en: The International System of Units
:title-fr: Le Système international d’unités
:title-cover-en: The International System of Units (SI)
Expand Down Expand Up @@ -43,7 +43,7 @@ include::sections-fr/99-bibliography.adoc[]
[appendix]
== Décisions de la Conférence générale des poids et mesures et du Comité international des poids et mesures

include::sib-a1-fr.adoc[leveloffset=+1,lines=21..-1]
include::../../sib-a1-fr.adoc[leveloffset=+1,lines=21..-1]

include::sections-fr/a2-important-units.adoc[]

Expand All @@ -52,7 +52,7 @@ include::sections-fr/a3-photochemical.adoc[]
[appendix]
== Notes historiques sur l’évolution du Système international d’unités et ses unités de base

include::sib-a4-fr.adoc[leveloffset=+1,lines=23..-1]
include::../../sib-a4-fr.adoc[leveloffset=+1,lines=23..-1]

include::sections-fr/a5-sigles.adoc[]

Expand Down

0 comments on commit 39a9f35

Please sign in to comment.