From 4b1d3a28f58d48686db238b60977660de105e349 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Wed, 15 Nov 2006 23:12:58 +0000 Subject: [PATCH] * Updated help and manpage. --- doc/toilet.1.in | 16 +++++++++++++++- src/main.c | 28 ++++++++++++++++------------ 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/doc/toilet.1.in b/doc/toilet.1.in index fb87503..2166ee8 100644 --- a/doc/toilet.1.in +++ b/doc/toilet.1.in @@ -4,7 +4,7 @@ TOIlet \- display large colourful characters .SH SYNOPSIS .B toilet [ -.B \-htv +.B \-hkostvSW ] [ .B \-d .I fontdirectory @@ -65,6 +65,20 @@ Specify the directory in which to look for fonts. The default value is set at build time and usually defaults to .B @datarootdir@/figlet. .TP +.B \-s, \-S, \-k, \-W, \-o +Select character composition rules. +.B \-S +sets smushing (nicely merging glyphs), +.B \-k +sets kerning (rendering subcharacters as close to each other as possible), +.B \-W +renders characters at their full width and +.B \-o +sets overlapping (glyphs slightly overlap the previous one). +.B \-s +(default behaviour) uses the font's smushing information if any, otherwise +forces overlapping, or does nothing if the glyph only has one subcharacter. +.TP .B \-w, \-\-width Set the output width. By default, .B TOIlet diff --git a/src/main.c b/src/main.c index cec51c0..b844ac8 100644 --- a/src/main.c +++ b/src/main.c @@ -217,7 +217,7 @@ int main(int argc, char *argv[]) #if defined(HAVE_GETOPT_H) # define USAGE \ - "Usage: toilet [ -htv ] [ -d fontdirectory ]\n" \ + "Usage: toilet [ -hkostvSW ] [ -d fontdirectory ]\n" \ " [ -f fontfile ] [ -F filter ] [ -w outputwidth ]\n" \ " [ -I infocode ] [ -E format ] [ message ]\n" #else @@ -249,6 +249,8 @@ static void usage(void) # ifdef HAVE_GETOPT_LONG printf(" -f, --font select the font\n"); printf(" -d, --directory specify font directory\n"); + printf(" -s, -S, -k, -W, -o render mode (default smushing, force smushing,\n"); + printf(" kerning, full width, overlap)\n"); printf(" -w, --width set output width\n"); printf(" -t, --termwidth adapt to terminal's width\n"); printf(" -F, --filter apply one or several filters to the text\n"); @@ -263,17 +265,19 @@ static void usage(void) printf(" -I, --infocode print FIGlet-compatible infocode\n"); printf(" -v, --version output version information and exit\n"); # else - printf(" -f select the font\n"); - printf(" -d specify font directory\n"); - printf(" -w set output width\n"); - printf(" -t adapt to terminal's width\n"); - printf(" -F apply one or several filters to the text\n"); - printf(" -F list list available filters\n"); - printf(" -E select export format\n"); - printf(" -E list list available export formats\n"); - printf(" -h display this help and exit\n"); - printf(" -I print FIGlet-compatible infocode\n"); - printf(" -v output version information and exit\n"); + printf(" -f select the font\n"); + printf(" -d specify font directory\n"); + printf(" -s, -S, -k, -W, -o render mode (default smushing, force smushing,\n"); + printf(" kerning, full width, overlap)\n"); + printf(" -w set output width\n"); + printf(" -t adapt to terminal's width\n"); + printf(" -F apply one or several filters to the text\n"); + printf(" -F list list available filters\n"); + printf(" -E select export format\n"); + printf(" -E list list available export formats\n"); + printf(" -h display this help and exit\n"); + printf(" -I print FIGlet-compatible infocode\n"); + printf(" -v output version information and exit\n"); # endif } #endif