eric: changeset 6866:b792455b35cd

--- a/APIs/Python3/eric6.api	Sat Mar 16 20:12:03 2019 +0100
+++ b/APIs/Python3/eric6.api	Sat Mar 16 20:14:21 2019 +0100
@@ -7396,22 +7396,28 @@
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.FAMILYONLY?7
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.FONT?7
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.SIZEONLY?7
+eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.StyleRole?7
+eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.SubstyleRole?7
+eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_addSubstyleButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_allDefaultButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_allEolFillButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_backgroundButton_clicked?4()
+eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_copySubstyleButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_defaultButton_clicked?4()
-eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_eolfillCheckBox_toggled?4(on)
+eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked?4()
+eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_editSubstyleButton_clicked?4()
+eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_eolfillCheckBox_clicked?4(on)
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_exportAllButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_exportCurrentButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_foregroundButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_importAllButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_importCurrentButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_lexerLanguageComboBox_activated?4(language)
-eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_styleElementList_currentRowChanged?4(index)
+eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_styleElementList_currentItemChanged?4(current, previous)
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.save?4()
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.saveState?4()
-eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.setFont?4(style, familyOnly, sizeOnly)
+eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.setFont?4(style, substyle, familyOnly, sizeOnly)
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.setSampleFont?4(familyOnly, sizeOnly)
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.setState?4(state)
 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage?1(lexers)
@@ -7642,20 +7648,31 @@
 eric6.Preferences.MouseClickDialog.MouseClickDialog.getClick?4()
 eric6.Preferences.MouseClickDialog.MouseClickDialog.on_clearButton_clicked?4()
 eric6.Preferences.MouseClickDialog.MouseClickDialog?1(modifiers, button, parent=None)
