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

@@ -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)

contrib/lisp/org-xhtml.el

@@ -44,6 +44,13 @@
   :tag "Org Export HTML"
   :group 'org-export)
 
+(defconst org-export-xhtml-special-string-regexps
+  '(("\\\\-" . "­")
+    ("---\\([^-]\\)" . "—\\1")
+    ("--\\([^-]\\)" . "–\\1")
+    ("\\.\\.\\." . "…"))
+  "Regular expressions for special string conversion.")
+
 (defcustom org-export-xhtml-footnotes-section "<div id=\"footnotes\">
 <h2 class=\"footnotes\">%s: </h2>
 <div id=\"text-footnotes\">