lilypond-1.1.1

diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile
index 8b4a15a5d457edcb101f47db9340e47dd0f8158f..6102deb049873953422eb730520ece392c86c9d9 100644 (file)
--- a/Documentation/tex/GNUmakefile
+++ b/Documentation/tex/GNUmakefile
@@ -4,6 +4,7 @@ depth=../..
 
 DATA_FILES = $(wildcard *.data)
 datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html))
+TEX_FILES = $(wildcard *.tex)
 DOC_FILES = $(wildcard *.doc)
 DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi))
 OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
@@ -11,10 +12,11 @@ OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES))
 # just include me
 YO_URG_FILES = $(wildcard *.yo-urg)
 
+OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES))
 OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES))
 EL_FILES = $(wildcard *.el)
 BIB_FILES= $(wildcard *.bib)
-EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES)
+EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES)
 HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html))
 PS_FILES = $(DVI_FILES:.dvi=.ps)
 
@@ -54,9 +56,9 @@ $(outdir)/glossary.dvi: $(outdir)/glossary-table.tex
 $(outdir)/glossary.html: $(outdir)/glossary-table.html
 
 
-local-WWW: $(HTML_FILES) $(OUTDOC_FILES:.doc=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles)
+local-WWW: $(HTML_FILES) $(OUTDOC_FILES:.doc=.ps.gz) $(OUTTEX_FILES:.tex=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles)
        $(PYTHON) $(step-bindir)/ls-latex.py --package=$(topdir) --title 'LaTeX documents about LilyPond' \
-         $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) \
+         $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) $(TEX_FILES)\
          | sed "s!$(outdir)/!!g" > $(outdir)/index.html
          $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) $(outdir)/index.html
 

diff --git a/Documentation/tex/feta.tex b/Documentation/tex/feta.tex
new file mode 100644 (file)
index 0000000..cf2f881
--- /dev/null
+++ b/Documentation/tex/feta.tex
@@ -0,0 +1,46 @@
+% display all feta chars in a pretty picture
+% GNU LilyPond
+% (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+
+\parindent0pt
+\nopagenumbers
+\newcount\n
+\newcount\i
+
+\font\fetatwenty = feta20
+\font\fetanumber = feta-nummer12
+\font\fetafinger = feta-nummer5
+\font\fetadyn = feta-din10 scaled \magstep 2
+
+\def\setchar#1#2{\hbox to\charwidth{\hss{#1\char#2}}}
+
+\def\charsperline{6}
+\def\charheight{55pt}
+\def\charwidth{60pt}
+
+\def\listfont#1#2#3{
+       \n=#2
+       \advance\n by-1
+       \advance\n by-\charsperline
+        \loop\ifnum\n<#3
+       \advance\n by\charsperline
+       \i=0
+       \vbox to\charheight{\vss\hbox{
+       {\loop\ifnum\i<\charsperline
+       \advance\i by1
+       \advance\n by1
+        {\setchar{#1}{\number\n}}
+       \repeat}}}\repeat}
+
+\listfont{\fetatwenty}{0}{78}
+% urg
+\vskip-\charheight
+\vskip-\charheight
+\listfont{\fetanumber}{48}{58}
+\vskip-\charheight
+\listfont{\fetafinger}{48}{58}
+\vskip-\charheight
+\listfont{\fetadyn}{0}{6}
+\vskip-\charheight
+
+\bye

diff --git a/Documentation/topdocs/PATCHES.yo b/Documentation/topdocs/PATCHES.yo
index 1b20b7c37aa114a5cb1e3a54fb7127939d2df964..b08b7ea4287dce23799d54188addcca15bfcf9fa 100644 (file)
--- a/Documentation/topdocs/PATCHES.yo
+++ b/Documentation/topdocs/PATCHES.yo
@@ -47,7 +47,7 @@ verb(
 which rolls the tarball file(../releases/lilypond-0.1.73.tar.gz)
 and leaves your patch as file(./lilypond-0.1.73.jcn1.diff).
 footnote('Make diff' generates a patch between two tarballs.  For 
-more info type 'make diff help=='.  We assume that there is a tarball 
+more info type 'make diff help=='.)  We assume that there is a tarball 
 file(lilypond-0.1.73.tar.gz) in the directory file(../releases).
 
 

diff --git a/init/paper20.ly b/init/paper20.ly
index cf6e0dbe95a727b9c6f2117c1a9883ac89c43336..226cfb6a7414adfa7e84d1ab4fb259c1adfaed1d 100644 (file)
--- a/init/paper20.ly
+++ b/init/paper20.ly
@@ -19,6 +19,8 @@ paper_twenty = \paper {
         arithmetic_multiplier = 6.\pt;
        texsetting = "\\input lilyponddefs \\musixtwentydefs ";
        pssetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n";
+       % urg, debugging only
+       scmsetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n";
 
        -2 = \symboltables { \table_thirteen }  
        -1 = \symboltables { \table_sixteen }

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 9e2b0978a6af3742b2754520dc6283401f30e793..033fbf3f06dcc24cbdebbeca0bdf21856958e0f0 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -85,8 +85,7 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm)
       if (!i->lambda_)
         {
          // urg
-         i->lambda_ = 
-           ly_append (ly_lambda_o (), 
+         i->lambda_ = ly_append (ly_lambda_o (), 
            ly_list1 (ly_func_o ("empty")));
        }
 
@@ -137,6 +136,15 @@ Paper_outputter::output_scheme (SCM scm)
       gh_display (scm); gh_newline ();
     }
 #endif
+  // urg; temporary hack to debug scheme error #unknown
+  if (String (output_global_ch) == "scm")
+    {
+//      char* c = gh_scm2newstr (scm, NULL);
+//      *outstream_l_ << c << "\n";
+//      free (c);
+       gh_display (scm); gh_newline ();
+      return;
+    }
   SCM str_scm = gh_call1 (ly_eval (scm), gh_eval_str (o.ch_l ()));
   char* c = gh_scm2newstr (str_scm, NULL);
 #ifndef NPRINT