diff options
| -rw-r--r-- | License.txt | 1 | ||||
| -rw-r--r-- | distrib/license.txt | 3 | ||||
| -rw-r--r-- | scintilla/lexers/LexHTML.cxx | 15 | ||||
| -rw-r--r-- | src/Version.h | 6 |
4 files changed, 14 insertions, 11 deletions
diff --git a/License.txt b/License.txt index 0368172..601aee8 100644 --- a/License.txt +++ b/License.txt @@ -1,4 +1,5 @@ Notepad2 Copyright © 2004-2011 Florian Balmer
+Notepad2-mod Copyright © 2010-2012 All contributors, see Readme-mod.txt
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/distrib/license.txt b/distrib/license.txt index 4a1b315..c256d91 100644 --- a/distrib/license.txt +++ b/distrib/license.txt @@ -1,4 +1,5 @@ -Notepad2 Copyright © 2004-2011 Florian Balmer
+Notepad2 Copyright © 2004-2012 Florian Balmer
+Notepad2-mod Copyright © 2010-2012 All contributors, see Readme-mod.txt
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/scintilla/lexers/LexHTML.cxx b/scintilla/lexers/LexHTML.cxx index d20d688..5fe4746 100644 --- a/scintilla/lexers/LexHTML.cxx +++ b/scintilla/lexers/LexHTML.cxx @@ -261,28 +261,29 @@ static void classifyAttribHTML(unsigned int start, unsigned int end, WordList &k static int classifyTagHTML(unsigned int start, unsigned int end,
WordList &keywords, Accessor &styler, bool &tagDontFold,
bool caseSensitive, bool isXml, bool allowScripts) {
- char s[30 + 2];
+ char withSpace[30 + 2] = " ";
+ const char *s = withSpace + 1;
// Copy after the '<'
- unsigned int i = 0;
+ unsigned int i = 1;
for (unsigned int cPos = start; cPos <= end && i < 30; cPos++) {
char ch = styler[cPos];
if ((ch != '<') && (ch != '/')) {
- s[i++] = caseSensitive ? ch : static_cast<char>(MakeLowerCase(ch));
+ withSpace[i++] = caseSensitive ? ch : static_cast<char>(MakeLowerCase(ch));
}
}
//The following is only a quick hack, to see if this whole thing would work
//we first need the tagname with a trailing space...
- s[i] = ' ';
- s[i+1] = '\0';
+ withSpace[i] = ' ';
+ withSpace[i+1] = '\0';
// if the current language is XML, I can fold any tag
// if the current language is HTML, I don't want to fold certain tags (input, meta, etc.)
//...to find it in the list of no-container-tags
- tagDontFold = (!isXml) && (NULL != strstr("meta link img area br hr input ", s));
+ tagDontFold = (!isXml) && (NULL != strstr(" area base basefont br col command embed frame hr img input isindex keygen link meta param source track wbr ", withSpace));
//now we can remove the trailing space
- s[i] = '\0';
+ withSpace[i] = '\0';
// No keywords -> all are known
char chAttr = SCE_H_TAGUNKNOWN;
diff --git a/src/Version.h b/src/Version.h index cff2fda..73ee992 100644 --- a/src/Version.h +++ b/src/Version.h @@ -6,7 +6,7 @@ *
* See License.txt for details about distribution and modification.
*
-* (c) XhmikosR 2010-2011
+* (c) XhmikosR 2010-2012
* http://code.google.com/p/notepad2-mod/
*
*
@@ -28,8 +28,8 @@ #define MY_APPNAME L"Notepad2-mod"
#define VERSION_FILEVERSION_NUM VERSION_MAJOR,VERSION_MINOR,VERSION_BUILD,VERSION_REV
#define VERSION_FILEVERSION STRINGIFY(VERSION_MAJOR) ", " STRINGIFY(VERSION_MINOR) ", " STRINGIFY(VERSION_BUILD) ", " STRINGIFY(VERSION_REV)
-#define VERSION_LEGALCOPYRIGHT_SHORT L"Copyright © 2004-2011"
-#define VERSION_LEGALCOPYRIGHT_LONG L"© Florian Balmer 2004-2011"
+#define VERSION_LEGALCOPYRIGHT_SHORT L"Copyright © 2004-2012"
+#define VERSION_LEGALCOPYRIGHT_LONG L"© Florian Balmer 2004-2012"
#define VERSION_AUTHORNAME L"Florian Balmer"
#define VERSION_WEBPAGEDISPLAY L"flo's freeware - http://www.flos-freeware.ch"
#define VERSION_EMAILDISPLAY L"florian.balmer@gmail.com"
|