From bab7e738a1fee69e3292a0d8f57a99e8b5a1fdc6 Mon Sep 17 00:00:00 2001
From: cxcn <cxprcn@gmail.com>
Date: Tue, 23 Mar 2021 20:10:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=20=E5=90=8C=E6=96=87?=
 =?UTF-8?q?=E6=97=A0=E9=9A=9C=E7=A2=8D=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 danjing.yaml                                  | 59 +++++++------
 "\345\215\225\351\235\231.trime.yaml"         |  9 +-
 .../\345\215\225\351\235\231+.trime.yaml"     | 88 +++++++++++++++++++
 ...345\215\225\351\235\231.trime.custom.yaml" | 21 +++++
 4 files changed, 144 insertions(+), 33 deletions(-)
 create mode 100644 "\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231+.trime.yaml"
 create mode 100644 "\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231.trime.custom.yaml"

diff --git a/danjing.yaml b/danjing.yaml
index 3a5c216..583e7a8 100644
--- a/danjing.yaml
+++ b/danjing.yaml
@@ -3,18 +3,17 @@
 # version: 1.1
 
 vars:
-  # 不要修改宽度
-  - '单单 <cxprcn@gmail.com>'
-  #- &sym_height 50 #按键高度 移至主文件
+  # ！不要修改宽度
+  #- &sym_height 50 #按键高度 移至 单静.trime.ymal
   - &menu_height 41 #菜单高度
   - &sym_bottom_switch 0 #底部空白开关
   - &sym_bottom 1 #底部空白
+  - &sym_long_text_size 20 #长标签字号
   - &sym_width 12 #按键宽度
   - &off_sym_width 16 #功能键宽度
   - &menu_width 12.5 #菜单宽度
-  - &sym_long_text_size 20 #长标签字号
   - &yanwz_width 28 #颜文字键盘按键宽度
-  - &yanwz_double_width 56 #颜文字键盘2按键宽度
+  - &yanwz_double_width 56 #颜文字键盘2键宽度
   - &yanwz_menu_width 16 #颜文字键盘菜单宽度
 
 keyboards:
@@ -192,22 +191,26 @@ keys:
   kb_yanwz6d: { label: '▼', send: Eisu_toggle, select: yanwz62 }
 
 vars_map:
+  # 符号键盘配置
   symbols_config:
     author: '单单 <cxprcn@gmail.com>'
     ascii_mode: 1
     width: *sym_width
     key_press_offset_x: 2
     key_press_offset_y: 2
+  # 功能键
   styl_off_sym:
     width: *off_sym_width
     key_back_color: off_sym_back_color
     hilited_key_back_color: hilited_off_sym_back_color
+  # 不可用的功能键（右边点不动的箭头）
   styl_unavl_off_sym:
     width: *off_sym_width
     key_back_color: off_sym_back_color
     hilited_key_back_color: hilited_off_sym_back_color
     key_text_color: hilited_off_sym_back_color
     hilited_key_text_color: hilited_off_sym_back_color
+  # 底部的菜单
   styl_menu:
     height: *menu_height
     width: *menu_width
@@ -215,6 +218,7 @@ vars_map:
     hilited_key_back_color: hilited_menu_back_color
     key_text_color: menu_text_color
     hilited_key_text_color: hilited_menu_text_color
+  # 高亮的底部菜单
   styl_hilited_menu:
     height: *menu_height
     width: *menu_width
@@ -222,9 +226,18 @@ vars_map:
     hilited_key_back_color: hilited_menu_back_color
     key_text_color: hilited_menu_text_color
     hilited_key_text_color: hilited_menu_text_color
+  # 颜文字键盘
+  yanwz_config:
+    author: '单单 <cxprcn@gmail.com>'
+    ascii_mode: 1
+    width: *yanwz_width
+    key_press_offset_x: 2
+    key_press_offset_y: 2
+  # 底部的菜单
   styl_yanwz_menu:
     __include: vars_map/styl_menu
     width: *yanwz_menu_width
+  # 高亮的底部菜单
   styl_yanwz_hilited_menu:
     __include: vars_map/styl_hilited_menu
     width: *yanwz_menu_width
@@ -2301,8 +2314,7 @@ kbs:
       - { width: *sym_bottom_switch, height: *sym_bottom }
 
   yanwz11:
-    __include: vars_map/symbols_config
-    width: *yanwz_width
+    __include: vars_map/yanwz_config
     name: 开心1
     keys:
       - { click: "^_^" }
@@ -2330,8 +2342,7 @@ kbs:
       - { width: *sym_bottom_switch, height: *sym_bottom }
 
   yanwz12:
-    __include: vars_map/symbols_config
-    width: *yanwz_width
+    __include: vars_map/yanwz_config
     name: 开心2
     keys:
       - { click: "Y(^_^)Y" }
