diff options
| author | Pierre Le Marre <dev@wismill.eu> | 2024-08-22 12:55:48 +0200 |
|---|---|---|
| committer | Pierre Le Marre <dev@wismill.eu> | 2024-08-27 07:01:28 +0200 |
| commit | 4da843af5230dd8008a64172456f57e2ba61370a (patch) | |
| tree | 9403701ffd9e86e266d6ce75bc471f30f8c83a24 /rules | |
| parent | 32d2ba4b03f8fb76bc56b6191215ff0e1630380f (diff) | |
Fix NEC Japanese layout having two groups
According to our doc and practices, symbols should be defined only for
the first group. There are still a few layouts defining simultaneously
two groups. One of them is `nec_vndr/jp`, which has also a dedicated
rule. This commit fixes only this layout in preparation of a refactor
for `inet` rules.
- Split `nec_vndr/jp(pc98)` into two sections: `pc98` and `jp`, and
make the latter the default section.
- Fix the rules to ensure using this layout with the model `pc98` will
load *explicitly* 2 layouts, as this is the case for other models.
- Make the rules match `jp` layout, not `nec_vndr/jp`. No other rule
used the vendor path to match a layout.
The remaining layouts with 2 groups should also be fixed someday.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/0013-modellayout_symbols.part | 3 | ||||
| -rw-r--r-- | rules/0033-modellayout_compat.part | 2 | ||||
| -rw-r--r-- | rules/xfree98 | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/rules/0013-modellayout_symbols.part b/rules/0013-modellayout_symbols.part index e576d101..5a0fb273 100644 --- a/rules/0013-modellayout_symbols.part +++ b/rules/0013-modellayout_symbols.part @@ -8,7 +8,8 @@ jollasbj $nonlatin = jolla_vndr/sbj(common)+us+%l%(v):2 jollasbj * = jolla_vndr/sbj(common)+%l%(v) $sun $sun_custom = pc+sun_vndr/%l%(v) - pc98 nec_vndr/jp = nec_vndr/jp(pc98) + pc98 jp = nec_vndr/jp(pc98)+nec_vndr/jp(jp):2 + pc98 * = nec_vndr/jp(pc98)+%l%(v) applealu_jis jp = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac)+macintosh_vndr/jp(mac):2 applealu_jis * = macintosh_vndr/apple(alukbd)+%l%(v)+macintosh_vndr/jp(mac):2 $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l%(v) diff --git a/rules/0033-modellayout_compat.part b/rules/0033-modellayout_compat.part index 91fb1896..db702358 100644 --- a/rules/0033-modellayout_compat.part +++ b/rules/0033-modellayout_compat.part @@ -1,5 +1,5 @@ ! model layout = compat - pc98 nec_vndr/jp = pc98(basic) + pc98 jp = pc98(basic) * jp = complete+japan olpc * = olpc olpcm * = olpc diff --git a/rules/xfree98 b/rules/xfree98 index 856ae9ca..23b0cda5 100644 --- a/rules/xfree98 +++ b/rules/xfree98 @@ -8,7 +8,7 @@ jp106 = xfree98(jp106) pc(jp106) ! model layout = symbols - pc98 nec_vndr/jp = nec_vndr/jp(pc98) + pc98 jp = nec_vndr/jp(pc98)+nec_vndr/jp(jp):2 jp106 jp = jp ! model layout = compat types |