Separate JSON and JavaScript Syntax Highlighter for future.

diff --git a/Externals/crystaledit/editlib/parsers/crystallineparser.cpp b/Externals/crystaledit/editlib/parsers/crystallineparser.cpp
index d55853f..48f2353 100644 (file)
--- a/Externals/crystaledit/editlib/parsers/crystallineparser.cpp
+++ b/Externals/crystaledit/editlib/parsers/crystallineparser.cpp
@@ -8,7 +8,7 @@ namespace CrystalLineParser
 // Tabsize is commented out since we have only GUI setting for it now.
 // Not removed because we may later want to have per-filetype settings again.
 // See ccrystaltextview.h for table declaration.
-TextDefinition m_SourceDefs[39] =
+TextDefinition m_SourceDefs[] =
 {
        SRC_PLAIN, _T ("Plain"), _T ("txt;doc;diz"), &ParseLinePlain, SRCOPT_AUTOINDENT, /*4,*/ _T (""), _T (""), _T (""), (DWORD)-1,
        SRC_ASP, _T ("ASP"), _T ("asp;ascx"), &ParseLineAsp, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T (""), _T (""), _T ("'"), (DWORD)-1,
@@ -26,7 +26,8 @@ TextDefinition m_SourceDefs[39] =
        SRC_INNOSETUP, _T ("InnoSetup"), _T ("iss"), &ParseLineInnoSetup, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("{"), _T ("}"), _T (";"), (DWORD)-1,
        SRC_INSTALLSHIELD, _T ("InstallShield"), _T ("rul"), &ParseLineIS, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
        SRC_JAVA, _T ("Java"), _T ("java;jav"), &ParseLineJava, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
-       SRC_JAVASCRIPT, _T ("JavaScript"), _T ("js;json"), &ParseLineJavaScript, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
+       SRC_JAVASCRIPT, _T ("JavaScript"), _T ("js"), &ParseLineJavaScript, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
+       SRC_JSON, _T ("JSON"), _T ("json"), &ParseLineJavaScript, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
        SRC_LISP, _T ("AutoLISP"), _T ("lsp;dsl"), &ParseLineLisp, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T (";|"), _T ("|;"), _T (";"), (DWORD)-1,
        SRC_LUA, _T ("Lua"), _T ("lua"), &ParseLineLua, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("--[["), _T ("]]"), _T ("--"), (DWORD)-1,
        SRC_NSIS, _T ("NSIS"), _T ("nsi;nsh"), &ParseLineNsis, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T (";"), (DWORD)-1,

diff --git a/Externals/crystaledit/editlib/parsers/crystallineparser.h b/Externals/crystaledit/editlib/parsers/crystallineparser.h
index 3794ba5..e03cc20 100644 (file)
--- a/Externals/crystaledit/editlib/parsers/crystallineparser.h
+++ b/Externals/crystaledit/editlib/parsers/crystallineparser.h
@@ -85,6 +85,7 @@ typedef enum
        SRC_INSTALLSHIELD,\r
        SRC_JAVA,\r
        SRC_JAVASCRIPT,\r
+       SRC_JSON,\r
        SRC_LISP,\r
        SRC_LUA,\r
        SRC_NSIS,\r
@@ -127,7 +128,7 @@ struct TextDefinition
        unsigned encoding;\r
 };\r
 \r
-extern TextDefinition m_SourceDefs[39];\r
+extern TextDefinition m_SourceDefs[40];\r
 \r
 bool IsXKeyword(const TCHAR *pszKey, size_t nKeyLen, const TCHAR *pszKeywordList[], size_t nKeywordListCount, int(*compare)(const TCHAR *, const TCHAR *, size_t));\r
 bool IsXNumber(const TCHAR* pszChars, int nLength);\r

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 7d85ea8..979accb 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -3480,6 +3480,7 @@ BEGIN
     IDS_COLORSCHEME_INSTALLSHIELD "InstallShield"\r
     IDS_COLORSCHEME_JAVA    "Java"\r
     IDS_COLORSCHEME_JAVASCRIPT "JavaScript"\r
+    IDS_COLORSCHEME_JSON    "JSON"\r
     IDS_COLORSCHEME_LISP    "AutoLISP"\r
     IDS_COLORSCHEME_LUA     "Lua"\r
 END\r

