diff options
| -rw-r--r-- | ds9/parsers/gridlex.fcl | 1 | ||||
| -rw-r--r-- | ds9/parsers/gridparser.tac | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ds9/parsers/gridlex.fcl b/ds9/parsers/gridlex.fcl index 02354d7..cb552f4 100644 --- a/ds9/parsers/gridlex.fcl +++ b/ds9/parsers/gridlex.fcl @@ -12,6 +12,7 @@ axes {return $AXES_} border {return $BORDER_} close {return $CLOSE_} color {return $COLOR_} +dash {return $DASH_} def {return $DEF_} def1 {return $DEF1_} def2 {return $DEF2_} diff --git a/ds9/parsers/gridparser.tac b/ds9/parsers/gridparser.tac index 1c45bdd..b0c9e11 100644 --- a/ds9/parsers/gridparser.tac +++ b/ds9/parsers/gridparser.tac @@ -16,6 +16,7 @@ %token BORDER_ %token COLOR_ %token CLOSE_ +%token DASH_ %token DEF_ %token DEF1_ %token DEF2_ @@ -116,6 +117,8 @@ system : coordsys {set _ $1} gridgrid : yesno {global grid; set grid(grid) $1} | COLOR_ STRING_ {global grid; set grid(grid,color) $2} | WIDTH_ INT_ {global grid; set grid(grid,color) $2} + | DASH_ yesno {global grid; set grid(grid,style) $2} + # backward compatible | STYLE_ INT_ {global grid; set grid(grid,style) $2} | GAP1_ numeric {global grid; set grid(grid,gap1) $2} | GAP2_ numeric {global grid; set grid(grid,gap2) $2} @@ -125,6 +128,8 @@ gridgrid : yesno {global grid; set grid(grid) $1} axes : yesno {global grid; set grid(axes) $1} | COLOR_ STRING_ {global grid; set grid(axes,color) $2} | WIDTH_ INT_ {global grid; set grid(axes,color) $2} + | DASH_ yesno {global grid; set grid(axes,style) $2} + # backward compatible | STYLE_ INT_ {global grid; set grid(axes,style) $2} | TYPE_ interiortype {global grid; set grid(axes,type) $2} | ORIGIN_ origin {global grid; set grid(axes,origin) $2} @@ -143,12 +148,16 @@ origin : LLL_ {set _ lll} tickmarks : yesno {global grid; set grid(tick) $1} | COLOR_ STRING_ {global grid; set grid(tick,color) $2} | WIDTH_ INT_ {global grid; set grid(tick,color) $2} + | DASH_ yesno {global grid; set grid(tick,style) $2} + # backward compatible | STYLE_ INT_ {global grid; set grid(tick,style) $2} ; border : yesno {global grid; set grid(border) $1} | COLOR_ STRING_ {global grid; set grid(border,color) $2} | WIDTH_ INT_ {global grid; set grid(border,color) $2} + | DASH_ yesno {global grid; set grid(border,style) $2} + # backward compatible | STYLE_ INT_ {global grid; set grid(border,style) $2} ; |