From 0c7e9633dec430cc1246f9015349499b07aeefa1 Mon Sep 17 00:00:00 2001 From: "David C. Rankin" Date: Wed, 20 Feb 2019 12:06:48 -0600 Subject: [PATCH] Version 0.2.4 - Feature update, add language-specs apache.lang (.conf files), asm-intel.lang, gnuplot.lang, and xorg.conf.lang. --- gtk_appdata.h | 2 +- gtk_menu.c | 2 +- gtk_sourceview.c | 71 ++++++++++++++++++++++++--------------------- styles/gtkwrite.xml | 4 +-- 4 files changed, 42 insertions(+), 37 deletions(-) diff --git a/gtk_appdata.h b/gtk_appdata.h index 5cfa38f..9ce76f1 100644 --- a/gtk_appdata.h +++ b/gtk_appdata.h @@ -48,7 +48,7 @@ #define HAVEMSWIN 1 #endif -#define VER "0.2.3" +#define VER "0.2.4" #define SITE "https://www.rankinlawfirm.com" #define LICENSE "gpl-2.0.txt" #define CFGDIR "gtkwrite" diff --git a/gtk_menu.c b/gtk_menu.c index 018f3d8..4e1c33c 100644 --- a/gtk_menu.c +++ b/gtk_menu.c @@ -1420,7 +1420,7 @@ void help_about (kwinst *app) }; static const gchar copyright[] = \ - "Copyright \xc2\xa9 2018 David C. Rankin"; + "Copyright \xc2\xa9 2019 David C. Rankin"; static const gchar comments[] = APPSTR; diff --git a/gtk_sourceview.c b/gtk_sourceview.c index ffb058c..a048f50 100644 --- a/gtk_sourceview.c +++ b/gtk_sourceview.c @@ -455,39 +455,44 @@ void sourceview_set_comment_syntax (kwinst *app) const gchar *lang_id = gtk_source_language_get_id (app->language); - const comment_t cmtsyntax[] = { { "ada" , "-- ", NULL, NULL }, - { "asp" , "' " , NULL, NULL }, - { "awk" , "# " , NULL, NULL }, - { "c" , "// ", "/* ", " */" }, - { "chdr" , "// ", "/* ", " */" }, - { "c-sharp" , "// ", "/* ", " */" }, - { "cmake" , "# " , NULL, NULL }, - { "cpp" , "// ", "/* ", " */" }, - { "desktop" , "# " , NULL, NULL }, - { "diff" , "# " , NULL, NULL }, - { "dosbatch", "rem " , NULL, NULL }, - { "erlang" , "% ", NULL, NULL }, - { "fortran" , "!* ", NULL, NULL }, - { "gtkrc" , "# " , NULL, NULL }, - { "haskell" , "-- ", "{- ", " -}" }, - { "html" , NULL, "" }, - { "java" , "// ", "/* ", " */" }, - { "js" , "// ", "/* ", " */" }, - { "lua" , "-- ", "--[[ ", " --]]", }, - { "makefile", "# " , NULL, NULL }, - { "objc" , NULL, "/* ", " */" }, - { "octave" , "% ", NULL, NULL }, - { "pascal" , NULL, "(* ", " *)", }, - { "perl" , "# " , NULL, NULL }, - { "php" , "// ", "/* ", " */" }, - { "python" , "# ", NULL, NULL }, - { "rpmspec" , "# ", NULL, NULL }, - { "ruby" , "# ", NULL, NULL }, - { "sql" , "-- ", NULL, NULL }, - { "sh" , "# ", NULL, NULL }, - { "vbnet" , "' " , NULL, NULL }, - { "xml" , NULL, "" }, - { NULL , NULL, NULL, NULL }}; + const comment_t cmtsyntax[] = { { "ada" , "-- ", NULL, NULL }, + { "apache" , "# " , NULL, NULL }, + { "asm-intel", "; " , NULL, NULL }, + { "asp" , "' " , NULL, NULL }, + { "awk" , "# " , NULL, NULL }, + { "c" , "// ", "/* ", " */" }, + { "chdr" , "// ", "/* ", " */" }, + { "c-sharp" , "// ", "/* ", " */" }, + { "cmake" , "# " , NULL, NULL }, + { "conf" , "# " , NULL, NULL }, + { "cpp" , "// ", "/* ", " */" }, + { "css" , NULL, "/* ", " */" }, + { "desktop" , "# " , NULL, NULL }, + { "diff" , "# " , NULL, NULL }, + { "dosbatch" , "rem " , NULL, NULL }, + { "erlang" , "% ", NULL, NULL }, + { "fortran" , "!* ", NULL, NULL }, + { "gnuplot" , "# " , NULL, NULL }, + { "gtkrc" , "# " , NULL, NULL }, + { "haskell" , "-- ", "{- ", " -}" }, + { "html" , NULL, "" }, + { "java" , "// ", "/* ", " */" }, + { "js" , "// ", "/* ", " */" }, + { "lua" , "-- ", "--[[ ", " --]]", }, + { "makefile" , "# " , NULL, NULL }, + { "objc" , NULL, "/* ", " */" }, + { "octave" , "% ", NULL, NULL }, + { "pascal" , NULL, "(* ", " *)", }, + { "perl" , "# " , NULL, NULL }, + { "php" , "// ", "/* ", " */" }, + { "python" , "# ", NULL, NULL }, + { "rpmspec" , "# ", NULL, NULL }, + { "ruby" , "# ", NULL, NULL }, + { "sql" , "-- ", NULL, NULL }, + { "sh" , "# ", NULL, NULL }, + { "vbnet" , "' " , NULL, NULL }, + { "xml" , NULL, "" }, + { NULL , NULL, NULL, NULL }}; gint i = 0; if (!lang_id) diff --git a/styles/gtkwrite.xml b/styles/gtkwrite.xml index 4ea6d26..740aad7 100644 --- a/styles/gtkwrite.xml +++ b/styles/gtkwrite.xml @@ -32,7 +32,7 @@ - + @@ -67,7 +67,7 @@