remove tail, filter-list, filter-out-list,

first-n, butfirst-n in favor of srfi-1 functions.
remove string-join, string-pad in favor of srfi-13 functions.

diff --git a/ChangeLog b/ChangeLog
index af356fd9c63378fa68e4195e615e6e227f0934f4..890a39f5348070f8e0d8e199ec5a3dfd33352db2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2003-07-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * scm/lily.scm: remove tail, filter-list, filter-out-list,
-       first-n, butfirst-n in favor of srfi-1 functions
+       first-n, butfirst-n in favor of srfi-1 functions.
+       remove string-join, string-pad in favor of srfi-13 functions.
 
        * mf/parmesan-custodes.mf (dir_down): remove _ from glyph names.
 

diff --git a/scm/document-functions.scm b/scm/document-functions.scm
index 459cb08a61cd075f4ebb2bc8bd35dfddb75f5f01..5b2a64455e6b52561d1f0b341c91be4599baaa97 100644 (file)
--- a/scm/document-functions.scm
+++ b/scm/document-functions.scm
@@ -1,5 +1,6 @@
 (use-modules
- (ice-9 regex))
+ (ice-9 regex)
+ )
 
 (define (format-c-header c-h)
   (regexp-substitute/global

diff --git a/scm/documentation-lib.scm b/scm/documentation-lib.scm
index df21108d1646fa246ce2ce077a13e80fca43d730..f5be4cb408935bc52142a442e6008719eca55423 100644 (file)
--- a/scm/documentation-lib.scm
+++ b/scm/documentation-lib.scm
@@ -6,7 +6,9 @@
 ;;; (c)  2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;; Jan Nieuwenhuizen <janneke@gnu.org>
 
-(use-modules (oop goops))
+(use-modules (oop goops)
+            (srfi srfi-13)
+            )
 
 (define-class <texi-node> ()
   (children #:init-value '() #:accessor node-children #:init-keyword #:children)
@@ -114,7 +116,7 @@
   (apply string-append
         (map (lambda (x)
                (string-append
-               (pad-string-to 
+               (string-pad-right 
                 (string-append "\n* " (car x) ":: ")
                 (+ maxwid 8)
                 )

diff --git a/scm/lily.scm b/scm/lily.scm
index 9866b1efc602bed32b1abb6a5a4c72824740ec84..7aa5cbdc17d4487cc446a3b7cb2469e38ae11e63 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -9,7 +9,9 @@
 
 
 (use-modules (ice-9 regex)
-            (srfi srfi-1))
+            (srfi srfi-1)              ;lists
+            (srfi srfi-13)             ;strings
+            )
 
 ;;; General settings
 ;; debugging evaluator is slower.
@@ -235,20 +237,6 @@ L1 is copied, L2 not.
   
   )))
 
-;;;;;;;;;;;;;;;;
-; strings.
-
-
-;; TODO : make sep optional.
-(define-public (string-join str-list sep)
-  "append the list of strings in STR-LIST, joining them with SEP"
-  
-  (apply string-append (list-insert-separator str-list sep))
-  )
-
-(define-public (pad-string-to str wid)
-  (string-append str (make-string (max (- wid (string-length str)) 0) #\ ))
-  )
 
 ;;;;;;;;;;;;;;;;
 ; other