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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-04-29 14:34:09 +02:00
parent 2a3443f142 1332bbd616
commit 6834142d87
2 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lisp/ox.el
View File

@ -4573,7 +4573,7 @@ ELEMENT doesn't allow line numbering."
(let ((linum (org-element-property :number-lines el))) (let ((linum (org-element-property :number-lines el)))
(when linum (when linum
(let ((lines (org-count-lines (let ((lines (org-count-lines
(org-trim (org-element-property :value el))))) (org-element-property :value el))))
;; Accumulate locs or reset them. ;; Accumulate locs or reset them.
(pcase linum (pcase linum
(`(new . ,n) (setq loc (+ n lines))) (`(new . ,n) (setq loc (+ n lines)))
@ -4592,30 +4592,28 @@ an alist between relative line number (integer) and name of code
reference on that line (string)." reference on that line (string)."
(let* ((line 0) refs (let* ((line 0) refs
(value (org-element-property :value element)) (value (org-element-property :value element))
;; Get code and clean it. Remove blank lines at its ;; Remove global indentation from code, if necessary. Also
;; beginning and end. ;; remove final newline character, since it doesn't belongs
;; to the code proper.
(code (replace-regexp-in-string (code (replace-regexp-in-string
"\\`\\([ \t]*\n\\)+" "" "\n\\'" ""
(replace-regexp-in-string (if (or org-src-preserve-indentation
"\\([ \t]*\n\\)*[ \t]*\\'" "\n" (org-element-property :preserve-indent element))
(if (or org-src-preserve-indentation value
(org-element-property :preserve-indent element)) (org-remove-indentation value))))
value
(org-remove-indentation value)))))
;; Build a regexp matching a loc with a reference. ;; Build a regexp matching a loc with a reference.
(ref-re (org-src-coderef-regexp (org-src-coderef-format element)))) (ref-re (org-src-coderef-regexp (org-src-coderef-format element))))
;; Return value. ;; Return value.
(cons (cons
;; Code with references removed. ;; Code with references removed.
(org-element-normalize-string (mapconcat
(mapconcat (lambda (loc)
(lambda (loc) (cl-incf line)
(cl-incf line) (if (not (string-match ref-re loc)) loc
(if (not (string-match ref-re loc)) loc ;; Ref line: remove ref, and add its position in REFS.
;; Ref line: remove ref, and signal its position in REFS. (push (cons line (match-string 3 loc)) refs)
(push (cons line (match-string 3 loc)) refs) (replace-match "" nil nil loc 1)))
(replace-match "" nil nil loc 1))) (split-string code "\n") "\n")
(org-split-string code "\n") "\n"))
;; Reference alist. ;; Reference alist.
refs))) refs)))
@ -4638,15 +4636,16 @@ number (i.e. ignoring NUM-LINES) and the name of the code
reference on it. If it is nil, FUN's third argument will always reference on it. If it is nil, FUN's third argument will always
be nil. It can be obtained through the use of be nil. It can be obtained through the use of
`org-export-unravel-code' function." `org-export-unravel-code' function."
(let ((--locs (org-split-string code "\n")) (let ((--locs (split-string code "\n"))
(--line 0)) (--line 0))
(org-element-normalize-string (concat
(mapconcat (mapconcat
(lambda (--loc) (lambda (--loc)
(cl-incf --line) (cl-incf --line)
(let ((--ref (cdr (assq --line ref-alist)))) (let ((--ref (cdr (assq --line ref-alist))))
(funcall fun --loc (and num-lines (+ num-lines --line)) --ref))) (funcall fun --loc (and num-lines (+ num-lines --line)) --ref)))
--locs "\n")))) --locs "\n")
"\n")))
(defun org-export-format-code-default (element info) (defun org-export-format-code-default (element info)
"Return source code from ELEMENT, formatted in a standard way. "Return source code from ELEMENT, formatted in a standard way.
@ -4663,7 +4662,7 @@ code."
;; Extract code and references. ;; Extract code and references.
(let* ((code-info (org-export-unravel-code element)) (let* ((code-info (org-export-unravel-code element))
(code (car code-info)) (code (car code-info))
(code-lines (org-split-string code "\n"))) (code-lines (split-string code "\n")))
(if (null code-lines) "" (if (null code-lines) ""
(let* ((refs (and (org-element-property :retain-labels element) (let* ((refs (and (org-element-property :retain-labels element)
(cdr code-info))) (cdr code-info)))
@ -4688,9 +4687,9 @@ code."
number-str number-str
loc loc
(and ref (and ref
(concat (make-string (concat (make-string (- (+ 6 max-width)
(- (+ 6 max-width) (+ (length loc) (length number-str)))
(+ (length loc) (length number-str))) ? ) ?\s)
(format "(%s)" ref)))))) (format "(%s)" ref))))))
num-start refs))))) num-start refs)))))

40
testing/lisp/test-ox.el
View File

