X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=blog.el;h=cb42d19a069aab639f11a087fa22f9f262946449;hb=da7baf43a25e64d2a67152455c39583083a96e88;hp=b000d9add95b6697879af0f90388edd5e18bb85a;hpb=c91f2857141f4891885384b531487df5495f0f91;p=blog.git

diff --git a/blog.el b/blog.el
index b000d9a..cb42d19 100644
--- a/blog.el
+++ b/blog.el
@@ -41,12 +41,19 @@
 (defconst root-dir (file-name-directory (or load-file-name buffer-file-name)))
 (defvar publish-dir (concat root-dir "_site/"))
 (defconst css-file "../css/worg.css")
+(defvar force-publish nil)
 ;; (defconst css-file (concat root-dir "css/worg.css"))
 
 (let ((aa (pop command-line-args-left)))
   (if (>  (length aa) 0)
       (setq publish-dir aa)))
 
+
+(let ((force (pop command-line-args-left)))
+  (if (string= force "true")
+      (setq force-publish t)))
+
+
 ;; (setq publish-dir (or (pop command-line-args-left) publish-dir))
 (message publish-dir)
 
@@ -56,42 +63,109 @@
 
 (message "Org-mode version %s" (org-version))
 (message "publish directory is %s" publish-dir)
+(message "force %s" force-publish)
 
 ;; To prevent inline-css when exporting html. will use external css
 (setq org-html-htmlize-output-type 'css)
 
+
+(setq blog-extra-head
+      (concat
+       ;; "<link rel='stylesheet' href='" css-file "' />\n"
+       "<link rel='stylesheet' href='../css/main.css' />\n"
+       "<link rel='stylesheet' href='../css/code.css' />"
+       ))
+
+(setq blog-header
+      (concat
+       " <header id= 'banner' > "
+       "<h1><a href= '/' >Peng Li</a></h1>"
+       "<hr>"
+       "<nav><ul>"
+       ;; "<li><a href= '/contact.html' >Contact</a></li>"
+       "<li><a href= '/blog.html' >Blog</a></li>"
+       ;; "<li><a href= '/teaching.html' >Teaching</a></li>"
+       ;; "<li><a href= '/research.html' >Research</a></li>"
+       "<li><a href= '/' >About Me</a></li>"
+       "</ul></nav>"
+       "</header>"))
+
+;; don't know why setting this null in `org-publish-project-alist' doesn't work
+;; (setf org-html-home/up-format "")
+
 (setq org-publish-project-alist
       `(
-        ("org-notes"
-         :base-directory ,root-dir
-         :base-extension "org"
-         :publishing-directory ,publish-dir
-         :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-table-of-contents nil
-         :html-postamble nil ;dont export creator auto validation info in html postamble div
-         :html-link-home "/"
-         :html-head  ,(concat  "<link rel='stylesheet' href='" css-file  "' />")
-         :html-head-include-default-style nil
-         :html-head-include-scripts nil)
-        ("org-static"
-         :base-directory ,root-dir
-         :base-extension "css\\|js\\|png\\|gif\\|pdf\\|mp3\\|ogg\\|swf\\|el"
-         :publishing-directory ,publish-dir
-         :recursive t
-         :publishing-function org-publish-attachment
-         :table-of-contents nil)
-        ("org" :components ("org-notes" "org-static"))))
-
-
-(org-publish-project "org")
+        ;; ("org-notes"
+        ;;  :base-directory ,root-dir
+        ;;  :base-extension "org"
+        ;;  :publishing-directory ,publish-dir
+        ;;  :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-table-of-contents nil
+        ;;  :html-postamble nil ;dont export creator auto validation info in html postamble div
+        ;;  :html-link-home "/"
+        ;;  :html-head  ,(concat  "<link rel='stylesheet' href='" css-file  "' />")
+        ;;  :html-head-include-default-style nil
+        ;;  :html-head-include-scripts nil)
+	("blog-pages"
+	 ;; publishing
+	 :base-directory ,root-dir
+	 :base-extension "org"
+	 :publishing-directory ,publish-dir
+	 :recursive nil
+	 :publishing-function org-html-publish-to-html
+	 
+	 ;; html style
+	 :htlm-link-home "/"
+	 ;; disable home/up div
+	 :html-home/up-format ""
+	 :html-link-home ""
+	 :html-link-up ""
+	 
+	 :html-head  ,blog-extra-head
+	 :html-postamble nil)
+
+	("blog-posts"
+	 ;; publishing
+	 :base-directory ,(concat root-dir "/posts")
+	 :base-extension "org"
+	 :publishing-directory ,(concat publish-dir "/posts")
+	 :recursive t
+	 :publishing-function org-html-publish-to-html
+
+	 ;; html style
+  	 :html-link-home "/"
+	 ;; disable Home/Up
+	 :html-home/up-format ""
+	 :html-link-up ""
+	 :html-link-home ""
+	 ;; Add css file and preamble
+	 :html-head ,blog-extra-head
+	 :html-preamble ,blog-header
+	 :html-postamble "")
+	
+	("blog-css"
+	 :base-directory ,(concat root-dir "/css")
+	 :base-extension ".*"
+	 :publishing-directory ,(concat publish-dir "/css")
+	 :publishing-function org-publish-attachment
+	 :recursive t)
+	("blog-cgi"
+	 :base-directory ,(concat root-dir "/cgi-bin")
+	 :base-extension ".*"
+	 :publishing-directory ,(concat publish-dir "/cgi-bin")
+	 :publishing-function org-publish-attachment
+	 :recursive t)
+        ("blog" :components ("blog-pages" "blog-posts" "blog-css" "blog-cgi"))))
+
+(org-publish-project "blog" force-publish)
 
 ;; (provide 'blog)
 (kill-emacs 0)