enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

1. fix korean font a bit - much nicer now. fix kochi filename to match 

original, and ship copyright info with fonts :)


SVN revision: 13843
This commit is contained in:
Carsten Haitzler 2005-03-22 09:09:12 +00:00
parent 77c7f60021
commit 88f32f21de
8 changed files with 62 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/fonts/Bandal.ttf
View File

Binary file not shown.

BIN
data/fonts/Kochi.ttf
View File

Binary file not shown.

9
data/fonts/Makefile.am
View File

@ -1,8 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/enlightenment/data/fonts
files_DATA = \
Bandal.ttf \
Kochi.ttf \
Vera.COPYING \
Vera.ttf \
VeraBI.ttf \
VeraBd.ttf \
@ -13,7 +12,11 @@ VeraMoIt.ttf \
VeraMono.ttf \
VeraSe.ttf \
VeraSeBd.ttf \
baekmuk.COPYING \
dotum.ttf \
fonts.alias \
fonts.dir
fonts.dir \
kochi-gothic.ttf \
kochi.COPYING
EXTRA_DIST = $(files_DATA)

47
data/fonts/Vera.COPYING Normal file
View File

@ -0,0 +1,47 @@
Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
Bitstream Vera is a trademark of Bitstream, Inc.
Permission is hereby granted, free of charge, to any person
obtaining a copy of the fonts accompanying this license (“Fonts”)
and associated documentation files (the “Font Software”), to
reproduce and distribute the Font Software, including without
limitation the rights to use, copy, merge, publish, distribute,
and/or sell copies of the Font Software, and to permit persons to
whom the Font Software is furnished to do so, subject to the
following conditions:
The above copyright and trademark notices and this permission
notice shall be included in all copies of one or more of the Font
Software typefaces.
The Font Software may be modified, altered, or added to, and in
particular the designs of glyphs or characters in the Fonts may
be modified and additional glyphs or characters may be added to
the Fonts, only if the fonts are renamed to names not containing
either the words “Bitstream” or the word “Vera”.
This License becomes null and void to the extent applicable to
Fonts or Font Software that has been modified and is distributed
under the “Bitstream Vera” names.
The Font Software may be sold as part of a larger software
package but no copy of one or more of the Font Software typefaces
may be sold by itself.
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER
RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY
GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR
FROM OTHER DEALINGS IN THE FONT SOFTWARE.
Except as contained in this notice, the names of Gnome, the Gnome
Foundation, and Bitstream Inc., shall not be used in advertising
or otherwise to promote the sale, use or other dealings in this
Font Software without prior written authorization from the Gnome
Foundation or Bitstream Inc., respectively. For further
information, contact: fonts at gnome dot org.

4
data/fonts/fonts.alias
View File

@ -1,5 +1,3 @@
Bandal -Unknown-Bandal-medium-r-normal--0-0-0-0-p-0-iso8859-9
Kochi -Unknown-Kochi-medium-r-normal--0-0-0-0-p-0-iso8859-9
Vera-Bold-Italic -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-ascii-0
Vera-Normal -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-ascii-0
Vera-Bold -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-ascii-0
@ -11,3 +9,5 @@ Vera-Mono -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-m-0-ascii
Vera-Serif -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-ascii-0
Vera-Serif-Bold -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-ascii-0
Vera -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-ascii-0
Baekmuk-Dotum -misc-Baekmuk Dotum-medium-r-normal--0-0-0-0-p-0-iso8859-1
Kochi-Gothic -misc-Kochi Gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1

7
data/fonts/fonts.dir
View File

@ -1,6 +1,4 @@
52
Bandal.ttf -Unknown-Bandal-medium-r-normal--0-0-0-0-p-0-iso8859-9
Kochi.ttf -Unknown-Kochi-medium-r-normal--0-0-0-0-p-0-iso8859-9
53
VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-ascii-0
VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-fcd8859-15
VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-1
@ -51,3 +49,6 @@ VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-fcd8859-
VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-1
VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-15
VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-9
dotum.ttf -misc-Baekmuk Dotum-medium-r-normal--0-0-0-0-p-0-iso8859-1
kochi-gothic.ttf -misc-Kochi Gothic-medium-r-normal--0-0-0-0-c-0-jisx0208.1983-0
kochi-gothic.ttf -misc-Kochi Gothic-medium-r-normal--0-0-0-0-p-0-iso8859-1

2
src/bin/e_main.c
View File

@ -249,7 +249,7 @@ main(int argc, char **argv)
edje_frametime_set(1.0 / e_config->framerate);
/* FIXME: this is just appending Kochi if Vera doesnt have it. We need
* a full config support subsystem for this */
edje_fontset_append_set("Kochi,Bandal");
edje_fontset_append_set("Kochi-Gothic,Baekmuk-Dotum");
e_canvas_recache();
/* setup init status window/screen */

2
src/bin/e_zone.c
View File

@ -189,6 +189,8 @@ e_zone_current_get(E_Container *con)
return zone;
}
}
if (!con->zones)
return NULL;
l = con->zones;
return (E_Zone *)l->data;
}