Skip to content

Commit 19d6871

Browse files
yawnocyawnoc
committed
Merge branch 'cmdv4'
2 parents e8bf026 + c04795c commit 19d6871

25 files changed

Lines changed: 408 additions & 353 deletions

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
## [Unreleased]
55

6+
- Updated CMD to v4 syntax
7+
68

79
## [v0.9.11] (33) 較為爆煲 (2022-04-23)
810

‎README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,13 @@ These are [Conway-Markdown (CMD)] files,
113113
used to compile the HTML files by running Conway-Markdown
114114
whilst in the root directory of this repository.
115115

116-
### `*.html` (HTML)
116+
### `*.cmdr` (CMD Rules)
117117

118-
These are the actual About and Help files that get served in the app.
118+
These are files containing CMD Rules used by the CMD files.
119119

120-
### `*.inc` (Inclusions)
120+
### `*.html` (HTML)
121121

122-
These are files containing common [Conway-Markdown (CMD)]
123-
for inclusion in the CMD files.
122+
These are the actual About and Help files that get served in the app.
124123

125124
### `*.txt` (Text)
126125

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android
3232
}
3333
androidResources
3434
{
35-
ignoreAssetsPattern '*.cmd:*.inc'
35+
ignoreAssetsPattern '*.cmd:*.cmdr'
3636
}
3737
}
3838

‎app/src/main/assets/about-zh-Hans-CN.cmd‎

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,83 @@
1-
{+ links.inc +}
2-
{+ lang.inc +}
1+
< links.cmdr
2+
< lang.cmdr
3+
< typography.cmdr
34

4-
%%
5-
%lang zh-Hans-CN
6-
%title 关于
7-
%resources <link rel="stylesheet" href="webview.css">
8-
%%
5+
OrdinaryDictionaryReplacement: #boilerplate-properties-override
6+
- queue_position: BEFORE #boilerplate-properties
7+
- apply_mode: SIMULTANEOUS
8+
* %lang --> zh-Hans-CN
9+
* %title --> 关于
910

11+
%%%
1012

11-
# 笔画输入法 (\stroke-input-version) #
13+
@LINK_DEFINITIONS
14+
15+
# 笔画输入法 (\stroke-input-version)
1216

1317
----
1418
__[笔画输入法]__是自由开源软件，恕无担保。
1519
----
1620
----{.notice}
17-
©~\stroke-input-year {Conway} \+
18-
以 {GPL-3.0-only} 授权，见\GPL-3.0-only。 \+
21+
©~\stroke-input-years {Conway} <br>
22+
以 {GPL-3.0-only} 授权，见[gpl-3]。 <br>
1923
----
2024
----
2125
当中含有从废类 [`Keyboard.java`]、[`KeyboardView.java`] 所抄的字节，即：
2226
----
2327
----{.notice}
24-
©~2020 {Android} 开源项目 \+
25-
以 {Apache-2.0} 授权，见\Apache-2.0。 \+
28+
©~2020 {Android} 开源项目 <br>
29+
以 {Apache-2.0} 授权，见[apache-2]。 <br>
2630
----
2731

2832

29-
## 建件所倚靠的东西 ##
33+
## 建件所倚靠的东西
3034

31-
### [Material Components For Android] (\material-version) ###
35+
### [Material Components For Android] (\material-version)
3236
----{.notice}
33-
©~\material-year {Android} 开源项目 \+
34-
以 {Apache-2.0} 授权，见\Apache-2.0。 \+
37+
©~\material-years {Android} 开源项目 <br>
38+
以 {Apache-2.0} 授权，见[apache-2]。 <br>
3539
----
3640

3741

38-
## 笔画输入资料 ##
42+
## 笔画输入资料
3943

40-
### [Conway Stroke Data] (\stroke-data-version) ###
44+
### [Conway Stroke Data] (\stroke-data-version)
4145

42-
#### `sequence-characters.txt` ####
46+
#### `sequence-characters.txt`
4347
----{.notice}
44-
©~\sequence-characters-year Conway \+
45-
以 {CC-BY-4.0} 授权，见\CC-BY-4.0。 \+
48+
©~\sequence-characters-years {Conway} <br>
49+
以 {CC-BY-4.0} 授权，见[cc-by-4]。 <br>
4650
----
4751

