Compare commits
6
Commits
v0.4.1
...
17f7d6f50d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
17f7d6f50d | ||
|
|
7e173a1da8 | ||
|
|
fa0b78e5a4 | ||
|
|
e928d08fdc | ||
|
|
82f20a6551 | ||
|
|
e6e5004630 |
@@ -12,10 +12,10 @@
|
||||
- **中英自動判斷**:每按一個鍵就重新判斷,組字區即時顯示結果(Mac 版英文以藍字顯示)
|
||||
- **中英混打不用空白**:`ji3hello` → 我hello、`hellosu3cl3` → hello你好,同一段內會自動切分
|
||||
- **判斷錯了按 Tab**:在中/英之間翻轉,輸入法會記住這組按鍵,下次自動判斷對
|
||||
- **單按 Shift 強制英文**:要打英文時先單按一下 Shift,接下來這個字照打、保持小寫
|
||||
- **單按 Shift 切換英文模式**:英文模式下按鍵直接送出、保持小寫、不顯示底線,再單按一次 Shift 回到中英自動判斷
|
||||
- **注音順序打錯也能修正**:`ㄧㄒㄠˇ`、`ㄒㄠㄧˇ` 都會變成 `ㄒㄧㄠˇ`(小)
|
||||
- **可省略聲調**:`jiap7`(ㄨㄛ ㄇㄣ˙)一樣能打出「我們」
|
||||
- **候選字**:按 ↓ 選最後一個字或詞,選過的會固定下來
|
||||
- **候選字**:用 ← → 把游標移到要改的字後面,按 ↓ 選字;選過的會固定下來
|
||||
- **全形標點**:中文語境下 `?` `!` `<` 自動變成 `?` `!` `,`
|
||||
- **完整詞庫**:約 17 萬筆,來自小麥注音 McBopomofo(MIT 授權)
|
||||
|
||||
@@ -51,9 +51,10 @@ SmartScreen 出現警告時,按「其他資訊 → 仍要執行」。解除安
|
||||
| 空白 | 注音:一聲;音節已完成時送出中文。英文:送出單字加空白 |
|
||||
| Enter | 送出目前組字 |
|
||||
| **Tab** | 判斷錯了?按 Tab 把整段翻轉成另一種語言,輸入法會**記住**這次修正 |
|
||||
| ↓ | 開啟候選字(選最後一個字或詞),數字鍵 1–9 選字,Esc 關閉 |
|
||||
| ← → | 在組字區移動游標,選要改哪個字 |
|
||||
| ↓ | 開啟游標前那個字或詞的候選字(游標預設在最後),數字鍵 1–9 選字,Esc 關閉 |
|
||||
| Esc | 取消組字 |
|
||||
| **單按 Shift** | 沒在打字時:下一個字強制英文(保持小寫),送出後恢復自動判斷,再按一次取消。打到一半時:同 Tab,整段翻轉 |
|
||||
| **單按 Shift** | 沒在打字時:切換**英文模式**,按鍵直接送出、保持小寫、沒有底線,一直維持到再單按一次 Shift 才回到中英自動判斷。打到一半時:同 Tab,整段翻轉 |
|
||||
| Shift + 字母 | 打大寫字母(也會強制英文) |
|
||||
| `< > ? ! : ( ) [ ]` | 中文語境下自動轉成全形 `,。?!:()「」` |
|
||||
| `, . / ; -` | 英文單字後是標點;在注音中是 ㄝ ㄡ ㄥ ㄤ ㄦ(例如 `2;3` = 檔) |
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.4.1</string>
|
||||
<string>0.6.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>5</string>
|
||||
<string>8</string>
|
||||
<key>InputMethodConnectionName</key>
|
||||
<string>com.autozhuyin.inputmethod.AutoZhuyin_Connection</string>
|
||||
<key>InputMethodServerControllerClass</key>
|
||||
|
||||
@@ -117,8 +117,10 @@ final class InputController: IMKInputController {
|
||||
]))
|
||||
}
|
||||
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,
|
||||
selectionRange: NSRange(location: (text as NSString).length, length: 0),
|
||||
selectionRange: NSRange(location: caret, length: 0),
|
||||
replacementRange: NSRange(location: NSNotFound, length: 0))
|
||||
|
||||
if engine.isShowingCandidates {
|
||||
|
||||
@@ -35,16 +35,19 @@ public final class CompositionEngine {
|
||||
public let converter: Converter
|
||||
|
||||
public private(set) var keys: [Character] = []
|
||||
/// Set by Tab / Shift tap: overrides the classifier for the whole buffer.
|
||||
/// Set by Tab / a Shift tap while typing: overrides the classifier for the whole
|
||||
/// buffer. It is a correction, learned on commit.
|
||||
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
|
||||
/// English mode, toggled by a Shift tap when nothing is being typed. Keys go straight
|
||||
/// to the app (no composition, no underline) until Shift is tapped again.
|
||||
public private(set) var isEnglishMode = false
|
||||
/// User-picked phrases: Zhuyin segment start (key index) → syllable range → text.
|
||||
private var fixed: [Int: [Range<Int>: String]] = [:]
|
||||
public private(set) var candidates: [Candidate] = []
|
||||
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 isShowingCandidates: Bool { !candidates.isEmpty }
|
||||
|
||||
@@ -89,17 +92,64 @@ public final class CompositionEngine {
|
||||
|
||||
/// Text for one segment. A non-final Zhuyin segment shows its unfinished syllable as Bopomofo.
|
||||
private func render(_ seg: Segment, final: Bool) -> String {
|
||||
let segKeys = Array(keys[seg.range])
|
||||
guard seg.mode == .zhuyin else { return String(segKeys) }
|
||||
let p = ZhuyinParser.parse(segKeys)
|
||||
let fixedHere = (fixed[seg.range.lowerBound] ?? [:])
|
||||
if final {
|
||||
let all = p.syllables.map(\.syllable)
|
||||
return converter.convert(all, fixed: fixedHere.filter { $0.key.upperBound <= all.count }).map(\.text).joined()
|
||||
guard seg.mode == .zhuyin else { return String(keys[seg.range]) }
|
||||
let (converted, pending) = conversion(of: seg, final: final)
|
||||
return converted.map(\.text).joined() + pending
|
||||
}
|
||||
|
||||
/// Syllables of a Zhuyin segment that are converted to Chinese (all of them when
|
||||
/// 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)
|
||||
let text = converter.convert(done, fixed: fixedHere.filter { $0.key.upperBound <= done.count }).map(\.text).joined()
|
||||
return text + (p.pending?.syllable.reading ?? "")
|
||||
return out
|
||||
}
|
||||
|
||||
/// 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
|
||||
@@ -112,13 +162,10 @@ public final class CompositionEngine {
|
||||
return handleCharacter(c)
|
||||
case .backspace:
|
||||
guard !keys.isEmpty else { return .passThrough }
|
||||
cursor = nil
|
||||
keys.removeLast()
|
||||
fixed = fixed.filter { $0.key < keys.count }
|
||||
if keys.isEmpty {
|
||||
// A Shift-tap "next word is English" stays armed; a correction is dropped.
|
||||
if forcedIsCorrection { forcedMode = nil; forcedIsCorrection = false }
|
||||
fixed = [:]
|
||||
}
|
||||
if keys.isEmpty { forcedMode = nil; fixed = [:] }
|
||||
return .consumed
|
||||
case .enter:
|
||||
guard !keys.isEmpty else { return .passThrough }
|
||||
@@ -133,9 +180,10 @@ public final class CompositionEngine {
|
||||
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
|
||||
// Toggle English mode; it stays on until the next Shift tap.
|
||||
isEnglishMode.toggle()
|
||||
previousMode = isEnglishMode ? .literal : nil
|
||||
previousCommitTime = now()
|
||||
} else {
|
||||
flip()
|
||||
}
|
||||
@@ -144,7 +192,15 @@ public final class CompositionEngine {
|
||||
guard !keys.isEmpty else { return .passThrough }
|
||||
openCandidates()
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -152,13 +208,12 @@ public final class CompositionEngine {
|
||||
/// 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 {
|
||||
cursor = nil // typing always continues at the end
|
||||
// English mode: every key goes to the app as typed.
|
||||
if isEnglishMode && keys.isEmpty { return .passThrough }
|
||||
if c == " " {
|
||||
guard !keys.isEmpty else { return .passThrough }
|
||||
let segs = segments(of: keys, finishing: true)
|
||||
@@ -206,13 +261,16 @@ public final class CompositionEngine {
|
||||
|
||||
// MARK: - Candidates (for the last Zhuyin segment)
|
||||
|
||||
/// Opens candidates for the phrase ending at the cursor (default: the last syllable).
|
||||
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
|
||||
guard let last = segs.last, last.mode == .zhuyin else { return }
|
||||
let done = ZhuyinParser.parse(Array(keys[last.range])).completed.map(\.syllable)
|
||||
guard !done.isEmpty else { return }
|
||||
candidates = converter.candidates(done, endingAt: done.count)
|
||||
candidateSegmentStart = last.range.lowerBound
|
||||
let seg = segs[stop.segIndex]
|
||||
let syl = convertibleSyllables(seg, final: stop.segIndex < segs.count - 1).syllables
|
||||
candidates = converter.candidates(syl, endingAt: stop.local)
|
||||
candidateSegmentStart = seg.range.lowerBound
|
||||
candidateIndex = 0
|
||||
}
|
||||
|
||||
@@ -252,7 +310,7 @@ public final class CompositionEngine {
|
||||
private func commitCurrent(_ given: [Segment]? = nil) -> String {
|
||||
let segs = given ?? segments
|
||||
let text = segs.map { render($0, final: true) }.joined()
|
||||
if let forced = forcedMode, forcedIsCorrection {
|
||||
if let forced = forcedMode {
|
||||
classifier.learned.record(String(keys), as: forced)
|
||||
}
|
||||
previousMode = segs.last?.mode
|
||||
@@ -268,8 +326,8 @@ public final class CompositionEngine {
|
||||
|
||||
public func reset() {
|
||||
keys = []
|
||||
cursor = nil
|
||||
forcedMode = nil
|
||||
forcedIsCorrection = false
|
||||
fixed = [:]
|
||||
candidates = []
|
||||
}
|
||||
|
||||
@@ -297,13 +297,16 @@ final class ShiftTapTests: XCTestCase {
|
||||
return out
|
||||
}
|
||||
|
||||
func testShiftTapForcesNextWordEnglishLowercase() {
|
||||
func testShiftTapTogglesEnglishMode() {
|
||||
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), "你好")
|
||||
// "ru" alone would be ㄐㄧ (機); in English mode keys pass straight through, lowercase.
|
||||
XCTAssertEqual(type("⇧ru su ", into: e), "ru su ")
|
||||
XCTAssertTrue(e.isEnglishMode) // still English after spaces
|
||||
XCTAssertEqual(e.markedText, "") // never composed: no underline
|
||||
XCTAssertEqual(type("\n", into: e), "\n") // Enter goes to the app, mode stays
|
||||
XCTAssertTrue(e.isEnglishMode)
|
||||
XCTAssertEqual(type("⇧su3cl3\n", into: e), "你好") // tap again: automatic again
|
||||
XCTAssertFalse(e.isEnglishMode)
|
||||
}
|
||||
|
||||
func testShiftTapTwiceCancels() {
|
||||
@@ -316,22 +319,22 @@ final class ShiftTapTests: XCTestCase {
|
||||
XCTAssertEqual(e.mode, .literal)
|
||||
_ = e.handle(.shiftTap)
|
||||
XCTAssertEqual(e.mode, .zhuyin)
|
||||
XCTAssertFalse(e.isEnglishMode) // a flip, not English mode
|
||||
_ = type("\n", into: e)
|
||||
XCTAssertEqual(e.classifier.learned.weights["so"], 1) // a correction is learned
|
||||
}
|
||||
|
||||
func testForcingBeforeTypingIsNotLearned() {
|
||||
func testEnglishModeIsNotLearned() {
|
||||
let e = engine()
|
||||
_ = type("⇧hello ", into: e)
|
||||
XCTAssertNil(e.classifier.learned.weights["hello"])
|
||||
XCTAssertTrue(e.classifier.learned.weights.isEmpty)
|
||||
}
|
||||
|
||||
func testArmingSurvivesBackspace() {
|
||||
func testBackspaceInEnglishModeGoesToApp() {
|
||||
let e = engine()
|
||||
_ = type("⇧r", into: e)
|
||||
_ = e.handle(.backspace)
|
||||
XCTAssertTrue(e.isEnglishArmed)
|
||||
XCTAssertEqual(type("ru ", into: e), "ru ")
|
||||
_ = type("⇧", into: e)
|
||||
XCTAssertFalse(e.handle(.backspace).handled)
|
||||
XCTAssertTrue(e.isEnglishMode)
|
||||
}
|
||||
|
||||
func testDetector() {
|
||||
@@ -351,3 +354,57 @@ final class ShiftTapTests: XCTestCase {
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -142,8 +142,8 @@ class AutoZhuyinTextService(TextService):
|
||||
return False
|
||||
self.engine.handle(SHIFT_TAP)
|
||||
self._update(None)
|
||||
if self.engine.english_armed:
|
||||
self.showMessage("英文", 1)
|
||||
if not self.engine.keys:
|
||||
self.showMessage("英文" if self.engine.english_mode else "中英自動", 1)
|
||||
return True
|
||||
|
||||
# --- replies ---
|
||||
@@ -153,7 +153,7 @@ class AutoZhuyinTextService(TextService):
|
||||
self.setCommitString(commit)
|
||||
marked = self.engine.marked_text
|
||||
self.setCompositionString(marked)
|
||||
self.setCompositionCursor(len(marked))
|
||||
self.setCompositionCursor(self.engine.cursor_offset)
|
||||
if self.engine.showing_candidates:
|
||||
page, cursor = self.engine.page()
|
||||
self.setCandidateList(page)
|
||||
|
||||
@@ -34,13 +34,15 @@ class CompositionEngine:
|
||||
self.now = now
|
||||
self.keys = []
|
||||
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
|
||||
# English mode, toggled by a Shift tap when nothing is being typed: keys go straight
|
||||
# to the app (no composition, no underline) until Shift is tapped again.
|
||||
self.english_mode = False
|
||||
self.fixed = {} # zhuyin segment start -> {(syl_start, syl_end): text}
|
||||
self.candidates = []
|
||||
self.candidate_index = 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_time = float("-inf")
|
||||
self._cache_key = None
|
||||
@@ -81,19 +83,61 @@ class CompositionEngine:
|
||||
def page_start(self):
|
||||
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):
|
||||
start, end, mode = seg
|
||||
seg_keys = self.keys[start:end]
|
||||
if mode == LITERAL:
|
||||
return "".join(seg_keys)
|
||||
p = bopomofo.parse(seg_keys)
|
||||
fixed_here = self.fixed.get(start, {})
|
||||
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)}
|
||||
text = "".join(t for _, t in self.converter.convert(syl, fx))
|
||||
if not final and p.pending:
|
||||
text += p.pending.syllable.reading
|
||||
return text
|
||||
return "".join(self.keys[start:end])
|
||||
converted, pending = self._conversion(seg, final)
|
||||
return "".join(t for _, t in converted) + pending
|
||||
|
||||
# --- cursor ---
|
||||
|
||||
def _cursor_stops(self):
|
||||
"""[(segment index, syllables before the stop)] for every Zhuyin syllable."""
|
||||
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
|
||||
def marked_pieces(self):
|
||||
@@ -106,19 +150,16 @@ class CompositionEngine:
|
||||
|
||||
# --- 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):
|
||||
"""Forces the whole buffer into the other mode (a correction that is learned)."""
|
||||
self.forced_mode = LITERAL if self.mode == ZHUYIN else ZHUYIN
|
||||
self._forced_is_correction = True
|
||||
|
||||
def wants(self, key):
|
||||
"""Whether handle(key) would consume the key, without changing state."""
|
||||
if self.candidates or key == SHIFT_TAP:
|
||||
return True
|
||||
if self.english_mode and not self.keys:
|
||||
return False # English mode: everything goes to the app as typed
|
||||
if key in SPECIAL_KEYS:
|
||||
return bool(self.keys)
|
||||
if self.keys:
|
||||
@@ -135,17 +176,17 @@ class CompositionEngine:
|
||||
if key == BACKSPACE:
|
||||
if not self.keys:
|
||||
return PASS
|
||||
self.cursor = None
|
||||
self.keys.pop()
|
||||
self.fixed = {k: v for k, v in self.fixed.items() if k < len(self.keys)}
|
||||
if not self.keys:
|
||||
# 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.forced_mode = None
|
||||
self.fixed = {}
|
||||
return CONSUMED
|
||||
if key == ENTER:
|
||||
return (True, self._commit()) if self.keys else PASS
|
||||
if not self.keys:
|
||||
return PASS
|
||||
return True, self._commit()
|
||||
if key == ESCAPE:
|
||||
if not self.keys:
|
||||
return PASS
|
||||
@@ -158,9 +199,10 @@ class CompositionEngine:
|
||||
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
|
||||
# Toggle English mode; it stays on until the next Shift tap.
|
||||
self.english_mode = not self.english_mode
|
||||
self._previous_mode = LITERAL if self.english_mode else None
|
||||
self._previous_time = self.now()
|
||||
else:
|
||||
self._flip()
|
||||
return CONSUMED
|
||||
@@ -169,7 +211,12 @@ class CompositionEngine:
|
||||
return PASS
|
||||
self._open_candidates()
|
||||
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 self._handle_character(key)
|
||||
|
||||
@@ -180,6 +227,9 @@ class CompositionEngine:
|
||||
return bopomofo.parse(self.keys[start:end])
|
||||
|
||||
def _handle_character(self, c):
|
||||
self.cursor = None # typing always continues at the end
|
||||
if self.english_mode and not self.keys:
|
||||
return PASS # English mode: every key goes to the app as typed
|
||||
if c == " ":
|
||||
if not self.keys:
|
||||
return PASS
|
||||
@@ -212,15 +262,16 @@ class CompositionEngine:
|
||||
# --- candidates (for the last Zhuyin segment) ---
|
||||
|
||||
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
|
||||
if not segs or segs[-1][2] != ZHUYIN:
|
||||
return
|
||||
start, end, _ = segs[-1]
|
||||
syl = [s.syllable for s in bopomofo.parse(self.keys[start:end]).completed]
|
||||
if not syl:
|
||||
return
|
||||
self.candidates = self.converter.candidates(syl, len(syl))
|
||||
self._candidate_segment_start = start
|
||||
seg = segs[seg_index]
|
||||
syl = self._convertible(seg, seg_index < len(segs) - 1)[0]
|
||||
self.candidates = self.converter.candidates(syl, local)
|
||||
self._candidate_segment_start = seg[0]
|
||||
self.candidate_index = 0
|
||||
|
||||
def page(self):
|
||||
@@ -256,7 +307,7 @@ class CompositionEngine:
|
||||
def _commit(self, segs=None):
|
||||
segs = segs if segs is not None else self.segments
|
||||
text = "".join(self._render(s, True) for s in segs)
|
||||
if self.forced_mode and self._forced_is_correction:
|
||||
if 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_time = self.now()
|
||||
@@ -268,7 +319,7 @@ class CompositionEngine:
|
||||
|
||||
def reset(self):
|
||||
self.keys = []
|
||||
self.cursor = None
|
||||
self.forced_mode = None
|
||||
self._forced_is_correction = False
|
||||
self.fixed = {}
|
||||
self.candidates = []
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "自動注音 AutoZhuyin",
|
||||
"version": "0.4.1",
|
||||
"version": "0.6.0",
|
||||
"guid": "{3895C6E3-6D40-4B4B-B4EA-CEEC75382D23}",
|
||||
"locale": "zh-Hant-TW",
|
||||
"fallbackLocale": "zh-TW",
|
||||
|
||||
@@ -26,10 +26,12 @@
|
||||
空白 注音:一聲;音節打完時送出中文。英文:送出單字加空白
|
||||
Enter 送出目前組字
|
||||
Tab 判斷錯了?按 Tab 在中/英之間翻轉,輸入法會記住這次修正
|
||||
↓ 開啟候選字,按數字鍵 1–9 選字
|
||||
← → 在組字區移動游標,選要改哪個字
|
||||
↓ 開啟游標前那個字或詞的候選字,按數字鍵 1–9 選字
|
||||
Esc 取消組字
|
||||
單按 Shift 下一個字強制英文(保持小寫),送出後恢復自動判斷;
|
||||
打到一半時按,同 Tab 整段翻轉。會出現「英文」小提示
|
||||
單按 Shift 切換英文模式(按鍵直接送出、保持小寫、沒有底線),
|
||||
再單按一次回到中英自動判斷,會出現「英文」/「中英自動」小提示;
|
||||
打到一半時按,同 Tab 整段翻轉
|
||||
Shift+字母 打大寫字母(也會強制英文)
|
||||
< > ? ! : 中文語境下自動變成全形 ,。?!:
|
||||
|
||||
|
||||
+50
-13
@@ -11,7 +11,7 @@ sys.path.insert(0, os.path.dirname(HERE))
|
||||
|
||||
from autozhuyin.core import bopomofo # noqa: E402
|
||||
from autozhuyin.core.classifier import LITERAL, ZHUYIN, Classifier, LearnedPreferences # noqa: E402
|
||||
from autozhuyin.core.engine import DOWN, ENTER, SHIFT_TAP, TAB, BACKSPACE, 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.lexicon import Converter, Lexicon # noqa: E402
|
||||
@@ -42,7 +42,7 @@ def make_engine():
|
||||
def type_keys(s, e):
|
||||
out = ""
|
||||
for c in s:
|
||||
key = ENTER if c == "\n" else TAB if c == "\t" else SHIFT_TAP if c == "⇧" else c
|
||||
key = {"\n": ENTER, "\t": TAB, "⇧": SHIFT_TAP, "←": LEFT, "→": RIGHT, "↓": DOWN}.get(c, c)
|
||||
handled, commit = e.handle(key)
|
||||
if commit is not None:
|
||||
out += commit
|
||||
@@ -194,11 +194,15 @@ class MixedSegmentTests(unittest.TestCase):
|
||||
|
||||
|
||||
class ShiftTapTests(unittest.TestCase):
|
||||
def test_forces_next_word_english_lowercase(self):
|
||||
def test_toggles_english_mode(self):
|
||||
e = make_engine()
|
||||
self.assertEqual(type_keys("⇧ru ", e), "ru ")
|
||||
self.assertFalse(e.english_armed)
|
||||
self.assertEqual(type_keys("su3cl3\n", e), "你好")
|
||||
self.assertEqual(type_keys("⇧ru su ", e), "ru su ")
|
||||
self.assertTrue(e.english_mode)
|
||||
self.assertEqual(e.marked_text, "")
|
||||
self.assertEqual(e.handle(ENTER), (False, None))
|
||||
self.assertTrue(e.english_mode)
|
||||
self.assertEqual(type_keys("⇧su3cl3\n", e), "你好")
|
||||
self.assertFalse(e.english_mode)
|
||||
|
||||
def test_tap_twice_cancels(self):
|
||||
self.assertEqual(type_keys("⇧⇧su3cl3\n", make_engine()), "你好")
|
||||
@@ -208,20 +212,20 @@ class ShiftTapTests(unittest.TestCase):
|
||||
type_keys("so", e)
|
||||
e.handle(SHIFT_TAP)
|
||||
self.assertEqual(e.mode, ZHUYIN)
|
||||
self.assertFalse(e.english_mode)
|
||||
type_keys("\n", e)
|
||||
self.assertEqual(e.classifier.learned.weights["so"], 1)
|
||||
|
||||
def test_forcing_before_typing_not_learned(self):
|
||||
def test_english_mode_not_learned(self):
|
||||
e = make_engine()
|
||||
type_keys("⇧hello ", e)
|
||||
self.assertNotIn("hello", e.classifier.learned.weights)
|
||||
self.assertEqual(e.classifier.learned.weights, {})
|
||||
|
||||
def test_arming_survives_backspace(self):
|
||||
def test_backspace_goes_to_app(self):
|
||||
e = make_engine()
|
||||
type_keys("⇧r", e)
|
||||
e.handle(BACKSPACE)
|
||||
self.assertTrue(e.english_armed)
|
||||
self.assertEqual(type_keys("ru ", e), "ru ")
|
||||
e.handle(SHIFT_TAP)
|
||||
self.assertEqual(e.handle(BACKSPACE), (False, None))
|
||||
self.assertTrue(e.english_mode)
|
||||
|
||||
def test_detector(self):
|
||||
d = ShiftTapDetector()
|
||||
@@ -234,5 +238,38 @@ class ShiftTapTests(unittest.TestCase):
|
||||
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__":
|
||||
unittest.main()
|
||||
|
||||
@@ -144,14 +144,15 @@ class ShiftTapWrapperTests(unittest.TestCase):
|
||||
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 ")
|
||||
self.assertEqual(type_text(self.svc, "ru su "), "ru su ")
|
||||
self.assertEqual(tap_shift(self.svc).get("showMessage"), "中英自動")
|
||||
|
||||
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)
|
||||
self.assertFalse(self.svc.engine.english_mode)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user