From 87d7c19fb7f8e3081e6b8719a6c012d69372290a Mon Sep 17 00:00:00 2001
From: Mark Shoulson <mark@kli.org>
Date: Mon, 6 Mar 2017 10:08:17 -0500
Subject: Fixed some issues with double-circles, add a few more chars.

---
 dotXCompose     |  5 +++++
 modletters-base |  5 ++++-
 parens.compose  | 22 ++++++++++++----------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/dotXCompose b/dotXCompose
index e908211..0666a4c 100644
--- a/dotXCompose
+++ b/dotXCompose
@@ -24,6 +24,8 @@ include "%L"
 #<Multi_key> <1> <period>		  : "․"	U2024		# ONE DOT LEADER
 <Multi_key> <c> <1> <period>		  : "·"	U00B7		# MIDDLE DOT (maybe I can remember the keystroke better?
 <Multi_key> <period> <slash> <period>	: "⁒"	U2052		# COMMERCIAL MINUS SIGN
+### or && ?
+<Multi_key> <ampersand> <at>    :   "⅋" U214B   # TURNED AMPERSAND
 # Printable sign for space.  But is \<space> too useful a key combo to use
 # for this?
 <Multi_key> <backslash> <space>		: "␣"	U2423		# OPEN BOX
@@ -906,8 +908,10 @@ include "%L"
 <Multi_key> <w> <w>			: "ʍ"	U028D		# LATIN SMALL LETTER TURNED W
 <Multi_key> <y> <y>			: "ʎ"	U028E		# LATIN SMALL LETTER TURNED Y
 <Multi_key> <a> <a>			: "ɐ"	U0250		# LATIN SMALL LETTER TURNED A
+<Multi_key> <h> <h>			: "ɥ"	U0265		# LATIN SMALL LETTER TURNED H
 # ı is already available in the "standard" .XCompose
 <Multi_key> <j> <period>    		: "ȷ"	U0237		# LATIN SMALL LETTER DOTLESS J
+<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
 # Sorry, I miss having this and hate having to use colon instead:
@@ -1105,6 +1109,7 @@ include "%L"
 <Multi_key> <Multi_key> <v> <e> <s> <t> <a>    	: "⚶"	U26B6	# VESTA
 <Multi_key> <Multi_key> <c> <h> <i> <r> <o> <n>	: "⚷"	U26B7	# CHIRON
 <Multi_key> <Multi_key> <l> <i> <l> <i> <t> <h>	: "⚸"	U26B8	# BLACK MOON LILITH
+<Multi_key>  <bracketleft> <k> <e> <y> <bracketright> : "⚿"	U26BF	# SQUARED KEY
 
 # Unicode 6.0 gave us all kinds of things, perhaps more than we can use...
 
diff --git a/modletters-base b/modletters-base
index 31fefb2..1945572 100644
--- a/modletters-base
+++ b/modletters-base
@@ -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 @@
 <M_> {!#WW} :  "Ỽ"   U1EFC	# LATIN CAPITAL LETTER MIDDLE-WELSH V
 #- 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
+#- A78C;LATIN SMALL LETTER SALTILLO;Ll;0;L;;;;;N;;;A78B;;A78B
+<M_> {!#/'}   "ꞌ"   # LATIN SMALL LETTER SALTILLO
diff --git a/parens.compose b/parens.compose
index 100e79c..05f7c17 100644
--- a/parens.compose
+++ b/parens.compose
@@ -165,13 +165,15 @@
 <Multi_key>  <bracketleft> <B> <y> <bracketright> :  "🆈"   U1F188	# NEGATIVE SQUARED LATIN CAPITAL LETTER Y
 <Multi_key>  <bracketleft> <B> <z> <bracketright> :  "🆉"   U1F189	# NEGATIVE SQUARED LATIN CAPITAL LETTER Z
 <Multi_key>  <bracketleft> <B> <W> <C> <bracketright> :  "🆏"   U1F18F	# NEGATIVE SQUARED WC
-<Multi_key>  <parenleft> <parenleft> <1> <parenright> <parenright> :  "⓵"   U24F5	# DOUBLE CIRCLED DIGIT ONE
-<Multi_key>  <parenleft> <parenleft> <2> <parenright> <parenright> :  "⓶"   U24F6	# DOUBLE CIRCLED DIGIT TWO
-<Multi_key>  <parenleft> <parenleft> <3> <parenright> <parenright> :  "⓷"   U24F7	# DOUBLE CIRCLED DIGIT THREE
-<Multi_key>  <parenleft> <parenleft> <4> <parenright> <parenright> :  "⓸"   U24F8	# DOUBLE CIRCLED DIGIT FOUR
-<Multi_key>  <parenleft> <parenleft> <5> <parenright> <parenright> :  "⓹"   U24F9	# DOUBLE CIRCLED DIGIT FIVE
-<Multi_key>  <parenleft> <parenleft> <6> <parenright> <parenright> :  "⓺"   U24FA	# DOUBLE CIRCLED DIGIT SIX
-<Multi_key>  <parenleft> <parenleft> <7> <parenright> <parenright> :  "⓻"   U24FB	# DOUBLE CIRCLED DIGIT SEVEN
-<Multi_key>  <parenleft> <parenleft> <8> <parenright> <parenright> :  "⓼"   U24FC	# DOUBLE CIRCLED DIGIT EIGHT
-<Multi_key>  <parenleft> <parenleft> <9> <parenright> <parenright> :  "⓽"   U24FD	# DOUBLE CIRCLED DIGIT NINE
-<Multi_key>  <parenleft> <parenleft> <1> <0> <parenright> <parenright> :  "⓾"   U24FE	# DOUBLE CIRCLED NUMBER TEN
+### Using <parenleft> <parenleft> ... <parenright> <parenright> conflicts
+### with system entries.  Using the *letter* O.
+<Multi_key> <parenleft> <O> <1> <parenright> :  "⓵"   U24F5	# DOUBLE CIRCLED DIGIT ONE
+<Multi_key> <parenleft> <O> <2> <parenright> :  "⓶"   U24F6	# DOUBLE CIRCLED DIGIT TWO
+<Multi_key> <parenleft> <O> <3> <parenright> :  "⓷"   U24F7	# DOUBLE CIRCLED DIGIT THREE
+<Multi_key> <parenleft> <O> <4> <parenright> :  "⓸"   U24F8	# DOUBLE CIRCLED DIGIT FOUR
+<Multi_key> <parenleft> <O> <5> <parenright> :  "⓹"   U24F9	# DOUBLE CIRCLED DIGIT FIVE
+<Multi_key> <parenleft> <O> <6> <parenright> :  "⓺"   U24FA	# DOUBLE CIRCLED DIGIT SIX
+<Multi_key> <parenleft> <O> <7> <parenright> :  "⓻"   U24FB	# DOUBLE CIRCLED DIGIT SEVEN
+<Multi_key> <parenleft> <O> <8> <parenright> :  "⓼"   U24FC	# DOUBLE CIRCLED DIGIT EIGHT
+<Multi_key> <parenleft> <O> <9> <parenright> :  "⓽"   U24FD	# DOUBLE CIRCLED DIGIT NINE
+<Multi_key> <parenleft> <O> <1> <0> <parenright> :  "⓾"   U24FE	# DOUBLE CIRCLED NUMBER TEN
-- 
cgit v1.2.3