l...@gnu.org (Ludovic Courtès) writes: > Cyrill Schenkel <cyrill.schen...@gmail.com> skribis: > >> From 2dc0cb0eaafbcfce062f4d0acbc7e5cad200bfbf Mon Sep 17 00:00:00 2001 >> From: Cyrill Schenkel <cyrill.schen...@gmail.com> >> Date: Sun, 27 Jul 2014 00:03:16 +0200 >> Subject: [PATCH] guix: Fix handling of periods by fill-paragraph. >> >> * guix/ui.scm (fill-paragraph): Two spaces after period and no spaces before >> newline. > > Could you add a test in tests/ui.scm that demonstrates bug #17468? > > Also please add “Fixes <http://bugs.gnu.org/17468>.” at the beginning of > the commit message.
Done. Regards Cyrill
>From f4240f7a360650383b1820dfe2004a0a3e3ffe50 Mon Sep 17 00:00:00 2001 From: Cyrill Schenkel <cyrill.schen...@gmail.com> Date: Sun, 27 Jul 2014 00:53:16 +0200 Subject: [PATCH] guix: Fix handling of periods by fill-paragraph. Fixes <http://bugs.gnu.org/17468>. * guix/ui.scm (fill-paragraph): Two spaces after period and no spaces before newline. * tests/ui.scm: New test case. --- guix/ui.scm | 25 +++++++++++++++---------- tests/ui.scm | 5 +++++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index 9112d55..f11c2e9 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -393,15 +393,17 @@ converted to a space; sequences of more than one line break are preserved." ((#\newline) `(,column ,(+ 1 newlines) ,chars)) (else - (let ((chars (case newlines - ((0) chars) - ((1) (cons #\space chars)) - (else - (append (make-list newlines #\newline) chars)))) - (column (case newlines - ((0) column) - ((1) (+ 1 column)) - (else 0)))) + (let* ((spaces (if (and (pair? chars) (eqv? (car chars) #\.)) 2 1)) + (chars (case newlines + ((0) chars) + ((1) + (append (make-list spaces #\space) chars)) + (else + (append (make-list newlines #\newline) chars)))) + (column (case newlines + ((0) column) + ((1) (+ spaces column)) + (else 0)))) (let ((chars (cons chr chars)) (column (+ 1 column))) (if (> column width) @@ -414,7 +416,10 @@ converted to a space; sequences of more than one line break are preserved." 0 ,(if (null? after) before - (append before (cons #\newline (cdr after))))) + (append before + (cons #\newline + (drop-while (cut eqv? #\space <>) + after))))) `(,column 0 ,chars))) ; unbreakable `(,column 0 ,chars))))))))) diff --git a/tests/ui.scm b/tests/ui.scm index 4bf7a77..7cc0264 100644 --- a/tests/ui.scm +++ b/tests/ui.scm @@ -67,6 +67,11 @@ interface, and powerful string processing.") 10) #\newline)) +(test-equal "fill-paragraph, two spaces after period" + "First line. Second line" + (fill-paragraph "First line. +Second line" 24)) + (test-equal "package-specification->name+version+output" '(("guile" #f "out") ("guile" "2.0.9" "out") -- 2.0.0
