Skip to content

Commit 52462f6

Browse files
keyman-statuskeyman-status
authored
Merge pull request #2420 from keymanapp/auto/A19S22-merge-master-into-staging
auto: A19S22 merge master into staging
2 parents b444ee2 + b161e84 commit 52462f6

File tree

15 files changed

+1599
-6
lines changed

15 files changed

+1599
-6
lines changed

‎developer/engine/web/18.0/guide/__index.txt‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎developer/language/reference/_index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ any(diacritickey) + any(vowel) > index(vowel,2) index(diacriticCombining,1)
7979
```
8080

8181
The following example shows how the index statement can be used in the left hand
82-
side of a rule. If a repeating vowel is found, then this rule puts a circumflex
82+
side of a rule. If a repeating vowel is found, then this rule adds a circumflex
8383
on top of both vowels when <key>^</key> is pressed.
8484

8585
```
8686
store(vowel) "aeiou"
8787
store(vowelcirc) "âêîôû"
88-
any(vowel) index(vowel,1) + "^" > index(vowelcirc,1)
88+
any(vowel) index(vowel,1) + "^" > index(vowelcirc,1) index(vowelcirc,1)
8989
```
9090

9191
## Platforms

‎keyboard/athinkra_mwangwego/1.1/Mwangwego-Typing-English.pdf‎

423 KB
Binary file not shown.

‎keyboard/athinkra_mwangwego/1.1/athinkra_mwangwego.php‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
<?php
2+
$pagename = "Mwangwego Keyboard";
3+
$pagetitle = "The Athinkra Mwangwego Keyboard";
4+
$pagestyle = <<<END
5+
img.indented { text-indent: 10%}
6+
7+
table.flat { border-spacing: 0; margin: 0.5em 0 }
8+
table.flat td, table.kb th { border: thin solid #666; text-align: center ; padding: 0.3em }
9+
table.flat { border-bottom: hidden }
10+
table.flat { empty-cells: show }
11+
table.flat th { text-align: center; border: thin solid #666; background-color: #e0dacf }
12+
table.flat caption { margin: 0.5em 0 0 0 }
13+
14+
td.divide { border-left: 1px solid black }
15+
td.flat-bottom { border-bottom: 1px solid black }
16+
td.flat-top { border-top: 1px solid black }
17+
.note { background: #ffa }
18+
.note-emph { background: #ffa; font-style: italic }
19+
.question-unanswered { background: #ffa; font-style: italic; color: #ff0000 }
20+
.question-answered { background: #bfffa0; font-style: italic; text-decoration: line-through }
21+
body { max-width: 1200px }
22+
23+
table.kb th, table.kb td { padding: 0.3em }
24+
table.kb th:first-child { background-color: #e0dacf; }
25+
table.kb tr:first-child { background-color: #e0dacf; font-weight:bold; }
26+
table.kb tr:first-child th:first-child { background-color: #ffffff; border-left-color: #ffffff; border-top-color: #ffffff }
27+
table.kb tr:first-child th:last-child { background-color: #ffffff; border-right-color: #ffffff; border-top-color: #ffffff }
28+
table.kb th { background-color: #e0dacf; border-left-color: #ffffff }
29+
table.kb td, table.kb th { border: thin solid #666; text-align: center }
30+
table.kb th { text-align: center; background-color: #d7d0b9 }
31+
table.kb { border-bottom: hidden }
32+
table.kb { empty-cells: show }
33+
table.kb caption { margin: 0.5em 0 0 0 }
34+
table.kb tr:last-child { text-align: center; background-color: #d7d0b9; font-weight:bold; }
35+
table.kb tr:last-child th:first-child { background-color: #ffffff; border-left-color: #ffffff; border-bottom-color: #ffffff }
36+
dd {margin: 0 0 1em; padding: 0}
37+
38+
table.punct th { font-weight: bold; padding: 0.3em }
39+
table.punct td { font-weight: normal; padding: 0.3em }
40+
table.punct th:first-child { background-color: #e0dacf; }
41+
table.punct tr:first-child { background-color: #e0dacf; }
42+
table.punct tr:first-child th:first-child { background-color: #ffffff; border-left-color: #ffffff; border-top-color: #ffffff }
43+
table.punct th { background-color: #e0dacf; border-left-color: #ffffff }
44+
table.punct td, table.punct th { border: thin solid #666; text-align: center }
45+
table.punct th { text-align: center; background-color: #d7d0b9 }
46+
table.punct { border-bottom: hidden }
47+
table.punct { empty-cells: show }
48+
49+
table.zaima th { font-weight: bold; padding: 0.3em }
50+
table.zaima td { font-weight: normal; padding: 0.3em }
51+
table.zaima th:first-child { background-color: #e0dacf;}
52+
table.zaima tr:first-child th { background-color: #e0dacf; }
53+
table.zaima tr:first-child th:first-child { background-color: #ffffff; border-left-color: #ffffff; border-top-color: #ffffff }
54+
table.zaima th { background-color: #e0dacf; border-left-color: #ffffff }
55+
table.zaima td, table.zaima th { border: thin solid #666; text-align: center }
56+
table.zaima th { text-align: center; background-color: #d7d0b9 }
57+
table.zaima { border-bottom: hidden }
58+
table.zaima { empty-cells: show }
59+
60+
code {
61+
display: inline-block;
62+
width: 50px;
63+
border: 1px solid #000;
64+
text-align: center;
65+
}
66+
END;
67+
require_once('header.php');
68+
?>
69+
70+
71+
<h1>Mwangwego Keyboard</h1>
72+
73+
<h2><a id="abstract" name="abstract"></a>Introduction</h2>
74+
75+
<p style="text-align: justify;">
76+
This is a keyboard for typing Malawi languages in the Mwangwego script.
77+
The <a target="_blank" href="Mwangwego-Typing-English.pdf">pdf manual</a> reviews typing in full detail.
78+
</p>
79+
80+
<h3>Caveats</h3>
81+
<p style="text-align: justify;">
82+
This is an <i><b>experimental</b></i> keyboard for the Mwangwego script. It requires the included “Mwangwego Book” font which
83+
in turn encodes the script under its provisional encoding for Unicode 19. See the typing manual for full details
84+
of the typing rules. Since this keyboard uses a provisional encoding, those codepoints can change. Any documents
85+
created using this keyboard could become obsolete if the codepoint assignments change.
86+
</p>
87+
88+
<hr/>
89+
90+
<h2>License</h2>
91+
92+
<p>This keyboard is copyright © Athinkra. It is distributed under the MIT free software license:</p>
93+
94+
<div style="margin-left: 1em;">
95+
<table>
96+
<tr>
97+
<td style="border: thin solid #666; text-align: justify; padding-left: 5px; padding-right: 5px;" width="700px">
98+
<h5>The MIT License (MIT)</h5>
99+
100+
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
101+
102+
<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
103+
104+
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
105+
</td>
106+
</tr>
107+
</table>
108+
</div>
109+

0 commit comments

Comments
 (0)