| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598 | 
							- ;;; ob-tangle.el --- extract source code from org-mode files
 
- ;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
- ;; Author: Eric Schulte
 
- ;; Keywords: literate programming, reproducible research
 
- ;; Homepage: http://orgmode.org
 
- ;; This file is part of GNU Emacs.
 
- ;; GNU Emacs is free software: you can redistribute it and/or modify
 
- ;; it under the terms of the GNU General Public License as published by
 
- ;; the Free Software Foundation, either version 3 of the License, or
 
- ;; (at your option) any later version.
 
- ;; GNU Emacs is distributed in the hope that it will be useful,
 
- ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 
- ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
- ;; GNU General Public License for more details.
 
- ;; You should have received a copy of the GNU General Public License
 
- ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
- ;;; Commentary:
 
- ;; Extract the code from source blocks out into raw source-code files.
 
- ;;; Code:
 
- (require 'org-src)
 
- (declare-function make-directory "files" (dir &optional parents))
 
- (declare-function org-babel-update-block-body "org" (new-body))
 
- (declare-function org-back-to-heading "org" (invisible-ok))
 
- (declare-function org-before-first-heading-p "org" ())
 
- (declare-function org-edit-special "org" (&optional arg))
 
- (declare-function org-fill-template "org" (template alist))
 
- (declare-function org-heading-components "org" ())
 
- (declare-function org-in-commented-heading-p "org" (&optional no-inheritance))
 
- (declare-function org-link-escape "org" (text &optional table))
 
- (declare-function org-open-link-from-string "org" (s &optional arg reference-buffer))
 
- (declare-function org-store-link "org" (arg))
 
- (declare-function org-up-heading-safe "org" ())
 
- (declare-function outline-previous-heading "outline" ())
 
- (defcustom org-babel-tangle-lang-exts
 
-   '(("emacs-lisp" . "el")
 
-     ("elisp" . "el"))
 
-   "Alist mapping languages to their file extensions.
 
- The key is the language name, the value is the string that should
 
- be inserted as the extension commonly used to identify files
 
- written in this language.  If no entry is found in this list,
 
- then the name of the language is used."
 
-   :group 'org-babel-tangle
 
-   :version "24.1"
 
-   :type '(repeat
 
- 	  (cons
 
- 	   (string "Language name")
 
- 	   (string "File Extension"))))
 
