iostream fixes

diff --git a/ChangeLog b/ChangeLog
index 5fa1ca874eee3ba0341f4f687b5cb6930166d919..074791f094a25c738ee88e204c9c0ad63b8e2c07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/scm-option.cc: excorcise iostream.
+
+       * lily/main.cc: remove iostream usage.
+
 2002-08-02  Han-Wen  <hanwen@cs.uu.nl>
 
        * scripts/lilypond-book.py: make URL for printfilename option.

diff --git a/Documentation/header.html.in b/Documentation/header.html.in
index 5691705ad43290e72654cd0f7ab6440d07e7c0b2..b295af7c165493a040d3f9b3874431a287393766 100644 (file)
--- a/Documentation/header.html.in
+++ b/Documentation/header.html.in
@@ -42,8 +42,7 @@ which substitutes some @AT_VARIABLES@ as well.
       </td></tr>
       <tr><td><font size="-1">
        <a href="@TOP@index.html">General information</a><br>
-       <a href="@TOP@short-examples.html">Simple examples</a><br>
-       <a href="@TOP@long-examples.html">Complex examples</a><br>
+       <a href="@TOP@examples.html">Examples</a><br>
       </font></td></tr>
       <tr><td bgcolor="#e8e8ff">
        <b>Download </b>

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index c103bdfd3195886bae767b9935ba58f18fe427b4..12937161ff8a86c4180143f4aa3a185cd6cde4df 100644 (file)
--- 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 73c98f4535667e99d74a608b19e1c128ff42a836..613cceb3d37197526f3cd481f11ed754fa2052af 100644 (file)
--- 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 2ef9af2f5a4f195604f70c7159f673081cd245b4..d5be30fe6882a06b1775690952c4d514028c8a8b 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -12,8 +12,6 @@
 #include <locale.h>
 #include <stdio.h>
 
-#include <iostream>
-
 #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 <hanwen@cs.uu.nl>\n";
-  std::cout << "  Jan Nieuwenhuizen <janneke@gnu.org>\n";
+  printf (_f ("Copyright (c) %s by", "1996--2002").to_str0 ());
+  printf ("\n");
+  printf ("  Han-Wen Nienhuys <hanwen@cs.uu.nl>\n");
+  printf ("  Jan Nieuwenhuizen <janneke@gnu.org>\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 <hanwen@cs.uu.nl>\n";
-  std::cout << "  Jan Nieuwenhuizen <janneke@gnu.org>\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 <hanwen@cs.uu.nl>\n");
+  printf ("  Jan Nieuwenhuizen <janneke@gnu.org>\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 49e917e2a2e63462b576afa9c4956f73ce9ec9ad..ab4e73f1cacdfc760f592efb484cc897567e5b4b 100644 (file)
--- a/lily/scm-option.cc
+++ b/lily/scm-option.cc
@@ -6,8 +6,7 @@
   (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-
-#include <iostream>
+#include <stdio.h>
 
 #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"))