m + colour whitelist and blacklist to guide which colours to use in metadata + complete metadata (without balloon top/bottom) for ponies beginning with ‘a’

Signed-off-by: Mattias Andrée <maandree@operamail.com>
This commit is contained in:
Mattias Andrée 2012-12-21 23:42:21 +01:00
parent bf97385581
commit ec73c4dd1d
20 changed files with 156 additions and 95 deletions

18
dev/colour-blacklist Normal file
View file

@ -0,0 +1,18 @@
creme (ambiguous, consider beige or yellow)
gray (spell it grey instead)
turquoise (hard to spell, and cyan or teal is better)
azure (uncommmon, use blue instead)
lilac (purple is commonly thought to be the name of this colour)
violet (too similar to purple, use purple instead)
indigo (uncommon and ambiguous, use blue or purple)
carnation (uncommon, use pink)
crimson (too similar to red)
olive (uncommon, consider green or brown)
silver (ambiguous, consider white or grey)
salmon (uncommon and ambiguous, use orange or pink)
coral (uncommon and ambiguous, use orange or pink)
blond (too similar to yellow)
cerise (uncommon and ambiguous, use pink or red)
jade (uncommon, use green instread)
magenta (uncommon, consider pink)
fushia (uncommon, consider pink)

16
dev/colour-whitelist Normal file
View file