4852
####
49-
`characters-traditional.txt` \+
50-
`characters-simplified.txt` \+
51-
`phrases-traditional.txt` \+
52-
`phrases-simplified.txt` \+
53-
`ranking-traditional.txt` \+
54-
`ranking-simplified.txt` \+
55-
####
53+
`characters-traditional.txt` <br>
54+
`characters-simplified.txt` <br>
55+
`phrases-traditional.txt` <br>
56+
`phrases-simplified.txt` <br>
57+
`ranking-traditional.txt` <br>
58+
`ranking-simplified.txt` <br>
59+
5660
----{.notice}
57-
献以为公，见\CC0。
61+
献以为公，见[cc0]。
5862
----
5963

6064

61-
## 键盘字体 ##
65+
## 键盘字体
6266

63-
### [Stroke Input Font] (\stroke-font-version) ###
67+
### [Stroke Input Font] (\stroke-font-version)
6468
----{.notice}
65-
©~\stroke-font-year Conway \+
66-
以 {GPL-3.0-only} 授权，见\GPL-3.0-only。 \+
69+
©~\stroke-font-years {Conway} <br>
70+
以 {GPL-3.0-only} 授权，见[gpl-3]。 <br>
6771
----
6872
----
69-
修改自 [2015 版 <span class="en">Noto Sans CJK TC</span>]，即：
73+
修改自 [2015 版 {Noto Sans CJK TC}]，即：
7074
----
7175
----{.notice}
72-
©~2015 谷歌、等 \+
73-
以 {Apache-2.0} 授权，见\Apache-2.0。 \+
76+
©~2015 谷歌、等 <br>
77+
以 {Apache-2.0} 授权，见[apache-2]。 <br>
7478
----
7579

7680

7781
<footer>
78-
此页的 [CMD] 源码： \cmd-source
82+
此页的 [CMD] 源码： [cmd-source]
7983
</footer>

‎app/src/main/assets/about-zh-Hans-CN.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ <h2>笔画输入资料</h2>
3232
<h3><a href="https://github.com/stroke-input/stroke-input-data">Conway Stroke Data</a> (v1.7.0)</h3>
3333
<h4><code>sequence-characters.txt</code></h4>
3434
<p class="notice">
35-
©&nbsp;2021–2022 Conway<br>
35+
©&nbsp;2021–2022 <span lang="en">Conway</span><br>
3636
以 <span lang="en">CC-BY-4.0</span> 授权，见&lt;<a href="https://creativecommons.org/licenses/by/4.0/">https://creativecommons.org/licenses/by/4.0/</a>&gt;。<br>
3737
</p>
38-
<h4><code>characters-traditional.txt</code><br>
38+
<h4>
39+
<code>characters-traditional.txt</code><br>
3940
<code>characters-simplified.txt</code><br>
4041
<code>phrases-traditional.txt</code><br>
4142
<code>phrases-simplified.txt</code><br>
@@ -47,18 +48,18 @@ <h4><code>characters-traditional.txt</code><br>
4748
<h2>键盘字体</h2>
4849
<h3><a href="https://github.com/stroke-input/stroke-input-font">Stroke Input Font</a> (v2.0.1)</h3>
4950
<p class="notice">
50-
©&nbsp;2021–2022 Conway<br>
51+
©&nbsp;2021–2022 <span lang="en">Conway</span><br>
5152
以 <span lang="en">GPL-3.0-only</span> 授权，见&lt;<a href="https://www.gnu.org/licenses/">https://www.gnu.org/licenses/</a>&gt;。<br>
5253
</p>
5354
<p>
54-
修改自 <a href="https://github.com/googlefonts/noto-cjk/tree/2663656870e92c0dcbe891590681815ebb509c05">2015 版 <span class="en">Noto Sans CJK TC</span></a>，即：
55+
修改自 <a href="https://github.com/googlefonts/noto-cjk/tree/2663656870e92c0dcbe891590681815ebb509c05">2015 版 <span lang="en">Noto Sans CJK TC</span></a>，即：
5556
</p>
5657
<p class="notice">
5758
©&nbsp;2015 谷歌、等<br>
5859
以 <span lang="en">Apache-2.0</span> 授权，见&lt;<a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>&gt;。<br>
5960
</p>
6061
<footer>
61-
此页的 <a lang="en" href="https://github.com/conway-markdown/conway-markdown">CMD</a> 源码： <a href="https://github.com/stroke-input/stroke-input-android/blob/master/app/src/main/assets/about-zh-Hans-CN.cmd"><code>about-zh-Hans-CN.cmd</code></a>
62+
此页的 <a href="https://github.com/conway-markdown/conway-markdown" lang="en">CMD</a> 源码： <a href="https://github.com/stroke-input/stroke-input-android/blob/master/app/src/main/assets/about-zh-Hans-CN.cmd"><code>about-zh-Hans-CN.cmd</code></a>
6263
</footer>
6364
</body>
6465
</html>