- (defcustom org-babel-tangle-use-relative-file-links t
 
-   "Use relative path names in links from tangled source back the Org-mode file."
 
-   :group 'org-babel-tangle
 
-   :type 'boolean)
 
- (defcustom org-babel-post-tangle-hook nil
 
-   "Hook run in code files tangled by `org-babel-tangle'."
 
-   :group 'org-babel
 
-   :version "24.1"
 
-   :type 'hook)
 
- (defcustom org-babel-pre-tangle-hook '(save-buffer)
 
-   "Hook run at the beginning of `org-babel-tangle'."
 
-   :group 'org-babel
 
-   :version "24.1"
 
-   :type 'hook)
 
- (defcustom org-babel-tangle-body-hook nil
 
-   "Hook run over the contents of each code block body."
 
-   :group 'org-babel
 
-   :version "24.1"
 
-   :type 'hook)
 
- (defcustom org-babel-tangle-comment-format-beg "[[%link][%source-name]]"
 
-   "Format of inserted comments in tangled code files.
 
- The following format strings can be used to insert special
 
- information into the output using `org-fill-template'.
 
- %start-line --- the line number at the start of the code block
 
- %file --------- the file from which the code block was tangled
 
- %link --------- Org-mode style link to the code block
 
- %source-name -- name of the code block
 
- Upon insertion the formatted comment will be commented out, and
 
- followed by a newline.  To inhibit this post-insertion processing
 
- set the `org-babel-tangle-uncomment-comments' variable to a
 
- non-nil value.
 
- Whether or not comments are inserted during tangling is
 
- controlled by the :comments header argument."
 
-   :group 'org-babel
 
-   :version "24.1"
 
-   :type 'string)
 
- (defcustom org-babel-tangle-comment-format-end "%source-name ends here"
 
-   "Format of inserted comments in tangled code files.
 
- The following format strings can be used to insert special
 
- information into the output using `org-fill-template'.
 
- %start-line --- the line number at the start of the code block
 
- %file --------- the file from which the code block was tangled
 
- %link --------- Org-mode style link to the code block
 
- %source-name -- name of the code block
 
- Upon insertion the formatted comment will be commented out, and
 
- followed by a newline.  To inhibit this post-insertion processing
 
- set the `org-babel-tangle-uncomment-comments' variable to a
 
- non-nil value.
 
- Whether or not comments are inserted during tangling is
 
- controlled by the :comments header argument."
 
-   :group 'org-babel
 
-   :version "24.1"
 
-   :type 'string)
 
- (defcustom org-babel-tangle-uncomment-comments nil
 
-   "Inhibits automatic commenting and addition of trailing newline
 
- of tangle comments.  Use `org-babel-tangle-comment-format-beg'
 
- and `org-babel-tangle-comment-format-end' to customize the format
 
- of tangled comments."
 
-   :group 'org-babel
 
-   :type 'boolean)
 
- (defcustom org-babel-process-comment-text #'org-remove-indentation
 
-   "Function called to process raw Org-mode text collected to be
 
- inserted as comments in tangled source-code files.  The function
 
- should take a single string argument and return a string
 
- result.  The default value is `org-remove-indentation'."
 
-   :group 'org-babel
 
-   :version "24.1"
 
-   :type 'function)
 
- (defun org-babel-find-file-noselect-refresh (file)
 
-   "Find file ensuring that the latest changes on disk are
 
- represented in the file."
 
-   (find-file-noselect file 'nowarn)
 
-   (with-current-buffer (get-file-buffer file)
 
-     (revert-buffer t t t)))
 
- (defmacro org-babel-with-temp-filebuffer (file &rest body)
 
-   "Open FILE into a temporary buffer execute BODY there like
 
- `progn', then kill the FILE buffer returning the result of
 
- evaluating BODY."
 
-   (declare (indent 1))
 
-   (let ((temp-path (make-symbol "temp-path"))
 
- 	(temp-result (make-symbol "temp-result"))
 
- 	(temp-file (make-symbol "temp-file"))
 
- 	(visited-p (make-symbol "visited-p")))
 
-     `(let* ((,temp-path ,file)
 
- 	    (,visited-p (get-file-buffer ,temp-path))
 
- 	    ,temp-result ,temp-file)
 
-        (org-babel-find-file-noselect-refresh ,temp-path)
 
-        (setf ,temp-file (get-file-buffer ,temp-path))
 
-        (with-current-buffer ,temp-file
 
- 	 (setf ,temp-result (progn ,@body)))
 
-        (unless ,visited-p (kill-buffer ,temp-file))
 
-        ,temp-result)))
 
- (def-edebug-spec org-babel-with-temp-filebuffer (form body))
 
- ;;;###autoload
 
- (defun org-babel-tangle-file (file &optional target-file lang)
 
-   "Extract the bodies of source code blocks in FILE.
 
- Source code blocks are extracted with `org-babel-tangle'.
 
- Optional argument TARGET-FILE can be used to specify a default
 
- export file for all source blocks.  Optional argument LANG can be
 
- used to limit the exported source code blocks by language.
 
- Return a list whose CAR is the tangled file name."
 
-   (interactive "fFile to tangle: \nP")
 
-   (let ((visited-p (get-file-buffer (expand-file-name file)))
 
- 	to-be-removed)
 
-     (prog1
 
- 	(save-window-excursion
 
- 	  (find-file file)
 
- 	  (setq to-be-removed (current-buffer))
 
- 	  (mapcar #'expand-file-name (org-babel-tangle nil target-file lang)))
 
-       (unless visited-p
 
- 	(kill-buffer to-be-removed)))))
 
- (defun org-babel-tangle-publish (_ filename pub-dir)
 
-   "Tangle FILENAME and place the results in PUB-DIR."
 
-   (unless (file-exists-p pub-dir)
 
-     (make-directory pub-dir t))
 
-   (mapc (lambda (el) (copy-file el pub-dir t)) (org-babel-tangle-file filename)))
 
- ;;;###autoload
 
- (defun org-babel-tangle (&optional arg target-file lang)
 
-   "Write code blocks to source-specific files.
 
- Extract the bodies of all source code blocks from the current
 
- file into their own source-specific files.
 
- With one universal prefix argument, only tangle the block at point.
 
- When two universal prefix arguments, only tangle blocks for the
 
- tangle file of the block at point.
 
- Optional argument TARGET-FILE can be used to specify a default
 
- export file for all source blocks.  Optional argument LANG can be
 
- used to limit the exported source code blocks by language."
 
-   (interactive "P")
 
-   (run-hooks 'org-babel-pre-tangle-hook)
 
-   ;; Possibly Restrict the buffer to the current code block
 
-   (save-restriction
 
-     (save-excursion
 
-       (when (equal arg '(4))
 
- 	(let ((head (org-babel-where-is-src-block-head)))
 
- 	  (if head
 
- 	      (goto-char head)
 
- 	    (user-error "Point is not in a source code block"))))
 
-       (let ((block-counter 0)
 
- 	    (org-babel-default-header-args
 
- 	     (if target-file
 
- 		 (org-babel-merge-params org-babel-default-header-args
 
- 					 (list (cons :tangle target-file)))
 
- 	       org-babel-default-header-args))
 
- 	    (tangle-file
 
- 	     (when (equal arg '(16))
 
- 	       (or (cdr (assoc :tangle (nth 2 (org-babel-get-src-block-info 'light))))
 
- 		   (user-error "Point is not in a source code block"))))
 
- 	    path-collector)
 
- 	(mapc ;; map over all languages
 
- 	 (lambda (by-lang)
 
- 	   (let* ((lang (car by-lang))
 
- 		  (specs (cdr by-lang))
 
- 		  (ext (or (cdr (assoc lang org-babel-tangle-lang-exts)) lang))
 
- 		  (lang-f (intern
 
- 			   (concat
 
- 			    (or (and (cdr (assoc lang org-src-lang-modes))
 
- 				     (symbol-name
 
- 				      (cdr (assoc lang org-src-lang-modes))))
 
- 				lang)
 
- 			    "-mode")))
 
- 		  she-banged)
 
- 	     (mapc
 
- 	      (lambda (spec)
 
- 		(let ((get-spec (lambda (name) (cdr (assoc name (nth 4 spec))))))
 
- 		  (let* ((tangle (funcall get-spec :tangle))
 
- 			 (she-bang (let ((sheb (funcall get-spec :shebang)))
 
-                                      (when (> (length sheb) 0) sheb)))
 
- 			 (tangle-mode (funcall get-spec :tangle-mode))
 
- 			 (base-name (cond
 
- 				     ((string= "yes" tangle)
 
- 				      (file-name-sans-extension
 
- 				       (nth 1 spec)))
 
- 				     ((string= "no" tangle) nil)
 
- 				     ((> (length tangle) 0) tangle)))
 
- 			 (file-name (when base-name
 
- 				      ;; decide if we want to add ext to base-name
 
- 				      (if (and ext (string= "yes" tangle))
 
- 					  (concat base-name "." ext) base-name))))
 
- 		    (when file-name
 
- 		      ;; Possibly create the parent directories for file.
 
- 		      (let ((m (funcall get-spec :mkdirp))
 
- 			    (fnd (file-name-directory file-name)))
 
- 			(and m fnd (not (string= m "no"))
 
- 			     (make-directory fnd 'parents)))
 
- 		      ;; delete any old versions of file
 
- 		      (and (file-exists-p file-name)
 
- 			   (not (member file-name (mapcar #'car path-collector)))
 
- 			   (delete-file file-name))
 
- 		      ;; drop source-block to file
 
- 		      (with-temp-buffer
 
- 			(when (fboundp lang-f) (ignore-errors (funcall lang-f)))
 
- 			(when (and she-bang (not (member file-name she-banged)))
 
- 			  (insert (concat she-bang "\n"))
 
- 			  (setq she-banged (cons file-name she-banged)))
 
- 			(org-babel-spec-to-string spec)
 
- 			;; We avoid append-to-file as it does not work with tramp.
 
- 			(let ((content (buffer-string)))
 
- 			  (with-temp-buffer
 
- 			    (if (file-exists-p file-name)
 
- 				(insert-file-contents file-name))
 
- 			    (goto-char (point-max))
 
- 			    ;; Handle :padlines unless first line in file
 
- 			    (unless (or (string= "no" (cdr (assoc :padline (nth 4 spec))))
 
- 					(= (point) (point-min)))
 
- 			      (insert "\n"))
 
- 			    (insert content)
 
- 			    (write-region nil nil file-name))))
 
- 		      ;; if files contain she-bangs, then make the executable
 
- 		      (when she-bang
 
- 			(unless tangle-mode (setq tangle-mode #o755)))
 
- 		      ;; update counter
 
- 		      (setq block-counter (+ 1 block-counter))
 
- 		      (add-to-list 'path-collector
 
- 				   (cons file-name tangle-mode)
 
- 				   nil
 
- 				   (lambda (a b) (equal (car a) (car b))))))))
 
- 	      specs)))
 
- 	 (if (equal arg '(4))
 
- 	     (org-babel-tangle-single-block 1 t)
 
- 	   (org-babel-tangle-collect-blocks lang tangle-file)))
 
- 	(message "Tangled %d code block%s from %s" block-counter
 
- 		 (if (= block-counter 1) "" "s")
 
- 		 (file-name-nondirectory
 
- 		  (buffer-file-name
 
- 		   (or (buffer-base-buffer) (current-buffer)))))
 
- 	;; run `org-babel-post-tangle-hook' in all tangled files
 
- 	(when org-babel-post-tangle-hook
 
- 	  (mapc
 
- 	   (lambda (file)
 
- 	     (org-babel-with-temp-filebuffer file
 
- 	       (run-hooks 'org-babel-post-tangle-hook)))
 
- 	   (mapcar #'car path-collector)))
 
- 	;; set permissions on tangled files
 
- 	(mapc (lambda (pair)
 
- 		(when (cdr pair) (set-file-modes (car pair) (cdr pair))))
 
- 	      path-collector)
 
- 	(mapcar #'car path-collector)))))
 
- (defun org-babel-tangle-clean ()
 
-   "Remove comments inserted by `org-babel-tangle'.
 
- Call this function inside of a source-code file generated by
 
- `org-babel-tangle' to remove all comments inserted automatically
 
- by `org-babel-tangle'.  Warning, this comment removes any lines
 
- containing constructs which resemble org-mode file links or noweb
 
- references."
 
-   (interactive)
 
-   (goto-char (point-min))
 
-   (while (or (re-search-forward "\\[\\[file:.*\\]\\[.*\\]\\]" nil t)
 
-              (re-search-forward (org-babel-noweb-wrap) nil t))
 
-     (delete-region (save-excursion (beginning-of-line 1) (point))
 
-                    (save-excursion (end-of-line 1) (forward-char 1) (point)))))
 
- (defvar org-stored-links)
 
- (defvar org-bracket-link-regexp)
 
- (defun org-babel-spec-to-string (spec)
 
-   "Insert SPEC into the current file.
 
- Insert the source-code specified by SPEC into the current source
 
- code file.  This function uses `comment-region' which assumes
 
- that the appropriate major-mode is set.  SPEC has the form:
 
-   (start-line file link source-name params body comment)"
 
-   (let* ((start-line (nth 0 spec))
 
- 	 (file (if org-babel-tangle-use-relative-file-links
 
- 		   (file-relative-name (nth 1 spec))
 
- 		 (nth 1 spec)))
 
- 	 (link (let ((link (nth 2 spec)))
 
- 		 (if org-babel-tangle-use-relative-file-links
 
- 		     (when (string-match "^\\(file:\\|docview:\\)\\(.*\\)" link)
 
- 		       (let* ((type (match-string 1 link))
 
- 			      (path (match-string 2 link))
 
- 			      (origpath path)
 
- 			      (case-fold-search nil))
 
- 			 (setq path (file-relative-name path))
 
- 			 (concat type path)))
 
- 		   link)))
 
- 	 (source-name (nth 3 spec))
 
- 	 (body (nth 5 spec))
 
- 	 (comment (nth 6 spec))
 
- 	 (comments (cdr (assoc :comments (nth 4 spec))))
 
- 	 (link-p (or (string= comments "both") (string= comments "link")
 
- 		     (string= comments "yes") (string= comments "noweb")))
 
- 	 (link-data (mapcar (lambda (el)
 
- 			      (cons (symbol-name el)
 
- 				    (let ((le (eval el)))
 
-                                       (if (stringp le) le (format "%S" le)))))
 
- 			    '(start-line file link source-name)))
 
- 	 (insert-comment (lambda (text)
 
- 			   (when (and comments (not (string= comments "no"))
 
- 				      (> (length text) 0))
 
- 			     (if org-babel-tangle-uncomment-comments
 
- 				 ;; Plain comments: no processing.
 
- 				 (insert text)
 
- 			       ;; Ensure comments are made to be
 
- 			       ;; comments, and add a trailing
 
- 			       ;; newline.  Also ignore invisible
 
- 			       ;; characters when commenting.
 
- 			       (comment-region
 
- 				(point)
 
- 				(progn (insert (org-no-properties text))
 
- 				       (point)))
 
- 			       (end-of-line)
 
- 			       (insert "\n"))))))
 
-     (when comment (funcall insert-comment comment))
 
-     (when link-p
 
-       (funcall
 
-        insert-comment
 
-        (org-fill-template org-babel-tangle-comment-format-beg link-data)))
 
-     (insert
 
-      (format
 
-       "%s\n"
 
-       (org-unescape-code-in-string
 
-        (org-babel-trim body (if org-src-preserve-indentation "[\f\n\r\v]")))))
 
-     (when link-p
 
-       (funcall
 
-        insert-comment
 
-        (org-fill-template org-babel-tangle-comment-format-end link-data)))))
 
- (defun org-babel-tangle-collect-blocks (&optional language tangle-file)
 
-   "Collect source blocks in the current Org file.
 
- Return an association list of source-code block specifications of
 
- the form used by `org-babel-spec-to-string' grouped by language.
 
- Optional argument LANGUAGE can be used to limit the collected
 
- source code blocks by language.  Optional argument TANGLE-FILE
 
- can be used to limit the collected code blocks by target file."
 
-   (let ((counter 0) last-heading-pos blocks)
 
-     (org-babel-map-src-blocks (buffer-file-name)
 
-       (let ((current-heading-pos
 
- 	     (org-with-wide-buffer
 
- 	      (org-with-limited-levels (outline-previous-heading)))))
 
- 	(cond ((eq last-heading-pos current-heading-pos) (incf counter))
 
- 	      ((= counter 1))
 
- 	      (t (setq counter 1))))
 
-       (unless (org-in-commented-heading-p)
 
- 	(let* ((info (org-babel-get-src-block-info 'light))
 
- 	       (src-lang (nth 0 info))
 
- 	       (src-tfile (cdr (assq :tangle (nth 2 info)))))
 
- 	  (unless (or (string= (cdr (assq :tangle (nth 2 info))) "no")
 
- 		      (and tangle-file (not (equal tangle-file src-tfile)))
 
- 		      (and language (not (string= language src-lang))))
 
- 	    ;; Add the spec for this block to blocks under its
 
- 	    ;; language.
 
- 	    (let ((by-lang (assoc src-lang blocks))
 
- 		  (block (org-babel-tangle-single-block counter)))
 
- 	      (if by-lang (setcdr by-lang (cons block (cdr by-lang)))
 
- 		(push (cons src-lang (list block)) blocks)))))))
 
-     ;; Ensure blocks are in the correct order.
 
-     (mapcar (lambda (b) (cons (car b) (nreverse (cdr b)))) blocks)))
 
- (defun org-babel-tangle-single-block
 
-   (block-counter &optional only-this-block)
 
-   "Collect the tangled source for current block.
 
- Return the list of block attributes needed by
 
- `org-babel-tangle-collect-blocks'.
 
- When ONLY-THIS-BLOCK is non-nil, return the full association
 
- list to be used by `org-babel-tangle' directly."
 
-   (let* ((info (org-babel-get-src-block-info))
 
- 	 (start-line
 
- 	  (save-restriction (widen)
 
- 			    (+ 1 (line-number-at-pos (point)))))
 
- 	 (file (buffer-file-name (buffer-base-buffer)))
 
- 	 (src-lang (nth 0 info))
 
- 	 (params (nth 2 info))
 
- 	 (extra (nth 3 info))
 
- 	 (cref-fmt (or (and (string-match "-l \"\\(.+\\)\"" extra)
 
- 			    (match-string 1 extra))
 
- 		       org-coderef-label-format))
 
- 	 (link (let ((link (org-no-properties
 
-                             (org-store-link nil))))
 
-                  (and (string-match org-bracket-link-regexp link)
 
-                       (match-string 1 link))))
 
- 	 (source-name
 
- 	  (intern (or (nth 4 info)
 
- 		      (format "%s:%d"
 
- 			      (or (ignore-errors (nth 4 (org-heading-components)))
 
- 				  "No heading")
 
- 			      block-counter))))
 
- 	 (expand-cmd
 
- 	  (intern (concat "org-babel-expand-body:" src-lang)))
 
- 	 (assignments-cmd
 
- 	  (intern (concat "org-babel-variable-assignments:" src-lang)))
 
- 	 (body
 
- 	  ;; Run the tangle-body-hook.
 
-           (let* ((body ;; Expand the body in language specific manner.
 
-                   (if (org-babel-noweb-p params :tangle)
 
-                       (org-babel-expand-noweb-references info)
 
-                     (nth 1 info)))
 
-                  (body
 
-                   (if (assoc :no-expand params)
 
-                       body
 
-                     (if (fboundp expand-cmd)
 
-                         (funcall expand-cmd body params)
 
-                       (org-babel-expand-body:generic
 
-                        body params
 
-                        (and (fboundp assignments-cmd)
 
-                             (funcall assignments-cmd params)))))))
 
-             (with-temp-buffer
 
-               (insert body)
 
-               (when (string-match "-r" extra)
 
-                 (goto-char (point-min))
 
-                 (while (re-search-forward
 
-                         (replace-regexp-in-string "%s" ".+" cref-fmt) nil t)
 
-                   (replace-match "")))
 
-               (run-hooks 'org-babel-tangle-body-hook)
 
-               (buffer-string))))
 
- 	 (comment
 
- 	  (when (or (string= "both" (cdr (assoc :comments params)))
 
- 		    (string= "org" (cdr (assoc :comments params))))
 
- 	    ;; From the previous heading or code-block end
 
- 	    (funcall
 
- 	     org-babel-process-comment-text
 
- 	     (buffer-substring
 
- 	      (max (condition-case nil
 
- 		       (save-excursion
 
- 			 (org-back-to-heading t)  ; Sets match data
 
- 			 (match-end 0))
 
- 		     (error (point-min)))
 
- 		   (save-excursion
 
- 		     (if (re-search-backward
 
- 			  org-babel-src-block-regexp nil t)
 
- 			 (match-end 0)
 
- 		       (point-min))))
 
- 	      (point)))))
 
- 	 (result
 
- 	  (list start-line file link source-name params body comment)))
 
-     (if only-this-block
 
- 	(list (cons src-lang (list result)))
 
-       result)))
 
- (defun org-babel-tangle-comment-links ( &optional info)
 
-   "Return a list of begin and end link comments for the code block at point."
 
-   (let* ((start-line (org-babel-where-is-src-block-head))
 
- 	 (file (buffer-file-name))
 
- 	 (link (org-link-escape (progn (call-interactively 'org-store-link)
 
- 				       (org-no-properties
 
- 					(car (pop org-stored-links))))))
 
- 	 (source-name (nth 4 (or info (org-babel-get-src-block-info 'light))))
 
- 	 (link-data (mapcar (lambda (el)
 
- 			      (cons (symbol-name el)
 
- 				    (let ((le (eval el)))
 
-                                       (if (stringp le) le (format "%S" le)))))
 
- 			    '(start-line file link source-name))))
 
-     (list (org-fill-template org-babel-tangle-comment-format-beg link-data)
 
- 	  (org-fill-template org-babel-tangle-comment-format-end link-data))))
 
- ;; de-tangling functions
 
- (defvar org-bracket-link-analytic-regexp)
 
- (defun org-babel-detangle (&optional source-code-file)
 
-   "Propagate changes in source file back original to Org-mode file.
 
- This requires that code blocks were tangled with link comments
 
- which enable the original code blocks to be found."
 
-   (interactive)
 
-   (save-excursion
 
-     (when source-code-file (find-file source-code-file))
 
-     (goto-char (point-min))
 
-     (let ((counter 0) new-body end)
 
-       (while (re-search-forward org-bracket-link-analytic-regexp nil t)
 
-         (when (re-search-forward
 
- 	       (concat " " (regexp-quote (match-string 5)) " ends here"))
 
-           (setq end (match-end 0))
 
-           (forward-line -1)
 
-           (save-excursion
 
- 	    (when (setq new-body (org-babel-tangle-jump-to-org))
 
- 	      (org-babel-update-block-body new-body)))
 
-           (setq counter (+ 1 counter)))
 
-         (goto-char end))
 
-       (prog1 counter (message "Detangled %d code blocks" counter)))))
 
- (defun org-babel-tangle-jump-to-org ()
 
-   "Jump from a tangled code file to the related Org-mode file."
 
-   (interactive)
 
-   (let ((mid (point))
 
- 	start body-start end done
 
-         target-buffer target-char link path block-name body)
 
-     (save-window-excursion
 
-       (save-excursion
 
- 	(while (and (re-search-backward org-bracket-link-analytic-regexp nil t)
 
- 		    (not ; ever wider searches until matching block comments
 
- 		     (and (setq start (point-at-eol))
 
- 			  (setq body-start (save-excursion
 
- 					     (forward-line 2) (point-at-bol)))
 
- 			  (setq link (match-string 0))
 
- 			  (setq path (match-string 3))
 
- 			  (setq block-name (match-string 5))
 
- 			  (save-excursion
 
- 			    (save-match-data
 
- 			      (re-search-forward
 
- 			       (concat " " (regexp-quote block-name)
 
- 				       " ends here") nil t)
 
- 			      (setq end (point-at-bol))))))))
 
- 	(unless (and start (< start mid) (< mid end))
 
- 	  (error "Not in tangled code"))
 
-         (setq body (org-babel-trim (buffer-substring start end))))
 
-       (when (string-match "::" path)
 
-         (setq path (substring path 0 (match-beginning 0))))
 
-       (find-file path) (setq target-buffer (current-buffer))
 
-       (goto-char start) (org-open-link-from-string link)
 
-       (if (string-match "[^ \t\n\r]:\\([[:digit:]]+\\)" block-name)
 
-           (org-babel-next-src-block
 
-            (string-to-number (match-string 1 block-name)))
 
-         (org-babel-goto-named-src-block block-name))
 
-       ;; position at the beginning of the code block body
 
-       (goto-char (org-babel-where-is-src-block-head))
 
-       (forward-line 1)
 
-       ;; Use org-edit-special to isolate the code.
 
-       (org-edit-special)
 
-       ;; Then move forward the correct number of characters in the
 
-       ;; code buffer.
 
-       (forward-char (- mid body-start))
 
-       ;; And return to the Org-mode buffer with the point in the right
 
-       ;; place.
 
-       (org-edit-src-exit)
 
-       (setq target-char (point)))
 
-     (org-src-switch-to-buffer target-buffer t)
 
-     (prog1 body (goto-char target-char))))
 
- (provide 'ob-tangle)
 
- ;; Local variables:
 
- ;; generated-autoload-file: "org-loaddefs.el"
 
- ;; End:
 
- ;;; ob-tangle.el ends here
 
 
  |