Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ebcf554a6f | ||
|
|
fbdf64f64e | ||
|
|
cfd095b3b0 | ||
|
|
f323a29552 | ||
|
|
aa00b793ce | ||
|
|
b3b7589379 |
@@ -12,7 +12,7 @@
|
||||
- **中英自動判斷**:每按一個鍵就重新判斷,組字區即時顯示結果(Mac 版英文以藍字顯示)
|
||||
- **中英混打不用空白**:`ji3hello` → 我hello、`hellosu3cl3` → hello你好,同一段內會自動切分
|
||||
- **判斷錯了按 Tab**:在中/英之間翻轉,輸入法會記住這組按鍵,下次自動判斷對
|
||||
- **單按 Shift 切換英文模式**:英文模式下按鍵直接送出、保持小寫、不顯示底線,再單按一次 Shift 回到中英自動判斷;英文模式時輸入法圖示會從「注」變成「A」
|
||||
- **單按 Shift 切換英文模式**:英文模式下按鍵直接送出、保持小寫、不顯示底線,再單按一次 Shift 回到中英自動判斷;切換時游標旁會短暫顯示「A」或「中」(Windows、Linux 的輸入法圖示也會變成「A」)
|
||||
- **注音順序打錯也能修正**:`ㄧㄒㄠˇ`、`ㄒㄠㄧˇ` 都會變成 `ㄒㄧㄠˇ`(小)
|
||||
- **可省略聲調**:`jiap7`(ㄨㄛ ㄇㄣ˙)一樣能打出「我們」
|
||||
- **候選字**:用 ← → 把游標移到要改的字後面,按 ↓ 選字;選過的會固定下來
|
||||
@@ -34,7 +34,7 @@
|
||||
2. 系統設定 → 鍵盤 → 文字輸入 → 編輯… → + → 繁體中文 → **自動注音**。
|
||||
3. 清單裡沒出現的話,登出再登入一次。
|
||||
|
||||
從 0.12 以前的版本更新:輸入法現在分成「中英自動」和「英文」兩個模式(各有圖示),安裝時會自動加入。如果輸入法清單裡還留著舊的「自動注音」項目,把它移除即可。
|
||||
從 0.13.x 更新:0.13 把輸入法拆成「中英自動」和「英文」兩個項目,0.14 起改回單一個「自動注音」。更新後如果輸入法清單裡沒有「自動注音」,到「系統設定 → 鍵盤 → 輸入方式」重新加入即可。
|
||||
|
||||
PKG 會裝到 `/Library/Input Methods/`,系統上所有使用者都能用。
|
||||
|
||||
@@ -69,7 +69,7 @@ SmartScreen 出現警告時,按「其他資訊 → 仍要執行」。解除安
|
||||
| ← → | 在組字區移動游標(最左停在第一個中文字後面)。游標在中間時:直接打注音會**插入**新字,Backspace 刪掉游標前的字,↓ 選游標前的字 |
|
||||
| ↓ | 開啟游標前那個字或詞的候選字(游標預設在最後),數字鍵 1–9 選字,Esc 關閉 |
|
||||
| Esc | 取消組字 |
|
||||
| **單按 Shift** | 沒在打字時:切換**英文模式**,按鍵直接送出、保持小寫、沒有底線,一直維持到再單按一次 Shift 才回到中英自動判斷,圖示會變成「A」(Mac 的選單列、Windows 的工作列、Linux 的 IBus 狀態)。Mac 也可以直接在選單列選「英文」模式。打到一半時:同 Tab,整段翻轉 |
|
||||
| **單按 Shift** | 沒在打字時:切換**英文模式**,按鍵直接送出、保持小寫、沒有底線,一直維持到再單按一次 Shift 才回到中英自動判斷,Mac 會在游標旁短暫顯示「A」/「中」,Windows 的工作列和 Linux 的 IBus 狀態圖示會變成「A」;Mac 也可以從輸入法選單的「英文模式」切換。打到一半時:同 Tab,整段翻轉 |
|
||||
| Shift + 字母 | 打大寫字母(也會強制英文) |
|
||||
| `< > ? ! : ( ) [ ]` | 中文語境下自動轉成全形 `,。?!:()「」` |
|
||||
| `, . / ; -` | 英文單字後是標點;在注音中是 ㄝ ㄡ ㄥ ㄤ ㄦ(例如 `2;3` = 檔) |
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
/* Names shown in System Settings and the input menu. */
|
||||
CFBundleName = "自動注音";
|
||||
CFBundleDisplayName = "自動注音";
|
||||
"com.autozhuyin.inputmethod.AutoZhuyin" = "自動注音";
|
||||
+2
-63
@@ -15,70 +15,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.13.0</string>
|
||||
<string>0.14.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>21</string>
|
||||
<key>ComponentInputModeDict</key>
|
||||
<dict>
|
||||
<key>tsInputModeListKey</key>
|
||||
<dict>
|
||||
<key>com.autozhuyin.inputmethod.AutoZhuyin.Auto</key>
|
||||
<dict>
|
||||
<key>TISInputSourceID</key>
|
||||
<string>com.autozhuyin.inputmethod.AutoZhuyin.Auto</string>
|
||||
<key>TISIntendedLanguage</key>
|
||||
<string>zh-Hant</string>
|
||||
<key>tsInputModeAlternateMenuIconFileKey</key>
|
||||
<string>icon.tiff</string>
|
||||
<key>tsInputModeCharacterRepertoireKey</key>
|
||||
<array>
|
||||
<string>Hant</string>
|
||||
</array>
|
||||
<key>tsInputModeDefaultStateKey</key>
|
||||
<true/>
|
||||
<key>tsInputModeIsVisibleKey</key>
|
||||
<true/>
|
||||
<key>tsInputModeMenuIconFileKey</key>
|
||||
<string>icon.tiff</string>
|
||||
<key>tsInputModePaletteIconFileKey</key>
|
||||
<string>icon.tiff</string>
|
||||
<key>tsInputModePrimaryInScriptKey</key>
|
||||
<true/>
|
||||
<key>tsInputModeScriptKey</key>
|
||||
<string>smTradChinese</string>
|
||||
</dict>
|
||||
<key>com.autozhuyin.inputmethod.AutoZhuyin.English</key>
|
||||
<dict>
|
||||
<key>TISInputSourceID</key>
|
||||
<string>com.autozhuyin.inputmethod.AutoZhuyin.English</string>
|
||||
<key>TISIntendedLanguage</key>
|
||||
<string>zh-Hant</string>
|
||||
<key>tsInputModeAlternateMenuIconFileKey</key>
|
||||
<string>icon-en.tiff</string>
|
||||
<key>tsInputModeCharacterRepertoireKey</key>
|
||||
<array>
|
||||
<string>Hant</string>
|
||||
</array>
|
||||
<key>tsInputModeDefaultStateKey</key>
|
||||
<true/>
|
||||
<key>tsInputModeIsVisibleKey</key>
|
||||
<true/>
|
||||
<key>tsInputModeMenuIconFileKey</key>
|
||||
<string>icon-en.tiff</string>
|
||||
<key>tsInputModePaletteIconFileKey</key>
|
||||
<string>icon-en.tiff</string>
|
||||
<key>tsInputModePrimaryInScriptKey</key>
|
||||
<false/>
|
||||
<key>tsInputModeScriptKey</key>
|
||||
<string>smTradChinese</string>
|
||||
</dict>
|
||||
</dict>
|
||||
<key>tsVisibleInputModeOrderedArrayKey</key>
|
||||
<array>
|
||||
<string>com.autozhuyin.inputmethod.AutoZhuyin.Auto</string>
|
||||
<string>com.autozhuyin.inputmethod.AutoZhuyin.English</string>
|
||||
</array>
|
||||
</dict>
|
||||
<string>24</string>
|
||||
<key>InputMethodConnectionName</key>
|
||||
<string>com.autozhuyin.inputmethod.AutoZhuyin_Connection</string>
|
||||
<key>InputMethodServerControllerClass</key>
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
/* Names shown in System Settings and the input menu. */
|
||||
CFBundleName = "AutoZhuyin";
|
||||
CFBundleDisplayName = "AutoZhuyin";
|
||||
"com.autozhuyin.inputmethod.AutoZhuyin" = "AutoZhuyin";
|
||||
@@ -0,0 +1,4 @@
|
||||
/* Names shown in System Settings and the input menu. */
|
||||
CFBundleName = "自動注音";
|
||||
CFBundleDisplayName = "自動注音";
|
||||
"com.autozhuyin.inputmethod.AutoZhuyin" = "自動注音";
|
||||
@@ -78,8 +78,8 @@ final class InputController: IMKInputController {
|
||||
let idle = engine.keys.isEmpty
|
||||
_ = engine.handle(.shiftTap)
|
||||
updateComposition(client)
|
||||
// English mode on/off: switch input mode so the menu-bar icon shows it.
|
||||
if idle { InputModes.select(english: engine.isEnglishMode) }
|
||||
// English mode on/off: show 中 / A by the cursor.
|
||||
if idle { ModeIndicator.show(english: engine.isEnglishMode, client: client) }
|
||||
}
|
||||
return false
|
||||
}
|
||||
@@ -156,18 +156,6 @@ final class InputController: IMKInputController {
|
||||
}
|
||||
}
|
||||
|
||||
/// The input mode changed (menu bar, keyboard shortcut, or our own Shift tap).
|
||||
override func setValue(_ value: Any!, forTag tag: Int, client sender: Any!) {
|
||||
if tag == kTextServiceInputModePropertyTag, let id = value as? String {
|
||||
let english = InputModes.isEnglish(id)
|
||||
if english != engine.isEnglishMode {
|
||||
commitComposition(sender)
|
||||
engine.setEnglishMode(english)
|
||||
}
|
||||
}
|
||||
super.setValue(value, forTag: tag, client: sender)
|
||||
}
|
||||
|
||||
override func commitComposition(_ sender: Any!) {
|
||||
guard let client = sender as? IMKTextInput else { return }
|
||||
commit(engine.commitAll(), to: client)
|
||||
@@ -202,6 +190,9 @@ final class InputController: IMKInputController {
|
||||
|
||||
override func menu() -> NSMenu! {
|
||||
let menu = NSMenu()
|
||||
let english = menu.addItem(withTitle: "英文模式(單按 Shift)", action: #selector(toggleEnglish(_:)), keyEquivalent: "")
|
||||
english.state = engine.isEnglishMode ? .on : .off
|
||||
menu.addItem(.separator())
|
||||
let modes: [(Reranker.Mode, String, Selector)] = [
|
||||
(.off, "AI 選字:關閉", #selector(aiOff(_:))),
|
||||
(.saver, "AI 選字:省電", #selector(aiSaver(_:))),
|
||||
@@ -221,6 +212,11 @@ final class InputController: IMKInputController {
|
||||
return menu
|
||||
}
|
||||
|
||||
@objc private func toggleEnglish(_ sender: Any?) {
|
||||
if let client = client() { commitComposition(client) }
|
||||
engine.setEnglishMode(!engine.isEnglishMode)
|
||||
}
|
||||
|
||||
@objc private func aiOff(_ sender: Any?) { AI.setMode(.off) }
|
||||
@objc private func aiSaver(_ sender: Any?) { AI.setMode(.saver) }
|
||||
@objc private func aiStandard(_ sender: Any?) { AI.setMode(.standard) }
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
import Carbon
|
||||
import Foundation
|
||||
|
||||
/// The two input modes declared in Info.plist (ComponentInputModeDict). Each has its own
|
||||
/// menu-bar icon, so switching modes is how the icon shows "中英自動" vs "英文".
|
||||
enum InputModes {
|
||||
static let auto = "com.autozhuyin.inputmethod.AutoZhuyin.Auto"
|
||||
static let english = "com.autozhuyin.inputmethod.AutoZhuyin.English"
|
||||
|
||||
static func isEnglish(_ modeID: String) -> Bool { modeID == english }
|
||||
|
||||
private static func source(_ id: String) -> TISInputSource? {
|
||||
let filter = [kTISPropertyInputSourceID as String: id] as CFDictionary
|
||||
guard let list = TISCreateInputSourceList(filter, true)?.takeRetainedValue() as? [TISInputSource] else { return nil }
|
||||
return list.first
|
||||
}
|
||||
|
||||
/// Makes the given mode current (enabling it first if needed). Returns false on failure.
|
||||
@discardableResult
|
||||
static func select(english: Bool) -> Bool {
|
||||
guard let src = source(english ? InputModes.english : InputModes.auto) else { return false }
|
||||
TISEnableInputSource(src)
|
||||
return TISSelectInputSource(src) == noErr
|
||||
}
|
||||
|
||||
/// Called by `--register`: enable both modes so they are in the input menu.
|
||||
static func enableAll() {
|
||||
for id in [auto, english] {
|
||||
if let src = source(id) { TISEnableInputSource(src) }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
import Cocoa
|
||||
import InputMethodKit
|
||||
|
||||
/// A small "中" / "A" badge shown under the text cursor for a moment when English mode is
|
||||
/// switched on or off (the menu-bar icon of an input method can't change on its own).
|
||||
enum ModeIndicator {
|
||||
private static var panel: NSPanel?
|
||||
private static var label: NSTextField?
|
||||
private static var hideWork: DispatchWorkItem?
|
||||
|
||||
static func show(english: Bool, client: IMKTextInput) {
|
||||
let (panel, label) = makePanel()
|
||||
label.stringValue = english ? "A" : "中"
|
||||
|
||||
var lineRect = NSRect.zero
|
||||
_ = client.attributes(forCharacterIndex: 0, lineHeightRectangle: &lineRect)
|
||||
let size = panel.frame.size
|
||||
var origin = NSPoint(x: lineRect.minX, y: lineRect.minY - size.height - 4)
|
||||
if lineRect == .zero, let screen = NSScreen.main { // the app gave no caret position
|
||||
origin = NSPoint(x: screen.visibleFrame.midX - size.width / 2, y: screen.visibleFrame.midY)
|
||||
}
|
||||
panel.setFrameOrigin(origin)
|
||||
panel.alphaValue = 1
|
||||
panel.orderFrontRegardless()
|
||||
|
||||
hideWork?.cancel()
|
||||
let work = DispatchWorkItem {
|
||||
NSAnimationContext.runAnimationGroup({ ctx in
|
||||
ctx.duration = 0.25
|
||||
panel.animator().alphaValue = 0
|
||||
}, completionHandler: { panel.orderOut(nil) })
|
||||
}
|
||||
hideWork = work
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.8, execute: work)
|
||||
}
|
||||
|
||||
private static func makePanel() -> (NSPanel, NSTextField) {
|
||||
if let panel, let label { return (panel, label) }
|
||||
let side: CGFloat = 28
|
||||
let p = NSPanel(contentRect: NSRect(x: 0, y: 0, width: side, height: side),
|
||||
styleMask: [.borderless, .nonactivatingPanel], backing: .buffered, defer: true)
|
||||
p.level = .popUpMenu
|
||||
p.isOpaque = false
|
||||
p.backgroundColor = .clear
|
||||
p.hasShadow = true
|
||||
p.ignoresMouseEvents = true
|
||||
p.collectionBehavior = [.canJoinAllSpaces, .transient, .ignoresCycle]
|
||||
|
||||
let background = NSVisualEffectView(frame: p.contentView!.bounds)
|
||||
background.material = .hudWindow
|
||||
background.state = .active
|
||||
background.wantsLayer = true
|
||||
background.layer?.cornerRadius = 6
|
||||
background.layer?.masksToBounds = true
|
||||
background.autoresizingMask = [.width, .height]
|
||||
|
||||
let l = NSTextField(labelWithString: "")
|
||||
l.font = .systemFont(ofSize: 15, weight: .semibold)
|
||||
l.alignment = .center
|
||||
l.frame = NSRect(x: 0, y: (side - 20) / 2, width: side, height: 20)
|
||||
background.addSubview(l)
|
||||
p.contentView = background
|
||||
panel = p
|
||||
label = l
|
||||
return (p, l)
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,6 @@ import InputMethodKit
|
||||
// in System Settings without logging out (used by the installer's postinstall script).
|
||||
if CommandLine.arguments.contains("--register") {
|
||||
let status = TISRegisterInputSource(Bundle.main.bundleURL as CFURL)
|
||||
if status == noErr { InputModes.enableAll() } // "中英自動" and "英文" (menu-bar icons)
|
||||
print(status == noErr ? "Registered \(Bundle.main.bundlePath)" : "TISRegisterInputSource failed: \(status)")
|
||||
exit(status == noErr ? 0 : 1)
|
||||
}
|
||||
|
||||
+2
-3
@@ -18,6 +18,8 @@ rm -rf "$APP"
|
||||
mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources"
|
||||
cp "$BIN" "$APP/Contents/MacOS/AutoZhuyin"
|
||||
cp Resources/Info.plist "$APP/Contents/Info.plist"
|
||||
# Localized names of the input method and its modes (System Settings, input menu).
|
||||
cp -R Resources/*.lproj "$APP/Contents/Resources/"
|
||||
cp Resources/lexicon.txt Resources/english-common.txt Resources/classifier-weights.json "$APP/Contents/Resources/"
|
||||
cp THIRD_PARTY_LICENSES.txt "$APP/Contents/Resources/"
|
||||
# "AI 選字" language model (CKIP gpt2-tiny-chinese, GPL-3.0), fetched and converted once.
|
||||
@@ -31,9 +33,6 @@ if [ ! -f build/icon.tiff ]; then
|
||||
xcrun swift scripts/make-icon.swift build/icon.tiff
|
||||
fi
|
||||
cp build/icon.tiff "$APP/Contents/Resources/icon.tiff"
|
||||
# English-mode icon ("A"), shown in the menu bar while English mode is on.
|
||||
[ -f build/icon-en.tiff ] || xcrun swift scripts/make-icon.swift build/icon-en.tiff A
|
||||
cp build/icon-en.tiff "$APP/Contents/Resources/icon-en.tiff"
|
||||
|
||||
codesign --force --sign - "$APP"
|
||||
echo "Built $APP"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "自動注音 AutoZhuyin",
|
||||
"version": "0.13.0",
|
||||
"version": "0.14.0",
|
||||
"guid": "{3895C6E3-6D40-4B4B-B4EA-CEEC75382D23}",
|
||||
"locale": "zh-Hant-TW",
|
||||
"fallbackLocale": "zh-TW",
|
||||
|
||||
Reference in New Issue
Block a user