@ -0,0 +1,16 @@
closed (for when the eyes are closed)
cyan (consider teal and blue)
teal (consider cyan)
beige
black (consider grey)
grey
blue
yellow
purple
pink
orange
green
brown
white
pastel (Celestia's mane colour)
rainbow

View file

@ -643,10 +643,8 @@ not work on less POSIX compatible shells. It works by first getting a random pon
use the extra information printed the file descriptor 3 (see @ref{Extra information}), use the extra information printed the file descriptor 3 (see @ref{Extra information}),
and fetchs the file name with help of @command{grep} and @command{sed}. The file and fetchs the file name with help of @command{grep} and @command{sed}. The file
name is stored in a shell variable. It the pipes one an execute of ponysay into name is stored in a shell variable. It the pipes one an execute of ponysay into
another executing, using the stored file anme in both executions. another executing, using the stored file anme in both executions. This does not
work on FISH shell because os POSIX incompatibility.
Is know that this comand ith the form that we show to you not work on
@shell{fish} as pressented here.
Ponysay can use just about anything as a message because it quarantines the message's Ponysay can use just about anything as a message because it quarantines the message's
ANSI escape sequences, including colour. And is Unicode aware (including combining ANSI escape sequences, including colour. And is Unicode aware (including combining
@ -936,7 +934,7 @@ The mane characters (also known as main characters [unponified] or protagonists)
@item @code{wildlife} @item @code{wildlife}
Wildlife, for example timberwolfs Wildlife, for example timberwolfs
@item @code{pet} @item @code{pet}
A ponies' pet, Spike does not count because Twilight does not play with him during A pony's pet, Spike does not count because Twilight does not play with him during
ponypet play dates. ponypet play dates.
@item @code{villain} @item @code{villain}
Villains, normally minons to antagonists. Applies to changelings. Villains, normally minons to antagonists. Applies to changelings.
@ -966,10 +964,10 @@ Imaginary ponies (or other animal).
@vindex @var{BALLOON} @vindex @var{BALLOON}
For each balloon in the file (a pony file can have more than one balloon, but For each balloon in the file (a pony file can have more than one balloon, but
that is not common) their should one tag entry. There are four values that that is not common) their should one tag entry. There are four values that
can be used: top (the common setup, the balloon is at the top of the image), can be used: @code{top} (the common setup, the balloon is at the top of the image),
bottom (the balloon is at the bottom of the image), right (the balloon is neither @code{bottom} (the balloon is at the bottom of the image), @code{right} (the balloon
at the top or at the bottom of the image, but is placed to the right of the pony) is neither at the top or at the bottom of the image, but is placed to the right of
and inside (the balloon is somewhere as inside the image.) the pony) and @code{inside} (the balloon is somewhere as inside the image.)
@item LINK ON @item LINK ON
@vindex @var{LINK ON} @vindex @var{LINK ON}
@ -1012,7 +1010,8 @@ may describe a colour combination.
@vindex @var{EYE} @vindex @var{EYE}
The name of the colour (as best estimated by you), in lowercase, that the pony's eyes The name of the colour (as best estimated by you), in lowercase, that the pony's eyes
have. Common colour names are preferable. Only one colour should be named, but the name have. Common colour names are preferable. Only one colour should be named, but the name
may describe a colour combination. may describe a colour combination. If the eyes are closed in the picture, use
@code{close} in addition the the actual eye colour, separated by a comma.
@item AURA @item AURA
@vindex @var{AURA} @vindex @var{AURA}
@ -1132,7 +1131,7 @@ three times.
`Officiallity tag' refers the an annotation added to a tag value's list element. `Officiallity tag' refers the an annotation added to a tag value's list element.
If the value is unofficial the string @code{(unofficial)} is appended (preferable with If the value is unofficial the string @code{(unofficial)} is appended (preferable with
leading whitespace) to the element. If it is official the appended string is of the leading whitespace) to the element. If it is official the appended string is of the
format @code{(unofficial, %c)} (the brackets are verbatim), where @code{%c} is a format @code{(official, %c)} (the brackets are verbatim), where @code{%c} is a
comment. For example Chrysalis' name has not been mentioned in the show, however it comment. For example Chrysalis' name has not been mentioned in the show, however it
is used in the manuscript, therefore a pony file with Chrysalis should have the is used in the manuscript, therefore a pony file with Chrysalis should have the
(partial) metadata: (partial) metadata:
@ -2959,12 +2958,15 @@ Pony metadata options added: @option{--info}, @option{++info} and @option{--rest
@item @item
@file{fillycelestia} and @file{filliestia} has been moved to @file{extraponies}. @file{fillycelestia} and @file{filliestia} has been moved to @file{extraponies}.
@item @item
Ponies renamed
@file{shadowbolts} has been renamed to @file{nightingale} (shadowbolts split) @file{shadowbolts} has been renamed to @file{nightingale} (shadowbolts split)
@file{lily} has been renamed to @fike{lilyvalley} (official name) @item
@file{lily} has been renamed to @file{lilyvalley} (official name)
@item
@file{sweatiesing} has been renamed to @file{sweetising} (name consistency) @file{sweatiesing} has been renamed to @file{sweetising} (name consistency)
@item
@file{carecake} has renamed into @file{carrotcake} (official full name) @file{carecake} has renamed into @file{carrotcake} (official full name)
@file{peppermoon} has renamed to @file{pepermoon} (miswriting) @item
@file{peppermoon} has renamed to @file{pepermoon} (typo)
@item @item
Pony symlink added: Pony symlink added:
@itemize @bullet @itemize @bullet
@ -2972,6 +2974,7 @@ Pony symlink added:
@item @file{swaetiedrops} @arrow{} @file{bonbon} @item @file{swaetiedrops} @arrow{} @file{bonbon}
@item @file{carecake} @arrow{} @file{carrotake} @item @file{carecake} @arrow{} @file{carrotake}
@end itemize @end itemize
@end itemize
@heading Version 2.9.1 @heading Version 2.9.1
@ -3576,7 +3579,6 @@ 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 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. changes. Access to the source code is a precondition for this.
@end itemize @end itemize
@* @*
@cartouche @cartouche

View file

@ -1,13 +1,15 @@
$$$ $$$
APPEARANCE: s1c12m7s25 APPEARANCE: S01E12 Call of the Cutie
COAT: creme BALLOON: top
EYE: cyan COAT: beige
EYE: teal
FREE: no FREE: no
GROUP: stallion GROUP: stallion, background, voice
KIND: earth KIND: earth
LINK: regular
MANE: black MANE: black
MEDIA: TV series NAME: (not mentioned)
NAME: ace OTHER NAMES: ace (unofficial)
SOURCE: [jristz] SOURCE: [jristz]
WIDTH: 48 WIDTH: 48
HEIGHT: 27 HEIGHT: 27

View file

@ -1,15 +1,18 @@
$$$ $$$
APPEARANCE: s1c6m3s55 APPEARANCE: S01E06 Boast Busters
BALLOON: top
COAT: pink COAT: pink
EYE: cyan DISPLAY: full, front
EYE: cyan, closed
FREE: no FREE: no
GROUP: mare GROUP: mare, background
KIND: pegasus KIND: pegasus
LINK: regular
MANE: brown MANE: brown
MEDIA: TV series NAME: (not mentioned)
NAME: airheart OTHER NAMES: airheart (unofficial)
SOURCE: [jristz] SOURCE: [jristz]
WIDTH: 26 WIDTH: 24
HEIGHT: 26 HEIGHT: 26

View file

@ -1,13 +1,16 @@
$$$ $$$
APPEARANCE: s2c6m00s50 APPEARANCE: S02E06 The Cutie Pox
BALLOON: top
COAT: yellow COAT: yellow
EYE: bue DISPLAY: full, right
EYE: blue
FREE: no FREE: no
GROUP: mare GROUP: mare, background
KIND: unicorn KIND: unicorn
MANE: blue, light blue LINK: regular
MEDIA: TV series MANE: blue
NAME: allie NAME: (not mentioned)
OTHER NAMES: allie (unofficial), allie way (unofficial)
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 49 WIDTH: 49
HEIGHT: 29 HEIGHT: 29

View file

@ -1,14 +1,16 @@
$$$ $$$
APPEARANCE: s2c20m00s33 APPEARANCE: S01E20 Green isn't Your Color
BALLOON: top
COAT: pink COAT: pink
EYE: sblue DISPLAY: full, left
EYE: purple
FREE: no FREE: no
GROUP: mare GROUP: mare, background
GROUP NAME: spa
KIND: earth KIND: earth
MANE: clue LINK: regular
MEDIA: TV series MANE: blue
NAME: aloe NAME: (not mentioned)
OTHER NAMES: aloe (unofficial)
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 39 WIDTH: 39
HEIGHT: 25 HEIGHT: 25

View file

@ -1,12 +1,15 @@
$$$ $$$
APPEARANCE: s1 APPEARANCE: S01E03 The Ticket Master
BALLOON: top
COAT: white COAT: white
DISPLAY: full, left
EYE: black EYE: black
FREE: no FREE: no
GROUP NAME: pet GROUP: pet, rabbit
KIND: animal KIND: animal
MEDIA: TV series LINK: regular
NAME: angel NAME: angel
OTHER NAMES: angel bunny (official, used by Fluttershy sometimes)
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 25 WIDTH: 25
HEIGHT: 19 HEIGHT: 19

View file

@ -1,15 +1,15 @@
$$$ $$$
APPEARANCE: s1c1m8s39 APPEARANCE: S01E01 Friendship is Magic [Part 1]
BALLOON: top
COAT: yellow COAT: yellow
DISPLAY: full, left
EYE: brown EYE: brown
FREE: no FREE: no
GROUP: filly GROUP: filly, deuteragonist
GROUP NAME: deuteragonist, cutie mark crusader, apple family
KIND: earth KIND: earth
LINK: regular
MANE: red MANE: red
MEDIA: TV series NAME: apple bloom
NAME: applebloom
OTHER NAMES: bloom
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 41 WIDTH: 41
HEIGHT: 21 HEIGHT: 21

View file

@ -1,16 +1,17 @@
$$$ $$$
APPEARANCE: s1c1m8s39 APPEARANCE: S01E01 Friendship is Magic [Part 1]
BASED ON: applebloom BALLOON: top
COAT: yellow COAT: yellow
DISPLAY: full, left
EYE: brown EYE: brown
FREE: no FREE: no
GROUP: filly GROUP: filly, deuteragonist
GROUP NAME: deuteragonist, cutie mark crusader, apple family
KIND: earth KIND: earth
LINK: regular
MANE: red MANE: red
MEDIA: TV series MASTER: applebloom
NAME: applebloom NAME: apple bloom
OTHER NAMES: bloom POSE: dance
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 34 WIDTH: 34
HEIGHT: 24 HEIGHT: 24

View file

@ -1,13 +1,14 @@
$$$ $$$
APPEARANCE: s1c1m8s23 APPEARANCE: S01E01 Friendship is Magic [Part 1]
BALLOON: top
COAT: yellow COAT: yellow
EYE: brown DISPLAY: full, left
EYE: brown, closed
FREE: no FREE: no
GROUP: filly GROUP: mare, background
GROUP NAME: apple family
KIND: earth KIND: earth
LINK: regular
MANE: pink MANE: pink
MEDIA: TV series
NAME: apple bumpkin NAME: apple bumpkin
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 47 WIDTH: 47

View file

@ -1,14 +1,16 @@
$$$ $$$
APPEARANCE: s1c1m19s35 APPEARANCE: S01E01 Friendship is Magic [Part 1]
BALLOON: top
COAT: pink COAT: pink
DISPLAY: full, right
EYE: cyan EYE: cyan
FREE: no FREE: no
GROUP: filly GROUP: filly, background
KIND: earth KIND: earth
LINK: regular
MANE: pink MANE: pink
MEDIA: TV series NAME: (not mentioned)
NAME: apple core OTHER NAMES: apple core (unofficial), piña colada (unofficial, merged in wiki), pina colada (ASCII)
OTHER NAMES: piña colada, pina colada (merged on mlp wikia)
SOURCE: [jristz] SOURCE: [jristz]
WIDTH: 33 WIDTH: 33
HEIGHT: 21 HEIGHT: 21

View file

@ -1,14 +1,15 @@
$$$ $$$
APPEARANCE: s1c1m8s23 APPEARANCE: S01E01 Friendship is Magic [Part 1]
BALLOON: top
COAT: yellow COAT: yellow
EYE: green EYE: green
FREE: no FREE: no
GROUP: filly GROUP: filly, background
GROUP NAME: apple family
KIND: earth KIND: earth
LINK: regular
MANE: green MANE: green
MEDIA: TV series
NAME: apple fritter NAME: apple fritter
POSE: full, left
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 40 WIDTH: 40
HEIGHT: 25 HEIGHT: 25

View file

@ -1,15 +1,15 @@
$$$ $$$
APPEARANCE: s1c1m7s30 APPEARANCE: S01E01 Friendship is Magic [Part 1]
BALLOON: top
COAT: brown COAT: brown
EYE: blue EYE: blue
FREE: no FREE: no
GROUP: mare GROUP: mare, mane
GROUP NAME: mane
KIND: earth KIND: earth
LINK: regular
MANE: yellow MANE: yellow
MEDIA: TV series
NAME: applejack NAME: applejack
OTHER NAMES: aj POSE: full, left
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 52 WIDTH: 52
HEIGHT: 27 HEIGHT: 27

View file

@ -1,18 +1,19 @@
$$$ $$$
APPEARANCE: s1c1m7s30 APPEARANCE: S01E01 Friendship is Magic [Part 1]
BALLOON: top
COAT: brown COAT: brown
DISPLAY: full, left
EYE: blue EYE: blue
FREE: no FREE: no
GROUP: mare GROUP: mare, mane
GROUP NAME: mane
KIND: earth KIND: earth
LINK: regular
MANE: yellow MANE: yellow
MEDIA: TV series
NAME: applejack NAME: applejack
OTHER NAMES: aj POSE: scarecrow
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 52 WIDTH: 47
HEIGHT: 27 HEIGHT: 33
$$$ $$$

View file

@ -1,13 +1,16 @@
$$$ $$$
APPEARANCE: s1c12m00s12 APPEARANCE: S01E12 Call of the Cutie
BALLOON: top
COAT: blue COAT: blue
EYE: gray DISPLAY: full, right
EYE: grey
FREE: no FREE: no
GROUP: filly GROUP: filly, background
KIND: earth KIND: earth
LINK: regular
MANE: blue MANE: blue
MEDIA: TV series NAME: (not mentioned)
NAME: archer OTHER NAMES: archer (unofficial)
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 46 WIDTH: 46
HEIGHT: 21 HEIGHT: 21

View file

@ -7,8 +7,8 @@ GROUP: filly
KIND: earth KIND: earth
MANE: pink MANE: pink
MEDIA: TV series MEDIA: TV series
NAME: piña colada NAME: (not mentioned)
OTHER NAMES: apple core (merged from in mlp wikia),pina colada OTHER NAMES: piña colada, apple core (merged in wiki), pina colada (ASCII)
SOURCE: [jristz] SOURCE: [jristz]
WIDTH: 35 WIDTH: 35
HEIGHT: 22 HEIGHT: 22

View file

@ -1,14 +1,17 @@
$$$ $$$
APPEARANCE: s1c1m2s43 APPEARANCE: S01E01 Friendship is Magic [Part 1]
AURA: purple
BALLOON: top
COAT: pink COAT: pink
DISPLAY: full, right
EYE: purple EYE: purple
FREE: no FREE: no
GROUP: mare GROUP: mare, background, voiced
KIND: unicorn KIND: unicorn
LINK: regular
MANE: purple MANE: purple
MEDIA: TV series NAME: (not mentioned)
NAME: amethyst star OTHER NAMES: amethyst star (official, in merchandise), sparkler (unofficial)
OTHER NAMES: sparkler
SOURCE: desktop ponies SOURCE: desktop ponies
WIDTH: 42 WIDTH: 42
HEIGHT: 25 HEIGHT: 25

View file

@ -741,7 +741,7 @@ class PonysayTool():
standardfields = ['GROUP NAME', 'NAME', 'OTHER NAMES', 'APPEARANCE', 'KIND', standardfields = ['GROUP NAME', 'NAME', 'OTHER NAMES', 'APPEARANCE', 'KIND',
'GROUP', 'BALLOON', 'LINK', 'LINK ON', 'COAT', 'MANE', 'EYE', 'GROUP', 'BALLOON', 'LINK', 'LINK ON', 'COAT', 'MANE', 'EYE',
'AURA', 'DISPLAY', 'BALLOON TOP', 'BALLOON BOTTOM', 'MASTER', 'AURA', 'DISPLAY', 'BALLOON TOP', 'BALLOON BOTTOM', 'MASTER',
'EXTRA', 'BASED ON', 'SOURCE', 'MEDIA', 'LICENSE', 'FREE', 'POSE', 'BASED ON', 'SOURCE', 'MEDIA', 'LICENSE', 'FREE',
'comment'] 'comment']
for standard in standardfields: for standard in standardfields:
if standard in fields: if standard in fields:

Binary file not shown.