Mercurial > mxe-octave

changeset 3291:d14352d4ab8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update qscintilla to 2.8 * index.html: update qscintilla-version to 2.8 * src/qscintilla.mk: update checksum for 2.8 tarball. * src/qscintilla-1-matlab-blockcomments.patch: removed patch file.
author John Donoghue <john.donoghue@ieee.org>
date Fri, 08 Nov 2013 20:29:06 -0500
parents dc1eedc77dbb
children fda357ce9f64
files index.html src/qscintilla-1-matlab-blockcomments.patch src/qscintilla.mk
diffstat 3 files changed, 2 insertions(+), 140 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Thu Nov 07 13:15:27 2013 -0500
+++ b/index.html	Fri Nov 08 20:29:06 2013 -0500
@@ -2168,7 +2168,7 @@
     </tr>
     <tr>
         <td id="qscintilla-package">qscintilla</td>
-        <td id="qscintilla-version">2.7.2</td>
+        <td id="qscintilla-version">2.8</td>
         <td id="qscintilla-website"><a href="http://www.riverbankcomputing.com/software/qscintilla/intro">QScintilla</a></td>
     </tr>
     <tr>
--- a/src/qscintilla-1-matlab-blockcomments.patch	Thu Nov 07 13:15:27 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-diff -p -u -r QScintilla-gpl-2.7.2-snapshot-0714ef531ead.orig/lexers/LexMatlab.cpp QScintilla-gpl-2.7.2-snapshot-0714ef531ead/lexers/LexMatlab.cpp
---- QScintilla-gpl-2.7.2-snapshot-0714ef531ead.orig/lexers/LexMatlab.cpp	2013-05-14 20:55:15.000000000 -0400
-+++ QScintilla-gpl-2.7.2-snapshot-0714ef531ead/lexers/LexMatlab.cpp	2013-05-14 20:56:15.000000000 -0400
-@@ -6,6 +6,12 @@
-  ** Changes by Christoph Dalitz 2003/12/04:
-  **   - added support for Octave
-  **   - Strings can now be included both in single or double quotes
-+ **
-+ ** Changes by John Donoghue 2012/04/02
-+ **   - added block comment (and nested block comments)
-+ **   - added ... displayed as a comment
-+ **   - removed unused IsAWord functions
-+ **   - added some comments
-  **/
- // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
- // The License.txt file describes the conditions under which this software may be distributed.
-@@ -48,14 +54,6 @@ static bool IsOctaveComment(Accessor &st
- 	return len > 0 && IsOctaveCommentChar(styler[pos]) ;
- }
- 
--static inline bool IsAWordChar(const int ch) {
--	return (ch < 0x80) && (isalnum(ch) || ch == '_');
--}
--
--static inline bool IsAWordStart(const int ch) {
--	return (ch < 0x80) && (isalnum(ch) || ch == '_');
--}
--
- static void ColouriseMatlabOctaveDoc(
-             unsigned int startPos, int length, int initStyle,
-             WordList *keywordlists[], Accessor &styler,
-@@ -65,12 +63,41 @@ static void ColouriseMatlabOctaveDoc(
- 
- 	styler.StartAt(startPos);
- 
-+	// boolean for when the ' is allowed to be transpose vs the start/end 
-+	// of a string
- 	bool transpose = false;
- 
-+	// approximate position of first non space character in a line
-+	int nonSpaceColumn = -1;
-+	// approximate column position of the current character in a line
-+	int column = 0;
-+
-+        // use the line state of each line to store the block comment depth
-+	int curLine = styler.GetLine(startPos);
-+        int commentDepth = curLine > 0 ? styler.GetLineState(curLine-1) : 0;
-+
-+
- 	StyleContext sc(startPos, length, initStyle, styler);
- 
--	for (; sc.More(); sc.Forward()) {
-+	for (; sc.More(); sc.Forward(), column++) {
-+
-+               	if(sc.atLineStart) {
-+			// set the line state to the current commentDepth 
-+			curLine = styler.GetLine(sc.currentPos);
-+                        styler.SetLineState(curLine, commentDepth);
-+
-+			// reset the column to 0, nonSpace to -1 (not set)
-+			column = 0;
-+			nonSpaceColumn = -1; 
-+		}
-+
-+		// save the column position of first non space character in a line
-+		if((nonSpaceColumn == -1) && (! IsASpace(sc.ch)))
-+		{
-+			nonSpaceColumn = column;
-+		}
- 
-+		// check for end of states
- 		if (sc.state == SCE_MATLAB_OPERATOR) {
- 			if (sc.chPrev == '.') {
- 				if (sc.ch == '*' || sc.ch == '/' || sc.ch == '\\' || sc.ch == '^') {
-@@ -79,6 +106,10 @@ static void ColouriseMatlabOctaveDoc(
- 				} else if (sc.ch == '\'') {
- 					sc.ForwardSetState(SCE_MATLAB_DEFAULT);
- 					transpose = true;
-+                                } else if(sc.ch == '.' && sc.chNext == '.') {
-+                                        // we werent an operator, but a '...' 
-+                                        sc.ChangeState(SCE_MATLAB_COMMENT);
-+                                        transpose = false;
- 				} else {
- 					sc.SetState(SCE_MATLAB_DEFAULT);
- 				}
-@@ -121,15 +152,51 @@ static void ColouriseMatlabOctaveDoc(
- 			} else if (sc.ch == '\"') {
- 				sc.ForwardSetState(SCE_MATLAB_DEFAULT);
- 			}
--		} else if (sc.state == SCE_MATLAB_COMMENT || sc.state == SCE_MATLAB_COMMAND) {
-+		} else if (sc.state == SCE_MATLAB_COMMAND) {
- 			if (sc.atLineEnd) {
- 				sc.SetState(SCE_MATLAB_DEFAULT);
- 				transpose = false;
- 			}
-+		} else if (sc.state == SCE_MATLAB_COMMENT) {
-+			// end or start of a nested a block comment?
-+			if( IsCommentChar(sc.ch) && sc.chNext == '}' && nonSpaceColumn == column) {
-+                           	if(commentDepth > 0) commentDepth --;
-+ 
-+				curLine = styler.GetLine(sc.currentPos);
-+				styler.SetLineState(curLine, commentDepth);
-+				sc.Forward();
-+
-+				if (commentDepth == 0) {
-+					sc.ForwardSetState(SCE_D_DEFAULT);
-+					transpose = false;
-+				}
-+                        }
-+                        else if( IsCommentChar(sc.ch) && sc.chNext == '{' && nonSpaceColumn == column)
-+                        {
-+ 				commentDepth ++;
-+
-+				curLine = styler.GetLine(sc.currentPos);
-+				styler.SetLineState(curLine, commentDepth);
-+				sc.Forward();
-+				transpose = false;
-+
-+                        } else if(commentDepth == 0) {
-+				// single line comment
-+				if (sc.atLineEnd || sc.ch == '\r' || sc.ch == '\n') {
-+					sc.SetState(SCE_MATLAB_DEFAULT);
-+					transpose = false;
-+				}
-+			}
- 		}
- 
-+		// check start of a new state
- 		if (sc.state == SCE_MATLAB_DEFAULT) {
- 			if (IsCommentChar(sc.ch)) {
-+				// ncrement depth if we are a block comment
-+				if(sc.chNext == '{' && nonSpaceColumn == column)
-+					commentDepth ++;
-+				curLine = styler.GetLine(sc.currentPos);
-+				styler.SetLineState(curLine, commentDepth);
- 				sc.SetState(SCE_MATLAB_COMMENT);
- 			} else if (sc.ch == '!' && sc.chNext != '=' ) {
- 				sc.SetState(SCE_MATLAB_COMMAND);
--- a/src/qscintilla.mk	Thu Nov 07 13:15:27 2013 -0500
+++ b/src/qscintilla.mk	Fri Nov 08 20:29:06 2013 -0500
@@ -3,7 +3,7 @@
 
 PKG             := qscintilla
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 2a11fb6be2c3005bc6502f929a0a339d4303af9b
+$(PKG)_CHECKSUM := 3edf9d476d4e6af0706a4d33401667a38e3a697e
 $(PKG)_SUBDIR   := QScintilla-gpl-$($(PKG)_VERSION)
 $(PKG)_FILE     := QScintilla-gpl-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-$($(PKG)_VERSION)/$($(PKG)_FILE)