Re: [PATCH] How do I include text between a range of line numbers with #INCLUDE

From: Puneeth <punchagan@gmail.com>
To: Venkatesh Choppella <venkatesh.choppella@iiit.ac.in>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] How do I include text between a range of line numbers with #INCLUDE
Date: Fri, 7 Jan 2011 13:29:41 +0530	[thread overview]
Message-ID: <AANLkTi=G8u9raP6p3jMeTRYPB_AzGgmZVKKZjPqqCPX4@mail.gmail.com> (raw)
In-Reply-To: <AANLkTikn64EGS5z5hTto_CVoFAZAvxZBdsHzVGySDqo8@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 683 bytes --]

On Fri, Jan 7, 2011 at 10:03 AM, Venkatesh Choppella
<venkatesh.choppella@iiit.ac.in> wrote:
> I would like to include a part of a file (between a given range of
> line numbers) instead of the whole file.  Is there a way to do that in
> org-mode?

It isn't possible to include files using line numbers, as of now.
Here's a quick patch that would add this feature.  I have tested it
with small files and works fine. Can somebody tell me if it looks
good?

:lines "5-10"  will include the lines from 5 to 10, 10 excluded.
:lines "-10"  will include the lines from 1 to 10, 10 excluded.
:lines "5-"  will include the lines from 1 to the end of the file.

HTH,
Puneeth

[-- Attachment #2: patch-include-lines.diff.txt --]
[-- Type: text/plain, Size: 2799 bytes --]

diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 3d466fa..5afa266 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -2130,13 +2130,14 @@ TYPE must be a string, any of:
 (defun org-export-handle-include-files ()
   "Include the contents of include files, with proper formatting."
   (let ((case-fold-search t)
-	params file markup lang start end prefix prefix1 switches all minlevel)
+	params file markup lang start end prefix prefix1 switches all minlevel lines)
     (goto-char (point-min))
     (while (re-search-forward "^#\\+INCLUDE:?[ \t]+\\(.*\\)" nil t)
       (setq params (read (concat "(" (match-string 1) ")"))
 	    prefix (org-get-and-remove-property 'params :prefix)
 	    prefix1 (org-get-and-remove-property 'params :prefix1)
 	    minlevel (org-get-and-remove-property 'params :minlevel)
+	    lines (org-get-and-remove-property 'params :lines)
 	    file (org-symname-or-string (pop params))
 	    markup (org-symname-or-string (pop params))
 	    lang (and (member markup '("src" "SRC"))
@@ -2159,7 +2160,7 @@ TYPE must be a string, any of:
 		  end  (format "#+end_%s" markup))))
 	(insert (or start ""))
 	(insert (org-get-file-contents (expand-file-name file)
-				       prefix prefix1 markup minlevel))
+				       prefix prefix1 markup minlevel lines))
 	(or (bolp) (newline))
 	(insert (or end ""))))
     all))
@@ -2176,15 +2177,32 @@ TYPE must be a string, any of:
 	(when intersection
 	  (error "Recursive #+INCLUDE: %S" intersection))))))
 
-(defun org-get-file-contents (file &optional prefix prefix1 markup minlevel)
+(defun org-get-file-contents (file &optional prefix prefix1 markup minlevel lines)
   "Get the contents of FILE and return them as a string.
 If PREFIX is a string, prepend it to each line.  If PREFIX1
 is a string, prepend it to the first line instead of PREFIX.
 If MARKUP, don't protect org-like lines, the exporter will
-take care of the block they are in."
+take care of the block they are in.  You can include a part
+of a file by specifying a range of line numbers, \"P-Q\" 
+which includes lines from P to Q, excluding Q. P and/or Q 
+may be ommitted to assume the obvious defaults."
   (if (stringp markup) (setq markup (downcase markup)))
   (with-temp-buffer
     (insert-file-contents file)
+    (when lines
+      (let (beg end)
+	(setq lines (split-string lines "-")
+	      beg (if (string= "" (car lines))
+		      (point-min)
+		    (goto-char (point-min)) 
+		    (forward-line (1- (string-to-number (car lines))))
+		    (point))
+	      end (if (string= "" (cadr lines))
+		      (point-max)
+		    (goto-char (point-min)) 
+		    (forward-line (1- (string-to-number (cadr lines))))
+		    (point)))
+	(narrow-to-region beg end)))
     (when (or prefix prefix1)
       (goto-char (point-min))
       (while (not (eobp))

[-- Attachment #3: Type: text/plain, Size: 201 bytes --]

_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
