From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 9 Feb 1999 22:23:38 +0000 (+0100)
Subject: patch::: 1.1.29.jcn2: jcn2
X-Git-Tag: release/1.1.30~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=91dd9de39f27c9d6f3ba78fffda8379998fdda73;p=lilypond.git

patch::: 1.1.29.jcn2: jcn2

pl 29.jcn2
	- resurrected ps output

---
Generated by janneke@gnu.org using package-diff 0.62,
>From = lilypond-1.1.29.jcn1, To = lilypond-1.1.29.jcn2

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.29.jcn2.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
and possibly make outdirs.

--state
1.1.29.jcn1
1.1.29.jcn2
++state
---

diff --git a/NEWS b/NEWS
index 54aedcfc58..be611e77e1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,12 @@
---- ../lilypond-1.1.29/NEWS	Tue Feb  9 13:54:27 1999
+--- ../lilypond-1.1.29.jcn1/NEWS	Tue Feb  9 17:15:49 1999
+++ b/NEWS	Tue Feb  9 22:46:07 1999
+@@ -1,3 +1,6 @@
+pl 29.jcn2
+	- resurrected ps output
+
+ pl 29.jcn1
+ 	- bf: volta sizes
+ 	- GNU stuff on home page--- ../lilypond-1.1.29/NEWS	Tue Feb  9 13:54:27 1999
 ++ b/NEWS	Tue Feb  9 17:15:49 1999
 @@ -1,3 +1,7 @@
 pl 29.jcn1
diff --git a/VERSION b/VERSION
index a834a19ac2..d986ff64a5 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=29
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/input/bugs/staff-side-slur.ly b/input/bugs/staff-side-slur.ly
index 8f00ff0da0..1a3cb5ceb2 100644
--- a/input/bugs/staff-side-slur.ly
+++ b/input/bugs/staff-side-slur.ly
@@ -1,6 +1,8 @@
 \score{
 	\type Staff \notes\relative c''{
-		\property Staff.instrument = "Toeters"
+		% length matters...
+%		\property Staff.instrument = "Tot"
+		\property Staff.instrument = "ToetersToetersToeters"
 		c c c c(\break
 		)c c c c ~\break
 		c c c c\break
diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index aaaa2e610b..68d95c238b 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -248,11 +248,14 @@ Paper_def::paper_outputter_p (Paper_stream* os_p, Header* header_l, String origi
   if (scope_p_)
     p->output_scope (scope_p_, "mudelapaper");
   
+#if 0
   if (output_global_ch == String("tex"))
     {
       *p->outstream_l_ << *scope_p_->elem ("texsetting")->access_content_String (false);
     }
-  
+#endif
+
+  *p->outstream_l_  << *scope_p_->elem (String (output_global_ch) + "setting")->access_content_String (false);
 
   SCM scm = gh_list (ly_symbol ("experimental-on"), SCM_UNDEFINED);
   p->output_scheme (scm);
diff --git a/ps/lily.ps b/ps/lily.ps
index 9c1710e3b2..87a5895d90 100644
--- a/ps/lily.ps
+++ b/ps/lily.ps
@@ -4,6 +4,15 @@
 % round cappings
 1 setlinecap
 
+% URG
+% staffheight 4 div /interline exch def
+% interline 3 div /bracket_b exch def
+% interline 2 mul /bracket_w exch def
+% stafflinethickness 2 mul /bracket_t exch def
+% interline 1.5 mul /bracket_v exch def
+% bracket_v /bracket_u exch def
+% 50 /bracket_alpha exch def
+
 /draw_beam % width slope thick
 {
         2 div /beam_thick exch def
diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps
index a862db2153..7bc7ae58ea 100644
--- a/ps/lilyponddefs.ps
+++ b/ps/lilyponddefs.ps
@@ -3,6 +3,9 @@
 % hmm
 /setgray { 1 add } bind def
 
+% urg
+1 /stafflinethickness exch def
+
 /xoffset 30 def
 /yoffset 700 def
 /staffrulethickness 1 def
diff --git a/scm/lily.scm b/scm/lily.scm
index b0dc1b9a83..73a0dc4ef4 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -82,9 +82,7 @@
   (define (cached-fontname i)
     (string-append
      "\\lilyfont"
-     (make-string 1 (integer->char (+ 65 i)))
-     )
-    )
+     (make-string 1 (integer->char (+ 65 i)))))
     
   (define (select-font font-name)
       (if (not (equal? font-name current-font))
@@ -96,18 +94,10 @@
 		  (set! font-cmd (cached-fontname font-count))
 		  (set! font-alist (acons font-name font-cmd font-alist))
 		  (set! font-count (+ 1 font-count))
-		  (string-append "\\font" font-cmd "=" font-name font-cmd)
-		  )
-		(cdr font-cmd))
-	    )
-	  
+		  (string-append "\\font" font-cmd "=" font-name font-cmd))
+		(cdr font-cmd)))
 	  ""				;no switch needed
