From f6eae560b122fd76b12655bf53eb6a4efb9533ac Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 22 Oct 2012 14:40:20 +0200 Subject: -q works as -f + added --f, --F and --q which are varidic variants of -f, -F and -q, respectivly + warn if -q is used with -f and -F but allow (but still warn if used) `-q -f` --- manuals/manpage.0 | 4 +-- manuals/ponysay.texinfo | 75 ++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 63 insertions(+), 16 deletions(-) (limited to 'manuals') diff --git a/manuals/manpage.0 b/manuals/manpage.0 index 9627f62..5407e2c 100644 --- a/manuals/manpage.0 +++ b/manuals/manpage.0 @@ -76,8 +76,8 @@ multiple times, and one of the will be selected randomly. .B \-q, \-\-quote [\fIname\fP...] By using this option, a pony will be printed with quotes from her in My Little Pony: Friendship is Magic. The pony will be selected randomly, unless at least one pony -is added as an argument after \fI-q\fP. If one or more ponies are added after \fI-q\fP -the pony will be selected randomly from that set of ponies. +is added as an argument to \fI-q\fP. If one or more ponies are added as an argument +to \fI-q\fP the pony will be selected randomly from that set of ponies. .TP .B \-W, \-\-wrap \fIcolumn\fP The screen column where the message should be wrapped. diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 3bd4fe4..fc96d07 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -172,7 +172,7 @@ In versions earlier than version 2.0, the if the pony were a file name it had to include a `@code{/}'. This is not longer required and any existing pony name supersedes file names. -@item -F +@item -F PONY @itemx ++file PONY @itemx ++pony PONY @opindex @option{-F} @@ -181,6 +181,54 @@ supersedes file names. Just as @option{-F}, but it uses extra (non-MLP:FiM) ponies instead of standard (MLP:FiM) ponies +@item -q PONY +@itemx --quote PONY +@opindex @option{-q} +@opindex @option{--quote} +@cindex quotes +@cindex pony quotes +By using this option, a pony will be printed with quotes from her in My Little Pony: +Friendship is Magic. The pony will be selected randomly, unless at least one pony +is added as an argument to @option{-q}. If one or more ponies are added as an argument +to @option{-q}, the pony will be selected randomly from that set of ponies. +This option requires the extension @command{ponyquotes4ponysay}, which is included +by default since version 1.2. + +The argument can be a file name, but only if it ends with @file{.pony}. + +@item --f [PONY...] +@itemx --files [PONY...] +@itemx --ponies [PONY...] +@opindex @option{--f} +@opindex @option{--files} +@opindex @option{--ponies} +Variadic variant of @option{-f}, meaning that all arguments added after this one +will parsed as an argument to this option. Additionally, those options are added +to @option{-f}. + +@item --F [PONY...] +@itemx ++files [PONY...] +@itemx ++ponies [PONY...] +@opindex @option{--F} +@opindex @option{++files} +@opindex @option{++ponies} +Variadic variant of @option{-F}, meaning that all arguments added after this one +will parsed as an argument to this option. Additionally, those options are added +to @option{-F}. + +@item --q [PONY...] +@itemx --quotes [PONY...] +@opindex @option{--q} +@opindex @option{--quotes} +@cindex quotes +@cindex pony quotes +Variadic variant of @option{-q}, meaning that all arguments added after this one +will parsed as an argument to this option. Additionally, those options are added +to @option{-q}. + +An important feature of this options, is that you can but it in the end of the +command line, without any argument to get a quote from any pony with a quote. + @item -b STYLE @itemx --bubble STYLE @itemx --balloon STYLE @@ -192,19 +240,6 @@ balloon name printed by @option{ponysay -B}. This option can be used multiple times to specify a set of styles from which one will be selected randomly. If no balloon style is specified a fallback style will be used. -@item -q [PONY...] -@itemx --quote [PONY...] -@opindex @option{-q} -@opindex @option{--quote} -By using this option, a pony will be printed with quotes from her in My Little Pony: -Friendship is Magic. The pony will be selected randomly, unless at least one pony -is added as an argument after @option{-q}. If one or more ponies are added after -@option{-q}, the pony will be selected randomly from that set of ponies. -This option requires the extension @command{ponyquotes4ponysay}, which is included -by default since version 1.2. - -The argument can be a file name, but only if it ends with @file{.pony}. - @item -W COLUMN @itemx --wrap COLUMN @opindex @option{-W} @@ -1947,6 +1982,18 @@ sequences. @cindex versions @cindex previous releases +@heading Version 2.9 +@itemize @bullet +@item +The option @option{-q} works like @option{-f} and @option{-F}, it takes one argument, and +may be used multiple times for more arguments. +@item +The old option @option{-q} is renamed to @option{--q}. +@item +The options @option{--f} and @option{--F} has been added. +@end itemize + + @heading Version 2.8 @itemize @bullet @item -- cgit From e726084422b59e5167c5cb0fdb5909c753e31e10 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 23 Oct 2012 22:09:59 +0200 Subject: autocorrection distance limit is set to 5, rather than unlimited --- manuals/ponysay.texinfo | 3 +++ 1 file changed, 3 insertions(+) (limited to 'manuals') diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index fc96d07..f2c9cb8 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -1991,6 +1991,9 @@ may be used multiple times for more arguments. The old option @option{-q} is renamed to @option{--q}. @item The options @option{--f} and @option{--F} has been added. +@item +Weighted distance for autocorrection on pony names and boolean style name is set to 5, rather +than unlimited. Currently this cannot be modified (without editing the source code.) @end itemize -- cgit From 78eda26515ad471cc36195318090451ba27ce56b Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 23 Oct 2012 23:42:28 +0200 Subject: include quote file in the extra information + change log update + manual update --- manuals/ponysay.texinfo | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) (limited to 'manuals') diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index f2c9cb8..cb661fb 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -116,7 +116,7 @@ way over e-mail. @cindex invoking @cindex options @cindex arguments -@pindex ponythink +@pindex @command{ponythink} The format for running the @command{ponysay} program is: @@ -324,7 +324,8 @@ the first list are the MLP:FiM and the second one are non-MLP:FiM. @opindex @option{-o} @opindex @option{--pony-only} @opindex @option{--ponyonly} -Print just the pony, nothing else like the speech balloon. +Print just the pony, nothing else like the speech balloon. Naturally the +@command{ponysay} will not wait for a message from stdin. @item -X @itemx --256-colours @@ -411,11 +412,13 @@ this file should be a symbolic link to the pony you want as a default. If it is a symbolic link, @option{-q} cannot determine which quotes to use. + @node Advanced usage @chapter Advanced usage of @command{ponysay}. @cindex advanced usage @menu +* Extra information:: Displaying extra information. * Fortune cookies:: Displaying with fortune cookies. * Ponification:: Ponify your fortune cookies. * Running on TTY:: Running on TTY (Linux VT). @@ -423,9 +426,28 @@ a symbolic link, @option{-q} cannot determine which quotes to use. @end menu + +@node Extra information +@section Extra information +@cindex file descriptor 3 +@cindex extra information +@cindex verbose mode +@pindex @command{tee} +If file descriptor 3 is definied when @command{ponysay} is executed, extra information +is printed to it. The printed information includes the name of the pony file, the name +of the balloon style file, and if definied in the pony file, file meta data and comment. + +In most shells, a file descriptor 3 can defined using @command{3> FILE}, and linked to +stderr using @command{3>&2}. For example, you can print the information to @file{~/info} +by running @command{ponysay I\'m just the cutest pony! | 3> ~/info}. + +The message is not stored this way, for that you can use @command{tee}. However, if you +use @option{-q} the quote file is printed to file descriptor 3. + + @node Fortune cookies @section Fortune cookies -@pindex fortune +@pindex @command{fortune} @cindex startup @cindex on startup @cindex @file{.bashrc} @@ -445,7 +467,7 @@ described in the previous paragraph every time you open a terminal. @section Ponification @cindex ponification @cindex text ponification -@pindex ponypipe +@pindex @command{ponypipe} You can ponify messages (i.e. replaces words search as `everyone' with `everypony') by using @code{fortune | ponypipe} instead of using @command{fortune}. @command{ponypipe} @@ -482,7 +504,7 @@ You should read more about this in @ref{KMS ponies}. @node Running on screen @section Running on @command{screen} -@pindex screen +@pindex @command{screen} @cindex @file{.bashrc} @cindex @file{~/.bashrc} @@ -702,7 +724,7 @@ run on it. @node Cowsay @section Cowsay -@pindex cowsay +@pindex @command{cowsay} This section describes the limitation of @command{cowsay}, but since version 2.1 @command{cowsay} is no longer used because of it. So none of the following limitations @@ -1994,6 +2016,9 @@ The options @option{--f} and @option{--F} has been added. @item Weighted distance for autocorrection on pony names and boolean style name is set to 5, rather than unlimited. Currently this cannot be modified (without editing the source code.) +@item +If file descriptor 3 is definied when @command{ponysay} is executed, extra information is +printed to it. @end itemize -- cgit