Split up a code again coming from different copyright notice
to show up easier in COPYING.
it was originally merged from separate file by 2e2121f9 though.
This commit is contained in:
Akira TAGOH
parent
dbef9d10de
commit
dc1443ac83
|
|
@ -86,7 +86,7 @@ LDADD = $(LIBINTL)
|
|||
|
||||
EXTRA_DIST += makealias
|
||||
|
||||
noinst_HEADERS=fcint.h fcftint.h fcdeprecate.h fcmd5.h fcstdint.h
|
||||
noinst_HEADERS=fcint.h fcftint.h fcdeprecate.h fcfoundry.h fcmd5.h fcstdint.h
|
||||
|
||||
ALIAS_FILES = fcalias.h fcaliastail.h fcftalias.h fcftaliastail.h
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
/*
|
||||
Copyright © 2002-2003 by Juliusz Chroboczek
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
/* Order is significant. For example, some B&H fonts are hinted by
|
||||
URW++, and both strings appear in the notice. */
|
||||
|
||||
static const char *FcNoticeFoundries[][2] =
|
||||
{
|
||||
{"Adobe", "adobe"},
|
||||
{"Bigelow", "b&h"},
|
||||
{"Bitstream", "bitstream"},
|
||||
{"Gnat", "culmus"},
|
||||
{"Iorsh", "culmus"},
|
||||
{"HanYang System", "hanyang"},
|
||||
{"Font21", "hwan"},
|
||||
{"IBM", "ibm"},
|
||||
{"International Typeface Corporation", "itc"},
|
||||
{"Linotype", "linotype"},
|
||||
{"LINOTYPE-HELL", "linotype"},
|
||||
{"Microsoft", "microsoft"},
|
||||
{"Monotype", "monotype"},
|
||||
{"Omega", "omega"},
|
||||
{"Tiro Typeworks", "tiro"},
|
||||
{"URW", "urw"},
|
||||
{"XFree86", "xfree86"},
|
||||
{"Xorg", "xorg"},
|
||||
};
|
||||
|
||||
#define NUM_NOTICE_FOUNDRIES (int) (sizeof (FcNoticeFoundries) / sizeof (FcNoticeFoundries[0]))
|
||||
|
|
@ -22,28 +22,6 @@
|
|||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/*
|
||||
Copyright © 2002-2003 by Juliusz Chroboczek
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "fcint.h"
|
||||
#include "fcftint.h"
|
||||
#include <stdlib.h>
|
||||
|
|
@ -65,6 +43,7 @@
|
|||
#endif
|
||||
#include FT_MULTIPLE_MASTERS_H
|
||||
|
||||
#include "fcfoundry.h"
|
||||
#include "ftglue.h"
|
||||
|
||||
/*
|
||||
|
|
@ -927,33 +906,6 @@ FcSfntNameLanguage (FT_SfntName *sname)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* Order is significant. For example, some B&H fonts are hinted by
|
||||
URW++, and both strings appear in the notice. */
|
||||
|
||||
static const char *FcNoticeFoundries[][2] =
|
||||
{
|
||||
{"Adobe", "adobe"},
|
||||
{"Bigelow", "b&h"},
|
||||
{"Bitstream", "bitstream"},
|
||||
{"Gnat", "culmus"},
|
||||
{"Iorsh", "culmus"},
|
||||
{"HanYang System", "hanyang"},
|
||||
{"Font21", "hwan"},
|
||||
{"IBM", "ibm"},
|
||||
{"International Typeface Corporation", "itc"},
|
||||
{"Linotype", "linotype"},
|
||||
{"LINOTYPE-HELL", "linotype"},
|
||||
{"Microsoft", "microsoft"},
|
||||
{"Monotype", "monotype"},
|
||||
{"Omega", "omega"},
|
||||
{"Tiro Typeworks", "tiro"},
|
||||
{"URW", "urw"},
|
||||
{"XFree86", "xfree86"},
|
||||
{"Xorg", "xorg"},
|
||||
};
|
||||
|
||||
#define NUM_NOTICE_FOUNDRIES (int) (sizeof (FcNoticeFoundries) / sizeof (FcNoticeFoundries[0]))
|
||||
|
||||
static const FcChar8 *
|
||||
FcNoticeFoundry(const FT_String *notice)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue