From cc9312e5bbdc75f864606cb9caa91df31ba68f51 Mon Sep 17 00:00:00 2001 From: "Mark E. Shoulson" Date: Tue, 26 May 2020 11:24:46 -0400 Subject: Added half-stars; fixed some mistakes in comments. --- dotXCompose | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dotXCompose b/dotXCompose index 76f776d..06ee4aa 100644 --- a/dotXCompose +++ b/dotXCompose @@ -373,8 +373,8 @@ include "%L" : "∭" U222D # TRIPLE INTEGRAL : "⨌" U2A0C # QUADRUPLE INTEGRAL : "∮" U222E # CONTOUR INTEGRAL -

: "⨕" U2A15 # SEMICIRCULAR POLE INTEGRAL -

: "⨓" U2A13 # INTEGRAL AROUND POINT +

: "⨕" U2A15 # INTEGRAL AROUND A POINT OPERATOR +

: "⨓" U2A13 # LINE INTEGRATION WITH SEMICIRCULAR PATH AROUND POLE : "∯" U222F # SURFACE INTEGRAL : "∰" U2230 # VOLUME INTEGRAL : "⨘" U2A18 # GEOMETRIC INTEGRAL @@ -393,7 +393,6 @@ include "%L"

: "℘" U2118 # SCRIPT CAPITAL P # Would we prefer 20D1 COMBINING RIGHT HARPOON ABOVE? : "⃗" U20D7 # COMBINING RIGHT ARROW ABOVE (vector) -# There's a whole passel of these guys starting at U+1D538 but I have no fonts for those. : "ℂ" U2102 # DOUBLE-STRUCK CAPITAL C (set of complex numbers) : "ℕ" U2115 # DOUBLE-STRUCK CAPITAL N (natural number)

