add --symall and --altall as alternatives to +A + m manual fix + -X, -V, -K options

4 files changed, 36 insertions, 16 deletions

diff --git a/manuals/manpage.0 b/manuals/manpage.0
index 229ad10..cb653f8 100644
--- a/manuals/manpage.0
+++ b/manuals/manpage.0
@@ -82,12 +82,12 @@ 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.
 .SH ENVIRONMENT
 .TP
diff --git a/manuals/manpage.es.0 b/manuals/manpage.es.0
index f4156ee..5f42fdf 100644
--- a/manuals/manpage.es.0
+++ b/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
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 16ce53c..931f853 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -266,19 +266,21 @@ Just as @option{-L}, except it lists extra (non-MLP:FiM) ponies instead of stand
 Prints a list of all balloon styles.
 
 @item -A
-@itemx --balloonlist
+@itemx --all
 @opindex @option{-A}
 @opindex @option{--all}
-@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 --balloonlist
+@itemx ++all
+@itemx --symall
+@itemx --altall
 @opindex @option{+A}
 @opindex @option{++all}
-@opindex @option{++all}
-Show both ponies names, including alternatives, these from MLP:FiM and 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.
 @end table
 
diff --git a/ponysay.py b/ponysay.py
index 85e4cbd..cb701bf 100755
--- a/ponysay.py
+++ b/ponysay.py
@@ -78,9 +78,23 @@ class Ponysay():
         elif args.opts['-A']        is not None:  self.list(); self.__extraponies(); self.list()
         elif args.opts['+A']        is not None:  self.linklist(); self.__extraponies(); self.linklist()
         else:
+            ## Emulate termial capabilities
+            if args.opts['-X'] is not None:
+                linuxvt = False
+                usekms = False
+            elif args.opts['-V'] is not None:
+                linuxvt = True
+                usekms = False
+            elif args.opts['-K'] is not None:
+                linuxvt = True
+                usekms = True
+            
+            ## Other extra features
             self.__extraponies(args)
             self.__bestpony(args)
             self.__ucsremap(args)
+            
+            ## The stuff
             if args.opts['-q'] is not None:  self.quote(args)
             else:                            self.print_pony(args)
     
@@ -2022,6 +2036,10 @@ opts.add_argumentless(['--quoters'])
 opts.add_argumentless(['--onelist'])
 opts.add_argumentless(['++onelist'])
 
+opts.add_argumentless(['-X', '--256-colours', '--256colours', '--x-colours'])
+opts.add_argumentless(['-V', '--tty-colours', '--ttycolours', '--vt-colours'])
+opts.add_argumentless(['-K', '--kms-colours', '--kmscolours'])
+
 opts.add_argumentless(['-h', '--help'],                                  help = 'Print this help message.')
 opts.add_argumentless(['-v', '--version'],                               help = 'Print the version of the program.')
 opts.add_argumentless(['-l', '--list'],                                  help = 'List pony names.')
@@ -2029,7 +2047,7 @@ opts.add_argumentless(['-L', '--symlist', '--altlist'],                  help =
 opts.add_argumentless(['+l', '++list'],                                  help = 'List non-MLP:FiM pony names.')
 opts.add_argumentless(['+L', '++symlist', '++altlist'],                  help = 'List non-MLP:FiM pony names with alternatives.')
 opts.add_argumentless(['-A', '--all'],                                   help = 'List all pony names.')
-opts.add_argumentless(['+A', '++all'],                                   help = 'List all pony names with alternatives.')
+opts.add_argumentless(['+A', '++all', '--symall', '--altall'],           help = 'List all pony names with alternatives.')
 opts.add_argumentless(['-B', '--bubblelist', '--balloonlist'],           help = 'List balloon styles.')
 opts.add_argumentless(['-c', '--compact'],                               help = 'Compress messages.')
 opts.add_argumented(  ['-W', '--wrap'],                  arg = 'COLUMN', help = 'Specify column where the message should be wrapped.')