mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-28 10:56:57 +00:00
Code

intermediate

Browse Source
This commit is contained in:
Carsten Dominik 2008-10-10 08:46:05 +02:00
parent 5ebc1a7982
commit 1e3198b821
2 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lisp/org-exp.el
View File

@ -1456,6 +1456,40 @@ on this string to produce the exported version."
;; Remove comment environment and comment subtrees
(org-export-remove-comment-blocks-and-subtrees)
;; Find matches for radio targets and turn them into internal links
(org-export-mark-radio-links)
;; Find all links that contain a newline and put them into a single line
(org-export-concatenate-multiline-links)
;; Normalize links: Convert angle and plain links into bracket links
;; and expand link abbreviations
(org-export-normalize-links)
;; Find all internal links. If they have a fuzzy match (i.e. not
;; a *dedicated* target match, let the link point to the
;; corresponding section.
(org-export-target-internal-links target-alist)
;; Find multiline emphasis and put them into single line
(when (plist-get parameters :emph-multiline)
(org-export-concatenate-multiline-emphasis))
;; Remove special table lines
(when org-export-table-remove-special-lines
(org-export-remove-special-table-lines))
@ -1476,24 +1510,6 @@ on this string to produce the exported version."
;; Remove or replace comments
(org-export-handle-comments (plist-get parameters :comments))
;; Find matches for radio targets and turn them into internal links
(org-export-mark-radio-links)
;; Find all links that contain a newline and put them into a single line
(org-export-concatenate-multiline-links)
;; Normalize links: Convert angle and plain links into bracket links
;; and expand link abbreviations
(org-export-normalize-links)
;; Find all internal links. If they have a fuzzy match (i.e. not
;; a *dedicated* target match, let the link point to the
;; corresponding section.
(org-export-target-internal-links target-alist)
;; Find multiline emphasis and put them into single line
(when (plist-get parameters :emph-multiline)
(org-export-concatenate-multiline-emphasis))
(setq rtn (buffer-string)))
(kill-buffer " org-mode-tmp")

6
lisp/org-export-latex.el
View File

@ -1069,7 +1069,8 @@ If TIMESTAMPS, convert timestamps, otherwise delete them."
;; image option should be set be a comment line
org-export-latex-image-default-option
(expand-file-name raw-path))))
(radiop (insert (format "\\hyperref[%s]{%s}" raw-path desc)))
(radiop (insert (format "\\hyperref[%s]{%s}"
(org-solidify-link-text raw-path) desc)))
(path (insert (format "\\href{%s}{%s}" path desc)))
(t (insert "\\texttt{" desc "}")))))))
@ -1140,7 +1141,8 @@ If TIMESTAMPS, convert timestamps, otherwise delete them."
">>>?\\((INVISIBLE)\\)?") nil t)
(replace-match
(org-export-latex-protect-string
(format "\\label{%s}%s"(match-string 1)
(format "\\label{%s}%s" (save-match-data (org-solidify-link-text
(match-string 1)))
(if (match-string 2) "" (match-string 1)))) t t))
;; Delete @<...> constructs