-
-	  )
-      
-      )
-
-
+	  ))
   
   (define (beam width slope thick)
     (embedded-ps ((ps-scm 'beam) width slope thick)))
@@ -121,21 +111,20 @@
   (define (crescendo w h cont)
     (embedded-ps ((ps-scm 'crescendo) w h cont)))
 
+  (define (char i)
+    (string-append "\\show{" (inexact->string i 10) "}"))
+  
   (define (decrescendo w h cont)
     (embedded-ps ((ps-scm 'decrescendo) w h cont)))
 
-
   (define (embedded-ps s)
     (string-append "\\embeddedps{" s "}"))
 
   (define (end-output) 
     "\n\\EndLilyPondOutput")
   
-  (define (experimental-on) "\\turnOnExperimentalFeatures")
-
-
-
-
+  (define (experimental-on)
+    "\\turnOnExperimentalFeatures")
 
   (define (font-switch i)
     (string-append
@@ -158,9 +147,7 @@
   (define (invoke-char s i)
     (string-append 
      "\n\\" s "{" (inexact->string i 10) "}" ))
-  (define (char i)
-    (string-append "\\show{" (inexact->string i 10) "}"))
-  
+
   (define (invoke-dim1 s d)
     (string-append
      "\n\\" s "{" (number->dim d) "}"))
@@ -235,18 +222,21 @@
   (define (volta w thick last)
     (embedded-ps ((ps-scm 'volta) w thick last)))
 
-
+  ;; TeX
   ;; The procedures listed below form the public interface of TeX-scm.
   ;; (should merge the 2 lists)
   (cond ((eq? action-name 'all-definitions)
 	 `(begin
 	    (define beam ,beam)
-	    (define tuplet ,tuplet)
+	    (define bezier-sandwich ,bezier-sandwich)
 	    (define bracket ,bracket)
+	    (define char ,char)
 	    (define crescendo ,crescendo)
 	    (define dashed-slur ,dashed-slur) 
 	    (define decrescendo ,decrescendo) 
 	    (define end-output ,end-output)
+	    (define experimental-on ,experimental-on)
+	    (define filledbox ,filledbox)
 	    (define font-def ,font-def)
 	    (define font-switch ,font-switch)
 	    (define generalmeter ,generalmeter)
@@ -255,21 +245,17 @@
 	    (define header ,header) 
 	    (define invoke-char ,invoke-char) 
 	    (define invoke-dim1 ,invoke-dim1)
+	    (define pianobrace ,pianobrace)
 	    (define placebox ,placebox)
 	    (define rulesym ,rulesym)
-	    (define bezier-sandwich ,bezier-sandwich)
 	    (define select-font ,select-font)
 	    (define start-line ,start-line)
-	    (define filledbox ,filledbox)
 	    (define stop-line ,stop-line)
 	    (define text ,text)
-	    (define experimental-on  ,experimental-on)
-	    (define char  ,char)
-	    (define pianobrace ,pianobrace)
+	    (define tuplet ,tuplet)
 	    (define volta ,volta)
 	    ))
 
-	((eq? action-name 'experimental-on) experimental-on)
 	((eq? action-name 'beam) beam)
 	((eq? action-name 'tuplet) tuplet)
 	((eq? action-name 'bracket) bracket)
@@ -277,6 +263,7 @@
 	((eq? action-name 'dashed-slur) dashed-slur) 
 	((eq? action-name 'decrescendo) decrescendo) 
 	((eq? action-name 'end-output) end-output)
+	((eq? action-name 'experimental-on) experimental-on)
 	((eq? action-name 'font-def) font-def)
 	((eq? action-name 'font-switch) font-switch)
 	((eq? action-name 'generalmeter) generalmeter)
@@ -298,6 +285,39 @@
 
 ;;;;;;;;;;;; PS
 (define (ps-scm action-name)
+
+  (define font-alist '())
+  (define font-count 0)
+  (define current-font "")
+  (define (clear-fontcache)
+    (begin
+      (set! font-alist '())
+      (set! font-count 0)
+      (set! current-font "")))
+  
+  (define (cached-fontname i)
+    (string-append
+     "lilyfont"
+     (make-string 1 (integer->char (+ 65 i)))))
+
+  (define (select-font font-name)
+      (if (not (equal? font-name current-font))
+	  (begin
+	    (set! current-font font-name)
+	    (define font-cmd (assoc font-name font-alist))
+	    (if (eq? font-cmd #f)
+		(begin
+		  (set! font-cmd (cached-fontname font-count))
+		  (set! font-alist (acons font-name font-cmd font-alist))
+		  (set! font-count (+ 1 font-count))
+		  (string-append "\n/" font-cmd " {/"
+				 font-name
+				 " findfont 12 scalefont setfont} bind def\n"
+				 font-cmd "\n"))
+		(cdr font-cmd)))
+	  ""				;no switch needed
+	  ))
+		  
   (define (beam width slope thick)
     (string-append
      (numbers->string (list width slope thick)) " draw_beam " ))
@@ -305,6 +325,9 @@
   (define (bracket h)
     (invoke-dim1 "draw_bracket" h))
 
+  (define (char i)
+    (invoke-char "show" i))
+
   (define (crescendo w h cont)
     (string-append 
      (numbers->string (list w h (inexact->exact cont)))
@@ -327,9 +350,14 @@
 
   (define (end-output)
     "\nshowpage\n")
-
+  
   (define (experimental-on) "")
+  
+  (define (filledbox kern width height depth) 
+    (string-append (numbers->string (list kern width height depth))
+		   "draw_stem" ))
 
+  ;; obsolete?
   (define (font-def i s)
     (string-append
      "\n/" (font i) " {/" 
@@ -351,11 +379,11 @@
     (string-append
      "%!PS-Adobe-3.0\n"
      "%%Creator: " creator generate "\n"))
-
+  
   (define (invoke-char s i)
     (string-append 
      "(\\" (inexact->string i 8) ") " s " " ))
-
+  
   (define (invoke-dim1 s d) 
     (string-append
      (number->string (* d  (/ 72.27 72))) " " s ))
@@ -406,19 +434,21 @@
     "\n unknown\n")
 
 
-  ; dispatch on action-name
+  ;; PS
   (cond ((eq? action-name 'all-definitions)
 	 `(begin
 	    (define beam ,beam)
 	    (define tuplet ,tuplet)
 	    (define bracket ,bracket)
+	    (define char ,char)
 	    (define crescendo ,crescendo)
 	    (define volta ,volta)
 	    (define bezier-sandwich ,bezier-sandwich)
 	    (define dashed-slur ,dashed-slur) 
 	    (define decrescendo ,decrescendo) 
-
 	    (define end-output ,end-output)
+	    (define experimental-on ,experimental-on)
+	    (define filledbox ,filledbox)
 	    (define font-def ,font-def)
 	    (define font-switch ,font-switch)
 	    (define generalmeter ,generalmeter)
@@ -429,6 +459,7 @@
 	    (define invoke-dim1 ,invoke-dim1)
 	    (define placebox ,placebox)
 	    (define rulesym ,rulesym)
+	    (define select-font ,select-font)
 	    (define start-line ,start-line)
 	    (define stem ,stem)
 	    (define stop-line ,stop-line)
@@ -436,12 +467,16 @@
 	    ))
 	((eq? action-name 'tuplet) tuplet)
 	((eq? action-name 'beam) beam)
+	((eq? action-name 'bezier-sandwich) bezier-sandwich)
 	((eq? action-name 'bracket) bracket)
+	((eq? action-name 'char) char)
 	((eq? action-name 'crescendo) crescendo)
-	((eq? action-name 'volta) volta)
-	((eq? action-name 'bezier-sandwich) bezier-sandwich)
 	((eq? action-name 'dashed-slur) dashed-slur) 
 	((eq? action-name 'decrescendo) decrescendo)
+	((eq? action-name 'experimental-on) experimental-on)
+	((eq? action-name 'filledbox) filledbox)
+	((eq? action-name 'select-font) select-font)
+	((eq? action-name 'volta) volta)
 	(else (error "unknown tag -- PS-SCM " action-name))
 	)
   )