@ -3446,12 +3446,12 @@ Another text. (ref:text)
"Test `org-export-unravel-code' function." "Test `org-export-unravel-code' function."
;; Code without reference. ;; Code without reference.
(should (should
(equal '("(+ 1 1)\n") (equal '("(+ 1 1)")
(org-test-with-temp-text "#+BEGIN_EXAMPLE\n(+ 1 1)\n#+END_EXAMPLE" (org-test-with-temp-text "#+BEGIN_EXAMPLE\n(+ 1 1)\n#+END_EXAMPLE"
(org-export-unravel-code (org-element-at-point))))) (org-export-unravel-code (org-element-at-point)))))
;; Code with reference. ;; Code with reference.
(should (should
(equal '("(+ 1 1)\n" (1 . "test")) (equal '("(+ 1 1)" (1 . "test"))
(org-test-with-temp-text (org-test-with-temp-text
"#+BEGIN_EXAMPLE\n(+ 1 1) (ref:test)\n#+END_EXAMPLE" "#+BEGIN_EXAMPLE\n(+ 1 1) (ref:test)\n#+END_EXAMPLE"
(let ((org-coderef-label-format "(ref:%s)")) (let ((org-coderef-label-format "(ref:%s)"))
@ -3459,14 +3459,14 @@ Another text. (ref:text)
;; Code with user-defined reference. ;; Code with user-defined reference.
(should (should
(equal (equal
'("(+ 1 1)\n" (1 . "test")) '("(+ 1 1)" (1 . "test"))
(org-test-with-temp-text (org-test-with-temp-text
"#+BEGIN_EXAMPLE -l \"[ref:%s]\"\n(+ 1 1) [ref:test]\n#+END_EXAMPLE" "#+BEGIN_EXAMPLE -l \"[ref:%s]\"\n(+ 1 1) [ref:test]\n#+END_EXAMPLE"
(let ((org-coderef-label-format "(ref:%s)")) (let ((org-coderef-label-format "(ref:%s)"))
(org-export-unravel-code (org-element-at-point)))))) (org-export-unravel-code (org-element-at-point))))))
;; Code references keys are relative to the current block. ;; Code references keys are relative to the current block.
(should (should
(equal '("(+ 2 2)\n(+ 3 3)\n" (2 . "one")) (equal '("(+ 2 2)\n(+ 3 3)" (2 . "one"))
(org-test-with-temp-text " (org-test-with-temp-text "
#+BEGIN_EXAMPLE -n #+BEGIN_EXAMPLE -n
\(+ 1 1) \(+ 1 1)
@ -3477,23 +3477,43 @@ Another text. (ref:text)
#+END_EXAMPLE" #+END_EXAMPLE"
(goto-line 5) (goto-line 5)
(let ((org-coderef-label-format "(ref:%s)")) (let ((org-coderef-label-format "(ref:%s)"))
(org-export-unravel-code (org-element-at-point))))))) (org-export-unravel-code (org-element-at-point)))))))
(ert-deftest test-org-export/format-code-default () (ert-deftest test-org-export/format-code-default ()
"Test `org-export-format-code-default' specifications." "Test `org-export-format-code-default' specifications."
;; Return the empty string when code is empty. ;; Preserve blank lines, even when code is empty.
(should (should
(equal "" (equal "\n\n"
(org-test-with-parsed-data "#+BEGIN_SRC emacs-lisp\n\n\n#+END_SRC" (org-test-with-parsed-data "#+BEGIN_SRC emacs-lisp\n\n\n#+END_SRC"
(org-export-format-code-default (org-export-format-code-default
(org-element-map tree 'src-block 'identity info t) info)))) (org-element-map tree 'src-block #'identity info t) info))))
;; Likewise, preserve leading and trailing blank lines in the code.
(should
(equal "\n(+ 1 1)\n"
(org-test-with-parsed-data
"#+BEGIN_SRC emacs-lisp\n\n(+ 1 1)\n#+END_SRC"
(org-export-format-code-default
(org-element-map tree 'src-block #'identity info t) info))))
(should
(equal "(+ 1 1)\n\n"
(org-test-with-parsed-data
"#+BEGIN_SRC emacs-lisp\n(+ 1 1)\n\n#+END_SRC"
(org-export-format-code-default
(org-element-map tree 'src-block #'identity info t) info))))
;; Number lines, two whitespace characters before the actual loc. ;; Number lines, two whitespace characters before the actual loc.
(should (should
(equal "1 a\n2 b\n" (equal "1 a\n2 b\n"
(org-test-with-parsed-data (org-test-with-parsed-data
"#+BEGIN_SRC emacs-lisp +n\na\nb\n#+END_SRC" "#+BEGIN_SRC emacs-lisp +n\na\nb\n#+END_SRC"
(org-export-format-code-default (org-export-format-code-default
(org-element-map tree 'src-block 'identity info t) info)))) (org-element-map tree 'src-block #'identity info t) info))))
;; Numbering includes blank lines.
(should
(equal "1 \n2 a\n3 \n4 b\n5 \n"
(org-test-with-parsed-data
"#+BEGIN_SRC emacs-lisp +n\n\na\n\nb\n\n#+END_SRC"
(org-export-format-code-default
(org-element-map tree 'src-block #'identity info t) info))))
;; Put references 6 whitespace characters after the widest line, ;; Put references 6 whitespace characters after the widest line,
;; wrapped within parenthesis. ;; wrapped within parenthesis.
(should (should
@ -3502,7 +3522,7 @@ Another text. (ref:text)
(org-test-with-parsed-data (org-test-with-parsed-data
"#+BEGIN_SRC emacs-lisp\n123 (ref:a)\n1 (ref:b)\n#+END_SRC" "#+BEGIN_SRC emacs-lisp\n123 (ref:a)\n1 (ref:b)\n#+END_SRC"
(org-export-format-code-default (org-export-format-code-default
(org-element-map tree 'src-block 'identity info t) info)))))) (org-element-map tree 'src-block #'identity info t) info))))))