From: hanwen <hanwen>
Date: Thu, 23 Jun 2005 15:04:36 +0000 (+0000)
Subject: (notice): add GPL notice
X-Git-Tag: release/2.7.2~118
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=591083d592ec2f2fc471258548e6d774853401ed;p=lilypond.git

(notice): add GPL notice
to fonts.
---

diff --git a/COPYING b/COPYING
index 545b9dced7..18517aeb15 100644
--- a/COPYING
+++ b/COPYING
@@ -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 @@ package.
 
 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
diff --git a/ChangeLog b/ChangeLog
index e31a343a7e..f65254400a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-23  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* buildscripts/gen-emmentaler-scripts.py (notice): add GPL notice
+	to fonts.
+
 2005-06-23  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
 	* scripts/lilypond-book.py (LATEX_DOCUMENT): More or less ugly
diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi
index ef97eb5cec..a2afe4f5b8 100644
--- a/Documentation/topdocs/AUTHORS.texi
+++ b/Documentation/topdocs/AUTHORS.texi
@@ -20,7 +20,6 @@ contributed over 100 lines of code.
 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 @@ Core code:
 @item @uref{http://www.ipd.uka.de/~reuter, Jürgen Reuter},
     Ancient notation  support (mensural notation,
     Gregorian chant notation), ambitus, clusters.
-@item @email{nicolas.sceaux@@free.fr,Nicolas Sceaux  },
+@item @email{nicolas.sceaux@@free.fr,Nicolas Sceaux},
     Scheme macros, \markup syntax.
-@item @email{carldsorensen@@comcast.net, Carl Sorensen  },
+@item @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}.
- 
+@item @email{jch@@pps.jussieu.fr,Juliusz Chroboczek},
+    Type42 code.
 @end itemize
 
 Font
@@ -80,15 +80,6 @@ Font
     "espressivo" mark.
 @end itemize
 
-TTF library
-
-@itemize
-@item @email{jch@@pps.jussieu.fr,Juliusz Chroboczek },
-    Main author.
-@item @email{hanwen@@xs4all.nl, Han-Wen Nienhuys}, 
-    @uref{http://www.xs4all.nl/~hanwen/},
-    Integration.
-@end itemize
 
 Documentation and examples
 
diff --git a/buildscripts/gen-emmentaler-scripts.py b/buildscripts/gen-emmentaler-scripts.py
index e13d9c9f5e..b68855acb6 100644
--- a/buildscripts/gen-emmentaler-scripts.py
+++ b/buildscripts/gen-emmentaler-scripts.py
@@ -31,7 +31,15 @@ New();
 
 # 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 @@ endloop
 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");
diff --git a/lily/ttf.cc b/lily/ttf.cc
index a40155e48d..3bdf45ff0c 100644
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -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)
 {