lilypond-1.1.59

diff --git a/Documentation/man/lilypond.yo b/Documentation/man/lilypond.yo
index d82b76d5c34219512ed11d2a623b8d3907064118..c26ca52f0f2782babf7f095d7346d7e444ca5606 100644 (file)
--- a/Documentation/man/lilypond.yo
+++ b/Documentation/man/lilypond.yo
@@ -26,12 +26,12 @@ manpageoptions()
 description(
 dit(-I,--include=)
     add file(FILE) to the search path for input files.
-dit(-M,--midi)
+dit(-m,--midi)
     Disable TeX output. If you have a \midi definition, it will do the 
     midi output only.
-dit(-d,--dependencies)
+dit(-M,--dependencies)
     Also output rules to be included in Makefile.
-dit(-D,--debug)
+dit(-d,--debug)
     Turn debugging info on.  GNU LilyPond reads the file file(.dstreamrc), 
     which lists what functions and classes may produce copious debugging
     output.

diff --git a/lily/main.cc b/lily/main.cc
index 04e883c4dec46816b7019cdacf3f51e4306eaa4b..abc2f5d169a7abd77e7056e378f891d2dd9c1bff 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -65,14 +65,15 @@ Long_option_init theopts[] = {
   {0, "warranty", 'w'},
   {0, "help", 'h'},
   {0, "test", 't'},
-  {0, "debug", 'D'},
+  {0, "debug", 'd'},
   {1, "init", 'i'},
   {1, "include", 'I'},
-  {0, "no-paper", 'M'},
-  {0, "dependencies", 'd'},
+  {0, "no-paper", 'm'},
+  {0, "dependencies", 'M'},    // like GCC
   {0, "no-timestamps", 'T'},   // why do we have this option?
   {0, "find-old-relative", 'Q'},
   {0, "ignore-version", 'V'},
+  {0, "version", 'v'},
   {1, "output-format", 'f'},
   {0, "safe", 's'},
   {0,0,0}
@@ -91,10 +92,10 @@ usage ()
     "  -a, --about            about LilyPond\n"
     );
   cout  << _ (
-    "  -D, --debug            enable debugging output\n"
+    "  -d, --debug            enable debugging output\n"
     );
   cout  << _ (
-    "  -d, --dependencies     write Makefile dependencies for every input file\n"
+    "  -M, --dependencies     write Makefile dependencies for every input file\n"
     );
   cout  << _ (
     "  -h, --help             this help\n"
@@ -109,7 +110,7 @@ usage ()
     "  -i, --init=FILE        use FILE as init file\n"
     );
   cout  << _ (
-    "  -M, --no-paper         produce midi output only\n"
+    "  -m, --no-paper         produce midi output only\n"
     );
   cout  << _ (
     "  -o, --output=FILE      set FILE as default output base\n"
@@ -322,6 +323,9 @@ main (int argc, char **argv)
     {
       switch (opt->shortname)
        {
+       case 'v':
+         exit (0);             // we print a version anyway.
+         break;
        case 't':
          experimental_features_global_b = true;
          *mlog << "*** enabling experimental features, you're on your own now ***\n";
@@ -358,13 +362,13 @@ main (int argc, char **argv)
        case 's':
          safe_global_b = true;
          break;
-       case 'd':
+       case 'M':
          dependency_global_b = true;
          break; 
-       case 'D':
+       case 'd':
          set_debug (true);
          break;
-       case 'M':
+       case 'm':
          no_paper_global_b = true;
          break;
        case 'T':