Skip to content

fix: clicks no longer silently deleted when adjacent to a modifier #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drammock merged 5 commits into from
Aug 10, 2026
Merged

fix: clicks no longer silently deleted when adjacent to a modifier #387

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9aa9b4e
fix: clicks no longer silently deleted when adjacent to a modifier
varunghat Jul 8, 2026
42d4ee1
Merge branch 'master' into fix/click-modifier-typestring
drammock Aug 4, 2026
ee2a516
fix: click-diacritic reordering bug in order_ipa()
varunghat Aug 10, 2026
d7b7c73
Added comments for click-modifier edge cases
varunghat Aug 10, 2026
7254749
Apply suggestion from @varunghat
drammock Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion scripts/aggregation-helper-functions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ order_ipa <- function(strings, keep_stars=FALSE, keep_brackets=TRUE) {
## If a diacritic comes right after a modifier letter, swap their order
while (stri_detect_fixed(typestring, "MD")) {
Comment thread
drammock marked this conversation as resolved.
Outdated
ix <- stri_locate_first_fixed(typestring, "MD")[1]
Comment thread
drammock marked this conversation as resolved.
if (string[ix] %in% clicks) break
if (ix == 1) neworder <- c(2, 1, 3:lenstr)
else if (ix == lenstr-1) neworder <- c(1:(ix-1), ix+1, ix)
else neworder <- c(1:(ix-1), ix+1, ix, (ix+2):lenstr)
Expand All @@ -312,7 +313,7 @@ order_ipa <- function(strings, keep_stars=FALSE, keep_brackets=TRUE) {
for (row in seq_len(dim(ixs)[1])) {
span <- ixs[row,1]:ixs[row,2]
mods <- string[span]
string[span] <- modifiers[modifiers %in% mods]
string[span] <- c(clicks, modifiers)[c(clicks, modifiers) %in% mods]
Comment thread
drammock marked this conversation as resolved.
} }
## Put sequences of diacritics in canonical order
if (stri_detect_fixed(typestring, "DD")) {
Expand Down
Loading