From: fred Date: Sun, 24 Mar 2002 19:56:18 +0000 (+0000) Subject: lilypond-0.1.12 X-Git-Tag: release/1.5.59~3971 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=365f5e4e87116d07fd5d15a13be62d2d1f36b410;p=lilypond.git lilypond-0.1.12 --- diff --git a/NEWS b/NEWS index b7e1b5bba1..d86ec1c927 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +pl 12 + - bf: don't redefine tex primitives like \textfont and \mathfont + - nicer broken slurs (?) + - bf: error status upon parse error + - robustness in Lookup::*slur + - bf: mi2mu: warn if 0-length string in midi-file + - output id-footer +******** +sep 1 pl 11 - forms for Musical vocabulary diff --git a/TODO b/TODO index ff14045e1e..12aee1d8b0 100644 --- a/TODO +++ b/TODO @@ -6,6 +6,9 @@ done, or is an idea that I want to think about Most of the items are marked in the code as well, with full explanation. grep for TODO and ugh/ugr + + * move to OpusTeX fonts + * check out egcs * give Items/Spanners access to unbroken originals @@ -382,15 +385,12 @@ IDEAS * Klavarskribo? - * return status on exit - * lyrics in chords still fuck up. * - rewire acknowledge_element() logic with a process_acknowledged() - construct Stem upon receiving Notehead. Junk Stem_req - * pushgroup/popgroup * whole head on ledger line diff --git a/lily/main.cc b/lily/main.cc index 8c68dd1bc0..259f95f651 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -43,34 +43,34 @@ void usage() { cout << - "Usage: lilypond [options] [mudela-file]\n" - "Typeset and or produce midi output from mudela-file or stdin\n" - "\n" - "Options:\n" - " -d, --debug enable debugging output\n" - " -I, --include=DIR add DIR to search path\n" - " -i, --init=FILE use FILE as init file\n" - " -h, --help this help\n" - " -w, --warranty show warranty and copyright\n" - " -o, --output=FILE set FILE as default output\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" + "Usage: lilypond [options] [mudela-file]\n" + "Typeset and or produce midi output from mudela-file or stdin\n" + "\n" + "Options:\n" + " -d, --debug enable debugging output\n" + " -I, --include=DIR add DIR to search path\n" + " -i, --init=FILE use FILE as init file\n" + " -h, --help this help\n" + " -w, --warranty show warranty and copyright\n" + " -o, --output=FILE set FILE as default output\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" #ifdef NDEBUG - "NDEBUG " + "NDEBUG " #endif #ifdef NPRINT - "NPRINT " + "NPRINT " #endif #ifdef STRING_UTILS_INLINED - "STRING_UTILS_INLINED " + "STRING_UTILS_INLINED " #endif - "datadir= " DIR_DATADIR + "datadir= " DIR_DATADIR - "\n"; + "\n"; - ; + ; } @@ -79,25 +79,25 @@ void notice() { cout << - "\n" - "GNU LilyPond -- The GNU Project music typesetter.\n" - "Copyright 1996,97 by\n" - " Han-Wen Nienhuys \n" - " Jan Nieuwenhuizen \n" - "\n" - " This program is free software; you can redistribute it and/or\n" - "modify it under the terms of the GNU General Public License version 2\n" - "as published by the Free Software Foundation.\n" - "\n" - " This program is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" - "General Public License for more details.\n" - "\n" - " 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"; + "\n" + "GNU LilyPond -- The GNU Project music typesetter.\n" + "Copyright 1996,97 by\n" + " Han-Wen Nienhuys \n" + " Jan Nieuwenhuizen \n" + "\n" + " This program is free software; you can redistribute it and/or\n" + "modify it under the terms of the GNU General Public License version 2\n" + "as published by the Free Software Foundation.\n" + "\n" + " This program is distributed in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" + "General Public License for more details.\n" + "\n" + " 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"; } @@ -108,23 +108,24 @@ do_one_file (String init_str, String file_str) { if (init_str != "" && "" == path.find (init_str)) { - error ("Can not find `" + init_str +"\'"); - return ; + error ("Can not find `" + init_str +"\'"); + return ; } if (file_str!= "" && path.find (file_str) == "") { - error ("Can not find `" + file_str + "'"); - return ; + error ("Can not find `" + file_str + "'"); + return ; } Sources 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.parse_file (init_str, file_str); - } + My_lily_parser parser (source_l_g); + parser.set_version_check (version_ignore_b_); + parser.parse_file (init_str, file_str); + exit_status_i_ |= parser.error_level_i_; + } do_scores(); source_l_g = 0; } @@ -139,7 +140,7 @@ main (int argc, char **argv) char const * env_l=getenv ("LILYINCLUDE"); if (env_l) { - path.add (env_l); + path.add (env_l); } path.add (""); path.add (String (DIR_DATADIR) + "/init/"); @@ -152,52 +153,52 @@ main (int argc, char **argv) while (Long_option_init const * opt = oparser()) { - switch (opt->shortname) - { + switch (opt->shortname) + { case 'o': - set_default_output (oparser.optional_argument_ch_C_); - break; + set_default_output (oparser.optional_argument_ch_C_); + break; case 'w': - notice(); - exit (0); - break; + notice(); + exit (0); + break; case 'I': - path.push (oparser.optional_argument_ch_C_); - break; + path.push (oparser.optional_argument_ch_C_); + break; case 'i': - init_str = oparser.optional_argument_ch_C_; - break; + init_str = oparser.optional_argument_ch_C_; + break; case 'h': - usage(); - exit (0); - break; + usage(); + exit (0); + break; case 'V': - version_ignore_b_ = true; - break; + version_ignore_b_ = true; + break; case 'd': - set_debug (true); - break; + set_debug (true); + break; case 'M': - only_midi = true; - break; + only_midi = true; + break; default: - assert (false); - break; - } + assert (false); + break; + } } int p=0; const char *arg ; while ((arg= oparser.get_next_arg())) { - String f (arg); - destill_inname (f); - do_one_file (init_str,f); - p++; + String f (arg); + destill_inname (f); + do_one_file (init_str,f); + p++; } if (!p) { - do_one_file (init_str, ""); + do_one_file (init_str, ""); } return exit_status_i_; @@ -208,18 +209,18 @@ void destill_inname (String &name_str_r) { if (name_str_r.length_i()) - { + { 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 == "") - d = ".ly"; - name_str_r = a+b+c+d; - } - } - else name_str_r = ""; + { + String a,b,c,d; + split_path (name_str_r,a,b,c,d); + + // add extension if not present. + if (d == "") + d = ".ly"; + name_str_r = a+b+c+d; + } + } + else name_str_r = ""; } diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index 0b1121190a..1f4d430f17 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -76,7 +76,10 @@ My_lily_parser::parse_file (String init, String s) if (!define_spot_array_.empty()) - warning ("Braces don't match."); + { + warning ("Braces don't match."); + error_level_i_ = 1; + } } My_lily_parser::~My_lily_parser()