Merge branch 'master' of ssh://ftp.meson.org/home/mark/xcompose

4 files changed, 12 insertions, 5 deletions

diff --git a/dotXCompose b/dotXCompose
index 0666a4c..2437cbb 100644
--- a/dotXCompose
+++ b/dotXCompose
@@ -770,6 +770,9 @@ include "%L"
 <Multi_key> <Multi_key> <m> <a> <i> <l>		: "✉"	U2709	  # ENVELOPE
 <Multi_key> <Multi_key> <w> <h> <l> <c> <h>	: "♿"	U267F	  # WHEELCHAIR SYMBOL
 <Multi_key> <Multi_key> <m> <e> <d> 		: "☤"	U2624	  # CADEUCEUS
+## Don't usually do sequences, but exception made for the
+## "eyewitness" compound emoji sequence:
+<Multi_key> <Multi_key> <i> <w> <i> <t>     : "👁️‍🗨️"
 # Something different for STAFF OF AESCULAPIUS?
 <Multi_key> <Multi_key> <1> <m> <e> <d>		: "⚕"	U2695	# STAFF OF AESCULAPIUS
 # 26B0 COFFIN ?
@@ -914,9 +917,9 @@ include "%L"
 <Multi_key> <exclam> <period>		: "Ꞌ"	UA78B		# LATIN CAPITAL LETTER SALTILLO
 # I'll use capitals for a different double
 <Multi_key> <W> <W>			: "ʬ"	U02AC		# LATIN LETTER BILABIAL PERCUSSIVE
+# Also handy for writing urls: http://ʬw.omniglot.com/
 # Sorry, I miss having this and hate having to use colon instead:
 <Multi_key> <colon> <plus>  	      	: "ː"	U02D0		# MODIFIER LETTER TRIANGULAR COLON
-# Also handy for writing urls: http://ʬw.omniglot.com/
 # ɣ? ᴥ?  Important enough to add? ᴥ is cool just as a "latin" letter.
 <Multi_key> <g> <h>	     	    : "ɣ"   U0263     # LATIN SMALL LETTER GAMMA
 # It looks like a ɣ and makes an "o" sorta sound:
diff --git a/emojitrans2.pl b/emojitrans2.pl
index c978b7e..27ee545 100755
--- a/emojitrans2.pl
+++ b/emojitrans2.pl
@@ -29,6 +29,7 @@ BEGIN { binmode(STDOUT, ":utf8");
 	     '{' => 'braceleft',
 	     '}' => 'braceright',
 	     "'" => 'apostrophe',
+	     '"' => 'quotedbl',
 	     '\\' => 'backslash',
 	     ':' => 'colon',
 	     ';' => 'semicolon',
@@ -59,7 +60,7 @@ unless (/^#/) {
     my $hold=$_;
     s/<M_>/<Multi_key>/;
     s/<MM>/<Multi_key> <Multi_key>/;
-    s({([][[:alnum:] _+:;%@>=`<,.^\$+#()?!/|'\\~*{}♫-]+)})(splitup($1))e;
+    s({([][[:alnum:] _+:;%@>=`<,.^\$+#()?!/|'"\\~*{}♫-]+)})(splitup($1))e;
     if (length($1) > 7) {
 	$_=$hold;
 	s/^<M([M_])>/### <M$1>/;
diff --git a/modletters-base b/modletters-base
index 1945572..d85b5ef 100644
--- a/modletters-base
+++ b/modletters-base
@@ -468,6 +468,6 @@
 #- 1EFD;LATIN SMALL LETTER MIDDLE-WELSH V;Ll;0;L;;;;;N;;;1EFC;;1EFC
 <M_> {!#ww} :  "ỽ"   U1EFD	# LATIN SMALL LETTER MIDDLE-WELSH V
 #- A78B;LATIN CAPITAL LETTER SALTILLO;Lu;0;L;;;;;N;;;;A78C;
-<M_> {!#/"}   "Ꞌ"     # LATIN CAPITAL LETTER SALTILLO
+<M_> {!#/"} :  "Ꞌ"    UA78B	# LATIN CAPITAL LETTER SALTILLO
 #- A78C;LATIN SMALL LETTER SALTILLO;Ll;0;L;;;;;N;;;A78B;;A78B
-<M_> {!#/'}   "ꞌ"   # LATIN SMALL LETTER SALTILLO
+<M_> {!#/'} :  "ꞌ"    UA78C	# LATIN SMALL LETTER SALTILLO
diff --git a/modletters.compose b/modletters.compose
index ea3cf43..caa9e4e 100644
--- a/modletters.compose
+++ b/modletters.compose
@@ -1,4 +1,3 @@
-### I think this is going to be a private one.
 ### For davka *letters*, not punctuation that looks like it.
 ### Mnemonic/signal: <♫>!#, because they are not numbers.
 ### Maybe #!^ for ones that are just raised letters?  Those not as critical.
@@ -468,3 +467,7 @@
 <Multi_key>  <exclam> <numbersign> <W> <W> :  "Ỽ"   U1EFC	# LATIN CAPITAL LETTER MIDDLE-WELSH V
 #- 1EFD;LATIN SMALL LETTER MIDDLE-WELSH V;Ll;0;L;;;;;N;;;1EFC;;1EFC
 <Multi_key>  <exclam> <numbersign> <w> <w> :  "ỽ"   U1EFD	# LATIN SMALL LETTER MIDDLE-WELSH V
+#- A78B;LATIN CAPITAL LETTER SALTILLO;Lu;0;L;;;;;N;;;;A78C;
+<Multi_key>  <exclam> <numbersign> <slash> <quotedbl> :  "Ꞌ"    UA78B	# LATIN CAPITAL LETTER SALTILLO
+#- A78C;LATIN SMALL LETTER SALTILLO;Ll;0;L;;;;;N;;;A78B;;A78B
+<Multi_key>  <exclam> <numbersign> <slash> <apostrophe> :  "ꞌ"    UA78C	# LATIN SMALL LETTER SALTILLO