From 590d9fe0a9573ca72fdbab5119fd2c60dce3dd19 Mon Sep 17 00:00:00 2001 From: Nick Morrott Date: Sat, 26 Mar 2022 10:02:22 +0000 Subject: [PATCH] Fix typo and manpage improvement (#249) * Fixes some typo and adds some consistency to the manpage Typo detected automatically whilst packaging nsxiv for Debian Co-authored-by: NRK --- examples/key-handler | 2 +- nsxiv.1 | 41 ++++++++++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/examples/key-handler b/examples/key-handler index 7dac1b5..3fe741d 100755 --- a/examples/key-handler +++ b/examples/key-handler @@ -9,7 +9,7 @@ # reloads them. # By default nsxiv(1) will send one image per-line to stdin, however when using -# -0 the image list will be NULL separated and the enviornment variable +# -0 the image list will be NULL separated and the environment variable # "$NSXIV_USING_NULL" will be set to 1. # The key combo argument has the following form: "[C-][M-][S-]KEY", diff --git a/nsxiv.1 b/nsxiv.1 index 3262827..729d0ec 100644 --- a/nsxiv.1 +++ b/nsxiv.1 @@ -30,7 +30,7 @@ It has two modes of operation: image and thumbnail mode. The default is image mode, in which only the current image is shown. In thumbnail mode a grid of small previews is displayed, making it easy to choose an image to open. .P -Please note, that the fullscreen mode requires an EWMH/NetWM compliant window +Please note, that the fullscreen mode requires an EWMH/NetWM-compliant window manager. .SH OPTIONS .TP @@ -83,7 +83,7 @@ nsxiv can be used as a visual filter/pipe. Enable private mode, in which nsxiv does not write any cache or temporary files. .TP .B \-q -Be quiet, disable warnings to standard error stream. +Be quiet, and disable warnings to standard error stream. .TP .B \-r Search the given directories recursively for images to view. @@ -93,7 +93,7 @@ Start in slideshow mode. Set the delay between images to .I DELAY seconds. .I DELAY -may be a floating point number. +may be a floating-point number. .TP .BI "\-s " MODE Set scale mode according to MODE character. Supported modes are: [d]own, @@ -112,11 +112,11 @@ The same as `\-z 100'. Set zoom level to ZOOM percent. .TP .B \-0 -Use NULL-separator. With this option output of \-o and file-list sent to the +Use NULL-separator. With this option, output of \-o and file-list sent to the key-handler and the input of \-i will be separated by a NULL character. .SH KEYBOARD COMMANDS .SS General -The following keyboard commands are available in both image and thumbnail mode: +The following keyboard commands are available in both image and thumbnail modes: .TP .BR 0 \- 9 Prefix the next command with a number (denoted via @@ -366,7 +366,7 @@ The following mouse mappings are available in thumbnail mode: Select the image. Goes into image mode if double\-clicked. .TP .B Button3 -Mark/unmark the image. Dragging while holding Button3 down will mark/unmark +Mark/unmark the image. Dragging while holding down Button3 will mark/unmark multiple images. .TP .B Button4 @@ -429,12 +429,18 @@ The window title can be replaced with the output of a user-provided script, which is called by nsxiv whenever there's a redraw. The path of this script is .I $XDG_CONFIG_HOME/nsxiv/exec/win-title and the arguments given to it (where "Optional" arguments might be empty) are: -1) resolved absolute path of the current file, -2) current file number, -3) total file count, -4) image width (Optional: Disabled on thumbnails mode), -5) image height (Optional: Disabled on thumbnails mode), -6) current zoom (Optional: Disabled on thumbnails mode). +.IP $1 4 +resolved absolute path of the current file +.IP $2 4 +current file number +.IP $3 4 +total file count +.IP $4 4 +image width (Optional: Disabled on thumbnails mode) +.IP $5 4 +image height (Optional: Disabled on thumbnails mode) +.IP $6 4 +current zoom (Optional: Disabled on thumbnails mode) .P The term file is used rather than image as nsxiv does not precheck that the input files are valid images. Total file count may be different from the actual @@ -447,8 +453,13 @@ The information displayed on the left side of the status bar can be replaced with the output of a user-provided script, which is called by nsxiv whenever an image gets loaded. The path of this script is .I $XDG_CONFIG_HOME/nsxiv/exec/image-info -and the arguments given to it are: 1) path to image file, 2) image width, -3) image height. +and the arguments given to it are: +.IP $1 4 +path to image file +.IP $2 4 +image width +.IP $3 4 +image height .P There is also an example script installed together with nsxiv as .IR EGPREFIX/image-info . @@ -465,7 +476,7 @@ the handler terminates. It then checks which images have been modified and reloads them. By default nsxiv(1) will send one image per-line to stdin, however when using -\-0 the image list will be NULL separated and the enviornment variable +\-0 the image list will be NULL separated and the environment variable "$NSXIV_USING_NULL" will be set to 1. The key combo argument has the following form: "[C-][M-][S-]KEY",