@@ -2358,8 +2369,7 @@ kbs:
       - { width: *sym_bottom_switch, height: *sym_bottom }
 
   yanwz21:
-    __include: vars_map/symbols_config
-    width: *yanwz_width
+    __include: vars_map/yanwz_config
     name: 喜欢1
     keys:
       - { click: "QwQ" }
@@ -2387,8 +2397,7 @@ kbs:
       - { width: *sym_bottom_switch, height: *sym_bottom }
 
   yanwz22:
-    __include: vars_map/symbols_config
-    width: *yanwz_width
+    __include: vars_map/yanwz_config
     name: 喜欢2
     keys:
       - { click: "( σ'ω')σ" }
@@ -2416,8 +2425,7 @@ kbs:
       - { width: *sym_bottom_switch, height: *sym_bottom }
 
   yanwz31:
-    __include: vars_map/symbols_config
-    width: *yanwz_width
+    __include: vars_map/yanwz_config
     name: 伤心1
     keys:
       - { click: "(＞﹏＜)" }
@@ -2445,8 +2453,7 @@ kbs:
       - { width: *sym_bottom_switch, height: *sym_bottom }
 
   yanwz32:
-    __include: vars_map/symbols_config
-    width: *yanwz_width
+    __include: vars_map/yanwz_config
     name: 伤心2
     keys:
       - { click: "●﹏●" }
@@ -2474,8 +2481,7 @@ kbs:
       - { width: *sym_bottom_switch, height: *sym_bottom }
 
   yanwz41:
-    __include: vars_map/symbols_config
-    width: *yanwz_width
+    __include: vars_map/yanwz_config
     name: 生气1
     keys:
       - { click: "╰（‵□′）╯" }
@@ -2503,8 +2509,7 @@ kbs:
       - { width: *sym_bottom_switch, height: *sym_bottom }
 
   yanwz42:
-    __include: vars_map/symbols_config
-    width: *yanwz_width
+    __include: vars_map/yanwz_config
     name: 生气2
     keys:
       - { click: "<(｀^´)>" }
@@ -2532,8 +2537,7 @@ kbs:
       - { width: *sym_bottom_switch, height: *sym_bottom }
 
   yanwz51:
-    __include: vars_map/symbols_config
-    width: *yanwz_width
+    __include: vars_map/yanwz_config
     name: 惊讶1
     keys:
       - { click: "⊙_⊙" }
@@ -2561,8 +2565,7 @@ kbs:
       - { width: *sym_bottom_switch, height: *sym_bottom }
 
   yanwz52:
-    __include: vars_map/symbols_config
-    width: *yanwz_width
+    __include: vars_map/yanwz_config
     name: 惊讶2
     keys:
       - { click: "(⊙x⊙;)" }
@@ -2588,8 +2591,7 @@ kbs:
       - { width: *sym_bottom_switch, height: *sym_bottom }
 
   yanwz61:
-    __include: vars_map/symbols_config
-    width: *yanwz_width
+    __include: vars_map/yanwz_config
     name: 无奈1
     keys:
       - { click: "=_=" }
@@ -2617,8 +2619,7 @@ kbs:
       - { width: *sym_bottom_switch, height: *sym_bottom }
 
   yanwz62:
-    __include: vars_map/symbols_config
-    width: *yanwz_width
+    __include: vars_map/yanwz_config
     name: 无奈2
     keys:
       - { click: "o_O" }
diff --git "a/\345\215\225\351\235\231.trime.yaml" "b/\345\215\225\351\235\231.trime.yaml"
index 9eabefc..48d7207 100644
--- "a/\345\215\225\351\235\231.trime.yaml"
+++ "b/\345\215\225\351\235\231.trime.yaml"
@@ -534,6 +534,7 @@ preset_keyboards:
         }
       - { click: 'k', long_click: ':', __include: vars_map/styl_key }
       - { click: 'l', long_click: ';', __include: vars_map/styl_key }
