X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ps%2Fmusic-drawing-routines.ps;h=762657508449c1ef4cff795575fc9be9dc26f26b;hb=3863f416bea79ef29dded3b1b8a3f61419098f7a;hp=0b1ddcf9c37b9674e16d6509955eaa0ceed8102b;hpb=a78c70be8951804126d19eb74b344ae1858023e5;p=lilypond.git

diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps
index 0b1ddcf9c3..7626575084 100644
--- a/ps/music-drawing-routines.ps
+++ b/ps/music-drawing-routines.ps
@@ -2,337 +2,236 @@
 %
 % Functions for direct and embedded PostScript
 
-/blot-diameter { lilypondpaperblotdiameter } bind def
+% Careful with double % as comment prefix.
+% Any %%X comment is interpreted as DSC comments.
 
-/euclidean_length  
-{ 
-	1 copy mul exch 1 copy mul add sqrt 
-} bind def 
+% TODO: use dicts or prefixes to prevent namespace pollution.
 
-% FIXME.  translate to middle of box.
-% Nice rectangle with rounded corners
-% FIXME: linewidth hardcoded.  check: too round?
-/draw_box % breapth width depth height
-{
-	%% FIXME: hardcoded
-	currentdict /testing known {
-		%% real thin lines for testing
-		/blot 0.005 def
-	}{
-		/blot blot-diameter def
-	} ifelse
+/pdfmark where
+{pop} {userdict /pdfmark /cleartomark load put} ifelse
 
-	0 setlinecap
-	blot setlinewidth
-	1 setlinejoin
 
-	blot 2 div sub /h exch def
-	blot 2 div sub /d exch def
-
-	%% UGH huh?
-	%% Where does this correction come from?
-	%% Why don't we need this in x direction?
-	h blot 2 div sub /h exch def
-	d blot 2 div sub /d exch def
-
-	blot 2 div sub /w exch def
-	blot 2 div sub /b exch def
+% llx lly urx ury URI
+/mark_URI
+{
+    /uri exch def
+    /ury exch def
+    /urx exch def
+    /lly exch def
+    /llx exch def
+    [
+	/Rect [ llx lly urx ury ]
+	
+	/Border [ 0 0 0 ]
+
+        /Action
+	    <<
+		/Subtype /URI
+		/URI uri
+	    >>
+        /Subtype /Link
+    /ANN
+    pdfmark
+}
+bind def
+
+% from adobe tech note 5002. 
+/BeginEPSF { %def
+    /b4_Inc_state save def % Save state for cleanup
+    /dict_count countdictstack def % Count objects on dict stack
+    /op_count count 1 sub def % Count objects on operand stack
+    userdict begin % Push userdict on dict stack
+    /showpage { } def % Redefine showpage, { } = null proc
+    0 setgray 0 setlinecap % Prepare graphics state
+    1 setlinewidth 0 setlinejoin
+    10 setmiterlimit [ ] 0 setdash newpath
+    /languagelevel where % If level not equal to 1 then
+    {pop languagelevel % set strokeadjust and
+    1 ne % overprint to their defaults.
+      {false setstrokeadjust false setoverprint
+      } if
+    } if
+} bind def
 
-	b neg d neg moveto
-	b w add 0 rlineto
-	0 d h add rlineto
-	b w add neg 0 rlineto
-	0 d h add neg rlineto
+/EndEPSF { %def
+  count op_count sub {pop} repeat % Clean up stacks
+  countdictstack dict_count sub {end} repeat
+  b4_Inc_state restore
+} bind def 
 
-	currentdict /testing known {
-		%% outline only, for testing:
+/stroke_and_fill {
+	gsave
 		stroke
-	}{
-		closepath gsave stroke grestore fill
-	} ifelse
+	grestore
+	fill
 } bind def
 
-% Nice beam with rounded corners
-% FIXME: linewidth hardcoded.  check: too round?
-/draw_beam % slope width thick 
-{
-	%% FIXME: hardcoded
-	currentdict /testing known {
-		%% real thin lines for testing
-		/blot 0.005 def
-	}{
-		/blot blot-diameter def
-	} ifelse
-	blot setlinewidth
+/vector_add { % x1 y1 x2 y2 vector_add x1+x2 y1+y2
+	exch
+	4 1 roll
+	add
+	3 1 roll
+	add
+	exch
+} bind def
 
- 	0 setlinecap
+/draw_round_box % width height x y blot
+{
+	setlinewidth % w h x y
+	0 setlinecap
 	1 setlinejoin
 
-	blot 2 mul sub /t exch def
-	blot 2 mul sub /w exch def
-	w mul /h exch def
+	rmoveto % w h
+	currentpoint % w h x1 y1
+	4 2 roll % x1 y1 w h
+	4 copy
+	rectfill
+	rectstroke
+} bind def
 
-	blot t 2 div neg moveto
-	w h rlineto
-	0 t rlineto
-	w neg h neg rlineto
-	0 t neg rlineto
+/draw_polygon % fill? x(n) y(n) x(n-1) y(n-1) ... x(0) y(0) n blot
+{
+	setlinewidth %set to blot
 
-	currentdict /testing known {
-		%% outline only, for testing:
-		stroke
+	0 setlinecap
+	1 setlinejoin
+
+	3 1 roll
+	/polygon_x
+	currentpoint
+	/polygon_y exch def
+	def
+	rmoveto % x(0) y(0)
+	{ polygon_x polygon_y vector_add lineto } repeat % n times
+	closepath 
+	{ %fill?
+		stroke_and_fill
 	}{
-		closepath gsave stroke grestore fill
+		stroke
 	} ifelse
-} bind def 
+} bind def
 
-/draw_repeat_slash % width slope thick
+/draw_repeat_slash % x-width width height draw_repeat_slash
 {
+	2 index % duplicate x-width
 	1 setlinecap
 	1 setlinejoin
-
-	/beamthick exch def
-	/slope exch def
-	/width exch def
-	beamthick beamthick slope div euclidean_length
-	  /xwid exch def 
-	0 0 moveto
-	xwid 0  rlineto
-	width slope width mul rlineto
-	xwid neg 0 rlineto
-      %  width neg width angle sin mul neg rlineto
+	
+	  0  rlineto % x-width 0
+	     rlineto % width height
+	neg 0 rlineto % -x-width 0
 	closepath fill
 } bind def
 
-/draw_hairpin % width start_h end_h thick
+% this is for drawing slurs and barre-indicators.
+/draw_bezier_sandwich  % thickness controls
 {
-	1 setlinecap
-	1 setlinejoin
-
+	gsave
+	currentpoint translate
+    % round ending and round beginning
+    1 setlinejoin 1 setlinecap
 	setlinewidth
-	/end_h exch def 
-	/start_h exch def
-	/wid exch def
-	0 start_h moveto
-	wid end_h lineto
-	stroke
-	0 start_h neg moveto
-	wid end_h neg lineto
-	stroke
+	moveto
+	curveto
+	lineto
+	curveto
+	closepath
+	stroke_and_fill
+	grestore
 } bind def
 
-/draw_tuplet % height gap dx dy thick dir 
-{ 
-	1 setlinecap 
-	1 setlinejoin 
-
-	/dir exch def 
-	setlinewidth 
-	/tuplet_dy exch def 
-	/tuplet_dx exch def 
-	/tuplet_gapx exch def 
-	/tuplet_h exch def 
-	tuplet_dy tuplet_dx div tuplet_gapx mul /tuplet_gapy exch def 
-
-
-	0 tuplet_h neg dir mul moveto 
-	0 0 lineto  
-	tuplet_dx tuplet_gapx sub 2 div  
-		tuplet_dy tuplet_gapy sub 2 div  lineto 
-	tuplet_dx tuplet_gapx add 2 div  
-		tuplet_dy tuplet_gapy add 2 div  moveto 
-	tuplet_dx tuplet_dy lineto 
-	tuplet_dx tuplet_dy tuplet_h dir neg mul add lineto 
-	stroke 
-} bind def 
-
-/draw_ez_ball % ch letter_col ball_col font
+/draw_dot % radius x y draw_dot
 {
-	% font
-	findfont 0.7 scalefont setfont 
-	0.1 setlinewidth
-	0 0 moveto
-	0 setgray
-	0.5 0 0.5 0 360 arc closepath fill stroke
-	% ball_col
-	1 eq {
-		0.01 setlinewidth
-		1 setgray
-		0.5 0 0.4 0 360 arc closepath
-		fill stroke
-	} if 
-	% letter_col
-	setgray
-	% 0.25 is empiric centering. Change to taste
-	0.25 -0.25 moveto
-	% ch
-	show
+	rmoveto
+	currentpoint
+	3 2 roll
+	0 360 arc closepath stroke_and_fill
 } bind def
 
-% Simple, but does it work everywhere?
-% Han-Wen reports that one printer (brand?) at cs.uu.nl chokes on this,
-% reverted for now -- jcn
-%
-% The filled circles are drawn by setting the linewidth
-% to 2*radius and drawing a point.
-/simple_draw_ez_ball % ch letter_col ball_col font
+/draw_circle % filled? radius thickness draw_circle
 {
-	% font
-	findfont 0.85 scalefont setfont
-	/origin { 0.45 0 } def
-	0 setgray
-	1.1 setlinewidth
-	origin moveto
-	origin lineto stroke
-	% ball_col
- 	setgray
-	0.9 setlinewidth
-	origin moveto
-	origin lineto stroke
-	% letter_col
-	setgray
-	% 0.25 is empiric centering. Change to taste
-	origin moveto
-	-0.28 -0.30 rmoveto
-	% ch
-	show
+	setlinewidth	% f? r
+	currentpoint	% f? r x0 y0
+	3 2 roll	% f? x0 y0 r
+	dup 0 rmoveto
+	0 360 arc closepath
+		{ stroke_and_fill } 
+		{ stroke }
+	ifelse
 } bind def
 
-/draw_volta % h w thick vert_start vert_end 
-{ 
-	1 setlinecap 
-	1 setlinejoin 
-
-	/vert_end exch def 
-	/vert_start exch def 
-	setlinewidth 
-	/volta_w exch def 
- 	/volta_h exch def 
-	vert_start 0 eq { 
-		0 0 moveto 
-		0 volta_h lineto 
-	} if 
-	0 volta_h moveto 
-	volta_w volta_h lineto 
-	vert_end 0 eq { 
-		volta_w 0 lineto 
-	} if 
-	stroke 
-} bind def 
-
-% this is for drawing slurs. 
-/draw_bezier_sandwich  % thickness controls 
-{ 
-	setlinewidth 
-	moveto 
-	curveto 
-	lineto 
-	curveto 
-	gsave 
-	fill 
-	grestore 
-	stroke 
-} bind def 
-
-/draw_dashed_line % dash thickness dx dy
-{ 
-	1 setlinecap 
-	1 setlinejoin 
-	setdash 
-	setlinewidth 
-	0 0 moveto
-	lineto
-	stroke 
-} bind def 
-
-/draw_dashed_slur % dash thickness controls
-{ 
-	1 setlinecap 
-	1 setlinejoin 
-	setdash 
-	setlinewidth 
-	8 -2 roll 
-	moveto 
-	curveto 
-	stroke 
-} bind def 
-
-
-
-/bracket_traject 
-{ 
-	/traject_ds exch def 
-	/traject_alpha exch def 
-	traject_ds traject_alpha sin mul add 
-	exch 
-	traject_ds traject_alpha cos mul add 
-	exch 
-} bind def 
-
-
-
-/half_bracket
-{ 
-%6 
-	0 0 
-%5a 
-	bracket_thick arch_height add half_height arch_thick sub arch_width add 
-	arch_angle arch_height -0.15 mul bracket_traject 
-%5b 
-	bracket_thick 0.5 mul half_height 
-	0 arch_height 0.5 mul bracket_traject 
-%5c 
-	0 half_height 
-%4a 
-	bracket_thick half_height arch_thick sub 
-	0 arch_height 0.4 mul bracket_traject 
-%4b 
-	bracket_thick arch_height add half_height arch_thick sub arch_width add 
-	arch_angle arch_height -0.25 mul bracket_traject 
-%4c 
-	bracket_thick arch_height add half_height arch_thick sub arch_width add 
-%3 
-	bracket_thick half_height arch_thick sub 
-%2 
-	bracket_thick 0 
-%1 
-	0 0 
-} bind def 
+/draw_oval % filled? x-radius y-radius thickness draw_ellipse
+{
+  setlinewidth % f? x-r y-r
+  /yrad exch def
+  /xrad exch def
+  xrad 0 rmoveto
+  0 yrad -2 xrad mul dup yrad exch 0 rcurveto
+  0 yrad neg dup 2 xrad mul dup 3 1 roll 0 rcurveto
+  closepath
+      { stroke_and_fill}
+      { stroke }
+  ifelse
+} bind def
 
-/draw_half_bracket { 
-	moveto 
-	lineto 
-	lineto 
-	curveto 
-	curveto 
-	lineto 
-	gsave 
-	fill 
-	grestore 
-} bind def 
+/draw_ellipse % filled? x-radius y-radius thickness draw_ellipse
+{
+  setlinewidth % f? x-r y-r
+  /savematrix matrix currentmatrix def
+  scale % f?
+  currentpoint
+  1 0 rmoveto
+  1 0 360  arc closepath
+  savematrix setmatrix
+             { stroke_and_fill}
+             { stroke }
+  ifelse
+} bind def
 
-/draw_bracket % arch_angle arch_width arch_height bracket_height arch_thick bracket_thick
-{ 
-	% urg
+/draw_line % dx dy x1 y1 thickness draw_line
+{
+	setlinewidth % dx dy x1 y1
+	1 setlinecap
+	1 setlinejoin
+	rmoveto % dx dy
+	rlineto
+	stroke
+} bind def
 
-	/bracket_thick exch def
-	/arch_thick exch def
-	/bracket_height exch def
-	/arch_height exch def
-	/arch_width exch def
-	/arch_angle exch def
+/draw_dashed_line % dx dy thickness dashpattern offset draw_dashed_line
+{
+	1 setlinecap
+	1 setlinejoin
+	setdash % dx dy thickness
+	setlinewidth %dx dy
+	rlineto
+	stroke
+	[] 0 setdash % reset dash pattern
+} bind def
 
-	bracket_height 2 div bracket_thick add /half_height exch def 
-	bracket_thick 0.5 mul setlinewidth
-	1 setlinecap 
-	1 setlinejoin 
-	half_bracket 
-	20 copy 
-	1 -1 scale 
-	draw_half_bracket 
-	stroke 
-	1 -1 scale 
-	draw_half_bracket 
-	stroke 
-} bind def 
+/draw_dashed_slur % controls thickness dash
+{
+gsave
+	currentpoint translate
+	1 setlinecap
+	1 setlinejoin
+	setdash
+	setlinewidth
+	8 2 roll
+	moveto
+	curveto
+	stroke
+grestore
+} bind def
 
+/print_glyphs % dx dy glyph print_glyphs
+{
+	{
+		currentpoint %dx dy glyph x0 y0
+		3 2 roll %dx dy x0 y0 glyph
+		glyphshow % dx dy x0 y0
+		moveto % dx dy
+		rmoveto
+	}repeat
+}bind def
+%end music-drawing-routines.ps