remove -m, --no-layout

diff --git a/ChangeLog b/ChangeLog
index c845d100cbdbb3e2e52ec7d69b8df681a0e5bf1a..faa69bbab4e17e66debc12c86b17fb8e6cbf105e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/main.cc: remove -m, --no-layout
+
+       * flower/include/libc-extension.hh: add ALIAS_FILE_TO_FILECOOKIE
+       to define. We don't want to override fprintf everywhere.
+
 2005-02-26  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * cygwin/lilypond.hint: 

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index c738e3bb3be4bd51615df184d29afdfb0603956d..df6bca6fc778ab3909e089ff5eb9e64556e1c85d 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -208,14 +208,10 @@ r"""%% LilyPond file to list all font symbols and the corresponding names
                ## \musicglyph and \markup require "_" to be escaped
                ## differently
                scm_string = re.sub ('_', r'_', m['name'])
-               tex_string = re.sub ('_', r'\\_' , m['name'])
-
-               ## prevent TeX from interpreting "--" as long dash
-               tex_string = re.sub ('--','-{}-', tex_string)
 
                file.write ('''    \\markup { \\raise #0.75 \\vcenter
              \\musicglyph #"%s"
-             \\typewriter " %s" } 4\n''' % (scm_string, tex_string))
+             \\typewriter " %s" } 4\n''' % (scm_string, scm_string))
 
                if (count % per_line) == 0:
                        file.write ('    \\skip 8 \\break\n')

diff --git a/lily/include/main.hh b/lily/include/main.hh
index dfdd671c4d6b3e9458534651213416d8d08dac3d..f1ac6bc847f3b896756d7c17eeacd0061dd00592 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -27,7 +27,6 @@ extern String init_name_global;
 
 /* options */
 extern Array<String> dump_header_fieldnames_global;
-extern bool skip_layout_global;
 extern String output_backend_global;
 extern String output_name_global;
 extern bool be_safe_global;

diff --git a/lily/main.cc b/lily/main.cc
index e5b6ef1f7a3d2c6be6b4dde7c15e036a63fa8378..ce313b93d17cc05ec35bdd166dc7e0fe0e3854cb 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -40,9 +40,6 @@ Array<String> dump_header_fieldnames_global;
 /* Name of initialisation file. */
 String init_name_global;
 
-/* Do not calculate and write layout output? */
-bool skip_layout_global = false;
-
 /* Selected output format.
    One of tex, ps, scm, as.
 */
@@ -131,7 +128,6 @@ static Long_option_init options_static[] =
     {_i ("FIELD"), "header", 'H',  _i ("write header field to BASENAME.FIELD")},
     {_i ("DIR"), "include", 'I',  _i ("add DIR to search path")},
     {_i ("FILE"), "init", 'i',  _i ("use FILE as init file")},
-    {0, "no-layout", 'm',  _i ("produce MIDI output only")},
     {_i ("FILE"), "output", 'o',  _i ("write output to FILE (suffix will be added)")},
     {0, "preview", 'p',  _i ("generate a preview")},
     {0, "no-pages", 0,  _i ("don't generate full pages")},
@@ -412,9 +408,6 @@ parse_argv (int argc, char **argv)
        case 's':
          be_safe_global = true;
          break;
-       case 'm':
-         skip_layout_global = true;
-         break;
        case 'p':
          make_preview = true;
          break;