Update QScintilla patches for version 2.10.8

Delete patches that have already been applied upstream and add new ones
for build related files that were not registered.

See commits:
209120c01e
43134caa2d

and issue #1621
This commit is contained in:
mgrojo
2018-11-21 20:30:59 +01:00
parent 39586da475
commit 17827ce5be
5 changed files with 494 additions and 112 deletions
-18
View File
@@ -1,18 +0,0 @@
diff --git a/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp b/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp
index d40b742..4c9fe75 100644
--- a/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp
+++ b/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp
@@ -386,7 +386,12 @@ void QsciScintilla::callTip()
ct = ct_entries.join("\n");
}
- QByteArray ct_ba = ct.toLatin1();
+ QByteArray ct_ba;
+ if (isUtf8())
+ ct_ba = ct.toUtf8();
+ else
+ ct_ba = ct.toLatin1();
+
const char *cts = ct_ba.data();
SendScintilla(SCI_CALLTIPSHOW, adjustedCallTipPosition(shift), cts);
-70
View File
@@ -1,70 +0,0 @@
diff --git a/libs/qscintilla/Qt4Qt5/Qsci/qsciscintilla.h b/libs/qscintilla/Qt4Qt5/Qsci/qsciscintilla.h
index 3b5f185..49ca5cc 100644
--- a/libs/qscintilla/Qt4Qt5/Qsci/qsciscintilla.h
+++ b/libs/qscintilla/Qt4Qt5/Qsci/qsciscintilla.h
@@ -2009,6 +2009,34 @@ public slots:
//! \sa zoomIn(), zoomOut()
virtual void zoomTo(int size);
+ //! For performance, Scintilla does not measure the display width
+ //! of the document to determine the properties of the horizontal
+ //! scroll bar. Instead, an assumed width is used. This sets the
+ //! document width in pixels assumed by Scintilla to \a
+ //! pixelWidth. The default value is 2000.
+ //!
+ //! \sa getScrollWidth(), setScrollWidthTracking()
+ virtual void setScrollWidth(int pixelWidth);
+
+ //! Gets the document width in pixels assumed by Scintilla.
+ //!
+ //! \sa setScrollWidth(), setScrollWidthTracking()
+ virtual int getScrollWidth() const;
+
+ //! If scroll width tracking is enabled then the scroll width is
+ //! adjusted to ensure that all of the lines currently displayed
+ //! can be completely scrolled. This mode never adjusts the scroll
+ //! width to be narrower.
+ //! Sets the scroll width tracking to \a enabled.
+ //!
+ //! \sa setScrollWidth(), getScrollWidthTracking()
+ virtual void setScrollWidthTracking(bool enabled);
+
+ //! Gets the current scroll width tracking mode.
+ //!
+ //! \sa getScrollWidth(), setScrollWidthTracking()
+ virtual bool getScrollWidthTracking() const;
+
signals:
//! This signal is emitted whenever the cursor position changes. \a line
//! contains the line number and \a index contains the character index
diff --git a/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp b/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp
index 4c9fe75..31dc579 100644
--- a/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp
+++ b/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp
@@ -4481,3 +4481,26 @@ static QColor asQColor(long sci_colour)
((int)(sci_colour >> 8)) & 0x00ff,
((int)(sci_colour >> 16)) & 0x00ff);
}
+
+void QsciScintilla::setScrollWidth(int pixelWidth)
+{
+ SendScintilla(SCI_SETSCROLLWIDTH, pixelWidth);
+}
+
+int QsciScintilla::getScrollWidth() const
+{
+ return SendScintilla(SCI_GETSCROLLWIDTH);
+}
+
+void QsciScintilla::setScrollWidthTracking(bool enabled)
+{
+ SendScintilla(SCI_SETSCROLLWIDTHTRACKING, enabled);
+}
+
+bool QsciScintilla::getScrollWidthTracking() const
+{
+ return SendScintilla(SCI_GETSCROLLWIDTHTRACKING);
+}
+
+
+
-24
View File
@@ -1,24 +0,0 @@
diff --git a/libs/qscintilla/lexers/LexJSON.cpp b/libs/qscintilla/lexers/LexJSON.cpp
index 9c044e5..6c06061 100644
--- a/libs/qscintilla/lexers/LexJSON.cpp
+++ b/libs/qscintilla/lexers/LexJSON.cpp
@@ -457,7 +457,9 @@ void SCI_METHOD LexerJSON::Fold(Sci_PositionU startPos,
LexAccessor styler(pAccess);
Sci_PositionU currLine = styler.GetLine(startPos);
Sci_PositionU endPos = startPos + length;
- int currLevel = styler.LevelAt(currLine) & SC_FOLDLEVELNUMBERMASK;
+ int currLevel = SC_FOLDLEVELBASE;
+ if (currLine > 0)
+ currLevel = styler.LevelAt(currLine - 1) >> 16;
int nextLevel = currLevel;
int visibleChars = 0;
for (Sci_PositionU i = startPos; i < endPos; i++) {
@@ -472,7 +474,7 @@ void SCI_METHOD LexerJSON::Fold(Sci_PositionU startPos,
}
}
if (atEOL || i == (endPos-1)) {
- int level = currLevel;
+ int level = currLevel | nextLevel << 16;
if (!visibleChars && options.foldCompact) {
level |= SC_FOLDLEVELWHITEFLAG;
} else if (nextLevel > currLevel) {
+363
View File
@@ -0,0 +1,363 @@
--- QScintilla_gpl-2.10.8/Qt4Qt5/qscintilla.pro 2018-10-01 15:46:06.000000000 +0200
+++ qscintilla/Qt4Qt5/qscintilla.pro 2018-11-21 19:51:25.870248673 +0100
@@ -23,24 +23,12 @@
!win32:VERSION = 13.2.1
TEMPLATE = lib
-CONFIG += qt warn_off thread exceptions hide_symbols
-
-CONFIG(debug, debug|release) {
- mac: {
- TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}_debug
- } else {
- win32: {
- TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}d
- } else {
- TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}
- }
- }
-} else {
- TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}
-}
-
+TARGET = qscintilla2
+CONFIG += qt warn_off thread exceptions hide_symbols staticlib debug_and_release
INCLUDEPATH += . ../include ../lexlib ../src
+QMAKE_CXXFLAGS += -std=c++11
+
!CONFIG(staticlib) {
DEFINES += QSCINTILLA_MAKE_DLL
}
@@ -59,11 +47,6 @@
DEFINES += QT_NO_ACCESSIBILITY
}
-# For old versions of GCC.
-unix:!macx {
- CONFIG += c++11
-}
-
# Comment this in if you want the internal Scintilla classes to be placed in a
# Scintilla namespace rather than pollute the global namespace.
#DEFINES += SCI_NAMESPACE
@@ -97,69 +80,20 @@
HEADERS = \
./Qsci/qsciglobal.h \
- ./Qsci/qsciscintilla.h \
- ./Qsci/qsciscintillabase.h \
- ./Qsci/qsciabstractapis.h \
- ./Qsci/qsciapis.h \
./Qsci/qscicommand.h \
./Qsci/qscicommandset.h \
./Qsci/qscidocument.h \
- ./Qsci/qscilexer.h \
- ./Qsci/qscilexeravs.h \
- ./Qsci/qscilexerbash.h \
- ./Qsci/qscilexerbatch.h \
- ./Qsci/qscilexercmake.h \
- ./Qsci/qscilexercoffeescript.h \
- ./Qsci/qscilexercpp.h \
- ./Qsci/qscilexercsharp.h \
- ./Qsci/qscilexercss.h \
- ./Qsci/qscilexercustom.h \
- ./Qsci/qscilexerd.h \
- ./Qsci/qscilexerdiff.h \
- ./Qsci/qscilexeredifact.h \
- ./Qsci/qscilexerfortran.h \
- ./Qsci/qscilexerfortran77.h \
- ./Qsci/qscilexerhtml.h \
- ./Qsci/qscilexeridl.h \
- ./Qsci/qscilexerjava.h \
- ./Qsci/qscilexerjavascript.h \
- ./Qsci/qscilexerjson.h \
- ./Qsci/qscilexerlua.h \
- ./Qsci/qscilexermakefile.h \
- ./Qsci/qscilexermarkdown.h \
- ./Qsci/qscilexermatlab.h \
- ./Qsci/qscilexeroctave.h \
- ./Qsci/qscilexerpascal.h \
- ./Qsci/qscilexerperl.h \
- ./Qsci/qscilexerpostscript.h \
- ./Qsci/qscilexerpo.h \
- ./Qsci/qscilexerpov.h \
- ./Qsci/qscilexerproperties.h \
- ./Qsci/qscilexerpython.h \
- ./Qsci/qscilexerruby.h \
- ./Qsci/qscilexerspice.h \
- ./Qsci/qscilexersql.h \
- ./Qsci/qscilexertcl.h \
- ./Qsci/qscilexertex.h \
- ./Qsci/qscilexerverilog.h \
- ./Qsci/qscilexervhdl.h \
- ./Qsci/qscilexerxml.h \
- ./Qsci/qscilexeryaml.h \
- ./Qsci/qscimacro.h \
./Qsci/qsciprinter.h \
./Qsci/qscistyle.h \
./Qsci/qscistyledtext.h \
ListBoxQt.h \
- SciAccessibility.h \
- SciClasses.h \
SciNamespace.h \
- ScintillaQt.h \
../include/ILexer.h \
../include/Platform.h \
- ../include/Sci_Position.h \
../include/SciLexer.h \
../include/Scintilla.h \
../include/ScintillaWidget.h \
+ ../include/Sci_Position.h \
../lexlib/Accessor.h \
../lexlib/CharacterCategory.h \
../lexlib/CharacterSet.h \
@@ -170,7 +104,6 @@
../lexlib/LexerSimple.h \
../lexlib/OptionSet.h \
../lexlib/PropSetSimple.h \
- ../lexlib/StringCopy.h \
../lexlib/StyleContext.h \
../lexlib/SubStyles.h \
../lexlib/WordList.h \
@@ -184,15 +117,12 @@
../src/ContractionState.h \
../src/Decoration.h \
../src/Document.h \
- ../src/EditModel.h \
../src/Editor.h \
- ../src/EditView.h \
../src/ExternalLexer.h \
../src/FontQuality.h \
../src/Indicator.h \
../src/KeyMap.h \
../src/LineMarker.h \
- ../src/MarginView.h \
../src/Partitioning.h \
../src/PerLine.h \
../src/PositionCache.h \
@@ -205,7 +135,26 @@
../src/UnicodeFromUTF8.h \
../src/UniConversion.h \
../src/ViewStyle.h \
- ../src/XPM.h
+ ../src/XPM.h \
+ ../src/Position.h \
+ ../src/SparseVector.h \
+ ./Qsci/qsciscintilla.h \
+ ./Qsci/qsciscintillabase.h \
+ ./Qsci/qsciabstractapis.h \
+ ./Qsci/qsciapis.h \
+ ./Qsci/qscilexer.h \
+ ./Qsci/qscilexercustom.h \
+ ./Qsci/qscilexersql.h \
+ ./Qsci/qscilexerjson.h \
+ ./Qsci/qscilexerhtml.h \
+ ./Qsci/qscilexerxml.h \
+ ./Qsci/qscilexerjavascript.h \
+ ./Qsci/qscilexercpp.h \
+ ./Qsci/qscilexerpython.h \
+ ./Qsci/qscimacro.h \
+ SciClasses.h \
+ ScintillaQt.h \
+ SciAccessibility.h
SOURCES = \
qsciscintilla.cpp \
@@ -216,161 +165,28 @@
qscicommandset.cpp \
qscidocument.cpp \
qscilexer.cpp \
- qscilexeravs.cpp \
- qscilexerbash.cpp \
- qscilexerbatch.cpp \
- qscilexercmake.cpp \
- qscilexercoffeescript.cpp \
- qscilexercpp.cpp \
- qscilexercsharp.cpp \
- qscilexercss.cpp \
qscilexercustom.cpp \
- qscilexerd.cpp \
- qscilexerdiff.cpp \
- qscilexeredifact.cpp \
- qscilexerfortran.cpp \
- qscilexerfortran77.cpp \
+ qscilexersql.cpp \
+ qscilexerjson.cpp \
qscilexerhtml.cpp \
- qscilexeridl.cpp \
- qscilexerjava.cpp \
+ qscilexerxml.cpp \
qscilexerjavascript.cpp \
- qscilexerjson.cpp \
- qscilexerlua.cpp \
- qscilexermakefile.cpp \
- qscilexermarkdown.cpp \
- qscilexermatlab.cpp \
- qscilexeroctave.cpp \
- qscilexerpascal.cpp \
- qscilexerperl.cpp \
- qscilexerpostscript.cpp \
- qscilexerpo.cpp \
- qscilexerpov.cpp \
- qscilexerproperties.cpp \
+ qscilexercpp.cpp \
qscilexerpython.cpp \
- qscilexerruby.cpp \
- qscilexerspice.cpp \
- qscilexersql.cpp \
- qscilexertcl.cpp \
- qscilexertex.cpp \
- qscilexerverilog.cpp \
- qscilexervhdl.cpp \
- qscilexerxml.cpp \
- qscilexeryaml.cpp \
qscimacro.cpp \
qsciprinter.cpp \
qscistyle.cpp \
qscistyledtext.cpp \
- MacPasteboardMime.cpp \
- InputMethod.cpp \
- SciAccessibility.cpp \
+ MacPasteboardMime.cpp \
+ InputMethod.cpp \
SciClasses.cpp \
ListBoxQt.cpp \
PlatQt.cpp \
ScintillaQt.cpp \
- ../lexers/LexA68k.cpp \
- ../lexers/LexAbaqus.cpp \
- ../lexers/LexAda.cpp \
- ../lexers/LexAPDL.cpp \
- ../lexers/LexAsm.cpp \
- ../lexers/LexAsn1.cpp \
- ../lexers/LexASY.cpp \
- ../lexers/LexAU3.cpp \
- ../lexers/LexAVE.cpp \
- ../lexers/LexAVS.cpp \
- ../lexers/LexBaan.cpp \
- ../lexers/LexBash.cpp \
- ../lexers/LexBasic.cpp \
- ../lexers/LexBatch.cpp \
- ../lexers/LexBibTeX.cpp \
- ../lexers/LexBullant.cpp \
- ../lexers/LexCaml.cpp \
- ../lexers/LexCLW.cpp \
- ../lexers/LexCmake.cpp \
- ../lexers/LexCOBOL.cpp \
- ../lexers/LexCoffeeScript.cpp \
- ../lexers/LexConf.cpp \
- ../lexers/LexCPP.cpp \
- ../lexers/LexCrontab.cpp \
- ../lexers/LexCsound.cpp \
- ../lexers/LexCSS.cpp \
- ../lexers/LexD.cpp \
- ../lexers/LexDiff.cpp \
- ../lexers/LexDMAP.cpp \
- ../lexers/LexDMIS.cpp \
- ../lexers/LexECL.cpp \
- ../lexers/LexEDIFACT.cpp \
- ../lexers/LexEiffel.cpp \
- ../lexers/LexErlang.cpp \
- ../lexers/LexErrorList.cpp \
- ../lexers/LexEScript.cpp \
- ../lexers/LexFlagship.cpp \
- ../lexers/LexForth.cpp \
- ../lexers/LexFortran.cpp \
- ../lexers/LexGAP.cpp \
- ../lexers/LexGui4Cli.cpp \
- ../lexers/LexHaskell.cpp \
- ../lexers/LexHex.cpp \
- ../lexers/LexHTML.cpp \
- ../lexers/LexInno.cpp \
- ../lexers/LexJSON.cpp \
- ../lexers/LexKix.cpp \
- ../lexers/LexKVIrc.cpp \
- ../lexers/LexLaTeX.cpp \
- ../lexers/LexLisp.cpp \
- ../lexers/LexLout.cpp \
- ../lexers/LexLua.cpp \
- ../lexers/LexMagik.cpp \
- ../lexers/LexMake.cpp \
- ../lexers/LexMarkdown.cpp \
- ../lexers/LexMatlab.cpp \
- ../lexers/LexMetapost.cpp \
- ../lexers/LexMMIXAL.cpp \
- ../lexers/LexModula.cpp \
- ../lexers/LexMPT.cpp \
- ../lexers/LexMSSQL.cpp \
- ../lexers/LexMySQL.cpp \
- ../lexers/LexNimrod.cpp \
- ../lexers/LexNsis.cpp \
- ../lexers/LexNull.cpp \
- ../lexers/LexOpal.cpp \
- ../lexers/LexOScript.cpp \
- ../lexers/LexPascal.cpp \
- ../lexers/LexPB.cpp \
- ../lexers/LexPerl.cpp \
- ../lexers/LexPLM.cpp \
- ../lexers/LexPO.cpp \
- ../lexers/LexPOV.cpp \
- ../lexers/LexPowerPro.cpp \
- ../lexers/LexPowerShell.cpp \
- ../lexers/LexProgress.cpp \
- ../lexers/LexProps.cpp \
- ../lexers/LexPS.cpp \
- ../lexers/LexPython.cpp \
- ../lexers/LexR.cpp \
- ../lexers/LexRebol.cpp \
- ../lexers/LexRegistry.cpp \
- ../lexers/LexRuby.cpp \
- ../lexers/LexRust.cpp \
- ../lexers/LexScriptol.cpp \
- ../lexers/LexSmalltalk.cpp \
- ../lexers/LexSML.cpp \
- ../lexers/LexSorcus.cpp \
- ../lexers/LexSpecman.cpp \
- ../lexers/LexSpice.cpp \
+ SciAccessibility.cpp \
../lexers/LexSQL.cpp \
- ../lexers/LexSTTXT.cpp \
- ../lexers/LexTACL.cpp \
- ../lexers/LexTADS3.cpp \
- ../lexers/LexTAL.cpp \
- ../lexers/LexTCL.cpp \
- ../lexers/LexTCMD.cpp \
- ../lexers/LexTeX.cpp \
- ../lexers/LexTxt2tags.cpp \
- ../lexers/LexVB.cpp \
- ../lexers/LexVerilog.cpp \
- ../lexers/LexVHDL.cpp \
- ../lexers/LexVisualProlog.cpp \
- ../lexers/LexYAML.cpp \
+ ../lexers/LexJSON.cpp \
+ ../lexers/LexHTML.cpp \
../lexlib/Accessor.cpp \
../lexlib/CharacterCategory.cpp \
../lexlib/CharacterSet.cpp \
@@ -391,20 +207,20 @@
../src/ContractionState.cpp \
../src/Decoration.cpp \
../src/Document.cpp \
- ../src/EditModel.cpp \
../src/Editor.cpp \
+ ../src/EditModel.cpp \
../src/EditView.cpp \
../src/ExternalLexer.cpp \
../src/Indicator.cpp \
- ../src/KeyMap.cpp \
+ ../src/KeyMap.cpp \
../src/LineMarker.cpp \
../src/MarginView.cpp \
../src/PerLine.cpp \
../src/PositionCache.cpp \
- ../src/RESearch.cpp \
+ ../src/RESearch.cpp \
../src/RunStyles.cpp \
- ../src/ScintillaBase.cpp \
- ../src/Selection.cpp \
+ ../src/ScintillaBase.cpp \
+ ../src/Selection.cpp \
../src/Style.cpp \
../src/UniConversion.cpp \
../src/ViewStyle.cpp \
+131
View File
@@ -0,0 +1,131 @@
--- QScintilla_gpl-2.10.8/src/Catalogue.cpp 2018-10-01 15:41:57.000000000 +0200
+++ qscintilla/src/Catalogue.cpp 2018-11-18 16:09:52.796704316 +0100
@@ -77,124 +77,10 @@
//++Autogenerated -- run scripts/LexGen.py to regenerate
//**\(\tLINK_LEXER(\*);\n\)
- LINK_LEXER(lmA68k);
- LINK_LEXER(lmAbaqus);
- LINK_LEXER(lmAda);
- LINK_LEXER(lmAPDL);
- LINK_LEXER(lmAs);
- LINK_LEXER(lmAsm);
- LINK_LEXER(lmAsn1);
- LINK_LEXER(lmASY);
- LINK_LEXER(lmAU3);
- LINK_LEXER(lmAVE);
- LINK_LEXER(lmAVS);
- LINK_LEXER(lmBaan);
- LINK_LEXER(lmBash);
- LINK_LEXER(lmBatch);
- LINK_LEXER(lmBibTeX);
- LINK_LEXER(lmBlitzBasic);
- LINK_LEXER(lmBullant);
- LINK_LEXER(lmCaml);
- LINK_LEXER(lmClw);
- LINK_LEXER(lmClwNoCase);
- LINK_LEXER(lmCmake);
- LINK_LEXER(lmCOBOL);
- LINK_LEXER(lmCoffeeScript);
- LINK_LEXER(lmConf);
- LINK_LEXER(lmCPP);
- LINK_LEXER(lmCPPNoCase);
- LINK_LEXER(lmCsound);
- LINK_LEXER(lmCss);
- LINK_LEXER(lmD);
- LINK_LEXER(lmDiff);
- LINK_LEXER(lmDMAP);
- LINK_LEXER(lmDMIS);
- LINK_LEXER(lmECL);
- LINK_LEXER(lmEDIFACT);
- LINK_LEXER(lmEiffel);
- LINK_LEXER(lmEiffelkw);
- LINK_LEXER(lmErlang);
- LINK_LEXER(lmErrorList);
- LINK_LEXER(lmESCRIPT);
- LINK_LEXER(lmF77);
- LINK_LEXER(lmFlagShip);
- LINK_LEXER(lmForth);
- LINK_LEXER(lmFortran);
- LINK_LEXER(lmFreeBasic);
- LINK_LEXER(lmGAP);
- LINK_LEXER(lmGui4Cli);
- LINK_LEXER(lmHaskell);
- LINK_LEXER(lmHTML);
- LINK_LEXER(lmIHex);
- LINK_LEXER(lmInno);
- LINK_LEXER(lmJSON);
- LINK_LEXER(lmKix);
- LINK_LEXER(lmKVIrc);
- LINK_LEXER(lmLatex);
- LINK_LEXER(lmLISP);
- LINK_LEXER(lmLiterateHaskell);
- LINK_LEXER(lmLot);
- LINK_LEXER(lmLout);
- LINK_LEXER(lmLua);
- LINK_LEXER(lmMagikSF);
- LINK_LEXER(lmMake);
- LINK_LEXER(lmMarkdown);
- LINK_LEXER(lmMatlab);
- LINK_LEXER(lmMETAPOST);
- LINK_LEXER(lmMMIXAL);
- LINK_LEXER(lmModula);
- LINK_LEXER(lmMSSQL);
- LINK_LEXER(lmMySQL);
- LINK_LEXER(lmNimrod);
- LINK_LEXER(lmNncrontab);
- LINK_LEXER(lmNsis);
- LINK_LEXER(lmNull);
- LINK_LEXER(lmOctave);
- LINK_LEXER(lmOpal);
- LINK_LEXER(lmOScript);
- LINK_LEXER(lmPascal);
- LINK_LEXER(lmPB);
- LINK_LEXER(lmPerl);
- LINK_LEXER(lmPHPSCRIPT);
- LINK_LEXER(lmPLM);
- LINK_LEXER(lmPO);
- LINK_LEXER(lmPOV);
- LINK_LEXER(lmPowerPro);
- LINK_LEXER(lmPowerShell);
- LINK_LEXER(lmProgress);
- LINK_LEXER(lmProps);
- LINK_LEXER(lmPS);
- LINK_LEXER(lmPureBasic);
- LINK_LEXER(lmPython);
- LINK_LEXER(lmR);
- LINK_LEXER(lmREBOL);
- LINK_LEXER(lmRegistry);
- LINK_LEXER(lmRuby);
- LINK_LEXER(lmRust);
- LINK_LEXER(lmScriptol);
- LINK_LEXER(lmSmalltalk);
- LINK_LEXER(lmSML);
- LINK_LEXER(lmSorc);
- LINK_LEXER(lmSpecman);
- LINK_LEXER(lmSpice);
- LINK_LEXER(lmSQL);
- LINK_LEXER(lmSrec);
- LINK_LEXER(lmSTTXT);
- LINK_LEXER(lmTACL);
- LINK_LEXER(lmTADS3);
- LINK_LEXER(lmTAL);
- LINK_LEXER(lmTCL);
- LINK_LEXER(lmTCMD);
- LINK_LEXER(lmTEHex);
- LINK_LEXER(lmTeX);
- LINK_LEXER(lmTxt2tags);
- LINK_LEXER(lmVB);
- LINK_LEXER(lmVBScript);
- LINK_LEXER(lmVerilog);
- LINK_LEXER(lmVHDL);
- LINK_LEXER(lmVisualProlog);
- LINK_LEXER(lmXML);
- LINK_LEXER(lmYAML);
+ LINK_LEXER(lmSQL);
+ LINK_LEXER(lmJSON);
+ LINK_LEXER(lmHTML);
+ LINK_LEXER(lmXML);
//--Autogenerated -- end of automatically generated section