summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLog.pre-1-08
-rw-r--r--ChangeLog.pre-1-108
-rw-r--r--ChangeLog.pre-1-28
-rw-r--r--ChangeLog.pre-1-48
-rw-r--r--ChangeLog.pre-1-68
-rw-r--r--ChangeLog.pre-1-88
-rw-r--r--Makefile.am3
-rw-r--r--examples/Makefile.am1
-rw-r--r--examples/pangoft2.aliases18
10 files changed, 77 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ef4d14db..4467bdb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-20 Tor Lillqvist <tml@iki.fi>
+
+ * Makefile.am (EXTRA_DIST): Add README.win32.
+
+ * examples/pangoft2.aliases: Add this file to CVS.
+
+ * examples/Makefile.am (EXTRA_DIST): Add it here.
+
2000-11-21 Elliot Lee <sopwith@redhat.com>
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index ef4d14db..4467bdb7 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,11 @@
+2000-11-20 Tor Lillqvist <tml@iki.fi>
+
+ * Makefile.am (EXTRA_DIST): Add README.win32.
+
+ * examples/pangoft2.aliases: Add this file to CVS.
+
+ * examples/Makefile.am (EXTRA_DIST): Add it here.
+
2000-11-21 Elliot Lee <sopwith@redhat.com>
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index ef4d14db..4467bdb7 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+2000-11-20 Tor Lillqvist <tml@iki.fi>
+
+ * Makefile.am (EXTRA_DIST): Add README.win32.
+
+ * examples/pangoft2.aliases: Add this file to CVS.
+
+ * examples/Makefile.am (EXTRA_DIST): Add it here.
+
2000-11-21 Elliot Lee <sopwith@redhat.com>
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index ef4d14db..4467bdb7 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,11 @@
+2000-11-20 Tor Lillqvist <tml@iki.fi>
+
+ * Makefile.am (EXTRA_DIST): Add README.win32.
+
+ * examples/pangoft2.aliases: Add this file to CVS.
+
+ * examples/Makefile.am (EXTRA_DIST): Add it here.
+
2000-11-21 Elliot Lee <sopwith@redhat.com>
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index ef4d14db..4467bdb7 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+2000-11-20 Tor Lillqvist <tml@iki.fi>
+
+ * Makefile.am (EXTRA_DIST): Add README.win32.
+
+ * examples/pangoft2.aliases: Add this file to CVS.
+
+ * examples/Makefile.am (EXTRA_DIST): Add it here.
+
2000-11-21 Elliot Lee <sopwith@redhat.com>
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index ef4d14db..4467bdb7 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+2000-11-20 Tor Lillqvist <tml@iki.fi>
+
+ * Makefile.am (EXTRA_DIST): Add README.win32.
+
+ * examples/pangoft2.aliases: Add this file to CVS.
+
+ * examples/Makefile.am (EXTRA_DIST): Add it here.
+
2000-11-21 Elliot Lee <sopwith@redhat.com>
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index ef4d14db..4467bdb7 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+2000-11-20 Tor Lillqvist <tml@iki.fi>
+
+ * Makefile.am (EXTRA_DIST): Add README.win32.
+
+ * examples/pangoft2.aliases: Add this file to CVS.
+
+ * examples/Makefile.am (EXTRA_DIST): Add it here.
+
2000-11-21 Elliot Lee <sopwith@redhat.com>
* modules/*/*.c: Fix warnings - mostly include string.h for strcmp.
diff --git a/Makefile.am b/Makefile.am
index 00597543..8d5c10f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,8 @@ EXTRA_DIST = \
pango-config.in \
pango.pc.in \
pangox.pc.in \
- TODO.xml
+ TODO.xml \
+ README.win32
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pango.pc pangox.pc
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 7cc94ff6..0a12e7fa 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -44,6 +44,7 @@ EXTRA_DIST= \
muru.utf \
pangorc \
pangox.aliases \
+ pangoft2.aliases \
pangowin32.aliases
alias_DATA = pangox.aliases
diff --git a/examples/pangoft2.aliases b/examples/pangoft2.aliases
new file mode 100644
index 00000000..96dd38e1
--- /dev/null
+++ b/examples/pangoft2.aliases
@@ -0,0 +1,18 @@
+# File defining aliases of PangoFontDescription to FreeType2 font set
+#
+# family style variant weight stretch list of face names, that should have been found
+# in the font files scanned
+#
+# Currently this file just lists some TrueType face names
+#
+# We really should include a locale attribute, too, to be able to choose
+# the correct font for the same CJK Unified Ideograph depending on whether
+# we are rendering zh_TW (Traditional Chinese), zh_CN (Simplified
+# Chinese) or ja (Japanese).
+#
+sans normal normal normal normal "arial,browallia new,latha,mangal,gulimche,ms gothic,ms hei,mingliu"
+#
+#
+serif normal normal normal normal "times new roman,angsana new,latha,mangal,gulimche,ms gothic,ms song,mingliu"
+#
+monospace normal normal normal normal "courier new,courier monothai,gulimche,ms gothic,ms song,mingliu"