release: 0.1.27

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index efba1f0c296c8ceba3dfef5cc2a51bf306065931..73e4dc087659ac2e8c095d9efe9f4be639f1a34b 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -20,9 +20,10 @@
 #include "debug.hh"
 #include "my-lily-parser.hh"
 
+static bool version_ignore_b = false;
 Sources* source_l_g = 0;
 bool only_midi = false;
-bool version_ignore_b_ = false;
+bool experimental_features_global_b = false;
 int exit_status_i_;
 
 void destill_inname (String &name_str_r);
@@ -31,6 +32,7 @@ Long_option_init theopts[] = {
   {1, "output", 'o'},
   {0, "warranty", 'w'},
   {0, "help", 'h'},
+  {0, "test", 't'},
   {0, "debug", 'd'},
   {1, "init", 'i'},
   {1, "include", 'I'},
@@ -43,7 +45,7 @@ void
 usage()
 {
   cout <<
-    "Usage: lilypond [options] [mudela-file]\n"
+    _("Usage: lilypond [options] [mudela-file]\n"
     "Typeset and or produce midi output from mudela-file or stdin\n"
     "\n"
     "Options:\n"
@@ -53,12 +55,13 @@ usage()
     "  -h, --help             this help\n"
     "  -w, --warranty         show warranty and copyright\n"
     "  -o, --output=FILE      set FILE as default output\n"
+    "  -t, --test             switch on experimental features\n"
     "  -M, --midi             produce midi output only\n"
     "  -V, --ignore-version   ignore mudela version\n"
     "\n"
-    "GNU LilyPond was compiled with the following settings:\n"
+    "GNU LilyPond was compiled with the following settings:\n")
 #ifdef NDEBUG
-    "NDEBUG "  
+    "NDEBUG "
 #endif
 #ifdef NPRINT
     "NPRINT "
@@ -66,20 +69,20 @@ usage()
 #ifdef STRING_UTILS_INLINED
     "STRING_UTILS_INLINED "
 #endif
-    "datadir= " DIR_DATADIR 
+    "datadir= " DIR_DATADIR
 
     "\n";
-       
+
   ;
-  
-  
+
+
 }
 
-void 
+void
 notice()
 {
   cout <<
-    "\n"
+    _("\n"
     "GNU LilyPond -- The GNU Project music typesetter.\n"
     "Copyright 1996,97 by\n"
     "  Han-Wen Nienhuys <hanwen@stack.nl>\n"
@@ -97,7 +100,7 @@ notice()
     "    You should have received a copy (refer to the file COPYING) of the\n"
     "GNU General Public License along with this program; if not, write to\n"
     "the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\n"
-    "USA.\n";
+    "USA.\n");
 }
 
 
@@ -106,23 +109,23 @@ static File_path path;
 void
 do_one_file (String init_str, String file_str)
 {
-  if (init_str && "" == path.find (init_str)) 
+  if (init_str.length_i () && path.find (init_str).empty_b ())
     {
-      error ("Can not find `" + init_str +"\'");
+      error (_("Can not find `") + init_str +"\'");
       return ;
     }
-  if (file_str && !path.find (file_str))
+  if (file_str.length_i () && path.find (file_str).empty_b ())
     {
-      error ("Can not find `" + file_str + "'");
+      error (_("Can not find `") + file_str + "'");
       return ;
     }
-  
+
   Sources sources;
-  source_l_g = &sources; 
+  source_l_g = &sources;
   source_l_g->set_path (&path);
   {
     My_lily_parser parser (source_l_g);
-    parser.set_version_check (version_ignore_b_);
+    parser.set_version_check (version_ignore_b);
     parser.parse_file (init_str, file_str);
     exit_status_i_ |= parser.error_level_i_;
   }
@@ -132,29 +135,32 @@ do_one_file (String init_str, String file_str)
 
 int
 main (int argc, char **argv)
-{    
+{
   debug_init();                // should be first
 
 
   // must override (come before) "/usr/local/share/lilypond"!
   char const * env_l=getenv ("LILYINCLUDE");
-  if (env_l) 
+  if (env_l)
     {
       path.add (env_l);
     }
   path.add ("");
   path.add (String (DIR_DATADIR) + "/init/");
-  
+
   path.push (DIR_DATADIR);
 
   Getopt_long oparser (argc, argv,theopts);
   cout << get_version_str() << endl;
   String init_str ("symbol.ly");
-  
-  while (Long_option_init const * opt = oparser()) 
+
+  while (Long_option_init const * opt = oparser())
     {
       switch (opt->shortname)
        {
+       case 't':
+         experimental_features_global_b = true;
+         break;
        case 'o':
          set_default_output (oparser.optional_argument_ch_C_);
          break;
@@ -173,7 +179,7 @@ main (int argc, char **argv)
          exit (0);
          break;
        case 'V':
-         version_ignore_b_ = true;
+         version_ignore_b = true;
          break;
        case 'd':
          set_debug (true);
@@ -189,16 +195,16 @@ main (int argc, char **argv)
 
   int p=0;
   const char *arg ;
-  while ((arg= oparser.get_next_arg())) 
+  while ((arg= oparser.get_next_arg()))
     {
       String f (arg);
       destill_inname (f);
       do_one_file (init_str,f);
       p++;
     }
-  if (!p) 
+  if (!p)
     {
-      do_one_file (init_str, "");      
+      do_one_file (init_str, "");
     }
 
   return exit_status_i_;
@@ -210,17 +216,16 @@ destill_inname (String &name_str_r)
 {
   if (name_str_r.length_i())
     {
-      if (name_str_r[ 0 ] != '-') 
+      if (name_str_r[ 0 ] != '-')
        {
          String a,b,c,d;
          split_path (name_str_r,a,b,c,d);
 
          // add extension if not present.
-         if (!d) 
+         if (d.empty_b ())
            d = ".ly";
          name_str_r = a+b+c+d;
        }
     }
-  else name_str_r = "";   
+  else name_str_r = "";
 }
-