From 7954f7524b231684a5c2dfc7991db7f687454cc1 Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 8 Jun 2018 13:53:25 -0400 Subject: update ds9 parsers --- ds9/parsers/catlex.fcl | 2 +- ds9/parsers/catparser.tac | 4 ++-- ds9/parsers/colorbarlex.fcl | 2 +- ds9/parsers/colorbarparser.tac | 4 ++-- ds9/parsers/colorbarsendlex.fcl | 2 +- ds9/parsers/colorbarsendparser.tac | 2 +- ds9/parsers/font.fin | 12 ------------ ds9/parsers/font.tin | 12 ------------ ds9/parsers/font.trl | 18 ------------------ ds9/parsers/fonts.fin | 12 ++++++++++++ ds9/parsers/fonts.tin | 12 ++++++++++++ ds9/parsers/fonts.trl | 18 ++++++++++++++++++ ds9/parsers/gridlex.fcl | 2 +- ds9/parsers/gridparser.tac | 4 ++-- ds9/parsers/gridsendlex.fcl | 2 +- ds9/parsers/gridsendparser.tac | 2 +- ds9/parsers/plotlex.fcl | 2 +- ds9/parsers/plotparser.tac | 4 ++-- 18 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 ds9/parsers/font.fin delete mode 100644 ds9/parsers/font.tin delete mode 100644 ds9/parsers/font.trl create mode 100644 ds9/parsers/fonts.fin create mode 100644 ds9/parsers/fonts.tin create mode 100644 ds9/parsers/fonts.trl diff --git a/ds9/parsers/catlex.fcl b/ds9/parsers/catlex.fcl index 29b1590..d966799 100644 --- a/ds9/parsers/catlex.fcl +++ b/ds9/parsers/catlex.fcl @@ -95,7 +95,7 @@ bejing {return $BEJING_} saao {return $SAAO_} #include yesno.fin -#include font.fin +#include fonts.fin #include wcssys.fin #include skyframe.fin #include wcsformat.fin diff --git a/ds9/parsers/catparser.tac b/ds9/parsers/catparser.tac index 089a026..c887e98 100644 --- a/ds9/parsers/catparser.tac +++ b/ds9/parsers/catparser.tac @@ -2,7 +2,7 @@ %} #include yesno.tin -#include font.tin +#include fonts.tin #include wcssys.tin #include skyframe.tin #include wcsformat.tin @@ -103,7 +103,7 @@ %% #include yesno.trl -#include font.trl +#include fonts.trl #include wcssys.trl #include skyframe.trl #include wcsformat.trl diff --git a/ds9/parsers/colorbarlex.fcl b/ds9/parsers/colorbarlex.fcl index 723880f..e8a6b1c 100644 --- a/ds9/parsers/colorbarlex.fcl +++ b/ds9/parsers/colorbarlex.fcl @@ -20,7 +20,7 @@ value {return $VALUE_} vertical {return $VERTICAL_} #include yesno.fin -#include font.fin +#include fonts.fin #include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/colorbarparser.tac b/ds9/parsers/colorbarparser.tac index 3c1376e..6ed54e0 100644 --- a/ds9/parsers/colorbarparser.tac +++ b/ds9/parsers/colorbarparser.tac @@ -2,7 +2,7 @@ %} #include yesno.tin -#include font.tin +#include fonts.tin #include int.tin #include string.tin @@ -23,7 +23,7 @@ %% #include yesno.trl -#include font.trl +#include fonts.trl command : colorbar | colorbar {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/colorbarsendlex.fcl b/ds9/parsers/colorbarsendlex.fcl index ab00f22..7ba4482 100644 --- a/ds9/parsers/colorbarsendlex.fcl +++ b/ds9/parsers/colorbarsendlex.fcl @@ -15,7 +15,7 @@ space {return $SPACE_} ticks {return $TICKS_} value {return $VALUE_} -#include font.fin +#include fonts.fin #include ws.fin %% diff --git a/ds9/parsers/colorbarsendparser.tac b/ds9/parsers/colorbarsendparser.tac index 35ffde0..ae13d21 100644 --- a/ds9/parsers/colorbarsendparser.tac +++ b/ds9/parsers/colorbarsendparser.tac @@ -1,7 +1,7 @@ %{ %} -#include font.tin +#include fonts.tin %start colorbarsend diff --git a/ds9/parsers/font.fin b/ds9/parsers/font.fin deleted file mode 100644 index a21938c..0000000 --- a/ds9/parsers/font.fin +++ /dev/null @@ -1,12 +0,0 @@ -font {return $FONT_} -fontsize {return $FONTSIZE_} -fontslant {return $FONTSLANT_} -fontstyle {return $FONTSTYLE_} -fontweight {return $FONTWEIGHT_} -times {return $TIMES_} -helvetica {return $HELVETICA_} -courier {return $COURIER_} -normal {return $NORMAL_} -bold {return $BOLD_} -roman {return $ROMAN_} -italic {return $ITALIC_} diff --git a/ds9/parsers/font.tin b/ds9/parsers/font.tin deleted file mode 100644 index b5ee700..0000000 --- a/ds9/parsers/font.tin +++ /dev/null @@ -1,12 +0,0 @@ -%token FONT_ -%token FONTSIZE_ -%token FONTSLANT_ -%token FONTSTYLE_ -%token FONTWEIGHT_ -%token TIMES_ -%token HELVETICA_ -%token COURIER_ -%token NORMAL_ -%token BOLD_ -%token ROMAN_ -%token ITALIC_ diff --git a/ds9/parsers/font.trl b/ds9/parsers/font.trl deleted file mode 100644 index ba41950..0000000 --- a/ds9/parsers/font.trl +++ /dev/null @@ -1,18 +0,0 @@ -font : TIMES_ {set _ times} - | HELVETICA_ {set _ helvetica} - | COURIER_ {set _ courier} - ; - -fontWeight : NORMAL_ {set _ normal} - | BOLD_ {set _ bold} - ; - -fontSlant : ROMAN_ {set _ roman} - | ITALIC_ {set _ italic} - ; - -fontStyle : NORMAL_ {set _ normal} - | BOLD_ {set _ bold} - | ITALIC_ {set _ italic} - ; - diff --git a/ds9/parsers/fonts.fin b/ds9/parsers/fonts.fin new file mode 100644 index 0000000..a21938c --- /dev/null +++ b/ds9/parsers/fonts.fin @@ -0,0 +1,12 @@ +font {return $FONT_} +fontsize {return $FONTSIZE_} +fontslant {return $FONTSLANT_} +fontstyle {return $FONTSTYLE_} +fontweight {return $FONTWEIGHT_} +times {return $TIMES_} +helvetica {return $HELVETICA_} +courier {return $COURIER_} +normal {return $NORMAL_} +bold {return $BOLD_} +roman {return $ROMAN_} +italic {return $ITALIC_} diff --git a/ds9/parsers/fonts.tin b/ds9/parsers/fonts.tin new file mode 100644 index 0000000..b5ee700 --- /dev/null +++ b/ds9/parsers/fonts.tin @@ -0,0 +1,12 @@ +%token FONT_ +%token FONTSIZE_ +%token FONTSLANT_ +%token FONTSTYLE_ +%token FONTWEIGHT_ +%token TIMES_ +%token HELVETICA_ +%token COURIER_ +%token NORMAL_ +%token BOLD_ +%token ROMAN_ +%token ITALIC_ diff --git a/ds9/parsers/fonts.trl b/ds9/parsers/fonts.trl new file mode 100644 index 0000000..ba41950 --- /dev/null +++ b/ds9/parsers/fonts.trl @@ -0,0 +1,18 @@ +font : TIMES_ {set _ times} + | HELVETICA_ {set _ helvetica} + | COURIER_ {set _ courier} + ; + +fontWeight : NORMAL_ {set _ normal} + | BOLD_ {set _ bold} + ; + +fontSlant : ROMAN_ {set _ roman} + | ITALIC_ {set _ italic} + ; + +fontStyle : NORMAL_ {set _ normal} + | BOLD_ {set _ bold} + | ITALIC_ {set _ italic} + ; + diff --git a/ds9/parsers/gridlex.fcl b/ds9/parsers/gridlex.fcl index 4c58463..8262ded 100644 --- a/ds9/parsers/gridlex.fcl +++ b/ds9/parsers/gridlex.fcl @@ -65,7 +65,7 @@ uul {return $UUL_} uuu {return $UUU_} #include yesno.fin -#include font.fin +#include fonts.fin #include coordsys.fin #include wcssys.fin #include skyframe.fin diff --git a/ds9/parsers/gridparser.tac b/ds9/parsers/gridparser.tac index fab5833..74f9801 100644 --- a/ds9/parsers/gridparser.tac +++ b/ds9/parsers/gridparser.tac @@ -2,7 +2,7 @@ %} #include yesno.tin -#include font.tin +#include fonts.tin #include coordsys.tin #include wcssys.tin #include skyframe.tin @@ -65,7 +65,7 @@ %% #include yesno.trl -#include font.trl +#include fonts.trl #include coordsys.trl #include wcssys.trl #include skyframe.trl diff --git a/ds9/parsers/gridsendlex.fcl b/ds9/parsers/gridsendlex.fcl index 7e27d79..bd75593 100644 --- a/ds9/parsers/gridsendlex.fcl +++ b/ds9/parsers/gridsendlex.fcl @@ -46,7 +46,7 @@ vertical {return $VERTICAL_} view {return $VIEW_} width {return $WIDTH_} -#include font.fin +#include fonts.fin #include ws.fin %% diff --git a/ds9/parsers/gridsendparser.tac b/ds9/parsers/gridsendparser.tac index 96d8d12..d35d0e6 100644 --- a/ds9/parsers/gridsendparser.tac +++ b/ds9/parsers/gridsendparser.tac @@ -1,7 +1,7 @@ %{ %} -#include font.tin +#include fonts.tin %start gridsend diff --git a/ds9/parsers/plotlex.fcl b/ds9/parsers/plotlex.fcl index 9254e03..57d76bf 100644 --- a/ds9/parsers/plotlex.fcl +++ b/ds9/parsers/plotlex.fcl @@ -134,7 +134,7 @@ xaxis {return $XAXIS_} yaxis {return $YAXIS_} #include yesno.fin -#include font.fin +#include fonts.fin #include numeric.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/plotparser.tac b/ds9/parsers/plotparser.tac index e201005..7a9b523 100644 --- a/ds9/parsers/plotparser.tac +++ b/ds9/parsers/plotparser.tac @@ -3,7 +3,7 @@ %} #include yesno.tin -#include font.tin +#include fonts.tin #include numeric.tin #include string.tin @@ -138,7 +138,7 @@ %% #include yesno.trl -#include font.trl +#include fonts.trl #include numeric.trl command : plot -- cgit v0.12