mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
ui: 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. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
ebc32b3110
commit
3a09e1d2e8
2 changed files with 20 additions and 10 deletions
25
guix/ui.scm
25
guix/ui.scm
|
@ -393,15 +393,17 @@ (define (maybe-break chr result)
|
|||
((#\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 @@ (define (maybe-break chr result)
|
|||
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)))))))))
|
||||
|
||||
|
|
|
@ -67,6 +67,11 @@ (define %paragraph
|
|||
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")
|
||||
|
|
Loading…
Reference in a new issue