Fix for Pascal, TCL and Fortran lexers

Mezomish · Mar 24, 2011 · 1f30102 · 1f30102
1 parent 7d0c4b8
commit 1f30102
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 137 deletions.
diff --git a/cmake/SomeLexers.cmake b/cmake/SomeLexers.cmake
@@ -1,29 +1,30 @@
 # find TCL lexer
-find_path ( QSCI_TCL_LEXER qscilexertcl.h ${LIBQSCINTILLA2_INCLUDE_DIR} )
+
+find_path ( QSCI_TCL_LEXER qscilexertcl.h ${QSCINTILLA_INCLUDE_DIR} )
 if ( QSCI_TCL_LEXER )
 	ADD_DEFINITIONS (
 		-DJUFF_TCL_LEXER
 	)
 endif ( QSCI_TCL_LEXER )
 
 # find Pascal lexer
-find_path ( QSCI_PASCAL_LEXER qscilexerpascal.h ${LIBQSCINTILLA2_INCLUDE_DIR} )
+find_path ( QSCI_PASCAL_LEXER qscilexerpascal.h ${QSCINTILLA_INCLUDE_DIR} )
 if ( QSCI_PASCAL_LEXER )
 	ADD_DEFINITIONS (
 		-DJUFF_PASCAL_LEXER
 	)
 endif ( QSCI_PASCAL_LEXER )
 
 # find Fortran lexer
-find_path ( QSCI_FORTRAN_LEXER qscilexerfortran.h ${LIBQSCINTILLA2_INCLUDE_DIR} )
+find_path ( QSCI_FORTRAN_LEXER qscilexerfortran.h ${QSCINTILLA_INCLUDE_DIR} )
 if ( QSCI_FORTRAN_LEXER )
 	ADD_DEFINITIONS (
 		-DJUFF_FORTRAN_LEXER
 	)
 endif ( QSCI_FORTRAN_LEXER )
 
 # find CSS3Property
-find_path ( QSCI_CSS_LEXER qscilexercss.h ${LIBQSCINTILLA2_INCLUDE_DIR} )
+find_path ( QSCI_CSS_LEXER qscilexercss.h ${QSCINTILLA_INCLUDE_DIR} )
 if ( QSCI_CSS_LEXER )
 	EXECUTE_PROCESS ( 
 		COMMAND grep CSS3Property ${QSCI_CSS_LEXER}/qscilexercss.h

diff --git a/pack.bat b/pack.bat
@@ -20,6 +20,7 @@ if "%1" == "" GOTO No_Version
 	echo Copying program binaries...
 	copy "build\juffed.exe" "%1"
 	copy "build\libjuff.dll" "%1"
+	copy "build\libjuffed-engine-*.dll" "%1"
 
 	REM localizations, apis, hlschemes
 	echo.
@@ -29,6 +30,12 @@ if "%1" == "" GOTO No_Version
 	copy "apis\*.api" "%1\apis"
 	copy "hlschemes\*.xml" "%1\hlschemes"
 
+	REM plugins
+	echo.
+	echo ----------------------------------
+	echo Copying Plugins...
+	copy "build\plugins\*.dll" "%1\plugins\"
+
 	REM Misc files
 	echo.
 	echo ----------------------------------

diff --git a/src/app/qsci/settings/FileTypeSettings.cpp b/src/app/qsci/settings/FileTypeSettings.cpp
diff --git a/src/lib/FileTypeSettings.cpp b/src/lib/FileTypeSettings.cpp
@@ -20,7 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 QStringList FileTypeSettings::getTypeList() {
-	return Settings::instance()->value("filetypes", "types").toStringList();
+	if ( Settings::instance()->valueExists("filetypes", "types") )
+		return Settings::instance()->value("filetypes", "types").toStringList();
+	else
+		return QStringList();
 }
 
 QStringList FileTypeSettings::getFileNamePatterns(const QString& type) {
@@ -59,6 +62,9 @@ QStringList FileTypeSettings::getFileNamePatterns(const QString& type) {
 		else if ( type == "Diff") {
 			list << "*.diff" << "*.patch";
 		}
+		else if ( type == "Fortran") {
+			list << "*.f" << "*.f77" << "*.f90";
+		}
 		else if ( type == "Haskell") {
 			list << "*.hs" << "*.lhs";
 		}
@@ -95,6 +101,9 @@ QStringList FileTypeSettings::getFileNamePatterns(const QString& type) {
 		else if ( type == "NXC") {
 			list << "*.nxc";
 		}
+		else if ( type == "Pascal") {
+			list << "*.p{1,2}" << "*.pa[s345]";
+		}
 		else if ( type == "Perl") {
 			list << "*.p[lm]";
 		}
@@ -104,6 +113,12 @@ QStringList FileTypeSettings::getFileNamePatterns(const QString& type) {
 		else if ( type == "PHP") {
 			list << "*.php*";
 		}
+		else if ( type == "Qore") {
+			list << "*.q" << "*.qc" << "*.ql";
+		}
+		else if ( type == "Qorus") {
+			list << "*.qfd" << "*.qwf" << "*.qsd" << "*.qclass";
+		}
 		else if ( type == "Ruby") {
 			list << "*.rb";
 		}
@@ -113,18 +128,12 @@ QStringList FileTypeSettings::getFileNamePatterns(const QString& type) {
 		else if ( type == "TeX") {
 			list << "*.tex";
 		}
+		else if ( type == "TCL") {
+			list << "*.tcl";
+		}
 		else if ( type == "XML") {
 			list << "*.xml";
 		}
-		else if ( type == "Fortran") {
-			list << "*.f" << "*.f77" << "*.f90";
-		}
-		else if ( type == "Qore") {
-			list << "*.q" << "*.qc" << "*.ql";
-		}
-		else if ( type == "Qorus") {
-			list << "*.qfd" << "*.qwf" << "*.qsd" << "*.qclass";
-		}
 
 		return list;
 	}
@@ -143,6 +152,8 @@ QStringList FileTypeSettings::getFirstLinePatterns(const QString& type) {
 			list << "Index: *";
 		else if ( type == "HTML") 
 			list << "<!doctype html*" << "<html*";
+		else if ( type == "Pascal") 
+			list << "program *" << "unit *";
 		else if ( type == "Perl") 
 			list << "*perl*";
 		else if ( type == "Python")