X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=cabe148735461b609a88c864dee42c0e455d9b8f;hb=76851aa71ae8130ac912be2cbc143ec12a1633c8;hp=926bd76d319c5b628ddcbe281d2eac2a293e75b2;hpb=5f46fb274bd39bbbefa92bf974d80d54cde52bfc;p=dotfiles.git

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 926bd76..cabe148 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -169,12 +169,12 @@ Check out [[http://tapoueh.org/emacs/el-get.html][el-get]].
 #+END_SRC
 
 ** Font Setting
-syntax highlighting
+*** syntax highlighting
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (global-font-lock-mode 1)
 #+END_SRC
 
-[[https://github.com/i-tu/Hasklig][Hasklig]] and Source Code Pro, defined fonts family
+*** [[https://github.com/i-tu/Hasklig][Hasklig]] and Source Code Pro, defined fonts family
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (if window-system
       (defvar sd/fixed-font-family
@@ -185,7 +185,7 @@ syntax highlighting
         "The fixed width font based on what is installed, `nil' if not defined."))
 #+END_SRC
 
-Setting the fonts 
+Setting the fonts alignment issue
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (if window-system
       (when sd/fixed-font-family
@@ -194,6 +194,69 @@ Setting the fonts
         (set-face-font 'default sd/fixed-font-family)))
 #+END_SRC
 
+*** Chinese fonts
+Fix the font alignment issue when both Chinese and English hybird in org-mode table. Refer [[http://coldnew.github.io/blog/2013/11-16_d2f3a/][解決 org-mode 表格內中英文對齊的問題]]
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (defvar emacs-english-font "Source Code Pro" "The font name of English.")
+
+  (defvar emacs-cjk-font "STHeiti" "The font name for CJK.")
+
+  (defvar emacs-font-size-pair '(13 . 16) "Default font size pair for (english . chinese)")
+
+  (defvar emacs-font-size-pair-list
+    '(( 5 .  6) (10 . 12)
+      (11 . 14) (12 . 14)
+      (13 . 16) (14 . 16) (15 . 18) (16 . 20) (17 . 20)
+      (18 . 22) (19 . 22) (20 . 24) (21 . 26)
+      (24 . 28) (26 . 32) (28 . 34)
+      (30 . 36) (34 . 40) (36 . 44))
+    "This list is used to store matching (englis . chinese) font-size.")
+
+  (defun font-exist-p (fontname)
+    "Test if this font is exist or not."
+    (if (or (not fontname) (string= fontname ""))
+        nil
+      (if (not (x-list-fonts fontname)) nil t)))
+
+  (defun set-font (english chinese size-pair)
+    "Setup emacs English and Chinese font on x window-system."
+    (if (font-exist-p english)
+        (set-frame-font (format "%s:pixelsize=%d" english (car size-pair)) t))
+    (if (font-exist-p chinese)
+        (dolist (charset '(han cjk-misc) ;; '(kana han symbol cjk-misc bopomofo)
+                 )
+          (set-fontset-font (frame-parameter nil 'font) charset
+                            (font-spec :family chinese :size (cdr size-pair))))))
+
+  (defun emacs-step-font-size (step)
+    "Increase/Decrease emacs's font size."
+    (let ((scale-steps emacs-font-size-pair-list))
+      (if (< step 0) (setq scale-steps (reverse scale-steps)))
+      (setq emacs-font-size-pair
+            (or (cadr (member emacs-font-size-pair scale-steps))
+                emacs-font-size-pair))
+      (when emacs-font-size-pair
+        (message "emacs font size set to %.1f" (car emacs-font-size-pair))
+        (set-font emacs-english-font emacs-cjk-font emacs-font-size-pair))))
+
+  (defun increase-emacs-font-size ()
+    "Decrease emacs's font-size acording emacs-font-size-pair-list."
+    (interactive) (emacs-step-font-size 1))
+
+  (defun decrease-emacs-font-size ()
+    "Increase emacs's font-size acording emacs-font-size-pair-list."
+    (interactive) (emacs-step-font-size -1))
+#+END_SRC
+
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  ;; Setup font size based on emacs-font-size-pair
+  (set-font emacs-english-font emacs-cjk-font '(13 . 16))
+
+  (global-set-key (kbd "s-=") 'increase-emacs-font-size)
+  (global-set-key (kbd "s--") 'decrease-emacs-font-size)
+
+#+END_SRC
+
 ** Color Theme
 
 Loading theme should be after all required loaded, refere [[https://github.com/jwiegley/use-package][:defer]] in =use-package=
@@ -657,7 +720,15 @@ Always indents header, and hide header leading starts so that no need type =#+ST
     (setq org-confirm-babel-evaluate nil)
     (setq org-use-speed-commands t)
     (setq org-completion-use-ido t)
-    (setq org-startup-with-inline-images t))
+    (setq org-startup-with-inline-images t)
+    ;; (setq org-emphasis-regexp-components
+    ;;       ;; markup 记号前后允许中文
+    ;;       (list (concat " \t('\"{" "[:nonascii:]")
+    ;;             (concat "- \t.,:!?;'\")}\\[" "[:nonascii:]")
+    ;;             " \t\r\n,\"'"
+    ;;             "."
+    ;;             1))
+    )
 
   (org-babel-do-load-languages
    'org-babel-load-languages
@@ -2681,8 +2752,8 @@ Use =ESC= to exit minibuffer. Also I map =Super-h= the same as =C-g=
   (global-set-key (kbd "s-p") 'persp-prev)
   (global-set-key (kbd "s-;") 'persp-switch-last)
 
-  (global-set-key (kbd "s-=") 'text-scale-increase)
-  (global-set-key (kbd "s--") 'text-scale-decrease)
+  ;; (global-set-key (kbd "s-=") 'text-scale-increase)
+  ;; (global-set-key (kbd "s--") 'text-scale-decrease)
 
   ;; (global-set-key (kbd "s-u") 'undo-tree-visualize)