+      - { width: 0 } #备用
       # 第 3 行
       - { click: Shift_L, composing: split_word, width: 15 }
       - {
@@ -619,7 +620,7 @@ preset_keyboards:
     __patch:
       ascii_mode: 1
       lock: false
-      'keys/@33/long_click': Keyboard_default
+      'keys/@34/long_click': Keyboard_default
 
   qwertys:
     name: 默认27键
@@ -630,7 +631,7 @@ preset_keyboards:
       'keys/@18/hint': ' '
       'keys/@19/long_click': '<'
       'keys/@20/long_click': '>'
-      'keys/@after 20/':
+      'keys/@21/':
         click: ';'
         long_click: ':'
         width: 10
@@ -644,7 +645,7 @@ preset_keyboards:
       'keys/@22/': { width: 0 }
       'keys/@27/hint': ' '
       'keys/@27/long_click': '|'
-      'keys/@30/':
+      'keys/@after 29/':
         click: ','
         long_click: '!'
         __include: vars_map/styl_key
@@ -656,7 +657,7 @@ preset_keyboards:
         click: '/'
         long_click: '\'
         __include: vars_map/styl_key
-      'keys/@after 32/':
+      'keys/@30/':
         click: Shift_L
         composing: split_word
         height: *key_height_last
diff --git "a/\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231+.trime.yaml" "b/\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231+.trime.yaml"
new file mode 100644
index 0000000..fa856e7
--- /dev/null
+++ "b/\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231+.trime.yaml"
@@ -0,0 +1,88 @@
+# Trime style settings
+# encoding: utf-8
+
+config_version: '2.1'
+name: 单静+ #方案名称
+author: '单单 <cxprcn@gmail.com>' #作者资讯
+
+vars:
+  # 其他在 单静.yaml修改
+  # 主键盘
+  - &num_height 44 #数字行按键高度
+  # 数字、编辑、功能键盘
+  - &number_height 71 #按键高度
+  # 符号、颜文字键盘
+  - &sym_height 61 #按键高度
+  #- &menu_height 41 #菜单高度 见附文件 danjing.yaml
+  #- &sym_bottom 0 #底部空白 见附文件
+
+style:
+  __include: 单静.trime:/style
+  key_height: *sym_height #键高
+
+fallback_colors:
+  __include: 单静.trime:/fallback_colors
+
+preset_color_schemes:
+  __include: 单静.trime:/preset_color_schemes
+
+patch_num:
+  'keys/@4/hint': ' '
+  'keys/@7/hint': ' '
+  'keys/@0/': { click: num1, height: *num_height }
+  'keys/@after 0/': { click: num2, height: *num_height }
+  'keys/@after 1/': { click: num3, height: *num_height }
+  'keys/@after 2/': { click: num4, height: *num_height }
+  'keys/@after 3/': { click: num5, height: *num_height }
+  'keys/@after 4/': { click: num6, height: *num_height }
+  'keys/@after 5/': { click: num7, height: *num_height }
+  'keys/@after 6/': { click: num8, height: *num_height }
+  'keys/@after 7/': { click: num9, height: *num_height }
+  'keys/@after 8/': { click: num0, height: *num_height }
+
+preset_keyboards:
+  __include: danjing:/kbs
+
+  default:
+    __include: 单静.trime:/preset_keyboards/default
+    __patch: patch_num
+  letter:
+    __include: 单静.trime:/preset_keyboards/letter
+    __patch: patch_num
+  qwertys:
+    __include: 单静.trime:/preset_keyboards/qwertys
+    __patch: patch_num
+  qwerty_:
+    __include: 单静.trime:/preset_keyboards/qwerty_
+    __patch: patch_num
+
+  number:
+    __include: 单静.trime:/preset_keyboards/number
+    height: *number_height
+
+  edit:
+    __include: 单静.trime:/preset_keyboards/edit
+    height: *number_height
+
+  func:
+    __include: 单静.trime:/preset_keyboards/func
+    height: *number_height
+
+android_keys:
+  __include: trime:/android_keys
+
+preset_keys:
+  __include: 单静.trime:/preset_keys
+  num1: { label: 1, send: 1 }
+  num2: { label: 2, send: 2 }
+  num3: { label: 3, send: 3 }
+  num4: { label: 4, send: 4 }
+  num5: { label: 5, send: 5 }
+  num6: { label: 6, send: 6 }
+  num7: { label: 7, send: 7 }
+  num8: { label: 8, send: 8 }
+  num9: { label: 9, send: 9 }
+  num0: { label: 0, send: 0 }
+  kb_qwerty: { label: '36键', send: Eisu_toggle, select: default }
+  kb_qwertys: { label: '37键', send: Eisu_toggle, select: qwertys }
+  kb_qwerty_: { label: '40键', send: Eisu_toggle, select: qwerty_ }
diff --git "a/\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231.trime.custom.yaml" "b/\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231.trime.custom.yaml"
new file mode 100644
index 0000000..936b476
--- /dev/null
+++ "b/\346\227\240\351\232\234\347\242\215\344\270\223\347\224\250/\345\215\225\351\235\231.trime.custom.yaml"
@@ -0,0 +1,21 @@
+# custom
+
+
+vars:
+  # 主键盘
+  - &key_height 59 #按键高度
+  - &key_height_last 57 # 第4行 按键高度
+
+patch:
+  'preset_keyboards/default/height': *key_height
+  'preset_keyboards/default/keys/@31/height': *key_height_last
+  
+  'preset_keyboards/letter/height': *key_height
+  'preset_keyboards/letter/keys/@31/height': *key_height_last
+
+  'preset_keyboards/qwertys/height': *key_height
+  'preset_keyboards/qwertys/keys/@31/height': *key_height_last
+
+  'preset_keyboards/qwerty_/height': *key_height
+  'preset_keyboards/qwerty_/keys/@33/height': *key_height_last
+