diff --git a/Src/resource.h b/Src/resource.h
index c2b20cb..9f72fb9 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -1166,29 +1166,30 @@
 #define IDS_COLORSCHEME_INSTALLSHIELD   33166\r
 #define IDS_COLORSCHEME_JAVA            33167\r
 #define IDS_COLORSCHEME_JAVASCRIPT      33168\r
-#define IDS_COLORSCHEME_LISP            33169\r
-#define IDS_COLORSCHEME_LUA             33170\r
-#define IDS_COLORSCHEME_NSIS            33171\r
-#define IDS_COLORSCHEME_PASCAL          33172\r
-#define IDS_COLORSCHEME_PERL            33173\r
-#define IDS_COLORSCHEME_PHP             33174\r
-#define IDS_COLORSCHEME_PO              33175\r
-#define IDS_COLORSCHEME_POWERSHELL      33176\r
-#define IDS_COLORSCHEME_PYTHON          33177\r
-#define IDS_COLORSCHEME_REXX            33178\r
-#define IDS_COLORSCHEME_RSRC            33179\r
-#define IDS_COLORSCHEME_RUBY            33180\r
-#define IDS_COLORSCHEME_RUST            33181\r
-#define IDS_COLORSCHEME_SGML            33182\r
-#define IDS_COLORSCHEME_SH              33183\r
-#define IDS_COLORSCHEME_SIOD            33184\r
-#define IDS_COLORSCHEME_SQL             33185\r
-#define IDS_COLORSCHEME_TCL             33186\r
-#define IDS_COLORSCHEME_TEX             33187\r
-#define IDS_COLORSCHEME_VERILOG         33188\r
-#define IDS_COLORSCHEME_VHDL            33189\r
-#define IDS_COLORSCHEME_XML             33190\r
-#define ID_COLORSCHEME_LAST             33190 // = IDS_COLORSCHEME_XML\r
+#define IDS_COLORSCHEME_JSON            33169\r
+#define IDS_COLORSCHEME_LISP            33170\r
+#define IDS_COLORSCHEME_LUA             33171\r
+#define IDS_COLORSCHEME_NSIS            33172\r
+#define IDS_COLORSCHEME_PASCAL          33173\r
+#define IDS_COLORSCHEME_PERL            33174\r
+#define IDS_COLORSCHEME_PHP             33175\r
+#define IDS_COLORSCHEME_PO              33176\r
+#define IDS_COLORSCHEME_POWERSHELL      33177\r
+#define IDS_COLORSCHEME_PYTHON          33178\r
+#define IDS_COLORSCHEME_REXX            33179\r
+#define IDS_COLORSCHEME_RSRC            33180\r
+#define IDS_COLORSCHEME_RUBY            33181\r
+#define IDS_COLORSCHEME_RUST            33182\r
+#define IDS_COLORSCHEME_SGML            33183\r
+#define IDS_COLORSCHEME_SH              33184\r
+#define IDS_COLORSCHEME_SIOD            33185\r
+#define IDS_COLORSCHEME_SQL             33186\r
+#define IDS_COLORSCHEME_TCL             33187\r
+#define IDS_COLORSCHEME_TEX             33188\r
+#define IDS_COLORSCHEME_VERILOG         33189\r
+#define IDS_COLORSCHEME_VHDL            33190\r
+#define IDS_COLORSCHEME_XML             33191\r
+#define ID_COLORSCHEME_LAST             33191 // = IDS_COLORSCHEME_XML\r
 #define ID_TOOLBAR_NONE                 33194\r
 #define ID_TOOLBAR_SMALL                33195\r
 #define ID_TOOLBAR_BIG                  33196\r

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 36b97f1..c854a8f 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -3622,3 +3622,4 @@ msgstr "1つのみインスタンスを起動する"
 
 msgid "Allow only one instance to run and wait for the instance to terminate"
 msgstr "1つのインスタンスを起動し、インスタンスの終了を待つ"
+

diff --git a/Translations/WinMerge/StringBlacklist.txt b/Translations/WinMerge/StringBlacklist.txt
index 995117a..b1a74c8 100644 (file)
--- a/Translations/WinMerge/StringBlacklist.txt
+++ b/Translations/WinMerge/StringBlacklist.txt
@@ -28,6 +28,7 @@ InnoSetup
 InstallShield
 Java
 JavaScript
+JSON
 Lua
 AutoLISP
 NSIS