From 2b83a81cebcb73e50e0e1676e8b70bbfbd550288 Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Sat, 2 Jul 2022 16:57:05 +0200 Subject: [PATCH] Update completion scripts Also correct minor blunders in the man page --- contrib/bash_compl/_rgbgfx.bash | 13 +++++++++---- contrib/zsh_compl/_rgbgfx | 15 ++++++++++----- man/rgbgfx.1 | 14 +++++++------- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/contrib/bash_compl/_rgbgfx.bash b/contrib/bash_compl/_rgbgfx.bash index ce40f1a36..298ad97c3 100755 --- a/contrib/bash_compl/_rgbgfx.bash +++ b/contrib/bash_compl/_rgbgfx.bash @@ -11,19 +11,24 @@ _rgbgfx_completions() { declare -A opts=( [V]="version:normal" [C]="color-curve:normal" - [D]="debug:normal" - [h]="horizontal:normal" [m]="mirror-tiles:normal" [u]="unique-tiles:normal" [v]="verbose:normal" - [f]="fix:normal" - [F]="fix-and-save:normal" + [Z]="columns:normal" [a]="attr-map:*.attrmap" [A]="output-attr-map:normal" + [b]="base-tiles:unk" [d]="depth:unk" + [L]="slice:unk" + [N]="nb-tiles:unk" + [n]="nb-palettes:unk" [o]="output:glob *.2bpp" [p]="palette:glob *.pal" [P]="output-palette:normal" + [q]="palette-map:glob *.palmap" + [Q]="output-palette-map:normal" + [r]="reverse:unk" + [s]="palette-size:unk" [t]="tilemap:glob *.tilemap" [T]="output-tilemap:normal" [x]="trim-end:unk" diff --git a/contrib/zsh_compl/_rgbgfx b/contrib/zsh_compl/_rgbgfx index c6e3f0f83..51f2919f8 100644 --- a/contrib/zsh_compl/_rgbgfx +++ b/contrib/zsh_compl/_rgbgfx @@ -15,20 +15,25 @@ local args=( '(-a --attr-map -A --output-attr-map)'{-A,--output-attr-map}'[Shortcut for -a .attrmap]' '(-C --color-curve)'{-C,--color-curve}'[Generate palettes using GBC color curve]' - '(-D --debug)'{-D,--debug}'[Enable debug features]' - '(-f --fix -F --fix-and-save)'{-f,--fix}'[Fix input PNG into an indexed image]' - '(-f --fix -F --fix-and-save)'{-F,--fix-and-save}'[Like -f but also save CLI params within the PNG]' - '(-h --horizontal)'{-h,--horizontal}'[Lay out tiles horizontally instead of vertically]' '(-m --mirror-tiles)'{-m,--mirror-tiles}'[Eliminate mirrored tiles from output]' '(-p --palette -P --output-palette)'{-P,--output-palette}'[Shortcut for -p .pal]' + '(-q --palette-map -Q --output-palette-map)'{-Q,--output-palette-map}'[Shortcut for -p .palmap]' '(-t --tilemap -T --output-tilemap)'{-T,--output-tilemap}'[Shortcut for -t .tilemap]' '(-u --unique-tiles)'{-u,--unique-tiles}'[Eliminate redundant tiles]' - '(-v --verbose)'{-v,--verbose}'[Enable verbose output]' + {-v,--verbose}'[Enable verbose output]' + '(-h --horizontal -Z --columns)'{-Z,--columns}'[Read the image in column-major order]' '(-a --attr-map -A --output-attr-map)'{-a,--attr-map}'+[Generate a map of tile attributes (mirroring)]:attrmap file:_files' + '(-b --base-tiles)'{-b,--base-tiles}'+[Base tile IDs for tile map output]:base tile IDs:' '(-d --depth)'{-d,--depth}'+[Set bit depth]:bit depth:_depths' + '(-L --slice)'{-L,--slice}'+[Only process a portion of the image]:input slice:' + '(-N --nb-tiles)'{-n,--nb-tiles}'+[Limit number of tiles]:tile count:' + '(-n --nb-palettes)'{-n,--nb-palettes}'+[Limit number of palettes]:palette count:' '(-o --output)'{-o,--output}'+[Set output file]:output file:_files' '(-p --palette -P --output-palette)'{-p,--palette}"+[Output the image's palette in little-endian native RGB555 format]:palette file:_files" + '(-q --palette-map -Q --output-palette-map)'{-p,--palette-map}"+[Output the image's palette map]:palette map file:_files" + '(-r --reverse)'{-r,--reverse}'+[Yield an image from binary data]:image width (in tiles):' + '(-s --palette-size)'{-s,--palette-size}'+[Limit palette size]:palette size:' '(-t --tilemap -T --output-tilemap)'{-t,--tilemap}'+[Generate a map of tile indices]:tilemap file:_files' '(-x --trim-end)'{-x,--trim-end}'+[Trim end of output by this many tiles]:tile count:' diff --git a/man/rgbgfx.1 b/man/rgbgfx.1 index 269690037..de9600b8f 100644 --- a/man/rgbgfx.1 +++ b/man/rgbgfx.1 @@ -215,12 +215,6 @@ where .Ar path is the input image's path with the extension set to .Pa .palmap . -.It Fl s Ar nb_colors , Fl Fl palette-size Ar nb_colors -Specify how many colors each palette contains, including the transparent one if any. -.Ar nb_colors -cannot be more than -.Ql 1 << Ar depth -.Pq see Fl d . .It Fl r Ar width , Fl Fl reverse Ar width Switches .Nm @@ -237,6 +231,12 @@ below for details. .Ar width is the image's width, in tiles .Pq including any margins specified by Fl L . +.It Fl s Ar nb_colors , Fl Fl palette-size Ar nb_colors +Specify how many colors each palette contains, including the transparent one if any. +.Ar nb_colors +cannot be more than +.Ql 1 << Ar depth +.Pq see Fl d . .It Fl t Ar tilemap , Fl Fl tilemap Ar tilemap Generate a file of tile indices. For each square of the input image, its corresponding tile map byte contains the index of the associated tile in the tile data file. @@ -364,9 +364,9 @@ The following formats are supported: .It Sy psp .Lk https://www.selapa.net/swatches/colors/fileformats.php#psp_pal Paint Shop Pro palette . .El +.Pp If you wish for another format to be supported, please open an issue (see .Sx BUGS -.Pp below) or contact us, and supply a few sample files. .Sh PALETTE GENERATION .Nm