lilypond-1.1.5

diff --git a/Documentation/man/mudela-book.yo b/Documentation/man/mudela-book.yo
index a3e854d892ee8cc56dc0ae1f93c47c0b24fee61a..b636b5e7e5b367b045d0accd415b20770124487c 100644 (file)
--- a/Documentation/man/mudela-book.yo
+++ b/Documentation/man/mudela-book.yo
@@ -16,11 +16,25 @@ manpagename(mudela-book)(integrate LaTeX and mudela)
 manpagesynopsis() bf(mudela-book) [options] inputfile
 
 manpagedescription() file(mudela-book) is a script that helps
-integrating mudela and LaTeX().  mudela-book runs LilyPond on
+integrating mudela and LaTeX.  mudela-book runs LilyPond on
 fragments of mudela in your source file, and includes the results into
-document that can be processed with LaTeX().  The result is a text
+document that can be processed with LaTeX.  The result is a text
 document with formatted music integrated.
 
+Lilypond will create a directory to put temporary files, the default
+dir name is file(out). When you run mudela on a file, like this:
+
+verb(mudelab-book myfile.tex)
+
+the a file file(out/myfile.latex) will be created. And to create
+the file(.dvi) file you should type:
+
+verb(latex out/myfile.latex)
+
+This will create file(myfile.dvi) in the current directory. Bad things
+will happen if you cd to file(out) and then runs verb(latex myfile.latex)
+
+bf(About the input)
 
 If the file contains the ``block''
 
@@ -32,7 +46,11 @@ verb(
 
 then LilyPond is run on CONTENTS.  mudela-book puts the result back,
 surrounded by code(\preMudelaExample) and code(\postMudelaExample)
-commands. The code(\begin) takes the following options:
+commands. code(\preMudelaExample) and code(posMudelaExample) is
+defined to nothing by default, and the user can redefine them
+to whatever he wants.
+
+code(\begin) takes the following options:
 
 description(
 dit(floating)
@@ -47,6 +65,7 @@ dit(11pt, 13pt, 16pt, 20pt, 26pt)
     set the fontsize to use for the music
 )
 
+
 manpageoptions()
 
 startdit()
@@ -63,9 +82,11 @@ the output name derived from the input name.
 dit(--outdir)
     The directory to output lilypond output and input to.
 dit(--help)
-       print a short help message
+       Print a short help message
 dit(--dependencies)
-        write dependencies to outdir/filname.dep
+        Write dependencies to outdir/filename.dep
+dit(--force-verbatim)
+       Make all mudela verbatim.
 enddit()
 
 manpagefiles()

diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh
index dcf0a9819dc7e7806e22b48a331b59584ec05ce4..fcb608efe340759393607aceb3be86d674457609 100644 (file)
--- a/lily/include/midi-def.hh
+++ b/lily/include/midi-def.hh
@@ -36,7 +36,7 @@ public:
   void print() const;
   void set_tempo (Moment moment, int count_per_minute_i);
   virtual int get_next_default_count () const;
+  static void reset_default_count();
 };
 
 #endif // MIDI_DEF_HH
-

diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh
index 0ae3a6981e6ca00c3403cb2936897163a46bd7f2..4195ca77f9d88ed1b65b18cf686e81af3223e9ea 100644 (file)
--- a/lily/include/paper-def.hh
+++ b/lily/include/paper-def.hh
@@ -91,6 +91,7 @@ public:
   Real arithmetic_constant (Moment minimal_mom) const;
   Real arithmetic_spacing (Moment mom,Real constant) const;
   virtual int get_next_default_count () const;
+  static void reset_default_count();
 
   void output_settings (Paper_outputter*) const;
   Paper_outputter* paper_outputter_p (Paper_stream*, Scope*, String) const;
@@ -102,4 +103,3 @@ public:
 };
 
 #endif // Paper_def_HH
-

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 202205d0899524a71a60fd9cf34cb54d1d4ccd11..275939aa4ec4117e1f1a55c2b54063d6c475d85b 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -76,3 +76,9 @@ Midi_def::get_next_default_count () const
 {
   return default_count_i_++;
 }
+
+void
+Midi_def::reset_default_count ()
+{
+  default_count_i_ = 0;
+}

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index e597ce1f3cec6c2489f744536f45c4a5868f8689..863e1593ced326e6c3ce816790b0ed97f6642841 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -218,6 +218,12 @@ Paper_def::get_next_default_count () const
   return default_count_i_ ++;
 }
 
+void
+Paper_def::reset_default_count()
+{
+  default_count_i_ = 0;
+}
+
 //urg
 extern char const* lily_version_number_sz ();
 

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 0618479ff278246348401b86cceed50e99b514ab..3185ce5ff3036bcfc42911c5aa3fb828d6d6a4de 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -146,11 +146,13 @@ Paper_outputter::output_scheme (SCM scm)
          FILE *file = fdopen (fd, "a");
          port = scm_standard_stream_to_port (file, "a", "");
          scm_display (gh_str02scm ("(load 'lily.scm)\n"), port);
+         scm_display (gh_str02scm ("(define (of) 'ps)\n"), port);
+         scm_display (gh_str02scm ("(define (of) 'tex)\n"), port);
        }
 
       scm_display (gh_str02scm ("(display ((eval "), port);
       scm_write (scm, port);
-      scm_display (gh_str02scm (") 'tex))\n"), port);
+      scm_display (gh_str02scm (") (of)))\n"), port);
       scm_newline (port);
       scm_fflush (port);
 

diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps
index 862bc2031b004ad67fdc9948351868ef82311f31..48b4bfb7b7f883b57b42d245ab448500a5a4f0fb 100644 (file)
--- a/ps/lilyponddefs.ps
+++ b/ps/lilyponddefs.ps
@@ -19,6 +19,11 @@
        grestore
 } bind def
 
+/setbold % '(' text ')'
+{
+       settext
+} bind def
+ 
 /settext % '(' text ')'
 {
        gsave
@@ -158,8 +163,8 @@
        yoffset staffheight 8 mul sub /yoffset exch def
 } bind def
 
-/unknown { (U) show} bind def
-/empty {(E) show} bind def
+/unknown { (U) setbold } bind def
+/empty { (E) setbold } bind def
 
 /turnOnExperimentalFeatures { } bind def