‎app/src/main/assets/about-zh-Hant-HK.cmd‎

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,83 @@
1-
{+ links.inc +}
2-
{+ lang.inc +}
1+
< links.cmdr
2+
< lang.cmdr
3+
< typography.cmdr
34

4-
%%
5-
%lang zh-Hant-HK
6-
%title 關於
7-
%resources <link rel="stylesheet" href="webview.css">
8-
%%
5+
OrdinaryDictionaryReplacement: #boilerplate-properties-override
6+
- queue_position: BEFORE #boilerplate-properties
7+
- apply_mode: SIMULTANEOUS
8+
* %lang --> zh-Hant-HK
9+
* %title --> 關於
910

11+
%%%
1012

11-
# 筆畫輸入法 (\stroke-input-version) #
13+
@LINK_DEFINITIONS
14+
15+
# 筆畫輸入法 (\stroke-input-version)
1216

1317
----
1418
__[筆畫輸入法]__為自由開源軟件，恕無擔保。
1519
----
1620
----{.notice}
17-
©~\stroke-input-year {Conway} \+
18-
以 {GPL-3.0-only} 授權，見\GPL-3.0-only。 \+
21+
©~\stroke-input-years {Conway} <br>
22+
以 {GPL-3.0-only} 授權，見[gpl-3]。 <br>
1923
----
2024
----
2125
當中含有從廢類 [`Keyboard.java`]、[`KeyboardView.java`] 所抄之位元組，即：
2226
----
2327
----{.notice}
24-
©~2020 {Android} 開源項目 \+
25-
以 {Apache-2.0} 授權，見\Apache-2.0。 \+
28+
©~2020 {Android} 開源項目 <br>
29+
以 {Apache-2.0} 授權，見[apache-2]。 <br>
2630
----
2731

2832

29-
## 建件所靠者 ##
33+
## 建件所靠者
3034

31-
### [Material Components For Android] (\material-version) ###
35+
### [Material Components For Android] (\material-version)
3236
----{.notice}
33-
©~\material-year {Android} 開源項目 \+
34-
以 {Apache-2.0} 授權，見\Apache-2.0。 \+
37+
©~\material-years {Android} 開源項目 <br>
38+
以 {Apache-2.0} 授權，見[apache-2]。 <br>
3539
----
3640

3741

38-
## 筆畫輸入資料 ##
42+
## 筆畫輸入資料
3943

40-
### [Conway Stroke Data] (\stroke-data-version) ###
44+
### [Conway Stroke Data] (\stroke-data-version)
4145

42-
#### `sequence-characters.txt` ####
46+
#### `sequence-characters.txt`
4347
----{.notice}
44-
©~\sequence-characters-year Conway \+
45-
以 {CC-BY-4.0} 授權，見\CC-BY-4.0。 \+
48+
©~\sequence-characters-years {Conway} <br>
49+
以 {CC-BY-4.0} 授權，見[cc-by-4]。 <br>
4650
----
4751

4852
####
49-
`characters-traditional.txt` \+
50-
`characters-simplified.txt` \+
51-
`phrases-traditional.txt` \+
52-
`phrases-simplified.txt` \+
53-
`ranking-traditional.txt` \+
54-
`ranking-simplified.txt` \+
55-
####
53+
`characters-traditional.txt` <br>
54+
`characters-simplified.txt` <br>
55+
`phrases-traditional.txt` <br>
56+
`phrases-simplified.txt` <br>
57+
`ranking-traditional.txt` <br>
58+
`ranking-simplified.txt` <br>
59+
5660
----{.notice}
57-
獻以為公，見\CC0。
61+
獻以為公，見[cc0]。
5862
----
5963

6064

