CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/23 15:04:36
Modified files:
. : COPYING ChangeLog
Documentation/topdocs: AUTHORS.texi
buildscripts : gen-emmentaler-scripts.py
lily : ttf.cc
Log message:
(notice): add GPL notice
to fonts.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/COPYING.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3814&tr2=1.3815&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/AUTHORS.texi.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/gen-emmentaler-scripts.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ttf.cc.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: lilypond/COPYING
diff -u lilypond/COPYING:1.13 lilypond/COPYING:1.14
--- lilypond/COPYING:1.13 Tue May 3 22:27:54 2005
+++ lilypond/COPYING Thu Jun 23 15:04:33 2005
@@ -2,14 +2,11 @@
*** NOTE
-1. This license applies to all files that do not explicitly specify
-another license.
-
-2. This license does not apply to the included example input files
+1. This license does not apply to the included example input files
(which are in the subdirectory input/).
-3. The following addition applies to the fonts included in this
+2. The following addition applies to the fonts included in this
package.
As a special exception, if you create a document which uses
@@ -25,6 +22,10 @@
Sources of the included fonts are in the subdirectory mf/
+3. This license applies to all other files that do not explicitly
+specify another license.
+
+
*** END NOTE
GNU GENERAL PUBLIC LICENSE
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3814 lilypond/ChangeLog:1.3815
--- lilypond/ChangeLog:1.3814 Thu Jun 23 10:56:06 2005
+++ lilypond/ChangeLog Thu Jun 23 15:04:34 2005
@@ -1,3 +1,8 @@
+2005-06-23 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * buildscripts/gen-emmentaler-scripts.py (notice): add GPL notice
+ to fonts.
+
2005-06-23 Mats Bengtsson <[EMAIL PROTECTED]>
* scripts/lilypond-book.py (LATEX_DOCUMENT): More or less ugly
Index: lilypond/Documentation/topdocs/AUTHORS.texi
diff -u lilypond/Documentation/topdocs/AUTHORS.texi:1.48
lilypond/Documentation/topdocs/AUTHORS.texi:1.49
--- lilypond/Documentation/topdocs/AUTHORS.texi:1.48 Tue May 31 12:16:40 2005
+++ lilypond/Documentation/topdocs/AUTHORS.texi Thu Jun 23 15:04:34 2005
@@ -20,7 +20,6 @@
Core code:
@itemize @bullet
-
@item @email{erlenda@@gmail.com,Erlend Aasland}
Color support, tablature improvements, trivial \mark stuff
@item @email{benkop@@freestart.hu,Pal Benko},
@@ -46,14 +45,15 @@
@item @uref{http://www.ipd.uka.de/~reuter, Jürgen Reuter},
Ancient notation support (mensural notation,
Gregorian chant notation), ambitus, clusters.
[EMAIL PROTECTED] @email{nicolas.sceaux@@free.fr,Nicolas Sceaux },
[EMAIL PROTECTED] @email{nicolas.sceaux@@free.fr,Nicolas Sceaux},
Scheme macros, \markup syntax.
[EMAIL PROTECTED] @email{carldsorensen@@comcast.net, Carl Sorensen },
[EMAIL PROTECTED] @email{carldsorensen@@comcast.net, Carl Sorensen},
Fret diagrams.
@item @email{rune@@zedeler.dk, Rune Zedeler},
Auto-accidental code, zigzag glissandi, rest bugfixes, minimum
fret, @code{subdivideBeams}.
-
[EMAIL PROTECTED] @email{jch@@pps.jussieu.fr,Juliusz Chroboczek},
+ Type42 code.
@end itemize
Font
@@ -80,15 +80,6 @@
"espressivo" mark.
@end itemize
-TTF library
-
[EMAIL PROTECTED]
[EMAIL PROTECTED] @email{jch@@pps.jussieu.fr,Juliusz Chroboczek },
- Main author.
[EMAIL PROTECTED] @email{hanwen@@xs4all.nl, Han-Wen Nienhuys},
- @uref{http://www.xs4all.nl/~hanwen/},
- Integration.
[EMAIL PROTECTED] itemize
Documentation and examples
Index: lilypond/buildscripts/gen-emmentaler-scripts.py
diff -u lilypond/buildscripts/gen-emmentaler-scripts.py:1.13
lilypond/buildscripts/gen-emmentaler-scripts.py:1.14
--- lilypond/buildscripts/gen-emmentaler-scripts.py:1.13 Tue May 3
00:42:56 2005
+++ lilypond/buildscripts/gen-emmentaler-scripts.py Thu Jun 23 15:04:36 2005
@@ -31,7 +31,15 @@
# Separate Feta versioning?
# * using 20 as Weight works for gnome-font-select widget: gfs
-SetFontNames("%(name)s-%(design_size)d", "%(name)s", "%(name)s
%(design_size)d", "%(design_size)d", "GNU GPL", "@TOPLEVEL_VERSION@");
+
+notice = "";
+notice += "This font is distributed under the GNU General Public License. ";
+notice += "As a special exception, if you create a document which uses ";
+notice += "this font, and embed this font or unaltered portions of this ";
+notice += "font into the document, this font does not by itself cause the ";
+notice += "resulting document to be covered by the GNU General Public
License.";;
+
+SetFontNames("%(name)s-%(design_size)d", "%(name)s", "%(name)s
%(design_size)d", "%(design_size)d", notice, "@TOPLEVEL_VERSION@");
MergeFonts("feta%(design_size)d.pfa");
MergeFonts("parmesan%(design_size)d.pfa");
@@ -61,13 +69,13 @@
MergeFonts("feta-alphabet%(design_size)d.pfa");
MergeKern("feta-alphabet%(design_size)d.tfm");
-LoadTableFromFile("LILF", "%(filename)s-%(design_size)d.subfonts")
-LoadTableFromFile("LILC", "feta%(design_size)d.otf-table")
-LoadTableFromFile("LILY", "feta%(design_size)d.otf-gtable")
+LoadTableFromFile("LILF", "%(filename)s-%(design_size)d.subfonts");
+LoadTableFromFile("LILC", "feta%(design_size)d.otf-table");
+LoadTableFromFile("LILY", "feta%(design_size)d.otf-gtable");
Generate("%(filename)s-%(design_size)d.otf");
Generate("%(filename)s-%(design_size)d.svg");
-SetFontNames("PFA%(name)s-%(design_size)d", "PFA%(name)s", "PFA%(name)s
%(design_size)d", "%(design_size)d", "GNU GPL", "@TOPLEVEL_VERSION@");
+SetFontNames("PFA%(name)s-%(design_size)d", "PFA%(name)s", "PFA%(name)s
%(design_size)d", "%(design_size)d", notice, "@TOPLEVEL_VERSION@");
# different name to prevent conflict with OTF
#LoadEncodingFile("feta%(design_size)d.enc");
Index: lilypond/lily/ttf.cc
diff -u lilypond/lily/ttf.cc:1.2 lilypond/lily/ttf.cc:1.3
--- lilypond/lily/ttf.cc:1.2 Tue Jun 21 23:25:40 2005
+++ lilypond/lily/ttf.cc Thu Jun 23 15:04:36 2005
@@ -17,6 +17,10 @@
#include "lily-guile.hh"
#include "main.hh"
+
+/*
+ Based on ttfps by Juliusz Chroboczek
+ */
static void
print_header (void *out, FT_Face face)
{
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
