Fixup various filedefs mappings

data/filetypes.ada

@@ -10,8 +10,8 @@ character=string_1
 charactereol=string_eol
 string=string_1
 stringeol=string_eol
-label=preprocessor
-commentline=comment
+label=label
+commentline=comment_line
 illegal=error
 
 [keywords]

data/filetypes.asm

@@ -2,7 +2,7 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-comment=comment
+comment=comment_line
 number=number_1
 string=string_1
 operator=operator

data/filetypes.c

@@ -3,7 +3,7 @@
 # Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
-commentline=comment
+commentline=comment_line
 commentdoc=comment_doc
 number=number_1
 word=keyword_1
@@ -17,7 +17,7 @@ identifier=identifier_1
 stringeol=string_eol
 verbatim=string_2
 regex=regex
-commentlinedoc=comment_doc
+commentlinedoc=comment_line_doc
 commentdockeyword=comment_doc_keyword
 commentdockeyworderror=comment_doc_keyword_error
 globalclass=class

data/filetypes.caml

@@ -10,7 +10,7 @@ number=number_1
 keyword=keyword_1
 keyword2=keyword_2
 string=string_1
-char=string_1
+char=character
 operator=operator
 identifier=identifier_1
 tagname=preprocessor

data/filetypes.cobol

@@ -3,7 +3,7 @@
 # Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
-commentline=comment
+commentline=comment_line
 commentdoc=comment_doc
 number=number_1
 word=keyword_1

data/filetypes.css

@@ -11,7 +11,7 @@ unknown_identifier=class
 operator=operator
 identifier=keyword_1
 doublestring=string_1
-singlestring=string_1
+singlestring=string_2
 attribute=attribute
 value=value
 id=number
@@ -23,7 +23,7 @@ pseudoelement=element
 extended_identifier=keyword_4
 extended_pseudoclass=class
 extended_pseudoelement=element
-media=string_2
+media=string_3
 
 [keywords]
 # CSS 1 properties

data/filetypes.d

@@ -3,7 +3,7 @@
 # Edit these in the colorscheme .conf file instead
 default=default
 comment=comment
-commentline=comment
+commentline=comment_line
 commentdoc=comment_doc
 commentdocnested=comment_doc
 number=number_1
@@ -13,10 +13,10 @@ word3=keyword_3
 typedef=type
 string=string_1
 stringeol=string_eol
-character=string_1
+character=character
 operator=operator
 identifier=identifier_1
-commentlinedoc=comment_doc
+commentlinedoc=comment_line_doc
 commentdockeyword=comment_doc_keyword
 commentdockeyworderror=comment_doc_keyword_error
 

data/filetypes.freebasic

@@ -16,7 +16,7 @@ word3=keyword_3
 word4=keyword_4
 constant=identifier_2
 asm=type
-label=identifier_3
+label=label
 error=error
 hexnumber=number_1
 binnumber=number_1

data/filetypes.haskell

@@ -2,7 +2,7 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-commentline=comment
+commentline=comment_line
 commentblock=comment
 commentblock2=comment
 commentblock3=comment
@@ -10,7 +10,7 @@ number=number_1
 keyword=keyword_1
 import=preprocessor
 string=string_1
-character=string_2
+character=character
 class=class
 operator=operator
 identifier=identifier_1

data/filetypes.lisp

@@ -2,7 +2,7 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-comment=comment
+comment=comment_line
 multicomment=comment
 number=number_1
 keyword=keyword_1

data/filetypes.nsis

@@ -2,7 +2,7 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-comment=comment
+comment=comment_line
 stringdq=string_1
 stringlq=string_2
 stringrq=string_2

data/filetypes.pascal

@@ -4,8 +4,8 @@
 default=default
 identifier=identifier_1
 comment=comment
-comment2=comment
-commentline=comment
+comment2=comment_doc
+commentline=comment_line
 preprocessor=preprocessor
 preprocessor2=preprocessor
 number=number_1

data/filetypes.perl

@@ -3,7 +3,7 @@
 # Edit these in the colorscheme .conf file instead
 default=default
 error=error
-commentline=comment
+commentline=comment_line
 number=number_1
 word=keyword_1
 string=string_1

data/filetypes.python

@@ -2,7 +2,7 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-commentline=comment
+commentline=comment_line
 number=number_1
 string=string_1
 character=character

data/filetypes.ruby

@@ -2,7 +2,7 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-commentline=comment
+commentline=comment_line
 number=number_1
 string=string_1
 character=character

data/filetypes.sh

@@ -2,11 +2,11 @@
 [styling]
 # Edit these in the colorscheme .conf file instead
 default=default
-commentline=comment
+commentline=comment_line
 number=number_1
 word=keyword_1
 string=string_1
-character=string_1
+character=character
 operator=operator
 identifier=identifier_1
 backticks=backticks

data/filetypes.sql

@@ -14,7 +14,7 @@ operator=operator
 identifier=identifier_1
 sqlplus=default
 sqlplus_prompt=default
-sqlplus_comment=default
+sqlplus_comment=comment
 quotedidentifier=identifier_2
 
 [keywords]

data/filetypes.xml

@@ -42,7 +42,7 @@ php_number=number_1
 php_word=keyword_1
 php_variable=preprocessor
 php_comment=comment
-php_commentline=comment
+php_commentline=comment_line
 php_operator=operator
 php_hstring_variable=string_2
 php_complex_variable=preprocessor
@@ -50,7 +50,7 @@ php_complex_variable=preprocessor
 jscript_start=tag
 jscript_default=default
 jscript_comment=comment
-jscript_commentline=comment
+jscript_commentline=comment_line
 jscript_commentdoc=comment_doc
 jscript_number=number_1
 jscript_word=keyword_1