Merge branch 'develop'

This commit is contained in:
Mattias Andrée 2012-09-29 22:21:14 +02:00
commit 3447dcdab7
8 changed files with 377 additions and 279 deletions

18
.gitignore vendored
View file

@ -23,3 +23,21 @@
/Makefile
/quotes/
## Texinfo manual stuff
/ponysay.aux
/ponysay.cp
/ponysay.cps
/ponysay.fn
/ponysay.ky
/ponysay.log
/ponysay.pg
/ponysay.toc
/ponysay.tp
/ponysay.vr
/ponysay.op
/ponysay.ops
/ponysay.pgs
/ponysay.vrs

View file

@ -7,13 +7,15 @@ Version 2.7
New extraponies: blueballblitz (Various fanfics, Shadowbolt), drhooves1, drhooves2, drhooves3,
drhooves4, drhooves5, drhooves6, drhooves7, drhooves8, drhooves9, drhooves10,
drhooves11, nyx (Fanfic: Past Sins), nyxdisguised (Fanfic: Past Sins)
drhooves11, nyx (Fanfic: Past Sins), nyxdisguised (Fanfic: Past Sins),
pinkaminacupcake (Fanfic)
Pony renamed: cracky to crackle
Version 2.6
New ponies: applebloomdance, blueberry, blueberrycake, blueharvest, candylicious,
New ponies: applebloomdance, blueberry, blueberrycake, blueharvest, candylicious,
cherrycola, cracky, cutiemarkcrusaders, derpybags, derpycloud, firestreak,
hughjelly, lemonhearts, lyrabonbon, noi, pictureperfect, pigpen,
poppycock, quickfix, rainbowhurricane, rainboshadowbolt, silverspeed,

View file

