Merge branch 'develop'

2 files changed, 97 insertions, 2 deletions

diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 17ba615..766c73e 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -132,8 +132,10 @@ Show summary of options.
 Show version of program.
 
 @item -f PONY
+@itemx --file PONY
 @itemx --pony PONY
 @cindex @command{-f}
+@cindex @command{--file}
 @cindex @command{--pony}
 Specify the pony that should printed, this can either be a file name or a pony
 name printed by @command{ponysay -l}. This option can be used multiple times to
@@ -145,8 +147,19 @@ If you have @command{util-say} installed, you can use .png-files as the
 arguments for this options.
 
 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 file
-supersedes pony names.
+to include a `@code{/}'. This is not longer required and any existing pony name
+supersedes file names.
+
+@item -b STYLE
+@itemx --bubble STYLE
+@itemx --balloon STYLE
+@cindex @command{-b}
+@cindex @command{--bubble}
+@cindex @command{--balloon}
+Specify the balloon style that should used, this can either be a file name or a
+balloon name printed by @command{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...]
@@ -185,6 +198,12 @@ is installed the ponies which have quotes, i.e. can be used with the
 (depending on the terminal.) This options differs from @command{-l} by
 printing alternative names (symbolic links) inside brackets after their
 target ponies.
+
+@item -B
+@itemx --balloonlist
+@cindex @command{-B}
+@cindex @command{--balloonlist}
+Prints a list of all balloon styles.
 @end table
 
 If neither @command{-q} is used nor any @var{message} is specified, @command{ponysay}
@@ -800,6 +819,7 @@ but is still available at @url{https://github.com/maandree/kmsponies4ponysay}.
 @menu
 * Pony anatomy::                 Anatomy of pony files.
 * Pony quote infrastructure::    Pony quote infrastructure.
+* Balloon style files::          Balloon style files.
 * Printing in TTY with KMS::     Printing in TTY with KMS.
 * Truncation::                   Output truncation.
 * Languages::                    Selection of languages.
@@ -861,6 +881,77 @@ when compiled to @code{quotes}. The source quote files are indentical to the com
 quote files, except that there name contains just the first pony.
 
 
+@node Balloon style files
+@section Balloon style files
+@cindex balloon style files
+@cindex bubble style files
+@cindex @command{ponythink}
+
+Balloon style files are located in the directory @code{balloons}, the ones ending with
+@code{.say} applies to @command{ponysay} and the ones ending with @code{.think} applies
+to @command{ponythink}.
+
+Balloon style consists of 20 strings. Each string is definied on separate lines, by their
+name and their value seperated with a colon (@code{name:value}), if the name is empty it
+continues the last one new line in the value. Only 10 of the strings may be multilined:
+@code{nw}, @code{nnw}, @code{n}, @code{nne}, @code{ne}, @code{sw}, @code{ssw}, @code{s}
+@code{sse} and @code{se}.
+
+The following strings are used, and must be definied in the files:
+@table @option
+@item \
+The character for the link to the balloon directed as @code{\}.
+@item /
+The character for the link to the balloon directed as @code{/}.
+@item ww
+The beginning of the balloon's line where the message is located if and only if the
+message contains only one line.
+@item ee
+The end of the balloon's line where the message is located if and only if the message
+contains only one line.
+@item nw
+The top left corner of the balloon.
+@item nnw
+If both this string and the @code{'nne'} string fits between the top corners, this
+is printed directly to the right of the top left corner.
+@item n
+The top edge of the balloon.
+@item nne
+If both this string and the @code{'nnw'} string fits between the top corners, this
+is printed directly to the right of the top top corner.
+@item ne
+The top right corner of the balloon.
+@item nee
+The end of the balloon's line where the message's first line is located if and only
+if the message contains more than one line.
+@item e
+The right edge of the balloon.
+@item see
+The end of the balloon's line where the message's last line is located if and only
+if the message contains more than one line.
+@item se
+The bottom right corner of the balloon.
+@item sse
+If both this string and the @code{'ssw'} string fits between the bottom corners, this
+is printed directly to the left of the bottom right corner.
+@item s
+The bottom edge of the balloon.
+@item ssw
+If both this string and the @code{'sse'} string fits between the bottom corners, this
+is printed directly to the right of the bottom left corner.
+@item sw
+The bottom left corner of the balloon.
+@item sww
+The beginning of the balloon's line where the message's last line is located if and
+only if the message contains more than one line.
+@item w
+The left edge of the balloon.
+@item nww
+The beginning of the balloon's line where the message's first line is located if and
+only if the message contains more than one line.
+@end table
+
+
 @node Printing in TTY with KMS
 @section Printing in TTY with KMS
 @cindex tty
@@ -1043,6 +1134,10 @@ ANSI colour sequences in pony files are applied only to the pony image,
 not the balloon link or the balloon itself.
 @item
 Support for colours in the message.
+@item
+Support custom balloon styles using the option @code{-b}, @code{-B} will list
+all available. This list depends on whether you are invoking @command{ponysay}
+or @command{ponythink}
 @end itemize
 
 @heading Version 2.1.1
diff --git a/manuals/ponysay_front.xcf b/manuals/ponysay_front.xcf
index 9ba8d0d..c785502 100644
--- a/manuals/ponysay_front.xcf
+++ b/manuals/ponysay_front.xcf