From: U-i7\gimy Date: Sat, 20 Jun 2009 14:16:30 +0000 (+0900) Subject: add *.mayu and yamy.ini for Scancode Map registry workaround X-Git-Tag: v0.01~2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d15f7223a1ceddf797b1b7c876b5f422bf49a0d4;p=yamy%2Fyamy.git add *.mayu and yamy.ini for Scancode Map registry workaround --- diff --git a/104.mayu b/104.mayu old mode 100644 new mode 100755 diff --git a/104on109.mayu b/104on109.mayu old mode 100644 new mode 100755 index 9fc2f80..ad9479a --- a/104on109.mayu +++ b/104on109.mayu @@ -8,6 +8,9 @@ define KBD104on109 def subst ~S-*”¼Šp/‘SŠp = $GRAVE_ACCENT def subst S-*”¼Šp/‘SŠp = $TILDE def subst A-”¼Šp/‘SŠp = $ToggleIME +def subst ~S-*E0”¼Šp/‘SŠp = $GRAVE_ACCENT +def subst S-*E0”¼Šp/‘SŠp = $TILDE +def subst A-E0”¼Šp/‘SŠp = $ToggleIME def subst S-*_2 = $COMMERCIAL_AT def subst S-*_6 = $CIRCUMFLEX_ACCENT def subst S-*_7 = $AMPERSAND @@ -30,6 +33,8 @@ def subst * def subst *•ÏŠ· = *Space def subst *‚Ђ炪‚È = *Space def subst *‰p” = S-*‰p” +def subst *E0‚Ђ炪‚È = *Space +def subst *E0‰p” = S-*‰p” def subst *ReverseSolidus = *RightShift keymap Global diff --git a/109.mayu b/109.mayu old mode 100644 new mode 100755 index cbb16bc..89ab1fb --- a/109.mayu +++ b/109.mayu @@ -56,6 +56,7 @@ def key L = 0x26 def key Semicolon = 0x27 # ;+ def key Colon = 0x28 # :* def key ”¼Šp/‘SŠp Š¿Žš Kanji = 0x29 # ”¼Šp/‘SŠp Š¿Žš +def key E0”¼Šp/‘SŠp E0Š¿Žš E0Kanji = E0-0x29 # ”¼Šp/‘SŠp Š¿Žš def key LeftShift LShift = 0x2a def key RightSquareBracket CloseBracket = 0x2b # ]} def key Z = 0x2c @@ -74,6 +75,7 @@ def key NumAsterisk NumMultiply = 0x37 # def key LeftAlt LAlt LMenu = 0x38 def key Space = 0x39 def key ‰p” Eisuu = 0x3a # ‰p” CapsLock Š¿Žš”ԍ† +def key E0‰p” E0Eisuu = E0-0x3a # ‰p” CapsLock Š¿Žš”ԍ† def key F1 = 0x3b def key F2 = 0x3c def key F3 = 0x3d @@ -106,6 +108,7 @@ def key F11 = 0x57 def key F12 = 0x58 def key ‚Ђ炪‚È Hiragana = 0x70 # ‚Ђ炪‚È ƒJƒ^ƒJƒi ƒ[ƒ}Žš +def key E0‚Ђ炪‚È E0Hiragana = E0-0x70 # ‚Ђ炪‚È ƒJƒ^ƒJƒi ƒ[ƒ}Žš def key ReverseSolidus BackSlash = 0x73 # __ diff --git a/default.mayu b/default.mayu old mode 100644 new mode 100755 index 69b6e52..d50d150 --- a/default.mayu +++ b/default.mayu @@ -76,12 +76,15 @@ keymap Global if ( KBD109 ) and ( ! KBD104on109 ) key *”¼Šp/‘SŠp = *Esc # Esc ‚Æ”¼Šp/‘SŠp‚Ì“ü‚ê‘Ö‚¦ + key *E0”¼Šp/‘SŠp = *Esc # Esc ‚Æ”¼Šp/‘SŠp‚Ì“ü‚ê‘Ö‚¦ key *Esc = *”¼Šp/‘SŠp # V endif if ( KBD109 ) mod control += ‰p” # ‰p”‚ð Control ‚É key *‰p” = *LControl # V + mod control += E0‰p” # ‰p”‚ð Control ‚É + key *E0‰p” = *LControl # V else mod control += CapsLock # CapsLock ‚ð Control ‚É key *CapsLock = *LControl # V @@ -124,6 +127,8 @@ keymap KeymapDefault = &Default if ( KBD109 ) mod control += ‰p” # ‰p”‚ð Control ‚É key *‰p” = *LControl # V + mod control += E0‰p” # ‰p”‚ð Control ‚É + key *E0‰p” = *LControl # V else mod control += CapsLock # CapsLock ‚ð Control ‚É key *CapsLock = *LControl # V @@ -273,6 +278,7 @@ keymap Emacsen : Global if ( MAP-ESCAPE-TO-META ) # ESC ‚ª M- ‚É‚È‚é‚Ì‚ð‘jŽ~‚·‚é if ( KBD109 ) and ( ! KBD104on109 ) key *”¼Šp/‘SŠp = *Esc + key *E0”¼Šp/‘SŠp = *Esc key *Esc = *”¼Šp/‘SŠp else key Escape = &Default diff --git a/emacsedit.mayu b/emacsedit.mayu index 9b8a3b6..adf4e57 100644 --- a/emacsedit.mayu +++ b/emacsedit.mayu @@ -146,6 +146,7 @@ keymap2 EmacsMark key Escape = &Prefix(EmacsMarkEscape) &EditNextModifier(M-) if ( KBD109 ) and ( ! KBD104on109 ) key ”¼Šp/‘SŠp = &Prefix(EmacsMarkEscape) &EditNextModifier(M-) + key E0”¼Šp/‘SŠp = &Prefix(EmacsMarkEscape) &EditNextModifier(M-) endif endif diff --git a/mayu-common.mak b/mayu-common.mak index 6cf0c30..da99f62 100644 --- a/mayu-common.mak +++ b/mayu-common.mak @@ -225,7 +225,7 @@ depend:: distrib: -@echo "we need cygwin tool" -rm -f yamy-$(VERSION).zip - zip yamy-$(VERSION).zip yamy.ini 104.mayu 109.mayu default.mayu emacsedit.mayu 104on109.mayu 109on104.mayu dot.mayu workaround.mayu + zip yamy-$(VERSION).zip yamy.ini 104.mayu 109.mayu default.mayu emacsedit.mayu 104on109.mayu 109on104.mayu dot.mayu workaround.mayu workaround.reg readme.txt cd $(OUT_DIR_EXE) zip ../yamy-$(VERSION).zip yamy.exe yamy32 yamy64 yamy32.dll yamy64.dll yamyd32 cd .. diff --git a/workaround.mayu b/workaround.mayu new file mode 100755 index 0000000..ce4e196 --- /dev/null +++ b/workaround.mayu @@ -0,0 +1,46 @@ +def key E0RightShift E0RShift = E0-0x36 +mod shift += E0RShift +key *E0RShift = *RShift + +if ( KBD109 ) + def key E0”¼Šp/‘SŠp E0Š¿Žš E0Kanji = E0-0x29 # ”¼Šp/‘SŠp Š¿Žš + def key E0‰p” E0Eisuu = E0-0x3a # ‰p” CapsLock Š¿Žš”ԍ† + def key E0‚Ђ炪‚È E0Hiragana = E0-0x70 # ‚Ђ炪‚È ƒJƒ^ƒJƒi ƒ[ƒ}Žš + + if ( KBD104on109 ) + def subst ~S-*E0”¼Šp/‘SŠp = $GRAVE_ACCENT + def subst S-*E0”¼Šp/‘SŠp = $TILDE + def subst A-E0”¼Šp/‘SŠp = $ToggleIME + def subst *E0‚Ђ炪‚È = *Space + def subst *E0‰p” = S-*‰p” + endif +endif + +keymap Global + if ( KBD109 ) and ( ! KBD104on109 ) + key *E0”¼Šp/‘SŠp = *Esc # Esc ‚Æ”¼Šp/‘SŠp‚Ì“ü‚ê‘Ö‚¦ + endif + if ( KBD109 ) + mod control += E0‰p” # ‰p”‚ð Control ‚É + key *E0‰p” = *LControl # V + endif + +keymap KeymapDefault = &Default + if ( KBD109 ) + mod control += E0‰p” # ‰p”‚ð Control ‚É + key *E0‰p” = *LControl # V + endif + +keymap Emacsen : Global + if ( MAP-ESCAPE-TO-META ) # ESC ‚ª M- ‚É‚È‚é‚Ì‚ð‘jŽ~‚·‚é + if ( KBD109 ) and ( ! KBD104on109 ) + key *E0”¼Šp/‘SŠp = *Esc + endif + endif + +keymap2 EmacsMark + if ( MAP-ESCAPE-TO-META ) + if ( KBD109 ) and ( ! KBD104on109 ) + key E0”¼Šp/‘SŠp = &Prefix(EmacsMarkEscape) &EditNextModifier(M-) + endif + endif diff --git a/workaround.reg b/workaround.reg new file mode 100755 index 0000000..bf25507 Binary files /dev/null and b/workaround.reg differ