r60100 - in /branches/upstream/liblingua-en-inflect-perl/current: Changes META.yml README lib/Lingua/EN/Inflect.pm t/inflections.t
ghostbar at users.alioth.debian.org
ghostbar at users.alioth.debian.org
Mon Jul 5 22:17:52 UTC 2010
Author: ghostbar
Date: Mon Jul 5 22:17:46 2010
New Revision: 60100
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=60100
Log:
[svn-upgrade] new version liblingua-en-inflect-perl (1.892)
Modified:
branches/upstream/liblingua-en-inflect-perl/current/Changes
branches/upstream/liblingua-en-inflect-perl/current/META.yml
branches/upstream/liblingua-en-inflect-perl/current/README
branches/upstream/liblingua-en-inflect-perl/current/lib/Lingua/EN/Inflect.pm
branches/upstream/liblingua-en-inflect-perl/current/t/inflections.t
Modified: branches/upstream/liblingua-en-inflect-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblingua-en-inflect-perl/current/Changes?rev=60100&op=diff
==============================================================================
--- branches/upstream/liblingua-en-inflect-perl/current/Changes (original)
+++ branches/upstream/liblingua-en-inflect-perl/current/Changes Mon Jul 5 22:17:46 2010
@@ -168,3 +168,22 @@
- Handled indefinite article for x-th, Nth etc. (thanks Tom)
- Numerous special-case fixes (thanks Marc)
+
+
+
+1.892 Mon Jun 28 11:01:52 2010
+
+ - Swatted POD nits (thanks Frank and Paul)
+
+ - Fixed A() handling of def_A() (thanks Paul)
+
+ - Fixed PL_eq() handling of adjectives (thanks Paul)
+
+ - Removed redundant military terms (thanks Paul)
+
+ - Fixed single-pronumeral ordinals: an a-th, a b-th, etc. (thanks Paul)
+
+ - Added present participle fixes for
+ 'is/am/are/was/were/have/had/alibi/hoe' (thanks Paul)
+
+ - Fixed pluralization of verb "quizzes" (thanks Paul)
Modified: branches/upstream/liblingua-en-inflect-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblingua-en-inflect-perl/current/META.yml?rev=60100&op=diff
==============================================================================
--- branches/upstream/liblingua-en-inflect-perl/current/META.yml (original)
+++ branches/upstream/liblingua-en-inflect-perl/current/META.yml Mon Jul 5 22:17:46 2010
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Lingua-EN-Inflect
-version: 1.891
+version: 1.892
abstract: Convert singular to plural. Select "a" or "an".
license: ~
author:
Modified: branches/upstream/liblingua-en-inflect-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblingua-en-inflect-perl/current/README?rev=60100&op=diff
==============================================================================
--- branches/upstream/liblingua-en-inflect-perl/current/README (original)
+++ branches/upstream/liblingua-en-inflect-perl/current/README Mon Jul 5 22:17:46 2010
@@ -1,4 +1,4 @@
-Lingua::EN::Inflect version 1.891
+Lingua::EN::Inflect version 1.892
The exportable subroutines of Lingua::EN::Inflect provide plural
inflections and "a"/"an" selection for English words.
Modified: branches/upstream/liblingua-en-inflect-perl/current/lib/Lingua/EN/Inflect.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblingua-en-inflect-perl/current/lib/Lingua/EN/Inflect.pm?rev=60100&op=diff
==============================================================================
--- branches/upstream/liblingua-en-inflect-perl/current/lib/Lingua/EN/Inflect.pm (original)
+++ branches/upstream/liblingua-en-inflect-perl/current/lib/Lingua/EN/Inflect.pm Mon Jul 5 22:17:46 2010
@@ -7,7 +7,7 @@
require Exporter;
@ISA = qw(Exporter);
-our $VERSION = '1.891';
+our $VERSION = '1.892';
%EXPORT_TAGS =
(
@@ -191,11 +191,20 @@
'blouse' => 'blouses',
'Rom' => 'Roma',
'rom' => 'roma',
+ 'carmen' => 'carmina',
%PL_sb_irregular_s,
);
my $PL_sb_irregular = enclose join '|', keys %PL_sb_irregular;
+
+# Z's that don't double
+
+my @PL_sb_z_zes =
+(
+ "quartz", "topaz", "snooz(?=e)",
+);
+my $PL_sb_z_zes = enclose join '|', @PL_sb_z_zes;
# CLASSICAL "..is" -> "..ides"
@@ -248,7 +257,7 @@
my $PL_sb_C_en_ina = enclose join "|", map { substr($_,0,-2) }
(
- "stamen", "foramen", "lumen", "carmen"
+ "stamen", "foramen", "lumen"
);
# UNCONDITIONAL "..um" -> "..a"
@@ -552,7 +561,7 @@
);
my %PL_sb_postfix_adj = (
- 'general' => ['(?!major|lieutenant|brigadier|adjutant)\S+'],
+ 'general' => ['(?!major|lieutenant|brigadier|adjutant|.*star)\S+'],
'martial' => [qw(court)],
);
@@ -563,9 +572,6 @@
}
my $PL_sb_postfix_adj = '(' . join('|', values %PL_sb_postfix_adj) . ')(.*)';
-
-my $PL_sb_military = 'major|lieutenant|brigadier|adjutant|quartermaster';
-my $PL_sb_general = '((?!'.$PL_sb_military.').*?)((-|\s+)general)';
my $PL_prep = enclose join '|', qw (
about above across after among around at athwart before behind
@@ -845,7 +851,7 @@
return $pre.$plural.$post;
}
-sub PL_eq { _PL_eq(@_, \&PL_N) || _PL_eq(@_, \&PL_V) || \&PL_ADJ; }
+sub PL_eq { _PL_eq(@_, \&PL_N) || _PL_eq(@_, \&PL_V) || _PL_eq(@_, \&PL_ADJ); }
sub PL_N_eq { _PL_eq(@_, \&PL_N); }
sub PL_V_eq { _PL_eq(@_, \&PL_V); }
sub PL_ADJ_eq { _PL_eq(@_, \&PL_ADJ); }
@@ -1065,6 +1071,7 @@
$word =~ /^($PL_sb_singular_s)$/i and return "$1es";
$word =~ /^([A-Z].*s)$/ and $classical{names} and return "$1es";
+$word =~ /^($PL_sb_z_zes)$/i and return "$1es";
$word =~ /^(.*[^z])(z)$/i and return "$1zzes";
$word =~ /^(.*)([cs]h|x|zz|ss)$/i and return "$1$2es";
# $word =~ /(.*)(us)$/i and return "$1$2es";
@@ -1133,7 +1140,8 @@
# HANDLE SPECIAL CASES
$word =~ /^($PL_v_special_s)$/ and return undef;
-$word =~ /\s/ and return undef;
+$word =~ /\s/ and return undef;
+$word =~ /^quizzes$/i and return "quiz";
# HANDLE STANDARD 3RD PERSON (CHOP THE ...(e)s OFF SINGLE WORDS)
@@ -1238,91 +1246,105 @@
my $A_explicit_an = enclose join '|',
(
-"euler",
-"hour(?!i)", "heir", "honest", "hono",
-"[fhlmnx]-?th",
-);
-
-sub A
-{
-my ($str, $count) = @_;
-my ($pre, $word, $post) = ( $str =~ m/\A(\s*)(?:an?\s+)?(.+?)(\s*)\Z/i );
-return $str unless $word;
-my $result = _indef_article($word,$count);
-return $pre.$result.$post;
+ "euler",
+ "hour(?!i)", "heir", "honest", "hono",
+);
+
+my $A_ordinal_an = enclose join '|',
+(
+ "[aefhilmnorsx]-?th",
+);
+
+my $A_ordinal_a = enclose join '|',
+(
+ "[bcdgjkpqtuvwyz]-?th",
+);
+
+sub A {
+ my ($str, $count) = @_;
+ my ($pre, $word, $post) = ( $str =~ m/\A(\s*)(?:an?\s+)?(.+?)(\s*)\Z/i );
+ return $str unless $word;
+ my $result = _indef_article($word,$count);
+ return $pre.$result.$post;
}
sub AN { goto &A }
-sub _indef_article
-{
-my ( $word, $count ) = @_;
-
-$count = $persistent_count
- if !defined($count) && defined($persistent_count);
-
-return "$count $word"
- if defined $count && $count!~/^($PL_count_one)$/io;
-
-# HANDLE USER-DEFINED VARIANTS
-
-my $value;
-return $value if defined($value = ud_match($word, @A_a_user_defined));
-
-# HANDLE SPECIAL CASES
-
-$word =~ /^($A_explicit_an)/i and return "an $word";
-$word =~ /^[aefhilmnorsx]$/i and return "an $word";
-$word =~ /^[bcdgjkpqtuvwyz]$/i and return "a $word";
-
-
-# HANDLE ABBREVIATIONS
-
-$word =~ /^($A_abbrev)/ox and return "an $word";
-$word =~ /^[aefhilmnorsx][.-]/i and return "an $word";
-$word =~ /^[a-z][.-]/i and return "a $word";
-
-# HANDLE CONSONANTS
-
-$word =~ /^[^aeiouy]/i and return "a $word";
-
-# HANDLE SPECIAL VOWEL-FORMS
-
-$word =~ /^e[uw]/i and return "a $word";
-$word =~ /^onc?e\b/i and return "a $word";
-$word =~ /^uni([^nmd]|mo)/i and return "a $word";
-$word =~ /^u[bcfhjkqrst][aeiou]/i and return "a $word";
-
-# HANDLE SPECIAL CAPITALS
-
-$word =~ /^U[NK][AIEO]?/ and return "a $word";
-
-# HANDLE VOWELS
-
-$word =~ /^[aeiou]/i and return "an $word";
-
-# HANDLE y... (BEFORE CERTAIN CONSONANTS IMPLIES (UNNATURALIZED) "i.." SOUND)
-
-$word =~ /^($A_y_cons)/io and return "an $word";
-
-# OTHERWISE, GUESS "a"
- return "a $word";
+sub _indef_article {
+ my ( $word, $count ) = @_;
+
+ $count = $persistent_count
+ if !defined($count) && defined($persistent_count);
+
+ return "$count $word"
+ if defined $count && $count!~/^($PL_count_one)$/io;
+
+ # HANDLE USER-DEFINED VARIANTS
+
+ my $value;
+ return "$value $word"
+ if defined($value = ud_match($word, @A_a_user_defined));
+
+ # HANDLE ORDINAL FORMS
+
+ $word =~ /^($A_ordinal_a)/i and return "a $word";
+ $word =~ /^($A_ordinal_an)/i and return "an $word";
+
+ # HANDLE SPECIAL CASES
+
+ $word =~ /^($A_explicit_an)/i and return "an $word";
+ $word =~ /^[aefhilmnorsx]$/i and return "an $word";
+ $word =~ /^[bcdgjkpqtuvwyz]$/i and return "a $word";
+
+
+ # HANDLE ABBREVIATIONS
+
+ $word =~ /^($A_abbrev)/ox and return "an $word";
+ $word =~ /^[aefhilmnorsx][.-]/i and return "an $word";
+ $word =~ /^[a-z][.-]/i and return "a $word";
+
+ # HANDLE CONSONANTS
+
+ $word =~ /^[^aeiouy]/i and return "a $word";
+
+ # HANDLE SPECIAL VOWEL-FORMS
+
+ $word =~ /^e[uw]/i and return "a $word";
+ $word =~ /^onc?e\b/i and return "a $word";
+ $word =~ /^uni([^nmd]|mo)/i and return "a $word";
+ $word =~ /^ut[th]/i and return "an $word";
+ $word =~ /^u[bcfhjkqrst][aeiou]/i and return "a $word";
+
+ # HANDLE SPECIAL CAPITALS
+
+ $word =~ /^U[NK][AIEO]?/ and return "a $word";
+
+ # HANDLE VOWELS
+
+ $word =~ /^[aeiou]/i and return "an $word";
+
+ # HANDLE y... (BEFORE CERTAIN CONSONANTS IMPLIES (UNNATURALIZED) "i.." SOUND)
+
+ $word =~ /^($A_y_cons)/io and return "an $word";
+
+ # OTHERWISE, GUESS "a"
+ return "a $word";
}
# 2. TRANSLATE ZERO-QUANTIFIED $word TO "no PL($word)"
sub NO
{
-my ($str, $count) = @_;
-my ($pre, $word, $post) = ($str =~ m/\A(\s*)(.+?)(\s*)\Z/);
-
-$count = $persistent_count
- if !defined($count) && defined($persistent_count);
-$count = 0 unless $count;
-
-return "$pre$count " . PL($word,$count) . $post
- unless $count =~ /^$PL_count_zero$/;
-return "${pre}no ". PL($word,0) . $post ;
+ my ($str, $count) = @_;
+ my ($pre, $word, $post) = ($str =~ m/\A(\s*)(.+?)(\s*)\Z/);
+
+ $count = $persistent_count
+ if !defined($count) && defined($persistent_count);
+ $count = 0 unless $count;
+
+ return "$pre$count " . PL($word,$count) . $post
+ unless $count =~ /^$PL_count_zero$/;
+ return "${pre}no ". PL($word,0) . $post ;
}
@@ -1335,7 +1357,10 @@
or s/ue$/u/
or s/([auy])e$/$1/
or s/ski$/ski/
- or s/i$//
+ or s/[^b]i$//
+ or s/^(are|were)$/be/
+ or s/^(had)$/hav/
+ or s/(hoe)$/$1/
or s/([^e])e$/$1/
or m/er$/
or s/([^aeiou][aeiouy]([bdgmnprst]))$/$1$2/;
@@ -1619,7 +1644,7 @@
=head1 VERSION
-This document describes version 1.891 of Lingua::EN::Inflect
+This document describes version 1.892 of Lingua::EN::Inflect
=head1 SYNOPSIS
@@ -1663,9 +1688,9 @@
# COMPARE TWO WORDS "NUMBER-INSENSITIVELY":
print "same\n" if PL_eq($word1, $word2);
- print "same noun\n" if PL_eq_N($word1, $word2);
- print "same verb\n" if PL_eq_V($word1, $word2);
- print "same adj.\n" if PL_eq_ADJ($word1, $word2);
+ print "same noun\n" if PL_N_eq($word1, $word2);
+ print "same verb\n" if PL_V_eq($word1, $word2);
+ print "same adj.\n" if PL_ADJ_eq($word1, $word2);
# ADD CORRECT "a" OR "an" FOR A GIVEN WORD:
@@ -1998,7 +2023,7 @@
PL_eq("indices","indices") # RETURNS "eq"
As indicated by the comments in the previous example, the actual value
-returned by the various C<PL_eq_...> subroutines encodes which of the
+returned by the various C<PL_eq> subroutines encodes which of the
three equality rules succeeded: "eq" is returned if the strings were
identical, "s:p" if the strings were singular and plural respectively,
"p:s" for plural and singular, and "p:p" for two distinct plurals.
@@ -2493,7 +2518,7 @@
plural according to the rules for names (which is that you don't
inflect, you just add -s or -es). You can choose to turn that behaviour
off (it's on by the default, even when the module isn't in classical
-mode) by calling C< classical(names=>0) >;
+mode) by calling C<< classical(names=>0) >>.
=head1 USER-DEFINED INFLECTIONS
@@ -2862,6 +2887,6 @@
=head1 COPYRIGHT
- Copyright (c) 1997-2000, Damian Conway. All Rights Reserved.
+ Copyright (c) 1997-2009, Damian Conway. All Rights Reserved.
This module is free software. It may be used, redistributed
and/or modified under the same terms as Perl itself.
Modified: branches/upstream/liblingua-en-inflect-perl/current/t/inflections.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblingua-en-inflect-perl/current/t/inflections.t?rev=60100&op=diff
==============================================================================
--- branches/upstream/liblingua-en-inflect-perl/current/t/inflections.t (original)
+++ branches/upstream/liblingua-en-inflect-perl/current/t/inflections.t Mon Jul 5 22:17:46 2010
@@ -6,7 +6,6 @@
# Change 1..1 below to 1..last_test_to_print .
# (It may become useful if the test is moved to ./t subdirectory.)
-BEGIN { $| = 1; print "1..1034\n"; }
END {print "not ok 1\n" unless $loaded;}
use Lingua::EN::Inflect qw( :ALL );
$loaded = 1;
@@ -185,80 +184,9 @@
ok ( PART_PRES("spies") eq "spying" );
ok ( PART_PRES("skis") eq "skiing" );
+BEGIN { $| = 1; print "1..911\n"; }
__DATA__
-sarcophagus -> sarcophagi
-cactus -> cactuses|cacti
-talisman -> talismans
-haggis -> haggis
-man -> men
-elk -> elks|elk
-Rom -> Roma
-fox -> foxes
-elf -> elves
-deer -> deer
-puma -> pumas
-pika -> pikas
-goat -> goats
-woman -> women
-wolf -> wolves
-trout -> trout
-sheep -> sheep
-oxman -> oxmen
-moose -> moose
-axman -> axmen
-vixen -> vixens
-leman -> lemans
-coney -> coneys
-Roman -> Romans
-yeoman -> yeomen
-taxman -> taxmen
-seaman -> seamen
-ragman -> ragmen
-merman -> mermen
-madman -> madmen
-layman -> laymen
-lawman -> lawmen
-gunman -> gunmen
-shaman -> shamans
-possum -> possums
-hetman -> hetmans
-harman -> harmans
-farman -> farmans
-dolman -> dolmans
-desman -> desmans
-cervid -> cervids
-cayman -> caymans
-carmen -> carmens|carmina
-caiman -> caimans
-blouse -> blouses
-ataman -> atamans
-Norman -> Normans
-German -> Germans
-lummox -> lummoxes
-caribou -> caribous|caribou
-Romany -> Romanies
-titmouse -> titmice
-talouse -> talouses
-ottoman -> ottomans
-dormouse -> dormice
-ceriman -> cerimans
-yeowoman -> yeowomen
-reindeer -> reindeer
-grizzly -> grizzlies
-auto-da-fe -> autos-da-fe
-flittermouse -> flittermice
- thief -> thiefs|thieves
- Roman -> Romans
- czech -> czechs
- eunuch -> eunuchs
- stomach -> stomachs
- yes -> yeses
- quiz -> quizzes
- whiz -> whizzes
- whizz -> whizzes
- fizz -> fizzes
- atman -> atmas
- macro -> macros
+
a -> as # NOUN FORM
a -> some # INDEFINITE ARTICLE
A.C.R.O.N.Y.M. -> A.C.R.O.N.Y.M.s
@@ -320,17 +248,21 @@
asylum -> asylums
asyndeton -> asyndeta
at it -> at them # ACCUSATIVE
+ ataman -> atamans
ate -> ate
atlas -> atlases|atlantes
+ atman -> atmas
attorney general -> attorneys general
attorney of record -> attorneys of record
aurora -> auroras|aurorae
auto -> autos
+ auto-da-fe -> autos-da-fe
aviatrix -> aviatrixes|aviatrices
aviatrix's -> aviatrixes'|aviatrices'
Avignonese -> Avignonese
axe -> axes
axis -> axes
+ axman -> axmen
Azerbaijanese -> Azerbaijanese
bacillus -> bacilli
bacterium -> bacteria
@@ -352,6 +284,7 @@
bias -> biases
biceps -> biceps
bison -> bisons|bison
+ blouse -> blouses
Bolognese -> Bolognese
bonus -> bonuses
Borghese -> Borghese
@@ -363,6 +296,7 @@
bream -> bream
breeches -> breeches
bride-to-be -> brides-to-be
+ Brigadier General -> Brigadier Generals
britches -> britches
bronchitis -> bronchitises|bronchitides
bronchus -> bronchi
@@ -380,6 +314,7 @@
buzzes -> buzz # VERB FORM
by it -> by them # ACCUSATIVE
caddis -> caddises
+ caiman -> caimans
cake -> cakes
Calabrese -> Calabrese
calf -> calves
@@ -401,12 +336,17 @@
carcinoma -> carcinomas|carcinomata
care -> cares
cargo -> cargoes
+ caribou -> caribous|caribou
Carlylese -> Carlylese
+ carmen -> carmina
carp -> carp
Cassinese -> Cassinese
cat -> cats
catfish -> catfish
+ cayman -> caymans
Celanese -> Celanese
+ ceriman -> cerimans
+ cervid -> cervids
Ceylonese -> Ceylonese
chairman -> chairmen
chamois -> chamois
@@ -435,6 +375,7 @@
coitus -> coitus
commando -> commandos
compendium -> compendiums|compendia
+ coney -> coneys
Congoese -> Congoese
Congolese -> Congolese
conspectus -> conspectuses
@@ -451,6 +392,7 @@
crescendo -> crescendos
criterion -> criteria
curriculum -> curriculums|curricula
+ czech -> czechs
dais -> daises
data point -> data points
datum -> data
@@ -459,6 +401,7 @@
deer -> deer
delphinium -> delphiniums
desideratum -> desiderata
+ desman -> desmans
diabetes -> diabetes
dictum -> dictums|dicta
did -> did
@@ -474,9 +417,11 @@
doesn't -> don't # VERB FORM
dog -> dogs
dogma -> dogmas|dogmata
+ dolman -> dolmans
dominatrix -> dominatrixes|dominatrices
domino -> dominoes
Dongolese -> Dongolese
+ dormouse -> dormice
drama -> dramas|dramata
drum -> drums
dwarf -> dwarves
@@ -484,6 +429,7 @@
edema -> edemas|edemata
eland -> elands|eland
elf -> elves
+ elk -> elks|elk
embryo -> embryos
emporium -> emporiums|emporia
encephalitis -> encephalitises|encephalitides
@@ -495,9 +441,11 @@
erratum -> errata
ethos -> ethoses
eucalyptus -> eucalyptuses
+ eunuch -> eunuchs
extremum -> extrema
eyas -> eyases
factotum -> factotums
+ farman -> farmans
Faroese -> Faroese
fauna -> faunas|faunae
fax -> faxes
@@ -510,6 +458,7 @@
fish -> fish
fizz -> fizzes
flamingo -> flamingoes
+ flittermouse -> flittermice
floes -> floe
flora -> floras|florae
flounder -> flounder
@@ -534,6 +483,7 @@
gas -> gases
gateau -> gateaus|gateaux
gave -> gave
+ general -> generals
generalissimo -> generalissimos
Genevese -> Genevese
genie -> genies|genii
@@ -545,16 +495,19 @@
Gilbertese -> Gilbertese
glottis -> glottises
Goanese -> Goanese
+ goat -> goats
goose -> geese
Governor General -> Governors General
goy -> goys|goyim
graffiti -> graffiti
graffito -> graffiti
+ grizzly -> grizzlies
guano -> guanos
guardsman -> guardsmen
Guianese -> Guianese
gumma -> gummas|gummata
gumshoes -> gumshoe
+ gunman -> gunmen
gymnasium -> gymnasiums|gymnasia
had -> had
had thought -> had thought
@@ -563,6 +516,7 @@
handkerchief -> handkerchiefs
Hararese -> Hararese
Harlemese -> Harlemese
+ harman -> harmans
harmonium -> harmoniums
has -> have
has become -> have become
@@ -583,6 +537,7 @@
herpes -> herpes
hers -> theirs # POSSESSIVE NOUN
herself -> themselves
+ hetman -> hetmans
hiatus -> hiatuses|hiatus
highlight -> highlights
hijinks -> hijinks
@@ -646,10 +601,13 @@
Lapponese -> Lapponese
larynx -> larynxes|larynges
latex -> latexes|latices
+ lawman -> lawmen
+ layman -> laymen
leaf -> leaves # NOUN FORM
leaf -> leaf # VERB FORM (1st/2nd pers.)
leafs -> leaf # VERB FORM (3rd pers.)
Lebanese -> Lebanese
+ leman -> lemans
lemma -> lemmas|lemmata
lens -> lenses
Leonese -> Leonese
@@ -667,6 +625,7 @@
Lucchese -> Lucchese
lumbago -> lumbagos
lumen -> lumens|lumina
+ lummox -> lummoxes
lustrum -> lustrums|lustra
lyceum -> lyceums
lymphoma -> lymphomas|lymphomata
@@ -676,7 +635,9 @@
Macanese -> Macanese
Macassarese -> Macassarese
mackerel -> mackerel
+ macro -> macros
made -> made
+ madman -> madmen
Madurese -> Madurese
magma -> magmas|magmata
magneto -> magnetos
@@ -697,6 +658,7 @@
medusa -> medusas|medusae
memorandum -> memorandums|memoranda
meniscus -> menisci
+ merman -> mermen
Messinese -> Messinese
metamorphosis -> metamorphoses
metropolis -> metropolises
@@ -716,6 +678,7 @@
momentum -> momentums|momenta
money -> monies
mongoose -> mongooses
+ moose -> moose
mother-in-law -> mothers-in-law
mouse -> mice
mumps -> mumps
@@ -741,6 +704,7 @@
nimbus -> nimbuses|nimbi
Nipponese -> Nipponese
no -> noes
+ Norman -> Normans
nostrum -> nostrums
noumenon -> noumena
nova -> novas|novae
@@ -761,12 +725,14 @@
optimum -> optimums|optima
opus -> opuses|opera
organon -> organa
+ ottoman -> ottomans
ought to be -> ought to be # VERB (UNLIKE bride to be)
overshoes -> overshoe
overtoes -> overtoe
ovum -> ova
ox -> oxen
ox's -> oxen's # POSSESSIVE FORM
+ oxman -> oxmen
oxymoron -> oxymorons|oxymora
Panaman -> Panamans
parabola -> parabolas|parabolae
@@ -790,6 +756,7 @@
phylum -> phylums|phyla
piano -> pianos|piani
Piedmontese -> Piedmontese
+ pika -> pikas
pincer -> pincers
pincers -> pincers
Pistoiese -> Pistoiese
@@ -803,6 +770,7 @@
pontifex -> pontifexes|pontifices
portmanteau -> portmanteaus|portmanteaux
Portuguese -> Portuguese
+ possum -> possums
potato -> potatoes
pox -> pox
pragma -> pragmas|pragmata
@@ -817,14 +785,18 @@
prospectus -> prospectuses|prospectus
protozoan -> protozoans
protozoon -> protozoa
+ puma -> pumas
put -> put
quantum -> quantums|quanta
quartermaster general -> quartermasters general
quarto -> quartos
+ quiz -> quizzes
+ quizzes -> quiz # VERB FORM
quorum -> quorums
rabies -> rabies
radius -> radiuses|radii
radix -> radices
+ ragman -> ragmen
rebus -> rebuses
rehoes -> rehoe
reindeer -> reindeer
@@ -832,8 +804,11 @@
rhino -> rhinos
rhinoceros -> rhinoceroses|rhinoceros
roes -> roe
+ Rom -> Roma
Romagnese -> Romagnese
+ Roman -> Romans
Romanese -> Romanese
+ Romany -> Romanies
romeo -> romeos
roof -> roofs
rostrum -> rostrums|rostra
@@ -852,12 +827,14 @@
scissors -> scissors
Scotsman -> Scotsmen
sea-bass -> sea-bass
+ seaman -> seamen
self -> selves
Selman -> Selmans
Senegalese -> Senegalese
seraph -> seraphs|seraphim
series -> series
shall eat -> shall eat
+ shaman -> shamans
Shavese -> Shavese
Shawanese -> Shawanese
she -> they
@@ -904,6 +881,7 @@
stigma -> stigmas|stigmata
stimulus -> stimuli
stoma -> stomas|stomata
+ stomach -> stomachs
storey -> storeys
story -> stories
stratum -> strata
@@ -923,7 +901,9 @@
syrinx -> syrinxes|syringes
tableau -> tableaus|tableaux
Tacoman -> Tacomans
+ talouse -> talouses
tattoo -> tattoos
+ taxman -> taxmen
tempo -> tempos|tempi
Tenggerese -> Tenggerese
testatrix -> testatrixes|testatrices
@@ -933,6 +913,7 @@
their -> their # POSSESSIVE FORM (GENDER-INCLUSIVE)
themself -> themselves # ugly but gaining currency
they -> they # for indeterminate gender
+ thief -> thiefs|thieves
this -> these
thought -> thoughts # NOUN FORM
thought -> thought # VERB FORM
@@ -942,6 +923,7 @@
Timorese -> Timorese
tiptoes -> tiptoe
Tirolese -> Tirolese
+ titmouse -> titmice
to her -> to them
to herself -> to themselves
to him -> to them
@@ -1005,6 +987,8 @@
wharf -> wharves
whiting -> whiting
Whitmanese -> Whitmanese
+ whiz -> whizzes
+ whizz -> whizzes
widget -> widgets
wife -> wives
wildebeest -> wildebeests|wildebeest
@@ -1024,6 +1008,9 @@
woodlouse -> woodlice
Yakiman -> Yakimans
Yengeese -> Yengeese
+ yeoman -> yeomen
+ yeowoman -> yeowomen
+ yes -> yeses
Yokohaman -> Yokohamans
you -> you
your -> your # POSSESSIVE FORM
@@ -1032,200 +1019,3 @@
Yunnanese -> Yunnanese
zero -> zeros
zoon -> zoa
-an Ath
-an a-th
-a b-th
-a Bth
-a c-th
-a Cth
-an Nth
-an n-th
-an Xth
-an x-th
-an A.B.C
-an AI
-an AGE
-an agendum
-an aide-de-camp
-an albino
- a B.L.T. sandwich
- a BMW
- a BLANK
- a bacterium
- a Burmese restaurant
- a C.O.
- a CCD
- a COLON
- a cameo
- a CAPITAL
- a D.S.M.
- a DNR
- a DINNER
- a dynamo
-an E.K.G.
-an ECG
-an EGG
-an embryo
-an erratum
- a eucalyptus
-an Euler number
- a eulogy
- a euphemism
- a euphoria
- a ewe
- a ewer
-an extremum
-an eye
-an F.B.I. agent
-an FSM
- a FACT
- a FAQ
-an F.A.Q.
- a fish
- a G-string
- a GSM phone
- a GOD
- a genus
- a Governor General
-an H-Bomb
-an H.M.S Ark Royal
-an HSL colour space
- a HAL 9000
-an H.A.L. 9000
- a has-been
- a height
-an heir
- a honed blade
-an honest man
- a honeymoon
-an honorarium
-an honorary degree
-an honoree
-an honorific
- a Hough transform
- a hound
-an hour
-an hourglass
- a houri
- a house
-an I.O.U.
-an IQ
-an IDEA
-an inferno
-an Inspector General
- a jumbo
- a knife
-an L.E.D.
- a LED
-an LCD
- a lady in waiting
- a leaf
-an M.I.A.
- a MIASMA
-an MTV channel
- a Major General
-an N.C.O.
-an NCO
- a NATO country
- a note
-an O.K.
-an OK
-an OLE
-an octavo
-an octopus
-an okay
- a once-and-future-king
-an oncologist
- a one night stand
-an onerous task
-an opera
-an optimum
-an opus
-an ox
- a Ph.D.
- a PET
- a P.E.T. scan
- a plateau
- a quantum
-an R.S.V.P.
-an RSVP
- a REST
- a reindeer
-an S.O.S.
- a SUM
-an SST
- a salmon
- a T.N.T. bomb
- a TNT bomb
- a TENT
- a thought
- a tomato
- a U-boat
- a UNESCO representative
- a U.F.O.
- a UFO
- a UK citizen
- a ubiquity
- a unicorn
-an unidentified flying object
- a uniform
- a unimodal system
-an unimpressive record
-an uninformed opinion
-an uninvited guest
- a union
- a uniplex
- a uniprocessor
- a unique opportunity
- a unisex hairdresser
- a unison
- a unit
- a unitarian
- a united front
- a unity
- a univalent bond
- a univariate statistic
- a universe
-an unordered meal
- a uranium atom
-an urban myth
-an urbane miss
-an urchin
- a urea detector
- a urethane monomer
-an urge
-an urgency
- a urinal
-an urn
- a usage
- a use
-an usher
- a usual suspect
- a usurer
- a usurper
- a utensil
- a utility
-an utmost urgency
- a utopia
-an utterance
- a V.I.P.
- a VIPER
- a viper
-an X-ray
-an X.O.
- a XYLAPHONE
-an XY chromosome
- a xenophobe
- a Y-shaped pipe
- a Y.Z. plane
- a YMCA
-an YBLENT eye
-an yblent eye
-an yclad body
- a yellowing
- a yield
- a youth
- a youth
-an ypsiliform junction
-an yttrium atom
- a zoo
More information about the Pkg-perl-cvs-commits
mailing list