|
@@ -246,14 +246,14 @@ in org-export-latex-classes."
|
|
|
(if (and (string-match "\\`[0-9.]+\\'" tmp)
|
|
|
(or (= (string-to-number tmp) 1.0)
|
|
|
(= (string-to-number tmp) 0.0)))
|
|
|
- ;; column width 1 means cloase columns, go back to full width
|
|
|
+ ;; column width 1 means close columns, go back to full width
|
|
|
(org-beamer-close-columns-maybe)
|
|
|
(when (setq ass (assoc "BEAMER_envargs" props))
|
|
|
(let (case-fold-search)
|
|
|
- (when (string-match "C\\(\\[[^][]*\\]\\)" (cdr ass))
|
|
|
+ (while (string-match "C\\(\\[[^][]*\\]\\|<[^<>]*>\\)" (cdr ass))
|
|
|
(setq columns-option (match-string 1 (cdr ass)))
|
|
|
(setcdr ass (replace-match "" t t (cdr ass))))
|
|
|
- (when (string-match "c\\(\\[[^][]*\\]\\)" (cdr ass))
|
|
|
+ (while (string-match "c\\(\\[[^][]*\\]\\|<[^<>]*>\\)" (cdr ass))
|
|
|
(setq column-option (match-string 1 (cdr ass)))
|
|
|
(setcdr ass (replace-match "" t t (cdr ass))))))
|
|
|
(org-beamer-open-columns-maybe columns-option)
|