[geany/geany] 4ffd44: Update for new PO styles

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Thu, 25 Oct 2012 15:09:55
Commit:      4ffd446c43986385170a2e144f951557e101ec05
             https://github.com/geany/geany/commit/4ffd446c43986385170a2e144f951557e101ec05

Log Message:
-----------
Update for new PO styles


Modified Paths:
--------------
    data/filetypes.po
    src/highlighting.c
    src/highlightingmappings.h

Modified: data/filetypes.po
9 files changed, 8 insertions(+), 1 deletions(-)
===================================================================
@@ -3,13 +3,20 @@
 # Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
+programmer_comment=comment_doc
+reference=comment
+flags=comment
+fuzzy=comment_doc_keyword
 msgid=keyword_1
 msgid_text=string_1
+msgid_text_eol=string_eol
 msgstr=keyword_2
 msgstr_text=string_1
+msgstr_text_eol=string_eol
 msgctxt=keyword_3
 msgctxt_text=string_1
-fuzzy=comment_doc_keyword
+msgctxt_text_eol=string_eol
+error=error
 
 [settings]
 # default extension used when saving files


Modified: src/highlighting.c
11 files changed, 10 insertions(+), 1 deletions(-)
===================================================================
@@ -1469,6 +1469,14 @@ gboolean highlighting_is_string_style(gint lexer, gint style)
 				style == SCE_PL_XLAT
 				/* we don't include any STRING_*_VAR for autocompletion */);
 
+		case SCLEX_PO:
+			return (style == SCE_PO_MSGCTXT_TEXT ||
+				style == SCE_PO_MSGCTXT_TEXT_EOL ||
+				style == SCE_PO_MSGID_TEXT ||
+				style == SCE_PO_MSGID_TEXT_EOL ||
+				style == SCE_PO_MSGSTR_TEXT ||
+				style == SCE_PO_MSGSTR_TEXT_EOL);
+
 		case SCLEX_R:
 			return (style == SCE_R_STRING);
 
@@ -1610,7 +1618,8 @@ gboolean highlighting_is_comment_style(gint lexer, gint style)
 			return (style == SCE_PROPS_COMMENT);
 
 		case SCLEX_PO:
-			return (style == SCE_PO_COMMENT);
+			return (style == SCE_PO_COMMENT ||
+				style == SCE_PO_PROGRAMMER_COMMENT);
 
 		case SCLEX_LATEX:
 			return (style == SCE_L_COMMENT ||


Modified: src/highlightingmappings.h
25 files changed, 16 insertions(+), 9 deletions(-)
===================================================================
@@ -1080,15 +1080,22 @@
 #define highlighting_lexer_PO		SCLEX_PO
 static const HLStyle highlighting_styles_PO[] =
 {
-	{ SCE_PO_DEFAULT,		"default",			FALSE },
-	{ SCE_PO_COMMENT,		"comment",			FALSE },
-	{ SCE_PO_MSGID,			"msgid",			FALSE },
-	{ SCE_PO_MSGID_TEXT,	"msgid_text",		FALSE },
-	{ SCE_PO_MSGSTR,		"msgstr",			FALSE },
-	{ SCE_PO_MSGSTR_TEXT,	"msgstr_text",		FALSE },
-	{ SCE_PO_MSGCTXT,		"msgctxt",			FALSE },
-	{ SCE_PO_MSGCTXT_TEXT,	"msgctxt_text",		FALSE },
-	{ SCE_PO_FUZZY,			"fuzzy",			FALSE }
+	{ SCE_PO_DEFAULT,				"default",				FALSE },
+	{ SCE_PO_COMMENT,				"comment",				FALSE },
+	{ SCE_PO_PROGRAMMER_COMMENT,	"programmer_comment",	FALSE },
+	{ SCE_PO_REFERENCE,				"reference",			FALSE },
+	{ SCE_PO_FLAGS,					"flags",				FALSE },
+	{ SCE_PO_FUZZY,					"fuzzy",				FALSE },
+	{ SCE_PO_MSGID,					"msgid",				FALSE },
+	{ SCE_PO_MSGID_TEXT,			"msgid_text",			FALSE },
+	{ SCE_PO_MSGID_TEXT_EOL,		"msgid_text_eol",		FALSE },
+	{ SCE_PO_MSGSTR,				"msgstr",				FALSE },
+	{ SCE_PO_MSGSTR_TEXT,			"msgstr_text",			FALSE },
+	{ SCE_PO_MSGSTR_TEXT_EOL,		"msgstr_text_eol",		FALSE },
+	{ SCE_PO_MSGCTXT,				"msgctxt",				FALSE },
+	{ SCE_PO_MSGCTXT_TEXT,			"msgctxt_text",			FALSE },
+	{ SCE_PO_MSGCTXT_TEXT_EOL,		"msgctxt_text_eol",		FALSE },
+	{ SCE_PO_ERROR,					"error",				FALSE }
 };
 #define highlighting_keywords_PO	EMPTY_KEYWORDS
 #define highlighting_properties_PO	EMPTY_PROPERTIES



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).