Merge pull request #7 from ahalterman/master

Big changes to the dictionaries

Phoenix.140422.agents.txt → Phoenix.agents.txt

@@ -27,7 +27,6 @@
 # SES-0455158, SES-0527564, SES-1004414, SES-1259190) and grants from the University of 
 # Kansas General Research Fund.
 #
-# Last update : 22 April 2014
 #
 # The MIT License (MIT)
 # 
@@ -237,6 +236,7 @@ JAIL_GUARD [~COP]
 LAW_ENFORCEMENT_AGENCY [~COP]
 LAW_ENFORCEMENT_AUTHORITY [~COP]
 LAW_ENFORCEMENT_OFFICER [~COP]
+LAW_ENFORCEMENT_OFFICIAL [~COP]
 LAWMAN {LAWMEN} [~COP]
 NARCOTICS_OFFICER [~COP]
 NATIONAL_POLICE {} [~COP]
@@ -275,17 +275,11 @@ ARMS_DEALER [~CRM]
 ARSONIST [~CRM]
 ASSAILANT [~CRM]
 BANDIT [~CRM]
-BAWDYHOUSE [~CRM]
 BLACKMAILER [~CRM]
-BORDELLO [~CRM]
 BRANOKKER [~CRM]
 BRIGAND [~CRM]
-BROTHEL [~CRM]
-BUCCANEER [~CRM]
 BURGLAR [~CRM]
-CALL_GIRL [~CRM]
 CARTEL [~CRM]
-CATHOUSE [~CRM]
 CATTLE_THIEF {CATTLE_THIEVES} [~CRM]
 CONMAN {CONMEN} [~CRM]
 CONTRABANDIST [~CRM]
@@ -311,18 +305,14 @@ DRUG_TRAFFICKING_TERRORIST [~CRM]
 EXTORTIONER [~CRM]
 EXTORTIONIST [~CRM]
 FELON [~CRM]
-FIREBUG [~CRM]
 FORGER [~CRM]
 GANGDOM {} [~CRM]
 GANGLAND [~CRM]
 GANGSTER [~CRM]
 GANG [~CRM]
 GAOLBIRD [~CRM]
 GUNRUNNER [~CRM]
-HARLOT [~CRM]
 HOLDUP_MAN {} [~CRM]
-HOUSE_OF_ILL_REPUTE [~CRM]
-HOUSE_OF_PROSTITUTION [~CRM]
 HUMAN_TRAFFICKER [~CRM]
 ILLEGAL_IMMIGRANT [~CRM]
 ILLEGAL_MIGRANT [~CRM]
@@ -332,7 +322,6 @@ JAIL_BIRD [~CRM]
 KIDNAPER [~CRM]
 KIDNAPPER [~CRM]
 KILLER [~CRM]
-LADY_OF_PLEASURE [~CRM]
 LARCENER [~CRM]
 LARCENIST [~CRM]
 LAWBREAKER [~CRM]
@@ -352,12 +341,9 @@ OUTLAW [~CRM]
 PAEDOPHILE [~CRM]
 PEDOPHILE [~CRM]
 PERPETRATOR [~CRM]
-PERVERT [~CRM]
 PICKPOCKET [~CRM]
 PILFERER [~CRM]
 PIRATE [~CRM]
-PROSTITUTE [~CRM]
-REPROBATE [~CRM]
 ROBBER [~CRM]
 RUMRUNNER [~CRM]
 RUSTLER [~CRM]
@@ -367,7 +353,6 @@ SEA_ROBBER [~CRM]
 SEA_ROVER [~CRM] # arggghhhhh
 SERIAL_KILLER [~CRM]
 SERIAL_MURDERER [~CRM]
-SEX_WORKER  [~CRM]
 SHOPLIFTER [~CRM]
 SMUGGLER [~CRM]
 SNATCHER [~CRM]
@@ -378,19 +363,19 @@ STICKUP_MAN {} [~CRM]
 THIEF {THIEVES} [~CRM]
 TRAFFICKER [~CRM]
 TRAFFIKER [~CRM]
-WHOREHOUSE [~CRM]
-WHORE [~CRM]
-WOMAN_OF_THE_STREET {WOMEN_OF_THE_STREET} [~CRM]
-WRONGDOER [~CRM]
 
 ADOPTION_GROUP [~CVL]
+AIRLINER [~CVL]
 BACKPACKER [~CVL]
 CHIEF_ENGINEER [~CVL]
+CHILD [~CVL]
+CHILDREN [~CVL]
 CITIZEN [~CVL]
 CIVIC_GROUP [~CVL]
 CIVILIAN [~CVL]
 CIVIL_SOCIETY [~CVL]
 COLONIST [~CVL]
+COMMERCIAL_JET [~CVL]
 COMMUNITY [~CVL]
 CONSTITUENT [~CVL]
 ELECTOR [~CVL]
@@ -417,7 +402,9 @@ NEIGHBORHOOD [~CVL]
 NEIGHBOURHOOD [~CVL]
 NON-NATIVE [~CVL]
 NON-RESIDENT [~CVL]
-# PASSENGER_JET  [~CVL]   # pas 14.01.27: original context was terrorist attacks but this is too general
+PASSENGER [~CVL]
+PASSENGER_AIRLINER [~CVL]
+PASSENGER_JET  [~CVL]   # pas 14.01.27: original context was terrorist attacks but this is too general ALH: given Malayia stuff, I think it's worth keeping
 POPULATION [~CVL]
 PRIVATE_CITIZEN [~CVL]
 PROPERTY_OWNER [~CVL]
@@ -427,16 +414,20 @@ RESIDENT  [~CVL]
 RESIDENT_OF_THE_CAPITAL {RESIDENTS_OF_THE_CAPITAL} [~CVL]
 SCIENTIST [~CVL]
 SETTLEMENT [~CVL]
+SHOPKEEPER [~CVL]
 SIGHTSEER [~CVL]
 SLUM_DWELLER [~CVL]
 SMALL_TOWN [~CVL]
 # SOLDIERS_FAMILIES [~CVL]  # figure out possessive
+TAXPAYERS [~CVL]
 TENANT [~CVL]
 THE_POOR {} [~CVL]
 TOURER [~CVL]
 TOURIST [~CVL]
 TRAVELER [~CVL]
 TRAVELLER [~CVL]
+VICTIM [~CVL]
+VICTIMS [~CVL]
 VILLAGER [~CVL]
 VILLAGE [~CVL]
 VOTER [~CVL]
@@ -452,8 +443,11 @@ ECONOMIST [~EDU]
 EDUCATEE [~EDU]
 EDUCATIONAL_INSTITUTION [~EDU]
 INTELLECTUAL [~EDU]
+KINDERGARDEN [~EDU]
+KINDERGARTEN [~EDU]
 LECTURER [~EDU]
 PROFESSOR [~EDU]
+PRESCHOOL [~EDU]
 PUPIL [~EDU]
 RESEARCH_INSTITUTION [~EDU]
 SCHOLAR [~EDU]
@@ -463,10 +457,15 @@ SCIENCE_CONGRESS [~EDU]
 STUDENTS_AND_PROFESSOR [~EDU]
 STUDENTS_AND_TEACHER [~EDU]
 STUDENT [~EDU]
+TEACHER [~EDU]
+TEACHER [~EDU]
 UNIVERSITY [~EDU]
 
 ACTOR  [~ELI]
+FIRST_FAMILY [~ELI]
 FIRST_LADY [~ELI]
+FORMER_PRIME_MINISTER [~ELI]
+FORMER_PRESIDENT [~ELI]
 HONORARY_CONSUL [~ELI]
 # PRESIDENT'S_CHILD [~ELI] # figure out possessives
 # PRESIDENT'S_HUSBAND [~ELI]
@@ -476,7 +475,10 @@ RETIRED [~ELI]
 VIP [~ELI]
 
 CONSERVATIONIST [~ENV]
+DEPARMENT_OF_ENVIRONMENT [~ENV}
+ECOLOGIST [~ENV]
 ENVIRONMENTALIST [~ENV]
+GREEN_PARTY [~ENV] # should sort out the PTY thing, but not yet
 TREE_HUGGER [~ENV]
 
 ADMINISTRATION [~GOV]
@@ -576,6 +578,9 @@ DEPARTMENT_OF_CIVIL_DEFENSE [~GOVMIL]
 DEPARTMENT_OF_COMMERCE [~GOVBUS]
 DEPARTMENT_OF_DEFENSE [~GOVMIL]
 DEPARTMENT_OF_EDUCATION [~GOVEDU]
+DEPARTMENT_OF_ENVIRONMENT [~GOVENV]
+DEPARTMENT_OF_THE_ENVIRONMENT [~GOVENV]
+DEPARTMENT_OF_ENVIRONMENTAL_QUALITY [~GOVENV]
 DEPARTMENT_OF_FOREIGN_AFFAIRS [~GOV]
 DEPARTMENT_OF_PROTOCOL [~GOV]
 DEPARTMENT_OF_TOURISM [~GOV]
@@ -613,6 +618,7 @@ EMPRESS [~GOV]
 ENERGY_MINIST [~GOV]
 ENERGY_SECRETARY [~GOV]
 ENT_AFFAIRS_MINIST [~GOV]
+ENVIRONMENTAL_PROTECTION_AGENCY [~ENV] # there are state ones, not just the US EPA
 ENVIRONMENT_MINIST [~GOVENV]
 ENVOY [~GOV]
 ENVOY_EXTRAORDINARY [~GOV]