@ -39,7 +39,7 @@ ttyponies()
pdfmanual()
{
texi2pdf "manuals/ponysay.texinfo"
for ext in `echo aux cp cps fn ky log pg toc tp vr bak`; do
for ext in `echo aux cp cps fn ky log pg toc tp vr op ops pgs vrs bak`; do
if [ -f "ponysay.$ext" ]; then
unlink "ponysay.$ext"
fi

View file

@ -0,0 +1,26 @@
$balloon35$
$\$
$\$
$\$
   
    
       
       
            
          
               
              
           
              
             
                
           
           
          
             
               
          
             
           
        
  

View file

@ -0,0 +1,26 @@
$balloon35$]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
$\$
$\$
$\$
]PDd75f87 ]PDd75f87]P5d70087]P5d75f87 ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PDd75f87]P5d70087 ]P0000000]P5d70087 ]P5d75f87 ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PDd75f87]P5d70087]P5d75f87 ]P5d70087 ]PFd787af]P7ffafd7]P7d787af ]P5d70087 ]PDd75f87 ]P5d75f87 ]P5d70087]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PE00d7ff]P6afffff]P5d75f87 ]P5d70087 ]PDd75f87]PFd787af]P7ffafd7 ]P7d787af ]P5d75f87]PFffafd7]PDd70087]P5d70087 ]P5d75f87 ]P0000000]PDd75f87 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PE00d7ff]P6afffff]P600d7ff ]P6afffff ]P5d75f87 ]P5d70087 ]P7d787af ]P7ffafd7 ]P7d787af ]P7ffafd7 ]PDd75f87]P5d70087 ]P5d75f87 ]PDd70087]P5d70087 ]P5d75f87 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]P600d7ff ]P6afffff ]P600d7ff ]PEafffff]P5d75f87]PDd70087]P5d70087 ]P7d787af]PDd75f87]P7ffafd7 ]P8000000]P7ffffff]PFd787af]P7ffafd7]P8000000 ]PFd787af]P5d75f87]P0000000 ]P5d75f87 ]P5d70087 ]P5d75f87 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]P600d7ff ]P6afffff ]P600d7ff ]P6afffff ]PE00d7ff]P5d75f87]PDd70087 ]PFd787af]P7ffafd7 ]P8000000]P7ffffff ]P787d7ff ]P7ffffff ]P0000000 ]P7ffafd7 ]P7d787af ]P0000000 ]P5d75f87 ]PDd70087]P0000000]PDd75f87 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PDd75f87]P5d75f87 ]P5d70087]P0000000 ]P600d7ff ]P6afffff ]P600d7ff ]P6afffff]PDd75f87]P5d70087 ]P7ffafd7 ]P8000000]P7ffffff ]P787d7ff ]P0000000 ]P7ffafd7 ]P7d787af ]P0000000 ]PDd75f87 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]P5d75f87 ]PDd70087]P5d70087 ]P5d75f87]P0000000]PDd75f87 ]PE00d7ff]P600d7ff ]P5d75f87 ]PDd70087]P5d70087 ]P5d75f87]PFffafd7]P7ffafd7 ]PFd787af]PFffffff]P7ffffff ]PF87d7ff]P7d787af]PFffafd7]P7ffafd7 ]PFd787af]P7d787af ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PDd75f87 ]P5d75f87 ]P5d70087 ]P5d75f87 ]P5d70087 ]PDd75f87]P5d75f87 ]P600d7ff ]PEafffff ]P5d75f87 ]P5d70087 ]PDd75f87 ]P7ffafd7 ]PFd787af]P7d787af ]PFffafd7]P0000000]PFd787af ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PDd75f87]P5d70087 ]P5d75f87 ]P5d70087 ]P5d75f87 ]P5d70087 ]P5d75f87 ]P0000000 ]PDd75f87]P5d70087]P600d7ff]PEafffff ]P5d75f87]PDd70087]P5d70087 ]P5d75f87 ]P7ffafd7 ]P7d787af ]P0000000]PFd787af ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]P5d75f87 ]P5d70087 ]PDd75f87]P5d75f87 ]PDd70087]P5d70087 ]P5d75f87 ]P0000000 ]PDd75f87]P7d787af ]P7ffafd7]P9ff5f5f]P600d7ff]PFffffaf ]P1ff5f5f ]P5d75f87]PDd70087]P5d70087 ]P5d75f87 ]P5d70087 ]P5d75f87 ]P7ffafd7 ]P7d787af ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PDd75f87]P5d70087 ]P5d75f87 ]P5d70087 ]P5d75f87 ]P0000000 ]P1ff5f5f ]P8808080 ]PFffffaf]PE00d7ff]PFffffff]PEafffff]PDd75f87]P5d70087 ]P5d75f87 ]PDd70087]PC0087ff]P1ff5f5f]P7808080 ]P9ff5f5f]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PDd75f87]P5d70087 ]P5d75f87 ]PDd70087 ]P0000000]PDd75f87 ]P1ff5f5f ]P7808080 ]P1ff5f5f ]P7ffffff]PFffffaf]P9ff5f5f]P1ff5f5f ]P787d7ff]PDd75f87]P5d70087]P5d75f87 ]P3ff8700 ]PC0087ff]P1ff5f5f]P7808080]PA87ff87]PFffffff]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PDd75f87]P5d70087 ]P5d75f87 ]P0000000 ]P1ff5f5f ]P600ffff ]P1ff5f5f]P9ff0000]PFffffff]P9ff0000]PF87d7ff ]P9ff8700]P3ff8700 ]P1ff5f5f ]PA87ff87]P287ff87 ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]P5d75f87 ]P5d70087 ]PDd75f87 ]P5d75f87 ]P0000000 ]PFd787af]P7ffafd7]P1ff5f5f ]P600ffff ]P1ff5f5f ]P1ff0000 ]PFffffff]P3ff8787 ]P9ff5f5f]P1ff5f5f ]P7d787af ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]P5d75f87 ]PDd70087 ]P5d70087 ]P5d75f87 ]P5d70087 ]P5d75f87]P5d70087 ]P5d75f87 ]P0000000 ]P7d787af ]P7ffafd7 ]P1ff5f5f ]P45f00ff ]P1ff5f5f ]PFd787af]PFffafd7]P7d787af ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PDd75f87]P5d75f87 ]P5d70087 ]P0000000 ]PFd787af]P7ffafd7 ]P1ff5f5f]PC5f00ff]P45f00ff ]P9ff5f5f]P1ff5f5f ]P0000000]P7d787af ]P7ffafd7 ]P7d787af ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]P5d75f87 ]P0000000 ]PDd75f87]P5d70087 ]P5d75f87 ]P0000000 ]P7d787af ]P7ffafd7 ]P7d787af ]P9ff5f5f]P45f00ff]PFd787af]P0000000]P9ff5f5f ]P7d787af ]P7ffafd7 ]P7d787af ]P0000000]PFd787af ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PDd75f87]P5d75f87 ]P5d70087 ]P5d75f87 ]P0000000 ]PFd787af]P7ffafd7 ]P7d787af ]P0000000 ]P7d787af ]P7ffafd7 ]P7d787af ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PDd75f87 ]P7d787af ]P7ffafd7 ]P7d787af ]P0000000]PFd787af ]PFd787af]P7ffafd7 ]P7d787af ]P0000000 ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF
]PFd787af ]PFd787af ]P7aaaaaa]PFffffff]P0000000]P1AA0000]P200AA00]P3AA5500]P40000AA]P5AA00AA]P600AAAA]P7AAAAAA]P8555555]P9FF5555]PA55FF55]PBFFFF55]PC5555FF]PDFF55FF]PE55FFFF]PFFFFFFF

