diff options
| author | Dave Davenport <qball@gmpclient.org> | 2017-05-18 07:59:37 +0200 |
|---|---|---|
| committer | Dave Davenport <qball@gmpclient.org> | 2017-05-18 07:59:37 +0200 |
| commit | 72afc7b0399834bc2b6c3a45f761b548f47b3cab (patch) | |
| tree | ae1eb158807ee04553d359d948f7b0a060c09030 /lexer | |
| parent | bcea55c398c9f9a77aeb045d264c67fee3bfba09 (diff) | |
Add strikethrough highlight method.
Diffstat (limited to 'lexer')
| -rw-r--r-- | lexer/theme-lexer.l | 54 | ||||
| -rw-r--r-- | lexer/theme-parser.y | 10 |
2 files changed, 34 insertions, 30 deletions
diff --git a/lexer/theme-lexer.l b/lexer/theme-lexer.l index 36fbccab..cf85a0fb 100644 --- a/lexer/theme-lexer.l +++ b/lexer/theme-lexer.l @@ -184,10 +184,11 @@ EAST "east" WEST "west" /* Line Style */ -NONE "none" -BOLD "bold" -UNDERLINE "underline" -ITALIC "italic" +NONE "none" +BOLD "bold" +UNDERLINE "underline" +ITALIC "italic" +STRIKETHROUGH "strikethrough" /* ANGLES */ @@ -439,31 +440,32 @@ if ( queue == NULL ){ return T_COLOR; } /* Color schemes */ -<PROPERTIES>{RGBA} { return T_COL_RGBA; } -<PROPERTIES>{HSL} { return T_COL_HSL; } -<PROPERTIES>{HWB} { return T_COL_HWB; } -<PROPERTIES>{CMYK} { return T_COL_CMYK; } +<PROPERTIES>{RGBA} { return T_COL_RGBA; } +<PROPERTIES>{HSL} { return T_COL_HSL; } +<PROPERTIES>{HWB} { return T_COL_HWB; } +<PROPERTIES>{CMYK} { return T_COL_CMYK; } /* Fluff */ -<PROPERTIES>{S_T_PARENT_LEFT} { return T_PARENT_LEFT; } -<PROPERTIES>{S_T_PARENT_RIGHT} { return T_PARENT_RIGHT;} -<PROPERTIES>{COMMA} { return T_COMMA; } -<PROPERTIES>{FORWARD_SLASH} { return T_FORWARD_SLASH; } +<PROPERTIES>{S_T_PARENT_LEFT} { return T_PARENT_LEFT; } +<PROPERTIES>{S_T_PARENT_RIGHT} { return T_PARENT_RIGHT; } +<PROPERTIES>{COMMA} { return T_COMMA; } +<PROPERTIES>{FORWARD_SLASH} { return T_FORWARD_SLASH; } /* Position */ -<PROPERTIES>{CENTER} { return T_POS_CENTER; } -<PROPERTIES>{EAST} { return T_POS_EAST; } -<PROPERTIES>{WEST} { return T_POS_WEST; } -<PROPERTIES>{SOUTH} { return T_POS_SOUTH; } -<PROPERTIES>{NORTH} { return T_POS_NORTH; } +<PROPERTIES>{CENTER} { return T_POS_CENTER; } +<PROPERTIES>{EAST} { return T_POS_EAST; } +<PROPERTIES>{WEST} { return T_POS_WEST; } +<PROPERTIES>{SOUTH} { return T_POS_SOUTH; } +<PROPERTIES>{NORTH} { return T_POS_NORTH; } /* Highlight style */ -<PROPERTIES>{NONE} { return T_NONE; } -<PROPERTIES>{BOLD} { return T_BOLD; } -<PROPERTIES>{ITALIC} { return T_ITALIC; } -<PROPERTIES>{UNDERLINE} { return T_UNDERLINE; } - -<PROPERTIES>{ANGLE_DEG} { return T_ANGLE_DEG; } -<PROPERTIES>{ANGLE_RAD} { return T_ANGLE_RAD; } -<PROPERTIES>{ANGLE_GRAD} { return T_ANGLE_GRAD; } -<PROPERTIES>{ANGLE_TURN} { return T_ANGLE_TURN; } +<PROPERTIES>{NONE} { return T_NONE; } +<PROPERTIES>{BOLD} { return T_BOLD; } +<PROPERTIES>{ITALIC} { return T_ITALIC; } +<PROPERTIES>{UNDERLINE} { return T_UNDERLINE; } +<PROPERTIES>{STRIKETHROUGH} { return T_STRIKETHROUGH; } + +<PROPERTIES>{ANGLE_DEG} { return T_ANGLE_DEG; } +<PROPERTIES>{ANGLE_RAD} { return T_ANGLE_RAD; } +<PROPERTIES>{ANGLE_GRAD} { return T_ANGLE_GRAD; } +<PROPERTIES>{ANGLE_TURN} { return T_ANGLE_TURN; } <PROPERTIES>{COLOR_TRANSPARENT} { return T_COLOR_TRANSPARENT; diff --git a/lexer/theme-parser.y b/lexer/theme-parser.y index 816bbd7c..e721b346 100644 --- a/lexer/theme-parser.y +++ b/lexer/theme-parser.y @@ -173,6 +173,7 @@ static ThemeColor hwb_to_rgb ( double h, double w, double b) %token T_BOLD "Bold" %token T_ITALIC "Italic" %token T_UNDERLINE "Underline" +%token T_STRIKETHROUGH "Strikethrough" %token T_DASH "Dash" %token T_SOLID "Solid" @@ -394,10 +395,11 @@ t_property_highlight_styles ; /** Single style. */ t_property_highlight_style -: T_NONE { $$ = HL_NONE; } -| T_BOLD { $$ = HL_BOLD; } -| T_UNDERLINE { $$ = HL_UNDERLINE; } -| T_ITALIC { $$ = HL_ITALIC; } +: T_NONE { $$ = HL_NONE; } +| T_BOLD { $$ = HL_BOLD; } +| T_UNDERLINE { $$ = HL_UNDERLINE; } +| T_STRIKETHROUGH { $$ = HL_STRIKETHROUGH; } +| T_ITALIC { $$ = HL_ITALIC; } ; /** Distance. */ |