partial: 1.1.0.jcn

[lilypond.git] / lily / tex-stream.cc

diff --git a/lily/tex-stream.cc b/lily/tex-stream.cc
index 2125593ab6b5747c75731213fc41e2cc902f25b8..d8030580020674b707616c0514751cf739a94327 100644 (file)
--- a/lily/tex-stream.cc
+++ b/lily/tex-stream.cc
@@ -1,88 +1,54 @@
 /*
   tex-stream.cc -- implement Tex_stream
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
+
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 #include <fstream.h>
 #include <time.h>
 
-#include "tex.hh"
 #include "main.hh"
 #include "tex-stream.hh"
 #include "debug.hh"
 
-Tex_stream::Tex_stream(String filename) 
+Tex_stream::Tex_stream (String filename)
+  : Paper_stream (filename)
 {
-    os = new ofstream(filename);
-    if (!*os)
-       error("can't open `" + filename+"\'");
-    nest_level = 0;
-    outputting_comment=false;
-    header();
+  header ();
 }
-void
-Tex_stream::header()
+
+Tex_stream::~Tex_stream ()
 {
-    *os << "% Creator: " << get_version_str();
-    *os << "% Automatically generated, at ";
-    time_t t(time(0));
-    *os << ctime(&t);
-    *os << "% from musical definition: " + infile_str_g + "\n";
+  *os << "\n\\EndLilyPondOutput";
 }
-Tex_stream::~Tex_stream()
+
+void
+Tex_stream::header ()
 {
-    delete os;
-    assert(nest_level == 0);
+  // urg, merge with Ps
+  *os << _ ("% Creator: ");
+  if (no_timestamps_global_b)
+    *os << "GNU LilyPond\n";
+  else
+    *os << get_version_str () << '\n';
+  *os << _ ("% Automatically generated");
+  if (no_timestamps_global_b)
+    *os << ".\n";
+  else
+    {
+      *os << _ (", at ");
+      time_t t (time (0));
+      *os << ctime (&t) << "%\n";
+    }
 }
 
 // print string. don't forget indent.
-Tex_stream &
-Tex_stream::operator<<(String s)
+Paper_stream&
+Tex_stream::operator << (Scalar s)
 {
-    
-    for (const char *cp = s; *cp; cp++) {
-       if (outputting_comment) {
-           *os << *cp;
-           if (*cp == '\n') {
-               outputting_comment=false;
-
-           }
-           continue;
-       }
-       switch(*cp) 
-           {
-           case '%':
-               outputting_comment = true;
-               *os << *cp;
-               break;
-           case '{':
-               nest_level++;
-               *os << *cp;             
-               break;
-           case '}':
-               nest_level--;           
-               *os << *cp;
-               
-               if (nest_level < 0) {
-                   delete os;  // we want to see the remains.
-                   assert(nest_level>=0);
-               }
-               /* FALLTHROUGH */
-               
-           case '\n':
-               *os << "%\n";
-               *os << String(' ', nest_level);
-               break;        
-           default:
-               *os << *cp;
-               break;
-           }
-    }
-    return *this;
+  return Paper_stream::operator << (s);
 }
 
-
-/* *************************************************************** */