conflict resolve

.gitignore

@@ -1,6 +1,7 @@
 ## Private workspace directory
 
 /_/
+/*.pony
 
 
 ## Backup files

CHANGELOG

@@ -4,7 +4,7 @@ Version 2.8
 	            pinkieparade, pinkieumbrellahat, raritycomplaining, shiningarmorwedding, soarinofficer,
 	            starlight, sunnyrays, sweatiesing, tenderheart, tom, twilightspike, zecorabalance
 
-	New extraponies: applejack (Tumblr), applejack-63, artemis, blueberry, butterscotch, 
+	New extraponies: applejack (Tumblr), applejack-63, artemis, blueberry, butterscotch,
 			 drhoovesdiscorded (Tumblr), duskshine, elusive, rainbowblitz
 
 	Pony symlink added: georgewachingtony → bastionyorsets
@@ -15,6 +15,14 @@ Version 2.8
 
 	The word wrapper colours the inserted hyphens in red.
 
+	Support for terminal capabilities emulation with the flags -X, -V and -K.
+
+	Support for printing just the pony, using the flag -o.
+
+	Colouring option flags are added.
+
+	Automatic correction of incorrectly spelled pony names and balloon style names added.
+
 
 Version 2.7
 

completion/bash-completion.sh

@@ -5,7 +5,8 @@ _ponysay()
     local cur prev words cword
     _init_completion -n = || return
 
-    options='--version --help --list --altlist --pony --wrap --quote --balloonlist --balloon --file ++file ++pony ++list ++altlist'
+    options="--version --help --list --altlist --pony --wrap --quote --balloonlist --balloon --file ++file ++pony ++list ++altlist --all ++all"
+    options="$options --256-colours --tty-colours --kms-colours"
     COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
 
     if [ $prev = "-f" ] || [ $prev = "--pony" ] || [ $prev = "--file" ]; then

completion/fish-completion.fish

@@ -9,7 +9,7 @@ set -g quoters  ('/usr/bin/ponysay' --quoters)
 set -g balloons ('/usr/bin/ponysay' --balloonlist)
 
 
-## TODO: update with options [see info manual]:  +l  +L  ++list  ++altlist  ++file  --file  ++pony
+## TODO: update with options [see info manual]:  +l  +L  ++list  ++altlist  ++file  --file  ++pony  {-A, +A, -V, -K, -X}(with alternative)
 complete --command ponysay --short-option h --long-option help                                           --description 'help of ponysay'
 complete --command ponysay --short-option v --long-option version                                        --description 'version of ponysay'
 complete --command ponysay --short-option l --long-option list                                           --description 'list pony names'

dependency-test.sh

@@ -15,6 +15,7 @@ ro=0
 (hash mkdir        2>/dev/null) || (br=1 ; echo 'Missing mkdir, install coreutils [build required]')
 (hash cp           2>/dev/null) || (br=1 ; echo 'Missing cp, install coreutils [build required]')
 (hash cut          2>/dev/null) || (br=1 ; echo 'Missing cut, install coreutils [build required]')
+(hash chmod        2>/dev/null) || (br=1 ; echo 'Missing chmod, install coreutils [build required]')
 
 (hash bash         2>/dev/null) || (bs=1 ; echo 'Missing bash, install bash [build recommended]')
 
@@ -32,6 +33,7 @@ ro=0
 
 (hash tty2colourfultty   2>/dev/null) || (ro=1 ; echo 'Missing tty2colourfultty, install util-say [runtime optional]')
 (hash ponysay2ttyponysay 2>/dev/null) || (ro=1 ; echo 'Missing ponysay2ttyponysay, install util-say [runtime optional]')
+(hash chmod              2>/dev/null) || (rr=1 ; echo 'Missing chmod, install coreutils [runtime optional]')
 
 ( (test $br = 1) || (test $rr = 1) || (test $ro = 1) ) && echo
 

manuals/manpage.0

@@ -82,13 +82,22 @@ the pony will be selected randomly from that set of ponies.
 .B \-W, \-\-wrap \fIcolumn\fP
 The screen column where the message should be wrapped.
 .TP
-.B \-A, \-\-all \fIcolumn\fP
-Show all ponies, MLP-FiM and non-MLP-FiM, in this case the first list are MLP:FiM
+.B \-A, \-\-all
+List all pony files, MLP-FiM and non-MLP-FiM, in this case the first list are MLP:FiM
 and the second are non-MLP-FiM.
 .TP
-.B \+A, \+\+all \fIcolumn\fP
-Show both ponies names, including alternatives, these from MLP:FiM and non-MLP:FiM
+.B \+A, \+\+all, \-\-symall, \-\-altall
+List all pony files, including alternatives names inside brackets, these from MLP:FiM and non-MLP:FiM
 the first list are the MLP:FiM and the second one are non-MLP:FiM.
+.TP
+.B \-o, \-\-pony\-only, \-\-ponyonly
+Just print the pony, nothing else like the speech balloon.
+.TP
+.B \+c, \-\-colour [\fIansi-colour\fP]
+Colour the balloon, including link and message. For more colouring features, se the \fIinfo\fP
+manual. The argument, \fIansi-colour\fP, should be a ANSI colour sequence without leading CSI
+and without a tailing \fIm\fP, for example \fI1;31\fP will make it in red and bold (or bright
+depending on the terminal.)
 .SH ENVIRONMENT
 .TP
 .B PONYSAY_BOTTOM

manuals/manpage.es.0

@@ -84,12 +84,12 @@ aleatoriamente uno de este conjunto.
 .B \-W, \-\-wrap \fIcolumna\fP
 El numero de columnas en el que será impreso el mensaje.
 .TP
-.B \-A. \-\-all \fIcolumn\fP
-Muestra todos los ponis, tanto pertenecientes a MLP:FiM cono no pertenecientes a esta
+.B \-A. \-\-all 
+Lista todos los ponis, tanto pertenecientes a MLP:FiM cono no pertenecientes a esta
 la primera lista son los pertenecientes a esta y la subsiguente los no pertenecientes.
 .TP
-.B \+A, \+\+all \fIcolumn\fP
-Muestra todos los ponies incluyendo sus nombres alternativos, estos pertenecientes a
+.B \+A, \+\+all, \-\-symall, \-\-altall
+Lista todos los ponis incluyendo sus nombres alternativos, estos pertenecientes a
 MLP:FiM cono no pertenecientes, la primera lista seran los pertenecientes y la
 subsiguente los no pertenecientes.
 .SH ENTORNO

manuals/ponysay.texinfo

@@ -269,15 +269,98 @@ Prints a list of all balloon styles.
 @itemx --all
 @opindex @option{-A}
 @opindex @option{--all}
-Show all ponies, MLP-FiM and non-MLP-FiM, in this case the first list are MLP:FiM
-and the second are non-MLP-FiM.
+List all ponies, MLP:FiM and non-MLP:FiM, in this case the first list are MLP:FiM
+and the second are non-MLP:FiM.
 
 @item +A
-@itemx --all
+@itemx ++all
+@itemx --symall
+@itemx --altall
 @opindex @option{+A}
 @opindex @option{++all}
-Show both ponies names, including alternatives, these from MLP:FiM and non-MLP:FiM
-the first list are the MLP:FiM and the second one are non-MLP:FiM.
+@opindex @option{--symall}
+@opindex @option{--altall}
+List all ponies names, including alternatives, these from MLP:FiM and non-MLP:FiM.
+The first list are the MLP:FiM and the second one are non-MLP:FiM.
+
+@item -o
+@itemx --pony-only
+@itemx --ponyonly
+@opindex @option{-o}
+@opindex @option{--pony-only}
+@opindex @option{--ponyonly}
+Print just the pony, nothing else like the speech balloon.
+
+@item -X
+@itemx --256-colours
+@itemx --256colours
+@itemx --x-colours
+@opindex @option{-X}
+@opindex @option{--256-colours}
+@opindex @option{--256colours}
+@opindex @option{--x-colours}
+Use @command{xterm}'s 256-colour support (supported by most X11 terminals), despite
+your terminal's actual compatibilies. 
+
+@item -V
+@itemx --tty-colours
+@itemx --ttycolours
+@itemx --vt-colours
+@opindex @option{-V}
+@opindex @option{--tty-colours}
+@opindex @option{--ttycolours}
+@opindex @option{--vt-colours}
+Use Linux VT's compatbilies without KMS utilisation, despite your terminal's actual
+compatibilies.
+
+@item -K
+@itemx --kms-colours
+@itemx --kmscolours
+@opindex @option{-K}
+@opindex @option{--kms-colours}
+@opindex @option{--kmscolours}
+Use Linux VT's compatbilies with KMS utilisation, despite your terminal's actual
+compatibilies.
+
+@item +c
+@itemx --colour ANSI-COLOUR
+@opindex @option{+c}
+@opindex @option{--colour}
+Colour the balloon, including link and message (the parts that are not individually
+specified.) The argument, should be a ANSI colour sequence without leading CSI and
+without a tailing ‘m’, for example @code{1;31} will make it in red and bold (or bright
+depending on the terminal.)
+
+@item --colour-bubble
+@itemx --colour-balloon ANSI-COLOUR
+@opindex @option{--colour-bubble}
+@opindex @option{--colour-balloon}
+Just like @option{--colour}, but it only colours the balloon, without the message
+or link.
+
+@item --colour-link ANSI-COLOUR
+@opindex @option{--colour-link}
+Just like @option{--colour}, but it only colours the balloon link.
+
+@item --colour-msg
+@itemx --colour-message ANSI-COLOUR
+@opindex @option{--colour-msg}
+@opindex @option{--colour-message}
+Just like @option{--colour}, but it only colours the message.
+
+@item --colour-pony ANSI-COLOUR
+@opindex @option{--colour-pony}
+Just like @option{--colour}, but it colours the pony. This colouring has no
+effect ony regular pony files, as it has its own colouring.
+
+@item --colour-wrap
+@itemx --colour-hyphen ANSI-COLOUR
+@opindex @option{--colour-wrap}
+@opindex @option{--colour-hyphen}
+Just like @option{--colour}, but it colours hyphen added by the word wrapping.
+By default this is red (@code{31}), if you want uncoloured use @code{0},
+without @code{0} or @code{39}, the default @code{31} is presistent.
+
 @end table
 
 @opindex @var{message}
@@ -671,12 +754,14 @@ We have provided a script that should run one most, if not all shells, named
 
 @table @command
 @item util-say>=2
-@cindex @command{util-say}
+@pindex @command{util-say}
 @cindex kms
 @cindex tty
 @pindex linux vt
 For improved TTY support for user with custom colour palette and KMS support.
-It can be downloaded at @url{https://github.com/maandree/util-say}.
+It can be downloaded at @url{https://github.com/maandree/util-say}. If this is
+used @command{chmod} from @command{coreutils} is also required.
+
 
 @cindex .png
 @cindex png images
@@ -1880,11 +1965,19 @@ Pony symlink added:
 @item @file{georgewashingtony} @arrow{} @file{bastionyorsets}
 @end itemize
 @item
-Support for explicit hypthenation using soft hyphens had been added to the word wrapper.
+Support for explicit hyphenation using soft hyphens had been added to the word wrapper.
 @item
 Support for explicit non-word wrapping using non-breaking space had been added to the word wrapper.
 @item
 The word wrapper colours the inserted hyphens in red.
+@item
+Support for terminal capabilities emulation with the flags @option{-X}, @option{-V} and @option{-K}.
+@item
+Support for printing just the pony, using the flag @option{-o}.
+@item
+Colouring option flags are added.
+@item
+Automatic correction of incorrectly spelled pony names and balloon style names added.
 @end itemize