X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper.scm;h=bb152b057aa0d8fe29742e4613f9a869d6667a9c;hb=ab8291c74c11daaf42ec8438cfb55097a3d6f77d;hp=9a6b05a8c02f2a700f22a096158ee5ebd3a13e9f;hpb=ffe548cfbb3c3b37c8969f49b5aba04ef998d080;p=lilypond.git

diff --git a/scm/paper.scm b/scm/paper.scm
index 9a6b05a8c0..bb152b057a 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -1,136 +1,83 @@
-;;; paper.scm -- scm paper variables and functions
-;;;
-;;;  source file of the GNU LilyPond music typesetter
-;;; 
-;;; (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
-
-;;; All dimensions are measured in staff-spaces
-
-
-
-;; Beams should be prevented to conflict with the stafflines, 
-;; especially at small slopes
-;;    ----------------------------------------------------------
-;;                                                   ########
-;;                                        ########
-;;                             ########
-;;    --------------########------------------------------------
-;;       ########
-;;
-;;       hang       straddle   sit        inter      hang
-
-;; inter seems to be a modern quirk, we don't use that
-
-(define staff-line 0.10)
-(define beam-thickness (* 0.52 (- 1 staff-line)))
-(define beam-straddle 0)
-(define beam-sit (/ (+ beam-thickness staff-line) 2))
-(define beam-hang (- 1 (/ (- beam-thickness staff-line) 2)))
-
-;; Note: quanting period is take as quants.top () - quants[0], 
-;; which should be 1 (== 1 interline)
-
-(define beam-normal-dy-quants
-  (list 0 (/ (+ beam-thickness staff-line) 2) (+ beam-thickness staff-line) 1))
-
-;; two popular veritcal beam quantings
-;; see params.ly: #'beam-vertical-quants
-(define (beam-normal-y-quants multiplicity dy)
-  (let ((quants (list beam-hang)))
-    (if (or (<= multiplicity 1) (>= (abs dy) (/ staff-line 2)))
-	(set! quants (cons beam-sit quants)))
-    (if (or (<= multiplicity 2) (>= (abs dy) (/ staff-line 2)))
-	(set! quants (cons beam-straddle quants)))
-    ;; period: 1 (interline)
-    (append quants (list (+ 1 (car quants))))))
-
-(define (beam-traditional-y-quants multiplicity dy)
-  (let ((quants '()))
-    (if (>= dy (/ staff-line -2))
-	(set! quants (cons beam-hang quants)))
-    (if (and (<= multiplicity 1) (<= dy (/ staff-line 2)))
-	(set! quants (cons beam-sit quants)))
-    (if (or (<= multiplicity 2) (>= (abs dy) (/ staff-line 2)))
-	(set! quants (cons beam-straddle quants)))
-    ;; period: 1 (interline)
-    (append quants (list (+ 1 (car quants))))))
-
-
-;; There are several ways to calculate the direction of a beam
-;;
-;; * majority: number count of up or down notes
-;; * mean    : mean centre distance of all notes
-;; * median  : mean centre distance weighted per note
-
-(define (dir-compare up down)
-  (if (= up down)
-      0
-      (if (> up down)
-	  1
-	  -1)))
-
-;; (up . down)
-(define (beam-dir-majority count total)
-  (dir-compare (car count) (cdr count)))
-
-(define (beam-dir-mean count total)
-  (dir-compare (car total) (cdr total)))
-
-(define (beam-dir-median count total)
-  (if (and (> (car count) 0)
-	   (> (cdr count) 0))
-      (dir-compare (/ (car total) (car count)) (/ (cdr total) (cdr count)))
-      (dir-compare (car count) (cdr count))))
-	    
-
-;;; Default variables and settings
-
-(define beam-height-quants beam-normal-dy-quants)
-(define beam-vertical-position-quants beam-normal-y-quants)
-
-
-;; [Ross] states that the majority of the notes dictates the
-;; direction (and not the mean of "center distance")
-;;
-;; But is that because it really looks better, or because he wants
-;; to provide some real simple hands-on rules?
-;;     
-;; We have our doubts, so we simply provide all sensible alternatives.
-(define beam-dir-algorithm beam-dir-majority)
-
-
-;; array index flag-2 (what a name!!), last if index>size
-;; unbeamed stems
-(define stem-length '(3.5 3.5 3.5 4.5 5.0))
-(define grace-length-factor 0.8)
-(define grace-stem-length
-  (map (lambda (x) (* grace-length-factor x)) stem-length))
-
-;; array index multiplicity, last if index>size
-;; beamed stems
-(define beamed-stem-shorten '(0.5))
-(define beamed-stem-length '(0.0 2.5 2.0 1.5))
-(define grace-beamed-stem-length '(0.0 2.5 2.0 1.5))
-(define beamed-stem-minimum-length '(0.0 1.5 1.25 1.0))
-(define grace-beamed-stem-minimum-length
-  (map (lambda (x) (* grace-length-factor x)) beamed-stem-minimum-length))
-
-;;  Stems in unnatural (forced) direction should be shortened,
-;;  according to [Roush & Gourlay].  Their suggestion to knock off
-;;  a whole staffspace seems a bit drastical: we'll do half.
-
-;; TODO
-;;  - take #forced stems into account (now done in C++)?
-;;  - take y-position of chord or beam into account
-
-(define stem-shorten '(0.5))
-(define grace-stem-shorten '(0.0))
-
-;; urg
-(define pi (* 2 (acos 0)))
-
-(define (slur-default-height h-inf r-0 b)
-  (let ((alpha (/ (* 2.0 h-inf) pi))
-	(beta (/ (* pi r-0) (* 2.0 h-inf))))
-    (* alpha (atan (* beta b)))))
- 
+;;;; paper.scm -- manipulate the paper block.
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c)  2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+
+(define-public (paper-set-staff-size sz)
+  "Function to be called inside a \\paper{} block to set the staff size."
+  (let*
+   ((m (current-module))
+    (ss (/ sz 4))
+    (pt (eval 'pt m)) 
+    (mm (eval 'mm m))  )
+   
+    (module-define! m 'fonts (scale-font-list (/  sz (* 20 pt))))
+    (module-define! m 'staffheight sz)
+    (module-define! m 'staff-space ss)
+    (module-define! m 'staffspace ss)
+
+
+    ;; !! synchronize with feta-params.mf
+    (module-define! m 'linethickness (+ (* 0.3 pt) (* 0.04 ss)))
+    (module-define! m 'outputscale ss)
+    (module-define! m 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10)))
+    (module-define! m 'blotdiameter (* 0.35 pt))
+    (module-define! m 'interscoreline (* 4 mm))
+    ;; REMOVEME
+    (module-define! m 'lineheight (* 14 ss))))
+
+(define-public (set-global-staff-size sz)
+  "Set the default staff size, where SZ is thought to be in PT."
+  (let* ((old-mod (current-module))
+	 (pap (eval '$defaultpaper old-mod))
+	 (new-paper (ly:output-def-clone pap))
+	 (new-scope (ly:output-def-scope new-paper)))
+    (set-current-module new-scope)
+    (paper-set-staff-size (* sz (eval 'pt new-scope)))
+    (set-current-module old-mod)
+    (module-define! old-mod '$defaultpaper new-paper)))
+
+(define paper-alist
+  '(("a4" . (cons (* 210 mm) (* 297.9 mm)))
+    ("a3" . (cons (* 297.9 mm) (* 420 mm)))
+    ("legal" . (cons (* 8.5 in) (* 14.0 in)))
+    ("letter" . (cons (* 8.5 in) (* 11.0 in)))
+    ("tabloid" . (cons (* 11.0 in) (* 17.0 in)))))
+
+;; todo: take dimension arguments.
+
+
+(define (set-paper-dimensions m w h)
+  "M is a module (ie. paper->scope_ )"
+  
+  (let* ((mm (eval 'mm m)))
+    (module-define! m 'hsize w)
+    (module-define! m 'vsize h)
+    (module-define! m 'linewidth (- w (* 20 mm)))
+    (module-define! m 'raggedright #f)
+    (module-define! m 'packed #f)
+    (module-define! m 'indent (/ w 14))))
+
+
+(define-public (set-paper-size name)
+  (let*
+      ((entry (assoc name paper-alist))
+       (pap (eval '$defaultpaper (current-module)))
+       (new-paper (ly:output-def-clone pap))
+       (m  (ly:output-def-scope new-paper))
+       (mm (eval 'mm m))
+       )
+
+    (if (pair? entry)
+	(begin
+	  (set! entry (eval  (cdr entry) m))
+	  (set-paper-dimensions m (car entry) (cdr entry))
+	  (module-define! m 'papersize name)
+	  (module-define! m 'papersizename name)
+	  (set-paper-dimensions m (car entry) (cdr entry))
+	  (module-define! (current-module) '$defaultpaper new-paper)
+	  )
+	(ly:warning (string-append "Unknown papersize: " name))
+	)))