lilypond-0.1.12

diff --git a/VERSION b/VERSION
index 3747f21228c658688daeb3b1523e6e55c19c71b0..1ae5036c7daa8cd6db33d05c759c08bb49071ed3 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 1
-TOPLEVEL_PATCH_LEVEL = 11
+TOPLEVEL_PATCH_LEVEL = 12
 
 # use to send patches, always empty for released version:
 TOPLEVEL_MY_PATCH_LEVEL = 

diff --git a/lily/VERSION b/lily/VERSION
index 7ce3b25fba45817016afc781083b8857de531bcd..4d5a2603a52ea8e648a08b54b0e0d47ba3d7674b 100644 (file)
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 1
-PATCH_LEVEL = 11
+PATCH_LEVEL = 12
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf
 

diff --git a/lily/header.cc b/lily/header.cc
index f2a54aab2d97018ad4bf239e238d6545df69acfc..b64be42fee46848b951b6a52b1fb2898ec898210 100644 (file)
--- a/lily/header.cc
+++ b/lily/header.cc
@@ -14,6 +14,9 @@ String
 Header::TeX_string() const
 {
   String s;
+
+  s+= "\\def\\LilyIdString{"  + lily_id_str_ + "}";
+  
   for (Assoc_iter<String, String> i(*this); i.ok(); i++) 
     {
       s += "\\def\\mudela" + i.key() + "{" + i.val() + "}";

diff --git a/lily/include/header.hh b/lily/include/header.hh
index d5919b0de5e8cfbb4711d98bd130bf783a5c53f8..62ee98ddf4c5c90d0503dc43f5eb5330220f11d6 100644 (file)
--- a/lily/include/header.hh
+++ b/lily/include/header.hh
@@ -16,6 +16,7 @@
 
 struct Header : Assoc<String, String>
 {
+  String lily_id_str_;
   String TeX_string() const;
 };
 

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 79ac1e878ed5ba56155188ff116c8a895fd8468f..75fc6a1e5483e2175315fb647d334746c93681e5 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -1,3 +1,10 @@
+/*
+  main.hh -- declare global entry points
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
 #ifndef MAIN_HH
 #define MAIN_HH
 #include "lily-proto.hh"
@@ -10,6 +17,7 @@ void set_default_output (String s);
 Input_score* current_iscore_l();
 String find_file (String);
 String get_version_str();
+String get_version_number_str();
 extern Sources* source_l_g;
 extern bool only_midi;
 extern int exit_status_i_;

diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index 68a6b49037351430abc3162cca94ccea9a83038b..df773fa7ccdb93c51859c6523348dc4023c84112 100644 (file)
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -1,12 +1,20 @@
 #include "version.hh"
 #include <stdio.h>
 
-static char *s = "GNU LilyPond " MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL MY_PATCH_LEVEL " #%d";
+
+#define VERSION_SZ  MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL MY_PATCH_LEVEL
+static char *s = "GNU LilyPond " VERSION_SZ " #%d";
 
 static const int build=
 #include ".build"
 ;
 
+char const *
+lily_version_number_sz()
+{
+  return VERSION_SZ;
+}
+
 char const * 
 lily_version_sz()
 {

diff --git a/lily/score.cc b/lily/score.cc
index 04ed82576876e348ab067782c9fcc74b74b80d1c..3da46e2c235f9e9318aa47616e0f0bbde2a93d25 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -10,7 +10,6 @@
 #include "debug.hh"
 #include "music-output-def.hh"
 #include "music-output.hh"
-#include "main.hh"
 #include "source.hh"
 #include "source-file.hh"
 #include "music-iterator.hh"

diff --git a/lily/scores.cc b/lily/scores.cc
index a1cb0830a1e403d70072b8f3f6df00490407249d..3886a7715d536b035b92a56d92a79734a737169b 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -10,19 +10,22 @@
 #include "score.hh"
 #include "string.hh"
 #include "paper-def.hh"
+#include "header.hh"
 #include "debug.hh"
+#include "parray.hh"
 
-static Array<Score*> score_array_global;
+static Link_array<Score> global_score_array;
 String default_out_fn = "lelie";
 
 void
 do_scores()
 {
-  for (int i=0; i < score_array_global.size(); i++) 
+  for (int i=0; i < global_score_array.size(); i++) 
     {
-       Score *&is_p = score_array_global[i];
-       
-       
+       Score *&is_p = global_score_array[i];
+       if (is_p->header_p_)
+         is_p->header_p_->lily_id_str_ = "Lily was here, " + 
+           get_version_number_str();
        if (is_p->errorlevel_i_) 
          {
            is_p->warning ("Score contains errors. Will not process it. ");
@@ -37,13 +40,13 @@ do_scores()
        is_p =0;
 
     }
-  score_array_global.clear();
+  global_score_array.clear();
 }
 
 void
 add_score (Score * s)
 {
-  score_array_global.push (s);
+  global_score_array.push (s);
 }
 
 void

diff --git a/lily/version.cc b/lily/version.cc
index c219dfcd616d33b6d0a5197c92beda6a6d113cd9..205e259b25598c7361d50c893f7e3f8939239599 100644 (file)
--- a/lily/version.cc
+++ b/lily/version.cc
@@ -2,7 +2,8 @@
 
 #include "string.hh"
 
-extern char const * lily_version_sz();
+char const * lily_version_sz();
+char const * lily_version_number_sz();
 
 String 
 get_version_str()
@@ -12,3 +13,9 @@ get_version_str()
   s+=flower_version_sz();
    return s;
 }
+
+String
+get_version_number_str()
+{
+  return lily_version_number_sz();
+}