File diff suppressed because it is too large Load diff

32
ponysay
View file

@ -67,6 +67,8 @@ class Ponysay():
elif args.opts['++onelist'] is not None: self.__extraponies(); self.onelist()
elif args.opts['+l'] is not None: self.__extraponies(); self.list()
elif args.opts['+L'] is not None: self.__extraponies(); self.linklist()
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:
self.__extraponies(args)
self.__bestpony(args)
@ -1750,20 +1752,22 @@ opts.add_argumentless(['--quoters'])
opts.add_argumentless(['--onelist'])
opts.add_argumentless(['++onelist'])
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.')
opts.add_argumentless(['-L', '--symlist', '--altlist'], help = 'List pony names with alternatives.')
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(['-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.')
opts.add_argumented( ['-b', '--bubble', '--balloon'], arg = 'STYLE', help = 'Select a balloon style.')
opts.add_argumented( ['-f', '--file', '--pony'], arg = 'PONY', help = 'Select a pony.\nEither a file name or a pony name.')
opts.add_argumented( ['-F', '++file', '++pony'], arg = 'PONY', help = 'Select a non-MLP:FiM pony.')
opts.add_variadic( ['-q', '--quote'], arg = 'PONY', help = 'Select a ponies which will quote themself.')
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.')
opts.add_argumentless(['-L', '--symlist', '--altlist'], help = 'List pony names with alternatives.')
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 MLP:FIM and non-MLP:FiM pony names.')
opts.add_argumentless(['+A', '++all'], help = 'List MLP:FIM and non-MLP:FiM 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.')
opts.add_argumented( ['-b', '--bubble', '--balloon'], arg = 'STYLE', help = 'Select a balloon style.')
opts.add_argumented( ['-f', '--file', '--pony'], arg = 'PONY', help = 'Select a pony.\nEither a file name or a pony name.')
opts.add_argumented( ['-F', '++file', '++pony'], arg = 'PONY', help = 'Select a non-MLP:FiM pony.')
opts.add_variadic( ['-q', '--quote'], arg = 'PONY', help = 'Select a ponies which will quote themself.')
opts.parse()

Binary file not shown.