patch::: 1.1.3.jcn2

diff --git a/TODO b/TODO
index ffd01a279742e2d835e921e14df3dc0e149346cb..bba8e78cd50c6f11e15801648101a117fbd9ad8a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -10,8 +10,6 @@ grep for TODO and ugh/ugr/urg
 BUGS:
        * --safe:  disallow backslashes, disallow \include.
 
-       * fix fontsize switching
-
        * fix rounding stuff in number->string
 
        * msgfmt -o check?

diff --git a/VERSION b/VERSION
index 1d931661d62f5c95b6e992f427235800774e35c9..37b932fed7db4fd7b6f2636c0711811fbb275994 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=3
-MY_PATCH_LEVEL=tca1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/init/lily.scm b/init/lily.scm
index 9c38a76bfa0113f7d3d6e99cd897c7bf6d3665e3..2a4207c60c750893b84c0344d653d3bda979cec0 100644 (file)
--- a/init/lily.scm
+++ b/init/lily.scm
@@ -177,13 +177,12 @@
 (define 
   (font-def o i s) 
   ((invoke-output o "font-def") i s))
-;  (empty o))
 
 (define 
   (font-def-ps i s)
   (string-append
    "\n/" (font i) " {/" 
-   (substring s 0 (- (string-length s) 3))
+   (substring s 0 (- (string-length s) 4))
    " findfont 12 scalefont setfont} bind def\n"))
 
 (define 
@@ -379,15 +378,11 @@
 
 (define 
   (start-line-ps) 
-  (string-append
-   (urg-fix-font-ps)
-   "\nstart_line {\n"))
+   "\nstart_line {\n")
 
 (define 
   (start-line-tex) 
-  (string-append 
-   (urg-fix-font-tex)
-   "\\hbox{%\n"))
+   "\\hbox{%\n")
 
 (define
   (startrepeat o h)
@@ -417,15 +412,4 @@
   (text-tex f s)
   (string-append "\\set" f "{" s "}"))
 
-(define
-  (urg-fix-font-ps)
-  "/fontA { /feta20 findfont 12 scalefont setfont} bind def fontA\n")
-
-(define
-  (urg-fix-font-tex)
-  "\\font\\fontA=feta20.afm\\fontA\n")
-
-(define 
-  (urg-font-switch-ps i)
-  "\n/feta20 findfont 12 scalefont setfont \n")
 

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index bb7d6e3bfb8305e4cda9edbad140c27541e86cd4..c96c48c859ea4f102f863d2b20e85ec5fa464876 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -178,11 +178,11 @@ Paper_outputter::switch_to_font (String fontname)
     {
       current_font_ = fontname;
       int i=0;
-      bool new_b = false;
+      bool new_b = true;
       for (; i< font_arr_.size (); i++)
        if (font_arr_[i] == fontname)
          {
-           new_b = true;
+           new_b = false;
            break;
          }
 

diff --git a/stepmake/stepmake/package.make b/stepmake/stepmake/package.make
index 303bc8f0df3378a8a1fede219315cec1893aea94..01a06871f449851c95210f460bc32f647bc177f2 100644 (file)
--- a/stepmake/stepmake/package.make
+++ b/stepmake/stepmake/package.make
@@ -17,7 +17,8 @@ deb:
          dpkg-buildpackage -b; \
        )'
 
-makeflags=$(patsubst %==, %, $(patsubst %----,%,$(MAKEFLAGS:%=--%)))
+# makeflags=$(patsubst %==, %, $(patsubst %----,%,$(MAKEFLAGS:%=--%)))
+makeflags=$(patsubst %==, %, $(patsubst ----%,%,$($(MAKEFLAGS:%=--%):--unix=)))
 
 diff:
        $(PYTHON) $(step-bindir)/package-diff.py --package=$(topdir) $(makeflags)