-eric6.Preferences.PreferencesLexer.PreferencesLexer.color?4(style)
-eric6.Preferences.PreferencesLexer.PreferencesLexer.defaulEolFill?4(style)
-eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultColor?4(style)
-eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultFont?4(style)
-eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultPaper?4(style)
-eric6.Preferences.PreferencesLexer.PreferencesLexer.description?4(style)
-eric6.Preferences.PreferencesLexer.PreferencesLexer.eolFill?4(style)
-eric6.Preferences.PreferencesLexer.PreferencesLexer.font?4(style)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.addSubstyle?4(style)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.color?4(style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultColor?4(style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultDescription?4(style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultEolFill?4(style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultFont?4(style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultPaper?4(style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultWords?4(style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.delSubstyle?4(style, substyle)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.description?4(style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.eolFill?4(style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.font?4(style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.getStyles?4()
+eric6.Preferences.PreferencesLexer.PreferencesLexer.hasStyle?4(style, substyle)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.isBaseStyle?4(style)
 eric6.Preferences.PreferencesLexer.PreferencesLexer.language?4()
-eric6.Preferences.PreferencesLexer.PreferencesLexer.paper?4(style)
-eric6.Preferences.PreferencesLexer.PreferencesLexer.setColor?4(c, style)
-eric6.Preferences.PreferencesLexer.PreferencesLexer.setEolFill?4(eolfill, style)
-eric6.Preferences.PreferencesLexer.PreferencesLexer.setFont?4(f, style)
-eric6.Preferences.PreferencesLexer.PreferencesLexer.setPaper?4(c, style)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.paper?4(style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.setColor?4(c, style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.setDescription?4(description, style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.setEolFill?4(eolfill, style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.setFont?4(f, style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.setPaper?4(c, style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.setWords?4(words, style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.words?4(style, substyle=-1)
+eric6.Preferences.PreferencesLexer.PreferencesLexer.writeSettings?4()
 eric6.Preferences.PreferencesLexer.PreferencesLexer?1(language, parent=None)
 eric6.Preferences.PreferencesLexer.PreferencesLexerError?1()
 eric6.Preferences.PreferencesLexer.PreferencesLexerLanguageError?1(language)
@@ -7730,6 +7747,12 @@
 eric6.Preferences.ShortcutsDialog.ShortcutsDialog.populate?4(helpViewer=None)
 eric6.Preferences.ShortcutsDialog.ShortcutsDialog.updateShortcuts?7
 eric6.Preferences.ShortcutsDialog.ShortcutsDialog?1(parent=None)
+eric6.Preferences.SubstyleDefinitionDialog.SubstyleDefinitionDialog.getData?4()
+eric6.Preferences.SubstyleDefinitionDialog.SubstyleDefinitionDialog.on_defaultButton_clicked?4()
+eric6.Preferences.SubstyleDefinitionDialog.SubstyleDefinitionDialog.on_descriptionEdit_textChanged?4(txt)
+eric6.Preferences.SubstyleDefinitionDialog.SubstyleDefinitionDialog.on_resetButton_clicked?4()
+eric6.Preferences.SubstyleDefinitionDialog.SubstyleDefinitionDialog.on_wordsEdit_textChanged?4()
+eric6.Preferences.SubstyleDefinitionDialog.SubstyleDefinitionDialog?1(lexer, style, substyle, parent=None)
 eric6.Preferences.ToolConfigurationDialog.ToolConfigurationDialog.getToollist?4()
 eric6.Preferences.ToolConfigurationDialog.ToolConfigurationDialog.on_addButton_clicked?4()
 eric6.Preferences.ToolConfigurationDialog.ToolConfigurationDialog.on_argumentsEdit_textChanged?4(text)
@@ -8715,6 +8738,7 @@
 eric6.QScintilla.Lexers.Lexer.Lexer.canStreamComment?4()
 eric6.QScintilla.Lexers.Lexer.Lexer.commentStr?4()
 eric6.QScintilla.Lexers.Lexer.Lexer.hasSmartIndent?4()
+eric6.QScintilla.Lexers.Lexer.Lexer.hasSubstyles?4()
 eric6.QScintilla.Lexers.Lexer.Lexer.initProperties?4()
 eric6.QScintilla.Lexers.Lexer.Lexer.isCommentStyle?4(style)
 eric6.QScintilla.Lexers.Lexer.Lexer.isStringStyle?4(style)
@@ -8996,6 +9020,36 @@
 eric6.QScintilla.Lexers.LexerYAML.LexerYAML.isCommentStyle?4(style)
 eric6.QScintilla.Lexers.LexerYAML.LexerYAML.isStringStyle?4(style)
 eric6.QScintilla.Lexers.LexerYAML.LexerYAML?1(parent=None)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.addSubstyle?4(style)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.delSubstyle?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.getBaseStyles?4()
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.hasSubstyle?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.hasSubstyles?4()
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.isBaseStyle?4(style)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.loadDefaultSubStyles?4()
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.loadSubstyles?4()
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.readSubstyles?4(editor)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.setSubstyleColor?4(color, style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.setSubstyleDescription?4(description, style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.setSubstyleEolFill?4(eolFill, style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.setSubstyleFont?4(font, style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.setSubstylePaper?4(color, style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.setSubstyleWords?4(words, style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleColor?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDefaultColor?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDefaultDescription?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDefaultEolFill?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDefaultFont?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDefaultPaper?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDefaultWords?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDescription?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleEolFill?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleFont?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substylePaper?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleWords?4(style, substyle)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substylesCount?4(style)
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.writeSubstyles?4()
+eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer?1()
 eric6.QScintilla.Lexers.getDefaultLexerAssociations?4()
 eric6.QScintilla.Lexers.getLanguageIcon?4(language, pixmap)
 eric6.QScintilla.Lexers.getLexer?4(language, parent=None, pyname="")
@@ -9182,7 +9236,8 @@
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.extendSelectionToEOL?4()
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.extendSelectionWordLeft?4()
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.extendSelectionWordRight?4()
-eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findFirstTarget?4(expr_, re_, cs_, wo_, begline=-1, begindex=-1, endline=-1, endindex=-1, ws_=False)
+eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findFirst?4(expression, regexp, caseSensitive, word, wrap, forward=True, line=-1, index=-1, show=True, posix=False, cxx11=False)
+eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findFirstTarget?4(expr_, re_, cs_, wo_, begline=-1, begindex=-1, endline=-1, endindex=-1, ws_=False, posix=False, cxx11=False)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findNextTarget?4()
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.flashFindIndicator?4(sline, sindex, eline, eindex)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.focusOutEvent?4(event)
@@ -9251,6 +9306,7 @@
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setRectangularSelection?4(startLine, startIndex, endLine, endIndex)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setStyling?4(length, style)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setVirtualSpaceOptions?4(options)
+eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setWrapStartIndent?4(indent)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showFindIndicator?4(sline, sindex, eline, eindex)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showUserList?4(listId, lst)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.startStyling?4(pos, mask)
--- a/APIs/Python3/eric6.bas	Sat Mar 16 20:12:03 2019 +0100
+++ b/APIs/Python3/eric6.bas	Sat Mar 16 20:14:21 2019 +0100
@@ -558,7 +558,7 @@
 LexerBash Lexer QsciLexerBash
 LexerBatch Lexer QsciLexerBatch
 LexerCMake Lexer QsciLexerCMake
-LexerCPP Lexer QsciLexerCPP
+LexerCPP QsciLexerCPP SubstyledLexer
 LexerCSS Lexer QsciLexerCSS
 LexerCSharp Lexer QsciLexerCSharp
 LexerCoffeeScript Lexer QsciLexerCoffeeScript
@@ -584,7 +584,7 @@
 LexerPostScript Lexer QsciLexerPostScript
 LexerProperties Lexer QsciLexerProperties
 LexerPygments LexerContainer
-LexerPython Lexer QsciLexerPython
+LexerPython QsciLexerPython SubstyledLexer
 LexerQSS Lexer QsciLexerCSS
 LexerRuby Lexer QsciLexerRuby
 LexerSQL Lexer QsciLexerSQL
@@ -705,7 +705,7 @@
 PluginUninstallWidget QWidget Ui_PluginUninstallDialog
 PluginUninstallWindow E5MainWindow
 PluginWizardDialog QDialog Ui_PluginWizardDialog
-PreferencesLexer QsciLexer
+PreferencesLexer QObject
 PreferencesLexerError Exception
 PreferencesLexerLanguageError PreferencesLexerError
 PreviewProcessingThread QThread
@@ -863,6 +863,8 @@
 StatusMonitorLedWidget QWidget
 Strip HgExtension
 StripProjectHelper HgExtensionProjectHelper
+SubstyleDefinitionDialog QDialog Ui_SubstyleDefinitionDialog
+SubstyledLexer Lexer
 Subversion VersionControl
 SubversionPage ConfigurationPageBase Ui_SubversionPage
 SvgDiagram E5MainWindow
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Sat Mar 16 20:12:03 2019 +0100
+++ b/Documentation/Help/source.qhp	Sat Mar 16 20:14:21 2019 +0100
@@ -970,6 +970,7 @@
             <section title="eric6.Preferences.ShortcutDialog" ref="eric6.Preferences.ShortcutDialog.html" />
             <section title="eric6.Preferences.Shortcuts" ref="eric6.Preferences.Shortcuts.html" />
             <section title="eric6.Preferences.ShortcutsDialog" ref="eric6.Preferences.ShortcutsDialog.html" />
+            <section title="eric6.Preferences.SubstyleDefinitionDialog" ref="eric6.Preferences.SubstyleDefinitionDialog.html" />
             <section title="eric6.Preferences.ToolConfigurationDialog" ref="eric6.Preferences.ToolConfigurationDialog.html" />
             <section title="eric6.Preferences.ToolGroupConfigurationDialog" ref="eric6.Preferences.ToolGroupConfigurationDialog.html" />
             <section title="eric6.Preferences.ViewProfileDialog" ref="eric6.Preferences.ViewProfileDialog.html" />
@@ -1064,6 +1065,7 @@
               <section title="eric6.QScintilla.Lexers.LexerVHDL" ref="eric6.QScintilla.Lexers.LexerVHDL.html" />
               <section title="eric6.QScintilla.Lexers.LexerXML" ref="eric6.QScintilla.Lexers.LexerXML.html" />
               <section title="eric6.QScintilla.Lexers.LexerYAML" ref="eric6.QScintilla.Lexers.LexerYAML.html" />
+              <section title="eric6.QScintilla.Lexers.SubstyledLexer" ref="eric6.QScintilla.Lexers.SubstyledLexer.html" />
               <section title="eric6.QScintilla.Lexers.__init__" ref="eric6.QScintilla.Lexers.__init__.html" />
             </section>
             <section title="eric6.QScintilla.MarkupProviders" ref="index-eric6.QScintilla.MarkupProviders.html">
@@ -5829,24 +5831,31 @@
       <keyword name="EditorHighlightingStylesPage (Module)" id="EditorHighlightingStylesPage (Module)" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html" />
       <keyword name="EditorHighlightingStylesPage.__allFontsButtonMenuTriggered" id="EditorHighlightingStylesPage.__allFontsButtonMenuTriggered" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__allFontsButtonMenuTriggered" />
       <keyword name="EditorHighlightingStylesPage.__changeFont" id="EditorHighlightingStylesPage.__changeFont" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__changeFont" />
+      <keyword name="EditorHighlightingStylesPage.__currentStyles" id="EditorHighlightingStylesPage.__currentStyles" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__currentStyles" />
       <keyword name="EditorHighlightingStylesPage.__exportStyles" id="EditorHighlightingStylesPage.__exportStyles" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__exportStyles" />
       <keyword name="EditorHighlightingStylesPage.__fontButtonMenuTriggered" id="EditorHighlightingStylesPage.__fontButtonMenuTriggered" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__fontButtonMenuTriggered" />
       <keyword name="EditorHighlightingStylesPage.__importStyles" id="EditorHighlightingStylesPage.__importStyles" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__importStyles" />
       <keyword name="EditorHighlightingStylesPage.__setToDefault" id="EditorHighlightingStylesPage.__setToDefault" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__setToDefault" />
       <keyword name="EditorHighlightingStylesPage.__styleAllItems" id="EditorHighlightingStylesPage.__styleAllItems" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__styleAllItems" />
+      <keyword name="EditorHighlightingStylesPage.__styleOneItem" id="EditorHighlightingStylesPage.__styleOneItem" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__styleOneItem" />
+      <keyword name="EditorHighlightingStylesPage.__stylesForItem" id="EditorHighlightingStylesPage.__stylesForItem" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__stylesForItem" />
+      <keyword name="EditorHighlightingStylesPage.on_addSubstyleButton_clicked" id="EditorHighlightingStylesPage.on_addSubstyleButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_addSubstyleButton_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" id="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_allDefaultButton_clicked" id="EditorHighlightingStylesPage.on_allDefaultButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_allDefaultButton_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_allEolFillButton_clicked" id="EditorHighlightingStylesPage.on_allEolFillButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_allEolFillButton_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_backgroundButton_clicked" id="EditorHighlightingStylesPage.on_backgroundButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_backgroundButton_clicked" />
+      <keyword name="EditorHighlightingStylesPage.on_copySubstyleButton_clicked" id="EditorHighlightingStylesPage.on_copySubstyleButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_copySubstyleButton_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_defaultButton_clicked" id="EditorHighlightingStylesPage.on_defaultButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_defaultButton_clicked" />
-      <keyword name="EditorHighlightingStylesPage.on_eolfillCheckBox_toggled" id="EditorHighlightingStylesPage.on_eolfillCheckBox_toggled" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_eolfillCheckBox_toggled" />
+      <keyword name="EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked" id="EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked" />
+      <keyword name="EditorHighlightingStylesPage.on_editSubstyleButton_clicked" id="EditorHighlightingStylesPage.on_editSubstyleButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_editSubstyleButton_clicked" />
+      <keyword name="EditorHighlightingStylesPage.on_eolfillCheckBox_clicked" id="EditorHighlightingStylesPage.on_eolfillCheckBox_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_eolfillCheckBox_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_exportAllButton_clicked" id="EditorHighlightingStylesPage.on_exportAllButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_exportAllButton_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_exportCurrentButton_clicked" id="EditorHighlightingStylesPage.on_exportCurrentButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_exportCurrentButton_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_foregroundButton_clicked" id="EditorHighlightingStylesPage.on_foregroundButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_foregroundButton_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_importAllButton_clicked" id="EditorHighlightingStylesPage.on_importAllButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_importAllButton_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_importCurrentButton_clicked" id="EditorHighlightingStylesPage.on_importCurrentButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_importCurrentButton_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_lexerLanguageComboBox_activated" id="EditorHighlightingStylesPage.on_lexerLanguageComboBox_activated" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_lexerLanguageComboBox_activated" />
-      <keyword name="EditorHighlightingStylesPage.on_styleElementList_currentRowChanged" id="EditorHighlightingStylesPage.on_styleElementList_currentRowChanged" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_styleElementList_currentRowChanged" />
+      <keyword name="EditorHighlightingStylesPage.on_styleElementList_currentItemChanged" id="EditorHighlightingStylesPage.on_styleElementList_currentItemChanged" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_styleElementList_currentItemChanged" />
       <keyword name="EditorHighlightingStylesPage.save" id="EditorHighlightingStylesPage.save" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.save" />
       <keyword name="EditorHighlightingStylesPage.saveState" id="EditorHighlightingStylesPage.saveState" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.saveState" />
       <keyword name="EditorHighlightingStylesPage.setFont" id="EditorHighlightingStylesPage.setFont" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.setFont" />
@@ -10698,6 +10707,7 @@
       <keyword name="Lexer.canStreamComment" id="Lexer.canStreamComment" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.canStreamComment" />
       <keyword name="Lexer.commentStr" id="Lexer.commentStr" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.commentStr" />
       <keyword name="Lexer.hasSmartIndent" id="Lexer.hasSmartIndent" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.hasSmartIndent" />
+      <keyword name="Lexer.hasSubstyles" id="Lexer.hasSubstyles" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.hasSubstyles" />
       <keyword name="Lexer.initProperties" id="Lexer.initProperties" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.initProperties" />
       <keyword name="Lexer.isCommentStyle" id="Lexer.isCommentStyle" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.isCommentStyle" />
       <keyword name="Lexer.isStringStyle" id="Lexer.isStringStyle" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.isStringStyle" />
@@ -12683,20 +12693,31 @@
       <keyword name="PreferencesLexer" id="PreferencesLexer" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer" />
       <keyword name="PreferencesLexer (Constructor)" id="PreferencesLexer (Constructor)" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.__init__" />
       <keyword name="PreferencesLexer (Module)" id="PreferencesLexer (Module)" ref="eric6.Preferences.PreferencesLexer.html" />
+      <keyword name="PreferencesLexer.addSubstyle" id="PreferencesLexer.addSubstyle" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.addSubstyle" />
       <keyword name="PreferencesLexer.color" id="PreferencesLexer.color" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.color" />
-      <keyword name="PreferencesLexer.defaulEolFill" id="PreferencesLexer.defaulEolFill" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaulEolFill" />
       <keyword name="PreferencesLexer.defaultColor" id="PreferencesLexer.defaultColor" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaultColor" />
+      <keyword name="PreferencesLexer.defaultDescription" id="PreferencesLexer.defaultDescription" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaultDescription" />
+      <keyword name="PreferencesLexer.defaultEolFill" id="PreferencesLexer.defaultEolFill" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaultEolFill" />
       <keyword name="PreferencesLexer.defaultFont" id="PreferencesLexer.defaultFont" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaultFont" />
       <keyword name="PreferencesLexer.defaultPaper" id="PreferencesLexer.defaultPaper" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaultPaper" />
+      <keyword name="PreferencesLexer.defaultWords" id="PreferencesLexer.defaultWords" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaultWords" />
+      <keyword name="PreferencesLexer.delSubstyle" id="PreferencesLexer.delSubstyle" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.delSubstyle" />
       <keyword name="PreferencesLexer.description" id="PreferencesLexer.description" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.description" />
       <keyword name="PreferencesLexer.eolFill" id="PreferencesLexer.eolFill" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.eolFill" />
       <keyword name="PreferencesLexer.font" id="PreferencesLexer.font" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.font" />
+      <keyword name="PreferencesLexer.getStyles" id="PreferencesLexer.getStyles" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.getStyles" />
+      <keyword name="PreferencesLexer.hasStyle" id="PreferencesLexer.hasStyle" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.hasStyle" />
+      <keyword name="PreferencesLexer.isBaseStyle" id="PreferencesLexer.isBaseStyle" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.isBaseStyle" />
       <keyword name="PreferencesLexer.language" id="PreferencesLexer.language" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.language" />
       <keyword name="PreferencesLexer.paper" id="PreferencesLexer.paper" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.paper" />
       <keyword name="PreferencesLexer.setColor" id="PreferencesLexer.setColor" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.setColor" />
+      <keyword name="PreferencesLexer.setDescription" id="PreferencesLexer.setDescription" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.setDescription" />
       <keyword name="PreferencesLexer.setEolFill" id="PreferencesLexer.setEolFill" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.setEolFill" />
       <keyword name="PreferencesLexer.setFont" id="PreferencesLexer.setFont" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.setFont" />
       <keyword name="PreferencesLexer.setPaper" id="PreferencesLexer.setPaper" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.setPaper" />
+      <keyword name="PreferencesLexer.setWords" id="PreferencesLexer.setWords" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.setWords" />
+      <keyword name="PreferencesLexer.words" id="PreferencesLexer.words" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.words" />
+      <keyword name="PreferencesLexer.writeSettings" id="PreferencesLexer.writeSettings" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.writeSettings" />
       <keyword name="PreferencesLexerError" id="PreferencesLexerError" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexerError" />
       <keyword name="PreferencesLexerError (Constructor)" id="PreferencesLexerError (Constructor)" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexerError.__init__" />
       <keyword name="PreferencesLexerError.__repr__" id="PreferencesLexerError.__repr__" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexerError.__repr__" />
@@ -13720,6 +13741,7 @@
       <keyword name="QsciScintillaCompat.extendSelectionToEOL" id="QsciScintillaCompat.extendSelectionToEOL" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.extendSelectionToEOL" />
       <keyword name="QsciScintillaCompat.extendSelectionWordLeft" id="QsciScintillaCompat.extendSelectionWordLeft" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.extendSelectionWordLeft" />
       <keyword name="QsciScintillaCompat.extendSelectionWordRight" id="QsciScintillaCompat.extendSelectionWordRight" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.extendSelectionWordRight" />
+      <keyword name="QsciScintillaCompat.findFirst" id="QsciScintillaCompat.findFirst" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.findFirst" />
       <keyword name="QsciScintillaCompat.findFirstTarget" id="QsciScintillaCompat.findFirstTarget" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.findFirstTarget" />
       <keyword name="QsciScintillaCompat.findNextTarget" id="QsciScintillaCompat.findNextTarget" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.findNextTarget" />
       <keyword name="QsciScintillaCompat.flashFindIndicator" id="QsciScintillaCompat.flashFindIndicator" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.flashFindIndicator" />
@@ -13789,6 +13811,7 @@
       <keyword name="QsciScintillaCompat.setRectangularSelection" id="QsciScintillaCompat.setRectangularSelection" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setRectangularSelection" />
       <keyword name="QsciScintillaCompat.setStyling" id="QsciScintillaCompat.setStyling" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setStyling" />
       <keyword name="QsciScintillaCompat.setVirtualSpaceOptions" id="QsciScintillaCompat.setVirtualSpaceOptions" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setVirtualSpaceOptions" />
+      <keyword name="QsciScintillaCompat.setWrapStartIndent" id="QsciScintillaCompat.setWrapStartIndent" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setWrapStartIndent" />
       <keyword name="QsciScintillaCompat.showFindIndicator" id="QsciScintillaCompat.showFindIndicator" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.showFindIndicator" />
       <keyword name="QsciScintillaCompat.showUserList" id="QsciScintillaCompat.showUserList" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.showUserList" />
       <keyword name="QsciScintillaCompat.startStyling" id="QsciScintillaCompat.startStyling" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.startStyling" />
@@ -15138,6 +15161,47 @@
       <keyword name="StyleGuide.init_report" id="StyleGuide.init_report" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.init_report" />
       <keyword name="StyleGuide.input_dir" id="StyleGuide.input_dir" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.input_dir" />
       <keyword name="StyleGuide.input_file" id="StyleGuide.input_file" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.input_file" />
+      <keyword name="SubstyleDefinitionDialog" id="SubstyleDefinitionDialog" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog" />
+      <keyword name="SubstyleDefinitionDialog (Constructor)" id="SubstyleDefinitionDialog (Constructor)" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.__init__" />
+      <keyword name="SubstyleDefinitionDialog (Module)" id="SubstyleDefinitionDialog (Module)" ref="eric6.Preferences.SubstyleDefinitionDialog.html" />
+      <keyword name="SubstyleDefinitionDialog.__updateOk" id="SubstyleDefinitionDialog.__updateOk" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.__updateOk" />
+      <keyword name="SubstyleDefinitionDialog.getData" id="SubstyleDefinitionDialog.getData" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.getData" />
+      <keyword name="SubstyleDefinitionDialog.on_defaultButton_clicked" id="SubstyleDefinitionDialog.on_defaultButton_clicked" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.on_defaultButton_clicked" />
+      <keyword name="SubstyleDefinitionDialog.on_descriptionEdit_textChanged" id="SubstyleDefinitionDialog.on_descriptionEdit_textChanged" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.on_descriptionEdit_textChanged" />
+      <keyword name="SubstyleDefinitionDialog.on_resetButton_clicked" id="SubstyleDefinitionDialog.on_resetButton_clicked" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.on_resetButton_clicked" />
+      <keyword name="SubstyleDefinitionDialog.on_wordsEdit_textChanged" id="SubstyleDefinitionDialog.on_wordsEdit_textChanged" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.on_wordsEdit_textChanged" />
+      <keyword name="SubstyledLexer" id="SubstyledLexer" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer" />
+      <keyword name="SubstyledLexer (Constructor)" id="SubstyledLexer (Constructor)" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.__init__" />
+      <keyword name="SubstyledLexer (Module)" id="SubstyledLexer (Module)" ref="eric6.QScintilla.Lexers.SubstyledLexer.html" />
+      <keyword name="SubstyledLexer.addSubstyle" id="SubstyledLexer.addSubstyle" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.addSubstyle" />
+      <keyword name="SubstyledLexer.delSubstyle" id="SubstyledLexer.delSubstyle" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.delSubstyle" />
+      <keyword name="SubstyledLexer.getBaseStyles" id="SubstyledLexer.getBaseStyles" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.getBaseStyles" />
+      <keyword name="SubstyledLexer.hasSubstyle" id="SubstyledLexer.hasSubstyle" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.hasSubstyle" />
+      <keyword name="SubstyledLexer.hasSubstyles" id="SubstyledLexer.hasSubstyles" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.hasSubstyles" />
+      <keyword name="SubstyledLexer.isBaseStyle" id="SubstyledLexer.isBaseStyle" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.isBaseStyle" />
+      <keyword name="SubstyledLexer.loadDefaultSubStyles" id="SubstyledLexer.loadDefaultSubStyles" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.loadDefaultSubStyles" />
+      <keyword name="SubstyledLexer.loadSubstyles" id="SubstyledLexer.loadSubstyles" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.loadSubstyles" />
+      <keyword name="SubstyledLexer.readSubstyles" id="SubstyledLexer.readSubstyles" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.readSubstyles" />
+      <keyword name="SubstyledLexer.setSubstyleColor" id="SubstyledLexer.setSubstyleColor" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.setSubstyleColor" />
+      <keyword name="SubstyledLexer.setSubstyleDescription" id="SubstyledLexer.setSubstyleDescription" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.setSubstyleDescription" />
+      <keyword name="SubstyledLexer.setSubstyleEolFill" id="SubstyledLexer.setSubstyleEolFill" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.setSubstyleEolFill" />
+      <keyword name="SubstyledLexer.setSubstyleFont" id="SubstyledLexer.setSubstyleFont" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.setSubstyleFont" />
+      <keyword name="SubstyledLexer.setSubstylePaper" id="SubstyledLexer.setSubstylePaper" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.setSubstylePaper" />
+      <keyword name="SubstyledLexer.setSubstyleWords" id="SubstyledLexer.setSubstyleWords" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.setSubstyleWords" />
+      <keyword name="SubstyledLexer.substyleColor" id="SubstyledLexer.substyleColor" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleColor" />
+      <keyword name="SubstyledLexer.substyleDefaultColor" id="SubstyledLexer.substyleDefaultColor" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDefaultColor" />
+      <keyword name="SubstyledLexer.substyleDefaultDescription" id="SubstyledLexer.substyleDefaultDescription" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDefaultDescription" />
+      <keyword name="SubstyledLexer.substyleDefaultEolFill" id="SubstyledLexer.substyleDefaultEolFill" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDefaultEolFill" />
+      <keyword name="SubstyledLexer.substyleDefaultFont" id="SubstyledLexer.substyleDefaultFont" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDefaultFont" />
+      <keyword name="SubstyledLexer.substyleDefaultPaper" id="SubstyledLexer.substyleDefaultPaper" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDefaultPaper" />
+      <keyword name="SubstyledLexer.substyleDefaultWords" id="SubstyledLexer.substyleDefaultWords" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDefaultWords" />
+      <keyword name="SubstyledLexer.substyleDescription" id="SubstyledLexer.substyleDescription" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDescription" />
+      <keyword name="SubstyledLexer.substyleEolFill" id="SubstyledLexer.substyleEolFill" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleEolFill" />
+      <keyword name="SubstyledLexer.substyleFont" id="SubstyledLexer.substyleFont" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleFont" />
+      <keyword name="SubstyledLexer.substylePaper" id="SubstyledLexer.substylePaper" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substylePaper" />
+      <keyword name="SubstyledLexer.substyleWords" id="SubstyledLexer.substyleWords" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleWords" />
+      <keyword name="SubstyledLexer.substylesCount" id="SubstyledLexer.substylesCount" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substylesCount" />
+      <keyword name="SubstyledLexer.writeSubstyles" id="SubstyledLexer.writeSubstyles" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.writeSubstyles" />
       <keyword name="Subversion" id="Subversion" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion" />
       <keyword name="Subversion" id="Subversion" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion" />
       <keyword name="Subversion (Constructor)" id="Subversion (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.__init__" />
@@ -20462,6 +20526,7 @@
       <file>eric6.Preferences.ShortcutDialog.html</file>
       <file>eric6.Preferences.Shortcuts.html</file>
       <file>eric6.Preferences.ShortcutsDialog.html</file>
+      <file>eric6.Preferences.SubstyleDefinitionDialog.html</file>
       <file>eric6.Preferences.ToolConfigurationDialog.html</file>
       <file>eric6.Preferences.ToolGroupConfigurationDialog.html</file>
       <file>eric6.Preferences.ViewProfileDialog.html</file>
@@ -20554,6 +20619,7 @@
       <file>eric6.QScintilla.Lexers.LexerVHDL.html</file>
       <file>eric6.QScintilla.Lexers.LexerXML.html</file>
       <file>eric6.QScintilla.Lexers.LexerYAML.html</file>
+      <file>eric6.QScintilla.Lexers.SubstyledLexer.html</file>
       <file>eric6.QScintilla.Lexers.__init__.html</file>
       <file>eric6.QScintilla.MarkupProviders.HtmlProvider.html</file>
       <file>eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html</file>
--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html	Sat Mar 16 20:12:03 2019 +0100
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html	Sat Mar 16 20:14:21 2019 +0100
@@ -51,7 +51,7 @@
 ConfigurationPageBase, Ui_EditorHighlightingStylesPage
 <h3>Class Attributes</h3>
 <table>
-<tr><td>FAMILYANDSIZE</td></tr><tr><td>FAMILYONLY</td></tr><tr><td>FONT</td></tr><tr><td>SIZEONLY</td></tr>
+<tr><td>FAMILYANDSIZE</td></tr><tr><td>FAMILYONLY</td></tr><tr><td>FONT</td></tr><tr><td>SIZEONLY</td></tr><tr><td>StyleRole</td></tr><tr><td>SubstyleRole</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -69,6 +69,9 @@
 <td><a href="#EditorHighlightingStylesPage.__changeFont">__changeFont</a></td>
 <td>Private slot to change the highlighter font.</td>
 </tr><tr>
+<td><a href="#EditorHighlightingStylesPage.__currentStyles">__currentStyles</a></td>
+<td>Private method to get the styles of the current item.</td>
+</tr><tr>
 <td><a href="#EditorHighlightingStylesPage.__exportStyles">__exportStyles</a></td>
 <td>Private method to export the styles of the given lexers.</td>
 </tr><tr>
@@ -84,6 +87,15 @@
 <td><a href="#EditorHighlightingStylesPage.__styleAllItems">__styleAllItems</a></td>
 <td>Private method to style all items of the style element list.</td>
 </tr><tr>
+<td><a href="#EditorHighlightingStylesPage.__styleOneItem">__styleOneItem</a></td>
+<td>Private method to style one item of the style element list.</td>
+</tr><tr>
+<td><a href="#EditorHighlightingStylesPage.__stylesForItem">__stylesForItem</a></td>
+<td>Private method to get the style and sub-style number of the given item.</td>
+</tr><tr>
+<td><a href="#EditorHighlightingStylesPage.on_addSubstyleButton_clicked">on_addSubstyleButton_clicked</a></td>
+<td>Private slot to add a new sub-style.</td>
+</tr><tr>
 <td><a href="#EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked">on_allBackgroundColoursButton_clicked</a></td>
 <td>Private method used to select the background colour of all styles of a selected lexer.</td>
 </tr><tr>
@@ -96,10 +108,19 @@
 <td><a href="#EditorHighlightingStylesPage.on_backgroundButton_clicked">on_backgroundButton_clicked</a></td>
 <td>Private method used to select the background colour of the selected style and lexer.</td>
 </tr><tr>
+<td><a href="#EditorHighlightingStylesPage.on_copySubstyleButton_clicked">on_copySubstyleButton_clicked</a></td>
+<td>Private slot to copy the selected sub-style.</td>
+</tr><tr>
 <td><a href="#EditorHighlightingStylesPage.on_defaultButton_clicked">on_defaultButton_clicked</a></td>
 <td>Private method to set the current style to its default values.</td>
 </tr><tr>
-<td><a href="#EditorHighlightingStylesPage.on_eolfillCheckBox_toggled">on_eolfillCheckBox_toggled</a></td>
+<td><a href="#EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked">on_deleteSubstyleButton_clicked</a></td>
+<td>Private slot to delete the selected sub-style.</td>
+</tr><tr>
+<td><a href="#EditorHighlightingStylesPage.on_editSubstyleButton_clicked">on_editSubstyleButton_clicked</a></td>
+<td>Private slot to edit the selected sub-style entry.</td>
+</tr><tr>
+<td><a href="#EditorHighlightingStylesPage.on_eolfillCheckBox_clicked">on_eolfillCheckBox_clicked</a></td>
 <td>Private method used to set the eolfill for the selected style and lexer.</td>
 </tr><tr>
 <td><a href="#EditorHighlightingStylesPage.on_exportAllButton_clicked">on_exportAllButton_clicked</a></td>
@@ -120,8 +141,8 @@
 <td><a href="#EditorHighlightingStylesPage.on_lexerLanguageComboBox_activated">on_lexerLanguageComboBox_activated</a></td>
 <td>Private slot to fill the style combo of the source page.</td>
 </tr><tr>
-<td><a href="#EditorHighlightingStylesPage.on_styleElementList_currentRowChanged">on_styleElementList_currentRowChanged</a></td>
-<td>Private method to set up the style element part of the source page.</td>
+<td><a href="#EditorHighlightingStylesPage.on_styleElementList_currentItemChanged">on_styleElementList_currentItemChanged</a></td>
+<td>Private method to handle a change of the current row.</td>
 </tr><tr>
 <td><a href="#EditorHighlightingStylesPage.save">save</a></td>
 <td>Public slot to save the Editor Highlighting Styles configuration.</td>
@@ -180,6 +201,21 @@
 <dd>
 flag indicating to set the font size only (boolean
 </dd>
+</dl><a NAME="EditorHighlightingStylesPage.__currentStyles" ID="EditorHighlightingStylesPage.__currentStyles"></a>
+<h4>EditorHighlightingStylesPage.__currentStyles</h4>
+<b>__currentStyles</b>(<i></i>)
+<p>
+        Private method to get the styles of the current item.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+tuple containing the style and sub-style numbers
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (int, int)
+</dd>
 </dl><a NAME="EditorHighlightingStylesPage.__exportStyles" ID="EditorHighlightingStylesPage.__exportStyles"></a>
 <h4>EditorHighlightingStylesPage.__exportStyles</h4>
 <b>__exportStyles</b>(<i>lexers</i>)
@@ -213,19 +249,63 @@
 </dd>
 </dl><a NAME="EditorHighlightingStylesPage.__setToDefault" ID="EditorHighlightingStylesPage.__setToDefault"></a>
 <h4>EditorHighlightingStylesPage.__setToDefault</h4>
-<b>__setToDefault</b>(<i>style</i>)
+<b>__setToDefault</b>(<i>style, substyle</i>)
 <p>
         Private method to set a specific style to its default values.
 </p><dl>
-<dt><i>style</i></dt>
+<dt><i>style</i> (int)</dt>
 <dd>
-style to be reset (integer)
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
 </dd>
 </dl><a NAME="EditorHighlightingStylesPage.__styleAllItems" ID="EditorHighlightingStylesPage.__styleAllItems"></a>
 <h4>EditorHighlightingStylesPage.__styleAllItems</h4>
 <b>__styleAllItems</b>(<i></i>)
 <p>
         Private method to style all items of the style element list.
+</p><a NAME="EditorHighlightingStylesPage.__styleOneItem" ID="EditorHighlightingStylesPage.__styleOneItem"></a>
+<h4>EditorHighlightingStylesPage.__styleOneItem</h4>
+<b>__styleOneItem</b>(<i>item, style, substyle</i>)
+<p>
+        Private method to style one item of the style element list.
+</p><dl>
+<dt><i>item</i> (QTreeWidgetItem)</dt>
+<dd>
+reference to the item to be styled
+</dd><dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><a NAME="EditorHighlightingStylesPage.__stylesForItem" ID="EditorHighlightingStylesPage.__stylesForItem"></a>
+<h4>EditorHighlightingStylesPage.__stylesForItem</h4>
+<b>__stylesForItem</b>(<i>itm</i>)
+<p>
+        Private method to get the style and sub-style number of the given item.
+</p><dl>
+<dt><i>itm</i> (QTreeWidgetItem)</dt>
+<dd>
+reference to the item to extract the styles from
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+tuple containing the style and sub-style numbers
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (int, int)
+</dd>
+</dl><a NAME="EditorHighlightingStylesPage.on_addSubstyleButton_clicked" ID="EditorHighlightingStylesPage.on_addSubstyleButton_clicked"></a>
+<h4>EditorHighlightingStylesPage.on_addSubstyleButton_clicked</h4>
+<b>on_addSubstyleButton_clicked</b>(<i></i>)
+<p>
+        Private slot to add a new sub-style.
 </p><a NAME="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" ID="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked"></a>
 <h4>EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked</h4>
 <b>on_allBackgroundColoursButton_clicked</b>(<i></i>)
@@ -249,14 +329,29 @@
 <p>
         Private method used to select the background colour of the selected
         style and lexer.
+</p><a NAME="EditorHighlightingStylesPage.on_copySubstyleButton_clicked" ID="EditorHighlightingStylesPage.on_copySubstyleButton_clicked"></a>
+<h4>EditorHighlightingStylesPage.on_copySubstyleButton_clicked</h4>
+<b>on_copySubstyleButton_clicked</b>(<i></i>)
+<p>
+        Private slot to copy the selected sub-style.
 </p><a NAME="EditorHighlightingStylesPage.on_defaultButton_clicked" ID="EditorHighlightingStylesPage.on_defaultButton_clicked"></a>
 <h4>EditorHighlightingStylesPage.on_defaultButton_clicked</h4>
 <b>on_defaultButton_clicked</b>(<i></i>)
 <p>
         Private method to set the current style to its default values.
-</p><a NAME="EditorHighlightingStylesPage.on_eolfillCheckBox_toggled" ID="EditorHighlightingStylesPage.on_eolfillCheckBox_toggled"></a>
-<h4>EditorHighlightingStylesPage.on_eolfillCheckBox_toggled</h4>
-<b>on_eolfillCheckBox_toggled</b>(<i>on</i>)
+</p><a NAME="EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked" ID="EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked"></a>
+<h4>EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked</h4>
+<b>on_deleteSubstyleButton_clicked</b>(<i></i>)
+<p>
+        Private slot to delete the selected sub-style.
+</p><a NAME="EditorHighlightingStylesPage.on_editSubstyleButton_clicked" ID="EditorHighlightingStylesPage.on_editSubstyleButton_clicked"></a>
+<h4>EditorHighlightingStylesPage.on_editSubstyleButton_clicked</h4>
+<b>on_editSubstyleButton_clicked</b>(<i></i>)
+<p>
+        Private slot to edit the selected sub-style entry.
+</p><a NAME="EditorHighlightingStylesPage.on_eolfillCheckBox_clicked" ID="EditorHighlightingStylesPage.on_eolfillCheckBox_clicked"></a>
+<h4>EditorHighlightingStylesPage.on_eolfillCheckBox_clicked</h4>
+<b>on_eolfillCheckBox_clicked</b>(<i>on</i>)
 <p>
         Private method used to set the eolfill for the selected style and
         lexer.
@@ -301,15 +396,18 @@
 <dd>
 The lexer language (string)
 </dd>
-</dl><a NAME="EditorHighlightingStylesPage.on_styleElementList_currentRowChanged" ID="EditorHighlightingStylesPage.on_styleElementList_currentRowChanged"></a>
-<h4>EditorHighlightingStylesPage.on_styleElementList_currentRowChanged</h4>
-<b>on_styleElementList_currentRowChanged</b>(<i>index</i>)
+</dl><a NAME="EditorHighlightingStylesPage.on_styleElementList_currentItemChanged" ID="EditorHighlightingStylesPage.on_styleElementList_currentItemChanged"></a>
+<h4>EditorHighlightingStylesPage.on_styleElementList_currentItemChanged</h4>
+<b>on_styleElementList_currentItemChanged</b>(<i>current, previous</i>)
 <p>
-        Private method to set up the style element part of the source page.
+        Private method to handle a change of the current row.
 </p><dl>
-<dt><i>index</i></dt>
+<dt><i>current</i> (QTreeWidgetItem)</dt>
 <dd>
-the style index.
+reference to the current item
+</dd><dt><i>previous</i> (QTreeWidgetItem)</dt>
+<dd>
+reference to the previous item
 </dd>
 </dl><a NAME="EditorHighlightingStylesPage.save" ID="EditorHighlightingStylesPage.save"></a>
 <h4>EditorHighlightingStylesPage.save</h4>
@@ -324,28 +422,36 @@
 </p><dl>
 <dt>Returns:</dt>
 <dd>
-array containing the index of the selected lexer language
-            (integer) and the index of the selected lexer entry (integer)
+list containing the index of the selected lexer language
+            and a tuple containing the index of the parent selected lexer
+            entry and the index of the selected entry
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+list of int and tuple of (int, int)
 </dd>
 </dl><a NAME="EditorHighlightingStylesPage.setFont" ID="EditorHighlightingStylesPage.setFont"></a>
 <h4>EditorHighlightingStylesPage.setFont</h4>
-<b>setFont</b>(<i>style, familyOnly, sizeOnly</i>)
+<b>setFont</b>(<i>style, substyle, familyOnly, sizeOnly</i>)
 <p>
             Local function to set the font.
 </p><dl>
-<dt><i>font</i></dt>
+<dt><i>font</i> (QFont)</dt>
+<dd>
+font to be set
+</dd><dt><i>style</i> (int)</dt>
 <dd>
-font to be set (QFont)
-</dd><dt><i>style</i></dt>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
 <dd>
-style to set the font for (integer)
-</dd><dt><i>familyOnly</i></dt>
+sub-style number
+</dd><dt><i>familyOnly</i> (bool)</dt>
 <dd>
 flag indicating to set the font family only
-                (boolean)
-</dd><dt><i>sizeOnly</i></dt>
+</dd><dt><i>sizeOnly</i> (bool)</dt>
 <dd>
-flag indicating to set the font size only (boolean
+flag indicating to set the font size only
 </dd>
 </dl><a NAME="EditorHighlightingStylesPage.setSampleFont" ID="EditorHighlightingStylesPage.setSampleFont"></a>
 <h4>EditorHighlightingStylesPage.setSampleFont</h4>
--- a/Documentation/Source/eric6.Preferences.PreferencesLexer.html	Sat Mar 16 20:12:03 2019 +0100
+++ b/Documentation/Source/eric6.Preferences.PreferencesLexer.html	Sat Mar 16 20:14:21 2019 +0100
@@ -21,7 +21,7 @@
 <body><a NAME="top" ID="top"></a>
 <h1>eric6.Preferences.PreferencesLexer</h1>
 <p>
-Module implementing a special QextScintilla lexer to handle the preferences.
+Module implementing a special QScintilla lexer to handle the preferences.
 </p>
 <h3>Global Attributes</h3>
 <table>
@@ -31,7 +31,7 @@
 <table>
 <tr>
 <td><a href="#PreferencesLexer">PreferencesLexer</a></td>
-<td>Subclass of QsciLexer to implement preferences specific lexer methods.</td>
+<td>Class implementing a Lexer facade for the highlighting styles configuration.</td>
 </tr><tr>
 <td><a href="#PreferencesLexerError">PreferencesLexerError</a></td>
 <td>Class defining a special error for the PreferencesLexer class.</td>
@@ -48,10 +48,11 @@
 <a NAME="PreferencesLexer" ID="PreferencesLexer"></a>
 <h2>PreferencesLexer</h2>
 <p>
-    Subclass of QsciLexer to implement preferences specific lexer methods.
+    Class implementing a Lexer facade for the highlighting styles
+    configuration.
 </p>
 <h3>Derived from</h3>
-QsciLexer
+QObject
 <h3>Class Attributes</h3>
 <table>
 <tr><td>None</td></tr>
@@ -66,14 +67,20 @@
 <td><a href="#PreferencesLexer.__init__">PreferencesLexer</a></td>
 <td>Constructor</td>
 </tr><tr>
-<td><a href="#PreferencesLexer.color">color</a></td>
-<td>Public method to get the colour of a style.</td>
+<td><a href="#PreferencesLexer.addSubstyle">addSubstyle</a></td>
+<td>Public method to add an empty sub-style to a given style.</td>
 </tr><tr>
-<td><a href="#PreferencesLexer.defaulEolFill">defaulEolFill</a></td>
-<td>Public method to get the default eolFill flag for a style.</td>
+<td><a href="#PreferencesLexer.color">color</a></td>
+<td>Public method to get the color of a style.</td>
 </tr><tr>
 <td><a href="#PreferencesLexer.defaultColor">defaultColor</a></td>
-<td>Public method to get the default colour of a style.</td>
+<td>Public method to get the default color of a style.</td>
+</tr><tr>
+<td><a href="#PreferencesLexer.defaultDescription">defaultDescription</a></td>
+<td>Public method to get the default descriptive string for a style.</td>
+</tr><tr>
+<td><a href="#PreferencesLexer.defaultEolFill">defaultEolFill</a></td>
+<td>Public method to get the default eolFill flag for a style.</td>
 </tr><tr>
 <td><a href="#PreferencesLexer.defaultFont">defaultFont</a></td>
 <td>Public method to get the default font for a style.</td>
@@ -81,6 +88,12 @@
 <td><a href="#PreferencesLexer.defaultPaper">defaultPaper</a></td>
 <td>Public method to get the default background for a style.</td>
 </tr><tr>
+<td><a href="#PreferencesLexer.defaultWords">defaultWords</a></td>
+<td>Public method to get the default list of words for a style.</td>
+</tr><tr>
+<td><a href="#PreferencesLexer.delSubstyle">delSubstyle</a></td>
+<td>Public method to delete a given sub-style definition.</td>
+</tr><tr>
 <td><a href="#PreferencesLexer.description">description</a></td>
 <td>Public method to get a descriptive string for a style.</td>
 </tr><tr>
@@ -90,6 +103,15 @@
 <td><a href="#PreferencesLexer.font">font</a></td>
 <td>Public method to get the font for a style.</td>
 </tr><tr>
+<td><a href="#PreferencesLexer.getStyles">getStyles</a></td>
+<td>Public method to get a list of all supported styles.</td>
+</tr><tr>
+<td><a href="#PreferencesLexer.hasStyle">hasStyle</a></td>
+<td>Public method to test for a given style definition.</td>
+</tr><tr>
+<td><a href="#PreferencesLexer.isBaseStyle">isBaseStyle</a></td>
+<td>Public method to test, if a given style may have sub-styles.</td>
+</tr><tr>
 <td><a href="#PreferencesLexer.language">language</a></td>
 <td>Public method to get the lexers programming language.</td>
 </tr><tr>
@@ -97,7 +119,10 @@
 <td>Public method to get the background for a style.</td>
 </tr><tr>
 <td><a href="#PreferencesLexer.setColor">setColor</a></td>
-<td>Public method to set the colour for a style.</td>
+<td>Public method to set the color for a style.</td>
+</tr><tr>
+<td><a href="#PreferencesLexer.setDescription">setDescription</a></td>
+<td>Public method to set a descriptive string for a style.</td>
 </tr><tr>
 <td><a href="#PreferencesLexer.setEolFill">setEolFill</a></td>
 <td>Public method to set the eolFill flag for a style.</td>
@@ -107,6 +132,15 @@
 </tr><tr>
 <td><a href="#PreferencesLexer.setPaper">setPaper</a></td>
 <td>Public method to set the background for a style.</td>
+</tr><tr>
+<td><a href="#PreferencesLexer.setWords">setWords</a></td>
+<td>Public method to set the list of words for a style.</td>
+</tr><tr>
+<td><a href="#PreferencesLexer.words">words</a></td>
+<td>Public method to get the list of words for a style.</td>
+</tr><tr>
+<td><a href="#PreferencesLexer.writeSettings">writeSettings</a></td>
+<td>Public method to write the lexer settings.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -119,12 +153,12 @@
 <p>
         Constructor
 </p><dl>
-<dt><i>language</i></dt>
+<dt><i>language</i> (str)</dt>
 <dd>
-The lexer language. (string)
+language of the lexer
 </dd><dt><i>parent</i></dt>
 <dd>
-The parent widget of this lexer. (QextScintilla)
+parent widget of this lexer (QWidget)
 </dd>
 </dl><dl>
 <dt>Raises <b>PreferencesLexerLanguageError</b>:</dt>
@@ -132,125 +166,332 @@
 raised to indicate an invalid
             lexer language
 </dd>
+</dl><a NAME="PreferencesLexer.addSubstyle" ID="PreferencesLexer.addSubstyle"></a>
+<h4>PreferencesLexer.addSubstyle</h4>
+<b>addSubstyle</b>(<i>style</i>)
+<p>
+        Public method to add an empty sub-style to a given style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+allocated sub-style number or -1 to indicate an error
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+int
+</dd>
 </dl><a NAME="PreferencesLexer.color" ID="PreferencesLexer.color"></a>
 <h4>PreferencesLexer.color</h4>
-<b>color</b>(<i>style</i>)
+<b>color</b>(<i>style, substyle=-1</i>)
 <p>
-        Public method to get the colour of a style.
+        Public method to get the color of a style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+color
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QColor
+</dd>
+</dl><a NAME="PreferencesLexer.defaultColor" ID="PreferencesLexer.defaultColor"></a>
+<h4>PreferencesLexer.defaultColor</h4>
+<b>defaultColor</b>(<i>style, substyle=-1</i>)
+<p>
+        Public method to get the default color of a style.
 </p><dl>
-<dt><i>style</i></dt>
+<dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+default color
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QColor
+</dd>
+</dl><a NAME="PreferencesLexer.defaultDescription" ID="PreferencesLexer.defaultDescription"></a>
+<h4>PreferencesLexer.defaultDescription</h4>
+<b>defaultDescription</b>(<i>style, substyle=-1</i>)
+<p>
+        Public method to get the default descriptive string for a style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
 <dd>
-the style number (int)
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+default description of the style
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl><a NAME="PreferencesLexer.defaultEolFill" ID="PreferencesLexer.defaultEolFill"></a>
+<h4>PreferencesLexer.defaultEolFill</h4>
+<b>defaultEolFill</b>(<i>style, substyle=-1</i>)
+<p>
+        Public method to get the default eolFill flag for a style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-colour
+default eolFill flag
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="PreferencesLexer.defaultFont" ID="PreferencesLexer.defaultFont"></a>
+<h4>PreferencesLexer.defaultFont</h4>
+<b>defaultFont</b>(<i>style, substyle=-1</i>)
+<p>
+        Public method to get the default font for a style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+default font
 </dd>
-</dl><a NAME="PreferencesLexer.defaulEolFill" ID="PreferencesLexer.defaulEolFill"></a>
-<h4>PreferencesLexer.defaulEolFill</h4>
-<b>defaulEolFill</b>(<i>style</i>)
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QFont
+</dd>
+</dl><a NAME="PreferencesLexer.defaultPaper" ID="PreferencesLexer.defaultPaper"></a>
+<h4>PreferencesLexer.defaultPaper</h4>
+<b>defaultPaper</b>(<i>style, substyle=-1</i>)
+<p>
+        Public method to get the default background for a style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+default background color
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QColor
+</dd>
+</dl><a NAME="PreferencesLexer.defaultWords" ID="PreferencesLexer.defaultWords"></a>
+<h4>PreferencesLexer.defaultWords</h4>
+<b>defaultWords</b>(<i>style, substyle=-1</i>)
 <p>
-        Public method to get the default eolFill flag for a style.
+        Public method to get the default list of words for a style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+whitespace separated default list of words
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl><a NAME="PreferencesLexer.delSubstyle" ID="PreferencesLexer.delSubstyle"></a>
+<h4>PreferencesLexer.delSubstyle</h4>
+<b>delSubstyle</b>(<i>style, substyle</i>)
+<p>
+        Public method to delete a given sub-style definition.
 </p><dl>
-<dt><i>style</i></dt>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating successful deletion
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="PreferencesLexer.description" ID="PreferencesLexer.description"></a>
+<h4>PreferencesLexer.description</h4>
+<b>description</b>(<i>style, substyle=-1</i>)
+<p>
+        Public method to get a descriptive string for a style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
 <dd>
-the style number (int)
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+description of the style
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl><a NAME="PreferencesLexer.eolFill" ID="PreferencesLexer.eolFill"></a>
+<h4>PreferencesLexer.eolFill</h4>
+<b>eolFill</b>(<i>style, substyle=-1</i>)
+<p>
+        Public method to get the eolFill flag for a style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
 eolFill flag
 </dd>
-</dl><a NAME="PreferencesLexer.defaultColor" ID="PreferencesLexer.defaultColor"></a>
-<h4>PreferencesLexer.defaultColor</h4>
-<b>defaultColor</b>(<i>style</i>)
-<p>
-        Public method to get the default colour of a style.
-</p><dl>
-<dt><i>style</i></dt>
+</dl><dl>
+<dt>Return Type:</dt>
 <dd>
-the style number (int)
+bool
 </dd>
-</dl><dl>
-<dt>Returns:</dt>
+</dl><a NAME="PreferencesLexer.font" ID="PreferencesLexer.font"></a>
+<h4>PreferencesLexer.font</h4>
+<b>font</b>(<i>style, substyle=-1</i>)
+<p>
+        Public method to get the font for a style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
 <dd>
-colour
-</dd>
-</dl><a NAME="PreferencesLexer.defaultFont" ID="PreferencesLexer.defaultFont"></a>
-<h4>PreferencesLexer.defaultFont</h4>
-<b>defaultFont</b>(<i>style</i>)
-<p>
-        Public method to get the default font for a style.
-</p><dl>
-<dt><i>style</i></dt>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
 <dd>
-the style number (int)
+sub-style number
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
 font
 </dd>
-</dl><a NAME="PreferencesLexer.defaultPaper" ID="PreferencesLexer.defaultPaper"></a>
-<h4>PreferencesLexer.defaultPaper</h4>
-<b>defaultPaper</b>(<i>style</i>)
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QFont
+</dd>
+</dl><a NAME="PreferencesLexer.getStyles" ID="PreferencesLexer.getStyles"></a>
+<h4>PreferencesLexer.getStyles</h4>
+<b>getStyles</b>(<i></i>)
 <p>
-        Public method to get the default background for a style.
+        Public method to get a list of all supported styles.
 </p><dl>
-<dt><i>style</i></dt>
-<dd>
-the style number (int)
-</dd>
-</dl><dl>
 <dt>Returns:</dt>
 <dd>
-colour
+list of tuples each containing the description of the style,
+            style number and sub-style number (or -1 for no sub-style)
 </dd>
-</dl><a NAME="PreferencesLexer.description" ID="PreferencesLexer.description"></a>
-<h4>PreferencesLexer.description</h4>
-<b>description</b>(<i>style</i>)
+</dl><a NAME="PreferencesLexer.hasStyle" ID="PreferencesLexer.hasStyle"></a>
+<h4>PreferencesLexer.hasStyle</h4>
+<b>hasStyle</b>(<i>style, substyle</i>)
 <p>
-        Public method to get a descriptive string for a style.
+        Public method to test for a given style definition.
 </p><dl>
-<dt><i>style</i></dt>
+<dt><i>style</i> (int)</dt>
 <dd>
-the style number (int)
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-description of the style (string)
+flag indicating the existence of a style definition
 </dd>
-</dl><a NAME="PreferencesLexer.eolFill" ID="PreferencesLexer.eolFill"></a>
-<h4>PreferencesLexer.eolFill</h4>
-<b>eolFill</b>(<i>style</i>)
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="PreferencesLexer.isBaseStyle" ID="PreferencesLexer.isBaseStyle"></a>
+<h4>PreferencesLexer.isBaseStyle</h4>
+<b>isBaseStyle</b>(<i>style</i>)
 <p>
-        Public method to get the eolFill flag for a style.
+        Public method to test, if a given style may have sub-styles.
 </p><dl>
-<dt><i>style</i></dt>
+<dt><i>style</i> (int)</dt>
 <dd>
-the style number (int)
+base style number
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-eolFill flag
-</dd>
-</dl><a NAME="PreferencesLexer.font" ID="PreferencesLexer.font"></a>
-<h4>PreferencesLexer.font</h4>
-<b>font</b>(<i>style</i>)
-<p>
-        Public method to get the font for a style.
-</p><dl>
-<dt><i>style</i></dt>
-<dd>
-the style number (int)
+flag indicating that the style may have sub-styles
 </dd>
 </dl><dl>
-<dt>Returns:</dt>
+<dt>Return Type:</dt>
 <dd>
-font
+bool
 </dd>
 </dl><a NAME="PreferencesLexer.language" ID="PreferencesLexer.language"></a>
 <h4>PreferencesLexer.language</h4>
@@ -260,76 +501,161 @@
 </p><dl>
 <dt>Returns:</dt>
 <dd>
-language
+lexer programming language
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl><a NAME="PreferencesLexer.paper" ID="PreferencesLexer.paper"></a>
 <h4>PreferencesLexer.paper</h4>
-<b>paper</b>(<i>style</i>)
+<b>paper</b>(<i>style, substyle=-1</i>)
 <p>
         Public method to get the background for a style.
 </p><dl>
-<dt><i>style</i></dt>
+<dt><i>style</i> (int)</dt>
 <dd>
-the style number (int)
+the style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-colour
+background color
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QColor
 </dd>
 </dl><a NAME="PreferencesLexer.setColor" ID="PreferencesLexer.setColor"></a>
 <h4>PreferencesLexer.setColor</h4>
-<b>setColor</b>(<i>c, style</i>)
+<b>setColor</b>(<i>c, style, substyle=-1</i>)
 <p>
-        Public method to set the colour for a style.
+        Public method to set the color for a style.
 </p><dl>
-<dt><i>c</i></dt>
+<dt><i>c</i> (QColor)</dt>
+<dd>
+color
+</dd><dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
 <dd>
-colour (int)
-</dd><dt><i>style</i></dt>
+sub-style number
+</dd>
+</dl><a NAME="PreferencesLexer.setDescription" ID="PreferencesLexer.setDescription"></a>
+<h4>PreferencesLexer.setDescription</h4>
+<b>setDescription</b>(<i>description, style, substyle=-1</i>)
+<p>
+        Public method to set a descriptive string for a style.
+</p><dl>
+<dt><i>description</i> (str)</dt>
 <dd>
-the style number (int)
+description for the style
+</dd><dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
 </dd>
 </dl><a NAME="PreferencesLexer.setEolFill" ID="PreferencesLexer.setEolFill"></a>
 <h4>PreferencesLexer.setEolFill</h4>
-<b>setEolFill</b>(<i>eolfill, style</i>)
+<b>setEolFill</b>(<i>eolfill, style, substyle=-1</i>)
 <p>
         Public method to set the eolFill flag for a style.
 </p><dl>
-<dt><i>eolfill</i></dt>
+<dt><i>eolfill</i> (bool)</dt>
+<dd>
+eolFill flag
+</dd><dt><i>style</i> (int)</dt>
 <dd>
-eolFill flag (boolean)
-</dd><dt><i>style</i></dt>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
 <dd>
-the style number (int)
+sub-style number
 </dd>
 </dl><a NAME="PreferencesLexer.setFont" ID="PreferencesLexer.setFont"></a>
 <h4>PreferencesLexer.setFont</h4>
-<b>setFont</b>(<i>f, style</i>)
+<b>setFont</b>(<i>f, style, substyle=-1</i>)
 <p>
         Public method to set the font for a style.
 </p><dl>
-<dt><i>f</i></dt>
+<dt><i>f</i> (QFont)</dt>
 <dd>
 font
-</dd><dt><i>style</i></dt>
+</dd><dt><i>style</i> (int)</dt>
 <dd>
-the style number (int)
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
 </dd>
 </dl><a NAME="PreferencesLexer.setPaper" ID="PreferencesLexer.setPaper"></a>
 <h4>PreferencesLexer.setPaper</h4>
-<b>setPaper</b>(<i>c, style</i>)
+<b>setPaper</b>(<i>c, style, substyle=-1</i>)
 <p>
         Public method to set the background for a style.
 </p><dl>
-<dt><i>c</i></dt>
+<dt><i>c</i> (QColor)</dt>
+<dd>
+background color
+</dd><dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><a NAME="PreferencesLexer.setWords" ID="PreferencesLexer.setWords"></a>
+<h4>PreferencesLexer.setWords</h4>
+<b>setWords</b>(<i>words, style, substyle=-1</i>)
+<p>
+        Public method to set the list of words for a style.
+</p><dl>
+<dt><i>words</i> (str)</dt>
+<dd>
+whitespace separated list of words
+</dd><dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
 <dd>
-colour (int)
-</dd><dt><i>style</i></dt>
+sub-style number
+</dd>
+</dl><a NAME="PreferencesLexer.words" ID="PreferencesLexer.words"></a>
+<h4>PreferencesLexer.words</h4>
+<b>words</b>(<i>style, substyle=-1</i>)
+<p>
+        Public method to get the list of words for a style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
 <dd>
-the style number (int)
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+whitespace separated list of words
 </dd>
-</dl>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl><a NAME="PreferencesLexer.writeSettings" ID="PreferencesLexer.writeSettings"></a>
+<h4>PreferencesLexer.writeSettings</h4>
+<b>writeSettings</b>(<i></i>)
+<p>
+        Public method to write the lexer settings.
+</p>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
 <a NAME="PreferencesLexerError" ID="PreferencesLexerError"></a>
@@ -379,6 +705,11 @@
 <dd>
 string representing the error message
 </dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
 </dl><a NAME="PreferencesLexerError.__str__" ID="PreferencesLexerError.__str__"></a>
 <h4>PreferencesLexerError.__str__</h4>
 <b>__str__</b>(<i></i>)
@@ -389,6 +720,11 @@
 <dd>
 string representing the error message
 </dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
@@ -424,9 +760,9 @@
 <p>
         Constructor
 </p><dl>
-<dt><i>language</i></dt>
+<dt><i>language</i> (str)</dt>
 <dd>
-lexer language (string)
+lexer language
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.Preferences.SubstyleDefinitionDialog.html	Sat Mar 16 20:14:21 2019 +0100
@@ -0,0 +1,153 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.Preferences.SubstyleDefinitionDialog</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.Preferences.SubstyleDefinitionDialog</h1>
+<p>
+Module implementing the sub-style definition dialog.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#SubstyleDefinitionDialog">SubstyleDefinitionDialog</a></td>
+<td>Class implementing the sub-style definition dialog.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="SubstyleDefinitionDialog" ID="SubstyleDefinitionDialog"></a>
+<h2>SubstyleDefinitionDialog</h2>
+<p>
+    Class implementing the sub-style definition dialog.
+</p>
+<h3>Derived from</h3>
+QDialog, Ui_SubstyleDefinitionDialog
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#SubstyleDefinitionDialog.__init__">SubstyleDefinitionDialog</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#SubstyleDefinitionDialog.__updateOk">__updateOk</a></td>
+<td>Private slot to update the state of the OK button.</td>
+</tr><tr>
+<td><a href="#SubstyleDefinitionDialog.getData">getData</a></td>
+<td>Public method to get the entered data.</td>
+</tr><tr>
+<td><a href="#SubstyleDefinitionDialog.on_defaultButton_clicked">on_defaultButton_clicked</a></td>
+<td>Private slot to set the dialog contents to default values.</td>
+</tr><tr>
+<td><a href="#SubstyleDefinitionDialog.on_descriptionEdit_textChanged">on_descriptionEdit_textChanged</a></td>
+<td>Private slot handling changes of the description.</td>
+</tr><tr>
+<td><a href="#SubstyleDefinitionDialog.on_resetButton_clicked">on_resetButton_clicked</a></td>
+<td>Private slot to reset the dialog contents.</td>
+</tr><tr>
+<td><a href="#SubstyleDefinitionDialog.on_wordsEdit_textChanged">on_wordsEdit_textChanged</a></td>
+<td>Private slot handling changes of the word list.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="SubstyleDefinitionDialog.__init__" ID="SubstyleDefinitionDialog.__init__"></a>
+<h4>SubstyleDefinitionDialog (Constructor)</h4>
+<b>SubstyleDefinitionDialog</b>(<i>lexer, style, substyle, parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>lexer</i> (PreferencesLexer)</dt>
+<dd>
+reference to the lexer object
+</dd><dt><i>style</i> (int)</dt>
+<dd>
+style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd><dt><i>parent</i> (QWidget)</dt>
+<dd>
+reference to the parent widget
+</dd>
+</dl><a NAME="SubstyleDefinitionDialog.__updateOk" ID="SubstyleDefinitionDialog.__updateOk"></a>
+<h4>SubstyleDefinitionDialog.__updateOk</h4>
+<b>__updateOk</b>(<i></i>)
+<p>
+        Private slot to update the state of the OK button.
+</p><a NAME="SubstyleDefinitionDialog.getData" ID="SubstyleDefinitionDialog.getData"></a>
+<h4>SubstyleDefinitionDialog.getData</h4>
+<b>getData</b>(<i></i>)
+<p>
+        Public method to get the entered data.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+tuple containing the sub-style description and words list.
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (str, str)
+</dd>
+</dl><a NAME="SubstyleDefinitionDialog.on_defaultButton_clicked" ID="SubstyleDefinitionDialog.on_defaultButton_clicked"></a>
+<h4>SubstyleDefinitionDialog.on_defaultButton_clicked</h4>
+<b>on_defaultButton_clicked</b>(<i></i>)
+<p>
+        Private slot to set the dialog contents to default values.
+</p><a NAME="SubstyleDefinitionDialog.on_descriptionEdit_textChanged" ID="SubstyleDefinitionDialog.on_descriptionEdit_textChanged"></a>
+<h4>SubstyleDefinitionDialog.on_descriptionEdit_textChanged</h4>
+<b>on_descriptionEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot handling changes of the description.
+</p><dl>
+<dt><i>txt</i> (str)</dt>
+<dd>
+text of the description
+</dd>
+</dl><a NAME="SubstyleDefinitionDialog.on_resetButton_clicked" ID="SubstyleDefinitionDialog.on_resetButton_clicked"></a>
+<h4>SubstyleDefinitionDialog.on_resetButton_clicked</h4>
+<b>on_resetButton_clicked</b>(<i></i>)
+<p>
+        Private slot to reset the dialog contents.
+</p><a NAME="SubstyleDefinitionDialog.on_wordsEdit_textChanged" ID="SubstyleDefinitionDialog.on_wordsEdit_textChanged"></a>
+<h4>SubstyleDefinitionDialog.on_wordsEdit_textChanged</h4>
+<b>on_wordsEdit_textChanged</b>(<i></i>)
+<p>
+        Private slot handling changes of the word list.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.QScintilla.Lexers.Lexer.html	Sat Mar 16 20:12:03 2019 +0100
+++ b/Documentation/Source/eric6.QScintilla.Lexers.Lexer.html	Sat Mar 16 20:14:21 2019 +0100
@@ -84,6 +84,9 @@
 <td><a href="#Lexer.hasSmartIndent">hasSmartIndent</a></td>
 <td>Public method indicating whether lexer can do smart indentation.</td>
 </tr><tr>
+<td><a href="#Lexer.hasSubstyles">hasSubstyles</a></td>
+<td>Public method to indicate the support of sub-styles.</td>
+</tr><tr>
 <td><a href="#Lexer.initProperties">initProperties</a></td>
 <td>Public slot to initialize the properties.</td>
 </tr><tr>
@@ -205,6 +208,21 @@
 flag indicating availability of smartIndentLine and
             smartIndentSelection methods (boolean)
 </dd>
+</dl><a NAME="Lexer.hasSubstyles" ID="Lexer.hasSubstyles"></a>
+<h4>Lexer.hasSubstyles</h4>
+<b>hasSubstyles</b>(<i></i>)
+<p>
+        Public method to indicate the support of sub-styles.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating sub-styling support
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
 </dl><a NAME="Lexer.initProperties" ID="Lexer.initProperties"></a>
 <h4>Lexer.initProperties</h4>
 <b>initProperties</b>(<i></i>)
--- a/Documentation/Source/eric6.QScintilla.Lexers.LexerCPP.html	Sat Mar 16 20:12:03 2019 +0100
+++ b/Documentation/Source/eric6.QScintilla.Lexers.LexerCPP.html	Sat Mar 16 20:14:21 2019 +0100
@@ -45,7 +45,7 @@
     Subclass to implement some additional lexer dependant methods.
 </p>
 <h3>Derived from</h3>
-Lexer, QsciLexerCPP
+SubstyledLexer, QsciLexerCPP
 <h3>Class Attributes</h3>
 <table>
 <tr><td>None</td></tr>
--- a/Documentation/Source/eric6.QScintilla.Lexers.LexerPython.html	Sat Mar 16 20:12:03 2019 +0100
+++ b/Documentation/Source/eric6.QScintilla.Lexers.LexerPython.html	Sat Mar 16 20:14:21 2019 +0100
@@ -45,7 +45,7 @@
     Subclass to implement some additional lexer dependant methods.
 </p>
 <h3>Derived from</h3>
-Lexer, QsciLexerPython
+SubstyledLexer, QsciLexerPython
 <h3>Class Attributes</h3>
 <table>
 <tr><td>None</td></tr>
@@ -58,7 +58,7 @@
 <table>
 <tr>
 <td><a href="#LexerPython.__init__">LexerPython</a></td>
-<td>Constructor</td>
+<td>__future__ with_statement unicode_literals print_function division absolute_import generator_stop annotations</td>
 </tr><tr>
 <td><a href="#LexerPython.autoCompletionWordSeparators">autoCompletionWordSeparators</a></td>
 <td>Public method to return the list of separators for autocompletion.</td>
@@ -93,16 +93,9 @@
 <h4>LexerPython (Constructor)</h4>
 <b>LexerPython</b>(<i>variant="", parent=None</i>)
 <p>
-        Constructor
-</p><dl>
-<dt><i>variant</i></dt>
-<dd>
-name of the language variant (string)
-</dd><dt><i>parent</i></dt>
-<dd>
-parent widget of this lexer
-</dd>
-</dl><a NAME="LexerPython.autoCompletionWordSeparators" ID="LexerPython.autoCompletionWordSeparators"></a>
+__future__ with_statement unicode_literals print_function division
+ absolute_import generator_stop annotations
+</p><a NAME="LexerPython.autoCompletionWordSeparators" ID="LexerPython.autoCompletionWordSeparators"></a>
 <h4>LexerPython.autoCompletionWordSeparators</h4>
 <b>autoCompletionWordSeparators</b>(<i></i>)
 <p>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.QScintilla.Lexers.SubstyledLexer.html	Sat Mar 16 20:14:21 2019 +0100
@@ -0,0 +1,696 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.QScintilla.Lexers.SubstyledLexer</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.QScintilla.Lexers.SubstyledLexer</h1>
+<p>
+Module implementing the lexer mixin class.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#SubstyledLexer">SubstyledLexer</a></td>
+<td>Class to implement the sub-styled lexer mixin class.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="SubstyledLexer" ID="SubstyledLexer"></a>
+<h2>SubstyledLexer</h2>
+<p>
+    Class to implement the sub-styled lexer mixin class.
+</p>
+<h3>Derived from</h3>
+Lexer
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#SubstyledLexer.__init__">SubstyledLexer</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.addSubstyle">addSubstyle</a></td>
+<td>Public method to add an empty sub-style to a given base style.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.delSubstyle">delSubstyle</a></td>
+<td>Public method to delete a given sub-style definition.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.getBaseStyles">getBaseStyles</a></td>
+<td>Public method to get the list of supported base styles.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.hasSubstyle">hasSubstyle</a></td>
+<td>Public method to test for a given sub-style definition.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.hasSubstyles">hasSubstyles</a></td>
+<td>Public method to indicate the support of sub-styles.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.isBaseStyle">isBaseStyle</a></td>
+<td>Public method to test, if a given style may have sub-styles.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.loadDefaultSubStyles">loadDefaultSubStyles</a></td>
+<td>Public method to load the default sub-style definitions.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.loadSubstyles">loadSubstyles</a></td>
+<td>Public method to load the sub-styles from the settings file.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.readSubstyles">readSubstyles</a></td>
+<td>Public method to load the sub-styles and configure the editor.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.setSubstyleColor">setSubstyleColor</a></td>
+<td>Public method to set the foreground color of a sub-style.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.setSubstyleDescription">setSubstyleDescription</a></td>
+<td>Public method to set the description for a sub-style.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.setSubstyleEolFill">setSubstyleEolFill</a></td>
+<td>Public method to set the eolfill flag of a sub-style.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.setSubstyleFont">setSubstyleFont</a></td>
+<td>Public method to set the font of a sub-style.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.setSubstylePaper">setSubstylePaper</a></td>
+<td>Public method to set the background color of a sub-style.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.setSubstyleWords">setSubstyleWords</a></td>
+<td>Public method to set the words for a sub-style.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substyleColor">substyleColor</a></td>
+<td>Public method to get the sub-style foreground color.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substyleDefaultColor">substyleDefaultColor</a></td>
+<td>Public method to get the sub-style default foreground color.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substyleDefaultDescription">substyleDefaultDescription</a></td>
+<td>Public method to get the default description of a sub-style.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substyleDefaultEolFill">substyleDefaultEolFill</a></td>
+<td>Public method to get the default eolfill flag.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substyleDefaultFont">substyleDefaultFont</a></td>
+<td>Public method to get the default sub-style font.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substyleDefaultPaper">substyleDefaultPaper</a></td>
+<td>Public method to get the sub-style default background color.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substyleDefaultWords">substyleDefaultWords</a></td>
+<td>Public method to get the default words of a sub-style.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substyleDescription">substyleDescription</a></td>
+<td>Public method to get the description of a sub-style.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substyleEolFill">substyleEolFill</a></td>
+<td>Public method to get the eolfill flag.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substyleFont">substyleFont</a></td>
+<td>Public method to get the sub-style font.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substylePaper">substylePaper</a></td>
+<td>Public method to get the sub-style background color.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substyleWords">substyleWords</a></td>
+<td>Public method to get the words of a sub-style.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.substylesCount">substylesCount</a></td>
+<td>Public method to get the number of defined sub-styles.</td>
+</tr><tr>
+<td><a href="#SubstyledLexer.writeSubstyles">writeSubstyles</a></td>
+<td>Public method to save the sub-styles.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="SubstyledLexer.__init__" ID="SubstyledLexer.__init__"></a>
+<h4>SubstyledLexer (Constructor)</h4>
+<b>SubstyledLexer</b>(<i></i>)
+<p>
+        Constructor
+</p><a NAME="SubstyledLexer.addSubstyle" ID="SubstyledLexer.addSubstyle"></a>
+<h4>SubstyledLexer.addSubstyle</h4>
+<b>addSubstyle</b>(<i>style</i>)
+<p>
+        Public method to add an empty sub-style to a given base style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+allocated sub-style number or -1 to indicate an error
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+int
+</dd>
+</dl><a NAME="SubstyledLexer.delSubstyle" ID="SubstyledLexer.delSubstyle"></a>
+<h4>SubstyledLexer.delSubstyle</h4>
+<b>delSubstyle</b>(<i>style, substyle</i>)
+<p>
+        Public method to delete a given sub-style definition.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating successful deletion
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="SubstyledLexer.getBaseStyles" ID="SubstyledLexer.getBaseStyles"></a>
+<h4>SubstyledLexer.getBaseStyles</h4>
+<b>getBaseStyles</b>(<i></i>)
+<p>
+        Public method to get the list of supported base styles.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+list of base styles
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+list of int
+</dd>
+</dl><a NAME="SubstyledLexer.hasSubstyle" ID="SubstyledLexer.hasSubstyle"></a>
+<h4>SubstyledLexer.hasSubstyle</h4>
+<b>hasSubstyle</b>(<i>style, substyle</i>)
+<p>
+        Public method to test for a given sub-style definition.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating the existence of a sub-style definition
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="SubstyledLexer.hasSubstyles" ID="SubstyledLexer.hasSubstyles"></a>
+<h4>SubstyledLexer.hasSubstyles</h4>
+<b>hasSubstyles</b>(<i></i>)
+<p>
+        Public method to indicate the support of sub-styles.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating sub-styling support
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="SubstyledLexer.isBaseStyle" ID="SubstyledLexer.isBaseStyle"></a>
+<h4>SubstyledLexer.isBaseStyle</h4>
+<b>isBaseStyle</b>(<i>style</i>)
+<p>
+        Public method to test, if a given style may have sub-styles.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating that the style may have sub-styles
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="SubstyledLexer.loadDefaultSubStyles" ID="SubstyledLexer.loadDefaultSubStyles"></a>
+<h4>SubstyledLexer.loadDefaultSubStyles</h4>
+<b>loadDefaultSubStyles</b>(<i></i>)
+<p>
+        Public method to load the default sub-style definitions.
+</p><a NAME="SubstyledLexer.loadSubstyles" ID="SubstyledLexer.loadSubstyles"></a>
+<h4>SubstyledLexer.loadSubstyles</h4>
+<b>loadSubstyles</b>(<i></i>)
+<p>
+        Public method to load the sub-styles from the settings file.
+</p><a NAME="SubstyledLexer.readSubstyles" ID="SubstyledLexer.readSubstyles"></a>
+<h4>SubstyledLexer.readSubstyles</h4>
+<b>readSubstyles</b>(<i>editor</i>)
+<p>
+        Public method to load the sub-styles and configure the editor.
+</p><dl>
+<dt><i>editor</i> (QsciScintilla)</dt>
+<dd>
+reference to the editor object
+</dd>
+</dl><a NAME="SubstyledLexer.setSubstyleColor" ID="SubstyledLexer.setSubstyleColor"></a>
+<h4>SubstyledLexer.setSubstyleColor</h4>
+<b>setSubstyleColor</b>(<i>color, style, substyle</i>)
+<p>
+        Public method to set the foreground color of a sub-style.
+</p><dl>
+<dt><i>color</i> (QColor)</dt>
+<dd>
+foreground color to be set
+</dd><dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><a NAME="SubstyledLexer.setSubstyleDescription" ID="SubstyledLexer.setSubstyleDescription"></a>
+<h4>SubstyledLexer.setSubstyleDescription</h4>
+<b>setSubstyleDescription</b>(<i>description, style, substyle</i>)
+<p>
+        Public method to set the description for a sub-style.
+</p><dl>
+<dt><i>description</i> (str)</dt>
+<dd>
+description to be set
+</dd><dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><a NAME="SubstyledLexer.setSubstyleEolFill" ID="SubstyledLexer.setSubstyleEolFill"></a>
+<h4>SubstyledLexer.setSubstyleEolFill</h4>
+<b>setSubstyleEolFill</b>(<i>eolFill, style, substyle</i>)
+<p>
+        Public method to set the eolfill flag of a sub-style.
+</p><dl>
+<dt><i>eolFill</i> (bool)</dt>
+<dd>
+eolfill flag to be set
+</dd><dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><a NAME="SubstyledLexer.setSubstyleFont" ID="SubstyledLexer.setSubstyleFont"></a>
+<h4>SubstyledLexer.setSubstyleFont</h4>
+<b>setSubstyleFont</b>(<i>font, style, substyle</i>)
+<p>
+        Public method to set the font of a sub-style.
+</p><dl>
+<dt><i>font</i> (QFont)</dt>
+<dd>
+font to be set
+</dd><dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><a NAME="SubstyledLexer.setSubstylePaper" ID="SubstyledLexer.setSubstylePaper"></a>
+<h4>SubstyledLexer.setSubstylePaper</h4>
+<b>setSubstylePaper</b>(<i>color, style, substyle</i>)
+<p>
+        Public method to set the background color of a sub-style.
+</p><dl>
+<dt><i>color</i> (QColor)</dt>
+<dd>
+background color to be set
+</dd><dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><a NAME="SubstyledLexer.setSubstyleWords" ID="SubstyledLexer.setSubstyleWords"></a>
+<h4>SubstyledLexer.setSubstyleWords</h4>
+<b>setSubstyleWords</b>(<i>words, style, substyle</i>)
+<p>
+        Public method to set the words for a sub-style.
+</p><dl>
+<dt><i>words</i> (str)</dt>
+<dd>
+words to be set separated by white-space
+</dd><dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><a NAME="SubstyledLexer.substyleColor" ID="SubstyledLexer.substyleColor"></a>
+<h4>SubstyledLexer.substyleColor</h4>
+<b>substyleColor</b>(<i>style, substyle</i>)
+<p>
+        Public method to get the sub-style foreground color.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+foreground color
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QColor
+</dd>
+</dl><a NAME="SubstyledLexer.substyleDefaultColor" ID="SubstyledLexer.substyleDefaultColor"></a>
+<h4>SubstyledLexer.substyleDefaultColor</h4>
+<b>substyleDefaultColor</b>(<i>style, substyle</i>)
+<p>
+        Public method to get the sub-style default foreground color.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+default foreground color
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QColor
+</dd>
+</dl><a NAME="SubstyledLexer.substyleDefaultDescription" ID="SubstyledLexer.substyleDefaultDescription"></a>
+<h4>SubstyledLexer.substyleDefaultDescription</h4>
+<b>substyleDefaultDescription</b>(<i>style, substyle</i>)
+<p>
+        Public method to get the default description of a sub-style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+sub-style default description
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl><a NAME="SubstyledLexer.substyleDefaultEolFill" ID="SubstyledLexer.substyleDefaultEolFill"></a>
+<h4>SubstyledLexer.substyleDefaultEolFill</h4>
+<b>substyleDefaultEolFill</b>(<i>style, substyle</i>)
+<p>
+        Public method to get the default eolfill flag.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+default eolfill flag
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="SubstyledLexer.substyleDefaultFont" ID="SubstyledLexer.substyleDefaultFont"></a>
+<h4>SubstyledLexer.substyleDefaultFont</h4>
+<b>substyleDefaultFont</b>(<i>style, substyle</i>)
+<p>
+        Public method to get the default sub-style font.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+default font
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QFont
+</dd>
+</dl><a NAME="SubstyledLexer.substyleDefaultPaper" ID="SubstyledLexer.substyleDefaultPaper"></a>
+<h4>SubstyledLexer.substyleDefaultPaper</h4>
+<b>substyleDefaultPaper</b>(<i>style, substyle</i>)
+<p>
+        Public method to get the sub-style default background color.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+default background color
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QColor
+</dd>
+</dl><a NAME="SubstyledLexer.substyleDefaultWords" ID="SubstyledLexer.substyleDefaultWords"></a>
+<h4>SubstyledLexer.substyleDefaultWords</h4>
+<b>substyleDefaultWords</b>(<i>style, substyle</i>)
+<p>
+        Public method to get the default words of a sub-style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+white-space separated default word list
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl><a NAME="SubstyledLexer.substyleDescription" ID="SubstyledLexer.substyleDescription"></a>
+<h4>SubstyledLexer.substyleDescription</h4>
+<b>substyleDescription</b>(<i>style, substyle</i>)
+<p>
+        Public method to get the description of a sub-style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+sub-style description
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl><a NAME="SubstyledLexer.substyleEolFill" ID="SubstyledLexer.substyleEolFill"></a>
+<h4>SubstyledLexer.substyleEolFill</h4>
+<b>substyleEolFill</b>(<i>style, substyle</i>)
+<p>
+        Public method to get the eolfill flag.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+eolfill flag
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="SubstyledLexer.substyleFont" ID="SubstyledLexer.substyleFont"></a>
+<h4>SubstyledLexer.substyleFont</h4>
+<b>substyleFont</b>(<i>style, substyle</i>)
+<p>
+        Public method to get the sub-style font.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+font
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QFont
+</dd>
+</dl><a NAME="SubstyledLexer.substylePaper" ID="SubstyledLexer.substylePaper"></a>
+<h4>SubstyledLexer.substylePaper</h4>
+<b>substylePaper</b>(<i>style, substyle</i>)
+<p>
+        Public method to get the sub-style background color.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+background color
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+QColor
+</dd>
+</dl><a NAME="SubstyledLexer.substyleWords" ID="SubstyledLexer.substyleWords"></a>
+<h4>SubstyledLexer.substyleWords</h4>
+<b>substyleWords</b>(<i>style, substyle</i>)
+<p>
+        Public method to get the words of a sub-style.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd><dt><i>substyle</i> (int)</dt>
+<dd>
+sub-style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+white-space separated word list
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl><a NAME="SubstyledLexer.substylesCount" ID="SubstyledLexer.substylesCount"></a>
+<h4>SubstyledLexer.substylesCount</h4>
+<b>substylesCount</b>(<i>style</i>)
+<p>
+        Public method to get the number of defined sub-styles.
+</p><dl>
+<dt><i>style</i> (int)</dt>
+<dd>
+base style number
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+number of defined sub-styles
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+int
+</dd>
+</dl><a NAME="SubstyledLexer.writeSubstyles" ID="SubstyledLexer.writeSubstyles"></a>
+<h4>SubstyledLexer.writeSubstyles</h4>
+<b>writeSubstyles</b>(<i></i>)
+<p>
+        Public method to save the sub-styles.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.QScintilla.Printer.html	Sat Mar 16 20:12:03 2019 +0100
+++ b/Documentation/Source/eric6.QScintilla.Printer.html	Sat Mar 16 20:14:21 2019 +0100
@@ -31,7 +31,7 @@
 <table>
 <tr>
 <td><a href="#Printer">Printer</a></td>
-<td>Class implementing the QextScintillaPrinter with a header.</td>
+<td>Class implementing the QsciPrinter with a header.</td>
 </tr>
 </table>
 <h3>Functions</h3>
@@ -42,7 +42,7 @@
 <a NAME="Printer" ID="Printer"></a>
 <h2>Printer</h2>
 <p>
-    Class implementing the QextScintillaPrinter with a header.
+    Class implementing the QsciPrinter with a header.
 </p>
 <h3>Derived from</h3>
 QsciPrinter
--- a/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html	Sat Mar 16 20:12:03 2019 +0100
+++ b/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html	Sat Mar 16 20:14:21 2019 +0100
@@ -178,6 +178,9 @@
 <td><a href="#QsciScintillaCompat.extendSelectionWordRight">extendSelectionWordRight</a></td>
 <td>Public method to extend the selection one word to the right.</td>
 </tr><tr>
+<td><a href="#QsciScintillaCompat.findFirst">findFirst</a></td>
+<td>Public method to search in the current editor text.</td>
+</tr><tr>
 <td><a href="#QsciScintillaCompat.findFirstTarget">findFirstTarget</a></td>
 <td>Public method to search in a specified range of text without setting the selection.</td>
 </tr><tr>
@@ -385,6 +388,9 @@
 <td><a href="#QsciScintillaCompat.setVirtualSpaceOptions">setVirtualSpaceOptions</a></td>
 <td>Public method to set the virtual space usage options.</td>
 </tr><tr>
+<td><a href="#QsciScintillaCompat.setWrapStartIndent">setWrapStartIndent</a></td>
+<td>Public method to set a the amount of characters wrapped sublines shall be indented.</td>
+</tr><tr>
 <td><a href="#QsciScintillaCompat.showFindIndicator">showFindIndicator</a></td>
 <td>Public method to show the find indicator for the given range.</td>
 </tr><tr>
@@ -757,49 +763,109 @@
 <b>extendSelectionWordRight</b>(<i></i>)
 <p>
         Public method to extend the selection one word to the right.
-</p><a NAME="QsciScintillaCompat.findFirstTarget" ID="QsciScintillaCompat.findFirstTarget"></a>
+</p><a NAME="QsciScintillaCompat.findFirst" ID="QsciScintillaCompat.findFirst"></a>
+<h4>QsciScintillaCompat.findFirst</h4>
+<b>findFirst</b>(<i>expression, regexp, caseSensitive, word, wrap, forward=True, line=-1, index=-1, show=True, posix=False, cxx11=False</i>)
+<p>
+        Public method to search in the current editor text.
+</p><dl>
+<dt><i>expression</i> (str)</dt>
+<dd>
+search expression
+</dd><dt><i>regexp</i> (bool)</dt>
+<dd>
+flag indicating a regular expression
+</dd><dt><i>caseSensitive</i> (bool)</dt>
+<dd>
+flag indicating a case sensitive search
+</dd><dt><i>word</i> (bool)</dt>
+<dd>
+flag indicating a word only search
+</dd><dt><i>wrap</i> (bool)</dt>
+<dd>
+flag indicating to warp around
+</dd><dt><i>forward</i> (bool)</dt>
+<dd>
+flag indicating the search direction
+</dd><dt><i>line</i> (int)</dt>
+<dd>
+line to start the search on
+</dd><dt><i>index</i> (int)</dt>
+<dd>
+index to start the search on
+</dd><dt><i>show</i> (bool)</dt>
+<dd>
+flag indicating to set the selection to the found
+            expression
+</dd><dt><i>posix</i> (bool)</dt>
+<dd>
+flag indicating the POSIX regular expression search mode
+</dd><dt><i>cxx11</i> (bool)</dt>
+<dd>
+flag indicating the CXX11 regular expression search mode
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating a successful search
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="QsciScintillaCompat.findFirstTarget" ID="QsciScintillaCompat.findFirstTarget"></a>
 <h4>QsciScintillaCompat.findFirstTarget</h4>
-<b>findFirstTarget</b>(<i>expr_, re_, cs_, wo_, begline=-1, begindex=-1, endline=-1, endindex=-1, ws_=False</i>)
+<b>findFirstTarget</b>(<i>expr_, re_, cs_, wo_, begline=-1, begindex=-1, endline=-1, endindex=-1, ws_=False, posix=False, cxx11=False</i>)
 <p>
         Public method to search in a specified range of text without
         setting the selection.
 </p><dl>
-<dt><i>expr_</i></dt>
+<dt><i>expr_</i> (str)</dt>
 <dd>
-search expression (string)
-</dd><dt><i>re_</i></dt>
+search expression
+</dd><dt><i>re_</i> (bool)</dt>
 <dd>
-flag indicating a regular expression (boolean)
-</dd><dt><i>cs_</i></dt>
+flag indicating a regular expression
+</dd><dt><i>cs_</i> (bool)</dt>
 <dd>
-flag indicating a case sensitive search (boolean)
-</dd><dt><i>wo_</i></dt>
+flag indicating a case sensitive search
+</dd><dt><i>wo_</i> (bool)</dt>
 <dd>
-flag indicating a word only search (boolean)
-</dd><dt><i>begline=</i></dt>
+flag indicating a word only search
+</dd><dt><i>begline</i> (int)</dt>
 <dd>
 line number to start from (-1 to indicate current
-            position) (integer)
-</dd><dt><i>begindex=</i></dt>
+            position)
+</dd><dt><i>begindex</i> (int)</dt>
 <dd>
-index to start from (-1 to indicate current
-            position) (integer)
-</dd><dt><i>endline=</i></dt>
+index to start from (-1 to indicate current position)
+</dd><dt><i>endline</i> (int)</dt>
 <dd>
-line number to stop at (-1 to indicate end of
-            document) (integer)
-</dd><dt><i>endindex=</i></dt>
+line number to stop at (-1 to indicate end of document)
+</dd><dt><i>endindex</i> (int)</dt>
 <dd>
 index number to stop at (-1 to indicate end of
-            document) (integer)
-</dd><dt><i>ws_=</i></dt>
+            document)
+</dd><dt><i>ws_</i> (bool)</dt>
 <dd>
 flag indicating a word start search (boolean)
+</dd><dt><i>posix</i> (bool)</dt>
+<dd>
+
+</dd><dt><i>cxx11</i> (bool)</dt>
+<dd>
+
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-flag indicating a successful search (boolean)
+flag indicating a successful search
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
 </dd>
 </dl><a NAME="QsciScintillaCompat.findNextTarget" ID="QsciScintillaCompat.findNextTarget"></a>
 <h4>QsciScintillaCompat.findNextTarget</h4>
@@ -1705,6 +1771,17 @@
 <dd>
 usage options to set (integer, 0 to 3)
 </dd>
+</dl><a NAME="QsciScintillaCompat.setWrapStartIndent" ID="QsciScintillaCompat.setWrapStartIndent"></a>
+<h4>QsciScintillaCompat.setWrapStartIndent</h4>
+<b>setWrapStartIndent</b>(<i>indent</i>)
+<p>
+            Public method to set a the amount of characters wrapped sublines
+            shall be indented.
+</p><dl>
+<dt><i>indent</i> (int)</dt>
+<dd>
+amount of characters to indent
+</dd>
 </dl><a NAME="QsciScintillaCompat.showFindIndicator" ID="QsciScintillaCompat.showFindIndicator"></a>
 <h4>QsciScintillaCompat.showFindIndicator</h4>
 <b>showFindIndicator</b>(<i>sline, sindex, eline, eindex</i>)
--- a/Documentation/Source/index-eric6.Preferences.html	Sat Mar 16 20:12:03 2019 +0100
+++ b/Documentation/Source/index-eric6.Preferences.html	Sat Mar 16 20:14:21 2019 +0100
@@ -51,7 +51,7 @@
 <td>Module implementing a dialog for the configuration of a mouse click sequence.</td>
 </tr><tr>
 <td><a href="eric6.Preferences.PreferencesLexer.html">PreferencesLexer</a></td>
-<td>Module implementing a special QextScintilla lexer to handle the preferences.</td>
+<td>Module implementing a special QScintilla lexer to handle the preferences.</td>
 </tr><tr>
 <td><a href="eric6.Preferences.ProgramsDialog.html">ProgramsDialog</a></td>
 <td>Module implementing the Programs page.</td>
@@ -65,6 +65,9 @@
 <td><a href="eric6.Preferences.ShortcutsDialog.html">ShortcutsDialog</a></td>
 <td>Module implementing a dialog for the configuration of eric6's keyboard shortcuts.</td>
 </tr><tr>
+<td><a href="eric6.Preferences.SubstyleDefinitionDialog.html">SubstyleDefinitionDialog</a></td>
+<td>Module implementing the sub-style definition dialog.</td>
+</tr><tr>
 <td><a href="eric6.Preferences.ToolConfigurationDialog.html">ToolConfigurationDialog</a></td>
 <td>Module implementing a configuration dialog for the tools menu.</td>
 </tr><tr>
--- a/Documentation/Source/index-eric6.QScintilla.Lexers.html	Sat Mar 16 20:12:03 2019 +0100
+++ b/Documentation/Source/index-eric6.QScintilla.Lexers.html	Sat Mar 16 20:14:21 2019 +0100
@@ -145,6 +145,9 @@
 <td><a href="eric6.QScintilla.Lexers.LexerYAML.html">LexerYAML</a></td>
 <td>Module implementing a YAML lexer with some additional methods.</td>
 </tr><tr>
+<td><a href="eric6.QScintilla.Lexers.SubstyledLexer.html">SubstyledLexer</a></td>
+<td>Module implementing the lexer mixin class.</td>
+</tr><tr>
 <td><a href="eric6.QScintilla.Lexers.__init__.html">Lexers</a></td>
 <td>Package implementing lexers for the various supported programming languages.</td>
 </tr>
--- a/Preferences/PreferencesLexer.py	Sat Mar 16 20:12:03 2019 +0100
+++ b/Preferences/PreferencesLexer.py	Sat Mar 16 20:14:21 2019 +0100
@@ -56,7 +56,7 @@
         Constructor

         @param language lexer language
-        @rtype str
+        @type str
         """
         PreferencesLexerError.__init__(self)
         self._errorMessage = QCoreApplication.translate(
APIs/Python3/eric6.api		file \| annotate \| diff \| comparison \| revisions
APIs/Python3/eric6.bas		file \| annotate \| diff \| comparison \| revisions
Documentation/Help/source.qch		file \| annotate \| diff \| comparison \| revisions
Documentation/Help/source.qhp		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.Preferences.PreferencesLexer.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.Preferences.SubstyleDefinitionDialog.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.QScintilla.Lexers.Lexer.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.QScintilla.Lexers.LexerCPP.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.QScintilla.Lexers.LexerPython.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.QScintilla.Lexers.SubstyledLexer.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.QScintilla.Printer.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/index-eric6.Preferences.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/index-eric6.QScintilla.Lexers.html		file \| annotate \| diff \| comparison \| revisions
Preferences/PreferencesLexer.py		file \| annotate \| diff \| comparison \| revisions