From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 29 Aug 1997 13:44:03 +0000 (+0200)
Subject: patch::: 0.1.10.jcn1: Re: Lilypond under Win/NT (fwd)
X-Git-Tag: release/0.1.11~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=68ffccad7c4d4ce0386cb60c537c99523e61c4d9;p=lilypond.git

patch::: 0.1.10.jcn1: Re: Lilypond under Win/NT (fwd)
---

diff --git a/VERSION b/VERSION
index 3bd575ecc2..d3a300ce96 100644
--- a/VERSION
+++ b/VERSION
@@ -3,4 +3,4 @@ TOPLEVEL_MINOR_VERSION = 1
 TOPLEVEL_PATCH_LEVEL = 10
 
 # use to send patches, always empty for released version:
-TOPLEVEL_MY_PATCH_LEVEL = 
+TOPLEVEL_MY_PATCH_LEVEL = .jcn1
diff --git a/lib/simple-file-storage.cc b/lib/simple-file-storage.cc
index d66c2c2d9b..2f72a4efc0 100644
--- a/lib/simple-file-storage.cc
+++ b/lib/simple-file-storage.cc
@@ -41,7 +41,9 @@ Simple_file_storage::Simple_file_storage(String s)
     data_p_ = new char[len_i_+1];
     data_p_[len_i_] = 0;
     ret = fread(data_p_, sizeof(char), len_i_, f);
+#ifndef __CYGWIN32__ // ugh, \r\n -> \n translation
     assert (ret==len_i_);
+#endif
     fclose(f);
 }
 
diff --git a/lily/VERSION b/lily/VERSION
index 7b9611af00..2302cb4717 100644
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 1
-PATCH_LEVEL = 9
+PATCH_LEVEL = 10
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf
 
-MY_PATCH_LEVEL =
+MY_PATCH_LEVEL =.jcn1
diff --git a/mi2mu/mudela-score.cc b/mi2mu/mudela-score.cc
index 75205c2ddd..7aa8c8ce8b 100644
--- a/mi2mu/mudela-score.cc
+++ b/mi2mu/mudela-score.cc
@@ -194,7 +194,7 @@ Mudela_score::quantify_columns()
   for  (int i = 0; i < column_l_array_.size(); i++) 
     {
       column_l_array_ [i]->at_mom_ =
-      	s * (int) ( (column_l_array_ [i]->at_mom()) / s);
+      	s * Moment((int) ((column_l_array_ [i]->at_mom()) / s));
 
       int bar_i = (int) (column_l_array_ [i]->at_mom () / bar_mom) + 1;
       if (bar_i > current_bar_i)