Skip to content

Commit 0dc4779

Browse files
srl295pedberg-icu
authored andcommitted
CLDR-19006 last update to link anchors, and document (#5153)
(cherry picked from commit 032243b)
1 parent 5254526 commit 0dc4779

File tree

5 files changed

+30
-14
lines changed

5 files changed

+30
-14
lines changed

.github/workflows/gh-pages.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: gh-pages
32

43
# Note: we have a foot in two camps here, maybe more
@@ -27,7 +26,7 @@ on:
2726
paths:
2827
- "tools/scripts/tr-archive/**"
2928
- "docs/**"
30-
- '.github/workflows/gh-pages.yml'
29+
- ".github/workflows/gh-pages.yml"
3130
jobs:
3231
build:
3332
name: "Build Github Pages"
@@ -47,17 +46,18 @@ jobs:
4746
- uses: nodenv/actions/node-version@v4 # setup using .node-version
4847
- name: Run TR archiver
4948
# Note: will update ToC if out of date
50-
run: 'cd tools/scripts/tr-archive/ && npm ci && npm run build'
49+
run: "cd tools/scripts/tr-archive/ && npm ci && npm run build"
5150
- name: Run Kbd Charts
52-
run: 'cd docs/charts/keyboards && npm ci && npm run build'
51+
run: "cd docs/charts/keyboards && npm ci && npm run build"
5352
- name: Upload tr35.zip
5453
uses: actions/upload-artifact@v4
5554
with:
5655
name: tr35-spec
5756
path: tools/scripts/tr-archive/tr35.zip
58-
- name: 'Run TR link extractor (experimental)'
57+
- name: "Check internal anchors in spec"
5958
# Note: see CLDR-16526 for making this an error
60-
run: 'cd tools/scripts/tr-archive/ && npm run extract-link-targets || (echo Warning, please fix these ; true)'
59+
# see <tools/scripts/tr-archive/README.md> for instructions
60+
run: "cd tools/scripts/tr-archive/ && npm run extract-link-targets"
6161
- name: Lint Markdown
6262
# Warn, don't fail yet
6363
run: npx markdownlint-cli *.md {specs,docs}/*.md || (echo Warning, please fix these ; true)
@@ -73,10 +73,10 @@ jobs:
7373
- name: Run lychee
7474
uses: lycheeverse/lychee-action@v1
7575
with:
76-
args: "-n --cache --max-cache-age 10d docs/rfc docs/ldml"
77-
fail: false
78-
format: markdown
79-
output: linkcheck.md
76+
args: "-n --cache --max-cache-age 10d docs/rfc docs/ldml"
77+
fail: false
78+
format: markdown
79+
output: linkcheck.md
8080
- name: Link Checker Summary
8181
run: cat linkcheck.md >> $GITHUB_STEP_SUMMARY
8282
- uses: ruby/setup-ruby@v1
@@ -90,7 +90,7 @@ jobs:
9090
env:
9191
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9292
- name: Rearrange stuff
93-
run: 'cp -vr tools/scripts/tr-archive/dist/* ./_site/ldml/ && cp tools/scripts/tr-archive/reports-v2.css ./_site/'
93+
run: "cp -vr tools/scripts/tr-archive/dist/* ./_site/ldml/ && cp tools/scripts/tr-archive/reports-v2.css ./_site/"
9494
- name: Deploy to GitHub Pages (main)
9595
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
9696
uses: actions/upload-pages-artifact@v3

docs/ldml/tr35-collation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ Comments with DUCET-style weights in files other than allkeys_CLDR.txt and allke
290290
An implementation may modify the weights further to fit the needs of its data structures.
291291

292292
* **UCA_Rules** - A file that specifies the root collation order in the form of [tailoring rules](#Collation_Tailorings). This is only an approximation of the FractionalUCA data, since the rule syntax cannot express every detail of the collation elements. For example, in the DUCET and in FractionalUCA, tertiary differences are usually expressed with special tertiary weights on all collation elements of an expansion, while a typical from-rules builder will modify the tertiary weight of only one of the collation elements.
293-
* **CollationTest_CLDR** - The CLDR versions of the CollationTest files, which use the tailorings for CLDR. For information on the format, see [CollationTest.html](https://www.unicode.org/Public/UCA/latest/CollationTest.html) in the [UCA data directory](https://www.unicode.org/reports/tr10/#Data10).
293+
* **CollationTest_CLDR** - The CLDR versions of the CollationTest files, which use the tailorings for CLDR. For information on the format, see [UTS #10: 12.2 Conformance Tests](https://unicode.org/reports/tr10/#Conformance_Tests) and the [UCA data directory](https://www.unicode.org/reports/tr10/#Data10).
294294
* CollationTest_CLDR_NON_IGNORABLE.txt
295295
* CollationTest_CLDR_SHIFTED.txt
296296

docs/ldml/tr35-dates.anchors.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
"Calendar_Elements",
88
"Calendar_Fields",
99
"Calendar_Period_Field_Sets",
10+
"Calendar_Preference_Data",
1011
"calendar-data",
1112
"calendar-elements",
1213
"calendar-fields",
1314
"calendar-period-field-sets",
15+
"calendar-preference-data",
1416
"Composite_Field_Sets",
1517
"composite-field-sets",
1618
"Contents",

docs/ldml/tr35-modifications.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ The LDML specification is divided into the following parts:
6868
**Changes in LDML Version 48 (Differences from Version 47)**
6969
<!-- Update the date (need to add/update this comment to pass CI tests that require mods to be updated when spec is) -->
7070
<!-- Some internal links were updated to fix broken links. -->
71+
<!-- fixed broken links -->
7172

7273
### Locale Identifiers and Names
7374
* [Display Name Elements](tr35-general.md#display-name-elements) Described the usage of the `language` element `menu` values `core` and `extension`, and `alt="menu"`.

tools/scripts/tr-archive/README.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,25 @@ $ npm install
3737
$ npm run fix-tocs
3838
```
3939

40-
This will update the tr .md files in place.
40+
This will update the tr .md files in place. Then, go ahead and check in updates to the .md fioles
41+
42+
## Checking internal link targets and stable anchors
43+
44+
```shell
45+
$ npm install
46+
$ npm run build
47+
$ npm run extract-link-targets
48+
```
49+
50+
1. fix any errors, such as bad links
51+
2. there are warnings about duplicate anchors - these are OK.
52+
3. check the git status an diff on the `docs/ldml/tr35*.anchors.json` files
53+
- make sure that any anchors aren't inexplicably removed
54+
4155
### Copyright
4256

4357
Copyright &copy; 1991-2021 Unicode, Inc.
4458
All rights reserved.
4559
[Terms of use](https://www.unicode.org/copyright.html)
4660

4761
See [../../../README.md](../../../README.md) for full project information.
48-

0 commit comments

Comments
 (0)