X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=cb563f77a1bc2402734b0d374ce12d826434f15d;hb=d2ec2b4d0940fae2293a88b66eb6c6e462247743;hp=8dce4e6d9d7050e623512b4f48114a039c42f938;hpb=4a6d433113fc61126d3998c5bdfcfbb2bd8de085;p=dotfiles.git

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 8dce4e6..cb563f7 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -155,15 +155,11 @@ Check out [[http://tapoueh.org/emacs/el-get.html][el-get]].
 #+END_SRC
 
 ** Smart Comments
-
 [[https://github.com/paldepind/smart-comment][smart-comments]]
-
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-
   (use-package smart-comment
     :ensure t
     :bind ("M-;" . smart-conmment))
-
 #+END_SRC
 
 ** Font Setting
@@ -177,7 +173,7 @@ Check out [[http://tapoueh.org/emacs/el-get.html][el-get]].
   (if window-system
       (defvar sd/fixed-font-family
         (cond ((x-list-fonts "Hasklig")         "Hasklig")
-              ((x-list-fonts "Source Code Pro") "Source Code Pro:weight")
+              ((x-list-fonts "Source Code Pro") "Source Code Pro:weight") ;; weigth=light
               ((x-list-fonts "Anonymous Pro")   "Anonymous Pro")
               ((x-list-fonts "M+ 1mn")          "M+ 1mn"))
         "The fixed width font based on what is installed, `nil' if not defined."))
@@ -188,7 +184,7 @@ Setting the fonts alignment issue
   (if window-system
       (when sd/fixed-font-family
         (set-frame-font sd/fixed-font-family)
-        (set-face-attribute 'default nil :font sd/fixed-font-family :height 130)
+        (set-face-attribute 'default nil :font sd/fixed-font-family :height 140)
         (set-face-font 'default sd/fixed-font-family)))
 #+END_SRC
 
@@ -248,21 +244,21 @@ Fix the font alignment issue when both Chinese and English hybird in org-mode ta
 
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   ;; Setup font size based on emacs-font-size-pair
-  (if window-system
-      (set-font emacs-english-font emacs-cjk-font '(13 . 16)))
-  ;  
+  ;; (if window-system
+  ;;     (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)
+  ;; (global-set-key (kbd "s-=") 'increase-emacs-font-size)
+  ;; (global-set-key (kbd "s--") 'decrease-emacs-font-size)
 
-    ;; set different fonts (chinese) size for org-mode.
-    (defun sd/org-buffer-font ()
-      "My font setting for org-mode"
-      (interactive)
-      (setq buffer-face-mode-face '(:family "cjk-misc" :font "STHeiti" :height 160))
-      (buffer-face-mode))
+  ;; set different fonts (chinese) size for org-mode.
+  (defun sd/org-buffer-font ()
+    "My font setting for org-mode"
+    (interactive)
+    (setq buffer-face-mode-face '(:family "Source Sans Code" :height 160))
+    (buffer-face-mode))
 
-    ;; (add-hook 'org-mode-hook 'sd/org-buffer-font)
+  ;; (add-hook 'org-mode-hook 'sd/org-buffer-font)
 #+END_SRC
 
 ** Color Theme
@@ -586,13 +582,13 @@ Fix the issue in mode line when showing triangle
 
 set height in mode line
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  (set-variable 'powerline-height 14)
-  (set-variable 'powerline-text-scale-factor (/ (float 100) 140))
-  ;; (custom-set-variables
-  ;;  '(powerline-height 14)
-  ;;  '(powerline-text-scale-factor (/ (float 100) 140)))
-  ;; 100/140;0.8
-  (set-face-attribute 'mode-line nil :height 100)
+  (with-eval-after-load "powerline"
+    (let* ((base-font-size (face-attribute 'default :height)))
+      ;; 100/140;0.8
+      (set-variable 'powerline-height (/ base-font-size 10))
+      (set-variable 'powerline-text-scale-factor (/ (float 100) base-font-size)))
+    (set-face-attribute 'mode-line nil :height 100)
+    (set-face-attribute 'mode-line-inactive nil :height 100))
 #+END_SRC
 
 * IDO & SMEX
@@ -730,33 +726,34 @@ Always indents header, and hide header leading starts so that no need type =#+ST
     (setq org-completion-use-ido t)
     (setq org-startup-with-inline-images t)
     ;; latex preview
-    (setq org-startup-with-latex-preview t)
-    (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.2))
+    ;; (setq org-startup-with-latex-preview t)
+    ;; (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.2))
     (require 'org-habit)
     (add-to-list 'org-modules 'org-habit)
-    (setq org-habit-graph-column 50))
+    (setq org-habit-graph-column 50)
+    (setq org-hide-emphasis-markers t)
+    (setq org-html-validation-link nil))
 
   (el-get-bundle hasu/emacs-ob-racket
     :features ob-racket)
 
-  (org-babel-do-load-languages
-   'org-babel-load-languages
-   '((python . t)
-     (C . t)
-     (perl . t)
-     (calc . t)
-     (latex . t)
-     (java . t)
-     (ruby . t)
-     (lua . t)
-     (lisp . t)
-     (scheme . t)
-     (racket . t)
-     (sh . t)
-     (sqlite . t)
-     (js . t)
-     (gnuplot . t)
-     (ditaa . t)))
+  (org-babel-do-load-languages 'org-babel-load-languages
+                               '((python . t)
+                                 (C . t)
+                                 (perl . t)
+                                 (calc . t)
+                                 (latex . t)
+                                 (java . t)
+                                 (ruby . t)
+                                 (lua . t)
+                                 (lisp . t)
+                                 (scheme . t)
+                                 (racket . t)
+                                 (sh . t)
+                                 (sqlite . t)
+                                 (js . t)
+                                 (gnuplot . t)
+                                 (ditaa . t)))
 
   ;; use current window for org source buffer editting
   (setq org-src-window-setup 'current-window )
@@ -1085,6 +1082,88 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em
                '("m" "\\begin{equation}\n?\n\\end{equation}"))
 #+END_SRC
 
+** Org theme
+*** variable-pitch-mode and fixed-pitch-mode
+[[https://yoo2080.wordpress.com/2013/05/30/monospace-font-in-tables-and-source-code-blocks-in-org-mode-proportional-font-in-other-parts/][monospace font in tables and source code blocks in org-mode, proportional font in other parts]]
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (set-face-attribute 'variable-pitch nil :font "Calibri" :height 160)
+  (set-face-attribute 'fixed-pitch nil :font "Source Code Pro" :height (face-attribute 'default :height))
+
+  (add-hook 'text-mode-hook 'variable-pitch-mode)
+
+  ;; Install Ubuntu Mono fonts and apply it in org-table to align Chinese fonts
+  (with-eval-after-load "org"
+    (mapc (lambda (face)
+            (set-face-attribute face nil :inherit 'fixed-pitch))
+          (list 'org-code 'org-block 'org-block-background))
+    (set-face-attribute 'org-table nil :family "Ubuntu Mono" :height 140)
+    
+    ;; fix indent broken by variable-pitch-mode
+    ;; http://emacs.stackexchange.com/questions/26864/variable-pitch-face-breaking-indentation-in-org-mode
+    (require 'org-indent)
+    (set-face-attribute 'org-indent nil :inherit '(org-hide fixed-pitch)))
+#+END_SRC
+
+Also correct the face of  =org-meta-line= in =org-table= 
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (with-eval-after-load "org"
+    (set-face-attribute 'org-meta-line nil :font "Source Code Pro" :height 120 :slant 'italic :inherit 'font-lock-comment-face))
+#+END_SRC
+
+*** Org-head face
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (with-eval-after-load "org"
+    (let* ((base-height (face-attribute 'variable-pitch :height))
+           (base-font-color (face-foreground 'default nil  'default)))
+      (set-face-attribute 'org-document-title nil :weight 'bold :height (+ 60 base-height))
+      (set-face-attribute 'org-level-1 nil :weight 'bold :height (+ 40 base-height))
+      (set-face-attribute 'org-level-2 nil :weight 'bold :height (+ 30 base-height))
+      (set-face-attribute 'org-level-3 nil :weight 'bold :height (+ 20 base-height))
+      (set-face-attribute 'org-level-4 nil :weight 'bold :height (+ 10 base-height))
+      (set-face-attribute 'org-level-5 nil :weight 'bold)
+      (set-face-attribute 'org-level-6 nil :weight 'bold)
+      (set-face-attribute 'org-level-7 nil :weight 'bold)
+      (set-face-attribute 'org-level-8 nil :weight 'bold)))
+#+END_SRC
+
+** Org Blog
+Refer to [[http://orgmode.org/worg/org-tutorials/org-publish-html-tutorial.html][org-publish-html-tutorial]]
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (require 'ox-publish)
+  ;; Refer https://ogbe.net/emacsconfig.html
+  (setq my-blog-extra-head
+        (concat 
+         "<link rel='stylesheet' href='./css/worg.css' />"))
+
+  (setq org-publish-project-alist
+        `(
+          ("org-notes"
+           :base-directory "~/Private/blog/"
+           :base-extension "org"
+           :publishing-directory "~/Private/publish_html"
+           :recursive t
+           :publishing-function org-html-publish-to-html
+           :headline-levels 4
+           :section-numbers nil
+           :auto-preamble t
+           :auto-sitemap t          ;Generate sitmap.org automagicaly...
+           :sitemap-filename "sitemap.org" ;... call it sitemap.org (it's the default )...
+           :sitemap-title "Sitemap"
+
+           :html-link-home "/"
+           :html-head nil                 ;
+           :html-head-extra ,my-blog-extra-head
+           :html-head-include-default-style nil
+           :html-head-include-scripts nil)
+          ("org-static"
+           :base-directory "~/Private/blog/"
+           :base-extension "css\\|js\\|png\\|gif\\|pdf\\|mp3\\|ogg\\|swf"
+           :publishing-directory "~/Private/publish_html"
+           :recursive t
+           :publishing-function org-publish-attachment)
+          ("org" :components ("org-notes" "org-static"))))
+#+END_SRC
+
 * Magit
 [[https://github.com/magit/magit][Magit]] is a very cool git interface on Emacs.
 and Defined keys, using vi keybindings, Refer abo-abo's setting [[https://github.com/abo-abo/oremacs/blob/c5cafdcebc88afe9e73cc8bd40c49b70675509c7/modes/ora-nextmagit.el][here]]
@@ -1764,11 +1843,12 @@ here on Mac, just use "open" commands to pen =.pdf=,  =.html= and image files
     (define-key company-active-map (kbd "M-p") nil)
     (define-key company-active-map (kbd "C-n") #'company-select-next)
     (define-key company-active-map (kbd "C-p") #'company-select-previous)
-     ;; should map both (kbd "TAB") and [tab],https://github.com/company-mode/company-mode/issues/75
+    ;; should map both (kbd "TAB") and [tab],https://github.com/company-mode/company-mode/issues/75
     (define-key company-active-map (kbd "TAB") #'company-complete-selection)
     (define-key company-active-map [tab] #'company-complete-selection)
     (global-company-mode)
-    (setq company-global-modes '(not org-mode)))
+    ;; magig-commit is text-modeh
+    (setq company-global-modes '(not org-mode magit-status-mode text-mode eshell-mode)))
 
   (use-package company-statistics
     :ensure t
@@ -3332,11 +3412,12 @@ Refer [[https://github.com/fnwiya/dotfiles/blob/c9ca79f1b22c919d9f4c3a0f944ba828
   (global-set-key (kbd "C-w") 'sd/kill-region-or-backward-kill-word)
 #+END_SRC
 
-
-
 * TODO todolist
-** rucket
+** Rucket
 ** player video on iphone for 
 ** SICP
 ** music searcher
 search music on some music web site
+
+
+