dict_en.dat spellcheck.py spellcheckcfgdlg.py spellcheckdlg.py tools/add_words.py @@ -25,6 +25,9 @@ import pml import scenereport import scriptreport import screenplay +import spellcheck +import spellcheckdlg +import spellcheckcfgdlg import splash import titlesdlg import util @@ -69,10 +72,14 @@ class GlobalData: self.confFilename = misc.confPath + "/default.conf" self.stateFilename = misc.confPath + "/state" + self.scDictFilename = misc.confPath + "/spell_checker_dictionary" # current script config path self.scriptSettingsPath = misc.confPath + # global spell checker (user) dictionary + self.scDict = spellcheck.Dict() + if opts.conf: self.confFilename = opts.conf @@ -140,6 +147,11 @@ class GlobalData: else: self.vm = self.vmOverviewLarge + # save global spell checker dictionary to disk + def saveScDict(self): + util.writeToFile(self.scDictFilename, + util.toUTF8(self.scDict.save()), mainFrame) + class MyPanel(wxPanel): def __init__(self, parent, id): @@ -575,6 +587,16 @@ class MyCtrl(wxControl): dlg.Destroy() + def OnSpellCheckerScriptDictionaryDlg(self): + dlg = spellcheckcfgdlg.SCDictDlg(mainFrame, + copy.deepcopy(self.sp.scDict), False) + + if dlg.ShowModal() == wxID_OK: + self.sp.scDict = dlg.scDict + self.sp.markChanged() + + dlg.Destroy() + def OnReportDialogueChart(self): self.sp.paginate() dialoguechart.genDialogueChart(mainFrame, self.sp, not misc.license) @@ -835,7 +857,53 @@ class MyCtrl(wxControl): dlg.Destroy() self.searchLine = -1 - self.searchColStart = -1 + self.searchColumn = -1 + self.searchWidth = -1 + + self.updateScreen() + + def OnSpellCheckerDlg(self): + self.clearAutoComp() + + wasAtStart = self.sp.line == 0 + + wxBeginBusyCursor() + + if not spellcheck.loadDict(mainFrame): + wxEndBusyCursor() + + return + + sc = spellcheck.SpellChecker(self.sp, gd.scDict) + found = sc.findNext() + + wxEndBusyCursor() + + if not found: + s = "" + + if not wasAtStart: + s = "\n\n(Starting position was not at\n"\ + "the beginning of the script.)" + wxMessageBox("Spell checker found no errors." + s, "Results", + wxOK, mainFrame) + + return + + dlg = spellcheckdlg.SpellCheckDlg(mainFrame, self, sc, gd.scDict) + dlg.ShowModal() + + if dlg.didReplaces: + self.sp.reformatAll() + self.makeLineVisible(self.sp.line) + + if dlg.changedGlobalDict: + gd.saveScDict() + + dlg.Destroy() + + self.searchLine = -1 + self.searchColumn = -1 self.searchWidth = -1 self.updateScreen() @@ -1378,6 +1446,8 @@ class MyFrame(wxFrame): tmp.AppendSeparator() tmp.Append(ID_SETTINGS_LOAD, "Load...") tmp.Append(ID_SETTINGS_SAVE_AS, "Save as...") + tmp.AppendSeparator() + tmp.Append(ID_SETTINGS_SC_DICT, "&Spell checker dictionary...") fileMenu.AppendMenu(ID_FILE_SETTINGS, "Se&ttings", tmp) fileMenu.AppendSeparator() @@ -1428,6 +1498,7 @@ class MyFrame(wxFrame): scriptMenu.Append(ID_SCRIPT_HEADERS, "&Headers...") scriptMenu.Append(ID_SCRIPT_LOCATIONS, "&Locations...") scriptMenu.Append(ID_SCRIPT_TITLES, "&Title pages...") + scriptMenu.Append(ID_SCRIPT_SC_DICT, "&Spell checker dictionary...") scriptMenu.AppendSeparator() tmp = wxMenu() @@ -1446,6 +1517,7 @@ class MyFrame(wxFrame): reportsMenu.Append(ID_REPORTS_DIALOGUE_CHART, "&Dialogue chart...") toolsMenu = wxMenu() + toolsMenu.Append(ID_TOOLS_SPELL_CHECK, "&Spell checker...") toolsMenu.Append(ID_TOOLS_NAME_DB, "&Name database...") toolsMenu.Append(ID_TOOLS_CHARMAP, "&Character map...") toolsMenu.Append(ID_TOOLS_COMPARE_SCRIPTS, "C&ompare scripts...") @@ -1534,6 +1606,7 @@ class MyFrame(wxFrame): EVT_MENU(self, ID_SETTINGS_CHANGE, self.OnSettings) EVT_MENU(self, ID_SETTINGS_LOAD, self.OnLoadSettings) EVT_MENU(self, ID_SETTINGS_SAVE_AS, self.OnSaveSettingsAs) + EVT_MENU(self, ID_SETTINGS_SC_DICT, self.OnSpellCheckerDictionaryDlg) EVT_MENU(self, ID_FILE_EXIT, self.OnExit) EVT_MENU(self, ID_EDIT_CUT, self.OnCut) EVT_MENU(self, ID_EDIT_COPY, self.OnCopy) @@ -1555,6 +1628,8 @@ class MyFrame(wxFrame): EVT_MENU(self, ID_SCRIPT_HEADERS, self.OnHeadersDlg) EVT_MENU(self, ID_SCRIPT_LOCATIONS, self.OnLocationsDlg) EVT_MENU(self, ID_SCRIPT_TITLES, self.OnTitlesDlg) + EVT_MENU(self, ID_SCRIPT_SC_DICT, + self.OnSpellCheckerScriptDictionaryDlg) EVT_MENU(self, ID_SCRIPT_SETTINGS_CHANGE, self.OnScriptSettings) EVT_MENU(self, ID_SCRIPT_SETTINGS_LOAD, self.OnLoadScriptSettings) EVT_MENU(self, ID_SCRIPT_SETTINGS_SAVE_AS, self.OnSaveScriptSettingsAs) @@ -1563,6 +1638,7 @@ class MyFrame(wxFrame): EVT_MENU(self, ID_REPORTS_SCRIPT_REP, self.OnReportScript) EVT_MENU(self, ID_REPORTS_LOCATION_REP, self.OnReportLocation) EVT_MENU(self, ID_REPORTS_SCENE_REP, self.OnReportScene) + EVT_MENU(self, ID_TOOLS_SPELL_CHECK, self.OnSpellCheckerDlg) EVT_MENU(self, ID_TOOLS_NAME_DB, self.OnNameDatabase) EVT_MENU(self, ID_TOOLS_CHARMAP, self.OnCharacterMap) EVT_MENU(self, ID_TOOLS_COMPARE_SCRIPTS, self.OnCompareScripts) @@ -1637,6 +1713,7 @@ class MyFrame(wxFrame): "ID_SCRIPT_HEADERS", "ID_SCRIPT_LOCATIONS", "ID_SCRIPT_PAGINATE", + "ID_SCRIPT_SC_DICT", "ID_SCRIPT_SETTINGS", "ID_SCRIPT_SETTINGS_CHANGE", "ID_SCRIPT_SETTINGS_LOAD", @@ -1645,9 +1722,11 @@ class MyFrame(wxFrame): "ID_SETTINGS_CHANGE", "ID_SETTINGS_LOAD", "ID_SETTINGS_SAVE_AS", + "ID_SETTINGS_SC_DICT", "ID_TOOLS_CHARMAP", "ID_TOOLS_COMPARE_SCRIPTS", "ID_TOOLS_NAME_DB", + "ID_TOOLS_SPELL_CHECK", "ID_VIEW_SHOW_FORMATTING", "ID_VIEW_STYLE_DRAFT", "ID_VIEW_STYLE_LAYOUT", @@ -1951,6 +2030,19 @@ class MyFrame(wxFrame): def OnLocationsDlg(self, event = None): self.panel.ctrl.OnLocationsDlg() + def OnSpellCheckerDictionaryDlg(self, event = None): + dlg = spellcheckcfgdlg.SCDictDlg(self, copy.deepcopy(gd.scDict), + True) + + if dlg.ShowModal() == wxID_OK: + gd.scDict = dlg.scDict + gd.saveScDict() + + dlg.Destroy() + + def OnSpellCheckerScriptDictionaryDlg(self, event = None): + self.panel.ctrl.OnSpellCheckerScriptDictionaryDlg() + def OnScriptSettings(self, event = None): self.panel.ctrl.OnScriptSettings() @@ -2001,6 +2093,9 @@ class MyFrame(wxFrame): def OnReportScript(self, event = None): self.panel.ctrl.OnReportScript() + def OnSpellCheckerDlg(self, event = None): + self.panel.ctrl.OnSpellCheckerDlg() + def OnNameDatabase(self, event = None): if not hasattr(self, "names"): self.statusBar.SetStatusText("Opening name database...", 1) @@ -2173,8 +2268,14 @@ class MyApp(wxApp): if s: gd.cvars.load(gd.cvars.makeVals(s), "", gd) - + gd.setViewMode(gd.viewMode) + + if util.fileExists(gd.scDictFilename): + s = util.fromUTF8(util.loadFile(gd.scDictFilename, None)) + + if s: + gd.scDict.load(s) mainFrame = MyFrame(NULL, -1, "Blyte") bugreport.mainFrame = mainFrame blyte.py @@ -740,7 +740,19 @@ class ConfigGlobal: [util.Key(WXK_SPACE, ctrl = True).toInt()]), Command("Settings", "Change global settings.", isMenu = True), + + Command("SpellCheckerDlg","Spell check the script.", + [util.Key(WXK_F8).toInt()], isMenu = True), + Command("SpellCheckerDictionaryDlg", + "Open the global spell checker dictionary dialog.", + isMenu = True), + + Command("SpellCheckerScriptDictionaryDlg", + "Open the script-specific spell checker dictionary" + " dialog.", + isMenu = True), + Command("Tab", "Change current element to the next style or" " create a new element.", [WXK_TAB], isFixed = True), config.py @@ -3,7 +3,7 @@ a single byte 0x0A. The file is encoded in UTF-8, and begins with the Unicode byte order mark (BOM), i.e. the bytes "EF BB BF". After the BOM, the first line contains "#Version x", where x is the -file format number, currently either 1 or 2. +file format number, currently either 1, 2 or 3. If file format is 2, configuration sections come next. They are of the form "#Begin-X ", [lines belonging to X], "#End-X ". Each line in the @@ -97,11 +97,18 @@ The following config sections exists and appear in the file in this order: Underlined: (boolean): Whether to underline text. + Locations: Locations (list of lists of strings): Each inner list lists scene names to treat as the same location. + + Spell-Checker-Dict: + + Words (list of strings): Script-specific spell checker dictionary. + + After this (in version 1 files after "#Version 1") there is more configuration, but in a different syntax, that is mostly due to historical accidents. @@ -168,8 +175,12 @@ pages exist yet, creates one. Example: "Header-Empty-Lines". Value: integer >= 0. If there are header lines, this is the number of empty lines between headers and actual script contents. +If file format is >= 3, between the config data and the actual script data +is a "#Start-Script " line. With it, config sections can be added without +increasing the file format version number, as unknown config parts can be +skipped. -After that, the actual script starts. Each line has two bytes at the +After the above, the actual script starts. Each line has two bytes at the beginning that signal the type of linebreak at the end of that line and the general type of the line, and everything after that is the text of the line. fileformat.txt @@ -1,4 +1,4 @@ -#Version 2 +#Version 3 #Begin-Auto-Completion AutoCompletion/Scene/Enabled:True AutoCompletion/Scene/Items:0 @@ -135,6 +135,10 @@ Element/Note/Export/Underlined:False #Begin-Locations Locations:0 #End-Locations +#Begin-Spell-Checker-Dict +Words:1 +Words/1:pilots' +#End-Spell-Checker-Dict #Title-String 0.000000,80.000000,32,cb,Times,,THE KOALA INCIDENT #Title-String 0.000000,100.000000,12,c,Courier,,by #Title-String 0.000000,108.470000,12,c,Courier,,Anonymous Person @@ -142,6 +146,7 @@ Locations:0 #Title-String 160.000000,208.000000,12,c,Courier,,All rights reserved. #Header-String 1,0,r,,${PAGE}. #Header-Empty-Lines 1 +#Start-Script .\ext. stonehenge - night ..SUPER: "STONEHENGE - 00:30" >.A blizzard rages. Snow is everywhere and visibility is sample.blyte @@ -23,6 +23,7 @@ import locations import mypager import pdf import pml +import spellcheck import titles import util @@ -40,7 +41,8 @@ class Screenplay: self.headers = headers.Headers() self.locations = locations.Locations() self.titles = titles.Titles() - + self.scDict = spellcheck.Dict() + self.lines = [ Line(LB_LAST, SCENE) ] self.cfgGl = cfgGl @@ -110,6 +112,7 @@ class Screenplay: sp.headers = copy.deepcopy(self.headers) sp.locations = copy.deepcopy(self.locations) sp.titles = copy.deepcopy(self.titles) + sp.scDict = copy.deepcopy(self.scDict) # remove the dummy empty line sp.lines = [] @@ -126,7 +129,7 @@ class Screenplay: output = util.String() output += codecs.BOM_UTF8 - output += "#Version 2\n" + output += "#Version 3\n" output += "#Begin-Auto-Completion \n" output += util.toUTF8(self.autoCompletion.save()) @@ -139,6 +142,10 @@ class Screenplay: output += "#Begin-Locations \n" output += util.toUTF8(self.locations.save()) output += "#End-Locations \n" + + output += "#Begin-Spell-Checker-Dict \n" + output += util.toUTF8(self.scDict.save()) + output += "#End-Spell-Checker-Dict \n" pgs = self.titles.pages for pg in xrange(len(pgs)): @@ -152,6 +159,8 @@ class Screenplay: output += "#Header-String %s\n" % util.toUTF8(str(h)) output += "#Header-Empty-Lines %d\n" % self.headers.emptyLinesAfter + + output += "#Start-Script \n" for i in xrange(len(self.lines)): output += util.toUTF8(str(self.lines[i]) + "\n") @@ -208,11 +217,13 @@ class Screenplay: raise error.MiscError("File doesn't seem to be a proper\n" "screenplay file.") - if version not in ("1", "2"): + if version not in ("1", "2", "3"): raise error.MiscError("File uses fileformat version '%s',\n" "which is not supported by this version\n" "of the program." % version) + version = int(version) + # current position at 'lines' index = 1 @@ -228,6 +239,11 @@ class Screenplay: if s: sp.locations.load(s) + s, index = Screenplay.getConfigPart(lines, "Spell-Checker-Dict", + index) + if s: + sp.scDict.load(s) + # used to keep track that element type only changes after a # LB_LAST line. prevType = None @@ -241,6 +257,10 @@ class Screenplay: # did we encounter unknown config lines unknownConfigs = False + # have we seen the Start-Script line. defaults to True in old + # files which didn't have it. + startSeen = version < 3 + for i in xrange(index, len(lines)): s = lines[i] @@ -272,10 +292,18 @@ class Screenplay: elif key == "Header-Empty-Lines": sp.headers.emptyLinesAfter = util.str2int(val, 1, 0, 5) + elif key == "Start-Script": + startSeen = True + else: unknownConfigs = True else: + if not startSeen: + unknownConfigs = True + + continue + lb = config.char2lb(s[0], False) lt = config.char2lt(s[1], False) text = s[2:] @@ -302,6 +330,9 @@ class Screenplay: else: prevType = None + if not startSeen: + raise error.MiscError("Start-Script line not found.") + if len(sp.lines) == 0: raise error.MiscError("File doesn't contain any screenplay" " lines.") @@ -1389,6 +1420,60 @@ class Screenplay: return names + # return a dictionary of all character names (single-line text + # elements only, lower-cased, values = None). + def getCharacterNames(self): + names = {} + + ul = util.lower + + for ln in self.lines: + if (ln.lt == CHARACTER) and (ln.lb == LB_LAST): + names[ul(ln.text)] = None + + return names + + # get next word, starting at (line, col). line must be valid, but col + # can point after the line's length, in which case the search starts + # at (line + 1, 0). returns (word, line, col), where word is None if + # at end of script, and (line, col) point to the start of the word. + # note that this only handles words that are on a single line. + def getWord(self, line, col): + ls = self.lines + + while 1: + if ((line < 0) or (line >= len(ls))): + return (None, 0, 0) + + s = ls[line].text + + if col >= len(s): + line += 1 + col = 0 + + continue + + ch = s[col : col + 1] + + if not util.isWordBoundary(ch): + word = ch + startCol = col + col += 1 + + while col < len(s): + ch = s[col : col + 1] + + if util.isWordBoundary(ch): + break + + word += ch + col += 1 + + return (word, line, startCol) + + else: + col += 1 + # returns True if we're at second-to-last character of PAREN element, # and last character is ")" def isAtEndOfParen(self): screenplay.py d63872bcecbb5ddac16dd3d5687d82623158216a Osku Salerma osku@iki.fi http://github.com/oskusalerma/blyte/commit/093095d6dbf7fb6d0a446433a9954e098bf32ea2 093095d6dbf7fb6d0a446433a9954e098bf32ea2 2005-10-04T09:14:39-07:00 2005-10-04T09:14:39-07:00 Add spell checker. Fixes #22. 9246a0608b52c8d3c2dcbb971567862e6fb463ca Osku Salerma osku@iki.fi