Merge pull request #14 from jpreprocess/fix-phone-position

Fix wrong phone position
jpreprocess · Jan 23, 2024 · 1efe8d5 · 1efe8d5
2 parents 0e85f53 + 63e4e9a
commit 1efe8d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/crates/jlabel-question/src/position.rs b/crates/jlabel-question/src/position.rs
@@ -134,8 +134,8 @@ impl Position for PhonePosition {
 
     fn get<'a>(&self, label: &'a Label) -> Option<&'a Self::Target> {
         match self {
-            Self::P1 => label.phoneme.p1.as_ref(),
-            Self::P2 => label.phoneme.p2.as_ref(),
+            Self::P1 => label.phoneme.p2.as_ref(),
+            Self::P2 => label.phoneme.p1.as_ref(),
             Self::P3 => label.phoneme.c.as_ref(),
             Self::P4 => label.phoneme.n1.as_ref(),
             Self::P5 => label.phoneme.n2.as_ref(),

diff --git a/crates/jlabel-question/src/tests.rs b/crates/jlabel-question/src/tests.rs
@@ -123,6 +123,9 @@ fn query() {
         },
     };
 
+    assert!(question(&["b^*"]).unwrap().test(&label));
+    assert!(question(&["*^o-*"]).unwrap().test(&label));
+
     assert!(!question(&["*=i/A:*"]).unwrap().test(&label));
 
     assert!(!question(&["*/A:-??+*", "*/A:-9+*"]).unwrap().test(&label));