From e9f93f6293235935ca683ff68629c13d45671586 Mon Sep 17 00:00:00 2001
From: pascal <pascal@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Fri, 29 Feb 2008 09:57:01 +0000
Subject: =?UTF-8?q?doppeltes=20tm=20f=C3=BCr=20Trademark=20einfernt,=20dop?=
 =?UTF-8?q?pelten=20Hinweis=20auf=20TM=20f=C3=BCr=20Trademark=20entfernt,?=
 =?UTF-8?q?=20Konflikt=20zwischen=20Plank-h=20quer=20und=20maltesischem=20?=
 =?UTF-8?q?h=20aufgel=C3=B6st?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.neo-layout.org@381 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 Compose/Compose.neo | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Compose/Compose.neo b/Compose/Compose.neo
index fb70c31..f7b5165 100644
--- a/Compose/Compose.neo
+++ b/Compose/Compose.neo
@@ -135,11 +135,12 @@
 <Multi_key> <p> <h>			: "ℎ"   U210E # PLANCK CONSTANT
 <Multi_key> <minus> <p> <h>   	     	: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
 <Multi_key> <KP_Subtract> <p> <h>  	: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
-<Multi_key> <minus> <h>			: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
-<Multi_key> <KP_Subtract> <h>		: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
-<Multi_key> <h> <minus>			: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
-<Multi_key> <h> <KP_Subtract>		: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
-<dead_macron> <h>			: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
+<Multi_key> <minus> <p> <h>		: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
+<Multi_key> <KP_Subtract> <p> <h>	: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
+<Multi_key> <p> <h> <minus>		: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
+<Multi_key> <p> <h> <KP_Subtract>	: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
+<dead_macron> <p> <h>			: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
+<dead_stroke> <p> <h>			: "ℏ"   U210F # PLANCK CONSTANT OVER TWO PI
 
 <Multi_key> <1> <question> <exclam>	: "‽"   U203D # INTERROBANG
 <Multi_key> <1> <exclam> <question>	: "‽"   U203D # INTERROBANG
@@ -150,8 +151,6 @@
 <Multi_key> <question> <exclam>		: "⁈"   U2048 # QUESTION EXCLAMATION MARK
 <Multi_key> <exclam> <question>		: "⁉"   U2049 # EXCLAMATION QUESTION MARK
 
-<Multi_key> <t> <m>			: "™"   U2122 # TRADE MARK SIGN
-
 <Multi_key> <asciicircum> <bracketleft>		: "⌈"   U2308 # LEFT CEILING
 <Multi_key> <asciicircum> <bracketright>	: "⌉"   U2309 # RIGHT CEILING
 <Multi_key> <underscore> <bracketleft>		: "⌊"   U230A # LEFT FLOOR
@@ -225,7 +224,6 @@
 <Multi_key> <t> <m>                     : "™"   trademark # TRADE MARK SIGN
 <Multi_key> <t> <M>                     : "™"   trademark # TRADE MARK SIGN
 <Multi_key> <T> <m>                     : "™"   trademark # TRADE MARK SIGN
-#<Multi_key> <T> <M>                     : "™"   trademark # TRADE MARK SIGN
 <Multi_key> <minus> <H>                 : "Ħ"   U0126 # LATIN CAPITAL LETTER H WITH STROKE
 <Multi_key> <minus> <h>                 : "ħ"   U0127 # LATIN SMALL LETTER H WITH STROKE
 #	Wobei schon diese ähnlichen drin waren:
-- 
cgit v1.2.3