X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fgetopt-long.cc;h=bbc6c2e7305678f93454d7c5cd819588916da756;hb=133f905bae15566c28274ce8f2fb60a154259b62;hp=bb51a018631f15362d34c6bd497ba2f5a032d976;hpb=d8082113a0df616e7beabc0417c3590a3fac7320;p=lilypond.git diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc index bb51a01863..bbc6c2e730 100644 --- a/flower/getopt-long.cc +++ b/flower/getopt-long.cc @@ -1,7 +1,20 @@ /* - process command line, GNU style. + This file is part of LilyPond, the GNU music typesetter. - this is Copyleft (c) 1996--2006 Han-Wen Nienhuys, + Copyright (C) 1996--2010 Han-Wen Nienhuys, + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "getopt-long.hh" @@ -141,7 +154,7 @@ Getopt_long::report (Errorcod c) found_option_->to_string ()); break; case E_NOARGEXPECT: - str += _f ("option `%s' doesn't allow an argument", + str += _f ("option `%s' does not allow an argument", found_option_->to_string ()); break; case E_UNKNOWNOPTION: @@ -310,7 +323,7 @@ Long_option_init::table_string (Long_option_init *l) s += string (wid - s.length () + EXTRA_SPACES, ' '); string help_text (gettext (l[i].help_str0_)); - replace_all (help_text, "\n", + replace_all (&help_text, "\n", "\n" + string (wid + EXTRA_SPACES + 2, ' ')); tabstr += s + help_text + "\n"; }