emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] Remove some blank leading blank lines from ASCII export.
@ 2009-08-09 11:20 Andrew Stribblehill
  2009-08-09 12:34 ` Carsten Dominik
  0 siblings, 1 reply; 2+ messages in thread
From: Andrew Stribblehill @ 2009-08-09 11:20 UTC (permalink / raw)
  To: emacs-orgmode

With the following org file:
------
Foo

In which foos are described.
#+OPTIONS: num:nil author:nil creator:nil timestamp:nil d:nil toc:nil skip:t
#+TITLE:
* The construction of a foo
** Armaments
------
I found exporting to ASCII gave five leading blank lines. The
following patch reduces that to one. (I'd love some help in tracking
down that final one.)

---
 lisp/ChangeLog    |    5 +++++
 lisp/org-ascii.el |   11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd00a9a..2c477d7 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-09  Andrew Stribblehill  <ads@wompom.org>
+
+	* org-ascii.el (org-export-as-ascii): Remove some leading blank
+	lines from output when skipping preamble.
+
 2009-08-08  Bastien Guerry  <bzg@altern.org>

 	* org.el (org-iswitchb): Fix bug when aborting the `org-iswitchb'
diff --git a/lisp/org-ascii.el b/lisp/org-ascii.el
index ede4ccc..846be8a 100644
--- a/lisp/org-ascii.el
+++ b/lisp/org-ascii.el
@@ -266,11 +266,13 @@ publishing directory."

     ;; File header
     (unless body-only
-      (if title (org-insert-centered title ?=))
-      (insert "\n")
+      (when (and title (not (string= "" title)))
+	(org-insert-centered title ?=)
+	(insert "\n"))
+
       (if (and (or author email)
 	       org-export-author-info)
-	  (insert (concat (nth 1 lang-words) ": " (or author "")
+	  (insert(concat (nth 1 lang-words) ": " (or author "")
 			  (if email (concat " <" email ">") "")
 			  "\n")))

@@ -283,7 +285,8 @@ publishing directory."
       (if (and date org-export-time-stamp-file)
 	  (insert (concat (nth 2 lang-words) ": " date"\n")))

-      (insert "\n\n"))
+      (unless (= (point) (point-min))
+	(insert "\n\n")))

     (if (and org-export-with-toc (not body-only))
 	(progn
-- 
1.6.3.GIT

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] Remove some blank leading blank lines from ASCII export.
  2009-08-09 11:20 [PATCH] Remove some blank leading blank lines from ASCII export Andrew Stribblehill
@ 2009-08-09 12:34 ` Carsten Dominik
  0 siblings, 0 replies; 2+ messages in thread
From: Carsten Dominik @ 2009-08-09 12:34 UTC (permalink / raw)
  To: Andrew Stribblehill; +Cc: emacs-orgmode

Applied, thanks.

- Carsten

On Aug 9, 2009, at 1:20 PM, Andrew Stribblehill wrote:

> With the following org file:
> ------
> Foo
>
> In which foos are described.
> #+OPTIONS: num:nil author:nil creator:nil timestamp:nil d:nil  
> toc:nil skip:t
> #+TITLE:
> * The construction of a foo
> ** Armaments
> ------
> I found exporting to ASCII gave five leading blank lines. The
> following patch reduces that to one. (I'd love some help in tracking
> down that final one.)
>
> ---
> lisp/ChangeLog    |    5 +++++
> lisp/org-ascii.el |   11 +++++++----
> 2 files changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/lisp/ChangeLog b/lisp/ChangeLog
> index dd00a9a..2c477d7 100755
> --- a/lisp/ChangeLog
> +++ b/lisp/ChangeLog
> @@ -1,3 +1,8 @@
> +2009-08-09  Andrew Stribblehill  <ads@wompom.org>
> +
> +	* org-ascii.el (org-export-as-ascii): Remove some leading blank
> +	lines from output when skipping preamble.
> +
> 2009-08-08  Bastien Guerry  <bzg@altern.org>
>
> 	* org.el (org-iswitchb): Fix bug when aborting the `org-iswitchb'
> diff --git a/lisp/org-ascii.el b/lisp/org-ascii.el
> index ede4ccc..846be8a 100644
> --- a/lisp/org-ascii.el
> +++ b/lisp/org-ascii.el
> @@ -266,11 +266,13 @@ publishing directory."
>
>     ;; File header
>     (unless body-only
> -      (if title (org-insert-centered title ?=))
> -      (insert "\n")
> +      (when (and title (not (string= "" title)))
> +	(org-insert-centered title ?=)
> +	(insert "\n"))
> +
>       (if (and (or author email)
> 	       org-export-author-info)
> -	  (insert (concat (nth 1 lang-words) ": " (or author "")
> +	  (insert(concat (nth 1 lang-words) ": " (or author "")
> 			  (if email (concat " <" email ">") "")
> 			  "\n")))
>
> @@ -283,7 +285,8 @@ publishing directory."
>       (if (and date org-export-time-stamp-file)
> 	  (insert (concat (nth 2 lang-words) ": " date"\n")))
>
> -      (insert "\n\n"))
> +      (unless (= (point) (point-min))
> +	(insert "\n\n")))
>
>     (if (and org-export-with-toc (not body-only))
> 	(progn
> -- 
> 1.6.3.GIT
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Remember: use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-08-09 12:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-08-09 11:20 [PATCH] Remove some blank leading blank lines from ASCII export Andrew Stribblehill
2009-08-09 12:34 ` Carsten Dominik

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).