diff options
| author | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-04-20 08:32:10 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-04-20 08:32:10 +0200 |
| commit | bc8d34541bc6231c84221c000befdb39147fbd0a (patch) | |
| tree | 16e2cd9655efcd6bb77c95b9c390efcdcfdd08ba | |
| parent | 3d994a602c6278179954d55a9a89a294935dac82 (diff) | |
| download | org-mode-bc8d34541bc6231c84221c000befdb39147fbd0a.tar.gz | |
ox-beamer: Do not ignore uppercase environements
* lisp/ox-beamer.el (org-beamer--frame-level): Small refactoring.
(org-beamer--format-block, org-beamer-headline): Do not systematically
downcase environment names as some require upper case in their
names (e.g. noteNH and CJK).
Thanks to James Harkins for reporting the bug.
| -rw-r--r-- | lisp/ox-beamer.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el index 2e2cfa9..3c564b0 100644 --- a/lisp/ox-beamer.el +++ b/lisp/ox-beamer.el @@ -421,19 +421,19 @@ INFO is a plist used as a communication channel." (catch 'exit (mapc (lambda (parent) (let ((env (org-element-property :BEAMER_ENV parent))) - (when (and env (member (downcase env) '("frame" "fullframe"))) + (when (and env (member-ignore-case env '("frame" "fullframe"))) (throw 'exit (org-export-get-relative-level parent info))))) (nreverse (org-export-get-genealogy headline))) nil) ;; 2. Look for "frame" environment in HEADLINE. (let ((env (org-element-property :BEAMER_ENV headline))) - (and env (member (downcase env) '("frame" "fullframe")) + (and env (member-ignore-case env '("frame" "fullframe")) (org-export-get-relative-level headline info))) ;; 3. Look for "frame" environment in sub-tree. (org-element-map headline 'headline (lambda (hl) (let ((env (org-element-property :BEAMER_ENV hl))) - (when (and env (member (downcase env) '("frame" "fullframe"))) + (when (and env (member-ignore-case env '("frame" "fullframe"))) (org-export-get-relative-level hl info)))) info 'first-match) ;; 4. No "frame" environment in tree: use default value. @@ -537,7 +537,7 @@ used as a communication channel." ;; "column" only. ((not env) "column") ;; Use specified environment. - (t (downcase env))))) + (t env)))) (env-format (unless (member environment '("column" "columns")) (assoc environment (append org-beamer-environments-special @@ -625,7 +625,7 @@ as a communication channel." (let ((level (org-export-get-relative-level headline info)) (frame-level (org-beamer--frame-level headline info)) (environment (let ((env (org-element-property :BEAMER_ENV headline))) - (if (stringp env) (downcase env) "block")))) + (or (org-string-nw-p env) "block")))) (cond ;; Case 1: Resume frame specified by "BEAMER_ref" property. ((equal environment "againframe") |