src/Tools/jEdit/src/rendering.scala
changeset 55514 8ef781e282d9
parent 55512 75c68e05f9ea
child 55526 39708e59f4b0
     1.1 --- a/src/Tools/jEdit/src/rendering.scala	Sun Feb 16 16:28:50 2014 +0100
     1.2 +++ b/src/Tools/jEdit/src/rendering.scala	Sun Feb 16 16:48:30 2014 +0100
     1.3 @@ -133,9 +133,9 @@
     1.4        ML_Lex.Kind.ANTIQ_START -> LITERAL4,
     1.5        ML_Lex.Kind.ANTIQ_STOP -> LITERAL4,
     1.6        ML_Lex.Kind.ANTIQ_OTHER -> NULL,
     1.7 -      ML_Lex.Kind.ANTIQ_STRING -> LITERAL1,
     1.8 -      ML_Lex.Kind.ANTIQ_ALT_STRING -> LITERAL2,
     1.9 -      ML_Lex.Kind.ANTIQ_CARTOUCHE -> COMMENT4,
    1.10 +      ML_Lex.Kind.ANTIQ_STRING -> NULL,
    1.11 +      ML_Lex.Kind.ANTIQ_ALT_STRING -> NULL,
    1.12 +      ML_Lex.Kind.ANTIQ_CARTOUCHE -> NULL,
    1.13        ML_Lex.Kind.ERROR -> INVALID
    1.14      ).withDefaultValue(NULL)
    1.15    }
    1.16 @@ -606,7 +606,7 @@
    1.17  
    1.18  
    1.19    private val foreground_include =
    1.20 -    Set(Markup.STRING, Markup.ALTSTRING, Markup.VERBATIM, Markup.ANTIQ)
    1.21 +    Set(Markup.STRING, Markup.ALTSTRING, Markup.VERBATIM, Markup.CARTOUCHE, Markup.ANTIQ)
    1.22  
    1.23    def foreground(range: Text.Range): List[Text.Info[Color]] =
    1.24      snapshot.select_markup(range, Some(foreground_include), _ =>
    1.25 @@ -624,6 +624,7 @@
    1.26        Markup.STRING -> Color.BLACK,
    1.27        Markup.ALTSTRING -> Color.BLACK,
    1.28        Markup.VERBATIM -> Color.BLACK,
    1.29 +      Markup.CARTOUCHE -> Color.BLACK,
    1.30        Markup.LITERAL -> keyword1_color,
    1.31        Markup.DELIMITER -> Color.BLACK,
    1.32        Markup.TFREE -> tfree_color,