ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXPERIMENTAL/org-e-latex: Apply change of back-end's name 

* EXPERIMENTAL/org-e-latex.el (org-e-latex--caption/label-string,
org-e-latex-template, org-e-latex-headline,
org-e-latex-inlinetask, org-e-latex-item, org-e-latex-keyword,
org-e-latex-link, org-e-latex-src-block, org-e-latex-table,
org-e-latex-verse-block): Apply change of back-end's name.
This commit is contained in:
Nicolas Goaziou 2011-12-23 16:30:00 +01:00
parent d7ba7d2e69
commit ed96338b21
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
EXPERIMENTAL/org-e-latex.el
View File

@ -588,7 +588,7 @@ If there's no caption nor label, return the empty string.
For non-floats, see `org-e-latex--wrap-label'." For non-floats, see `org-e-latex--wrap-label'."
(let ((caption-str (and caption (let ((caption-str (and caption
(org-export-secondary-string (org-export-secondary-string
caption 'latex info))) caption 'e-latex info)))
(label-str (if label (format "\\label{%s}" label) ""))) (label-str (if label (format "\\label{%s}" label) "")))
(cond (cond
((and (not caption-str) (not label)) "") ((and (not caption-str) (not label)) "")
@ -670,7 +670,7 @@ This function shouldn't be used for floats. See
CONTENTS is the transcoded contents string. INFO is a plist CONTENTS is the transcoded contents string. INFO is a plist
holding export options." holding export options."
(let ((title (org-export-secondary-string (let ((title (org-export-secondary-string
(plist-get info :title) 'latex info))) (plist-get info :title) 'e-latex info)))
(concat (concat
;; 1. Time-stamp. ;; 1. Time-stamp.
(and (plist-get info :time-stamp-file) (and (plist-get info :time-stamp-file)
@ -699,10 +699,10 @@ holding export options."
(let ((author (and (plist-get info :with-author) (let ((author (and (plist-get info :with-author)
(let ((auth (plist-get info :author))) (let ((auth (plist-get info :author)))
(and auth (org-export-secondary-string (and auth (org-export-secondary-string
auth 'latex info))))) auth 'e-latex info)))))
(email (and (plist-get info :with-email) (email (and (plist-get info :with-email)
(org-export-secondary-string (org-export-secondary-string
(plist-get info :email) 'latex info)))) (plist-get info :email) 'e-latex info))))
(cond ((and author email (not (string= "" email))) (cond ((and author email (not (string= "" email)))
(format "\\author{%s\\thanks{%s}}\n" author email)) (format "\\author{%s\\thanks{%s}}\n" author email))
(author (format "\\author{%s}\n" author)) (author (format "\\author{%s}\n" author))
@ -937,12 +937,12 @@ holding contextual information."
(concat (car sec) "\n%s" (nth 1 sec)) (concat (car sec) "\n%s" (nth 1 sec))
(concat (nth 2 sec) "\n%s" (nth 3 sec))))))) (concat (nth 2 sec) "\n%s" (nth 3 sec)))))))
(text (org-export-secondary-string (text (org-export-secondary-string
(org-element-get-property :title headline) 'latex info)) (org-element-get-property :title headline) 'e-latex info))
(todo (and (plist-get info :with-todo-keywords) (todo (and (plist-get info :with-todo-keywords)
(let ((todo (org-element-get-property (let ((todo (org-element-get-property
:todo-keyword headline))) :todo-keyword headline)))
(and todo (and todo
(org-export-secondary-string todo 'latex info))))) (org-export-secondary-string todo 'e-latex info)))))
(todo-type (and todo (org-element-get-property :todo-type headline))) (todo-type (and todo (org-element-get-property :todo-type headline)))
(tags (and (plist-get info :with-tags) (tags (and (plist-get info :with-tags)
(org-element-get-property :tags headline))) (org-element-get-property :tags headline)))
@ -1062,12 +1062,12 @@ contextual information."
CONTENTS holds the contents of the block. INFO is a plist CONTENTS holds the contents of the block. INFO is a plist
holding contextual information." holding contextual information."
(let ((title (org-export-secondary-string (let ((title (org-export-secondary-string
(org-element-get-property :title inlinetask) 'latex info)) (org-element-get-property :title inlinetask) 'e-latex info))
(todo (and (plist-get info :with-todo-keywords) (todo (and (plist-get info :with-todo-keywords)
(let ((todo (org-element-get-property (let ((todo (org-element-get-property
:todo-keyword inlinetask))) :todo-keyword inlinetask)))
(and todo (and todo
(org-export-secondary-string todo 'latex info))))) (org-export-secondary-string todo 'e-latex info)))))
(todo-type (org-element-get-property :todo-type inlinetask)) (todo-type (org-element-get-property :todo-type inlinetask))
(tags (and (plist-get info :with-tags) (tags (and (plist-get info :with-tags)
(org-element-get-property :tags inlinetask))) (org-element-get-property :tags inlinetask)))
@ -1119,7 +1119,7 @@ contextual information."
(tag (let ((tag (org-element-get-property :tag item))) (tag (let ((tag (org-element-get-property :tag item)))
(and tag (and tag
(format "[%s]" (org-export-secondary-string (format "[%s]" (org-export-secondary-string
tag 'latex info)))))) tag 'e-latex info))))))
(concat counter "\\item" tag " " checkbox contents))) (concat counter "\\item" tag " " checkbox contents)))
@ -1150,7 +1150,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
((string= "figures" value) "\\listoffigures") ((string= "figures" value) "\\listoffigures")
((string= "listings" value) "\\listoflistings")))) ((string= "listings" value) "\\listoflistings"))))
((string= key "include") ((string= key "include")
(org-export-included-file keyword 'latex info))))) (org-export-included-file keyword 'e-latex info)))))
;;;; Latex Environment ;;;; Latex Environment
@ -1274,7 +1274,7 @@ INFO is a plist holding contextual information. See
((member type '("custom-id" "target" "radio")) ((member type '("custom-id" "target" "radio"))
(format "\\hyperref[%s]{%s}" (format "\\hyperref[%s]{%s}"
(org-export-solidify-link-text path) (org-export-solidify-link-text path)
(or desc (org-export-secondary-string path 'latex info)))) (or desc (org-export-secondary-string path 'e-latex info))))
;; Fuzzy: With the help of `org-export-resolve-fuzzy-link', find ;; Fuzzy: With the help of `org-export-resolve-fuzzy-link', find
;; the destination of the link. ;; the destination of the link.
((string= type "fuzzy") ((string= type "fuzzy")
@ -1286,20 +1286,20 @@ INFO is a plist holding contextual information. See
(org-export-solidify-link-text destination) (org-export-solidify-link-text destination)
(or desc (or desc
(org-export-secondary-string (org-export-secondary-string
(org-element-get-property :raw-link link) 'latex info)))) (org-element-get-property :raw-link link) 'e-latex info))))
;; Headline match. ;; Headline match.
((integerp destination) ((integerp destination)
(format "\\hyperref[headline-%d]{%s}" (format "\\hyperref[headline-%d]{%s}"
destination destination
(or desc (or desc
(org-export-secondary-string (org-export-secondary-string
(org-element-get-property :raw-link link) 'latex info)))) (org-element-get-property :raw-link link) 'e-latex info))))
;; No match. ;; No match.
(t (format "\\texttt{%s}" (t (format "\\texttt{%s}"
(or desc (or desc
(org-export-secondary-string (org-export-secondary-string
(org-element-get-property :raw-link link) (org-element-get-property :raw-link link)
'latex info))))))) 'e-latex info)))))))
;; Coderef: replace link with the reference name or the ;; Coderef: replace link with the reference name or the
;; equivalent line number. ;; equivalent line number.
((string= type "coderef") ((string= type "coderef")
@ -1519,7 +1519,7 @@ contextual information."
(caption-str (and caption (caption-str (and caption
(org-export-secondary-string (org-export-secondary-string
(org-element-get-property :caption src-block) (org-element-get-property :caption src-block)
'latex info)))) 'e-latex info))))
(concat (format "\\lstset{%s}\n" (concat (format "\\lstset{%s}\n"
(org-e-latex--make-option-string (org-e-latex--make-option-string
(append org-e-latex-listings-options (append org-e-latex-listings-options
@ -1725,7 +1725,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
(org-element-parse-secondary-string (org-element-parse-secondary-string
cell cell
(cdr (assq 'table org-element-string-restrictions))) (cdr (assq 'table org-element-string-restrictions)))
'latex info)) 'e-latex info))
(org-split-string row "[ \t]*|[ \t]*")))) (org-split-string row "[ \t]*|[ \t]*"))))
(org-split-string clean-table "\n")) (org-split-string clean-table "\n"))
`(:tstart nil :tend nil `(:tstart nil :tend nil
@ -1831,7 +1831,7 @@ CONTENTS is nil. INFO is a plist holding contextual information."
(org-remove-indentation (org-remove-indentation
(org-export-secondary-string (org-export-secondary-string
(org-element-get-property :value verse-block) (org-element-get-property :value verse-block)
'latex info))))) 'e-latex info)))))
(while (string-match "^[ \t]+" contents) (while (string-match "^[ \t]+" contents)
(let ((new-str (format "\\hspace*{%dem}" (let ((new-str (format "\\hspace*{%dem}"
(length (match-string 0 contents))))) (length (match-string 0 contents)))))