: "ℙ" U2119 # DOUBLE-STRUCK CAPITAL P @@ -867,6 +866,12 @@ include "%L" :"★" U2605 # BLACK STAR <0> :"☆" U2606 # WHITE STAR :"✪" U272A # CIRCLED WHITE STAR +## Did not have great luck with keystrokes for these. L/ conflicts with ł, +## and <2> : "⯨" U2BE8 # LEFT HALF BLACK STAR + <2> : "⯩" U2BE9 # RIGHT HALF BLACK STAR + <2> : "⯪" U2BEA # STAR WITH LEFT HALF BLACK + <2> : "⯫" U2BEB # STAR WITH RIGHT HALF BLACK <3> :"⁂" U2042 # ASTERISM <3> :"⁂" U2042 # ASTERISM <2> :"⁑" U2051 # TWO ASTERISKS ALIGNED VERTICALLY @@ -918,7 +923,7 @@ include "%L" : "ᵗ" U1D57 # MODIFIER LETTER SMALL T # Abbreviation for "that": : "ꝥ" UA765 # LATIN SMALL LETTER THORN WITH STROKE -#Maybe add: ˀˁ˃˂ Need to be able to talk about ʔˁ... +#Maybe add: ˃˂ Need to be able to talk about ʔˁ... : "ˀ" U02C0 # MODIFIER LETTER GLOTTAL STOP : "ˁ" U02C1 # MODIFIER LETTER REVERSED GLOTTAL STOP : "⁻" U207B # SUPERSCRIPT MINUS -- cgit v1.2.3 From 260998464bdda4627a15d1b40e2a9460c990f1dd Mon Sep 17 00:00:00 2001 From: "Mark E. Shoulson" Date: Mon, 1 Jun 2020 11:26:44 -0400 Subject: Added entries for new emoji in emoji-base Not necessarily key sequences for all that could have them. --- baserefresh.pl | 27 +++++++++++ checklines.py3 | 4 ++ dotXCompose | 3 ++ emoji-base | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 baserefresh.pl diff --git a/baserefresh.pl b/baserefresh.pl new file mode 100644 index 0000000..f684569 --- /dev/null +++ b/baserefresh.pl @@ -0,0 +1,27 @@ +#!/usr/bin/perl -n +my $last; + +# The whole "base" file format took shape kind of sloppily, just getting a +# list of likely-looking characters and all, which is why it's sort of a +# mess. It also didn't really have good ways of updating it with new +# emoji. This file is _part_ of such a solution: it takes in a "base" file +# and adds the "" line after just those "#-" lines which are not +# followed by a line that starts with "##" or with NO #-signs. + +BEGIN {binmode(STDOUT, ":utf8"); + binmode(STDIN, ":utf8"); +} + +while (/^#- /) { + $last = $_; + print; + $_ = <>; + if (/^[^#]/ or /^##/) { + last; + } + $last = substr($last, 3); + @_ = split /;/, $last; + printf qq( \{%s\} : "%s" U%s\t# %s\n), lc($_[1]),chr(hex($_[0])), $_[0], $_[1]; +} +print; + diff --git a/checklines.py3 b/checklines.py3 index dcc88e9..4551f0d 100755 --- a/checklines.py3 +++ b/checklines.py3 @@ -6,10 +6,12 @@ from unicodedata import name import re import sys +linecount = 0 for line in sys.stdin: line=line.strip() if not line or line[0]=="#": continue + linecount += 1 match=re.match(r'\s*(.*):\s*"(.*?)"\s*(\S*)\s*(#.*)?', line) if not match: print("({0})".format(line)) @@ -32,3 +34,5 @@ for line in sys.stdin: print("\tNumber gives character: {0} ({1})".format(c, name(c))) except Exception as e: print("{0}\n\t{1}".format(line, e)) + +print("Done. Checked %d lines."%linecount) diff --git a/dotXCompose b/dotXCompose index 06ee4aa..8a823e2 100644 --- a/dotXCompose +++ b/dotXCompose @@ -290,6 +290,9 @@ include "%L" : "∈" U2208 # ELEMENT OF : "∉" U2209 # NOT AN ELEMENT OF : "∉" U2209 # NOT AN ELEMENT OF (I have ∈ on my keyboard...) + : "∊" U220A # SMALL ELEMENT OF + : "∍" U220D # SMALL CONTAINS AS MEMBER +# For the above for people without ∈/∋ on their kbds? {♫i/n} and {♫n/i}? : "∋" U220B # CONTAINS AS MEMBER (I hope this doesn't conflict) : "∌" U220C # DOES NOT CONTAIN AS MEMBER # would conflict, with for N WITH UNDERDOT, etc. diff --git a/emoji-base b/emoji-base index 6dd8c3e..5a9d3ca 100644 --- a/emoji-base +++ b/emoji-base @@ -258,6 +258,7 @@ #- 2775;MEDIUM RIGHT CURLY BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;; ### {medium right curly bracket ornament} : "❵" U2775 # MEDIUM RIGHT CURLY BRACKET ORNAMENT #- 2776;DINGBAT NEGATIVE CIRCLED DIGIT ONE;No;0;ON;;;1;1;N;INVERSE CIRCLED DIGIT ONE;;;; + {dingbat negative circled digit one} : "❶" U2776 # DINGBAT NEGATIVE CIRCLED DIGIT ONE #- 1F300;CYCLONE;So;0;ON;;;;;N;;;;; {cyclone} : "🌀" U1F300 # CYCLONE #- 1F301;FOGGY;So;0;ON;;;;;N;;;;; @@ -1545,6 +1546,8 @@ {web} : "🕸" U1F578 # SPIDER WEB #- 1F579;JOYSTICK;So;0;ON;;;;;N;;;;; {joystic} : "🕹" U1F579 # JOYSTICK +#- 1F57A;MAN DANCING;So;0;ON;;;;;N;;;;; + {man dancing} : "🕺" U1F57A # MAN DANCING #- 1F57B;LEFT HAND TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;; ### {left hand telephone receiver} : "🕻" U1F57B # LEFT HAND TELEPHONE RECEIVER #- 1F57C;TELEPHONE RECEIVER WITH PAGE;So;0;ON;;;;;N;;;;; @@ -1630,6 +1633,8 @@ ### {black up pointing backhand index} : "🖢" U1F5A2 # BLACK UP POINTING BACKHAND INDEX #- 1F5A3;BLACK DOWN POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;; ### {black down pointing backhand index} : "🖣" U1F5A3 # BLACK DOWN POINTING BACKHAND INDEX +#- 1F5A4;BLACK HEART;So;0;ON;;;;;N;;;;; + {black heart} : "🖤" U1F5A4 # BLACK HEART #- 1F5A5;DESKTOP COMPUTER;So;0;ON;;;;;N;;;;; ### {desktop computer} : "🖥" U1F5A5 # DESKTOP COMPUTER #- 1F5A6;KEYBOARD AND MOUSE;So;0;ON;;;;;N;;;;; @@ -2266,8 +2271,20 @@ {bed} : "🛏" U1F6CF # BED #- 1F6D0;PLACE OF WORSHIP;So;0;ON;;;;;N;;;;; {shrine} : "🛐" U1F6D0 # PLACE OF WORSHIP +#- 1F6D1;OCTAGONAL SIGN;So;0;ON;;;;;N;;;;; + {octagonal sign} : "🛑" U1F6D1 # OCTAGONAL SIGN +#- 1F6D2;SHOPPING TROLLEY;So;0;ON;;;;;N;;;;; + {shopping trolley} : "🛒" U1F6D2 # SHOPPING TROLLEY +#- 1F6D3;STUPA;So;0;ON;;;;;N;;;;; + {stupa} : "🛓" U1F6D3 # STUPA +#- 1F6D4;PAGODA;So;0;ON;;;;;N;;;;; + {pagoda} : "🛔" U1F6D4 # PAGODA #- 1F6D5;HINDU TEMPLE;So;0;ON;;;;;N;;;;; {hindu temple} : "🛕" U1F6D5 # HINDU TEMPLE +#- 1F6D6;HUT;So;0;ON;;;;;N;;;;; + {hut} : "🛖" U1F6D6 # HUT +#- 1F6D7;ELEVATOR;So;0;ON;;;;;N;;;;; + {elevator} : "🛗" U1F6D7 # ELEVATOR #- 1F6E0;HAMMER AND WRENCH;So;0;ON;;;;;N;;;;; {tools} : "🛠" U1F6E0 # HAMMER AND WRENCH #- 1F6E1;SHIELD;So;0;ON;;;;;N;;;;; @@ -2302,8 +2319,24 @@ ### {diesel locomotive} : "🛲" U1F6F2 # DIESEL LOCOMOTIVE #- 1F6F3;PASSENGER SHIP;So;0;ON;;;;;N;;;;; ### {passenger ship} : "🛳" U1F6F3 # PASSENGER SHIP +#- 1F6F4;SCOOTER;So;0;ON;;;;;N;;;;; + {scooter} : "🛴" U1F6F4 # SCOOTER +#- 1F6F5;MOTOR SCOOTER;So;0;ON;;;;;N;;;;; + {motor scooter} : "🛵" U1F6F5 # MOTOR SCOOTER +#- 1F6F6;CANOE;So;0;ON;;;;;N;;;;; + {canoe} : "🛶" U1F6F6 # CANOE +#- 1F6F7;SLED;So;0;ON;;;;;N;;;;; + {sled} : "🛷" U1F6F7 # SLED +#- 1F6F8;FLYING SAUCER;So;0;ON;;;;;N;;;;; + {flying saucer} : "🛸" U1F6F8 # FLYING SAUCER +#- 1F6F9;SKATEBOARD;So;0;ON;;;;;N;;;;; + {skateboard} : "🛹" U1F6F9 # SKATEBOARD #- 1F6FA;AUTO RICKSHAW;So;0;ON;;;;;N;;;;; {auto rickshaw} : "🛺" U1F6FA # AUTO RICKSHAW +#- 1F6FB;PICKUP TRUCK;So;0;ON;;;;;N;;;;; + {pickup truck} : "🛻" U1F6FB # PICKUP TRUCK +#- 1F6FC;ROLLER SKATE;So;0;ON;;;;;N;;;;; + {roller skate} : "🛼" U1F6FC # ROLLER SKATE #- 1F7E0;LARGE ORANGE CIRCLE;So;0;ON;;;;;N;;;;; {large orange circle} : "🟠" U1F7E0 # LARGE ORANGE CIRCLE #- 1F7E1;LARGE YELLOW CIRCLE;So;0;ON;;;;;N;;;;; @@ -2369,6 +2402,8 @@ {handsha} : "🤝" U1F91D # HANDSHAKE #- 1F91E;HAND WITH INDEX AND MIDDLE FINGERS CROSSED;So;0;ON;;;;;N;;;;; {fingerX} : "🤞" U1F91E # HAND WITH INDEX AND MIDDLE FINGERS CROSSED +#- 1F91F;I LOVE YOU HAND SIGN;So;0;ON;;;;;N;;;;; + {i love you hand sign} : "🤟" U1F91F # I LOVE YOU HAND SIGN #- 1F920;FACE WITH COWBOY HAT;So;0;ON;;;;;N;;;;; ### {face with cowboy hat} : "🤠" U1F920 # FACE WITH COWBOY HAT #- 1F921;CLOWN FACE;So;0;ON;;;;;N;;;;; @@ -2538,6 +2573,8 @@ {smiling face with smiling eyes and three hearts} : "🥰" U1F970 # SMILING FACE WITH SMILING EYES AND THREE HEARTS #- 1F971;YAWNING FACE;So;0;ON;;;;;N;;;;; {()yawn} : "🥱" U1F971 # YAWNING FACE +#- 1F972;SMILING FACE WITH TEAR;So;0;ON;;;;;N;;;;; + {smiling face with tear} : "🥲" U1F972 # SMILING FACE WITH TEAR #- 1F973;FACE WITH PARTY HORN AND PARTY HAT;So;0;ON;;;;;N;;;;; {()party} : "🥳" U1F973 # FACE WITH PARTY HORN AND PARTY HAT #- 1F974;FACE WITH UNEVEN EYES AND WAVY MOUTH;So;0;ON;;;;;N;;;;; @@ -2547,6 +2584,10 @@ {overheated face} : "🥵" U1F975 # OVERHEATED FACE #- 1F976;FREEZING FACE;So;0;ON;;;;;N;;;;; {()freez} : "🥶" U1F976 # FREEZING FACE +#- 1F977;NINJA;So;0;ON;;;;;N;;;;; + {ninja} : "🥷" U1F977 # NINJA +#- 1F978;DISGUISED FACE;So;0;ON;;;;;N;;;;; + {disguised face} : "🥸" U1F978 # DISGUISED FACE #- 1F97A;FACE WITH PLEADING EYES;So;0;ON;;;;;N;;;;; {()plead} : "🥺" U1F97A # FACE WITH PLEADING EYES #- 1F97B;SARI;So;0;ON;;;;;N;;;;; @@ -2630,6 +2671,10 @@ {badger} : "🦡" U1F9A1 # BADGER #- 1F9A2;SWAN;So;0;ON;;;;;N;;;;; {swan} : "🦢" U1F9A2 # SWAN +#- 1F9A3;MAMMOTH;So;0;ON;;;;;N;;;;; + {mammoth} : "🦣" U1F9A3 # MAMMOTH +#- 1F9A4;DODO;So;0;ON;;;;;N;;;;; + {dodo} : "🦤" U1F9A4 # DODO #- 1F9A5;SLOTH;So;0;ON;;;;;N;;;;; {sloth} : "🦥" U1F9A5 # SLOTH #- 1F9A6;OTTER;So;0;ON;;;;;N;;;;; @@ -2642,6 +2687,12 @@ {flamingo} : "🦩" U1F9A9 # FLAMINGO #- 1F9AA;OYSTER;So;0;ON;;;;;N;;;;; {oyster} : "🦪" U1F9AA # OYSTER +#- 1F9AB;BEAVER;So;0;ON;;;;;N;;;;; + {beaver} : "🦫" U1F9AB # BEAVER +#- 1F9AC;BISON;So;0;ON;;;;;N;;;;; + {bison} : "🦬" U1F9AC # BISON +#- 1F9AD;SEAL;So;0;ON;;;;;N;;;;; + {seal} : "🦭" U1F9AD # SEAL #- 1F9AE;GUIDE DOG;So;0;ON;;;;;N;;;;; {guide dog} : "🦮" U1F9AE # GUIDE DOG #- 1F9AF;PROBING CANE;So;0;ON;;;;;N;;;;; @@ -2701,6 +2752,8 @@ {yerba} : "🧉" U1F9C9 # MATE DRINK #- 1F9CA;ICE CUBE;So;0;ON;;;;;N;;;;; {icecube} : "🧊" U1F9CA # ICE CUBE +#- 1F9CB;BUBBLE TEA;So;0;ON;;;;;N;;;;; + {bubble tea} : "🧋" U1F9CB # BUBBLE TEA #- 1F9CD;STANDING PERSON;So;0;ON;;;;;N;;;;; {stander} : "🧍" U1F9CD # STANDING PERSON #- 1F9CE;KNEELING PERSON;So;0;ON;;;;;N;;;;; @@ -2759,7 +2812,7 @@ #- 1F9E8;FIRECRACKER;So;0;ON;;;;;N;;;;; {firecracker} : "🧨" U1F9E8 # FIRECRACKER #- 1F9E9;JIGSAW PUZZLE PIECE;So;0;ON;;;;;N;;;;; - {jigsaw puzzle piece} : "🧩" U1F9E9 # JIGSAW PUZZLE PIECE + {puzzle} : "🧩" U1F9E9 # JIGSAW PUZZLE PIECE #- 1F9EA;TEST TUBE;So;0;ON;;;;;N;;;;; {test tube} : "🧪" U1F9EA # TEST TUBE #- 1F9EB;PETRI DISH;So;0;ON;;;;;N;;;;; @@ -2812,6 +2865,8 @@ {briefs} : "🩲" U1FA72 # BRIEFS #- 1FA73;SHORTS;So;0;ON;;;;;N;;;;; {shorts} : "🩳" U1FA73 # SHORTS +#- 1FA74;THONG SANDAL;So;0;ON;;;;;N;;;;; + {thong sandal} : "🩴" U1FA74 # THONG SANDAL #- 1FA78;DROP OF BLOOD;So;0;ON;;;;;N;;;;; {blood} : "🩸" U1FA78 # DROP OF BLOOD #- 1FA79;ADHESIVE BANDAGE;So;0;ON;;;;;N;;;;; @@ -2824,6 +2879,14 @@ {kite} : "🪁" U1FA81 # KITE #- 1FA82;PARACHUTE;So;0;ON;;;;;N;;;;; {parachute} : "🪂" U1FA82 # PARACHUTE +#- 1FA83;BOOMERANG;So;0;ON;;;;;N;;;;; + {boomerang} : "🪃" U1FA83 # BOOMERANG +#- 1FA84;MAGIC WAND;So;0;ON;;;;;N;;;;; + {magic wand} : "🪄" U1FA84 # MAGIC WAND +#- 1FA85;PINATA;So;0;ON;;;;;N;;;;; + {pinata} : "🪅" U1FA85 # PINATA +#- 1FA86;NESTING DOLLS;So;0;ON;;;;;N;;;;; + {nesting dolls} : "🪆" U1FA86 # NESTING DOLLS #- 1FA90;RINGED PLANET;So;0;ON;;;;;N;;;;; {ringed planet} : "🪐" U1FA90 # RINGED PLANET #- 1FA91;CHAIR;So;0;ON;;;;;N;;;;; @@ -2836,3 +2899,78 @@ {diya} : "🪔" U1FA94 # DIYA LAMP #- 1FA95;BANJO;So;0;ON;;;;;N;;;;; {banjo} : "🪕" U1FA95 # BANJO +#- 1FA96;MILITARY HELMET;So;0;ON;;;;;N;;;;; + {military helmet} : "🪖" U1FA96 # MILITARY HELMET +#- 1FA97;ACCORDION;So;0;ON;;;;;N;;;;; + {accordion} : "🪗" U1FA97 # ACCORDION +#- 1FA98;LONG DRUM;So;0;ON;;;;;N;;;;; + {long drum} : "🪘" U1FA98 # LONG DRUM +#- 1FA99;COIN;So;0;ON;;;;;N;;;;; + {coin} : "🪙" U1FA99 # COIN +#- 1FA9A;CARPENTRY SAW;So;0;ON;;;;;N;;;;; + {saw} : "🪚" U1FA9A # CARPENTRY SAW +#- 1FA9B;SCREWDRIVER;So;0;ON;;;;;N;;;;; + {screwdriver} : "🪛" U1FA9B # SCREWDRIVER +#- 1FA9C;LADDER;So;0;ON;;;;;N;;;;; + {ladder} : "🪜" U1FA9C # LADDER +#- 1FA9D;HOOK;So;0;ON;;;;;N;;;;; + {hook} : "🪝" U1FA9D # HOOK +#- 1FA9E;MIRROR;So;0;ON;;;;;N;;;;; + {mirror} : "🪞" U1FA9E # MIRROR +#- 1FA9F;WINDOW;So;0;ON;;;;;N;;;;; + {window} : "🪟" U1FA9F # WINDOW +#- 1FAA0;PLUNGER;So;0;ON;;;;;N;;;;; + {plunger} : "🪠" U1FAA0 # PLUNGER +#- 1FAA1;SEWING NEEDLE;So;0;ON;;;;;N;;;;; + {needle} : "🪡" U1FAA1 # SEWING NEEDLE +#- 1FAA2;KNOT;So;0;ON;;;;;N;;;;; + {knot} : "🪢" U1FAA2 # KNOT +#- 1FAA3;BUCKET;So;0;ON;;;;;N;;;;; + {bucket} : "🪣" U1FAA3 # BUCKET +#- 1FAA4;MOUSE TRAP;So;0;ON;;;;;N;;;;; + {mouse trap} : "🪤" U1FAA4 # MOUSE TRAP +#- 1FAA5;TOOTHBRUSH;So;0;ON;;;;;N;;;;; + {toothbrush} : "🪥" U1FAA5 # TOOTHBRUSH +#- 1FAA6;HEADSTONE;So;0;ON;;;;;N;;;;; + {headstone} : "🪦" U1FAA6 # HEADSTONE +#- 1FAA7;PLACARD;So;0;ON;;;;;N;;;;; + {placard} : "🪧" U1FAA7 # PLACARD +#- 1FAA8;ROCK;So;0;ON;;;;;N;;;;; + {rock♫} : "🪨" U1FAA8 # ROCK +### {rock} has prefix conflicts {rocket}, {rockon} +#- 1FAB0;FLY;So;0;ON;;;;;N;;;;; + {fly♫} : "🪰" U1FAB0 # FLY +### {fly} has prefix-conflicts {flying$} etc +#- 1FAB1;WORM;So;0;ON;;;;;N;;;;; + {worm} : "🪱" U1FAB1 # WORM +#- 1FAB2;BEETLE;So;0;ON;;;;;N;;;;; + {beetle} : "🪲" U1FAB2 # BEETLE +#- 1FAB3;COCKROACH;So;0;ON;;;;;N;;;;; + {cockroach} : "🪳" U1FAB3 # COCKROACH +#- 1FAB4;POTTED PLANT;So;0;ON;;;;;N;;;;; + {potted plant} : "🪴" U1FAB4 # POTTED PLANT +#- 1FAB5;WOOD;So;0;ON;;;;;N;;;;; + {wood} : "🪵" U1FAB5 # WOOD +#- 1FAB6;FEATHER;So;0;ON;;;;;N;;;;; + {feather} : "🪶" U1FAB6 # FEATHER +#- 1FAC0;ANATOMICAL HEART;So;0;ON;;;;;N;;;;; + {anat<3} : "🫀" U1FAC0 # ANATOMICAL HEART +#- 1FAC1;LUNGS;So;0;ON;;;;;N;;;;; + {lungs} : "🫁" U1FAC1 # LUNGS +#- 1FAC2;PEOPLE HUGGING;So;0;ON;;;;;N;;;;; + {huggers} : "🫂" U1FAC2 # PEOPLE HUGGING +#- 1FAD0;BLUEBERRIES;So;0;ON;;;;;N;;;;; + {blueberries} : "🫐" U1FAD0 # BLUEBERRIES +#- 1FAD1;BELL PEPPER;So;0;ON;;;;;N;;;;; + {bell pepper} : "🫑" U1FAD1 # BELL PEPPER +#- 1FAD2;OLIVE;So;0;ON;;;;;N;;;;; + {olive} : "🫒" U1FAD2 # OLIVE +#- 1FAD3;FLATBREAD;So;0;ON;;;;;N;;;;; + {flatbread} : "🫓" U1FAD3 # FLATBREAD +#- 1FAD4;TAMALE;So;0;ON;;;;;N;;;;; + {tamale} : "🫔" U1FAD4 # TAMALE +#- 1FAD5;FONDUE;So;0;ON;;;;;N;;;;; + {fondue} : "🫕" U1FAD5 # FONDUE +#- 1FAD6;TEAPOT;So;0;ON;;;;;N;;;;; + {Teapot} : "🫖" U1FAD6 # TEAPOT +### prefix-conflict with {tea} -- cgit v1.2.3 From 23dc941b67d06389679829a02262e224d1c2e186 Mon Sep 17 00:00:00 2001 From: "Mark E. Shoulson" Date: Mon, 1 Jun 2020 12:56:03 -0400 Subject: A bunch more emoji, including some new ones. Fix to emojitrans2.pl to keep the RE correct. --- emoji-base | 97 ++++++++++++++++++++++++++++++++-------------------------- emojitrans2.pl | 7 ++++- 2 files changed, 59 insertions(+), 45 deletions(-) diff --git a/emoji-base b/emoji-base index 5a9d3ca..13ac649 100644 --- a/emoji-base +++ b/emoji-base @@ -21,17 +21,18 @@ #- 26D3;CHAINS;So;0;ON;;;;;N;;;;; {chains} : "⛓" U26D3 # CHAINS #- 2700;BLACK SAFETY SCISSORS;So;0;ON;;;;;N;;;;; -### {black safety scissors} : "✀" U2700 # BLACK SAFETY SCISSORS + {BS8<} : "✀" U2700 # BLACK SAFETY SCISSORS #- 2701;UPPER BLADE SCISSORS;So;0;ON;;;;;N;;;;; -### {upper blade scissors} : "✁" U2701 # UPPER BLADE SCISSORS + {^8<} : "✁" U2701 # UPPER BLADE SCISSORS #- 2702;BLACK SCISSORS;So;0;ON;;;;;N;;;;; -### {black scissors} : "✂" U2702 # BLACK SCISSORS + {B8<} : "✂" U2702 # BLACK SCISSORS #- 2703;LOWER BLADE SCISSORS;So;0;ON;;;;;N;;;;; -### {lower blade scissors} : "✃" U2703 # LOWER BLADE SCISSORS + {_8<} : "✃" U2703 # LOWER BLADE SCISSORS #- 2704;WHITE SCISSORS;So;0;ON;;;;;N;;;;; -### {white scissors} : "✄" U2704 # WHITE SCISSORS + {W8<} : "✄" U2704 # WHITE SCISSORS #- 2705;WHITE HEAVY CHECK MARK;So;0;ON;;;;;N;;;;; -### {white heavy check mark} : "✅" U2705 # WHITE HEAVY CHECK MARK +## ♫@@/ is the black HEAVY CHECKMARK ✔ already + {W@@/} : "✅" U2705 # WHITE HEAVY CHECK MARK #- 2706;TELEPHONE LOCATION SIGN;So;0;ON;;;;;N;;;;; ### {telephone location sign} : "✆" U2706 # TELEPHONE LOCATION SIGN #- 2707;TAPE DRIVE;So;0;ON;;;;;N;;;;; @@ -59,14 +60,17 @@ #- 2712;BLACK NIB;So;0;ON;;;;;N;;;;; ### {black nib} : "✒" U2712 # BLACK NIB #- 2713;CHECK MARK;So;0;ON;;;;;N;;;;; -### {check mark} : "✓" U2713 # CHECK MARK +## Should we also match the single-♫ versions? +### {check mark} : "✓" U2713 # CHECK MARK #- 2714;HEAVY CHECK MARK;So;0;ON;;;;;N;;;;; -### {heavy check mark} : "✔" U2714 # HEAVY CHECK MARK +### {heavy check mark} : "✔" U2714 # HEAVY CHECK MARK #- 2715;MULTIPLICATION X;So;0;ON;;;;;N;;;;; -### {multiplication x} : "✕" U2715 # MULTIPLICATION X +## Just ♫xx is MULTIPLICATION SIGN. + {xx} : "✕" U2715 # MULTIPLICATION X #- 2716;HEAVY MULTIPLICATION X;So;0;ON;;;;;N;;;;; -### {heavy multiplication x} : "✖" U2716 # HEAVY MULTIPLICATION X + {@xx} : "✖" U2716 # HEAVY MULTIPLICATION X #- 2717;BALLOT X;So;0;ON;;;;;N;;;;; +## These are already ♫@X and ♫@@X ### {ballot x} : "✗" U2717 # BALLOT X #- 2718;HEAVY BALLOT X;So;0;ON;;;;;N;;;;; ### {heavy ballot x} : "✘" U2718 # HEAVY BALLOT X @@ -88,6 +92,7 @@ ### {maltese cross} : "✠" U2720 # MALTESE CROSS #- 2721;STAR OF DAVID;So;0;ON;;;;;N;;;;; {*david} : "✡" U2721 # STAR OF DAVID +## So many stars and asterisks! And even Xs! How to distinguish? #- 2722;FOUR TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;; ### {four teardrop-spoked asterisk} : "✢" U2722 # FOUR TEARDROP-SPOKED ASTERISK #- 2723;FOUR BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;; @@ -174,11 +179,11 @@ #- 274B;HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK;So;0;ON;;;;;N;;;;; ### {heavy eight teardrop-spoked propeller asterisk} : "❋" U274B # HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK #- 274C;CROSS MARK;So;0;ON;;;;;N;;;;; -### {cross mark} : "❌" U274C # CROSS MARK + {XX} : "❌" U274C # CROSS MARK #- 274D;SHADOWED WHITE CIRCLE;So;0;ON;;;;;N;;;;; ### {shadowed white circle} : "❍" U274D # SHADOWED WHITE CIRCLE #- 274E;NEGATIVE SQUARED CROSS MARK;So;0;ON;;;;;N;;;;; -### {negative squared cross mark} : "❎" U274E # NEGATIVE SQUARED CROSS MARK + {[XX]} : "❎" U274E # NEGATIVE SQUARED CROSS MARK #- 274F;LOWER RIGHT DROP-SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;; ### {lower right drop-shadowed white square} : "❏" U274F # LOWER RIGHT DROP-SHADOWED WHITE SQUARE #- 2750;UPPER RIGHT DROP-SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;; @@ -188,15 +193,15 @@ #- 2752;UPPER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;; ### {upper right shadowed white square} : "❒" U2752 # UPPER RIGHT SHADOWED WHITE SQUARE #- 2753;BLACK QUESTION MARK ORNAMENT;So;0;ON;;;;;N;;;;; -### {black question mark ornament} : "❓" U2753 # BLACK QUESTION MARK ORNAMENT + {@B?} : "❓" U2753 # BLACK QUESTION MARK ORNAMENT #- 2754;WHITE QUESTION MARK ORNAMENT;So;0;ON;;;;;N;;;;; -### {white question mark ornament} : "❔" U2754 # WHITE QUESTION MARK ORNAMENT + {@W?} : "❔" U2754 # WHITE QUESTION MARK ORNAMENT #- 2755;WHITE EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; -### {white exclamation mark ornament} : "❕" U2755 # WHITE EXCLAMATION MARK ORNAMENT + {@W!} : "❕" U2755 # WHITE EXCLAMATION MARK ORNAMENT #- 2756;BLACK DIAMOND MINUS WHITE X;So;0;ON;;;;;N;;;;; ### {black diamond minus white x} : "❖" U2756 # BLACK DIAMOND MINUS WHITE X #- 2757;HEAVY EXCLAMATION MARK SYMBOL;So;0;ON;;;;;N;;;;; -### {heavy exclamation mark symbol} : "❗" U2757 # HEAVY EXCLAMATION MARK SYMBOL + {@B!} : "❗" U2757 # HEAVY EXCLAMATION MARK SYMBOL #- 2758;LIGHT VERTICAL BAR;So;0;ON;;;;;N;;;;; ### {light vertical bar} : "❘" U2758 # LIGHT VERTICAL BAR #- 2759;MEDIUM VERTICAL BAR;So;0;ON;;;;;N;;;;; @@ -204,17 +209,17 @@ #- 275A;HEAVY VERTICAL BAR;So;0;ON;;;;;N;;;;; ### {heavy vertical bar} : "❚" U275A # HEAVY VERTICAL BAR #- 275B;HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; -### {heavy single turned comma quotation mark ornament} : "❛" U275B # HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT + {@6'} : "❛" U275B # HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT #- 275C;HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; -### {heavy single comma quotation mark ornament} : "❜" U275C # HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT + {@9'} : "❜" U275C # HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT #- 275D;HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; -### {heavy double turned comma quotation mark ornament} : "❝" U275D # HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT + {@6"} : "❝" U275D # HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT #- 275E;HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; -### {heavy double comma quotation mark ornament} : "❞" U275E # HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT + {@9"} : "❞" U275E # HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT #- 275F;HEAVY LOW SINGLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; -### {heavy low single comma quotation mark ornament} : "❟" U275F # HEAVY LOW SINGLE COMMA QUOTATION MARK ORNAMENT + {@1,} : "❟" U275F # HEAVY LOW SINGLE COMMA QUOTATION MARK ORNAMENT #- 2760;HEAVY LOW DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; -### {heavy low double comma quotation mark ornament} : "❠" U2760 # HEAVY LOW DOUBLE COMMA QUOTATION MARK ORNAMENT + {@2,} : "❠" U2760 # HEAVY LOW DOUBLE COMMA QUOTATION MARK ORNAMENT #- 2761;CURVED STEM PARAGRAPH SIGN ORNAMENT;So;0;ON;;;;;N;;;;; ### {curved stem paragraph sign ornament} : "❡" U2761 # CURVED STEM PARAGRAPH SIGN ORNAMENT #- 2762;HEAVY EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;; @@ -330,7 +335,7 @@ #- 1F321;THERMOMETER;So;0;ON;;;;;N;;;;; {thermom} : "🌡" U1F321 # THERMOMETER #- 1F322;BLACK DROPLET;So;0;ON;;;;;N;;;;; - {black droplet} : "🌢" U1F322 # BLACK DROPLET + {Bdrop} : "🌢" U1F322 # BLACK DROPLET #- 1F323;WHITE SUN;So;0;ON;;;;;N;;;;; {white sun} : "🌣" U1F323 # WHITE SUN #- 1F324;WHITE SUN WITH SMALL CLOUD;So;0;ON;;;;;N;;;;; @@ -784,7 +789,7 @@ #- 1F3F5;ROSETTE;So;0;ON;;;;;N;;;;; {Rosette} : "🏵" U1F3F5 # ROSETTE #- 1F3F6;BLACK ROSETTE;So;0;ON;;;;;N;;;;; -### {black rosette} : "🏶" U1F3F6 # BLACK ROSETTE + {BRosett} : "🏶" U1F3F6 # BLACK ROSETTE #- 1F3F7;LABEL;So;0;ON;;;;;N;;;;; {label} : "🏷" U1F3F7 # LABEL #- 1F3F8;BADMINTON RACQUET AND SHUTTLECOCK;So;0;ON;;;;;N;;;;; @@ -1349,9 +1354,9 @@ #- 1F502;CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS WITH CIRCLED ONE OVERLAY;So;0;ON;;;;;N;;;;; {1repeat} : "🔂" U1F502 # CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS WITH CIRCLED ONE OVERLAY #- 1F503;CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS;So;0;ON;;;;;N;;;;; -### {clockwise downwards and upwards open circle arrows} : "🔃" U1F503 # CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS + {↑repeat} : "🔃" U1F503 # CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS #- 1F504;ANTICLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS;So;0;ON;;;;;N;;;;; -### {anticlockwise downwards and upwards open circle arrows} : "🔄" U1F504 # ANTICLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS + {↓repeat} : "🔄" U1F504 # ANTICLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS #- 1F505;LOW BRIGHTNESS SYMBOL;So;0;ON;;;;;N;;;;; {dim} : "🔅" U1F505 # LOW BRIGHTNESS SYMBOL #- 1F506;HIGH BRIGHTNESS SYMBOL;So;0;ON;;;;;N;;;;; @@ -1447,9 +1452,9 @@ #- 1F531;TRIDENT EMBLEM;So;0;ON;;;;;N;;;;; ### {trident emblem} : "🔱" U1F531 # TRIDENT EMBLEM #- 1F532;BLACK SQUARE BUTTON;So;0;ON;;;;;N;;;;; -### {black square button} : "🔲" U1F532 # BLACK SQUARE BUTTON + {Bbutton} : "🔲" U1F532 # BLACK SQUARE BUTTON #- 1F533;WHITE SQUARE BUTTON;So;0;ON;;;;;N;;;;; -### {white square button} : "🔳" U1F533 # WHITE SQUARE BUTTON + {Wbutton} : "🔳" U1F533 # WHITE SQUARE BUTTON #- 1F534;LARGE RED CIRCLE;So;0;ON;;;;;N;;;;; ### {large red circle} : "🔴" U1F534 # LARGE RED CIRCLE #- 1F535;LARGE BLUE CIRCLE;So;0;ON;;;;;N;;;;; @@ -1688,7 +1693,7 @@ #- 1F5BE;FRAME WITH AN X;So;0;ON;;;;;N;;;;; ### {frame with an x} : "🖾" U1F5BE # FRAME WITH AN X #- 1F5BF;BLACK FOLDER;So;0;ON;;;;;N;;;;; -### {black folder} : "🖿" U1F5BF # BLACK FOLDER + {Bfolder} : "🖿" U1F5BF # BLACK FOLDER #- 1F5C0;FOLDER;So;0;ON;;;;;N;;;;; {folder} : "🗀" U1F5C0 # FOLDER #- 1F5C1;OPEN FOLDER;So;0;ON;;;;;N;;;;; @@ -1796,16 +1801,17 @@ ### {ballot box with ballot} : "🗳" U1F5F3 # BALLOT BOX WITH BALLOT #- 1F5F4;BALLOT SCRIPT X;So;0;ON;;;;;N;;;;; ### {ballot script x} : "🗴" U1F5F4 # BALLOT SCRIPT X +## We already have ♫[x] for ☒ #- 1F5F5;BALLOT BOX WITH SCRIPT X;So;0;ON;;;;;N;;;;; -### {ballot box with script x} : "🗵" U1F5F5 # BALLOT BOX WITH SCRIPT X + {[x]} : "🗵" U1F5F5 # BALLOT BOX WITH SCRIPT X #- 1F5F6;BALLOT BOLD SCRIPT X;So;0;ON;;;;;N;;;;; ### {ballot bold script x} : "🗶" U1F5F6 # BALLOT BOLD SCRIPT X #- 1F5F7;BALLOT BOX WITH BOLD SCRIPT X;So;0;ON;;;;;N;;;;; -### {ballot box with bold script x} : "🗷" U1F5F7 # BALLOT BOX WITH BOLD SCRIPT X + {[@x]} : "🗷" U1F5F7 # BALLOT BOX WITH BOLD SCRIPT X #- 1F5F8;LIGHT CHECK MARK;So;0;ON;;;;;N;;;;; ### {light check mark} : "🗸" U1F5F8 # LIGHT CHECK MARK #- 1F5F9;BALLOT BOX WITH BOLD CHECK;So;0;ON;;;;;N;;;;; -### {ballot box with bold check} : "🗹" U1F5F9 # BALLOT BOX WITH BOLD CHECK + {[@/]} : "🗹" U1F5F9 # BALLOT BOX WITH BOLD CHECK #- 1F5FA;WORLD MAP;So;0;ON;;;;;N;;;;; {world} : "🗺" U1F5FA # WORLD MAP #- 1F5FB;MOUNT FUJI;So;0;ON;;;;;N;;;;; @@ -1918,8 +1924,9 @@ {()fearf} : "😨" U1F628 # FEARFUL FACE #- 1F629;WEARY FACE;So;0;ON;;;;;N;;;;; {()weary} : "😩" U1F629 # WEARY FACE +## sleepY vs sleepING... use zzz for the latter. #- 1F62A;SLEEPY FACE;So;0;ON;;;;;N;;;;; -### {sleepy face} : "😪" U1F62A # SLEEPY FACE + {()sleep} : "😪" U1F62A # SLEEPY FACE #- 1F62B;TIRED FACE;So;0;ON;;;;;N;;;;; {()tired} : "😫" U1F62B # TIRED FACE #- 1F62C;GRIMACING FACE;So;0;ON;;;;;N;;;;; @@ -1941,7 +1948,7 @@ {()blush} : "😳" U1F633 # FLUSHED FACE {()flush} : "😳" U1F633 # FLUSHED FACE #- 1F634;SLEEPING FACE;So;0;ON;;;;;N;;;;; -### {sleeping face} : "😴" U1F634 # SLEEPING FACE + {()zzz} : "😴" U1F634 # SLEEPING FACE #- 1F635;DIZZY FACE;So;0;ON;;;;;N;;;;; {()dizzy} : "😵" U1F635 # DIZZY FACE #- 1F636;FACE WITHOUT MOUTH;So;0;ON;;;;;N;;;;; @@ -2186,7 +2193,7 @@ #- 1F6AA;DOOR;So;0;ON;;;;;N;;;;; {door} : "🚪" U1F6AA # DOOR #- 1F6AB;NO ENTRY SIGN;So;0;ON;;;;;N;;;;; -### {no entry sign} : "🚫" U1F6AB # NO ENTRY SIGN + {noentry} : "🚫" U1F6AB # NO ENTRY SIGN #- 1F6AC;SMOKING SYMBOL;So;0;ON;;;;;N;;;;; {smoke} : "🚬" U1F6AC # SMOKING SYMBOL #- 1F6AD;NO SMOKING SYMBOL;So;0;ON;;;;;N;;;;; @@ -2207,7 +2214,7 @@ #- 1F6B3;NO BICYCLES;So;0;ON;;;;;N;;;;; {!bicycl} : "🚳" U1F6B3 # NO BICYCLES #- 1F6B4;BICYCLIST;So;0;ON;;;;;N;;;;; -### {bicyclist} : "🚴" U1F6B4 # BICYCLIST + {cyclist} : "🚴" U1F6B4 # BICYCLIST #- 1F6B5;MOUNTAIN BICYCLIST;So;0;ON;;;;;N;;;;; ### {mountain bicyclist} : "🚵" U1F6B5 # MOUNTAIN BICYCLIST #- 1F6B6;PEDESTRIAN;So;0;ON;;;;;N;;;;; @@ -2251,6 +2258,7 @@ {noway} : "🛇" U1F6C7 # PROHIBITED SIGN #- 1F6C8;CIRCLED INFORMATION SOURCE;So;0;ON;;;;;N;;;;; {(info)} : "🛈" U1F6C8 # CIRCLED INFORMATION SOURCE +## Sorry, this one is out of order. #- 2139;INFORMATION SOURCE;Ll;0;L; 0069;;;;N;;;;; {info} : "ℹ" U2139 # INFORMATION SOURCE ## careful for conflicts with {boy} and {girl} @@ -2272,7 +2280,7 @@ #- 1F6D0;PLACE OF WORSHIP;So;0;ON;;;;;N;;;;; {shrine} : "🛐" U1F6D0 # PLACE OF WORSHIP #- 1F6D1;OCTAGONAL SIGN;So;0;ON;;;;;N;;;;; - {octagonal sign} : "🛑" U1F6D1 # OCTAGONAL SIGN + {[STOP]} : "🛑" U1F6D1 # OCTAGONAL SIGN #- 1F6D2;SHOPPING TROLLEY;So;0;ON;;;;;N;;;;; {shopping trolley} : "🛒" U1F6D2 # SHOPPING TROLLEY #- 1F6D3;STUPA;So;0;ON;;;;;N;;;;; @@ -2403,7 +2411,7 @@ #- 1F91E;HAND WITH INDEX AND MIDDLE FINGERS CROSSED;So;0;ON;;;;;N;;;;; {fingerX} : "🤞" U1F91E # HAND WITH INDEX AND MIDDLE FINGERS CROSSED #- 1F91F;I LOVE YOU HAND SIGN;So;0;ON;;;;;N;;;;; - {i love you hand sign} : "🤟" U1F91F # I LOVE YOU HAND SIGN + {ILY} : "🤟" U1F91F # I LOVE YOU HAND SIGN #- 1F920;FACE WITH COWBOY HAT;So;0;ON;;;;;N;;;;; ### {face with cowboy hat} : "🤠" U1F920 # FACE WITH COWBOY HAT #- 1F921;CLOWN FACE;So;0;ON;;;;;N;;;;; @@ -2425,7 +2433,7 @@ {()':-)} : "🤨" U1F928 # FACE WITH ONE EYEBROW RAISED {()spock} : "🤨" U1F928 # FACE WITH ONE EYEBROW RAISED #- 1F929;GRINNING FACE WITH STAR EYES;So;0;ON;;;;;N;;;;; - {grinning face with star eyes} : "🤩" U1F929 # GRINNING FACE WITH STAR EYES + {()*-D} : "🤩" U1F929 # GRINNING FACE WITH STAR EYES #- 1F92A;GRINNING FACE WITH ONE LARGE AND ONE SMALL EYE;So;0;ON;;;;;N;;;;; {()oO)} : "🤪" U1F92A # GRINNING FACE WITH ONE LARGE AND ONE SMALL EYE {()Oo)} : "🤪" U1F92A # GRINNING FACE WITH ONE LARGE AND ONE SMALL EYE @@ -2434,7 +2442,7 @@ #- 1F92C;SERIOUS FACE WITH SYMBOLS COVERING MOUTH;So;0;ON;;;;;N;;;;; {():-###} : "🤬" U1F92C # SERIOUS FACE WITH SYMBOLS COVERING MOUTH #- 1F92D;SMILING FACE WITH SMILING EYES AND HAND COVERING MOUTH;So;0;ON;;;;;N;;;;; - {smiling face with smiling eyes and hand covering mouth} : "🤭" U1F92D # SMILING FACE WITH SMILING EYES AND HAND COVERING MOUTH + {()):-==} : "🤭" U1F92D # SMILING FACE WITH SMILING EYES AND HAND COVERING MOUTH #- 1F92E;FACE WITH OPEN MOUTH VOMITING;So;0;ON;;;;;N;;;;; {()puke} : "🤮" U1F92E # FACE WITH OPEN MOUTH VOMITING #- 1F92F;SHOCKED FACE WITH EXPLODING HEAD;So;0;ON;;;;;N;;;;; @@ -2761,7 +2769,7 @@ #- 1F9CF;DEAF PERSON;So;0;ON;;;;;N;;;;; {deaf} : "🧏" U1F9CF # DEAF PERSON #- 1F9D0;FACE WITH MONOCLE;So;0;ON;;;;;N;;;;; - {face with monocle} : "🧐" U1F9D0 # FACE WITH MONOCLE + {()o.-)} : "🧐" U1F9D0 # FACE WITH MONOCLE #- 1F9D1;ADULT;So;0;ON;;;;;N;;;;; {adult} : "🧑" U1F9D1 # ADULT #- 1F9D2;CHILD;So;0;ON;;;;;N;;;;; @@ -2798,7 +2806,7 @@ #- 1F9E1;ORANGE HEART;So;0;ON;;;;;N;;;;; {orange heart} : "🧡" U1F9E1 # ORANGE HEART #- 1F9E2;BILLED CAP;So;0;ON;;;;;N;;;;; - {billed cap} : "🧢" U1F9E2 # BILLED CAP + {BBcap} : "🧢" U1F9E2 # BILLED CAP #- 1F9E3;SCARF;So;0;ON;;;;;N;;;;; {scarf} : "🧣" U1F9E3 # SCARF #- 1F9E4;GLOVES;So;0;ON;;;;;N;;;;; @@ -2935,12 +2943,12 @@ {headstone} : "🪦" U1FAA6 # HEADSTONE #- 1FAA7;PLACARD;So;0;ON;;;;;N;;;;; {placard} : "🪧" U1FAA7 # PLACARD +### {rock} has prefix conflicts {rocket}, {rockon} #- 1FAA8;ROCK;So;0;ON;;;;;N;;;;; {rock♫} : "🪨" U1FAA8 # ROCK -### {rock} has prefix conflicts {rocket}, {rockon} +### {fly} has prefix-conflicts {flying$} etc #- 1FAB0;FLY;So;0;ON;;;;;N;;;;; {fly♫} : "🪰" U1FAB0 # FLY -### {fly} has prefix-conflicts {flying$} etc #- 1FAB1;WORM;So;0;ON;;;;;N;;;;; {worm} : "🪱" U1FAB1 # WORM #- 1FAB2;BEETLE;So;0;ON;;;;;N;;;;; @@ -2958,6 +2966,7 @@ #- 1FAC1;LUNGS;So;0;ON;;;;;N;;;;; {lungs} : "🫁" U1FAC1 # LUNGS #- 1FAC2;PEOPLE HUGGING;So;0;ON;;;;;N;;;;; + {hugging} : "🫂" U1FAC2 # PEOPLE HUGGING {huggers} : "🫂" U1FAC2 # PEOPLE HUGGING #- 1FAD0;BLUEBERRIES;So;0;ON;;;;;N;;;;; {blueberries} : "🫐" U1FAD0 # BLUEBERRIES diff --git a/emojitrans2.pl b/emojitrans2.pl index 420129f..4ee9eac 100755 --- a/emojitrans2.pl +++ b/emojitrans2.pl @@ -52,6 +52,11 @@ BEGIN { binmode(STDOUT, ":utf8"); '˅' => 'Insert', # it'll do. ); + $specials = join "", keys %specials; + # Because of reasons + $specials =~ s/[]\\-]/\\$&/g; + $RE = qr{([[:alnum:]$specials]+)}; + sub splitup { my $arg=shift; local $_; @@ -73,7 +78,7 @@ unless (/^#/) { my $hold=$_; s///; s// /; - s({([][[:alnum:] _+:;%@>=`<,.^\$+#()?&!/|'"\\~*{}♫-]+)})(splitup($1))e; + s({($RE)})(splitup($1))e; if (length($1) > 7) { $_=$hold; s/^/### /; -- cgit v1.2.3