Mercurial > hg > forks > UniversalIndentGUI
changeset 523:53bcc80dbcaa
Added support for the new QScintilla 2.3 lexers and added a xml example file.
git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@763 59b1889a-e5ac-428c-b0c7-476e01d41282
| author | thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282> |
|---|---|
| date | Sun, 21 Sep 2008 16:56:12 +0000 |
| parents | fd10192343de |
| children | ee21f47b5ffb |
| files | indenters/example.xml src/highlighter.cpp src/highlighter.h |
| diffstat | 3 files changed, 56 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/indenters/example.xml Sun Sep 21 16:56:12 2008 +0000 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> +<verzeichnis> + <titel>Wikipedia Städteverzeichnis</titel> + <eintrag> + <stichwort>Genf</stichwort> + <eintragstext>Genf ist der Sitz von ...</eintragstext> + </eintrag> + <eintrag> + <stichwort>Köln</stichwort> + <eintragstext>Köln ist eine Stadt, die ...</eintragstext> + </eintrag> +</verzeichnis> \ No newline at end of file
--- a/src/highlighter.cpp Sun Sep 21 16:51:43 2008 +0000 +++ b/src/highlighter.cpp Sun Sep 21 16:56:12 2008 +0000 @@ -46,31 +46,38 @@ this->settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(), "UiGuiSyntaxHighlightConfig", this); } - highlightningIsOn = true; mapHighlighternameToExtension["Bash"] = QStringList() << "sh"; mapHighlighternameToExtension["Batch"] = QStringList() << "bat"; + mapHighlighternameToExtension["CMake"] = QStringList() << "cmake"; mapHighlighternameToExtension["C++"] = QStringList() << "c" << "h" << "cpp" << "hpp" << "cxx" << "hxx"; mapHighlighternameToExtension["C#"] = QStringList() << "cs"; mapHighlighternameToExtension["CSS"] = QStringList() << "css"; mapHighlighternameToExtension["D"] = QStringList() << "d"; mapHighlighternameToExtension["Diff"] = QStringList() << "diff"; + mapHighlighternameToExtension["Fortran"] = QStringList() << "f" << "for"; + mapHighlighternameToExtension["Fortran77"] = QStringList() << "f77"; mapHighlighternameToExtension["HTML"] = QStringList() << "html"; mapHighlighternameToExtension["IDL"] = QStringList() << "idl"; mapHighlighternameToExtension["Java"] = QStringList() << "java"; mapHighlighternameToExtension["JavaScript"] = QStringList() << "js"; mapHighlighternameToExtension["LUA"] = QStringList() << "lua"; mapHighlighternameToExtension["Makefile"] = QStringList() << "makefile"; + mapHighlighternameToExtension["Pascal"] = QStringList() << "pas"; mapHighlighternameToExtension["Perl"] = QStringList() << "perl" << "pl" << "pm"; mapHighlighternameToExtension["PHP"] = QStringList() << "php"; + mapHighlighternameToExtension["PostScript"] = QStringList() << "ps" << "eps" << "pdf" << "ai" << "fh"; mapHighlighternameToExtension["POV"] = QStringList() << "pov"; mapHighlighternameToExtension["Ini"] = QStringList() << "ini"; mapHighlighternameToExtension["Python"] = QStringList() << "py"; - mapHighlighternameToExtension["Ruby"] = QStringList() << "rub"; + mapHighlighternameToExtension["Ruby"] = QStringList() << "rub" << "rb"; mapHighlighternameToExtension["SQL"] = QStringList() << "sql"; + mapHighlighternameToExtension["TCL"] = QStringList() << "tcl"; mapHighlighternameToExtension["TeX"] = QStringList() << "tex"; + mapHighlighternameToExtension["VHDL"] = QStringList() << "vhdl"; mapHighlighternameToExtension["XML"] = QStringList() << "xml"; + mapHighlighternameToExtension["YAML"] = QStringList() << "yaml"; lexer = 0; @@ -314,6 +321,9 @@ else if ( extension == "bat" ) { lexer = new QsciLexerBatch(); } + else if ( extension == "cmake" ) { + lexer = new QsciLexerCMake(); + } else if ( extension == "cs" ) { lexer = new QsciLexerCSharp(); } @@ -326,6 +336,12 @@ else if ( extension == "diff" ) { lexer = new QsciLexerDiff(); } + else if ( extension == "f" || extension == "for" ) { + lexer = new QsciLexerFortran(); + } + else if ( extension == "f77" ) { + lexer = new QsciLexerFortran77(); + } else if ( extension == "html" ) { lexer = new QsciLexerHTML(); } @@ -344,12 +360,18 @@ else if ( extension == "makefile" ) { lexer = new QsciLexerMakefile(); } + else if ( extension == "pas" ) { + lexer = new QsciLexerPascal(); + } else if ( extension == "perl" || extension == "pl" || extension == "pm" ) { lexer = new QsciLexerPerl(); } else if ( extension == "php" ) { lexer = new QsciLexerHTML(); } + else if ( extension == "ps" || extension == "eps" || extension == "pdf" || extension == "ai" || extension == "fh") { + lexer = new QsciLexerPostScript(); + } else if ( extension == "pov" ) { lexer = new QsciLexerPOV(); } @@ -359,18 +381,27 @@ else if ( extension == "py" ) { lexer = new QsciLexerPython(); } - else if ( extension == "rub" ) { + else if ( extension == "rub" || extension == "rb" ) { lexer = new QsciLexerRuby(); } else if ( extension == "sql" ) { lexer = new QsciLexerSQL(); } + else if ( extension == "tcl" ) { + lexer = new QsciLexerTCL(); + } else if ( extension == "tex" ) { lexer = new QsciLexerTeX(); } + else if ( extension == "vhdl" ) { + lexer = new QsciLexerVHDL(); + } else if ( extension == "xml" ) { - lexer = new QsciLexerHTML(); + lexer = new QsciLexerXML(); } + else if ( extension == "yaml" ) { + lexer = new QsciLexerYAML(); + } else { lexer = new QsciLexerCPP(); extension = "cpp";
--- a/src/highlighter.h Sun Sep 21 16:51:43 2008 +0000 +++ b/src/highlighter.h Sun Sep 21 16:56:12 2008 +0000 @@ -28,24 +28,33 @@ #include <Qsci/qscilexer.h> #include <Qsci/qscilexerbash.h> #include <Qsci/qscilexerbatch.h> +#include <Qsci/qscilexercmake.h> #include <Qsci/qscilexercpp.h> #include <Qsci/qscilexercsharp.h> #include <Qsci/qscilexercss.h> #include <Qsci/qscilexerd.h> #include <Qsci/qscilexerdiff.h> +#include <Qsci/qscilexerfortran.h> +#include <Qsci/qscilexerfortran77.h> #include <Qsci/qscilexerhtml.h> #include <Qsci/qscilexeridl.h> #include <Qsci/qscilexerjava.h> #include <Qsci/qscilexerjavascript.h> #include <Qsci/qscilexerlua.h> #include <Qsci/qscilexermakefile.h> +#include <Qsci/qscilexerpascal.h> #include <Qsci/qscilexerperl.h> +#include <Qsci/qscilexerpostscript.h> #include <Qsci/qscilexerpov.h> #include <Qsci/qscilexerproperties.h> #include <Qsci/qscilexerpython.h> #include <Qsci/qscilexerruby.h> #include <Qsci/qscilexersql.h> +#include <Qsci/qscilexertcl.h> #include <Qsci/qscilexertex.h> +#include <Qsci/qscilexervhdl.h> +#include <Qsci/qscilexerxml.h> +#include <Qsci/qscilexeryaml.h> class Highlighter : public QObject