diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0a061dcf0..6864eaeb5 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,28 @@ * org-html.el (org-html-level-start): Catch the case that target might be nil. +2010-03-31 Dan Davison + + * org.el (org-appearance): Change Customize group variable name + from org-font-lock to org-appearance, and change tag from "Org + Font Lock" to "Org Appearance" + (org-odd-levels-only): Change Customize group variable name + (org-level-color-stars-only): Change Customize group variable name + (org-hide-leading-stars): Change Customize group variable name + (org-hidden-keywords): Change Customize group variable name + (org-fontify-done-headline): Change Customize group variable name + (org-fontify-emphasized-text): Change Customize group variable name + (org-fontify-whole-heading-line): Change Customize group variable name + (org-highlight-latex-fragments-and-specials): Change Customize + group variable name + (org-hide-emphasis-markers): Change Customize group variable name + (org-emphasis-alist): Change Customize group variable name + (org-emphasis-regexp-components): Change Customize group variable + name + (org-modules): Remove mention of org-R + + * org-faces.el (org-faces): Change Customize group variable name + 2010-03-29 Carsten Dominik * org-agenda.el (org-diary-last-run-time): New variable. diff --git a/lisp/org-faces.el b/lisp/org-faces.el index 8ec7ce136..9407ab11e 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -49,7 +49,7 @@ (defgroup org-faces nil "Faces in Org-mode." :tag "Org Faces" - :group 'org-font-lock) + :group 'org-appearance) (defface org-hide '((((background light)) (:foreground "white")) diff --git a/lisp/org-html.el b/lisp/org-html.el index d40e5d6a4..8b1f8d142 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -1529,7 +1529,8 @@ lang=\"%s\" xml:lang=\"%s\"> "Create image tag with source and attributes." (save-match-data (if (string-match "^ltxpng/" src) - (format "" src) + (format "\"%s\"/" + src (org-find-text-property-in-string 'org-latex-src 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))) diff --git a/lisp/org.el b/lisp/org.el index e30c49a7b..1eb5a3f23 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -230,7 +230,6 @@ to add the symbol `xyz', and the package must have a call to (const :tag "C man: Support for links to manpages in Org-mode" org-man) (const :tag "C mtags: Support for muse-like tags" org-mtags) (const :tag "C panel: Simple routines for us with bad memory" org-panel) - (const :tag "C R: Computation using the R language" org-R) (const :tag "C registry: A registry for Org-mode links" org-registry) (const :tag "C org2rem: Convert org appointments into reminders" org2rem) (const :tag "C screen: Visit screen sessions through Org-mode links" org-screen) @@ -791,7 +790,7 @@ lines to the buffer: #+STARTUP: odd #+STARTUP: oddeven" :group 'org-edit-structure - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defcustom org-adapt-indentation t @@ -2946,9 +2945,9 @@ Each cell is of the format \( \"option\" . \"package\" \)." (string :tag "option") (string :tag "package")))) -(defgroup org-font-lock nil - "Font-lock settings for highlighting in Org-mode." - :tag "Org Font Lock" +(defgroup org-appearance nil + "Settings for Org-mode appearance." + :tag "Org Appearance" :group 'org) (defcustom org-level-color-stars-only nil @@ -2956,7 +2955,7 @@ Each cell is of the format \( \"option\" . \"package\" \)." When nil, the entire headline is fontified. Changing it requires restart of `font-lock-mode' to become effective also in regions already fontified." - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defcustom org-hide-leading-stars nil @@ -2972,7 +2971,7 @@ lines to the buffer: #+STARTUP: hidestars #+STARTUP: showstars" - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defcustom org-hidden-keywords nil @@ -2980,7 +2979,7 @@ lines to the buffer: For example, add #+TITLE to this list in order to make the document title appear in the buffer without the initial #+TITLE: keyword." - :group 'org-font-lock + :group 'org-appearance :type '(set (const :tag "#+AUTHOR" author) (const :tag "#+DATE" date) (const :tag "#+EMAIL" email) @@ -2991,30 +2990,30 @@ keyword." Normally, only the TODO/DONE keyword indicates the state of a headline. When this is non-nil, the headline after the keyword is set to the `org-headline-done' as an additional indication." - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defcustom org-fontify-emphasized-text t "Non-nil means fontify *bold*, /italic/ and _underlined_ text. Changing this variable requires a restart of Emacs to take effect." - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defcustom org-fontify-whole-heading-line nil "Non-nil means fontify the whole line for headings. This is useful when setting a background color for the org-level-* faces." - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defcustom org-highlight-latex-fragments-and-specials nil "Non-nil means fontify what is treated specially by the exporters." - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defcustom org-hide-emphasis-markers nil "Non-nil mean font-lock should hide the emphasis marker characters." - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defvar org-emph-re nil @@ -3095,7 +3094,7 @@ body-regexp A regexp like \".\" to match a body character. Don't use newline The maximum number of newlines allowed in an emphasis exp. Use customize to modify this, or restart Emacs after changing it." - :group 'org-font-lock + :group 'org-appearance :set 'org-set-emph-re :type '(list (sexp :tag "Allowed chars in pre ") @@ -3121,7 +3120,7 @@ characters, the face to be used by font-lock for highlighting in Org-mode Emacs buffers, and the HTML tags to be used for this. For LaTeX export, see the variable `org-export-latex-emphasis-alist'. Use customize to modify this, or restart Emacs after changing it." - :group 'org-font-lock + :group 'org-appearance :set 'org-set-emph-re :type '(repeat (list @@ -15183,7 +15182,9 @@ Some of the options can be changed using the variable (push ov org-latex-fragment-image-overlays) (goto-char end)) (delete-region beg end) - (insert link)))))))) + (insert (org-add-props link + (list 'org-latex-src + (replace-regexp-in-string "\"" "" txt))))))))))) ;; This function borrows from Ganesh Swami's latex2png.el (defun org-create-formula-image (string tofile options buffer)