Merge branch 'lilypond/translation'

[lilypond.git] / scm / clip-region.scm

diff --git a/scm/clip-region.scm b/scm/clip-region.scm
index 14f593adc6b9315449a3319001b4f6a6cfc40533..1c0a6409ba65d5bc0ceb57c91d04082d7c35c597 100644 (file)
--- a/scm/clip-region.scm
+++ b/scm/clip-region.scm
@@ -19,55 +19,25 @@
 
 (use-modules (lily))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; The procedures shown in this list have been moved to
+;; scm/output-lib.scm
+;;
+;;
+;;     (define-public (make-rhythmic-location bar-num num den)
+;:     (define-public (rhythmic-location? a)
+;;     (define-public (make-graceless-rhythmic-location loc)
+;;     (define-public rhythmic-location-measure-position cdr)
+;;     (define-public rhythmic-location-bar-number car)
+;;     (define-public (rhythmic-location<? a b)
+;:     (define-public (rhythmic-location<=? a b)
+;:     (define-public (rhythmic-location>=? a b)
+;;     (define-public (rhythmic-location>? a b)
+;:     (define-public (rhythmic-location=? a b)
+;;     (define-public (rhythmic-location->file-string a)
+;;     (define-public (rhythmic-location->string a)
 
-(define-public (make-rhythmic-location bar-num num den)
-  (cons
-   bar-num (ly:make-moment num den)))
-
-(define-public (rhythmic-location? a)
-  (and (pair? a)
-       (integer? (car a))
-       (ly:moment? (cdr a))))
-
-(define-public (make-graceless-rhythmic-location loc)
-  (make-rhythmic-location
-   (car loc)
-   (ly:moment-main-numerator (rhythmic-location-measure-position loc))
-   (ly:moment-main-denominator (rhythmic-location-measure-position loc))))
-                  
-                                            
-(define-public rhythmic-location-measure-position cdr)
-(define-public rhythmic-location-bar-number car)
-
-(define-public (rhythmic-location<? a b)
-  (cond
-   ((< (car a) (car b)) #t)
-   ((> (car a) (car b)) #f)
-   (else
-    (ly:moment<? (cdr a) (cdr b)))))
-
-(define-public (rhythmic-location<=? a b)
-  (not (rhythmic-location<? b a)))
-(define-public (rhythmic-location>=? a b)
-  (rhythmic-location<? a b))
-(define-public (rhythmic-location>? a b)
-  (rhythmic-location<? b a))
-
-(define-public (rhythmic-location=? a b)
-  (and (rhythmic-location<=? a b)
-       (rhythmic-location<=? b a)))
-
-
-(define-public (rhythmic-location->file-string a)
-  (ly:format "~a.~a.~a"
-         (car a)
-         (ly:moment-main-numerator (cdr a))
-         (ly:moment-main-denominator (cdr a))))
-
-(define-public (rhythmic-location->string a)
-  (ly:format "bar ~a ~a"
-         (car a)
-         (ly:moment->string  (cdr a))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  Actual clipping logic.