More bug fixes

4 files changed, 9 insertions, 10 deletions

diff --git a/doc/org.texi b/doc/org.texi
index 94081ed..7a08b14 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -334,7 +334,7 @@ Exporting
 * Selective export::            Using tags to select and exclude trees
 * Export options::              Per-file export settings
 * The export dispatcher::       How to access exporter commands
-* ASCII export::                Exporting to plain ASCII
+* ASCII/Latin-1/UTF-8 export::  Exporting to flat files with encoding
 * HTML export::                 Exporting to HTML
 * LaTeX and PDF export::        Exporting to La@TeX{}, and processing to PDF
 * DocBook export::              Exporting to DocBook
@@ -8894,7 +8894,7 @@ enabled (default in Emacs 23).
 * Selective export::            Using tags to select and exclude trees
 * Export options::              Per-file export settings
 * The export dispatcher::       How to access exporter commands
-* ASCII export::                Exporting to plain ASCII
+* ASCII/Latin-1/UTF-8 export::  Exporting to flat files with encoding
 * HTML export::                 Exporting to HTML
 * LaTeX and PDF export::        Exporting to La@TeX{}, and processing to PDF
 * DocBook export::              Exporting to DocBook
@@ -9042,7 +9042,7 @@ settings with properties @code{EXPORT_FILE_NAME}, @code{EXPORT_TITLE},
 @code{EXPORT_TEXT}, @code{EXPORT_AUTHOR}, @code{EXPORT_DATE}, and
 @code{EXPORT_OPTIONS}.
 
-@node The export dispatcher, ASCII export, Export options, Exporting
+@node The export dispatcher, ASCII/Latin-1/UTF-8 export, Export options, Exporting
 @section The export dispatcher
 @cindex dispatcher, for export commands
 
@@ -9142,7 +9142,7 @@ Links will be exported in a footnote-like style, with the descriptive part in
 the text and the link in a note before the next heading.  See the variable
 @code{org-export-ascii-links-to-notes} for details and other options.
 
-@node HTML export, LaTeX and PDF export, ASCII export, Exporting
+@node HTML export, LaTeX and PDF export, ASCII/Latin-1/UTF-8 export, Exporting
 @section HTML export
 @cindex HTML export
 
diff --git a/lisp/org-ascii.el b/lisp/org-ascii.el
index 3b831dd..4201e8c 100644
--- a/lisp/org-ascii.el
+++ b/lisp/org-ascii.el
@@ -118,7 +118,6 @@ utf8      Use all UTF-8 characters")
 			  'utf8 args))
 
 (defun org-export-as-encoding (command interactivep encoding &rest args)
-  (debug)
   (let ((org-export-ascii-entities encoding))
     (if interactivep
 	(call-interactively command)
diff --git a/lisp/org-entities.el b/lisp/org-entities.el
index 41efa91..47bbdb6 100644
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@@ -93,7 +93,7 @@ utf-8 replacement    Use special character available in utf-8."
     ("plusmn" "\\textpm{}" nil "±" "+-" "±" "±")
     ("sup2" "\\texttwosuperior{}" nil "²" "^2" "²" "²")
     ("sup3" "\\textthreesuperior{}" nil "³" "^3" "³" "³")
-    ("acutex" "\\acute x" t "&acute x;" "'x" "'x" "𝑥́")
+    ("acutex" "\\acute x" t "´x" "'x" "'x" "𝑥́")
     ("micro" "\\textmu{}" nil "µ" "micro" "µ" "µ")
     ("para" "\\P{}" nil "¶" "[pilcrow]" "¶" "¶")
     ("middot" "\\textperiodcentered{}" nil "·" "." "·" "·")
@@ -279,7 +279,7 @@ utf-8 replacement    Use special character available in utf-8."
     ("minus" "-" t "−" "-" "-" "−")
     ("lowast" "\\ast" t "∗" "*" "*" "∗")
     ("ast" "\\ast" t "∗" "*" "*" "*")
-    ("radic" "\\sqrt{\,}" t "√" "[square root]" "[square root]" "√")
+    ("radic" "\\sqrt{\\,}" t "√" "[square root]" "[square root]" "√")
     ("prop" "\\propto" t "∝" "[proportional to]" "[proportional to]" "∝")
     ("proptp" "\\propto" t "∝" "[proportional to]" "[proportional to]" "∝")
     ("infin" "\\propto" t "∞" "[infinity]" "[infinity]" "∞")
@@ -346,7 +346,7 @@ utf-8 replacement    Use special character available in utf-8."
     ("scaron" "\\v{s}" nil "š" "s" "s" "š")
     ("Yuml" "\\\"{Y}" nil "Ÿ" "Y" "Y" "Ÿ")
     ("circ" "\\circ" t "ˆ" "^" "^" "ˆ")
-    ("tilde" "\~{}" nil "˜" "~" "~" "~")
+    ("tilde" "\\~{}" nil "˜" "~" "~" "~")
     ("ensp" "\\hspace*{.5em}" nil " " " " " " " ")
     ("emsp" "\\hspace*{1em}" nil " " " " " " " ")
     ("thinsp" "\\hspace*{.2em}" nil " " " " " " " ")
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index fda6c32..83409e3 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1453,8 +1453,8 @@ See the `org-export-latex.el' code for a complete conversion table."
 		       (backward-char 1)))))))
 	'(;"^\\([^\n$]*?\\|^\\)\\(\\\\?\\$\\)\\([^\n$]*\\)$"
 	  "\\(\\(\\\\?\\$\\)\\)"
-	  "\\([a-za-z0-9()]+\\|[ \t\n]\\|\\b\\|\\\\\\)\\(_\\|\\^\\)\\({[^{}]+}\\|[a-za-z0-9]+\\|[ \t\n]\\|[:punct:]\\|)\\|{[a-za-z0-9]+}\\|([a-za-z0-9]+)\\)"
-	  "\\(.\\|^\\)\\(\\\\\\)\\([ \t\n]\\|[a-zA-Z&#%{}\"]+\\)"
+	  "\\([a-zA-Z0-9()]+\\|[ \t\n]\\|\\b\\|\\\\\\)\\(_\\|\\^\\)\\({[^{}]+}\\|[a-zA-Z0-9]+\\|[ \t\n]\\|[:punct:]\\|)\\|{[a-zA-Z0-9]+}\\|([a-zA-Z0-9]+)\\)"
+	  "\\(.\\|^\\)\\(\\\\\\)\\([ \t\n]\\|\\([&#%{}\"]\\|[a-zA-Z][a-zA-Z0-9]*\\)\\)"
 	  "\\(.\\|^\\)\\(&\\)"
 	  "\\(.\\|^\\)\\(#\\)"
 	  "\\(.\\|^\\)\\(%\\)"