Browse Source

Revert "LaTeX export: Fix problem with emphasis in quotes"

This reverts commit 0ba7d3d2f961a224d077e6806b804cde4c4a7726.

Conflicts:

	lisp/ChangeLog
Carsten Dominik 15 years ago
parent
commit
44bb3134d0
3 changed files with 2 additions and 3 deletions
  1. 0 1
      lisp/ChangeLog
  2. 1 1
      lisp/org-latex.el
  3. 1 1
      lisp/org.el

+ 0 - 1
lisp/ChangeLog

@@ -158,7 +158,6 @@
 	* org-latex.el (org-export-latex-classes): Always include the soul
 	package.
 	(org-export-latex-emphasis-alist): Use \st for strikethough.
-	(org-export-latex-fontify): Fix emphasis in quotes.
 
 	* org-exp-blocks.el (org-export-blocks-preprocess): Use
 	`indent-code-rigidly' to indent.

+ 1 - 1
lisp/org-latex.el

@@ -1440,7 +1440,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
       (unless emph
 	(message "`org-export-latex-emphasis-alist' has no entry for formatting triggered by \"%s\""
 		 (match-string 3)))
-      (unless (or (get-text-property (- (point) 3) 'org-protected)
+      (unless (or (get-text-property (1- (point)) 'org-protected)
 		  (save-excursion
 		    (goto-char (match-beginning 1))
 		    (save-match-data

+ 1 - 1
lisp/org.el

@@ -2804,7 +2804,7 @@ org-leve-* faces."
 		    "\\([" post  "]\\|$\\)")))))
 
 (defcustom org-emphasis-regexp-components
-  '(" \t('`\"{" "- \t.,:!?;'\")}\\" " \t\r\n,\"'" "." 1)
+  '(" \t('\"{" "- \t.,:!?;'\")}\\" " \t\r\n,\"'" "." 1)
   "Components used to build the regular expression for emphasis.
 This is a list with 6 entries.  Terminology:  In an emphasis string
 like \" *strong word* \", we call the initial space PREMATCH, the final