diff --git a/bin/feedgnuplot b/bin/feedgnuplot index 0864fda..07e5ee7 100755 --- a/bin/feedgnuplot +++ b/bin/feedgnuplot @@ -109,7 +109,7 @@ sub interpretCommandline 'title=s', 'xlen=f', 'ymin=f', 'ymax=f', 'xmin=s', 'xmax=s', 'y2min=f', 'y2max=f', 'zmin=f', 'zmax=f', 'y2=s@', 'style=s{2}', 'curvestyle=s{2}', 'curvestyleall=s', 'styleall=s', 'with=s', 'extracmds=s@', 'set=s@', 'unset=s@', - 'square!', 'square_xy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s', + 'square!', 'square_xy!', 'square-xy!', 'squarexy!', 'hardcopy=s', 'maxcurves=i', 'monotonic!', 'timefmt=s', 'equation=s@', 'image=s', 'histogram=s@', 'binwidth=f', 'histstyle=s', @@ -143,6 +143,10 @@ sub interpretCommandline delete $options{styleall}; } + # various square-xy synonyms + $options{'square_xy'} = 1 if $options{'square-xy'} || $options{'squarexy'}; + + push @{$options{curvestyle}}, @{$options{style}}; delete $options{style}; @@ -2005,7 +2009,7 @@ all 3 axes =item -C<--square_xy> +C<--square-xy> For 3D plots, set square aspect ratio for ONLY the x,y axes diff --git a/completions/bash/feedgnuplot b/completions/bash/feedgnuplot index 1cb7e3b..0509c6e 100644 --- a/completions/bash/feedgnuplot +++ b/completions/bash/feedgnuplot @@ -33,7 +33,7 @@ complete -W \ --monotonic \ --points \ --square \ - --square_xy \ + --square-xy \ --stream \ --terminal \ --timefmt \ diff --git a/completions/zsh/_feedgnuplot b/completions/zsh/_feedgnuplot index 3f57213..465a0f1 100644 --- a/completions/zsh/_feedgnuplot +++ b/completions/zsh/_feedgnuplot @@ -35,7 +35,7 @@ _arguments -S '*--equation[Raw symbolic equation]:equation' \ '--image[Image file to render beneath the data]:image:_files -g "(#i)*.(jpg|jpeg|png|gif)"' \ '--square[Plot data with square aspect ratio]' \ - '--square_xy[For 3D plots, set square aspect ratio for ONLY the x,y axes]' \ + '--square-xy[For 3D plots, set square aspect ratio for ONLY the x,y axes]' \ '--hardcopy[Plot to a file]:new image filename:_files -g "(#i)*.(jpg|jpeg|png|gif)"' \ '--maxcurves[The maximum allowed number of curves]:number of curves' \ '(--3d)--monotonic[Resets plot if an X in the past is seen]' \