Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
82f20a6551 | ||
|
|
e6e5004630 | ||
|
|
988ed471be | ||
|
|
6c36c01f0e | ||
|
|
0fc42a4b8c | ||
|
|
42a2d3a2a3 | ||
|
|
20291bf515 |
@@ -12,9 +12,10 @@
|
|||||||
- **中英自動判斷**:每按一個鍵就重新判斷,組字區即時顯示結果(Mac 版英文以藍字顯示)
|
- **中英自動判斷**:每按一個鍵就重新判斷,組字區即時顯示結果(Mac 版英文以藍字顯示)
|
||||||
- **中英混打不用空白**:`ji3hello` → 我hello、`hellosu3cl3` → hello你好,同一段內會自動切分
|
- **中英混打不用空白**:`ji3hello` → 我hello、`hellosu3cl3` → hello你好,同一段內會自動切分
|
||||||
- **判斷錯了按 Tab**:在中/英之間翻轉,輸入法會記住這組按鍵,下次自動判斷對
|
- **判斷錯了按 Tab**:在中/英之間翻轉,輸入法會記住這組按鍵,下次自動判斷對
|
||||||
|
- **單按 Shift 強制英文**:要打英文時先單按一下 Shift,接下來這個字照打、保持小寫
|
||||||
- **注音順序打錯也能修正**:`ㄧㄒㄠˇ`、`ㄒㄠㄧˇ` 都會變成 `ㄒㄧㄠˇ`(小)
|
- **注音順序打錯也能修正**:`ㄧㄒㄠˇ`、`ㄒㄠㄧˇ` 都會變成 `ㄒㄧㄠˇ`(小)
|
||||||
- **可省略聲調**:`jiap7`(ㄨㄛ ㄇㄣ˙)一樣能打出「我們」
|
- **可省略聲調**:`jiap7`(ㄨㄛ ㄇㄣ˙)一樣能打出「我們」
|
||||||
- **候選字**:按 ↓ 選最後一個字或詞,選過的會固定下來
|
- **候選字**:用 ← → 把游標移到要改的字後面,按 ↓ 選字;選過的會固定下來
|
||||||
- **全形標點**:中文語境下 `?` `!` `<` 自動變成 `?` `!` `,`
|
- **全形標點**:中文語境下 `?` `!` `<` 自動變成 `?` `!` `,`
|
||||||
- **完整詞庫**:約 17 萬筆,來自小麥注音 McBopomofo(MIT 授權)
|
- **完整詞庫**:約 17 萬筆,來自小麥注音 McBopomofo(MIT 授權)
|
||||||
|
|
||||||
@@ -50,9 +51,11 @@ SmartScreen 出現警告時,按「其他資訊 → 仍要執行」。解除安
|
|||||||
| 空白 | 注音:一聲;音節已完成時送出中文。英文:送出單字加空白 |
|
| 空白 | 注音:一聲;音節已完成時送出中文。英文:送出單字加空白 |
|
||||||
| Enter | 送出目前組字 |
|
| Enter | 送出目前組字 |
|
||||||
| **Tab** | 判斷錯了?按 Tab 把整段翻轉成另一種語言,輸入法會**記住**這次修正 |
|
| **Tab** | 判斷錯了?按 Tab 把整段翻轉成另一種語言,輸入法會**記住**這次修正 |
|
||||||
| ↓ | 開啟候選字(選最後一個字或詞),數字鍵 1–9 選字,Esc 關閉 |
|
| ← → | 在組字區移動游標,選要改哪個字 |
|
||||||
|
| ↓ | 開啟游標前那個字或詞的候選字(游標預設在最後),數字鍵 1–9 選字,Esc 關閉 |
|
||||||
| Esc | 取消組字 |
|
| Esc | 取消組字 |
|
||||||
| Shift + 字母 | 強制英文 |
|
| **單按 Shift** | 沒在打字時:下一個字強制英文(保持小寫),送出後恢復自動判斷,再按一次取消。打到一半時:同 Tab,整段翻轉 |
|
||||||
|
| Shift + 字母 | 打大寫字母(也會強制英文) |
|
||||||
| `< > ? ! : ( ) [ ]` | 中文語境下自動轉成全形 `,。?!:()「」` |
|
| `< > ? ! : ( ) [ ]` | 中文語境下自動轉成全形 `,。?!:()「」` |
|
||||||
| `, . / ; -` | 英文單字後是標點;在注音中是 ㄝ ㄡ ㄥ ㄤ ㄦ(例如 `2;3` = 檔) |
|
| `, . / ; -` | 英文單字後是標點;在注音中是 ㄝ ㄡ ㄥ ㄤ ㄦ(例如 `2;3` = 檔) |
|
||||||
|
|
||||||
|
|||||||
@@ -15,9 +15,9 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>0.3.0</string>
|
<string>0.5.0</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>3</string>
|
<string>6</string>
|
||||||
<key>InputMethodConnectionName</key>
|
<key>InputMethodConnectionName</key>
|
||||||
<string>com.autozhuyin.inputmethod.AutoZhuyin_Connection</string>
|
<string>com.autozhuyin.inputmethod.AutoZhuyin_Connection</string>
|
||||||
<key>InputMethodServerControllerClass</key>
|
<key>InputMethodServerControllerClass</key>
|
||||||
@@ -37,7 +37,6 @@
|
|||||||
<key>tsInputMethodCharacterRepertoireKey</key>
|
<key>tsInputMethodCharacterRepertoireKey</key>
|
||||||
<array>
|
<array>
|
||||||
<string>Hant</string>
|
<string>Hant</string>
|
||||||
<string>Latn</string>
|
|
||||||
</array>
|
</array>
|
||||||
<key>tsInputMethodIconFileKey</key>
|
<key>tsInputMethodIconFileKey</key>
|
||||||
<string>icon.tiff</string>
|
<string>icon.tiff</string>
|
||||||
|
|||||||
@@ -34,15 +34,32 @@ enum Shared {
|
|||||||
@objc(AutoZhuyinInputController)
|
@objc(AutoZhuyinInputController)
|
||||||
final class InputController: IMKInputController {
|
final class InputController: IMKInputController {
|
||||||
private let engine = CompositionEngine(classifier: Shared.classifier)
|
private let engine = CompositionEngine(classifier: Shared.classifier)
|
||||||
|
private var shiftTap = ShiftTapDetector()
|
||||||
|
|
||||||
// MARK: - Key events
|
// MARK: - Key events
|
||||||
|
|
||||||
override func recognizedEvents(_ sender: Any!) -> Int {
|
override func recognizedEvents(_ sender: Any!) -> Int {
|
||||||
Int(NSEvent.EventTypeMask.keyDown.rawValue)
|
Int(NSEvent.EventTypeMask.keyDown.rawValue | NSEvent.EventTypeMask.flagsChanged.rawValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
override func handle(_ event: NSEvent!, client sender: Any!) -> Bool {
|
override func handle(_ event: NSEvent!, client sender: Any!) -> Bool {
|
||||||
guard let event, event.type == .keyDown, let client = sender as? IMKTextInput else { return false }
|
guard let event, let client = sender as? IMKTextInput else { return false }
|
||||||
|
|
||||||
|
// Shift pressed and released alone: next word is English (or flip the current one).
|
||||||
|
if event.type == .flagsChanged {
|
||||||
|
let flags = event.modifierFlags
|
||||||
|
let tapped = shiftTap.modifiersChanged(
|
||||||
|
shift: flags.contains(.shift),
|
||||||
|
otherModifiers: !flags.intersection([.command, .control, .option, .function]).isEmpty,
|
||||||
|
time: event.timestamp)
|
||||||
|
if tapped {
|
||||||
|
_ = engine.handle(.shiftTap)
|
||||||
|
updateComposition(client)
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
guard event.type == .keyDown else { return false }
|
||||||
|
shiftTap.keyPressed()
|
||||||
|
|
||||||
// Shortcuts (⌘C, ⌃A, ⌥…) go to the app; commit any composition first.
|
// Shortcuts (⌘C, ⌃A, ⌥…) go to the app; commit any composition first.
|
||||||
if !event.modifierFlags.intersection([.command, .control, .option]).isEmpty {
|
if !event.modifierFlags.intersection([.command, .control, .option]).isEmpty {
|
||||||
@@ -100,8 +117,10 @@ final class InputController: IMKInputController {
|
|||||||
]))
|
]))
|
||||||
}
|
}
|
||||||
let text = marked.string
|
let text = marked.string
|
||||||
|
// Caret at the candidate cursor (UTF-16 offset of the first `cursorOffset` characters).
|
||||||
|
let caret = String(text.prefix(engine.cursorOffset)).utf16.count
|
||||||
client.setMarkedText(marked,
|
client.setMarkedText(marked,
|
||||||
selectionRange: NSRange(location: (text as NSString).length, length: 0),
|
selectionRange: NSRange(location: caret, length: 0),
|
||||||
replacementRange: NSRange(location: NSNotFound, length: 0))
|
replacementRange: NSRange(location: NSNotFound, length: 0))
|
||||||
|
|
||||||
if engine.isShowingCandidates {
|
if engine.isShowingCandidates {
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ public enum KeyInput: Equatable {
|
|||||||
case character(Character)
|
case character(Character)
|
||||||
case backspace, enter, escape, tab
|
case backspace, enter, escape, tab
|
||||||
case up, down, left, right
|
case up, down, left, right
|
||||||
|
/// Shift pressed and released on its own.
|
||||||
|
case shiftTap
|
||||||
}
|
}
|
||||||
|
|
||||||
public struct KeyResult: Equatable {
|
public struct KeyResult: Equatable {
|
||||||
@@ -33,12 +35,19 @@ public final class CompositionEngine {
|
|||||||
public let converter: Converter
|
public let converter: Converter
|
||||||
|
|
||||||
public private(set) var keys: [Character] = []
|
public private(set) var keys: [Character] = []
|
||||||
/// Set by Tab: overrides the classifier for the whole buffer.
|
/// Set by Tab / Shift tap: overrides the classifier for the whole buffer.
|
||||||
public private(set) var forcedMode: InputMode?
|
public private(set) var forcedMode: InputMode?
|
||||||
|
/// True when forcedMode corrects the classifier (learned on commit); false when the
|
||||||
|
/// user forced English before typing (Shift tap on an empty buffer), which is not a
|
||||||
|
/// correction and is not learned.
|
||||||
|
private var forcedIsCorrection = false
|
||||||
/// User-picked phrases: Zhuyin segment start (key index) → syllable range → text.
|
/// User-picked phrases: Zhuyin segment start (key index) → syllable range → text.
|
||||||
private var fixed: [Int: [Range<Int>: String]] = [:]
|
private var fixed: [Int: [Range<Int>: String]] = [:]
|
||||||
public private(set) var candidates: [Candidate] = []
|
public private(set) var candidates: [Candidate] = []
|
||||||
private var candidateSegmentStart = 0
|
private var candidateSegmentStart = 0
|
||||||
|
/// Composition cursor for choosing candidates: index into `cursorStops`, nil = at the end.
|
||||||
|
/// ← → move it; ↓ shows candidates for the phrase ending at the cursor.
|
||||||
|
private var cursor: Int?
|
||||||
public var candidateIndex = 0
|
public var candidateIndex = 0
|
||||||
public var isShowingCandidates: Bool { !candidates.isEmpty }
|
public var isShowingCandidates: Bool { !candidates.isEmpty }
|
||||||
|
|
||||||
@@ -83,17 +92,64 @@ public final class CompositionEngine {
|
|||||||
|
|
||||||
/// Text for one segment. A non-final Zhuyin segment shows its unfinished syllable as Bopomofo.
|
/// Text for one segment. A non-final Zhuyin segment shows its unfinished syllable as Bopomofo.
|
||||||
private func render(_ seg: Segment, final: Bool) -> String {
|
private func render(_ seg: Segment, final: Bool) -> String {
|
||||||
let segKeys = Array(keys[seg.range])
|
guard seg.mode == .zhuyin else { return String(keys[seg.range]) }
|
||||||
guard seg.mode == .zhuyin else { return String(segKeys) }
|
let (converted, pending) = conversion(of: seg, final: final)
|
||||||
let p = ZhuyinParser.parse(segKeys)
|
return converted.map(\.text).joined() + pending
|
||||||
let fixedHere = (fixed[seg.range.lowerBound] ?? [:])
|
}
|
||||||
if final {
|
|
||||||
let all = p.syllables.map(\.syllable)
|
/// Syllables of a Zhuyin segment that are converted to Chinese (all of them when
|
||||||
return converter.convert(all, fixed: fixedHere.filter { $0.key.upperBound <= all.count }).map(\.text).joined()
|
/// final, otherwise the finished ones).
|
||||||
|
private func convertibleSyllables(_ seg: Segment, final: Bool) -> (syllables: [Syllable], pending: String) {
|
||||||
|
let p = ZhuyinParser.parse(Array(keys[seg.range]))
|
||||||
|
if final { return (p.syllables.map(\.syllable), "") }
|
||||||
|
return (p.completed.map(\.syllable), p.pending?.syllable.reading ?? "")
|
||||||
|
}
|
||||||
|
|
||||||
|
private func conversion(of seg: Segment, final: Bool) -> (segments: [ConvertedSegment], pending: String) {
|
||||||
|
let (syl, pending) = convertibleSyllables(seg, final: final)
|
||||||
|
let fixedHere = (fixed[seg.range.lowerBound] ?? [:]).filter { $0.key.upperBound <= syl.count }
|
||||||
|
return (converter.convert(syl, fixed: fixedHere), pending)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MARK: - Cursor
|
||||||
|
|
||||||
|
/// A place the cursor can stop: after the `local`-th syllable of Zhuyin segment `segIndex`.
|
||||||
|
private struct CursorStop { let segIndex: Int; let local: Int }
|
||||||
|
|
||||||
|
private var cursorStops: [CursorStop] {
|
||||||
|
let segs = segments
|
||||||
|
var out: [CursorStop] = []
|
||||||
|
for (i, seg) in segs.enumerated() where seg.mode == .zhuyin {
|
||||||
|
let n = convertibleSyllables(seg, final: i < segs.count - 1).syllables.count
|
||||||
|
for k in stride(from: 1, through: n, by: 1) { out.append(CursorStop(segIndex: i, local: k)) }
|
||||||
}
|
}
|
||||||
let done = p.completed.map(\.syllable)
|
return out
|
||||||
let text = converter.convert(done, fixed: fixedHere.filter { $0.key.upperBound <= done.count }).map(\.text).joined()
|
}
|
||||||
return text + (p.pending?.syllable.reading ?? "")
|
|
||||||
|
/// Cursor position in `markedText`, in Characters.
|
||||||
|
public var cursorOffset: Int {
|
||||||
|
let pieces = markedPieces
|
||||||
|
let total = pieces.reduce(0) { $0 + $1.text.count }
|
||||||
|
let stops = cursorStops
|
||||||
|
guard let c = cursor, stops.indices.contains(c) else { return total }
|
||||||
|
let stop = stops[c]
|
||||||
|
var offset = pieces[..<stop.segIndex].reduce(0) { $0 + $1.text.count }
|
||||||
|
let segs = segments
|
||||||
|
for conv in conversion(of: segs[stop.segIndex], final: stop.segIndex < segs.count - 1).segments {
|
||||||
|
if conv.range.upperBound <= stop.local {
|
||||||
|
offset += conv.text.count
|
||||||
|
} else if conv.range.lowerBound < stop.local {
|
||||||
|
offset += min(stop.local - conv.range.lowerBound, conv.text.count)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return offset
|
||||||
|
}
|
||||||
|
|
||||||
|
private func moveCursor(by delta: Int) {
|
||||||
|
let stops = cursorStops
|
||||||
|
guard !stops.isEmpty else { return }
|
||||||
|
let next = (cursor ?? stops.count - 1) + delta
|
||||||
|
cursor = next >= stops.count - 1 ? nil : max(0, next)
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Key handling
|
// MARK: - Key handling
|
||||||
@@ -106,9 +162,14 @@ public final class CompositionEngine {
|
|||||||
return handleCharacter(c)
|
return handleCharacter(c)
|
||||||
case .backspace:
|
case .backspace:
|
||||||
guard !keys.isEmpty else { return .passThrough }
|
guard !keys.isEmpty else { return .passThrough }
|
||||||
|
cursor = nil
|
||||||
keys.removeLast()
|
keys.removeLast()
|
||||||
fixed = fixed.filter { $0.key < keys.count }
|
fixed = fixed.filter { $0.key < keys.count }
|
||||||
if keys.isEmpty { forcedMode = nil; fixed = [:] }
|
if keys.isEmpty {
|
||||||
|
// A Shift-tap "next word is English" stays armed; a correction is dropped.
|
||||||
|
if forcedIsCorrection { forcedMode = nil; forcedIsCorrection = false }
|
||||||
|
fixed = [:]
|
||||||
|
}
|
||||||
return .consumed
|
return .consumed
|
||||||
case .enter:
|
case .enter:
|
||||||
guard !keys.isEmpty else { return .passThrough }
|
guard !keys.isEmpty else { return .passThrough }
|
||||||
@@ -119,18 +180,45 @@ public final class CompositionEngine {
|
|||||||
return .consumed
|
return .consumed
|
||||||
case .tab:
|
case .tab:
|
||||||
guard !keys.isEmpty else { return .passThrough }
|
guard !keys.isEmpty else { return .passThrough }
|
||||||
forcedMode = (mode == .zhuyin) ? .literal : .zhuyin
|
flip()
|
||||||
|
return .consumed
|
||||||
|
case .shiftTap:
|
||||||
|
if keys.isEmpty {
|
||||||
|
// Next word is English, typed as-is (lowercase stays lowercase). Tap again to cancel.
|
||||||
|
forcedMode = forcedMode == .literal ? nil : .literal
|
||||||
|
forcedIsCorrection = false
|
||||||
|
} else {
|
||||||
|
flip()
|
||||||
|
}
|
||||||
return .consumed
|
return .consumed
|
||||||
case .down:
|
case .down:
|
||||||
guard !keys.isEmpty else { return .passThrough }
|
guard !keys.isEmpty else { return .passThrough }
|
||||||
openCandidates()
|
openCandidates()
|
||||||
return .consumed
|
return .consumed
|
||||||
case .up, .left, .right:
|
case .left:
|
||||||
|
guard !keys.isEmpty else { return .passThrough }
|
||||||
|
moveCursor(by: -1)
|
||||||
|
return .consumed
|
||||||
|
case .right:
|
||||||
|
guard !keys.isEmpty else { return .passThrough }
|
||||||
|
moveCursor(by: 1)
|
||||||
|
return .consumed
|
||||||
|
case .up:
|
||||||
return keys.isEmpty ? .passThrough : .consumed
|
return keys.isEmpty ? .passThrough : .consumed
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Forces the whole buffer into the other mode (a correction that is learned).
|
||||||
|
private func flip() {
|
||||||
|
forcedMode = (mode == .zhuyin) ? .literal : .zhuyin
|
||||||
|
forcedIsCorrection = true
|
||||||
|
}
|
||||||
|
|
||||||
|
/// True while the user has forced English before typing anything (Shift tap).
|
||||||
|
public var isEnglishArmed: Bool { keys.isEmpty && forcedMode == .literal }
|
||||||
|
|
||||||
private func handleCharacter(_ c: Character) -> KeyResult {
|
private func handleCharacter(_ c: Character) -> KeyResult {
|
||||||
|
cursor = nil // typing always continues at the end
|
||||||
if c == " " {
|
if c == " " {
|
||||||
guard !keys.isEmpty else { return .passThrough }
|
guard !keys.isEmpty else { return .passThrough }
|
||||||
let segs = segments(of: keys, finishing: true)
|
let segs = segments(of: keys, finishing: true)
|
||||||
@@ -178,13 +266,16 @@ public final class CompositionEngine {
|
|||||||
|
|
||||||
// MARK: - Candidates (for the last Zhuyin segment)
|
// MARK: - Candidates (for the last Zhuyin segment)
|
||||||
|
|
||||||
|
/// Opens candidates for the phrase ending at the cursor (default: the last syllable).
|
||||||
private func openCandidates() {
|
private func openCandidates() {
|
||||||
|
let stops = cursorStops
|
||||||
|
guard !stops.isEmpty else { return }
|
||||||
|
let stop = stops[min(cursor ?? stops.count - 1, stops.count - 1)]
|
||||||
let segs = segments
|
let segs = segments
|
||||||
guard let last = segs.last, last.mode == .zhuyin else { return }
|
let seg = segs[stop.segIndex]
|
||||||
let done = ZhuyinParser.parse(Array(keys[last.range])).completed.map(\.syllable)
|
let syl = convertibleSyllables(seg, final: stop.segIndex < segs.count - 1).syllables
|
||||||
guard !done.isEmpty else { return }
|
candidates = converter.candidates(syl, endingAt: stop.local)
|
||||||
candidates = converter.candidates(done, endingAt: done.count)
|
candidateSegmentStart = seg.range.lowerBound
|
||||||
candidateSegmentStart = last.range.lowerBound
|
|
||||||
candidateIndex = 0
|
candidateIndex = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -224,7 +315,7 @@ public final class CompositionEngine {
|
|||||||
private func commitCurrent(_ given: [Segment]? = nil) -> String {
|
private func commitCurrent(_ given: [Segment]? = nil) -> String {
|
||||||
let segs = given ?? segments
|
let segs = given ?? segments
|
||||||
let text = segs.map { render($0, final: true) }.joined()
|
let text = segs.map { render($0, final: true) }.joined()
|
||||||
if let forced = forcedMode {
|
if let forced = forcedMode, forcedIsCorrection {
|
||||||
classifier.learned.record(String(keys), as: forced)
|
classifier.learned.record(String(keys), as: forced)
|
||||||
}
|
}
|
||||||
previousMode = segs.last?.mode
|
previousMode = segs.last?.mode
|
||||||
@@ -240,7 +331,9 @@ public final class CompositionEngine {
|
|||||||
|
|
||||||
public func reset() {
|
public func reset() {
|
||||||
keys = []
|
keys = []
|
||||||
|
cursor = nil
|
||||||
forcedMode = nil
|
forcedMode = nil
|
||||||
|
forcedIsCorrection = false
|
||||||
fixed = [:]
|
fixed = [:]
|
||||||
candidates = []
|
candidates = []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import Foundation
|
||||||
|
|
||||||
|
/// Detects Shift pressed and released on its own (no other key in between, released
|
||||||
|
/// within `maxDuration`), as opposed to Shift used for capitals or shortcuts.
|
||||||
|
///
|
||||||
|
/// Python twin: windows/autozhuyin/core/shift_tap.py
|
||||||
|
public struct ShiftTapDetector {
|
||||||
|
public var maxDuration: TimeInterval = 0.5
|
||||||
|
private var pressedAt: TimeInterval?
|
||||||
|
private var used = false
|
||||||
|
|
||||||
|
public init() {}
|
||||||
|
|
||||||
|
/// Call when the modifier state changes. Returns true when a Shift tap completed.
|
||||||
|
public mutating func modifiersChanged(shift: Bool, otherModifiers: Bool, time: TimeInterval) -> Bool {
|
||||||
|
if shift && !otherModifiers {
|
||||||
|
if pressedAt == nil {
|
||||||
|
pressedAt = time
|
||||||
|
used = false
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
defer { pressedAt = nil }
|
||||||
|
guard let start = pressedAt, !shift, !otherModifiers, !used else { return false }
|
||||||
|
return time - start <= maxDuration
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Call for every other key press: Shift was used as a modifier, not tapped.
|
||||||
|
public mutating func keyPressed() {
|
||||||
|
if pressedAt != nil { used = true }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -281,3 +281,127 @@ final class ParityTests: XCTestCase {
|
|||||||
XCTAssertEqual(out.count, 1, out)
|
XCTAssertEqual(out.count, 1, out)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final class ShiftTapTests: XCTestCase {
|
||||||
|
func engine() -> CompositionEngine {
|
||||||
|
CompositionEngine(classifier: Classifier(lexicon: sharedLexicon, english: sharedEnglish, weights: sharedWeights))
|
||||||
|
}
|
||||||
|
|
||||||
|
func type(_ s: String, into e: CompositionEngine) -> String {
|
||||||
|
var out = ""
|
||||||
|
for c in s {
|
||||||
|
let key: KeyInput = c == "⇧" ? .shiftTap : c == "\n" ? .enter : .character(c)
|
||||||
|
let r = e.handle(key)
|
||||||
|
if let t = r.commit { out += t } else if !r.handled { out.append(c) }
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func testShiftTapForcesNextWordEnglishLowercase() {
|
||||||
|
let e = engine()
|
||||||
|
// "ru" alone would be ㄐㄧ (機); after a Shift tap it stays English, lowercase.
|
||||||
|
XCTAssertEqual(type("⇧ru ", into: e), "ru ")
|
||||||
|
// Automatic detection resumes after the word.
|
||||||
|
XCTAssertFalse(e.isEnglishArmed)
|
||||||
|
XCTAssertEqual(type("su3cl3\n", into: e), "你好")
|
||||||
|
}
|
||||||
|
|
||||||
|
func testShiftTapTwiceCancels() {
|
||||||
|
XCTAssertEqual(type("⇧⇧su3cl3\n", into: engine()), "你好")
|
||||||
|
}
|
||||||
|
|
||||||
|
func testShiftTapMidWordFlips() {
|
||||||
|
let e = engine()
|
||||||
|
_ = type("so", into: e)
|
||||||
|
XCTAssertEqual(e.mode, .literal)
|
||||||
|
_ = e.handle(.shiftTap)
|
||||||
|
XCTAssertEqual(e.mode, .zhuyin)
|
||||||
|
_ = type("\n", into: e)
|
||||||
|
XCTAssertEqual(e.classifier.learned.weights["so"], 1) // a correction is learned
|
||||||
|
}
|
||||||
|
|
||||||
|
func testForcingBeforeTypingIsNotLearned() {
|
||||||
|
let e = engine()
|
||||||
|
_ = type("⇧hello ", into: e)
|
||||||
|
XCTAssertNil(e.classifier.learned.weights["hello"])
|
||||||
|
}
|
||||||
|
|
||||||
|
func testArmingSurvivesBackspace() {
|
||||||
|
let e = engine()
|
||||||
|
_ = type("⇧r", into: e)
|
||||||
|
_ = e.handle(.backspace)
|
||||||
|
XCTAssertTrue(e.isEnglishArmed)
|
||||||
|
XCTAssertEqual(type("ru ", into: e), "ru ")
|
||||||
|
}
|
||||||
|
|
||||||
|
func testDetector() {
|
||||||
|
var d = ShiftTapDetector()
|
||||||
|
XCTAssertFalse(d.modifiersChanged(shift: true, otherModifiers: false, time: 0))
|
||||||
|
XCTAssertTrue(d.modifiersChanged(shift: false, otherModifiers: false, time: 0.1))
|
||||||
|
// Shift used for a capital letter: not a tap.
|
||||||
|
_ = d.modifiersChanged(shift: true, otherModifiers: false, time: 1)
|
||||||
|
d.keyPressed()
|
||||||
|
XCTAssertFalse(d.modifiersChanged(shift: false, otherModifiers: false, time: 1.1))
|
||||||
|
// Held too long: not a tap.
|
||||||
|
_ = d.modifiersChanged(shift: true, otherModifiers: false, time: 2)
|
||||||
|
XCTAssertFalse(d.modifiersChanged(shift: false, otherModifiers: false, time: 3))
|
||||||
|
// Shift + Command: not a tap.
|
||||||
|
_ = d.modifiersChanged(shift: true, otherModifiers: false, time: 4)
|
||||||
|
_ = d.modifiersChanged(shift: true, otherModifiers: true, time: 4.1)
|
||||||
|
XCTAssertFalse(d.modifiersChanged(shift: false, otherModifiers: false, time: 4.2))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final class CursorTests: XCTestCase {
|
||||||
|
func engine() -> CompositionEngine {
|
||||||
|
CompositionEngine(classifier: Classifier(lexicon: sharedLexicon, english: sharedEnglish, weights: sharedWeights))
|
||||||
|
}
|
||||||
|
|
||||||
|
func type(_ s: String, into e: CompositionEngine) -> String {
|
||||||
|
var out = ""
|
||||||
|
for c in s {
|
||||||
|
let key: KeyInput = c == "←" ? .left : c == "→" ? .right : c == "↓" ? .down : c == "\n" ? .enter : .character(c)
|
||||||
|
let r = e.handle(key)
|
||||||
|
if let t = r.commit { out += t } else if !r.handled { out.append(c) }
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func testCursorMovesAndClamps() {
|
||||||
|
let e = engine()
|
||||||
|
_ = type("rup wu0 wu0 fu4", into: e) // 今天天氣
|
||||||
|
XCTAssertEqual(e.cursorOffset, 4)
|
||||||
|
_ = type("←", into: e)
|
||||||
|
XCTAssertEqual(e.cursorOffset, 3)
|
||||||
|
_ = type("←←←←", into: e)
|
||||||
|
XCTAssertEqual(e.cursorOffset, 1) // stops after the first character
|
||||||
|
_ = type("→→→→", into: e)
|
||||||
|
XCTAssertEqual(e.cursorOffset, 4)
|
||||||
|
}
|
||||||
|
|
||||||
|
func testChooseCandidateInTheMiddle() {
|
||||||
|
let e = engine()
|
||||||
|
_ = type("rup wu0 wu0 fu4", into: e)
|
||||||
|
_ = type("←←↓", into: e) // cursor after the 2nd syllable (天)
|
||||||
|
XCTAssertTrue(e.isShowingCandidates)
|
||||||
|
XCTAssertTrue(e.candidates.allSatisfy { $0.range.upperBound == 2 })
|
||||||
|
let i = e.candidates.firstIndex { $0.text == "添" }!
|
||||||
|
e.selectCandidate(i)
|
||||||
|
XCTAssertEqual(type("\n", into: e), "今添天氣")
|
||||||
|
}
|
||||||
|
|
||||||
|
func testTypingReturnsCursorToEnd() {
|
||||||
|
let e = engine()
|
||||||
|
_ = type("rup wu0 ←", into: e)
|
||||||
|
XCTAssertEqual(e.cursorOffset, 1)
|
||||||
|
_ = type("wu0 ", into: e)
|
||||||
|
XCTAssertEqual(e.cursorOffset, e.markedText.count)
|
||||||
|
}
|
||||||
|
|
||||||
|
func testCandidatesForChineseBeforeEnglish() {
|
||||||
|
let e = engine()
|
||||||
|
_ = type("su3cl3hello", into: e) // 你好hello
|
||||||
|
_ = type("↓", into: e) // last Chinese syllable, not the English word
|
||||||
|
XCTAssertTrue(e.isShowingCandidates)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -13,6 +13,17 @@ rm -rf "$DEST/AutoZhuyin.app"
|
|||||||
cp -R build/AutoZhuyin.app "$DEST/"
|
cp -R build/AutoZhuyin.app "$DEST/"
|
||||||
"$DEST/AutoZhuyin.app/Contents/MacOS/AutoZhuyin" --register
|
"$DEST/AutoZhuyin.app/Contents/MacOS/AutoZhuyin" --register
|
||||||
|
|
||||||
|
SYSTEM_APP="/Library/Input Methods/AutoZhuyin.app"
|
||||||
|
if [ -d "$SYSTEM_APP" ]; then
|
||||||
|
OLD="$(plutil -extract CFBundleShortVersionString raw "$SYSTEM_APP/Contents/Info.plist" 2>/dev/null || echo '?')"
|
||||||
|
echo
|
||||||
|
echo "WARNING: a system-wide copy (v$OLD, installed from the .pkg) exists at:"
|
||||||
|
echo " $SYSTEM_APP"
|
||||||
|
echo "macOS runs that copy instead of this one. Install the new .pkg"
|
||||||
|
echo "(scripts/package.sh), or remove it with:"
|
||||||
|
echo " sudo rm -rf \"$SYSTEM_APP\" && pkill -x AutoZhuyin"
|
||||||
|
fi
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "Installed to $DEST/AutoZhuyin.app"
|
echo "Installed to $DEST/AutoZhuyin.app"
|
||||||
echo "First install: System Settings → Keyboard → Text Input → Edit… → + → 繁體中文 → 自動注音"
|
echo "First install: System Settings → Keyboard → Text Input → Edit… → + → 繁體中文 → 自動注音"
|
||||||
|
|||||||
@@ -6,14 +6,16 @@ tests); this file only translates PIME key events and replies.
|
|||||||
"""
|
"""
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
import time
|
||||||
|
|
||||||
from keycodes import * # noqa: F401,F403 (VK_* constants, provided by PIME)
|
from keycodes import * # noqa: F401,F403 (VK_* constants, provided by PIME)
|
||||||
from textService import TextService
|
from textService import TextService
|
||||||
|
|
||||||
from .core.classifier import Classifier, LearnedPreferences
|
from .core.classifier import Classifier, LearnedPreferences
|
||||||
from .core.engine import BACKSPACE, DOWN, ENTER, ESCAPE, LEFT, RIGHT, TAB, UP, CompositionEngine
|
from .core.engine import BACKSPACE, DOWN, ENTER, ESCAPE, LEFT, RIGHT, SHIFT_TAP, TAB, UP, CompositionEngine
|
||||||
from .core.english import EnglishModel
|
from .core.english import EnglishModel
|
||||||
from .core.lexicon import Lexicon
|
from .core.lexicon import Lexicon
|
||||||
|
from .core.shift_tap import ShiftTapDetector
|
||||||
|
|
||||||
_HERE = os.path.dirname(os.path.abspath(__file__))
|
_HERE = os.path.dirname(os.path.abspath(__file__))
|
||||||
_DATA = os.path.join(_HERE, "data")
|
_DATA = os.path.join(_HERE, "data")
|
||||||
@@ -67,6 +69,7 @@ class AutoZhuyinTextService(TextService):
|
|||||||
def __init__(self, client):
|
def __init__(self, client):
|
||||||
TextService.__init__(self, client)
|
TextService.__init__(self, client)
|
||||||
self.engine = CompositionEngine(_shared_classifier())
|
self.engine = CompositionEngine(_shared_classifier())
|
||||||
|
self.shift_tap = ShiftTapDetector()
|
||||||
|
|
||||||
# --- lifecycle ---
|
# --- lifecycle ---
|
||||||
|
|
||||||
@@ -105,6 +108,13 @@ class AutoZhuyinTextService(TextService):
|
|||||||
return bool(self.engine.keys or self.engine.candidates)
|
return bool(self.engine.keys or self.engine.candidates)
|
||||||
|
|
||||||
def filterKeyDown(self, ev):
|
def filterKeyDown(self, ev):
|
||||||
|
if ev.keyCode == VK_SHIFT: # noqa: F405
|
||||||
|
if ev.isKeyDown(VK_CONTROL) or ev.isKeyDown(VK_MENU): # noqa: F405
|
||||||
|
self.shift_tap.key_pressed()
|
||||||
|
else:
|
||||||
|
self.shift_tap.shift_down(time.monotonic())
|
||||||
|
return False
|
||||||
|
self.shift_tap.key_pressed()
|
||||||
# Shortcuts (Ctrl/Alt) go to the app.
|
# Shortcuts (Ctrl/Alt) go to the app.
|
||||||
if ev.isKeyDown(VK_CONTROL) or ev.isKeyDown(VK_MENU): # noqa: F405
|
if ev.isKeyDown(VK_CONTROL) or ev.isKeyDown(VK_MENU): # noqa: F405
|
||||||
return False
|
return False
|
||||||
@@ -121,6 +131,21 @@ class AutoZhuyinTextService(TextService):
|
|||||||
self._update(commit)
|
self._update(commit)
|
||||||
return handled
|
return handled
|
||||||
|
|
||||||
|
def filterKeyUp(self, ev):
|
||||||
|
# Shift pressed and released alone: next word is English (or flip the current one).
|
||||||
|
if ev.keyCode == VK_SHIFT: # noqa: F405
|
||||||
|
return self.shift_tap.shift_up(time.monotonic())
|
||||||
|
return False
|
||||||
|
|
||||||
|
def onKeyUp(self, ev):
|
||||||
|
if ev.keyCode != VK_SHIFT: # noqa: F405
|
||||||
|
return False
|
||||||
|
self.engine.handle(SHIFT_TAP)
|
||||||
|
self._update(None)
|
||||||
|
if self.engine.english_armed:
|
||||||
|
self.showMessage("英文", 1)
|
||||||
|
return True
|
||||||
|
|
||||||
# --- replies ---
|
# --- replies ---
|
||||||
|
|
||||||
def _update(self, commit):
|
def _update(self, commit):
|
||||||
@@ -128,7 +153,7 @@ class AutoZhuyinTextService(TextService):
|
|||||||
self.setCommitString(commit)
|
self.setCommitString(commit)
|
||||||
marked = self.engine.marked_text
|
marked = self.engine.marked_text
|
||||||
self.setCompositionString(marked)
|
self.setCompositionString(marked)
|
||||||
self.setCompositionCursor(len(marked))
|
self.setCompositionCursor(self.engine.cursor_offset)
|
||||||
if self.engine.showing_candidates:
|
if self.engine.showing_candidates:
|
||||||
page, cursor = self.engine.page()
|
page, cursor = self.engine.page()
|
||||||
self.setCandidateList(page)
|
self.setCandidateList(page)
|
||||||
|
|||||||
@@ -12,7 +12,8 @@ from .lexicon import Converter
|
|||||||
|
|
||||||
BACKSPACE, ENTER, ESCAPE, TAB = "<backspace>", "<enter>", "<escape>", "<tab>"
|
BACKSPACE, ENTER, ESCAPE, TAB = "<backspace>", "<enter>", "<escape>", "<tab>"
|
||||||
UP, DOWN, LEFT, RIGHT = "<up>", "<down>", "<left>", "<right>"
|
UP, DOWN, LEFT, RIGHT = "<up>", "<down>", "<left>", "<right>"
|
||||||
SPECIAL_KEYS = {BACKSPACE, ENTER, ESCAPE, TAB, UP, DOWN, LEFT, RIGHT}
|
SHIFT_TAP = "<shift-tap>" # Shift pressed and released on its own
|
||||||
|
SPECIAL_KEYS = {BACKSPACE, ENTER, ESCAPE, TAB, UP, DOWN, LEFT, RIGHT, SHIFT_TAP}
|
||||||
|
|
||||||
FULLWIDTH = {
|
FULLWIDTH = {
|
||||||
"<": ",", ">": "。", "?": "?", "!": "!", ":": ":", '"': "「", "(": "(", ")": ")",
|
"<": ",", ">": "。", "?": "?", "!": "!", ":": ":", '"': "「", "(": "(", ")": ")",
|
||||||
@@ -33,10 +34,15 @@ class CompositionEngine:
|
|||||||
self.now = now
|
self.now = now
|
||||||
self.keys = []
|
self.keys = []
|
||||||
self.forced_mode = None
|
self.forced_mode = None
|
||||||
|
# True when forced_mode corrects the classifier (learned on commit); False when the
|
||||||
|
# user forced English before typing (Shift tap on an empty buffer).
|
||||||
|
self._forced_is_correction = False
|
||||||
self.fixed = {} # zhuyin segment start -> {(syl_start, syl_end): text}
|
self.fixed = {} # zhuyin segment start -> {(syl_start, syl_end): text}
|
||||||
self.candidates = []
|
self.candidates = []
|
||||||
self.candidate_index = 0
|
self.candidate_index = 0
|
||||||
self._candidate_segment_start = 0
|
self._candidate_segment_start = 0
|
||||||
|
# Composition cursor for choosing candidates: index into _cursor_stops(), None = end.
|
||||||
|
self.cursor = None
|
||||||
self._previous_mode = None
|
self._previous_mode = None
|
||||||
self._previous_time = float("-inf")
|
self._previous_time = float("-inf")
|
||||||
self._cache_key = None
|
self._cache_key = None
|
||||||
@@ -77,19 +83,61 @@ class CompositionEngine:
|
|||||||
def page_start(self):
|
def page_start(self):
|
||||||
return (self.candidate_index // self.page_size) * self.page_size
|
return (self.candidate_index // self.page_size) * self.page_size
|
||||||
|
|
||||||
|
def _convertible(self, seg, final):
|
||||||
|
"""(syllables converted to Chinese, pending Bopomofo) for a Zhuyin segment."""
|
||||||
|
start, end, _ = seg
|
||||||
|
p = bopomofo.parse(self.keys[start:end])
|
||||||
|
if final:
|
||||||
|
return [s.syllable for s in p.syllables], ""
|
||||||
|
return [s.syllable for s in p.completed], (p.pending.syllable.reading if p.pending else "")
|
||||||
|
|
||||||
|
def _conversion(self, seg, final):
|
||||||
|
syl, pending = self._convertible(seg, final)
|
||||||
|
fx = {k: v for k, v in self.fixed.get(seg[0], {}).items() if k[1] <= len(syl)}
|
||||||
|
return self.converter.convert(syl, fx), pending
|
||||||
|
|
||||||
def _render(self, seg, final):
|
def _render(self, seg, final):
|
||||||
start, end, mode = seg
|
start, end, mode = seg
|
||||||
seg_keys = self.keys[start:end]
|
|
||||||
if mode == LITERAL:
|
if mode == LITERAL:
|
||||||
return "".join(seg_keys)
|
return "".join(self.keys[start:end])
|
||||||
p = bopomofo.parse(seg_keys)
|
converted, pending = self._conversion(seg, final)
|
||||||
fixed_here = self.fixed.get(start, {})
|
return "".join(t for _, t in converted) + pending
|
||||||
syl = [s.syllable for s in (p.syllables if final else p.completed)]
|
|
||||||
fx = {k: v for k, v in fixed_here.items() if k[1] <= len(syl)}
|
# --- cursor ---
|
||||||
text = "".join(t for _, t in self.converter.convert(syl, fx))
|
|
||||||
if not final and p.pending:
|
def _cursor_stops(self):
|
||||||
text += p.pending.syllable.reading
|
"""[(segment index, syllables before the stop)] for every Zhuyin syllable."""
|
||||||
return text
|
segs = self.segments
|
||||||
|
out = []
|
||||||
|
for i, seg in enumerate(segs):
|
||||||
|
if seg[2] == ZHUYIN:
|
||||||
|
n = len(self._convertible(seg, i < len(segs) - 1)[0])
|
||||||
|
out.extend((i, k) for k in range(1, n + 1))
|
||||||
|
return out
|
||||||
|
|
||||||
|
@property
|
||||||
|
def cursor_offset(self):
|
||||||
|
"""Cursor position in marked_text (characters)."""
|
||||||
|
pieces = self.marked_pieces
|
||||||
|
stops = self._cursor_stops()
|
||||||
|
if self.cursor is None or not 0 <= self.cursor < len(stops):
|
||||||
|
return sum(len(t) for t, _ in pieces)
|
||||||
|
seg_index, local = stops[self.cursor]
|
||||||
|
offset = sum(len(t) for t, _ in pieces[:seg_index])
|
||||||
|
segs = self.segments
|
||||||
|
for (a, b), text in self._conversion(segs[seg_index], seg_index < len(segs) - 1)[0]:
|
||||||
|
if b <= local:
|
||||||
|
offset += len(text)
|
||||||
|
elif a < local:
|
||||||
|
offset += min(local - a, len(text))
|
||||||
|
return offset
|
||||||
|
|
||||||
|
def _move_cursor(self, delta):
|
||||||
|
stops = self._cursor_stops()
|
||||||
|
if not stops:
|
||||||
|
return
|
||||||
|
nxt = (len(stops) - 1 if self.cursor is None else self.cursor) + delta
|
||||||
|
self.cursor = None if nxt >= len(stops) - 1 else max(0, nxt)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def marked_pieces(self):
|
def marked_pieces(self):
|
||||||
@@ -102,9 +150,18 @@ class CompositionEngine:
|
|||||||
|
|
||||||
# --- key handling ---
|
# --- key handling ---
|
||||||
|
|
||||||
|
@property
|
||||||
|
def english_armed(self):
|
||||||
|
"""True while the user has forced English before typing anything (Shift tap)."""
|
||||||
|
return not self.keys and self.forced_mode == LITERAL
|
||||||
|
|
||||||
|
def _flip(self):
|
||||||
|
self.forced_mode = LITERAL if self.mode == ZHUYIN else ZHUYIN
|
||||||
|
self._forced_is_correction = True
|
||||||
|
|
||||||
def wants(self, key):
|
def wants(self, key):
|
||||||
"""Whether handle(key) would consume the key, without changing state."""
|
"""Whether handle(key) would consume the key, without changing state."""
|
||||||
if self.candidates:
|
if self.candidates or key == SHIFT_TAP:
|
||||||
return True
|
return True
|
||||||
if key in SPECIAL_KEYS:
|
if key in SPECIAL_KEYS:
|
||||||
return bool(self.keys)
|
return bool(self.keys)
|
||||||
@@ -122,10 +179,14 @@ class CompositionEngine:
|
|||||||
if key == BACKSPACE:
|
if key == BACKSPACE:
|
||||||
if not self.keys:
|
if not self.keys:
|
||||||
return PASS
|
return PASS
|
||||||
|
self.cursor = None
|
||||||
self.keys.pop()
|
self.keys.pop()
|
||||||
self.fixed = {k: v for k, v in self.fixed.items() if k < len(self.keys)}
|
self.fixed = {k: v for k, v in self.fixed.items() if k < len(self.keys)}
|
||||||
if not self.keys:
|
if not self.keys:
|
||||||
self.forced_mode = None
|
# A Shift-tap "next word is English" stays armed; a correction is dropped.
|
||||||
|
if self._forced_is_correction:
|
||||||
|
self.forced_mode = None
|
||||||
|
self._forced_is_correction = False
|
||||||
self.fixed = {}
|
self.fixed = {}
|
||||||
return CONSUMED
|
return CONSUMED
|
||||||
if key == ENTER:
|
if key == ENTER:
|
||||||
@@ -138,14 +199,27 @@ class CompositionEngine:
|
|||||||
if key == TAB:
|
if key == TAB:
|
||||||
if not self.keys:
|
if not self.keys:
|
||||||
return PASS
|
return PASS
|
||||||
self.forced_mode = LITERAL if self.mode == ZHUYIN else ZHUYIN
|
self._flip()
|
||||||
|
return CONSUMED
|
||||||
|
if key == SHIFT_TAP:
|
||||||
|
if not self.keys:
|
||||||
|
# Next word is English, typed as-is. Tap again to cancel.
|
||||||
|
self.forced_mode = None if self.forced_mode == LITERAL else LITERAL
|
||||||
|
self._forced_is_correction = False
|
||||||
|
else:
|
||||||
|
self._flip()
|
||||||
return CONSUMED
|
return CONSUMED
|
||||||
if key == DOWN:
|
if key == DOWN:
|
||||||
if not self.keys:
|
if not self.keys:
|
||||||
return PASS
|
return PASS
|
||||||
self._open_candidates()
|
self._open_candidates()
|
||||||
return CONSUMED
|
return CONSUMED
|
||||||
if key in (UP, LEFT, RIGHT):
|
if key in (LEFT, RIGHT):
|
||||||
|
if not self.keys:
|
||||||
|
return PASS
|
||||||
|
self._move_cursor(-1 if key == LEFT else 1)
|
||||||
|
return CONSUMED
|
||||||
|
if key == UP:
|
||||||
return CONSUMED if self.keys else PASS
|
return CONSUMED if self.keys else PASS
|
||||||
return self._handle_character(key)
|
return self._handle_character(key)
|
||||||
|
|
||||||
@@ -156,6 +230,7 @@ class CompositionEngine:
|
|||||||
return bopomofo.parse(self.keys[start:end])
|
return bopomofo.parse(self.keys[start:end])
|
||||||
|
|
||||||
def _handle_character(self, c):
|
def _handle_character(self, c):
|
||||||
|
self.cursor = None # typing always continues at the end
|
||||||
if c == " ":
|
if c == " ":
|
||||||
if not self.keys:
|
if not self.keys:
|
||||||
return PASS
|
return PASS
|
||||||
@@ -188,15 +263,16 @@ class CompositionEngine:
|
|||||||
# --- candidates (for the last Zhuyin segment) ---
|
# --- candidates (for the last Zhuyin segment) ---
|
||||||
|
|
||||||
def _open_candidates(self):
|
def _open_candidates(self):
|
||||||
|
"""Candidates for the phrase ending at the cursor (default: the last syllable)."""
|
||||||
|
stops = self._cursor_stops()
|
||||||
|
if not stops:
|
||||||
|
return
|
||||||
|
seg_index, local = stops[min(len(stops) - 1 if self.cursor is None else self.cursor, len(stops) - 1)]
|
||||||
segs = self.segments
|
segs = self.segments
|
||||||
if not segs or segs[-1][2] != ZHUYIN:
|
seg = segs[seg_index]
|
||||||
return
|
syl = self._convertible(seg, seg_index < len(segs) - 1)[0]
|
||||||
start, end, _ = segs[-1]
|
self.candidates = self.converter.candidates(syl, local)
|
||||||
syl = [s.syllable for s in bopomofo.parse(self.keys[start:end]).completed]
|
self._candidate_segment_start = seg[0]
|
||||||
if not syl:
|
|
||||||
return
|
|
||||||
self.candidates = self.converter.candidates(syl, len(syl))
|
|
||||||
self._candidate_segment_start = start
|
|
||||||
self.candidate_index = 0
|
self.candidate_index = 0
|
||||||
|
|
||||||
def page(self):
|
def page(self):
|
||||||
@@ -232,7 +308,7 @@ class CompositionEngine:
|
|||||||
def _commit(self, segs=None):
|
def _commit(self, segs=None):
|
||||||
segs = segs if segs is not None else self.segments
|
segs = segs if segs is not None else self.segments
|
||||||
text = "".join(self._render(s, True) for s in segs)
|
text = "".join(self._render(s, True) for s in segs)
|
||||||
if self.forced_mode:
|
if self.forced_mode and self._forced_is_correction:
|
||||||
self.classifier.learned.record("".join(self.keys), self.forced_mode)
|
self.classifier.learned.record("".join(self.keys), self.forced_mode)
|
||||||
self._previous_mode = segs[-1][2] if segs else None
|
self._previous_mode = segs[-1][2] if segs else None
|
||||||
self._previous_time = self.now()
|
self._previous_time = self.now()
|
||||||
@@ -244,6 +320,8 @@ class CompositionEngine:
|
|||||||
|
|
||||||
def reset(self):
|
def reset(self):
|
||||||
self.keys = []
|
self.keys = []
|
||||||
|
self.cursor = None
|
||||||
self.forced_mode = None
|
self.forced_mode = None
|
||||||
|
self._forced_is_correction = False
|
||||||
self.fixed = {}
|
self.fixed = {}
|
||||||
self.candidates = []
|
self.candidates = []
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
"""Detects Shift pressed and released on its own. Port of ShiftTapDetector.swift."""
|
||||||
|
|
||||||
|
|
||||||
|
class ShiftTapDetector:
|
||||||
|
max_duration = 0.5
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
self._pressed_at = None
|
||||||
|
self._used = False
|
||||||
|
|
||||||
|
def shift_down(self, time):
|
||||||
|
if self._pressed_at is None: # ignore auto-repeat
|
||||||
|
self._pressed_at = time
|
||||||
|
self._used = False
|
||||||
|
|
||||||
|
def key_pressed(self):
|
||||||
|
"""Any other key while Shift is held: Shift was used as a modifier."""
|
||||||
|
if self._pressed_at is not None:
|
||||||
|
self._used = True
|
||||||
|
|
||||||
|
def shift_up(self, time):
|
||||||
|
"""Returns True when this release completes a Shift tap."""
|
||||||
|
start, self._pressed_at = self._pressed_at, None
|
||||||
|
return start is not None and not self._used and time - start <= self.max_duration
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "自動注音 AutoZhuyin",
|
"name": "自動注音 AutoZhuyin",
|
||||||
"version": "0.3.0",
|
"version": "0.5.0",
|
||||||
"guid": "{3895C6E3-6D40-4B4B-B4EA-CEEC75382D23}",
|
"guid": "{3895C6E3-6D40-4B4B-B4EA-CEEC75382D23}",
|
||||||
"locale": "zh-Hant-TW",
|
"locale": "zh-Hant-TW",
|
||||||
"fallbackLocale": "zh-TW",
|
"fallbackLocale": "zh-TW",
|
||||||
|
|||||||
@@ -26,9 +26,12 @@
|
|||||||
空白 注音:一聲;音節打完時送出中文。英文:送出單字加空白
|
空白 注音:一聲;音節打完時送出中文。英文:送出單字加空白
|
||||||
Enter 送出目前組字
|
Enter 送出目前組字
|
||||||
Tab 判斷錯了?按 Tab 在中/英之間翻轉,輸入法會記住這次修正
|
Tab 判斷錯了?按 Tab 在中/英之間翻轉,輸入法會記住這次修正
|
||||||
↓ 開啟候選字,按數字鍵 1–9 選字
|
← → 在組字區移動游標,選要改哪個字
|
||||||
|
↓ 開啟游標前那個字或詞的候選字,按數字鍵 1–9 選字
|
||||||
Esc 取消組字
|
Esc 取消組字
|
||||||
Shift+字母 強制英文
|
單按 Shift 下一個字強制英文(保持小寫),送出後恢復自動判斷;
|
||||||
|
打到一半時按,同 Tab 整段翻轉。會出現「英文」小提示
|
||||||
|
Shift+字母 打大寫字母(也會強制英文)
|
||||||
< > ? ! : 中文語境下自動變成全形 ,。?!:
|
< > ? ! : 中文語境下自動變成全形 ,。?!:
|
||||||
|
|
||||||
注音符號的順序打錯也沒關係,例如 ㄧㄒㄠˇ 會自動變成 ㄒㄧㄠˇ(小)。
|
注音符號的順序打錯也沒關係,例如 ㄧㄒㄠˇ 會自動變成 ㄒㄧㄠˇ(小)。
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ sys.path.insert(0, os.path.dirname(HERE))
|
|||||||
|
|
||||||
from autozhuyin.core import bopomofo # noqa: E402
|
from autozhuyin.core import bopomofo # noqa: E402
|
||||||
from autozhuyin.core.classifier import LITERAL, ZHUYIN, Classifier, LearnedPreferences # noqa: E402
|
from autozhuyin.core.classifier import LITERAL, ZHUYIN, Classifier, LearnedPreferences # noqa: E402
|
||||||
from autozhuyin.core.engine import DOWN, ENTER, TAB, CompositionEngine # noqa: E402
|
from autozhuyin.core.engine import DOWN, ENTER, LEFT, RIGHT, SHIFT_TAP, TAB, BACKSPACE, CompositionEngine # noqa: E402
|
||||||
|
from autozhuyin.core.shift_tap import ShiftTapDetector # noqa: E402
|
||||||
from autozhuyin.core.english import EnglishModel # noqa: E402
|
from autozhuyin.core.english import EnglishModel # noqa: E402
|
||||||
from autozhuyin.core.lexicon import Converter, Lexicon # noqa: E402
|
from autozhuyin.core.lexicon import Converter, Lexicon # noqa: E402
|
||||||
|
|
||||||
@@ -41,7 +42,7 @@ def make_engine():
|
|||||||
def type_keys(s, e):
|
def type_keys(s, e):
|
||||||
out = ""
|
out = ""
|
||||||
for c in s:
|
for c in s:
|
||||||
key = ENTER if c == "\n" else TAB if c == "\t" else c
|
key = {"\n": ENTER, "\t": TAB, "⇧": SHIFT_TAP, "←": LEFT, "→": RIGHT, "↓": DOWN}.get(c, c)
|
||||||
handled, commit = e.handle(key)
|
handled, commit = e.handle(key)
|
||||||
if commit is not None:
|
if commit is not None:
|
||||||
out += commit
|
out += commit
|
||||||
@@ -192,5 +193,79 @@ class MixedSegmentTests(unittest.TestCase):
|
|||||||
self.assertLess(per_key, 0.05)
|
self.assertLess(per_key, 0.05)
|
||||||
|
|
||||||
|
|
||||||
|
class ShiftTapTests(unittest.TestCase):
|
||||||
|
def test_forces_next_word_english_lowercase(self):
|
||||||
|
e = make_engine()
|
||||||
|
self.assertEqual(type_keys("⇧ru ", e), "ru ")
|
||||||
|
self.assertFalse(e.english_armed)
|
||||||
|
self.assertEqual(type_keys("su3cl3\n", e), "你好")
|
||||||
|
|
||||||
|
def test_tap_twice_cancels(self):
|
||||||
|
self.assertEqual(type_keys("⇧⇧su3cl3\n", make_engine()), "你好")
|
||||||
|
|
||||||
|
def test_mid_word_flips_and_learns(self):
|
||||||
|
e = make_engine()
|
||||||
|
type_keys("so", e)
|
||||||
|
e.handle(SHIFT_TAP)
|
||||||
|
self.assertEqual(e.mode, ZHUYIN)
|
||||||
|
type_keys("\n", e)
|
||||||
|
self.assertEqual(e.classifier.learned.weights["so"], 1)
|
||||||
|
|
||||||
|
def test_forcing_before_typing_not_learned(self):
|
||||||
|
e = make_engine()
|
||||||
|
type_keys("⇧hello ", e)
|
||||||
|
self.assertNotIn("hello", e.classifier.learned.weights)
|
||||||
|
|
||||||
|
def test_arming_survives_backspace(self):
|
||||||
|
e = make_engine()
|
||||||
|
type_keys("⇧r", e)
|
||||||
|
e.handle(BACKSPACE)
|
||||||
|
self.assertTrue(e.english_armed)
|
||||||
|
self.assertEqual(type_keys("ru ", e), "ru ")
|
||||||
|
|
||||||
|
def test_detector(self):
|
||||||
|
d = ShiftTapDetector()
|
||||||
|
d.shift_down(0)
|
||||||
|
self.assertTrue(d.shift_up(0.1))
|
||||||
|
d.shift_down(1)
|
||||||
|
d.key_pressed()
|
||||||
|
self.assertFalse(d.shift_up(1.1))
|
||||||
|
d.shift_down(2)
|
||||||
|
self.assertFalse(d.shift_up(3))
|
||||||
|
|
||||||
|
|
||||||
|
class CursorTests(unittest.TestCase):
|
||||||
|
def test_moves_and_clamps(self):
|
||||||
|
e = make_engine()
|
||||||
|
type_keys("rup wu0 wu0 fu4", e)
|
||||||
|
self.assertEqual(e.cursor_offset, 4)
|
||||||
|
type_keys("←", e)
|
||||||
|
self.assertEqual(e.cursor_offset, 3)
|
||||||
|
type_keys("←←←←", e)
|
||||||
|
self.assertEqual(e.cursor_offset, 1)
|
||||||
|
type_keys("→→→→", e)
|
||||||
|
self.assertEqual(e.cursor_offset, 4)
|
||||||
|
|
||||||
|
def test_choose_candidate_in_the_middle(self):
|
||||||
|
e = make_engine()
|
||||||
|
type_keys("rup wu0 wu0 fu4←←↓", e)
|
||||||
|
self.assertTrue(e.showing_candidates)
|
||||||
|
self.assertTrue(all(r[1] == 2 for r, _ in e.candidates))
|
||||||
|
e.select_candidate([t for _, t in e.candidates].index("添"))
|
||||||
|
self.assertEqual(type_keys("\n", e), "今添天氣")
|
||||||
|
|
||||||
|
def test_typing_returns_cursor_to_end(self):
|
||||||
|
e = make_engine()
|
||||||
|
type_keys("rup wu0 ←", e)
|
||||||
|
self.assertEqual(e.cursor_offset, 1)
|
||||||
|
type_keys("wu0 ", e)
|
||||||
|
self.assertEqual(e.cursor_offset, len(e.marked_text))
|
||||||
|
|
||||||
|
def test_candidates_for_chinese_before_english(self):
|
||||||
|
e = make_engine()
|
||||||
|
type_keys("su3cl3hello↓", e)
|
||||||
|
self.assertTrue(e.showing_candidates)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|||||||
@@ -36,6 +36,8 @@ class FakeTextService:
|
|||||||
def setCandidateList(self, c): self.reply["candidateList"] = c
|
def setCandidateList(self, c): self.reply["candidateList"] = c
|
||||||
def setCandidateCursor(self, p): self.reply["candidateCursor"] = p
|
def setCandidateCursor(self, p): self.reply["candidateCursor"] = p
|
||||||
|
|
||||||
|
def showMessage(self, message, duration=3): self.reply["showMessage"] = message
|
||||||
|
|
||||||
def setShowCandidates(self, show):
|
def setShowCandidates(self, show):
|
||||||
self.showCandidates = show
|
self.showCandidates = show
|
||||||
self.reply["showCandidates"] = show
|
self.reply["showCandidates"] = show
|
||||||
@@ -51,8 +53,8 @@ VK = {"\n": 0x0D, "\t": 0x09, " ": 0x20, "\b": 0x08, "↓": 0x28}
|
|||||||
|
|
||||||
class FakeKeyEvent:
|
class FakeKeyEvent:
|
||||||
def __init__(self, ch, shift=False, ctrl=False):
|
def __init__(self, ch, shift=False, ctrl=False):
|
||||||
self.keyCode = VK.get(ch, ord(ch.upper()) if ch.isalnum() else 0xBA)
|
self.keyCode = 0x10 if ch == "⇧" else VK.get(ch, ord(ch.upper()) if ch.isalnum() else 0xBA)
|
||||||
self.charCode = 0 if ch in ("\n", "\t", "\b", "↓") else ord(ch)
|
self.charCode = 0 if ch in ("\n", "\t", "\b", "↓", "⇧") else ord(ch)
|
||||||
self.keyStates = [0] * 256
|
self.keyStates = [0] * 256
|
||||||
if shift:
|
if shift:
|
||||||
self.keyStates[0x10] = 0x80
|
self.keyStates[0x10] = 0x80
|
||||||
@@ -74,6 +76,17 @@ def press(svc, ch, **kw):
|
|||||||
return True, svc.reply
|
return True, svc.reply
|
||||||
|
|
||||||
|
|
||||||
|
def tap_shift(svc):
|
||||||
|
"""Shift down then up with nothing in between, as PIME delivers it."""
|
||||||
|
svc.reply = {}
|
||||||
|
down = FakeKeyEvent("⇧", shift=True)
|
||||||
|
assert not svc.filterKeyDown(down)
|
||||||
|
up = FakeKeyEvent("⇧")
|
||||||
|
if svc.filterKeyUp(up):
|
||||||
|
svc.onKeyUp(up)
|
||||||
|
return svc.reply
|
||||||
|
|
||||||
|
|
||||||
def type_text(svc, text):
|
def type_text(svc, text):
|
||||||
out = ""
|
out = ""
|
||||||
for ch in text:
|
for ch in text:
|
||||||
@@ -123,5 +136,23 @@ class WrapperTests(unittest.TestCase):
|
|||||||
self.assertEqual(out + reply.get("commitString", ""), "Hi ")
|
self.assertEqual(out + reply.get("commitString", ""), "Hi ")
|
||||||
|
|
||||||
|
|
||||||
|
class ShiftTapWrapperTests(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.svc = AutoZhuyinTextService(client=None)
|
||||||
|
self.svc.onActivate()
|
||||||
|
|
||||||
|
def test_tap_forces_english_lowercase(self):
|
||||||
|
reply = tap_shift(self.svc)
|
||||||
|
self.assertEqual(reply.get("showMessage"), "英文")
|
||||||
|
self.assertEqual(type_text(self.svc, "ru "), "ru ")
|
||||||
|
|
||||||
|
def test_shift_with_letter_is_not_a_tap(self):
|
||||||
|
self.svc.filterKeyDown(FakeKeyEvent("⇧", shift=True))
|
||||||
|
press(self.svc, "H", shift=True)
|
||||||
|
up = FakeKeyEvent("⇧")
|
||||||
|
self.assertFalse(self.svc.filterKeyUp(up))
|
||||||
|
self.assertFalse(self.svc.engine.english_armed)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|||||||
Reference in New Issue
Block a user