From 86fde82d901b42d33ed736d802f9d5174b2be36a Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Mon, 2 Feb 2009 17:39:10 +0100 Subject: [PATCH] Quite a bunch of improvements This commits adds several improvements and bugfixes unveiled during the rehearsals here at Montpellier. The first violist wondered why the notes were so high, when I had simply forgotten a comma :-) The LICENSE document is also updated and bumped to version .2, which is the official version that covers this opera. --- LICENSE | 41 +++++++++++++++++++++++------------- definitions/settings.ly | 3 ++- instruments/alto1.ly | 4 ++-- instruments/clarinetteB.ly | 52 +++++++++++++++++++++++----------------------- master/common.ly | 4 ++-- master/instruments.ly | 6 +++--- master/master.ly | 2 +- parts.ly | 4 ++-- 8 files changed, 64 insertions(+), 52 deletions(-) diff --git a/LICENSE b/LICENSE index ef7781f..e31ae44 100755 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,8 @@ By using this work in any way, you must comply with the following license, -version 0.1 or later (see section 6 about future versions). +version 0.2 or later (see section 6 about future versions). - Libre Opera License v.0.1 + Libre Opera License v.0.2 0. Introduction @@ -20,8 +20,8 @@ reproduced in the PERFORMING document. The "work" means the copyrightable work licensed under this License; the General Public License may refer to it as "the program". The different authors -and licensors are listed in the THANKS document, with contact informations. -Each licensee (individuals or organizations) is addressed as "you". +and licensors are listed in the THANKS document, with contact informations. +Each licensee (individuals or organizations) is addressed as "you". The "source code" of the work is defined by the General Public License; it means the full machine- and human-readable (where possible) code needed to @@ -34,13 +34,19 @@ either computer- or human-generated, any media resulting from such a performance, and any use of narrative elements (characters, events, lyrics, dramatic structure). The Creative Commons license refers to it as the "Work". + The "source title" is the codename of the source code, used mainly while +developing the project. + + The "narrative title" is mentioned in the VERSION document; it is the title of +the narrative work. + 2. Source Code If you want to modify and/or redistribute this work, you must comply with the GNU General Public License, with the following exception: any interpretation of the source code as a narrative work is not regarded as an object-code form of the work, and therefore will be covered by the Creative -Commons by-NC-SA license instead of the GPL license. +Commons by-NC-SA license instead of the GPL license, as explained in section 4. The source code of the work, however, may be compiled, printed and reproduced as a printed score under the terms and conditions of the GPL license. @@ -54,39 +60,44 @@ publicly perform, or distribute, any media resulting from the narrative work, you must provide in a reasonable manner, either (i) the full machine-readable source code that has been used to generate the score, or (ii) a written document offering full access to the source code at no charge, to the general public. - The title of the narrative work may differ from the title of the source code; -if so, both titles have to be mentioned whenever the narrative work (or a -derived work) it either distributed or publicly performed. + 4. Derivative works Modifying this work is possible in three distinct ways: - + a. You may use the source code (or parts of the source code) in a completely different work, which must not include any narrative element of the original work; in this case the only license you must comply with is the GPL license, as -specified in section 2. +specified in section 2. You are allowed to ignore the narrative title, and refer +to the original code by using only the source title. b. You may use the source code to produce a modified version of the narrative work (for instance by keeping some characters or events, or by translating text -elements); in this case you must comply with the full license, as well as the +elements); in this case you must comply with this full license, as well as the GPL license and the Creative Commons license it depends on. A copy of all three -licenses must be distributed with the work. +licenses must be distributed with the work. You also have to mention both the +narrative title and the source title whenever the narrative work it either +distributed or publicly performed. If you have made major modifications that +change the narrative work, you have to use a different title than the original +narrative title (which you may, however, mention as a reference). c. You may use a performance (or a media resulting from a performance) of the narrative work to produce a new work, without modifying its original source -code. In this case you must comply with the Creative Commons +code. In this case you must comply only with the Creative Commons Attribution-NonCommercial-ShareAlike license, as specified in section 3; if the derivative work includes any other computer-readable elements, you must also provide the corresponding source for these elements, as well as the unmodified -source code of the original work. +source code of the original work. If you have made major modifications, you have +to use a different title than the original narrative title (which you must, +however, mention as a reference, as well as the original source title). 5. Special authorizations As implied by the Berne Convention for the Protection of Literary and Artistic Works, special authorizations can be given by the authors to use this work outside the terms of its license. Such authorizations have to be requested -directly from any of the authors, for specific purposes and motivations; such +directly from all of the authors, for specific purposes and motivations; such authorizations (if granted) will not change any of the terms of this license, and will remain limited in their extent and implications. diff --git a/definitions/settings.ly b/definitions/settings.ly index 91a83ae..55e77b6 100755 --- a/definitions/settings.ly +++ b/definitions/settings.ly @@ -1,4 +1,4 @@ -%------------------------------------------------------------------% +%------------------------------------------------------------------% % Opéra Libre -- settings.ly % % % % (c) Valentin Villenave, 2008 % @@ -100,6 +100,7 @@ \context { \DrumStaff \override StaffSymbol #'line-count = #1 + \override BarLine #'bar-size = #3 } } diff --git a/instruments/alto1.ly b/instruments/alto1.ly index e01b6c5..57f2076 100755 --- a/instruments/alto1.ly +++ b/instruments/alto1.ly @@ -1,4 +1,4 @@ -%------------------------------------------------------------------% +%------------------------------------------------------------------% % Opéra Libre -- alto1.ly % % % % (c) Valentin Villenave, 2008 % @@ -84,7 +84,7 @@ PrologueAltoUn = { \AltoUn re,8\sfz \clef treble r16 re'-.\mf re-. re-. | dod'8-.-> r16 re,-. re-. re-. | dod'8-.-> r16 re,-. re-. re-. | dod'8-.-> r16 re,-. re-. re-. | mi'8-.-> r16 si-. si-. si-. | - lad'8-.-> r16 si-. si-. si-. | lad'8-.-> r16 si,-. si-. si-. | + lad'8-.-> r16 si,-. si-. si-. | lad'8-.-> r16 si,-. si-. si-. | lad'8-.-> r16 si,-. si-. si-. | lad'8-.-> r16 si,-. si-. si-. | lad'-> lad, dod\< mi sol lad | sol8->\f r16 mi,\< mi mi | fa'8\! r16 mi,\< mi mi | mi'8\! r16 dod,\< dod dod | diff --git a/instruments/clarinetteB.ly b/instruments/clarinetteB.ly index 76d7d57..76c70b5 100755 --- a/instruments/clarinetteB.ly +++ b/instruments/clarinetteB.ly @@ -1,4 +1,4 @@ -%------------------------------------------------------------------% +%------------------------------------------------------------------% % Opéra Libre -- clarinetteB.ly % % % % (c) Valentin Villenave, 2008 % @@ -232,7 +232,7 @@ ActeUnSceneUnBisClarinetteDeux = { \ClarinetteBasse sol4 r sib2~sib4. sol8~sol2 | r4 sib sol2~sol4 r r2 | mi1~mi2. r4 | - R1*5 \clef treble + R1*5 r2 r4 r8 la'' | r la( sol si) r si( sol la) | r \simile la sol si r si sol la | @@ -485,12 +485,12 @@ ActeUnSceneTroisTerClarinetteDeux = { \ClarinetteDeux R2. re2.~-- re2 r4 | R2. - re2-- r4 | \clef treble + re2-- r4 | r8 si'''\mp\<( sib sol fad mib\> re'2\!) r4 | r8 si\<( sib sol fad mib\> re'2\!) r4 | r8 si\p\<( sib sol fad mib\> re'2\!) r4 | } - re,4-- r2 \clef "G_8" + re,4-- r2 r4 \t {r8 mi\p( dod} \t {sold) fa( do)} | r8 sold\mp( la do dod mi) | \ten fa,2.~-- fa4 r2 | r8 sold( la do dod mi) | fa,2.~-- fa4 r2 | @@ -504,10 +504,10 @@ ActeUnSceneTroisTerClarinetteDeux = { \ClarinetteDeux fa2.~-- fa4 r2 r4 dod'2-- | fa,2.~-- fa4 r2 r4 la2--\mp\< | dod,2.~--\! dod4 r2 r4 la'2--\< | - dod,2.~--\! dod4 r2 | \clef treble + dod,2.~--\! dod4 r2 | mib''4\<( sib' si\!) | r8 sib\f( si fad sol re mib) sib'( si fad sol re | - mib) sib'\>( si4\!) \clef "G_8" r8 sib,( si4\mp) sib,-- r | + mib) sib'\>( si4\!) r8 sib,( si4\mp) sib,-- r | R2.*15 } } @@ -662,13 +662,13 @@ EntracteClarinetteDeux = { \ClarinetteDeux %%% Andantino %%% \ten la'1~\p la2~ la1~ la4 r | - la1~ la2~ la2. r4 R2. \clef treble | + la1~ la2~ la2. r4 R2. | %%% Largo non troppo %%% la'4\mp( sol8 r fa4 mi8 r fa\< mi fa sol) | la4\!\(( sol8) r fa4( mi8) r fa\<( mi) fa sol\) | la4\! sol8 r fa4 mi8 r fa mi fa sol | - la2( mi) r \clef "G_8" | + la2( mi) r | la,,\mf( la') la,-- si( si') r | do,( do') do,-- re( re') r | la'-- la,,-- la''-- sol-- si,,-- r | @@ -682,10 +682,10 @@ EntracteClarinetteDeux = { \ClarinetteDeux ActeDeuxSceneUnClarinetteDeux = { \ClarinetteBasse \relative { - R2.*4 R2 R2.*2 R2 | \ten mi2.~ | mi2.~ | mi2.~ | mi4 r \clef treble - mib'4\mp( sib2~) | sib4 r | do8( sol~) sol2~| sol2.~ | sol4 r \clef "G_8" | + R2.*4 R2 R2.*2 R2 | \ten mi2.~ | mi2.~ | mi2.~ | mi4 r + mib'4\mp( sib2~) | sib4 r | do8( sol~) sol2~| sol2.~ | sol4 r | mi,2.~-- | mi2.~ | mi2.~ | mi4 r | - R2. R2 R2.*2 R2 | R2. \clef treble | re''2.~\p\<| re2.~\mf\>| re4\! r \clef "G_8" | + R2. R2 R2.*2 R2 | R2. | re''2.~\p\<| re2.~\mf\>| re4\! r | %%% Entrée de la Soprano Deux %%% R2.*2 R1 R2. do,,1\mp fa,2.~-- fa4 r | mi2.~\p mi2 r | @@ -696,16 +696,16 @@ ActeDeuxSceneUnClarinetteDeux = { \ClarinetteBasse mi2 r4 R1 R2. do4--\mp sol'-- fad8( re) do4-- | R2. R1 sib4-- fa'-- mi8( do) sib2.-- r4 | R2. R1 sib2--\p r4 R1 R2. | R1 R2. R1 R2. R1 R2. R1 - r4 \clef treble fad''8\mf( sold si sold fad re) dod\>( re fad sold si fad | + r4 fad''8\mf( sold si sold fad re) dod\>( re fad sold si fad | %%% Entrée de la Contralto %%% - sold2.~\p) sold2. r4 \clef "G_8" | R2. R1 R2. R1 R2. R1 + sold2.~\p) sold2. r4 | R2. R1 R2. R1 R2. R1 \ten do,,2.~\p do2. r4 | R2. r4 do2-- r4 reb2.~-- reb2. r4 | r4 do-- r R1 | fad,8-.\mp r r2 | R1 R2. R1 R2. \ten sol2.~--\mp sol2 r4 | R2.*4 r4 mi'2--\mf \ten mib2.~-- mib~ mib4 r r2 | R2. re1~ re4 r2 | R1 lab2.--\mp( la2.) r4 lab2.--( sol2.) r4 | R2. R1 R2. do'4\p( sib la sol la8 sol la sib do4 sol) r | fa2.-- r4 | - R2. R1 R2. R1 R2. \clef treble sol'4\p( mi) r2 | + R2. R1 R2. R1 R2. sol'4\p( mi) r2 | } } @@ -802,15 +802,15 @@ ActeDeuxSceneUnBisClarinetteDeux = { \ClarinetteBasse ActeDeuxSceneDeuxClarinetteDeux = { \ClarinetteBasse \relative { - \clef treble lab'2\mp( fa4) r r2 | lab2( fa4) r r2 R1. | lab4-- r fa-- r r2 | - R1.*2 fa4\p( reb) r2 R1 R2. \clef "G_8" + lab'2\mp( fa4) r r2 | lab2( fa4) r r2 R1. | lab4-- r fa-- r r2 | + R1.*2 fa4\p( reb) r2 R1 R2. sol,4--\mf \stdet {sol8 sol r4 | mib'8 mib r4 r8 mib} | - r16 \st {la, la la r8 mib'--} r4 | r r16 \clef treble fa8--( lab16) mi4-- | + r16 \st {la, la la r8 mib'--} r4 | r r16 fa8--( lab16) mi4-- | re1-- r2 | R1. - fa4( reb) r1 \clef "G_8" | reb4( fa,) r2 | R1 R2. + fa4( reb) r1 | reb4( fa,) r2 | R1 R2. sol4--\mf \stdet {sol8 sol} r red'( mi4) | do-- r8 | - si,2--\p r4 \clef treble \ind #"en dehors" sold''8--\mf \det {sold la4 r r sold8 sold | - la4 r r si8 si mib4} r r2 \clef "G_8" | \ten solb,,1~\mp solb2. r4 | + si,2--\p r4 \ind #"en dehors" sold''8--\mf \det {sold la4 r r sold8 sold | + la4 r r si8 si mib4} r r2 | \ten solb,,1~\mp solb2. r4 | R2. R1. la2.--\p r4 | do,2.-- r4 | fa,2.~\pp fa~ fa2 r4 | R2 @@ -822,7 +822,7 @@ ActeDeuxSceneDeuxClarinetteDeux = { \ClarinetteBasse reb''4( solb,) r2 | R2. R1 R2. R1 R2. R1 R2. - R1 R2. R1 \clef treble sib4( do re | + R1 R2. R1 sib4( do re | mib2) fab8( mib fab solb | \ten lab2.~) lab4 r r2 | R2. R1 R2. R1 R2. R1 r2 r8 r16 \t {sol32\<( fa mi} | la8-.\f) r r4 | @@ -830,15 +830,15 @@ ActeDeuxSceneDeuxClarinetteDeux = { \ClarinetteBasse r2 r8 \t {sol16( fa mi} | la8-.) r r4 r2 | R1*2 \st {la8 la sold} r4 | sold4-- r8 \st {la la} | - sold4-- \clef "G_8" \st {la,,8 la sold | + sold4-- \st {la,,8 la sold | sold'' la,,-> la sold r | - mib mib re} r4 | mib'4---> r r8 | R2*5/4 \clef treble - \st {la'8 la sold} r4 | r \clef "G_8" la,,8 la sold | + mib mib re} r4 | mib'4---> r r8 | R2*5/4 + \st {la'8 la sold} r4 | r la,,8 la sold | mib'4 r r8 | R2*5/4*4 R1*2 si4->\sffz r r2 | R1*6 - re4-.->\sfz r2 | re,4---.\p r | r2 r4 \clef treble solb''16\mp( mi8) solb16( | - fa1) R2.*2 \clef "G_8" \ten la,2.~\p la2 r4 | R2.*3 + re4-.->\sfz r2 | re,4---.\p r | r2 r4 solb''16\mp( mi8) solb16( | + fa1) R2.*2 \ten la,2.~\p la2 r4 | R2.*3 \stdet {la,8\p r mib r lab r re, r | reb r sol r do r | fa, r si r mi, r | diff --git a/master/common.ly b/master/common.ly index b72edbd..673ece5 100755 --- a/master/common.ly +++ b/master/common.ly @@ -1,4 +1,4 @@ -%------------------------------------------------------------------% +%------------------------------------------------------------------% % Opéra Libre -- common.ly % % % % (c) Valentin Villenave, 2008 % @@ -43,7 +43,7 @@ %% Vertical margins -----------------------------------------------% page-top-space = #(* 7 mm) - between-system-space = 10 \mm + between-system-space = 2 \mm between-system-padding = #5 %before-title-space = 10 \mm %between-title-space = 2 \mm diff --git a/master/instruments.ly b/master/instruments.ly index b56d087..5f79ce3 100644 --- a/master/instruments.ly +++ b/master/instruments.ly @@ -1,4 +1,4 @@ -%------------------------------------------------------------------% +%------------------------------------------------------------------% % Opéra Libre -- master.ly % % % % (c) Valentin Villenave, 2008 % @@ -78,7 +78,7 @@ ActeDeuxSceneTrois = \makeSection { \smart \transpose la do' \ActeDeuxSceneTroi \include "./master/master.ly" } % -%} +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%% Saxophones %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Prologue = \makeSection { \smart \transpose mib do' \PrologueSaxophoneUn } { \smart \transpose mib do' \PrologueSaxophoneDeux } \PrologueMesures @@ -176,7 +176,7 @@ ActeDeuxSceneTrois = \makePart \ActeDeuxSceneTroisViolonTrois \ActeDeuxSceneTroi \bookpart { \include "./master/master.ly" } -% +%} %%%%%%%%%%%%%%%%%%%%%%%%%%%%% Altos %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/master/master.ly b/master/master.ly index 5d9c486..4a9b157 100644 --- a/master/master.ly +++ b/master/master.ly @@ -1,4 +1,4 @@ -%------------------------------------------------------------------% +%------------------------------------------------------------------% % Opéra Libre -- master.ly % % % % (c) Valentin Villenave, 2008 % diff --git a/parts.ly b/parts.ly index 865142a..ac65b8c 100644 --- a/parts.ly +++ b/parts.ly @@ -1,4 +1,4 @@ -%------------------------------------------------------------------% +%------------------------------------------------------------------% % Opéra Libre -- parts.ly % % % % (c) Valentin Villenave, 2008 % @@ -52,7 +52,7 @@ PercuDeuxMains= \include "./master/common.ly" \header { - scoretype = "Saxophones" + scoretype = "Altos" } \paper { #(define page-breaking ly:page-turn-breaking) } -- 2.11.4.GIT