Skip to content

Commit f0d8c71

Browse files
Merge pull request #2473 from keymanapp/auto/A19S25-merge-master-into-staging
auto: A19S25 merge master into staging
2 parents 3653ad3 + bceb4df commit f0d8c71

File tree

123 files changed

+7491
-11438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+7491
-11438
lines changed

.github/workflows/add-to-keyman-project.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
name: Add new issues and pull requests to project
1414
runs-on: ubuntu-latest
1515
steps:
16+
# TODO: Update to Node 24 when actions/add-to-project#712 is resolved
1617
- uses: actions/add-to-project@v1.0.2
1718
with:
1819
project-url: https://github.com/orgs/keymanapp/projects/1

.github/workflows/auto-approve-and-merge-keyman-server-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
permissions: write-all
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v4.1.5
20+
uses: actions/checkout@v6.0.2
2121
with:
2222
sparse-checkout: |
2323
README.md

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v4.1.5
14+
uses: actions/checkout@v6.0.2
1515

1616
# Build the docker image and create link to vendor/ dependencies
1717
- name: Build the Docker image

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v4.1.5
24+
uses: actions/checkout@v6.0.2
2525

2626
# Workaround: https://github.com/docker/build-push-action/issues/461
2727
- name: Setup Docker buildx

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
- name: Update labels based on PR title
1111
id: labeler
12-
uses: fuxingloh/multi-labeler@f5bd7323b53b0833c1e4ed8d7b797ae995ef75b4 # v2.0.1
12+
uses: fuxingloh/multi-labeler@b15a54460c38f54043fa75f7b08a0e2aa5b94b5b # v4.0.0
1313
with:
1414
github-token: ${{secrets.GITHUB_TOKEN}}
1515
config-path: .github/multi-labeler.yml

developer/19.0/context/keyboard-editor.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -209,24 +209,24 @@ Display 102nd Key (as on European keyboards)
209209
: European keyboards (ISO layout) have one extra key that is not on US keyboards (ANSI layout).
210210
This key is positioned to the right of the left shift key. Some
211211
other keyboards have additional keys; these are not shown on the
212-
layout designer.
213-
212+
layout designer.
213+
214214
If you have a European layout selected as your
215215
Windows layout, the 102nd key will always be visible in the
216216
designer; ensure you select this checkbox if you want the 102nd key
217217
to always be visible to end users of the layout, irrespective of
218-
their selected base layout.
219-
218+
their selected base layout.
219+
220220
When a European layout is selected as
221221
your Windows layout, the shape of the Enter key will also change to
222222
take two rows, and the backslash key will move down one row, but not
223-
otherwise change in behaviour.
223+
otherwise change in behaviour.
224224

225225
<img src="../images/ui/OnScreenKeyboard_ISO.png" style="width:100%" alt="Keyboard Editor - On-Screen tab with ISO layout"/>
226226
*See the difference between the two layouts in Keyman Developer.*
227227

228228
> [!NOTE]
229-
> The "Display 102nd Key (as on European keyboards)" checkbox can be left unchecked.
229+
> The "Display 102nd Key (as on European keyboards)" checkbox can be left unchecked.
230230
> To ensure compatibility, the extra key shouldn't be assigned since it won't be accessible on an ANSI physical keyboard.
231231

232232
Auto-fill underlying layout
@@ -270,20 +270,20 @@ Template...
270270
be lost. Therefore, selecting an appropriate template early in the
271271
development process is suggested.
272272

273-
- template-basic: has only a phone layout (4 rows of keys), with three layers: default (K_A through K_Z
274-
plus some punctuation), shift (Shift K_A through Shift K_Z, plus some punctuation), numeric (K_0 through
273+
- template-basic: has only a phone layout (4 rows of keys), with three layers: default (K_A through K_Z
274+
plus some punctuation), shift (Shift K_A through Shift K_Z, plus some punctuation), numeric (K_0 through
275275
K_9 unshifted and shifted, plus other non-alphanumerice keys).
276276

277-
- template-latin: has both phone and tablet layouts (which are identical except for some key spacing,
278-
each with 4 rows of keys), with four layers: default, shift, numeric, symbol. The first three layers
279-
are similar to those of template-basic, with the addition of longpress keys for accented characters.
277+
- template-latin: has both phone and tablet layouts (which are identical except for some key spacing,
278+
each with 4 rows of keys), with four layers: default, shift, numeric, symbol. The first three layers
279+
are similar to those of template-basic, with the addition of longpress keys for accented characters.
280280
The symbol layer has many symbols not usually seen on a physical keyboard.
281281

282-
- template-traditional: has both phone (4 rows of keys) and tablet (5 rows of keys) layouts. The phone
283-
layout is similar to the template-basic layout. The tablet layout has eight layers: default, shift, ctrl,
284-
shift-ctrl, alt, shift-alt, ctrl-alt, shift-ctrl-alt. The default layer has the keys from the default layer
282+
- template-traditional: has both phone (4 rows of keys) and tablet (5 rows of keys) layouts. The phone
283+
layout is similar to the template-basic layout. The tablet layout has eight layers: default, shift, ctrl,
284+
shift-ctrl, alt, shift-alt, ctrl-alt, shift-ctrl-alt. The default layer has the keys from the default layer
285285
of the desktop layout, the shift layer has the keys from the shift layer of the desktop layout, and so on.
286-
286+
287287
Import from On Screen
288288
: If you have an existing On-Screen Keyboard for your keyboard layout,
289289
importing the design from the On-Screen Keyboard can reduce the
@@ -413,7 +413,7 @@ ID
413413
- `U_####[_####]` is used as a shortcut for a key that
414414
will output those Unicode values, if no rule matches it. This is
415415
similar to the overloaded behaviour for `K_` ids. Thus `####`
416-
must be valid Unicode characters.
416+
must be valid Unicode characters.
417417
The square bracket characters `[` and `]` indicate an optional portion of the sequence
418418
and are not to be included in the shortcut. E.g. `U_0259` would generate a
419419
schwa if no rule matches. It is still valid to have a rule such
@@ -479,7 +479,7 @@ file. This makes certain operations simpler, such as batched rearranging
479479
of keys, or using another text editor to make bulk changes. The Code
480480
view uses the standard [editor](editor).
481481

482-
The format of the layout file is described in [Creating a touch keyboard layout guide](../guides/develop/creating-a-touch-keyboard-layout-for-amharic-the-nitty-gritty).
482+
The format of the layout file is described in [.keyman-touch-layout file format](../reference/file-types/keyman-touch-layout).
483483

484484
#### Long-press, Flicks, and Multitaps controls
485485

developer/19.0/guides/__index.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-distribute
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-creating-a-touch-keyboard-layout-for-amharic-the-nitty-gritty.md
2+
-creating-a-touch-keyboard-layout-for-amharic.md
3+
-tutorial
4+
-touch-keyboard-tutorial

0 commit comments

Comments
 (0)