summaryrefslogtreecommitdiffstats
path: root/lexer
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2017-05-17 08:24:28 +0200
committerDave Davenport <qball@gmpclient.org>2017-05-17 08:24:28 +0200
commit41a7e069196d4890226bdf418cc7d9944ce4f852 (patch)
tree532f71230c3e0bfb2f301d75fbe6110772b0db71 /lexer
parentbca8ca33d825b94c07d2d771fca450a6cd50c055 (diff)
[Theme] Update theme-manpage
Diffstat (limited to 'lexer')
-rw-r--r--lexer/theme-parser.y22
1 files changed, 18 insertions, 4 deletions
diff --git a/lexer/theme-parser.y b/lexer/theme-parser.y
index 7e9c1da2..816bbd7c 100644
--- a/lexer/theme-parser.y
+++ b/lexer/theme-parser.y
@@ -455,6 +455,20 @@ t_property_color
$$.green = $4/255.0;
$$.blue = $5/255.0;
}
+ /** rgba ( 0-100% , 0-100%, 0-100%, 0-1.0 ) */
+| T_COL_RGBA T_PARENT_LEFT t_property_color_value T_PERCENT T_COMMA t_property_color_value T_PERCENT T_COMMA t_property_color_value T_PERCENT t_property_color_opt_alpha_c T_PARENT_RIGHT {
+ if ( ! check_in_range($3,0,100, &(@$)) ) { YYABORT; }
+ if ( ! check_in_range($6,0,100, &(@$)) ) { YYABORT; }
+ if ( ! check_in_range($9,0,100, &(@$)) ) { YYABORT; }
+ $$.alpha = $11; $$.red = $3/100.0; $$.green = $6/100.0; $$.blue = $9/100.0;
+}
+ /** rgba ( 0-100% 0-100% 0-100% / 0-1.0 ) */
+| T_COL_RGBA T_PARENT_LEFT t_property_color_value T_PERCENT t_property_color_value T_PERCENT t_property_color_value T_PERCENT t_property_color_opt_alpha_ws T_PARENT_RIGHT {
+ if ( ! check_in_range($3,0,100, &(@$)) ) { YYABORT; }
+ if ( ! check_in_range($5,0,100, &(@$)) ) { YYABORT; }
+ if ( ! check_in_range($7,0,100, &(@$)) ) { YYABORT; }
+ $$.alpha = $9; $$.red = $3/100.0; $$.green = $5/100.0; $$.blue = $7/100.0;
+}
/** hwb with comma */
| T_COL_HWB T_PARENT_LEFT t_property_color_value_angle T_COMMA t_property_color_value_unit T_COMMA t_property_color_value_unit t_property_color_opt_alpha_c T_PARENT_RIGHT {
double h = $3, w = $5, b = $7;
@@ -468,16 +482,16 @@ t_property_color
$$.alpha = $6;
}
/** cmyk with comma */
-| T_COL_CMYK T_PARENT_LEFT t_property_color_value_unit T_COMMA t_property_color_value_unit T_COMMA t_property_color_value_unit T_COMMA t_property_color_value_unit T_PARENT_RIGHT {
- $$.alpha = 1.0;
+| T_COL_CMYK T_PARENT_LEFT t_property_color_value_unit T_COMMA t_property_color_value_unit T_COMMA t_property_color_value_unit T_COMMA t_property_color_value_unit t_property_color_opt_alpha_c T_PARENT_RIGHT {
+ $$.alpha = $10;
double c= $3, m= $5, y= $7, k= $9;
$$.red = (1.0-c)*(1.0-k);
$$.green = (1.0-m)*(1.0-k);
$$.blue = (1.0-y)*(1.0-k);
}
/** cmyk whitespace edition. */
-| T_COL_CMYK T_PARENT_LEFT t_property_color_value_unit t_property_color_value_unit t_property_color_value_unit t_property_color_value_unit T_PARENT_RIGHT {
- $$.alpha = 1.0;
+| T_COL_CMYK T_PARENT_LEFT t_property_color_value_unit t_property_color_value_unit t_property_color_value_unit t_property_color_value_unit t_property_color_opt_alpha_ws T_PARENT_RIGHT {
+ $$.alpha = $7;
double c= $3, m= $4, y= $5, k= $6;
$$.red = (1.0-c)*(1.0-k);
$$.green = (1.0-m)*(1.0-k);