Browse Source

Export: LaTeX fragment images are inlined again.

Carsten Dominik 17 years ago
parent
commit
19bda1c361
2 changed files with 14 additions and 10 deletions
  1. 2 0
      lisp/ChangeLog
  2. 12 10
      lisp/org-exp.el

+ 2 - 0
lisp/ChangeLog

@@ -2,6 +2,8 @@
 
 	* org-exp.el (org-export-remove-or-extract-drawers): Only remove
 	drawers that are unprotected.
+	(org-export-html-format-image): Make sure inlined LaTeX fragment
+	images remain inlined.
 
 	* org.el (org-toggle-ordered-property): New function.
 	(org-mode-map): Add a key for `org-toggle-ordered-property'.

+ 12 - 10
lisp/org-exp.el

@@ -4036,18 +4036,20 @@ lang=\"%s\" xml:lang=\"%s\">
 (defun org-export-html-format-image (src)
   "Create image tag with source and attributes."
   (save-match-data
-    (let* ((caption (org-find-text-property-in-string 'org-caption src))
-	   (attr (org-find-text-property-in-string 'org-attributes src))
-	   (label (org-find-text-property-in-string 'org-label src)))
-      (format "<div %sclass=\"figure\">
+    (if (string-match "^ltxpng/" src)
+	(format "<img src=\"%s\"/>" src)
+      (let* ((caption (org-find-text-property-in-string 'org-caption src))
+	     (attr (org-find-text-property-in-string 'org-attributes src))
+	     (label (org-find-text-property-in-string 'org-label src)))
+	(format "<div %sclass=\"figure\">
 <p><img src=\"%s\"%s /></p>%s
 </div>"
-	      (if label (format "id=\"%s\" " label) "")
-	      src
-	      (if (string-match "\\<alt=" (or attr ""))
-		  (concat " " attr )
-		(concat " " attr " alt=\"" src "\""))
-	      (if caption (concat "\n<p>" caption "</p>") "")))))
+		(if label (format "id=\"%s\" " label) "")
+		src
+		(if (string-match "\\<alt=" (or attr ""))
+		    (concat " " attr )
+		  (concat " " attr " alt=\"" src "\""))
+		(if caption (concat "\n<p>" caption "</p>") ""))))))
 
 (defvar org-table-colgroup-info nil)
 (defun org-format-table-ascii (lines)