From bebea711d4d2a077295bd7a04dd2f7b44b526692 Mon Sep 17 00:00:00 2001 From: Mark Shoulson Date: Tue, 22 Mar 2016 12:06:55 -0400 Subject: Redo the convention to use initial caps on longer element if possible. Fix various prefix conflicts, add alternate forms, etc. Including changing dotXCompose itself! --- dotXCompose | 12 ++++++---- emoji-base | 77 ++++++++++++++++++++++++++++++++----------------------------- 2 files changed, 48 insertions(+), 41 deletions(-) diff --git a/dotXCompose b/dotXCompose index 11608c9..fc33974 100644 --- a/dotXCompose +++ b/dotXCompose @@ -170,6 +170,7 @@ include "%L" # These are just too cool-looking not to have (if your font supports them) : "⸎" U2E0E # EDITORIAL CORONIS

: "⸙" U2E19 # PALM BRANCH + : "⸙" U2E19 # PALM BRANCH : "ff" UFB00 # LATIN SMALL LIGATURE FF @@ -725,7 +726,8 @@ include "%L" : "☠" U2620 # SKULL AND CROSSBONES - : "☠" U2620 # SKULL AND CROSSBONES + : "☠" U2620 # SKULL AND CROSSBONES + : "☠" U2620 # SKULL AND CROSSBONES : "⌨" U2328 # KEYBOARD : "☞" U261E # WHITE RIGHT POINTING INDEX : "☜" U261C # WHITE LEFT POINTING INDEX @@ -744,14 +746,16 @@ include "%L" # Using backslash-minus-slash etc. conflicts with combining accents. : "⚞" U269E # THREE LINES CONVERGING RIGHT : "⚟" U269F # THREE LINES CONVERGING LEFT - : "⍾" U237E # BELL SYMBOL (or ALIENS LANDING) -- &-a-l-i-e-n ? -# Other monstery characters... ѪꙚ (alien abductions?) -# ඏൠഋ & others from Kannada et al...? + : "⍾" U237E # BELL SYMBOL (or ALIENS LANDING) -- &-a-l-i-e-n ? +# Other monstery characters... ѪꙚ (alien abductions?) +# ඏൠഋ & others from Kannada et al...? # Can't use -^- for this; conflicts with -^ for ↑, and getting those arrows # workable was complicated enough. How about this? : "⌤" U2324 # UP ARROWHEAD BETWEEN TWO HORIZONTAL BARS; aka ENTER KEY, aka NOT AMUSED. : "⌛" U231B # HOURGLASS + : "⌛" U231B # HOURGLASS : "⌚" U231A # WATCH + : "⌚" U231A # WATCH : " " U2002 # EN SPACE : " " U2003 # EM SPACE <3> : " " U2004 # THREE-PER-EM SPACE diff --git a/emoji-base b/emoji-base index 673eace..7b74a5d 100644 --- a/emoji-base +++ b/emoji-base @@ -1,5 +1,6 @@ -## Convention: capitalize final letter of shorter element to avoid prefixing. -## Perhaps capitalize first letter of longer element if that is not desired. +## Convention: capitalize first letter of longer element to avoid prefixing. +## Or capitalize last letter of shorter element if that is not desired. +## (like, trying not to alter the "main" dotXCompose file). ## Use two #s for ordinary comments, #- for quotes from UnicodeData.txt, ## and three #s to comment out XCompose lines. ## How about using 4 #s to comment out things that are only commented out @@ -15,7 +16,7 @@ #- 1F300;CYCLONE;So;0;ON;;;;;N;;;;; {cyclone} : "🌀" U1F300 # CYCLONE #- 1F301;FOGGY;So;0;ON;;;;;N;;;;; - {foggy} : "🌁" U1F301 # FOGGY + {Foggy} : "🌁" U1F301 # FOGGY #- 1F302;CLOSED UMBRELLA;So;0;ON;;;;;N;;;;; ### {closed umbrella} : "🌂" U1F302 # CLOSED UMBRELLA #- 1F303;NIGHT WITH STARS;So;0;ON;;;;;N;;;;; @@ -39,13 +40,13 @@ #- 1F30C;MILKY WAY;So;0;ON;;;;;N;;;;; ### {milky way} : "🌌" U1F30C # MILKY WAY #- 1F30D;EARTH GLOBE EUROPE-AFRICA;So;0;ON;;;;;N;;;;; - {earthEU} : "🌍" U1F30D # EARTH GLOBE EUROPE-AFRICA + {EarthEU} : "🌍" U1F30D # EARTH GLOBE EUROPE-AFRICA #- 1F30E;EARTH GLOBE AMERICAS;So;0;ON;;;;;N;;;;; - {earthAM} : "🌎" U1F30E # EARTH GLOBE AMERICAS + {EarthAM} : "🌎" U1F30E # EARTH GLOBE AMERICAS #- 1F30F;EARTH GLOBE ASIA-AUSTRALIA;So;0;ON;;;;;N;;;;; - {earthAS} : "🌏" U1F30F # EARTH GLOBE ASIA-AUSTRALIA + {EarthAS} : "🌏" U1F30F # EARTH GLOBE ASIA-AUSTRALIA #- 1F310;GLOBE WITH MERIDIANS;So;0;ON;;;;;N;;;;; - {earth|-} : "🌐" U1F310 # GLOBE WITH MERIDIANS + {Earth|-} : "🌐" U1F310 # GLOBE WITH MERIDIANS #- 1F311;NEW MOON SYMBOL;So;0;ON;;;;;N;;;;; {new moon symbol} : "🌑" U1F311 # NEW MOON SYMBOL #- 1F312;WAXING CRESCENT MOON SYMBOL;So;0;ON;;;;;N;;;;; @@ -99,7 +100,7 @@ #- 1F32A;CLOUD WITH TORNADO;So;0;ON;;;;;N;;;;; {cloud with tornado} : "🌪" U1F32A # CLOUD WITH TORNADO #- 1F32B;FOG;So;0;ON;;;;;N;;;;; - {foG} : "🌫" U1F32B # FOG + {fog} : "🌫" U1F32B # FOG #- 1F32C;WIND BLOWING FACE;So;0;ON;;;;;N;;;;; {wind blowing face} : "🌬" U1F32C # WIND BLOWING FACE #- 1F32D;HOT DOG;So;0;ON;;;;;N;;;;; @@ -119,6 +120,7 @@ #- 1F333;DECIDUOUS TREE;So;0;ON;;;;;N;;;;; {tree} : "🌳" U1F333 # DECIDUOUS TREE #- 1F334;PALM TREE;So;0;ON;;;;;N;;;;; + {Palmtre} : "🌴" U1F334 # PALM TREE {palm} : "🌴" U1F334 # PALM TREE #- 1F335;CACTUS;So;0;ON;;;;;N;;;;; {cactus} : "🌵" U1F335 # CACTUS @@ -129,7 +131,7 @@ #- 1F338;CHERRY BLOSSOM;So;0;ON;;;;;N;;;;; {cherryf} : "🌸" U1F338 # CHERRY BLOSSOM #- 1F339;ROSE;So;0;ON;;;;;N;;;;; - {rosE} : "🌹" U1F339 # ROSE + {rose} : "🌹" U1F339 # ROSE #- 1F33A;HIBISCUS;So;0;ON;;;;;N;;;;; {hibisc} : "🌺" U1F33A # HIBISCUS #- 1F33B;SUNFLOWER;So;0;ON;;;;;N;;;;; @@ -198,7 +200,7 @@ #- 1F356;MEAT ON BONE;So;0;ON;;;;;N;;;;; {bone} : "🍖" U1F356 # MEAT ON BONE #- 1F357;POULTRY LEG;So;0;ON;;;;;N;;;;; - {chknleg} : "🍗" U1F357 # POULTRY LEG + {Chknleg} : "🍗" U1F357 # POULTRY LEG #- 1F358;RICE CRACKER;So;0;ON;;;;;N;;;;; {cracker} : "🍘" U1F358 # RICE CRACKER #- 1F359;RICE BALL;So;0;ON;;;;;N;;;;; @@ -208,14 +210,14 @@ #- 1F35B;CURRY AND RICE;So;0;ON;;;;;N;;;;; {curry} : "🍛" U1F35B # CURRY AND RICE #- 1F35C;STEAMING BOWL;So;0;ON;;;;;N;;;;; - {bowL} : "🍜" U1F35C # STEAMING BOWL + {bowl} : "🍜" U1F35C # STEAMING BOWL #- 1F35D;SPAGHETTI;So;0;ON;;;;;N;;;;; {pasta} : "🍝" U1F35D # SPAGHETTI #- 1F35E;BREAD;So;0;ON;;;;;N;;;;; {bread} : "🍞" U1F35E # BREAD #- 1F35F;FRENCH FRIES;So;0;ON;;;;;N;;;;; {chips} : "🍟" U1F35F # FRENCH FRIES - {ffries} : "🍟" U1F35F # FRENCH FRIES + {fries} : "🍟" U1F35F # FRENCH FRIES #- 1F360;ROASTED SWEET POTATO;So;0;ON;;;;;N;;;;; {yam} : "🍠" U1F360 # ROASTED SWEET POTATO #- 1F361;DANGO;So;0;ON;;;;;N;;;;; @@ -295,7 +297,7 @@ #- 1F385;FATHER CHRISTMAS;So;0;ON;;;;;N;;;;; {santa} : "🎅" U1F385 # FATHER CHRISTMAS #- 1F386;FIREWORKS;So;0;ON;;;;;N;;;;; - {firewrk} : "🎆" U1F386 # FIREWORKS + {Firewrk} : "🎆" U1F386 # FIREWORKS #- 1F387;FIREWORK SPARKLER;So;0;ON;;;;;N;;;;; {sparker} : "🎇" U1F387 # FIREWORK SPARKLER #- 1F388;BALLOON;So;0;ON;;;;;N;;;;; @@ -319,7 +321,7 @@ #- 1F391;MOON VIEWING CEREMONY;So;0;ON;;;;;N;;;;; ### {moon viewing ceremony} : "🎑" U1F391 # MOON VIEWING CEREMONY #- 1F392;SCHOOL SATCHEL;So;0;ON;;;;;N;;;;; - {bookbag} : "🎒" U1F392 # SCHOOL SATCHEL + {Bookbag} : "🎒" U1F392 # SCHOOL SATCHEL #- 1F393;GRADUATION CAP;So;0;ON;;;;;N;;;;; {grad} : "🎓" U1F393 # GRADUATION CAP #- 1F394;HEART WITH TIP ON THE LEFT;So;0;ON;;;;;N;;;;; @@ -327,7 +329,7 @@ #- 1F395;BOUQUET OF FLOWERS;So;0;ON;;;;;N;;;;; ### {bouquet of flowers} : "🎕" U1F395 # BOUQUET OF FLOWERS #- 1F396;MILITARY MEDAL;So;0;ON;;;;;N;;;;; - {medal} : "🎖" U1F396 # MILITARY MEDAL + {Medal} : "🎖" U1F396 # MILITARY MEDAL #- 1F397;REMINDER RIBBON;So;0;ON;;;;;N;;;;; {remind} : "🎗" U1F397 # REMINDER RIBBON {remembe} : "🎗" U1F397 # REMINDER RIBBON @@ -347,7 +349,7 @@ #- 1F39E;FILM FRAMES;So;0;ON;;;;;N;;;;; {frames} : "🎞" U1F39E # FILM FRAMES #- 1F39F;ADMISSION TICKETS;So;0;ON;;;;;N;;;;; - {tickets} : "🎟" U1F39F # ADMISSION TICKETS + {Tickets} : "🎟" U1F39F # ADMISSION TICKETS #- 1F3A0;CAROUSEL HORSE;So;0;ON;;;;;N;;;;; {carosel} : "🎠" U1F3A0 # CAROUSEL HORSE #- 1F3A1;FERRIS WHEEL;So;0;ON;;;;;N;;;;; @@ -372,7 +374,7 @@ #- 1F3AA;CIRCUS TENT;So;0;ON;;;;;N;;;;; {circus} : "🎪" U1F3AA # CIRCUS TENT #- 1F3AB;TICKET;So;0;ON;;;;;N;;;;; - {tickeT} : "🎫" U1F3AB # TICKET + {ticket} : "🎫" U1F3AB # TICKET #- 1F3AC;CLAPPER BOARD;So;0;ON;;;;;N;;;;; {clapper} : "🎬" U1F3AC # CLAPPER BOARD #- 1F3AD;PERFORMING ARTS;So;0;ON;;;;;N;;;;; @@ -390,7 +392,7 @@ {gamedie} : "🎲" U1F3B2 # GAME DIE ## Careful not to conflict with "bowl" #- 1F3B3;BOWLING;So;0;ON;;;;;N;;;;; - {bowling} : "🎳" U1F3B3 # BOWLING + {Bowling} : "🎳" U1F3B3 # BOWLING ## These were called "hanafuda" #- 1F3B4;FLOWER PLAYING CARDS;So;0;ON;;;;;N;;;;; {hanafda} : "🎴" U1F3B4 # FLOWER PLAYING CARDS @@ -525,7 +527,7 @@ #- 1F3F4;WAVING BLACK FLAG;So;0;ON;;;;;N;;;;; {Bflag~} : "🏴" U1F3F4 # WAVING BLACK FLAG #- 1F3F5;ROSETTE;So;0;ON;;;;;N;;;;; - {rosette} : "🏵" U1F3F5 # ROSETTE + {Rosette} : "🏵" U1F3F5 # ROSETTE #- 1F3F6;BLACK ROSETTE;So;0;ON;;;;;N;;;;; ### {black rosette} : "🏶" U1F3F6 # BLACK ROSETTE #- 1F3F7;LABEL;So;0;ON;;;;;N;;;;; @@ -589,7 +591,7 @@ #- 1F413;ROOSTER;So;0;ON;;;;;N;;;;; {rooster} : "🐓" U1F413 # ROOSTER #- 1F414;CHICKEN;So;0;ON;;;;;N;;;;; - {chicken} : "🐔" U1F414 # CHICKEN + {Chicken} : "🐔" U1F414 # CHICKEN #- 1F415;DOG;So;0;ON;;;;;N;;;;; {dog} : "🐕" U1F415 # DOG #- 1F416;PIG;So;0;ON;;;;;N;;;;; @@ -624,7 +626,7 @@ #- 1F423;HATCHING CHICK;So;0;ON;;;;;N;;;;; {hatch} : "🐣" U1F423 # HATCHING CHICK #- 1F424;BABY CHICK;So;0;ON;;;;;N;;;;; - {chicK} : "🐤" U1F424 # BABY CHICK + {chick} : "🐤" U1F424 # BABY CHICK #- 1F425;FRONT-FACING BABY CHICK;So;0;ON;;;;;N;;;;; ### {front-facing baby chick} : "🐥" U1F425 # FRONT-FACING BABY CHICK #- 1F426;BIRD;So;0;ON;;;;;N;;;;; @@ -634,7 +636,7 @@ #- 1F428;KOALA;So;0;ON;;;;;N;;;;; {koala} : "🐨" U1F428 # KOALA #- 1F429;POODLE;So;0;ON;;;;;N;;;;; - {poodle} : "🐩" U1F429 # POODLE + {Poodle} : "🐩" U1F429 # POODLE #- 1F42A;DROMEDARY CAMEL;So;0;ON;;;;;N;;;;; {camel} : "🐪" U1F42A # DROMEDARY CAMEL #- 1F42B;BACTRIAN CAMEL;So;0;ON;;;;;N;;;;; @@ -685,7 +687,7 @@ #- 1F441;EYE;So;0;ON;;;;;N;;;;; {eye} : "👁" U1F441 # EYE #- 1F442;EAR;So;0;ON;;;;;N;;;;; - {eaR} : "👂" U1F442 # EAR + {ear} : "👂" U1F442 # EAR #- 1F443;NOSE;So;0;ON;;;;;N;;;;; {nose} : "👃" U1F443 # NOSE #- 1F444;MOUTH;So;0;ON;;;;;N;;;;; @@ -812,6 +814,7 @@ #- 1F47F;IMP;So;0;ON;;;;;N;;;;; {imp} : "👿" U1F47F # IMP #- 1F480;SKULL;So;0;ON;;;;;N;;;;; + {Skull} : "💀" U1F480 # SKULL {skull} : "💀" U1F480 # SKULL #- 1F481;INFORMATION DESK PERSON;So;0;ON;;;;;N;;;;; ### {information desk person} : "💁" U1F481 # INFORMATION DESK PERSON @@ -820,8 +823,8 @@ #- 1F483;DANCER;So;0;ON;;;;;N;;;;; {dancer} : "💃" U1F483 # DANCER #- 1F484;LIPSTICK;So;0;ON;;;;;N;;;;; - {lipstic} : "💄" U1F484 # LIPSTICK - {lipstck} : "💄" U1F484 # LIPSTICK + {Lipstic} : "💄" U1F484 # LIPSTICK + {Lipstck} : "💄" U1F484 # LIPSTICK #- 1F485;NAIL POLISH;So;0;ON;;;;;N;;;;; ### {nail polish} : "💅" U1F485 # NAIL POLISH #- 1F486;FACE MASSAGE;So;0;ON;;;;;N;;;;; @@ -898,7 +901,7 @@ {dash} : "💨" U1F4A8 # DASH SYMBOL #- 1F4A9;PILE OF POO;So;0;ON;;;;;N;;;;; {shit} : "💩" U1F4A9 # PILE OF POO - {poO} : "💩" U1F4A9 # PILE OF POO + {poo} : "💩" U1F4A9 # PILE OF POO #- 1F4AA;FLEXED BICEPS;So;0;ON;;;;;N;;;;; {biceps} : "💪" U1F4AA # FLEXED BICEPS #- 1F4AB;DIZZY SYMBOL;So;0;ON;;;;;N;;;;; @@ -998,7 +1001,7 @@ #- 1F4D9;ORANGE BOOK;So;0;ON;;;;;N;;;;; ### {orange book} : "📙" U1F4D9 # ORANGE BOOK #- 1F4DA;BOOKS;So;0;ON;;;;;N;;;;; - {books} : "📚" U1F4DA # BOOKS + {Books} : "📚" U1F4DA # BOOKS #- 1F4DB;NAME BADGE;So;0;ON;;;;;N;;;;; {IDbadge} : "📛" U1F4DB # NAME BADGE #- 1F4DC;SCROLL;So;0;ON;;;;;N;;;;; @@ -1008,7 +1011,7 @@ #- 1F4DE;TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;; ### {telephone receiver} : "📞" U1F4DE # TELEPHONE RECEIVER #- 1F4DF;PAGER;So;0;ON;;;;;N;;;;; - {pager} : "📟" U1F4DF # PAGER + {Pager} : "📟" U1F4DF # PAGER #- 1F4E0;FAX MACHINE;So;0;ON;;;;;N;;;;; ### {fax machine} : "📠" U1F4E0 # FAX MACHINE #- 1F4E1;SATELLITE ANTENNA;So;0;ON;;;;;N;;;;; @@ -1065,7 +1068,7 @@ #- 1F4FA;TELEVISION;So;0;ON;;;;;N;;;;; {TV} : "📺" U1F4FA # TELEVISION #- 1F4FB;RADIO;So;0;ON;;;;;N;;;;; - {radio} : "📻" U1F4FB # RADIO + {Radio} : "📻" U1F4FB # RADIO #- 1F4FC;VIDEOCASSETTE;So;0;ON;;;;;N;;;;; ### {videocassette} : "📼" U1F4FC # VIDEOCASSETTE #- 1F4FD;FILM PROJECTOR;So;0;ON;;;;;N;;;;; @@ -1120,7 +1123,7 @@ {!bell} : "🔕" U1F515 # BELL WITH CANCELLATION STROKE {nobell} : "🔕" U1F515 # BELL WITH CANCELLATION STROKE #- 1F516;BOOKMARK;So;0;ON;;;;;N;;;;; - {bookmar} : "🔖" U1F516 # BOOKMARK + {Bookmar} : "🔖" U1F516 # BOOKMARK #- 1F517;LINK SYMBOL;So;0;ON;;;;;N;;;;; {link} : "🔗" U1F517 # LINK SYMBOL #- 1F518;RADIO BUTTON;So;0;ON;;;;;N;;;;; @@ -1153,7 +1156,7 @@ #- 1F524;INPUT SYMBOL FOR LATIN LETTERS;So;0;ON;;;;;N;;;;; ### {input symbol for latin letters} : "🔤" U1F524 # INPUT SYMBOL FOR LATIN LETTERS #- 1F525;FIRE;So;0;ON;;;;;N;;;;; - {firE} : "🔥" U1F525 # FIRE + {fire} : "🔥" U1F525 # FIRE #- 1F526;ELECTRIC TORCH;So;0;ON;;;;;N;;;;; {torch} : "🔦" U1F526 # ELECTRIC TORCH #- 1F527;WRENCH;So;0;ON;;;;;N;;;;; @@ -1253,7 +1256,7 @@ #- 1F56D;RINGING BELL;So;0;ON;;;;;N;;;;; ### {ringing bell} : "🕭" U1F56D # RINGING BELL #- 1F56E;BOOK;So;0;ON;;;;;N;;;;; - {booK} : "🕮" U1F56E # BOOK + {book} : "🕮" U1F56E # BOOK #- 1F56F;CANDLE;So;0;ON;;;;;N;;;;; {candle} : "🕯" U1F56F # CANDLE #- 1F570;MANTELPIECE CLOCK;So;0;ON;;;;;N;;;;; @@ -1447,9 +1450,9 @@ #- 1F5CE;DOCUMENT;So;0;ON;;;;;N;;;;; ### {document} : "🗎" U1F5CE # DOCUMENT #- 1F5CF;PAGE;So;0;ON;;;;;N;;;;; - {pagE} : "🗏" U1F5CF # PAGE + {page} : "🗏" U1F5CF # PAGE #- 1F5D0;PAGES;So;0;ON;;;;;N;;;;; - {pages} : "🗐" U1F5D0 # PAGES + {Pages} : "🗐" U1F5D0 # PAGES #- 1F5D1;WASTEBASKET;So;0;ON;;;;;N;;;;; {trash} : "🗑" U1F5D1 # WASTEBASKET #- 1F5D2;SPIRAL NOTE PAD;So;0;ON;;;;;N;;;;; @@ -1486,7 +1489,7 @@ #- 1F5E1;DAGGER KNIFE;So;0;ON;;;;;N;;;;; {dagger} : "🗡" U1F5E1 # DAGGER KNIFE #- 1F5E2;LIPS;So;0;ON;;;;;N;;;;; - {lipS} : "🗢" U1F5E2 # LIPS + {lips} : "🗢" U1F5E2 # LIPS #- 1F5E3;SPEAKING HEAD IN SILHOUETTE;So;0;ON;;;;;N;;;;; {talker} : "🗣" U1F5E3 # SPEAKING HEAD IN SILHOUETTE ## Arguably the wrong way around. @@ -1935,9 +1938,9 @@ #- 1F6BF;SHOWER;So;0;ON;;;;;N;;;;; {shower} : "🚿" U1F6BF # SHOWER #- 1F6C0;BATH;So;0;ON;;;;;N;;;;; - {batH} : "🛀" U1F6C0 # BATH + {bath} : "🛀" U1F6C0 # BATH #- 1F6C1;BATHTUB;So;0;ON;;;;;N;;;;; - {bathtub} : "🛁" U1F6C1 # BATHTUB + {Bathtub} : "🛁" U1F6C1 # BATHTUB #- 1F6C2;PASSPORT CONTROL;So;0;ON;;;;;N;;;;; ### {passport control} : "🛂" U1F6C2 # PASSPORT CONTROL #- 1F6C3;CUSTOMS;So;0;ON;;;;;N;;;;; -- cgit v1.2.3