Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 38 additions & 7 deletions Source/Includes/Wordlist.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ CheckValid(Word,ForceLearn=false)
{
return
}
} else if ( RegExMatch(Word, "S)[a-zA-Z�-��-��-��-�]") = 0 )
} else if ( RegExMatch(Word, "S)[a-zA-Zà-öø-ÿÀ-ÖØ-ß]") = 0 )
{
Return
}
Expand Down Expand Up @@ -467,12 +467,43 @@ StrUnmark(string) {
; Remove combining marks and return result.
string := RegExReplace(StrGet(&buf, len, "UTF-16"), "\pM")

StringReplace, string, string, , ae, All
StringReplace, string, string, , AE, All
StringReplace, string, string, , oe, All
StringReplace, string, string, , OE, All
StringReplace, string, string, , ss, All
StringReplace, string, string, æ, ae, All
StringReplace, string, string, Æ, AE, All
StringReplace, string, string, œ, oe, All
StringReplace, string, string, Œ, OE, All
StringReplace, string, string, ß, ss, All
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please revert the changes to these lines? If not, let me know and I'll take care of it.


return, string

}
}

;------------------------------------------------------------------------

BulkLearnFromClipboard(textblock)
{
global g_TerminatingCharactersParsed

;Display progress bar window...
Progress, M, Please wait..., Bulk learning..., %g_ScriptTitle%

;Count how many individual items there are, we need this number to display
;an accurate progress bar.
Loop, Parse, textblock, %g_TerminatingCharactersParsed%`r`n%A_Tab%%A_Space%
{
;Count the individual items
Counter++
}

Loop, Parse, textblock, %g_TerminatingCharactersParsed%`r`n%A_Tab%%A_Space%
{
;Display words to show progress...
ProgressPercent := Round(A_Index/Counter * 100)
Progress, %ProgressPercent%, Please wait..., %A_LoopField%, %g_ScriptTitle%
AddWordToList(A_LoopField, 0,"ForceLearn")
}

;Turn off progress bar window...
Progress, Off

return
}
12 changes: 12 additions & 0 deletions Source/TypingAid.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -1099,6 +1099,7 @@ BuildTrayMenu()
Menu, Tray, NoStandard
Menu, Tray, add, Settings, Configuration
Menu, Tray, add, Pause, PauseResumeScript
Menu, Tray, add, Bulk Learn, BulkLearnFromClipboardMenu
IF (A_IsCompiled)
{
Menu, Tray, add, Exit, ExitScript
Expand Down Expand Up @@ -1258,6 +1259,17 @@ if (g_PauseState == "Paused")
}
Return


BulkLearnFromClipboardMenu:
MsgBox, 4, Bulk-learn words from clipboard contents, Would you like to continue? (press Yes or No)
IfMsgBox No
{
Return
}
BulkLearnFromClipboard(clipboard)
Return


ExitScript:
ExitApp
Return
Expand Down