[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-248-gb7faf
From: |
Andy Wingo |
Subject: |
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-248-gb7faf39 |
Date: |
Mon, 17 Mar 2014 20:52:55 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=b7faf399c1420567b017cdc7f900009ded175151
The branch, stable-2.0 has been updated
via b7faf399c1420567b017cdc7f900009ded175151 (commit)
from 679ffce89c3ddb8f906df452e4884b128ea4655b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b7faf399c1420567b017cdc7f900009ded175151
Author: Andy Wingo <address@hidden>
Date: Thu Feb 27 17:16:29 2014 +0100
Fix newline preservation in @example with lines beginning with @
* module/texinfo.scm (read-char-data): Preserve newlines in @example and
similar environments in the case when the next line starts with an @.
* test-suite/tests/texinfo.test ("test-texinfo->stexinfo"): Add a test.
-----------------------------------------------------------------------
Summary of changes:
module/texinfo.scm | 6 ++++--
test-suite/tests/texinfo.test | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/module/texinfo.scm b/module/texinfo.scm
index 91bb46d..02fec16 100644
--- a/module/texinfo.scm
+++ b/module/texinfo.scm
@@ -1,6 +1,6 @@
;;;; (texinfo) -- parsing of texinfo into SXML
;;;;
-;;;; Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation,
Inc.
+;;;; Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Free Software
Foundation, Inc.
;;;; Copyright (C) 2004, 2009 Andy Wingo <wingo at pobox dot com>
;;;; Copyright (C) 2001,2002 Oleg Kiselyov <oleg at pobox dot com>
;;;;
@@ -765,7 +765,9 @@ Examples:
(let* ((token (read-command-token port))
(end? (eq? (token-kind token) 'END)))
(values
- (handle str-handler fragment (if end? "" " ") seed)
+ (handle str-handler fragment
+ (if end? "" (if preserve-ws? "\n" " "))
+ seed)
token)))
((and (not preserve-ws?) (eq? c #\newline))
;; paragraph-separator ::= #\newline #\newline+
diff --git a/test-suite/tests/texinfo.test b/test-suite/tests/texinfo.test
index 2cb4a71..9c6722f 100644
--- a/test-suite/tests/texinfo.test
+++ b/test-suite/tests/texinfo.test
@@ -1,6 +1,6 @@
;;;; texinfo.test -*- scheme -*-
;;;;
-;;;; Copyright (C) 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+;;;; Copyright (C) 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
;;;; Copyright (C) 2001,2002 Oleg Kiselyov <oleg at pobox dot com>
;;;;
;;;; This library is free software; you can redistribute it and/or
@@ -232,6 +232,8 @@
(test-body "@example\n foo asdf asd sadf asd address@hidden example\n"
'((example " foo asdf asd sadf asd ")))
+ (test-body "@address@hidden@address@hidden example\n"
+ '((example "{\n}")))
(test-body (join-lines
"@quotation"
"@example"
hooks/post-receive
--
GNU Guile
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-248-gb7faf39,
Andy Wingo <=