summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-12 09:03:38 (GMT)
committer Bastien Guerry <bzg@altern.org>2014-01-12 09:03:38 (GMT)
commit90884b9748f87acc9ad2ac8810e9b5472387ff72 (patch)
treef454687da1edb77cac15a1307858988114dcb16a
parent72b8a86d9c25f75c34ff18360c634f908e69e631 (diff)
parent1a1f7bbe68706ad33d113984cfc3a998f4076467 (diff)
downloadorg-mode-90884b9748f87acc9ad2ac8810e9b5472387ff72.zip
org-mode-90884b9748f87acc9ad2ac8810e9b5472387ff72.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--contrib/lisp/ox-deck.el4
-rw-r--r--lisp/org-element.el36
-rw-r--r--lisp/org.el17
3 files changed, 29 insertions, 28 deletions
diff --git a/contrib/lisp/ox-deck.el b/contrib/lisp/ox-deck.el
index 60a2cbe..87081a5 100644
--- a/contrib/lisp/ox-deck.el
+++ b/contrib/lisp/ox-deck.el
@@ -319,7 +319,7 @@ and have the id \"title-slide\"."
(include (plist-get info :deck-include-extensions))
(exclude (plist-get info :deck-exclude-extensions))
(scripts '()) (sheets '()) (snippets '()))
- (add-to-list 'scripts (concat prefix "jquery-1.7.2.min.js"))
+ (add-to-list 'scripts (concat prefix "jquery.min.js"))
(add-to-list 'scripts (concat prefix "core/deck.core.js"))
(add-to-list 'scripts (concat prefix "modernizr.custom.js"))
(add-to-list 'sheets (concat prefix "core/deck.core.css"))
@@ -368,7 +368,7 @@ holding export options."
"Transcode an ITEM element from Org to HTML.
CONTENTS holds the contents of the item. INFO is a plist holding
contextual information.
-If the containing headline has the property :slide, then
+If the containing headline has the property :STEP, then
the \"slide\" class will be added to the to the list element,
which will make the list into a \"build\"."
(let ((text (org-html-item item contents info)))
diff --git a/lisp/org-element.el b/lisp/org-element.el
index fdcbf8d..4932a5c 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3385,13 +3385,12 @@ Return a list whose CAR is `subscript' and CDR a plist with
Assume point is at the underscore."
(save-excursion
(unless (bolp) (backward-char))
- (let ((bracketsp (if (looking-at org-match-substring-with-braces-regexp)
- t
- (not (looking-at org-match-substring-regexp))))
+ (looking-at org-match-substring-regexp)
+ (let ((bracketsp (match-beginning 4))
(begin (match-beginning 2))
- (contents-begin (or (match-beginning 5)
+ (contents-begin (or (match-beginning 4)
(match-beginning 3)))
- (contents-end (or (match-end 5) (match-end 3)))
+ (contents-end (or (match-end 4) (match-end 3)))
(post-blank (progn (goto-char (match-end 0))
(skip-chars-forward " \t")))
(end (point)))
@@ -3434,12 +3433,12 @@ Return a list whose CAR is `superscript' and CDR a plist with
Assume point is at the caret."
(save-excursion
(unless (bolp) (backward-char))
- (let ((bracketsp (if (looking-at org-match-substring-with-braces-regexp) t
- (not (looking-at org-match-substring-regexp))))
+ (looking-at org-match-substring-regexp)
+ (let ((bracketsp (match-beginning 4))
(begin (match-beginning 2))
- (contents-begin (or (match-beginning 5)
+ (contents-begin (or (match-beginning 4)
(match-beginning 3)))
- (contents-end (or (match-end 5) (match-end 3)))
+ (contents-end (or (match-end 4) (match-end 3)))
(post-blank (progn (goto-char (match-end 0))
(skip-chars-forward " \t")))
(end (point)))
@@ -5602,14 +5601,19 @@ cache, unless optional argument IGNORE-CHANGES is non-nil."
(cond
((< key beg)
(setq node (avl-tree--node-left node)))
- ((= key beg)
- (if (memq (org-element-type element) '(item table-row))
- (setq last (avl-tree--node-data node)
- node (avl-tree--node-left node))
- (throw 'found (avl-tree--node-data node))))
- (t
+ ((> key beg)
+ (setq last (avl-tree--node-data node)
+ node (avl-tree--node-right node)))
+ ;; When KEY is at the beginning of a table or list,
+ ;; make sure to return it instead of the first row or
+ ;; item.
+ ((and (memq (org-element-type element) '(item table-row))
+ (= (org-element-property
+ :contents-begin (org-element-property :parent element))
+ beg))
(setq last (avl-tree--node-data node)
- node (avl-tree--node-right node))))))
+ node (avl-tree--node-left node)))
+ (t (throw 'found (avl-tree--node-data node))))))
last)))))
(defun org-element-cache-put (data &optional element)
diff --git a/lisp/org.el b/lisp/org.el
index 0ed723c..bb0f0fd 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5638,21 +5638,20 @@ stacked delimiters is N. Escaping delimiters is not possible."
next (concat "\\(?:" nothing left next right "\\)+" nothing)))
(concat left "\\(" re "\\)" right)))
-(defvar org-match-substring-regexp
+(defconst org-match-substring-regexp
(concat
"\\(\\S-\\)\\([_^]\\)\\("
- "\\(" (org-create-multibrace-regexp "{" "}" org-match-sexp-depth) "\\)"
+ "\\(?:" (org-create-multibrace-regexp "{" "}" org-match-sexp-depth) "\\)"
"\\|"
- "\\(" (org-create-multibrace-regexp "(" ")" org-match-sexp-depth) "\\)"
+ "\\(?:" (org-create-multibrace-regexp "(" ")" org-match-sexp-depth) "\\)"
"\\|"
- "\\(\\(?:\\*\\|[-+]?[^-+*!@#$%^_ \t\r\n,:\"?<>~;./{}=()]+\\)\\)\\)")
+ "\\(?:\\*\\|[+-]?[[:alnum:].,\\]*[[:alnum:]]\\)\\)")
"The regular expression matching a sub- or superscript.")
-(defvar org-match-substring-with-braces-regexp
+(defconst org-match-substring-with-braces-regexp
(concat
- "\\(\\S-\\)\\([_^]\\)\\("
- "\\(" (org-create-multibrace-regexp "{" "}" org-match-sexp-depth) "\\)"
- "\\)")
+ "\\(\\S-\\)\\([_^]\\)"
+ "\\(" (org-create-multibrace-regexp "{" "}" org-match-sexp-depth) "\\)")
"The regular expression matching a sub- or superscript, forcing braces.")
(defun org-make-link-regexps ()
@@ -6089,8 +6088,6 @@ by a #."
(defvar org-latex-and-related-regexp nil
"Regular expression for highlighting LaTeX, entities and sub/superscript.")
-(defvar org-match-substring-regexp)
-(defvar org-match-substring-with-braces-regexp)
(defun org-compute-latex-and-related-regexp ()
"Compute regular expression for LaTeX, entities and sub/superscript.