@@ -734,6 +740,7 @@ MINES_!MINST! [~GOV]
 MINES_OFFICIAL [~GOV]
 !MINST!  [~GOV]
 # Note: some of these are really esoteric: they were extracted from CIA World Leaders lists
+# ALH: Also, a bunch (all?) of these should also be OF, rather than just FOR
 !MINST! DE_OBRAS_PÚBLICAS_SERVICIOS_Y_VIVIENDA [~GOV]
 !MINST! FOR_ YOUTH_AND_SPORTS [~GOV]
 !MINST! FOR_AGRICULTURE,_FISHERIES_AND_FOOD [~GOVAGR]
@@ -764,6 +771,9 @@ MINES_OFFICIAL [~GOV]
 !MINST! FOR_EMPLOYMENT_AND_VOCATIONAL_TRAINING [~GOVLAB]
 !MINST! FOR_ENERGY [~GOV]
 !MINST! FOR_ENVIRONMENT [~GOVENV]
+!MINIST! OF_ENVIRONMENT [~ENV] 
+!MINIST! OF_THE_ENVIRONMENT [~ENV]
+!MINIST! OF_ENVIRONMENT [~ENV]
 !MINST! FOR_EQUIPMENT [~GOVDEV]
 !MINST! FOR_EXTERNAL_RELATIONS [~GOV]
 !MINST! FOR_FINANCE [~GOV]
@@ -1479,6 +1489,7 @@ PUBLISHING_FIRM [~MED]
 PUBLISHING_HOUSE [~MED]
 PULP_MAGAZINE [~MED]
 RADIO_STATION [~MED]
+REPORTER [~MED]
 SPOKES!PERSON!  [~MED]
 TABLOID [~MED]
 TELECOM CONSULTANT [~MED]
@@ -1520,6 +1531,7 @@ ARMY_RESERVE [~MIL]
 ARMY_STAFF [~MIL]
 ARMY_UNIT [~MIL]
 ARMY_VICE_CHIEF_OF_STAFF [~MIL]
+ARTILLERY [~MIL]
 ATTACK_CRAFT [~MIL]
 ATTACK_HELICOPTERS [~MIL]
 ATTACK_HELICOPTER [~MIL]
@@ -2053,6 +2065,9 @@ SPY [~SPY]
 SPY_AGENCY [~SPY]
 SPY_SHIP [~SPY]
 UNDERCOVER_AGENT [~SPY]
+MUKHABARAT_ [~SPY]
+MUHABARAT_ [~SPY]
+MUKABARAT_ [~SPY]
 
 ARMED_BAND [~UAF]
 ARMED_CITIZENS [~UAF]
@@ -2076,15 +2091,25 @@ HIT_MAN {HIT_MEN} [~UAF]
 HIT_SQUAD [~UAF]
 INFILTRATION_UNIT [~UAF]
 JANJAWEED [~UAF]
+JIHADIST [~UAFMOS]
+JIHADISTS [~UAFMOS]
 MARAUDER [~UAF]
 MERCENARY [~UAF]
 MILITANT [~UAF]
 MILITARY_WING [~UAF]
 MILITIA [~UAF]
-MOSLEM_MILITANT[~UAFMOS]
+MILITANT [~UAF]
+MOSLEM_MILITANT [~UAFMOS]
+MUSLIM_MILITANT [~UAFMOS]
 MURDEROUS_EXTREMIST [~UAFRAD]
 PRIVATE_ARMY [~UAF]
 PRIVATE_SECURITY_FORCE [~UAF]
+SELF_DEFENSE_FORCE [~UAF]
+SELF-DFENSE_FORCE [~UAF]
+SELF-DEFENCE_FORCE [~UAF]
+SELF_DEFENCE_FORCE [~UAF]
+SELF-DEFENSE_MILITA [~UAF]
+SELF_DEFENSE_MILITIA [~UAF]
 SOLDIER_OF_FORTUNE [~UAF]
 TERRORIST [~UAF]
 TERRORIST_GROUP [~UAF]

Potential Dictionary Inclusions.txt

@@ -0,0 +1,11 @@
++US_ARMY_
++US_AIR_FORCE_
++US_NAVY_
++US_MARINE_
++US_MARINE_CORPS_
++US_SOLDIERS_
++US_ARMED_FORCES_
++US_SPECIAL_FORCES_
++US_SPECIAL_OPERATIONS_
++US_COMMANDO
+	[USAMIL]

README.md

@@ -1,6 +1,8 @@
 PETRARCH Dictionary Formats
 ===========================
 
+**This branch includes a major reorganization of the Petrarch dictionaries. The objective of this reorganization is to ensure that all the relevant dictionary entries are available to Petrarch and to make it much more intuitive to add entries in the future.** 
+
 There are five separate input dictionaries or lists that PETRACH makes use of:
 the verb dictionary, the actor dictionary, the agent dictionary, the discard
 list, and the issues list. The following sections describe these files in