From 9e90e53ba3a141e1e4f4a32ccaa7b36b0daecf1a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 17 Mar 1999 17:02:12 +0100 Subject: [PATCH] patch::: 1.1.35.jcn1: ps fixes -- huh? pl 35.jcn1 - some ps fixes --- Documentation/faq.yo | 27 ++++++++++++++++++++----- NEWS | 3 +++ TODO | 6 +++--- VERSION | 2 +- aclocal.m4 | 15 ++++++++++++++ buildscripts/ps-to-pfa.py | 12 ++++++----- config.make.in | 2 ++ mf/GNUmakefile | 2 ++ ps/lilyponddefs.ps | 9 +++++---- scm/lily.scm | 8 ++++---- stepmake/NEWS | 4 ++++ stepmake/VERSION | 2 +- stepmake/aclocal.m4 | 15 ++++++++++++++ stepmake/config.make.in | 2 ++ stepmake/stepmake/metapost-rules.make | 3 ++- stepmake/stepmake/metapost-targets.make | 6 +++--- 16 files changed, 91 insertions(+), 27 deletions(-) diff --git a/Documentation/faq.yo b/Documentation/faq.yo index b7278b5206..ea2e567fe0 100644 --- a/Documentation/faq.yo +++ b/Documentation/faq.yo @@ -391,14 +391,31 @@ previous fonts, including the file(.pk) and file(.tfm) fonts in file(/var/lib/texmf). A script automating this has been included, see file(buildscripts/clean-fonts.sh). + question(How does PS output work?) -Make Type-1 fonts: issue +itemize( +it() Generate the PostScript Type-3 fonts. In the file(mf/) +subdirectory, issue: +verb( + make pfa +) +it() Run lilypond with option tt(-f ps): +verb( + lilypond -fps foo.ly +) +it() To view the file(.ps) output with GhostView, set GS_FONTPATH to the +directory containing the pfas. In the source tree, this is file(mf/out/), +i.e. do something like: verb( - make pfa -) in the mf/ subdirectory -Set GS_FONTPATH to the directory containing the pfas. In the source -tree, this is file(mf/out/). Run lilypond with option tt(-f ps). + export GS_FONTPATH=$HOME/usr/src/lilypond/mf/out + gv foo.ps & +) +) + +Direct PS output is still experimental. For creating nice looking ps +output, use TeX() and code(dvips). + question(The beams and slurs are gone if use the XDvi magnifying glass!?) diff --git a/NEWS b/NEWS index c750a49d46..8f707c6969 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +pl 35.jcn1 + - some ps fixes + pl 35 pl 34.hwn2 diff --git a/TODO b/TODO index 3df133a7cd..029a6293d7 100644 --- a/TODO +++ b/TODO @@ -439,12 +439,12 @@ with a broadcast/acknowledge process. So the best way of handling this, is -* supporting dynamic settings in Audio_note +- supporting dynamic settings in Audio_note -* mimicking the broadcast/acknowledge mechanism of the Engravers in +- mimicking the broadcast/acknowledge mechanism of the Engravers in the Performers -* using that mechanism to write a Dynamics_performer that will modify +- using that mechanism to write a Dynamics_performer that will modify any notes it finds to set appropriate strengths. You could also kludge this by deriving from Performer_group_performer diff --git a/VERSION b/VERSION index 487d616ca1..187c9b2400 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=35 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index 0dedb26ffd..0a8f9d46b4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -503,6 +503,7 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ AC_DEFUN(AC_STEPMAKE_TEXMF, [ # urg, never know what names these teTeX guys will think up + AC_CHECK_PROGS(METAFONT, mf, no) if test "x$METAFONT" = "xno"; then AC_CHECK_PROGS(MFONT, mfont, -echo no mf or mfont) @@ -515,8 +516,22 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ METAPOST=$MPOST fi + AC_CHECK_PROGS(INIMETAFONT, inimf, no) + if test "x$INIMETAFONT" = "xno"; then + AC_CHECK_PROGS(INIMFONT, inimfont, -echo no inimf or inimfont) + INIMETAFONT=$INIMFONT + fi + + AC_CHECK_PROGS(INIMETAPOST, inimp, no) + if test "x$INIMETAPOST" = "xno"; then + AC_CHECK_PROGS(INIMPOST, inimpost, -echo no inimp or inimpost) + INIMETAPOST=$INIMPOST + fi + AC_SUBST(METAFONT) AC_SUBST(METAPOST) + AC_SUBST(INIMETAFONT) + AC_SUBST(INIMETAPOST) ]) AC_DEFUN(AC_STEPMAKE_WARN, [ diff --git a/buildscripts/ps-to-pfa.py b/buildscripts/ps-to-pfa.py index 33ee75ddec..2bbd2813da 100644 --- a/buildscripts/ps-to-pfa.py +++ b/buildscripts/ps-to-pfa.py @@ -85,9 +85,9 @@ def header (f): '/FontMatrix [.001 0 0 .001 0 0] def\n' '%%/FontMatrix [.01 0 0 .01 0 0] def\n' '%%/FontMatrix [0.1 0 0 0.1 0 0] def\n' -'%% /FontBBox [-1000 -1000 1000 1000] def\n' -' /FontBBox [-3000 -3000 3000 3000] def\n' -'%% /FontBBox [-300 -300 300 300] def\n' +'%%/FontBBox [-1000 -1000 1000 1000] def\n' +'/FontBBox [-3000 -3000 3000 3000] def\n' +'%%/FontBBox [-300 -300 300 300] def\n' '%%/FontBBox [-30 -30 30 30] def\n' '\n' '/Encoding 256 array def %% Trivial encoding vector\n' @@ -97,9 +97,11 @@ def footer (f): f.write ('\n' '/BuildGlyph { % Stack contains: font charname\n' '% 1000 0 % Width\n' +'% -1000 -1000 1000 1000 % Bounding Box\n' '% -750 -750 750 750 % Bounding Box\n' -' 3000 0 % Width\n' -' -3000 -3000 3000 3000 % Bounding Box\n' +'% -750 -750 750 750 % Bounding Box\n' +' 3000 0 % Width\n' +' -3000 -3000 3000 3000 % Bounding Box\n' '% 300 0 % Width\n' '% -300 -300 300 300 % Bounding Box\n' '% 30 0 % Width\n' diff --git a/config.make.in b/config.make.in index 8eef00972f..841d5e28d1 100644 --- a/config.make.in +++ b/config.make.in @@ -46,6 +46,8 @@ BASH = @BASH@ BISON = @BISON@ FIND = @FIND@ FLEX = @FLEX@ +INIMETAFONT = @INIMETAFONT@ +INIMETAPOST = @INIMETAPOST@ LN = @LN@ LN_S = @LN_S@ METAFONT = @METAFONT@ diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 3c04833f44..2566a2f5f7 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -39,3 +39,5 @@ default: $(ALL_GEN_FILES) $(outdir)/%.afm $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(PYTHON) $(buildscripts)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(string (list kern width height depth)) + (define (filledbox breapth width depth height) + (string-append (numbers->string (list breapth width depth height)) "draw_stem" )) ;; obsolete? @@ -449,8 +449,8 @@ (clear-fontcache) "\nstart_line {\n")) - (define (stem kern width height depth) - (string-append (numbers->string (list kern width height depth)) + (define (stem breapth width depth height) + (string-append (numbers->string (list breapth width depth height)) "draw_stem" )) (define (stop-line) diff --git a/stepmake/NEWS b/stepmake/NEWS index cfc9576c3e..480f8a8cd2 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,3 +1,7 @@ +pl 72 + - bf: mfplain dependency + - inimf, inimf checking (sigh) + pl 71 - bf: c-tags - yodl: groff, ditroff diff --git a/stepmake/VERSION b/stepmake/VERSION index 833861a630..df407f27e3 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=71 +PATCH_LEVEL=72 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index cf7c1a686e..c9e042c0e5 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -501,6 +501,7 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ AC_DEFUN(AC_STEPMAKE_TEXMF, [ # urg, never know what names these teTeX guys will think up + AC_CHECK_PROGS(METAFONT, mf, no) if test "x$METAFONT" = "xno"; then AC_CHECK_PROGS(MFONT, mfont, -echo no mf or mfont) @@ -513,8 +514,22 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ METAPOST=$MPOST fi + AC_CHECK_PROGS(INIMETAFONT, inimf, no) + if test "x$INIMETAFONT" = "xno"; then + AC_CHECK_PROGS(INIMFONT, inimfont, -echo no inimf or inimfont) + INIMETAFONT=$INIMFONT + fi + + AC_CHECK_PROGS(INIMETAPOST, inimp, no) + if test "x$INIMETAPOST" = "xno"; then + AC_CHECK_PROGS(INIMPOST, inimpost, -echo no inimp or inimpost) + INIMETAPOST=$INIMPOST + fi + AC_SUBST(METAFONT) AC_SUBST(METAPOST) + AC_SUBST(INIMETAFONT) + AC_SUBST(INIMETAPOST) ]) AC_DEFUN(AC_STEPMAKE_WARN, [ diff --git a/stepmake/config.make.in b/stepmake/config.make.in index 442d65c0a4..f3fcccab6e 100644 --- a/stepmake/config.make.in +++ b/stepmake/config.make.in @@ -45,6 +45,8 @@ BASH = @BASH@ BISON = @BISON@ FIND = @FIND@ FLEX = @FLEX@ +INIMETAFONT = @INIMETAFONT@ +INIMETAPOST = @INIMETAPOST@ LN = @LN@ LN_S = @LN_S@ METAFONT = @METAFONT@ diff --git a/stepmake/stepmake/metapost-rules.make b/stepmake/stepmake/metapost-rules.make index 4cd6423483..cddbaf88c5 100644 --- a/stepmake/stepmake/metapost-rules.make +++ b/stepmake/stepmake/metapost-rules.make @@ -4,8 +4,9 @@ $(outdir)/%.pfa: %.mf # i've got no idea what this scaling could be for, on both sides... # it seems that 'low_res', which should be all we ever need according # to the metapost mfplain guru, really does 200dpi, iso 600dpi (minimun) - -$(METAPOST) "&mfplain \mode=lowres; \mag=100.0; batchmode; input $<" # -$(METAPOST) "&mfmp \mode=ljfour; \mag=100.0; batchmode; input $<" +# -$(METAPOST) "&mfplain \mode=lowres; \mag=100.0; batchmode; input $<" + -$(METAPOST) "&mfplain \mode=lowres; \mag=30.0; batchmode; input $<" $(PYTHON) $(depth)/buildscripts/ps-to-pfa.py $< rm -f $(basename $(@F)).[0-9]* rm -f $(basename $<).log $(basename $<).tfm diff --git a/stepmake/stepmake/metapost-targets.make b/stepmake/stepmake/metapost-targets.make index cf632d9de1..fb013f244f 100644 --- a/stepmake/stepmake/metapost-targets.make +++ b/stepmake/stepmake/metapost-targets.make @@ -1,5 +1,5 @@ -pfa: $(PFA_FILES) mfplain.mem +pfa: mfplain.mem $(PFA_FILES) -mfplain.mem: - inimpost mfplain.ini +mfplain.mem: mfplain.ini + $(INIMETAPOST) mfplain.ini -- 2.39.2