From 5bc609fa09271d1fd1af467083e31901ec35ff67 Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Wed, 19 Nov 2008 19:31:40 +0100 Subject: [PATCH] License corrections --- COPYING | 4 ++-- LICENSE | 46 ++++++++++++++++++++++++++++++++++++++-------- instruments/reduction.ly | 30 ++++++++++++++++++++++++++++++ instruments/saxophone1.ly | 2 +- texte/didascalies.ly | 12 ++++++------ vocal_score.ly | 30 ++++++++++++++++++++++++++---- 6 files changed, 103 insertions(+), 21 deletions(-) diff --git a/COPYING b/COPYING index d19146a..669d653 100755 --- a/COPYING +++ b/COPYING @@ -1,6 +1,6 @@ - If you want to modify and/or redistribute this work as a score, + If you want to modify and/or redistribute this work as a LilyPond score, you must comply with the GNU General Public License (reproduced below) -v3 or later. +version 3 or later. GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/LICENSE b/LICENSE index 900381f..16d5f7b 100755 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,7 @@ + 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). + + Libre Opera License v.0.1 0. Introduction @@ -12,6 +16,8 @@ COPYING document. The Creative Commons Attribution-NonCommercial-ShareAlike license is reproduced in the PERFORMING document. +1. Definitions + 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. @@ -28,7 +34,7 @@ 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". -1. Source Code +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: @@ -38,10 +44,10 @@ Commons by-NC-SA license instead of the GPL license. 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. -2. Narrative work +3. Narrative work If you want to perform and/or record and/or distribute any recording based on -the narrative work, you must comply with the Creative Commons +the narrative work, you must comply with the Creative Commons Attribution-NonCommercial-ShareAlike license, with the following exceptions: in addition to the credits specified in section 4(d) of the license, if you publicly perform, or distribute, any media resulting from the narrative work, @@ -52,7 +58,30 @@ offering full access to the source code at no charge, to the general public. if so, both titles have to be mentioned whenever the narrative work (or a derived work) it either distributed or publicly performed. -3. Special authorizations +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. + + 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 +GPL license and the Creative Commons license it depends on. A copy of all three +licences must be distributed with the work. + + 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 +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. + +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 @@ -61,10 +90,11 @@ directly from any 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. -4. Future versions of this license +6. Future versions of this license The terms specified by this license are valid for as long as the copyright of the work remains applicable in the country where it is read or performed, and -therefore no future version of this license will add any obligations to these. -However, later versions may imply additional permissions by specifying less -restrictive terms and conditions. \ No newline at end of file +therefore no future version of this license will add any obligations to these. + If you ever were to find more restrictive terms in a future version, you may +use an older version at your convenience. However, later versions may imply +additional permissions by specifying less restrictive terms and conditions. \ No newline at end of file diff --git a/instruments/reduction.ly b/instruments/reduction.ly index dffb0cc..5be3547 100755 --- a/instruments/reduction.ly +++ b/instruments/reduction.ly @@ -1103,6 +1103,36 @@ ActeUnSceneUnBisMainGauche = { ActeUnSceneUnBisNuances = { } +InterludeUnMainDroite = { + \relative { + fad4 red8 r fad4 red8 r fad4 red8 r R1*2 + sol4 mib8 r sol4 mib8 r | + R1. sol4 mi!8 r r2 | + sol4 mi8 r \pl {mi16 fa4..} + {sold4 mi8 s} + sold4 \pl {re8 \t {fa16 la sold}} + {mi8 s } | + \pl {sold4 mi8 r} si'2 + } +} + +InterludeUnMainGauche = { + \relative { \clef bass + r8 la r la r la r la + r la32 reb64[ mib re16]~ re4~ | + re8. do16 si sol lab fa re'2~ | + re8 r r4 r2 | + r8 sol, r sol r + \pl {s8 r8 sol s8} + {sol16 mi'? sol4~ sol8} r r4 r1 | + r8 sol, r sol r2 | + r8 r + r r + r r | + + } +} + ActeUnSceneDeuxMainDroite = { \relative{ diff --git a/instruments/saxophone1.ly b/instruments/saxophone1.ly index 34e8439..d30bb25 100755 --- a/instruments/saxophone1.ly +++ b/instruments/saxophone1.ly @@ -188,7 +188,7 @@ ActeUnSceneUnBisSaxophoneUn = { \SaxAltoUn InterludeUnSaxophoneUn = { \SaxAltoUn \relative { r1 re32 mib re4..~ | re8. do16 si sol lab fa re'2~ | - re8 r r4 r2 | r2 \t {mib8 mi sol~} sol4 | sol8 r r4 r1 | + re8 r r4 r2 | r2 \t {mib8 mi sol~} sol4~ | sol8 r r4 r1 | R1 r2 mi16 fa4.. r4 \tt {re16 mi fa la sold } | si1 r2 | r16 mi, sold8 sol16 si8 sib16 re2~ re4 r r2 | r4 r8 mi,32 fa mi16~ mi2 r8 mi4. | mi8 fa4.~ fa2. r4 | diff --git a/texte/didascalies.ly b/texte/didascalies.ly index cc1fea0..d67511d 100755 --- a/texte/didascalies.ly +++ b/texte/didascalies.ly @@ -446,18 +446,18 @@ Chef se décompose." ActeDeuxSceneUnBisJ = "Du pied, l'Étranger donne à nouveau un tout petit coup au Roi." -ActeDeuxSceneUnBisK = "Le Chef s'approche doucement, visiblement tenté ; -soudain des accords de l'orchestre l'interrompent. -Il hésite un peu, puis même jeu. Enfin, au prix d'un effort manifeste, +ActeDeuxSceneUnBisK = "Le Chef s'approche et regarde ses pieds, visiblement tenté ; +mais des accords de l'orchestre l'interrompent. +Il hésite un peu, puis même jeu, toujours en regardant ses pieds. Enfin, au prix d'un effort manifeste, il arme son pied..." -ActeDeuxSceneUnBisL = "Mais à cet instant précis, le Roi revient à lui, -et entreprend de se relever. Le Chef recule précipitamment." +ActeDeuxSceneUnBisL = "Mais il se retrouve nez-à-nez avec le Roi, qui est revenu à lui et s'est relevé pendant son jeu de scène. +Le Chef recule précipitamment." ActeDeuxSceneUnBisM = "Le Chef se prosterne." ActeDeuxSceneUnBisN = "Le Chef interrompt l'Étranger, -d'un quasi-aboiement." +presque en aboyant." ActeDeuxSceneUnBisO = "L'Étranger s'interrompt, supris." diff --git a/vocal_score.ly b/vocal_score.ly index d074b3c..b8e5f4c 100755 --- a/vocal_score.ly +++ b/vocal_score.ly @@ -113,6 +113,22 @@ ActeUnSceneUnBis = { >> } +InterludeUn = { + << + \new TopLine \InterludeUnMesures + \new ChoirStaff + << + \new Staff \new Voice = "contralto" \InterludeUnContralto + \new Lyrics \lyricsto "contralto" { \InterludeUnContraltoTexte } + >> + \new PianoStaff { \Accompagnement << + \new StaffPiano = "md" \InterludeUnMainDroite + \new StaffPiano = "mg" \InterludeUnMainGauche + >> + } + >> +} + ActeUnSceneDeux = { << \new TopLine \ActeUnSceneDeuxMesures @@ -348,7 +364,7 @@ ActeDeuxSceneTrois = { } %%%%%%%%%%%%%%%%%%%%%%%%% The actual score %%%%%%%%%%%%%%%%%%%%%%%%% -showFirstLength = s1*40 +%showFirstLength = s1*40 \book { \header { title = \OperaTitre @@ -362,19 +378,25 @@ showFirstLength = s1*40 \header { piece = \PrologueTitre } - } %} + } % \score { \ActeUnSceneUn \header { piece = \ActeUnSceneUnTitre } - } %{ + } % \score { \ActeUnSceneUnBis \header { piece = \Separateur } - } % + } %} + \score { + \InterludeUn + \header { + piece = \Interlude + } + } %{ \score { \ActeUnSceneDeux \header { -- 2.11.4.GIT