OSDN Git Service

(root) / yamy / yamy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 62d318c)
add *.mayu and yamy.ini for Scancode Map registry workaround
authorU-i7\gimy <gimy@users.sourceforge.jp>
Sat, 20 Jun 2009 14:16:30 +0000 (23:16 +0900)
committerU-i7\gimy <gimy@users.sourceforge.jp>
Sat, 20 Jun 2009 14:16:30 +0000 (23:16 +0900)
104.mayu [changed mode: 0644->0755] patch | blob | history
104on109.mayu [changed mode: 0644->0755] patch | blob | history
109.mayu [changed mode: 0644->0755] patch | blob | history
default.mayu [changed mode: 0644->0755] patch | blob | history
emacsedit.mayu patch | blob | history
mayu-common.mak patch | blob | history
workaround.mayu [new file with mode: 0755] patch | blob
workaround.reg [new file with mode: 0755] patch | blob

diff --git a/104.mayu b/104.mayu
old mode 100644 (file)
new mode 100755 (executable)
diff --git a/104on109.mayu b/104on109.mayu
old mode 100644 (file)
new mode 100755 (executable)
index 9fc2f80..ad9479a
--- a/104on109.mayu
+++ b/104on109.mayu
@@ -8,6 +8,9 @@ define KBD104on109
 def subst ~S-*\94¼\8ap/\91S\8ap                = $GRAVE_ACCENT
 def subst  S-*\94¼\8ap/\91S\8ap                = $TILDE
 def subst  A-\94¼\8ap/\91S\8ap         = $ToggleIME
+def subst ~S-*E0\94¼\8ap/\91S\8ap      = $GRAVE_ACCENT
+def subst  S-*E0\94¼\8ap/\91S\8ap      = $TILDE
+def subst  A-E0\94¼\8ap/\91S\8ap       = $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    *\95Ï\8a·             = *Space
 def subst    *\82Ð\82ç\82ª\82È         = *Space
 def subst    *\89p\90\94             = S-*\89p\90\94
+def subst    *E0\82Ð\82ç\82ª\82È       = *Space
+def subst    *E0\89p\90\94           = S-*\89p\90\94
 def subst *ReverseSolidus      = *RightShift
 
 keymap Global
diff --git a/109.mayu b/109.mayu
old mode 100644 (file)
new mode 100755 (executable)
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 \94¼\8ap/\91S\8ap \8a¿\8e\9a Kanji           =    0x29 # \94¼\8ap/\91S\8ap \8a¿\8e\9a
+def key E0\94¼\8ap/\91S\8ap E0\8a¿\8e\9a E0Kanji     = E0-0x29 # \94¼\8ap/\91S\8ap \8a¿\8e\9a
 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 \89p\90\94 Eisuu                     =    0x3a # \89p\90\94 CapsLock \8a¿\8e\9a\94Ô\8d\86
+def key E0\89p\90\94 E0Eisuu                 = E0-0x3a # \89p\90\94 CapsLock \8a¿\8e\9a\94Ô\8d\86
 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 \82Ð\82ç\82ª\82È Hiragana              =    0x70 # \82Ð\82ç\82ª\82È \83J\83^\83J\83i \83\8d\81[\83}\8e\9a
+def key E0\82Ð\82ç\82ª\82È E0Hiragana          = E0-0x70 # \82Ð\82ç\82ª\82È \83J\83^\83J\83i \83\8d\81[\83}\8e\9a
 
 def key ReverseSolidus BackSlash       =    0x73 # \81__
 
diff --git a/default.mayu b/default.mayu
old mode 100644 (file)
new mode 100755 (executable)
index 69b6e52..d50d150
--- a/default.mayu
+++ b/default.mayu
@@ -76,12 +76,15 @@ keymap Global
 
  if ( KBD109 ) and ( ! KBD104on109 )
    key *\94¼\8ap/\91S\8ap      = *Esc                  # Esc \82Æ\94¼\8ap/\91S\8ap\82Ì\93ü\82ê\91Ö\82¦
+   key *E0\94¼\8ap/\91S\8ap    = *Esc                  # Esc \82Æ\94¼\8ap/\91S\8ap\82Ì\93ü\82ê\91Ö\82¦
    key *Esc            = *\94¼\8ap/\91S\8ap            #       \81V
  endif
 
  if ( KBD109 )
    mod control += \89p\90\94                         # \89p\90\94\82ð Control \82É
    key *\89p\90\94           = *LControl             #       \81V
+   mod control += E0\89p\90\94                               # \89p\90\94\82ð Control \82É
+   key *E0\89p\90\94         = *LControl             #       \81V
  else
    mod control += CapsLock                     # CapsLock \82ð Control \82É
    key *CapsLock       = *LControl             #       \81V
@@ -124,6 +127,8 @@ keymap      KeymapDefault = &Default
  if ( KBD109 )
    mod control += \89p\90\94                         # \89p\90\94\82ð Control \82É
    key *\89p\90\94           = *LControl             #       \81V
