-diff -urN ../cinstall/Makefile.in ./Makefile.in
---- ../cinstall/Makefile.in Thu Feb 8 05:55:22 2001
-+++ ./Makefile.in Thu Apr 12 11:41:37 2001
-@@ -130,11 +130,15 @@
- @chmod a-x $@
-
- clean:
-- rm -f *.o *.rc $(PROGS)
-- $(MAKE) -C zlib clean
-+ rm -f *.o $(PROGS)
-+ $(MAKE) -C zlib $@
+Binary files ../cinstall/LilyPond.ico and ./LilyPond.ico differ
+diff -purN ../cinstall/Makefile.in ./Makefile.in
+--- ../cinstall/Makefile.in Fri Jun 1 05:56:01 2001
++++ ./Makefile.in Thu Sep 13 21:38:27 2001
+@@ -135,8 +135,9 @@ clean:
+ $(MAKE) -C zlib clean
realclean: clean
- rm -f Makefile config.cache
+-
+ rm -f Makefile *.d
+ rm -f config.cache config.log config.status
-+ rm -f inilex.c iniparse.c iniparse.h version.c
-+
-+distclean: realclean
-
++
install: all
$(SHELL) $(updir1)/mkinstalldirs $(bindir) $(etcdir)
-diff -urN ../cinstall/desktop.cc ./desktop.cc
---- ../cinstall/desktop.cc Sat Nov 11 05:55:16 2000
-+++ ./desktop.cc Thu Apr 12 11:39:52 2001
-@@ -79,9 +79,7 @@
+ for i in $(PROGS) ; do \
+diff -purN ../cinstall/desktop.cc ./desktop.cc
+--- ../cinstall/desktop.cc Tue Aug 14 05:55:37 2001
++++ ./desktop.cc Thu Sep 13 21:37:38 2001
+@@ -76,9 +76,7 @@ static char *etc_profile[] = {
"done",
"",
"export MAKE_MODE=unix",
"",
"cd \"$HOME\"",
"",
-@@ -197,6 +195,30 @@
+@@ -194,6 +192,30 @@ make_cygwin_bat ()
}
static void
+static void
make_etc_profile ()
{
- char *fname = concat (get_root_dir (), "/etc/profile", 0);
-@@ -299,11 +321,11 @@
+ char *fname = cygpath ("/etc/profile", 0);
+@@ -290,9 +312,9 @@ make_passwd_group ()
}
static void
-save_icon ()
+save_icon (char* iconfile, char* iconres)
{
-- iconname = backslash (concat (get_root_dir (), "/cygwin.ico", 0));
+- iconname = backslash (cygpath ("/cygwin.ico", 0));
+ iconname = backslash (concat (get_root_dir (), iconfile, 0));
-- HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE");
-+ HRSRC rsrc = FindResource (NULL, iconres, "FILE");
+ HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE");
if (rsrc == NULL)
- {
- fatal ("FindResource failed");
-@@ -323,7 +345,7 @@
+@@ -314,7 +336,7 @@ save_icon ()
static void
do_desktop_setup()
{
make_cygwin_bat ();
make_etc_profile ();
-@@ -335,6 +357,17 @@
+@@ -326,6 +348,17 @@ do_desktop_setup()
if (root_desktop) {
desktop_icon ("Cygwin", batname);
}
}
-diff -urN ../cinstall/ini.cc ./ini.cc
---- ../cinstall/ini.cc Thu Oct 5 05:55:27 2000
-+++ ./ini.cc Thu Apr 12 11:39:52 2001
-@@ -174,7 +174,7 @@
+diff -purN ../cinstall/ini.cc ./ini.cc
+--- ../cinstall/ini.cc Thu Jun 14 05:55:26 2001
++++ ./ini.cc Thu Sep 13 21:27:48 2001
+@@ -175,7 +175,7 @@ fprintf (FILE *f, const char *fmt, ...)
{
*nl = 0;
/*OutputDebugString (stderrbuf);*/
+ MessageBox (0, buf, "GNU LilyPond Cygwin Setup", 0);
stderrbuf[0] = 0;
}
-
-diff -urN ../cinstall/msg.cc ./msg.cc
+
+diff -purN ../cinstall/msg.cc ./msg.cc
--- ../cinstall/msg.cc Sat Aug 26 05:55:14 2000
-+++ ./msg.cc Thu Apr 12 11:39:52 2001
-@@ -44,7 +44,7 @@
++++ ./msg.cc Thu Sep 13 21:27:48 2001
+@@ -44,7 +44,7 @@ mbox (char *name, int type, int id, va_l
vsprintf (buf, fmt, args);
log (0, "mbox %s: %s", name, buf);
}
void
-diff -urN ../cinstall/res.rc ./res.rc
---- ../cinstall/res.rc Wed Mar 7 18:13:31 2001
-+++ ./res.rc Fri Apr 13 16:06:40 2001
-@@ -30,10 +30,10 @@
+diff -purN ../cinstall/res.rc ./res.rc
+--- ../cinstall/res.rc Thu Jul 5 05:55:22 2001
++++ ./res.rc Thu Sep 13 21:36:25 2001
+@@ -30,10 +30,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
IDD_SOURCE DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
BEGIN
- ICON IDI_CYGWIN,-1,5,5,20,20
+ ICON IDI_LILYPOND,-1,5,5,20,20
- CONTROL "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button",
- BS_AUTORADIOBUTTON,55,15,152,10
CONTROL "&Install from Internet",IDC_SOURCE_NETINST,"Button",
-@@ -49,7 +49,7 @@
- CAPTION "Local package directory"
+ BS_AUTORADIOBUTTON,55,15,75,10
+ CONTROL "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button",
+@@ -46,10 +46,10 @@ END
+
+ IDD_LOCAL_DIR DIALOG DISCARDABLE 0, 0, 215, 95
+ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+-CAPTION "Cygwin Setup"
++CAPTION "GNU LilyPond Setup"
FONT 8, "MS Sans Serif"
BEGIN
- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
PUSHBUTTON "B&rowse...",IDC_LOCAL_DIR_BROWSE,150,10,34,14
LTEXT "Local Package &Directory",IDC_STATIC,55,15,85,11
EDITTEXT IDC_LOCAL_DIR,55,25,127,12,ES_AUTOHSCROLL
-@@ -60,10 +60,10 @@
+@@ -60,10 +60,10 @@ END
IDD_ROOT DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
PUSHBUTTON "B&rowse...",IDC_ROOT_BROWSE,150,10,34,14
LTEXT "Select install root &directory",IDC_STATIC,55,15,85,11
EDITTEXT IDC_ROOT_DIR,55,25,127,12,ES_AUTOHSCROLL
-@@ -84,10 +84,10 @@
+@@ -84,10 +84,10 @@ END
IDD_SITE DIALOG DISCARDABLE 0, 0, 222, 206
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
LTEXT "Select Download &Site",IDC_STATIC,55,5,135,11
LISTBOX IDC_URL_LIST,55,20,160,155,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-@@ -98,10 +98,10 @@
+@@ -98,10 +98,10 @@ END
IDD_OTHER_URL DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
LTEXT "Select &URL to download from",IDC_STATIC,55,15,135,11
EDITTEXT IDC_OTHER_URL,55,25,127,12,ES_AUTOHSCROLL
DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
-@@ -111,10 +111,10 @@
+@@ -111,10 +111,10 @@ END
- IDD_NET DIALOG DISCARDABLE 0, 0, 215, 95
+ IDD_NET DIALOGEX 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
BEGIN
- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
- CONTROL "Use &IE5 Settings",IDC_NET_IE5,"Button",
- BS_AUTORADIOBUTTON,55,10,69,10
CONTROL "&Direct Connection",IDC_NET_DIRECT,"Button",
-@@ -135,10 +135,10 @@
+ BS_AUTORADIOBUTTON,55,10,73,10
+ CONTROL "Use &IE5 Settings",IDC_NET_IE5,"Button",
+@@ -135,10 +135,10 @@ END
IDD_DLSTATUS DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYSMENU
PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
LTEXT "Downloading...",IDC_STATIC,55,5,135,8
LTEXT "(URL)",IDC_DLS_URL,55,15,150,8
-@@ -157,10 +157,10 @@
+@@ -157,10 +157,10 @@ END
IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYSMENU
PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
LTEXT "Installing...",IDC_INS_ACTION,55,5,135,8
LTEXT "(PKG)",IDC_INS_PKG,55,15,150,8
-@@ -178,10 +178,10 @@
+@@ -178,10 +178,10 @@ END
IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
LTEXT "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
WS_EX_RIGHT
EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-@@ -195,10 +195,10 @@
+@@ -195,10 +195,10 @@ END
IDD_NET_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
WS_EX_RIGHT
EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-@@ -212,26 +212,25 @@
+@@ -212,27 +212,25 @@ END
IDD_SPLASH DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
BEGIN
- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
- LTEXT "Cygwin Net Release Setup Program",IDC_STATIC,55,10,114,
+- 8
+- LTEXT "Version (unknown)",IDC_VERSION,55,25,120,10
+- LTEXT "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,55,35,
+- 120,8
+- LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,55,50,112,
+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
+ LTEXT "GNU LilyPond GNU LilyPond Setup Program",IDC_STATIC,55,10,114,
8
-- LTEXT "Version (unknown)",IDC_VERSION,55,25,120,10
-- LTEXT "Copyright (C) 2000 Red Hat Inc",IDC_STATIC,55,35,135,8
-- LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,55,50,150,
-- 10
-+ LTEXT "Version (1.4pre)",IDC_VERSION,55,25,120,10
++ LTEXT "Version (1.5)",IDC_VERSION,55,25,120,10
+ LTEXT "Copyright (C) 2000-2001 Red Hat Inc",IDC_STATIC,55,35,135,8
+ LTEXT " (C) 2001 Jan Nieuwenhuizen <janneke@gnu.org>",IDC_STATIC,55,45,135,8
DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
END
- IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 292, 206
+ IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 430, 207
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
FONT 8, "MS Sans Serif"
BEGIN
-- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
- LTEXT "Select packages to install",IDC_STATIC,55,5,85,8
+- ICON IDI_CYGWIN,IDC_STATIC,5,5,21,20
++ ICON IDI_LILYPOND,IDC_STATIC,5,5,21,20
+ LTEXT "Select packages to install",IDC_CHOOSE_INST_TEXT,55,5,
+ 99,8
CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT
- WS_VISIBLE,55,15,230,155
-@@ -249,10 +248,10 @@
+@@ -255,10 +253,10 @@ END
IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CONTROL "Create Desktop &Icon",IDC_ROOT_DESKTOP,"Button",
BS_AUTOCHECKBOX,55,25,100,8
CONTROL "Add to &Start Menu",IDC_ROOT_MENU,"Button",
-@@ -298,6 +297,7 @@
+@@ -273,7 +271,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POP
+ CAPTION "Cygwin Setup"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
+ LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
+ WS_EX_RIGHT
+ EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
+@@ -322,6 +320,7 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_CYGWIN ICON DISCARDABLE "cygwin.ico"
/////////////////////////////////////////////////////////////////////////////
-@@ -305,6 +305,7 @@
+@@ -329,6 +328,7 @@ IDI_CYGWIN ICON DISCARDA
// FILE
//
CYGWIN.ICON FILE DISCARDABLE "cygwin.ico"
/////////////////////////////////////////////////////////////////////////////
-@@ -354,7 +355,8 @@
+@@ -383,7 +383,8 @@ STRINGTABLE DISCARDABLE
BEGIN
IDS_ROOT_SLASH "Warning: we recommend you do NOT use the root of your hard drive as the cygwin root. Proceed anyway?"
IDS_ROOT_SPACE "You should not choose a root path that include spaces in directory names. Proceed anyway?"
IDS_DIALOG_FAILED "Unable to create Dialog Box"
IDS_CYGWIN_FUNC_MISSING "Error: unable to find function `%s' in %s"
IDS_DOWNLOAD_SHORT "Download error: %s too short (%d, wanted %d)"
-diff -urN ../cinstall/resource.h ./resource.h
---- ../cinstall/resource.h Thu Mar 1 05:55:20 2001
-+++ ./resource.h Thu Apr 12 11:39:52 2001
-@@ -47,11 +47,12 @@
+diff -purN ../cinstall/resource.h ./resource.h
+--- ../cinstall/resource.h Mon Jul 2 05:55:40 2001
++++ ./resource.h Thu Sep 13 21:29:51 2001
+@@ -47,12 +47,13 @@
#define IDB_SPIN 118
#define IDB_RTARROW 119
#define IDI_SPIN 120
#define IDB_CHECK_YES 123
#define IDB_CHECK_NO 124
#define IDB_CHECK_NA 125
-+#define IDI_CYGWIN 126
+ #define IDD_FTP_AUTH 126
++#define IDI_CYGWIN 127
#define IDC_SOURCE_DOWNLOAD 1000
#define IDC_SOURCE_NETINST 1001
#define IDC_SOURCE_CWD 1002
-diff -urN ../cinstall/zlib/Makefile.in ./zlib/Makefile.in
---- ../cinstall/zlib/Makefile.in Tue Aug 8 05:55:18 2000
-+++ ./zlib/Makefile.in Thu Apr 12 11:42:10 2001
-@@ -299,6 +299,10 @@
-
- clean: clean-am
-
-+realclean: clean
-+ rm -f Makefile *.d
-+ rm -f config.cache config.log config.status
-+
- distclean-am: distclean-noinstLIBRARIES distclean-compile \
- distclean-tags distclean-generic clean-am
-
+diff -purN ../cinstall/version.c ./version.c
+--- ../cinstall/version.c Thu Jan 1 01:00:00 1970
++++ ./version.c Mon Sep 17 18:44:46 2001
+@@ -0,0 +1,2 @@
++char *version = "2.96.jcn1";
++static char *id = "\n%%% setup-version 2.96.jcn1\n";
//
// lilypond-staff.cc -- implement Lilypond_staff
//
-// copyright 1997 Jan Nieuwenhuizen <janneke@gnu.org>
+// (c) 1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
#include <assert.h>
#include <ctype.h>
Lilypond_voice* voice_p = new Lilypond_voice (this);
lilypond_voice_p_list_.append (new Killing_cons<Lilypond_voice> (voice_p, 0));
- // Rational mom = items.top ()->at_mom ();
Rational mom = 0;
- for (Cons<Lilypond_item>** pp = &items.head_; *pp;)
+ Link_array<Lilypond_item> now_items;
+ for (Cons<Lilypond_item>** i = &items.head_; *i;)
{
- Cons<Lilypond_item>* i = *pp;
- if (i->car_->at_mom () > mom)
- {
- if (no_rests_b_g && voice_p->last_note_l_)
- {
- voice_p->last_note_l_->end_column_l_ = i->car_->lilypond_column_l_;
- }
- else
- {
- /* uh, what about quantisation? This should probably
- use mom2standardised_dur ()
- arg, urg: skip should get duration from start/end columns!
- */
-
- Rational r = i->car_->at_mom () - mom;
- // ugh, need score
- Lilypond_column* start = lilypond_score_l_g->find_column_l (mom);
- voice_p->add_item (new Lilypond_skip (start, r));
- }
-
- mom = i->car_->at_mom ();
- continue; // unnecessary
- }
+ while (*i && (*i)->car_->at_mom () < mom)
+ i = &(*i)->next_;
+ Lilypond_note* last_note = 0;
Link_array<Lilypond_item> now_items;
- for (Cons<Lilypond_item> *cp = i; cp && cp->car_->at_mom () == mom; cp = cp->next_)
- now_items.push (i->car_);
-
-#if 0
- /*
- Why don't we use <note>, if voice has:
-
- <note> <key-change>
-
- we'd get last_item == key_change -> last_note == 0;
- */
- Lilypond_note * last_note = dynamic_cast<Lilypond_note*> (voice_p->last_item_l_);
-#else
- /*
- Not sure, is this better?
- */
- Lilypond_note * last_note = voice_p->last_note_l_;
-#endif
-
- Link_array<Lilypond_item> candidates;
-
- for (int i=0; last_note && i < now_items.size (); i++)
- {
- Lilypond_note * now_note = dynamic_cast<Lilypond_note*> (now_items[i]);
- if (now_note && last_note->channel_i_ != now_note->channel_i_)
- candidates.push (now_note);
- }
-
- if (candidates.size())
- {
- now_items = candidates;
- }
-
- Lilypond_item * which = 0;
- if (now_items.size () > 1)
+ if (*i)
+ mom = (*i)->car_->at_mom ();
+ while (*i && (*i)->car_->at_mom () == mom)
{
- int mindiff = 100000; // ugh
- for (int i=0; last_note && i < now_items.size (); i++)
- {
- Lilypond_note *nt = dynamic_cast<Lilypond_note*> (now_items[i]);
- if (!nt)
- continue;
- int diff = abs (last_note->pitch_i_ - nt->pitch_i_ );
- if(diff < mindiff)
- {
- mindiff = diff;
- which = now_items [i];
- }
- }
-
- if (which && mindiff > 18) // more than 1.5 octaves apart. Don't put in same voice.
- {
- which =0;
- }
- }
- else if (now_items.size () == 1)
- which = now_items[0];
-
- if (which)
- {
- while ((*pp)->car_ != which)
- pp = &(*pp)->next_;
-
- mom += (*pp)->car_->duration_mom ();
- Cons<Lilypond_item>* c = items.remove_cons (pp);
- voice_p->add_item (c->car_);
+ Lilypond_note* note = dynamic_cast<Lilypond_note*> ((*i)->car_);
+ if (note && last_note
+ /* ugh, should sort out (whether to) channel before */
+ && (note->channel_i_ != last_note->channel_i_
+ || (note->duration_mom ()
+ != last_note->duration_mom ())))
+ break;
+ Cons<Lilypond_item>* c = items.remove_cons (i);
+ now_items.push (c->car_);
+ if (note)
+ last_note = note;
delete c;
}
- else
- {
- pp = &(*pp)->next_;
- continue;
- }
+
+ if (now_items.size ())
+ mom = now_items.top ()->at_mom ();
+ if (last_note)
+ mom += last_note->duration_mom ();
+
+ voice_p->add_items (now_items);
}
}
lilypond_stream_r << voicename << " = \\notes ";
- trackbody += "\\" + voicename + "\n";
-
+ trackbody += "\\context Voice = " + voicename + " \\" + voicename + "\n";
lilypond_stream_r << '\n';
i->car_->output (lilypond_stream_r);
c++;
+ lilypond_stream_r << '\n';
}
+ lilypond_stream_r << '\n';
lilypond_stream_r << _ ("% MIDI copyright:") << copyright_str_ << '\n';
lilypond_stream_r << _ ("% MIDI instrument:") << instrument_str_ << '\n';
lilypond_stream_r << id_str () << " = ";
- lilypond_stream_r << "<\n " << trackbody << " >\n";
+ lilypond_stream_r << "<\n" << trackbody << ">\n";
lilypond_stream_r << " % " << name_str () << '\n';
}
}
-#if 0 // not used for now
-void
-Lilypond_staff::output_lilypond_rest (Lilypond_stream& lilypond_stream_r, Rational begin_mom, Rational end_mom)
-{
- Rational bar_mom = lilypond_time_signature_l_->bar_mom ();
- Rational now_mom = begin_mom;
-
- int begin_bar_i = (int) (now_mom / bar_mom) + 1;
- int end_bar_i = (int) (end_mom / bar_mom) + 1;
-
- if (end_bar_i == begin_bar_i)
- {
- output_lilypond_rest_remain (lilypond_stream_r, end_mom - begin_mom);
- return;
- }
-
- // multiple bars involved
- int bar_i = (int) (now_mom / bar_mom) + 1;
-
- //fill current bar
- Rational begin_bar_mom = Rational (begin_bar_i - 1) * bar_mom;
- if (now_mom > begin_bar_mom)
- {
- int next_bar_i = (int) (now_mom / bar_mom) + 2;
- Rational next_bar_mom = Rational (next_bar_i - 1) * bar_mom;
- assert (next_bar_mom <= end_mom);
-
- Rational remain_mom = next_bar_mom - now_mom;
- if (remain_mom > Rational (0))
- {
- output_lilypond_rest_remain (lilypond_stream_r, remain_mom);
- now_mom += remain_mom;
- }
-
- bar_i = check_end_bar_i (now_mom, bar_i);
- }
-
- // fill whole bars
- int count_i = end_bar_i - bar_i;
- for (int i = 0; i < count_i; i++)
- {
- int begin_bar_i = check_begin_bar_i (now_mom, bar_i);
- if (begin_bar_i)
- output_lilypond_begin_bar (lilypond_stream_r, now_mom, begin_bar_i);
- lilypond_stream_r << "r1 ";
- // *lilypond_stream_r.os_p_ << flush;
- if (begin_bar_i)
- LOGOUT (NORMAL_ver) << begin_bar_i << flush;
- bar_i = check_end_bar_i (now_mom, bar_i);
- now_mom += bar_mom;
- }
-
- // use "int i" here, and gcc 2.7.2 hits internal compiler error
- int ii = check_begin_bar_i (now_mom, bar_i);
- if (ii)
- output_lilypond_begin_bar (lilypond_stream_r, now_mom, ii);
-
- // bar_i = check_end_bar_i (now_mom, bar_i);
-
- Rational remain_mom = end_mom - Rational (end_bar_i - 1) * bar_mom;
- if (remain_mom > Rational (0))
- {
- output_lilypond_rest_remain (lilypond_stream_r, remain_mom);
- now_mom += remain_mom;
- }
- assert (now_mom == end_mom);
-}
-
-void
-Lilypond_staff::output_lilypond_rest_remain (Lilypond_stream& lilypond_stream_r, Rational mom)
-{
- if (Duration_convert::no_quantify_b_s)
- {
- Duration dur = Duration_convert::mom2_dur (mom);
- lilypond_stream_r << "r" << dur.str () << " ";
- // assert (mom == dur.mom ());
- assert (mom == dur.length ());
- return;
- }
-
- Duration dur = Duration_convert::mom2standardised_dur (mom);
- if (dur.type_i_>-10)
- lilypond_stream_r << "r" << dur.str () << " ";
-}
-#endif
-
-
void
Lilypond_staff::process ()
{
/*
- group items into voices
- */
+ group items into voices
+ */
assert (lilypond_score_l_g);
lilypond_key_l_ = lilypond_score_l_g->lilypond_key_l_;
projects / lilypond.git / commitdiff