From fba4b004b5e8e92b35b70d248d22c53ac017b07c Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Wed, 18 Jul 2012 17:58:47 -0400 Subject: Vonboyage background pony added --- ponies/bonvoyage.pony | 21 +++++++++++++++++++++ ttyponies/bonvoyage.pony | 22 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 ponies/bonvoyage.pony create mode 100644 ttyponies/bonvoyage.pony diff --git a/ponies/bonvoyage.pony b/ponies/bonvoyage.pony new file mode 100644 index 0000000..fa03236 --- /dev/null +++ b/ponies/bonvoyage.pony @@ -0,0 +1,21 @@ +$the_cow =< Date: Wed, 18 Jul 2012 19:01:10 -0400 Subject: Added petunia, same problem that fleurdelis, fix'd --- ponies/petunia.pony | 28 ++++++++++++++++++++++++++++ ttyponies/petunia.pony | 29 +++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 ponies/petunia.pony create mode 100644 ttyponies/petunia.pony diff --git a/ponies/petunia.pony b/ponies/petunia.pony new file mode 100644 index 0000000..aac4cca --- /dev/null +++ b/ponies/petunia.pony @@ -0,0 +1,28 @@ +$the_cow =< Date: Thu, 19 Jul 2012 17:56:03 -0400 Subject: Added Truffle Shuffle --- ponies/truffleshuffle.pony | 22 ++++++++++++++++++++++ ttyponies/truffleshuffle.pony | 23 +++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 ponies/truffleshuffle.pony create mode 100644 ttyponies/truffleshuffle.pony diff --git a/ponies/truffleshuffle.pony b/ponies/truffleshuffle.pony new file mode 100644 index 0000000..83dbf0a --- /dev/null +++ b/ponies/truffleshuffle.pony @@ -0,0 +1,22 @@ +$the_cow =< Date: Thu, 19 Jul 2012 18:34:33 -0400 Subject: Piña colada, Change Ñ for n for terminals, fix'd problem in color, same problem from fleurdelis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ponies/pinacolada.pony | 23 +++++++++++++++++++++++ ttyponies/pinacolada.pony | 24 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 ponies/pinacolada.pony create mode 100644 ttyponies/pinacolada.pony diff --git a/ponies/pinacolada.pony b/ponies/pinacolada.pony new file mode 100644 index 0000000..05e845f --- /dev/null +++ b/ponies/pinacolada.pony @@ -0,0 +1,23 @@ +$the_cow =< Date: Thu, 19 Jul 2012 18:49:04 -0400 Subject: Added the correctly perry pierce --- ponies/perrypierce.pony | 28 ++++++++++++++++++++++++++++ ttyponies/perrypierce.pony | 29 +++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 ponies/perrypierce.pony create mode 100644 ttyponies/perrypierce.pony diff --git a/ponies/perrypierce.pony b/ponies/perrypierce.pony new file mode 100644 index 0000000..f99ebe4 --- /dev/null +++ b/ponies/perrypierce.pony @@ -0,0 +1,28 @@ +$the_cow =< Date: Fri, 20 Jul 2012 01:02:34 +0200 Subject: typo --- README | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 49891e1..46ba369 100644 --- a/README +++ b/README @@ -120,7 +120,7 @@ It is available at: https://github.com/maandree/ponyquotes4ponysay https://aur.archlinux.org/packages.php?ID=60988 Run `ponysay -q` will give you a random pony saying one it its quote from MLP:FiM. -Add one or more argument after `-q` to sepcify a set of ponies from which one will be selected randomly. +Add one or more argument after `-q` to sepecify a set of ponies from which one will be selected randomly. When running `ponysay -l` or `ponysay -L` the ponies which have quotes will be printed bold or bright (depending on terminal diff --git a/README.md b/README.md index bc9bf7a..eb46b37 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Now every time you open a terminal a pony should give your fortune Installing [ponyquotes4ponysay](https://github.com/maandree/ponyquotes4ponysay) will enable My Little Pony quotes with associated pony. -Run `ponysay -q` will give you a random pony saying one it its quote from MLP:FiM. Add one or more argument after `-q` to sepcify a +Run `ponysay -q` will give you a random pony saying one it its quote from MLP:FiM. Add one or more argument after `-q` to sepecify a set of ponies from which one will be selected randomly. When running `ponysay -l` or `ponysay -L` the ponies which have quotes will be printed bold or bright (depending on terminal). -- cgit From f274d626934c62e37555bb27c1ef00f4f5d78fe9 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 01:05:03 +0200 Subject: typo --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 46ba369..64a75ed 100644 --- a/README +++ b/README @@ -122,7 +122,7 @@ It is available at: https://github.com/maandree/ponyquotes4ponysay Run `ponysay -q` will give you a random pony saying one it its quote from MLP:FiM. Add one or more argument after `-q` to sepecify a set of ponies from which one will be selected randomly. -When running `ponysay -l` or `ponysay -L` the ponies which have quotes will be printed bold or bright (depending on terminal +When running `ponysay -l` or `ponysay -L` the ponies which have quotes will be printed bold or bright (depending on terminal). Ponies in TTY (Linux VT) -- cgit From 22c1fc020ab50fa18ba1a68d4165ed6b625e7fb7 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 01:44:47 +0200 Subject: m + work on info manual --- README | 8 +-- README.md | 4 +- manuals/ponysay.texinfo | 176 ++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 170 insertions(+), 18 deletions(-) diff --git a/README b/README index 64a75ed..11725d4 100644 --- a/README +++ b/README @@ -25,9 +25,9 @@ Required runtime dependencies cowsay : this is a wrapper for cowsay - coreutils : the main script [file: ponysay] uses stty, cut, ls, cat, sort, readlink, head and tail + coreutils : the main script [file: ponysay] uses stty, cut, ls, cat, sort, readlink, pwd, head and tail - sed : used to remove .pony from pony named when running `ponysay -l` and `ponysay -L` + sed : used to remove .pony from pony names when running `ponysay -l` and `ponysay -L` perl : required to run `ponysay -l` and `ponysay -L` @@ -49,7 +49,7 @@ Package building dependencies make : required to run the make script - coreutils : make script uses install unlink rm ln mkdir cp + coreutils : make script uses install, unlink, rm, ln, mkdir and cp Dependencies for pony providers @@ -61,7 +61,7 @@ Dependencies for pony providers bash : used in the ttyponies subscript - util-say : used by `make ttyponies` to builder ttyponies from xterm ponies + util-say : used by `make ttyponies` to build ttyponies from xterm ponies -- Available for Arch:ers in AUR as util-say-git (https://aur.archlinux.org/packages.php?ID=60241) -- and on github at https://github.com/maandree/util-say diff --git a/README.md b/README.md index eb46b37..36811f3 100644 --- a/README.md +++ b/README.md @@ -80,9 +80,9 @@ Dependencies `cowsay`: this is a wrapper for cowsay -`coreutils`: the main script uses stty, cut, ls, cat, sort, readlink, head and tail +`coreutils`: the main script uses stty, cut, ls, cat, sort, readlink, pwd, head and tail -`sed`: used to remove .pony from pony named when running `ponysay -l` and `ponysay -l` +`sed`: used to remove .pony from pony names when running `ponysay -l` and `ponysay -l` `perl`: required to run `ponysay -l` and `ponysay -L` diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index d25cfdf..00b77de 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -21,8 +21,8 @@ Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +Texts. A copy of the license is included in the section entitled +``GNU Free Documentation License''. @end quotation @end copying @@ -49,15 +49,18 @@ Free Documentation License''. @menu * Overview:: Brief overview of @command{ponysay}. * Invoking ponysay:: How to run @command{ponysay}. +* Advanced usage:: Advanced usage of @command{ponysay}. * Environment:: Environment variables. -@c Extensions * Limitations:: Limitations. * Problems and requests:: Reports and requests. +* Dependencies:: Dependencies. * GNU Free Documentation License:: Copying and sharing this manual. * Concept index:: Concept index. @end menu + + @node Overview @chapter Overview @cindex overview @@ -70,6 +73,8 @@ is printed on standard output. @command{ponythink} is to @command{ponysay} as @command{cowthink} is to @command{cowsay}. + + @node Invoking ponysay @chapter Invoking @command{ponysay} @cindex invoking @@ -138,6 +143,46 @@ If you want to use @command{ponysay} without arguments and enter the message by hand, you can run @code{cat | ponysay}. + +@node Advanced usage +@chapter Advanced usage of @command{ponysay}. +@cindex advanced usage + +@cindex fortune +If you have @command{fortune} installed -- this program may be named +@command{fortune-mod} in your GNU/Linux distributions package reposity -- +you can run @code{fortune | ponysay} to get a random pony reading a +random fortune cookie. + +@cindex on startup +By adding @code{fortune | ponysay} to the end [easiest way] of your +@code{~/.bashrc} -- or equivalent for your shell if use do not use GNU Bash +(standard shell for most distributions now adays) -- you will get the +effect described in the previous paragraph every time you open a terminal. + +@cindex tty +@cindex linux vt +If you use TTY and have a custom colour palette, you should also add to your +@code{~/.bashrc}, before @code{fortune | ponysay}: +@example +[[ "$TERM" = "linux" ]] && + function ponysay + @{ exec ponysay "$@@" + #RESET PALETTE HERE + @} +@end example + +@cindex ponification +@cindex ponypipe +You can ponify text (i.e. replaces words search as ``everyone'' with ``everypony'') +by using @code{fortune | ponypipe} instead of using @command{fortune}. +@command{ponypipe} can be downloaded from @url{https://github.com/maandree/ponypipe}. +Alternatively use can use @command{pinkie} (or @command{pinkiepie}), which can +be downloaded from @url{https://github.com/maandree/pinkie-pie}, which is just +@code{fortune | ponypipe}. +Their is also a large sed script, similar to @command{ponypipe}: @url{http://www.reddit.com/r/mylittlelinux/comments/srixi/using_ponysay_with_a_ponified_fortune_warning/} + + @node Environment @chapter Environment variables @cindex environment variables @@ -176,30 +221,54 @@ are not running @command{ponysay} under TTY. + @node Limitations @chapter Limitations @cindex limitations @menu * Terminals:: Limitations on terminals. -@c Cowsay +* Cowsay:: Limitations on cowsay, @end menu + @node Terminals @section Terminals - Ponysay works perfectly on @command{xterm}, @command{xterm} like terminals including @command{putty}, settings may however need to be customised for Unicode Character Set (UCS) support, but less well, depending on font, on VTE based terminals including @command{mate-terminal}. -On Linux's native terminal Linux VT (or TTY) it works less well, and not good at all -with Kernal Mode Settings (KMS) support. See @url{https://github.com/erkin/ponysay/issues/1} -for more information. +On Linux's native terminal Linux VT (TTY) it works less well, and not good at all with +Kernal Mode Settings (KMS) support. See @url{https://github.com/erkin/ponysay/issues/1} +for more information. @command{ponysay} clears the screen before printing to TTY, this +is because if your graphics driver supports KMS, the colours will be messed by when the +ponies position moves on the screen, this is also reason why the output is truncated on +the height in TTY by default. + +Due to extreme limitations in @command{9term} @command{ponysay} will never be able to +run on it. + + +@node Cowsay +@section Cowsay + +When @command{cowsay} determines the length of a word it measures in number of bytes +(in UTF-8), therefore non-ascii words will malformat the balloon with the message. + +Further, @command{cowsay} does not recognise ANSI escape sequences, therefore, using +colours and text styling in messages will also malformat the balloon with the message. -Due to extreme limitations in @command{9term} @command{ponysay} will never be able -to run on it. +@command{cowsay} does not support balloon, including the link between the message and +the pony, customisation, other than using @command{cowthink}. However you can modify +@command{cowsay} (written perl, so you can edit the installed files) to make the balloon +look different, maybe using box drawing characters. + +@cindex figlet +@cindex tiolet +@command{cowsay}'s word wrapping handles single line breaks as normal blankspaces, +this messes up messaged created with programs seach as @command{figlet} and @command{TOIlet}. @@ -208,9 +277,10 @@ to run on it. @menu * Problems:: Reporting bugs. -* Requests:: Requestig ponies. +* Requests:: Requesting ponies. @end menu + @node Problems @section Reporting bugs @cindex bugs @@ -221,8 +291,9 @@ present, please report it at @url{https://github.com/erkin/ponysay/issues}. Please be as descriptive as possible, as it will help us verify it solve it faster. + @node Requests -@section Requestig ponies +@section Requesting ponies @cindex pony requests If you want I specific pony added, ask us at @url{https://github.com/erkin/ponysay/issues} @@ -230,6 +301,85 @@ and we will add it. To speed the up the process, if possible, supply good pictures. Full visibly, transparent background, and pixelated are the properties that makes a picture good. + + +@node Dependencies +@chapter Dependencies +@cindex dependencies + +@menu +* Required runtime dependencies:: Required runtime dependencies. +* Optional runtime dependencies:: Optional runtime dependencies. +* Package building dependencies:: Package building dependencies. +* Dependencies for pony providers:: Dependencies for pony providers. +@end menu + + +@node Required runtime dependencies +@section Required runtime dependencies + +@table @option +@item bash +Required for the main script [file: @command{ponysay}]. +@item cowsay +This is a wrapper for @command{cowsay}. +@item coreutils +The main script [file: @command{ponysay}] uses @command{stty}, @command{cut}, +@command{ls}, @command{cat}, @command{sort}, @command{readlink}, @command{pwd}, +@command{head} and @command{tail}. +@item sed +Used to remove @code{.pony} from pony names when running @command{ponysay -l} +and @command{ponysay -L}. +@item perl +Required to run @command{ponysay -l} and @command{ponysay -L}. +@end table + +@node Optional runtime dependencies +@section Optional runtime dependencies +@cindex extensions +@cindex ponyquotes4ponysay + +@table @option +@item ponyquotes4ponysay +For support of My Little Pony quotes with associated pony: the @code{-q} option. +It can be downloaded at @url{https://github.com/maandree/ponyquotes4ponysay}. +@end table + + +@node Package building dependencies +@section Package building dependencies + +@table @option +@item gcc +Used for compiling @command{ponysaytruncater.c}. +@item gzip +Used for compressing manpages. +@item make +Required to run the make script. +@item coreutils +The make script uses @command{install}, @command{unlink}, @command{rm}, @command{ln}, +@command{mkdir} and @command{cp}. +@end table + + +@node Dependencies for pony providers +@section Dependencies for pony providers +@cindex contributing + +@table @option +@item make +Required to run @command{make -B ttyponies`}. +@item coreutils +@command{ln} and @command{readlink} are used in the @command{ttyponies} subscript. +@item bash +Used in the ttyponies subscript. +@item util-say +Used by @command{make ttyponies} to build ttyponies from xterm ponies. +It can be downloaded at @url{https://github.com/maandree/util-say}. +@end table + + + @node GNU Free Documentation License @appendix GNU Free Documentation License @include fdl.texinfo @@ -238,5 +388,7 @@ properties that makes a picture good. @appendix Concept index @printindex cp + + @bye -- cgit From 492b62f39e5a798a2253f2b39345313fb58ebae6 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 04:55:29 +0200 Subject: m + work in info manual --- README | 8 +-- README.md | 2 +- manuals/ponysay.texinfo | 160 +++++++++++++++++++++++++++++++++++++++++++++++- ponysay | 4 +- 4 files changed, 165 insertions(+), 9 deletions(-) diff --git a/README b/README index 11725d4..5517aa5 100644 --- a/README +++ b/README @@ -77,7 +77,7 @@ Installation on GNU/Linux (or other Unix implementations) In the terminal, `cd` into the ponysay directory and execute `make && make install`. This will install ponysay into the $PREFIX (/usr by default, meaning you may need to - run `make install` as root, e.g by running `sudo make install`.) + run `make install` as root, e.g. by running `sudo make install`.) In order to use ponysay, run: ponysay "I am just the cutest pony!" Or if you have a specific pony in your mind: ponysay -f pinkie "Partay!~" @@ -119,7 +119,7 @@ Installing ponyquotes4ponysay will enable My Little Pony quotes with associated It is available at: https://github.com/maandree/ponyquotes4ponysay https://aur.archlinux.org/packages.php?ID=60988 -Run `ponysay -q` will give you a random pony saying one it its quote from MLP:FiM. +Running `ponysay -q` will give you a random pony saying one it its quote from MLP:FiM. Add one or more argument after `-q` to sepecify a set of ponies from which one will be selected randomly. When running `ponysay -l` or `ponysay -L` the ponies which have quotes will be printed bold or bright (depending on terminal). @@ -166,7 +166,7 @@ Providing ponies ================ Most pony images are browser ponies or desktop ponies, - browser ponies is a fork of desktop ponies, implementing it in JavaScript. + browser ponies is a port of desktop ponies, implementing it in JavaScript. Browser ponies: https://github.com/panzi/Browser-Ponies Desktop ponies: http://desktop-pony-team.deviantart.com/ @@ -194,7 +194,7 @@ Providing ponies When a pony is added please also add a ttypony version, but if you don't please state so in the pull request so we do not miss the create it; the simplest way to - do this is to run `make -B ttyponies` after adding the ponies to ponies/, + do this is to run `make -B ttyponies` after adding the ponies to ponies/. Running `make -B ttyponies` will build (or rebuild) all ttyponies with a pony present in ponies/, and creates all needed symlinks. diff --git a/README.md b/README.md index 36811f3..0a5f848 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Now every time you open a terminal a pony should give your fortune Installing [ponyquotes4ponysay](https://github.com/maandree/ponyquotes4ponysay) will enable My Little Pony quotes with associated pony. -Run `ponysay -q` will give you a random pony saying one it its quote from MLP:FiM. Add one or more argument after `-q` to sepecify a +Running `ponysay -q` will give you a random pony saying one it its quote from MLP:FiM. Add one or more argument after `-q` to sepecify a set of ponies from which one will be selected randomly. When running `ponysay -l` or `ponysay -L` the ponies which have quotes will be printed bold or bright (depending on terminal). diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 00b77de..c90cd4c 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -54,6 +54,12 @@ Texts. A copy of the license is included in the section entitled * Limitations:: Limitations. * Problems and requests:: Reports and requests. * Dependencies:: Dependencies. +* Installing:: Installing. +@c Extensions +@c Inner workings->Pony anatomy +* Contributing:: Contributing. +* Ponysay constributors:: Ponysay constributors. +* Ponysay license:: Ponysay license. * GNU Free Documentation License:: Copying and sharing this manual. * Concept index:: Concept index. @end menu @@ -250,12 +256,17 @@ the height in TTY by default. Due to extreme limitations in @command{9term} @command{ponysay} will never be able to run on it. +Most terminals have support for 256 colours, we do however only use the top 240 colours; +this is because the lower 16 colours are usally, in contrast to the top 240, customised. +We assume that the top 240 colours have their standard values. In TTY with KMS support +we dot have any actual (except for @math{2^{24}} + full transparency.) + @node Cowsay @section Cowsay When @command{cowsay} determines the length of a word it measures in number of bytes -(in UTF-8), therefore non-ascii words will malformat the balloon with the message. +(in UTF-8), therefore non-ASCII words will malformat the balloon with the message. Further, @command{cowsay} does not recognise ANSI escape sequences, therefore, using colours and text styling in messages will also malformat the balloon with the message. @@ -265,6 +276,10 @@ the pony, customisation, other than using @command{cowthink}. However you can mo @command{cowsay} (written perl, so you can edit the installed files) to make the balloon look different, maybe using box drawing characters. +@command{cowsay} does support setting the minimum size of the balloon, both directions +on the balloon–pony links. or any other placement of the balloon than at the top to +the left. + @cindex figlet @cindex tiolet @command{cowsay}'s word wrapping handles single line breaks as normal blankspaces, @@ -380,6 +395,148 @@ It can be downloaded at @url{https://github.com/maandree/util-say}. +@node Installing +@chapter Installing +@cindex installing +@cindex make + +Before installing @command{ponysay}, make sure your system have the packages listed under +@ref{Required runtime dependencies} and @ref{Package building dependencies} installed. + +Tarballs can be downloaded at @url{https://github.com/erkin/ponysay/tarball/master} +for bleeding edge, or from @url{https://github.com/erkin/ponysay/tags} for releases. + +If you have @command{git} you @command{clone} the project URL +@url{https://github.com/erkin/ponysay.git}. + +In the terminal,@command{cd} into the ponysay directory and execute +@command{make && make install}. This will install @command{ponysay} into the +@code{/usr}, meaning you may need to run @command{make install} as root, +e.g. by running @command{sudo make install}. + +Now you will be to use ponysay, run: @command{ponysay "I am just the cutest pony!"}, +or if have a specific pony in your mind: @command{ponysay -f pinkie "Partay!~"}. + +@command{ponysay} comes with a manpage in section 6, @command{man 6 ponysay} +(or just @command{man ponysay}). The man page is also available in Spanish: +@command{man -L es 6 ponysay}. + + + +@node Contributing +@chapter Contributing + +@menu +* Providing ponies:: Providing ponies +@end menu + +@node Providing ponies +@section Providing ponies +@cindex create pony file + +Most pony images are browser ponies or desktop ponies, browser ponies is a port of +desktop ponies, implementing it in JavaScript. Browser ponies are available at +@url{https://github.com/panzi/Browser-Ponies}. Desktop ponies are available at +@url{http://desktop-pony-team.deviantart.com/}. + +There is also a collection of ponies that are not yet pixelated in a Java reimplementation: +@url{https://github.com/maandree/unisay/tree/develop/dev/newponies} +@* + +New ponies can be created from regular images by using util-say, which is available +at @url{https://github.com/maandree/util-say}. +@command{img2xterm} (@url{https://github.com/rossy2401/img2xterm}) was used earlier, +but util-say tries do optimise the images in some aspects: as good as possible for +low capability terminals, tries to place the pony–balloon link, displayed as good as +possible when marked in the terminal (somewhat compromised by the first aspect.) + +Using util-say: +@example +img2ponysay -2 -- SOURCE_IMAGE > PONY_FILE + +PONY_FILE should end with .pony and be localed in ponies/ + +Omit -2 if the source image does not use double pixel size. + +For more information see: +@url{https://github.com/maandree/util-say/wiki/img2ponysay} +@end example + +@* +@cindex ttypony +When a pony is added please also add a ttypony version, i.e. the pony files used in TTY, +but if you don't please state so in the pull request so we do not miss the create it; +the simplest way to do this is to run @command{make -B ttyponies} after adding the ponies +to @code{ponies/}, running @command{make -B ttyponies} will build (or rebuild) all +ttyponies with a pony present in @code{ponies/}, and creates all needed symlinks. + +To be able to run @command{make -B ttyponies} you must have the packages listed under +@ref{Dependencies for pony providers}. + + + + +@node Ponysay constributors +@appendix Ponysay constributors + +Active developers of ponysay: +@itemize @bullet +@item Erkin Batu Altunbaş +@item Mattias Andrée +@item Sven-Hendrik Haase +@item Pablo Lezaeta +@item Jan Alexander Steffens +@end itemize +@* +Patchers and other contributors of ponysay: +@itemize @bullet +@item Elis Axelsson +@item Duane Bekaert +@item Kyah Rindlisbacher +@item James Ross-Gowan +@item Louis Taylor +@item Jannis +@end itemize + + +@node Ponysay license +@appendix Ponysay license + +Ponysay is Free Software (yet not Open Source) and in licensed under the terms +of Do What The Fuck You Want To Public Licese (WTFPL) version 2. + +You have the four essential freedoms: +@itemize @bullet +@item +The freedom to run the program, for any purpose (freedom 0). +@item +The freedom to study how the program works, and change it so it does your computing as you wish (freedom 1). Access to the source code is a precondition for this. +@item +The freedom to redistribute copies so you can help your neighbor (freedom 2). +@item +The freedom to distribute copies of your modified versions to others (freedom 3). By doing this you can give the whole community a chance to benefit from your changes. Access to the source code is a precondition for this. +@end itemize + +@* + +@center DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE +@center Version 2, December 2004 + +Copyright @copyright{} 2012 Erkin Batu Altunbaş + +@quotation +Everyone is permitted to copy and distribute verbatim or modified +copies of this license document, and changing it is allowed as long +as the name is changed. + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. You just DO WHAT THE FUCK YOU WANT TO. +@end quotation + + + @node GNU Free Documentation License @appendix GNU Free Documentation License @include fdl.texinfo @@ -389,6 +546,5 @@ It can be downloaded at @url{https://github.com/maandree/util-say}. @printindex cp - @bye diff --git a/ponysay b/ponysay index bacf1eb..de1aa09 100755 --- a/ponysay +++ b/ponysay @@ -67,7 +67,7 @@ _linklist() { scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` - perl '/dev/stdin' $(echo $args) < /dev/shm/ponysay~ + perl '/dev/stdin' $(echo $args) < /dev/shm/.ponysay~ #!/usr/bin/perl #Author: Mattias Andrée (maandree@kth.se) @@ -134,7 +134,7 @@ while (\$i < \$argc) } EOF - perl $listcmd $scrw $(cat /dev/shm/ponysay~) | sed -e 's/_/ /g' | qlist + perl $listcmd $scrw $(cat /dev/shm/.ponysay~) | sed -e 's/_/ /g' | qlist } linklist() { -- cgit From 301197ff740addf34ad866cfbc532ad9a205e0bd Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 05:10:41 +0200 Subject: new environment variable, PONYSAY_COWSAY, allows replace cowsay with another program, if this variable has a value the "use uft8" patch will not be applies --- ponysay | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/ponysay b/ponysay index de1aa09..2d2a321 100755 --- a/ponysay +++ b/ponysay @@ -12,7 +12,13 @@ if [ "$TERM" = "linux" ]; then HOMEPONIES="${HOME}/.local/share/ponysay/ttyponies" fi -cmd=cowsay +if [[ "$PONYSAY_COWSAY" = "" ]]; then + cmd=cowsay + customcmd=0 +else + cmd="$PONYSAY_COWSAY" + customcmd=1 +fi [[ ${0} == *ponythink ]] && cmd=cowthink version() { @@ -208,14 +214,28 @@ say() { tail --lines=$(( `stty size <&2 | cut -d ' ' -f 1` - $PONYSAY_SHELL_LINES )) } + if [[ $customcmd = 0 ]]; then + function cowcmd + { + pcmd='#!/usr/bin/perl\nuse utf8;' + ccmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done) + perl <(cat <(echo -e $pcmd) $ccmd) "$@" + } + else + function cowcmd + { + $cmd "$@" + } + fi + if [ "$TERM" = "linux" ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = 'yes' ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = 'y' ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = '1' ]; then if [ "$PONYSAY_BOTTOM" = 'yes' ] || [ "$PONYSAY_BOTTOM" = 'y' ] || [ "$PONYSAY_BOTTOM" = '1' ]; then - perl <(cat <(echo -e '#!/usr/bin/perl\nuse utf8;') $(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done)) -f "$pony" "${wrap:+-W$wrap}" | wtrunc | htrunctail + cowcmd -f "$pony" "${wrap:+-W$wrap}" | wtrunc | htrunctail else - perl <(cat <(echo -e '#!/usr/bin/perl\nuse utf8;') $(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done)) -f "$pony" "${wrap:+-W$wrap}" | wtrunc | htrunchead + cowcmd -f "$pony" "${wrap:+-W$wrap}" | wtrunc | htrunchead fi else - perl <(cat <(echo -e '#!/usr/bin/perl\nuse utf8;') $(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done)) -f "$pony" "${wrap:+-W$wrap}" | wtrunc + cowcmd -f "$pony" "${wrap:+-W$wrap}" | wtrunc fi } -- cgit From 122f1da602b9039c1f3dc958f5e1a355a6daf44a Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 05:22:46 +0200 Subject: fix on env var --- manuals/manpage.6 | 2 +- manuals/manpage.es.6 | 2 +- ponysay | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manuals/manpage.6 b/manuals/manpage.6 index daa221e..07f88c9 100644 --- a/manuals/manpage.6 +++ b/manuals/manpage.6 @@ -74,7 +74,7 @@ of how many blank lines you want. Naturally this takes effect if the output is n than the screen. .TP .B PONYSAY_FULL_WIDTH -You can export \fIPONYSAY_FULL_WIDTH\fP with the value \fIno\fP, \fIn\fP or \fI0\fP, if you +You can export \fIPONYSAY_FULL_WIDTH\fP with the value \fIyes\fP, \fIy\fP or \fI1\fP, if you do not want the output to be truncated on the width to fit the terminal. .TP .B PONYSAY_TRUNCATE_HEIGHT diff --git a/manuals/manpage.es.6 b/manuals/manpage.es.6 index 6e14d11..59e0ead 100644 --- a/manuals/manpage.es.6 +++ b/manuals/manpage.es.6 @@ -77,7 +77,7 @@ el valor de cuantas líneas blancas desea. Naturalmente esto solo tomará efecto larga que la pantalla. .TP .B PONYSAY_FULL_WIDTH -Puede exportar \fIPONYSAY_FULL_WIDTH\fP con el valor \fIno\fP, \fIn\fP o \fI0\fP, si usted +Puede exportar \fIPONYSAY_FULL_WIDTH\fP con el valor \fIyes\fP, \fIy\fP o \fI1\fP, si usted no desea que la salida sea truncada para que calce en la terminal. .TP .B PONYSAY_TRUNCATE_HEIGHT diff --git a/ponysay b/ponysay index 2d2a321..04ab745 100755 --- a/ponysay +++ b/ponysay @@ -194,7 +194,7 @@ say() { function wtrunc { - if [ "$PONYSAY_FULL_WIDTH" = 'no' ] || [ "$PONYSAY_FULL_WIDTH" = 'n' ] || [ "$PONYSAY_FULL_WIDTH" = '0' ]; then + if [ "$PONYSAY_FULL_WIDTH" = 'yes' ] || [ "$PONYSAY_FULL_WIDTH" = 'y' ] || [ "$PONYSAY_FULL_WIDTH" = '1' ]; then cat else WIDTH=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` -- cgit From d9d620f9809c8079d8c13ed4794a41f9f5857277 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 05:46:58 +0200 Subject: fixing ponythink bug I introduced --- ponysay | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/ponysay b/ponysay index 04ab745..10b031a 100755 --- a/ponysay +++ b/ponysay @@ -19,7 +19,14 @@ else cmd="$PONYSAY_COWSAY" customcmd=1 fi -[[ ${0} == *ponythink ]] && cmd=cowthink +[[ ${0} == *ponythink ]] && + if [[ "$PONYSAY_COWTHINK" = "" ]]; then + cmd=cowthink + customcmd=0 + else + cmd="$PONYSAY_COWTHINK" + customcmd=1 + fi version() { echo "ponysay v$version" @@ -73,7 +80,7 @@ _linklist() { scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` - perl '/dev/stdin' $(echo $args) < /dev/shm/.ponysay~ + perl '/dev/stdin' $(echo $args) < '/dev/shm/.ponysay~' #!/usr/bin/perl #Author: Mattias Andrée (maandree@kth.se) @@ -140,7 +147,8 @@ while (\$i < \$argc) } EOF - perl $listcmd $scrw $(cat /dev/shm/.ponysay~) | sed -e 's/_/ /g' | qlist + perl $listcmd $scrw $(cat "/dev/shm/.ponysay~") | sed -e 's/_/ /g' | qlist + rm '/dev/shm/.ponysay~' } linklist() { @@ -217,13 +225,22 @@ say() { if [[ $customcmd = 0 ]]; then function cowcmd { + echo "standrd $cmd" pcmd='#!/usr/bin/perl\nuse utf8;' ccmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done) - perl <(cat <(echo -e $pcmd) $ccmd) "$@" + echo "is $cmd" + if [[ ${0} == *ponythink ]]; then + cat <(echo -e $pcmd) $ccmd > "/dev/shm/.ponythink" + perl '/dev/shm/.ponythink' "$@" + rm '/dev/shm/.ponythink' + else + perl <(cat <(echo -e $pcmd) $ccmd) "$@" + fi } else function cowcmd { + echo "custom $cmd" $cmd "$@" } fi -- cgit From e48e73ef4bdf505d44a3189043a948677377d6d7 Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Fri, 20 Jul 2012 18:07:59 +0200 Subject: Removed some weird echos and reindeted the full file --- ponysay | 321 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 162 insertions(+), 159 deletions(-) diff --git a/ponysay b/ponysay index 10b031a..c856fd2 100755 --- a/ponysay +++ b/ponysay @@ -8,28 +8,29 @@ pony="*" wrap="" if [ "$TERM" = "linux" ]; then - SYSTEMPONIES="/usr/share/ponysay/ttyponies" - HOMEPONIES="${HOME}/.local/share/ponysay/ttyponies" + SYSTEMPONIES="/usr/share/ponysay/ttyponies" + HOMEPONIES="${HOME}/.local/share/ponysay/ttyponies" fi if [[ "$PONYSAY_COWSAY" = "" ]]; then - cmd=cowsay - customcmd=0 + cmd=cowsay + customcmd=0 else - cmd="$PONYSAY_COWSAY" - customcmd=1 + cmd="$PONYSAY_COWSAY" + customcmd=1 fi + [[ ${0} == *ponythink ]] && - if [[ "$PONYSAY_COWTHINK" = "" ]]; then +if [[ "$PONYSAY_COWTHINK" = "" ]]; then cmd=cowthink customcmd=0 - else +else cmd="$PONYSAY_COWTHINK" customcmd=1 - fi +fi version() { - echo "ponysay v$version" + echo "ponysay v$version" } scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` @@ -38,49 +39,51 @@ truncatercmd="${SCRIPTDIR}/../lib/ponysay/truncater" haspq=1 if [[ -f './pq4ps-list' ]]; then - function qlist - { ./pq4ps-list - } + function qlist { + ./pq4ps-list + } elif [[ -f '/usr/bin/pq4ps-list' ]]; then - function qlist - { /usr/bin/pq4ps-list - } + function qlist { + /usr/bin/pq4ps-list + } else - haspq=0 - function qlist - { cat - } + haspq=0 + function qlist { + cat + } fi list() { - echo -e "\\e[01mponyfiles located in $SYSTEMPONIES:\\e[21m" - perl $listcmd $scrw $(ls --color=no $SYSTEMPONIES | sed -e 's/\.pony$//' | sort) | qlist - - if [[ -d $HOMEPONIES ]]; then - echo -e "\\e[01mponyfiles located in $HOMEPONIES:\\e[21m" - perl $listcmd $scrw $(ls --color=no $HOMEPONIES | sed -e 's/\.pony$//' | sort) | qlist - fi + echo -e "\\e[01mponyfiles located in $SYSTEMPONIES:\\e[21m" + perl $listcmd $scrw $(ls --color=no $SYSTEMPONIES | sed -e 's/\.pony$//' | sort) | qlist + + if [[ -d $HOMEPONIES ]]; then + echo -e "\\e[01mponyfiles located in $HOMEPONIES:\\e[21m" + perl $listcmd $scrw $(ls --color=no $HOMEPONIES | sed -e 's/\.pony$//' | sort) | qlist + fi } _linklist() { - echo -e "\\e[01mponyfiles located in $1:\\e[21m" - files=$(ls --color=no $1 | sed -e 's/\.pony$//' | sort) - - args="" - - for file in $files; do - target=$(readlink $1"/"$file".pony") - if [[ $target = "" ]]; then - target=$file - else - target=$(echo $target | sed -e 's/^\.\///g' -e 's/\.pony$//g') - fi - args=$(echo $args $file $target) - done - - scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` - - perl '/dev/stdin' $(echo $args) < '/dev/shm/.ponysay~' + echo -e "\\e[01mponyfiles located in $1:\\e[21m" + files=$(ls --color=no $1 | sed -e 's/\.pony$//' | sort) + + args="" + + for file in $files; do + target=$(readlink $1"/"$file".pony") + + if [[ $target = "" ]]; then + target=$file + else + target=$(echo $target | sed -e 's/^\.\///g' -e 's/\.pony$//g') + fi + + args=$(echo $args $file $target) + done + + scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` + + perl '/dev/stdin' $(echo $args) < '/dev/shm/.ponysay~' #!/usr/bin/perl #Author: Mattias Andrée (maandree@kth.se) @@ -146,21 +149,22 @@ while (\$i < \$argc) } } EOF - - perl $listcmd $scrw $(cat "/dev/shm/.ponysay~") | sed -e 's/_/ /g' | qlist - rm '/dev/shm/.ponysay~' + + perl $listcmd $scrw $(cat "/dev/shm/.ponysay~") | sed -e 's/_/ /g' | qlist + rm '/dev/shm/.ponysay~' } linklist() { - _linklist $SYSTEMPONIES - if [[ -d $HOMEPONIES ]]; then - _linklist $HOMEPONIES - fi + _linklist $SYSTEMPONIES + + if [[ -d $HOMEPONIES ]]; then + _linklist $HOMEPONIES + fi } usage() { - version - cat </dev/null || cat + # Ponies use UTF-8 drawing characters. Prevent a Perl warning. + export PERL_UNICODE=S + + if [ "$TERM" = "linux" ]; then + echo -ne '\e[H\e[2J' fi - } - - if [ "$PONYSAY_SHELL_LINES" = "" ]; then - PONYSAY_SHELL_LINES=2 - fi - function htrunchead - { - head --lines=$(( `stty size <&2 | cut -d ' ' -f 1` - $PONYSAY_SHELL_LINES )) - } - function htrunctail - { - tail --lines=$(( `stty size <&2 | cut -d ' ' -f 1` - $PONYSAY_SHELL_LINES )) - } - - if [[ $customcmd = 0 ]]; then - function cowcmd - { - echo "standrd $cmd" - pcmd='#!/usr/bin/perl\nuse utf8;' - ccmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done) - echo "is $cmd" - if [[ ${0} == *ponythink ]]; then - cat <(echo -e $pcmd) $ccmd > "/dev/shm/.ponythink" - perl '/dev/shm/.ponythink' "$@" - rm '/dev/shm/.ponythink' - else - perl <(cat <(echo -e $pcmd) $ccmd) "$@" - fi + + function wtrunc { + if [ "$PONYSAY_FULL_WIDTH" = 'yes' ] || [ "$PONYSAY_FULL_WIDTH" = 'y' ] || [ "$PONYSAY_FULL_WIDTH" = '1' ]; then + cat + else + WIDTH=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` + $truncatercmd $WIDTH 2>/dev/null || cat + fi } - else - function cowcmd - { - echo "custom $cmd" - $cmd "$@" + + if [ "$PONYSAY_SHELL_LINES" = "" ]; then + PONYSAY_SHELL_LINES=2 + fi + + function htrunchead { + head --lines=$(( `stty size <&2 | cut -d ' ' -f 1` - $PONYSAY_SHELL_LINES )) + } + + function htrunctail { + tail --lines=$(( `stty size <&2 | cut -d ' ' -f 1` - $PONYSAY_SHELL_LINES )) } - fi - - if [ "$TERM" = "linux" ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = 'yes' ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = 'y' ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = '1' ]; then - if [ "$PONYSAY_BOTTOM" = 'yes' ] || [ "$PONYSAY_BOTTOM" = 'y' ] || [ "$PONYSAY_BOTTOM" = '1' ]; then - cowcmd -f "$pony" "${wrap:+-W$wrap}" | wtrunc | htrunctail + + if [[ $customcmd = 0 ]]; then + function cowcmd { + pcmd='#!/usr/bin/perl\nuse utf8;' + ccmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done) + + if [[ ${0} == *ponythink ]]; then + cat <(echo -e $pcmd) $ccmd > "/dev/shm/.ponythink" + perl '/dev/shm/.ponythink' "$@" + rm '/dev/shm/.ponythink' + else + perl <(cat <(echo -e $pcmd) $ccmd) "$@" + fi + } + else + function cowcmd { + echo "custom $cmd" + $cmd "$@" + } + fi + + if [ "$TERM" = "linux" ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = 'yes' ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = 'y' ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = '1' ]; then + if [ "$PONYSAY_BOTTOM" = 'yes' ] || [ "$PONYSAY_BOTTOM" = 'y' ] || [ "$PONYSAY_BOTTOM" = '1' ]; then + cowcmd -f "$pony" "${wrap:+-W$wrap}" | wtrunc | htrunctail + else + cowcmd -f "$pony" "${wrap:+-W$wrap}" | wtrunc | htrunchead + fi else - cowcmd -f "$pony" "${wrap:+-W$wrap}" | wtrunc | htrunchead + cowcmd -f "$pony" "${wrap:+-W$wrap}" | wtrunc fi - else - cowcmd -f "$pony" "${wrap:+-W$wrap}" | wtrunc - fi } ponies=() opts="f:W:Llhv" if [[ $haspq ]]; then - opts=$opts"q" + opts=$opts"q" fi + usepq=0 -while getopts $opts OPT -do - case ${OPT} in - v) version; exit ;; - h) usage; exit ;; - f) ponies+=( "$OPTARG" ) ;; - l) list; exit ;; - L) linklist; exit ;; - W) wrap="$OPTARG" ;; - q) usepq=1 ;; - \?) usage >&2; exit 1 ;; - esac +while getopts $opts OPT; do + case ${OPT} in + v) version; exit ;; + h) usage; exit ;; + f) ponies+=( "$OPTARG" ) ;; + l) list; exit ;; + L) linklist; exit ;; + W) wrap="$OPTARG" ;; + q) usepq=1 ;; + \?) usage >&2; exit 1 ;; + esac done shift $((OPTIND - 1)) if [[ $usepq = 1 ]]; then - if [[ -f './pq4ps' ]]; then - function q - { ./pq4ps $@ - } - elif [[ -f '/usr/bin/pq4ps' ]]; then - function q - { /usr/bin/pq4ps $@ - } - fi - $0 ${wrap:+-W$wrap} $(q "$*") - exit + if [[ -f './pq4ps' ]]; then + function q { + ./pq4ps $@ + } + elif [[ -f '/usr/bin/pq4ps' ]]; then + function q { + /usr/bin/pq4ps $@ + } + fi + $0 ${wrap:+-W$wrap} $(q "$*") + exit fi hash $cmd &>/dev/null; if [ $? -ne 0 ]; then - cat >&2 <&2 <&2 "All the ponies are missing! Call the Princess!" - exit 1 - fi - - # Choose a random pony - pony="${ponies[$RANDOM%${#ponies[@]}]}" + # Pony not a file? Search for it + + ponies=() + [[ -d $SYSTEMPONIES ]] && ponies+=( "$SYSTEMPONIES"/$pony.pony ) + [[ -d $HOMEPONIES ]] && ponies+=( "$HOMEPONIES"/$pony.pony ) + + if (( ${#ponies} < 1 )); then + echo >&2 "All the ponies are missing! Call the Princess!" + exit 1 + fi + + # Choose a random pony + pony="${ponies[$RANDOM%${#ponies[@]}]}" fi if [[ -n "$*" ]]; then - # Handle a message given via arguments - say <<<"$*" + # Handle a message given via arguments + say <<<"$*" else - say + say fi + -- cgit From f8a9088bed7fc73d501228dda5c7afb0aaf2d76a Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Fri, 20 Jul 2012 18:29:00 +0200 Subject: Made generation of ponythink completions simpler --- Makefile | 6 +++--- completion/fish-completion.fish | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c1ed92e..2faf943 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,9 @@ manpages: ponythinkcompletion: - sed -e 's/ponysay/ponythink/g' <"completion/bash-completion.sh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/bash-completion-think.sh" - sed -e 's/ponysay/ponythink/g' <"completion/fish-completion.fish" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/fish-completion-think.fish" - sed -e 's/ponysay/ponythink/g' <"completion/zsh-completion.zsh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/zsh-completion-think.zsh" + sed -e 's/ponysay/ponythink/' -e 's/\/ponythink\//\/ponysay\//' completion/bash-completion.sh > completion/bash-completion-think.sh + sed -e 's/ponysay/ponythink/' -e 's/\/ponythink\//\/ponysay\//' completion/fish-completion.fish > completion/fish-completion-think.fish + sed -e 's/ponysay/ponythink/' -e 's/\/ponythink\//\/ponysay\//' completion/zsh-completion.zsh > completion/zsh-completion-think.zsh ttyponies: diff --git a/completion/fish-completion.fish b/completion/fish-completion.fish index 8d3c911..0023c58 100644 --- a/completion/fish-completion.fish +++ b/completion/fish-completion.fish @@ -1,5 +1,5 @@ -# Completions for ponysay & ponythink +# Completions for ponysay # https://github.com/erkin/ponysay/ # # Author: Elis Axelsson -- cgit From 7e5018d58a4cb2f24087e6c3ac8d7b43b3c5066a Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 18:33:04 +0200 Subject: work on info manual --- manuals/ponysay.texinfo | 118 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 102 insertions(+), 16 deletions(-) diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index c90cd4c..9816b2b 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -55,7 +55,7 @@ Texts. A copy of the license is included in the section entitled * Problems and requests:: Reports and requests. * Dependencies:: Dependencies. * Installing:: Installing. -@c Extensions +* Extensions:: Extensions. @c Inner workings->Pony anatomy * Contributing:: Contributing. * Ponysay constributors:: Ponysay constributors. @@ -154,20 +154,49 @@ by hand, you can run @code{cat | ponysay}. @chapter Advanced usage of @command{ponysay}. @cindex advanced usage +@menu +* Fortune cookies:: Displaying with fortune cookies. +* Ponification:: Ponify your fortune cookies. +* Running on TTY:: Running on TTY (Linux VT). +* Running on screen:: Running on @command{screen}. +@end menu + + +@node Fortune cookies +@section Fortune cookies @cindex fortune +@cindex on startup + If you have @command{fortune} installed -- this program may be named @command{fortune-mod} in your GNU/Linux distributions package reposity -- you can run @code{fortune | ponysay} to get a random pony reading a random fortune cookie. -@cindex on startup By adding @code{fortune | ponysay} to the end [easiest way] of your @code{~/.bashrc} -- or equivalent for your shell if use do not use GNU Bash (standard shell for most distributions now adays) -- you will get the effect described in the previous paragraph every time you open a terminal. + +@node Ponification +@section Ponification +@cindex ponification +@cindex ponypipe + +You can ponify text (i.e. replaces words search as ``everyone'' with ``everypony'') +by using @code{fortune | ponypipe} instead of using @command{fortune}. +@command{ponypipe} can be downloaded from @url{https://github.com/maandree/ponypipe}. +Alternatively use can use @command{pinkie} (or @command{pinkiepie}), which can +be downloaded from @url{https://github.com/maandree/pinkie-pie}, which is just +@code{fortune | ponypipe}. +Their is also a large sed script, similar to @command{ponypipe}: @url{http://www.reddit.com/r/mylittlelinux/comments/srixi/using_ponysay_with_a_ponified_fortune_warning/} + + +@node Running on TTY +@section Running on TTY @cindex tty @cindex linux vt + If you use TTY and have a custom colour palette, you should also add to your @code{~/.bashrc}, before @code{fortune | ponysay}: @example @@ -178,15 +207,28 @@ If you use TTY and have a custom colour palette, you should also add to your @} @end example -@cindex ponification -@cindex ponypipe -You can ponify text (i.e. replaces words search as ``everyone'' with ``everypony'') -by using @code{fortune | ponypipe} instead of using @command{fortune}. -@command{ponypipe} can be downloaded from @url{https://github.com/maandree/ponypipe}. -Alternatively use can use @command{pinkie} (or @command{pinkiepie}), which can -be downloaded from @url{https://github.com/maandree/pinkie-pie}, which is just -@code{fortune | ponypipe}. -Their is also a large sed script, similar to @command{ponypipe}: @url{http://www.reddit.com/r/mylittlelinux/comments/srixi/using_ponysay_with_a_ponified_fortune_warning/} + +@node Running on screen +@section Running on @command{screen} +@cindex screen + +@command{screen} will adapt ASNI colour escape sequencies to your terminals +capabilities. This means that is your terminal reports itself as @code{xterm} +in @code{$TERM} it ponies will lose colours; they will only use the lower 16 +colours instread of the top 240 colours. By default, almost all X terminal, +including @command{xterm} and @command{mate-terminal} reports themself as +@code{xterm} in @code{$TERM}, and some reports their actual name in @code{$COLORTERM}. +So before openning @command{screen} you use set @code{$TERM} to @code{xterm-256colour}, +if you are using a terminal with support for @code{xterm}'s 256 colours; this +can be done by adding to your @code{~/.bashrc}: +@example +[[ "$TERM" = "xterm" ]] && + function screen + @{ export TERM="xterm-256color" + exec screen "$@@" + @} +@end example + @node Environment @@ -199,6 +241,7 @@ Their is also a large sed script, similar to @command{ponypipe}: @url{http://www @table @option @item PONYSAY_BOTTOM @cindex PONYSAY_BOTTOM +@cindex tty Under TTY (Linux VT), if the output is larger the the screen's height, only the beginning is printed, leaving two blank lines. If you want the buttom to be printed rather the the beginning you can export @code{PONYSAY_BOTTOM} @@ -206,6 +249,7 @@ with the value @code{yes}, @code{y} or @code{1}. @item PONYSAY_SHELL_LINES @cindex PONYSAY_SHELL_LINES +@cindex tty Under TTY (Linux VT), if the output is larger the the screen's height, two lines are left blank. If you want more, or less, blank lines you can export @code{PONYSAY_SHELL_LINES} with the value of how many blank lines you want. @@ -214,8 +258,8 @@ screen. @item PONYSAY_FULL_WIDTH @cindex PONYSAY_FULL_WIDTH -You can export @code{PONYSAY_FULL_WIDTH} with the value @code{no}, @code{n} -or @code{0}, if you do not want the output to be truncated on the width to +You can export @code{PONYSAY_FULL_WIDTH} with the value @code{yes}, @code{y} +or @code{1}, if you do not want the output to be truncated on the width to fit the terminal. @item PONYSAY_TRUNCATE_HEIGHT @@ -223,6 +267,22 @@ fit the terminal. Export @code{PONYSAY_TRUNCATE_HEIGHT} with the value @code{yes}, @code{y} or @code{1}, if you want to truncate the output on the height even if you are not running @command{ponysay} under TTY. + +@item PONYSAY_COWSAY +@item PONYSAY_COWTHINK +@cindex PONYSAY_COWSAY +@cindex PONYSAY_COWTINK +@cindex custom cowsay +@cindex replace cowsay +If you want to use another program than @command{cowsay} (the first +@command{cowsay} found in @code{$PATH}), you can export @code{PONYSAY_COWSAY} +with the value of that program. If, and only if, @code{PONYSAY_COWSAY} does +not have any value, @command{cowsay} is patch with @code{use utf8;} to the +beginning. The @code{use utf8;} patch is introduced to make it easier to +customise cowsay. + +@code{PONYSAY_COWTHINK} will be used instead of @code{PONYSAY_COWSAY} if +you run @command{ponythink}. @end table @@ -321,6 +381,7 @@ properties that makes a picture good. @node Dependencies @chapter Dependencies @cindex dependencies +@cindex optional dependencies @menu * Required runtime dependencies:: Required runtime dependencies. @@ -352,6 +413,7 @@ Required to run @command{ponysay -l} and @command{ponysay -L}. @node Optional runtime dependencies @section Optional runtime dependencies @cindex extensions +@cindex optional dependencies @cindex ponyquotes4ponysay @table @option @@ -419,7 +481,30 @@ or if have a specific pony in your mind: @command{ponysay -f pinkie "Partay!~"}. @command{ponysay} comes with a manpage in section 6, @command{man 6 ponysay} (or just @command{man ponysay}). The man page is also available in Spanish: -@command{man -L es 6 ponysay}. +@command{man -L es 6 ponysay}. + + + +@node Extensions +@chapter Extensions +@cindex extensions +@cindex optional dependencies + +Ponysay does not support extensions, per se, but rather have optional features that +are enabled when other packages are installed. + +@menu +* ponyquotes4ponysay:: ponyquotes4ponysay +@end menu + +@node ponyquotes4ponysay +@section ponyquotes4ponysay +@cindex ponyquotes4ponysay + +@command{ponyquotes4ponysay} is a package that adds support for MLP:FiM quotes that are +displayed with the associated ponies. See @ref{Invoking ponysay} for more information. +@command{ponyquotes4ponysay} can be downloaded at +@url{https://github.com/maandree/ponyquotes4ponysay}. @@ -448,7 +533,8 @@ at @url{https://github.com/maandree/util-say}. @command{img2xterm} (@url{https://github.com/rossy2401/img2xterm}) was used earlier, but util-say tries do optimise the images in some aspects: as good as possible for low capability terminals, tries to place the pony–balloon link, displayed as good as -possible when marked in the terminal (somewhat compromised by the first aspect.) +possible when marked in the terminal (somewhat compromised by the first aspect,) and +same width on all rows. Using util-say: @example @@ -512,7 +598,7 @@ The freedom to run the program, for any purpose (freedom 0). @item The freedom to study how the program works, and change it so it does your computing as you wish (freedom 1). Access to the source code is a precondition for this. @item -The freedom to redistribute copies so you can help your neighbor (freedom 2). +The freedom to redistribute copies so you can help your neighbour (freedom 2). @item The freedom to distribute copies of your modified versions to others (freedom 3). By doing this you can give the whole community a chance to benefit from your changes. Access to the source code is a precondition for this. @end itemize -- cgit From 9c859fe68385dfa4dd9b426cd3b790ca31fcfcc3 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 18:47:54 +0200 Subject: Revert "Merge pull request #43 from etu/master" This commit broke bash-completion for ponythink. This reverts commit 9dd1fbe1754ee592059e3c7f33f7ffd66fbfaad5, reversing changes made to 7e5018d58a4cb2f24087e6c3ac8d7b43b3c5066a. --- Makefile | 6 +++--- completion/fish-completion.fish | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2faf943..c1ed92e 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,9 @@ manpages: ponythinkcompletion: - sed -e 's/ponysay/ponythink/' -e 's/\/ponythink\//\/ponysay\//' completion/bash-completion.sh > completion/bash-completion-think.sh - sed -e 's/ponysay/ponythink/' -e 's/\/ponythink\//\/ponysay\//' completion/fish-completion.fish > completion/fish-completion-think.fish - sed -e 's/ponysay/ponythink/' -e 's/\/ponythink\//\/ponysay\//' completion/zsh-completion.zsh > completion/zsh-completion-think.zsh + sed -e 's/ponysay/ponythink/g' <"completion/bash-completion.sh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/bash-completion-think.sh" + sed -e 's/ponysay/ponythink/g' <"completion/fish-completion.fish" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/fish-completion-think.fish" + sed -e 's/ponysay/ponythink/g' <"completion/zsh-completion.zsh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/zsh-completion-think.zsh" ttyponies: diff --git a/completion/fish-completion.fish b/completion/fish-completion.fish index 0023c58..8d3c911 100644 --- a/completion/fish-completion.fish +++ b/completion/fish-completion.fish @@ -1,5 +1,5 @@ -# Completions for ponysay +# Completions for ponysay & ponythink # https://github.com/erkin/ponysay/ # # Author: Elis Axelsson -- cgit From 39968bb8318857b65d0c37e334526189e0a0332e Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 19:51:30 +0300 Subject: Update completion/fish-completion.fish --- completion/fish-completion.fish | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/completion/fish-completion.fish b/completion/fish-completion.fish index 8d3c911..9a0cf23 100644 --- a/completion/fish-completion.fish +++ b/completion/fish-completion.fish @@ -1,5 +1,4 @@ - -# Completions for ponysay & ponythink +# Completions for ponysay # https://github.com/erkin/ponysay/ # # Author: Elis Axelsson -- cgit From 11e52caaa218e8da2ceb33d6892711952ef4ef7b Mon Sep 17 00:00:00 2001 From: Elis Date: Fri, 20 Jul 2012 20:07:20 +0300 Subject: Added section in installation about Gentoo --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 0a5f848..e26f48b 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,9 @@ Or if you have a specific pony in your mind: Run `info ponysay`, `man 6 ponysay` or `ponysay -h` for more information. A Spanish manual is available: `man -L es 6 ponysay`. +#### Gentoo +Theres a package for gentoo, to make install and keeping up to date easy. You can find it in [this overlay](/etu/aidstu-overlay). Package is named `games-misc/ponysay`. + ### Pony fortune on terminal startup -- cgit From 6bff7576ebe259f9cb88c75e6131353c1e55a70f Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Fri, 20 Jul 2012 19:13:15 +0200 Subject: Fix fish-completion of homeponies --- completion/fish-completion.fish | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/completion/fish-completion.fish b/completion/fish-completion.fish index 9a0cf23..08b42c4 100644 --- a/completion/fish-completion.fish +++ b/completion/fish-completion.fish @@ -4,11 +4,11 @@ # Author: Elis Axelsson if test $TERM = "linux" - set -g systempath "/usr/share/ponysay/ttyponies/" - set -g homepath "~/.local/share/ponysay/ttyponies/" + set -g systempath /usr/share/ponysay/ttyponies/ + set -g homepath ~/.local/share/ponysay/ttyponies/ else - set -g systempath "/usr/share/ponysay/ponies/" - set -g homepath "~/.local/share/ponysay/ponies/" + set -g systempath /usr/share/ponysay/ponies/ + set -g homepath ~/.local/share/ponysay/ponies/ end -- cgit From 6fcb65b964c0ab40fd4d99317e1f0b30629bfd7e Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 19:22:21 +0200 Subject: m + installation of info manual + prebuild PDF --- Makefile | 33 +++++++++++++++++++++++++++++---- README | 2 +- manuals/ponysay.texinfo | 6 +++--- ponysay.pdf | Bin 0 -> 210745 bytes 4 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 ponysay.pdf diff --git a/Makefile b/Makefile index c1ed92e..9b08250 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: ponysaytruncater manpages ponythinkcompletion +all: ponysaytruncater manpages infomanual ponythinkcompletion ponysaytruncater: @@ -6,8 +6,13 @@ ponysaytruncater: manpages: - gzip -9 < manuals/manpage.6 > manuals/manpage.6.gz - gzip -9 < manuals/manpage.es.6 > manuals/manpage.es.6.gz + gzip -9 < "manuals/manpage.6" > "manuals/manpage.6.gz" + gzip -9 < "manuals/manpage.es.6" > "manuals/manpage.es.6.gz" + + +infomanual: + makeinfo "manuals/ponysay.texinfo" + gzip -9 "ponysay.info" ponythinkcompletion: @@ -28,6 +33,20 @@ ttyponies: done +pdfmanual: + texi2pdf "manuals/ponysay.texinfo" + if [[ -f "ponysay.aux" ]]; then unlink "ponysay.aux"; fi + if [[ -f "ponysay.cp" ]]; then unlink "ponysay.cp" ; fi + if [[ -f "ponysay.cps" ]]; then unlink "ponysay.cps"; fi + if [[ -f "ponysay.fn" ]]; then unlink "ponysay.fn" ; fi + if [[ -f "ponysay.ky" ]]; then unlink "ponysay.ky" ; fi + if [[ -f "ponysay.log" ]]; then unlink "ponysay.log"; fi + if [[ -f "ponysay.pg" ]]; then unlink "ponysay.pg" ; fi + if [[ -f "ponysay.toc" ]]; then unlink "ponysay.toc"; fi + if [[ -f "ponysay.tp" ]]; then unlink "ponysay.tp" ; fi + if [[ -f "ponysay.vr" ]]; then unlink "ponysay.vr" ; fi + + install: all mkdir -p "$(DESTDIR)/usr/share/ponysay/" mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies" @@ -66,6 +85,10 @@ install: all install "manuals/manpage.es.6.gz" "$(DESTDIR)/usr/share/man/es/man6/ponysay.6.gz" ln -sf "ponysay.6.gz" "$(DESTDIR)/usr/share/man/es/man6/ponythink.6.gz" + mkdir -p "$(DESTDIR)/usr/share/info" + install "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponysay.info.gz" + ln -sf "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponythink.info.gz" + @echo -e '\n\n'\ '/--------------------------------------------------\\\n'\ '| ___ |\n'\ @@ -103,6 +126,8 @@ uninstall: unlink "$(DESTDIR)/usr/share/man/man6/ponythink.6.gz" unlink "$(DESTDIR)/usr/share/man/es/man6/ponysay.6.gz" unlink "$(DESTDIR)/usr/share/man/es/man6/ponythink.6.gz" + unlink "$(DESTDIR)/usr/share/info/ponysay.info.gz" + unlink "$(DESTDIR)/usr/share/info/ponythink.info.gz" clean: @@ -112,4 +137,4 @@ clean: rm "completion/zsh-completion-think.zsh" rm "manuals/manpage.6.gz" rm "manuals/manpage.es.6.gz" - + rm "ponysay.info.gz" diff --git a/README b/README index 5517aa5..c04f3c2 100644 --- a/README +++ b/README @@ -55,7 +55,7 @@ Package building dependencies Dependencies for pony providers =============================== - make : required to run `make -B ttyponies` + make : required to run `make -B ttyponies` coreutils : ln and readlink are used in the ttyponies subscript diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 9816b2b..5033ca7 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -294,7 +294,7 @@ you run @command{ponythink}. @menu * Terminals:: Limitations on terminals. -* Cowsay:: Limitations on cowsay, +* Cowsay:: Limitations on cowsay. @end menu @@ -535,7 +535,7 @@ but util-say tries do optimise the images in some aspects: as good as possible f low capability terminals, tries to place the pony–balloon link, displayed as good as possible when marked in the terminal (somewhat compromised by the first aspect,) and same width on all rows. - + Using util-say: @example img2ponysay -2 -- SOURCE_IMAGE > PONY_FILE @@ -596,7 +596,7 @@ You have the four essential freedoms: @item The freedom to run the program, for any purpose (freedom 0). @item -The freedom to study how the program works, and change it so it does your computing as you wish (freedom 1). Access to the source code is a precondition for this. +The freedom to study how the program works, and change it so it does your computing as you wish (freedom 1). Access to the source code is a precondition for this. @item The freedom to redistribute copies so you can help your neighbour (freedom 2). @item diff --git a/ponysay.pdf b/ponysay.pdf new file mode 100644 index 0000000..310fdb5 Binary files /dev/null and b/ponysay.pdf differ -- cgit From f916bbcf642d691c21f06746a912732370760f42 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 19:26:51 +0200 Subject: do not force "all" to run when invoking "make install", it may create files owned by root (in cwd), that should not be owned by root --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9b08250..e259af8 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ pdfmanual: if [[ -f "ponysay.vr" ]]; then unlink "ponysay.vr" ; fi -install: all +install: mkdir -p "$(DESTDIR)/usr/share/ponysay/" mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies" mkdir -p "$(DESTDIR)/usr/share/ponysay/ttyponies" -- cgit From d458be657ddce310ecdea86a549b089ec6177ec1 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 20:00:20 +0200 Subject: adding blossomforth --- ponies/blossomforth.pony | 26 ++++++++++++++++++++++++++ ttyponies/blossomforth.pony | 27 +++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 ponies/blossomforth.pony create mode 100644 ttyponies/blossomforth.pony diff --git a/ponies/blossomforth.pony b/ponies/blossomforth.pony new file mode 100644 index 0000000..e2696ec --- /dev/null +++ b/ponies/blossomforth.pony @@ -0,0 +1,26 @@ +$the_cow =< Date: Fri, 20 Jul 2012 20:53:55 +0200 Subject: symlink ponies --- ponies/magnum.pony | 1 + ponies/pearl.pony | 1 + ttyponies/magnum.pony | 1 + ttyponies/pearl.pony | 1 + 4 files changed, 4 insertions(+) create mode 120000 ponies/magnum.pony create mode 120000 ponies/pearl.pony create mode 120000 ttyponies/magnum.pony create mode 120000 ttyponies/pearl.pony diff --git a/ponies/magnum.pony b/ponies/magnum.pony new file mode 120000 index 0000000..47da427 --- /dev/null +++ b/ponies/magnum.pony @@ -0,0 +1 @@ +./raritysdad.pony \ No newline at end of file diff --git a/ponies/pearl.pony b/ponies/pearl.pony new file mode 120000 index 0000000..7d26721 --- /dev/null +++ b/ponies/pearl.pony @@ -0,0 +1 @@ +./raritysmom.pony \ No newline at end of file diff --git a/ttyponies/magnum.pony b/ttyponies/magnum.pony new file mode 120000 index 0000000..47da427 --- /dev/null +++ b/ttyponies/magnum.pony @@ -0,0 +1 @@ +./raritysdad.pony \ No newline at end of file diff --git a/ttyponies/pearl.pony b/ttyponies/pearl.pony new file mode 120000 index 0000000..7d26721 --- /dev/null +++ b/ttyponies/pearl.pony @@ -0,0 +1 @@ +./raritysmom.pony \ No newline at end of file -- cgit From 4e31d07f76befd4f0a26a3cff29a1b56bf1019ae Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 21:23:17 +0200 Subject: issue 45 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index e259af8..7f0ee07 100644 --- a/Makefile +++ b/Makefile @@ -88,6 +88,8 @@ install: mkdir -p "$(DESTDIR)/usr/share/info" install "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponysay.info.gz" ln -sf "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponythink.info.gz" + install-info --dir-file="/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "/usr/share/info/ponysay.info.gz" + install-info --dir-file="/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "/usr/share/info/ponythink.info.gz" @echo -e '\n\n'\ '/--------------------------------------------------\\\n'\ -- cgit From 6f7decf58faeae2a385980bddba0760ae7410f23 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 20 Jul 2012 21:24:19 +0200 Subject: m --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7f0ee07..1cc935b 100644 --- a/Makefile +++ b/Makefile @@ -88,8 +88,8 @@ install: mkdir -p "$(DESTDIR)/usr/share/info" install "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponysay.info.gz" ln -sf "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponythink.info.gz" - install-info --dir-file="/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "/usr/share/info/ponysay.info.gz" - install-info --dir-file="/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "/usr/share/info/ponythink.info.gz" + install-info --dir-file="$(DESTDIR)/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "$(DESTDIR)/usr/share/info/ponysay.info.gz" + install-info --dir-file="$(DESTDIR)/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "$(DESTDIR)/usr/share/info/ponythink.info.gz" @echo -e '\n\n'\ '/--------------------------------------------------\\\n'\ -- cgit From ebae6092e9ade33e5c99e6c0f4f4a9e1387e9aa2 Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Fri, 20 Jul 2012 21:44:48 +0200 Subject: Maybe solution for the bug --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1cc935b..24a5808 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ install: mkdir -p "$(DESTDIR)/usr/share/info" install "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponysay.info.gz" - ln -sf "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponythink.info.gz" + install "ponysay.info.gz" "$(DESTDIR)/usr/share/info/ponythink.info.gz" install-info --dir-file="$(DESTDIR)/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "$(DESTDIR)/usr/share/info/ponysay.info.gz" install-info --dir-file="$(DESTDIR)/usr/share/info/dir" --entry="Miscellaneous" --description="My Little Ponies for your terminal" "$(DESTDIR)/usr/share/info/ponythink.info.gz" -- cgit From 25f0972d9ee6ea6f83f528136aa3d48eceb3d3dc Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 00:06:38 +0200 Subject: A checklist of ponies --- pony-checklist | 689 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 689 insertions(+) create mode 100644 pony-checklist diff --git a/pony-checklist b/pony-checklist new file mode 100644 index 0000000..61e3c14 --- /dev/null +++ b/pony-checklist @@ -0,0 +1,689 @@ +Pony checklist bas ed one http://mlp.wikia.com/wiki/List_of_ponies version 2012-(07)Jul-11 06:55 + +Ponies with just the name are already added to ponysay. +Why not comment the lines for the ponies you are working on. + + +Applejack +Pinkie Pie +Fluttershy +Rainbow Dash +Rarity +Twilight Sparkle +Apple Bloom +Scootaloo +Sweetie Belle +Big Macintosh +Braeburn +Caramel +Mr. Carrot Cake +Mrs. Cup Cake +Cheerilee +Filthy Rich http://mlp.wikia.com/wiki/Filthy_Rich +Granny Smith +Hoity Toity +Mayor Mare +Photo Finish +Sapphire Shores +Daring Do +Derpy +Pegasus royal guards +Soarin' +Spitfire +Princess Cadance +Princess Celestia +Princess Luna +Fancypants +Flam +Flim +Joe http://mlp.wikia.com/wiki/Joe +Prince Blueblood http://mlp.wikia.com/wiki/Prince_Blueblood +Shining Armor +The Great and Powerful Trixie +Unicorn royal guards http://mlp.wikia.com/wiki/Royal_guards +Diamond Tiara +Featherweight http://mlp.wikia.com/wiki/Featherweight +Pipsqueak +Pound Cake http://mlp.wikia.com/wiki/Pound_Cake_and_Pumpkin_Cake +Pumpkin Cake http://mlp.wikia.com/wiki/Pound_Cake_and_Pumpkin_Cake +Silver Spoon +Snails +Snips +Twist +Aunt Orange http://images3.wikia.nocookie.net/__cb20110823211433/mlp/images/thumb/6/6f/Aunt_Orange.png/150px-Aunt_Orange.png +Uncle Orange +Pokey Oaks http://images2.wikia.nocookie.net/__cb20120107203156/mlp/images/thumb/8/87/S02E12_UES3.png/150px-S02E12_UES3.png +Sew 'n Sow http://images2.wikia.nocookie.net/__cb20120107203155/mlp/images/thumb/0/0e/S02E12_UEM1.png/150px-S02E12_UEM1.png +Stinking Rich http://images.wikia.com/mlp/images/5/52/StinkingRich_ID.png +Apple Bumpkin +Apple Cider http://images1.wikia.nocookie.net/__cb20110821234409/mlp/images/thumb/9/97/Apple_Cider.png/150px-Apple_Cider.png +Apple Cobbler http://images.wikia.com/mlp/images/0/0a/Apple_Cobbler_s01e22.png +Apple Fritter +Apple Pie http://images2.wikia.nocookie.net/__cb20110821235513/mlp/images/thumb/f/fb/Apple_Pie.png/150px-Apple_Pie.png +Apple Strudel http://images4.wikia.nocookie.net/__cb20120214131152/mlp/images/thumb/b/b1/AppleStrudel_ID.png/150px-AppleStrudel_ID.png +Apple Tarty http://images2.wikia.nocookie.net/__cb20110821235354/mlp/images/thumb/a/a3/Apple_Tart.png/150px-Apple_Tart.png +Buttercream http://mlp.wikia.com/wiki/List_of_ponies +Caramel Apple http://images1.wikia.nocookie.net/__cb20110822005340/mlp/images/thumb/2/24/Caramel_Apple.png/150px-Caramel_Apple.png +Golden Delicious http://images2.wikia.nocookie.net/__cb20110822061036/mlp/images/thumb/2/25/Golden_Delicious.png/150px-Golden_Delicious.png +Happy Trails http://images3.wikia.nocookie.net/__cb20120107203155/mlp/images/thumb/3/3a/S02E12_UES1.png/150px-S02E12_UES1.png +Marmalade Jalapeno Popette / Orange Wafer http://images3.wikia.nocookie.net/__cb20110712090559/mlp/images/thumb/1/14/Marmalade_Jalapeno_Popette.png/150px-Marmalade_Jalapeno_Popette.png +Pacific Rose http://images4.wikia.nocookie.net/__cb20120306183745/mlp/images/thumb/9/9b/Pinkponyfirstepisode.png/150px-Pinkponyfirstepisode.png +Peachy Sweet http://images3.wikia.nocookie.net/__cb20110327212746/mlp/images/thumb/d/da/Green_coat_red_mane_boots_and_hat_pony_S121.png/150px-Green_coat_red_mane_boots_and_hat_pony_S121.png +Pink Lady http://images2.wikia.nocookie.net/__cb20111214224457/mlp/images/thumb/e/e5/Yellow_coat_pink_mane_S1E20.png/150px-Yellow_coat_pink_mane_S1E20.png +Prairie Tune http://images2.wikia.nocookie.net/__cb20120107203156/mlp/images/thumb/6/6c/S02E12_UES2.png/150px-S02E12_UES2.png +Red Delicious http://images2.wikia.nocookie.net/__cb20110823190727/mlp/images/thumb/5/51/Red_Delicious.png/150px-Red_Delicious.png +Red Gala http://images3.wikia.nocookie.net/__cb20110217234826/mlp/images/thumb/6/65/Red_Gala_Thumb.JPG/150px-Red_Gala_Thumb.JPG +Violet Fritter http://images1.wikia.nocookie.net/__cb20110714030159/mlp/images/thumb/c/c9/Lavender_Fritter.PNG/150px-Lavender_Fritter.PNG +Night Light http://images3.wikia.nocookie.net/__cb20110823214944/mlp/images/thumb/2/21/Crescent_Sparkle.png/150px-Crescent_Sparkle.png +Twilight Velvet +Magnum +Pearl +Blinkie Pie +Inkie Pie +Ace http://images4.wikia.nocookie.net/__cb20120214080030/mlp/images/thumb/7/7e/Ace_id.png/150px-Ace_id.png +Affero http://images1.wikia.nocookie.net/__cb20120214080654/mlp/images/2/2d/Affero.png +All Aboard http://images3.wikia.nocookie.net/__cb20120311212861/mlp/images/thumb/d/d2/Train_conductor_s02e14.png/150px-Train_conductor_s02e14.png +Aloe +Ambrosia http://images2.wikia.nocookie.net/__cb20120214092931/mlp/images/thumb/a/a2/Ambrosia.png/150px-Ambrosia.png +Apple Dumpling http://images4.wikia.nocookie.net/__cb20120107203155/mlp/images/thumb/a/a8/S02E12_UEM2.png/150px-S02E12_UEM2.png +Apple Munchies http://images4.wikia.nocookie.net/__cb20110714032709/mlp/images/thumb/3/3e/Apple_Munchies.PNG/150px-Apple_Munchies.PNG +Baritone http://images4.wikia.nocookie.net/__cb20120206115455/mlp/images/thumb/a/af/Gray_earth_pony_musical_notes_cutie_mark_pulling_plow_S1E11.png/150px-Gray_earth_pony_musical_notes_cutie_mark_pulling_plow_S1E11.png +Beauty Brass http://images2.wikia.nocookie.net/__cb20110822004761/mlp/images/thumb/c/cf/Bluenote.png/150px-Bluenote.png +Bell Perin http://images4.wikia.nocookie.net/__cb20110822003305/mlp/images/thumb/b/b5/BellPerin.png/150px-BellPerin.png +Berry Frost http://images2.wikia.nocookie.net/__cb20120224190632/mlp/images/thumb/d/d7/S02E18_UEM7.png/150px-S02E18_UEM7.png +Berry Icicle http://images2.wikia.nocookie.net/__cb20110822003414/mlp/images/thumb/1/10/Berry_Icicle.png/150px-Berry_Icicle.png +Berry Punch +Big Wig http://images3.wikia.nocookie.net/__cb20111213195513/mlp/images/thumb/7/72/Big_Wig.png/150px-Big_Wig.png +Black Stone http://images4.wikia.nocookie.net/__cb20110706133106/mlp/images/thumb/5/57/Black_cherry.png/150px-Black_cherry.png +Blue Bonnet http://images4.wikia.nocookie.net/__cb20110709210523/mlp/images/thumb/b/ba/Blue_Bonnet.png/150px-Blue_Bonnet.png +Blue Harvest http://images4.wikia.nocookie.net/__cb20120228004721/mlp/images/thumb/4/47/Unnamed_hazmat_suit_pony_s02e06.png/150px-Unnamed_hazmat_suit_pony_s02e06.png +Blueberry http://images4.wikia.nocookie.net/__cb20110822003906/mlp/images/thumb/6/63/Blue_coat_tan_mane_Iron_Pony_Competition_spectator_S1E13.png/150px-Blue_coat_tan_mane_Iron_Pony_Competition_spectator_S1E13.png +Bon Bon +Bonnie http://images3.wikia.nocookie.net/__cb20120107203155/mlp/images/e/e1/S02E12_UEM3.png +Bottlecap http://images4.wikia.nocookie.net/__cb20120228033204/mlp/images/thumb/a/ac/Blue_bottles_Earth_pony_s02e15.png/150px-Blue_bottles_Earth_pony_s02e15.png +Mr. Breezy http://images3.wikia.nocookie.net/__cb20110822004915/mlp/images/thumb/0/0e/Mr._Breezy.png/150px-Mr._Breezy.png +Brindle Young http://images3.wikia.nocookie.net/__cb20120107203156/mlp/images/thumb/f/ff/S02E12_UES4.png/150px-S02E12_UES4.png +Bruce Mane http://images3.wikia.nocookie.net/__cb20111221132526/mlp/images/thumb/7/76/Bruce_Mane_S1E26.png/150px-Bruce_Mane_S1E26.png +Burnt Oak http://images2.wikia.nocookie.net/__cb20111104214714/mlp/images/f/f6/Burnt_oak_id.png +Caboose http://images1.wikia.nocookie.net/__cb20110403102844/mlp/images/thumb/0/0f/Fourth_engineer_pony_S1E21.jpg/150px-Fourth_engineer_pony_S1E21.jpg +Caesar +Candy Mane +Candylicious http://images2.wikia.nocookie.net/__cb20110710014517/mlp/images/thumb/d/da/Candylicious.PNG/150px-Candylicious.PNG +Chelsea Porcelain http://images1.wikia.nocookie.net/__cb20120228004720/mlp/images/thumb/a/a1/Elderly_tea_set_mare_s02e08.png/150px-Elderly_tea_set_mare_s02e08.png +Cherry Berry +Cherry Cola http://images2.wikia.nocookie.net/__cb20110704211148/mlp/images/thumb/4/4e/Cherry_Coke_id.png/150px-Cherry_Coke_id.png +Cherry Jubilee http://images2.wikia.nocookie.net/__cb20120121221155/mlp/images/thumb/0/06/Cherries_Jubilee.png/150px-Cherries_Jubilee.png +Cherry Strudel http://images3.wikia.nocookie.net/__cb20110714031560/mlp/images/thumb/6/64/Cherry_Strudel.PNG/150px-Cherry_Strudel.PNG +Chilly Puddle http://images4.wikia.nocookie.net/__cb20110803032838/mlp/images/thumb/6/6d/Chilly_puddle_xsalien.PNG/150px-Chilly_puddle_xsalien.PNG +Clip Clop http://images2.wikia.nocookie.net/__cb20120214130545/mlp/images/thumb/4/4d/Clown_pony_S2E17.png/150px-Clown_pony_S2E17.png +Coconut http://images1.wikia.nocookie.net/__cb20120206121237/mlp/images/thumb/7/71/Brown_pony_with_tree_cutie_mark_pulling_plow_S1E11.jpg/150px-Brown_pony_with_tree_cutie_mark_pulling_plow_S1E11.jpg +Concerto http://images3.wikia.nocookie.net/__cb20120207142145/mlp/images/thumb/5/59/S02e09_ues1.png/150px-S02e09_ues1.png +Cormano http://images1.wikia.nocookie.net/__cb20110706134727/mlp/images/thumb/6/6d/Manliest_pony.jpg/150px-Manliest_pony.jpg +Cosmic http://images3.wikia.nocookie.net/__cb20111213195652/mlp/images/thumb/1/1f/Cosmic.png/150px-Cosmic.png +Creme Brulee http://images2.wikia.nocookie.net/__cb20110822014007/mlp/images/thumb/3/3c/Big_Macintosh_lookalike_with_Caramel_color_scheme_opening_sequence.png/150px-Big_Macintosh_lookalike_with_Caramel_color_scheme_opening_sequence.png +Dainty Dove http://images3.wikia.nocookie.net/__cb20110621062750/mlp/images/thumb/5/50/Dainty_Dove.png/150px-Dainty_Dove.png +Daisy +Davenport +Doseydotes http://images4.wikia.nocookie.net/__cb20110822232444/mlp/images/thumb/0/02/Doseydotes.png/150px-Doseydotes.png +Eiffel http://images2.wikia.nocookie.net/__cb20110706201705/mlp/images/thumb/d/de/Eiffel_65.png/150px-Eiffel_65.png +Elphaba Trot http://images3.wikia.nocookie.net/__cb20120224190631/mlp/images/thumb/1/1b/S02E18_UEM5.png/150px-S02E18_UEM5.png +Emerald http://images1.wikia.nocookie.net/__cb20120224190631/mlp/images/thumb/6/60/S02E18_UEM4.png/150px-S02E18_UEM4.png +Evening Star http://images2.wikia.nocookie.net/__cb20110403103420/mlp/images/thumb/2/26/Evening_star.jpg/150px-Evening_star.jpg +Felix http://images4.wikia.nocookie.net/__cb20120310220652/mlp/images/thumb/c/cd/S02E19_UES2.png/150px-S02E19_UES2.png +Fiddlesticks http://images2.wikia.nocookie.net/__cb20111022193515/mlp/images/thumb/e/e2/Violna.png/150px-Violna.png +Film Reel http://images3.wikia.nocookie.net/__cb20110822054522/mlp/images/thumb/4/44/Film_Reel.png/150px-Film_Reel.png +Flounder http://images2.wikia.nocookie.net/__cb20110610061737/mlp/images/thumb/8/85/Flounder.png/150px-Flounder.png +Forest Spirit http://images1.wikia.nocookie.net/__cb20110715085613/mlp/images/8/8c/Forest_Spirit.PNG +Frederic Horseshoepin http://images3.wikia.nocookie.net/__cb20111213195912/mlp/images/thumb/8/8a/Frederic_Horseshoepin.png/150px-Frederic_Horseshoepin.png +Fuzzy Slippers http://images4.wikia.nocookie.net/__cb20120208020302/mlp/images/thumb/0/05/Bald_pony_s02e14.png/150px-Bald_pony_s02e14.png +G. Raff http://images4.wikia.nocookie.net/__cb20120212060405/mlp/images/thumb/d/dd/Too_tall.png/150px-Too_tall.png +Geri http://images2.wikia.nocookie.net/__cb20111113165236/mlp/images/thumb/c/cc/Fore_S2E06.png/150px-Fore_S2E06.png +Ginger Gold http://images4.wikia.nocookie.net/__cb20110705211958/mlp/images/thumb/0/0a/Gingergold.png/150px-Gingergold.png +Giselle http://images3.wikia.nocookie.net/__cb20110822060922/mlp/images/thumb/f/f1/Giselle.png/150px-Giselle.png +Gizmo http://images3.wikia.nocookie.net/__cb20120306100927/mlp/images/thumb/c/c3/Stallion_with_robot_cutie_mark_s02e19.png/150px-Stallion_with_robot_cutie_mark_s02e19.png +Golden Harvest +Goldengrape http://images4.wikia.nocookie.net/__cb20110822061150/mlp/images/thumb/d/dc/Goldengrape_id_S1E7.png/150px-Goldengrape_id_S1E7.png +Mr. Greenhooves http://images1.wikia.nocookie.net/__cb20120718005134/mlp/images/thumb/2/2e/Mr._Greenhooves_S1E15_thumb.PNG/150px-Mr._Greenhooves_S1E15_thumb.PNG +Hairy Tipper http://images1.wikia.nocookie.net/__cb20120213072741/mlp/images/thumb/2/25/Too_flashy_pony_S2E17.png/150px-Too_flashy_pony_S2E17.png +Hard Knocks http://images2.wikia.nocookie.net/__cb20120205002823/mlp/images/thumb/7/78/S02E16_UES1.png/150px-S02E16_UES1.png +Harpo Parish Nadermane http://images4.wikia.nocookie.net/__cb20110822061317/mlp/images/thumb/5/55/Harpo_Parish_Nadermane.png/150px-Harpo_Parish_Nadermane.png +Harry Trotter http://images2.wikia.nocookie.net/__cb20120618212032/mlp/images/c/c9/Yellow_pony_with_glasses_and_scarf_S02E26.png +Hay Fever http://images3.wikia.nocookie.net/__cb20120212053738/mlp/images/thumb/2/2e/Cold_Pony.png/150px-Cold_Pony.png +Hayseed Turnip Truck http://images4.wikia.nocookie.net/__cb20111220174830/mlp/images/thumb/0/0c/Hayseed_Turnip_Truck_S2E9.png/150px-Hayseed_Turnip_Truck_S2E9.png +Herald http://images3.wikia.nocookie.net/__cb20110322110425/mlp/images/thumb/a/a9/Herald.PNG/150px-Herald.PNG +Hercules http://images4.wikia.nocookie.net/__cb20110822061424/mlp/images/thumb/7/76/Hercules.png/150px-Hercules.png +High Style http://images2.wikia.nocookie.net/__cb20110822000642/mlp/images/thumb/2/21/Hairdresser_pony_S1E20.png/150px-Hairdresser_pony_S1E20.png +Horse, MD http://images2.wikia.nocookie.net/__cb20111212174238/mlp/images/thumb/d/dc/Doctor_examining_Spike_S2E10.png/150px-Doctor_examining_Spike_S2E10.png +Horte Cuisine +Hugh Jelly http://images4.wikia.nocookie.net/__cb20120211211959/mlp/images/thumb/c/c3/Pony_strangely_obsessed_with_tubs_of_jelly_S2E17.png/150px-Pony_strangely_obsessed_with_tubs_of_jelly_S2E17.png +Icy Drop http://images4.wikia.nocookie.net/__cb20110822064622/mlp/images/thumb/3/38/Icy_Rain.png/150px-Icy_Rain.png +Jangles http://images1.wikia.nocookie.net/__cb20110614052860/mlp/images/thumb/e/e8/Party_pony_2_S1E26.png/150px-Party_pony_2_S1E26.png +Jeff "The Dude" Letrotski http://images3.wikia.nocookie.net/__cb20111113154012/mlp/images/thumb/0/04/Jeff_The_Dude_Letrotskti.png/150px-Jeff_The_Dude_Letrotskti.png +Jesús Pezuña http://images1.wikia.nocookie.net/__cb20111113161740/mlp/images/thumb/3/3e/Jesus_S2E05.png/150px-Jesus_S2E05.png +Jim Beam http://images4.wikia.nocookie.net/__cb20120227215231/mlp/images/thumb/6/67/Construction_worker_i-beam_s02e08.png/150px-Construction_worker_i-beam_s02e08.png +John Bull http://images3.wikia.nocookie.net/__cb20110403103440/mlp/images/thumb/5/52/Second_engineer_pony_pulling_locomotive_S1E21.jpg/150px-Second_engineer_pony_pulling_locomotive_S1E21.jpg +Junebug http://images1.wikia.nocookie.net/__cb20111213200332/mlp/images/thumb/1/15/Junebug.png/150px-Junebug.png +Karat http://images3.wikia.nocookie.net/__cb20120212144739/mlp/images/thumb/0/01/Unnamed_Jeweller_Pony_S2E17.png/150px-Unnamed_Jeweller_Pony_S2E17.png +Kazooie http://images2.wikia.nocookie.net/__cb20111213200348/mlp/images/0/0a/Kazooie.png +Klein http://images2.wikia.nocookie.net/__cb20110624190926/mlp/images/thumb/f/f4/Blueberry_twist.png/150px-Blueberry_twist.png +Knit Knot http://images1.wikia.nocookie.net/__cb20120228004721/mlp/images/thumb/2/23/Elderly_yarn_mare_s02e08.png/150px-Elderly_yarn_mare_s02e08.png +Lavenderhoof http://images1.wikia.nocookie.net/__cb20110714003760/mlp/images/thumb/6/63/Lavenderhoof.PNG/150px-Lavenderhoof.PNG +Lemon Chiffon http://images2.wikia.nocookie.net/__cb20120227223534/mlp/images/thumb/0/0c/S02E08_UEM1.png/150px-S02E08_UEM1.png +Lily http://images3.wikia.nocookie.net/__cb20110822064855/mlp/images/thumb/0/0a/Lily.png/150px-Lily.png +Lincoln http://images1.wikia.nocookie.net/__cb20110822065011/mlp/images/thumb/4/43/Lincoln.png/150px-Lincoln.png +Link Pink http://images2.wikia.nocookie.net/__cb20110714003819/mlp/images/thumb/a/a9/Link_Pink.PNG/150px-Link_Pink.PNG +Linked Hearts http://images1.wikia.nocookie.net/__cb20111015143007/mlp/images/thumb/7/7a/Linkedheartsep3s2.png/150px-Linkedheartsep3s2.png +Little Po http://images2.wikia.nocookie.net/__cb20110821032938/mlp/images/thumb/3/37/Little_Po.png/150px-Little_Po.png +Lotus +Lucky http://images4.wikia.nocookie.net/__cb20120212142628/mlp/images/thumb/1/19/Grey-Lucky.png/150px-Grey-Lucky.png +Lyrica http://images1.wikia.nocookie.net/__cb20110822070241/mlp/images/thumb/7/77/Lyrica.png/150px-Lyrica.png +Majesty http://images3.wikia.nocookie.net/__cb20110822070412/mlp/images/thumb/c/cc/Majesty.png/150px-Majesty.png +Mane Goodall http://images3.wikia.nocookie.net/__cb20111212180238/mlp/images/thumb/3/30/Vet_smiling_at_Spike_S2E10.png/150px-Vet_smiling_at_Spike_S2E10.png +Mango Juice http://images2.wikia.nocookie.net/__cb20110726182509/mlp/images/7/7f/Mangojuice.png +Marigold http://images1.wikia.nocookie.net/__cb20110822054628/mlp/images/thumb/9/91/News_stand_pony_S1E20.png/150px-News_stand_pony_S1E20.png +Maroon Carrot http://images3.wikia.nocookie.net/__cb20110822222505/mlp/images/thumb/b/b0/Maroon_Carrot.png/150px-Maroon_Carrot.png +Masquerade http://images2.wikia.nocookie.net/__cb20110614052849/mlp/images/thumb/0/01/Party_pony_1.png/150px-Party_pony_1.png +Master +Maybelline http://images4.wikia.nocookie.net/__cb20120227223534/mlp/images/thumb/2/2e/S02E08_UEM2.png/150px-S02E08_UEM2.png +Meadow Song http://images3.wikia.nocookie.net/__cb20120630043550/mlp/images/thumb/6/61/Meadow_Song.png/150px-Meadow_Song.png +Melilot http://images2.wikia.nocookie.net/__cb20110709060736/mlp/images/thumb/1/17/Melilot.png/150px-Melilot.png +Midnight Fun http://images1.wikia.nocookie.net/__cb20110624094129/mlp/images/thumb/f/fb/Marge_pony.png/150px-Marge_pony.png +Millie http://images1.wikia.nocookie.net/__cb20111127205205/mlp/images/thumb/0/04/Millie.png/150px-Millie.png +Mjölna +Morton Saltworthy http://images3.wikia.nocookie.net/__cb20110328182939/mlp/images/thumb/b/b3/Saltshaker.png/150px-Saltshaker.png +Noteworthy +Nurse Coldheart http://images4.wikia.nocookie.net/__cb20120205002823/mlp/images/thumb/8/80/S02E16_UEM2.png/150px-S02E16_UEM2.png +Nurse Redheart +Nurse Sweetheart http://images4.wikia.nocookie.net/__cb20120205002822/mlp/images/thumb/e/e8/S02E16_UEM1.png/150px-S02E16_UEM1.png +Nurse Tenderheart http://images3.wikia.nocookie.net/__cb20120607003107/mlp/images/thumb/a/ab/Tenderheart.png/150px-Tenderheart.png +Oakey Doke http://images1.wikia.nocookie.net/__cb20120130080532/mlp/images/thumb/d/de/S01E01_UEM1.png/150px-S01E01_UEM1.png +Octavia +Oregon Trail http://images1.wikia.nocookie.net/__cb20120107203156/mlp/images/thumb/2/2d/S02E12_UES5.png/150px-S02E12_UES5.png +Orion http://images2.wikia.nocookie.net/__cb20110823205129/mlp/images/thumb/3/36/Orion1.png/150px-Orion1.png +Palmer http://images1.wikia.nocookie.net/__cb20120701011150/mlp/images/thumb/0/0a/Palmer.png/150px-Palmer.png +Peachy Cream http://images1.wikia.nocookie.net/__cb20120311212861/mlp/images/thumb/c/c2/S02E14_UEM2.png/150px-S02E14_UEM2.png +Persnickety http://images3.wikia.nocookie.net/__cb20120212053457/mlp/images/thumb/2/25/Uptightpony.png/150px-Uptightpony.png +Petunia http://images3.wikia.nocookie.net/__cb20110822071116/mlp/images/thumb/4/40/Petunia.png/150px-Petunia.png +Picture Perfect http://images3.wikia.nocookie.net/__cb20110821035940/mlp/images/thumb/0/0b/Picture_Perfect.png/150px-Picture_Perfect.png +Pigpen http://images2.wikia.nocookie.net/__cb20120212044742/mlp/images/thumb/4/42/Too_smelly.png/150px-Too_smelly.png +Pine Breeze http://images3.wikia.nocookie.net/__cb20120212135139/mlp/images/thumb/2/22/Gardener_pony_s02e08.png/150px-Gardener_pony_s02e08.png +Pish Posh http://images2.wikia.nocookie.net/__cb20111213200424/mlp/images/thumb/1/1e/Lady_Grey.png/150px-Lady_Grey.png +Post Haste http://images2.wikia.nocookie.net/__cb20120123000855/mlp/images/thumb/0/03/Telegram_delivery_pony_S2E14.png/150px-Telegram_delivery_pony_S2E14.png +Powder Rouge +Pretty Vision http://images1.wikia.nocookie.net/__cb20110822054310/mlp/images/thumb/1/15/Tan_coat_blond_mane_green_suit_pony_S1E20.png/150px-Tan_coat_blond_mane_green_suit_pony_S1E20.png +Promontory http://images2.wikia.nocookie.net/__cb20110403103514/mlp/images/thumb/e/e6/Promontory.png/150px-Promontory.png +Purple Haze http://images2.wikia.nocookie.net/__cb20110823001242/mlp/images/thumb/7/77/Purple_Haze.png/150px-Purple_Haze.png +Purple Wave http://images2.wikia.nocookie.net/__cb20110823190613/mlp/images/thumb/d/dc/Purple_Wave.png/150px-Purple_Wave.png +Quake http://images3.wikia.nocookie.net/__cb20110322103954/mlp/images/thumb/0/0a/Quake.PNG/150px-Quake.PNG +Raggedy Doctor http://images4.wikia.nocookie.net/__cb20111213200712/mlp/images/thumb/3/3f/Top_hat_hourglass_cutie_mark_pony_S2E09.png/150px-Top_hat_hourglass_cutie_mark_pony_S2E09.png +The Rani http://images2.wikia.nocookie.net/__cb20110624191141/mlp/images/thumb/6/6d/Rani.png/150px-Rani.png +Raven http://images3.wikia.nocookie.net/__cb20111213200948/mlp/images/thumb/2/26/Devil_costume_pony_S2E04.png/150px-Devil_costume_pony_S2E04.png +Reflective Rock http://images4.wikia.nocookie.net/__cb20110821035412/mlp/images/4/4f/Reflective_Rock.png +Regal Candent http://images3.wikia.nocookie.net/__cb20110515013654/mlp/images/thumb/5/56/Regal_Candent.png/150px-Regal_Candent.png +Rick Shaw http://images2.wikia.nocookie.net/__cb20120202064706/mlp/images/thumb/b/b9/Taxi_pony_s02e05.png/150px-Taxi_pony_s02e05.png +Roma http://images4.wikia.nocookie.net/__cb20120309140137/mlp/images/thumb/b/b0/S02E19_UEM3.png/150px-S02E19_UEM3.png +Romana http://images1.wikia.nocookie.net/__cb20110822223212/mlp/images/thumb/0/0c/Romana_II.png/150px-Romana_II.png +Rose +Roxie http://images4.wikia.nocookie.net/__cb20110822223411/mlp/images/thumb/f/f2/Roxies.png/150px-Roxies.png +Royal Riff http://images4.wikia.nocookie.net/__cb20120227015711/mlp/images/thumb/4/46/S02E08_UES2_shot_taken_from_s02e15.png/150px-S02E08_UES2_shot_taken_from_s02e15.png +Salt Lick http://images4.wikia.nocookie.net/__cb20110405035659/mlp/images/thumb/8/82/Salty.png/150px-Salty.png +Sandy Soles http://images2.wikia.nocookie.net/__cb20120224190632/mlp/images/thumb/0/05/S02E18_UEM6.png/150px-S02E18_UEM6.png +Screw Loose http://images2.wikia.nocookie.net/__cb20120210080937/mlp/images/thumb/7/71/Barking_pony_screw_cutie_mark_S2E16.png/150px-Barking_pony_screw_cutie_mark_S2E16.png +Screwball +Serena http://images1.wikia.nocookie.net/__cb20110612005433/mlp/images/thumb/6/68/Serena.jpg/150px-Serena.jpg +Shamrock http://images3.wikia.nocookie.net/__cb20110623074615/mlp/images/thumb/9/98/Shamrock.png/150px-Shamrock.png +Sharpener http://images1.wikia.nocookie.net/__cb20110419181219/mlp/images/thumb/c/ca/Sharpener.PNG/150px-Sharpener.PNG +Sheriff Silverstar +Shoeshine http://mlp.wikia.com/wiki/Shoeshine +Shortround http://images3.wikia.nocookie.net/__cb20120212040610/mlp/images/thumb/2/2a/Too_Short_pony.png/150px-Too_Short_pony.png +Silver String http://images3.wikia.nocookie.net/__cb20110822223017/mlp/images/f/fb/Silver_String_ID_s01e21.png +Snappy Scoop http://images3.wikia.nocookie.net/__cb20110821040506/mlp/images/thumb/3/3a/Snappy_Scoop.png/150px-Snappy_Scoop.png +Soigne Folio +Spring Water http://images3.wikia.nocookie.net/__cb20110822223834/mlp/images/thumb/e/e5/Spring_Water.png/150px-Spring_Water.png +Squeaky Clean http://images1.wikia.nocookie.net/__cb20120212055960/mlp/images/thumb/2/23/Too_clean.png/150px-Too_clean.png +Star Gazer http://images1.wikia.nocookie.net/__cb20110822222717/mlp/images/thumb/5/53/Star_Gazer.png/150px-Star_Gazer.png +Starlight http://images3.wikia.nocookie.net/__cb20110822004144/mlp/images/thumb/d/da/Pink_cheerleader_pony_S1E13.png/150px-Pink_cheerleader_pony_S1E13.png +Steamer http://images2.wikia.nocookie.net/__cb20120311212902/mlp/images/thumb/1/18/Train_driver_s02e14.png/150px-Train_driver_s02e14.png +Stella +Storm http://images2.wikia.nocookie.net/__cb20110822224060/mlp/images/thumb/0/07/Storm.png/150px-Storm.png +Strawberry Cream http://images4.wikia.nocookie.net/__cb20120214142460/mlp/images/8/8a/S02E17_UES1.png +Sun Streak http://images1.wikia.nocookie.net/__cb20110822224209/mlp/images/thumb/1/1a/Sun_Streak.png/150px-Sun_Streak.png +Sunset Bliss http://images2.wikia.nocookie.net/__cb20110708000917/mlp/images/thumb/9/90/Sunset_bliss.png/150px-Sunset_bliss.png +Surf http://images2.wikia.nocookie.net/__cb20120309140137/mlp/images/thumb/5/51/S02E19_UEM2.png/150px-S02E19_UEM2.png +Symphony http://images1.wikia.nocookie.net/__cb20120207133422/mlp/images/thumb/1/13/Violin_pony_s02e09.png/150px-Violin_pony_s02e09.png +Theodore Donald "Donny" Kerabatsos http://images1.wikia.nocookie.net/__cb20111113153728/mlp/images/thumb/d/d2/Theodore_Donald_Donny_Kerabatsos.png/150px-Theodore_Donald_Donny_Kerabatsos.png +Time Turner +Toffee http://images2.wikia.nocookie.net/__cb20110822224628/mlp/images/thumb/2/29/Toffee.png/150px-Toffee.png +Tourist Trap http://images3.wikia.nocookie.net/__cb20120227223534/mlp/images/thumb/2/2c/S02E08_UES4.png/150px-S02E08_UES4.png +Tree Sap http://images2.wikia.nocookie.net/__cb20110822224332/mlp/images/thumb/f/fc/Tree_Sap.png/150px-Tree_Sap.png +Tropical Spring http://images4.wikia.nocookie.net/__cb20120224190631/mlp/images/thumb/3/3c/S02E18_UEM3.png/150px-S02E18_UEM3.png +Turf http://images4.wikia.nocookie.net/__cb20120309140136/mlp/images/thumb/3/39/S02E19_UEM1.png/150px-S02E19_UEM1.png +Tux n' Tails http://images3.wikia.nocookie.net/__cb20110621063125/mlp/images/thumb/8/81/Tux_'n_Tails.png/150px-Tux_'n_Tails.png +Twilight Sky http://images4.wikia.nocookie.net/__cb20110331124145/mlp/images/thumb/7/77/Ice.png/150px-Ice.png +Vanilla Sweets http://images4.wikia.nocookie.net/__cb20110624094310/mlp/images/thumb/f/ff/Vanilla_sweets.png/150px-Vanilla_sweets.png +Vera http://images3.wikia.nocookie.net/__cb20110706140537/mlp/images/thumb/3/3b/Cream_coat_lavender_mane_lotus_cutie_mark_clown_hairdo_S1E18.jpg/150px-Cream_coat_lavender_mane_lotus_cutie_mark_clown_hairdo_S1E18.jpg +Vigilance http://images3.wikia.nocookie.net/__cb20120205002823/mlp/images/thumb/e/ee/S02E16_UES2.png/150px-S02E16_UES2.png +Wacky Hair Day and Spray http://images3.wikia.nocookie.net/__cb20110727212619/mlp/images/thumb/e/ea/Wackyhair.png/150px-Wackyhair.png +Mr. Waddle http://images2.wikia.nocookie.net/__cb20111213195636/mlp/images/thumb/d/d8/Elderly_pony_bubble_pipe_cutie_mark_S2E08.png/150px-Elderly_pony_bubble_pipe_cutie_mark_S2E08.png +Walter Coltchak http://images4.wikia.nocookie.net/__cb20111113172152/mlp/images/thumb/f/f2/WalterColtchak.png/150px-WalterColtchak.png +Welly http://images2.wikia.nocookie.net/__cb20120224190630/mlp/images/thumb/b/bb/S02E18_UEM2.png/150px-S02E18_UEM2.png +Wildwood Flower http://images1.wikia.nocookie.net/__cb20120123194028/mlp/images/thumb/5/50/Happy_cowpony_S02E14.png/150px-Happy_cowpony_S02E14.png +William Wright http://images4.wikia.nocookie.net/__cb20120224190634/mlp/images/thumb/9/9c/S02E18_UES1.png/150px-S02E18_UES1.png +Winter Withers http://images3.wikia.nocookie.net/__cb20111213201343/mlp/images/b/b6/Winter_Withers1.png +Wisp http://images4.wikia.nocookie.net/__cb20120227223535/mlp/images/thumb/d/d9/S02E08_UES5.png/150px-S02E08_UES5.png +Yooess Dee http://images1.wikia.nocookie.net/__cb20110821040633/mlp/images/thumb/5/5a/Yooess_Dee.png/150px-Yooess_Dee.png +Mr. Zippy http://images4.wikia.nocookie.net/__cb20111230172439/mlp/images/thumb/0/0d/S01E03_UWM1.png/150px-S01E03_UWM1.png +Blaze http://images4.wikia.nocookie.net/__cb20111230172439/mlp/images/thumb/0/0d/S01E03_UWM1.png/150px-S01E03_UWM1.png +Fire Streak http://images4.wikia.nocookie.net/__cb20111216012624/mlp/images/0/09/Firestreak.png +Fleetfoot http://images1.wikia.nocookie.net/__cb20111216012711/mlp/images/f/fb/S02E09_Fleetfoot.png +High Winds http://images1.wikia.nocookie.net/__cb20111213200158/mlp/images/5/5a/High_Winds.png +Lightning Streak http://images4.wikia.nocookie.net/__cb20111213200452/mlp/images/7/7f/Lightning_Streak.png +Misty http://images2.wikia.nocookie.net/__cb20111216012822/mlp/images/d/de/S01E26_Ice_Wind.png +Rapidfire [UNIDENTIFIED] +Silver Lining http://images3.wikia.nocookie.net/__cb20111216013326/mlp/images/6/6f/S01E16_Rapid_Process_of_Elimination.png +Surprise [NOT SURPRISE IN BROWSER/DESKTOP PONIES] http://images1.wikia.nocookie.net/__cb20111230172440/mlp/images/thumb/6/6c/S01E03_UWM2.png/150px-S01E03_UWM2.png +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 +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 +Blue October / Blueberry Muffin http://images4.wikia.nocookie.net/__cb20110705213514/mlp/images/thumb/8/8b/Blueoctober.png/150px-Blueoctober.png +Blueberry Cloud http://images1.wikia.nocookie.net/__cb20120625080960/mlp/images/b/b1/Blueberry_Cloud.PNG +Bon Voyage http://images4.wikia.nocookie.net/__cb20120326185955/mlp/images/thumb/7/7c/Blue-and-purple_maned_pegasus_s02e22.png/150px-Blue-and-purple_maned_pegasus_s02e22.png +Brolly http://images3.wikia.nocookie.net/__cb20110405235216/mlp/images/thumb/7/76/Brolly.png/150px-Brolly.png +Cappuccino / Luke http://images1.wikia.nocookie.net/__cb20111216012454/mlp/images/5/5c/S01E16_Cappuccino.png +Chocolate Blueberry http://images1.wikia.nocookie.net/__cb20110709061019/mlp/images/thumb/d/d3/Chocolate_Blueberry.png/150px-Chocolate_Blueberry.png +Cinnamon Swirl http://images3.wikia.nocookie.net/__cb20120224191007/mlp/images/thumb/a/a1/S02E18_UPM2.png/150px-S02E18_UPM2.png +Cloud Kicker http://images2.wikia.nocookie.net/__cb20110216030054/mlp/images/thumb/4/46/Cloud_Kicker_id.png/150px-Cloud_Kicker_id.png +Cloud Showers http://images2.wikia.nocookie.net/__cb20110727054813/mlp/images/thumb/5/5d/Cloudshowers.png/150px-Cloudshowers.png +Cloudchaser http://images4.wikia.nocookie.net/__cb20120319192208/mlp/images/thumb/d/de/Pony_next_to_pink_bow_pegasus_s02e22.png/150px-Pony_next_to_pink_bow_pegasus_s02e22.png +Crafty Crate +Daddy Hooves / Daddy Doo / Nimbos http://images3.wikia.nocookie.net/__cb20110713225512/mlp/images/thumb/7/7f/Purplish_male_Pegasus_at_cloud_factory_S1E16.png/150px-Purplish_male_Pegasus_at_cloud_factory_S1E16.png +Deep Blue http://images4.wikia.nocookie.net/__cb20120224190634/mlp/images/thumb/5/59/S02E18_UPM1.png/150px-S02E18_UPM1.png +Dewdrop http://images1.wikia.nocookie.net/__cb20120326185532/mlp/images/thumb/9/90/Green_stallion_hurled_out_of_tornado_s02e22.png/150px-Green_stallion_hurled_out_of_tornado_s02e22.png +Dizzy Twister http://images4.wikia.nocookie.net/__cb20120221212659/mlp/images/thumb/c/c0/Tornados_id.png/150px-Tornados_id.png +Dollar / Cashier / Money Shot http://images2.wikia.nocookie.net/__cb20110319145320/mlp/images/thumb/2/26/Dollar.JPG/150px-Dollar.JPG +Drizzle http://images4.wikia.nocookie.net/__cb20110718022048/mlp/images/thumb/8/8d/Drizzle.PNG/150px-Drizzle.PNG +Dumb-Bell http://images2.wikia.nocookie.net/__cb20110220214036/mlp/images/thumb/b/b6/Dumbbell_Thumb.JPG/150px-Dumbbell_Thumb.JPG +Dust Devil http://images2.wikia.nocookie.net/__cb20120326185012/mlp/images/thumb/a/a3/Desaturated_tornado_pegasus_mare_s02e22.png/150px-Desaturated_tornado_pegasus_mare_s02e22.png +Electric Blue http://images4.wikia.nocookie.net/__cb20110215052515/mlp/images/thumb/9/97/Firefly_Thumb.JPG/150px-Firefly_Thumb.JPG +Endless Clouds http://images3.wikia.nocookie.net/__cb20111213195752/mlp/images/1/1d/Endless_Clouds.png +Flash Bulb http://images4.wikia.nocookie.net/__cb20110507210507/mlp/images/thumb/a/a4/Flashbulb.png/150px-Flashbulb.png +Flitter http://images2.wikia.nocookie.net/__cb20120319192207/mlp/images/thumb/3/31/Pink_bow_pegasus_s02e22.png/150px-Pink_bow_pegasus_s02e22.png +Flutter Doo / Flutter Hooves / Missing Bubbles http://images3.wikia.nocookie.net/__cb20110407160053/mlp/images/thumb/c/cb/Flutter_Doo.png/150px-Flutter_Doo.png +Great Scott http://images4.wikia.nocookie.net/__cb20120325035724/mlp/images/thumb/6/69/White_pegasus_stallion_in_reservoir_s02e22.png/150px-White_pegasus_stallion_in_reservoir_s02e22.png +Green Gem http://images2.wikia.nocookie.net/__cb20111216012732/mlp/images/9/90/Green_Gem1.png +Helia http://images4.wikia.nocookie.net/__cb20120326175955/mlp/images/thumb/5/57/Freckles_sunflower_pegasus_s02e22.png/150px-Freckles_sunflower_pegasus_s02e22.png +Honeysuckle http://images1.wikia.nocookie.net/__cb20110709060821/mlp/images/thumb/2/21/Honeysuckle.png/150px-Honeysuckle.png +Hoops http://images4.wikia.nocookie.net/__cb20110220214104/mlp/images/thumb/e/e6/Hoops_Thumb.JPG/150px-Hoops_Thumb.JPG +Ice Pop / Cryo Doo / Frosty Hooves http://images2.wikia.nocookie.net/__cb20110709060809/mlp/images/thumb/3/3b/Ice_pop.png/150px-Ice_pop.png +Icy Rain http://images3.wikia.nocookie.net/__cb20110704035921/mlp/images/thumb/c/c4/Icy_rain.png/150px-Icy_rain.png +Jack Hammer http://images3.wikia.nocookie.net/__cb20110621071205/mlp/images/thumb/7/71/Carl.png/150px-Carl.png +Juicy Fruit http://images2.wikia.nocookie.net/__cb20110624094111/mlp/images/thumb/f/fc/Fruit_Punch.png/150px-Fruit_Punch.png +Lavender Skies http://images1.wikia.nocookie.net/__cb20120212173315/mlp/images/thumb/8/8f/S01E11_UPM1.png/150px-S01E11_UPM1.png +Lightning Bolt +Lucy Packard http://images3.wikia.nocookie.net/__cb20110301021442/mlp/images/thumb/1/1d/Lucy.jpg/150px-Lucy.jpg +Madden http://images3.wikia.nocookie.net/__cb20110301021551/mlp/images/thumb/b/b1/Madden.jpg/150px-Madden.jpg +Medley http://images2.wikia.nocookie.net/__cb20120222233647/mlp/images/thumb/9/9b/Medley-blue_id_s01e11.png/150px-Medley-blue_id_s01e11.png +Merry May http://images2.wikia.nocookie.net/__cb20110203053144/mlp/images/thumb/d/d4/Flora.jpg/150px-Flora.jpg +Milky Way http://images3.wikia.nocookie.net/__cb20120326180036/mlp/images/thumb/6/6c/White_telescope_pegasus_stallion_s02e22.png/150px-White_telescope_pegasus_stallion_s02e22.png +Nana Knits http://images2.wikia.nocookie.net/__cb20110228042005/mlp/images/thumb/e/ea/Old_Pegasus_pony_with_a_yarn_cutie_mark_S1E16.png/150px-Old_Pegasus_pony_with_a_yarn_cutie_mark_S1E16.png +Opal Water http://images2.wikia.nocookie.net/__cb20110709213807/mlp/images/thumb/e/e5/Name-me.PNG/150px-Name-me.PNG +Orange Blossom http://images3.wikia.nocookie.net/__cb20110710014711/mlp/images/thumb/5/55/Overly_Accessorised_Party_Pony.PNG/150px-Overly_Accessorised_Party_Pony.PNG +Orange Box http://images4.wikia.nocookie.net/__cb20110714045752/mlp/images/thumb/f/ff/Orangebox.png/150px-Orangebox.png +Papermoon http://images2.wikia.nocookie.net/__cb20110407194306/mlp/images/thumb/0/0f/Moon.PNG/150px-Moon.PNG +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 +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 +Q. T. Prism http://images1.wikia.nocookie.net/__cb20110624094149/mlp/images/thumb/1/10/Optic_Prism.png/150px-Optic_Prism.png +Rainbowshine +Raindrops +Red Velvet / Velvet Hooves Red Velvet / Velvet Hooves +Riverdance http://images2.wikia.nocookie.net/__cb20110715201547/mlp/images/thumb/7/70/Riverdance.PNG/150px-Riverdance.PNG +Rivet http://images1.wikia.nocookie.net/__cb20110621071218/mlp/images/thumb/3/33/Homer.png/150px-Homer.png +Sandstorm http://images4.wikia.nocookie.net/__cb20120116224256/mlp/images/thumb/9/99/S01E06_UPM1.png/150px-S01E06_UPM1.png +Sassaflash http://images2.wikia.nocookie.net/__cb20110709061028/mlp/images/thumb/9/92/Bluebird_Happiness.png/150px-Bluebird_Happiness.png +Score http://images1.wikia.nocookie.net/__cb20110220214046/mlp/images/thumb/3/35/Score_Thumb.JPG/150px-Score_Thumb.JPG +Serenity http://images1.wikia.nocookie.net/__cb20120326185039/mlp/images/thumb/9/96/Pink_raindrops_pegasus_stallion_s02e22.png/150px-Pink_raindrops_pegasus_stallion_s02e22.png +Silver Script http://images2.wikia.nocookie.net/__cb20120214053328/mlp/images/thumb/7/79/S02E17_UPS1.png/150px-S02E17_UPS1.png +Silverspeed http://images4.wikia.nocookie.net/__cb20120326185123/mlp/images/thumb/b/bc/Silverspeed_s02e22.png/150px-Silverspeed_s02e22.png +Skyra +Snow Catcher http://images1.wikia.nocookie.net/__cb20110704192224/mlp/images/thumb/5/5b/Snow_catcher.png/150px-Snow_catcher.png +Snowflake +Spectrum http://images2.wikia.nocookie.net/__cb20111213200922/mlp/images/thumb/3/31/Roy_G._Bow_S01E16.png/150px-Roy_G._Bow_S01E16.png +Star Hunter http://images1.wikia.nocookie.net/__cb20120326180137/mlp/images/thumb/d/dc/Dark_blue_constellation_stallion_s02e22.png/150px-Dark_blue_constellation_stallion_s02e22.png +Starburst http://images4.wikia.nocookie.net/__cb20110706203538/mlp/images/thumb/5/52/Cool_star.png/150px-Cool_star.png +Stardancer http://images3.wikia.nocookie.net/__cb20110707013113/mlp/images/thumb/3/31/Stardancer.png/150px-Stardancer.png +Starsong / Sugar Apple http://images1.wikia.nocookie.net/__cb20110621071306/mlp/images/thumb/f/f6/Sugar_Apple.png/150px-Sugar_Apple.png +Strawberry Sunrise http://images1.wikia.nocookie.net/__cb20120326175918/mlp/images/thumb/4/41/Yellow_grapes_pegasus_s02e22.png/150px-Yellow_grapes_pegasus_s02e22.png +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 +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 +Thorn http://images4.wikia.nocookie.net/__cb20110621071344/mlp/images/thumb/4/40/Tornado.png/150px-Tornado.png +Thunderlane http://images2.wikia.nocookie.net/__cb20120421200732/mlp/images/thumb/c/c8/Thunderlane_S02E22_thumb.png/150px-Thunderlane_S02E22_thumb.png +Tiger Lily http://images3.wikia.nocookie.net/__cb20110827181803/mlp/images/thumb/0/08/Cherries_Jubilee.jpg/150px-Cherries_Jubilee.jpg +Tin Tailor http://images3.wikia.nocookie.net/__cb20110621071227/mlp/images/thumb/c/cc/Larry.png/150px-Larry.png +Tracy Flash / Shutterfly http://images1.wikia.nocookie.net/__cb20110322025215/mlp/images/thumb/2/23/Tracy_Flash_id.png/150px-Tracy_Flash_id.png +Under D. Weather / Tropical Storm http://images2.wikia.nocookie.net/__cb20110709000512/mlp/images/thumb/d/d2/Trobical_storm.png/150px-Trobical_storm.png +Vanilla Skies http://images3.wikia.nocookie.net/__cb20110710020747/mlp/images/thumb/8/86/Vanilla_Skies.PNG/150px-Vanilla_Skies.PNG +Wild Fire +Wind Whistler http://images3.wikia.nocookie.net/__cb20110612002913/mlp/images/thumb/7/70/Wind_Whistler.jpg/150px-Wind_Whistler.jpg +Wing Wishes http://images3.wikia.nocookie.net/__cb20110707013058/mlp/images/thumb/d/d8/Wing_Wishes.png/150px-Wing_Wishes.png +Yo-Yo / Gumdrop http://images3.wikia.nocookie.net/__cb20120214113050/mlp/images/thumb/4/4f/Applause.png/150px-Applause.png +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 +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 +Cinnabelle http://images3.wikia.nocookie.net/__cb20120107205209/mlp/images/thumb/5/5d/S02E12_UUM1.png/150px-S02E12_UUM1.png +Comet Tail http://images3.wikia.nocookie.net/__cb20120213155741/mlp/images/thumb/e/e7/Yellow_comet_stallion_s02e15.png/150px-Yellow_comet_stallion_s02e15.png +Diamond Mint +DJ Pon-3 / Vın̈yl Scratch +Doctor Stable http://images3.wikia.nocookie.net/__cb20120205002824/mlp/images/thumb/2/2e/S02E16_UUS1.png/150px-S02E16_UUS1.png +Earl Grey http://images3.wikia.nocookie.net/__cb20120314011724/mlp/images/thumb/7/77/S02E09_Waiter_unicorn_blue.png/150px-S02E09_Waiter_unicorn_blue.png +Eliza http://images1.wikia.nocookie.net/__cb20120107205209/mlp/images/e/ea/S02E12_UUM2.png +Epona / Clockwork http://images2.wikia.nocookie.net/__cb20120130222054/mlp/images/thumb/e/ed/S02E15_Placeholder_Epona.png/150px-S02E15_Placeholder_Epona.png +Fleur de Lis +Glory / Spring Fresh http://images4.wikia.nocookie.net/__cb20110823212004/mlp/images/thumb/2/2c/Glory.png/150px-Glory.png +Graphite http://images1.wikia.nocookie.net/__cb20120202171924/mlp/images/7/7b/SuperSqueezy6000UnicornStallionAshes.png +Holly Dash http://images2.wikia.nocookie.net/__cb20110408184102/mlp/images/thumb/3/31/Holly_Dash.png/150px-Holly_Dash.png +Hors D'oeuvre http://images1.wikia.nocookie.net/__cb20110823211747/mlp/images/thumb/f/fc/ElleCuisine.png/150px-ElleCuisine.png +Ingrid Marie http://images2.wikia.nocookie.net/__cb20110624093304/mlp/images/thumb/6/68/Poppy_Quiz.png/150px-Poppy_Quiz.png +The Inquisitor http://images2.wikia.nocookie.net/__cb20110823214858/mlp/images/thumb/c/c8/Inquisitor.png/150px-Inquisitor.png +Jazz http://images3.wikia.nocookie.net/__cb20110421043858/mlp/images/thumb/b/b2/Jazz.jpg/150px-Jazz.jpg +Jenny http://images3.wikia.nocookie.net/__cb20110822064741/mlp/images/thumb/a/a7/Jenny.png/150px-Jenny.png +Jet Set http://images3.wikia.nocookie.net/__cb20111216012861/mlp/images/e/ec/S02E09_Jet_Set.png +Jolene http://images2.wikia.nocookie.net/__cb20120107205209/mlp/images/4/46/S02E12_UUM4.png +Katt Apples http://images3.wikia.nocookie.net/__cb20120224191007/mlp/images/thumb/6/6b/S02E18_UUM3.png/150px-S02E18_UUM3.png +Lemon Hearts http://images4.wikia.nocookie.net/__cb20120211162232/mlp/images/thumb/1/1e/Lemon_Hearts_id_2.png/150px-Lemon_Hearts_id_2.png +Lemon Tart http://images4.wikia.nocookie.net/__cb20110704024157/mlp/images/thumb/9/96/Unnamed_yellow_unicorn_in_ep_3_and_call_of_cutie_2.PNG/150px-Unnamed_yellow_unicorn_in_ep_3_and_call_of_cutie_2.PNG +Lonsdaleite http://images4.wikia.nocookie.net/__cb20110421104012/mlp/images/thumb/5/58/Lonsdaleite.PNG/150px-Lonsdaleite.PNG +Lyra Heartstrings +Marey Fetlock http://images2.wikia.nocookie.net/__cb20111115165850/mlp/images/thumb/5/55/Firecracker_Burst.png/150px-Firecracker_Burst.png +Maxie / Madmax http://images2.wikia.nocookie.net/__cb20110823212161/mlp/images/thumb/a/a4/Maxie.png/150px-Maxie.png +May Ball http://images1.wikia.nocookie.net/__cb20111208221025/mlp/images/thumb/a/a1/South_Star_1.png/150px-South_Star_1.png +Minuette +Mochaccino http://images3.wikia.nocookie.net/__cb20120224191007/mlp/images/thumb/7/79/S02E18_UUS1.png/120px-S02E18_UUS1.png +Neon Lights http://images3.wikia.nocookie.net/__cb20111208202708/mlp/images/thumb/e/eb/Teal_coat_black_mane_sunglasses_S2E09.png/150px-Teal_coat_black_mane_sunglasses_S2E09.png +Nixie http://images2.wikia.nocookie.net/__cb20120211224827/mlp/images/7/76/S01E09_UUM2.png +North Pole http://images1.wikia.nocookie.net/__cb20110707235054/mlp/images/thumb/d/d1/Northpole.png/150px-Northpole.png +North Star / Rosaline http://images1.wikia.nocookie.net/__cb20110829222361/mlp/images/thumb/8/8b/North_Star1.png/150px-North_Star1.png +Orchid Dew http://images3.wikia.nocookie.net/__cb20110827183618/mlp/images/thumb/8/8a/Orchid_Dew.PNG/150px-Orchid_Dew.PNG +Perry Pierce http://images3.wikia.nocookie.net/__cb20111216012554/mlp/images/f/f0/Doctor_Whoof_-3.png +Pixie http://images4.wikia.nocookie.net/__cb20120211224826/mlp/images/c/c8/S01E09_UUM1.png +Pokey Pierce +Ponet http://images4.wikia.nocookie.net/__cb20110216030225/mlp/images/thumb/f/fd/Van_Horse_id.png/150px-Van_Horse_id.png +Primrose http://images1.wikia.nocookie.net/__cb20110823212511/mlp/images/thumb/9/96/Primrose1.png/150px-Primrose1.png +Pristine http://images2.wikia.nocookie.net/__cb20120314003916/mlp/images/b/b9/S02E09_Waiter_unicorn_brown.png +Raty / Polly http://images2.wikia.nocookie.net/__cb20110823214235/mlp/images/thumb/8/8f/Raty.png/150px-Raty.png +Rhythm / Night Shade http://images2.wikia.nocookie.net/__cb20110714111158/mlp/images/thumb/9/92/Rhytm_unicorn.PNG/150px-Rhytm_unicorn.PNG +Rosewood Brook http://images3.wikia.nocookie.net/__cb20120107205209/mlp/images/9/96/S02E12_UUM3.png +Royal Ribbon +Sea Swirl http://mlp.wikia.com/wiki/Sea_Swirl +South Pole http://images3.wikia.nocookie.net/__cb20110707235429/mlp/images/thumb/5/51/Southpole.png/150px-Southpole.png +Star Bright http://images2.wikia.nocookie.net/__cb20120311212054/mlp/images/thumb/6/61/Gray_stallion_with_telescope_CM_s02e14.png/115px-Gray_stallion_with_telescope_CM_s02e14.png +Star Dream / Sky Dream http://images1.wikia.nocookie.net/__cb20110707121344/mlp/images/thumb/c/c3/Star_Dream.png/150px-Star_Dream.png +Strawberry Lime http://images4.wikia.nocookie.net/__cb20110823200712/mlp/images/c/ce/Strawberry_Lime.png +Sugarberry http://images1.wikia.nocookie.net/__cb20110823200833/mlp/images/thumb/d/d7/Sugar_berry.png/150px-Sugar_berry.png +Swan Dive http://images3.wikia.nocookie.net/__cb20111214223813/mlp/images/thumb/5/5f/Swandive1.png/150px-Swandive1.png +Sweet Dreams http://images3.wikia.nocookie.net/__cb20110704192213/mlp/images/thumb/7/7a/Sweet_Dreams.png/150px-Sweet_Dreams.png +Top Notch http://images3.wikia.nocookie.net/__cb20120107205209/mlp/images/thumb/a/a7/S02E12_UUS1.png/150px-S02E12_UUS1.png +Twinkleshine http://images4.wikia.nocookie.net/__cb20110823215317/mlp/images/thumb/3/35/Twinkleshine.png/150px-Twinkleshine.png +Upper Crust http://images2.wikia.nocookie.net/__cb20111216012939/mlp/images/2/2c/S02E09_Upper_Crust.png +Vance Van Vendington http://images4.wikia.nocookie.net/__cb20111216012954/mlp/images/a/a8/Kristoph_Gavin.png +Written Script http://images2.wikia.nocookie.net/__cb20111127145431/mlp/images/thumb/4/41/Written_Script.png/150px-Written_Script.png +Alula http://mlp.wikia.com/wiki/Alula +Apple Bytes http://images2.wikia.nocookie.net/__cb20120229172615/mlp/images/thumb/b/bb/S02E17_UEF1.png/150px-S02E17_UEF1.png +Archer +Atlas http://images1.wikia.nocookie.net/__cb20120125024638/mlp/images/3/3c/Unnamed_porter_unicorn_S2E9.png +Bee Bop http://images2.wikia.nocookie.net/__cb20110825201846/mlp/images/thumb/b/bd/Harpica.png/150px-Harpica.png +Berry Pinch +Bloo http://images3.wikia.nocookie.net/__cb20120224191005/mlp/images/thumb/2/25/S02E18_UUF1.png/150px-S02E18_UUF1.png +Blueberry Cake http://images1.wikia.nocookie.net/__cb20110825215551/mlp/images/thumb/f/f7/Blueberry_Cake.png/150px-Blueberry_Cake.png +Checkered Flag http://images3.wikia.nocookie.net/__cb20110825192423/mlp/images/thumb/2/23/Checkered_Flag.png/150px-Checkered_Flag.png +Cheery http://images3.wikia.nocookie.net/__cb20110825215707/mlp/images/thumb/1/1b/Cheery.png/150px-Cheery.png +Chip Mint http://images1.wikia.nocookie.net/__cb20120224190634/mlp/images/thumb/3/3d/S02E18_UPC1.png/150px-S02E18_UPC1.png +Coronet http://images2.wikia.nocookie.net/__cb20110825201607/mlp/images/thumb/b/b7/Coronet.png/150px-Coronet.png +Cotton Cloudy +Cotton Top http://images2.wikia.nocookie.net/__cb20110825220210/mlp/images/thumb/a/aa/Cotton_Top.png/150px-Cotton_Top.png +Cream Puff http://images2.wikia.nocookie.net/__cb20111216012529/mlp/images/a/a6/Cream_Puff.png +Cyan Skies http://images3.wikia.nocookie.net/__cb20110825192717/mlp/images/thumb/5/54/Cyan_Skies.png/150px-Cyan_Skies.png +Dinky Doo +Firelock http://images4.wikia.nocookie.net/__cb20120515034213/mlp/images/thumb/c/cc/Orange_red_unicorn_filly_s02e23.png/150px-Orange_red_unicorn_filly_s02e23.png +Fruitbasket / Froot Loops http://images4.wikia.nocookie.net/__cb20110825220357/mlp/images/thumb/0/08/Fruitbasket.png/150px-Fruitbasket.png +Grace Lightning http://images2.wikia.nocookie.net/__cb20111216012639/mlp/images/7/74/Flash.png +Half Note http://images3.wikia.nocookie.net/__cb20111112194331/mlp/images/thumb/a/ae/Seabreeze.png/150px-Seabreeze.png +High Score http://images2.wikia.nocookie.net/__cb20120212052329/mlp/images/thumb/1/1f/Too_youn.png/150px-Too_youn.png +Honey Drop http://images4.wikia.nocookie.net/__cb20110825222149/mlp/images/thumb/f/f6/Sweet_Bumblebee.png/150px-Sweet_Bumblebee.png +Hot Wheels http://images4.wikia.nocookie.net/__cb20110825193005/mlp/images/thumb/5/59/Hot_Rod.png/150px-Hot_Rod.png +Lance http://images3.wikia.nocookie.net/__cb20120106141249/mlp/images/7/74/Cutie_Pox_Fencing_pony.png +Lemon Daze http://images4.wikia.nocookie.net/__cb20111216013008/mlp/images/6/6c/Lemon_Daze.png +Lickety Split http://images1.wikia.nocookie.net/__cb20111216013020/mlp/images/f/fa/Lickety_Split.png +Lily Dache http://images3.wikia.nocookie.net/__cb20110825193309/mlp/images/thumb/c/cd/Lily_Dache.png/150px-Lily_Dache.png +Little Hoof http://images1.wikia.nocookie.net/__cb20110825201951/mlp/images/thumb/b/b1/Little_Hoof.png/150px-Little_Hoof.png +Mango Dash http://images4.wikia.nocookie.net/__cb20110825221648/mlp/images/d/dd/Mango_Dash.png +Muffin http://images1.wikia.nocookie.net/__cb20111113221056/mlp/images/thumb/0/02/Baby_derpy2.png/150px-Baby_derpy2.png +Noi http://mlp.wikia.com/wiki/Noi +Nursery Rhyme http://images1.wikia.nocookie.net/__cb20120204200258/mlp/images/thumb/d/dc/Small_nurse_pony_S2E16.png/150px-Small_nurse_pony_S2E16.png +Peachy Petal http://images2.wikia.nocookie.net/__cb20110825222908/mlp/images/thumb/2/21/Peachy_Petal.png/150px-Peachy_Petal.png +Peachy Pie http://images4.wikia.nocookie.net/__cb20110825224652/mlp/images/thumb/d/d9/PeachyPie.png/150px-PeachyPie.png +Piña Colada http://images3.wikia.nocookie.net/__cb20110825193650/mlp/images/thumb/1/12/Piña_Colada.png/150px-Piña_Colada.png +Pinkie Feather http://images3.wikia.nocookie.net/__cb20110825221754/mlp/images/1/1b/Pinkie_Feather.png +Purpletastic / Purpleskies http://images1.wikia.nocookie.net/__cb20110825221851/mlp/images/c/cd/Purpletastic.png +Rainy Feather http://images3.wikia.nocookie.net/__cb20110825222019/mlp/images/b/b5/Rainy_Feather.png +Royal Blue http://images3.wikia.nocookie.net/__cb20110825202654/mlp/images/thumb/e/ea/Royal_Blue.png/150px-Royal_Blue.png +Rumble http://images4.wikia.nocookie.net/__cb20120326190215/mlp/images/thumb/f/fd/Gray_pegasus_colt_s02e22.png/150px-Gray_pegasus_colt_s02e22.png +Shady Daze http://images3.wikia.nocookie.net/__cb20120204083934/mlp/images/thumb/d/d3/Blue_colt_looking_at_looptihoop_S2E06.png/150px-Blue_colt_looking_at_looptihoop_S2E06.png +Strike http://images1.wikia.nocookie.net/__cb20111216013432/mlp/images/7/70/Strike.png +Sun Glimmer http://images1.wikia.nocookie.net/__cb20110909211606/mlp/images/thumb/a/a1/Sun_Glimmer1.png/150px-Sun_Glimmer1.png +Sunny Daze http://images2.wikia.nocookie.net/__cb20110825224806/mlp/images/thumb/e/ef/SunnyDays.png/150px-SunnyDays.png +Sweet Pop http://images4.wikia.nocookie.net/__cb20110825222316/mlp/images/2/29/Sweet_Pop.png +Tootsie Flute http://images3.wikia.nocookie.net/__cb20110825195552/mlp/images/thumb/1/1b/Tootsie_Flute1.png/150px-Tootsie_Flute1.png +Tornado Bolt http://images1.wikia.nocookie.net/__cb20110825202839/mlp/images/thumb/6/63/Tornado_Bolt1.png/150px-Tornado_Bolt1.png +Truffle Shuffle http://images4.wikia.nocookie.net/__cb20120113144952/mlp/images/9/93/S02E12_UEC1.png +Golden Glory http://images1.wikia.nocookie.net/__cb20120326180005/mlp/images/thumb/b/b1/Yellow_laurel_pegasus_mare_s02e22.png/150px-Yellow_laurel_pegasus_mare_s02e22.png +Crafty Crate [WHAT ANOTHER] [EARTH PONY] +Green Gem [WHAT ANOTHER] [EARTH PONY] +Jack Hammer [WHAT ANOTHER] [EARTH PONY] +Rivet [WHAT ANOTHER] [EARTH PONY] +Spectrum [WHAT ANOTHER] [EARTH PONY] +Star Hunter [WHAT ANOTHER] [EARTH PONY] +Sunburst [WHAT ANOTHER] [EARTH PONY] +Tin Tailor [WHAT ANOTHER] [EARTH PONY] +Meadow Song [WHAT ANOTHER] [PEGASUS] +Twilight Sky [WHAT ANOTHER] [PEGASUS] +Horte Cuisine [WHAT ANOTHER] [UNICORN] +Lucy Packard [WHAT ANOTHER] [UNICORN] +Master [WHAT ANOTHER] [UNICORN] +Orion [WHAT ANOTHER] [UNICORN] +Red Gala [WHAT ANOTHER] [UNICORN] +Chancellor Puddinghead [NO PICTURE AVAILABLE] +Smart Cookie [NO PICTURE AVAILABLE] +Commander Hurricane [NO PICTURE AVAILABLE] +Private Pansy [NO PICTURE AVAILABLE] +Clover the Clever [NO PICTURE AVAILABLE] +Princess Platinum [NO PICTURE AVAILABLE] +Star Swirl the Bearded [NO PICTURE AVAILABLE] +The Unicorn King [NO PICTURE AVAILABLE] +Apple Brioche [NO PICTURE AVAILABLE] +Apple Brown Betty [NO PICTURE AVAILABLE] +Apple Cinnamon Crisp [NO PICTURE AVAILABLE] +Apple Tart [NO PICTURE AVAILABLE] +Baked Apples [NO PICTURE AVAILABLE] +Bumpkin [NO PICTURE AVAILABLE] +Calamity Mane [NO PICTURE AVAILABLE] +Granny Pie [NO PICTURE AVAILABLE] +Mr. Kingpin [NO PICTURE AVAILABLE] +Moondancer [NO PICTURE AVAILABLE] +Namby-Pamby [NO PICTURE AVAILABLE] +Thornhoof [NO PICTURE AVAILABLE] +Wild Bull Hickok [NO PICTURE AVAILABLE] +S02E09 Unnamed Announcer [NO PICTURE AVAILABLE] +S02E17 Unnamed Prince http://images2.wikia.nocookie.net/__cb20120320011919/mlp/images/thumb/b/be/Love_poison_prince_s02e17.png/150px-Love_poison_prince_s02e17.png +S02E17 Unnamed Princess http://images3.wikia.nocookie.net/__cb20120320011919/mlp/images/thumb/a/ac/Love_poison_princess_s02e17.png/150px-Love_poison_princess_s02e17.png + + +Unnamed ponies with with pictures available: + +Unnamed teacher Earth pony http://images4.wikia.nocookie.net/__cb20120716010319/mlp/images/thumb/8/8b/Math_teacher_pony.png/140px-Math_teacher_pony.png http://www.reddit.com/r/listofponies/comments/wmcha/earth_pony_m_coatgray_manewhite/ +S01E03 Unnamed Earth Stallion #1 +S01E04 Unnamed Earth Mare #2 +S01E04 Unnamed Earth Mare #3 +S01E04 Unnamed Earth Stallion #1 +S01E11 Unnamed Earth Mare #1 +S01E11 Unnamed Earth Mare #2 +S01E11 Unnamed Earth Mare #3 +S01E11 Unnamed Earth Mare #4 +S01E11 Unnamed Earth Mare #5 +S01E14 Unnamed Earth Mare #1 +S01E14 Unnamed Earth Mare #2 +S01E14 Unnamed Earth Mare #3 +S01E14 Unnamed Earth Mare #4 +S01E14 Unnamed Earth Mare #5 +S01E14 Unnamed Earth Mare #6 +S01E14 Unnamed Earth Mare #7 +S01E14 Unnamed Earth Mare #8 +S01E14 Unnamed Earth Mare #9 +S01E14 Unnamed Earth Stallion #1 +S01E14 Unnamed Earth Stallion #2 +S01E21 Unnamed Earth Stallion #1 +S02E11 Unnamed Earth Mare #1 +S02E26 Unnamed Earth Mare #1 +S02E26 Unnamed Earth Mare #2 +S02E26 Unnamed Earth Mare #3 +S02E26 Unnamed Earth Mare #4 +S02E26 Unnamed Earth Stallion #1 +S02E26 Unnamed Earth Stallion #2 +S02E26 Unnamed Earth Stallion #3 +S02E26 Unnamed Earth Stallion #4 +S02E26 Unnamed Earth Stallion #5 +S01E02 Unnamed Pegasus Mare #1 http://images3.wikia.nocookie.net/__cb20120712011255/mlp/images/9/93/S1E02_-_Unnamed_Shadowbolt_1.PNG +S01E02 Unnamed Pegasus Stallion #1 http://images4.wikia.nocookie.net/__cb20120712011311/mlp/images/b/ba/S1E02_-_Unnamed_Shadowbolt_2.PNG +S01E02 Unnamed Pegasus Stallion #2 http://images4.wikia.nocookie.net/__cb20120712011323/mlp/images/2/25/S1E02_-_Unnamed_Shadowbolt_3.PNG +S01E04 Unnamed Pegasus Mare #1 +S01E04 Unnamed Pegasus Mare #2 +S01E06 Unnamed Pegasus Mare #2 +S01E11 Unnamed Pegasus Mare #2 +S01E11 Unnamed Pegasus Mare #3 +S01E11 Unnamed Pegasus Mare #4 +S01E11 Unnamed Pegasus Mare #5 +S01E11 Unnamed Pegasus Mare #6 +S01E11 Unnamed Pegasus Mare #7 +S01E14 Unnamed Pegasus Mare #1 +S01E14 Unnamed Pegasus Mare #2 +S01E16 Unnamed Pegasus Mare #1 +S01E16 Unnamed Pegasus Mare #2 +S01E16 Unnamed Pegasus Mare #3 +S01E16 Unnamed Pegasus Stallion #1 +S02E18 Unnamed Pegasus Mare #3 +S02E22 Unnamed Pegasus Mare #5 http://www.reddit.com/r/listofponies/comments/rf54g/pegasus_f_coatpurplish_blue_maneyellow_cmtwo/ +S02E22 Unnamed Pegasus Mare #7 +S02E22 Unnamed Pegasus Mare #10 +S02E22 Unnamed Pegasus Mare #13 http://www.reddit.com/r/listofponies/comments/tl8cd/pegasus_f_coatlight_green_maneblue_eyespurple/ +S02E22 Unnamed Pegasus Stallion #4 +S02E22 Unnamed Pegasus Stallion #5 http://www.reddit.com/r/listofponies/comments/rf59d/pegasus_m_coatgreen_manegray_eyesblue_cmflowers/ +S02E22 Unnamed Pegasus Stallion #11 +S02E26 Unnamed Pegasus Mare #1 +S01E01 Unnamed Unicorn Mare #1 +S01E11 Unnamed Unicorn Mare #1 +S01E14 Unnamed Unicorn Mare #1 +S01E14 Unnamed Unicorn Mare #2 +S01E14 Unnamed Unicorn Mare #3 +S01E14 Unnamed Unicorn Mare #4 +S01E14 Unnamed Unicorn Mare #5 +S01E14 Unnamed Unicorn Mare #6 +S02E18 Unnamed Unicorn Mare #1 +S02E18 Unnamed Unicorn Mare #2 +S02E26 Unnamed Unicorn Mare #1 +S02E26 Unnamed Unicorn Mare #2 +S02E26 Unnamed Unicorn Mare #3 +S02E26 Unnamed Unicorn Mare #4 +S02E26 Unnamed Unicorn Mare #5 +S02E26 Unnamed Unicorn Mare #6 +S02E26 Unnamed Unicorn Mare #7 +S02E26 Unnamed Unicorn Mare #8 +S02E26 Unnamed Unicorn Mare #9 +S02E26 Unnamed Unicorn Mare #10 +S02E26 Unnamed Unicorn Mare #11 +S02E26 Unnamed Unicorn Mare #12 +S02E26 Unnamed Unicorn Stallion #1 +S02E26 Unnamed Unicorn Stallion #2 +S02E26 Unnamed Unicorn Stallion #3 http://www.reddit.com/r/listofponies/comments/wspnq/unicorn_m_coatred_manelight_blue_eyesgreen/ +S02E26 Unnamed Unicorn Stallion #4 +S02E26 Unnamed Unicorn Stallion #5 +S02E13 Unnamed Earth Baby #1 +S02E13 Unnamed Unicorn Baby #1 +S02E23 Unnamed Earth Filly #1 http://www.reddit.com/r/listofponies/comments/un6ae/earth_pony_f_coatgreen_manepurple_eyesblue_cmnone/ +S02E23 Unnamed Earth Colt #1 http://www.reddit.com/r/listofponies/comments/rs1zd/earth_pony_m_coatgreen_maneblue_eyesblue/ + + + +More characters: + +Nightmare Moon +Gilda +Chrysalis +Discord +Garble http://mlp.wikia.com/wiki/Garble +Zecora +Little Strongheart +Chief Thunderhooves http://mlp.wikia.com/wiki/Chief_Thunderhooves +Cranky Doodle Donkey http://mlp.wikia.com/wiki/Cranky_Doodle_Donkey +Matilda http://mlp.wikia.com/wiki/Matilda +Iron Will +Gustave Le Grand http://mlp.wikia.com/wiki/Gustave_Le_Grand +Mulia Mild http://mlp.wikia.com/wiki/Mulia_Mild +Bloomberg http://mlp.wikia.com/wiki/Inanimate_objects#Bloomberg +Mr. Turnip +Rocky +Sir Lintsalot +Madame Le Flour +Tom http://mlp.wikia.com/wiki/Inanimate_objects#Tom +Smarty Pants http://mlp.wikia.com/wiki/Inanimate_objects#Smarty_Pants +Ahuitzotl http://mlp.wikia.com/wiki/Ahuitzotl +Angel +Winona +Opalescence +Gummy +Philomena +Owlowiscious +Tank +Peewee http://mlp.wikia.com/wiki/Spike#Peewee +Cerberus http://mlp.wikia.com/wiki/Creatures#Cerberus +Changeling +Cockatrice http://mlp.wikia.com/wiki/Creatures#Cockatrice +Hydra http://mlp.wikia.com/wiki/Creatures#Hydra +Manticore http://mlp.wikia.com/wiki/Creatures#Manticore +Parasprite +Phoenix +Quarray eel http://mlp.wikia.com/wiki/Creatures#Quarray_eels +Sea serpent +Timberwolf http://mlp.wikia.com/wiki/Creatures#Timberwolf +Ursa Major http://mlp.wikia.com/wiki/Creatures#Ursa +Ursa Minor http://mlp.wikia.com/wiki/Creatures#Ursa +Windigo http://mlp.wikia.com/wiki/Creatures#Windigo +Elizabeak: http://images.wikia.com/mlp/images/7/79/Elizabeak_S1E17_thumb.png + +Other dragons: +http://images2.wikia.nocookie.net/__cb20101214223529/mlp/images/thumb/9/9d/Fluttershy_Confronting_Dragon_S1E07.png/200px-Fluttershy_Confronting_Dragon_S1E07.png +http://images1.wikia.nocookie.net/__cb20110425055507/mlp/images/thumb/8/8c/Green_dragon_s1e24.png/200px-Green_dragon_s1e24.png +http://images2.wikia.nocookie.net/__cb20120319133616/mlp/images/thumb/d/d1/S2E21_dragon_three.png/180px-S2E21_dragon_three.png +http://images2.wikia.nocookie.net/__cb20120322093252/mlp/images/thumb/d/d0/Garble_with_the_other_teen_dragons_S2E21.png/274px-Garble_with_the_other_teen_dragons_S2E21.png +More in S02E21... + +Other buffalo: +http://images1.wikia.nocookie.net/__cb20110329021538/mlp/images/thumb/c/ce/RD%2C_Pinkie_Pie%2C_and_Spike_meeting_Buffalo_tribe_and_LSH_S1E21.png/300px-RD%2C_Pinkie_Pie%2C_and_Spike_meeting_Buffalo_tribe_and_LSH_S1E21.png + +Wild life: +http://mlp.wikia.com/wiki/Wildlife + -- cgit From 8535909c730cf8cc70a58effa1b3b1256b343246 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 00:13:25 +0200 Subject: Perry Pierce is not Pokey Pierce --- ponies/perry.pony | 1 - ttyponies/perry.pony | 1 - 2 files changed, 2 deletions(-) delete mode 120000 ponies/perry.pony delete mode 120000 ttyponies/perry.pony diff --git a/ponies/perry.pony b/ponies/perry.pony deleted file mode 120000 index c66432d..0000000 --- a/ponies/perry.pony +++ /dev/null @@ -1 +0,0 @@ -pokey.pony \ No newline at end of file diff --git a/ttyponies/perry.pony b/ttyponies/perry.pony deleted file mode 120000 index c66432d..0000000 --- a/ttyponies/perry.pony +++ /dev/null @@ -1 +0,0 @@ -pokey.pony \ No newline at end of file -- cgit From ebec4243536fa06889d035b174963765a6188c0d Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 00:44:02 +0200 Subject: symbolic pony links --- ponies/amethyststar | 1 + ponies/berrypinch | 1 + ponies/craftycrate | 1 + ponies/powderrouge | 1 + ponies/royalribbon | 1 + ttyponies/amethyststar | 1 + ttyponies/berrypinch | 1 + ttyponies/craftycrate | 1 + ttyponies/powderrouge | 1 + ttyponies/royalribbon | 1 + 10 files changed, 10 insertions(+) create mode 120000 ponies/amethyststar create mode 120000 ponies/berrypinch create mode 120000 ponies/craftycrate create mode 120000 ponies/powderrouge create mode 120000 ponies/royalribbon create mode 120000 ttyponies/amethyststar create mode 120000 ttyponies/berrypinch create mode 120000 ttyponies/craftycrate create mode 120000 ttyponies/powderrouge create mode 120000 ttyponies/royalribbon diff --git a/ponies/amethyststar b/ponies/amethyststar new file mode 120000 index 0000000..01ee830 --- /dev/null +++ b/ponies/amethyststar @@ -0,0 +1 @@ +./sparkler \ No newline at end of file diff --git a/ponies/berrypinch b/ponies/berrypinch new file mode 120000 index 0000000..3d4539d --- /dev/null +++ b/ponies/berrypinch @@ -0,0 +1 @@ +./ruby \ No newline at end of file diff --git a/ponies/craftycrate b/ponies/craftycrate new file mode 120000 index 0000000..c164882 --- /dev/null +++ b/ponies/craftycrate @@ -0,0 +1 @@ +./boxxy \ No newline at end of file diff --git a/ponies/powderrouge b/ponies/powderrouge new file mode 120000 index 0000000..127424f --- /dev/null +++ b/ponies/powderrouge @@ -0,0 +1 @@ +./sindy \ No newline at end of file diff --git a/ponies/royalribbon b/ponies/royalribbon new file mode 120000 index 0000000..8819d6d --- /dev/null +++ b/ponies/royalribbon @@ -0,0 +1 @@ +./violet \ No newline at end of file diff --git a/ttyponies/amethyststar b/ttyponies/amethyststar new file mode 120000 index 0000000..01ee830 --- /dev/null +++ b/ttyponies/amethyststar @@ -0,0 +1 @@ +./sparkler \ No newline at end of file diff --git a/ttyponies/berrypinch b/ttyponies/berrypinch new file mode 120000 index 0000000..3d4539d --- /dev/null +++ b/ttyponies/berrypinch @@ -0,0 +1 @@ +./ruby \ No newline at end of file diff --git a/ttyponies/craftycrate b/ttyponies/craftycrate new file mode 120000 index 0000000..c164882 --- /dev/null +++ b/ttyponies/craftycrate @@ -0,0 +1 @@ +./boxxy \ No newline at end of file diff --git a/ttyponies/powderrouge b/ttyponies/powderrouge new file mode 120000 index 0000000..127424f --- /dev/null +++ b/ttyponies/powderrouge @@ -0,0 +1 @@ +./sindy \ No newline at end of file diff --git a/ttyponies/royalribbon b/ttyponies/royalribbon new file mode 120000 index 0000000..8819d6d --- /dev/null +++ b/ttyponies/royalribbon @@ -0,0 +1 @@ +./violet \ No newline at end of file -- cgit From 9c503c9ee24f119fed0a1f4b3df080bba7855cc7 Mon Sep 17 00:00:00 2001 From: Pablo Lezaeta Date: Fri, 20 Jul 2012 19:40:21 -0400 Subject: I work on there too --- pony-checklist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pony-checklist b/pony-checklist index 8604a7f..5ce8aab 100644 --- a/pony-checklist +++ b/pony-checklist @@ -462,7 +462,7 @@ Firelock http://images4.wikia.nocookie.net/__cb20120515034213/mlp/images/thumb/ Fruitbasket / Froot Loops http://images4.wikia.nocookie.net/__cb20110825220357/mlp/images/thumb/0/08/Fruitbasket.png/150px-Fruitbasket.png Grace Lightning http://images2.wikia.nocookie.net/__cb20111216012639/mlp/images/7/74/Flash.png Half Note http://images3.wikia.nocookie.net/__cb20111112194331/mlp/images/thumb/a/ae/Seabreeze.png/150px-Seabreeze.png -High Score http://images2.wikia.nocookie.net/__cb20120212052329/mlp/images/thumb/1/1f/Too_youn.png/150px-Too_youn.png +High Score Honey Drop http://images4.wikia.nocookie.net/__cb20110825222149/mlp/images/thumb/f/f6/Sweet_Bumblebee.png/150px-Sweet_Bumblebee.png Hot Wheels http://images4.wikia.nocookie.net/__cb20110825193005/mlp/images/thumb/5/59/Hot_Rod.png/150px-Hot_Rod.png Lance http://images3.wikia.nocookie.net/__cb20120106141249/mlp/images/7/74/Cutie_Pox_Fencing_pony.png @@ -488,7 +488,7 @@ Sun Glimmer http://images1.wikia.nocookie.net/__cb20110909211606/mlp/images/thu Sunny Daze http://images2.wikia.nocookie.net/__cb20110825224806/mlp/images/thumb/e/ef/SunnyDays.png/150px-SunnyDays.png Sweet Pop http://images4.wikia.nocookie.net/__cb20110825222316/mlp/images/2/29/Sweet_Pop.png Tootsie Flute http://images3.wikia.nocookie.net/__cb20110825195552/mlp/images/thumb/1/1b/Tootsie_Flute1.png/150px-Tootsie_Flute1.png -Tornado Bolt http://images1.wikia.nocookie.net/__cb20110825202839/mlp/images/thumb/6/63/Tornado_Bolt1.png/150px-Tornado_Bolt1.png +Tornado Bolt Truffle Shuffle Golden Glory http://images1.wikia.nocookie.net/__cb20120326180005/mlp/images/thumb/b/b1/Yellow_laurel_pegasus_mare_s02e22.png/150px-Yellow_laurel_pegasus_mare_s02e22.png Crafty Crate [WHAT ANOTHER] [EARTH PONY] -- cgit From b83a6117eb91e1d11793a212cbae469bd84f489e Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 01:43:29 +0200 Subject: whoops, missed .pony --- ponies/amethyststar | 1 - ponies/amethyststar.pony | 1 + ponies/berrypinch | 1 - ponies/berrypinch.pony | 1 + ponies/craftycrate | 1 - ponies/craftycrate.pony | 1 + ponies/powderrouge | 1 - ponies/powderrouge.pony | 1 + ponies/royalribbon | 1 - ponies/royalribbon.pony | 1 + ttyponies/amethyststar | 1 - ttyponies/amethyststar.pony | 1 + ttyponies/berrypinch | 1 - ttyponies/berrypinch.pony | 1 + ttyponies/craftycrate | 1 - ttyponies/craftycrate.pony | 1 + ttyponies/powderrouge | 1 - ttyponies/powderrouge.pony | 1 + ttyponies/royalribbon | 1 - ttyponies/royalribbon.pony | 1 + 20 files changed, 10 insertions(+), 10 deletions(-) delete mode 120000 ponies/amethyststar create mode 120000 ponies/amethyststar.pony delete mode 120000 ponies/berrypinch create mode 120000 ponies/berrypinch.pony delete mode 120000 ponies/craftycrate create mode 120000 ponies/craftycrate.pony delete mode 120000 ponies/powderrouge create mode 120000 ponies/powderrouge.pony delete mode 120000 ponies/royalribbon create mode 120000 ponies/royalribbon.pony delete mode 120000 ttyponies/amethyststar create mode 120000 ttyponies/amethyststar.pony delete mode 120000 ttyponies/berrypinch create mode 120000 ttyponies/berrypinch.pony delete mode 120000 ttyponies/craftycrate create mode 120000 ttyponies/craftycrate.pony delete mode 120000 ttyponies/powderrouge create mode 120000 ttyponies/powderrouge.pony delete mode 120000 ttyponies/royalribbon create mode 120000 ttyponies/royalribbon.pony diff --git a/ponies/amethyststar b/ponies/amethyststar deleted file mode 120000 index 01ee830..0000000 --- a/ponies/amethyststar +++ /dev/null @@ -1 +0,0 @@ -./sparkler \ No newline at end of file diff --git a/ponies/amethyststar.pony b/ponies/amethyststar.pony new file mode 120000 index 0000000..196d416 --- /dev/null +++ b/ponies/amethyststar.pony @@ -0,0 +1 @@ +./sparkler.pony \ No newline at end of file diff --git a/ponies/berrypinch b/ponies/berrypinch deleted file mode 120000 index 3d4539d..0000000 --- a/ponies/berrypinch +++ /dev/null @@ -1 +0,0 @@ -./ruby \ No newline at end of file diff --git a/ponies/berrypinch.pony b/ponies/berrypinch.pony new file mode 120000 index 0000000..0e63199 --- /dev/null +++ b/ponies/berrypinch.pony @@ -0,0 +1 @@ +./ruby.pony \ No newline at end of file diff --git a/ponies/craftycrate b/ponies/craftycrate deleted file mode 120000 index c164882..0000000 --- a/ponies/craftycrate +++ /dev/null @@ -1 +0,0 @@ -./boxxy \ No newline at end of file diff --git a/ponies/craftycrate.pony b/ponies/craftycrate.pony new file mode 120000 index 0000000..00fc48b --- /dev/null +++ b/ponies/craftycrate.pony @@ -0,0 +1 @@ +./boxxy.pony \ No newline at end of file diff --git a/ponies/powderrouge b/ponies/powderrouge deleted file mode 120000 index 127424f..0000000 --- a/ponies/powderrouge +++ /dev/null @@ -1 +0,0 @@ -./sindy \ No newline at end of file diff --git a/ponies/powderrouge.pony b/ponies/powderrouge.pony new file mode 120000 index 0000000..792dff0 --- /dev/null +++ b/ponies/powderrouge.pony @@ -0,0 +1 @@ +./sindy.pony \ No newline at end of file diff --git a/ponies/royalribbon b/ponies/royalribbon deleted file mode 120000 index 8819d6d..0000000 --- a/ponies/royalribbon +++ /dev/null @@ -1 +0,0 @@ -./violet \ No newline at end of file diff --git a/ponies/royalribbon.pony b/ponies/royalribbon.pony new file mode 120000 index 0000000..b057da8 --- /dev/null +++ b/ponies/royalribbon.pony @@ -0,0 +1 @@ +./violet.pony \ No newline at end of file diff --git a/ttyponies/amethyststar b/ttyponies/amethyststar deleted file mode 120000 index 01ee830..0000000 --- a/ttyponies/amethyststar +++ /dev/null @@ -1 +0,0 @@ -./sparkler \ No newline at end of file diff --git a/ttyponies/amethyststar.pony b/ttyponies/amethyststar.pony new file mode 120000 index 0000000..196d416 --- /dev/null +++ b/ttyponies/amethyststar.pony @@ -0,0 +1 @@ +./sparkler.pony \ No newline at end of file diff --git a/ttyponies/berrypinch b/ttyponies/berrypinch deleted file mode 120000 index 3d4539d..0000000 --- a/ttyponies/berrypinch +++ /dev/null @@ -1 +0,0 @@ -./ruby \ No newline at end of file diff --git a/ttyponies/berrypinch.pony b/ttyponies/berrypinch.pony new file mode 120000 index 0000000..0e63199 --- /dev/null +++ b/ttyponies/berrypinch.pony @@ -0,0 +1 @@ +./ruby.pony \ No newline at end of file diff --git a/ttyponies/craftycrate b/ttyponies/craftycrate deleted file mode 120000 index c164882..0000000 --- a/ttyponies/craftycrate +++ /dev/null @@ -1 +0,0 @@ -./boxxy \ No newline at end of file diff --git a/ttyponies/craftycrate.pony b/ttyponies/craftycrate.pony new file mode 120000 index 0000000..00fc48b --- /dev/null +++ b/ttyponies/craftycrate.pony @@ -0,0 +1 @@ +./boxxy.pony \ No newline at end of file diff --git a/ttyponies/powderrouge b/ttyponies/powderrouge deleted file mode 120000 index 127424f..0000000 --- a/ttyponies/powderrouge +++ /dev/null @@ -1 +0,0 @@ -./sindy \ No newline at end of file diff --git a/ttyponies/powderrouge.pony b/ttyponies/powderrouge.pony new file mode 120000 index 0000000..792dff0 --- /dev/null +++ b/ttyponies/powderrouge.pony @@ -0,0 +1 @@ +./sindy.pony \ No newline at end of file diff --git a/ttyponies/royalribbon b/ttyponies/royalribbon deleted file mode 120000 index 8819d6d..0000000 --- a/ttyponies/royalribbon +++ /dev/null @@ -1 +0,0 @@ -./violet \ No newline at end of file diff --git a/ttyponies/royalribbon.pony b/ttyponies/royalribbon.pony new file mode 120000 index 0000000..b057da8 --- /dev/null +++ b/ttyponies/royalribbon.pony @@ -0,0 +1 @@ +./violet.pony \ No newline at end of file -- cgit From 20423b9cba4ddb0320800ce661779364a8727e1f Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 01:48:10 +0200 Subject: linking perry to perrypierce --- ponies/perry.pony | 1 + ttyponies/perry.pony | 1 + 2 files changed, 2 insertions(+) create mode 120000 ponies/perry.pony create mode 120000 ttyponies/perry.pony diff --git a/ponies/perry.pony b/ponies/perry.pony new file mode 120000 index 0000000..82925e2 --- /dev/null +++ b/ponies/perry.pony @@ -0,0 +1 @@ +./perrypierce.pony \ No newline at end of file diff --git a/ttyponies/perry.pony b/ttyponies/perry.pony new file mode 120000 index 0000000..82925e2 --- /dev/null +++ b/ttyponies/perry.pony @@ -0,0 +1 @@ +./perrypierce.pony \ No newline at end of file -- cgit From 510915a60d2ccee2f9857fcc11911d1e5dde3033 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 01:51:25 +0200 Subject: making ponies as added --- pony-checklist | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pony-checklist b/pony-checklist index 61e3c14..96c68f7 100644 --- a/pony-checklist +++ b/pony-checklist @@ -289,7 +289,7 @@ 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 Blue October / Blueberry Muffin http://images4.wikia.nocookie.net/__cb20110705213514/mlp/images/thumb/8/8b/Blueoctober.png/150px-Blueoctober.png Blueberry Cloud http://images1.wikia.nocookie.net/__cb20120625080960/mlp/images/b/b1/Blueberry_Cloud.PNG -Bon Voyage http://images4.wikia.nocookie.net/__cb20120326185955/mlp/images/thumb/7/7c/Blue-and-purple_maned_pegasus_s02e22.png/150px-Blue-and-purple_maned_pegasus_s02e22.png +Bon Voyage Brolly http://images3.wikia.nocookie.net/__cb20110405235216/mlp/images/thumb/7/76/Brolly.png/150px-Brolly.png Cappuccino / Luke http://images1.wikia.nocookie.net/__cb20111216012454/mlp/images/5/5c/S01E16_Cappuccino.png Chocolate Blueberry http://images1.wikia.nocookie.net/__cb20110709061019/mlp/images/thumb/d/d3/Chocolate_Blueberry.png/150px-Chocolate_Blueberry.png @@ -419,7 +419,7 @@ Nixie http://images2.wikia.nocookie.net/__cb20120211224827/mlp/images/7/76/S01 North Pole http://images1.wikia.nocookie.net/__cb20110707235054/mlp/images/thumb/d/d1/Northpole.png/150px-Northpole.png North Star / Rosaline http://images1.wikia.nocookie.net/__cb20110829222361/mlp/images/thumb/8/8b/North_Star1.png/150px-North_Star1.png Orchid Dew http://images3.wikia.nocookie.net/__cb20110827183618/mlp/images/thumb/8/8a/Orchid_Dew.PNG/150px-Orchid_Dew.PNG -Perry Pierce http://images3.wikia.nocookie.net/__cb20111216012554/mlp/images/f/f0/Doctor_Whoof_-3.png +Perry Pierce Pixie http://images4.wikia.nocookie.net/__cb20120211224826/mlp/images/c/c8/S01E09_UUM1.png Pokey Pierce Ponet http://images4.wikia.nocookie.net/__cb20110216030225/mlp/images/thumb/f/fd/Van_Horse_id.png/150px-Van_Horse_id.png @@ -477,7 +477,7 @@ Noi http://mlp.wikia.com/wiki/Noi Nursery Rhyme http://images1.wikia.nocookie.net/__cb20120204200258/mlp/images/thumb/d/dc/Small_nurse_pony_S2E16.png/150px-Small_nurse_pony_S2E16.png Peachy Petal http://images2.wikia.nocookie.net/__cb20110825222908/mlp/images/thumb/2/21/Peachy_Petal.png/150px-Peachy_Petal.png Peachy Pie http://images4.wikia.nocookie.net/__cb20110825224652/mlp/images/thumb/d/d9/PeachyPie.png/150px-PeachyPie.png -Piña Colada http://images3.wikia.nocookie.net/__cb20110825193650/mlp/images/thumb/1/12/Piña_Colada.png/150px-Piña_Colada.png +Piña Colada Pinkie Feather http://images3.wikia.nocookie.net/__cb20110825221754/mlp/images/1/1b/Pinkie_Feather.png Purpletastic / Purpleskies http://images1.wikia.nocookie.net/__cb20110825221851/mlp/images/c/cd/Purpletastic.png Rainy Feather http://images3.wikia.nocookie.net/__cb20110825222019/mlp/images/b/b5/Rainy_Feather.png @@ -490,7 +490,7 @@ Sunny Daze http://images2.wikia.nocookie.net/__cb20110825224806/mlp/images/thum Sweet Pop http://images4.wikia.nocookie.net/__cb20110825222316/mlp/images/2/29/Sweet_Pop.png Tootsie Flute http://images3.wikia.nocookie.net/__cb20110825195552/mlp/images/thumb/1/1b/Tootsie_Flute1.png/150px-Tootsie_Flute1.png Tornado Bolt http://images1.wikia.nocookie.net/__cb20110825202839/mlp/images/thumb/6/63/Tornado_Bolt1.png/150px-Tornado_Bolt1.png -Truffle Shuffle http://images4.wikia.nocookie.net/__cb20120113144952/mlp/images/9/93/S02E12_UEC1.png +Truffle Shuffle Golden Glory http://images1.wikia.nocookie.net/__cb20120326180005/mlp/images/thumb/b/b1/Yellow_laurel_pegasus_mare_s02e22.png/150px-Yellow_laurel_pegasus_mare_s02e22.png Crafty Crate [WHAT ANOTHER] [EARTH PONY] Green Gem [WHAT ANOTHER] [EARTH PONY] -- cgit From e3bdae86d7caccd33857ce539c09e342e4dd6b4b Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 01:53:52 +0200 Subject: m --- pony-checklist | 1 - 1 file changed, 1 deletion(-) diff --git a/pony-checklist b/pony-checklist index 96c68f7..535ef93 100644 --- a/pony-checklist +++ b/pony-checklist @@ -203,7 +203,6 @@ Orion http://images2.wikia.nocookie.net/__cb20110823205129/mlp/images/thumb/ Palmer http://images1.wikia.nocookie.net/__cb20120701011150/mlp/images/thumb/0/0a/Palmer.png/150px-Palmer.png Peachy Cream http://images1.wikia.nocookie.net/__cb20120311212861/mlp/images/thumb/c/c2/S02E14_UEM2.png/150px-S02E14_UEM2.png Persnickety http://images3.wikia.nocookie.net/__cb20120212053457/mlp/images/thumb/2/25/Uptightpony.png/150px-Uptightpony.png -Petunia http://images3.wikia.nocookie.net/__cb20110822071116/mlp/images/thumb/4/40/Petunia.png/150px-Petunia.png Picture Perfect http://images3.wikia.nocookie.net/__cb20110821035940/mlp/images/thumb/0/0b/Picture_Perfect.png/150px-Picture_Perfect.png Pigpen http://images2.wikia.nocookie.net/__cb20120212044742/mlp/images/thumb/4/42/Too_smelly.png/150px-Too_smelly.png Pine Breeze http://images3.wikia.nocookie.net/__cb20120212135139/mlp/images/thumb/2/22/Gardener_pony_s02e08.png/150px-Gardener_pony_s02e08.png -- cgit From 4de5757deecb799b761f52e83826c65d7473148b Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 02:47:08 +0200 Subject: adding four ponies: celestiasmall changelingqueen fleurdelishair fleurdelislay --- ponies/celestiasmall.pony | 34 ++++++++++++++++++++++++++++++++++ ponies/changelingqueen.pony | 36 ++++++++++++++++++++++++++++++++++++ ponies/fleurdelishair.pony | 33 +++++++++++++++++++++++++++++++++ ponies/fleurdelislay.pony | 24 ++++++++++++++++++++++++ ttyponies/celestiasmall.pony | 35 +++++++++++++++++++++++++++++++++++ ttyponies/changelingqueen.pony | 37 +++++++++++++++++++++++++++++++++++++ ttyponies/fleurdelishair.pony | 34 ++++++++++++++++++++++++++++++++++ ttyponies/fleurdelislay.pony | 25 +++++++++++++++++++++++++ 8 files changed, 258 insertions(+) create mode 100644 ponies/celestiasmall.pony create mode 100644 ponies/changelingqueen.pony create mode 100644 ponies/fleurdelishair.pony create mode 100644 ponies/fleurdelislay.pony create mode 100644 ttyponies/celestiasmall.pony create mode 100644 ttyponies/changelingqueen.pony create mode 100644 ttyponies/fleurdelishair.pony create mode 100644 ttyponies/fleurdelislay.pony diff --git a/ponies/celestiasmall.pony b/ponies/celestiasmall.pony new file mode 100644 index 0000000..f64fd4f --- /dev/null +++ b/ponies/celestiasmall.pony @@ -0,0 +1,34 @@ +$the_cow =< Date: Sat, 21 Jul 2012 03:45:59 +0200 Subject: adding pony: discordamused --- ponies/discordamused.pony | 35 +++++++++++++++++++++++++++++++++++ ttyponies/discordamused.pony | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 ponies/discordamused.pony create mode 100644 ttyponies/discordamused.pony diff --git a/ponies/discordamused.pony b/ponies/discordamused.pony new file mode 100644 index 0000000..a3e05a4 --- /dev/null +++ b/ponies/discordamused.pony @@ -0,0 +1,35 @@ +$the_cow =< Date: Fri, 20 Jul 2012 22:58:17 -0400 Subject: Working in Filthy Rich --- pony-checklist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pony-checklist b/pony-checklist index 5ce8aab..d63d86e 100644 --- a/pony-checklist +++ b/pony-checklist @@ -19,7 +19,7 @@ Caramel Mr. Carrot Cake Mrs. Cup Cake Cheerilee -Filthy Rich http://mlp.wikia.com/wiki/Filthy_Rich +Filthy Rich Granny Smith Hoity Toity Mayor Mare -- cgit From 3b9d58ecf930618248e63345e1dd46e6b761abac Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 08:34:56 +0300 Subject: Update pony-checklist --- pony-checklist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pony-checklist b/pony-checklist index 535ef93..df66c0d 100644 --- a/pony-checklist +++ b/pony-checklist @@ -1,4 +1,4 @@ -Pony checklist bas ed one http://mlp.wikia.com/wiki/List_of_ponies version 2012-(07)Jul-11 06:55 +Pony checklist based on http://mlp.wikia.com/wiki/List_of_ponies version 2012-(07)Jul-11 06:55 Ponies with just the name are already added to ponysay. Why not comment the lines for the ponies you are working on. -- cgit From 4cfde927f3dd456d2c4315f7eca6fe65c0f3351f Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 08:25:48 +0200 Subject: pony-checklist --- pony-checklist | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pony-checklist b/pony-checklist index df66c0d..8604a7f 100644 --- a/pony-checklist +++ b/pony-checklist @@ -532,7 +532,7 @@ S02E17 Unnamed Prince http://images2.wikia.nocookie.net/__cb20120320011919/m S02E17 Unnamed Princess http://images3.wikia.nocookie.net/__cb20120320011919/mlp/images/thumb/a/ac/Love_poison_princess_s02e17.png/150px-Love_poison_princess_s02e17.png -Unnamed ponies with with pictures available: +Unnamed ponies with pictures available: Unnamed teacher Earth pony http://images4.wikia.nocookie.net/__cb20120716010319/mlp/images/thumb/8/8b/Math_teacher_pony.png/140px-Math_teacher_pony.png http://www.reddit.com/r/listofponies/comments/wmcha/earth_pony_m_coatgray_manewhite/ S01E03 Unnamed Earth Stallion #1 @@ -625,6 +625,10 @@ S02E13 Unnamed Unicorn Baby #1 S02E23 Unnamed Earth Filly #1 http://www.reddit.com/r/listofponies/comments/un6ae/earth_pony_f_coatgreen_manepurple_eyesblue_cmnone/ S02E23 Unnamed Earth Colt #1 http://www.reddit.com/r/listofponies/comments/rs1zd/earth_pony_m_coatgreen_maneblue_eyesblue/ +Ponies not listed: + +S01E06 The green haired ponies saying: Well I'd never. + More characters: -- cgit From 40164221fbae896ba14715fa0c01cbb56a426105 Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Sat, 21 Jul 2012 09:36:33 +0200 Subject: Updated perl-script to format the ponies names --- ponysaylist.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ponysaylist.pl b/ponysaylist.pl index 7a09376..72c0a92 100755 --- a/ponysaylist.pl +++ b/ponysaylist.pl @@ -15,6 +15,10 @@ $maxw = 1; foreach $arg (@ARGV) { + # Format names from ponyies names + $arg =~ s/([a-z])([A-Z])/\1 \2/; + $arg =~ s/_(.*)/\t(\1)/; + if ($first == 1) { $first = 0; $scrw = $arg; -- cgit From 57fdde2f5e78abf097a0af2249031989de2ef0b5 Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Sat, 21 Jul 2012 10:39:24 +0200 Subject: Support ponies by name like "Apple Jack" --- ponysay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ponysay b/ponysay index c856fd2..4a73cbe 100755 --- a/ponysay +++ b/ponysay @@ -270,7 +270,7 @@ while getopts $opts OPT; do case ${OPT} in v) version; exit ;; h) usage; exit ;; - f) ponies+=( "$OPTARG" ) ;; + f) ponies=($(echo $OPTARG | sed -e 's/ //g' -e 's/,/\n/')) ;; l) list; exit ;; L) linklist; exit ;; W) wrap="$OPTARG" ;; -- cgit From 86be6c93ff8ad6b0bedc67295c7236c13fbfeafa Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Sat, 21 Jul 2012 12:34:35 +0200 Subject: Fish-completion now supports the new .pony-filename-format --- completion/fish-completion.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/completion/fish-completion.fish b/completion/fish-completion.fish index 08b42c4..8299564 100644 --- a/completion/fish-completion.fish +++ b/completion/fish-completion.fish @@ -13,11 +13,11 @@ end if test -d $systempath - set -g systemponies (ls --color=no $systempath | sed 's/\.pony//') + set -g systemponies (ls --color=no $systempath | sed -e 's/\.pony//' -e 's/_.*//' | perl -pe 's/([a-z])([A-Z])/\1\\\ \2/' ) end if test -d $homepath - set -g homeponies (ls --color=no $homepath | sed 's/\.pony//') + set -g homeponies (ls --color=no $systempath | sed -e 's/\.pony//' -e 's/_.*//' | perl -pe 's/([a-z])([A-Z])/\1\\\ \2/' ) end -- cgit From 991ab2cf03a895f238d07fb4c112c1200f15c984 Mon Sep 17 00:00:00 2001 From: Elis Axelsson Date: Sat, 21 Jul 2012 12:54:34 +0200 Subject: Sorry :) Missed that part, fixed. --- ponysay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ponysay b/ponysay index 4a73cbe..0d84cd8 100755 --- a/ponysay +++ b/ponysay @@ -270,7 +270,7 @@ while getopts $opts OPT; do case ${OPT} in v) version; exit ;; h) usage; exit ;; - f) ponies=($(echo $OPTARG | sed -e 's/ //g' -e 's/,/\n/')) ;; + f) ponies+=($(echo $OPTARG | sed -e 's/ //g')) ;; l) list; exit ;; L) linklist; exit ;; W) wrap="$OPTARG" ;; -- cgit From 4ff170065c649a6f34da55c3e2a426f38259227a Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 14:03:55 +0200 Subject: truncater: typo in doc + renaming of varibles x and nx --- ponysaytruncater.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ponysaytruncater.c b/ponysaytruncater.c index 58f3d91..d703406 100644 --- a/ponysaytruncater.c +++ b/ponysaytruncater.c @@ -15,7 +15,7 @@ #define STDIN 0 /* The number of columns on the current line */ -static int x = 0; +static int col = 0; /* Escape sequence state */ static int esc = 0; @@ -30,7 +30,7 @@ int toInt(String string); /* Mane method! * The only argument, in addition to the executed file, * should be the width of the terminal which you get by - * adding `tput cols || echo 0` as and argument. + * adding `tput cols || echo 0` as an argument. * * @param argc The number of startup arguments * @param argv The startup arguments, the first is the file itself @@ -61,13 +61,13 @@ void main(int argc, String* argv) void write(char b, int width) { int i; - char nx; + char tabstop; if (esc == 0) { if (b == '\n') { - if (x >= width) + if (col >= width) { /* Reset background colour */ write('\e', width); @@ -76,13 +76,13 @@ void write(char b, int width) write('9', width); write('m', width); } - x = -1; + col = -1; } else if (b == '\t') { /* Tab to next pos ≡₈ 0 */ - nx = 8 - (x & 7); - for (i = 0; i < nx; i++) + tabstop = 8 - (col & 7); + for (i = 0; i < tabstop; i++) write(' ', width); return; /* (!) */ } @@ -92,7 +92,7 @@ void write(char b, int width) else if (esc == 1) { if (b == '[') esc = 2; /* CSI: CSI ends with a letter, m is for colour */ - else if (b == ']') esc = 3; /* OSI: OSI P is for palett editing in Linux VT */ + else if (b == ']') esc = 3; /* OSI: OSI P is for palette editing in Linux VT */ else esc = 10; /* Nothing to see here, move along */ } else if (esc == 2) @@ -118,14 +118,14 @@ void write(char b, int width) within bounds ∨ ∨ escape sequence ∨ ∨ last with printed ∧ not first byte in character */ - (x < width) || + (col < width) || (esc != 0) || (ok && ((b & 0xC0) == 0x80))) { printf("%c", b); if ((esc == 0) && ((b & 0xC0) != 0x80)) /* Count up columns of not in escape sequnce and */ - x++; /* the byte is not the first byte in the character */ + col++; /* the byte is not the first byte in the character */ ok = true; } else -- cgit From e58b4fed5755181598e74c35ca419f3d54611dce Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 14:36:09 +0200 Subject: I think this manual covers exacty everying now, execept for what etu is working on kmsponies4ponysay which I hope will be finished soon --- manuals/ponysay.texinfo | 89 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 5033ca7..18f6814 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -56,7 +56,7 @@ Texts. A copy of the license is included in the section entitled * Dependencies:: Dependencies. * Installing:: Installing. * Extensions:: Extensions. -@c Inner workings->Pony anatomy +* Inner workings:: Inner workings. * Contributing:: Contributing. * Ponysay constributors:: Ponysay constributors. * Ponysay license:: Ponysay license. @@ -300,6 +300,10 @@ you run @command{ponythink}. @node Terminals @section Terminals +@cindex kms +@cindex kernel mode settings +@cindex 9term +@cindex putty Ponysay works perfectly on @command{xterm}, @command{xterm} like terminals including @command{putty}, settings may however need to be customised for Unicode Character Set @@ -508,8 +512,88 @@ displayed with the associated ponies. See @ref{Invoking ponysay} for more inform +@node Inner workings +@chapter Inner workings +@cindex inner workings +@cindex hacking + +@menu +* Pony anatomy:: Anatomy of pony files. +* Truncation:: Output truncation. +* Languages:: Selection of languages. +@end menu + + +@node Pony anatomy +@section Pony anatomy +@cindex pony anatomy +@cindex anatomy of pony files + +The pony files are cow files used by @command{cowsay}, they are partial Perl-scripts +that assign a value to a scalar variable named @code{$the_cow}. The files use a +predefined scalar named variable named @code{$thoughts}, these are used to create +a link between the message and the pony. The message (and the balloon) it self is +printed by @command{cowsay} and is not definied in the pony files. + +The pony images consists of white space, lower half blocks [U+2584], upper half +blocks [U+2580] and ANSI colour sequences (CSI m), and, in TTY, colour value change +sequences (OSI P). + + +@node Truncation +@section Truncation +@cindex truncation +@cindex output trunction +@cindex kms +@cindex kernel mode settings + +Ponysay supports three type of output truncations, cutting away overflow on the right +and truncation the height by either keeping the bottom or keeping the top. By default +the latest is enabled under TTY, cutting away overflow on the right is always enabled +by default. + +Truncating the height in TTY is required under Kernel Mode Settings (KMS) support to +keep the colours from being messed up ad the ponies is moved in the screen during +print; this done either by piping to @command{head} (keeps the top) or by piping to +@command{tail} (keeps the bottom.) @command{head} and @command{tail} takes as argument +the number of lines to keep at most. + +The size of the terminal, measured in characters, is fetched from @command{stty size}, +which returns @code{HEIGHT WIDTH}, and @command{cut} it the used to get either the +height or the width. This required on GNU Coreutils; earlier @command{tput rows} and +@command{tput cols} were used, this however required, the only de facto standard, +package @command{ncurses}, some shells have environment variables for this. + +For truncation the width, we have a custom program, named @command{ponysaytruncater}, +that is installed to @code{/usr/lib/ponysay/truncater}. It recognised UTF-8 ANSI escape +sequences, including OSI P and CSI m, which is essential for the truncation to be correct. +It also expands tabs to every eigth coloumn and resets the background colour when needed, +and writes ANSI escape sequences that are on the left side of the truncation. The truncater +stops CSI sequences on the first ASCII letter (@code{[a-zA-Z]}), but also stops escape +sequences after the first character after the initial escape if it is not either [ (OSI) +or ] (CSI). For support UTF-8, to handles all bytes that do not match @code{10xxxxxx} as +beginning of a character. + + +@node Languages +@section Languages +@cindex languages +@cindex script languages +@cindex programming languages + +Ponysay is written primarily in GNU Bash shell script (POSIX compliant); the truncater +is however written in C, because it is simple, fast, does not pose addition dependencies, +and is easy to do byte hacking in. + +Sometimes shell is too slow, in these cases [that exist today] Perl is used; Perl +is already required by cowsay, is similar to shell, but also supports hash tables. +[maandree: I actually learned Perl just for this.] + + + @node Contributing @chapter Contributing +@cindex contributing @menu * Providing ponies:: Providing ponies @@ -526,6 +610,9 @@ desktop ponies, implementing it in JavaScript. Browser ponies are available at There is also a collection of ponies that are not yet pixelated in a Java reimplementation: @url{https://github.com/maandree/unisay/tree/develop/dev/newponies} + +There is a checklist named @code{"pony-checklist"} at the top level of the project +directory. You can use the check which ponies are added and which are not. @* New ponies can be created from regular images by using util-say, which is available -- cgit From 9375cf18fe66989e64e25225a90c1881d0a328aa Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 14:37:40 +0200 Subject: m --- manuals/ponysay.texinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 18f6814..267e1b0 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -36,7 +36,7 @@ Texts. A copy of the license is included in the section entitled @title Ponysay @subtitle A cowsay wrapper for ponies. @subtitle Covers ponysay version @value{VERSION}. -@author by Mattias Andrée +@author by Mattias Andrée (maandree) @page @vskip 0pt plus 1filll -- cgit From 520bbd1a739428cf2cc5bf386a939270764c9e14 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 14:54:28 +0200 Subject: adding prebuilt pdf verions of info manual --- ponysay.pdf | Bin 210745 -> 216420 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ponysay.pdf b/ponysay.pdf index 310fdb5..cab308f 100644 Binary files a/ponysay.pdf and b/ponysay.pdf differ -- cgit From 202340218b85d723d9611fd5e6d40ab71f35f81b Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Sat, 21 Jul 2012 16:03:54 +0300 Subject: Add force flag to rm commands on clean because of write-protected regular files. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 24a5808..490c782 100644 --- a/Makefile +++ b/Makefile @@ -134,9 +134,9 @@ uninstall: clean: rm -f "ponysaytruncater" - rm "completion/bash-completion-think.sh" - rm "completion/fish-completion-think.fish" - rm "completion/zsh-completion-think.zsh" - rm "manuals/manpage.6.gz" - rm "manuals/manpage.es.6.gz" - rm "ponysay.info.gz" + rm -f "completion/bash-completion-think.sh" + rm -f "completion/fish-completion-think.fish" + rm -f "completion/zsh-completion-think.zsh" + rm -f "manuals/manpage.6.gz" + rm -f "manuals/manpage.es.6.gz" + rm -f "ponysay.info.gz" -- cgit From 90d5b99bb36cd7498da0d0c7ee8ca3aeda4d6b87 Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Sat, 21 Jul 2012 16:20:47 +0300 Subject: Update README.md --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e26f48b..c0b33dd 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,11 @@ Or if you have a specific pony in your mind: Run `info ponysay`, `man 6 ponysay` or `ponysay -h` for more information. A Spanish manual is available: `man -L es 6 ponysay`. -#### Gentoo -Theres a package for gentoo, to make install and keeping up to date easy. You can find it in [this overlay](/etu/aidstu-overlay). Package is named `games-misc/ponysay`. +#### Arch Linux +The package is in the official repositories as `community/ponysay`. + +#### Gentoo Linux +There is a package for Gentoo, to make installation and keeping it up to date easy. You can find it in [this overlay](/etu/aidstu-overlay). The package is named `games-misc/ponysay`. ### Pony fortune on terminal startup -- cgit From c6f82a5d388c3d273b1e7bc21d1149fe379f9157 Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Sat, 21 Jul 2012 16:30:37 +0200 Subject: tag test --- ponysay | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ponysay b/ponysay index 0d84cd8..fe2ed48 100755 --- a/ponysay +++ b/ponysay @@ -1,6 +1,6 @@ -#!/usr/bin/env bash +\#!/usr/bin/env bash -version=1.0 +version=1.1 SYSTEMPONIES="/usr/share/ponysay/ponies" HOMEPONIES="${HOME}/.local/share/ponysay/ponies" SCRIPTDIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Get bash script directory -- cgit From c0a9749730da46165aec40eb7217158c4cb89a74 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 15:43:21 +0200 Subject: release correction --- ponysay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ponysay b/ponysay index fe2ed48..ae71fc5 100755 --- a/ponysay +++ b/ponysay @@ -1,4 +1,4 @@ -\#!/usr/bin/env bash +#!/usr/bin/env bash version=1.1 SYSTEMPONIES="/usr/share/ponysay/ponies" -- cgit From f4bdfd9e7d6eb670a5caa0dd4f3b4d47fd662fd8 Mon Sep 17 00:00:00 2001 From: Elis Date: Sat, 21 Jul 2012 18:39:11 +0300 Subject: Fixed stupid copy-paste fail --- completion/fish-completion.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/completion/fish-completion.fish b/completion/fish-completion.fish index 8299564..802cbf2 100644 --- a/completion/fish-completion.fish +++ b/completion/fish-completion.fish @@ -17,7 +17,7 @@ if test -d $systempath end if test -d $homepath - set -g homeponies (ls --color=no $systempath | sed -e 's/\.pony//' -e 's/_.*//' | perl -pe 's/([a-z])([A-Z])/\1\\\ \2/' ) + set -g homeponies (ls --color=no $homepath | sed -e 's/\.pony//' -e 's/_.*//' | perl -pe 's/([a-z])([A-Z])/\1\\\ \2/' ) end -- cgit From 61eb843ded3184b2a09a1f68b9643da6e660b6b0 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 18:16:18 +0200 Subject: support for kmsponies4ponysay --- ponysay | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/ponysay b/ponysay index ae71fc5..1c7ff4e 100755 --- a/ponysay +++ b/ponysay @@ -7,6 +7,10 @@ SCRIPTDIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Get bash scri pony="*" wrap="" +kmscmd="" +[[ "$TERM" = "linux" ]] && kmscmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/ponysay2kmsponysay /g'); do if [[ -f $c ]]; then echo $c; break; fi done) +[[ ! "$kmscmd" = "" ]] && TERM="-linux-" + if [ "$TERM" = "linux" ]; then SYSTEMPONIES="/usr/share/ponysay/ttyponies" HOMEPONIES="${HOME}/.local/share/ponysay/ttyponies" @@ -247,14 +251,24 @@ say() { } fi + if [[ "$kmscmd" = "" ]]; then + function runcmd { + cowcmd -f "$pony" "$@" + } + else + function runcmd { + cowcmd -f <($kmscmd "$pony") "$@" + } + fi + if [ "$TERM" = "linux" ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = 'yes' ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = 'y' ] || [ "$PONYSAY_TRUNCATE_HEIGHT" = '1' ]; then if [ "$PONYSAY_BOTTOM" = 'yes' ] || [ "$PONYSAY_BOTTOM" = 'y' ] || [ "$PONYSAY_BOTTOM" = '1' ]; then - cowcmd -f "$pony" "${wrap:+-W$wrap}" | wtrunc | htrunctail + runcmd "${wrap:+-W$wrap}" | wtrunc | htrunctail else - cowcmd -f "$pony" "${wrap:+-W$wrap}" | wtrunc | htrunchead + runcmd "${wrap:+-W$wrap}" | wtrunc | htrunchead fi else - cowcmd -f "$pony" "${wrap:+-W$wrap}" | wtrunc + runcmd "${wrap:+-W$wrap}" | wtrunc fi } -- cgit From 77e93df7996cf512e859c785b0e128e71b67e975 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 18:42:57 +0200 Subject: typos --- manuals/ponysay.texinfo | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 267e1b0..8f455b9 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -189,7 +189,7 @@ by using @code{fortune | ponypipe} instead of using @command{fortune}. Alternatively use can use @command{pinkie} (or @command{pinkiepie}), which can be downloaded from @url{https://github.com/maandree/pinkie-pie}, which is just @code{fortune | ponypipe}. -Their is also a large sed script, similar to @command{ponypipe}: @url{http://www.reddit.com/r/mylittlelinux/comments/srixi/using_ponysay_with_a_ponified_fortune_warning/} +There is also a large sed script, similar to @command{ponypipe}: @url{http://www.reddit.com/r/mylittlelinux/comments/srixi/using_ponysay_with_a_ponified_fortune_warning/} @node Running on TTY @@ -212,13 +212,13 @@ If you use TTY and have a custom colour palette, you should also add to your @section Running on @command{screen} @cindex screen -@command{screen} will adapt ASNI colour escape sequencies to your terminals +@command{screen} will adapt ASNI colour escape sequencies to your terminal's capabilities. This means that is your terminal reports itself as @code{xterm} in @code{$TERM} it ponies will lose colours; they will only use the lower 16 colours instread of the top 240 colours. By default, almost all X terminal, including @command{xterm} and @command{mate-terminal} reports themself as @code{xterm} in @code{$TERM}, and some reports their actual name in @code{$COLORTERM}. -So before openning @command{screen} you use set @code{$TERM} to @code{xterm-256colour}, +So before openning @command{screen} you use set @code{$TERM} to @code{xterm-256color}, if you are using a terminal with support for @code{xterm}'s 256 colours; this can be done by adding to your @code{~/.bashrc}: @example -- cgit From d1de4eb374634734e347f82587977a34453e241a Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 18:51:54 +0200 Subject: m info manual --- manuals/ponysay.texinfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 8f455b9..2f9eb7e 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -570,8 +570,8 @@ sequences, including OSI P and CSI m, which is essential for the truncation to b It also expands tabs to every eigth coloumn and resets the background colour when needed, and writes ANSI escape sequences that are on the left side of the truncation. The truncater stops CSI sequences on the first ASCII letter (@code{[a-zA-Z]}), but also stops escape -sequences after the first character after the initial escape if it is not either [ (OSI) -or ] (CSI). For support UTF-8, to handles all bytes that do not match @code{10xxxxxx} as +sequences after the first character after the initial escape if it is not either [ (CSI) +or ] (OSI). For support UTF-8, to handles all bytes that do not match @code{10xxxxxx} as beginning of a character. -- cgit From 80739e89dfd526f0220d33831a02c0462b3a375f Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 21 Jul 2012 18:52:47 +0200 Subject: built pdf manual --- ponysay.pdf | Bin 216420 -> 216413 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ponysay.pdf b/ponysay.pdf index cab308f..8dd2096 100644 Binary files a/ponysay.pdf and b/ponysay.pdf differ -- cgit From 7dced5dd382ecebcde1f84a80f5f734b0fd046c2 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 14:57:44 +0200 Subject: fix ponysay -L + fix for issue 53 --- Makefile | 2 ++ ponysay | 80 ++++++------------------------------------------------ ponysaylinklist.pl | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 72 deletions(-) create mode 100755 ponysaylinklist.pl diff --git a/Makefile b/Makefile index 490c782..d4c6503 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,7 @@ install: mkdir -p "$(DESTDIR)/usr/lib/ponysay/" install -s "ponysaytruncater" "$(DESTDIR)/usr/lib/ponysay/truncater" install "ponysaylist.pl" "$(DESTDIR)/usr/lib/ponysay/list.pl" + install "ponysaylinklist.pl" "$(DESTDIR)/usr/lib/ponysay/linklist.pl" mkdir -p "$(DESTDIR)/usr/share/bash-completion/completions/" install "completion/bash-completion.sh" "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" @@ -116,6 +117,7 @@ uninstall: unlink "$(DESTDIR)/usr/bin/ponysay" unlink "$(DESTDIR)/usr/bin/ponythink" unlink "$(DESTDIR)/usr/lib/ponysay/list.pl" + unlink "$(DESTDIR)/usr/lib/ponysay/linklist.pl" unlink "$(DESTDIR)/usr/lib/ponysay/truncater" unlink "$(DESTDIR)/usr/share/licenses/ponysay/COPYING" unlink "$(DESTDIR)/usr/share/bash-completion/completions/ponysay" diff --git a/ponysay b/ponysay index 1c7ff4e..76bc94f 100755 --- a/ponysay +++ b/ponysay @@ -39,7 +39,11 @@ version() { scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` listcmd="${SCRIPTDIR}/../lib/ponysay/list.pl" +linklistcmd="${SCRIPTDIR}/../lib/ponysay/linklist.pl" truncatercmd="${SCRIPTDIR}/../lib/ponysay/truncater" +[[ -f "./ponysaylist.pl" ]] && listcmd="./ponysaylist.pl" +[[ -f "./ponysaylinklist.pl" ]] && linklistcmd="./ponysaylinklist.pl" +[[ -f "./ponysaytruncater" ]] && truncatercmd="./ponysaytruncater" haspq=1 if [[ -f './pq4ps-list' ]]; then @@ -87,75 +91,7 @@ _linklist() { scrw=`(stty size <&2 || echo 0 0) | cut -d ' ' -f 2` - perl '/dev/stdin' $(echo $args) < '/dev/shm/.ponysay~' -#!/usr/bin/perl - -#Author: Mattias Andrée (maandree@kth.se) - -%hash = (); -\$argc = @ARGV; - -\$i = 0; -while (\$i < \$argc) -{ - \$source = \$ARGV[\$i]; - \$i += 1; - \$target = \$ARGV[\$i]; - \$i += 1; - if (\$source eq \$target) - { - \$hash{\$source} = [ () ]; - } -} - -\$i = 0; -while (\$i < \$argc) -{ - \$source = \$ARGV[\$i]; - \$i += 1; - \$target = \$ARGV[\$i]; - \$i += 1; - unless (\$source eq \$target) - { - push @{ \$hash{\$target} }, \$source; - } -} - -\$i = 0; -while (\$i < \$argc) -{ - \$source = \$ARGV[\$i]; - \$i += 1; - \$target = \$ARGV[\$i]; - \$i += 1; - if (\$source eq \$target) - { - @list = @{ \$hash{\$source} }; - \$first = 1; - print \$source; - foreach \$link (@list) - { - if (\$first eq 1) - { - print " (".\$link; - \$first = 0; - } - else - { - print " ".\$link; - } - } - if (\$first eq 0) - { - print ")"; - } - print "\n"; - } -} -EOF - - perl $listcmd $scrw $(cat "/dev/shm/.ponysay~") | sed -e 's/_/ /g' | qlist - rm '/dev/shm/.ponysay~' + perl $listcmd $scrw $(perl $linklistcmd $(echo $args) | sed -e 's/ /_/g') | sed -e 's/_/ /g' | qlist } linklist() { @@ -237,9 +173,9 @@ say() { ccmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done) if [[ ${0} == *ponythink ]]; then - cat <(echo -e $pcmd) $ccmd > "/dev/shm/.ponythink" - perl '/dev/shm/.ponythink' "$@" - rm '/dev/shm/.ponythink' + cat <(echo -e $pcmd) $ccmd > "/tmp/.ponythink" + perl '/tmp/.ponythink' "$@" + rm '/tmp/.ponythink' else perl <(cat <(echo -e $pcmd) $ccmd) "$@" fi diff --git a/ponysaylinklist.pl b/ponysaylinklist.pl new file mode 100755 index 0000000..ec6ff9b --- /dev/null +++ b/ponysaylinklist.pl @@ -0,0 +1,72 @@ +#!/usr/bin/perl + +# ponysaylist +# Prints a list of ponies in columns +# +# Licensed under WTFPL +# See COPYING for details + +# Author: Mattias Andrée, maandree@kth.se + + +%hash = (); +$argc = @ARGV; + +$i = 0; +while ($i < $argc) +{ + $source = $ARGV[$i]; + $i += 1; + $target = $ARGV[$i]; + $i += 1; + if ($source eq $target) + { + $hash{$source} = [ () ]; + } +} + +$i = 0; +while ($i < $argc) +{ + $source = $ARGV[$i]; + $i += 1; + $target = $ARGV[$i]; + $i += 1; + unless ($source eq $target) + { + push @{ $hash{$target} }, $source; + } +} + +$i = 0; +while ($i < $argc) +{ + $source = $ARGV[$i]; + $i += 1; + $target = $ARGV[$i]; + $i += 1; + if ($source eq $target) + { + @list = @{ $hash{$source} }; + $first = 1; + print $source; + foreach $link (@list) + { + if ($first eq 1) + { + print " (".$link; + $first = 0; + } + else + { + print " ".$link; + } + } + if ($first eq 0) + { + print ")"; + } + print "\n"; + } +} + -- cgit From 9fc93bbef458d8660bc9322fb637a3c0273a75b7 Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Tue, 24 Jul 2012 15:28:29 +0200 Subject: svenstaro: make install obviously should correctly have the other deps set up --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 490c782..269c4e5 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,21 @@ all: ponysaytruncater manpages infomanual ponythinkcompletion - ponysaytruncater: gcc -o "ponysaytruncater" "ponysaytruncater.c" - manpages: gzip -9 < "manuals/manpage.6" > "manuals/manpage.6.gz" gzip -9 < "manuals/manpage.es.6" > "manuals/manpage.es.6.gz" - infomanual: makeinfo "manuals/ponysay.texinfo" gzip -9 "ponysay.info" - ponythinkcompletion: sed -e 's/ponysay/ponythink/g' <"completion/bash-completion.sh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/bash-completion-think.sh" sed -e 's/ponysay/ponythink/g' <"completion/fish-completion.fish" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/fish-completion-think.fish" sed -e 's/ponysay/ponythink/g' <"completion/zsh-completion.zsh" | sed -e 's/\/ponythink\//\/ponysay\//g' -e 's/\\\/ponythink\\\//\\\/ponysay\\\//g' >"completion/zsh-completion-think.zsh" - ttyponies: mkdir -p ttyponies for pony in $$(ls --color=no ponies/); do \ @@ -32,7 +27,6 @@ ttyponies: fi \ done - pdfmanual: texi2pdf "manuals/ponysay.texinfo" if [[ -f "ponysay.aux" ]]; then unlink "ponysay.aux"; fi @@ -46,8 +40,7 @@ pdfmanual: if [[ -f "ponysay.tp" ]]; then unlink "ponysay.tp" ; fi if [[ -f "ponysay.vr" ]]; then unlink "ponysay.vr" ; fi - -install: +install: all mkdir -p "$(DESTDIR)/usr/share/ponysay/" mkdir -p "$(DESTDIR)/usr/share/ponysay/ponies" mkdir -p "$(DESTDIR)/usr/share/ponysay/ttyponies" @@ -109,7 +102,6 @@ install: '\\--------------------------------------------------/' @echo '' | ./ponysay -f ./`if [[ "$$TERM" = "linux" ]]; then echo ttyponies; else echo ponies; fi`/pinkiecannon.pony | tail --lines=30 ; echo -e '\n' - uninstall: rm -fr "$(DESTDIR)/usr/share/ponysay/ponies" rm -fr "$(DESTDIR)/usr/share/ponysay/ttyponies" @@ -131,7 +123,6 @@ uninstall: unlink "$(DESTDIR)/usr/share/info/ponysay.info.gz" unlink "$(DESTDIR)/usr/share/info/ponythink.info.gz" - clean: rm -f "ponysaytruncater" rm -f "completion/bash-completion-think.sh" -- cgit From c374d57fd365833807c2e191178848d76828e859 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 16:16:59 +0200 Subject: /tmp/ponythink instead of /tmp/.ponythink --- ponysay | 6 +++--- ponysaylist.pl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ponysay b/ponysay index 76bc94f..0fdcb18 100755 --- a/ponysay +++ b/ponysay @@ -173,9 +173,9 @@ say() { ccmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/'"$cmd"' /g'); do if [[ -f $c ]]; then echo $c; break; fi done) if [[ ${0} == *ponythink ]]; then - cat <(echo -e $pcmd) $ccmd > "/tmp/.ponythink" - perl '/tmp/.ponythink' "$@" - rm '/tmp/.ponythink' + cat <(echo -e $pcmd) $ccmd > "/tmp/ponythink" + perl '/tmp/ponythink' "$@" + rm '/tmp/ponythink' else perl <(cat <(echo -e $pcmd) $ccmd) "$@" fi diff --git a/ponysaylist.pl b/ponysaylist.pl index 72c0a92..401d83b 100755 --- a/ponysaylist.pl +++ b/ponysaylist.pl @@ -17,7 +17,7 @@ foreach $arg (@ARGV) { # Format names from ponyies names $arg =~ s/([a-z])([A-Z])/\1 \2/; - $arg =~ s/_(.*)/\t(\1)/; + #$arg =~ s/_(.*)/\t(\1)/; ## Incompatible with `ponysay -L` if ($first == 1) { $first = 0; -- cgit From b51d03f6263d3ef674f01be9c01a5b6539e61caf Mon Sep 17 00:00:00 2001 From: spider-mario Date: Tue, 24 Jul 2012 16:24:23 +0200 Subject: Rewrote ponysaylist.pl. --- ponysaylist.pl | 71 +++++++++++++++++----------------------------------------- 1 file changed, 20 insertions(+), 51 deletions(-) diff --git a/ponysaylist.pl b/ponysaylist.pl index 401d83b..0e2db56 100755 --- a/ponysaylist.pl +++ b/ponysaylist.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # ponysaylist # Prints a list of ponies in columns @@ -9,63 +9,32 @@ # Author: Mattias Andrée, maandree@kth.se -$first = 1; -$scrw = 1; -$maxw = 1; +use strict; +use warnings; +use utf8; +use feature qw(say); +use integer; +use List::Util qw(max); -foreach $arg (@ARGV) -{ +my $scrw = shift @ARGV; + +for (@ARGV) { # Format names from ponyies names - $arg =~ s/([a-z])([A-Z])/\1 \2/; - #$arg =~ s/_(.*)/\t(\1)/; ## Incompatible with `ponysay -L` - - if ($first == 1) - { $first = 0; - $scrw = $arg; - } - else - { $w = length $arg; - $maxw = $w if ($w > $maxw); - } + s/(?<=[a-z])(?=[A-Z])/ /; + s/_(.*)/\t($1)/; } -$cols = int (($scrw + 2) / ($maxw + 2)); -$cols = 1 if ($cols < 1); - - -@list = (); - -$first = 1; -$items = 0; -foreach $arg (@ARGV) -{ - if ($first == 1) - { $first = 0; - } - else - { $ws = $maxw - (length $arg); - push @list, $arg.(" "x$ws); - $items += 1; - } -} +my $maxw = max map {length} @ARGV; +my $cols = max 1, (($scrw + 2) / ($maxw + 2)); -$rows = int (($items + $cols - 1) / $cols); -$i = 0; -@rowlist = (); +my @list = map {sprintf "%-${maxw}s", $_} @ARGV; -while ($i < $items) -{ $row = 0; - while (($row < $rows) and ($i < $items)) - { - $rowlist[$row] .= " " unless ($i < $rows); - $rowlist[$row] .= $list[$i]; - $row += 1; - $i += 1; -} } +my $rows = (@list + $cols - 1) / $cols; -foreach $row (@rowlist) -{ - print $row."\n"; +my @rowlist; +for my $i (0 .. $#list) { + push @{$rowlist[$i % $rows]}, $list[$i]; } +say join ' ', @$_ for @rowlist; -- cgit From 4e1655bc0bb213c001848d02342bcdcd60f4f110 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 16:34:44 +0200 Subject: Fix issue #41 --- ponysay | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ponysay b/ponysay index 0fdcb18..1afb742 100755 --- a/ponysay +++ b/ponysay @@ -1,19 +1,23 @@ #!/usr/bin/env bash version=1.1 -SYSTEMPONIES="/usr/share/ponysay/ponies" -HOMEPONIES="${HOME}/.local/share/ponysay/ponies" SCRIPTDIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Get bash script directory pony="*" wrap="" +SYSTEMPONIES="$(dirname $SCRIPTDIR)/share/ponysay" +HOMEPONIES="${HOME}/.local/share/ponysay" + kmscmd="" [[ "$TERM" = "linux" ]] && kmscmd=$(for c in $(echo $PATH":" | sed -e 's/:/\/ponysay2kmsponysay /g'); do if [[ -f $c ]]; then echo $c; break; fi done) [[ ! "$kmscmd" = "" ]] && TERM="-linux-" if [ "$TERM" = "linux" ]; then - SYSTEMPONIES="/usr/share/ponysay/ttyponies" - HOMEPONIES="${HOME}/.local/share/ponysay/ttyponies" + SYSTEMPONIES="$SYSTEMPONIES/ttyponies" + HOMEPONIES="$HOMEPONIES/ttyponies" +else + SYSTEMPONIES="$SYSTEMPONIES/ponies" + HOMEPONIES="$HOMEPONIES/ponies" fi if [[ "$PONYSAY_COWSAY" = "" ]]; then -- cgit From 5c12c02d7da938244e58635030210cde87bf2db3 Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Tue, 24 Jul 2012 17:37:42 +0300 Subject: Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c0b33dd..ec1f3b0 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,8 @@ The package is in the official repositories as `community/ponysay`. #### Gentoo Linux There is a package for Gentoo, to make installation and keeping it up to date easy. You can find it in [this overlay](/etu/aidstu-overlay). The package is named `games-misc/ponysay`. +#### Debian/Ubuntu +The DEB file can be found [here](http://roryholland.co.uk/misc.html#ponysay). ### Pony fortune on terminal startup -- cgit From e928a02e8a4a1fa2f4d68d109e2d9080e7b0d0a6 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 16:40:58 +0200 Subject: Revert "Merge pull request #54 from spider-mario/master" Error at line 29 This reverts commit 39341e46e62abadd299beec0b6a2dadb5694f282, reversing changes made to 4e1655bc0bb213c001848d02342bcdcd60f4f110. --- ponysaylist.pl | 71 +++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 20 deletions(-) diff --git a/ponysaylist.pl b/ponysaylist.pl index 0e2db56..401d83b 100755 --- a/ponysaylist.pl +++ b/ponysaylist.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # ponysaylist # Prints a list of ponies in columns @@ -9,32 +9,63 @@ # Author: Mattias Andrée, maandree@kth.se -use strict; -use warnings; -use utf8; -use feature qw(say); -use integer; -use List::Util qw(max); +$first = 1; +$scrw = 1; +$maxw = 1; -my $scrw = shift @ARGV; - -for (@ARGV) { +foreach $arg (@ARGV) +{ # Format names from ponyies names - s/(?<=[a-z])(?=[A-Z])/ /; - s/_(.*)/\t($1)/; + $arg =~ s/([a-z])([A-Z])/\1 \2/; + #$arg =~ s/_(.*)/\t(\1)/; ## Incompatible with `ponysay -L` + + if ($first == 1) + { $first = 0; + $scrw = $arg; + } + else + { $w = length $arg; + $maxw = $w if ($w > $maxw); + } } -my $maxw = max map {length} @ARGV; +$cols = int (($scrw + 2) / ($maxw + 2)); +$cols = 1 if ($cols < 1); + + +@list = (); + +$first = 1; +$items = 0; +foreach $arg (@ARGV) +{ + if ($first == 1) + { $first = 0; + } + else + { $ws = $maxw - (length $arg); + push @list, $arg.(" "x$ws); + $items += 1; + } +} -my $cols = max 1, (($scrw + 2) / ($maxw + 2)); -my @list = map {sprintf "%-${maxw}s", $_} @ARGV; +$rows = int (($items + $cols - 1) / $cols); +$i = 0; +@rowlist = (); -my $rows = (@list + $cols - 1) / $cols; +while ($i < $items) +{ $row = 0; + while (($row < $rows) and ($i < $items)) + { + $rowlist[$row] .= " " unless ($i < $rows); + $rowlist[$row] .= $list[$i]; + $row += 1; + $i += 1; +} } -my @rowlist; -for my $i (0 .. $#list) { - push @{$rowlist[$i % $rows]}, $list[$i]; +foreach $row (@rowlist) +{ + print $row."\n"; } -say join ' ', @$_ for @rowlist; -- cgit From e36fdec84b75c22205f0bbe4318b12a304ff2059 Mon Sep 17 00:00:00 2001 From: Erkin Batu Altunbaş Date: Tue, 24 Jul 2012 17:53:51 +0300 Subject: Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec1f3b0..603b16f 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ The package is in the official repositories as `community/ponysay`. There is a package for Gentoo, to make installation and keeping it up to date easy. You can find it in [this overlay](/etu/aidstu-overlay). The package is named `games-misc/ponysay`. #### Debian/Ubuntu -The DEB file can be found [here](http://roryholland.co.uk/misc.html#ponysay). +The DEB file can be found [here](http://roryholland.co.uk/misc.html#ponysay) and the PPA can be found [here](https://launchpad.net/~blazemore/+archive/ponysay). ### Pony fortune on terminal startup -- cgit From 15daf9a399886b78b9173f1c89ea8b64b500e481 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 18:42:44 +0300 Subject: Full name for Debian GNU/Linux and ’and’ instead of ’/’ between that and Ubuntu. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 603b16f..68d6a54 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ The package is in the official repositories as `community/ponysay`. #### Gentoo Linux There is a package for Gentoo, to make installation and keeping it up to date easy. You can find it in [this overlay](/etu/aidstu-overlay). The package is named `games-misc/ponysay`. -#### Debian/Ubuntu +#### Debian GNU/Linux and Ubuntu The DEB file can be found [here](http://roryholland.co.uk/misc.html#ponysay) and the PPA can be found [here](https://launchpad.net/~blazemore/+archive/ponysay). ### Pony fortune on terminal startup -- cgit From 7f5fc135cf005a3275e6a648f4f665429193e122 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Jul 2012 18:03:57 +0200 Subject: fix for ponyquotes in tty --- ponysay | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ponysay b/ponysay index 1afb742..b5d823c 100755 --- a/ponysay +++ b/ponysay @@ -146,7 +146,7 @@ say() { # Ponies use UTF-8 drawing characters. Prevent a Perl warning. export PERL_UNICODE=S - if [ "$TERM" = "linux" ]; then + if [ "$TERM" = "linux" ] || [ "$TERM" = "-linux-" ]; then echo -ne '\e[H\e[2J' fi @@ -244,6 +244,7 @@ if [[ $usepq = 1 ]]; then /usr/bin/pq4ps $@ } fi + [[ "$TERM" = "-linux-" ]] && TERM="linux" $0 ${wrap:+-W$wrap} $(q "$*") exit fi -- cgit