[the-board] [fonts] Add support for app-specific fonts
- From: Lucas Almeida Rocha <lucasr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [the-board] [fonts] Add support for app-specific fonts
- Date: Mon, 8 Nov 2010 22:11:31 +0000 (UTC)
commit e1bcf3eb9379dbcbab12926700c22f890705d92c
Author: Lucas Rocha <lucasr gnome org>
Date: Mon Nov 8 22:06:01 2010 +0000
[fonts] Add support for app-specific fonts
A custom fontconfig file is installed and used on The Board's main
scripts (installed and uninstalled). Still need to pick the fonts to
install.
.gitignore | 4 ++++
configure.ac | 1 +
data/Makefile.am | 2 +-
data/fonts/Makefile.am | 19 +++++++++++++++++++
data/fonts/fonts.conf.in | 10 ++++++++++
data/fonts/uninstalled-fonts.conf.in | 10 ++++++++++
src/the-board-uninstalled.in | 4 ++++
src/the-board.in | 4 ++++
8 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c89c6b2..40c87d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,10 @@ data/Makefile
data/Makefile.in
data/backgrounds/Makefile
data/backgrounds/Makefile.in
+data/fonts/Makefile
+data/fonts/Makefile.in
+data/fonts/fonts.conf
+data/fonts/uninstalled-fonts.conf
data/icons/Makefile
data/icons/Makefile.in
data/style/Makefile
diff --git a/configure.ac b/configure.ac
index 45d9db6..89d59e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,7 @@ Makefile
src/Makefile
data/Makefile
data/backgrounds/Makefile
+data/fonts/Makefile
data/icons/Makefile
data/style/Makefile
data/things/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 7dfbb8e..8286676 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = backgrounds icons style things
+SUBDIRS = backgrounds fonts icons style things
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
new file mode 100644
index 0000000..6ff12fe
--- /dev/null
+++ b/data/fonts/Makefile.am
@@ -0,0 +1,19 @@
+fontconfigdir = $(pkgdatadir)
+fontsdir = $(pkgdatadir)/fonts
+
+do_subst = sed -e 's|@fontsdir[ ]|$(fontsdir)|g' \
+ -e 's|@abs_top_srcdir[ ]|$(abs_top_srcdir)|g'
+
+fonts.conf: fonts.conf.in
+ $(AM_V_GEN) $(do_subst) $< > $@
+
+uninstalled-fonts.conf: uninstalled-fonts.conf.in
+ $(AM_V_GEN) $(do_subst) $< > $@
+
+dist_fontconfig_DATA = \
+ fonts.conf
+
+nodist_fontconfig_DATA = \
+ uninstalled-fonts.conf
+
+dist_fonts_DATA =
diff --git a/data/fonts/fonts.conf.in b/data/fonts/fonts.conf.in
new file mode 100644
index 0000000..173ce7d
--- /dev/null
+++ b/data/fonts/fonts.conf.in
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- include the system font configuration first -->
+<include ignore_missing="yes">/etc/fonts/fonts.conf</include>
+
+<dir>@fontsdir@</dir>
+
+</fontconfig>
diff --git a/data/fonts/uninstalled-fonts.conf.in b/data/fonts/uninstalled-fonts.conf.in
new file mode 100644
index 0000000..6ed8312
--- /dev/null
+++ b/data/fonts/uninstalled-fonts.conf.in
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- include the system font configuration first -->
+<include ignore_missing="yes">/etc/fonts/fonts.conf</include>
+
+<dir>@abs_top_srcdir@/data/fonts/</dir>
+
+</fontconfig>
diff --git a/src/the-board-uninstalled.in b/src/the-board-uninstalled.in
index fa52476..a6328ad 100644
--- a/src/the-board-uninstalled.in
+++ b/src/the-board-uninstalled.in
@@ -18,4 +18,8 @@ else
export LD_LIBRARY_PATH= abs_top_srcdir@/src/.libs:$LD_LIBRARY_PATH
fi
+if test x"$FONTCONFIG_FILE" = x ; then
+ export FONTCONFIG_FILE= abs_top_srcdir@/data/fonts/uninstalled-fonts.conf
+fi
+
THE_BOARD_UNINSTALLED_DIR= abs_top_srcdir@ @abs_top_srcdir@/src/the-board-start
diff --git a/src/the-board.in b/src/the-board.in
index b44a7d6..9de8c87 100644
--- a/src/the-board.in
+++ b/src/the-board.in
@@ -6,4 +6,8 @@ else
export GJS_PATH= pkgdatadir@/js:$GJS_PATH
fi
+if test x"$FONTCONFIG_FILE" = x ; then
+ export FONTCONFIG_FILE= pkgdatadir@/fonts.conf
+fi
+
@libexecdir@/the-board-start
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]