From: Han-Wen Nienhuys Date: Fri, 2 Aug 2002 12:46:48 +0000 (+0000) Subject: iostream fixes X-Git-Tag: release/1.5.72~49 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=f73fdbd1bdbda9012874a911f1de0c847a854af1;p=lilypond.git iostream fixes --- diff --git a/ChangeLog b/ChangeLog index 5fa1ca874e..074791f094 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-08-02 Han-Wen Nienhuys + + * lily/scm-option.cc: excorcise iostream. + + * lily/main.cc: remove iostream usage. + 2002-08-02 Han-Wen * scripts/lilypond-book.py: make URL for printfilename option. diff --git a/Documentation/header.html.in b/Documentation/header.html.in index 5691705ad4..b295af7c16 100644 --- a/Documentation/header.html.in +++ b/Documentation/header.html.in @@ -42,8 +42,7 @@ which substitutes some @AT_VARIABLES@ as well. General information
- Simple examples
- Complex examples
+ Examples
 Download diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi index c103bdfd31..12937161ff 100644 --- a/Documentation/user/invoking.itexi +++ b/Documentation/user/invoking.itexi @@ -270,9 +270,9 @@ through @code{ps2pdf} producing a PDF file. @cindex Scalable fonts If you use lilypond-book or your own wrapper files, don't use -\use package[[T1]{fontenc} in the file header but don't forget -\usepackage[[latin1]{inputenc} if you use any other non-anglosaxian -characters. +@code{\usepackage[[T1]@{fontenc@}} in the file header but don't forget +@code{\usepackage[latin1]@{inputenc@}} if you use any other +non-anglosaxian characters. @item --preview Also generate a picture of the first system of the score. diff --git a/VERSION b/VERSION index 73c98f4535..613cceb3d3 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=70 -MY_PATCH_LEVEL=gp1 +MY_PATCH_LEVEL=uu1 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/main.cc b/lily/main.cc index 2ef9af2f5a..d5be30fe68 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -12,8 +12,6 @@ #include #include -#include - #include "config.h" #if HAVE_GETTEXT @@ -152,59 +150,59 @@ dirinfo (FILE *out) void usage () { - std::cout << "\n"; + printf ("\n"); /* No version number or newline here. It confuses help2man. */ - std::cout << _f ("Usage: %s [OPTION]... FILE...", "lilypond").to_str0 (); - std::cout << "\n\n"; - std::cout << _ ("Typeset music and or play MIDI from FILE").to_str0 (); - std::cout << "\n\n"; - std::cout << -_ ( + printf (_f ("Usage: %s [OPTION]... FILE...", "lilypond").to_str0 ()); + printf ("\n\n"); + printf (_ ("Typeset music and or play MIDI from FILE").to_str0 ()); + printf ("\n\n"); + printf(_ ( "LilyPond is a music typesetter. It produces beautiful sheet music\n" "using a high level description file as input. LilyPond is part of \n" "the GNU Project.\n" -).to_str0 (); +).to_str0 ()); - std::cout << '\n'; - std::cout << _ ("Options:").to_str0 (); - std::cout << '\n'; - std::cout << Long_option_init::table_string (options_static).to_str0 (); - std::cout << '\n'; - std::cout << std::endl; + printf ("\n"); + printf (_ ("Options:").to_str0 ()); + printf ("\n"); + printf (Long_option_init::table_string (options_static).to_str0 ()); + printf ("\n"); + printf ("\n"); - std::cout << _f ("Report bugs to %s", "bug-lilypond@gnu.org").to_str0 () << std::endl; + printf (_f ("Report bugs to %s", "bug-lilypond@gnu.org").to_str0 ()); + printf ("\n"); } void version () { identify (stdout); - std::cout << '\n'; - std::cout << _f ("" + printf ("\n"); + printf (_f ( "This is free software. It is covered by the GNU General Public License,\n" "and you are welcome to change it and/or distribute copies of it under\n" "certain conditions. Invoke as `%s --warranty' for more information.\n", - "lilypond").to_str0 (); - std::cout << std::endl; + "lilypond").to_str0 ()); + printf ("\n"); - std::cout << _f ("Copyright (c) %s by", "1996--2002").to_str0 (); - std::cout << '\n'; - std::cout << " Han-Wen Nienhuys \n"; - std::cout << " Jan Nieuwenhuizen \n"; + printf (_f ("Copyright (c) %s by", "1996--2002").to_str0 ()); + printf ("\n"); + printf (" Han-Wen Nienhuys \n"); + printf (" Jan Nieuwenhuizen \n"); } void notice () { - std::cout << '\n'; - std::cout << _ ("GNU LilyPond -- The music typesetter").to_str0 (); - std::cout << '\n'; - std::cout << _f ("Copyright (c) %s by", "1996--2002").to_str0 (); - std::cout << '\n'; - std::cout << " Han-Wen Nienhuys \n"; - std::cout << " Jan Nieuwenhuizen \n"; - std::cout << '\n'; - std::cout << _ ( + printf ("\n"); + printf (_ ("GNU LilyPond -- The music typesetter").to_str0 ()); + printf ("\n"); + printf (_f ("Copyright (c) %s by", "1996--2002").to_str0 ()); + printf ("\n"); + printf (" Han-Wen Nienhuys \n"); + printf (" Jan Nieuwenhuizen \n"); + printf ("\n"); + printf ( _ ( " 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" @@ -217,7 +215,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").to_str0 (); + "USA.\n").to_str0 ()); } @@ -344,8 +342,8 @@ main_prog (void *, int, char **) dirinfo (stderr); ly_init_guile (); - - std::cout << std::endl; + + printf ("\n"); call_constructors (); all_fonts_global = new All_font_metrics (global_path.string ()); @@ -463,11 +461,10 @@ main (int argc, char **argv) exit (0); break; case 'f': - if (output_name_global == "help") + if (oparser_p_static->optional_argument_str0_ == "help") { - cout << \ - "See http://lilypond.org/wiki?OutputFormats for more information.\n"\ - "This option is for developers only.\n"; + printf("See http://lilypond.org/wiki?OutputFormats for more information.\n"\ + "This option is for developers only.\n"); exit (0); } output_format_global = oparser_p_static->optional_argument_str0_; diff --git a/lily/scm-option.cc b/lily/scm-option.cc index 49e917e2a2..ab4e73f1ca 100644 --- a/lily/scm-option.cc +++ b/lily/scm-option.cc @@ -6,8 +6,7 @@ (c) 2001--2002 Han-Wen Nienhuys */ - -#include +#include #include "string.hh" #include "lily-guile.hh" @@ -74,7 +73,7 @@ This function is useful to call from the command line: @code{lilypond -e */ if (var == ly_symbol2scm ("help")) { - std::cout << _("lilypond -e EXPR means + printf ( _("lilypond -e EXPR means evalute EXPR as Scheme after init.scm has been read. In particular, the function set-lily-option allows for access to some internal @@ -83,13 +82,12 @@ variables. Usage: (set-lily-option SYMBOL VAL) possible options for SYMBOL are : -").to_str0 ()<< std::endl; - - std::cout << " help (any-symbol)"<< std::endl; - std::cout << " internal-type-checking (boolean)"<< std::endl; - std::cout << " midi-debug (boolean)"<< std::endl; - std::cout << " testing-level (int)"<< std::endl; - +").to_str0 ()); + printf ( " help (any-symbol)\n" + " internal-type-checking (boolean)\n" + " midi-debug (boolean)\n" + " testing-level (int)\n"); + exit (0); } else if (var == ly_symbol2scm ("midi-debug"))