+   mod control += E0\89p\90\94                               # \89p\90\94\82ð Control \82É
+   key *E0\89p\90\94         = *LControl             #       \81V
  else
    mod control += CapsLock                     # CapsLock \82ð Control \82É
    key *CapsLock       = *LControl             #       \81V
@@ -273,6 +278,7 @@ keymap Emacsen : Global
  if ( MAP-ESCAPE-TO-META )                     # ESC \82ª M- \82É\82È\82é\82Ì\82ð\91j\8e~\82·\82é
    if ( KBD109 ) and ( ! KBD104on109 )
      key *\94¼\8ap/\91S\8ap    = *Esc
+     key *E0\94¼\8ap/\91S\8ap  = *Esc
      key *Esc          = *\94¼\8ap/\91S\8ap
    else
      key Escape                = &Default
diff --git a/emacsedit.mayu b/emacsedit.mayu
index 9b8a3b6..adf4e57 100644 (file)
--- a/emacsedit.mayu
+++ b/emacsedit.mayu
@@ -146,6 +146,7 @@ keymap2     EmacsMark
    key Escape          = &Prefix(EmacsMarkEscape) &EditNextModifier(M-)
    if ( KBD109 ) and ( ! KBD104on109 )
      key \94¼\8ap/\91S\8ap     = &Prefix(EmacsMarkEscape) &EditNextModifier(M-)
+     key E0\94¼\8ap/\91S\8ap   = &Prefix(EmacsMarkEscape) &EditNextModifier(M-)
    endif
  endif
 
diff --git a/mayu-common.mak b/mayu-common.mak
index 6cf0c30..da99f62 100644 (file)
--- 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 (executable)
index 0000000..ce4e196
--- /dev/null
+++ b/workaround.mayu
@@ -0,0 +1,46 @@
+def key E0RightShift E0RShift          = E0-0x36\r
+mod shift += E0RShift\r
+key *E0RShift = *RShift\r
+\r
+if ( KBD109 )\r
+  def key E0\94¼\8ap/\91S\8ap E0\8a¿\8e\9a E0Kanji   = E0-0x29 # \94¼\8ap/\91S\8ap \8a¿\8e\9a\r
+  def key E0\89p\90\94 E0Eisuu               = E0-0x3a # \89p\90\94 CapsLock \8a¿\8e\9a\94Ô\8d\86\r
+  def key E0\82Ð\82ç\82ª\82È E0Hiragana                = E0-0x70 # \82Ð\82ç\82ª\82È \83J\83^\83J\83i \83\8d\81[\83}\8e\9a\r
+\r
+  if ( KBD104on109 )\r
+    def subst ~S-*E0\94¼\8ap/\91S\8ap          = $GRAVE_ACCENT\r
+    def subst  S-*E0\94¼\8ap/\91S\8ap          = $TILDE\r
+    def subst  A-E0\94¼\8ap/\91S\8ap           = $ToggleIME\r
+    def subst    *E0\82Ð\82ç\82ª\82È           = *Space\r
+    def subst    *E0\89p\90\94               = S-*\89p\90\94\r
+  endif\r
+endif\r
+\r
+keymap Global\r
+ if ( KBD109 ) and ( ! KBD104on109 )\r
+   key *E0\94¼\8ap/\91S\8ap    = *Esc                  # Esc \82Æ\94¼\8ap/\91S\8ap\82Ì\93ü\82ê\91Ö\82¦\r
+ endif\r
+ if ( KBD109 )\r
+   mod control += E0\89p\90\94                       # \89p\90\94\82ð Control \82É\r
+   key *E0\89p\90\94         = *LControl             #       \81V\r
+ endif\r
+\r
+keymap KeymapDefault = &Default\r
+ if ( KBD109 )\r
+   mod control += E0\89p\90\94                       # \89p\90\94\82ð Control \82É\r
+   key *E0\89p\90\94         = *LControl             #       \81V\r
+ endif\r
+\r
+keymap Emacsen : Global\r
+ if ( MAP-ESCAPE-TO-META )                     # ESC \82ª M- \82É\82È\82é\82Ì\82ð\91j\8e~\82·\82é\r
+   if ( KBD109 ) and ( ! KBD104on109 )\r
+     key *E0\94¼\8ap/\91S\8ap  = *Esc\r
+   endif\r
+ endif\r
+\r
+keymap2        EmacsMark\r
+ if ( MAP-ESCAPE-TO-META )\r
+   if ( KBD109 ) and ( ! KBD104on109 )\r
+     key E0\94¼\8ap/\91S\8ap   = &Prefix(EmacsMarkEscape) &EditNextModifier(M-)\r
+   endif\r
+ endif\r
diff --git a/workaround.reg b/workaround.reg
new file mode 100755 (executable)
index 0000000..bf25507
Binary files /dev/null and b/workaround.reg differ
source code repository of yamy
About OSDN
Find Software
Develop Software
Help