Re: [PATCH] Distinguish = and ~ delimiters in LaTeX export

[Carsten Dominik <carsten.dominik@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 31 bytes --]

Forgot to attach the patch...


[-- Attachment #2: verb.patch --]
[-- Type: application/octet-stream, Size: 2349 bytes --]

Changes at master
	Modified lisp/org-latex.el
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 4d2d79a..9b32943 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -230,14 +230,15 @@ are written as utf8 files."
     ("/" "\\emph{%s}" nil)
     ("_" "\\underline{%s}" nil)
     ("+" "\\st{%s}" nil)
-    ("=" "\\verb" t)
+    ("=" "\\protectedtexttt" t)
     ("~" "\\verb" t))
   "Alist of LaTeX expressions to convert emphasis fontifiers.
 Each element of the list is a list of three elements.
 The first element is the character used as a marker for fontification.
 The second element is a formatting string to wrap fontified text with.
 If it is \"\\verb\", Org will automatically select a delimiter
-character that is not in the string.
+character that is not in the string.  \"\\protectedtexttt\" will use \\texttt
+to typeset and try to protect special characters.
 The third element decides whether to protect converted text from other
 conversions."
   :group 'org-export-latex
@@ -1977,12 +1978,14 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 	(replace-match rpl t t)))
     (backward-char)))
 
-(defvar org-export-latex-use-verb nil)
+(defvar org-export-latex-use-verb t
+  "Toggle the use of \\verb for ~ emphasis.
+Set to nil for \\texttt, t for \\verb.")
 (defun org-export-latex-emph-format (format string)
   "Format an emphasis string and handle the \\verb special case."
-  (when (equal format "\\verb")
+  (when (member format '("\\verb" "\\protectedtexttt"))
     (save-match-data
-      (if org-export-latex-use-verb
+      (if (and (equal format "\\verb") org-export-latex-use-verb)
 	  (let ((ll "~,./?;':\"|!@#%^&-_=+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>()[]{}"))
 	    (catch 'exit
 	      (loop for i from 0 to (1- (length ll)) do
@@ -2005,7 +2008,9 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 	    (setq string (substring string (1+ (match-beginning 0))))
 	    (setq char (or (cdr (assoc char trans)) (concat "\\" char))
 		  rtn (concat rtn char)))
-	  (setq string (concat rtn string) format "\\texttt{%s}")))))
+	  (setq string (concat rtn string) format "\\texttt{%s}")
+	  (while (string-match "--" string)
+	    (setq string (replace-match "-{}-" t t string)))))))
   (format format string))
 
 (defun org-export-latex-links ()


[-- Attachment #3: Type: text/plain, Size: 1694 bytes --]





On Jan 30, 2011, at 4:30 PM, Carsten Dominik wrote:

> Aloha Tom,
>
> On Jan 29, 2011, at 7:40 PM, Thomas S. Dye wrote:
>
>> Aloha all,
>>
>> The default value of org-export-latex-emphasis-alist treats the =  
>> and ~ delimiters as \\verb.  Both settings are ignored because org- 
>> export-latex-use-verb is nil by default.  The = and ~ delimiters  
>> produce \texttt{} instead of \verb.  This patch distinguishes = and  
>> ~ by changing the default for = to \\texttt{%s}.
>>
>> The docstring has also been changed to refer to org-export-latex- 
>> use-verb.
>>
>> With this patch, users exporting to LaTeX will be able to use = for  
>> \texttt text in LaTeX moving environments and ~ for \verb text in  
>> places where it is safe to use this construct.
>
> This is a pretty good patch, but I think we should still modify it.
> Org users traditionally use =stuff= to mark code pieces, and I think
> it is still important to escape special characters like ^ and ~ and  
> others.
>
> The modified patch below does the following:
>
> - Like your patch, it makes Org use \\verb for the ~...~ emphasis.
> - For =...= emphasis, it uses a new keyword \\protectedtexttt.
>  This will protect special characters and then do texttt.  And I
>  have extended the protection to include multiple hyphens by  
> converting
>  "--" to "-{}-".
>
> Do you agree with this solution?
>
> - Carsten
>
>
>>
>> Tom
>>
>> <0001-Changed-org-export-latex-emphasis-alist-to-distingui.patch>
>> _______________________________________________
>> Emacs-orgmode mailing list
>> Please use `Reply All' to send replies to the list.
>> Emacs-orgmode@gnu.org
>> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
>


[-- Attachment #4: Type: text/plain, Size: 201 bytes --]

_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode