From d96a8f9e167abebe74cb23e5810f3556ed7a87e1 Mon Sep 17 00:00:00 2001
From: Jambunathan K <kjambunathan@gmail.com>
Date: Fri, 1 Jul 2011 17:11:45 +0530
Subject: [PATCH] Make org-xhtml and org-odt usable

* contrib/lisp/org-odt.el (org-odt-data-dir): Update to
reflect new directory layout.

* contrib/lisp/org-xhtml.el
(org-export-xhtml-special-string-regexps): Define it.
---
 contrib/lisp/org-odt.el   |    2 +-
 contrib/lisp/org-xhtml.el |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/contrib/lisp/org-odt.el b/contrib/lisp/org-odt.el
index ad53204..c0b6491 100644
--- a/contrib/lisp/org-odt.el
+++ b/contrib/lisp/org-odt.el
@@ -70,7 +70,7 @@
 
 (defconst org-odt-lib-dir (file-name-directory load-file-name))
 (defconst org-odt-data-dir
-  (let ((dir1 (expand-file-name ".." org-odt-lib-dir))		   ; git
+  (let ((dir1 (expand-file-name "../odt" org-odt-lib-dir))	   ; git
 	(dir2 (expand-file-name "./contrib/odt" org-odt-lib-dir))) ; elpa
     (cond
      ((file-directory-p dir1) dir1)
diff --git a/contrib/lisp/org-xhtml.el b/contrib/lisp/org-xhtml.el
index 7cdb936..fcc782c 100644
--- a/contrib/lisp/org-xhtml.el
+++ b/contrib/lisp/org-xhtml.el
@@ -44,6 +44,13 @@
   :tag "Org Export HTML"
   :group 'org-export)
 
+(defconst org-export-xhtml-special-string-regexps
+  '(("\\\\-" . "&shy;")
+    ("---\\([^-]\\)" . "&mdash;\\1")
+    ("--\\([^-]\\)" . "&ndash;\\1")
+    ("\\.\\.\\." . "&hellip;"))
+  "Regular expressions for special string conversion.")
+
 (defcustom org-export-xhtml-footnotes-section "<div id=\"footnotes\">
 <h2 class=\"footnotes\">%s: </h2>
 <div id=\"text-footnotes\">
-- 
1.7.2.3