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

diff --git a/VERSION b/VERSION
index 3bd575ecc2431df484dc843606a6a255a463d661..d3a300ce9618727314edbe70ae377d495cde20e2 100644 (file)
--- 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 d66c2c2d9b1b34dfd6c254d628d88eadfa90d387..2f72a4efc05c5b7d831e6dbb8be19ead73ff367e 100644 (file)
--- 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 7b9611af008e0cdef86459ab4dfe6f2488c7d913..2302cb4717c48b271f8e05887a3c20020f50186c 100644 (file)
--- 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 75205c2ddd93b785b9c745ef7f29b0734ba11871..7aa8c8ce8be3d921beb312b74c9ced9810aa5a09 100644 (file)
--- 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)