autorg directory initialization

6 files changed, 31 insertions, 24 deletions

diff --git a/configure.ac b/configure.ac
index 241971d..ad1cfb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,6 +119,7 @@ share/Makefile
 share/awk/Makefile
 share/elisp/Makefile
 share/manual/Makefile
+share/org-templates/Makefile
 ])
 
 AC_OUTPUT
diff --git a/share/Makefile.am b/share/Makefile.am
index b2eed02..675928c 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = awk elisp manual
+SUBDIRS = awk elisp manual org-templates
 
 EXTRA_DIST = config.in
 
diff --git a/share/elisp/org-batch.el.in b/share/elisp/org-batch.el.in
index f516862..d6ae003 100644
--- a/share/elisp/org-batch.el.in
+++ b/share/elisp/org-batch.el.in
@@ -69,7 +69,7 @@
 (require 'org-publish)
 (setq org-publish-project-alist
 '(
- ("manual"
+ ("manual-org"
 :base-directory "%data_path%/manual"
 :base-extension "org"
 :publishing-directory "%autorg_path%/manual"
@@ -79,26 +79,15 @@
 :auto-preamble t
 )
 
- ("notes"
- :base-directory "%autorg_path%/notes"
- :base-extension "org"
- :publishing-directory "%autorg_path%/notes/pub"
- :recursive t
- :publishing-function org-publish-org-to-html
- :headline-levels 4 ; Just the default for this project.
- :auto-preamble t
- )
-
- ("org-static"
- :base-directory "."
- :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf"
- :publishing-directory "../pub"
+ ("manual-static"
+ :base-directory "%data_path%/manual"
+ :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|ico\\|ogg"
+ :publishing-directory "%autorg_path%/manual"
 :recursive t
 :publishing-function org-publish-attachment
- )
+ )
 
- ("autorg" :components ("manual" "notes" "autorg-static"))
-; ("autorg" :components ("manual" "notes"))
+ ("manual" :components ("manual-org" "manual-static"))
 ))
 
 ;;(org-publish-project "autorg")
@@ -118,6 +107,7 @@
 org-publish-project-alist)
 current-prefix-arg))
 (setq org-publish-initial-buffer (current-buffer))
+
 (save-window-excursion
 (let* ((org-publish-use-timestamps-flag
 (if force nil org-publish-use-timestamps-flag)))
@@ -131,6 +121,16 @@
 ; directory used for mobile-org files
 
 (custom-set-variables
- '(org-mobile-directory "%autorg_path%/notes")
- '(org-agenda-files (quote ("%autorg_path%/notes.org" "%autorg_path%/agenda.org")))
+
+ ; meta-paths (filled in by config)
+ '(org-directory "%autorg_path%")
+ '(org-mobile-directory "%autorg_path%/mobile")
+ '(org-agenda-files (quote ("%autorg_path%/agenda.org")))
+ '(org-mobile-files (quote ("%autorg_path%/mobile.org")))
+
+ ; export options (todo: make them configurable)
+ '(org-export-html-inline-images t)
+ '(org-export-html-use-infojs t)
+ '(org-export-html-validation-link "<p class=\"xhtml-validation\"><a href=\"http://validator.w3.org/check?uri=referer\">Validate XHTML 1.0</a></p>")
+ '(org-export-html-with-timestamp t)
 )
diff --git a/share/manual/Makefile.am b/share/manual/Makefile.am
index 9910ae7..1744e10 100644
--- a/share/manual/Makefile.am
+++ b/share/manual/Makefile.am
@@ -2,11 +2,11 @@
 EXTRA_DIST = 404.org API.org autonomy-is-organization.org \
 autorg-bg.png autorg.css autorg-logo.png favicon.ico \
 get-started.org hacking.org index.org org-gtd.org \
- org-protocol.org SemVer.org TODO.org
+ org-protocol.org SemVer.org TODO.org .autorg-setup.org
 
 Manualdir = $(prefix)/share/autorg/manual
 Manual_DATA = 404.org API.org autonomy-is-organization.org \
 autorg-bg.png autorg.css autorg-logo.png favicon.ico \
 get-started.org hacking.org index.org org-gtd.org \
- org-protocol.org SemVer.org TODO.org
+ org-protocol.org SemVer.org TODO.org .autorg-setup.org
 
diff --git a/share/org-templates/Makefile.am b/share/org-templates/Makefile.am
new file mode 100644
index 0000000..8870034
--- a/dev/null
+++ b/share/org-templates/Makefile.am
@@ -0,0 +1,6 @@
+
+EXTRA_DIST = agenda-setup.org
+
+Orgdir = $(prefix)/share/autorg/org-templates
+Org_DATA = agenda-setup.org
+
diff --git a/share/org-templates/agenda-setup.org b/share/org-templates/agenda-setup.org
index 89de424..02e59cb 100644
--- a/share/org-templates/agenda-setup.org
+++ b/share/org-templates/agenda-setup.org
@@ -1,5 +1,5 @@
 #+STARTUP: overview
 #+STARTUP: hidestars
 #+STARTUP: logdone
-#+TAGS: code(c) sysadm(s) buro(b) dyne(d) fun(f)
+#+TAGS: trip(v) comm(c) theory(t) sysadm(s) buro(b) zorg(z) fun(f)
 #+SEQ_TODO: TODO(t) NEXT(n) APPT(a) WAITING(w) SOMEDAY(s) | DONE(d) CANCELLED(c) DEFERRED(f)