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

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

This commit is contained in:
Carsten Dominik 2008-09-05 23:01:34 +02:00
parent 7482b04df0 cf9a05052f
commit 2efb6d127a
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/ChangeLog
View File

@ -1,3 +1,11 @@
2008-09-05 Bastien Guerry <bzg@altern.org>
* org.el (org-additional-option-like-keywords): Added keywords for
the _QUOTE, _VERSE and _SRC environments.
* org-export-latex.el (org-export-latex-preprocess): Fix bug when
exporting _QUOTE and _VERSE environments.
2008-09-05 Carsten Dominik <dominik@science.uva.nl> 2008-09-05 Carsten Dominik <dominik@science.uva.nl>
* org-agenda.el (org-agenda-filter-by-tag): New command. * org-agenda.el (org-agenda-filter-by-tag): New command.

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

@ -1122,18 +1122,18 @@ Regexps are those from `org-export-latex-special-string-regexps'."
;; Convert blockquotes ;; Convert blockquotes
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward "^#\\+BEGIN_QUOTE" nil t) (while (search-forward "ORG-BLOCKQUOTE-START" nil t)
(replace-match "\\begin{quote}" t t)) (replace-match "\\begin{quote}" t t))
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward "^#\\+END_QUOTE" nil t) (while (search-forward "ORG-BLOCKQUOTE-END" nil t)
(replace-match "\\end{quote}" t t)) (replace-match "\\end{quote}" t t))
;; Convert verse ;; Convert verse
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward "^#\\+BEGIN_VERSE" nil t) (while (search-forward "ORG-VERSE-START" nil t)
(replace-match "\\begin{verse}" t t)) (replace-match "\\begin{verse}" t t))
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward "^#\\+END_VERSE" nil t) (while (search-forward "ORG-VERSE-END" nil t)
(replace-match "\\end{verse}" t t)) (replace-match "\\end{verse}" t t))
;; Convert horizontal rules ;; Convert horizontal rules

5
lisp/org.el
View File

@ -8095,7 +8095,10 @@ This function can be used in a hook."
(defconst org-additional-option-like-keywords (defconst org-additional-option-like-keywords
'("BEGIN_HTML" "BEGIN_LaTeX" "END_HTML" "END_LaTeX" '("BEGIN_HTML" "BEGIN_LaTeX" "END_HTML" "END_LaTeX"
"ORGTBL" "HTML:" "LaTeX:" "BEGIN:" "END:" "TBLFM" "ORGTBL" "HTML:" "LaTeX:" "BEGIN:" "END:" "TBLFM"
"BEGIN_EXAMPLE" "END_EXAMPLE")) "BEGIN_EXAMPLE" "END_EXAMPLE"
"BEGIN_QUOTE" "END_QUOTE"
"BEGIN_VERSE" "END_VERSE"
"BEGIN_SRC" "END_SRC"))
(defcustom org-structure-template-alist (defcustom org-structure-template-alist
'( '(