Permalink
Browse files

Merge branch 'master' into develop

  • Loading branch information...
2 parents 1096f2c + 01ca259 commit d37e1bbb9dd0d882485b44b4b63c41e4c58f93be @maandree maandree committed Oct 4, 2012
View
@@ -1,5 +1,9 @@
Version 2.8
+ New ponies: airheart, bastionyorsets, peppermoon, sunnyrays
+
+ Pony symlink added: georgewachingtony → bastionyorsets
+
Support for explicit hypthenation using soft hyphens had been added to the word wrapper.
Support for explicit non-word wrapping using non-breaking space had been added to the word wrapper.
View
@@ -282,7 +282,7 @@ Rapidfire [UNIDENTIFIED]
Silver Lining http://images3.wikia.nocookie.net/__cb20111216013326/mlp/images/6/6f/S01E16_Rapid_Process_of_Elimination.png
Surprise
Wave Chill http://images1.wikia.nocookie.net/__cb20120115103232/mlp/images/thumb/3/3d/S1E16_UWM3.png/150px-S1E16_UWM3.png
-Airheart http://images3.wikia.nocookie.net/__cb20120326185026/mlp/images/1/16/Purple_cloud_pegasus_mare_s02e22.png
+Airheart
April Showers http://images2.wikia.nocookie.net/__cb20111216013116/mlp/images/9/92/S01E16_Medley.png
Blossomforth
Blue Skies http://images1.wikia.nocookie.net/__cb20120326190048/mlp/images/thumb/d/df/Blue_pegasus_yellow_mane_s02e22.png/150px-Blue_pegasus_yellow_mane_s02e22.png
@@ -334,6 +334,7 @@ Papermoon http://images2.wikia.nocookie.net/__cb20110407194306/mlp/images/thumb
Parasol http://images4.wikia.nocookie.net/__cb20110725003630/mlp/images/thumb/6/64/Parasol_flies.png/150px-Parasol_flies.png
Parula http://images4.wikia.nocookie.net/__cb20111213200633/mlp/images/f/f6/Parula.png
Peppermint Crunch http://images4.wikia.nocookie.net/__cb20110707011840/mlp/images/thumb/9/9d/Peppermint_Crunch.png/150px-Peppermint_Crunch.png
+Peppermoon
Pink Cloud http://images2.wikia.nocookie.net/__cb20111216013154/mlp/images/2/20/S01E03_Pink_Cloud.png
Prism Strider http://images1.wikia.nocookie.net/__cb20120326190037/mlp/images/thumb/6/66/Blue_rainbow_pegasus_stallion_s02e22.png/150px-Blue_rainbow_pegasus_stallion_s02e22.png
Pumpkin Tart http://images2.wikia.nocookie.net/__cb20111213200839/mlp/images/5/55/Pumpkin_Tart.png
@@ -361,7 +362,7 @@ Strawberry Sunrise http://images1.wikia.nocookie.net/__cb20120326175918/mlp/imag
Sugar Grape http://images1.wikia.nocookie.net/__cb20110805213911/mlp/images/2/25/Sugar_grape.png
Sunburst http://images1.wikia.nocookie.net/__cb20110621071321/mlp/images/thumb/9/97/Sunburst.png/150px-Sunburst.png
Sunlight http://images3.wikia.nocookie.net/__cb20120325033120/mlp/images/thumb/e/ec/Yellow_stallion_hurled_out_of_tornado_s02e22.png/150px-Yellow_stallion_hurled_out_of_tornado_s02e22.png
-Sunny Rays http://images3.wikia.nocookie.net/__cb20110725003610/mlp/images/thumb/d/d5/Sun_rays.png/150px-Sun_rays.png
+Sunny Rays
Sunstone http://images2.wikia.nocookie.net/__cb20120417184529/mlp/images/thumb/7/7f/S02E11_UPM1.png/150px-S02E11_UPM1.png
Sunstone http://images2.wikia.nocookie.net/__cb20120417184529/mlp/images/thumb/7/7f/S02E11_UPM1.png/150px-S02E11_UPM1.png
The Tenth Doctor / Doctor Whooves #3 http://images1.wikia.nocookie.net/__cb20120214112240/mlp/images/thumb/8/84/Anothertimelord.png/150px-Anothertimelord.png
@@ -380,7 +381,7 @@ Allie Way
Amethyst Star
Ballad http://images2.wikia.nocookie.net/__cb20111129211324/mlp/images/thumb/4/4e/Violyre.PNG/150px-Violyre.PNG
Banana Fluff http://images4.wikia.nocookie.net/__cb20111213195452/mlp/images/b/be/Yellow_purple_unicorn_Banana_Fluff_down-shot._S2E05.png
-Bastion Yorsets / George Washingtony http://images1.wikia.nocookie.net/__cb20110624092738/mlp/images/thumb/e/ef/Bastion_Yorsets.png/150px-Bastion_Yorsets.png
+Bastion Yorsets / George Washingtony
Blue Belle http://images1.wikia.nocookie.net/__cb20110704192511/mlp/images/thumb/d/da/Blue_belle.png/150px-Blue_belle.png
Chocolate Sun http://images1.wikia.nocookie.net/__cb20110823200338/mlp/images/thumb/f/fc/Chocolate_Sun.png/150px-Chocolate_Sun.png
Chocolate Tail http://images2.wikia.nocookie.net/__cb20110823191748/mlp/images/thumb/9/98/Chocolate_Tail.png/150px-Chocolate_Tail.png
View
@@ -81,6 +81,14 @@ 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.
+.TP
+.B \-A, \-\-all \fIcolumn\fP
+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.
+.TP
+.B \+A, \+\+all \fIcolumn\fP
+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.
.SH ENVIRONMENT
.TP
.B PONYSAY_BOTTOM
@@ -131,4 +139,4 @@ Mattias Andrée <maandree@kth.se> for the official ponysay release.
.PP
This program is licensed under WTFPL.
.\" See file COPYING to see the license.
-
+
View
@@ -83,6 +83,15 @@ aleatoriamente uno de este conjunto.
.TP
.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
+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
+MLP:FiM cono no pertenecientes, la primera lista seran los pertenecientes y la
+subsiguente los no pertenecientes.
.SH ENTORNO
.TP
.B PONYSAY_BOTTOM
@@ -105,6 +114,7 @@ no desea que la salida sea truncada para que calce en la terminal.
Exporte \fIPONYSAY_TRUNCATE_HEIGHT\fP con el valor \fIyes\fP, \fIy\fP o \fI1\fP, si
desea truncar la salida en el largo aun si no se está dentro de una terminal \fIponysay\fP bajo
TTY.
+.TP
.B PONYSAY_UCS_ME
Exportar \fIPONYSAY_UCS_ME\fP con el valor \fIyes\fP, \fIy\fP o \fI1\fP,
Si es que busca 'simular enlaces simbólicos' a ponis usando 'Universal Character Set' (Set de
View
@@ -264,6 +264,22 @@ Just as @option{-L}, except it lists extra (non-MLP:FiM) ponies instead of stand
@opindex @option{--bubblelist}
@opindex @option{--balloonlist}
Prints a list of all balloon styles.
+
+@item -A
+@itemx --balloonlist
+@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.
+
+@item +A
+@itemx --balloonlist
+@opindex @option{+A}
+@opindex @option{++all}
+@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.
@end table
@opindex @var{message}
@@ -1848,10 +1864,16 @@ sequences.
@cindex versions
@cindex previous releases
-
@heading Version 2.8
@itemize @bullet
@item
+New ponies: @file{airheart}, @file{bastionyorsets}, @file{peppermoon}, @file{sunnyrays}
+@item
+Pony symlink added:
+@itemize @bullet
+@item @file{georgewashingtony} @arrow{} @file{bastionyorsets}
+@end itemize
+@item
Support for explicit hypthenation 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.
View
@@ -0,0 +1,5 @@
+This day has been just perfect
+The kind of day I've dreamed since I was small
+Everypony I'll soon control
+Every Stallion, mare and foal
+Who says a girl can't really have it all?
View
@@ -1,4 +1,5 @@
ace
+airheart
allie
aloe
angel
@@ -9,6 +10,7 @@ applefritter
applejack+applejackscarecrow+fillyjack+fillyjacktravel
archer
basil
+bastionyorsets+georgewashingtony
berrypunch
bigmac
blaze
@@ -107,6 +109,7 @@ opal
orange
owl+owlowiscious
parasprite
+peppermoon
perry+perrypierce
persnickety
petunia
@@ -165,6 +168,7 @@ stella
stevenmagnet+stevenmagnettrue
strongheart
sue+suedance
+sunirays
surprise
sweetie
tank
View
@@ -0,0 +1,26 @@
+$balloon7$]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ $\$
+ $\$
+ $\$
+ ]P9af5f5f▄▄]P3d7875f▀▀▀]P0000000▄▄▄ ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P3af5f5f ]P3d7875f ]P9af5f5f▀▀]P0000000▄]PFd787af▄]P7d7afd7▀▀]P0000000▄ ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P3af5f5f ]P3d7875f ]P84e4e4e▄]P78a8a8a▀▀▀]P3d7875f▄ ▄]P78a8a8a▀▀▀]P7d7afd7▄ ]PFd787af▀]P0000000▄]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P3af5f5f ]P3d7875f]P8444444▄]P04e4e4e▀ ]P78a8a8a]PF9e9e9e▄]P79e9e9e ]P04e4e4e ]P8444444▀▀ ]P78a8a8a]PF9e9e9e▄]P79e9e9e ]P04e4e4e ]P8444444▀]P7d7afd7▄]P7d787af ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P3af5f5f ]P0444444 ]PFd7afd7▄]P04e4e4e▄]PBaf875f▀▀▀]PFd7afd7▄]P0444444▄]P9af5f5f▄]P04e4e4e▄]PBaf875f▀▀▀]PFd7afd7▄]P0444444▄]P84e4e4e▀ ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P3af5f5f ]P3d7875f ]P7d787af]P9af5f5f▄]PFd7afd7▀]P7d7afd7 ]P9af5f5f▀▀ ]PFd787af▄]P0444444▄]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P3af5f5f ]P3d7875f ]P3af5f5f ]P7d787af]P8000000▄]P7d7afd7▄▀▀▀▄ ▄▀▀▀▄]P7d787af▄]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P3af5f5f ]P3d7875f ]P7d787af ]PFd7afd7▀]P7d7afd7 ]P7d787af▀▄▄▄▀]P7d7afd7 ]P7d787af▀ ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P3af5f5f ]P3d7875f ]PFd787af▀]P7d7afd7▄ ▄▄▄ ▄]P0000000▀ ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P9af5f5f▀]P3d7875f▄ ]P3af5f5f ]P7d787af]P9d7875f▄]P9af5f5f▄]PFd7afd7▀▀▀▀▀▀▀ ]P0000000]PFd787af▀ ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P9af5f5f▄]P3d7875f▀▄ ]P3af5f5f ]P9d7875f▀ ]P7d7afd7 ]P7d787af ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P9af5f5f▄]P3d7875f▀ ▄ ]P7d787af▀]P3af5f5f ]P3d7875f]PFd787af▄]P3af5f5f]PFd7afd7▄]P7d7afd7 ]PFd787af▀]P0000000▄]P7d7afd7▀]P0000000▄ ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P9af5f5f▄]P3af5f5f ]P3d7875f ]P3af5f5f ]P3d7875f ]P7d787af ]P7d7afd7]PFd7afaf▄]P7d787af ]P7d7afd7 ]P7d787af ]P7d7afd7▄]P7d787af ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P3af5f5f ]P3d7875f ]P3af5f5f ]P3d7875f ]P7d787af ]P7d7afd7]PFd7afaf▄▀]P7d787af ]PFd7afd7▀]P7d7afd7 ]P7d787af▀ ]P7d7afaf▄▀]P7d787af ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P3af5f5f ]P3d7875f ]P3af5f5f ]P3d7875f ]PFd787af▀]P5af5f87▀]P7d7afd7▄]P7d787af ]P7d7afd7 ▄▄ ]P7d787af ]PFd7afd7▀]PDaf5f87▄]P0000000]PFd787af▀ ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P3af5f5f ]P3d7875f ]P3af5f5f ]P3d7875f ]P5af5f87 ]P7d7afaf ]P7d787af ]P7d7afd7 ]P7d787af ]P7d7afd7 ]P7d787af ]P7d7afaf ]P5af5f87 ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P9af5f5f▀]P3d7875f▄ ]P3af5f5f ]P3d7875f ]P5af5f87 ]P7d7afaf ]P7d787af ]P7d7afd7 ]P7d787af ]P7d7afd7 ]P7d787af ]P7d7afaf ]P5af5f87 ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P9af5f5f▀]P3d7875f▄ ]P3af5f5f ]P3d7875f ]P5af5f87 ]P7d787af ]P7d7afd7 ]P7d787af ]P7d7afd7 ]P7d787af ]P5af5f87 ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P9af5f5f▄]P3d7875f▀ ▄]P5af5f87 ]P7d7afaf ]P7d787af ]P7d7afd7 ]P7d787af ]P7d7afd7 ]P7d787af ]P7d7afaf ]P5af5f87 ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]P9af5f5f▀▀▀▀ ]P5af5f87 ]P7d7afaf ]P7d787af ]P7d7afd7 ]P7d787af ]P7d7afd7 ]P7d787af ]P7d7afaf ]P5af5f87 ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]PDaf5f87▀]P7d7afaf▄]P7d787af ]P7d7afd7 ]P7d787af ]P7d7afd7 ]P7d787af ]P7d7afaf▄]P0000000▀ ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
+ ]PFd787af▀]P7d7afd7▄▄▄]P0000000▀▀]P7d7afd7▄▄▄]P0000000▀ ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
Oops, something went wrong.

0 comments on commit d37e1bb

Please sign in to comment.