* scm/stencil.scm (fontify-text): reinstate function

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 7431bce28df601b951177c7cc1c9351651cb32b3..a3b89c602048cd96cd64b9f079aa1204d459c86c 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -18,32 +18,25 @@
 #include <libintl.h>
 #endif
 
-#include "lily-guile.hh"
-#include "lily-version.hh"
 #include "all-font-metrics.hh"
+#include "file-name.hh"
+#include "file-path.hh"
 #include "getopt-long.hh"
+#include "global-ctor.hh"
+#include "kpath.hh"
+#include "lily-guile.hh"
+#include "lily-version.hh"
+#include "main.hh"
+#include "midi-def.hh"
 #include "misc.hh"
+#include "paper-def.hh"
 #include "string.hh"
-#include "main.hh"
-#include "file-path.hh"
-#include "input-file-results.hh"
 #include "warn.hh"
-#include "lily-guile.hh"
-#include "paper-def.hh"
-#include "midi-def.hh"
-#include "global-ctor.hh"
-#include "kpath.hh"
 
 /*
  * Global options that can be overridden through command line.
  */
 
-/* Write dependencies file? */
-bool dependency_global_b = false;
-
-/* Prepend to dependencies */
-String dependency_prefix_global;
-
 /* Names of header fields to be dumped to a separate file. */
 Array<String> dump_header_fieldnames_global;
 
@@ -135,10 +128,8 @@ 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, "dependencies", 'M',  _i ("write Makefile dependencies")},
     {0, "no-paper", 'm',  _i ("produce MIDI output only")},
     {_i ("FILE"), "output", 'o',  _i ("write output to FILE")},
-    {_i ("DIR"), "dep-prefix", 'P',  _i ("prepend DIR to dependencies")},
     {0, "safe-mode", 's',  _i ("run in safe mode")},
     {0, "version", 'v',  _i ("print version number")},
     {0, "verbose", 'V', _i ("be verbose")},
@@ -221,7 +212,7 @@ setup_paths ()
   if (char const *lilypond_prefix = getenv ("LILYPONDPREFIX"))
     prefix_directory[1] = lilypond_prefix;
 
-  global_path.add ("");
+  global_path.append ("");
 
   /* Adding mf/out make lilypond unchanged source directory, when setting
      LILYPONDPREFIX to lilypond-x.y.z */
@@ -261,7 +252,6 @@ main_with_guile (void *, int, char **)
       prepend_load_path (String (prefix_directory[i]) + "/scm");
     }
 
-
   if (verbose_global_b)
     dir_info (stderr);
 
@@ -280,11 +270,10 @@ main_with_guile (void *, int, char **)
 
   SCM files = SCM_EOL;
   SCM *tail = &files;
-  bool first = true;
   while (char const *arg = option_parser->get_next_arg ())
     {
       *tail = scm_cons (scm_makfrom0str (arg), SCM_EOL);
-      tail = SCM_CDRLOC(*tail);
+      tail = SCM_CDRLOC (*tail);
     }
   delete option_parser;
   option_parser = 0;
@@ -292,19 +281,17 @@ main_with_guile (void *, int, char **)
   if (files == SCM_EOL)
     {
       /* No FILE arguments is now a usage error to help newbies.  If you
-     want a filter, you're not a newbie and should know to use file
-     argument `-'.  */
+        want a filter, you're not a newbie and should know to use file
+        argument `-'.  */
       usage ();
       exit (2);
     }
 
-  SCM result = scm_call_1 (ly_scheme_function ("lilypond-main"),
-                          files);
+  SCM result = scm_call_1 (ly_scheme_function ("lilypond-main"), files);
+  (void) result;
 
 
-  /*
-    unreachable.
-   */
+  /* Unreachable.  */
   exit (0);
 }
 
@@ -331,7 +318,7 @@ parse_argv (int argc, char **argv)
 {
   bool help_b = false;
   option_parser = new Getopt_long (argc, argv, options_static);
-  while (Long_option_init const * opt = (*option_parser) ())
+  while (Long_option_init const *opt = (*option_parser) ())
     {
       switch (opt->shortname_char_)
        {
@@ -342,10 +329,10 @@ parse_argv (int argc, char **argv)
        case 'o':
          {
            String s = option_parser->optional_argument_str0_;
-           Path p = split_path (s);
-           if (s != "-" && p.ext.is_empty ())
-             p.ext = output_format_global;
-           output_name_global = p.to_string ();
+           File_name file_name (s);
+           if (s != "-" && file_name.ext_.is_empty ())
+             file_name.ext_ = output_format_global;
+           output_name_global = file_name.to_string ();
          }
          break;
        case 'e':
@@ -364,15 +351,12 @@ parse_argv (int argc, char **argv)
            }
          output_format_global = option_parser->optional_argument_str0_;
          break;
-       case 'P':
-           dependency_prefix_global = option_parser->optional_argument_str0_;
-         break;
        case 'H':
          dump_header_fieldnames_global
            .push (option_parser->optional_argument_str0_);
          break;
        case 'I':
-         global_path.push (option_parser->optional_argument_str0_);
+         global_path.append (option_parser->optional_argument_str0_);
          break;
        case 'i':
          init_name_global = option_parser->optional_argument_str0_;
@@ -386,9 +370,6 @@ parse_argv (int argc, char **argv)
        case 's':
          safe_global_b = true;
          break;
-       case 'M':
-         dependency_global_b = true;
-         break; 
        case 'm':
          no_paper_global_b = true;
          break;