61-
## 鍵盤字體 ##
65+
## 鍵盤字體
6266

63-
### [Stroke Input Font] (\stroke-font-version) ###
67+
### [Stroke Input Font] (\stroke-font-version)
6468
----{.notice}
65-
©~\stroke-font-year Conway \+
66-
以 {GPL-3.0-only} 授權，見\GPL-3.0-only。 \+
69+
©~\stroke-font-years {Conway} <br>
70+
以 {GPL-3.0-only} 授權，見[gpl-3]。 <br>
6771
----
6872
----
69-
修改自 [2015 版 <span class="en">Noto Sans CJK TC</span>]，即：
73+
修改自 [2015 版 {Noto Sans CJK TC}]，即：
7074
----
7175
----{.notice}
72-
©~2015 谷歌、等 \+
73-
以 {Apache-2.0} 授權，見\Apache-2.0。 \+
76+
©~2015 谷歌、等 <br>
77+
以 {Apache-2.0} 授權，見[apache-2]。 <br>
7478
----
7579

7680

7781
<footer>
78-
此頁之 [CMD] 源碼： \cmd-source
82+
此頁之 [CMD] 源碼： [cmd-source]
7983
</footer>

‎app/src/main/assets/about-zh-Hant-HK.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ <h2>筆畫輸入資料</h2>
3232
<h3><a href="https://github.com/stroke-input/stroke-input-data">Conway Stroke Data</a> (v1.7.0)</h3>
3333
<h4><code>sequence-characters.txt</code></h4>
3434
<p class="notice">
35-
©&nbsp;2021–2022 Conway<br>
35+
©&nbsp;2021–2022 <span lang="en">Conway</span><br>
3636
以 <span lang="en">CC-BY-4.0</span> 授權，見&lt;<a href="https://creativecommons.org/licenses/by/4.0/">https://creativecommons.org/licenses/by/4.0/</a>&gt;。<br>
3737
</p>
38-
<h4><code>characters-traditional.txt</code><br>
38+
<h4>
39+
<code>characters-traditional.txt</code><br>
3940
<code>characters-simplified.txt</code><br>
4041
<code>phrases-traditional.txt</code><br>
4142
<code>phrases-simplified.txt</code><br>
@@ -47,18 +48,18 @@ <h4><code>characters-traditional.txt</code><br>
4748
<h2>鍵盤字體</h2>
4849
<h3><a href="https://github.com/stroke-input/stroke-input-font">Stroke Input Font</a> (v2.0.1)</h3>
4950
<p class="notice">
50-
©&nbsp;2021–2022 Conway<br>
51+
©&nbsp;2021–2022 <span lang="en">Conway</span><br>
5152
以 <span lang="en">GPL-3.0-only</span> 授權，見&lt;<a href="https://www.gnu.org/licenses/">https://www.gnu.org/licenses/</a>&gt;。<br>
5253
</p>
5354
<p>
54-
修改自 <a href="https://github.com/googlefonts/noto-cjk/tree/2663656870e92c0dcbe891590681815ebb509c05">2015 版 <span class="en">Noto Sans CJK TC</span></a>，即：
55+
修改自 <a href="https://github.com/googlefonts/noto-cjk/tree/2663656870e92c0dcbe891590681815ebb509c05">2015 版 <span lang="en">Noto Sans CJK TC</span></a>，即：
5556
</p>
5657
<p class="notice">
5758
©&nbsp;2015 谷歌、等<br>
5859
以 <span lang="en">Apache-2.0</span> 授權，見&lt;<a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>&gt;。<br>
5960
</p>
6061
<footer>
61-
此頁之 <a lang="en" href="https://github.com/conway-markdown/conway-markdown">CMD</a> 源碼： <a href="https://github.com/stroke-input/stroke-input-android/blob/master/app/src/main/assets/about-zh-Hant-HK.cmd"><code>about-zh-Hant-HK.cmd</code></a>
62+
此頁之 <a href="https://github.com/conway-markdown/conway-markdown" lang="en">CMD</a> 源碼： <a href="https://github.com/stroke-input/stroke-input-android/blob/master/app/src/main/assets/about-zh-Hant-HK.cmd"><code>about-zh-Hant-HK.cmd</code></a>
6263
</footer>
6364
</body>
6465
</html>

0 commit comments

Comments
 (0)