remove TEXMF from variables.

remove DEB_BUILD pk font variables.
remove GUILE_LOAD_PATH
remove TeX memory vars.

diff --git a/ChangeLog b/ChangeLog
index b336a8fffd4c4c01f1420aadcbf16ea26e81c76e..0353412ab4f435cefd58af03cf14a7dabb86fd98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-04  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * make/lilypond-vars.make: remove TEXMF from variables.
+       remove DEB_BUILD pk font variables.
+       remove GUILE_LOAD_PATH
+       remove TeX memory vars.
+
 2005-04-04  Werner Lemberg  <wl@gnu.org>
 
        * lilypond/scm-option.cc (ly_option_usage): Add final newline.

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index cdd3292b7435e458ce9d712a8d697fbad0c53aac..1ce3e294e8e20b94c6ef4d177cbd6a5084584e74 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -142,7 +142,7 @@ the looks of a piece of music, so nitpicking about typographical details
 may seem academical.  But it is not.  In larger pieces with monotonous
 rhythms, spacing corrections lead to subtle variations in the layout
 of every line, giving each one a distinct visual signature.  Without
-this signature all lines would look the same, and they become like a
+`this signature all lines would look the same, and they become like a
 labyrinth.  If a musician looks away once or has a lapse in
 concentration, the lines might lose their place on the page.
 

diff --git a/lily/grob.cc b/lily/grob.cc
index 6b17b356b793b701767d0559ea9dc41ae48a8fc6..ea8c1a5609dea115639765c6cb0e110acc960444 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -240,7 +240,6 @@ Grob::get_uncached_stencil () const
        stil = Stencil (m->extent_box (), SCM_EOL).smobbed_copy ();
       else
        {
-         
          SCM expr = m->expr ();
          if (point_and_click_global)
            expr = scm_list_3 (ly_symbol2scm ("grob-cause"), self_scm (), expr);

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index d9946a8914baddab69e0d54e884da51ed60516e1..64a1fe7f39c0350d97e0842fb62675124aa89a3e 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,33 +1,12 @@
 ##
 ## settings to run LilyPond
 
-
+# environment settings.
 export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(builddir)/scripts/$(outconfbase):$(PATH):
-
-# LilyPond is often run from within $(outdir), making a relative
-# PREFIX incorrect.
 export LILYPONDPREFIX:=$(build_lilypond_datadir)/$(TOPLEVEL_VERSION)
-
 export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
 
-export GUILE_LOAD_PATH:=$(builddir):$(GUILE_LOAD_PATH)
-
-## arg, TEXINPUTS, TFMFONTS, MFINPUTS may still override and thus break this
-export TEXMF:={$(LILYPONDPREFIX),$(shell kpsexpand \$$TEXMF)}
-
-export MFINPUTS:=
-export TEXINPUTS:=
-export TFMFONTS:=
-export extra_mem_top=1000000
-export extra_mem_bottom=1000000
-export pool_size=500000
-
 
-ifdef DEB_BUILD
-export PKFONTS := $(topdir)/mf/out
-export MT_DESTROOT := $(topdir)/mf/out
-export DVIPSMAKEPK := mktexpk --destdir $(topdir)/mf/out
-endif
 
 
 the-script-dir=$(wildcard $(script-dir))