1 files changed, 16 insertions, 36 deletions
diff --git a/confs/ru.scm b/confs/ru.scm
index 09a3744..eedc75b 100644
--- a/confs/ru.scm
+++ b/confs/ru.scm
@@ -1,30 +1,3 @@
-(define letters       (string->list "АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ" ))
-
-(define numbers       (string->list "1234567890"))
-(define brackets      (string->list "()[]{}<>"))
-(define symbols       (string->list "+-*\\|@#~$%&^`´\"'"))
-(define punct         (string->list ",."))
-
-;(define tab "⭾")
-;(define tab "↹")
-;(define tab "→|")
-(define tab "⇥")
-;(define backspace "⌫")
-(define backspace "⟵")
-;(define arrows (string->list "▼▶▼▶"))
-(define arrows (string->list "←↑→↓"))
-
-(define key-symbols   (concatenate  (list (list backspace tab)
-                                          arrows
-                                          (string->list "⇧⇧⇪⏎"))))
-(define modifiers     '("Ctrl" "Ctrl" "Alt" "AltGr" "Esc" "Del"))
-
-(define fn         '("Fn"))
-(define media       (string->list ""))
-
-;(define extra-symbols  (string->list "☠⌨☭☮☢☣☥⚓"))
-(define extra-symbols  (string->list "☠⎘⎘"))
-
 (define font "B612")
 (define sticker-radius 3.82); mm
 (define page-size a7-size)
@@ -32,12 +5,19 @@
 (define glyphs
   (concatenate
     (list
-      (map (lambda (l) (glyph l font "6" "white"      "none"))     letters)
-      (map (lambda (l) (glyph l font "6" "lightgreen" "none"))     symbols)
-      (map (lambda (l) (glyph l font "6" "white"      "none"))     key-symbols)
-      (map (lambda (l) (glyph l font "6" "white"      "none"))     numbers)
-      (map (lambda (l) (glyph l font "3" "white"      "italic"))   modifiers)
-      (map (lambda (l) (glyph l font "6" "red"        "none"))     brackets)
-      ;(map (lambda (l) (glyph l font "6" "steelblue"  "none"))     media)
-      (map (lambda (l) (glyph l font "6" "white"      "none"))     extra-symbols)
-      (map (lambda (l) (glyph l font "6" "white"      "none"))     punct))))
+      (map (lambda (l) (make-glyph l font "6" "white"      "none"))     ru-chars)
+      (map (lambda (l) (make-glyph l font "6" "white"      "none"))     numbers)
+      (map (lambda (l) (make-glyph l font "6" "red"        "none"))     brackets)
+      (map (lambda (l) (make-glyph l font "6" "white"      "none"))     punct)
+      (map (lambda (l) (make-glyph l font "6" "lightgreen" "none"))     symbols)
+      (map (lambda (l) (make-glyph l font "6" "white"      "none"))     math)
+      (map (lambda (l) (make-glyph l font "6" "white"      "none"))     tab)
+      (map (lambda (l) (make-glyph l font "6" "white"      "none"))     backspace)
+      (map (lambda (l) (make-glyph l font "6" "white"      "none"))     arrows)
+      (map (lambda (l) (make-glyph l font "6" "white"      "none"))     upcase)
+      (map (lambda (l) (make-glyph l font "6" "white"      "none"))     enter)
+      (map (lambda (l) (make-glyph l font "3" "white"      "italic"))   modifiers)
+      (map (lambda (l) (make-glyph l font "3" "white"      "italic"))   pagers)
+      (map (lambda (l) (make-glyph l font "6" "steelblue"  "none"))     media))))
+
+(make-config page-size sticker-radius glyphs)