diff --git a/lib/fontconfig/COPYING b/lib/fontconfig/COPYING index 0dce36477..d68372289 100644 --- a/lib/fontconfig/COPYING +++ b/lib/fontconfig/COPYING @@ -1,4 +1,4 @@ -$Id: COPYING,v 1.1.1.1 2006/11/25 18:41:47 matthieu Exp $ +fontconfig/COPYING Copyright © 2001,2003 Keith Packard @@ -12,9 +12,9 @@ specific, written prior permission. Keith Packard makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. -KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/ChangeLog b/lib/fontconfig/ChangeLog index 7dd06db4b..d2195633d 100644 --- a/lib/fontconfig/ChangeLog +++ b/lib/fontconfig/ChangeLog @@ -1,6 +1,5430 @@ +commit 4a3bef8ac3b91354c6c10b5f6af10ead9d4fe49a +Author: Behdad Esfahbod +Date: Wed Nov 18 18:45:19 2009 -0500 + + Bump version to 2.8.0 + + README | 32 ++++++++++++++++++++++++++++++-- + configure.in | 2 +- + fontconfig/fontconfig.h | 4 ++-- + 3 files changed, 33 insertions(+), 5 deletions(-) + +commit 2e44cbe1b9bf466718167e9e05077743df36ab21 +Author: Behdad Esfahbod +Date: Wed Nov 18 18:45:06 2009 -0500 + + Bump libtool revision in preparation for release + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 91a73751dcd4fd2d2e4e8bcb98af53098c721224 +Author: Tor Lillqvist +Date: Wed Nov 18 21:56:16 2009 +0200 + + Improve zip "distribution" + + Don't put entries for directories in the zip file. Fetch manpages from + correct place. + + fontconfig-zip.in | 8 ++------ + 1 files changed, 2 insertions(+), 6 deletions(-) + +commit bb8fdae8ad6f0a857569b3e09cf21f1af6b4a41b +Author: Tor Lillqvist +Date: Wed Nov 18 21:54:39 2009 +0200 + + Use correct autoconf variable + + Use LIBT_CURRENT_MINUS_AGE instead of the undefined + lt_current_minus_age for the name of the DLL when generating the MS + style import library. + + src/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 1845f3100d15927cc536bc3d38f140c139fb5614 +Author: Behdad Esfahbod +Date: Wed Nov 18 14:39:34 2009 -0500 + + [fc-arch] Rename architecture names to better reflect what they are + + We only care about three properties in the arch: + + - endianness + - pointer size + - for 32-bit archs, whether double is aligned on 4 or 8 bytes + + This leads to the following 6 archs (old name -> new name): + + x86 -> le32d4 + mipsel -> le32d8 + x86-64 -> le64 + m68k -> be32d4 + ppc -> be32d8 + ppc64 -> be64 + + fc-arch/fcarch.tmpl.h | 67 + +++++++++++++++++++++++++------------------------ + 1 files changed, 34 insertions(+), 33 deletions(-) + +commit d5ebf48e34e9235cf10e9f7beb49af74823c3fc6 +Author: Behdad Esfahbod +Date: Wed Nov 18 14:08:00 2009 -0500 + + [fc-arch] Beautify the arch template + + fc-arch/fc-arch.c | 10 +++++----- + fc-arch/fcarch.tmpl.h | 42 ++++++++++++++++++++++++++++++++++-------- + 2 files changed, 39 insertions(+), 13 deletions(-) + +commit d074706b507226427f5a4018e78fe120a01eb53d +Author: Behdad Esfahbod +Date: Wed Nov 18 09:40:11 2009 -0500 + + [fc-case] Update CaseFolding.txt to Unicode 5.2.0 + + fc-case/CaseFolding.txt | 116 + +++++++++++++++++++++++++++++++++++++++++++++-- + 1 files changed, 112 insertions(+), 4 deletions(-) + +commit 13781ba00b0ded28319ff417a254c620231973f1 +Author: Behdad Esfahbod +Date: Wed Nov 18 09:36:23 2009 -0500 + + [fc-glyphname] Remove Adobe glyphlist + + It was unused. + + fc-glyphname/glyphlist.txt | 4291 + -------------------------------------------- + 1 files changed, 0 insertions(+), 4291 deletions(-) + +commit d2fb683796f41a68edec53f26e524fd06725eef8 +Author: Behdad Esfahbod +Date: Wed Nov 18 09:35:40 2009 -0500 + + Clean up Makefile's a bit + + fc-arch/Makefile.am | 4 +--- + fc-case/Makefile.am | 7 +++---- + fc-glyphname/Makefile.am | 3 ++- + fc-lang/Makefile.am | 2 +- + src/Makefile.am | 12 +++++++++--- + 5 files changed, 16 insertions(+), 12 deletions(-) + +commit 192927225c447a8eaba613838aff93f82dee41d0 +Author: Behdad Esfahbod +Date: Wed Nov 18 09:26:24 2009 -0500 + + [fc-glyphname] Rename internal arrays to prefix with _fc_ + + Although they were static, I was still surprised that gdb was seeing + our variable "glyphs". Not helpful. + + fc-glyphname/fc-glyphname.c | 6 +++--- + src/fcfreetype.c | 13 ++++++------- + 2 files changed, 9 insertions(+), 10 deletions(-) + +commit 3e5e83e12e051d6ac734f08609c6c584b0f0b807 +Author: Behdad Esfahbod +Date: Wed Nov 18 09:26:01 2009 -0500 + + [src] Create fcglyphname.h automatically + + src/Makefile.am | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +commit 040c98bcc40617ecbc9eb7e16b1714ebd256cfdc +Author: Behdad Esfahbod +Date: Wed Nov 18 09:25:42 2009 -0500 + + [fc-glyphname] Cleanup Makefile.am + + fc-glyphname/Makefile.am | 8 +++----- + 1 files changed, 3 insertions(+), 5 deletions(-) + +commit 77f4e60a32971a815b85f187712191724a00b856 +Author: Behdad Esfahbod +Date: Wed Nov 18 09:10:05 2009 -0500 + + Remove bogus comment + + Last night in between my dreams I also noticed that we support Unicode + values up to 0x01000000 and not 0x00100000 which I thought before. + This covers the entire Unicode range. + + src/fccharset.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +commit a90a3ad97a7cee10225190e13a576e55871b9441 +Author: Behdad Esfahbod +Date: Tue Nov 17 12:10:01 2009 -0500 + + Make sure fclang.h and fcarch.h are built + + src/Makefile.am | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +commit a3b2426819836ab2454c6a7bad27c382f4a245bf +Author: Behdad Esfahbod +Date: Mon Nov 16 18:29:26 2009 -0500 + + [lang] Fix serializing LangSet from older versions + + src/fclang.c | 9 ++++++--- + 1 files changed, 6 insertions(+), 3 deletions(-) + +commit 8480c6f86327877fce729ebb01b52bd7a40ddfc5 +Author: Behdad Esfahbod +Date: Mon Nov 16 17:38:40 2009 -0500 + + [arch] Try to ensure proper FcLangSet alignment in arch + + fc-arch/fc-arch.c | 5 +++-- + fc-arch/fcarch.tmpl.h | 16 ++++++++-------- + src/fclang.c | 2 +- + 3 files changed, 12 insertions(+), 11 deletions(-) + +commit dffcb2a083bc5f959ed96dbdf0f365ebc0e710cc +Author: Behdad Esfahbod +Date: Mon Nov 16 17:00:50 2009 -0500 + + [xml] Remove unused code + + src/fcxml.c | 12 ------------ + 1 files changed, 0 insertions(+), 12 deletions(-) + +commit b2d910123008115813a5cd623389189a2d66880b +Author: Behdad Esfahbod +Date: Mon Nov 16 16:57:53 2009 -0500 + + [int] Remove more unused macros + + src/fcint.h | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +commit 247c4f3df21582260c4799bdbda2be1c13cc8901 +Author: Behdad Esfahbod +Date: Mon Nov 16 15:48:20 2009 -0500 + + Enable automake silent rules + + configure.in | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 963820fcbfdb537fd956f8863f8793cf22093c5d +Author: Behdad Esfahbod +Date: Mon Nov 16 15:46:46 2009 -0500 + + [int] Remove fc_value_* macros that did nothing other than renaming + + src/fcint.h | 6 ------ + src/fcmatch.c | 8 ++++---- + src/fcpat.c | 12 ++++++------ + 3 files changed, 10 insertions(+), 16 deletions(-) + +commit 888f9427ae84195104855d2bb2fbb6d44067a998 +Author: Behdad Esfahbod +Date: Mon Nov 16 15:43:08 2009 -0500 + + [int] Remove fc_storage_type() in favor of direct access to v->type + + src/fcint.h | 1 - + src/fcmatch.c | 2 +- + src/fcpat.c | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) + +commit 486fa46893d070485738de6e2c0d418650662d63 +Author: Behdad Esfahbod +Date: Mon Nov 16 15:41:58 2009 -0500 + + Remove unused macros + + src/fcint.h | 5 ----- + 1 files changed, 0 insertions(+), 5 deletions(-) + +commit 1f4e6fecde22fd4ce8336b01a5c32c533fcb8bac +Author: Behdad Esfahbod +Date: Mon Nov 16 15:39:16 2009 -0500 + + Bump cache version up from 2 to 3 and fix FcLangSet caching/crash + + Protect cache against future expansions of FcLangSet (adding new + orth files). Previously, doing so could change the size of + that struct. Indeed, that happened between 2.6.0 and 2.7.3, causing + crashes. Unfortunately, sizeof(FcLangSet) was not checked in + fcarch.c. + + This changes FcLangSet code to be able to cope with struct size + changes. + And change cache format, hence bumping from 2 to 3. + + fontconfig/fontconfig.h | 2 +- + src/fcint.h | 2 +- + src/fclang.c | 67 + ++++++++++++++++++++++++++++++++++++---------- + 3 files changed, 54 insertions(+), 17 deletions(-) + +commit 6b1fc678ca59df3f3f1ffac0e509cf485c9df0c0 +Author: Behdad Esfahbod +Date: Mon Nov 16 16:57:10 2009 -0500 + + [int] Define MIN/MAX/ABS macros + + src/fcfreetype.c | 3 --- + src/fcint.h | 4 ++++ + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit b393846860a390ebe35b19320b5eaf9272084042 +Author: Behdad Esfahbod +Date: Mon Nov 16 15:17:56 2009 -0500 + + [fc-arch] Add FcAlign to arch signature + + fc-arch/fc-arch.c | 5 +++-- + fc-arch/fcarch.tmpl.h | 16 ++++++++-------- + 2 files changed, 11 insertions(+), 10 deletions(-) + +commit 8009229bc5cd9b540ff56a47ddc32ccada2679b0 +Author: Behdad Esfahbod +Date: Mon Nov 16 15:12:52 2009 -0500 + + Move FcAlign to fcint.h + + src/fcint.h | 8 ++++++++ + src/fcserialize.c | 8 -------- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit 36ae1d9563cff4966b293f816cf9eb25c8ebb857 +Author: Behdad Esfahbod +Date: Mon Nov 9 13:17:17 2009 -0500 + + Clarify default confdir and cachedir better. + + Also remove --with-docdir. It can be set by setting docdir variable. + + configure.in | 19 ++----------------- + doc/Makefile.am | 2 -- + 2 files changed, 2 insertions(+), 19 deletions(-) + +commit b322eb4d7a90778dc9f08c73036836deba7e463e +Author: Behdad Esfahbod +Date: Tue Sep 8 11:45:26 2009 -0400 + + Bump version to 2.7.3 + + README | 14 ++++++++++++-- + configure.in | 2 +- + fontconfig/fontconfig.h | 2 +- + 3 files changed, 14 insertions(+), 4 deletions(-) + +commit afc845d930877ac62f6d5a5f50ea87b5182d0a4a +Author: Behdad Esfahbod +Date: Tue Sep 8 11:44:59 2009 -0400 + + Bump libtool version in preparation for release + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 5e544b32d8dc98737c7a268a6a5f877207284e9a +Author: Behdad Esfahbod +Date: Sun Sep 6 22:10:22 2009 -0400 + + Use default config in FcFileScan() and FcDirScan() + + Before a NULL config was passed down adn essentially FcFileScan was + equivalent to FcFreeTypeQuery. Now fc-scan tool correctly applies + the configuration to the scanned patterns. + + src/fcdir.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 25436fd08fa6d0825a2f7c7b5d51e34873a05187 +Author: Roozbeh Pournader +Date: Wed Sep 2 20:03:42 2009 -0700 + + Updated Arabic, Persian, and Urdu orthographies + + - Arabic (ar), Persian (fa), and Urdu (ur) now use generic forms + (bug #23004) + - Persian (fa) orthography updated to latest standards and + orthographies + - Persian dialects Dari/Eastern Farsi (prs) and Western Farsi + (pes) added + + fc-lang/ar.orth | 81 + ++++++++++------------------------------------------- + fc-lang/fa.orth | 80 + +++++++++++++++++++++++++++++++++-------------------- + fc-lang/pes.orth | 26 +++++++++++++++++ + fc-lang/prs.orth | 29 +++++++++++++++++++ + fc-lang/ur.orth | 77 + ++++++++++++++++++++++++++------------------------ + 5 files changed, 161 insertions(+), 132 deletions(-) + +commit d9d8b8826402ca75e882a427392bc8209ae8ff1a +Author: Roozbeh Pournader +Date: Wed Sep 2 18:54:24 2009 -0700 + + Correct Ewe (ee) orthography to use U+025B (bug #20711) + + fc-lang/ee.orth | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit e52fdbd2bc1b9589ca0adc4b0c143034ff60dd18 +Author: Behdad Esfahbod +Date: Mon Aug 31 17:32:36 2009 -0400 + + Bump version to 2.7.2 + + README | 19 +++++++++++++++++-- + configure.in | 2 +- + fontconfig/fontconfig.h | 2 +- + 3 files changed, 19 insertions(+), 4 deletions(-) + +commit a74cfb63cb6af3c357b9c33d9f28b9cea5ff3e72 +Author: Behdad Esfahbod +Date: Mon Aug 31 17:32:13 2009 -0400 + + Bump libtool version for release + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit c5f0a65b36bc863d67bbf1f334262c35445ce610 +Author: Behdad Esfahbod +Date: Tue Aug 25 20:40:30 2009 -0400 + + Revert "Fix FcNameUnparseLangSet()" and redo it + + This reverts commit 5c6d1ff23bda4386984a1d6e4c024958f8f5547c and + fixes that bug using the new reverse-map I added in the previous + commit. + + src/fclang.c | 29 ++++++++++++++++++----------- + 1 files changed, 18 insertions(+), 11 deletions(-) + +commit d354a321ee51f0bb70a39faeed541d1a90477d7d +Author: Behdad Esfahbod +Date: Tue Aug 25 20:39:20 2009 -0400 + + Bug 23419 - "contains" expression seems not working on the fontconfig + rule + + Fix bug in FcLangSetContains(), similar to + 5c6d1ff23bda4386984a1d6e4c024958f8f5547c + + fc-lang/fc-lang.c | 20 +++++++++++++++++--- + src/fclang.c | 4 ++-- + 2 files changed, 19 insertions(+), 5 deletions(-) + +commit f33a23133ecbcc981745051f7c34d96b33b57447 +Author: Behdad Esfahbod +Date: Fri Aug 21 13:41:41 2009 -0400 + + Bug 22037 - No Fonts installed on a default install on Windows + Server 2003 + + Make it easy to install on older Windows + + src/fcxml.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit 8b1ceef0b7f41703775c163d6ac595a5407e9159 +Author: Tor Lillqvist +Date: Fri Aug 14 00:16:18 2009 +0300 + + Use multi-byte codepage aware string function on Windows + + The East Asian double-byte codepages have characters with backslash as + the second byte, so we must use _mbsrchr() instead of strrchr() when + looking at pathnames in the system codepage. + + src/fcxml.c | 11 +++++++++-- + 1 files changed, 9 insertions(+), 2 deletions(-) + +commit d15678127aeea96c9c8254a171c2f0af0bd7d140 +Author: Tor Lillqvist +Date: Fri Aug 14 00:08:17 2009 +0300 + + Fix heap corruption on Windows in FcEndElement() + + Must not call FcStrFree() on a value returned by + FcStrBufDoneStatic(). In the Windows code don't bother with dynamic + allocation, just use a local buffer. + + src/fcxml.c | 43 +++++++++++-------------------------------- + 1 files changed, 11 insertions(+), 32 deletions(-) + +commit a1b6e34a9a17a4a675bdc993aa465b92d7122376 +Author: Tor Lillqvist +Date: Fri Aug 14 00:02:59 2009 +0300 + + Fix MinGW compilation + + Need to define _WIN32_WINNT as 0x0500 to get declaration for + GetSystemWindowsDirectory(). + + src/fcxml.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 161620108bbb4e70f2817481e4d5bc26772fe67e +Author: Behdad Esfahbod +Date: Tue Jul 28 14:24:21 2009 -0400 + + [ja.orth] Comment out FULLWIDTH YEN SIGN (#22942) + + fc-lang/ja.orth | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 7c12181f7a75a434e2139f4bee794046258342cf +Author: Behdad Esfahbod +Date: Tue Jul 28 14:23:10 2009 -0400 + + Improve charset printing + + src/fcdbg.c | 4 ++-- + src/fclang.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit d2c8ac373e9ac45df66627cfc42679636d017f6e +Author: Behdad Esfahbod +Date: Mon Jul 27 17:53:26 2009 -0400 + + Bump version to 2.7.1 + + README | 27 +++++++++++++++++++++++++-- + configure.in | 4 ++-- + fontconfig/fontconfig.h | 2 +- + 3 files changed, 28 insertions(+), 5 deletions(-) + +commit 16630692ec590bd70f4e426125e358251e05435d +Author: Behdad Esfahbod +Date: Mon Jul 27 17:51:17 2009 -0400 + + Update .gitignore + + .gitignore | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 50d937b0e110ee21d9861b8fb973d62534db98ae +Author: Behdad Esfahbod +Date: Mon Jul 27 17:48:29 2009 -0400 + + Bump libtool versions that 2.7.0 (I forgot to do back then) + + configure.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 273e22c71f78281ade1c5c30a25ef10d214d7ea6 +Author: Behdad Esfahbod +Date: Mon Jul 27 15:07:12 2009 -0400 + + Hardcode /etc/fonts instead of @CONFDIR@ in docs (#22911) + + We distribute the docs, so it makes little sense to distribute with + @CONFDIR@ replaced. Until we find a better solution, I've hardcoded + /etc/fonts now. + + doc/confdir.sgml.in | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit 21384990ffd045cc0f8379a325612aba6d810359 +Author: Behdad Esfahbod +Date: Mon Jul 27 14:50:44 2009 -0400 + + [doc] Add ~/fonts.conf.d to user docs + + doc/fontconfig-user.sgml | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +commit 7575c666619c58df00659d4e70b01104b8e114a5 +Author: Behdad Esfahbod +Date: Sat Jul 25 16:38:52 2009 -0400 + + TT_MS_ID_UCS_4 is really UTF-16BE, not UTF-32 + + Reported by Yuriy Kaminskiy. + + src/fcfreetype.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 558581c434abf0d96c46cf3bb1454be6806e1ffc +Author: Behdad Esfahbod +Date: Fri Jul 24 14:59:07 2009 -0400 + + Fix doc syntax (#22902) + + fc-match/fc-match.sgml | 3 ++- + fc-scan/fc-scan.sgml | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 5c6d1ff23bda4386984a1d6e4c024958f8f5547c +Author: Behdad Esfahbod +Date: Wed Jul 22 19:25:24 2009 -0400 + + Fix FcNameUnparseLangSet() + + Was broken since ffd6668b469508177c4baf7745ae42aee5b00322 + + src/fclang.c | 29 +++++++++++------------------ + 1 files changed, 11 insertions(+), 18 deletions(-) + +commit d9741a7f1a73f718ab20b0582fff8aebeba01077 +Author: Behdad Esfahbod +Date: Wed Jul 22 19:01:06 2009 -0400 + + Remove unused macros + + src/fcmatch.c | 33 ++------------------------------- + 1 files changed, 2 insertions(+), 31 deletions(-) + +commit 792ce655cb06c678d4a4ff091866fd0531b141fb +Author: Karl Tomlinson +Date: Wed Jul 22 08:39:23 2009 -0400 + + Don't change the order of names unnecessarily (#20128) + + so that TT_NAME_ID_PREFERRED_FAMILY is consistently preferred over + TT_NAME_ID_FONT_FAMILY when both are specified for the default + language. + + src/fclist.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +commit 327fc9d183ba193c307d0ecaec8ad1f4e6ca1330 +Author: Behdad Esfahbod +Date: Tue Jul 21 15:41:47 2009 -0400 + + Use GetSystemWindowsDirectory() instead of GetWindowsDirectory() + (#22037) + + src/fcxml.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit 86dd857447f69cf89fd47259055b150f62519c17 +Author: Behdad Esfahbod +Date: Tue Jul 21 15:39:58 2009 -0400 + + Improve libtool version parsing (#22122) + + autogen.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 16e55c7c85fc5771349172d6eb989dddd48c5c25 +Author: Behdad Esfahbod +Date: Mon Jul 20 16:30:12 2009 -0400 + + Fix leak with string VStack objects + + src/fcxml.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit c0ffd7733a735bf2e10834925c63f0039c408649 +Author: Behdad Esfahbod +Date: Fri Jul 10 18:09:42 2009 +0100 + + Add Inconsolata to monospace config (#22710) + + conf.d/45-latin.conf | 1 + + conf.d/60-latin.conf | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +commit 55e202a62d95e25cf2c4897afd66eab5711195c3 +Author: Behdad Esfahbod +Date: Sun Jun 28 14:14:46 2009 -0400 + + Remove unused ftglue code + + src/fcfreetype.c | 66 + +++++++++++++++++++++++------------------------------- + src/ftglue.c | 62 + +------------------------------------------------- + src/ftglue.h | 33 --------------------------- + 3 files changed, 30 insertions(+), 131 deletions(-) + +commit 52742ff86b60b1d244c1e87611aff5ceee46e596 +Author: Behdad Esfahbod +Date: Sun Jun 28 13:49:09 2009 -0400 + + Replace spaces with tabs in conf files + + conf.d/25-unhint-nonlatin.conf | 32 ++++---- + conf.d/30-metric-aliases.conf | 48 +++++----- + conf.d/30-urw-aliases.conf | 36 ++++---- + conf.d/65-fonts-persian.conf | 184 + ++++++++++++++++++++-------------------- + conf.d/90-synthetic.conf | 8 +- + 5 files changed, 154 insertions(+), 154 deletions(-) + +commit 57cf838cccda12dd171d3834b3e9b1275467d9e2 +Author: Behdad Esfahbod +Date: Sun Jun 28 13:46:41 2009 -0400 + + Fix win32 build + + src/fcint.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 76374f0edef04e21859122dd8a2026b64fd2b273 +Author: Behdad Esfahbod +Date: Wed Jun 24 15:19:13 2009 -0400 + + git-tag -s again + + new-version.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 0f40912599a4be1b961c091733ed86d08a4e14e1 +Author: Behdad Esfahbod +Date: Wed Jun 24 15:04:11 2009 -0400 + + Bump version to 2.7.0 + + README | 222 + ++++++++++++++++++++++++++++++++++++++++++++++- + configure.in | 2 +- + fontconfig/fontconfig.h | 2 +- + 3 files changed, 222 insertions(+), 4 deletions(-) + +commit 3734d6a5a2c5326bf1cd8b7cc7f3f07fe6943aa5 +Author: Behdad Esfahbod +Date: Wed Jun 24 15:03:32 2009 -0400 + + Remove keithp's GPG key id + + new-version.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit d07059b7a3f8044904d884818d5e03596e7cc1a2 +Author: Behdad Esfahbod +Date: Wed Jun 24 14:43:32 2009 -0400 + + Fix distcheck + + Makefile.am | 7 +++---- + 1 files changed, 3 insertions(+), 4 deletions(-) + +commit b65fa0c3113bd1e1cec38d05f8c4f45f78e3e044 +Author: Behdad Esfahbod +Date: Thu Jun 11 07:08:10 2009 -0400 + + Bug 22154 -- fontconfig.pc doesn't include libxml2 link flags + + fontconfig.pc.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 3164ac76229d9817120015401c1f532934d0a3e2 +Author: Behdad Esfahbod +Date: Fri Jun 5 22:59:06 2009 -0400 + + [xml] Intern more strings + + src/fcxml.c | 9 ++++----- + 1 files changed, 4 insertions(+), 5 deletions(-) + +commit 390c05e64a3716f6ea6fd81cf3ab63439051fbaa +Author: Behdad Esfahbod +Date: Fri Jun 5 22:32:31 2009 -0400 + + [xml] Allocate FcExpr's in a pool in FcConfig + + Reduces number of malloc's for FcExprs from hundreds into single + digits. + + src/fccfg.c | 32 +++++++++++++++++++++++++ + src/fcint.h | 14 +++++++++++ + src/fcxml.c | 75 + +++++++++++++++++++++++++--------------------------------- + 3 files changed, 78 insertions(+), 43 deletions(-) + +commit 398d436441d741d6f8edcc25ca01aa9715c0731c +Author: Behdad Esfahbod +Date: Fri Jun 5 21:37:01 2009 -0400 + + [xml] Mark more symbols static + + src/fcint.h | 30 ------------------------------ + src/fcxml.c | 22 ++++++++++++---------- + 2 files changed, 12 insertions(+), 40 deletions(-) + +commit a96ecbfa20fbc66fad3847b1d2bc6fb3cd712c91 +Author: Behdad Esfahbod +Date: Fri Jun 5 18:40:46 2009 -0400 + + [xml] Centralize FcExpr allocation + + To be improved, using a central pool. + + src/fcxml.c | 46 ++++++++++++++++++++-------------------------- + 1 files changed, 20 insertions(+), 26 deletions(-) + +commit 5aebb3e299d877c4a66f409a7d448b2ac4e94be0 +Author: Behdad Esfahbod +Date: Fri Jun 5 18:27:47 2009 -0400 + + Remove unused prototypes and function + + src/fcint.h | 16 ++-------------- + src/fcxml.c | 6 ------ + 2 files changed, 2 insertions(+), 20 deletions(-) + +commit 900723f3d2396cfb606e5eceb8df0b71c4ffc0dd +Author: Behdad Esfahbod +Date: Fri Jun 5 18:16:38 2009 -0400 + + [charset] Grow internal FcCharset arrays exponentially + + src/fccharset.c | 65 + ++++++++++++++++++++++++++++++------------------------ + 1 files changed, 36 insertions(+), 29 deletions(-) + +commit cce69b07efd82056c8eb855ef7ac7e02c94439da +Author: Behdad Esfahbod +Date: Fri Jun 5 17:15:53 2009 -0400 + + Always set *changed in FcCharsetMerge + + src/fccharset.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +commit 86bdf4598fb46f7f2a36151016a5d318da073d60 +Author: Behdad Esfahbod +Date: Fri Jun 5 16:57:35 2009 -0400 + + Add XXX note about Unicode Plane 16 + + src/fccharset.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit efe5eae26b2443363b1000b3197d1731a40f8af9 +Author: Behdad Esfahbod +Date: Fri Jun 5 16:49:07 2009 -0400 + + Simplify FcValueSave() semantics + + src/fccfg.c | 3 ++- + src/fcpat.c | 12 ++---------- + 2 files changed, 4 insertions(+), 11 deletions(-) + +commit 8ea654b2aa6b4e97b369e299325da49807559511 +Author: Behdad Esfahbod +Date: Mon Jun 1 21:14:56 2009 -0400 + + Use/prefer WWS family/style (name table id 21/22) + + src/fcfreetype.c | 12 ++++++++++++ + 1 files changed, 12 insertions(+), 0 deletions(-) + +commit 76845a40c58b092a9b1812830dc98b6f32e13da6 +Author: Behdad Esfahbod +Date: Mon May 25 20:26:56 2009 -0400 + + Mark matchers array const (#21935) + + src/fcmatch.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit aa82a4f81d4d5e547c84266e66274d55e3843746 +Author: Roozbeh Pournader +Date: Thu May 7 14:31:11 2009 -0700 + + Reorganize Panjabi/Punjabi and Lahnda orthographies (bug #19890) + + The correct ISO 639 code for Pakistani/Western Panjabi seems to be + 'lah', + not 'pa'. We are keeping 'pa_pk.orth' for compatiblity with glibc. + + Signed-off-by: Behdad Esfahbod + + fc-lang/Makefile.am | 5 ++- + fc-lang/lah.orth | 35 +++++++++++++++++++++++++++++++++ + fc-lang/pa.orth | 53 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + fc-lang/pa_in.orth | 46 -------------------------------------------- + fc-lang/pa_pk.orth | 7 +++-- + 5 files changed, 95 insertions(+), 51 deletions(-) + +commit 58aa0c8ee83f7bbd232401583106387517d216a9 +Author: Behdad Esfahbod +Date: Thu Apr 9 13:31:18 2009 -0400 + + Detect TrueType Collections by checking the font data header + + Instead of checking for "face->num_faces >1". (GNOME bug #577952) + + src/ftglue.c | 11 +++++++++-- + 1 files changed, 9 insertions(+), 2 deletions(-) + +commit 1dd95fcb8bb9b5feeabee0dfe334448733f5cb4c +Author: Serge van den Boom +Date: Sun Apr 5 19:00:18 2009 -0400 + + Correctly handle mmap() failure (#21062) + + src/fccache.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 35c51811515ab316c7279bd779f6685f2aaf7e81 +Author: Behdad Esfahbod +Date: Wed Mar 25 23:40:40 2009 -0400 + + [fc-cache] Remove obsolete sentence from man page + + fc-cache/fc-cache.sgml | 5 +---- + 1 files changed, 1 insertions(+), 4 deletions(-) + +commit ffd6668b469508177c4baf7745ae42aee5b00322 +Author: Behdad Esfahbod +Date: Wed Mar 18 19:28:52 2009 -0400 + + [fc-lang] Make LangSet representation in the cache files stable + + Fontconfig assigns an index number to each language it knows about. + The index is used to index a bit in FcLangSet language map. The bit + map is stored in the cache. + + Previously fc-lang simply sorted the list of languages and assigned + them an index starting from zero. Net effect is that whenever new + orth files were added, all the FcLangSet info in the cache files would + become invalid. This was causing weird bugs like this one: + + https://bugzilla.redhat.com/show_bug.cgi?id=490888 + + With this commit we fix the index assigned to each language. + The index + will be based on the order the orth files are passed to fc-lang. As a + result all orth files are explicitly listed in Makefile.am now, and + new additions should be made to the end of the list. The list is made + to reflect the sorted list of orthographies from 2.6.0 released + followed + by new additions since. + + This fixes the stability problem. Needless to say, recreating caches + is necessary before any new orthography is recognized in existing + fonts, + but at least the existing caches are still valid and don't cause bugs + like the above. + + configure.in | 7 -- + fc-lang/Makefile.am | 248 + ++++++++++++++++++++++++++++++++++++++++++++++++++- + fc-lang/fc-lang.c | 49 +++++++--- + src/fclang.c | 4 +- + 4 files changed, 282 insertions(+), 26 deletions(-) + +commit 4d13536db49bdfba97f84f702325d1a99796c06b +Author: Behdad Esfahbod +Date: Wed Mar 18 18:50:14 2009 -0400 + + [fcstr] Remove unused variable + + src/fcstr.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +commit bb36e67685dc4139fc4199c57c9d74d97f7923c8 +Author: Behdad Esfahbod +Date: Wed Mar 18 18:43:09 2009 -0400 + + [fc-lang] Fix bug in country map generation + + Previously the county map code was using an uninitialized variable and + hence was totally failing to populate same-lang-different-territory + map. + + fc-lang/fc-lang.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 0f11354877323edc2145f687f9127d2de83c5b3b +Author: Behdad Esfahbod +Date: Tue Mar 17 12:52:48 2009 -0400 + + Revert "[conf] Disable hinting when emboldening (#19904)" (#20599) + + This reverts commit 10609af4aa4030a15c19573198462fa002d2ef13. + Apparently disabling hinting can cause worse rendering with certain + fonts. This is better handled on a per font basis. + + conf.d/90-synthetic.conf | 11 ----------- + 1 files changed, 0 insertions(+), 11 deletions(-) + +commit 7042e236495399aab4eaf268232177d4b1680a12 +Author: Behdad Esfahbod +Date: Mon Mar 16 17:59:50 2009 -0400 + + [Makefile.am] Don't clean ChangeLog in distclean + + Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit caeea376da54a6337bfcb1bb20f50c8c2302458f +Author: Behdad Esfahbod +Date: Fri Mar 13 17:26:21 2009 -0400 + + Document FcPatternFormat() format + + doc/Makefile.am | 2 + + doc/fcformat.fncs | 301 + +++++++++++++++++++++++++++++++++++++++++++++ + doc/fcpattern.fncs | 20 --- + doc/fontconfig-devel.sgml | 2 + + src/fcformat.c | 94 +++++++------- + 5 files changed, 353 insertions(+), 66 deletions(-) + +commit f6d83439890c165e5a7f6a8a746ffdb189dbbd0d +Author: Behdad Esfahbod +Date: Fri Mar 13 12:11:13 2009 -0400 + + [fcformat] Fix default-value handling + + src/fcformat.c | 21 +++++++++++---------- + 1 files changed, 11 insertions(+), 10 deletions(-) + +commit 3074a73b418b40135d4a4f4e0713fcf987d34795 +Author: Behdad Esfahbod +Date: Thu Mar 12 16:00:08 2009 -0400 + + Replace 'KEITH PACKARD' with 'THE AUTHOR(S)' in license text in + all files + + COPYING | 4 ++-- + Makefile.am | 4 ++-- + conf.d/65-fonts-persian.conf | 2 +- + conf.d/Makefile.am | 4 ++-- + config/Makedefs.in | 4 ++-- + configure.in | 4 ++-- + doc/Makefile.am | 4 ++-- + doc/confdir.sgml.in | 4 ++-- + doc/edit-sgml.c | 4 ++-- + doc/fcatomic.fncs | 4 ++-- + doc/fcblanks.fncs | 4 ++-- + doc/fccache.fncs | 4 ++-- + doc/fccharset.fncs | 4 ++-- + doc/fcconfig.fncs | 4 ++-- + doc/fcconstant.fncs | 4 ++-- + doc/fcfile.fncs | 4 ++-- + doc/fcfontset.fncs | 4 ++-- + doc/fcfreetype.fncs | 4 ++-- + doc/fcinit.fncs | 4 ++-- + doc/fcmatrix.fncs | 4 ++-- + doc/fcobjectset.fncs | 4 ++-- + doc/fcobjecttype.fncs | 4 ++-- + doc/fcpattern.fncs | 4 ++-- + doc/fcstring.fncs | 4 ++-- + doc/fcstrset.fncs | 4 ++-- + doc/fcvalue.fncs | 4 ++-- + doc/fontconfig-devel.sgml | 8 ++++---- + doc/fontconfig-user.sgml | 4 ++-- + doc/func.sgml | 4 ++-- + doc/version.sgml.in | 4 ++-- + fc-arch/Makefile.am | 4 ++-- + fc-arch/fcarch.tmpl.h | 4 ++-- + fc-cache/Makefile.am | 4 ++-- + fc-cache/fc-cache.c | 4 ++-- + fc-case/Makefile.am | 4 ++-- + fc-case/fc-case.c | 4 ++-- + fc-case/fccase.tmpl.h | 4 ++-- + fc-cat/Makefile.am | 4 ++-- + fc-cat/fc-cat.c | 4 ++-- + fc-glyphname/Makefile.am | 4 ++-- + fc-glyphname/fc-glyphname.c | 4 ++-- + fc-glyphname/fcglyphname.tmpl.h | 4 ++-- + fc-lang/Makefile.am | 4 ++-- + fc-lang/aa.orth | 4 ++-- + fc-lang/ab.orth | 4 ++-- + fc-lang/af.orth | 4 ++-- + fc-lang/am.orth | 4 ++-- + fc-lang/ar.orth | 4 ++-- + fc-lang/ast.orth | 4 ++-- + fc-lang/av.orth | 4 ++-- + fc-lang/ay.orth | 4 ++-- + fc-lang/az_ir.orth | 4 ++-- + fc-lang/ba.orth | 4 ++-- + fc-lang/be.orth | 4 ++-- + fc-lang/bg.orth | 4 ++-- + fc-lang/bh.orth | 4 ++-- + fc-lang/bho.orth | 4 ++-- + fc-lang/bi.orth | 4 ++-- + fc-lang/bin.orth | 4 ++-- + fc-lang/bm.orth | 4 ++-- + fc-lang/bo.orth | 4 ++-- + fc-lang/br.orth | 4 ++-- + fc-lang/bs.orth | 4 ++-- + fc-lang/bua.orth | 4 ++-- + fc-lang/ca.orth | 4 ++-- + fc-lang/ce.orth | 4 ++-- + fc-lang/ch.orth | 4 ++-- + fc-lang/chm.orth | 4 ++-- + fc-lang/chr.orth | 4 ++-- + fc-lang/co.orth | 4 ++-- + fc-lang/cs.orth | 4 ++-- + fc-lang/cu.orth | 4 ++-- + fc-lang/cv.orth | 4 ++-- + fc-lang/cy.orth | 4 ++-- + fc-lang/da.orth | 4 ++-- + fc-lang/de.orth | 4 ++-- + fc-lang/dz.orth | 4 ++-- + fc-lang/el.orth | 4 ++-- + fc-lang/en.orth | 4 ++-- + fc-lang/eo.orth | 4 ++-- + fc-lang/es.orth | 4 ++-- + fc-lang/et.orth | 4 ++-- + fc-lang/eu.orth | 4 ++-- + fc-lang/fa.orth | 4 ++-- + fc-lang/fc-lang.c | 4 ++-- + fc-lang/fc-lang.man | 4 ++-- + fc-lang/fclang.tmpl.h | 4 ++-- + fc-lang/ff.orth | 4 ++-- + fc-lang/fi.orth | 4 ++-- + fc-lang/fj.orth | 4 ++-- + fc-lang/fo.orth | 4 ++-- + fc-lang/fr.orth | 4 ++-- + fc-lang/fur.orth | 4 ++-- + fc-lang/fy.orth | 4 ++-- + fc-lang/ga.orth | 4 ++-- + fc-lang/gd.orth | 4 ++-- + fc-lang/gez.orth | 4 ++-- + fc-lang/gl.orth | 4 ++-- + fc-lang/gn.orth | 4 ++-- + fc-lang/gu.orth | 4 ++-- + fc-lang/gv.orth | 4 ++-- + fc-lang/ha.orth | 4 ++-- + fc-lang/haw.orth | 4 ++-- + fc-lang/he.orth | 4 ++-- + fc-lang/hi.orth | 4 ++-- + fc-lang/ho.orth | 4 ++-- + fc-lang/hr.orth | 4 ++-- + fc-lang/hu.orth | 4 ++-- + fc-lang/hy.orth | 4 ++-- + fc-lang/ia.orth | 4 ++-- + fc-lang/id.orth | 4 ++-- + fc-lang/ie.orth | 4 ++-- + fc-lang/ig.orth | 4 ++-- + fc-lang/ik.orth | 4 ++-- + fc-lang/io.orth | 4 ++-- + fc-lang/is.orth | 4 ++-- + fc-lang/it.orth | 4 ++-- + fc-lang/iu.orth | 4 ++-- + fc-lang/ja.orth | 4 ++-- + fc-lang/ka.orth | 4 ++-- + fc-lang/kaa.orth | 4 ++-- + fc-lang/ki.orth | 4 ++-- + fc-lang/kk.orth | 4 ++-- + fc-lang/kl.orth | 4 ++-- + fc-lang/kn.orth | 4 ++-- + fc-lang/ko.orth | 4 ++-- + fc-lang/kok.orth | 4 ++-- + fc-lang/ku_am.orth | 4 ++-- + fc-lang/ku_ir.orth | 4 ++-- + fc-lang/kum.orth | 4 ++-- + fc-lang/kv.orth | 4 ++-- + fc-lang/kw.orth | 4 ++-- + fc-lang/ky.orth | 4 ++-- + fc-lang/la.orth | 4 ++-- + fc-lang/lb.orth | 4 ++-- + fc-lang/lez.orth | 4 ++-- + fc-lang/ln.orth | 4 ++-- + fc-lang/lo.orth | 4 ++-- + fc-lang/lt.orth | 4 ++-- + fc-lang/lv.orth | 4 ++-- + fc-lang/mai.orth | 4 ++-- + fc-lang/mg.orth | 4 ++-- + fc-lang/mh.orth | 4 ++-- + fc-lang/mi.orth | 4 ++-- + fc-lang/mk.orth | 4 ++-- + fc-lang/ml.orth | 4 ++-- + fc-lang/mn_cn.orth | 4 ++-- + fc-lang/mo.orth | 4 ++-- + fc-lang/mr.orth | 4 ++-- + fc-lang/mt.orth | 4 ++-- + fc-lang/my.orth | 4 ++-- + fc-lang/nb.orth | 4 ++-- + fc-lang/nds.orth | 4 ++-- + fc-lang/ne.orth | 4 ++-- + fc-lang/nl.orth | 4 ++-- + fc-lang/nn.orth | 4 ++-- + fc-lang/no.orth | 4 ++-- + fc-lang/ny.orth | 4 ++-- + fc-lang/oc.orth | 4 ++-- + fc-lang/om.orth | 4 ++-- + fc-lang/or.orth | 4 ++-- + fc-lang/os.orth | 4 ++-- + fc-lang/pa_in.orth | 2 +- + fc-lang/pl.orth | 4 ++-- + fc-lang/ps_af.orth | 4 ++-- + fc-lang/ps_pk.orth | 4 ++-- + fc-lang/pt.orth | 4 ++-- + fc-lang/rm.orth | 4 ++-- + fc-lang/ro.orth | 4 ++-- + fc-lang/ru.orth | 4 ++-- + fc-lang/sa.orth | 4 ++-- + fc-lang/sah.orth | 4 ++-- + fc-lang/sco.orth | 4 ++-- + fc-lang/se.orth | 4 ++-- + fc-lang/sel.orth | 4 ++-- + fc-lang/sk.orth | 4 ++-- + fc-lang/sl.orth | 4 ++-- + fc-lang/sm.orth | 4 ++-- + fc-lang/sma.orth | 4 ++-- + fc-lang/smj.orth | 4 ++-- + fc-lang/smn.orth | 4 ++-- + fc-lang/sms.orth | 4 ++-- + fc-lang/so.orth | 4 ++-- + fc-lang/sq.orth | 4 ++-- + fc-lang/sr.orth | 4 ++-- + fc-lang/sv.orth | 4 ++-- + fc-lang/sw.orth | 4 ++-- + fc-lang/syr.orth | 4 ++-- + fc-lang/ta.orth | 4 ++-- + fc-lang/te.orth | 4 ++-- + fc-lang/tg.orth | 4 ++-- + fc-lang/th.orth | 4 ++-- + fc-lang/ti_er.orth | 4 ++-- + fc-lang/ti_et.orth | 4 ++-- + fc-lang/tig.orth | 4 ++-- + fc-lang/tn.orth | 4 ++-- + fc-lang/to.orth | 4 ++-- + fc-lang/tr.orth | 4 ++-- + fc-lang/ts.orth | 4 ++-- + fc-lang/tt.orth | 4 ++-- + fc-lang/tw.orth | 4 ++-- + fc-lang/tyv.orth | 4 ++-- + fc-lang/ug.orth | 4 ++-- + fc-lang/uk.orth | 4 ++-- + fc-lang/ur.orth | 4 ++-- + fc-lang/ve.orth | 4 ++-- + fc-lang/vi.orth | 4 ++-- + fc-lang/vo.orth | 4 ++-- + fc-lang/vot.orth | 4 ++-- + fc-lang/wa.orth | 4 ++-- + fc-lang/wen.orth | 4 ++-- + fc-lang/wo.orth | 4 ++-- + fc-lang/xh.orth | 4 ++-- + fc-lang/yap.orth | 4 ++-- + fc-lang/yi.orth | 4 ++-- + fc-lang/yo.orth | 4 ++-- + fc-lang/zh_cn.orth | 4 ++-- + fc-lang/zh_hk.orth | 4 ++-- + fc-lang/zh_mo.orth | 4 ++-- + fc-lang/zh_sg.orth | 4 ++-- + fc-lang/zh_tw.orth | 4 ++-- + fc-lang/zu.orth | 4 ++-- + fc-list/Makefile.am | 4 ++-- + fc-list/fc-list.c | 4 ++-- + fc-match/Makefile.am | 4 ++-- + fc-match/fc-match.c | 4 ++-- + fc-query/Makefile.am | 4 ++-- + fc-query/fc-query.c | 4 ++-- + fc-scan/Makefile.am | 4 ++-- + fc-scan/fc-scan.c | 4 ++-- + fontconfig/fcfreetype.h | 4 ++-- + fontconfig/fcprivate.h | 4 ++-- + fontconfig/fontconfig.h | 4 ++-- + src/Makefile.am | 4 ++-- + src/fcatomic.c | 4 ++-- + src/fcblanks.c | 4 ++-- + src/fccache.c | 4 ++-- + src/fccfg.c | 4 ++-- + src/fccharset.c | 4 ++-- + src/fcdbg.c | 4 ++-- + src/fcdefault.c | 4 ++-- + src/fcdir.c | 4 ++-- + src/fcformat.c | 4 ++-- + src/fcfreetype.c | 4 ++-- + src/fcfs.c | 4 ++-- + src/fcinit.c | 4 ++-- + src/fcint.h | 4 ++-- + src/fclang.c | 4 ++-- + src/fclist.c | 4 ++-- + src/fcmatch.c | 4 ++-- + src/fcname.c | 4 ++-- + src/fcpat.c | 4 ++-- + src/fcstr.c | 4 ++-- + src/fcxml.c | 4 ++-- + 254 files changed, 508 insertions(+), 508 deletions(-) + +commit b9b01b6ed0849f770200fb6ae2a3ac0ca2166877 +Author: Behdad Esfahbod +Date: Thu Mar 12 13:48:07 2009 -0400 + + Call git tools using "git cmd" instead of "git-cmd" syntax + + Recent git doesn't install the git-* commands in path. + + Makefile.am | 2 +- + new-version.sh | 10 +++++----- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit de69ee14d3ed094cd2bc4df603a03675c28d1b5b +Author: Behdad Esfahbod +Date: Thu Mar 12 12:31:57 2009 -0400 + + [fcxml.c] Embed a static 64-byte attr buffer in FcPStack + + Reduces number of mallocs called from FcConfigSaveAttr in my + small test + from 160 down to 6. + + src/fcstr.c | 4 ++-- + src/fcxml.c | 23 +++++++++++++++-------- + 2 files changed, 17 insertions(+), 10 deletions(-) + +commit 39861b7d9c69e71b9a8fb0d0d04279520cb30f04 +Author: Behdad Esfahbod +Date: Thu Mar 12 12:22:37 2009 -0400 + + [fcxml] Embed 64 static FcVStack objects in FcConfigParse + + This reduces the number of mallocs called from FcVStackPush from + over 800 down to zero. + + src/fcxml.c | 218 + ++++++++++++++++++++++++++++------------------------------ + 1 files changed, 105 insertions(+), 113 deletions(-) + +commit 1d7b47da9da574a8adf39b0b5d11aab3d3cf4a37 +Author: Behdad Esfahbod +Date: Thu Mar 12 11:58:04 2009 -0400 + + [fcxml] Embed 8 static FcPStack objects in FcConfigParse + + This reduces the number of mallocs called from FcPStackPush from + over 900 down to zero. + + src/fcxml.c | 28 ++++++++++++++++++++++------ + 1 files changed, 22 insertions(+), 6 deletions(-) + +commit 532d8a1dbc2baebc2603d091952a640b954b6f71 +Author: Behdad Esfahbod +Date: Thu Mar 12 09:27:20 2009 -0400 + + [fcxml] Don't allocate attr array if there are no attributes + + Reduces number of mallocs from FcConfigSaveAttr() in my small test + from over 900 down to 157. + + src/fcxml.c | 19 ++++++------------- + 1 files changed, 6 insertions(+), 13 deletions(-) + +commit 3ed70071cdc8a03229c009f5565c23948264a5e0 +Author: Behdad Esfahbod +Date: Wed Mar 11 14:07:15 2009 -0400 + + [fcstr,fcxml] Don't copy FcStrBuf contents when we would free it soon + + We can simply NUL-terminate the buffer and use it. Reduces number of + mallocs called from FcStrBufDone in my small test from 631 down to 66. + + src/fcint.h | 3 +++ + src/fcstr.c | 13 +++++++++++++ + src/fcxml.c | 28 ++++++++++++++-------------- + 3 files changed, 30 insertions(+), 14 deletions(-) + +commit 7d35c11b3304659d8be43913c9b125f2b5b38516 +Author: Behdad Esfahbod +Date: Wed Mar 11 13:56:09 2009 -0400 + + [fcstr.c] Embed a static 64-byte buffer in FcStrBuf + + Reduces number of mallocs called from FcStrBufChar in my small test + from 900 down to 6. + + src/fcint.h | 1 + + src/fcstr.c | 11 +++++++++-- + 2 files changed, 10 insertions(+), 2 deletions(-) + +commit 916640ce40b995d1d97244975139ec0c030483e4 +Author: Behdad Esfahbod +Date: Tue Mar 10 02:15:37 2009 -0400 + + Fix Makefile's to not create target file in case of failure + + fc-arch/Makefile.am | 3 ++- + fc-lang/Makefile.am | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 26ce979e825d661be046b1440563115ddc5ea4ab +Author: Behdad Esfahbod +Date: Tue Mar 10 02:14:15 2009 -0400 + + Fix Fanti (fat) orth file (#20390) + + fc-lang/fat.orth | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 49111c11fb5dca2af06004cc2ae443517f6c9557 +Author: Roozbeh Pournader +Date: Mon Mar 2 22:48:37 2009 -0800 + + Add Sundanese (su) orthography (bug #20440) + + fc-lang/su.orth | 33 +++++++++++++++++++++++++++++++++ + 1 files changed, 33 insertions(+), 0 deletions(-) + +commit 0eaed16d34687bddc831d1ab3c50406c7c56792d +Author: Roozbeh Pournader +Date: Mon Mar 2 20:53:26 2009 -0800 + + Add Kanuri (kr) orthography (bug #20438) + + fc-lang/kr.orth | 43 +++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 43 insertions(+), 0 deletions(-) + +commit fe4838588b0b9eb84f66bd4ad70ee12013e0b49a +Author: Roozbeh Pournader +Date: Mon Mar 2 02:21:17 2009 -0800 + + Add Nauru (na) orthography (bug #20418) + + fc-lang/na.orth | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 40 insertions(+), 0 deletions(-) + +commit 9141b4bbe9a100200b09597f02521cd6e30d0f06 +Author: Roozbeh Pournader +Date: Sun Mar 1 03:53:11 2009 -0800 + + Add Javanese (jv) orthography (bug #20403) + + fc-lang/jv.orth | 36 ++++++++++++++++++++++++++++++++++++ + 1 files changed, 36 insertions(+), 0 deletions(-) + +commit dc6daae9494e30d8c2d9657bab04d8f88751f751 +Author: Roozbeh Pournader +Date: Sun Mar 1 03:50:46 2009 -0800 + + Add Sichuan Yi (ii) orthography (bug #20402) + + fc-lang/ii.orth | 34 ++++++++++++++++++++++++++++++++++ + 1 files changed, 34 insertions(+), 0 deletions(-) + +commit 43517045f885c0e463c8a784c65f0b783658fc9b +Author: Roozbeh Pournader +Date: Sun Mar 1 03:46:48 2009 -0800 + + Add Shona (sn) orthography (bug #20394) + + fc-lang/sn.orth | 35 +++++++++++++++++++++++++++++++++++ + 1 files changed, 35 insertions(+), 0 deletions(-) + +commit 42a8008df14c7dcdd85ab7d3ce12b4191b807f27 +Author: Roozbeh Pournader +Date: Sun Mar 1 03:30:58 2009 -0800 + + Add orthographies for Oshiwambo languages (bug #20401) + + The languages are Kuanyama/Kwanyama (kj), Ndonga (ng), and Kwambi + (kwm). + + fc-lang/kj.orth | 34 ++++++++++++++++++++++++++++++++++ + fc-lang/kwm.orth | 29 +++++++++++++++++++++++++++++ + fc-lang/ng.orth | 29 +++++++++++++++++++++++++++++ + 3 files changed, 92 insertions(+), 0 deletions(-) + +commit f0b546372967434418aa6cfe6f2d709795fdff24 +Author: Roozbeh Pournader +Date: Sun Mar 1 02:33:54 2009 -0800 + + Add Zhuang (za) orthography (bug #20399) + + fc-lang/za.orth | 39 +++++++++++++++++++++++++++++++++++++++ + 1 files changed, 39 insertions(+), 0 deletions(-) + +commit 7886b147834decbcab6f556b1c43cc003e2bf893 +Author: Roozbeh Pournader +Date: Sun Mar 1 02:12:38 2009 -0800 + + Add Rundi (rn) orthography (bug #20398) + + fc-lang/rn.orth | 32 ++++++++++++++++++++++++++++++++ + 1 files changed, 32 insertions(+), 0 deletions(-) + +commit 10a85249d9e79ae474c996d3e4f14d0ea8aa50b8 +Author: Roozbeh Pournader +Date: Sat Feb 28 19:43:02 2009 -0800 + + Add Navajo (nv) orthography (bug #20395) + + fc-lang/nv.orth | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 48 insertions(+), 0 deletions(-) + +commit bf20886085a18227702f67b70dd7ef5f0e919469 +Author: Roozbeh Pournader +Date: Sat Feb 28 18:25:20 2009 -0800 + + Add Tahitian (ty) orthography (bug #20391) + + fc-lang/ty.orth | 41 +++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 41 insertions(+), 0 deletions(-) + +commit 0e05d7e5c730a1740d4c289a66f43f11a527c840 +Author: Roozbeh Pournader +Date: Sat Feb 28 18:01:11 2009 -0800 + + Add Sango (sg) orthography (bug #20393) + + fc-lang/sg.orth | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 47 insertions(+), 0 deletions(-) + +commit bdbdc64dd1e0a1727e2486c3320f9598695e4ab4 +Author: Roozbeh Pournader +Date: Sat Feb 28 17:38:21 2009 -0800 + + Added Quechua (qu) orthography (bug #20392) + + fc-lang/qu.orth | 36 ++++++++++++++++++++++++++++++++++++ + 1 files changed, 36 insertions(+), 0 deletions(-) + +commit 16159d0fae1d8d0d2ba6ac1fc7f845582dec351b +Author: Roozbeh Pournader +Date: Sat Feb 28 17:05:11 2009 -0800 + + Add Akan (ak) and Fanti (fat) orthographies (bug #20390) + + fc-lang/ak.orth | 30 ++++++++++++++++++++++++++++++ + fc-lang/fat.orth | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 60 insertions(+), 0 deletions(-) + +commit 881a7cd93b3358e371a25bc7ad4818baa3c8968b +Author: Roozbeh Pournader +Date: Sat Feb 28 16:29:07 2009 -0800 + + Add Herero (hz) orthograhy (bug #20387) + + fc-lang/hz.orth | 35 +++++++++++++++++++++++++++++++++++ + 1 files changed, 35 insertions(+), 0 deletions(-) + +commit bc701d2a5b7dc687ba25bafc5fea282adad37ecb +Author: Roozbeh Pournader +Date: Sat Feb 28 16:03:51 2009 -0800 + + Add Ewe (ee) orthography (bug #20386) + + fc-lang/ee.orth | 77 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 77 insertions(+), 0 deletions(-) + +commit 5a83914b733755ff6c710ff398cb5668fdb74a19 +Author: Roozbeh Pournader +Date: Fri Feb 27 14:41:07 2009 -0800 + + Update Serbo-Croatian (sh) orthography (bug #20368) + + fc-lang/sh.orth | 18 +++++++++++++----- + 1 files changed, 13 insertions(+), 5 deletions(-) + +commit 505ea8ce37dff9cc35dba6a98de4a31ed1ac5f8c +Author: Roozbeh Pournader +Date: Thu Feb 26 23:27:20 2009 -0800 + + Extend Crimean Tatar (crh) orthography (bug #19891) + + fc-lang/crh.orth | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +commit 4c7da799f3b90fb2f1117f9e9c45fa7fc1bd268c +Author: Roozbeh Pournader +Date: Wed Feb 18 21:21:01 2009 -0800 + + Add Divehi (dv) orthography (bug #20207) + + fc-lang/dv.orth | 34 ++++++++++++++++++++++++++++++++++ + 1 files changed, 34 insertions(+), 0 deletions(-) + +commit 5cac0a4fd681087562c84b3d2534cecff6876048 +Author: Roozbeh Pournader +Date: Wed Feb 18 17:09:51 2009 -0800 + + Remove digits and symbols from some Indic orthographies (bug #20204) + + These orthographies were changed: Gujarati (gu), Kannada (kn), Lao + (lo), + Malayalam (ml), Oriya (or), Telugu (te), and Thai (th). + + fc-lang/gu.orth | 4 ++-- + fc-lang/kn.orth | 4 ++-- + fc-lang/lo.orth | 4 ++-- + fc-lang/ml.orth | 4 ++-- + fc-lang/or.orth | 5 +++-- + fc-lang/te.orth | 4 ++-- + fc-lang/th.orth | 8 ++++++-- + 7 files changed, 19 insertions(+), 14 deletions(-) + +commit ea628d97706e842cb5555ceb5368fd972c941e0c +Author: Roozbeh Pournader +Date: Wed Feb 18 16:44:10 2009 -0800 + + Tighten Central Khmer (km) orthography (bug #20202) + + fc-lang/km.orth | 24 +++++++++++++++++------- + 1 files changed, 17 insertions(+), 7 deletions(-) + +commit 4a5805d9c6b20b4c8f56f3b8201653e88e3706be +Author: Roozbeh Pournader +Date: Wed Feb 18 16:03:30 2009 -0800 + + Change Kashmiri (ks) orthography to Arabic script (bug #20200) + + fc-lang/ks.orth | 19 ++++++++++++------- + 1 files changed, 12 insertions(+), 7 deletions(-) + +commit cda57219229025db963d3db0f984974187a409f8 +Author: Roozbeh Pournader +Date: Tue Feb 17 23:33:07 2009 -0800 + + Rename Fulah orthography from 'ful' to 'ff' (bug #20177) + + fc-lang/ff.orth | 38 ++++++++++++++++++++++++++++++++++++++ + fc-lang/ful.orth | 38 -------------------------------------- + 2 files changed, 38 insertions(+), 38 deletions(-) + +commit a32b79c3a5251916597bb871d2cd7698baeb5e58 +Author: Roozbeh Pournader +Date: Tue Feb 17 22:45:17 2009 -0800 + + Rename Bambara orthography from 'bam' to 'bm' (bug #20175) + + fc-lang/bam.orth | 37 ------------------------------------- + fc-lang/bm.orth | 37 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 37 insertions(+), 37 deletions(-) + +commit 74a0a28695a24e02bc623d1b2c1c72054ff03d52 +Author: Roozbeh Pournader +Date: Tue Feb 17 22:40:50 2009 -0800 + + Rename Avaric orthography from 'ava' to 'av' (bug #20174) + + fc-lang/av.orth | 97 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fc-lang/ava.orth | 97 + ------------------------------------------------------ + 2 files changed, 97 insertions(+), 97 deletions(-) + +commit eba32fa3f3024fb94f75cdedaa8d4c17d786a761 +Author: Roozbeh Pournader +Date: Tue Feb 17 22:09:53 2009 -0800 + + Update Azerbaijani in Latin (az_az) to present usage (bug #20173) + + Removed Cyrillic that is no longer in use. Removed "A WITH DIAERESIS" + too, since it was only temporarily used in 1991-1992. + + fc-lang/az_az.orth | 41 ++++++++++++++--------------------------- + 1 files changed, 14 insertions(+), 27 deletions(-) + +commit 1c7bacc214f6e6e507f932230ec52744337cdf47 +Author: Roozbeh Pournader +Date: Tue Feb 17 21:37:45 2009 -0800 + + Switch Uzbek (uz) orthography to Latin (bug #19851) + + fc-lang/uz.orth | 94 + +++++++++--------------------------------------------- + 1 files changed, 16 insertions(+), 78 deletions(-) + +commit dfd5d0937ce44b4a60b5ee7e2e82650a5e31a456 +Author: Roozbeh Pournader +Date: Tue Feb 17 20:02:39 2009 -0800 + + Add Crimean Tatar (crh) orthography (bug #19891) + + fc-lang/crh.orth | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 45 insertions(+), 0 deletions(-) + +commit 502c46c23d3e36dbfff29484486091f140756535 +Author: Roozbeh Pournader +Date: Tue Feb 17 19:41:30 2009 -0800 + + Add Papiamento (pap_aw, pap_an) orthographies (bug #19891) + + fc-lang/pap_an.orth | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + fc-lang/pap_aw.orth | 31 +++++++++++++++++++++++++++++++ + 2 files changed, 77 insertions(+), 0 deletions(-) + +commit b4cd4cb6cc2cfd6432bfd4a5b2ec9c63cf653f6d +Author: Roozbeh Pournader +Date: Tue Feb 17 17:30:15 2009 -0800 + + Add Blin (byn) orthography (bug #19891) + + fc-lang/byn.orth | 27 +++++++++++++++++++++++++++ + 1 files changed, 27 insertions(+), 0 deletions(-) + +commit 4d7412a28b834830d0d1749852115846b3554932 +Author: Roozbeh Pournader +Date: Tue Feb 17 17:03:54 2009 -0800 + + Divide Panjabi (pa) to that of Pakistan and India (bug #19890) + + Previous Panjabi orthography was in the Gurmukhi script only, while in + Pakistan, the Arabic script (called Shahmukhi) is used for Panjani. + + fc-lang/pa.orth | 46 ---------------------------------------------- + fc-lang/pa_in.orth | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + fc-lang/pa_pk.orth | 28 ++++++++++++++++++++++++++++ + 3 files changed, 74 insertions(+), 46 deletions(-) + +commit 7a22c9d3471cd4963c529937df823148ab8e1a7d +Author: Roozbeh Pournader +Date: Fri Feb 13 20:04:42 2009 -0800 + + Add Ottoman Turkish (ota) orthography (bug #20114) + + fc-lang/ota.orth | 41 +++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 41 insertions(+), 0 deletions(-) + +commit b5675e4c920dbb146ab76d49b4807693749e8143 +Author: Roozbeh Pournader +Date: Fri Feb 13 17:14:14 2009 -0800 + + Remove Euro Sign from all orthographies (bug #19865) + + fc-lang/de.orth | 1 - + fc-lang/el.orth | 1 - + fc-lang/en.orth | 1 - + fc-lang/es.orth | 1 - + fc-lang/fi.orth | 1 - + fc-lang/fr.orth | 1 - + fc-lang/it.orth | 1 - + fc-lang/nl.orth | 1 - + fc-lang/pt.orth | 1 - + 9 files changed, 0 insertions(+), 9 deletions(-) + +commit f6993c880345b45abc0f7e7f0bb14dd0ddae0caa +Author: Behdad Esfahbod +Date: Mon Mar 2 13:25:37 2009 +0330 + + [fc-lang] Continue parsing after an "include" (#20179) + + fc-lang/fc-lang.c | 29 ++++++++++++++++++----------- + 1 files changed, 18 insertions(+), 11 deletions(-) + +commit abe0e056d5a93dee80d8e964569563dc4d131a90 +Author: Roozbeh Pournader +Date: Fri Feb 13 16:47:11 2009 -0800 + + Fix Bengali (bn) and Assamese (as) orthographies (bug #22924) + + Removing digits, symbols, and the letters not used in the languages. + + fc-lang/as.orth | 37 +++++++++++++++++++++++++++---------- + fc-lang/bn.orth | 21 ++++++++++++--------- + 2 files changed, 39 insertions(+), 19 deletions(-) + +commit 40b2904c8984db90cc35eecbec571552c2e4d120 +Author: Roozbeh Pournader +Date: Fri Feb 13 16:07:14 2009 -0800 + + Add Sidamo (sid) and Wolaitta (wal) orthographies (bug #19891) + + fc-lang/sid.orth | 27 +++++++++++++++++++++++++++ + fc-lang/wal.orth | 27 +++++++++++++++++++++++++++ + 2 files changed, 54 insertions(+), 0 deletions(-) + +commit d333969e0c809b3175193c7dda26703287d57fd4 +Author: Roozbeh Pournader +Date: Fri Feb 13 15:52:23 2009 -0800 + + Add Sardinian (sc) orthography (bug #19891) + + fc-lang/sc.orth | 42 ++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 42 insertions(+), 0 deletions(-) + +commit 1ae2e9b479818835ba3ddddb3c613cdb5acf46d4 +Author: Roozbeh Pournader +Date: Fri Feb 13 13:31:10 2009 -0800 + + Add Limburgan (li) orthography (bug #19891) + + fc-lang/li.orth | 43 +++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 43 insertions(+), 0 deletions(-) + +commit d8a4ee921a3bf0e78dffcea8f27d457cc1bc378e +Author: Roozbeh Pournader +Date: Wed Feb 11 01:59:56 2009 -0800 + + Ad Ganda (lg) orthography (bug #19891) + + fc-lang/lg.orth | 33 +++++++++++++++++++++++++++++++++ + 1 files changed, 33 insertions(+), 0 deletions(-) + +commit f4159adaa88d55118fe1c2c62b05600d0a8fbc0a +Author: Roozbeh Pournader +Date: Wed Feb 11 01:44:45 2009 -0800 + + Add Haitian Creole (ht) orthography (bug #19891) + + fc-lang/ht.orth | 35 +++++++++++++++++++++++++++++++++++ + 1 files changed, 35 insertions(+), 0 deletions(-) + +commit 190b4b5b2bd9a4822660b134639a759a5949c862 +Author: Roozbeh Pournader +Date: Wed Feb 11 01:11:30 2009 -0800 + + Add Aragonese (an) orthography (bug #19891) + + fc-lang/an.orth | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 45 insertions(+), 0 deletions(-) + +commit 3541f01828be06e2a414fa5bcd9543dbb2c9e0fd +Author: Roozbeh Pournader +Date: Wed Feb 11 00:34:10 2009 -0800 + + Add Kurdish in Turkey (ku_tr) orthography (bug #19891) + + fc-lang/ku_tr.orth | 42 ++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 42 insertions(+), 0 deletions(-) + +commit 3792f0199065cdf808d723eacf3fa86910453f70 +Author: Roozbeh Pournader +Date: Wed Feb 11 00:22:53 2009 -0800 + + Use newly added Cyrillic letters for Kurdish (bug #20049) + + fc-lang/ku_am.orth | 5 +---- + 1 files changed, 1 insertions(+), 4 deletions(-) + +commit 0d8b15f00f11a5150d842a3bd10e8dd05413fb9c +Author: Roozbeh Pournader +Date: Wed Feb 11 00:05:16 2009 -0800 + + Add Chhattisgarhi (hne) orthography (bug #19891) + + fc-lang/hne.orth | 28 ++++++++++++++++++++++++++++ + 1 files changed, 28 insertions(+), 0 deletions(-) + +commit 04ac14fc14131a66f0c391d8bb3894a01e556a05 +Author: Behdad Esfahbod +Date: Fri Feb 13 17:18:11 2009 -0800 + + [fcformat] Add list of undocumented language features + + src/fcformat.c | 35 +++++++++++++++++++++++++++++++++++ + 1 files changed, 35 insertions(+), 0 deletions(-) + +commit 384542fa915b27285ec22d899c4aa19be8c275f1 +Author: Behdad Esfahbod +Date: Fri Feb 13 16:41:37 2009 -0800 + + [fcformat] Add a 'pkgkit' builtin that prints tags for font packages + + For DejaVu Sans Condensed it generates: + + font(dejavusans) + font(dejavusanscondensed) + font(:lang=aa) + font(:lang=ab) + ... + font(:lang=yo) + font(:lang=zu) + + src/fcformat.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 9d58d01c5c061c1fcfb3cca3a3a4622f9bbec727 +Author: Behdad Esfahbod +Date: Fri Feb 13 16:33:58 2009 -0800 + + [fcformat] Enumerate langsets like we do arrays of values + + If one asks for a format like '%{[]elt{expr}}' and the first value + for elt is a langset, we enumerate the langset languages in expr. + + src/fcformat.c | 59 + ++++++++++++++++++++++++++++++++++++++++++++----------- + 1 files changed, 47 insertions(+), 12 deletions(-) + +commit d62b85af21777582ad720efd9c319fde97b67d82 +Author: Behdad Esfahbod +Date: Fri Feb 13 16:30:43 2009 -0800 + + [fclang] Implement FcLangSetGetLangs() (#18846) + + doc/fclangset.fncs | 8 ++++++++ + fontconfig/fontconfig.h | 3 +++ + src/fclang.c | 32 ++++++++++++++++++++++++++++++++ + 3 files changed, 43 insertions(+), 0 deletions(-) + +commit cdfb76585e7afbe739d00ed83a029ce1f909142f +Author: Behdad Esfahbod +Date: Thu Feb 12 21:48:22 2009 -0600 + + [fcformat] Implement array enumeration + + The format '%{[]family,familylang{expr}}' expands expr once for + the first + value of family and familylang, then for the second, etc, until + both lists + are exhausted. + + src/fcformat.c | 90 + ++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 files changed, 85 insertions(+), 5 deletions(-) + +commit 0673ef3881d24820e627b9a8cd3a4b3e3889c545 +Author: Behdad Esfahbod +Date: Wed Feb 11 23:55:11 2009 -0500 + + [fcformat] Support 'default value' for simple tags + + The format '%{family:-XXX} prints XٓٓٓٓXX if the element family + is not defined. + Also works for things like '%{family[1]:-XXX}'. + + src/fcformat.c | 30 +++++++++++++++++++++++++----- + 1 files changed, 25 insertions(+), 5 deletions(-) + +commit 9c83a8376f7db19421fb42d311fba81b398c67b0 +Author: Behdad Esfahbod +Date: Wed Feb 11 23:44:36 2009 -0500 + + [fcformat] Support indexing simple tags + + The format '%{family[0]}' will only output the first value for + element family. + + src/fcformat.c | 43 +++++++++++++++++++++++++++++++++++++++---- + src/fcint.h | 5 +++++ + src/fcname.c | 2 +- + 3 files changed, 45 insertions(+), 5 deletions(-) + +commit d04a750764d89a7048f49d655fb7e4aabbcd10b3 +Author: Behdad Esfahbod +Date: Tue Feb 10 20:56:39 2009 -0500 + + [fcformat] Add support for builtin formats + + The '%{=unparse}' format expands to the FcNameUnparse() result on the + pattern. Need to add '%{=verbose}' for FcPatternPrint() output but + need to change that function to output to a string first. + + Also added the '%{=fclist}' and '%{=fcmatch}' which format like the + default format of fc-list and fc-match respectively. + + src/fcformat.c | 137 + +++++++++++++++++++++++++++++++++++++++----------------- + 1 files changed, 95 insertions(+), 42 deletions(-) + +commit 85c7fb67ce9f77574f71de7d9b69867bb974cd48 +Author: Behdad Esfahbod +Date: Tue Feb 10 18:57:34 2009 -0500 + + [fcformat] Refactor code to avoid malloc + + src/fcformat.c | 246 + +++++++++++++++++++++++++++++++++----------------------- + 1 files changed, 144 insertions(+), 102 deletions(-) + +commit d4f7a4c6af5420afbbcf2217f9fe396623671294 +Author: Behdad Esfahbod +Date: Tue Feb 10 06:22:55 2009 -0500 + + [fcformat] Start adding builtins + + src/fcformat.c | 27 ++++++++++++++++++++++++++- + 1 files changed, 26 insertions(+), 1 deletions(-) + +commit c8f5933d13efa6705854d8f89b22d40cf720e68d +Author: Behdad Esfahbod +Date: Tue Feb 10 05:57:10 2009 -0500 + + [fcformat] Implement 'delete', 'escape', and 'translate' filter + functions + + The format '%{family|delete( )}' expands to family values with + space removed. + The format '%{family|translate( ,-)}' expands to family values + with space + replaced by dash. Multiple chars are supported, like tr(1). + The format '%{family|escape(\\ )}' expands to family values with space + escaped using backslash. + + src/fcformat.c | 219 + +++++++++++++++++++++++++++++++++++++++++++++++++------- + 1 files changed, 194 insertions(+), 25 deletions(-) + +commit b6a23028beb3b99022599344ebd8511c12dc7fd0 +Author: Behdad Esfahbod +Date: Tue Feb 10 05:05:53 2009 -0500 + + [fcformat] Add value-count syntax + + The format '%{#family}' expands to the number of values for the + element + 'family', or '0' if no such element exists in the pattern. + + src/fcformat.c | 116 + ++++++++++++++++++++++++++++++++++++-------------------- + 1 files changed, 75 insertions(+), 41 deletions(-) + +commit dccbbe83eff54097c55fdc560810cdc56b679a60 +Author: Behdad Esfahbod +Date: Tue Feb 10 04:47:24 2009 -0500 + + [FcStrBuf] better handle malloc failure + + If buffer has failed allocation, return NULL when done. + + src/fcstr.c | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +commit ced38254b49ab616df79930bbb798a93e5ce51fa +Author: Behdad Esfahbod +Date: Tue Feb 10 04:44:54 2009 -0500 + + [fcformat] Implement 'cescape', 'shescape', and 'xmlescape' converters + + src/fcformat.c | 87 + ++++++++++++++++++++++++++++++++++++++++++++++++------- + 1 files changed, 76 insertions(+), 11 deletions(-) + +commit 2017a5eb79a0774cc5bace8c76304e1a9ef157b9 +Author: Behdad Esfahbod +Date: Tue Feb 10 03:38:22 2009 -0500 + + [fcformat] Add simple converters + + The format '%{family|downcase}' for example prints the lowercase of + the family element. Three converters are defined right now: + 'downcase', 'basename', and 'dirname'. + + src/fcformat.c | 224 + +++++++++++++++++++++++++++++++++----------------------- + 1 files changed, 131 insertions(+), 93 deletions(-) + +commit 7717b25ffdd9507b0d73ef60b70b692f7286c0a2 +Author: Behdad Esfahbod +Date: Tue Feb 10 00:15:08 2009 -0500 + + [fcformat] Add conditionals + + The conditional '%{?elt1,elt2,!elt3{expr1}{expr2}}' will evaluate + expr1 if elt1 and elt2 exist in pattern and elt3 doesn't exist, and + expr2 otherwise. The '{expr2}' part is optional. + + src/fcformat.c | 158 + ++++++++++++++++++++++++++++++++++++++++++++++++++++---- + 1 files changed, 147 insertions(+), 11 deletions(-) + +commit 8c31a2434d5dfa475ef710ad52c992111caac424 +Author: Behdad Esfahbod +Date: Mon Feb 9 23:08:08 2009 -0500 + + [fcformat] Add element filtering and deletion + + The filtering, '%{+elt1,elt2,elt3{subexpr}}' will evaluate subexpr + with a pattern only having the listed elements from the surrounding + pattern. + + The deletion, '%{-elt1,elt2,elt3{subexpr}}' will evaluate subexpr + with a the surrounding pattern sans the listed elements. + + doc/fcpattern.fncs | 2 +- + fc-list/fc-list.c | 7 +- + fc-match/fc-match.c | 6 +- + fc-query/fc-query.c | 7 +- + fc-scan/fc-scan.c | 7 +- + src/fcformat.c | 214 + ++++++++++++++++++++++++++++++++++++++------------ + 6 files changed, 183 insertions(+), 60 deletions(-) + +commit d6506ff6eeb4a4cb0bfe827174e474c7b91ff045 +Author: Behdad Esfahbod +Date: Mon Feb 9 20:49:45 2009 -0500 + + [fcformat] Add support for subexpressions + + The syntax is '{{expr}}'. Can be used for aligning/justifying + an entire + subexpr for example. + + src/fcformat.c | 149 + ++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 files changed, 124 insertions(+), 25 deletions(-) + +commit 27b3e2dddf6a89c66e8d79f4a28b1a0653e8e100 +Author: Behdad Esfahbod +Date: Mon Feb 9 19:13:07 2009 -0500 + + [fcformat] Refactor and restructure code for upcoming changes + + Also makes it thread-safe. + + src/fcformat.c | 165 + ++++++++++++++++++++++++++++++++----------------------- + 1 files changed, 96 insertions(+), 69 deletions(-) + +commit c493c3b770ab12ab1c61a4fb10419c490d2b5ba6 +Author: Behdad Esfahbod +Date: Mon Feb 9 18:18:59 2009 -0500 + + [fcformat] Add support for width modifiers + + One can do '%30{family}' for example. Or '%-30{family}' for the + left-aligned version. + + doc/fcpattern.fncs | 6 ++++-- + src/fcformat.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 47 insertions(+), 5 deletions(-) + +commit 967267556c762d2746f819eca85f3c59fbb95875 +Author: Behdad Esfahbod +Date: Thu Feb 5 23:37:16 2009 -0500 + + Further update Sinhala orthography (#19288) + + fc-lang/si.orth | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +commit b697fa2523a6d3fe091e14710d14720a9e051bf1 +Author: Behdad Esfahbod +Date: Thu Feb 5 02:46:16 2009 -0500 + + [cache] After writing cache to file, update the internal copy to + reflect this + + Only do it for small caches though. For large cache we'd better + off loading + the cache file again, mmap()ing it. + + Based on patch from Diego Santa Cruz. + + src/fccache.c | 16 ++++++++++++++++ + 1 files changed, 16 insertions(+), 0 deletions(-) + +commit ecce22d40cfbc50bbe19891035c06bbbeef5232f +Author: Behdad Esfahbod +Date: Wed Feb 4 15:58:36 2009 -0500 + + Update Sinhala orthography (#19288) + + Patch from Harshula Jayasuriya. + + fc-lang/si.orth | 45 ++++++++++++++++++++++++++++++++++----------- + 1 files changed, 34 insertions(+), 11 deletions(-) + +commit 6bb5d72fe788f897e30ab39ac7585c624282303f +Author: Behdad Esfahbod +Date: Tue Feb 3 21:06:15 2009 -0500 + + [fccache] Make sure the cache is current when reusing from open caches + + Reported by Diego Santa Cruz. + + src/fccache.c | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +commit f9feb587faa5a3df0f03e5ba945d228b8b49ec51 +Author: Behdad Esfahbod +Date: Tue Feb 3 20:50:29 2009 -0500 + + [win32] Do not remove leading '\\' such that network paths work + + Raised by Diego Santa Cruz. + + src/fcstr.c | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +commit 1cdf7efb224867c41b2dea48884d87c5fb67bdaf +Author: Behdad Esfahbod +Date: Tue Feb 3 20:35:10 2009 -0500 + + [win32] Expand "APPSHAREFONTDIR" to ../share/fonts relative to + binary location + + Proposed by Diego Santa Cruz. + + src/fcxml.c | 21 +++++++++++++++++++++ + 1 files changed, 21 insertions(+), 0 deletions(-) + +commit e62058abb9cf04b3f2270a45f3c0760287f12033 +Author: Behdad Esfahbod +Date: Tue Feb 3 20:31:30 2009 -0500 + + [win32] Fix usage of GetFullPathName() + + Diego Santa Cruz pointed out that we are using that API wrongly. + The forth argument is a pointer to a pointer. Turns out we don't + need that arugment and it accepts NULL, so just pass that. + + src/fcstr.c | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) + +commit c4d557ab90c7ef6eccb998550190ccccde80670d +Author: Behdad Esfahbod +Date: Tue Feb 3 17:15:52 2009 -0500 + + Add ICONV_LIBS to fontconfig.pc.in (#19606) + + fontconfig.pc.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 10609af4aa4030a15c19573198462fa002d2ef13 +Author: Mike FABIAN +Date: Tue Feb 3 16:57:01 2009 -0500 + + [conf] Disable hinting when emboldening (#19904) + + Hinting will be done before Embolden in freetype2, + but in such case, Embolden will get wrong result + on some glyph contours after applying hinting. + Actually, hinting should be done after embolden, but we can't + fix it in current freetype2. So as a workaround, just turn off + hinting if we want to do embolden. + + conf.d/90-synthetic.conf | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +commit fe00689cddb42df141d891c2cd5b4a8ea3a42816 +Author: Roozbeh Pournader +Date: Mon Feb 2 00:27:58 2009 -0800 + + Remove punctuation symbols from Asturian orthography (bug #19893) + + Also fix the URL for orthography. + + fc-lang/ast.orth | 12 ++++-------- + 1 files changed, 4 insertions(+), 8 deletions(-) + +commit a4f651241e2db62bd058e773b4e5931d205af0f6 +Author: Roozbeh Pournader +Date: Sun Feb 1 23:52:10 2009 -0800 + + Rename Igbo from "ibo" to "ig" (bug #19892) + + fc-lang/ibo.orth | 35 ----------------------------------- + fc-lang/ig.orth | 35 +++++++++++++++++++++++++++++++++++ + 2 files changed, 35 insertions(+), 35 deletions(-) + +commit ff71a83c207891323b487d9cbec0658e16ca11c3 +Author: Roozbeh Pournader +Date: Sun Feb 1 22:14:53 2009 -0800 + + Renamed az to az_az (bug #19889) + + fc-lang/az.orth | 66 + ---------------------------------------------------- + fc-lang/az_az.orth | 66 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 66 insertions(+), 66 deletions(-) + +commit e53956ee5e6340c5c8a78bf65e9c9df0757af439 +Author: Roozbeh Pournader +Date: Sun Feb 1 20:46:23 2009 -0800 + + Add Berber orthographies in Latin and Tifinagh scripts (bug #19881) + + fc-lang/ber_dz.orth | 27 +++++++++++++++++++++++++++ + fc-lang/ber_ma.orth | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + fc-lang/kab.orth | 42 ++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 115 insertions(+), 0 deletions(-) + +commit 3765a7483e1d313c6d0ced8a20cd5a258165f8e0 +Author: Roozbeh Pournader +Date: Sun Feb 1 20:42:54 2009 -0800 + + Add Upper Sorbian (hsb) orthography (bug #19870) + + fc-lang/hsb.orth | 42 ++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 42 insertions(+), 0 deletions(-) + +commit 9f54d9db2912287358c1c01771a1bc8263e9539a +Author: Roozbeh Pournader +Date: Sun Feb 1 20:41:14 2009 -0800 + + Add Kinyarwanda (rw) orthography (bug #19868) + + fc-lang/rw.orth | 31 +++++++++++++++++++++++++++++++ + 1 files changed, 31 insertions(+), 0 deletions(-) + +commit 3889de9e3c0a0b6aacd0558ce41953d9aa35878b +Author: Roozbeh Pournader +Date: Sun Feb 1 20:39:03 2009 -0800 + + Add Malay (ms) orthography (bug #19867) + + fc-lang/ms.orth | 32 ++++++++++++++++++++++++++++++++ + 1 files changed, 32 insertions(+), 0 deletions(-) + +commit 0896d14ab7fe5a7233102f5ff7c59199f893c734 +Author: Roozbeh Pournader +Date: Sun Feb 1 20:36:55 2009 -0800 + + Add Kashubian (csb) orth file (bug #19866) + + fc-lang/csb.orth | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 46 insertions(+), 0 deletions(-) + +commit a32870457eb8f35a19193bc3e9e66db9948186fb +Author: Roozbeh Pournader +Date: Sun Feb 1 20:29:12 2009 -0800 + + Rename "ku" to "ku_am", add "ku_iq" (bug #19853). + + For Iraq, we are assuming its the same Arabic orthography used + in Iran. + + According to Ethnologue, Kurdish is written in Cyrillic in Armenia: + http://www.ethnologue.com/show_language.asp?code=kmr + + Turkey and Syria need more research. + + fc-lang/ku.orth | 94 + ---------------------------------------------------- + fc-lang/ku_am.orth | 94 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + fc-lang/ku_iq.orth | 27 +++++++++++++++ + 3 files changed, 121 insertions(+), 94 deletions(-) + +commit 2199c6e321c92cf42711180b483e3f1b0091d980 +Author: Roozbeh Pournader +Date: Sun Feb 1 20:21:45 2009 -0800 + + Rename Venda from "ven" to "ve" (bug #19852) + + Since ISO 639-1 code exists, we should use it. + + fc-lang/ve.orth | 34 ++++++++++++++++++++++++++++++++++ + fc-lang/ven.orth | 34 ---------------------------------- + 2 files changed, 34 insertions(+), 34 deletions(-) + +commit d7dd87649c07b7b73cf4ecfe7273cb0fcedc5be0 +Author: Roozbeh Pournader +Date: Sun Feb 1 20:00:15 2009 -0800 + + Change Turkmen orth from Cyrillic to Latin (bug #19849) + + fc-lang/tk.orth | 114 + ++++++++++++------------------------------------------ + 1 files changed, 26 insertions(+), 88 deletions(-) + +commit b25a42963d70f9ead6bc026f57ae2433b4ac5e85 +Author: Roozbeh Pournader +Date: Sun Feb 1 19:35:37 2009 -0800 + + Fix doubly encoded UTF-8 in comments (bug #19848) + + fc-lang/nb.orth | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit f3c214a1cd799dc1eb965ced8107f52cc9dd065e +Author: Roozbeh Pournader +Date: Sun Feb 1 19:29:21 2009 -0800 + + Split Mongolian orth to Mongolia and China (bug #19847) + + The orth file for Mongolia uses Cyrillic, while that of + China uses the classical Mongolian script. + + fc-lang/mn.orth | 37 ------------------------------------- + fc-lang/mn_cn.orth | 37 +++++++++++++++++++++++++++++++++++++ + fc-lang/mn_mn.orth | 35 +++++++++++++++++++++++++++++++++++ + 3 files changed, 72 insertions(+), 37 deletions(-) + +commit 0d5f9a2592634e6f9c74f48bbad9f6b443d1b574 +Author: Roozbeh Pournader +Date: Sun Feb 1 18:55:31 2009 -0800 + + Add Filipino orth, alias Tagalog to Filipino (bug #19846) + + The previous Tagalog orthography used the Tagalog script, which is + not in + modern use. + + fc-lang/fil.orth | 45 +++++++++++++++++++++++++++++++++++++++++++++ + fc-lang/tl.orth | 23 ++++++++--------------- + 2 files changed, 53 insertions(+), 15 deletions(-) + +commit 2bf7d799bf8c9e116f08864f4f62575a6a25b380 +Author: Roozbeh Pournader +Date: Sun Feb 1 18:52:41 2009 -0800 + + Remove Sinhala characters not in modern use (bug #19288) + + fc-lang/si.orth | 30 ++++++++++++++++++++---------- + 1 files changed, 20 insertions(+), 10 deletions(-) + +commit 2f3b07fe80415873ef3e0e0a7e753a55e766986b +Author: Roozbeh Pournader +Date: Sun Feb 1 18:32:21 2009 -0800 + + Correct Sindhi orthography to use Arabic script (bug #17140) + + The previous version used the Devanagari script. But in both + Pakistan and + India, Sindhi is generally written in Arabic. The Devanagari data + could + prove to be useful, if we decide on how we should name such files (see + bug #17208 and bug #19869). + + fc-lang/sd.orth | 48 +++++++++++++++++++++++++++++++++++++++--------- + 1 files changed, 39 insertions(+), 9 deletions(-) + +commit 574805478c19cdb487aea96922ff7177dd0844d7 +Author: Behdad Esfahbod +Date: Sat Jan 31 03:38:19 2009 -0500 + + [fcfreetype] Fix typo in GB2312 encoding name string (#19845) + + This was causing failure when opening iconv converter, hence rendering + GB2312-encoded fonts with no other usable encoding unusable. + + src/fcfreetype.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 575ee6cddd391857339f57331d2677fcc868369e +Author: Karl Tomlinson +Date: Tue Jan 27 03:35:51 2009 -0500 + + Change FcCharSetMerge API + + To only work on writable charsets. Also, return a bool indicating + whether + the merge changed the charset. + + Also changes the implementation of FcCharSetMerge and + FcCharSetIsSubset + + doc/fccharset.fncs | 16 +++--- + fontconfig/fontconfig.h | 4 +- + src/fccharset.c | 129 + +++++++++++++++++++--------------------------- + src/fcmatch.c | 64 +++++++++++++----------- + 4 files changed, 99 insertions(+), 114 deletions(-) + +commit b8860e2faffa8b3f62b3c7aafd2d3b6962566f41 +Author: Behdad Esfahbod +Date: Fri Jan 23 14:17:08 2009 -0500 + + [fcmatch] Fix crash when no fonts are available. + + src/fcmatch.c | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +commit c08216c6f468ce22cb7c0c1959019a7caad3484a +Author: Dan Nicholson +Date: Mon Jan 19 17:02:55 2009 -0500 + + Let make expand fc_cachedir/FC_CACHEDIR (bug #18675) + + configure replaces a NONE prefix with the default prefix too late. + So we move fonts.conf creation to Makefile, such that prefix is + correctly + expanded. Ugly, but works. + + Makefile.am | 13 ++++++++++++- + configure.in | 3 +-- + 2 files changed, 13 insertions(+), 3 deletions(-) + +commit 98d765a53ba33d28283e499ebd1098d27cbe6d02 +Author: Behdad Esfahbod +Date: Thu Jan 15 19:27:53 2009 -0500 + + Cleanup all manpage.* files + + Recent doc2man generates files called manpage.log. This was + breaking build. + + doc/Makefile.am | 5 ++--- + fc-cache/Makefile.am | 2 +- + fc-cat/Makefile.am | 2 +- + fc-list/Makefile.am | 2 +- + fc-match/Makefile.am | 2 +- + fc-query/Makefile.am | 2 +- + fc-scan/Makefile.am | 2 +- + 7 files changed, 8 insertions(+), 9 deletions(-) + +commit 41af588f543ca5c0efaeb699992376d89cb35763 +Author: Behdad Esfahbod +Date: Thu Jan 15 19:12:37 2009 -0500 + + [fc-match] Accept list of elements like fc-list (bug #13017) + + Also make --verbose not ignore list of elements and only print those. + Update docs. + + fc-list/fc-list.c | 29 ++++++++++++++--------------- + fc-list/fc-list.sgml | 12 ++++++------ + fc-match/fc-match.c | 48 + +++++++++++++++++++++++++++++++++++++----------- + fc-match/fc-match.sgml | 29 ++++++++++++++++++++--------- + 4 files changed, 77 insertions(+), 41 deletions(-) + +commit 263f16ced279b0c09834bb4ca0df87fd0f76dcaf +Author: Behdad Esfahbod +Date: Thu Jan 15 19:12:27 2009 -0500 + + Oops, fix FcPatternFilter + + src/fcpat.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 6bffe1a95bfd6609358d38590ad638c688232575 +Author: Behdad Esfahbod +Date: Thu Jan 15 18:39:48 2009 -0500 + + Add fc-scan too that runs FcFileScan/FcDirScan + + This is quite similar to fc-query, but calling FcFileScan/FcDirScan + instead + of FcFreeTypeQuery. + + .gitignore | 2 + + Makefile.am | 2 +- + configure.in | 1 + + doc/fcfile.fncs | 18 +++--- + fc-cache/fc-cache.sgml | 1 + + fc-cat/fc-cat.sgml | 1 + + fc-list/fc-list.sgml | 7 +- + fc-match/fc-match.sgml | 7 +- + fc-query/fc-query.sgml | 5 +- + fc-scan/Makefile.am | 59 ++++++++++++++++ + fc-scan/fc-scan.c | 181 + ++++++++++++++++++++++++++++++++++++++++++++++++ + fc-scan/fc-scan.sgml | 176 + ++++++++++++++++++++++++++++++++++++++++++++++ + 12 files changed, 442 insertions(+), 18 deletions(-) + +commit 4074fd254e5ad707448d3665a034e0fbdf6de033 +Author: Behdad Esfahbod +Date: Thu Jan 15 18:35:09 2009 -0500 + + Revive FcConfigScan() (bug #17121) + + FcConfigScan() with parameters cache=NULL and force=FcTrue can be used + to scan font dirs without any caching side effect. + + src/fcdir.c | 155 + ++++++++++++++++++++++++++++++++++------------------------- + 1 files changed, 90 insertions(+), 65 deletions(-) + +commit 46e405cb9ab5870bda1947f3afd80f8f54c7ac75 +Author: Behdad Esfahbod +Date: Thu Jan 15 17:34:26 2009 -0500 + + Oops. Fix usage output. + + fc-query/fc-query.c | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +commit 25a09eb9bf2d993228a3d98d1dd271f55efb2358 +Author: Behdad Esfahbod +Date: Thu Jan 8 03:04:34 2009 -0500 + + Don't use FcCharSetCopy in FcCharSetMerge + + The Copy function is actually a ref, not real copy. + + doc/fccharset.fncs | 2 +- + src/fccharset.c | 7 ++++--- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit d230cf144f84c8a50b932c8b89daa55c1a3620d8 +Author: Behdad Esfahbod +Date: Wed Jan 7 20:15:20 2009 -0500 + + Make FcCharSetMerge() public + + That's needed for apps to be abled to do pruning themselves without + the performance penalty of recreating new charsets all the time. + + doc/fccharset.fncs | 13 +++++++++++++ + fontconfig/fontconfig.h | 3 +++ + src/fcint.h | 3 --- + 3 files changed, 16 insertions(+), 3 deletions(-) + +commit 3b725d0a318623bba08a9f7c75e4fe71527f5dec +Author: Behdad Esfahbod +Date: Thu Jan 1 16:29:01 2009 -0500 + + [doc] Note that fontset returned by FcConfigGetFonts should not + be modified + + doc/fcconfig.fncs | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 6d764a3f9b89f21b5c2cdf48cbd913b9706d42b2 +Author: Behdad Esfahbod +Date: Wed Dec 31 20:16:40 2008 -0500 + + [fcmatch] Move FcFontSetMatch() functionality into + FcFontSetMatchInternal() + + Except for the final FcFontRenderPrepare(). This way we have more + flexibility to do caching in FcFontMatch() while leaving + FcFontSetMatch() + intact. + + src/fcmatch.c | 42 +++++++++++++++++++++++++++++------------- + 1 files changed, 29 insertions(+), 13 deletions(-) + +commit a5a384c5ffb479e095092c2aaedd406f8785280a +Author: Behdad Esfahbod +Date: Wed Dec 31 19:44:32 2008 -0500 + + [fcmatch] When matching, reserve score 0 for when elements don't exist + + Previously an index j was added to element score to prefer matches + earlier + in the value list to the later ones. This index started from 0, + meaning + that the score zero could be generated for the first element. + By starting + j from one, scores for when the element exists in both pattern + and font + can never be zero. The score zero is reserved for when the element is + NOT available in both font and pattern. We will use this property + later. + + This shouldn't change matching much. The only difference I can + think of + is that if a font family exists both as a bitmap font and a scalable + version, and when requesting it at the size of the bitmap version, + previously the font returned was nondeterministic. Now the scalable + version will always be preferred. + + src/fcmatch.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit c7641f2872329197250db6ffe194df3d33ff42b3 +Author: Behdad Esfahbod +Date: Wed Dec 31 19:35:27 2008 -0500 + + [fcmatch] Use larger multipliers to enforce order + + Previously the matcher multiplied comparison results by 100 and added + index value to it. With long lists of families (lots of aliases), + reaching 100 is not that hard. That could result in a non-match early + in the list to be preferred over a match late in the list. Changing + the multiplier from 100 to 1000 should fix that. + + To keep things relatively in order, the lang multiplier is changed + from 1000 to 10000. + + src/fcmatch.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 1b43ccc805f26a78934267d92275cd19b5648e91 +Author: Behdad Esfahbod +Date: Wed Dec 31 18:10:31 2008 -0500 + + [fcmatch.c] Fix debug formatting + + src/fcmatch.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit a291cfc710c5989ba3e787ae20911d3176bea307 +Author: Behdad Esfahbod +Date: Wed Dec 31 18:06:07 2008 -0500 + + Fix comparison of family names to ignore leading space properly + + Previously fc-match "xxx,nazli" matched Nazli, but "xxx, nazli" + didn't. + This was because of a bug in FcCompareFamily's short-circuit check + that forgot to ignore spaces. + + src/fcmatch.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit 0c93b91db0cdf7c5e901477c266b45c8baeadd00 +Author: Behdad Esfahbod +Date: Mon Dec 29 20:00:26 2008 -0500 + + Implement FcPatternFormat and use it in cmdline tools (bug #17107) + + Still need to add more features, but the API is there, and used + by cmdline tools with -f or --format. + + doc/fcpattern.fncs | 18 ++++++ + fc-list/fc-list.c | 38 +++++++++--- + fc-list/fc-list.sgml | 22 ++++++- + fc-match/fc-match.c | 31 +++++++--- + fc-match/fc-match.sgml | 47 ++++++++++----- + fc-query/fc-query.c | 25 +++++++- + fc-query/fc-query.sgml | 36 ++++++++--- + fontconfig/fontconfig.h | 3 + + src/Makefile.am | 1 + + src/fcformat.c | 155 + +++++++++++++++++++++++++++++++++++++++++++++++ + src/fcint.h | 5 ++ + src/fcname.c | 2 +- + 12 files changed, 333 insertions(+), 50 deletions(-) + +commit 5cf04b201fb5e9dc989d30cf5c30f7575dda56bc +Author: Behdad Esfahbod +Date: Mon Dec 29 19:27:00 2008 -0500 + + [.gitignore] Update + + .gitignore | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit f9806ab4b9bfa88a782008156511e29f37ce967d +Author: Behdad Esfahbod +Date: Mon Dec 29 18:58:29 2008 -0500 + + Remove special-casing of FC_FILE in FcPatternPrint() + + I can't understand why the special case is needed. Indeed, + removing it + does not make any difference in the "fc-match --verbose" output, and + that's the only time fc-match uses FcPatternPrint. + + src/fcdbg.c | 21 +-------------------- + 1 files changed, 1 insertions(+), 20 deletions(-) + +commit 8ae1e3d5dc323542e7def06a42deea62c7ba7027 +Author: Behdad Esfahbod +Date: Sun Dec 28 16:54:44 2008 -0500 + + Explicitly chmod() directories (bug #18934) + + Two changes: + + - after mkdir(), we immediately chmod(), such that we are not + affected + by stupid umask's. + + - if a directory we want to use is not writable but exists, we try a + chmod on it. This is to recover from stupid umask's having + affected + us with older versions. + + src/fccache.c | 14 +++++++++++--- + 1 files changed, 11 insertions(+), 3 deletions(-) + +commit b6cf885a0a71a0e8f03832fe038e57e6f2778974 +Author: Behdad Esfahbod +Date: Sun Dec 28 09:03:29 2008 -0500 + + Don't use identifier named complex + + src/fcfreetype.c | 42 +++++++++++++++++++++--------------------- + 1 files changed, 21 insertions(+), 21 deletions(-) + +commit 627dd913cf1588436936bc8731c7dd9c96baee90 +Author: Behdad Esfahbod +Date: Sun Dec 28 08:06:07 2008 -0500 + + [65-fonts-persian.conf] Set foundry in target=scan instead of + target=font + + conf.d/65-fonts-persian.conf | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +commit 030983185bb6f3f3885dc2e4d80fec330455f11c +Author: Harshula Jayasuriya +Date: Sun Dec 28 06:13:19 2008 -0500 + + Fix Sinhala coverage (bug #19288) + + fc-lang/si.orth | 9 ++++----- + 1 files changed, 4 insertions(+), 5 deletions(-) + +commit 6ca36812b4ece5368468278a9ff18f5a9c62b39f +Author: Alexey Khoroshilov +Date: Sun Dec 28 05:15:45 2008 -0500 + + Use human-readable file names in the docs (bug #16278) + + doc/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit f26062b277e1781876a30d3170fca8bbba2409ab +Author: Behdad Esfahbod +Date: Sun Dec 28 04:58:14 2008 -0500 + + Implement fc-list --quiet ala grep (bug #17141) + + Exits 1 if no fonts matched, 0 otherwise. + + fc-list/fc-list.c | 27 ++++++++++++++++++++------- + 1 files changed, 20 insertions(+), 7 deletions(-) + +commit 00c0972acae849ca3b18a7c76894c078185d3be4 +Author: Behdad Esfahbod +Date: Sun Dec 28 04:48:54 2008 -0500 + + Fix compile with old FreeType that doesn't have FT_Select_Size() + (bug #17498) + + configure.in | 10 +--------- + src/fcfreetype.c | 2 ++ + 2 files changed, 3 insertions(+), 9 deletions(-) + +commit 350dc5f35091e7e5635a6cf239e4cad56e992d01 +Author: Behdad Esfahbod +Date: Sun Dec 28 04:26:26 2008 -0500 + + Use __builtin_popcount() when available (bug #17592) + + src/fccharset.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit 4c209d5f0c217ff9d8f3b517017212d6362b07a8 +Author: Rahul Bhalerao +Date: Sun Dec 28 04:10:53 2008 -0500 + + Add config for new Indic fonts (bug #17856) + + conf.d/65-nonlatin.conf | 35 ++++++++++++++++++++++++++++------- + 1 files changed, 28 insertions(+), 7 deletions(-) + +commit f69db8d49cbd929b80527719be6c0b1e6d49ccac +Author: Behdad Esfahbod +Date: Sun Dec 28 04:06:01 2008 -0500 + + Consistently use FcStat() over stat() in all places + + src/fcatomic.c | 2 +- + src/fccache.c | 7 +------ + src/fccfg.c | 2 +- + src/fcdir.c | 4 ++-- + src/fcint.h | 7 +++++++ + 5 files changed, 12 insertions(+), 10 deletions(-) + +commit 9e2ed2513bb4c2ecc7ee09c48c1dc677ea58a723 +Author: Behdad Esfahbod +Date: Sun Dec 28 04:00:09 2008 -0500 + + [fccache] Consistently use FcStat() over stat() (bug #18195) + + src/fccache.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit ee2463fbcbe105a413021aa870e8a3f0094a1a24 +Author: Behdad Esfahbod +Date: Sun Dec 28 03:40:21 2008 -0500 + + Cleanup symlinks in "make uninstall" (bug #18885) + + conf.d/Makefile.am | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +commit fe8e8a1dd777ab53f57c4d31dc9547b3e4ba0d70 +Author: Harald Fernengel +Date: Sun Dec 28 03:23:58 2008 -0500 + + Don't use variables named 'bool' (bug #18851) + + src/fcxml.c | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +commit a9ac5c52a658920f1054a12435d8c07205953153 +Author: Behdad Esfahbod +Date: Sun Dec 28 03:08:38 2008 -0500 + + [.gitignore] Update + + .gitignore | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit 1c7f4de80cc4819b504707ae143a2d718af42733 +Author: Behdad Esfahbod +Date: Tue Dec 2 06:07:41 2008 -0500 + + Fix two more doc typos + + doc/fcpattern.fncs | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 355ed50b185b7879a5c95e1f8697824c6dec6f9f +Author: Behdad Esfahbod +Date: Mon Sep 22 18:51:11 2008 -0400 + + Don't call FcPatternGetCharSet in FcSortWalk unless we need to + (#17361) + + src/fcmatch.c | 55 + +++++++++++++++++++++++++++++++------------------------ + 1 files changed, 31 insertions(+), 24 deletions(-) + +commit 799691c901ea2d8561980c763a7e78383f1cceec +Author: Behdad Esfahbod +Date: Mon Sep 22 18:16:30 2008 -0400 + + Don't leak FcValues string loaded through fcxml.c (#17661) + + Patch from Caolan McNamara. + + src/fcpat.c | 10 +++++----- + src/fcxml.c | 2 ++ + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit 311da2316f5d40d9b8c72c9965f7d70330f3c498 +Author: Chris Wilson +Date: Wed Apr 23 09:07:28 2008 +0100 + + Reduce number of allocations during FcSortWalk(). + + The current behaviour of FcSortWalk() is to create a new FcCharSet on + each iteration that is the union of the previous iteration with + the next + FcCharSet in the font set. This causes the existing FcCharSet to be + reproduced in its entirety and then allocates fresh leaves for the new + FcCharSet. In essence the number of allocations is quadratic wrt the + number of fonts required. + + By introducing a new method for merging a new FcCharSet with an + existing + one we can change the behaviour to be effectively linear with + the number + of fonts - allocating no more leaves than necessary to cover all the + fonts in the set. + + For example, profiling 'gedit UTF-8-demo.txt' + Allocator nAllocs nBytes + Before: + FcCharSetFindLeafCreate 62886 2012352 + FcCharSetPutLeaf 9361 11441108 + After: + FcCharSetFindLeafCreate 1940 62080 + FcCharSetPutLeaf 281 190336 + + The savings are even more significant for applications like + firefox-3.0b5 + which need to switch between large number of fonts. + Before: + FcCharSetFindLeafCreate 4461192 142758144 + FcCharSetPutLeaf 1124536 451574172 + After: + FcCharSetFindLeafCreate 80359 2571488 + FcCharSetPutLeaf 18940 9720522 + + Out of interest, the next most frequent allocations are + FcPatternObjectAddWithBinding 526029 10520580 + tt_face_load_eblc 42103 2529892 + + src/fccharset.c | 62 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/fcint.h | 3 ++ + src/fcmatch.c | 13 ++-------- + 3 files changed, 68 insertions(+), 10 deletions(-) + +commit 8072f4b1304efc59fee5e61efc4c4b0fc05bb8fb +Author: Behdad Esfahbod +Date: Fri Aug 22 18:25:22 2008 -0400 + + Document how to free return value of FcNameUnparse() + + doc/fcpattern.fncs | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 241fbde1ab28d7beb9b861d8804d0416f0d5589c +Author: Behdad Esfahbod +Date: Fri Aug 22 18:08:07 2008 -0400 + + Add FcConfigReference() (#17124) + + doc/fcconfig.fncs | 20 +++++++++++++++++--- + fontconfig/fontconfig.h | 3 +++ + src/fccfg.c | 20 ++++++++++++++++++++ + src/fcint.h | 2 ++ + 4 files changed, 42 insertions(+), 3 deletions(-) + +commit 03dcaaa08fe324a058c427ab2da993fddaa7b3fd +Author: Behdad Esfahbod +Date: Fri Aug 22 17:49:02 2008 -0400 + + Document when config can be NULL (#17105) + + Note that this also fixes a bug with FcFontList() where previously + it was NOT checking whether the config is up-to-date. May want to + keep the old behavior and document that ScanInterval is essentially + unused internally (FcFontSetList uses it, but we can remove that + too). + + doc/fcconfig.fncs | 21 +++++++++++++++++++++ + doc/fcfontset.fncs | 3 +++ + src/fclist.c | 3 +++ + 3 files changed, 27 insertions(+), 0 deletions(-) + +commit 1439c8f21af1533a920b54333f79459f456a402e +Author: Behdad Esfahbod +Date: Fri Aug 22 16:51:33 2008 -0400 + + Handle -h and --help according to GNU Coding Standards (#17104) + + Added -h instead of -?. And upon -h and --help, write usave to stdout + instead of stdin, and return 0 instead of 1. + + -? still works like before as that's what getopt returns upon unknown + arguments. + + fc-cache/fc-cache.c | 47 + +++++++++++++++++++++++++---------------------- + fc-cache/fc-cache.sgml | 4 ++-- + fc-cat/fc-cat.c | 45 + ++++++++++++++++++++++++--------------------- + fc-cat/fc-cat.sgml | 4 ++-- + fc-list/fc-list.c | 36 ++++++++++++++++++++---------------- + fc-list/fc-list.sgml | 4 ++-- + fc-match/fc-match.c | 44 + ++++++++++++++++++++++++-------------------- + fc-match/fc-match.sgml | 4 ++-- + fc-query/fc-query.c | 40 ++++++++++++++++++++++------------------ + fc-query/fc-query.sgml | 4 ++-- + 10 files changed, 125 insertions(+), 107 deletions(-) + +commit df243f93be4306e788aebf6b2ac4a7c1b97550ae +Author: Behdad Esfahbod +Date: Fri Aug 22 13:02:14 2008 -0400 + + Add WenQuanYi fonts to default conf (#17262, from Mandriva) + + conf.d/65-nonlatin.conf | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit f31d8b1b1a93334611353d7ea846f8006fda855c +Author: Behdad Esfahbod +Date: Fri Aug 22 03:51:57 2008 -0400 + + Add Sindhi .orth file. (#17140) + + fc-lang/sd.orth | 28 ++++++++++++++++++++++++++++ + 1 files changed, 28 insertions(+), 0 deletions(-) + +commit b9f18922f112f2f551429b692d793dda7d02cd86 +Author: Behdad Esfahbod +Date: Thu Aug 21 17:17:04 2008 -0400 + + Update sr.orth to actul subset of Cyrillic used by Serbian (#17208) + + fc-lang/sr.orth | 24 +++++++----------------- + 1 files changed, 7 insertions(+), 17 deletions(-) + +commit 74e16ceeeab86f50c4b6bea12800f70110cd4794 +Author: Behdad Esfahbod +Date: Thu Aug 14 15:27:16 2008 -0400 + + Fix docs re 'orig' argument of FcPatternBuild and family + + Now call it 'p' or 'pattern', since it's modified in place. + There is no copying. + + doc/fcpattern.fncs | 6 +++--- + fontconfig/fontconfig.h | 4 ++-- + src/fcpat.c | 12 ++++++------ + 3 files changed, 11 insertions(+), 11 deletions(-) + +commit bb65f58f6354b8ad363021457852ad9e841cef89 +Author: Behdad Esfahbod +Date: Wed Aug 13 16:45:18 2008 -0400 + + [doc] Fix signature of FcConfigHome() + + We should write a test to automatically cross-check signatures + from public headers to docs. + + doc/fcconfig.fncs | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +commit e690fbb20ec41ef018a32ac01118a41103c01289 +Author: Behdad Esfahbod +Date: Wed Aug 13 03:30:23 2008 -0400 + + Get rid of $Id: ChangeLog,v 1.2 2010/03/25 21:45:57 matthieu Exp $ tags + + COPYING | 2 +- + Makefile.am | 2 +- + conf.d/Makefile.am | 2 +- + configure.in | 2 +- + doc/Makefile.am | 2 +- + doc/confdir.sgml.in | 2 +- + doc/edit-sgml.c | 2 +- + doc/fcatomic.fncs | 2 +- + doc/fcblanks.fncs | 2 +- + doc/fccharset.fncs | 2 +- + doc/fcconfig.fncs | 2 +- + doc/fcconstant.fncs | 2 +- + doc/fcfile.fncs | 2 +- + doc/fcfontset.fncs | 2 +- + doc/fcfreetype.fncs | 2 +- + doc/fcinit.fncs | 2 +- + doc/fcmatrix.fncs | 2 +- + doc/fcobjectset.fncs | 2 +- + doc/fcobjecttype.fncs | 2 +- + doc/fcpattern.fncs | 2 +- + doc/fcstring.fncs | 2 +- + doc/fcstrset.fncs | 2 +- + doc/fcvalue.fncs | 2 +- + doc/fontconfig-devel.sgml | 2 +- + doc/func.sgml | 2 +- + doc/version.sgml.in | 2 +- + fc-cache/Makefile.am | 2 +- + fc-case/fc-case.c | 2 +- + fc-case/fccase.tmpl.h | 2 +- + fc-cat/Makefile.am | 2 +- + fc-glyphname/fc-glyphname.c | 2 +- + fc-glyphname/fcglyphname.tmpl.h | 2 +- + fc-list/Makefile.am | 2 +- + fc-match/Makefile.am | 2 +- + fc-query/Makefile.am | 2 +- + src/Makefile.am | 2 +- + 36 files changed, 36 insertions(+), 36 deletions(-) + +commit 3042050954ddbe205e3166c9910886839829e788 +Author: Behdad Esfahbod +Date: Wed Aug 13 03:16:39 2008 -0400 + + [doc] Document that a zero rescanInterval disables automatic checks + (#17103) + + doc/fcconfig.fncs | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 41fc0fe68d88c1fdd38469a51a322dab6a30757d +Author: Behdad Esfahbod +Date: Wed Aug 13 02:50:35 2008 -0400 + + Add FcPatternFilter() (#13016) + + doc/fcpattern.fncs | 12 ++++++++++++ + fontconfig/fontconfig.h | 3 +++ + src/fcpat.c | 37 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 52 insertions(+), 0 deletions(-) + +commit e6f14d3c513a9f2e7d75c389db4f65aa0dc0502f +Author: Behdad Esfahbod +Date: Wed Aug 13 02:47:12 2008 -0400 + + [doc] Add const decorator for FcPatternDuplicate() + + doc/fcpattern.fncs | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 29874098537e763e8e4cd3fefb1ecc0f36b808a5 +Author: Behdad Esfahbod +Date: Wed Aug 13 02:24:42 2008 -0400 + + Implement fc-list --verbose (#13015) + + A private FcObjectGetSet() is implemented that provides an + FcObjectSet of all registered elements. FcFontSetList() is + then modified to use the object set from FcObjectGetSet() if + provided object-set is NULL. + + Alternatively FcObjectGetSet() can be made public. In that + case fc-list can use that as a base if --verbose is included, + and also add any elements provided by the user (though that has + no effect, as all elements from the cache are already registered). + Currently fc-list ignores user-provided elements if --verbose + is specified. + + fc-list/fc-list.c | 41 ++++++++++++++++++++++++----------------- + fc-list/fc-list.sgml | 10 +++++++--- + src/fcint.h | 3 +++ + src/fclist.c | 10 ++++++++++ + src/fcname.c | 14 ++++++++++++++ + 5 files changed, 58 insertions(+), 20 deletions(-) + +commit 77c0d8bce86ca088782d5631617c0ef681d91312 +Author: Behdad Esfahbod +Date: Wed Aug 13 01:31:18 2008 -0400 + + Add fc-query (#13019) + + .gitignore | 2 + + Makefile.am | 2 +- + configure.in | 1 + + doc/fontconfig-user.sgml | 2 +- + fc-cache/fc-cache.sgml | 1 + + fc-cat/fc-cat.sgml | 1 + + fc-list/fc-list.sgml | 1 + + fc-match/fc-match.sgml | 1 + + fc-query/Makefile.am | 59 ++++++++++++++++ + fc-query/fc-query.c | 166 + +++++++++++++++++++++++++++++++++++++++++++ + fc-query/fc-query.sgml | 174 + ++++++++++++++++++++++++++++++++++++++++++++++ + 11 files changed, 408 insertions(+), 2 deletions(-) + +commit d5b6085c3e40b4e2605cab7ff6c8a621b961b2d2 +Author: Behdad Esfahbod +Date: Wed Aug 13 00:42:12 2008 -0400 + + Update man pages + + fc-cache/fc-cache.sgml | 16 ++++++++++------ + fc-cat/fc-cat.sgml | 15 +++++++++++---- + fc-list/fc-list.sgml | 12 ++++++++---- + fc-match/fc-match.sgml | 30 +++++++++++++++++++++++------- + 4 files changed, 52 insertions(+), 21 deletions(-) + +commit 88261bafff30ec02b5a2180f1f9b786c8ff44e3d +Author: Behdad Esfahbod +Date: Tue Aug 12 23:44:44 2008 -0400 + + [fc-match] Fix list of getopt options in --help + + fc-match/fc-match.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 43291847c58002fca99984dcec4f1bbbb0d0f61d +Author: Behdad Esfahbod +Date: Tue Aug 12 18:00:35 2008 -0400 + + Add ~/.fonts.conf.d to default config (#17100) + + conf.d/50-user.conf | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 4f468454d80bf4f1d256f084afd69cabecf1243e +Author: Behdad Esfahbod +Date: Tue Aug 12 17:54:45 2008 -0400 + + Update Thai default families (#16223) + + Patch from Theppitak Karoonboonyanan + + conf.d/65-nonlatin.conf | 13 +++++++++---- + 1 files changed, 9 insertions(+), 4 deletions(-) + +commit 2e08e0f243633386b6441784926f928359c92453 +Author: Behdad Esfahbod +Date: Tue Aug 12 17:52:02 2008 -0400 + + [doc] Fix signatures of FcPatternGetFTFace and FcPatternGetLangSet + (#16272) + + doc/fcpattern.fncs | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +commit 317b849215ab16cfcd0dda0e424efc9216a74f28 +Author: Behdad Esfahbod +Date: Tue Aug 12 16:34:24 2008 -0400 + + Replace RCS Id tags with the file name + + config/Makedefs.in | 2 +- + config/install.sh | 2 +- + fc-cache/fc-cache.c | 2 +- + fc-cat/fc-cat.c | 2 +- + fc-lang/aa.orth | 2 +- + fc-lang/ab.orth | 2 +- + fc-lang/af.orth | 2 +- + fc-lang/am.orth | 2 +- + fc-lang/ar.orth | 2 +- + fc-lang/ast.orth | 2 +- + fc-lang/ava.orth | 2 +- + fc-lang/ay.orth | 2 +- + fc-lang/az.orth | 2 +- + fc-lang/az_ir.orth | 2 +- + fc-lang/ba.orth | 2 +- + fc-lang/bam.orth | 2 +- + fc-lang/be.orth | 2 +- + fc-lang/bg.orth | 2 +- + fc-lang/bh.orth | 2 +- + fc-lang/bho.orth | 2 +- + fc-lang/bi.orth | 2 +- + fc-lang/bin.orth | 2 +- + fc-lang/bn.orth | 2 +- + fc-lang/bo.orth | 2 +- + fc-lang/br.orth | 2 +- + fc-lang/bs.orth | 2 +- + fc-lang/bua.orth | 2 +- + fc-lang/ca.orth | 2 +- + fc-lang/ce.orth | 2 +- + fc-lang/ch.orth | 2 +- + fc-lang/chm.orth | 2 +- + fc-lang/chr.orth | 2 +- + fc-lang/co.orth | 2 +- + fc-lang/cs.orth | 2 +- + fc-lang/cu.orth | 2 +- + fc-lang/cv.orth | 2 +- + fc-lang/cy.orth | 2 +- + fc-lang/da.orth | 2 +- + fc-lang/de.orth | 2 +- + fc-lang/dz.orth | 2 +- + fc-lang/el.orth | 2 +- + fc-lang/en.orth | 2 +- + fc-lang/eo.orth | 2 +- + fc-lang/es.orth | 2 +- + fc-lang/et.orth | 2 +- + fc-lang/eu.orth | 2 +- + fc-lang/fa.orth | 2 +- + fc-lang/fc-lang.c | 2 +- + fc-lang/fc-lang.man | 2 +- + fc-lang/fclang.tmpl.h | 2 +- + fc-lang/fi.orth | 2 +- + fc-lang/fj.orth | 2 +- + fc-lang/fo.orth | 2 +- + fc-lang/fr.orth | 2 +- + fc-lang/ful.orth | 2 +- + fc-lang/fur.orth | 2 +- + fc-lang/fy.orth | 2 +- + fc-lang/ga.orth | 2 +- + fc-lang/gd.orth | 2 +- + fc-lang/gez.orth | 2 +- + fc-lang/gl.orth | 2 +- + fc-lang/gn.orth | 2 +- + fc-lang/gu.orth | 2 +- + fc-lang/gv.orth | 2 +- + fc-lang/ha.orth | 2 +- + fc-lang/haw.orth | 2 +- + fc-lang/he.orth | 2 +- + fc-lang/hi.orth | 2 +- + fc-lang/ho.orth | 2 +- + fc-lang/hr.orth | 2 +- + fc-lang/hu.orth | 2 +- + fc-lang/hy.orth | 2 +- + fc-lang/ia.orth | 2 +- + fc-lang/ibo.orth | 2 +- + fc-lang/id.orth | 2 +- + fc-lang/ie.orth | 2 +- + fc-lang/ik.orth | 2 +- + fc-lang/io.orth | 2 +- + fc-lang/is.orth | 2 +- + fc-lang/it.orth | 2 +- + fc-lang/iu.orth | 2 +- + fc-lang/ja.orth | 2 +- + fc-lang/ka.orth | 2 +- + fc-lang/kaa.orth | 2 +- + fc-lang/ki.orth | 2 +- + fc-lang/kk.orth | 2 +- + fc-lang/kl.orth | 2 +- + fc-lang/km.orth | 2 +- + fc-lang/kn.orth | 2 +- + fc-lang/ko.orth | 2 +- + fc-lang/kok.orth | 2 +- + fc-lang/ks.orth | 2 +- + fc-lang/ku.orth | 2 +- + fc-lang/ku_ir.orth | 2 +- + fc-lang/kum.orth | 2 +- + fc-lang/kv.orth | 2 +- + fc-lang/kw.orth | 2 +- + fc-lang/ky.orth | 2 +- + fc-lang/la.orth | 2 +- + fc-lang/lb.orth | 2 +- + fc-lang/lez.orth | 2 +- + fc-lang/ln.orth | 2 +- + fc-lang/lo.orth | 2 +- + fc-lang/lt.orth | 2 +- + fc-lang/lv.orth | 2 +- + fc-lang/mai.orth | 2 +- + fc-lang/mg.orth | 2 +- + fc-lang/mh.orth | 2 +- + fc-lang/mi.orth | 2 +- + fc-lang/mk.orth | 2 +- + fc-lang/ml.orth | 2 +- + fc-lang/mn.orth | 2 +- + fc-lang/mo.orth | 2 +- + fc-lang/mr.orth | 2 +- + fc-lang/mt.orth | 2 +- + fc-lang/my.orth | 2 +- + fc-lang/nb.orth | 2 +- + fc-lang/nds.orth | 2 +- + fc-lang/ne.orth | 2 +- + fc-lang/nl.orth | 2 +- + fc-lang/nn.orth | 2 +- + fc-lang/no.orth | 2 +- + fc-lang/nr.orth | 2 +- + fc-lang/nso.orth | 2 +- + fc-lang/ny.orth | 2 +- + fc-lang/oc.orth | 2 +- + fc-lang/om.orth | 2 +- + fc-lang/or.orth | 2 +- + fc-lang/os.orth | 2 +- + fc-lang/pa.orth | 2 +- + fc-lang/pl.orth | 2 +- + fc-lang/ps_af.orth | 2 +- + fc-lang/ps_pk.orth | 2 +- + fc-lang/pt.orth | 2 +- + fc-lang/rm.orth | 2 +- + fc-lang/ro.orth | 2 +- + fc-lang/ru.orth | 2 +- + fc-lang/sa.orth | 2 +- + fc-lang/sah.orth | 2 +- + fc-lang/sco.orth | 2 +- + fc-lang/se.orth | 2 +- + fc-lang/sel.orth | 2 +- + fc-lang/sh.orth | 2 +- + fc-lang/shs.orth | 2 +- + fc-lang/si.orth | 2 +- + fc-lang/sk.orth | 2 +- + fc-lang/sl.orth | 2 +- + fc-lang/sm.orth | 2 +- + fc-lang/sma.orth | 2 +- + fc-lang/smj.orth | 2 +- + fc-lang/smn.orth | 2 +- + fc-lang/sms.orth | 2 +- + fc-lang/so.orth | 2 +- + fc-lang/sq.orth | 2 +- + fc-lang/sr.orth | 2 +- + fc-lang/ss.orth | 2 +- + fc-lang/st.orth | 2 +- + fc-lang/sv.orth | 2 +- + fc-lang/sw.orth | 2 +- + fc-lang/syr.orth | 2 +- + fc-lang/ta.orth | 2 +- + fc-lang/te.orth | 2 +- + fc-lang/tg.orth | 2 +- + fc-lang/th.orth | 2 +- + fc-lang/ti_er.orth | 2 +- + fc-lang/ti_et.orth | 2 +- + fc-lang/tig.orth | 2 +- + fc-lang/tk.orth | 2 +- + fc-lang/tl.orth | 2 +- + fc-lang/tn.orth | 2 +- + fc-lang/to.orth | 2 +- + fc-lang/tr.orth | 2 +- + fc-lang/ts.orth | 2 +- + fc-lang/tt.orth | 2 +- + fc-lang/tw.orth | 2 +- + fc-lang/tyv.orth | 2 +- + fc-lang/ug.orth | 2 +- + fc-lang/uk.orth | 2 +- + fc-lang/ur.orth | 2 +- + fc-lang/uz.orth | 2 +- + fc-lang/ven.orth | 2 +- + fc-lang/vi.orth | 2 +- + fc-lang/vo.orth | 2 +- + fc-lang/vot.orth | 2 +- + fc-lang/wa.orth | 2 +- + fc-lang/wen.orth | 2 +- + fc-lang/wo.orth | 2 +- + fc-lang/xh.orth | 2 +- + fc-lang/yap.orth | 2 +- + fc-lang/yi.orth | 2 +- + fc-lang/yo.orth | 2 +- + fc-lang/zh_cn.orth | 2 +- + fc-lang/zh_hk.orth | 2 +- + fc-lang/zh_mo.orth | 2 +- + fc-lang/zh_sg.orth | 2 +- + fc-lang/zh_tw.orth | 2 +- + fc-lang/zu.orth | 2 +- + fc-list/fc-list.c | 2 +- + fc-match/fc-match.c | 2 +- + fontconfig/fcfreetype.h | 2 +- + fontconfig/fcprivate.h | 2 +- + fontconfig/fontconfig.h | 2 +- + src/fcatomic.c | 2 +- + src/fcblanks.c | 2 +- + src/fccfg.c | 2 +- + src/fccharset.c | 2 +- + src/fcdbg.c | 2 +- + src/fcdefault.c | 2 +- + src/fcdir.c | 2 +- + src/fcfreetype.c | 2 +- + src/fcfs.c | 2 +- + src/fcinit.c | 2 +- + src/fcint.h | 2 +- + src/fclang.c | 2 +- + src/fclist.c | 2 +- + src/fcmatch.c | 2 +- + src/fcmatrix.c | 2 +- + src/fcname.c | 2 +- + src/fcstr.c | 2 +- + src/fcxml.c | 2 +- + 220 files changed, 220 insertions(+), 220 deletions(-) + +commit aef608efed2feb867128e528cd9d39ee7e10a0ac +Author: Behdad Esfahbod +Date: Tue Aug 12 16:11:29 2008 -0400 + + Add orth file for Maithili mai.orth (#15821) + + fc-lang/mai.orth | 25 +++++++++++++++++++++++++ + 1 files changed, 25 insertions(+), 0 deletions(-) + +commit 1bcf4ae5f2348d7956c435d34f2856ebfaccd6c8 +Author: Behdad Esfahbod +Date: Tue Aug 12 15:10:04 2008 -0400 + + When canonizing filenames, squash // and remove final / (#bug 16286) + + The fact that we now drop final slashes from all filenames without + checking that the file name represents a directory may surprise some, + but it doesn't bother me really. + + src/fcstr.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit b21bea3731106ef30224f9255c4232d6e2607803 +Author: Behdad Esfahbod +Date: Tue Aug 12 14:32:40 2008 -0400 + + [doc] Fix inaccuracy in FcFontRenderPrepare docs (#16985) + + doc/fcconfig.fncs | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit e04afe83de409b880be9a854b34fb624bca5c3b0 +Author: Behdad Esfahbod +Date: Tue Aug 12 14:10:03 2008 -0400 + + Avoid C99ism in Win32 code (#16651) + + src/fccfg.c | 3 ++- + src/fcxml.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit f7364e6273df6f660e6b01ea5189e88b34ba4602 +Author: Benjamin Close +Date: Thu Feb 12 10:23:40 2009 +1030 + + Remove build manpage logfile if it exists + + doc/Makefile.am | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 0e21b5a4d5609a5dd0f332b412d878b6f1037d29 +Author: Peter +Date: Sun Jun 22 09:21:05 2008 -0700 + + Make sure alias files are built first (bug 16464) + + Signed-off-by: Keith Packard + + fc-case/Makefile.am | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +commit a93b4c2aab1d79573abd646147596a8a34b19350 +Author: Keith Packard +Date: Sat May 31 19:24:35 2008 -0700 + + Bump version to 2.6.0 + + README | 6 ++++-- + configure.in | 2 +- + fontconfig/fontconfig.h | 4 ++-- + 3 files changed, 7 insertions(+), 5 deletions(-) + +commit d0902ee0867bd11e4ff266876a69c258eee8d08d +Author: Keith Packard +Date: Sat May 24 17:52:41 2008 -0700 + + Bump version to 2.5.93 + + README | 34 ++++++++++++++++++++++++++++++++-- + configure.in | 2 +- + fontconfig/fontconfig.h | 2 +- + 3 files changed, 34 insertions(+), 4 deletions(-) + +commit 8ade2369238a0b439192a847f12fcc9748a6d73a +Author: Keith Packard +Date: Sat May 24 17:14:24 2008 -0700 + + Ignore empty elements + + An empty element would cause every file starting with the current + directory to be scanned, probably not what the user wanted. + + src/fcxml.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +commit 83c5c357abc8d626680943537b4dbc020d6c378c +Author: Keith Packard +Date: Sat May 24 17:01:12 2008 -0700 + + Oops. Fix for bug 15928 used wrong path for installed fc-cache. + + fc-cache lives in $(bindir)/fc-cache, not $(bindir)/fc-cache/fc-cache. + + Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit e91e7efd7b0e0ca6f9f2e718541f99331447b40a +Author: Keith Packard +Date: Sat May 24 16:32:27 2008 -0700 + + Libs.private needs freetype libraries + + To make static linking work, fontconfig.pc needs @FREETYPE_LIBS@ in + Libs.private. + + fontconfig.pc.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit ad3fc667914d19435ade56adc8afe584d5605d10 +Author: Sayamindu Dasgupta +Date: Sat May 24 16:15:27 2008 -0700 + + FcConfigUptoDate breaks if directory mtime is in the future. Bug + 14424. + + At OLPC, we came across a bug where the Browse activity (based + on xulrunner) + took 100% CPU after an upgrade/. It turns out the Mozilla uses + FcConfigUptoDate() to check if new fonts have been added to the + system, and + this function was always returning FcFalse since we have the mtimes + of some + font directories set in the future. The attached patch makes + FcConfigUptoDate() print a warning and return FcTrue if mtime of + directories + are in the future. + + src/fccfg.c | 13 ++++++++++++- + 1 files changed, 12 insertions(+), 1 deletions(-) + +commit b808204023ab47eb06dc520665eb7a0473320a9b +Author: Evgeniy Stepanov +Date: Sat May 24 16:09:17 2008 -0700 + + Fix index/offset for 'decorative' matcher. Bug 15890. + + It seems indices in _FcMatchers array are slightly mixed up, + MATCH_DECORATIVE + should be 10, not 11. + + And MATCH_RASTERIZER_INDEX should be 13, not 12, right? + + src/fcmatch.c | 7 +++---- + 1 files changed, 3 insertions(+), 4 deletions(-) + +commit c6228a34b0ebaab3df395163b3b9246da2aa7d8c +Author: Glen Low +Date: Sat May 24 15:59:35 2008 -0700 + + Fix Win32 build error: install tries to run fc-cache locally + (bug 15928). + + When building in Win32 e.g. with MinGW, the install tries to run + fc-cache + locally but the required DLL's are not in the path. I've included + a patch for + this to fix Makefile.in to run fc-cache from bindir but obviously + this should + be applied to Makefile.am instead. + + (the second part of this patch was already in the tree) + + Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 557f87f7337df1d78c04d2c993916d1d1748360f +Author: Neskie Manuel +Date: Sat May 24 15:51:41 2008 -0700 + + Add Secwepemctsin Orthography. Bug 15996. + + fc-lang/shs.orth | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 48 insertions(+), 0 deletions(-) + +commit a572f547fd46bf169b617108552ab0fa280f4813 +Author: Behdad Esfahbod +Date: Sat May 24 15:48:00 2008 -0700 + + Persian conf update. (bug 16066). + + conf.d/40-nonlatin.conf | 37 +++++++++++++++++++++++++++++++++++++ + conf.d/65-fonts-persian.conf | 24 ++++++++++++++++++++---- + 2 files changed, 57 insertions(+), 4 deletions(-) + +commit 0faca4ff826c214c5c5bb0ff7e64a09802230f9d +Author: Alexey Khoroshilov +Date: Sat May 24 15:44:00 2008 -0700 + + Fix FcStrDirname documentation. (bug 16068) + + Description of FcStrDirname is absent in the official documentation of + fontconfig-2.5.92. At the same time the source documentation contains + description of the function. + + The problem is a consequence of a misprint in the format of the source + documentation file 'fcstring.fncs'. The finish mark of description + of the + previous function is absent. + + doc/fcstring.fncs | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 4dfb4aa1d4e1a3195d6f2f6873cb48d1d739a1bd +Author: Keith Packard +Date: Mon May 5 08:30:44 2008 -0700 + + Add a copy of dolt.m4 to acinclude.m4. + + An ancient version of dolt.m4 was installed on my system leading to + a broken + build on non-Linux systems. + + acinclude.m4 | 137 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 137 insertions(+), 0 deletions(-) + +commit 8d0139b0e68b081c9cdbeaa025fb278105ebf50c +Author: Keith Packard +Date: Sun May 4 19:08:31 2008 -0700 + + Freetype 2.3.5 (2007-jul-02) fixes indic font hinting. re-enable + (bug 15822) + + Autohinting for Indic fonts has been disabled since freetype could + not handle + it properly. But since freetype-2.3.5, the hinting problems for + indic fonts + have been fixed. Thus this is a request to enable the autohinting in + fontconfig again for all the indic fonts. + + conf.d/25-unhint-nonlatin.conf | 119 + ---------------------------------------- + 1 files changed, 0 insertions(+), 119 deletions(-) + +commit 3a3f687b759ceb76fc1e6407980a4b2717a47219 +Author: Keith Packard +Date: Sun May 4 01:27:42 2008 -0700 + + Add extended, caps, dunhill style mappings. + + extended -> expanded. + caps, dunhill -> decorative + + src/fcfreetype.c | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +commit 13a14cbf56d56c14d53e5f55d7fcc4bdec900994 +Author: Keith Packard +Date: Sun May 4 01:26:40 2008 -0700 + + Fix a few memory tracking mistakes. + + The built-in memory tracking code in fontconfig relies on a lot + of manual + function call tracking. A pain, but it helps debug leaks. + + src/fcatomic.c | 2 +- + src/fccharset.c | 6 ++++++ + src/fcinit.c | 2 ++ + src/fcpat.c | 2 +- + src/fcstr.c | 9 +++++++-- + 5 files changed, 17 insertions(+), 4 deletions(-) + +commit c6c9400d67ffefa95100d03e6650ea901b05116b +Author: Keith Packard +Date: Sun May 4 01:25:04 2008 -0700 + + Call FcFini to make memory debugging easier + + FcFini frees all libary data structures so valgrind should report 0 + allocations in use when the program exits. + + fc-cache/fc-cache.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit d33d23ada05a688046e4cc0a48b149fbf44c9ce3 +Author: Keith Packard +Date: Sat May 3 20:39:07 2008 -0700 + + Bump version to 2.5.92 + + README | 40 ++++++++++++++++++++++++++++++++++++++-- + configure.in | 2 +- + fontconfig/fontconfig.h | 2 +- + 3 files changed, 40 insertions(+), 4 deletions(-) + +commit 366887c3845973a6f81dd2e9e7aec60afbc61c32 +Author: Keith Packard +Date: Sat May 3 20:38:29 2008 -0700 + + git ignore doltcompile + + .gitignore | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 0b15b5f38b94ca1eda2b8b25de939776198c017a +Author: Keith Packard +Date: Sat May 3 20:37:49 2008 -0700 + + Allow for RC versions in README update + + new-version.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 19d124dc4f9a68e1c9ddce58bf79a5e11d2ccbfd +Author: Keith Packard +Date: Sat May 3 20:23:37 2008 -0700 + + Deal with libtool 2.2 which doesn't let us use LT_ variables. (bug + 15692) + + Libtool-2.2 introduces new restrictions. So now it does not allow LT_* + variables as it includes marcros: + + m4_pattern_forbid([^_?LT_[A-Z_]+$]) + + Rename the LT_ variables to LIBT_ to work around this restriction. + + configure.in | 18 +++++++++--------- + fontconfig-zip.in | 2 +- + src/Makefile.am | 6 +++--- + 3 files changed, 13 insertions(+), 13 deletions(-) + +commit 0028f72bc818ca3bc343383fb644765ae12ce769 +Author: Carlo Bramini +Date: Sat May 3 20:17:16 2008 -0700 + + Add FreeType-dependent functions to fontconfig.def file. (bug 15415) + + With PUBLIC_FILES no longer containing the freetype-dependent + symbols, those + must be added to the fontconfig.def file build process. + + src/Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit bdbc26f3d970581a3248c245451f7fbfb1609601 +Author: Keith Packard +Date: Sat May 3 20:14:07 2008 -0700 + + Make fc-match behave better when style is unknown (bug 15332) + + fc-match/fc-match.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 3322ca855330631e0d849e6beca0c2d82390898f +Author: Keith Packard +Date: Sat May 3 20:07:35 2008 -0700 + + Use of ":=" in src/Makefile.am is unportable (bug 14420) + + Building 2.5.91 on Solaris with the native make(1) yields + + ... + Making all in src + make: Fatal error in reader: Makefile, line 313: Unexpected end of + line seen + Current working directory /tmp/fontconfig-2.5.91/src + *** Error code 1 + + This is due to the following line (src/Makefile.am:143): + + CLEANFILES := $(ALIAS_FILES) + + Changing that to a standard assignment ("=") fixes the problem. + + I believe the ":=" is a typo. ALIAS_FILES is just a statically + assigned + variable; it's not like evaluating it more than once would be + a problem. + + src/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit df8ceebdbe735226bef602614921d517321c690f +Author: Keith Packard +Date: Sat May 3 20:06:48 2008 -0700 + + Remove doltcompile in distclean + + Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 9ffa2fa7efa7815b8808e744c3601631fe1810d7 +Author: Ryan Schmidt +Date: Sat May 3 19:49:07 2008 -0700 + + fontconfig build fails if "head" is missing or unusable (bug 14304) + + If the /usr/bin/head program is missing or unusable, or if an + unusable head + program is listed first in the PATH, fontconfig fails to build + + using "sed -n 1p" instead of "head -1" would be a suitable workaround. + + src/makealias | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 6d65081e35fc1ffae1212f173853b0693645192e +Author: Dennis Schridde +Date: Sat May 3 19:45:31 2008 -0700 + + Proper config path for static libraries in win32 + + Since fontconfig didn't have special handling for paths in static + Windows + libraries, I've created a patch which should fix this. + + Basically it does this: + fccfg.c: + If fontconfig_path was uninitialised it tries to get the directory + the exe is + in and uses a fonts/ dir inside that. + fcxml.c: + In case the fonts.conf lists a CUSTOMFONTDIR, it searches + for a + fonts/ directory where the exe is located. + + src/fccfg.c | 26 +++++++++++++++++++++----- + src/fcxml.c | 22 +++++++++++++++++++++- + 2 files changed, 42 insertions(+), 6 deletions(-) + +commit ae6fac08029bce11487d2d20184b1cabb4e0ec34 +Author: Changwoo Ryu +Date: Sat May 3 19:39:56 2008 -0700 + + Korean font in the default config - replacing baekmuk with un + (bug 13569) + + I propose to replace the default Baekmuk Korean fonts with Un fonts. + + Some people don't agree but most Korean people prefer Un fonts + to Baekmuk + ones. Un fonts just look better, at least in the most common Linux + desktops + (antialiased, GNOME or KDE, high resolution). + + conf.d/40-nonlatin.conf | 2 ++ + conf.d/65-nonlatin.conf | 4 ++++ + 2 files changed, 6 insertions(+), 0 deletions(-) + +commit 53aec111074cf7b46d15eb84a55791d3c95bc15e +Author: Sylvain Pasche +Date: Sat May 3 19:33:45 2008 -0700 + + Fontconfig options for freetype sub-pixel filter configuration + + David Turner has modified FreeType to be able to render sub-pixel + decimated + glyphs using different methods of filtering. Fontconfig needs new + configurables to support selecting these new filtering options. A + patch + follows that would correspond to one available for Cairo in bug 10301. + + doc/fontconfig-devel.sgml | 1 + + doc/fontconfig-user.sgml | 5 +++++ + fontconfig/fontconfig.h | 9 ++++++++- + src/fcint.h | 3 ++- + src/fcname.c | 7 ++++++- + 5 files changed, 22 insertions(+), 3 deletions(-) + +commit c26344ecfc1d3b85671f5d948a10d5cc27c21c2f +Author: Frederic Crozat +Date: Sat May 3 19:26:09 2008 -0700 + + Merge some of Mandriva configuration into upstream configuration. Bug + 13247 + + This is merging some parts of Mandriva fontconfig changes, mostly + adding and + documenting fonts to common aliases. + + conf.d/25-unhint-nonlatin.conf | 20 ++++++++++ + conf.d/60-latin.conf | 3 + + conf.d/65-nonlatin.conf | 81 + ++++++++++++++++++++++++++++++++++++--- + conf.d/69-unifont.conf | 4 ++ + 4 files changed, 101 insertions(+), 7 deletions(-) + +commit c014142a207d6f3ac63580dfb0cacb243776f7c5 +Author: Keith Packard +Date: Sat May 3 19:09:57 2008 -0700 + + Add --all flag to fc-match to show the untrimmed list. Bug 13018. + + fc-match/fc-match.c | 18 ++++++++++++------ + 1 files changed, 12 insertions(+), 6 deletions(-) + +commit 8415442f9bb8ad624c9940adf187390468c70548 +Author: Keith Packard +Date: Sat May 3 18:04:32 2008 -0700 + + Add some sample cursive and fantasy families. + + conf.d/45-latin.conf | 20 ++++++++++++++++++++ + conf.d/60-latin.conf | 24 ++++++++++++++++++++++++ + 2 files changed, 44 insertions(+), 0 deletions(-) + +commit 73e8ae3ac8890af2dd8dd769686e2d34b749e3d0 +Author: Keith Packard +Date: Sat May 3 17:43:39 2008 -0700 + + Remove size and dpi values from bitmap fonts. Bug 8765. + + The only relevant information is the pixel size; don't report + anything else. + + src/fcfreetype.c | 34 ---------------------------------- + 1 files changed, 0 insertions(+), 34 deletions(-) + +commit 60421f5d68e81478430c2d9c796eedbf6d43b3cf +Author: Keith Packard +Date: Sat May 3 17:19:43 2008 -0700 + + Work around for bitmap-only TrueType fonts that are missing the + glyf table. + + Bitmap-only TrueType fonts without a glyf table will not load a + glyph when + FT_LOAD_NO_SCALE is set. Work around this by identifying TrueType + fonts that have no + glyphs and select a single strike to measure the glyph map with. + + src/fcfreetype.c | 58 + +++++++++++++++++++++++++++++++++++++++++++++++------ + 1 files changed, 51 insertions(+), 7 deletions(-) + +commit ef9db2e2d286c4c26a2cb06aef14d175c33d0898 +Author: Keith Packard +Date: Sat May 3 17:18:01 2008 -0700 + + Use DOLT if available + + configure.in | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit ba884599133e444b5f6d0b9b6981079cf8059b9f +Author: Eric Anholt +Date: Fri Apr 18 11:52:41 2008 -0700 + + Fix build with !ENABLE_DOCS and no built manpages. + + fc-cache/Makefile.am | 8 ++++++-- + fc-cat/Makefile.am | 8 ++++++-- + fc-list/Makefile.am | 8 ++++++-- + fc-match/Makefile.am | 8 ++++++-- + 4 files changed, 24 insertions(+), 8 deletions(-) + +commit 0dffe625d43c1165f8b84f97e8ba098793e2cf7b +Author: Keith Packard +Date: Thu Jan 10 10:58:25 2008 -0800 + + Bump version to 2.5.91 + + README | 26 ++++++++++++++++++++++---- + configure.in | 2 +- + fontconfig/fontconfig.h | 2 +- + 3 files changed, 24 insertions(+), 6 deletions(-) + +commit b2cbf483ab520ff21ca2152f960498d181613608 +Author: Keith Packard +Date: Thu Jan 10 10:58:22 2008 -0800 + + git-tag requires space after -m flag + + new-version.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 51f1536479064c2d224860c15271a9b14c87fd62 +Author: Keith Packard +Date: Thu Jan 10 10:56:52 2008 -0800 + + new-version.sh was mis-editing files + + new-version.sh | 19 ++++++++----------- + 1 files changed, 8 insertions(+), 11 deletions(-) + +commit 554dc2e7b7e3c1cb6409d0cd786cfbea480fcf69 +Author: Keith Packard +Date: Thu Jan 10 10:48:00 2008 -0800 + + Add more files to .gitignore + + .gitignore | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +commit 94d4f51d854f33b158e7eef2df75a5b21e95fb27 +Author: Keith Packard +Date: Thu Jan 10 10:43:33 2008 -0800 + + Distribute khmer font aliases + + conf.d/65-khmer.conf | 16 ++++++++++++++++ + conf.d/Makefile.am | 1 + + 2 files changed, 17 insertions(+), 0 deletions(-) + +commit fba7c37f98658e3ee94bb454868885b7f3a8ec5e +Author: Keith Packard +Date: Thu Jan 10 10:40:41 2008 -0800 + + Create new-version.sh to help with releases, update INSTALL + instructions + + INSTALL | 36 +++++------------ + new-version.sh | 121 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 131 insertions(+), 26 deletions(-) + +commit ad43ccaafa4f987b982afa2fff07ee8003c51a81 +Author: Keith Packard +Date: Thu Jan 10 08:58:57 2008 -0800 + + Distribute new fcftint.h file + + src/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 32fed4572754c2d484cd1605ff273c3fbfbd09bb +Author: Keith Packard +Date: Tue Jan 8 12:34:19 2008 -0800 + + Eliminate references to freetype from utility Makefile.am's + + The utility programs don't use any freetype interfaces, so they + don't need to directly refer to freetype headers or libraries. + + fc-cache/Makefile.am | 4 ++-- + fc-cat/Makefile.am | 4 ++-- + fc-list/Makefile.am | 4 ++-- + fc-match/Makefile.am | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +commit a0a1da22a4a8e66e47e2ec8ac0515741b8ad7a7f +Author: Keith Packard +Date: Mon Jan 7 16:31:06 2008 -0800 + + Include fcftaliastail.h so that the freetype funcs are exported. + + This header file needs to be included at the end of every file that + exports any freetype symbols. + + src/fcfreetype.c | 1 + + src/fclang.c | 1 + + src/fcpat.c | 1 + + 3 files changed, 3 insertions(+), 0 deletions(-) + +commit dbd065ad312921308add99fc4cb31457d9045e6a +Author: Keith Packard +Date: Wed Jan 2 08:47:14 2008 -0800 + + Remove freetype requirement for build-time applications. + + This avoids requiring the freetype development files when cross + compiling + + fc-arch/Makefile.am | 2 +- + fc-case/Makefile.am | 2 +- + fc-glyphname/Makefile.am | 2 +- + fc-lang/Makefile.am | 2 +- + src/Makefile.am | 13 ++++++++-- + src/fcfreetype.c | 1 + + src/fcftint.h | 54 + ++++++++++++++++++++++++++++++++++++++++++++++ + src/fcint.h | 18 +-------------- + src/fclang.c | 1 + + src/fcpat.c | 1 + + src/makealias | 6 +++- + 11 files changed, 76 insertions(+), 26 deletions(-) + +commit 0aa5fbaa0df9d6c7bee8e0839dd443de9c48a402 +Author: Keith Packard +Date: Sun Dec 23 14:06:41 2007 -0800 + + Fix OOM failure case in FcPStackPush. + + When allocation for the node attributes fail, clean up the node + allocation + and report failure. + + src/fcxml.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +commit 0f7870887adff6db3cffda5485418143f2bfa1f6 +Author: Hongbo Zhao +Date: Wed Dec 12 21:47:33 2007 -0800 + + Not_contain should use strstr, not strcmp on strings. (bug 13632) + + For Version 2.5.0, (same for previous version 2.4.2), in source + file fccfg.c, + on line 700, + + Original: + ret = FcStrCmpIgnoreCase (left.u.s, right.u.s) == 0; + + Should change to: + ret = FcStrStrIgnoreCase (left.u.s, right.u.s) == 0; + + I think this is just a mistake when copy-n-paste similar codes in + the same + function. Apparently, return for "Not_contain" should be just the + inverse of + "Contain", not the same as "Equal". + + src/fccfg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 6e5d2cb931f11f0aba8d187e49ddc7cc92a5be85 +Author: Keith Packard +Date: Sun Nov 25 16:35:55 2007 -0800 + + Move conf.avail/README to conf.d/README (bug 13392) + + Because conf.d is where most people look first. And the comment at + the top + of the README file says conf.d/README too. + + conf.d/Makefile.am | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +commit 8a0bd93e8a81b105206c1433e2da55b1acef1070 +Author: Keith Packard +Date: Tue Nov 13 18:56:44 2007 -0800 + + Bump version number to 2.5 + + README | 15 +++++++++++++-- + configure.in | 2 +- + fontconfig/fontconfig.h | 4 ++-- + 3 files changed, 16 insertions(+), 5 deletions(-) + +commit 8a3dc4880c1182ea446cdbc0885e956c6517cf83 +Author: Tor Lillqvist +Date: Tue Nov 13 16:41:55 2007 -0800 + + Workaround for stat() brokenness in Microsoft's C library (bug 8526) + + Fix a couple of longstanding problems with fontconfig on Windows that + manifest themselves especially in GIMP. The root cause to the problems + is in + Microsoft's incredibly stupid stat() implementation. Basically, stat() + returns wrong timestamp fields for files on NTFS filesystems on + machines + that use automatic DST switching. + + See for instance http://bugzilla.gnome.org/show_bug.cgi?id=154968 and + http://www.codeproject.com/datetime/dstbugs.asp + + As fccache.c now looks at more fields in the stat struct I fill in + them all. + I noticed that fstat() is used only on a fd just after opening it, + so on + Win32 I just call my stat() replacement before opening instead... + Implementing a good replacement for fstat() would be harder because + the code + in fccache.c wants to compare inode numbers. There are no (readily + accessible) inode numbers on Win32, so I fake it with the hash of + the full + file name, in the case as it is on disk. And fstat() doesn't know + the full + file name, so it would be rather hard to come up with a inode + number to + identify the file. + + The patch also adds similar handling for the cache directory as for + the fonts + directory: If a cachedir element in fonts.conf contains the magic + string + "WINDOWSTEMPDIR_FONTCONFIG_CACHE" it is replaced at runtime with a + path under + the machine's (or user's) temp folder as returned by GetTempPath(). I + don't + want to hardcode any pathnames in a fonts.conf intended to be + distributed to + end-users, most of which who wouldn't know how to edit it anyway. And + requiring an installer to edit it gets complicated. + + configure.in | 6 +++- + fc-cache/Makefile.am | 3 ++ + src/fccache.c | 93 + +++++++++++++++++++++++++++++++++++++++++++++++++- + src/fcxml.c | 24 +++++++++++++ + 4 files changed, 124 insertions(+), 2 deletions(-) + +commit 1315db01b626aedd27e3e05bde96ce46c253629b +Author: Keith Packard +Date: Tue Nov 13 15:48:30 2007 -0800 + + Revert "Remove fcprivate.h, move the remaining macros to fcint.h." + + This reverts commit b607922909acfc7ae96de688ed34efd19cd038ac. + + Conflicts: + + src/Makefile.am + + Xft still uses the macros that are in fcprivate.h. Document those + macros and + include fcprivate.h in the published header files. + + doc/check-missing-doc | 1 + + doc/fcobjectset.fncs | 11 ++++ + doc/fcpattern.fncs | 12 ++++- + fontconfig/Makefile.am | 3 +- + fontconfig/fcprivate.h | 123 + +++++++++++++++++++++++++++++++++++++++++++++++ + fontconfig/fontconfig.h | 2 +- + src/Makefile.am | 3 +- + src/fcint.h | 95 +------------------------------------ + 8 files changed, 152 insertions(+), 98 deletions(-) + +commit eaf4470a465cbfb95e2ba4df017d45f7b1d9c131 +Author: Keith Packard +Date: Tue Nov 13 15:16:58 2007 -0800 + + Document that FcConfigGetFonts returns the internal fontset (bug + 13197) + + FcConfigGetFonts returns the internal font set used by the library + which + must not be freed by the application or 'bad things' will happen. + + doc/fcconfig.fncs | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit 3fb38716aefef0fac300dee059403c04c1cbaa6c +Author: Keith Packard +Date: Tue Nov 13 15:11:35 2007 -0800 + + Document that Match calls FcFontRenderPrepare (bug 13162). + + The behaviour of FcFontMatch and FcFontSetMatch is hard to understand + without + knowing that they call FcFontRenderPrepare. + + doc/fcconfig.fncs | 12 ++++++++---- + doc/fcfontset.fncs | 12 ++++++++---- + 2 files changed, 16 insertions(+), 8 deletions(-) + +commit fab44f3cb63dc8bd1285dcbd6ad4f1f468f91daf +Author: Keith Packard +Date: Tue Nov 13 14:58:39 2007 -0800 + + Document several function return values (Bug 13145). + + Several functions had no indication of what the return value would be, + mostly these were allocation failure returns. + + doc/fcatomic.fncs | 4 +++- + doc/fcconfig.fncs | 21 ++++++++++++++------- + doc/fcconstant.fncs | 8 ++++++-- + doc/fcfile.fncs | 28 +++++++++++++++------------- + doc/fcfontset.fncs | 3 ++- + doc/fcinit.fncs | 7 +++++-- + doc/fcobjectset.fncs | 3 ++- + doc/fcobjecttype.fncs | 6 ++++-- + 8 files changed, 51 insertions(+), 29 deletions(-) + +commit ed7955a58f93927eb304ecf8d4d5274dbdc2362b +Author: Keith Packard +Date: Mon Nov 5 16:08:55 2007 -0800 + + Fix parallel build in doc directory. + + docbook2man has fixed output file names; place output in a + subdirectory to + avoid collisions. + + doc/Makefile.am | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +commit 37e9d33950df03f76b6938ae5675ecfc853eb903 +Author: Keith Packard +Date: Mon Nov 5 15:52:45 2007 -0800 + + Update version numbers to 2.4.92 (2.5 RC2) + + README | 49 + +++++++++++++++++++++++++++++++++++++++++++++- + fontconfig/fontconfig.h | 2 +- + 2 files changed, 48 insertions(+), 3 deletions(-) + +commit a504f6b5394b96d2c6a24772b61705227a8e88ab +Author: Behdad Esfahbod +Date: Mon Nov 5 18:12:51 2007 -0500 + + Simplify/improve 30-metric-aliases.conf + + conf.d/30-metric-aliases.conf | 192 + +++++++++++++++++++++++------------------ + 1 files changed, 109 insertions(+), 83 deletions(-) + +commit cbff442c69bfbb6895f5033dfcda325c0508cb3f +Author: Behdad Esfahbod +Date: Mon Nov 5 17:07:36 2007 -0500 + + Remove list of available conf files from README. + It was redundant and out-dated. + + conf.d/README | 29 +---------------------------- + 1 files changed, 1 insertions(+), 28 deletions(-) + +commit 0294bda4800b94828b59139e6205730c74261c40 +Author: Behdad Esfahbod +Date: Mon Nov 5 17:05:36 2007 -0500 + + Fix documented conf-file naming format in README + + conf.d/README | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit 07d04da76c4009552866ae0d2f85659186ef77d6 +Author: Behdad Esfahbod +Date: Mon Nov 5 17:01:44 2007 -0500 + + Remove 25-unhint-nonlatin.conf from default configuration by not + linking it. + + conf.d/Makefile.am | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +commit 9bac30859b9b2b532b9028dc6fe1730b87e95686 +Author: Behdad Esfahbod +Date: Mon Nov 5 16:46:19 2007 -0500 + + Oops, fix Makefile.am. + + conf.d/Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 93b4049c9ac6283fbf05a2a414ff3b4edaef822e +Author: Behdad Esfahbod +Date: Mon Nov 5 16:43:49 2007 -0500 + + Remove 20-lohit-gujarati.conf. It's covered by + 25-unhint-nonlatin.conf now. + + conf.d/20-lohit-gujarati.conf | 11 ----------- + conf.d/Makefile.am | 2 -- + 2 files changed, 0 insertions(+), 13 deletions(-) + +commit 7465091fa90753440ed775de5783387bc4fd9cc4 +Author: Behdad Esfahbod +Date: Mon Nov 5 16:43:14 2007 -0500 + + Remove redundant/obsolete comments from conf files. + + Conf files had an initial comment mentioning the files' name. + This was outdated and wrong in most cases. There's no real use + in that. + + conf.d/10-autohint.conf | 1 - + conf.d/10-no-sub-pixel.conf | 1 - + conf.d/10-sub-pixel-bgr.conf | 1 - + conf.d/10-sub-pixel-rgb.conf | 1 - + conf.d/10-sub-pixel-vbgr.conf | 1 - + conf.d/10-sub-pixel-vrgb.conf | 1 - + conf.d/10-unhinted.conf | 1 - + conf.d/20-fix-globaladvance.conf | 1 - + conf.d/20-unhint-small-vera.conf | 1 - + conf.d/25-unhint-nonlatin.conf | 1 - + conf.d/30-metric-aliases.conf | 1 - + conf.d/30-urw-aliases.conf | 1 - + conf.d/50-user.conf | 1 - + conf.d/51-local.conf | 1 - + conf.d/65-fonts-persian.conf | 1 - + conf.d/70-no-bitmaps.conf | 1 - + conf.d/70-yes-bitmaps.conf | 1 - + conf.d/80-delicious.conf | 1 - + 18 files changed, 0 insertions(+), 18 deletions(-) + +commit 531a143858aa1b5c82ee20bdacc292c0a31b6cfb +Author: Behdad Esfahbod +Date: Mon Nov 5 16:40:25 2007 -0500 + + Use binding="same" in 30-urw-aliases.conf and remove duplicate + entries. + + Times, Helvetical, and Courier are already handled in + 30-metric-aliases.conf. + Remove them here and add a comment instead. + + conf.d/30-urw-aliases.conf | 27 ++++++++------------------- + 1 files changed, 8 insertions(+), 19 deletions(-) + +commit 4b51f173c99152586db26b03752873a4b4020672 +Author: Behdad Esfahbod +Date: Mon Nov 5 16:36:55 2007 -0500 + + Split 40-generic.conf into 40-nonlatin.conf and 45-latin.conf + + conf.d/40-generic.conf | 80 + ----------------------------------------------- + conf.d/40-nonlatin.conf | 51 ++++++++++++++++++++++++++++++ + conf.d/45-latin.conf | 56 +++++++++++++++++++++++++++++++++ + conf.d/Makefile.am | 6 ++- + conf.d/README | 5 ++- + 5 files changed, 114 insertions(+), 84 deletions(-) + +commit 39968fb223bf2eeb5502553c8d316dc4914a32ba +Author: Behdad Esfahbod +Date: Mon Nov 5 16:14:35 2007 -0500 + + Add/update config files from Fedora. + + conf.d/25-unhint-nonlatin.conf | 228 + ++++++++++++++++++++++++++++++++++++++++ + conf.d/30-amt-aliases.conf | 21 ---- + conf.d/30-metric-aliases.conf | 186 ++++++++++++++++++++++++++++++++ + conf.d/40-generic.conf | 22 +++- + conf.d/65-nonlatin.conf | 45 ++++++++ + conf.d/Makefile.am | 6 +- + conf.d/README | 3 +- + 7 files changed, 483 insertions(+), 28 deletions(-) + +commit cf223cc7bcae94e839d7ac1e980f289cca5199b0 +Author: Behdad Esfahbod +Date: Mon Nov 5 15:29:44 2007 -0500 + + Add FcGetLangs() and FcLangGetCharSet(). + + doc/fclangset.fncs | 16 ++++++++++++++++ + fontconfig/fontconfig.h | 6 ++++++ + src/fcint.h | 3 --- + src/fclang.c | 20 ++++++++++++++++++-- + 4 files changed, 40 insertions(+), 5 deletions(-) + +commit 811995b79db16be39046dbbffcc5a7d66f88b731 +Author: Behdad Esfahbod +Date: Mon Nov 5 15:29:03 2007 -0500 + + Fix trivial bugs in edit-sgml.c + + doc/edit-sgml.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit de1faa42d1425f80366707a730ea919c57e57b2f +Author: Keith Packard +Date: Sun Nov 4 12:20:45 2007 -0800 + + Export FcConfig{G,S}etRescanInverval from .so, mark as deprecated. + + These two names are typos of the correct names. Instead of simply + changing + them, the correct thing to do is leave them in the library, add + the correct + functions and mark them as deprecated so any source packages will + be updated. + + This requires bumping the minor version of the library (for adding + APIs) + instead of bumping the major version of the library (for removing + APIs). + + configure.in | 6 +++--- + fontconfig/fontconfig.h | 13 +++++++++++++ + src/Makefile.am | 5 +++-- + src/fccfg.c | 16 ++++++++++++++++ + src/fcdeprecate.h | 36 ++++++++++++++++++++++++++++++++++++ + src/fcint.h | 1 + + 6 files changed, 72 insertions(+), 5 deletions(-) + +commit 69d3eb9cb8e58ab771170f68868748204a4793ab +Author: Keith Packard +Date: Sat Nov 3 23:43:48 2007 -0700 + + Ignore new generated documentation + + .gitignore | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit dc7b6f1d79b5508706be9242b79180727701e54f +Author: Keith Packard +Date: Sat Nov 3 23:42:32 2007 -0700 + + Link new function documentation into the fontconfig-devel.sgml + + doc/fontconfig-devel.sgml | 31 +++++++++++++++++++++++++++++++ + 1 files changed, 31 insertions(+), 0 deletions(-) + +commit dac27f2f1a766b042487827c726b3ccae147d282 +Author: Keith Packard +Date: Sat Nov 3 23:41:38 2007 -0700 + + Formatting syntax mistake in doc/fclangset.fncs. + + ls needed to be ls. + + doc/fclangset.fncs | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 9bfb41ffefe41c90c8b16e155e04e6c6a5a2c1fd +Author: Keith Packard +Date: Sat Nov 3 23:23:55 2007 -0700 + + Generate fccache.sgml, fcdircache.sgml and fclangset.sgml. + + Just adding the .fncs versions doesn't get these files generated. + + doc/Makefile.am | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit bfdc0047c670b0ac38bf050bbb81e0ef7299aa1f +Author: Keith Packard +Date: Sat Nov 3 23:23:09 2007 -0700 + + Fix formatting syntax in doc/fccache.fncs + + doc/fccache.fncs | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit f2772d6b45bcfc27618968fdbb08dcc50a18be22 +Author: Keith Packard +Date: Sat Nov 3 23:03:11 2007 -0700 + + Replace incorrect documentation uses of 'char' with 'FcChar8' + (bug 13002). + + doc/fcconfig.fncs | 10 +++++----- + doc/fcfile.fncs | 6 +++--- + doc/fcfreetype.fncs | 4 ++-- + doc/fcpattern.fncs | 6 +++--- + doc/fontconfig-devel.sgml | 2 +- + 5 files changed, 14 insertions(+), 14 deletions(-) + +commit b4a3e834126a3cac7fbf2212087825f886be1f1d +Author: Keith Packard +Date: Sat Nov 3 22:53:12 2007 -0700 + + Remove references to FcConfigParse and FcConfigLoad. + + These functions no longer exist. + + doc/fcconfig.fncs | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +commit fc141b492bab23d58d248fc3b6d34bcb9c5faa99 +Author: Keith Packard +Date: Sat Nov 3 22:45:31 2007 -0700 + + Have FcConfigSetCurrent accept the current configuration and simply + return + without updating anything. + + src/fccfg.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 7c6939793b1691b4b950a856cdcd31f1e020b14a +Author: Keith Packard +Date: Sat Nov 3 22:39:54 2007 -0700 + + Update documentation for stale FcConfigGetConfig function. + + The old per-user cache filename is no longer used. + + doc/fcconfig.fncs | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +commit 026fe895e487d0a9607a8506ab8be2ff6022ea19 +Author: Keith Packard +Date: Sat Nov 3 22:31:16 2007 -0700 + + Update documentation for FcStrCopyFilename (bug 12964). + + FcStrCopyFilename constructs a canonical path for any argument, + including + expanding leading ~ and editing '.' and '..' elements out of the + resulting + path. + + doc/fcstring.fncs | 13 +++++++++---- + 1 files changed, 9 insertions(+), 4 deletions(-) + +commit a190678e3c4497870679808dde418191407be91d +Author: Keith Packard +Date: Sat Nov 3 22:23:28 2007 -0700 + + Document previously undocumented functions. (bug 12963) + + doc/Makefile.am | 3 + + doc/check-missing-doc | 4 +- + doc/fccache.fncs | 68 ++++++++++++++++++++++++ + doc/fccharset.fncs | 24 +++++++++ + doc/fcconfig.fncs | 31 +++++++++++ + doc/fcdircache.fncs | 88 ++++++++++++++++++++++++++++++++ + doc/fcfile.fncs | 29 ++++++---- + doc/fcfontset.fncs | 83 ++++++++++++++++++++++++++++++ + doc/fcfreetype.fncs | 22 ++++++++ + doc/fclangset.fncs | 124 + +++++++++++++++++++++++++++++++++++++++++++++ + doc/fcmatrix.fncs | 2 + + doc/fcpattern.fncs | 52 ++++++++++++++++++- + doc/fcstring.fncs | 80 ++++++++++++++++++++++++----- + doc/fcstrset.fncs | 11 ++++ + doc/fcvalue.fncs | 21 ++++++++ + doc/fontconfig-devel.sgml | 26 +++++++++- + 16 files changed, 638 insertions(+), 30 deletions(-) + +commit 9a54f8a1945e614e07446412a2df534fbc1f77cb +Author: Keith Packard +Date: Sat Nov 3 22:01:33 2007 -0700 + + Verify documentation covers exposed symbols. + + Add check-missing-doc script to make sure the documentation matches + the + complete list of symbols exported from the header files before + release. + + doc/Makefile.am | 6 +++++- + doc/check-missing-doc | 23 +++++++++++++++++++++++ + 2 files changed, 28 insertions(+), 1 deletions(-) + +commit c833409f6b68c191ac354cd2fdeb183f73a65c4c +Author: Keith Packard +Date: Sat Nov 3 21:58:34 2007 -0700 + + Use FcLangDifferentTerritory instead of FcLangDifferentCountry. + + src/fclang.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit 9b84ecff92b8dccf6559a858e35762c0f664429a +Author: Keith Packard +Date: Sat Nov 3 21:57:51 2007 -0700 + + Don't check cache file time stamps when cleaning cache dir. + + Cache file mtime is meaningless now that the directory time is + encoded in + the cache. + + fc-cache/fc-cache.c | 10 +--------- + 1 files changed, 1 insertions(+), 9 deletions(-) + +commit 1d93c1752f03b833603ea31c2cfbd16868c44922 +Author: Keith Packard +Date: Sat Nov 3 21:56:36 2007 -0700 + + Typo error in function name: Inverval -> interval + + src/fccfg.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit b868a1447341ebe9962007069ec8658550e62483 +Author: Keith Packard +Date: Sat Nov 3 21:55:39 2007 -0700 + + Track line numbers in sgml edit tool input. + + Errors in the documentation can be hard to find unless the tool + outputs the + line number where the problem exists. + + doc/edit-sgml.c | 85 + +++++++++++++++++++++++++++++++++--------------------- + 1 files changed, 52 insertions(+), 33 deletions(-) + +commit 088b582a26bce1ab3ec081a80fd6a6fe43223da5 +Author: Keith Packard +Date: Sat Nov 3 21:54:49 2007 -0700 + + Clean up exported names in fontconfig.h. + + Fix typo errors (Inverval indeed). + Remove FcPattern *p from FcValue (unused) + Remove spurious FcPublic from formals. + + fontconfig/fontconfig.h | 24 +++++++++++++----------- + 1 files changed, 13 insertions(+), 11 deletions(-) + +commit e37d10fa74217a6102003882d49ac323f28db678 +Author: Keith Packard +Date: Sat Nov 3 14:16:29 2007 -0700 + + Make file_stat argument to FcDirCacheLoadFile optional. + + Allow file_stat to be NULL by using a local stat structure in + that case. + + src/fccache.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 2ddce88cde79d8bf8959d614af883999d5c66a85 +Author: Keith Packard +Date: Sat Nov 3 13:44:59 2007 -0700 + + Document skipping of fonts from FcFileScan/FcDirScan. + + FcFileScan and FcDirScan will skip fonts under direction of the + configuration and default fontconfig policy. + + doc/fcfile.fncs | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +commit 5d82c4c85d201011e60adcf887d15341ecdd5729 +Author: Keith Packard +Date: Sat Nov 3 13:26:16 2007 -0700 + + Correct documentation for FcConfigUptoDate (bug 12948). + + FcConfigUptoDate only checks whether files have been modified + since the + configuration was created. Any changes to the configuration through + the API + since then are not considered. + + doc/fcconfig.fncs | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit b607922909acfc7ae96de688ed34efd19cd038ac +Author: Keith Packard +Date: Sat Nov 3 13:09:01 2007 -0700 + + Remove fcprivate.h, move the remaining macros to fcint.h. + + fcprivate.h was supposed to extend the fontconfig API for the various + fontconfig utilities. Instead, just have those utilities use the + internal + fcint.h header file (which they already do), removing fcprivate.h + from the + installation and hence from the defacto public API. + + fontconfig/Makefile.am | 3 +- + fontconfig/fcprivate.h | 123 + ------------------------------------------------ + src/Makefile.am | 3 +- + src/fcint.h | 95 ++++++++++++++++++++++++++++++++++++- + 4 files changed, 96 insertions(+), 128 deletions(-) + +commit 910db318ae67693f7bc17f0bdc61caaf555365ae +Author: Keith Packard +Date: Sat Nov 3 13:05:25 2007 -0700 + + Correct documentation for FcAtomicLock (Bug 12947). + + FcAtomicLock can only be called once from any process. + + doc/fcatomic.fncs | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit d0e2a0f3a37ace2d5de6f18e7871a8efaf6580c2 +Author: Behdad Esfahbod +Date: Fri Oct 26 02:02:19 2007 -0400 + + Port fonts-persian.conf to new alias syntax with binding="same" + + Signed-off-by: Keith Packard + + conf.d/65-fonts-persian.conf | 377 + ++++++++++++++---------------------------- + 1 files changed, 121 insertions(+), 256 deletions(-) + +commit 681bb379de1847cf288ba27cf29243c8395cff17 +Author: Keith Packard +Date: Thu Oct 25 22:30:49 2007 -0700 + + Respect "binding" attribute in entries. + + This makes creating "same" aliases for renamed font families far + easier. + + fonts.dtd | 2 ++ + src/fcxml.c | 58 + ++++++++++++++++++++++++++++++++++++---------------------- + 2 files changed, 38 insertions(+), 22 deletions(-) + +commit 0602c605af04ea73af700b223ec4ac1dfd5a36f1 +Author: Behdad Esfahbod +Date: Thu Oct 25 21:35:45 2007 -0700 + + Make fc-match --sort call FcFontRenderPrepare. + + This makes the --sort and regular output the same for each font. + + fc-match/fc-match.c | 20 ++++++++++++++++++-- + 1 files changed, 18 insertions(+), 2 deletions(-) + +commit ad27687f725faf7df83b161c77e99bc7bedf5b3d +Author: Keith Packard +Date: Thu Oct 25 21:23:36 2007 -0700 + + Also check configDirs mtimes in FcConfigUptoDate + + Checking only config files and font directories can miss changes which + affect only a configuration directory. Check those to catch any + changes. + + src/fccfg.c | 17 +++-------------- + 1 files changed, 3 insertions(+), 14 deletions(-) + +commit 89d6119c0283969cb28dc6dfc8eac4cc1b52bf6a +Author: Keith Packard +Date: Thu Oct 25 15:19:14 2007 -0700 + + A few fixups for make distcheck + + Makefile.am | 2 +- + doc/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e66c65fd41928babb3ba2ae2dc58f13d25e57661 +Author: Keith Packard +Date: Thu Oct 25 15:07:54 2007 -0700 + + Set version numbers to 2.4.91 (2.5 RC1) + + README | 59 + +++++++++++++++++++++++++++++++++++++++++++++- + configure.in | 2 +- + fontconfig/fontconfig.h | 2 +- + 3 files changed, 59 insertions(+), 4 deletions(-) + +commit 7a1a7c0c15793e77cb162dd3393971332896460e +Author: Keith Packard +Date: Thu Oct 25 14:36:24 2007 -0700 + + Build fix for Solaris 10 with GCC. + + Solaris 10 with GCC doesn't appear capable of supporting the symbol + visibility stuff, so disable it. + + src/fcint.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit fc990b2e86008967f499fe0df88de8e074a3670e +Author: Behdad Esfahbod +Date: Thu Oct 25 14:20:06 2007 -0700 + + Update CaseFolding.txt to Unicode 5.1.0 + + fc-case/CaseFolding.txt | 184 + +++++++++++++++++++++++++++++++++++++++++++++-- + src/fcstr.c | 2 +- + 2 files changed, 178 insertions(+), 8 deletions(-) + +commit 4ee9ca67867ec9517c90d6947bb88d3f25707746 +Author: Keith Packard +Date: Fri Sep 1 20:25:21 2006 -0700 + + Match 'ultra' on word boundaries to detect ultra bold fonts. (bug + 2511) + + Added FcStrContainsWord to detect strings on word boundaries. + + src/fcfreetype.c | 15 +++++++++++++-- + src/fcint.h | 3 +++ + src/fcstr.c | 50 + +++++++++++++++++++++++++++++++++++++++++++++++++- + 3 files changed, 65 insertions(+), 3 deletions(-) + +commit 349182784fdd0acf5d1262d8876c967f69dc30aa +Author: Keith Packard +Date: Thu Oct 25 01:51:38 2007 -0700 + + fontconfig needs configure option to use gnu iconv (bug 4083). + + Existing Solaris workaround was broken; mis-matching values caused + the test + for libiconv to always fail. + + configure.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 7f46cdbb87a4a2113effb45c6e67b00a86363234 +Author: Keith Packard +Date: Thu Oct 25 01:35:32 2007 -0700 + + Ensure weight/slant values present even when style is supplied + (bug 9313). + + If the provided style value doesn't match any available font, fall + back to + using the weight and slant values by ensuring that those are in + the pattern. + + src/fcdefault.c | 16 +++++----------- + 1 files changed, 5 insertions(+), 11 deletions(-) + +commit 43d0454597dfb5375b1268edb79172779cc51113 +Author: Keith Packard +Date: Thu Oct 25 01:26:09 2007 -0700 + + Distribute man source files for command line programs (bug 9678). + + For systems on whch DOCBOOK is unavailable, distribute command + line program + manual pages in .man format. + + fc-cache/Makefile.am | 6 +++--- + fc-cat/Makefile.am | 6 +++--- + fc-list/Makefile.am | 6 +++--- + fc-match/Makefile.am | 6 +++--- + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit cf3e888b71a22e5c5875b96bf29557746044bd2b +Author: Dwayne Bailey +Date: Thu Oct 25 01:16:06 2007 -0700 + + Add/fix *.orth files for South African languages + + This adds the missing orth files for Ndebele (South) (nr), Northern + Sotho + (nso), Swati (ss) and Southern Sotho (st). It also fixes the Tswana + (tn) + orth file. + + fc-lang/iso639-1 | 4 ++-- + fc-lang/iso639-2 | 8 ++++---- + fc-lang/nr.orth | 29 +++++++++++++++++++++++++++++ + fc-lang/nso.orth | 34 ++++++++++++++++++++++++++++++++++ + fc-lang/ss.orth | 29 +++++++++++++++++++++++++++++ + fc-lang/st.orth | 29 +++++++++++++++++++++++++++++ + fc-lang/tn.orth | 2 ++ + 7 files changed, 129 insertions(+), 6 deletions(-) + +commit 28a4ea7f714956d34f7ac65354577b87bec5620d +Author: Keith Packard +Date: Thu Oct 25 01:09:11 2007 -0700 + + Fix parallel build in fontconfig/docs (bug 10481). + + doc/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 79641a3b0c2b4a0c2e1a315028f0e54a9d846003 +Author: Keith Packard +Date: Thu Oct 25 01:03:40 2007 -0700 + + Handle UltraBlack weight. + + UltraBlack is weight 950 on the CSS scale; handle this by name + and value + encoding it as fontconfig weight 215. + + fontconfig/fontconfig.h | 2 ++ + src/fcfreetype.c | 7 ++++++- + 2 files changed, 8 insertions(+), 1 deletions(-) + +commit d02f6a70f1cb4cdad882ffe429918a119641ddbb +Author: Keith Packard +Date: Thu Oct 25 01:02:58 2007 -0700 + + Oops. Left debugging printf in previous commit. + + src/fcfreetype.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +commit 61139cf638becf023a9d5e01c90adc5aa19f83c5 +Author: Keith Packard +Date: Thu Oct 25 00:49:19 2007 -0700 + + Spelling errors in documentation. (bug 10879). + + Thanks to David for spotting these. + + doc/fcconfig.fncs | 4 ++-- + doc/fcstring.fncs | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit feecc86cea6bd1cb588f68e06b85d85727289989 +Author: Keith Packard +Date: Thu Oct 25 00:46:41 2007 -0700 + + There is no U+1257 (bug 10899). + + The Eritrean Tigrinya orthography mistakenly included this unicode + value. + + fc-lang/ti_er.orth | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 4657944d0c39a640b2e30dfbd95f13d79a99460b +Author: Keith Packard +Date: Thu Oct 25 00:41:28 2007 -0700 + + FcInit should return FcFalse when FcInitLoadConfigAndFonts fails. (bug + 10976) + + Thanks to David for spotting this error. + + src/fcinit.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 28baf727367513ad06ddb1c53daff062e8f39e8c +Author: Tilman Sauerbeck +Date: Thu Oct 25 00:38:44 2007 -0700 + + Store FcVendorFoundries in read-only memory. + + Create fixed size strings for vendor and foundry. + + src/fcfreetype.c | 62 + +++++++++++++++++++++++++++--------------------------- + 1 files changed, 31 insertions(+), 31 deletions(-) + +commit 481f6c23079b6dbf5239478f2bb22ee4c72404b4 +Author: Tilman Sauerbeck +Date: Thu Oct 25 00:36:37 2007 -0700 + + Store FcNoticeFoundries in read-only memory. + + Use a single character array and a separate table of integer indices. + + src/fcfreetype.c | 75 + ++++++++++++++++++++++++++++++++++++------------------ + 1 files changed, 50 insertions(+), 25 deletions(-) + +commit a72ef35ce68efa3687dee84d49dc40a5ccd22917 +Author: Keith Packard +Date: Thu Oct 25 00:22:04 2007 -0700 + + Replace makealias pattern with something supported by POSIX grep + (bug 11083) + + The suggested replacement in the bug was not supported by GNU grep, + so I + created something that should be supported everywhere (famous + last words). + + src/makealias | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 369b6b5bfbab57bbc7fb6482f6fd9c88e5057e5a +Author: Keith Packard +Date: Wed Oct 24 21:59:33 2007 -0700 + + Add BRAILLE PATTERN BLANK to list of blank glyphs. + + Braille pattern blank is often imaged as a blank glyph. + + fonts.conf.in | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 007cae508c831561c7a4f06092858ea7bf517e2e +Author: Keith Packard +Date: Wed Oct 24 21:52:56 2007 -0700 + + Move elements to the end of fonts.conf. + + This allows users to select alternate directories for cache files, + ahead of + the 'standard' directories. + + fonts.conf.in | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +commit d50cfeb805f7dec304c1d51d7a7c1c35f55d2e68 +Author: Keith Packard +Date: Wed Oct 24 21:47:40 2007 -0700 + + Leave generated headers out of distribution (bug 12734). + + If the generated header files are included in the distribution, + a build + outside of the source directory will use them. For machine-specific + files, + this generates the wrong result (fcarch.h). Leaving them out of the + distribution forces them to be built. + + fc-arch/Makefile.am | 4 +--- + fc-case/Makefile.am | 4 +--- + fc-glyphname/Makefile.am | 4 +--- + fc-lang/Makefile.am | 4 +--- + 4 files changed, 4 insertions(+), 12 deletions(-) + +commit 1bd0b5ba7365fc7b4ef39e46efc66a6f25c052c5 +Author: Keith Packard +Date: Thu Oct 18 09:48:31 2007 -0700 + + Eliminate relocations from FcCodePageRange structure (bug 10982). + + FcCodePageRange was using char pointers; replace them with char + arrays. + + src/fcfreetype.c | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +commit 96925b99c0551c4ed6bf7099473d0d36964f52cd +Author: Keith Packard +Date: Thu Oct 18 09:43:22 2007 -0700 + + Eliminate relocations for glyph name table. + + Glyph names (now used only for dingbats) were using many relocations, + causing startup latency plus per-process memory usage. Replace + pointers with + table indices, shrinking table size and elimninating relocations. + + fc-glyphname/fc-glyphname.c | 28 ++++++++++++++++++++-------- + src/fcfreetype.c | 16 ++++++++-------- + 2 files changed, 28 insertions(+), 16 deletions(-) + +commit bc5e8adb4d05d1d03007951f46aaacc63c3b2197 +Author: Keith Packard +Date: Thu Oct 18 09:41:00 2007 -0700 + + Must not insert cache into hash table before completely validating. + + The cache was inserted into the hash table before the timestamps + in the + cache were verified; if that verification failed, an extra pointer + to the + now freed cache would be left in the hash table. FcFini would fail an + assertion as a result. + + src/fccache.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit e85789a99770dbd1a4abe9da3eadb355c19f5216 +Author: Keith Packard +Date: Thu Oct 18 08:58:14 2007 -0700 + + Place language name in constant array instead of pointer. + + Constant char array of 8 bytes is the same size as a pointer plus + a short + string, so this actually saves memory and eliminates a pile of + relocations. + + fc-lang/fc-lang.c | 2 +- + src/fclang.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 26437d4924b0f53f03915e5f3616992eb1fb72e7 +Author: Keith Packard +Date: Thu Oct 18 08:56:42 2007 -0700 + + FcConfigParseAndLoad doc was missing the last param. + + Typo lost the last param to this function. + + doc/fcconfig.fncs | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 07e646cc8422bda778ecf1c084129556a39a0f2a +Author: Mike FABIAN +Date: Thu Oct 18 05:44:28 2007 -0700 + + Avoid crashes if config files contain junk. + + If ~/.fonts.conf contains: + + + mono + + + fontconfig crashes: + + mfabian@magellan:~$ fc-match sans + Fontconfig error: "~/.fonts.conf", line 46: "mono": not + a valid + integer + セグメンテーション違反です (core dumped) + mfabian@magellan:~$ + + Of course the above is nonsense, “mono” is no valid integer + indeed. + + But I think nevertheless fontconfig should not crash in that case. + + The problem was caused by partially truncated expression trees + caused by + parse errors -- typechecking these walked the tree without verifying + the + integrity of the structure. Of course, the whole tree will be + discarded + shortly after being loaded as it contained an error. + + src/fcxml.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit fa9a7448d83da498b3494fd0ff7d756569f94425 +Author: Hideki Yamane +Date: Thu Oct 18 05:17:36 2007 -0700 + + Handle Japanese fonts better. (debian bug #435971) + + Add some commonly available Japanese fonts to the standard aliases. + + conf.d/65-nonlatin.conf | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +commit 2a3e3c442de4c675e28e754dea0fe2f7f0686ade +Author: Keith Packard +Date: Thu Oct 18 05:05:59 2007 -0700 + + Have fc-cache remove invalid cache files from cache directories. + + Old cache file versions, or corrupted cache files should be removed + when + cleaning cache directories with fc-cache. This only affects filenames + which + match the fontconfig cache file format, so other files will be + left alone. + + fc-cache/fc-cache.c | 34 ++++++++++++++++++---------------- + 1 files changed, 18 insertions(+), 16 deletions(-) + +commit 238489030a64fa883f8f9fc3d73247b7f7257899 +Author: Keith Packard +Date: Thu Oct 18 05:04:39 2007 -0700 + + Don't use X_OK bit when checking for writable directories (bug 12438) + + Some mingw versions have broken X_OK checking; instead of trying + to work + around this in a system-depedent manner, simply don't bother + checking for + X_OK along with W_OK as such cases are expected to be mistakes, + and not + sensible access control. + + fc-cache/fc-cache.c | 2 +- + src/fccache.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 2b0d3d8af5a83604972e4e0fe80802e448d6dd11 +Author: Keith Packard +Date: Thu Oct 18 05:01:41 2007 -0700 + + Verbose message about cleaning directories was imprecise + + Non-existent directories are now described as 'non-existent' + instead of + 'unwritable'. + + fc-cache/fc-cache.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit 50124d1e484b84796abb7d8a6c1995edaff23e80 +Author: Keith Packard +Date: Thu Oct 18 04:58:31 2007 -0700 + + Improve verbose messages from fc-cache. + + fc-cache would say 'skipping: %d fonts, %d dirs' or 'caching: %d + fonts, %d + dirs', which could easily mislead the user. Add 'existing cache is + valid' or + 'new cache contents' to these messages to explain what it is doing. + + fc-cache/fc-cache.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit e12f718f65fc874e9170761f670930124815663e +Author: Keith Packard +Date: Thu Oct 18 04:54:51 2007 -0700 + + Remove unneeded call to access(2) in fc-cache. + + This call was followed by a call to stat(2) which provided the + necessary + information. This call to access(2) was necessary when cache + files were + stored in the font directory as that would check for write permission + correctly. + + fc-cache/fc-cache.c | 18 +++--------------- + 1 files changed, 3 insertions(+), 15 deletions(-) + +commit f7da903d370dcf662a301930b003485f25db618f +Author: Keith Packard +Date: Thu Oct 18 04:31:33 2007 -0700 + + Make FC_FULLNAME include all fullname entries, elide nothing. [bug + 12827] + + The old policy of eliding fullname entries which matched FC_FAMILY or + FC_FAMILY + FC_STYLE meant that applications could not know what the + font foundry set as the fullname of the font. Hiding information + is not + helpful. + + src/fcfreetype.c | 64 + ------------------------------------------------------ + 1 files changed, 0 insertions(+), 64 deletions(-) + +commit 144ca878311af885db820a35db31563ba87ee6ad +Author: Keith Packard +Date: Thu Oct 18 04:29:13 2007 -0700 + + Comment about mmaping cache files was misleading. + + src/fccache.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit db6f19f13b1719617c54a1658b8faa31da56e1d4 +Author: Keith Packard +Date: Thu Oct 18 04:13:51 2007 -0700 + + Store font directory mtime in cache file. + + Instead of relying on mtime ordering between a directory and its + associated + cache file, write the directory mtime into the cache file itself. This + makes + cache file checks more reliable across file systems. + + This change is made in a way that old programs can use new cache + files, but + new programs will need new cache files. + + fc-arch/fcarch.tmpl.h | 14 +++++----- + src/fccache.c | 64 + +++++++++++++++++++++++++++++++----------------- + src/fcdir.c | 8 +++++- + src/fcint.h | 5 ++- + 4 files changed, 58 insertions(+), 33 deletions(-) + +commit 00268a50e8b99e80ff25ee2a77a925398f89693f +Author: Keith Packard +Date: Thu Oct 18 03:52:29 2007 -0700 + + Fix ChangeLog generation to avoid circular make dependency + + Makefile.am | 11 ++++------- + 1 files changed, 4 insertions(+), 7 deletions(-) + +commit 3ae9258f9e825ed576dc315ec79009188bb422e2 +Author: Keith Packard +Date: Sun Aug 5 12:31:03 2007 -0700 + + Free temporary string in FcDirCacheUnlink (Bug #11758) + + In FcDirCacheUnlink(), the line + + cache_hashed = FcStrPlus (cache_dir, cache_base); + + allocates memory in cache_hashed that is never free()'d before + the function + exits. + + Reported by Ben Combee. + + src/fccache.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit c80a08d6bf08a27ede95035f3f02cd5abfa2cafd +Author: Keith Packard +Date: Mon Mar 12 10:32:23 2007 -0700 + + Work around FreeType bug when glyph name buffer is too small. + + Recent versions of FreeType do not correctly deal with glyph name + buffers + that are too small; work around this by declaring a buffer that can + hold any + PS name (127 bytes). + + src/fcfreetype.c | 21 +++++++++++++++++---- + 1 files changed, 17 insertions(+), 4 deletions(-) + +commit fa741cd4fffbbaa5d4ba9a15f53550ac7817cc92 +Author: Keith Packard +Date: Mon Mar 12 10:30:51 2007 -0700 + + rehash increment could be zero, causing rehash infinite loop. + + Bump the rehash value by one so that it is always positive. + + fc-glyphname/fc-glyphname.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 9b74b78fe87f75f7026bfb23ab43ef347e109ca6 +Author: Stephan Kulow +Date: Mon Mar 12 10:21:35 2007 -0700 + + Make FcPatternDuplicate copy the binding instead of always using + Strong. + + I noticed that Qt always uses a different font than fc-match + advertises. + Debugging the issue, I found that a call that looks pretty innocent is + changing all weak bindings to strong bindings and as such changes the + semantic of the match: FcPatternDuplicate. + + src/fcpat.c | 10 +++++++--- + 1 files changed, 7 insertions(+), 3 deletions(-) + +commit 2373f904265a05761039cfc5fe305bf588e831c5 +Author: Keith Packard +Date: Sat Dec 2 16:09:47 2006 -0800 + + Update for version 2.4.2 + + INSTALL | 2 +- + README | 36 ++++++++++++++++++++++++++++++++++-- + configure.in | 2 +- + fontconfig/fontconfig.h | 2 +- + 4 files changed, 37 insertions(+), 5 deletions(-) + commit e3b65ee06808cda296215b88111a259a200cc37c Author: Peter Breitenlohner -Date: Sat Dec 2 15:09:57 2006 -0800 +Date: Sat Dec 2 15:09:57 2006 -0800 Fix fc-cat documentation (bug 8935). @@ -11,13 +5435,13 @@ Date: Sat Dec 2 15:09:57 2006 -0800 (2) The fc-cat.1 manpage was fairly broken (unreadable). - fc-cat/fc-cat.c | 9 +++++++-- - fc-cat/fc-cat.sgml | 26 +++++++++++++++++++++++--- + fc-cat/fc-cat.c | 9 +++++++-- + fc-cat/fc-cat.sgml | 26 +++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) commit 61895ed16c0c06e4d6b2abeb8ff292d53b4ea499 Author: Keith Packard -Date: Sat Dec 2 15:06:13 2006 -0800 +Date: Sat Dec 2 15:06:13 2006 -0800 Add space between type and formal in devel man pages (bug 8935) @@ -41,31 +5465,31 @@ Date: Sat Dec 2 15:06:13 2006 -0800 commit b1aa20098f641a16d02e70a161450e6b85afe410 Author: Peter Breitenlohner -Date: Sat Dec 2 14:28:03 2006 -0800 +Date: Sat Dec 2 14:28:03 2006 -0800 Use instead of when documenting fonts.conf. Bug 8935. doc/fontconfig-user.sgml | 87 - +++++++++++++++++++++++----------------------- + ++++++++++++++++++++++----------------------- 1 files changed, 43 insertions(+), 44 deletions(-) commit 2cae0512cdf3544ff78b04f6c05a4cb585e50bb8 Author: Peter Breitenlohner -Date: Sat Dec 2 14:18:11 2006 -0800 +Date: Sat Dec 2 14:18:11 2006 -0800 A VPATH build of fontconfig-2.4.1 fails for various reasons. Bug 8933. VPATH builds without doctools breaks as it cannot find the distributed pre-formatted documentation. - configure.in | 2 +- + configure.in | 2 +- doc/Makefile.am | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) commit 0f963b0d3ec417a39f6aa2ba22ba56c2a79d05aa Author: Keith Packard -Date: Sat Dec 2 13:57:45 2006 -0800 +Date: Sat Dec 2 13:57:45 2006 -0800 Segfault scanning non-font files. Disallow scan edit of user vars. (#8767) @@ -75,14 +5499,14 @@ Date: Sat Dec 2 13:57:45 2006 -0800 edited variables are in the predefined set; otherwise, the resulting cache files will not be stable. - src/fcdir.c | 2 +- - src/fcint.h | 1 + - src/fcxml.c | 6 ++++++ + src/fcdir.c | 2 +- + src/fcint.h | 1 + + src/fcxml.c | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletions(-) commit c9c6875014661d4326100bae0464279d76bd657f Author: Kean Johnston -Date: Sat Dec 2 13:36:56 2006 -0800 +Date: Sat Dec 2 13:36:56 2006 -0800 Don't use varargs CPP macros in fccache.c. (bug 8733) @@ -96,23 +5520,23 @@ Date: Sat Dec 2 13:36:56 2006 -0800 commit 72ffe6536a6825a32095c8185aff836a12326ac5 Author: Keith Packard -Date: Sat Dec 2 13:22:27 2006 -0800 +Date: Sat Dec 2 13:22:27 2006 -0800 Add FcFreeTypeQueryFace external API. Bug #7311. Expose ability to build an FcPattern directly from an FT_Face object. - configure.in | 4 ++-- - doc/fcfreetype.fncs | 17 +++++++++++++++- - fontconfig/fcfreetype.h | 6 ++++++ - src/fcfreetype.c | 50 - ++++++++++++++++++++++++++--------------------- + configure.in | 4 +- + doc/fcfreetype.fncs | 17 +++++++++++++++- + fontconfig/fcfreetype.h | 6 +++++ + src/fcfreetype.c | 50 + ++++++++++++++++++++++++++-------------------- 4 files changed, 52 insertions(+), 25 deletions(-) commit 5e234d9e764d8c52d93b918a5c92b7956c95882b Author: Keith Packard -Date: Sat Dec 2 13:14:23 2006 -0800 +Date: Sat Dec 2 13:14:23 2006 -0800 Fix grep pattern in makealias to work on non-Gnu grep (bug 8368). @@ -126,7 +5550,7 @@ Date: Sat Dec 2 13:14:23 2006 -0800 commit 2b77216ee21de95ec352672aa025195a83925b32 Author: Keith Packard -Date: Sat Dec 2 13:04:05 2006 -0800 +Date: Sat Dec 2 13:04:05 2006 -0800 Avoid writing uninitialized structure pad bytes to cache files. @@ -136,12 +5560,12 @@ Date: Sat Dec 2 13:04:05 2006 -0800 fields to avoid writing whichever bytes serve as padding within the structure. - src/fcpat.c | 17 ++++++++++++++++- + src/fcpat.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) commit 64d7e303df441f274ee194a401dcd14dfb58af7e Author: Keith Packard -Date: Sat Dec 2 12:14:49 2006 -0800 +Date: Sat Dec 2 12:14:49 2006 -0800 Warn (and recover) from config file without elements. @@ -162,7 +5586,7 @@ Date: Sat Dec 2 12:14:49 2006 -0800 commit 253ec7609c13b46c717c801206ebb1a6c7f06e27 Author: Keith Packard -Date: Sat Dec 2 11:47:07 2006 -0800 +Date: Sat Dec 2 11:47:07 2006 -0800 Use explicit platform/nameid order when scanning ttf files. @@ -296,8 +5720,8 @@ Date: Sun Sep 17 14:09:12 2006 -0700 header files to ensure it exports the public API. - configure.in | 1 - src/Makefile.am | 18 +++ + configure.in | 1 - + src/Makefile.am | 18 +++- src/fontconfig.def.in | 303 ------------------------------------------------- 3 files changed, 17 insertions(+), 305 deletions(-) @@ -339,8 +5763,8 @@ Date: Fri Sep 15 00:23:40 2006 -0700 directories. src/fccfg.c | 86 - +++++++++++++++++++++++++++++------------------------------ - src/fcdir.c | 4 +-- + ++++++++++++++++++++++++++++------------------------------ + src/fcdir.c | 4 +- src/fcint.h | 3 +- 3 files changed, 46 insertions(+), 47 deletions(-) @@ -420,16 +5844,16 @@ Date: Sat Sep 9 21:32:14 2006 -0700 conf.d/10-sub-pixel-vrgb.conf | 9 + conf.d/10-unhinted.conf | 9 + conf.d/10-urw-aliases.conf | 52 ---- - conf.d/15-amt-aliases.conf | 21 - + conf.d/15-amt-aliases.conf | 21 -- conf.d/20-lohit-gujarati.conf | 11 + - conf.d/20-unhint-small-vera.conf | 49 +++ - conf.d/30-amt-aliases.conf | 21 + - conf.d/30-unhint-small-vera.conf | 49 --- + conf.d/20-unhint-small-vera.conf | 49 ++++ + conf.d/30-amt-aliases.conf | 21 ++ + conf.d/30-unhint-small-vera.conf | 49 ---- conf.d/30-urw-aliases.conf | 52 ++++ conf.d/40-generic.conf | 66 +++++ - conf.d/49-sansserif.conf | 21 + - conf.d/60-LohitGujarati.conf | 5 - conf.d/60-delicious.conf | 20 - + conf.d/49-sansserif.conf | 21 ++ + conf.d/60-LohitGujarati.conf | 5 - + conf.d/60-delicious.conf | 20 -- conf.d/60-fonts-persian.conf | 539 -------------------------------------- conf.d/60-latin.conf | 42 +++ @@ -448,10 +5872,10 @@ Date: Sat Sep 9 21:32:14 2006 -0700 conf.d/73-unhinted.conf | 9 - conf.d/76-no-bitmaps.conf | 13 - conf.d/76-yes-bitmaps.conf | 13 - - conf.d/80-delicious.conf | 20 + + conf.d/80-delicious.conf | 20 ++ conf.d/90-synthetic.conf | 64 +++++ - conf.d/Makefile.am | 55 ++-- - conf.d/README | 46 +++ + conf.d/Makefile.am | 55 +++-- + conf.d/README | 46 +++- fonts.conf.in | 207 --------------- 39 files changed, 1113 insertions(+), 1006 deletions(-) @@ -495,15 +5919,15 @@ Date: Sat Sep 9 19:37:22 2006 -0700 Rename conf.avail to conf.d - Makefile.am | 2 - conf.avail/10-urw-aliases.conf | 52 --- - conf.avail/15-amt-aliases.conf | 21 - + Makefile.am | 2 +- + conf.avail/10-urw-aliases.conf | 52 ---- + conf.avail/15-amt-aliases.conf | 21 -- conf.avail/20-fix-globaladvance.conf | 29 -- conf.avail/30-unhint-small-vera.conf | 49 --- - conf.avail/50-user.conf | 7 - conf.avail/51-local.conf | 7 - conf.avail/60-LohitGujarati.conf | 5 - conf.avail/60-delicious.conf | 20 - + conf.avail/50-user.conf | 7 - + conf.avail/51-local.conf | 7 - + conf.avail/60-LohitGujarati.conf | 5 - + conf.avail/60-delicious.conf | 20 -- conf.avail/60-fonts-persian.conf | 539 ---------------------------------- conf.avail/70-no-sub-pixel.conf | 9 - @@ -515,16 +5939,16 @@ Date: Sat Sep 9 19:37:22 2006 -0700 conf.avail/73-unhinted.conf | 9 - conf.avail/76-no-bitmaps.conf | 13 - conf.avail/76-yes-bitmaps.conf | 13 - - conf.avail/Makefile.am | 71 ---- + conf.avail/Makefile.am | 71 ----- conf.avail/README | 8 - - conf.d/10-urw-aliases.conf | 52 +++ - conf.d/15-amt-aliases.conf | 21 + + conf.d/10-urw-aliases.conf | 52 ++++ + conf.d/15-amt-aliases.conf | 21 ++ conf.d/20-fix-globaladvance.conf | 29 ++ conf.d/30-unhint-small-vera.conf | 49 +++ - conf.d/50-user.conf | 7 - conf.d/51-local.conf | 7 - conf.d/60-LohitGujarati.conf | 5 - conf.d/60-delicious.conf | 20 + + conf.d/50-user.conf | 7 + + conf.d/51-local.conf | 7 + + conf.d/60-LohitGujarati.conf | 5 + + conf.d/60-delicious.conf | 20 ++ conf.d/60-fonts-persian.conf | 539 ++++++++++++++++++++++++++++++++++ conf.d/70-no-sub-pixel.conf | 9 + @@ -536,9 +5960,9 @@ Date: Sat Sep 9 19:37:22 2006 -0700 conf.d/73-unhinted.conf | 9 + conf.d/76-no-bitmaps.conf | 13 + conf.d/76-yes-bitmaps.conf | 13 + - conf.d/Makefile.am | 71 ++++ + conf.d/Makefile.am | 71 +++++ conf.d/README | 8 + - configure.in | 1 + configure.in | 1 - 42 files changed, 898 insertions(+), 899 deletions(-) commit 9e292c889f1138b1af2f60621d7e2bfd8c490ff7 @@ -580,7 +6004,7 @@ Date: Sat Sep 9 16:41:58 2006 -0700 1 files changed, 14 insertions(+), 3 deletions(-) commit 766a9b2f61458202be0fbf5745ce1e02ecd95c6e -Merge: 5d2f7a9... 164e267... +Merge: 5d2f7a9 164e267 Author: Keith Packard Date: Sat Sep 9 15:49:24 2006 -0700 @@ -659,7 +6083,7 @@ Date: Thu Sep 7 14:29:35 2006 -0700 faster. src/fcfreetype.c | 83 - ++++++++++++++++++++---------------------------------- + +++++++++++++++++++---------------------------------- 1 files changed, 30 insertions(+), 53 deletions(-) commit 8d779ce4b3cdac796e20ca568654c0ef1c576809 @@ -846,10 +6270,10 @@ Date: Mon Sep 4 22:20:25 2006 -0700 src/fccache.c | 255 +++++++++++++++++++++++++++++++++++++++++-------------- - src/fccfg.c | 22 ----- + src/fccfg.c | 22 +----- src/fccharset.c | 5 + - src/fcint.h | 16 +-- - src/fcpat.c | 10 ++ + src/fcint.h | 16 ++-- + src/fcpat.c | 10 ++- 5 files changed, 213 insertions(+), 95 deletions(-) commit 8fe2104a1e5771ac8079a438fa21e00f946be8b3 @@ -870,8 +6294,8 @@ Date: Mon Sep 4 13:59:58 2006 -0700 once. src/fccache.c | 143 - +++++++++++++++++++++++++++++++++++++++++++++------------ - src/fcinit.c | 1 + ++++++++++++++++++++++++++++++++++++++++++++------------ + src/fcinit.c | 1 + src/fcint.h | 3 + 3 files changed, 116 insertions(+), 31 deletions(-) @@ -925,7 +6349,7 @@ Date: Mon Sep 4 15:45:28 2006 -0400 Make sure they continue to load after ~/.fonts.conf and local.conf - conf.avail/20-LohitGujarati.conf | 5 + conf.avail/20-LohitGujarati.conf | 5 - conf.avail/20-fonts-persian.conf | 539 ------------------------------------- conf.avail/30-no-sub-pixel.conf | 9 - @@ -937,7 +6361,7 @@ Date: Mon Sep 4 15:45:28 2006 -0400 conf.avail/33-unhinted.conf | 9 - conf.avail/36-no-bitmaps.conf | 13 - conf.avail/36-yes-bitmaps.conf | 13 - - conf.avail/60-LohitGujarati.conf | 5 + conf.avail/60-LohitGujarati.conf | 5 + conf.avail/60-fonts-persian.conf | 539 +++++++++++++++++++++++++++++++++++++ conf.avail/70-no-sub-pixel.conf | 9 + @@ -957,10 +6381,10 @@ Date: Mon Sep 4 15:36:46 2006 -0400 Make room for chunks from fonts.conf in conf.avail - conf.avail/10-LohitGujarati.conf | 5 + conf.avail/10-LohitGujarati.conf | 5 - conf.avail/10-fonts-persian.conf | 539 -------------------------------------- - conf.avail/20-LohitGujarati.conf | 5 + conf.avail/20-LohitGujarati.conf | 5 + conf.avail/20-fonts-persian.conf | 539 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 544 insertions(+), 544 deletions(-) @@ -1040,10 +6464,10 @@ Date: Mon Sep 4 00:47:07 2006 -0700 version number in the process. - configure.in | 9 + - fc-cache/fc-cache.c | 30 ++- - fc-cat/Makefile.am | 2 - fc-cat/fc-cat.c | 37 ++-- + configure.in | 9 +- + fc-cache/fc-cache.c | 30 ++-- + fc-cat/Makefile.am | 2 +- + fc-cat/fc-cat.c | 37 ++--- fontconfig/fcfreetype.h | 14 +- fontconfig/fontconfig.h | 403 +++++++++++++++++++++++++++-------------------- @@ -1100,11 +6524,11 @@ Date: Mon Sep 4 01:21:55 2006 -0400 All of the files in conf.d are now in conf.avail Makefile.am is updated to reflect the change - Makefile.am | 2 + Makefile.am | 2 +- conf.avail/10-fonts-persian.conf | 539 ++++++++++++++++++++++++++++++++++++++ - conf.avail/10LohitGujarati.conf | 5 - conf.avail/60-delicious.conf | 20 + + conf.avail/10LohitGujarati.conf | 5 + + conf.avail/60-delicious.conf | 20 ++ conf.avail/Makefile.am | 40 +++ conf.avail/README | 8 + conf.avail/autohint.conf | 9 + @@ -1115,8 +6539,8 @@ Date: Mon Sep 4 01:21:55 2006 -0400 conf.avail/yes-bitmaps.conf | 13 + conf.d/10-fonts-persian.conf | 539 -------------------------------------- - conf.d/10LohitGujarati.conf | 5 - conf.d/60-delicious.conf | 20 - + conf.d/10LohitGujarati.conf | 5 - + conf.d/60-delicious.conf | 20 -- conf.d/Makefile.am | 40 --- conf.d/README | 8 - conf.d/autohint.conf | 9 - @@ -1149,7 +6573,7 @@ Date: Sun Sep 3 16:27:09 2006 -0700 13 files changed, 0 insertions(+), 106 deletions(-) commit 822ec78c54a24a0f1589154ac2d4906b02b111ef -Merge: e79c648... fb2092c... +Merge: e79c648 fb2092c Author: Keith Packard Date: Sun Sep 3 16:07:11 2006 -0700 @@ -1195,9 +6619,9 @@ Date: Sun Sep 3 14:42:48 2006 -0700 Change version to 2.3.96 README | 67 - ++++++++++++++++++++++++++++++++++++++++++++++- - configure.in | 2 + - fontconfig/fontconfig.h | 2 + + +++++++++++++++++++++++++++++++++++++++++++++- + configure.in | 2 +- + fontconfig/fontconfig.h | 2 +- 3 files changed, 67 insertions(+), 4 deletions(-) commit 2a5ea80023657724e3e6ba629d828ab5e33bdb70 @@ -1372,9 +6796,9 @@ Date: Fri Sep 1 21:30:54 2006 -0700 Guess that names with a large number of high bits set are SJIS encoded Japanese names rather than English names. - src/fcfreetype.c | 81 - +++++++++++++++++++++++++++++++++++++++++++----------- - 1 files changed, 64 insertions(+), 17 deletions(-) + src/fcfreetype.c | 83 + ++++++++++++++++++++++++++++++++++++++++++----------- + 1 files changed, 65 insertions(+), 18 deletions(-) commit db970d3596fbbc75f652f1a9fe7f7ce98e651ad2 Author: Keith Packard @@ -1560,17 +6984,17 @@ Date: Fri Sep 1 01:15:14 2006 -0700 share across multiple fonts in the same cache. fc-cache/fc-cache.c | 109 ++++----- - fc-cat/fc-cat.c | 83 ++---- + fc-cat/fc-cat.c | 83 ++----- fc-glyphname/fc-glyphname.c | 13 - - src/fccache.c | 300 ++++++++++------------- - src/fccfg.c | 169 +++++++------ + src/fccache.c | 300 ++++++++++-------------- + src/fccfg.c | 169 ++++++++------ src/fccharset.c | 550 ++++++++++++++++++++++--------------------- src/fcdir.c | 177 +++++++------- - src/fcinit.c | 1 + src/fcinit.c | 1 - src/fcint.h | 60 +++-- src/fcpat.c | 8 + - src/fcserialize.c | 3 + src/fcserialize.c | 3 + 11 files changed, 702 insertions(+), 771 deletions(-) commit aec8c90b450c115718fd87bc270e35ee6b605967 @@ -1641,8 +7065,8 @@ Date: Thu Aug 31 11:56:43 2006 -0700 fc-cat/fc-cat.c | 119 +++++++++++++++++++++++++++++++++++++++++++------------ - src/fccache.c | 16 +++++-- - src/fcint.h | 2 - + src/fccache.c | 16 +++++--- + src/fcint.h | 2 +- 3 files changed, 104 insertions(+), 33 deletions(-) commit d8ab9e6c42cb3513a6623df0c2866e1ebbd96485 @@ -1654,12 +7078,12 @@ Date: Thu Aug 31 09:42:49 2006 -0700 Cache files for missing or more recently modified directories are automatically removed at the end of every fc-cache run. - fc-cache/Makefile.am | 2 - + fc-cache/Makefile.am | 2 +- fc-cache/fc-cache.c | 130 - ++++++++++++++++++++++++++++++++++++++++++++++++++ - fc-cat/fc-cat.c | 3 - + +++++++++++++++++++++++++++++++++++++++++++++++++- + fc-cat/fc-cat.c | 3 +- src/fccache.c | 6 +- - src/fcint.h | 2 - + src/fcint.h | 2 +- 5 files changed, 135 insertions(+), 8 deletions(-) commit e9a564e2cd3cb40109a1133dbbcee9f938f141b3 @@ -1728,12 +7152,12 @@ Date: Wed Aug 30 21:59:53 2006 -0700 Call FcFini from fc-match to make valgrind happy. fc-cache/fc-cache.c | 25 ++++----- - fc-match/fc-match.c | 1 + fc-match/fc-match.c | 1 + src/fccache.c | 148 +++++++++++++++++++++++++++------------------------ src/fccfg.c | 80 ++++++++-------------------- src/fccharset.c | 56 +++++++++++-------- - src/fcdir.c | 2 - + src/fcdir.c | 2 +- src/fcint.h | 19 +++++-- src/fcxml.c | 19 +++---- 8 files changed, 169 insertions(+), 181 deletions(-) @@ -1751,11 +7175,11 @@ Date: Wed Aug 30 18:50:58 2006 -0700 avoid mis-typed pattern elements. fc-case/fc-case.c | 13 -- - src/fcint.h | 7 + - src/fcmatch.c | 9 + + src/fcint.h | 7 +- + src/fcmatch.c | 9 +- src/fcname.c | 389 ++++++++++++++++++++++++++++++----------------------- - src/fcpat.c | 2 + src/fcpat.c | 2 +- 5 files changed, 233 insertions(+), 187 deletions(-) commit c02886485b293179e8492cad9a34eb431dd4bfc9 @@ -1774,10 +7198,10 @@ Date: Wed Aug 30 13:51:03 2006 -0700 fc-cat/fc-cat.c | 134 +++++++++++++++++++++++++++++-------------------------- - src/fccache.c | 6 +- - src/fccharset.c | 3 + + src/fccache.c | 6 +-- + src/fccharset.c | 3 +- src/fcdbg.c | 20 +++++++- - src/fcint.h | 15 +++++- + src/fcint.h | 15 +++++-- src/fcpat.c | 7 +++ 6 files changed, 110 insertions(+), 75 deletions(-) @@ -1796,9 +7220,9 @@ Date: Wed Aug 30 04:24:03 2006 -0700 fc-lang now requires fcserialize.c, which has been added to the repository. - fc-arch/fc-arch.c | 14 +--- - fc-arch/fcarch.tmpl.h | 4 + - fc-lang/fc-lang.c | 1 + fc-arch/fc-arch.c | 14 +---- + fc-arch/fcarch.tmpl.h | 4 +- + fc-lang/fc-lang.c | 1 + src/fcserialize.c | 159 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+), 13 deletions(-) @@ -1823,25 +7247,25 @@ Date: Wed Aug 30 04:16:22 2006 -0700 everywhere in the library yet. - fc-arch/fcarch.tmpl.h | 3 - fc-lang/fc-lang.c | 185 ++++---- - fontconfig/fontconfig.h | 3 - src/Makefile.am | 1 + fc-arch/fcarch.tmpl.h | 3 +- + fc-lang/fc-lang.c | 185 ++++----- + fontconfig/fontconfig.h | 3 - + src/Makefile.am | 1 + src/fccache.c | 581 +++++++++++---------------- - src/fccfg.c | 102 ++--- + src/fccfg.c | 102 +++--- src/fccharset.c | 493 ++++++++--------------- - src/fcdbg.c | 43 +- - src/fcdefault.c | 64 +-- - src/fcfs.c | 133 ++---- + src/fcdbg.c | 43 ++- + src/fcdefault.c | 64 ++-- + src/fcfs.c | 133 ++----- src/fcint.h | 477 +++++++++++++--------- - src/fclang.c | 120 +----- - src/fclist.c | 86 ++-- - src/fcmatch.c | 179 +++----- - src/fcname.c | 142 +------ + src/fclang.c | 120 ++----- + src/fclist.c | 86 ++--- + src/fcmatch.c | 179 +++------ + src/fcname.c | 142 ++------ src/fcpat.c | 1025 ++++++++++++++--------------------------------- - src/fcstr.c | 1 - src/fcxml.c | 15 - + src/fcstr.c | 1 + + src/fcxml.c | 15 +- 18 files changed, 1394 insertions(+), 2259 deletions(-) commit 2a9179d8895c1cc90d02917f7bb6fac30ffb6a62 @@ -1935,11 +7359,11 @@ Date: Sun Aug 27 22:24:39 2006 -0700 fc-cache and fc-cat use internal (fcint.h) APIs that have changed with the elimination of the global cache. - fc-cache/fc-cache.c | 2 - + fc-cache/fc-cache.c | 2 +- fc-cat/fc-cat.c | 119 ++++++--------------------------------------------- src/fccache.c | 77 +++++++++++++++++++++++---------- - src/fcdir.c | 13 ++---- + src/fcdir.c | 13 ++--- src/fcint.h | 4 ++ 5 files changed, 76 insertions(+), 139 deletions(-) @@ -1956,12 +7380,12 @@ Date: Sun Aug 27 21:53:48 2006 -0700 structure and simplifies the overall caching strategies greatly. - fc-cache/fc-cache.c | 3 + fc-cache/fc-cache.c | 3 +- src/fccache.c | 1051 - +++++---------------------------------------------- - src/fccfg.c | 23 - - src/fcdir.c | 164 ++++---- - src/fcint.h | 70 --- + ++++++--------------------------------------------- + src/fccfg.c | 23 +- + src/fcdir.c | 164 +++++---- + src/fcint.h | 70 +---- 5 files changed, 203 insertions(+), 1108 deletions(-) commit cf65c0557e9fa1b86003d1ec8643f44f4344ebd2 @@ -2017,9 +7441,9 @@ Date: Sun Aug 27 17:04:01 2006 -0700 file wasn't valid. - fonts.conf.in | 2 + + fonts.conf.in | 2 +- src/fccache.c | 90 - +++++++++++++++++++++++++++------------------------------ + ++++++++++++++++++++++++++------------------------------ 2 files changed, 43 insertions(+), 49 deletions(-) commit 2b629781d74b5a7db1fff873ce5322e59a0f863a @@ -2037,7 +7461,7 @@ Date: Sun Aug 27 16:25:07 2006 -0700 be overridden with the --with-arch=ARCH configure option. - Makefile.am | 2 - + Makefile.am | 2 +- configure.in | 17 ++++++ fc-arch/Makefile.am | 50 +++++++++++++++++ fc-arch/fc-arch.c | 144 @@ -2064,22 +7488,22 @@ Date: Fri Aug 4 16:13:00 2006 +0000 code which deals with per-directory caches. - ChangeLog | 24 +++ - configure.in | 22 ++- - fc-cache/fc-cache.c | 7 - - fontconfig/fontconfig.h | 4 - + ChangeLog | 24 ++++ + configure.in | 22 +++- + fc-cache/fc-cache.c | 7 +- + fontconfig/fontconfig.h | 4 +- fonts.conf.in | 5 + fonts.dtd | 12 ++ - src/Makefile.am | 3 + src/Makefile.am | 3 +- src/fccache.c | 323 ++++++++++++++++++++++++----------------------- - src/fccfg.c | 28 ++++ - src/fcdir.c | 6 - - src/fcinit.c | 2 - src/fcint.h | 13 ++ - src/fcxml.c | 17 ++ - test/fonts.conf.in | 1 - test/run-test.sh | 6 + + src/fccfg.c | 28 ++++- + src/fcdir.c | 6 +- + src/fcinit.c | 2 + + src/fcint.h | 13 ++- + src/fcxml.c | 17 +++ + test/fonts.conf.in | 1 + + test/run-test.sh | 6 +- 15 files changed, 294 insertions(+), 179 deletions(-) commit 62a4a8459adaf26833e1dad0ee96ea5a4b8c3d54 @@ -2134,12 +7558,12 @@ Date: Thu Apr 27 07:54:07 2006 +0000 Eliminate pattern freezing - ChangeLog | 8 + + ChangeLog | 8 ++ src/fcinit.c | 4 - - src/fcint.h | 3 + src/fcint.h | 3 - src/fcpat.c | 370 ---------------------------------------------------------- - src/fcxml.c | 3 + src/fcxml.c | 3 +- 5 files changed, 9 insertions(+), 379 deletions(-) commit c1c3ba06d5f5e00a1bfef4ef0dbf10f28fa86ce2 @@ -2154,8 +7578,8 @@ Date: Thu Apr 27 07:11:44 2006 +0000 ChangeLog | 30 ++++++++++++ src/fccache.c | 104 ++++++++++--------------------------------- - src/fcfreetype.c | 10 ---- - src/fcint.h | 8 --- + src/fcfreetype.c | 10 +---- + src/fcint.h | 8 +--- src/fclist.c | 4 -- src/fcmatch.c | 3 - src/fcpat.c | 130 @@ -2558,12 +7982,12 @@ Date: Fri Apr 7 04:42:32 2006 +0000 4) use chsize instead of ftruncate; and 5) update libtool exports file - ChangeLog | 18 ++ - configure.in | 3 + ChangeLog | 18 +++ + configure.in | 3 +- fc-cache/fc-cache.c | 7 + - fc-cat/fc-cat.c | 1 + fc-cat/fc-cat.c | 1 - src/fccache.c | 74 +++++++++- - src/fcfreetype.c | 3 + src/fcfreetype.c | 3 +- src/fontconfig.def.in | 370 ++++++++++++++++++++++++++++++++++--------------- 7 files changed, 353 insertions(+), 123 deletions(-) @@ -2592,7 +8016,7 @@ Date: Thu Apr 6 05:15:08 2006 +0000 Konstantinov) ChangeLog | 8 ++ - fc-match/.cvsignore | 1 + fc-match/.cvsignore | 1 + fc-match/Makefile.am | 27 +++++++- fc-match/fc-match.1 | 37 ----------- fc-match/fc-match.sgml | 169 @@ -2723,23 +8147,23 @@ Date: Wed Mar 8 20:33:42 2006 +0000 debian/* Now remove debian/ directory. - ChangeLog | 5 - debian/README.Debian | 45 -- + ChangeLog | 5 + + debian/README.Debian | 45 --- debian/changelog | 718 ------------------------------------- - debian/compat | 1 + debian/compat | 1 - debian/control | 80 ---- - debian/copyright | 29 - - debian/fontconfig-udeb.install | 3 + debian/copyright | 29 -- + debian/fontconfig-udeb.install | 3 - debian/fontconfig.config | 10 - - debian/fontconfig.defoma | 162 -------- - debian/fontconfig.dirs | 1 - debian/fontconfig.install | 7 - debian/fontconfig.postinst | 145 ------- - debian/fontconfig.postrm | 26 - - debian/fontconfig.templates | 27 - - debian/libfontconfig1-dev.install | 7 - debian/libfontconfig1.install | 1 + debian/fontconfig.defoma | 162 --------- + debian/fontconfig.dirs | 1 - + debian/fontconfig.install | 7 - + debian/fontconfig.postinst | 145 -------- + debian/fontconfig.postrm | 26 -- + debian/fontconfig.templates | 27 -- + debian/libfontconfig1-dev.install | 7 - + debian/libfontconfig1.install | 1 - debian/local.conf.md5sum | 18 - debian/rules | 40 -- 18 files changed, 5 insertions(+), 1320 deletions(-) @@ -2755,21 +8179,20 @@ Date: Wed Mar 8 20:32:56 2006 +0000 svn://svn.debian.org/pkg-freedesktop/trunk/fontconfig instead. ChangeLog | 8 ++ - debian/po/POTFILES.in | 1 - debian/po/cs.po | 127 ------------------------------------- + debian/po/POTFILES.in | 1 - + debian/po/cs.po | 127 ------------------------------------ debian/po/da.po | 146 ------------------------------------------ - debian/po/de.po | 124 ------------------------------------ + debian/po/de.po | 124 ----------------------------------- debian/po/es.po | 163 ----------------------------------------------- debian/po/fr.po | 159 - ---------------------------------------------- + --------------------------------------------- debian/po/ja.po | 88 ------------------------- debian/po/nl.po | 125 ------------------------------------ debian/po/pt.po | 112 -------------------------------- - debian/po/pt_BR.po | 148 - ------------------------------------------- + debian/po/pt_BR.po | 148 ------------------------------------------ debian/po/templates.pot | 84 ------------------------ - debian/po/tr.po | 117 ---------------------------------- + debian/po/tr.po | 117 --------------------------------- debian/po/zh_CN.po | 115 --------------------------------- 14 files changed, 8 insertions(+), 1509 deletions(-) @@ -2841,13 +8264,13 @@ Date: Wed Mar 8 02:30:43 2006 +0000 Code cleanups (excess prototype, old-style function definition). reviewed by: plam - ChangeLog | 14 ++++++++++++++ - src/fcfreetype.c | 8 ++++---- - src/fcint.h | 3 --- + ChangeLog | 14 +++++++++++++ + src/fcfreetype.c | 8 +++--- + src/fcint.h | 3 -- src/fcname.c | 2 +- src/ftglue.c | 55 - ++++++++---------------------------------------------- - src/ftglue.h | 39 +++++++++++--------------------------- + +++++++---------------------------------------------- + src/ftglue.h | 39 ++++++++++--------------------------- 6 files changed, 38 insertions(+), 83 deletions(-) commit 9226e04c69d7cb472999b1d8bc0cfa3c28054ebe @@ -2872,7 +8295,7 @@ Date: Sun Mar 5 06:05:50 2006 +0000 ChangeLog | 6 +++++ src/fcpat.c | 73 - ++++++++++++++++++++++++++++++++--------------------------- + ++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 46 insertions(+), 33 deletions(-) commit dc70c15aba6d14dbd5ce8bcd1bc36a39602fbc2c @@ -3422,7 +8845,7 @@ Date: Mon Feb 6 19:25:45 2006 +0000 ChangeLog | 9 +++++++ src/fccfg.c | 78 - +++++++++++++++++++++++++++++++++++++++-------------------- + +++++++++++++++++++++++++++++++++++++++------------------- 2 files changed, 61 insertions(+), 26 deletions(-) commit 86e75dfb5d1434837537b40e829f00f9ffbb8183 @@ -3471,11 +8894,11 @@ Date: Sun Feb 5 02:57:21 2006 +0000 Check I/O call return values and eliminate unused variable warnings. reviewed by: plam - ChangeLog | 13 +++++++++++ - fc-cat/fc-cat.c | 5 ++-- + ChangeLog | 13 ++++++++++ + fc-cat/fc-cat.c | 5 +-- src/fccache.c | 66 - ++++++++++++++++++++++++++++++++++++++++++------------- - src/fcxml.c | 4 ++- + +++++++++++++++++++++++++++++++++++++++++------------- + src/fcxml.c | 4 +- 4 files changed, 67 insertions(+), 21 deletions(-) commit c4c47a7654196f37b625f337192b235e558ab890 @@ -3809,7 +9232,7 @@ Date: Tue Jan 10 13:15:05 2006 +0000 have the right file, use inode equality. - ChangeLog | 12 ++++++++++ + ChangeLog | 12 +++++++++ fc-cache/fc-cache.c | 1 + src/fccache.c | 64 +++++++++++++++++++++++++++------------------------ @@ -3845,7 +9268,7 @@ Date: Sun Jan 8 10:58:30 2006 +0000 per-set basis (and other changes). src/fcmatch.c | 243 - ++++++++++++++++++++++++++++++++++----------------------- + +++++++++++++++++++++++++++++++++----------------------- 1 files changed, 143 insertions(+), 100 deletions(-) commit a6d3757d9802c8f5dc8632a8cf6703042f62e303 @@ -3902,11 +9325,11 @@ Date: Thu Jan 5 15:12:22 2006 +0000 with zero fonts cached. - AUTHORS | 2 ++ + AUTHORS | 2 + ChangeLog | 18 +++++++++++++++ fc-cat/fc-cat.c | 66 - ++++++++++++++++++++++++++++++++----------------------- - src/fccache.c | 31 +++++++++++++------------- + +++++++++++++++++++++++++++++++----------------------- + src/fccache.c | 31 ++++++++++++------------- src/fcint.h | 1 + src/fcpat.c | 2 +- 6 files changed, 75 insertions(+), 45 deletions(-) @@ -3979,13 +9402,13 @@ Date: Wed Dec 21 03:31:19 2005 +0000 dir. ChangeLog | 20 +++++++++++++++ - README | 17 +++++++++++-- + README | 17 +++++++++++- configure.in | 2 +- fc-cache/Makefile.am | 8 ++++++ fontconfig/fontconfig.h | 2 +- src/fccache.c | 62 - +++++++++++++++++++++++++++++++++++++++-------- - src/fcxml.c | 13 +++++----- + ++++++++++++++++++++++++++++++++++++++-------- + src/fcxml.c | 13 +++++---- 7 files changed, 103 insertions(+), 21 deletions(-) commit 6f767cec491d354150a11491905ba59cc77a2659 @@ -4067,15 +9490,15 @@ Date: Fri Dec 9 16:36:45 2005 +0000 --localstatedir=/var. ChangeLog | 20 ++ - INSTALL | 2 + INSTALL | 2 +- configure.in | 7 + - fc-cache/Makefile.am | 2 - fc-cat/Makefile.am | 2 - fc-cat/fc-cat.c | 13 + - fontconfig/fontconfig.h | 1 - src/Makefile.am | 2 + fc-cache/Makefile.am | 2 + + fc-cat/Makefile.am | 2 + + fc-cat/fc-cat.c | 13 +- + fontconfig/fontconfig.h | 1 + + src/Makefile.am | 2 + src/fccache.c | 523 - +++++++++++++++++++++++++++++++++++++++++++---- + ++++++++++++++++++++++++++++++++++++++++++----- 9 files changed, 519 insertions(+), 53 deletions(-) commit 204da5a8b88a73e54a9bab0537db7ff4fe8c6374 @@ -4126,7 +9549,7 @@ Date: Thu Dec 1 07:12:45 2005 +0000 Add codepath for reading global cache files as well. - ChangeLog | 5 +++++ + ChangeLog | 5 ++++ fc-cat/fc-cat.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 0 deletions(-) @@ -4145,10 +9568,10 @@ Date: Thu Dec 1 06:27:07 2005 +0000 Add config file for Persian fonts from Sharif FarsiWeb, Inc. reviewed by: plam - ChangeLog | 10 + + ChangeLog | 10 +- conf.d/10-fonts-persian.conf | 545 ++++++++++++++++++++++++++++++++++++++++++ - conf.d/Makefile.am | 1 + conf.d/Makefile.am | 1 + 3 files changed, 555 insertions(+), 1 deletions(-) commit cb6d97eb1baba6795bb8abdede69902b2440f371 @@ -4237,7 +9660,7 @@ Date: Tue Nov 29 00:16:02 2005 +0000 config/config.guess | 535 ++++++++++++++++++++++++++------------------------- - config/config.sub | 67 ++++-- + config/config.sub | 67 ++++--- 2 files changed, 314 insertions(+), 288 deletions(-) commit ced3f0a0abd84de73753956ec18e7316eda33a37 @@ -4302,9 +9725,9 @@ Date: Fri Nov 25 16:33:58 2005 +0000 Don't do random matching when bad objects are passed into FcCompareValueList. - ChangeLog | 6 ++++++ + ChangeLog | 6 +++++ src/fcmatch.c | 58 - ++++++++++++++++++++++++++++++++++++++++++--------------- + ++++++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 49 insertions(+), 15 deletions(-) commit 81fe99fdd0903ef8aa782fe427bc8f9510457ee9 @@ -4376,7 +9799,7 @@ Date: Fri Nov 25 02:16:42 2005 +0000 debian/changelog | 13 ++++++++++++ debian/control | 1 + debian/po/cs.po | 57 - +++++++++++++++++++++++++++--------------------------- + +++++++++++++++++++++++++++-------------------------- 3 files changed, 43 insertions(+), 28 deletions(-) commit 1c9fdccab95c9c5eebd0f9d8488d3ac7c46cbe53 @@ -4542,7 +9965,7 @@ Date: Sat Nov 19 22:32:13 2005 +0000 ChangeLog | 13 +++++++++ src/Makefile.am | 4 ++- src/fcfreetype.c | 75 - +++++++++++++++++++++++++----------------------------- + +++++++++++++++++++++++++---------------------------- 3 files changed, 51 insertions(+), 41 deletions(-) commit a151acedc056783957f9875b1a21f13d0bb8bfe2 @@ -4679,9 +10102,9 @@ Date: Fri Nov 4 19:31:26 2005 +0000 be in .rodata. - ChangeLog | 11 ++++++++++ + ChangeLog | 11 +++++++++ fc-lang/fc-lang.c | 59 - +++++++++++++++++++++++++++++++++++++++-------------- + ++++++++++++++++++++++++++++++++++++++-------------- src/fccharset.c | 18 ++++++++++++++++ src/fcint.h | 5 ++++ src/fclang.c | 16 +++++++++++++- @@ -4918,11 +10341,11 @@ Date: Sat Oct 22 14:21:14 2005 +0000 work fine. reviewed by: plam - ChangeLog | 7 ++++ + ChangeLog | 7 +++ src/fcdefault.c | 110 +++++++++++++++++++++++++++++++------------------------ src/fcint.h | 4 ++ - src/fclist.c | 60 +++++++++++++++++++++++++++++- + src/fclist.c | 60 ++++++++++++++++++++++++++++- 4 files changed, 130 insertions(+), 51 deletions(-) commit e58b50e88cbe3b55695101a0988306ea4646bbe4 @@ -5136,8 +10559,8 @@ Date: Thu Sep 29 20:53:30 2005 +0000 ChangeLog | 11 ++++ configure.in | 162 +++++++++++++++++++++++++++++++------------------------ - src/Makefile.am | 3 + - src/fcxml.c | 71 ++++++++++++++++++++++++ + src/Makefile.am | 3 +- + src/fcxml.c | 71 ++++++++++++++++++++++++- 4 files changed, 174 insertions(+), 73 deletions(-) commit 649cc3616d11add9d5c39563f9f343614c2bb2eb @@ -5251,17 +10674,17 @@ Date: Fri Sep 23 05:59:19 2005 +0000 Remove done 'TODO' comment. Updates for development release 2.3.90. - Makefile.am | 2 - README | 7 + - configure.in | 3 - fc-cache/fc-cache.c | 1 - fc-cache/fc-cache.sgml | 4 - + Makefile.am | 2 +- + README | 7 +- + configure.in | 3 +- + fc-cache/fc-cache.c | 1 - + fc-cache/fc-cache.sgml | 4 +- fc-cat/.cvsignore | 6 + fc-cat/Makefile.am | 55 ++++++++ fc-cat/fc-cat.c | 336 +++++++++++++++++++++++++++++++++++++++++++++++ fc-cat/fc-cat.sgml | 139 +++++++++++++++++++ - fontconfig/fontconfig.h | 2 + fontconfig/fontconfig.h | 2 +- 10 files changed, 548 insertions(+), 7 deletions(-) commit a9698bed6553c12d397593292ee9e81054244e85 @@ -5319,18 +10742,18 @@ Date: Thu Sep 22 23:45:53 2005 +0000 - Add consts where appropriate. reviewed by: Patrick Lam - doc/edit-sgml.c | 4 + + doc/edit-sgml.c | 4 +- fc-case/fc-case.c | 8 +- fc-glyphname/fc-glyphname.c | 21 ++++--- fc-lang/fc-lang.c | 20 ++++-- - src/fccharset.c | 3 + + src/fccharset.c | 3 +- src/fcdefault.c | 6 +- - src/fcfreetype.c | 43 +++++++------ - src/fcinit.c | 2 - + src/fcfreetype.c | 43 ++++++++------ + src/fcinit.c | 2 +- src/fcmatch.c | 18 +++--- - src/fcpat.c | 3 + + src/fcpat.c | 3 +- src/fcxml.c | 138 - ++++++++++++++++++++++--------------------- + +++++++++++++++++++++--------------------- 11 files changed, 142 insertions(+), 124 deletions(-) commit 141432505aecb158285ccc84ec5d7099e3c2efa7 @@ -5370,9 +10793,9 @@ Date: Thu Sep 15 20:36:44 2005 +0000 Fix compilation warning (uninitialized variable). Add comment. - fontconfig/fontconfig.h | 1 - src/fccache.c | 1 - src/fccfg.c | 2 - + fontconfig/fontconfig.h | 1 - + src/fccache.c | 1 + + src/fccfg.c | 2 +- src/fcname.c | 98 +++++++++++++++++++++++++++++++++++++---------- 4 files changed, 80 insertions(+), 22 deletions(-) @@ -5397,21 +10820,21 @@ Date: Sun Sep 11 02:16:09 2005 +0000 Merge with HEAD and finish the GCC 4 cleanups (no more warnings!) ChangeLog | 19 ++++ - doc/fontconfig-user.sgml | 4 - - fc-glyphname/fc-glyphname.c | 4 - - fc-lang/fc-lang.c | 2 + doc/fontconfig-user.sgml | 4 +- + fc-glyphname/fc-glyphname.c | 4 +- + fc-lang/fc-lang.c | 2 +- fc-match/fc-match.c | 8 +- - fontconfig/fcprivate.h | 2 + fontconfig/fcprivate.h | 2 +- src/fccache.c | 35 ++++---- - src/fccfg.c | 2 - src/fcdir.c | 4 - + src/fccfg.c | 2 +- + src/fcdir.c | 4 +- src/fcfreetype.c | 191 - ++++++++++++++++++++++++------------------- + +++++++++++++++++++++++------------------- src/fcint.h | 10 +- - src/fclist.c | 2 + src/fclist.c | 2 +- src/fcpat.c | 80 +++++++++--------- - src/fcstr.c | 2 - src/fcxml.c | 11 ++ + src/fcstr.c | 2 +- + src/fcxml.c | 11 ++- 15 files changed, 209 insertions(+), 167 deletions(-) commit 8cb4c56d9925bba17bce32c12f7e09d8f36b2e53 @@ -5527,11 +10950,11 @@ Date: Tue Aug 30 05:55:13 2005 +0000 remnants of the old cache infrastructure. - fc-cache/fc-cache.c | 3 + fc-cache/fc-cache.c | 3 - src/fccache.c | 1156 - +++++++++++---------------------------------------- - src/fcdir.c | 144 ++---- - src/fcint.h | 97 +--- + ++++++++++++--------------------------------------- + src/fcdir.c | 144 ++----- + src/fcint.h | 97 +---- 4 files changed, 307 insertions(+), 1093 deletions(-) commit 2dbe759762c3b7b779dbe52ef0d6ca50e51d4bf1 @@ -5543,8 +10966,8 @@ Date: Sun Aug 28 05:20:23 2005 +0000 files. Fix bugs in FcCacheBankToIndex. src/fccache.c | 152 - ++++++++++++++++++++++++++++++++------------------------- - src/fcint.h | 2 - + +++++++++++++++++++++++++++++++------------------------- + src/fcint.h | 2 +- 2 files changed, 85 insertions(+), 69 deletions(-) commit 7f37423d8c1acc8ece0555e66ae7f857c22a77a7 @@ -5561,10 +10984,10 @@ Date: Sat Aug 27 02:34:24 2005 +0000 the object table in memory. - src/fccfg.c | 4 + - src/fcfs.c | 11 ++-- - src/fcint.h | 31 +++++----- - src/fclist.c | 2 - + src/fccfg.c | 4 +- + src/fcfs.c | 11 ++- + src/fcint.h | 31 ++++++----- + src/fclist.c | 2 +- src/fcname.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++++---------- src/fcpat.c | 19 +++--- @@ -5589,9 +11012,9 @@ Date: Thu Aug 25 07:38:02 2005 +0000 create from the mmapped files. src/fccache.c | 710 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- src/fccfg.c | 21 +- - src/fcint.h | 53 ++++ + src/fcint.h | 53 +++++- 3 files changed, 741 insertions(+), 43 deletions(-) commit 4262e0b3853bc2153270eb33d09a063f852f3f90 @@ -5611,27 +11034,27 @@ Date: Wed Aug 24 06:21:30 2005 +0000 FcValue, respectively). Bump FC_CACHE_VERSION to 2. - fc-cache/fc-cache.c | 12 - fc-lang/fc-lang.c | 4 - fontconfig/fcprivate.h | 8 - fontconfig/fontconfig.h | 51 -- - src/fccache.c | 415 +++++++++++----- - src/fccfg.c | 109 ++-- + fc-cache/fc-cache.c | 12 +- + fc-lang/fc-lang.c | 4 +- + fontconfig/fcprivate.h | 8 +- + fontconfig/fontconfig.h | 51 +-- + src/fccache.c | 415 +++++++++++------ + src/fccfg.c | 109 +++-- src/fccharset.c | 333 +++++-------- - src/fcdbg.c | 12 - src/fcdir.c | 17 - - src/fcfs.c | 154 ++---- - src/fcinit.c | 3 + src/fcdbg.c | 12 +- + src/fcdir.c | 17 +- + src/fcfs.c | 154 +++---- + src/fcinit.c | 3 - src/fcint.h | 276 ++++------- - src/fclang.c | 213 +++----- - src/fclist.c | 57 +- - src/fcmatch.c | 88 ++- - src/fcmatrix.c | 100 ---- - src/fcname.c | 101 +++- + src/fclang.c | 213 ++++----- + src/fclist.c | 57 +-- + src/fcmatch.c | 88 ++-- + src/fcmatrix.c | 100 +---- + src/fcname.c | 101 ++++- src/fcpat.c | 1218 ++++++++++++++++++----------------------------- - src/fcstr.c | 291 +---------- - src/fcxml.c | 13 - + src/fcstr.c | 291 +----------- + src/fcxml.c | 13 +- 20 files changed, 1402 insertions(+), 2073 deletions(-) commit 71f94d0768725eb171e04748d9f561f58b258ae7 @@ -5644,16 +11067,16 @@ Date: Mon Jul 25 20:39:19 2005 +0000 avoid loading *.rpmsave or .dpkg-old files. (otaylor) ChangeLog | 19 ++++ - doc/fontconfig-user.sgml | 4 - - fc-glyphname/fc-glyphname.c | 4 - - fc-lang/fc-lang.c | 2 + doc/fontconfig-user.sgml | 4 +- + fc-glyphname/fc-glyphname.c | 4 +- + fc-lang/fc-lang.c | 2 +- fc-match/fc-match.c | 8 +- - src/fccfg.c | 2 + src/fccfg.c | 2 +- src/fcfreetype.c | 191 - ++++++++++++++++++++++++------------------- - src/fcpat.c | 2 - src/fcstr.c | 2 - src/fcxml.c | 11 ++ + +++++++++++++++++++++++------------------- + src/fcpat.c | 2 +- + src/fcstr.c | 2 +- + src/fcxml.c | 11 ++- 10 files changed, 144 insertions(+), 101 deletions(-) commit 212c9f437e959fbdc5fe344c67b8c1cf8ca63edb @@ -5673,20 +11096,20 @@ Date: Mon Jul 25 04:10:09 2005 +0000 lots of memory. Also fixes a few bugs and leaks. - fc-cache/fc-cache.c | 13 + - fc-lang/fc-lang.c | 6 + fc-cache/fc-cache.c | 13 +- + fc-lang/fc-lang.c | 6 + src/fccache.c | 1081 ++++++++++++++------------------------------------- - src/fccfg.c | 16 + - src/fccharset.c | 103 +++++ - src/fcdir.c | 17 + - src/fcfs.c | 95 ++++ - src/fcinit.c | 3 + src/fccfg.c | 16 +- + src/fccharset.c | 103 +++++- + src/fcdir.c | 17 +- + src/fcfs.c | 95 +++++ + src/fcinit.c | 3 + src/fcint.h | 148 ++++--- - src/fclang.c | 28 + - src/fcmatrix.c | 29 + - src/fcpat.c | 241 ++++++++++- - src/fcstr.c | 76 +++- + src/fclang.c | 28 ++ + src/fcmatrix.c | 29 ++ + src/fcpat.c | 241 ++++++++++-- + src/fcstr.c | 76 ++++- 13 files changed, 963 insertions(+), 893 deletions(-) commit e1b9d091c661b0e1d1e9f73c5c55ad53959c55c7 @@ -5695,11 +11118,11 @@ Date: Fri Jul 15 18:49:12 2005 +0000 Forward port cworth's patch to branch. - ChangeLog | 15 +++++++++++++++ + ChangeLog | 15 ++++++++++++++ src/fcinit.c | 2 +- src/fcint.h | 2 +- src/fcpat.c | 60 - ++++++++++++++++++++++++++++++++++++++++------------------ + +++++++++++++++++++++++++++++++++++++++------------------ src/fcxml.c | 1 + 5 files changed, 59 insertions(+), 21 deletions(-) @@ -5731,12 +11154,12 @@ Date: Thu Jul 7 12:09:10 2005 +0000 strings). Static strings belong to a single buffer, while dynamic strings are independently allocated. - fontconfig/fontconfig.h | 9 - - src/fccfg.c | 7 - - src/fcname.c | 2 + fontconfig/fontconfig.h | 9 +- + src/fccfg.c | 7 +- + src/fcname.c | 2 +- src/fcpat.c | 560 - ++++++++++++++++++++++++++++++++++------------- - src/fcxml.c | 2 + +++++++++++++++++++++++++++++++++-------------- + src/fcxml.c | 2 +- 5 files changed, 408 insertions(+), 172 deletions(-) commit cd2ec1a940888ebcbd323a8000d2fcced41ddf9e @@ -5780,24 +11203,24 @@ Date: Tue Jun 28 03:41:02 2005 +0000 appear to work the same way. - fc-lang/fc-lang.c | 17 - - fontconfig/fcprivate.h | 8 - fontconfig/fontconfig.h | 50 ++- + fc-lang/fc-lang.c | 17 +- + fontconfig/fcprivate.h | 8 +- + fontconfig/fontconfig.h | 50 +++- src/fccache.c | 32 ++ - src/fccfg.c | 135 ++++--- - src/fccharset.c | 371 +++++++++++++++----- - src/fcdbg.c | 26 + + src/fccfg.c | 135 ++++---- + src/fccharset.c | 371 ++++++++++++++++----- + src/fcdbg.c | 26 +- src/fcfs.c | 36 ++ src/fcint.h | 212 +++++++++++- src/fclang.c | 164 +++++++-- - src/fclist.c | 104 +++--- - src/fcmatch.c | 69 ++-- - src/fcmatrix.c | 71 ++++ + src/fclist.c | 104 ++++--- + src/fcmatch.c | 69 +++-- + src/fcmatrix.c | 71 ++++- src/fcname.c | 35 +- src/fcpat.c | 866 +++++++++++++++++++++++++++++++++++++---------- - src/fcstr.c | 219 +++++++++++- - src/fcxml.c | 13 - + src/fcstr.c | 219 +++++++++++-- + src/fcxml.c | 13 +- 17 files changed, 1902 insertions(+), 526 deletions(-) commit f1a42f6b5f9bcd774d09002509b2872c04025c1b @@ -5894,22 +11317,22 @@ Date: Thu Apr 21 19:03:53 2005 +0000 monospace/dual-width fonts. ChangeLog | 36 ++++++++++ - debian/fontconfig.postinst | 8 ++ + debian/fontconfig.postinst | 8 ++- debian/po/cs.po | 154 ++++++++++++++++++-------------------------- - debian/po/da.po | 94 +++++++++------------------ - debian/po/de.po | 71 +++++--------------- + debian/po/da.po | 94 +++++++++----------------- + debian/po/de.po | 71 ++++++--------------- debian/po/es.po | 77 ++++++---------------- debian/po/fr.po | 77 ++++++---------------- debian/po/ja.po | 150 - ++++++++----------------------------------- - debian/po/nl.po | 71 +++++--------------- - debian/po/pt.po | 71 +++++--------------- + ++++++++---------------------------------- + debian/po/nl.po | 71 ++++++--------------- + debian/po/pt.po | 71 ++++++--------------- debian/po/pt_BR.po | 77 ++++++---------------- debian/po/templates.pot | 66 ++++--------------- - debian/po/tr.po | 71 +++++--------------- - debian/po/zh_CN.po | 71 +++++--------------- - fc-cache/fc-cache.c | 1 + debian/po/tr.po | 71 ++++++--------------- + debian/po/zh_CN.po | 71 ++++++--------------- + fc-cache/fc-cache.c | 1 + fonts.conf.in | 37 ++++------- src/fcfreetype.c | 84 ++++++++++++++---------- 17 files changed, 404 insertions(+), 812 deletions(-) @@ -6024,7 +11447,7 @@ Date: Sat Mar 5 23:34:57 2005 +0000 ChangeLog | 7 ++++++ src/fcfreetype.c | 64 - +++++++++++++++++++++++++++++++++++++----------------- + +++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 51 insertions(+), 20 deletions(-) commit 97bde49a2b791de9ad66aed97ca07c22302da60d @@ -6087,48 +11510,48 @@ Date: Thu Mar 3 01:59:28 2005 +0000 Update debian build system to switch maintainers and deal with 2.3 functionality - .cvsignore | 7 - ChangeLog | 53 ++ - Makefile.am | 50 ++ - conf.d/.cvsignore | 2 + .cvsignore | 7 + + ChangeLog | 53 +++ + Makefile.am | 50 +++- + conf.d/.cvsignore | 2 + config/config.guess | 846 ++++++++++++++++++++----------------- - config/config.sub | 449 ++++++++++++++------ + config/config.sub | 449 +++++++++++++++------ debian/README.Debian | 44 ++ - debian/autohint.conf | 9 + debian/autohint.conf | 9 + debian/changelog | 661 +++++++++++++++++++++++++++++ - debian/compat | 1 - debian/control | 78 +++ - debian/copyright | 29 + - debian/fontconfig-udeb.install | 3 - debian/fontconfig.config | 10 + debian/compat | 1 + + debian/control | 78 ++++ + debian/copyright | 29 ++ + debian/fontconfig-udeb.install | 3 + + debian/fontconfig.config | 10 + debian/fontconfig.defoma | 162 +++++++ - debian/fontconfig.dirs | 1 - debian/fontconfig.install | 6 + debian/fontconfig.dirs | 1 + + debian/fontconfig.install | 6 + debian/fontconfig.postinst | 139 ++++++ - debian/fontconfig.postrm | 26 + - debian/fontconfig.templates | 51 ++ - debian/libfontconfig1-dev.install | 7 - debian/libfontconfig1.install | 1 + debian/fontconfig.postrm | 26 ++ + debian/fontconfig.templates | 51 +++ + debian/libfontconfig1-dev.install | 7 + + debian/libfontconfig1.install | 1 + debian/local.conf.md5sum | 18 + debian/no-sub-pixel.conf | 12 + - debian/po/POTFILES.in | 1 + debian/po/POTFILES.in | 1 + debian/po/cs.po | 154 +++++++ debian/po/da.po | 174 ++++++++ debian/po/de.po | 157 +++++++ debian/po/es.po | 198 +++++++++ - debian/po/fr.po | 194 ++++++++ + debian/po/fr.po | 194 +++++++++ debian/po/ja.po | 180 ++++++++ debian/po/nl.po | 158 +++++++ - debian/po/pt.po | 145 ++++++ + debian/po/pt.po | 145 +++++++ debian/po/pt_BR.po | 183 ++++++++ - debian/po/templates.pot | 120 +++++ + debian/po/templates.pot | 120 ++++++ debian/po/tr.po | 150 +++++++ - debian/po/zh_CN.po | 148 ++++++ + debian/po/zh_CN.po | 148 +++++++ debian/rules | 39 ++ - debian/unhinted.conf | 9 - doc/.cvsignore | 1 - doc/Makefile.am | 13 - + debian/unhinted.conf | 9 + + doc/.cvsignore | 1 + + doc/Makefile.am | 13 +- 41 files changed, 4171 insertions(+), 518 deletions(-) commit 4afc00ca02bb3f49fe214463e0f194486f438b70 @@ -6164,8 +11587,8 @@ Date: Tue Mar 1 20:36:48 2005 +0000 doc/fcstring.fncs | 40 +++++++++++++++++++++++- doc/fontconfig-devel.sgml | 10 +++++- doc/fontconfig-user.sgml | 74 - +++++++++++++++++++++++++++++++++++++++------ - fontconfig/fontconfig.h | 2 + + ++++++++++++++++++++++++++++++++++++++------ + fontconfig/fontconfig.h | 2 +- src/fcfreetype.c | 3 -- 8 files changed, 156 insertions(+), 19 deletions(-) @@ -6233,11 +11656,11 @@ Date: Fri Jan 28 23:55:14 2005 +0000 errors in the font configuration. - ChangeLog | 10 ++ - src/fcint.h | 12 --- - src/fcname.c | 2 + ChangeLog | 10 +++ + src/fcint.h | 12 +--- + src/fcname.c | 2 +- src/fcxml.c | 252 - ++++++++++++++++++++++++++++++++++++++++++++++------------ + +++++++++++++++++++++++++++++++++++++++++++++------------ 4 files changed, 211 insertions(+), 65 deletions(-) commit 59e149e757795a7c0ec66c35b551a66e0da42098 @@ -6326,9 +11749,9 @@ Date: Wed Dec 29 10:07:10 2004 +0000 Reviewed by: Keith Packard Remove Han characters from Korean orthography - .cvsignore | 1 - ChangeLog | 15 - fc-case/.cvsignore | 6 + .cvsignore | 1 + + ChangeLog | 15 + + fc-case/.cvsignore | 6 + fc-lang/iso-3166.txt | 242 + fc-lang/ko.orth |18729 +++++++------------------------------------------- @@ -6357,18 +11780,18 @@ Date: Wed Dec 29 09:15:17 2004 +0000 Re-implement case insensitive functions with Unicode aware versions (including full case folding mappings) - ChangeLog | 26 + - Makefile.am | 2 - configure.in | 1 + ChangeLog | 26 ++ + Makefile.am | 2 +- + configure.in | 1 + fc-case/CaseFolding.txt | 924 +++++++++++++++++++++++++++++++++++++++++++++++ fc-case/Makefile.am | 52 +++ - fc-case/fc-case.c | 363 ++++++++++++++++++ - fc-case/fccase.tmpl.h | 25 + + fc-case/fc-case.c | 363 +++++++++++++++++++ + fc-case/fccase.tmpl.h | 25 ++ fonts.conf.in | 73 +++- src/fcint.h | 34 ++ - src/fclist.c | 16 - - src/fcstr.c | 263 ++++++++++--- + src/fclist.c | 16 +- + src/fcstr.c | 263 +++++++++++--- 11 files changed, 1685 insertions(+), 94 deletions(-) commit 5cf8c5364f1b7a676f52b480fa55c571cadc6fda @@ -6395,7 +11818,7 @@ Date: Tue Dec 14 00:12:25 2004 +0000 ChangeLog | 17 ++++++++++++ src/fcmatch.c | 81 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 2 deletions(-) commit 46a10637cde656967b60f1e028b24763022358bb @@ -6461,253 +11884,253 @@ Date: Tue Dec 7 01:14:46 2004 +0000 Change files from ISO-Latin-1 to UTF-8 - COPYING | 2 + COPYING | 2 +- ChangeLog | 249 +++++++++++++++++++++++++++++++++++++++ - Makefile.am | 2 - config/Makedefs.in | 2 - configure.in | 2 - doc/edit-sgml.c | 2 - doc/fcatomic.fncs | 2 - doc/fcblanks.fncs | 2 - doc/fccharset.fncs | 2 - doc/fcconfig.fncs | 2 - doc/fcconstant.fncs | 2 - doc/fcfile.fncs | 2 - doc/fcfontset.fncs | 2 - doc/fcfreetype.fncs | 2 - doc/fcinit.fncs | 2 - doc/fcmatrix.fncs | 2 - doc/fcobjectset.fncs | 2 - doc/fcobjecttype.fncs | 2 - doc/fcpattern.fncs | 2 - doc/fcstring.fncs | 2 - doc/fcstrset.fncs | 2 - doc/fcvalue.fncs | 2 - doc/fontconfig-devel.sgml | 4 - - doc/fontconfig-user.sgml | 2 - doc/func.sgml | 2 - doc/version.sgml.in | 2 - fc-cache/Makefile.am | 2 - fc-cache/fc-cache.c | 2 - fc-glyphname/Makefile.am | 2 - fc-glyphname/fc-glyphname.c | 2 - fc-glyphname/fcglyphname.tmpl.h | 2 - fc-lang/Makefile.am | 2 - fc-lang/aa.orth | 2 - fc-lang/ab.orth | 2 - fc-lang/af.orth | 2 - fc-lang/am.orth | 2 - fc-lang/ar.orth | 2 - fc-lang/ast.orth | 2 - fc-lang/ava.orth | 2 - fc-lang/ay.orth | 2 - fc-lang/az.orth | 2 - fc-lang/az_ir.orth | 2 - fc-lang/ba.orth | 2 - fc-lang/bam.orth | 2 - fc-lang/be.orth | 2 - fc-lang/bg.orth | 2 - fc-lang/bh.orth | 2 - fc-lang/bho.orth | 2 - fc-lang/bi.orth | 2 - fc-lang/bin.orth | 2 - fc-lang/bn.orth | 2 - fc-lang/bo.orth | 2 - fc-lang/br.orth | 2 - fc-lang/bs.orth | 2 - fc-lang/bua.orth | 2 - fc-lang/ca.orth | 2 - fc-lang/ce.orth | 2 - fc-lang/ch.orth | 2 - fc-lang/chm.orth | 2 - fc-lang/chr.orth | 2 - fc-lang/co.orth | 2 - fc-lang/cs.orth | 2 - fc-lang/cu.orth | 2 - fc-lang/cv.orth | 2 - fc-lang/cy.orth | 2 - fc-lang/da.orth | 2 - fc-lang/de.orth | 2 - fc-lang/dz.orth | 2 - fc-lang/el.orth | 2 - fc-lang/en.orth | 2 - fc-lang/eo.orth | 2 - fc-lang/es.orth | 2 - fc-lang/et.orth | 2 - fc-lang/eu.orth | 4 - - fc-lang/fa.orth | 2 - fc-lang/fc-lang.c | 2 - fc-lang/fc-lang.man | 2 - fc-lang/fclang.tmpl.h | 2 - fc-lang/fi.orth | 2 - fc-lang/fj.orth | 2 - fc-lang/fo.orth | 2 - fc-lang/fr.orth | 2 - fc-lang/ful.orth | 2 - fc-lang/fur.orth | 2 - fc-lang/fy.orth | 4 - - fc-lang/ga.orth | 2 - fc-lang/gd.orth | 2 - fc-lang/gez.orth | 2 - fc-lang/gl.orth | 2 - fc-lang/gn.orth | 4 - - fc-lang/gu.orth | 2 - fc-lang/gv.orth | 2 - fc-lang/ha.orth | 2 - fc-lang/haw.orth | 2 - fc-lang/he.orth | 2 - fc-lang/hi.orth | 2 - fc-lang/ho.orth | 2 - fc-lang/hr.orth | 2 - fc-lang/hu.orth | 2 - fc-lang/hy.orth | 2 - fc-lang/ia.orth | 2 - fc-lang/ibo.orth | 2 - fc-lang/id.orth | 2 - fc-lang/ie.orth | 2 - fc-lang/ik.orth | 2 - fc-lang/io.orth | 2 - fc-lang/is.orth | 2 + Makefile.am | 2 +- + config/Makedefs.in | 2 +- + configure.in | 2 +- + doc/edit-sgml.c | 2 +- + doc/fcatomic.fncs | 2 +- + doc/fcblanks.fncs | 2 +- + doc/fccharset.fncs | 2 +- + doc/fcconfig.fncs | 2 +- + doc/fcconstant.fncs | 2 +- + doc/fcfile.fncs | 2 +- + doc/fcfontset.fncs | 2 +- + doc/fcfreetype.fncs | 2 +- + doc/fcinit.fncs | 2 +- + doc/fcmatrix.fncs | 2 +- + doc/fcobjectset.fncs | 2 +- + doc/fcobjecttype.fncs | 2 +- + doc/fcpattern.fncs | 2 +- + doc/fcstring.fncs | 2 +- + doc/fcstrset.fncs | 2 +- + doc/fcvalue.fncs | 2 +- + doc/fontconfig-devel.sgml | 4 +- + doc/fontconfig-user.sgml | 2 +- + doc/func.sgml | 2 +- + doc/version.sgml.in | 2 +- + fc-cache/Makefile.am | 2 +- + fc-cache/fc-cache.c | 2 +- + fc-glyphname/Makefile.am | 2 +- + fc-glyphname/fc-glyphname.c | 2 +- + fc-glyphname/fcglyphname.tmpl.h | 2 +- + fc-lang/Makefile.am | 2 +- + fc-lang/aa.orth | 2 +- + fc-lang/ab.orth | 2 +- + fc-lang/af.orth | 2 +- + fc-lang/am.orth | 2 +- + fc-lang/ar.orth | 2 +- + fc-lang/ast.orth | 2 +- + fc-lang/ava.orth | 2 +- + fc-lang/ay.orth | 2 +- + fc-lang/az.orth | 2 +- + fc-lang/az_ir.orth | 2 +- + fc-lang/ba.orth | 2 +- + fc-lang/bam.orth | 2 +- + fc-lang/be.orth | 2 +- + fc-lang/bg.orth | 2 +- + fc-lang/bh.orth | 2 +- + fc-lang/bho.orth | 2 +- + fc-lang/bi.orth | 2 +- + fc-lang/bin.orth | 2 +- + fc-lang/bn.orth | 2 +- + fc-lang/bo.orth | 2 +- + fc-lang/br.orth | 2 +- + fc-lang/bs.orth | 2 +- + fc-lang/bua.orth | 2 +- + fc-lang/ca.orth | 2 +- + fc-lang/ce.orth | 2 +- + fc-lang/ch.orth | 2 +- + fc-lang/chm.orth | 2 +- + fc-lang/chr.orth | 2 +- + fc-lang/co.orth | 2 +- + fc-lang/cs.orth | 2 +- + fc-lang/cu.orth | 2 +- + fc-lang/cv.orth | 2 +- + fc-lang/cy.orth | 2 +- + fc-lang/da.orth | 2 +- + fc-lang/de.orth | 2 +- + fc-lang/dz.orth | 2 +- + fc-lang/el.orth | 2 +- + fc-lang/en.orth | 2 +- + fc-lang/eo.orth | 2 +- + fc-lang/es.orth | 2 +- + fc-lang/et.orth | 2 +- + fc-lang/eu.orth | 4 +- + fc-lang/fa.orth | 2 +- + fc-lang/fc-lang.c | 2 +- + fc-lang/fc-lang.man | 2 +- + fc-lang/fclang.tmpl.h | 2 +- + fc-lang/fi.orth | 2 +- + fc-lang/fj.orth | 2 +- + fc-lang/fo.orth | 2 +- + fc-lang/fr.orth | 2 +- + fc-lang/ful.orth | 2 +- + fc-lang/fur.orth | 2 +- + fc-lang/fy.orth | 4 +- + fc-lang/ga.orth | 2 +- + fc-lang/gd.orth | 2 +- + fc-lang/gez.orth | 2 +- + fc-lang/gl.orth | 2 +- + fc-lang/gn.orth | 4 +- + fc-lang/gu.orth | 2 +- + fc-lang/gv.orth | 2 +- + fc-lang/ha.orth | 2 +- + fc-lang/haw.orth | 2 +- + fc-lang/he.orth | 2 +- + fc-lang/hi.orth | 2 +- + fc-lang/ho.orth | 2 +- + fc-lang/hr.orth | 2 +- + fc-lang/hu.orth | 2 +- + fc-lang/hy.orth | 2 +- + fc-lang/ia.orth | 2 +- + fc-lang/ibo.orth | 2 +- + fc-lang/id.orth | 2 +- + fc-lang/ie.orth | 2 +- + fc-lang/ik.orth | 2 +- + fc-lang/io.orth | 2 +- + fc-lang/is.orth | 2 +- fc-lang/iso639-2 | 194 +++++++++++++++--------------- - fc-lang/it.orth | 2 - fc-lang/iu.orth | 2 - fc-lang/ja.orth | 2 - fc-lang/ka.orth | 2 - fc-lang/kaa.orth | 2 - fc-lang/ki.orth | 2 - fc-lang/kk.orth | 2 - fc-lang/kl.orth | 2 - fc-lang/km.orth | 2 - fc-lang/kn.orth | 2 - fc-lang/ko.orth | 2 - fc-lang/kok.orth | 2 - fc-lang/ks.orth | 2 - fc-lang/ku.orth | 2 - fc-lang/ku_ir.orth | 2 - fc-lang/kum.orth | 2 - fc-lang/kv.orth | 2 - fc-lang/kw.orth | 2 - fc-lang/ky.orth | 2 - fc-lang/la.orth | 2 - fc-lang/lb.orth | 2 - fc-lang/lez.orth | 2 - fc-lang/lo.orth | 2 - fc-lang/lt.orth | 2 - fc-lang/lv.orth | 2 - fc-lang/mg.orth | 2 - fc-lang/mh.orth | 2 - fc-lang/mi.orth | 2 - fc-lang/mk.orth | 2 - fc-lang/ml.orth | 2 - fc-lang/mn.orth | 2 - fc-lang/mo.orth | 2 - fc-lang/mr.orth | 2 - fc-lang/mt.orth | 2 - fc-lang/my.orth | 2 - fc-lang/nb.orth | 4 - - fc-lang/nds.orth | 2 - fc-lang/ne.orth | 2 - fc-lang/nl.orth | 2 - fc-lang/nn.orth | 2 - fc-lang/no.orth | 4 - - fc-lang/ny.orth | 2 - fc-lang/oc.orth | 2 - fc-lang/om.orth | 2 - fc-lang/or.orth | 2 - fc-lang/os.orth | 2 - fc-lang/pl.orth | 2 - fc-lang/ps_af.orth | 2 - fc-lang/ps_pk.orth | 2 - fc-lang/pt.orth | 2 - fc-lang/rm.orth | 2 - fc-lang/ro.orth | 2 - fc-lang/ru.orth | 2 - fc-lang/sa.orth | 2 - fc-lang/sah.orth | 2 - fc-lang/sco.orth | 2 - fc-lang/se.orth | 4 - - fc-lang/sel.orth | 2 - fc-lang/sh.orth | 2 - fc-lang/si.orth | 2 - fc-lang/sk.orth | 2 - fc-lang/sl.orth | 2 - fc-lang/sm.orth | 2 - fc-lang/sma.orth | 4 - - fc-lang/smj.orth | 4 - - fc-lang/smn.orth | 4 - - fc-lang/sms.orth | 4 - - fc-lang/so.orth | 2 - fc-lang/sq.orth | 2 - fc-lang/sr.orth | 2 - fc-lang/sv.orth | 2 - fc-lang/sw.orth | 2 - fc-lang/syr.orth | 2 - fc-lang/ta.orth | 2 - fc-lang/te.orth | 2 - fc-lang/tg.orth | 2 - fc-lang/th.orth | 2 - fc-lang/ti_er.orth | 2 - fc-lang/ti_et.orth | 2 - fc-lang/tig.orth | 2 - fc-lang/tk.orth | 2 - fc-lang/tl.orth | 2 - fc-lang/tn.orth | 2 - fc-lang/to.orth | 2 - fc-lang/tr.orth | 2 - fc-lang/ts.orth | 2 - fc-lang/tt.orth | 2 - fc-lang/tw.orth | 2 - fc-lang/tyv.orth | 2 - fc-lang/ug.orth | 2 - fc-lang/uk.orth | 2 - fc-lang/ur.orth | 2 - fc-lang/uz.orth | 2 - fc-lang/ven.orth | 2 - fc-lang/vi.orth | 2 - fc-lang/vo.orth | 4 - - fc-lang/vot.orth | 2 - fc-lang/wa.orth | 2 - fc-lang/wen.orth | 2 - fc-lang/wo.orth | 2 - fc-lang/xh.orth | 2 - fc-lang/yap.orth | 2 - fc-lang/yi.orth | 2 - fc-lang/yo.orth | 2 - fc-lang/zh_cn.orth | 2 - fc-lang/zh_hk.orth | 2 - fc-lang/zh_mo.orth | 2 - fc-lang/zh_sg.orth | 2 - fc-lang/zh_tw.orth | 2 - fc-lang/zu.orth | 2 - fc-list/Makefile.am | 2 - fc-list/fc-list.c | 2 - fc-match/Makefile.am | 2 - fc-match/fc-match.1 | 2 - fc-match/fc-match.c | 2 - fontconfig/fcfreetype.h | 2 - fontconfig/fcprivate.h | 2 - fontconfig/fontconfig.h | 2 - src/fcatomic.c | 2 - src/fcblanks.c | 2 - src/fccache.c | 2 - src/fccfg.c | 2 - src/fccharset.c | 2 - src/fcdbg.c | 2 - src/fcdefault.c | 2 - src/fcdir.c | 2 - src/fcfreetype.c | 4 - - src/fcfs.c | 2 - src/fcinit.c | 2 - src/fcint.h | 2 - src/fclang.c | 2 - src/fclist.c | 2 - src/fcmatch.c | 2 - src/fcmatrix.c | 2 - src/fcname.c | 2 - src/fcpat.c | 2 - src/fcstr.c | 2 - src/fcxml.c | 2 + fc-lang/it.orth | 2 +- + fc-lang/iu.orth | 2 +- + fc-lang/ja.orth | 2 +- + fc-lang/ka.orth | 2 +- + fc-lang/kaa.orth | 2 +- + fc-lang/ki.orth | 2 +- + fc-lang/kk.orth | 2 +- + fc-lang/kl.orth | 2 +- + fc-lang/km.orth | 2 +- + fc-lang/kn.orth | 2 +- + fc-lang/ko.orth | 2 +- + fc-lang/kok.orth | 2 +- + fc-lang/ks.orth | 2 +- + fc-lang/ku.orth | 2 +- + fc-lang/ku_ir.orth | 2 +- + fc-lang/kum.orth | 2 +- + fc-lang/kv.orth | 2 +- + fc-lang/kw.orth | 2 +- + fc-lang/ky.orth | 2 +- + fc-lang/la.orth | 2 +- + fc-lang/lb.orth | 2 +- + fc-lang/lez.orth | 2 +- + fc-lang/lo.orth | 2 +- + fc-lang/lt.orth | 2 +- + fc-lang/lv.orth | 2 +- + fc-lang/mg.orth | 2 +- + fc-lang/mh.orth | 2 +- + fc-lang/mi.orth | 2 +- + fc-lang/mk.orth | 2 +- + fc-lang/ml.orth | 2 +- + fc-lang/mn.orth | 2 +- + fc-lang/mo.orth | 2 +- + fc-lang/mr.orth | 2 +- + fc-lang/mt.orth | 2 +- + fc-lang/my.orth | 2 +- + fc-lang/nb.orth | 4 +- + fc-lang/nds.orth | 2 +- + fc-lang/ne.orth | 2 +- + fc-lang/nl.orth | 2 +- + fc-lang/nn.orth | 2 +- + fc-lang/no.orth | 4 +- + fc-lang/ny.orth | 2 +- + fc-lang/oc.orth | 2 +- + fc-lang/om.orth | 2 +- + fc-lang/or.orth | 2 +- + fc-lang/os.orth | 2 +- + fc-lang/pl.orth | 2 +- + fc-lang/ps_af.orth | 2 +- + fc-lang/ps_pk.orth | 2 +- + fc-lang/pt.orth | 2 +- + fc-lang/rm.orth | 2 +- + fc-lang/ro.orth | 2 +- + fc-lang/ru.orth | 2 +- + fc-lang/sa.orth | 2 +- + fc-lang/sah.orth | 2 +- + fc-lang/sco.orth | 2 +- + fc-lang/se.orth | 4 +- + fc-lang/sel.orth | 2 +- + fc-lang/sh.orth | 2 +- + fc-lang/si.orth | 2 +- + fc-lang/sk.orth | 2 +- + fc-lang/sl.orth | 2 +- + fc-lang/sm.orth | 2 +- + fc-lang/sma.orth | 4 +- + fc-lang/smj.orth | 4 +- + fc-lang/smn.orth | 4 +- + fc-lang/sms.orth | 4 +- + fc-lang/so.orth | 2 +- + fc-lang/sq.orth | 2 +- + fc-lang/sr.orth | 2 +- + fc-lang/sv.orth | 2 +- + fc-lang/sw.orth | 2 +- + fc-lang/syr.orth | 2 +- + fc-lang/ta.orth | 2 +- + fc-lang/te.orth | 2 +- + fc-lang/tg.orth | 2 +- + fc-lang/th.orth | 2 +- + fc-lang/ti_er.orth | 2 +- + fc-lang/ti_et.orth | 2 +- + fc-lang/tig.orth | 2 +- + fc-lang/tk.orth | 2 +- + fc-lang/tl.orth | 2 +- + fc-lang/tn.orth | 2 +- + fc-lang/to.orth | 2 +- + fc-lang/tr.orth | 2 +- + fc-lang/ts.orth | 2 +- + fc-lang/tt.orth | 2 +- + fc-lang/tw.orth | 2 +- + fc-lang/tyv.orth | 2 +- + fc-lang/ug.orth | 2 +- + fc-lang/uk.orth | 2 +- + fc-lang/ur.orth | 2 +- + fc-lang/uz.orth | 2 +- + fc-lang/ven.orth | 2 +- + fc-lang/vi.orth | 2 +- + fc-lang/vo.orth | 4 +- + fc-lang/vot.orth | 2 +- + fc-lang/wa.orth | 2 +- + fc-lang/wen.orth | 2 +- + fc-lang/wo.orth | 2 +- + fc-lang/xh.orth | 2 +- + fc-lang/yap.orth | 2 +- + fc-lang/yi.orth | 2 +- + fc-lang/yo.orth | 2 +- + fc-lang/zh_cn.orth | 2 +- + fc-lang/zh_hk.orth | 2 +- + fc-lang/zh_mo.orth | 2 +- + fc-lang/zh_sg.orth | 2 +- + fc-lang/zh_tw.orth | 2 +- + fc-lang/zu.orth | 2 +- + fc-list/Makefile.am | 2 +- + fc-list/fc-list.c | 2 +- + fc-match/Makefile.am | 2 +- + fc-match/fc-match.1 | 2 +- + fc-match/fc-match.c | 2 +- + fontconfig/fcfreetype.h | 2 +- + fontconfig/fcprivate.h | 2 +- + fontconfig/fontconfig.h | 2 +- + src/fcatomic.c | 2 +- + src/fcblanks.c | 2 +- + src/fccache.c | 2 +- + src/fccfg.c | 2 +- + src/fccharset.c | 2 +- + src/fcdbg.c | 2 +- + src/fcdefault.c | 2 +- + src/fcdir.c | 2 +- + src/fcfreetype.c | 4 +- + src/fcfs.c | 2 +- + src/fcinit.c | 2 +- + src/fcint.h | 2 +- + src/fclang.c | 2 +- + src/fclist.c | 2 +- + src/fcmatch.c | 2 +- + src/fcmatrix.c | 2 +- + src/fcname.c | 2 +- + src/fcpat.c | 2 +- + src/fcstr.c | 2 +- + src/fcxml.c | 2 +- 246 files changed, 603 insertions(+), 354 deletions(-) commit fc2cc873bb1a715844a1e6f885661bf433bdd7cf @@ -6788,7 +12211,7 @@ Date: Sun Dec 5 05:03:52 2004 +0000 doc/fontconfig-user.sgml | 17 +++++---- fonts.conf.in | 1 + local.conf | 23 ++++++++++++ - src/fcdir.c | 4 +- + src/fcdir.c | 4 +-- src/fcint.h | 6 +++ src/fcxml.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++ @@ -6842,11 +12265,11 @@ Date: Sat Dec 4 22:06:52 2004 +0000 reviewed by: Keith Packard ChangeLog | 13 +++ - doc/fontconfig-user.sgml | 1 - fontconfig/fontconfig.h | 1 + doc/fontconfig-user.sgml | 1 + + fontconfig/fontconfig.h | 1 + src/fcfreetype.c | 188 ++++++++++++++++++++++++++++++++++++++++++++++ - src/fcname.c | 1 + src/fcname.c | 1 + 5 files changed, 204 insertions(+), 0 deletions(-) commit 4f27c1c0a383e891890ab27c74226957ed7067aa @@ -6867,25 +12290,25 @@ Date: Sat Dec 4 19:41:10 2004 +0000 pattern element names which are required to be static. ChangeLog | 47 ++ - Makefile.am | 13 - - configure.in | 6 - doc/fcpattern.fncs | 11 - doc/fontconfig-devel.sgml | 13 - - doc/fontconfig-user.sgml | 43 ++ - fc-lang/nb.orth | 2 - fontconfig/fontconfig.h | 7 + Makefile.am | 13 +- + configure.in | 6 +- + doc/fcpattern.fncs | 11 + + doc/fontconfig-devel.sgml | 13 +- + doc/fontconfig-user.sgml | 43 ++- + fc-lang/nb.orth | 2 +- + fontconfig/fontconfig.h | 7 + fonts.dtd | 19 + - src/fccache.c | 2 - src/fccfg.c | 55 ++ - src/fcdir.c | 2 - src/fcfreetype.c | 1085 - ++++++++++++++++++++++++++++++++++----------- + src/fccache.c | 2 +- + src/fccfg.c | 55 +++- + src/fcdir.c | 2 +- + src/fcfreetype.c | 1087 + +++++++++++++++++++++++++++++++++------------ src/fcint.h | 21 + - src/fclist.c | 6 - src/fcname.c | 4 + src/fclist.c | 6 +- + src/fcname.c | 4 + src/fcpat.c | 73 +++ src/fcxml.c | 162 +++++++ - 18 files changed, 1282 insertions(+), 289 deletions(-) + 18 files changed, 1283 insertions(+), 290 deletions(-) commit c641c77d6f1a0b378e800c9e3502ae446839a8af Author: Keith Packard @@ -7052,19 +12475,19 @@ Date: Wed Apr 14 18:08:41 2004 +0000 pixel. ChangeLog | 30 +++++++++++++ - INSTALL | 13 +++++ - README | 27 +++++++++++ - configure.in | 14 +++++- - fc-glyphname/Makefile.am | 2 - - fc-lang/Makefile.am | 2 - - fc-lang/fc-lang.c | 2 - - fc-list/Makefile.am | 2 - - fc-match/Makefile.am | 2 - - fontconfig.spec.in | 42 ++++++++++++++---- - fontconfig/fontconfig.h | 2 - - src/Makefile.am | 1 + INSTALL | 13 ++++++ + README | 27 +++++++++++- + configure.in | 14 ++++++- + fc-glyphname/Makefile.am | 2 +- + fc-lang/Makefile.am | 2 +- + fc-lang/fc-lang.c | 2 +- + fc-list/Makefile.am | 2 +- + fc-match/Makefile.am | 2 +- + fontconfig.spec.in | 42 +++++++++++++---- + fontconfig/fontconfig.h | 2 +- + src/Makefile.am | 1 + src/fcfreetype.c | 109 - ++++++++++++++++++++++++---------------------- + +++++++++++++++++++++++---------------------- 13 files changed, 176 insertions(+), 72 deletions(-) commit 89e28590f3c85f302dcc5c611e7b9fa906e0ec07 @@ -7265,16 +12688,16 @@ Date: Mon Oct 27 10:44:13 2003 +0000 tested to ensure that it even works from a _build directory. ChangeLog | 16 ++++++ - Makefile.am | 1 - configure.in | 10 +++ + Makefile.am | 1 + + configure.in | 10 ++++ doc/Makefile.am | 133 +++++++++++++++------------------------------- - fc-cache/Makefile.am | 2 - + fc-cache/Makefile.am | 2 +- fc-glyphname/Makefile.am | 6 +- fc-lang/Makefile.am | 5 +- - fc-list/Makefile.am | 2 - - fc-match/Makefile.am | 2 - - test/Makefile.am | 4 + + fc-list/Makefile.am | 2 +- + fc-match/Makefile.am | 2 +- + test/Makefile.am | 4 +- test/run-test.sh | 28 ++++++---- 11 files changed, 98 insertions(+), 111 deletions(-) @@ -7301,15 +12724,15 @@ Date: Mon Oct 27 06:30:29 2003 +0000 Now to go use a faster machine and try and wring out the last issues. ChangeLog | 27 ++++++++++++++++++ - configure.in | 2 + + configure.in | 2 +- doc/Makefile.am | 68 +++++++++++++++++++++++++++++++++++++++------- fc-cache/Makefile.am | 13 +++++---- fc-glyphname/Makefile.am | 11 +++++-- fc-lang/Makefile.am | 10 +++++-- - fc-lang/fc-lang.c | 29 ++++++++++++++++++-- + fc-lang/fc-lang.c | 29 ++++++++++++++++++- fc-list/Makefile.am | 10 ++++--- - fc-match/Makefile.am | 2 + + fc-match/Makefile.am | 2 +- 9 files changed, 142 insertions(+), 30 deletions(-) commit 3541556bd38d6b1a3fffe1a661edce2f8d60e06a @@ -7341,15 +12764,15 @@ Date: Thu Oct 9 18:21:49 2003 +0000 versions. ChangeLog | 7 ++ - fc-cache/.cvsignore | 1 - fc-cache/Makefile.am | 24 ++++++ + fc-cache/.cvsignore | 1 + + fc-cache/Makefile.am | 24 ++++++- fc-cache/fc-cache.1 | 51 ------------ fc-cache/fc-cache.sgml | 200 ++++++++++++++++++++++++++++++++++++++++++++++++ - fc-list/.cvsignore | 1 - fc-list/Makefile.am | 24 ++++++ + fc-list/.cvsignore | 1 + + fc-list/Makefile.am | 24 ++++++- fc-list/fc-list.1 | 37 --------- - fc-list/fc-list.sgml | 165 ++++++++++++++++++++++++++++++++++++++++ + fc-list/fc-list.sgml | 165 +++++++++++++++++++++++++++++++++++++++ 9 files changed, 420 insertions(+), 90 deletions(-) commit f077d662c001468eb2aa1261549accd9ff3de401 @@ -7385,9 +12808,9 @@ Date: Sat Sep 6 19:40:41 2003 +0000 When checking for monospace and dual-width fonts, allow roughly a 3% variance in the advances. - ChangeLog | 13 +++++++++++ - doc/fontconfig-devel.sgml | 4 ++- - doc/fontconfig-user.sgml | 3 ++ + ChangeLog | 13 ++++++++++ + doc/fontconfig-devel.sgml | 4 +- + doc/fontconfig-user.sgml | 3 +- fontconfig/fontconfig.h | 1 + src/fcfreetype.c | 55 ++++++++++++++++++++++++++++++++++++--------- @@ -7419,17 +12842,17 @@ Date: Fri Aug 15 19:45:20 2003 +0000 doc/edit-sgml.c | 187 +++++++++++++++++++++++++++++++------------ doc/fcinit.fncs | 11 +++ - fc-glyphname/fc-glyphname.c | 35 ++++++-- + fc-glyphname/fc-glyphname.c | 35 +++++++-- fc-list/fc-list.c | 4 + - fc-match/fc-match.c | 2 + fc-match/fc-match.c | 2 +- fontconfig/fontconfig.h | 3 + - src/fccfg.c | 6 + + src/fccfg.c | 6 ++ src/fccharset.c | 64 ++++++++++++++- src/fcinit.c | 13 +++ - src/fcint.h | 6 + + src/fcint.h | 6 ++ src/fcpat.c | 84 ++++++++++++++++++- src/fcxml.c | 4 + - src/fontconfig.def.in | 1 + src/fontconfig.def.in | 1 + 15 files changed, 398 insertions(+), 74 deletions(-) commit 18906a876aa13550b1a10550ceeef6df0c4473ec @@ -7466,11 +12889,11 @@ Date: Sun Jul 20 16:06:18 2003 +0000 same country or one is missing the country src/fccfg.c | 79 - ++++++++++++++++++++++++++++++++-------------------------- + ++++++++++++++++++++++++++++++++------------------------- src/fcdbg.c | 3 ++ src/fcint.h | 3 +- src/fclang.c | 18 ++++++++----- - src/fclist.c | 38 +++++++++++++++++++++------- + src/fclist.c | 38 ++++++++++++++++++++------- src/fcxml.c | 1 + 6 files changed, 89 insertions(+), 53 deletions(-) @@ -7665,16 +13088,16 @@ Date: Sat May 31 14:58:41 2003 +0000 usage info on non-long option systems (Tim Mooney) - ChangeLog | 4 ++++ - fc-cache/Makefile.am | 4 ++-- + ChangeLog | 4 +++ + fc-cache/Makefile.am | 4 +- fc-cache/fc-cache.1 | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ - fc-cache/fc-cache.c | 19 +++++++++++++++--- + fc-cache/fc-cache.c | 19 +++++++++++++++-- fc-cache/fc-cache.man | 45 ------------------------------------------- - fc-list/Makefile.am | 4 ++-- - fc-list/fc-list.1 | 37 ++++++++++++++++++++++++++++++++++++ - fc-list/fc-list.c | 11 +++++++++++ - fc-list/fc-list.man | 36 ----------------------------------- + fc-list/Makefile.am | 4 +- + fc-list/fc-list.1 | 37 +++++++++++++++++++++++++++++++++++ + fc-list/fc-list.c | 11 ++++++++++ + fc-list/fc-list.man | 36 ---------------------------------- 9 files changed, 123 insertions(+), 88 deletions(-) commit d4d1e8bc604c98d647d70f9188744b95deba8723 @@ -7684,7 +13107,7 @@ Date: Wed May 28 01:34:38 2003 +0000 Fix "contains" op for strings and langsets. fontconfig/fontconfig.h | 6 +++ - src/fccfg.c | 16 +++++-- + src/fccfg.c | 16 +++++--- src/fcstr.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 6 deletions(-) @@ -7757,10 +13180,10 @@ Date: Wed May 7 16:13:24 2003 +0000 src/fccache.c | 18 ++++++---- src/fccfg.c | 96 - ++++++++++++++++++++++++++++++++++++++++++++++++++++-- - src/fcdir.c | 60 +++++++++++++++++++++++++--------- - src/fcfreetype.c | 2 + - src/fcint.h | 40 +++++++++++++++++++++-- + +++++++++++++++++++++++++++++++++++++++++++++++++++-- + src/fcdir.c | 60 +++++++++++++++++++++++++-------- + src/fcfreetype.c | 2 +- + src/fcint.h | 40 +++++++++++++++++++++- src/fcxml.c | 46 +++++++++++++++++++++++++- 6 files changed, 232 insertions(+), 30 deletions(-) @@ -7800,11 +13223,11 @@ Date: Sun May 4 22:53:49 2003 +0000 Handle Adobe glyph names for fonts which include ADOBE_CUSTOM encodings - Makefile.am | 2 - - configure.in | 1 + Makefile.am | 2 +- + configure.in | 1 + src/fcfreetype.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++- - src/fcint.h | 10 +++ + src/fcint.h | 10 ++++ 4 files changed, 170 insertions(+), 3 deletions(-) commit 83321a017a9586aa4f3ace022a91f69122c08ed8 @@ -7823,9 +13246,9 @@ Date: Sun May 4 22:50:17 2003 +0000 Add fc-glyphname to compute hash tables for Adobe glyph name to UCS4 conversion functions - fc-glyphname/Makefile.am | 42 + fc-glyphname/Makefile.am | 42 + fc-glyphname/fc-glyphname.c | 287 +++ - fc-glyphname/fcglyphname.tmpl.h | 25 + fc-glyphname/fcglyphname.tmpl.h | 25 + fc-glyphname/glyphlist.txt | 4291 +++++++++++++++++++++++++++++++++++++++ fc-glyphname/zapfdingbats.txt | 212 ++ @@ -7841,7 +13264,7 @@ Date: Fri May 2 01:11:53 2003 +0000 src/fcfreetype.c | 228 ++++++++++++++++++++++++++++++++++++------------------ - src/fcint.h | 6 + + src/fcint.h | 6 ++ src/fcstr.c | 74 ++++++++++++++++++ 3 files changed, 233 insertions(+), 75 deletions(-) @@ -8145,7 +13568,7 @@ Date: Wed Apr 16 16:19:38 2003 +0000 Move foundry detection data into fcfreetype.c (which is getting rather large at this point) - src/Makefile.am | 2 - + src/Makefile.am | 2 +- src/data.h | 77 ----------------------- src/fcfreetype.c | 177 +++++++++++++++++++++++++++++++++++++++++------------- @@ -8169,12 +13592,12 @@ Date: Tue Apr 15 23:38:06 2003 +0000 fontconfig/fontconfig.h | 2 + fonts.dtd | 6 ++- - src/Makefile.am | 2 - + src/Makefile.am | 2 +- src/fccfg.c | 71 +++++++++++++++++++++++++++++++ src/fcdbg.c | 20 +++++++++ - src/fcint.h | 3 + + src/fcint.h | 3 +- src/fcxml.c | 107 - ++++++++++++++++++++++++++++++++++++++--------- + +++++++++++++++++++++++++++++++++++++--------- 7 files changed, 187 insertions(+), 24 deletions(-) commit 52253696cd2779bd9040457fbd157bbe75895ed6 @@ -8184,7 +13607,7 @@ Date: Tue Apr 15 17:01:39 2003 +0000 Clean up ps font weight matching and check for NULL src/fcfreetype.c | 59 - ++++++++++++++++++++++++++++-------------------------- + ++++++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 28 deletions(-) commit 2ae95e77f7d50d65ca414a5d5a1065aa9f2581ed @@ -8196,7 +13619,7 @@ Date: Fri Apr 11 23:45:59 2003 +0000 src/data.h | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/fcfreetype.c | 73 - ++++++++++++++++++++++++++++++++++++++++++++++++--- + +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 145 insertions(+), 5 deletions(-) commit 0a557ec372a7dddede4edec3ac77caf328fd12f5 @@ -8348,16 +13771,16 @@ Date: Sat Mar 22 21:25:34 2003 +0000 Add a fontconfig-zip(.in) script, used to build a binary distribution. ChangeLog | 32 +++++++++ - Makefile.am | 3 + - configure.in | 28 ++++++++ + Makefile.am | 3 +- + configure.in | 28 ++++++++- fc-lang/fc-lang.man | 6 +- src/Makefile.am | 55 +++++++++++++++- - src/fcatomic.c | 23 ++++++ - src/fccache.c | 21 +++++- + src/fcatomic.c | 23 ++++++- + src/fccache.c | 21 ++++++- src/fccfg.c | 90 ++++++++++++++++++++++++- src/fcint.h | 9 +++ - src/fcstr.c | 23 ++++++ - src/fcxml.c | 30 ++++++++ + src/fcstr.c | 23 ++++++- + src/fcxml.c | 30 +++++++++ src/fontconfig-def.cpp | 170 ------------------------------------------------ src/fontconfig.def.in | 161 @@ -8428,11 +13851,11 @@ Date: Wed Mar 12 22:16:43 2003 +0000 add font widths and extend weight from OS/2 table fontconfig/fontconfig.h | 44 +++++++++++++++++++++++++++----------- - src/fcdefault.c | 3 +++ + src/fcdefault.c | 3 ++ src/fcfreetype.c | 54 - +++++++++++++++++++++++++++++++++++++++++++---- - src/fcmatch.c | 29 +++++++++++++++++-------- - src/fcname.c | 18 ++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++---- + src/fcmatch.c | 29 ++++++++++++++++-------- + src/fcname.c | 18 +++++++++++++++ 5 files changed, 120 insertions(+), 28 deletions(-) commit a8386abc916c6ce4b0fa0ca3f9f68aa0232d4824 @@ -8571,8 +13994,8 @@ Date: Fri Mar 7 19:37:16 2003 +0000 doc/Makefile.am | 172 +++++++++++++++++++++++++++------------------- - doc/edit-sgml.c | 2 - - doc/fontconfig-user.sgml | 2 - + doc/edit-sgml.c | 2 +- + doc/fontconfig-user.sgml | 2 +- 3 files changed, 102 insertions(+), 74 deletions(-) commit 39381776a4c0cf4077a31f3a493cbd37420cec71 @@ -8581,13 +14004,13 @@ Date: Fri Mar 7 19:01:41 2003 +0000 Finish reformatting developer documentation - doc/Makefile.am | 16 +- - doc/edit-sgml.c | 17 +- + doc/Makefile.am | 16 ++- + doc/edit-sgml.c | 17 ++- doc/fcatomic.fncs | 93 +++++++++ - doc/fcconfig.fncs | 153 ++++++++------ - doc/fcfile.fncs | 78 +++++++ + doc/fcconfig.fncs | 153 ++++++++------- + doc/fcfile.fncs | 78 ++++++++ doc/fcfreetype.fncs | 69 +++++++ - doc/fcinit.fncs | 78 +++++++ + doc/fcinit.fncs | 78 ++++++++ doc/fcstring.fncs | 150 ++++++++++++++ doc/fcstrset.fncs | 104 ++++++++++ doc/fontconfig-devel.sgml | 475 @@ -8623,7 +14046,7 @@ Date: Fri Mar 7 08:44:32 2003 +0000 Add lots more function documentation - doc/Makefile.am | 16 ++ + doc/Makefile.am | 16 ++- doc/fcblanks.fncs | 58 +++++++++ doc/fccharset.fncs | 23 ++++ doc/fcconfig.fncs | 279 @@ -8631,8 +14054,8 @@ Date: Fri Mar 7 08:44:32 2003 +0000 doc/fcconstant.fncs | 58 +++++++++ doc/fcfontset.fncs | 49 ++++++++ doc/fcmatrix.fncs | 23 ++++ - doc/fcobjectset.fncs | 61 +++++++++ - doc/fcobjecttype.fncs | 48 +++++++ + doc/fcobjectset.fncs | 61 ++++++++++ + doc/fcobjecttype.fncs | 48 ++++++++ doc/fcpattern.fncs | 23 ++++ doc/fcvalue.fncs | 23 ++++ doc/fontconfig-devel.sgml | 292 @@ -8645,14 +14068,14 @@ Date: Fri Mar 7 07:12:51 2003 +0000 Rework documentation to build man pages for each function - doc/Makefile.am | 84 ++- + doc/Makefile.am | 84 +++- doc/fccharset.fncs | 144 +++++ - doc/fcmatrix.fncs | 100 +++ + doc/fcmatrix.fncs | 100 ++++ doc/fcpattern.fncs | 287 ++++++++++ doc/fcvalue.fncs | 17 + doc/fontconfig-devel.sgml | 1355 ++++++++++++++++++--------------------------- - doc/fontconfig-user.sgml | 396 ++++++------- + doc/fontconfig-user.sgml | 396 ++++++-------- doc/func.sgml | 61 ++ 8 files changed, 1411 insertions(+), 1033 deletions(-) @@ -9091,10 +14514,10 @@ Date: Mon Mar 3 01:13:11 2003 +0000 ChangeLog | 8 ++ doc/fontconfig-devel.sgml | 237 +++++++++++++++++++++++---------------------- - doc/fontconfig-user.sgml | 8 +- - fc-cache/Makefile.am | 2 - fc-lang/Makefile.am | 2 - fc-list/Makefile.am | 2 + doc/fontconfig-user.sgml | 8 ++- + fc-cache/Makefile.am | 2 + + fc-lang/Makefile.am | 2 + + fc-list/Makefile.am | 2 + fontconfig.spec.in | 86 +++++++++------- 7 files changed, 191 insertions(+), 154 deletions(-) @@ -9115,18 +14538,18 @@ Date: Sun Mar 2 19:12:23 2003 +0000 --system-only to fc-cache. Fix FC_VERSION to match product version rather than .so version - Makefile.am | 1 - configure.in | 23 - fc-cache/fc-cache.c | 8 - fc-lang/fc-lang.c | 6 - fontconfig/fontconfig.h | 16 + Makefile.am | 1 - + configure.in | 23 +- + fc-cache/fc-cache.c | 8 + + fc-lang/fc-lang.c | 6 + + fontconfig/fontconfig.h | 16 +- ltmain.sh | 6192 ----------------------------------------------- - src/Makefile.am | 2 - src/fccfg.c | 25 - src/fcint.h | 3 - src/fcstr.c | 8 - src/fcxml.c | 14 + src/Makefile.am | 2 +- + src/fccfg.c | 25 +- + src/fcint.h | 3 + + src/fcstr.c | 8 +- + src/fcxml.c | 14 +- 11 files changed, 79 insertions(+), 6219 deletions(-) commit bf0093b72487bd463b9c7700902cd8765534c9c1 @@ -9163,17 +14586,17 @@ Date: Sun Mar 2 07:28:24 2003 +0000 make dist works now. Update to 2.1.90 in preparation for eventual 2.2 release - COPYING | 4 + COPYING | 4 +- ChangeLog | 20 + - INSTALL | 11 - Makefile.am | 3 - README | 6 - configure.in | 11 - fc-lang/Makefile.am | 2 - src/Makefile.am | 2 + INSTALL | 11 +- + Makefile.am | 3 +- + README | 6 +- + configure.in | 11 +- + fc-lang/Makefile.am | 2 + + src/Makefile.am | 2 + src/fcknownsets.h | 1895 --------------------------------------------------- - test/Makefile.am | 3 + test/Makefile.am | 3 + 10 files changed, 42 insertions(+), 1915 deletions(-) commit 4b06670ac92b8b9d2f1ba7036fdfaed5e55ff533 @@ -9191,10 +14614,10 @@ Date: Sat Mar 1 05:55:17 2003 +0000 Add simple tests - Makefile.am | 2 + + Makefile.am | 2 +- configure.in | 1 + - test/4x6.pcf | Bin - test/8x16.pcf | Bin + test/4x6.pcf | Bin 0 -> 70952 bytes + test/8x16.pcf | Bin 0 -> 21320 bytes test/Makefile.am | 4 ++ test/fonts.conf.in | 4 ++ test/out.expected | 8 +++++ @@ -9219,9 +14642,9 @@ Date: Sat Mar 1 03:06:37 2003 +0000 Switch to docbook and split documentation into pieces - Makefile.am | 2 + Makefile.am | 2 +- configure.in | 15 + - doc/Makefile.am | 35 + + doc/Makefile.am | 35 ++ src/fontconfig.3 | 1466 ------------------------------------------------------ 4 files changed, 51 insertions(+), 1467 deletions(-) @@ -9313,29 +14736,29 @@ Date: Mon Feb 24 17:18:50 2003 +0000 Switch to automake - Makefile.am | 49 + Makefile.am | 49 + Makefile.in | 91 - autogen.sh | 89 + - config.h.in | 138 - - configure.in | 425 +-- - cvscompile.sh | 11 - fc-cache/Makefile.am | 28 - fc-cache/Makefile.in | 53 - fc-lang/Makefile.am | 38 - fc-list/Makefile.am | 28 - fc-list/Makefile.in | 54 - findfonts | 4 + config.h.in | 138 -- + configure.in | 425 ++-- + cvscompile.sh | 11 - + fc-cache/Makefile.am | 28 + + fc-cache/Makefile.in | 53 - + fc-lang/Makefile.am | 38 + + fc-list/Makefile.am | 28 + + fc-list/Makefile.in | 54 - + findfonts | 4 - fontconfig.spec.in | 74 + - fontconfig/Makefile.am | 8 - fontconfig/Makefile.in | 39 - fontconfig/fontconfig.h | 3 - fonts.conf.in | 12 - local.conf | 5 + fontconfig/Makefile.am | 8 + + fontconfig/Makefile.in | 39 - + fontconfig/fontconfig.h | 3 +- + fonts.conf.in | 12 +- + local.conf | 5 + local.def | 70 - ltmain.sh | 6192 +++++++++++++++++++++++++++++++++++++++++++++++ - setfontdirs | 36 - src/Makefile.am | 38 + setfontdirs | 36 - + src/Makefile.am | 38 + src/Makefile.in | 120 - src/fontconfig.3 | 1466 +++++++++++ src/fontconfig.man | 1466 ----------- @@ -9522,23 +14945,23 @@ Date: Thu Feb 6 17:46:06 2003 +0000 Remove imake support Install empty local.conf file if none is present - fc-cache/Imakefile | 22 + fc-cache/Imakefile | 22 - fc-lang/Imakefile | 56 - - fc-lang/am.orth | 10 - fc-lang/fc-lang.c | 21 + fc-lang/am.orth | 10 +- + fc-lang/fc-lang.c | 21 +- fc-lang/fclang.h | 4006 -------------------------------------------------- - fc-lang/gez.orth | 55 - - fc-lang/ti.orth | 28 + fc-lang/gez.orth | 55 +- + fc-lang/ti.orth | 28 - fc-lang/ti_er.orth | 56 + - fc-lang/ti_et.orth | 33 + fc-lang/ti_et.orth | 33 + fc-lang/tig.orth | 52 + - fc-list/Imakefile | 17 - fontconfig/Imakefile | 8 + fc-list/Imakefile | 17 - + fontconfig/Imakefile | 8 - src/Imakefile | 48 - - src/fccharset.c | 769 ---------- + src/fccharset.c | 769 +---------- src/fcfreetype.c | 768 ++++++++++ - src/fcint.h | 19 + src/fcint.h | 19 +- 16 files changed, 975 insertions(+), 4993 deletions(-) commit 3d72cadda1f3398238ad9a5c52e31a9c710ccb5f @@ -9610,7 +15033,7 @@ Date: Sat Dec 14 02:03:59 2002 +0000 fontconfig (#A.1406, Keith Packard). fc-lang/fc-lang.c | 76 - +++++++++++++++++++++++++++++++++++++++++++++++++---- + ++++++++++++++++++++++++++++++++++++++++++++++++---- fc-lang/fclang.h | 10 ++++++- src/fclang.c | 15 +++++++--- 3 files changed, 89 insertions(+), 12 deletions(-) @@ -9857,13 +15280,13 @@ Date: Sat Aug 31 22:17:32 2002 +0000 src/fcfreetype.c | 8 +++++--- src/fcinit.c | 48 ++++++++++++++++++++++++++++++------------------ - src/fcint.h | 16 ++++++++++++++-- + src/fcint.h | 14 +++++++++++++- src/fcmatch.c | 3 ++- src/fcname.c | 7 ++++++- src/fcpat.c | 3 ++- src/fcstr.c | 5 +++++ src/fcxml.c | 33 ++++++++++++++++++++++++++++----- - 15 files changed, 151 insertions(+), 61 deletions(-) + 15 files changed, 150 insertions(+), 60 deletions(-) commit cb30af720468a7e89abdf65bbf62b8942d3d8c13 Author: Keith Packard @@ -9872,51 +15295,51 @@ Date: Fri Aug 30 01:28:17 2002 +0000 Update latin and cyrillic orthographies by comparing those found at evertype.com with those from eki.ee - fc-lang/ab.orth | 7 - fc-lang/az.orth | 65 +- - fc-lang/ba.orth | 43 + - fc-lang/be.orth | 20 - - fc-lang/bg.orth | 21 - - fc-lang/br.orth | 33 + + fc-lang/ab.orth | 7 +- + fc-lang/az.orth | 65 ++- + fc-lang/ba.orth | 43 +- + fc-lang/be.orth | 20 +- + fc-lang/bg.orth | 21 +- + fc-lang/br.orth | 33 +- fc-lang/ca.orth | 50 +- - fc-lang/cs.orth | 67 +- + fc-lang/cs.orth | 67 ++- fc-lang/da.orth | 83 ++- - fc-lang/de.orth | 33 + - fc-lang/es.orth | 42 + - fc-lang/et.orth | 35 + - fc-lang/eu.orth | 26 + + fc-lang/de.orth | 33 +- + fc-lang/es.orth | 42 +- + fc-lang/et.orth | 35 +- + fc-lang/eu.orth | 26 +- fc-lang/fclang.h | 1602 ++++++++++++++++++++++++++---------------------------- - fc-lang/fi.orth | 40 + - fc-lang/fo.orth | 57 +- - fc-lang/fy.orth | 24 + + fc-lang/fi.orth | 40 +- + fc-lang/fo.orth | 57 ++- + fc-lang/fy.orth | 24 +- fc-lang/ga.orth | 78 ++- - fc-lang/gd.orth | 23 + - fc-lang/gl.orth | 7 - fc-lang/hr.orth | 33 + - fc-lang/hu.orth | 13 - fc-lang/is.orth | 31 + - fc-lang/it.orth | 24 + - fc-lang/kk.orth | 15 - - fc-lang/kl.orth | 35 + - fc-lang/lt.orth | 11 - fc-lang/lv.orth | 7 - fc-lang/mt.orth | 50 +- - fc-lang/nl.orth | 27 + - fc-lang/no.orth | 49 +- - fc-lang/oc.orth | 37 + - fc-lang/pl.orth | 16 - - fc-lang/pt.orth | 40 + - fc-lang/rm.orth | 13 - fc-lang/ro.orth | 6 - fc-lang/sk.orth | 31 + - fc-lang/sl.orth | 82 ++- - fc-lang/sq.orth | 7 - fc-lang/sr.orth | 25 + - fc-lang/sv.orth | 76 ++- - fc-lang/tr.orth | 34 + - fc-lang/uk.orth | 20 - - fc-lang/vot.orth | 5 + fc-lang/gd.orth | 23 +- + fc-lang/gl.orth | 7 +- + fc-lang/hr.orth | 33 +- + fc-lang/hu.orth | 13 +- + fc-lang/is.orth | 31 +- + fc-lang/it.orth | 24 +- + fc-lang/kk.orth | 15 +- + fc-lang/kl.orth | 35 +- + fc-lang/lt.orth | 11 +- + fc-lang/lv.orth | 7 +- + fc-lang/mt.orth | 50 ++- + fc-lang/nl.orth | 27 +- + fc-lang/no.orth | 49 ++- + fc-lang/oc.orth | 37 +- + fc-lang/pl.orth | 16 +- + fc-lang/pt.orth | 40 +- + fc-lang/rm.orth | 13 +- + fc-lang/ro.orth | 6 +- + fc-lang/sk.orth | 31 +- + fc-lang/sl.orth | 82 +++- + fc-lang/sq.orth | 7 +- + fc-lang/sr.orth | 25 +- + fc-lang/sv.orth | 76 +++- + fc-lang/tr.orth | 34 +- + fc-lang/uk.orth | 20 +- + fc-lang/vot.orth | 5 +- 44 files changed, 1799 insertions(+), 1244 deletions(-) commit 2458a6d8d8bbd9b0b6b999c2aa035816c0d825fa @@ -9937,7 +15360,7 @@ Date: Mon Aug 26 20:52:59 2002 +0000 ChangeLog | 3 ++ src/fontconfig.man | 68 - ++++++++++++++++++++++++++++------------------------ + +++++++++++++++++++++++++++------------------------ 2 files changed, 39 insertions(+), 32 deletions(-) commit f21f40f347afa81d1fcd4ae604bd3f164a3b2e90 @@ -9986,25 +15409,25 @@ Date: Thu Aug 22 07:36:45 2002 +0000 Reimplement FC_LANG as FcTypeLang, freeze patterns, other cleanup - ChangeLog | 22 ++ - fc-lang/fc-lang.c | 24 ++ + ChangeLog | 22 ++- + fc-lang/fc-lang.c | 24 ++- fc-lang/fclang.h | 556 - ++++++++++++++++++++++++----------------------- - fontconfig/fcprivate.h | 5 - fontconfig/fontconfig.h | 46 ++++ - src/fccache.c | 16 + - src/fccfg.c | 22 ++ - src/fccharset.c | 80 ++++--- - src/fcdbg.c | 5 - src/fcfreetype.c | 11 + - src/fcinit.c | 14 + + +++++++++++++++++++++++----------------------- + fontconfig/fcprivate.h | 5 +- + fontconfig/fontconfig.h | 46 ++++- + src/fccache.c | 16 +- + src/fccfg.c | 22 ++- + src/fccharset.c | 80 +++++--- + src/fcdbg.c | 5 +- + src/fcfreetype.c | 11 +- + src/fcinit.c | 14 +- src/fcint.h | 35 ++- - src/fclang.c | 431 ++++++++++++++++++++++++++++++++---- - src/fclist.c | 4 - src/fcmatch.c | 31 ++- - src/fcname.c | 29 ++ - src/fcpat.c | 301 +++++++++++++++++++++++++ - src/fcstr.c | 14 + + src/fclang.c | 431 +++++++++++++++++++++++++++++++----- + src/fclist.c | 4 +- + src/fcmatch.c | 31 +++- + src/fcname.c | 29 ++- + src/fcpat.c | 301 +++++++++++++++++++++++++- + src/fcstr.c | 14 +- 18 files changed, 1235 insertions(+), 411 deletions(-) commit f4fe447f49171d4b0ad69c8efcbadc555f211efa @@ -10026,25 +15449,25 @@ Date: Mon Aug 19 19:32:05 2002 +0000 config.h.in | 9 ---- config/Makedefs.in | 25 +++++----- configure.in | 117 - +++++++---------------------------------------- - fc-cache/Imakefile | 2 - + +++++++--------------------------------------- + fc-cache/Imakefile | 2 +- fc-lang/Imakefile | 4 +- fc-lang/ja.orth | 4 +- - fc-lang/ko.orth | 5 ++ - fc-lang/zh_cn.orth | 5 ++ + fc-lang/ko.orth | 5 ++- + fc-lang/zh_cn.orth | 5 ++- fc-lang/zh_sg.orth | 4 +- - fc-list/Imakefile | 2 - - fontconfig/fcprivate.h | 4 -- + fc-list/Imakefile | 2 +- + fontconfig/fcprivate.h | 4 +- fontconfig/fontconfig.h | 18 +++---- fonts.conf.in | 12 +++++ - src/Imakefile | 2 - + src/Imakefile | 2 +- src/fccache.c | 69 +++++++++++++++++----------- src/fccfg.c | 33 +++++-------- - src/fcdbg.c | 7 --- - src/fclist.c | 4 -- + src/fcdbg.c | 7 +-- + src/fclist.c | 4 +- src/fcmatch.c | 5 +- - src/fcname.c | 4 -- - src/fcpat.c | 43 ----------------- + src/fcname.c | 4 +- + src/fcpat.c | 43 +----------------- src/fcxml.c | 17 +------ src/fontconfig.man | 22 +++------ 24 files changed, 159 insertions(+), 277 deletions(-) @@ -10064,7 +15487,7 @@ Date: Mon Aug 12 22:20:11 2002 +0000 Clean up French orthography, update 639-1 list of supported languages - fc-lang/fclang.h | 2 - + fc-lang/fclang.h | 2 +- fc-lang/fr.orth | 59 +++++++++++++++----------- fc-lang/iso639-1 | 122 +++++++++++++++++++++++++++--------------------------- @@ -10078,20 +15501,20 @@ Date: Sun Aug 11 18:11:04 2002 +0000 with target qualifiers on test elements. Update library manual page. - fontconfig/fcprivate.h | 5 + - fontconfig/fontconfig.h | 23 ++- - fonts.conf.in | 9 + + fontconfig/fcprivate.h | 5 +- + fontconfig/fontconfig.h | 23 +++- + fonts.conf.in | 9 +- fonts.dtd | 4 + src/fccfg.c | 142 ++++++++------------ src/fcdbg.c | 29 +++- src/fcint.h | 19 ++- - src/fclist.c | 4 - - src/fcmatch.c | 19 --- - src/fcname.c | 4 - - src/fcpat.c | 43 ++++++ + src/fclist.c | 4 +- + src/fcmatch.c | 19 +--- + src/fcname.c | 4 +- + src/fcpat.c | 43 ++++++- src/fcxml.c | 33 ++++- src/fontconfig.man | 332 - ++++++++++++++++++++++++++++++++++++++++++++--- + +++++++++++++++++++++++++++++++++++++++++++---- 13 files changed, 510 insertions(+), 156 deletions(-) commit 80a7d664395d62cc335ac93b9918efebca00c117 @@ -10113,10 +15536,10 @@ Date: Thu Aug 8 00:10:51 2002 +0000 Tigrinya, Tsonga, Twi, Uighur, Urdu, Xhosa and Zulu orthographies - fc-lang/Imakefile | 42 + - fc-lang/aa.orth | 40 + + fc-lang/Imakefile | 42 +- + fc-lang/aa.orth | 40 ++ fc-lang/am.orth | 28 + - fc-lang/ay.orth | 37 + + fc-lang/ay.orth | 37 ++ fc-lang/bin.orth | 55 ++ fc-lang/dz.orth | 28 + fc-lang/fclang.h | 1752 @@ -10126,9 +15549,9 @@ Date: Thu Aug 8 00:10:51 2002 +0000 fc-lang/ia.orth | 29 + fc-lang/ie.orth | 29 + fc-lang/io.orth | 29 + - fc-lang/iso639-2 | 48 + + fc-lang/iso639-2 | 48 +- fc-lang/ki.orth | 33 + - fc-lang/my.orth | 37 + + fc-lang/my.orth | 37 ++ fc-lang/om.orth | 29 + fc-lang/so.orth | 29 + fc-lang/sw.orth | 29 + @@ -10149,20 +15572,20 @@ Date: Wed Aug 7 17:34:15 2002 +0000 Scots, Syriac and Votic orthographies - fc-lang/Imakefile | 39 + - fc-lang/ast.orth | 47 + - fc-lang/cu.orth | 42 + + fc-lang/Imakefile | 39 +- + fc-lang/ast.orth | 47 ++ + fc-lang/cu.orth | 42 ++ fc-lang/fclang.h | 1776 ++++++++++++++++++++++++++++------------------------- - fc-lang/fur.orth | 39 + - fc-lang/fy.orth | 26 + + fc-lang/fur.orth | 39 ++ + fc-lang/fy.orth | 26 +- fc-lang/gv.orth | 31 + - fc-lang/iso639-2 | 20 - + fc-lang/iso639-2 | 20 +- fc-lang/kw.orth | 35 + fc-lang/sco.orth | 32 + fc-lang/syr.orth | 29 + - fc-lang/to.orth | 4 - fc-lang/vot.orth | 37 + + fc-lang/to.orth | 4 +- + fc-lang/vot.orth | 37 ++ 13 files changed, 1300 insertions(+), 857 deletions(-) commit bd724c85969f7c24cf17b8780217c5a428555ea4 @@ -10210,7 +15633,7 @@ Date: Tue Aug 6 18:59:43 2002 +0000 Add Latin-1 characters needed by Welsh - fc-lang/cy.orth | 17 + + fc-lang/cy.orth | 17 +- fc-lang/fclang.h | 1430 +++++++++++++++++++++++++++--------------------------- 2 files changed, 733 insertions(+), 714 deletions(-) @@ -10277,13 +15700,13 @@ Date: Sun Jul 28 10:50:59 2002 +0000 Rewrite global cache handling code in fontconfig to eliminate per-file syscalls - fontconfig/fontconfig.h | 5 + fontconfig/fontconfig.h | 5 +- src/fccache.c | 968 +++++++++++++++++++++++++++++++---------------- - src/fccfg.c | 23 - - src/fcdir.c | 183 ++++----- - src/fcint.h | 126 ++++-- - src/fcmatrix.c | 9 + src/fccfg.c | 23 +- + src/fcdir.c | 183 +++++----- + src/fcint.h | 126 +++++-- + src/fcmatrix.c | 9 +- 6 files changed, 830 insertions(+), 484 deletions(-) commit 23cd70c4ef2b5c959959275d9d7f282029ae69f5 @@ -10292,10 +15715,10 @@ Date: Sat Jul 27 23:13:28 2002 +0000 Add ngai tahu specific chars to maori orthography - fc-lang/Imakefile | 1 + fc-lang/Imakefile | 1 + fc-lang/fclang.h | 802 +++++++++++++++++++++++++++-------------------------- - fc-lang/mi.orth | 1 + fc-lang/mi.orth | 1 + 3 files changed, 405 insertions(+), 399 deletions(-) commit 1a9ae91a1693df1bfe93f34747584b0ff5dce014 @@ -10335,12 +15758,12 @@ Date: Sat Jul 13 05:43:25 2002 +0000 name table for sfnt fonts - fontconfig/fontconfig.h | 23 +++ - src/fccharset.c | 40 ++++- + fontconfig/fontconfig.h | 23 +++- + src/fccharset.c | 40 +++++-- src/fcfreetype.c | 342 - ++++++++++++++++++++++++++++++++++++++++++++++- + +++++++++++++++++++++++++++++++++++++++++++++-- src/fcint.h | 11 ++ - src/fcstr.c | 99 +++++++++++++- + src/fcstr.c | 99 ++++++++++++++- 5 files changed, 495 insertions(+), 20 deletions(-) commit c80d2ac4866d4c534a8693d611ed85b84c11d009 @@ -10353,28 +15776,28 @@ Date: Fri Jul 12 21:06:03 2002 +0000 during cache building when missing only a few - fc-lang/bg.orth | 13 - fc-lang/bi.orth | 10 - fc-lang/bo.orth | 17 - - fc-lang/el.orth | 20 - + fc-lang/bg.orth | 13 +- + fc-lang/bi.orth | 10 +- + fc-lang/bo.orth | 17 +- + fc-lang/el.orth | 20 +- fc-lang/fclang.h | 1630 ++++++++++++++++++++++++++---------------------------- - fc-lang/ga.orth | 4 - fc-lang/gn.orth | 4 - fc-lang/hy.orth | 6 - fc-lang/km.orth | 6 - fc-lang/ko.orth | 128 ++-- - fc-lang/lb.orth | 10 - fc-lang/mg.orth | 6 - fc-lang/mh.orth | 14 - fc-lang/mk.orth | 12 - fc-lang/mn.orth | 14 - fc-lang/mo.orth | 4 - fc-lang/ro.orth | 4 - fc-lang/si.orth | 8 - fc-lang/tl.orth | 11 - fc-lang/yo.orth | 80 +-- - src/fclang.c | 33 + + fc-lang/ga.orth | 4 +- + fc-lang/gn.orth | 4 +- + fc-lang/hy.orth | 6 +- + fc-lang/km.orth | 6 +- + fc-lang/ko.orth | 128 +++--- + fc-lang/lb.orth | 10 +- + fc-lang/mg.orth | 6 +- + fc-lang/mh.orth | 14 +- + fc-lang/mk.orth | 12 +- + fc-lang/mn.orth | 14 +- + fc-lang/mo.orth | 4 +- + fc-lang/ro.orth | 4 +- + fc-lang/si.orth | 8 +- + fc-lang/tl.orth | 11 +- + fc-lang/yo.orth | 80 ++-- + src/fclang.c | 33 +- 21 files changed, 1017 insertions(+), 1017 deletions(-) commit b4a2c1f012c9c05cd14e43544570371ba2ca1134 @@ -10383,17 +15806,17 @@ Date: Fri Jul 12 19:19:16 2002 +0000 Add a bunch more languages that use the Latin alphabet - fc-lang/Imakefile | 35 + - fc-lang/af.orth | 46 + + fc-lang/Imakefile | 35 +- + fc-lang/af.orth | 46 ++ fc-lang/bam.orth | 37 + - fc-lang/bi.orth | 39 + - fc-lang/bs.orth | 39 + + fc-lang/bi.orth | 39 ++ + fc-lang/bs.orth | 39 ++ fc-lang/ch.orth | 35 + - fc-lang/cy.orth | 48 + + fc-lang/cy.orth | 48 ++ fc-lang/fclang.h | 1900 - ++++++++++++++++++++++++++++++++++------------------- - fc-lang/ful.orth | 38 + - fc-lang/gn.orth | 48 + + +++++++++++++++++++++++++++++++++-------------------- + fc-lang/ful.orth | 38 ++ + fc-lang/gn.orth | 48 ++ fc-lang/ha.orth | 36 + fc-lang/haw.orth | 35 + fc-lang/ibo.orth | 35 + @@ -10401,24 +15824,24 @@ Date: Fri Jul 12 19:19:16 2002 +0000 fc-lang/iso639-2 | 64 +- fc-lang/lb.orth | 60 ++ fc-lang/mg.orth | 35 + - fc-lang/mh.orth | 45 + + fc-lang/mh.orth | 45 ++ fc-lang/mi.orth | 34 + fc-lang/ny.orth | 30 + fc-lang/se.orth | 37 + fc-lang/sm.orth | 30 + fc-lang/sma.orth | 37 + fc-lang/smj.orth | 37 + - fc-lang/smn.orth | 40 + - fc-lang/sms.orth | 48 + + fc-lang/smn.orth | 40 ++ + fc-lang/sms.orth | 48 ++ fc-lang/tn.orth | 33 + fc-lang/to.orth | 30 + fc-lang/ven.orth | 34 + fc-lang/vi.orth | 58 ++ - fc-lang/wen.orth | 42 + - fc-lang/wo.orth | 42 + + fc-lang/wen.orth | 42 ++ + fc-lang/wo.orth | 42 ++ fc-lang/yap.orth | 35 + - fc-lang/yo.orth | 86 ++ - src/fcxml.c | 12 + fc-lang/yo.orth | 86 +++ + src/fcxml.c | 12 +- 35 files changed, 2522 insertions(+), 749 deletions(-) commit 3f03d0c2ac9ec2050abf56b4ce48fff987b55ac0 @@ -10428,24 +15851,24 @@ Date: Fri Jul 12 09:13:32 2002 +0000 Add nynorsk and bokml, remove double angle quotes from other languages fc-lang/Imakefile | 31 +- - fc-lang/ab.orth | 6 - fc-lang/ba.orth | 6 - fc-lang/be.orth | 6 - fc-lang/br.orth | 8 - fc-lang/da.orth | 6 - fc-lang/de.orth | 6 + fc-lang/ab.orth | 6 +- + fc-lang/ba.orth | 6 +- + fc-lang/be.orth | 6 +- + fc-lang/br.orth | 8 +- + fc-lang/da.orth | 6 +- + fc-lang/de.orth | 6 +- fc-lang/fclang.h | 854 +++++++++++++++++++++++++++-------------------------- - fc-lang/fr.orth | 10 - - fc-lang/gl.orth | 10 - - fc-lang/iso639-2 | 4 - fc-lang/kk.orth | 6 - fc-lang/kl.orth | 6 + fc-lang/fr.orth | 10 +- + fc-lang/gl.orth | 10 +- + fc-lang/iso639-2 | 4 +- + fc-lang/kk.orth | 6 +- + fc-lang/kl.orth | 6 +- fc-lang/nb.orth | 25 ++ fc-lang/nn.orth | 43 +++ - fc-lang/no.orth | 6 - fc-lang/ru.orth | 6 - fc-lang/uk.orth | 6 + fc-lang/no.orth | 6 +- + fc-lang/ru.orth | 6 +- + fc-lang/uk.orth | 6 +- 18 files changed, 565 insertions(+), 480 deletions(-) commit c2b971c89819281be41584720d20648fe5d1627f @@ -10454,9 +15877,9 @@ Date: Fri Jul 12 07:58:16 2002 +0000 Missed adding kumyk - fc-lang/Imakefile | 19 ++++++---- + fc-lang/Imakefile | 19 +++++----- fc-lang/fclang.h | 74 +++++++++++++++++++++-------------------- - fc-lang/iso639-2 | 2 + + fc-lang/iso639-2 | 2 +- fc-lang/kum.orth | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+), 46 deletions(-) @@ -10467,39 +15890,39 @@ Date: Fri Jul 12 07:52:16 2002 +0000 Add devanagari and cyrillic languages. Add Geez - fc-lang/Imakefile | 36 + - fc-lang/ava.orth | 97 +++ + fc-lang/Imakefile | 36 +- + fc-lang/ava.orth | 97 ++++ fc-lang/bh.orth | 25 + fc-lang/bho.orth | 25 + - fc-lang/bua.orth | 102 +++ - fc-lang/ce.orth | 97 +++ + fc-lang/bua.orth | 102 ++++ + fc-lang/ce.orth | 97 ++++ fc-lang/chm.orth | 109 ++++ fc-lang/cv.orth | 109 ++++ fc-lang/fclang.h | 1612 +++++++++++++++++++++++++++++++---------------------- fc-lang/gez.orth | 57 ++ - fc-lang/hi.orth | 35 + - fc-lang/ik.orth | 100 +++ + fc-lang/hi.orth | 35 ++ + fc-lang/ik.orth | 100 ++++ fc-lang/iso639-2 | 54 +- fc-lang/iu.orth | 77 +++ fc-lang/kaa.orth | 110 ++++ fc-lang/kok.orth | 25 + fc-lang/ks.orth | 25 + - fc-lang/ku.orth | 94 +++ - fc-lang/kv.orth | 101 +++ - fc-lang/ky.orth | 102 +++ - fc-lang/lez.orth | 97 +++ + fc-lang/ku.orth | 94 ++++ + fc-lang/kv.orth | 101 ++++ + fc-lang/ky.orth | 102 ++++ + fc-lang/lez.orth | 97 ++++ fc-lang/mr.orth | 25 + fc-lang/ne.orth | 25 + - fc-lang/os.orth | 96 +++ + fc-lang/os.orth | 96 ++++ fc-lang/sa.orth | 25 + fc-lang/sah.orth | 108 ++++ - fc-lang/sel.orth | 96 +++ + fc-lang/sel.orth | 96 ++++ fc-lang/tg.orth | 108 ++++ - fc-lang/tk.orth | 106 +++ + fc-lang/tk.orth | 106 ++++ fc-lang/tt.orth | 108 ++++ - fc-lang/tyv.orth | 102 +++ - fc-lang/uz.orth | 98 +++ + fc-lang/tyv.orth | 102 ++++ + fc-lang/uz.orth | 98 ++++ 32 files changed, 3278 insertions(+), 708 deletions(-) commit 2ce525423688d32b80587741d97a82209e52378c @@ -10550,15 +15973,15 @@ Date: Tue Jul 9 02:28:29 2002 +0000 possible bug in charset walking - fc-lang/Imakefile | 18 - fc-lang/fa.orth | 53 + + fc-lang/Imakefile | 18 +- + fc-lang/fa.orth | 53 ++ fc-lang/fclang.h | 1428 +++++++++++++++++++++------------ - fc-lang/iso639-2 | 4 + fc-lang/iso639-2 | 4 +- fc-lang/zh_hk.orth | 2240 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - fc-lang/zh_tw.orth | 33 - - src/fccharset.c | 4 - src/fcfreetype.c | 6 + fc-lang/zh_tw.orth | 33 +- + src/fccharset.c | 4 +- + src/fcfreetype.c | 6 +- 8 files changed, 3229 insertions(+), 557 deletions(-) commit e50b9ae71134a23820e8f50589649e629a6143ba @@ -10571,17 +15994,17 @@ Date: Mon Jul 8 07:31:53 2002 +0000 OS/2 for Han exclusion, restructure fclang.c to use fclang.h from fc-lang dir - fc-lang/Imakefile | 8 + fc-lang/Imakefile | 8 +- fc-lang/fclang.h | 2624 - +++++++++++++++++++++++++++++++++++++++++++++++++ - fc-lang/fclang.tmpl.c | 130 -- - fc-lang/fclang.tmpl.h | 25 - fc-lang/iso639-2 | 30 - - fc-lang/ka.orth | 5 + ++++++++++++++++++++++++++++++++++++++++++++++++ + fc-lang/fclang.tmpl.c | 130 --- + fc-lang/fclang.tmpl.h | 25 + + fc-lang/iso639-2 | 30 +- + fc-lang/ka.orth | 5 +- fc-lang/zh_mo.orth | 27 + fc-lang/zh_sg.orth | 27 + - src/fcfreetype.c | 238 +--- - src/fcint.h | 9 + src/fcfreetype.c | 238 +---- + src/fcint.h | 9 +- src/fclang.c | 2632 +------------------------------------------------ 11 files changed, 2794 insertions(+), 2961 deletions(-) @@ -10592,7 +16015,7 @@ Date: Sun Jul 7 19:30:53 2002 +0000 Add walloon, update fclang.c to include recent language additions - fc-lang/Imakefile | 4 + fc-lang/Imakefile | 4 +- fc-lang/wa.orth | 47 ++ src/fclang.c | 1252 ++++++++++++++++++++++++++++++----------------------- @@ -10713,15 +16136,15 @@ Date: Sat Jul 6 23:47:44 2002 +0000 Switch to RFC 3066 based lang names - fontconfig/fontconfig.h | 5 - - src/Imakefile | 8 - - src/fccharset.c | 8 - + fontconfig/fontconfig.h | 5 +- + src/Imakefile | 8 +- + src/fccharset.c | 8 +- src/fcfreetype.c | 406 ++++++++++++++++++++++++----------------------- - src/fcint.h | 28 +++ - src/fcmatch.c | 43 +++++ - src/fcpat.c | 22 ++- - src/fcstr.c | 25 +++ + src/fcint.h | 28 ++++ + src/fcmatch.c | 43 +++++- + src/fcpat.c | 22 +++- + src/fcstr.c | 25 +++- 8 files changed, 330 insertions(+), 215 deletions(-) commit 899e352656f04323b9467555faf9152c69a741ab @@ -10750,75 +16173,75 @@ Date: Sat Jul 6 23:21:37 2002 +0000 Add fc-lang program to generate language coverage tables - fc-lang/Imakefile | 44 - fc-lang/ab.orth | 17 - fc-lang/ar.orth | 49 - fc-lang/az.orth | 26 - fc-lang/ba.orth | 16 - fc-lang/be.orth | 11 - fc-lang/bg.orth | 12 - fc-lang/br.orth | 17 - fc-lang/ca.orth | 23 - fc-lang/chr.orth | 2 - fc-lang/co.orth | 2 - fc-lang/cs.orth | 27 - fc-lang/da.orth | 27 - fc-lang/de.orth | 17 - fc-lang/el.orth | 26 - fc-lang/en.orth | 17 - fc-lang/eo.orth | 9 - fc-lang/es.orth | 19 - fc-lang/et.orth | 15 - fc-lang/eu.orth | 8 + fc-lang/Imakefile | 44 + + fc-lang/ab.orth | 17 + + fc-lang/ar.orth | 49 + + fc-lang/az.orth | 26 + + fc-lang/ba.orth | 16 + + fc-lang/be.orth | 11 + + fc-lang/bg.orth | 12 + + fc-lang/br.orth | 17 + + fc-lang/ca.orth | 23 + + fc-lang/chr.orth | 2 + + fc-lang/co.orth | 2 + + fc-lang/cs.orth | 27 + + fc-lang/da.orth | 27 + + fc-lang/de.orth | 17 + + fc-lang/el.orth | 26 + + fc-lang/en.orth | 17 + + fc-lang/eo.orth | 9 + + fc-lang/es.orth | 19 + + fc-lang/et.orth | 15 + + fc-lang/eu.orth | 8 + fc-lang/fc-lang.c | 295 + - fc-lang/fc-lang.man | 41 - fc-lang/fclang.tmpl.c | 130 - fc-lang/fi.orth | 15 - fc-lang/fo.orth | 25 - fc-lang/fr.orth | 28 - fc-lang/fy.orth | 2 - fc-lang/ga.orth | 29 - fc-lang/gd.orth | 15 - fc-lang/gl.orth | 22 - fc-lang/he.orth | 2 - fc-lang/hr.orth | 21 - fc-lang/hu.orth | 19 - fc-lang/hy.orth | 5 - fc-lang/is.orth | 26 - fc-lang/it.orth | 14 + fc-lang/fc-lang.man | 41 + + fc-lang/fclang.tmpl.c | 130 + + fc-lang/fi.orth | 15 + + fc-lang/fo.orth | 25 + + fc-lang/fr.orth | 28 + + fc-lang/fy.orth | 2 + + fc-lang/ga.orth | 29 + + fc-lang/gd.orth | 15 + + fc-lang/gl.orth | 22 + + fc-lang/he.orth | 2 + + fc-lang/hr.orth | 21 + + fc-lang/hu.orth | 19 + + fc-lang/hy.orth | 5 + + fc-lang/is.orth | 26 + + fc-lang/it.orth | 14 + fc-lang/ja.orth | 6540 ++++++++++++++++++++ - fc-lang/ka.orth | 9 - fc-lang/kk.orth | 15 - fc-lang/kl.orth | 23 + fc-lang/ka.orth | 9 + + fc-lang/kk.orth | 15 + + fc-lang/kl.orth | 23 + fc-lang/ko.orth |16217 +++++++++++++++++++++++++++++++++++++++++++++++++ - fc-lang/la.orth | 8 - fc-lang/lt.orth | 13 - fc-lang/lv.orth | 16 - fc-lang/mk.orth | 15 - fc-lang/mo.orth | 14 - fc-lang/mt.orth | 18 - fc-lang/nl.orth | 15 - fc-lang/no.orth | 18 - fc-lang/oc.orth | 15 - fc-lang/pl.orth | 10 - fc-lang/pt.orth | 19 - fc-lang/rm.orth | 15 - fc-lang/ro.orth | 11 - fc-lang/ru.orth | 11 - fc-lang/sh.orth | 2 - fc-lang/sk.orth | 29 - fc-lang/sl.orth | 21 - fc-lang/sq.orth | 7 - fc-lang/sr.orth | 11 - fc-lang/sv.orth | 21 - fc-lang/th.orth | 3 - fc-lang/tr.orth | 12 - fc-lang/uk.orth | 12 - fc-lang/vo.orth | 13 - fc-lang/yi.orth | 2 - fc-lang/zh_cn.orth | 6766 ++++++++++++++++++++ - fc-lang/zh_tw.orth |13079 ++++++++++++++++++++++++++++++++++++++++ + fc-lang/la.orth | 8 + + fc-lang/lt.orth | 13 + + fc-lang/lv.orth | 16 + + fc-lang/mk.orth | 15 + + fc-lang/mo.orth | 14 + + fc-lang/mt.orth | 18 + + fc-lang/nl.orth | 15 + + fc-lang/no.orth | 18 + + fc-lang/oc.orth | 15 + + fc-lang/pl.orth | 10 + + fc-lang/pt.orth | 19 + + fc-lang/rm.orth | 15 + + fc-lang/ro.orth | 11 + + fc-lang/ru.orth | 11 + + fc-lang/sh.orth | 2 + + fc-lang/sk.orth | 29 + + fc-lang/sl.orth | 21 + + fc-lang/sq.orth | 7 + + fc-lang/sr.orth | 11 + + fc-lang/sv.orth | 21 + + fc-lang/th.orth | 3 + + fc-lang/tr.orth | 12 + + fc-lang/uk.orth | 12 + + fc-lang/vo.orth | 13 + + fc-lang/yi.orth | 2 + + fc-lang/zh_cn.orth | 6766 +++++++++++++++++++++ + fc-lang/zh_tw.orth |13079 +++++++++++++++++++++++++++++++++++++++ 68 files changed, 44053 insertions(+), 0 deletions(-) commit 084407063d0069b16b24e1fd8be818af12e36741 @@ -10883,15 +16306,15 @@ Date: Sat Jun 29 20:31:02 2002 +0000 automatic lang computation - src/fccfg.c | 3 - src/fccharset.c | 40 + + src/fccfg.c | 3 +- + src/fccharset.c | 40 +- src/fcfreetype.c | 235 ++++++- - src/fcint.h | 15 + src/fcint.h | 15 +- src/fcknownsets.h | 1895 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/fcmatch.c | 112 ++- - src/fcname.c | 7 - src/fcpat.c | 3 + src/fcmatch.c | 112 ++-- + src/fcname.c | 7 +- + src/fcpat.c | 3 +- 8 files changed, 2222 insertions(+), 88 deletions(-) commit 5c7fb8274ce9c2c561cbcf73b9ee98003f516a9b @@ -11055,8 +16478,8 @@ Date: Sat Jun 8 17:32:05 2002 +0000 Add FcPatternHash, clean up a few valgrind issues fontconfig/fontconfig.h | 3 ++ - src/fccfg.c | 2 + - src/fcmatch.c | 11 ++++--- + src/fccfg.c | 2 +- + src/fcmatch.c | 11 ++++-- src/fcpat.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ src/fcxml.c | 13 +++++++- @@ -11091,9 +16514,9 @@ Date: Mon Jun 3 08:31:15 2002 +0000 Add FcPatternEqualSubset for Pango, clean up some internal FcPattern interfaces - fontconfig/fontconfig.h | 7 +- + fontconfig/fontconfig.h | 7 ++- src/fccfg.c | 12 ++-- - src/fcint.h | 7 +- + src/fcint.h | 7 ++- src/fclist.c | 72 +++++++++++++-------- src/fcmatch.c | 6 +- src/fcname.c | 8 +- @@ -11182,12 +16605,12 @@ Date: Fri May 31 04:42:42 2002 +0000 Change FcCharSet datastructure, add FcFontSort API - fontconfig/fontconfig.h | 9 - - src/fccharset.c | 772 + fontconfig/fontconfig.h | 9 +- + src/fccharset.c | 770 +++++++++++++++++++++++++---------------------- - src/fcint.h | 27 -- - src/fcmatch.c | 26 ++ - 4 files changed, 451 insertions(+), 383 deletions(-) + src/fcint.h | 27 +-- + src/fcmatch.c | 26 ++- + 4 files changed, 450 insertions(+), 382 deletions(-) commit bc9469baadc6b5f9a920a476e460113bab518208 Author: Keith Packard @@ -11195,10 +16618,10 @@ Date: Wed May 29 22:07:33 2002 +0000 Optimize after profiling. Fix FcStrCmp to return correct sign - src/fccharset.c | 103 ++++++++++++++++++++++++++++++---------- - src/fcint.h | 1 + src/fccharset.c | 103 ++++++++++++++++++++++++++++++--------- + src/fcint.h | 1 + src/fcmatch.c | 143 - +++++++++++++++++++++++++++++++++++++++++-------------- + ++++++++++++++++++++++++++++++++++++++++-------------- src/fcname.c | 4 +- src/fcpat.c | 13 ++--- src/fcstr.c | 6 +- @@ -11212,11 +16635,11 @@ Date: Wed May 29 08:21:33 2002 +0000 FcCharSet primitives and FcFontSetSort - fontconfig/fontconfig.h | 8 ++ + fontconfig/fontconfig.h | 8 ++- src/fccfg.c | 10 +- src/fccharset.c | 197 - +++++++++++++++++++++++++++++++++++++++++++++-- - src/fcint.h | 3 - + ++++++++++++++++++++++++++++++++++++++++++++--- + src/fcint.h | 3 +- src/fcmatch.c | 23 ++++- 5 files changed, 219 insertions(+), 22 deletions(-) @@ -11248,9 +16671,9 @@ Date: Fri May 24 06:25:52 2002 +0000 Makefile.in | 67 +++++++++++++++++++++++++++++++++--------------- fc-cache/Makefile.in | 23 ++++++++++------ - fc-list/Makefile.in | 22 ++++++++++------ - fontconfig/Makefile.in | 24 +++++++++-------- - src/Makefile.in | 48 ++++++++++++++++++++++++---------- + fc-list/Makefile.in | 22 ++++++++++----- + fontconfig/Makefile.in | 24 ++++++++-------- + src/Makefile.in | 48 +++++++++++++++++++++++---------- 5 files changed, 119 insertions(+), 65 deletions(-) commit 36732012151a91527f3ad7ad05569f40a0ca3cd9 @@ -11303,7 +16726,7 @@ Date: Thu May 23 17:06:46 2002 +0000 INSTALL | 17 +++++++-- Imakefile | 33 +++++++++++++++++- - Makefile.in | 18 +++++++++- + Makefile.in | 18 ++++++++- README | 13 +++++++ config/config-subst | 8 ++++ configure.in | 18 ++++++---- @@ -11337,15 +16760,15 @@ Date: Wed May 22 04:37:07 2002 +0000 Replace silly avl sort with qsort, add FcPatternEqual - fontconfig/fontconfig.h | 8 + - src/Imakefile | 6 - - src/Makefile.in | 4 + fontconfig/fontconfig.h | 8 +- + src/Imakefile | 6 +- + src/Makefile.in | 4 +- src/fcavl.c | 419 ----------------------------------------------- src/fcavl.h | 46 ----- - src/fcmatch.c | 76 ++++----- - src/fcpat.c | 109 ++++++++++++ - src/fcxml.c | 9 + + src/fcmatch.c | 76 +++++---- + src/fcpat.c | 109 ++++++++++++- + src/fcxml.c | 9 +- 8 files changed, 162 insertions(+), 515 deletions(-) commit 446bb9c9e0a18d365de0578c6f0daf676e36f168 @@ -11354,16 +16777,16 @@ Date: Tue May 21 17:48:15 2002 +0000 More autoconf cleanup for fontconfig - Makefile.in | 8 +++---- + Makefile.in | 8 ++---- config.h.in | 2 +- config/Makedefs.in | 10 ++++++++- configure.in | 55 - +++++++++++++++++++++++--------------------------- - fc-cache/Makefile.in | 4 +++- - fc-list/Makefile.in | 4 +++- - src/Imakefile | 4 ++-- - src/Makefile.in | 5 +---- - src/fcinit.c | 4 ++-- + ++++++++++++++++++++++--------------------------- + fc-cache/Makefile.in | 4 ++- + fc-list/Makefile.in | 4 ++- + src/Imakefile | 4 +- + src/Makefile.in | 5 +--- + src/fcinit.c | 4 +- 9 files changed, 49 insertions(+), 47 deletions(-) commit fb9545b1ba81604405f730de8c39f40b3fdc13bd @@ -11372,18 +16795,18 @@ Date: Tue May 21 17:08:42 2002 +0000 Fix xmkmf build process for fontconfig - Imakefile | 2 + Imakefile | 2 +- Makefile.in | 54 +++++++++ - acconfig.h | 2 + acconfig.h | 2 - config.h.in | 144 +++++++++++++++++++++++ configure.in | 360 - +++++++++++++++++++++++++++++++++++++++++++-------------- - cvscompile.sh | 11 +- - findfonts | 8 - - fonts.conf.in | 77 ++++++------ - fonts.dtd | 13 ++ + ++++++++++++++++++++++++++++++++++++++++++-------------- + cvscompile.sh | 11 ++- + findfonts | 8 +- + fonts.conf.in | 77 ++++++------- + fonts.dtd | 13 ++- local.def | 54 +++++++++ - setfontdirs | 4 - + setfontdirs | 4 +- 11 files changed, 581 insertions(+), 148 deletions(-) commit 179c39959cc9c19004f8ca948623590e404c8c46 @@ -11392,26 +16815,26 @@ Date: Tue May 21 17:06:22 2002 +0000 Fix autoconf build process for fontconfig - config/Makedefs.in | 68 ++ + config/Makedefs.in | 68 +++ config/config.guess | 1391 +++++++++++++++++++++++++++++++++++++++++++++++ config/config.sub | 1355 - ++++++++++++++++++++++++++++++++++++++++++++++ + +++++++++++++++++++++++++++++++++++++++++++++ config/install.sh | 240 ++++++++ - fc-cache/Imakefile | 7 + fc-cache/Imakefile | 7 +- fc-cache/Makefile.in | 46 ++ - fc-cache/fc-cache.c | 161 ++++- + fc-cache/fc-cache.c | 161 ++++-- fc-list/Makefile.in | 46 ++ - fontconfig/fontconfig.h | 80 ++- + fontconfig/fontconfig.h | 80 +++- src/Makefile.in | 105 ++++ - src/fccache.c | 164 ++++-- + src/fccache.c | 164 +++++- src/fccfg.c | 352 ++++++++---- - src/fcdir.c | 84 ++- + src/fcdir.c | 84 +++- src/fcinit.c | 109 +++- - src/fcint.h | 52 ++ - src/fclist.c | 5 - src/fcstr.c | 228 ++++++++ - src/fcxml.c | 215 +++++-- + src/fcint.h | 52 ++- + src/fclist.c | 5 +- + src/fcstr.c | 228 ++++++++- + src/fcxml.c | 215 +++++--- 18 files changed, 4377 insertions(+), 331 deletions(-) commit 1ce2a1bbadc15147e35dbc4c43fae072b8c4805e @@ -11475,7 +16898,7 @@ Date: Sun Mar 3 18:39:05 2002 +0000 src/fcavl.c | 419 +++++++++++++++++++++++++++++++++++++++++++++++ src/fcavl.h | 46 +++++ - src/fcmatch.c | 225 ++++++++++++++++++++++--- + src/fcmatch.c | 225 ++++++++++++++++++++++---- 4 files changed, 671 insertions(+), 33 deletions(-) commit ee9061efe984a3c5b659449f8db57a03b6bf5d13 @@ -11512,7 +16935,7 @@ Date: Sun Mar 3 00:19:43 2002 +0000 Add fcatomic.c - src/Imakefile | 4 + + src/Imakefile | 4 +- src/fcatomic.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/fccache.c | 4 + @@ -11644,12 +17067,12 @@ Date: Mon Feb 18 22:29:28 2002 +0000 Switch fontconfig from libxml2 to expat - src/Imakefile | 3 - src/fccharset.c | 12 - src/fcdbg.c | 20 + - src/fcint.h | 34 + - src/fcname.c | 98 --- - src/fcstr.c | 92 +++ + src/Imakefile | 3 +- + src/fccharset.c | 12 +- + src/fcdbg.c | 20 +- + src/fcint.h | 34 +- + src/fcname.c | 98 +--- + src/fcstr.c | 92 +++- src/fcxml.c | 1744 +++++++++++++++++++++++++++++++++++++------------------ 7 files changed, 1316 insertions(+), 687 deletions(-) @@ -11680,25 +17103,25 @@ Date: Fri Feb 15 06:01:28 2002 +0000 fontconfig library: build fixes and compiler warning fixes - fc-cache/Imakefile | 2 - - fc-list/Imakefile | 2 - - fc-list/fc-list.c | 5 + - fontconfig/fcfreetype.h | 1 - fontconfig/fcprivate.h | 2 - - fontconfig/fcxml.h | 2 - + fc-cache/Imakefile | 2 +- + fc-list/Imakefile | 2 +- + fc-list/fc-list.c | 5 +- + fontconfig/fcfreetype.h | 1 + + fontconfig/fcprivate.h | 2 +- + fontconfig/fcxml.h | 2 +- fontconfig/fontconfig.h | 61 ++++++++-------- src/fccache.c | 176 +++++++++++++++++++++++++++++------------------ src/fccfg.c | 126 +++++++++++++++++----------------- src/fccharset.c | 23 +++--- - src/fcdir.c | 58 ++++++++------- + src/fcdir.c | 58 ++++++++-------- src/fcfreetype.c | 106 ++++++++++++++-------------- - src/fcinit.c | 2 - - src/fcint.h | 74 +++++++------------- + src/fcinit.c | 2 +- + src/fcint.h | 74 ++++++++------------ src/fcmatch.c | 7 +- - src/fcname.c | 92 ++++++++++++------------- - src/fcpat.c | 10 +-- - src/fcstr.c | 32 ++++----- + src/fcname.c | 92 ++++++++++++------------ + src/fcpat.c | 10 ++-- + src/fcstr.c | 32 ++++---- src/fcxml.c | 135 ++++++++++++++++++------------------ 19 files changed, 473 insertions(+), 443 deletions(-) @@ -11709,10 +17132,10 @@ Date: Fri Feb 15 00:49:44 2002 +0000 Update fontconfig and libxml2 to get them working with in-tree build process - fc-cache/Imakefile | 12 +++-------- - fc-list/Imakefile | 13 +++--------- + fc-cache/Imakefile | 12 ++-------- + fc-list/Imakefile | 13 ++--------- src/Imakefile | 55 - ++++++---------------------------------------------- + +++++---------------------------------------------- 3 files changed, 12 insertions(+), 68 deletions(-) commit 82e6d72059aaa4beccb2ec39706ef86e99e479de @@ -11728,3 +17151,50 @@ Author: Keith Packard Date: Thu Feb 14 23:34:13 2002 +0000 Initial revision + + AUTHORS | 1 + + COPYING | 22 + + INSTALL | 3 + + Imakefile | 25 + + README | 2 + + acconfig.h | 2 + + configure.in | 202 +++++++ + cvscompile.sh | 6 + + doc/fontconfig.tex | 55 ++ + fc-cache/Imakefile | 19 + + fc-cache/fc-cache.c | 145 +++++ + fc-cache/fc-cache.man | 45 ++ + fc-list/Imakefile | 17 + + fc-list/fc-list.c | 128 ++++ + fc-list/fc-list.man | 36 ++ + findfonts | 8 + + fontconfig/Imakefile | 8 + + fontconfig/fcfreetype.h | 34 + + fontconfig/fcprivate.h | 117 ++++ + fontconfig/fcxml.h | 37 ++ + fontconfig/fontconfig.h | 551 +++++++++++++++++ + fonts.conf.in | 191 ++++++ + fonts.dtd | 165 +++++ + setfontdirs | 19 + + src/Imakefile | 90 +++ + src/fcblanks.c | 84 +++ + src/fccache.c | 592 ++++++++++++++++++ + src/fccfg.c | 1369 ++++++++++++++++++++++++++++++++++++++++++ + src/fccharset.c | 1521 + +++++++++++++++++++++++++++++++++++++++++++++++ + src/fcdbg.c | 272 +++++++++ + src/fcdefault.c | 87 +++ + src/fcdir.c | 178 ++++++ + src/fcfreetype.c | 236 ++++++++ + src/fcfs.c | 82 +++ + src/fcinit.c | 174 ++++++ + src/fcint.h | 480 +++++++++++++++ + src/fclist.c | 442 ++++++++++++++ + src/fcmatch.c | 347 +++++++++++ + src/fcmatrix.c | 112 ++++ + src/fcname.c | 621 +++++++++++++++++++ + src/fcpat.c | 491 +++++++++++++++ + src/fcstr.c | 188 ++++++ + src/fcxml.c | 1032 ++++++++++++++++++++++++++++++++ + src/fontconfig.man | 1113 ++++++++++++++++++++++++++++++++++ + 44 files changed, 11349 insertions(+), 0 deletions(-) diff --git a/lib/fontconfig/Makefile.am b/lib/fontconfig/Makefile.am index 970ea42b0..81db2ec42 100644 --- a/lib/fontconfig/Makefile.am +++ b/lib/fontconfig/Makefile.am @@ -1,5 +1,5 @@ # -# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:41:34 matthieu Exp $ +# fontconfig/Makefile.am # # Copyright © 2003 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -23,7 +23,7 @@ DOCSRC=@DOCSRC@ SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \ - fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test + fc-cache fc-cat fc-list fc-match fc-query fc-scan conf.d $(DOCSRC) test EXTRA_DIST = \ fontconfig.pc.in \ @@ -32,7 +32,8 @@ EXTRA_DIST = \ fontconfig.spec.in \ fontconfig.spec \ fontconfig-zip.in -DISTCLEANFILES = config.cache ChangeLog doltcompile +CLEANFILES = fonts.conf +DISTCLEANFILES = config.cache doltcompile MAINTAINERCLEANFILES = \ $(srcdir)/aclocal.m4 \ $(srcdir)/autoscan.log \ @@ -62,13 +63,12 @@ endif # Creating ChangeLog from git log: -MAINTAINERCLEANFILES += ChangeLog - +MAINTAINERCLEANFILES += $(srcdir)/ChangeLog EXTRA_DIST += ChangeLog - -ChangeLog: +ChangeLog: $(srcdir)/ChangeLog +$(srcdir)/ChangeLog: if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git ./missing --run git-log --stat) | fmt --split-only > $@.tmp \ + (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \ && mv -f $@.tmp $@ \ || ($(RM) $@.tmp; \ echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ @@ -81,7 +81,17 @@ ChangeLog: .PHONY: ChangeLog -install-data-local: +fonts.conf: fonts.conf.in Makefile + sed \ + -e 's,@FC_CACHEDIR\@,$(FC_CACHEDIR),g' \ + -e 's,@FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \ + -e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \ + -e 's,@PACKAGE\@,$(PACKAGE),g' \ + -e 's,@VERSION\@,$(VERSION),g' \ + $(srcdir)/fonts.conf.in > $@.tmp && \ + mv $@.tmp $@ + +install-data-local: fonts.conf $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \ echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \ diff --git a/lib/fontconfig/Makefile.bsd-wrapper b/lib/fontconfig/Makefile.bsd-wrapper index 7d0fbc1ad..c9c053b75 100644 --- a/lib/fontconfig/Makefile.bsd-wrapper +++ b/lib/fontconfig/Makefile.bsd-wrapper @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2009/04/05 16:43:35 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.11 2010/03/25 21:45:57 matthieu Exp $ -SHARED_LIBS= fontconfig 6.0 +SHARED_LIBS= fontconfig 7.0 CONFIGURE_ARGS= --with-expat=${X11BASE} --sysconfdir=/etc \ --mandir=${X11BASE}/man \ diff --git a/lib/fontconfig/Makefile.in b/lib/fontconfig/Makefile.in index 5cfa60955..b2c6bcfee 100644 --- a/lib/fontconfig/Makefile.in +++ b/lib/fontconfig/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:41:34 matthieu Exp $ +# fontconfig/Makefile.am # # Copyright © 2003 Keith Packard # @@ -29,9 +29,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -62,9 +62,9 @@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/fontconfig-zip.in $(srcdir)/fontconfig.pc.in \ - $(srcdir)/fontconfig.spec.in $(srcdir)/fonts.conf.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - config.guess config.sub depcomp install-sh ltmain.sh missing + $(srcdir)/fontconfig.spec.in $(top_srcdir)/configure AUTHORS \ + COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \ + install-sh ltmain.sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -75,8 +75,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = fontconfig.spec fontconfig.pc fonts.conf \ - fontconfig-zip +CONFIG_CLEAN_FILES = fontconfig.spec fontconfig.pc fontconfig-zip SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -137,7 +136,6 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ -DOCDIR = @DOCDIR@ DOCMAN3 = @DOCMAN3@ DOCSRC = @DOCSRC@ DOLT_BASH = @DOLT_BASH@ @@ -162,6 +160,7 @@ FC_FONTPATH = @FC_FONTPATH@ FFLAGS = @FFLAGS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GREP = @GREP@ HASDOCBOOK = @HASDOCBOOK@ HAVE_EXPAT = @HAVE_EXPAT@ HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@ @@ -193,7 +192,6 @@ MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -ORTH_FILES = @ORTH_FILES@ OS_WIN32_FALSE = @OS_WIN32_FALSE@ OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ @@ -205,6 +203,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -213,18 +212,9 @@ USEDOCBOOK_FALSE = @USEDOCBOOK_FALSE@ USEDOCBOOK_TRUE = @USEDOCBOOK_TRUE@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_NMEDIT = @ac_ct_NMEDIT@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -242,6 +232,9 @@ build_os = @build_os@ build_vendor = @build_vendor@ confdir = @confdir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ fc_cachedir = @fc_cachedir@ ft_config = @ft_config@ @@ -250,28 +243,33 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = fontconfig fc-case fc-lang fc-glyphname fc-arch src \ - fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test + fc-cache fc-cat fc-list fc-match fc-query fc-scan conf.d $(DOCSRC) test EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd \ fontconfig.spec.in fontconfig.spec fontconfig-zip.in ChangeLog -DISTCLEANFILES = config.cache ChangeLog doltcompile +CLEANFILES = fonts.conf +DISTCLEANFILES = config.cache doltcompile # Creating ChangeLog from git log: MAINTAINERCLEANFILES = $(srcdir)/aclocal.m4 $(srcdir)/autoscan.log \ @@ -279,7 +277,7 @@ MAINTAINERCLEANFILES = $(srcdir)/aclocal.m4 $(srcdir)/autoscan.log \ $(srcdir)/config.sub $(srcdir)/configure.scan \ $(srcdir)/depcomp $(srcdir)/install-sh $(srcdir)/ltmain.sh \ $(srcdir)/missing $(srcdir)/mkinstalldirs `find "$(srcdir)" \ - -type f -name Makefile.in -print` ChangeLog + -type f -name Makefile.in -print` $(srcdir)/ChangeLog pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = fontconfig.pc configdir = $(CONFDIR) @@ -344,8 +342,6 @@ fontconfig.spec: $(top_builddir)/config.status $(srcdir)/fontconfig.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ fontconfig.pc: $(top_builddir)/config.status $(srcdir)/fontconfig.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ -fonts.conf: $(top_builddir)/config.status $(srcdir)/fonts.conf.in - cd $(top_builddir) && $(SHELL) ./config.status $@ fontconfig-zip: $(top_builddir)/config.status $(srcdir)/fontconfig-zip.in cd $(top_builddir) && $(SHELL) ./config.status $@ @@ -692,6 +688,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -773,10 +770,10 @@ uninstall-info: uninstall-info-recursive uninstall uninstall-am uninstall-configDATA uninstall-info-am \ uninstall-local uninstall-pkgconfigDATA - -ChangeLog: +ChangeLog: $(srcdir)/ChangeLog +$(srcdir)/ChangeLog: if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git ./missing --run git-log --stat) | fmt --split-only > $@.tmp \ + (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \ && mv -f $@.tmp $@ \ || ($(RM) $@.tmp; \ echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ @@ -789,7 +786,17 @@ ChangeLog: .PHONY: ChangeLog -install-data-local: +fonts.conf: fonts.conf.in Makefile + sed \ + -e 's,@FC_CACHEDIR\@,$(FC_CACHEDIR),g' \ + -e 's,@FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \ + -e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \ + -e 's,@PACKAGE\@,$(PACKAGE),g' \ + -e 's,@VERSION\@,$(VERSION),g' \ + $(srcdir)/fonts.conf.in > $@.tmp && \ + mv $@.tmp $@ + +install-data-local: fonts.conf $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \ echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \ diff --git a/lib/fontconfig/README b/lib/fontconfig/README index 205aea47a..7dcc2f9ee 100644 --- a/lib/fontconfig/README +++ b/lib/fontconfig/README @@ -1,12 +1,306 @@ Fontconfig Font configuration and customization library - Version 2.6 - 2008-05-31 + Version 2.8 + 2009-11-18 Check INSTALL for compilation and installation instructions. Report bugs to https://bugs.freedesktop.org in the fontconfig module. +2.8 + +Behdad Esfahbod (24): + Clarify default confdir and cachedir better. + Move FcAlign to fcint.h + [fc-arch] Add FcAlign to arch signature + [int] Define MIN/MAX/ABS macros + Bump cache version up from 2 to 3 and fix FcLangSet caching/crash + Remove unused macros + [int] Remove fc_storage_type() in favor of direct access to v->type + [int] Remove fc_value_* macros that did nothing other than renaming + Enable automake silent rules + [int] Remove more unused macros + [xml] Remove unused code + [arch] Try to ensure proper FcLangSet alignment in arch + [lang] Fix serializing LangSet from older versions + Make sure fclang.h and fcarch.h are built + Remove bogus comment + [fc-glyphname] Cleanup Makefile.am + [src] Create fcglyphname.h automatically + [fc-glyphname] Rename internal arrays to prefix with _fc_ + Clean up Makefile's a bit + [fc-glyphname] Remove Adobe glyphlist + [fc-case] Update CaseFolding.txt to Unicode 5.2.0 + [fc-arch] Beautify the arch template + [fc-arch] Rename architecture names to better reflect what they are + Bump libtool revision in preparation for release + +2.7.3 + +Behdad Esfahbod (2): + Use default config in FcFileScan() and FcDirScan() + Bump libtool version in preparation for release + +Roozbeh Pournader (2): + Correct Ewe (ee) orthography to use U+025B (bug #20711) + Updated Arabic, Persian, and Urdu orthographies + +2.7.2 + +Behdad Esfahbod (6): + Improve charset printing + [ja.orth] Comment out FULLWIDTH YEN SIGN (#22942) + Bug 22037 - No Fonts installed on a default install on Windows Server 2003 + Bug 23419 - "contains" expression seems not working on the fontconfig rule + Revert "Fix FcNameUnparseLangSet()" and redo it + Bump libtool version for release + +Tor Lillqvist (3): + Fix MinGW compilation + Fix heap corruption on Windows in FcEndElement() + Use multi-byte codepage aware string function on Windows + +2.7.1 + +Behdad Esfahbod (16): + git-tag -s again + Fix win32 build + Replace spaces with tabs in conf files + Remove unused ftglue code + Add Inconsolata to monospace config (#22710) + Fix leak with string VStack objects + Improve libtool version parsing (#22122) + Use GetSystemWindowsDirectory() instead of GetWindowsDirectory() (#22037) + Remove unused macros + Fix FcNameUnparseLangSet() + Fix doc syntax (#22902) + TT_MS_ID_UCS_4 is really UTF-16BE, not UTF-32 + [doc] Add ~/fonts.conf.d to user docs + Hardcode /etc/fonts instead of @CONFDIR@ in docs (#22911) + Bump libtool versions that 2.7.0 (I forgot to do back then) + Update .gitignore + +Karl Tomlinson (1): + Don't change the order of names unnecessarily (#20128) + +2.7 + +Alexey Khoroshilov (1): + Use human-readable file names in the docs (bug #16278) + +Behdad Esfahbod (119): + Avoid C99ism in Win32 code (#16651) + [doc] Fix inaccuracy in FcFontRenderPrepare docs (#16985) + When canonizing filenames, squash // and remove final / (#bug 16286) + Add orth file for Maithili mai.orth (#15821) + Replace RCS Id tags with the file name + [doc] Fix signatures of FcPatternGetFTFace and FcPatternGetLangSet (#16272) + Update Thai default families (#16223) + Add ~/.fonts.conf.d to default config (#17100) + [fc-match] Fix list of getopt options in --help + Update man pages + Add fc-query (#13019) + Implement fc-list --verbose (#13015) + [doc] Add const decorator for FcPatternDuplicate() + Add FcPatternFilter() (#13016) + [doc] Document that a zero rescanInterval disables automatic checks (#17103) + Get rid of $Id: README,v 1.3 2010/03/25 21:45:57 matthieu Exp $ tags + [doc] Fix signature of FcConfigHome() + Fix docs re 'orig' argument of FcPatternBuild and family + Update sr.orth to actul subset of Cyrillic used by Serbian (#17208) + Add Sindhi .orth file. (#17140) + Add WenQuanYi fonts to default conf (#17262, from Mandriva) + Handle -h and --help according to GNU Coding Standards (#17104) + Document when config can be NULL (#17105) + Add FcConfigReference() (#17124) + Document how to free return value of FcNameUnparse() + Don't leak FcValues string loaded through fcxml.c (#17661) + Don't call FcPatternGetCharSet in FcSortWalk unless we need to (#17361) + Fix two more doc typos + [.gitignore] Update + Cleanup symlinks in "make uninstall" (bug #18885) + [fccache] Consistently use FcStat() over stat() (bug #18195) + Consistently use FcStat() over stat() in all places + Use __builtin_popcount() when available (bug #17592) + Fix compile with old FreeType that doesn't have FT_Select_Size() (bug #17498) + Implement fc-list --quiet ala grep (bug #17141) + [65-fonts-persian.conf] Set foundry in target=scan instead of target=font + Don't use identifier named complex + Explicitly chmod() directories (bug #18934) + Remove special-casing of FC_FILE in FcPatternPrint() + [.gitignore] Update + Implement FcPatternFormat and use it in cmdline tools (bug #17107) + Fix comparison of family names to ignore leading space properly + [fcmatch.c] Fix debug formatting + [fcmatch] Use larger multipliers to enforce order + [fcmatch] When matching, reserve score 0 for when elements don't exist + [fcmatch] Move FcFontSetMatch() functionality into FcFontSetMatchInternal() + [doc] Note that fontset returned by FcConfigGetFonts should not be modified + Make FcCharSetMerge() public + Don't use FcCharSetCopy in FcCharSetMerge + Oops. Fix usage output. + Revive FcConfigScan() (bug #17121) + Add fc-scan too that runs FcFileScan/FcDirScan + Oops, fix FcPatternFilter + [fc-match] Accept list of elements like fc-list (bug #13017) + Cleanup all manpage.* files + [fcmatch] Fix crash when no fonts are available. + [fcfreetype] Fix typo in GB2312 encoding name string (#19845) + Add ICONV_LIBS to fontconfig.pc.in (#19606) + [win32] Fix usage of GetFullPathName() + [win32] Expand "APPSHAREFONTDIR" to ../share/fonts relative to binary location + [win32] Do not remove leading '\\' such that network paths work + [fccache] Make sure the cache is current when reusing from open caches + Update Sinhala orthography (#19288) + [cache] After writing cache to file, update the internal copy to reflect this + Further update Sinhala orthography (#19288) + [fcformat] Add support for width modifiers + [fcformat] Refactor and restructure code for upcoming changes + [fcformat] Add support for subexpressions + [fcformat] Add element filtering and deletion + [fcformat] Add conditionals + [fcformat] Add simple converters + [fcformat] Implement 'cescape', 'shescape', and 'xmlescape' converters + [FcStrBuf] better handle malloc failure + [fcformat] Add value-count syntax + [fcformat] Implement 'delete', 'escape', and 'translate' filter functions + [fcformat] Start adding builtins + [fcformat] Refactor code to avoid malloc + [fcformat] Add support for builtin formats + [fcformat] Support indexing simple tags + [fcformat] Support 'default value' for simple tags + [fcformat] Implement array enumeration + [fclang] Implement FcLangSetGetLangs() (#18846) + [fcformat] Enumerate langsets like we do arrays of values + [fcformat] Add a 'pkgkit' builtin that prints tags for font packages + [fcformat] Add list of undocumented language features + [fc-lang] Continue parsing after an "include" (#20179) + Fix Fanti (fat) orth file (#20390) + Fix Makefile's to not create target file in case of failure + [fcstr.c] Embed a static 64-byte buffer in FcStrBuf + [fcstr,fcxml] Don't copy FcStrBuf contents when we would free it soon + [fcxml] Don't allocate attr array if there are no attributes + [fcxml] Embed 8 static FcPStack objects in FcConfigParse + [fcxml] Embed 64 static FcVStack objects in FcConfigParse + [fcxml.c] Embed a static 64-byte attr buffer in FcPStack + Call git tools using "git cmd" instead of "git-cmd" syntax + Replace 'KEITH PACKARD' with 'THE AUTHOR(S)' in license text in all files + [fcformat] Fix default-value handling + Document FcPatternFormat() format + [Makefile.am] Don't clean ChangeLog in distclean + Revert "[conf] Disable hinting when emboldening (#19904)" (#20599) + [fc-lang] Fix bug in country map generation + [fcstr] Remove unused variable + [fc-lang] Make LangSet representation in the cache files stable + [fc-cache] Remove obsolete sentence from man page + Detect TrueType Collections by checking the font data header + Mark matchers array const (#21935) + Use/prefer WWS family/style (name table id 21/22) + Simplify FcValueSave() semantics + Add XXX note about Unicode Plane 16 + Always set *changed in FcCharsetMerge + [charset] Grow internal FcCharset arrays exponentially + Remove unused prototypes and function + [xml] Centralize FcExpr allocation + [xml] Mark more symbols static + [xml] Allocate FcExpr's in a pool in FcConfig + [xml] Intern more strings + Bug 22154 -- fontconfig.pc doesn't include libxml2 link flags + Fix distcheck + Remove keithp's GPG key id + +Benjamin Close (1): + Remove build manpage logfile if it exists + +Chris Wilson (1): + Reduce number of allocations during FcSortWalk(). + +Dan Nicholson (1): + Let make expand fc_cachedir/FC_CACHEDIR (bug #18675) + +Harald Fernengel (1): + Don't use variables named 'bool' (bug #18851) + +Harshula Jayasuriya (1): + Fix Sinhala coverage (bug #19288) + +Karl Tomlinson (1): + Change FcCharSetMerge API + +Mike FABIAN (1): + [conf] Disable hinting when emboldening (#19904) + +Peter (1): + Make sure alias files are built first (bug 16464) + +Rahul Bhalerao (1): + Add config for new Indic fonts (bug #17856) + +Roozbeh Pournader (60): + Correct Sindhi orthography to use Arabic script (bug #17140) + Remove Sinhala characters not in modern use (bug #19288) + Add Filipino orth, alias Tagalog to Filipino (bug #19846) + Split Mongolian orth to Mongolia and China (bug #19847) + Fix doubly encoded UTF-8 in comments (bug #19848) + Change Turkmen orth from Cyrillic to Latin (bug #19849) + Rename Venda from "ven" to "ve" (bug #19852) + Rename "ku" to "ku_am", add "ku_iq" (bug #19853). + Add Kashubian (csb) orth file (bug #19866) + Add Malay (ms) orthography (bug #19867) + Add Kinyarwanda (rw) orthography (bug #19868) + Add Upper Sorbian (hsb) orthography (bug #19870) + Add Berber orthographies in Latin and Tifinagh scripts (bug #19881) + Renamed az to az_az (bug #19889) + Rename Igbo from "ibo" to "ig" (bug #19892) + Remove punctuation symbols from Asturian orthography (bug #19893) + Add Chhattisgarhi (hne) orthography (bug #19891) + Use newly added Cyrillic letters for Kurdish (bug #20049) + Add Kurdish in Turkey (ku_tr) orthography (bug #19891) + Add Aragonese (an) orthography (bug #19891) + Add Haitian Creole (ht) orthography (bug #19891) + Ad Ganda (lg) orthography (bug #19891) + Add Limburgan (li) orthography (bug #19891) + Add Sardinian (sc) orthography (bug #19891) + Add Sidamo (sid) and Wolaitta (wal) orthographies (bug #19891) + Fix Bengali (bn) and Assamese (as) orthographies (bug #22924) + Remove Euro Sign from all orthographies (bug #19865) + Add Ottoman Turkish (ota) orthography (bug #20114) + Divide Panjabi (pa) to that of Pakistan and India (bug #19890) + Add Blin (byn) orthography (bug #19891) + Add Papiamento (pap_aw, pap_an) orthographies (bug #19891) + Add Crimean Tatar (crh) orthography (bug #19891) + Switch Uzbek (uz) orthography to Latin (bug #19851) + Update Azerbaijani in Latin (az_az) to present usage (bug #20173) + Rename Avaric orthography from 'ava' to 'av' (bug #20174) + Rename Bambara orthography from 'bam' to 'bm' (bug #20175) + Rename Fulah orthography from 'ful' to 'ff' (bug #20177) + Change Kashmiri (ks) orthography to Arabic script (bug #20200) + Tighten Central Khmer (km) orthography (bug #20202) + Remove digits and symbols from some Indic orthographies (bug #20204) + Add Divehi (dv) orthography (bug #20207) + Extend Crimean Tatar (crh) orthography (bug #19891) + Update Serbo-Croatian (sh) orthography (bug #20368) + Add Ewe (ee) orthography (bug #20386) + Add Herero (hz) orthograhy (bug #20387) + Add Akan (ak) and Fanti (fat) orthographies (bug #20390) + Added Quechua (qu) orthography (bug #20392) + Add Sango (sg) orthography (bug #20393) + Add Tahitian (ty) orthography (bug #20391) + Add Navajo (nv) orthography (bug #20395) + Add Rundi (rn) orthography (bug #20398) + Add Zhuang (za) orthography (bug #20399) + Add orthographies for Oshiwambo languages (bug #20401) + Add Shona (sn) orthography (bug #20394) + Add Sichuan Yi (ii) orthography (bug #20402) + Add Javanese (jv) orthography (bug #20403) + Add Nauru (na) orthography (bug #20418) + Add Kanuri (kr) orthography (bug #20438) + Add Sundanese (su) orthography (bug #20440) + Reorganize Panjabi/Punjabi and Lahnda orthographies (bug #19890) + +Serge van den Boom (1): + Correctly handle mmap() failure (#21062) + 2.6 2.5.93 (2.6 RC3) diff --git a/lib/fontconfig/conf.d/25-unhint-nonlatin.conf b/lib/fontconfig/conf.d/25-unhint-nonlatin.conf index 3799853e6..ffb70c69f 100644 --- a/lib/fontconfig/conf.d/25-unhint-nonlatin.conf +++ b/lib/fontconfig/conf.d/25-unhint-nonlatin.conf @@ -76,22 +76,22 @@ false - - - AR PL ShanHeiSun Uni - - - false - - - - - AR PL KaitiM Big5 - - - false - - + + + AR PL ShanHeiSun Uni + + + false + + + + + AR PL KaitiM Big5 + + + false + + AR PL ZenKai Uni diff --git a/lib/fontconfig/conf.d/30-metric-aliases.conf b/lib/fontconfig/conf.d/30-metric-aliases.conf index 87e44938b..702a495ea 100644 --- a/lib/fontconfig/conf.d/30-metric-aliases.conf +++ b/lib/fontconfig/conf.d/30-metric-aliases.conf @@ -51,21 +51,21 @@ - + Nimbus Sans L Helvetica - + Nimbus Roman No9 L Times - + Nimbus Mono L Courier @@ -74,8 +74,8 @@ - - Liberation Sans + + Liberation Sans Albany Albany AMT @@ -83,8 +83,8 @@ - - Liberation Serif + + Liberation Serif Thorndale Thorndale AMT @@ -92,8 +92,8 @@ - - Liberation Mono + + Liberation Mono Cumberland Cumberland AMT @@ -107,21 +107,21 @@ - + Helvetica Arial - + Times Times New Roman - + Courier Courier New @@ -130,21 +130,21 @@ - + Arial Helvetica - + Times New Roman Times - + Courier New Courier @@ -157,21 +157,21 @@ - + Helvetica Nimbus Sans L - + Times Nimbus Roman No9 L - + Courier Nimbus Mono L @@ -180,28 +180,28 @@ - + Arial - Liberation Sans + Liberation Sans Albany Albany AMT - + Times New Roman - Liberation Serif + Liberation Serif Thorndale Thorndale AMT - + Courier New - Liberation Mono + Liberation Mono Cumberland Cumberland AMT diff --git a/lib/fontconfig/conf.d/30-urw-aliases.conf b/lib/fontconfig/conf.d/30-urw-aliases.conf index 6bab15b67..9d5920306 100644 --- a/lib/fontconfig/conf.d/30-urw-aliases.conf +++ b/lib/fontconfig/conf.d/30-urw-aliases.conf @@ -5,27 +5,27 @@ URW provides metric and shape compatible fonts for some Adobe families. Helvetica, Courier, and Times are handled in 30-metric-aliases.conf. --> - - Avant Garde - URW Gothic L - - - Bookman - URW Bookman L - - - New Century Schoolbook - Century Schoolbook L - - - Palatino - URW Palladio L - - + + Avant Garde + URW Gothic L + + + Bookman + URW Bookman L + + + New Century Schoolbook + Century Schoolbook L + + + Palatino + URW Palladio L + + Zapf Chancery URW Chancery L - + Zapf Dingbats Dingbats diff --git a/lib/fontconfig/conf.d/45-latin.conf b/lib/fontconfig/conf.d/45-latin.conf index bdd164a04..7e4126468 100644 --- a/lib/fontconfig/conf.d/45-latin.conf +++ b/lib/fontconfig/conf.d/45-latin.conf @@ -44,6 +44,7 @@ Bitstream Vera Sans Mono DejaVu Sans Mono Liberation Mono + Inconsolata Courier New Courier Andale Mono diff --git a/lib/fontconfig/conf.d/50-user.conf b/lib/fontconfig/conf.d/50-user.conf index 3052cdcb6..3f8901296 100644 --- a/lib/fontconfig/conf.d/50-user.conf +++ b/lib/fontconfig/conf.d/50-user.conf @@ -2,5 +2,6 @@ + ~/.fonts.conf.d ~/.fonts.conf diff --git a/lib/fontconfig/conf.d/60-latin.conf b/lib/fontconfig/conf.d/60-latin.conf index 62bf0d461..2107e31e4 100644 --- a/lib/fontconfig/conf.d/60-latin.conf +++ b/lib/fontconfig/conf.d/60-latin.conf @@ -34,6 +34,7 @@ Bitstream Vera Sans Mono DejaVu Sans Mono + Inconsolata Andale Mono Courier New Cumberland AMT diff --git a/lib/fontconfig/conf.d/65-fonts-persian.conf b/lib/fontconfig/conf.d/65-fonts-persian.conf index 97b783ec4..0033675a4 100644 --- a/lib/fontconfig/conf.d/65-fonts-persian.conf +++ b/lib/fontconfig/conf.d/65-fonts-persian.conf @@ -18,7 +18,7 @@ SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -36,151 +36,151 @@ - - Nesf - Nesf2 - - - Nesf2 - Persian_sansserif_default - + + Nesf + Nesf2 + + + Nesf2 + Persian_sansserif_default + - - Nazanin - Nazli - - - Lotus - Lotoos - - - Yaqut - Yaghoot - - - Yaghut - Yaghoot - - - Traffic - Terafik - - - Ferdowsi - Ferdosi - - - Fantezy - Fantezi - + + Nazanin + Nazli + + + Lotus + Lotoos + + + Yaqut + Yaghoot + + + Yaghut + Yaghoot + + + Traffic + Terafik + + + Ferdowsi + Ferdosi + + + Fantezy + Fantezi + - - Jadid - Persian_title - - - Titr - Persian_title - + + Jadid + Persian_title + + + Titr + Persian_title + - - Kamran - + + Kamran + Persian_fantasy Homa - - - Homa - + + + Homa + Persian_fantasy Kamran - - - Fantezi - Persian_fantasy - - - Tabassom - Persian_fantasy - + + + Fantezi + Persian_fantasy + + + Tabassom + Persian_fantasy + - - Arshia - Persian_square - - - Nasim - Persian_square - - - Elham - + + Arshia + Persian_square + + + Nasim + Persian_square + + + Elham + Persian_square Farnaz - - + + Farnaz - + Persian_square - Elham + Elham - - - Sina - Persian_square - + + + Sina + Persian_square + - + Persian_title - + Titr Jadid - Persian_serif + Persian_serif - + - + Persian_fantasy - + Homa Kamran Fantezi Tabassom - Persian_square + Persian_square - + - + Persian_square - + Arshia Elham Farnaz Nasim Sina - Persian_serif + Persian_serif - + - + Elham @@ -189,7 +189,7 @@ - + Homa @@ -198,7 +198,7 @@ - + Koodak @@ -207,7 +207,7 @@ - + Nazli @@ -216,7 +216,7 @@ - + Roya @@ -225,7 +225,7 @@ - + Terafik @@ -234,7 +234,7 @@ - + Titr diff --git a/lib/fontconfig/conf.d/65-nonlatin.conf b/lib/fontconfig/conf.d/65-nonlatin.conf index 4b3a946c9..53ac064b0 100644 --- a/lib/fontconfig/conf.d/65-nonlatin.conf +++ b/lib/fontconfig/conf.d/65-nonlatin.conf @@ -6,8 +6,7 @@ Artsounk BPG UTF8 M - Phaisarn - Phaisarn98 + Kinnari Norasi Frank Ruehl Dror @@ -28,6 +27,8 @@ UmePlus P Gothic SimSun PMingLiu + WenQuanYi Zen Hei + WenQuanYi Bitmap Song AR PL ShanHeiSun Uni AR PL New Sung ZYSong18030 @@ -49,9 +50,16 @@ Lohit Bengali Lohit Gujarati Lohit Hindi + Lohit Marathi + Lohit Maithili + Lohit Kashmiri + Lohit Konkani + Lohit Nepali + Lohit Sindhi Lohit Punjabi Lohit Tamil - Lohit Malayalam + Meera + Lohit Malayalam Lohit Kannada Lohit Telugu Lohit Oriya @@ -68,7 +76,10 @@ ArmNet Helvetica Artsounk BPG UTF8 M - Norasi + Waree + Loma + Garuda + Umpush Saysettha Unicode JG Lao Old Arial GF Zemen Unicode @@ -88,6 +99,8 @@ SimSun PMingLiu + WenQuanYi Zen Hei + WenQuanYi Bitmap Song AR PL ShanHeiSun Uni AR PL New Sung MgOpen Modata @@ -111,8 +124,15 @@ Lohit Bengali Lohit Gujarati Lohit Hindi + Lohit Marathi + Lohit Maithili + Lohit Kashmiri + Lohit Konkani + Lohit Nepali + Lohit Sindhi Lohit Punjabi Lohit Tamil + Meera Lohit Malayalam Lohit Kannada Lohit Telugu @@ -145,7 +165,10 @@ Baekmuk Batang Baekmuk Dotum Baekmuk Gulim - Courier MonoThai + TlwgTypo + TlwgTypist + TlwgTypewriter + TlwgMono Hasida Mitra Mono GF Zemen Unicode @@ -153,13 +176,20 @@ Lohit Bengali Lohit Gujarati Lohit Hindi + Lohit Marathi + Lohit Maithili + Lohit Kashmiri + Lohit Konkani + Lohit Nepali + Lohit Sindhi Lohit Punjabi - Lohit Tamil - Lohit Malayalam - Lohit Kannada - Lohit Telugu - Lohit Oriya - LKLUG + Lohit Tamil + Meera + Lohit Malayalam + Lohit Kannada + Lohit Telugu + Lohit Oriya + LKLUG diff --git a/lib/fontconfig/conf.d/90-synthetic.conf b/lib/fontconfig/conf.d/90-synthetic.conf index 63d9b891b..b8d1e85e1 100644 --- a/lib/fontconfig/conf.d/90-synthetic.conf +++ b/lib/fontconfig/conf.d/90-synthetic.conf @@ -27,10 +27,10 @@ oblique - - - false - + + + false + -@CONFDIR@ + +/etc/fonts diff --git a/lib/fontconfig/doc/edit-sgml.c b/lib/fontconfig/doc/edit-sgml.c index ac9027f1e..b69c93ed7 100644 --- a/lib/fontconfig/doc/edit-sgml.c +++ b/lib/fontconfig/doc/edit-sgml.c @@ -1,5 +1,5 @@ /* - * $Id: edit-sgml.c,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/edit-sgml.c * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fcatomic.fncs b/lib/fontconfig/doc/fcatomic.fncs index 91996d833..c6b924d84 100644 --- a/lib/fontconfig/doc/fcatomic.fncs +++ b/lib/fontconfig/doc/fcatomic.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcatomic.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcatomic.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fcblanks.fncs b/lib/fontconfig/doc/fcblanks.fncs index 73a8232c8..b8ce47d24 100644 --- a/lib/fontconfig/doc/fcblanks.fncs +++ b/lib/fontconfig/doc/fcblanks.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcblanks.fncs,v 1.1.1.2 2006/12/31 14:57:59 matthieu Exp $ + * fontconfig/doc/fcblanks.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fccache.fncs b/lib/fontconfig/doc/fccache.fncs index 36db10c74..f0c984d79 100644 --- a/lib/fontconfig/doc/fccache.fncs +++ b/lib/fontconfig/doc/fccache.fncs @@ -11,9 +11,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fccharset.fncs b/lib/fontconfig/doc/fccharset.fncs index b84fe576d..6213a7ba9 100644 --- a/lib/fontconfig/doc/fccharset.fncs +++ b/lib/fontconfig/doc/fccharset.fncs @@ -1,5 +1,5 @@ /* - * $Id: fccharset.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ +* fontconfig/doc/fccharset.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -98,6 +98,21 @@ Returns a set including only those chars found in either aa but not b. @@ +@RET@ FcBool +@FUNC@ FcCharSetMerge +@TYPE1@ FcCharSet * @ARG1@ a +@TYPE2@ const FcCharSet * @ARG2@ b +@TYPE3@ FcBool * @ARG3@ changed +@PURPOSE@ Merge charsets +@DESC@ +Adds all chars in b to a. +In other words, this is an in-place version of FcCharSetUnion. +If changed is not NULL, then it returns whether any new +chars from b were added to a. +Returns FcFalse on failure, either when a is a constant +set or from running out of memory. +@@ + @RET@ FcBool @FUNC@ FcCharSetHasChar @TYPE1@ const FcCharSet * @ARG1@ fcs diff --git a/lib/fontconfig/doc/fcconfig.fncs b/lib/fontconfig/doc/fcconfig.fncs index ce5d93bce..8bb953b34 100644 --- a/lib/fontconfig/doc/fcconfig.fncs +++ b/lib/fontconfig/doc/fcconfig.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcconfig.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcconfig.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -29,14 +29,28 @@ Creates an empty configuration. @@ +@RET@ FcConfig * +@FUNC@ FcConfigReference +@TYPE1@ FcConfig * @ARG1@ config +@PURPOSE@ Increment config reference count +@DESC@ +Add another reference to config. Configs are freed only +when the reference count reaches zero. +If config is NULL, the current configuration is used. +In that case this function will be similar to FcConfigGetCurrent() except that +it increments the reference count before returning and the user is responsible +for destroying the configuration when not needed anymore. +@@ + @RET@ void @FUNC@ FcConfigDestroy @TYPE1@ FcConfig * @ARG1@ config @PURPOSE@ Destroy a configuration @DESC@ -Destroys a configuration and any data associated with it. Note that calling -this function with the return from FcConfigGetCurrent will place the library -in an indeterminate state. +Decrements the config reference count. If all references are gone, destroys +the configuration and any data associated with it. +Note that calling this function with the return from FcConfigGetCurrent will +cause a new configuration to be created for use as current configuration. @@ @RET@ FcBool @@ -63,15 +77,17 @@ Returns the current default configuration. @DESC@ Checks all of the files related to config and returns whether any of them has been modified since the configuration was created. +If config is NULL, the current configuration is used. @@ -@RET@ FcBool +@RET@ FcChar8 * @FUNC@ FcConfigHome @TYPE1@ void @PURPOSE@ return the current home directory. @DESC@ Return the current user's home directory, if it is available, and if using it -is enabled. See also FcConfigEnableHome). +is enabled, and NULL otherwise. +See also FcConfigEnableHome). @@ @RET@ FcBol @@ -94,6 +110,7 @@ disabled. The previous setting of the value is returned. Builds the set of available fonts for the given configuration. Note that any changes to the configuration after this call have indeterminate effects. Returns FcFalse if this operation runs out of memory. +If config is NULL, the current configuration is used. @@ @RET@ FcStrList * @@ -103,6 +120,7 @@ Returns FcFalse if this operation runs out of memory. @DESC@ Returns the list of font directories specified in the configuration files for config. Does not include any subdirectories. +If config is NULL, the current configuration is used. @@ @RET@ FcStrList * @@ -113,6 +131,7 @@ for config. Does not include any subdirectories. Returns the list of font directories in config. This includes the configured font directories along with any directories below those in the filesystem. +If config is NULL, the current configuration is used. @@ @RET@ FcStrList * @@ -121,6 +140,7 @@ filesystem. @PURPOSE@ Get config files @DESC@ Returns the list of known configuration files used to generate config. +If config is NULL, the current configuration is used. @@ @RET@ FcChar8 * @@ -140,6 +160,7 @@ simply returns NULL to indicate that no per-user file exists. FcConfigGetCacheDirs returns a string list containing all of the directories that fontconfig will search when attempting to load a cache file for a font directory. +If config is NULL, the current configuration is used. @@ @RET@ FcFontSet * @@ -150,7 +171,8 @@ cache file for a font directory. @DESC@ Returns one of the two sets of fonts from the configuration as specified by set. This font set is owned by the library and must -not be freed. +not be modified or freed. +If config is NULL, the current configuration is used. @@ @RET@ FcBlanks * @@ -160,6 +182,9 @@ not be freed. @DESC@ Returns the FcBlanks object associated with the given configuration, if no blanks were present in the configuration, this function will return 0. +The returned FcBlanks object if not NULL, is valid as long as the owning +FcConfig is alive. +If config is NULL, the current configuration is used. @@ @RET@ int @@ -170,6 +195,8 @@ blanks were present in the configuration, this function will return 0. Returns the interval between automatic checks of the configuration (in seconds) specified in config. The configuration is checked during a call to FcFontList when this interval has passed since the last check. +An interval setting of zero disables automatic checks. +If config is NULL, the current configuration is used. @@ @RET@ FcBool @@ -180,6 +207,8 @@ a call to FcFontList when this interval has passed since the last check. @DESC@ Sets the rescan interval. Returns FcFalse if the interval cannot be set (due to allocation failure). Otherwise returns FcTrue. +An interval setting of zero disables automatic checks. +If config is NULL, the current configuration is used. @@ @RET@ FcBool @@ -190,6 +219,7 @@ to allocation failure). Otherwise returns FcTrue. @DESC@ Adds an application-specific font to the configuration. Returns FcFalse if the fonts cannot be added (due to allocation failure). Otherwise returns FcTrue. +If config is NULL, the current configuration is used. @@ @RET@ FcBool @@ -201,6 +231,7 @@ if the fonts cannot be added (due to allocation failure). Otherwise returns FcTr Scans the specified directory for fonts, adding each one found to the application-specific set of fonts. Returns FcFalse if the fonts cannot be added (due to allocation failure). Otherwise returns FcTrue. +If config is NULL, the current configuration is used. @@ @RET@ void @@ -209,6 +240,7 @@ if the fonts cannot be added (due to allocation failure). Otherwise returns FcTr @PURPOSE@ Remove all app fonts from font database @DESC@ Clears the set of application-specific fonts. +If config is NULL, the current configuration is used. @@ @RET@ FcBool @@ -224,6 +256,7 @@ FcMatchPattern, then those tagged as pattern operations are applied, else if kind is FcMatchFont, those tagged as font operations are applied and p_pat is used for <test> elements with target=pattern. Returns FcFalse if the substitution cannot be performed (due to allocation failure). Otherwise returns FcTrue. +If config is NULL, the current configuration is used. @@ @RET@ FcBool @@ -235,6 +268,7 @@ if the substitution cannot be performed (due to allocation failure). Otherwise r @DESC@ Calls FcConfigSubstituteWithPat setting p_pat to NULL. Returns FcFalse if the substitution cannot be performed (due to allocation failure). Otherwise returns FcTrue. +If config is NULL, the current configuration is used. @@ @RET@ FcPattern * @@ -251,6 +285,7 @@ pattern. This function should be called only after FcConfigSubstitute and FcDefaultSubstitute have been called for p; otherwise the results will not be correct. +If config is NULL, the current configuration is used. @@ @RET@ FcFontSet * @@ -275,6 +310,7 @@ modify these patterns. Instead, they should be passed, along with p< FcFontRenderPrepare which combines them into a complete pattern. The FcFontSet returned by FcFontSort is destroyed by caling FcFontSetDestroy. +If config is NULL, the current configuration is used. @@ @RET@ FcPattern * @@ -287,7 +323,7 @@ The FcFontSet returned by FcFontSort is destroyed by caling FcFontSetDestroy. Creates a new pattern consisting of elements of font not appearing in pat, elements of pat not appearing in font and the best matching value from pat for elements appearing in both. The result is passed to -FcConfigSubstitute with kind FcMatchFont and then returned. +FcConfigSubstituteWithPat with kind FcMatchFont and then returned. @@ @RET@ FcFontSet * @@ -299,6 +335,8 @@ FcConfigSubstitute with kind FcMatchFont and then returne @DESC@ Selects fonts matching p, creates patterns from those fonts containing only the objects in os and returns the set of unique such patterns. +If config is NULL, the default configuration is checked +to be up to date, and used. @@ @RET@ FcChar8 * diff --git a/lib/fontconfig/doc/fcconstant.fncs b/lib/fontconfig/doc/fcconstant.fncs index 5264a5b91..86150f203 100644 --- a/lib/fontconfig/doc/fcconstant.fncs +++ b/lib/fontconfig/doc/fcconstant.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcconstant.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcconstant.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fcfile.fncs b/lib/fontconfig/doc/fcfile.fncs index e2823f01a..d15ab27a3 100644 --- a/lib/fontconfig/doc/fcfile.fncs +++ b/lib/fontconfig/doc/fcfile.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcfile.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcfile.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -29,7 +29,7 @@ @TYPE3@ FcFileCache * @ARG3@ cache @TYPE4@ FcBlanks * @ARG4@ blanks @TYPE5@ const FcChar8 * @ARG5@ file -@TYPE6@ FcBool% @ARG6@ force +@TYPE6@ FcBool% @ARG6@ force @PURPOSE@ scan a font file @DESC@ Scans a single file and adds all fonts found to set. @@ -61,15 +61,15 @@ returns FcFalse. @TYPE3@ FcFileCache * @ARG3@ cache @TYPE4@ FcBlanks * @ARG4@ blanks @TYPE5@ const FcChar8 * @ARG5@ dir -@TYPE6@ FcBool% @ARG6@ force -@PURPOSE@ DEPRECATED: formerly used to scan a font directory +@TYPE6@ FcBool% @ARG6@ force +@PURPOSE@ scan a font directory without caching it @DESC@ -This function does nothing aside from returning FcFalse. It used to scan an -entire directory and add all fonts found to -set. If force was FcTrue, then -the directory and all files within it were scanned even if information was -present in the per-directory cache file or cache. Any -subdirectories found were added to dirs. +If cache is not zero or if force +is FcFalse, this function currently returns FcFalse. Otherwise, it scans an +entire directory and adds all fonts found to set. +Any subdirectories found are added to dirs. Calling +this function does not create any cache files. Use FcDirCacheRead() if +caching is desired. @@ @RET@ FcBool diff --git a/lib/fontconfig/doc/fcfontset.fncs b/lib/fontconfig/doc/fcfontset.fncs index 51b12464b..57005fdd0 100644 --- a/lib/fontconfig/doc/fcfontset.fncs +++ b/lib/fontconfig/doc/fcfontset.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcfontset.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcfontset.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -62,6 +62,8 @@ Selects fonts matching pattern from sets, creates patterns from those fonts containing only the objects in object_set and returns the set of unique such patterns. +If config is NULL, the default configuration is checked +to be up to date, and used. @@ @RET@ FcPattern * @@ -80,6 +82,7 @@ pattern. This function should be called only after FcConfigSubstitute and FcDefaultSubstitute have been called for pattern; otherwise the results will not be correct. +If config is NULL, the current configuration is used. Returns NULL if an error occurs during this process. @@ diff --git a/lib/fontconfig/doc/fcformat.fncs b/lib/fontconfig/doc/fcformat.fncs new file mode 100644 index 000000000..b092449cf --- /dev/null +++ b/lib/fontconfig/doc/fcformat.fncs @@ -0,0 +1,301 @@ +/* + * fontconfig/doc/fcformat.fncs + * + * Copyright © 2008 Behdad Esfahbod + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +@RET@ FcChar8 * +@FUNC@ FcPatternFormat +@TYPE1@ FcPattern * @ARG1@ pat +@TYPE2@ const FcChar8 * @ARG2@ format +@PURPOSE@ Format a pattern into a string according to a format specifier +@DESC@ + +Converts given pattern pat into text described by +the format specifier format. +The return value refers to newly allocated memory which should be freed by the +caller using free(), or NULL if format is invalid. + + + +The format is loosely modelled after printf-style format string. +The format string is composed of zero or more directives: ordinary +characters (not "%"), which are copied unchanged to the output stream; +and tags which are interpreted to construct text from the pattern in a +variety of ways (explained below). +Special characters can be escaped +using backslash. C-string style special characters like \n and \r are +also supported (this is useful when the format string is not a C string +literal). +It is advisable to always escape curly braces that +are meant to be copied to the output as ordinary characters. + + + +Each tags is introduced by the character "%", +followed by an optional minimum field width, +followed by tag contents in curly braces ({}). +If the minimum field width value is provided the tag +will be expanded and the result padded to achieve the minimum width. +If the minimum field width is positive, the padding will right-align +the text. Negative field width will left-align. +The rest of this section describes various supported tag contents +and their expansion. + + + +A simple tag +is one where the content is an identifier. When simple +tags are expanded, the named identifier will be looked up in +pattern and the resulting list of values returned, +joined together using comma. For example, to print the family name and style the +pattern, use the format "%{family} %{style}\n". To extend the family column +to forty characters use "%-40{family}%{style}\n". + + + +Simple tags expand to list of all values for an element. To only choose +one of the values, one can index using the syntax "%{elt[idx]}". For example, +to get the first family name only, use "%{family[0]}". + + + +If a simple tag ends with "=" and the element is found in the pattern, the +name of the element followed by "=" will be output before the list of values. +For example, "%{weight=}" may expand to the string "weight=80". Or to the empty +string if pattern does not have weight set. + + + +If a simple tag starts with ":" and the element is found in the pattern, ":" +will be printed first. For example, combining this with the =, the format +"%{:weight=}" may expand to ":weight=80" or to the empty string +if pattern does not have weight set. + + + +If a simple tag contains the string ":-", the rest of the the tag contents +will be used as a default string. The default string is output if the element +is not found in the pattern. For example, the format +"%{:weight=:-123}" may expand to ":weight=80" or to the string +":weight=123" if pattern does not have weight set. + + + +A count tag +is one that starts with the character "#" followed by an element +name, and expands to the number of values for the element in the pattern. +For example, "%{#family}" expands to the number of family names +pattern has set, which may be zero. + + + +A sub-expression tag +is one that expands a sub-expression. The tag contents +are the sub-expression to expand placed inside another set of curly braces. +Sub-expression tags are useful for aligning an entire sub-expression, or to +apply converters (explained later) on an entire sub-expression. +For example, the format "%40{{%{family} %{style}}}" expands the sub-expression +to construct the family name followed by the style, then takes the entire +string and pads it on the left to be at least forty characters. + + + +A filter-out tag +is one starting with the character "-" followed by a +comma-separated list of element names, followed by a sub-expression enclosed +in curly braces. The sub-expression will be expanded but with a pattern that +has the listed elements removed from it. +For example, the format "%{-size,pixelsize{sub-expr}}" will expand "sub-expr" +with pattern sans the size and pixelsize elements. + + + +A filter-in tag +is one starting with the character "+" followed by a +comma-separated list of element names, followed by a sub-expression enclosed +in curly braces. The sub-expression will be expanded but with a pattern that +only has the listed elements from the surrounding pattern. +For example, the format "%{+family,familylang{sub-expr}}" will expand "sub-expr" +with a sub-pattern consisting only the family and family lang elements of +pattern. + + + +A conditional tag +is one starting with the character "?" followed by a +comma-separated list of element conditions, followed by two sub-expression +enclosed in curly braces. An element condition can be an element name, +in which case it tests whether the element is defined in pattern, or +the character "!" followed by an element name, in which case the test +is negated. The conditional passes if all the element conditions pass. +The tag expands the first sub-expression if the conditional passes, and +expands the second sub-expression otherwise. +For example, the format "%{?size,dpi,!pixelsize{pass}{fail}}" will expand +to "pass" if pattern has size and dpi elements but +no pixelsize element, and to "fail" otherwise. + + + +An enumerate tag +is one starting with the string "[]" followed by a +comma-separated list of element names, followed by a sub-expression enclosed +in curly braces. The list of values for the named elements are walked in +parallel and the sub-expression expanded each time with a pattern just having +a single value for those elements, starting from the first value and +continuing as long as any of those elements has a value. +For example, the format "%{[]family,familylang{%{family} (%{familylang})\n}}" +will expand the pattern "%{family} (%{familylang})\n" with a pattern +having only the first value of the family and familylang elemtns, then expands +it with the second values, then the third, etc. + + + +As a special case, if an enumerate tag has only one element, and that element +has only one value in the pattern, and that value is of type FcLangSet, the +individual languages in the language set are enumerated. + + + +A builtin tag +is one starting with the character "=" followed by a builtin +name. The following builtins are defined: + + + + +unparse + +Expands to the result of calling FcNameUnparse() on the pattern. + + + +fcmatch + +Expands to the output of the default output format of the fc-match +command on the pattern, without the final newline. + + + +fclist + +Expands to the output of the default output format of the fc-list +command on the pattern, without the final newline. + + + +pkgkit + +Expands to the list of PackageKit font() tags for the pattern. +Currently this includes tags for each family name, and each language +from the pattern, enumerated and sanitized into a set of tags terminated +by newline. Package management systems can use these tags to tag their +packages accordingly. + + + + +For example, the format "%{+family,style{%{=unparse}}}\n" will expand +to an unparsed name containing only the family and style element values +from pattern. + + + +The contents of any tag can be followed by a set of zero or more +converters. A converter is specified by the +character "|" followed by the converter name and arguments. The +following converters are defined: + + + + +basename + +Replaces text with the results of calling FcStrBasename() on it. + + + +dirname + +Replaces text with the results of calling FcStrDirname() on it. + + + +downcase + +Replaces text with the results of calling FcStrDowncase() on it. + + + +shescape + +Escapes text for one level of shell expansion. +(Escapes single-quotes, also encloses text in single-quotes.) + + + +cescape + +Escapes text such that it can be used as part of a C string literal. +(Escapes backslash and double-quotes.) + + + +xmlescape + +Escapes text such that it can be used in XML and HTML. +(Escapes less-than, greater-than, and ampersand.) + + + +delete(chars) + +Deletes all occurrences of each of the characters in chars +from the text. +FIXME: This converter is not UTF-8 aware yet. + + + +escape(chars) + +Escapes all occurrences of each of the characters in chars +by prepending it by the first character in chars. +FIXME: This converter is not UTF-8 aware yet. + + + +translate(from,to) + +Translates all occurrences of each of the characters in from +by replacing them with their corresponding character in to. +If to has fewer characters than +from, it will be extended by repeating its last +character. +FIXME: This converter is not UTF-8 aware yet. + + + + +For example, the format "%{family|downcase|delete( )}\n" will expand +to the values of the family element in pattern, +lower-cased and with spaces removed. + +@@ diff --git a/lib/fontconfig/doc/fcfreetype.fncs b/lib/fontconfig/doc/fcfreetype.fncs index 595489ba4..366cfaef8 100644 --- a/lib/fontconfig/doc/fcfreetype.fncs +++ b/lib/fontconfig/doc/fcfreetype.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcfreetype.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcfreetype.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fcinit.fncs b/lib/fontconfig/doc/fcinit.fncs index 9e9c9ceeb..e9b7947b8 100644 --- a/lib/fontconfig/doc/fcinit.fncs +++ b/lib/fontconfig/doc/fcinit.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcinit.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcinit.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fclangset.fncs b/lib/fontconfig/doc/fclangset.fncs index 3f69f0d30..f9d578e65 100644 --- a/lib/fontconfig/doc/fclangset.fncs +++ b/lib/fontconfig/doc/fclangset.fncs @@ -123,6 +123,14 @@ function returns FcLangDiffentTerritory. If ls has no matching language, this function returns FcLangDifferentLang. @@ +@RET@ FcStrSet * +@FUNC@ FcLangSetGetLangs +@TYPE1@ const FcLangSet * @ARG1@ ls +@PURPOSE@ get the list of languages in the langset +@DESC@ +Returns a string set of all languages in langset. +@@ + @RET@ FcStrSet * @FUNC@ FcGetLangs @TYPE1@ void diff --git a/lib/fontconfig/doc/fcmatrix.fncs b/lib/fontconfig/doc/fcmatrix.fncs index bfb5c4302..fd680e458 100644 --- a/lib/fontconfig/doc/fcmatrix.fncs +++ b/lib/fontconfig/doc/fcmatrix.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcmatrix.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcmatrix.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fcobjectset.fncs b/lib/fontconfig/doc/fcobjectset.fncs index 9a8596450..468a7bfc1 100644 --- a/lib/fontconfig/doc/fcobjectset.fncs +++ b/lib/fontconfig/doc/fcobjectset.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcobjectset.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcobjectset.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fcobjecttype.fncs b/lib/fontconfig/doc/fcobjecttype.fncs index a8b05abfb..bc254f3b9 100644 --- a/lib/fontconfig/doc/fcobjecttype.fncs +++ b/lib/fontconfig/doc/fcobjecttype.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcobjecttype.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcobjecttype.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fcpattern.fncs b/lib/fontconfig/doc/fcpattern.fncs index 2814598b9..e2c2953df 100644 --- a/lib/fontconfig/doc/fcpattern.fncs +++ b/lib/fontconfig/doc/fcpattern.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcpattern.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcpattern.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -31,7 +31,7 @@ Creates a pattern with no properties; used to build patterns from scratch. @RET@ FcPattern * @FUNC@ FcPatternDuplicate -@TYPE1@ FcPattern * @ARG1@ p +@TYPE1@ const FcPattern * @ARG1@ p @PURPOSE@ Copy a pattern @DESC@ Copy a pattern, returning a new pattern that matches @@ -77,6 +77,18 @@ Returns whether pa and pb have exa objects in os. @@ +@RET@ FcPattern * +@FUNC@ FcPatternFilter +@TYPE1@ FcPattern * @ARG1@ p +@TYPE2@ const FcObjectSet * @ARG1@ os +@PURPOSE@ Filter the objects of pattern +@DESC@ +Returns a new pattern that only has those objects from +p that are in os. +If os is NULL, a duplicate of +p is returned. +@@ + @RET@ FcChar32 @FUNC@ FcPatternHash @TYPE1@ const FcPattern * @ARG1@ p @@ -241,18 +253,20 @@ within the pattern directly. Applications must not free this value. @TYPE4+++++@ FcBool * @ARG4+++++@ b @PROTOTYPE++++++@ -@RET++++++@ FcBool +@RET++++++@ FcResult @FUNC++++++@ FcPatternGetFTFace @TYPE1++++++@ FcPattern * @ARG1++++++@ p @TYPE2++++++@ const char * @ARG2++++++@ object -@TYPE3++++++@ const FT_Face * @ARG3++++++@ f +@TYPE3+++++@ int% @ARG3+++++@ n +@TYPE3++++++@ FT_Face * @ARG3++++++@ f @PROTOTYPE+++++++@ -@RET+++++++@ FcBool +@RET+++++++@ FcResult @FUNC+++++++@ FcPatternGetLangSet @TYPE1+++++++@ FcPattern * @ARG1+++++++@ p @TYPE2+++++++@ const char * @ARG2+++++++@ object -@TYPE3+++++++@ const FcLangSet ** @ARG3+++++++@ l +@TYPE3+++++@ int% @ARG3+++++@ n +@TYPE3+++++++@ FcLangSet ** @ARG3+++++++@ l @PURPOSE@ Return a typed value from a pattern @DESC@ @@ -265,20 +279,20 @@ in preference to FcPatternGet to provide compile-time typechecking. @RET@ FcPattern * @FUNC@ FcPatternBuild -@TYPE1@ FcPattern * @ARG1@ orig +@TYPE1@ FcPattern * @ARG1@ pattern @TYPE2@ ... @PROTOTYPE+@ @RET+@ FcPattern * @FUNC+@ FcPatternVaBuild -@TYPE1+@ FcPattern * @ARG1+@ orig +@TYPE1+@ FcPattern * @ARG1+@ pattern @TYPE2+@ va_list% @ARG2+@ va @PROTOTYPE++@ @RET++@ void @FUNC++@ FcPatternVapBuild @TYPE1++@ FcPattern * @ARG1++@ result -@TYPE2++@ FcPattern * @ARG2++@ orig +@TYPE2++@ FcPattern * @ARG2++@ pattern @TYPE3++@ va_list% @ARG3++@ va @PURPOSE@ Create patterns from arguments @@ -379,5 +393,5 @@ Converts name from the standard text format described abo @DESC@ Converts the given pattern into the standard text format described above. The return value is not static, but instead refers to newly allocated memory -which should be freed by the caller. +which should be freed by the caller using free(). @@ diff --git a/lib/fontconfig/doc/fcstring.fncs b/lib/fontconfig/doc/fcstring.fncs index 7a5251804..5f1f93ac1 100644 --- a/lib/fontconfig/doc/fcstring.fncs +++ b/lib/fontconfig/doc/fcstring.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcstring.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcstring.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fcstrset.fncs b/lib/fontconfig/doc/fcstrset.fncs index d115bedf8..61af37b63 100644 --- a/lib/fontconfig/doc/fcstrset.fncs +++ b/lib/fontconfig/doc/fcstrset.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcstrset.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcstrset.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fcvalue.fncs b/lib/fontconfig/doc/fcvalue.fncs index 4988ad007..d0c669b1f 100644 --- a/lib/fontconfig/doc/fcvalue.fncs +++ b/lib/fontconfig/doc/fcvalue.fncs @@ -1,5 +1,5 @@ /* - * $Id: fcvalue.fncs,v 1.2 2009/04/05 16:43:35 matthieu Exp $ + * fontconfig/doc/fcvalue.fncs * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/doc/fontconfig-devel.sgml b/lib/fontconfig/doc/fontconfig-devel.sgml index 4869fc713..891251f30 100644 --- a/lib/fontconfig/doc/fontconfig-devel.sgml +++ b/lib/fontconfig/doc/fontconfig-devel.sgml @@ -8,6 +8,7 @@ + @@ -21,7 +22,7 @@ ]> @@ -548,8 +516,7 @@ System configuration file --> mono - monospace + monospace @@ -640,37 +607,38 @@ User configuration file + Files - fonts.conf contains configuration information for the - fontconfig library consisting of directories to look at for - font information as well as instructions on editing program - specified font patterns before attempting to match the - available fonts. It is in xml format. +fonts.conf contains configuration information for the fontconfig library +consisting of directories to look at for font information as well as +instructions on editing program specified font patterns before attempting to +match the available fonts. It is in xml format. - conf.d is the conventional name for a directory of additional - configuration files managed by external applications or the - local administrator. The filenames starting with decimal digits - are sorted in lexicographic order and used as additional - configuration files. All of these files are in xml format. The - master fonts.conf file references this directory in an - directive. +conf.d is the conventional name for a directory of additional configuration +files managed by external applications or the local administrator. The +filenames starting with decimal digits are sorted in lexicographic order and +used as additional configuration files. All of these files are in xml format. +The master fonts.conf file references this directory in an directive. - fonts.dtd is a DTD that describes the format of the - configuration files. +fonts.dtd is a DTD that describes the format of the configuration files. - ~/.fonts.conf is the conventional location for per-user font - configuration, although the actual location is specified in the - global fonts.conf file. +~/.fonts.conf.d is the conventional name for a per-user directory of (typically +auto-generated) configuration files, although the actual location is specified +in the global fonts.conf file. - ~/.fonts.cache-* is the conventional repository of font - information that isn't found in the per-directory caches. This - file is automatically maintained by fontconfig. +~/.fonts.conf is the conventional location for per-user font configuration, +although the actual location is specified in the global fonts.conf file. + +~/.fonts.cache-* is the conventional repository of font information that isn't +found in the per-directory caches. This file is automatically maintained by +fontconfig. See Also - fc-cache(1), fc-match(1), fc-list(1) +fc-cat(1), fc-cache(1), fc-list(1), fc-match(1), fc-query(1) Version - Fontconfig version 2.6.0 +Fontconfig version 2.8.0 + diff --git a/lib/fontconfig/doc/fonts-conf.5 b/lib/fontconfig/doc/fonts-conf.5 index 8dcb3c4b3..44ffa0f89 100644 --- a/lib/fontconfig/doc/fonts-conf.5 +++ b/lib/fontconfig/doc/fonts-conf.5 @@ -1,19 +1,16 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "FONTS-CONF" "5" "31 May 2008" "" "" - +.\\" auto-generated by docbook2man-spec $Revision: 1.3 $ +.TH "FONTS-CONF" "5" "18 November 2009" "" "" .SH NAME fonts.conf \- Font configuration files .SH SYNOPSIS - +.sp .nf /etc/fonts/fonts.conf /etc/fonts/fonts.dtd /etc/fonts/conf.d + ~/.fonts.conf.d ~/.fonts.conf +.sp .fi .SH "DESCRIPTION" .PP @@ -28,14 +25,14 @@ which accepts font patterns and returns the nearest matching font. .PP The configuration module consists of the FcConfig datatype, libexpat and FcConfigParse which walks over an XML tree and amends a configuration with -data found within. From an external perspective, configuration of the +data found within. From an external perspective, configuration of the library consists of generating a valid XML tree and feeding that to -FcConfigParse. The only other mechanism provided to applications for +FcConfigParse. The only other mechanism provided to applications for changing the running configuration is to add fonts and directories to the -list of application-provided font files. +list of application-provided font files. .PP The intent is to make font configurations relatively static, and shared by -as many applications as possible. It is hoped that this will lead to more +as many applications as possible. It is hoped that this will lead to more stable font selection when passing names from one application to another. XML was chosen as a configuration file format because it provides a format which is easy for external agents to edit while retaining the correct @@ -43,19 +40,19 @@ structure and syntax. .PP Font configuration is separate from font matching; applications needing to do their own matching can access the available fonts from the library and -perform private matching. The intent is to permit applications to pick and +perform private matching. The intent is to permit applications to pick and choose appropriate functionality from the library instead of forcing them to -choose between this library and a private configuration mechanism. The hope +choose between this library and a private configuration mechanism. The hope is that this will ensure that configuration of fonts for all applications -can be centralized in one place. Centralizing font configuration will +can be centralized in one place. Centralizing font configuration will simplify and regularize font installation and customization. .SS "FONT PROPERTIES" .PP While font patterns may contain essentially any properties, there are some -well known properties with associated types. Fontconfig uses some of these -properties for font matching and font completion. Others are provided as a +well known properties with associated types. Fontconfig uses some of these +properties for font matching and font completion. Others are provided as a convenience for the applications' rendering mechanism. - +.sp .nf Property Type Description -------------------------------------------------------------- @@ -98,24 +95,25 @@ convenience for the applications' rendering mechanism. capability String List of layout capabilities in the font embolden Bool Rasterizer should synthetically embolden the font +.sp .fi .SS "FONT MATCHING" .PP Fontconfig performs matching by measuring the distance from a provided -pattern to all of the available fonts in the system. The closest matching -font is selected. This ensures that a font will always be returned, but +pattern to all of the available fonts in the system. The closest matching +font is selected. This ensures that a font will always be returned, but doesn't ensure that it is anything like the requested pattern. .PP -Font matching starts with an application constructed pattern. The desired -attributes of the resulting font are collected together in a pattern. Each +Font matching starts with an application constructed pattern. The desired +attributes of the resulting font are collected together in a pattern. Each property of the pattern can contain one or more values; these are listed in priority order; matches earlier in the list are considered "closer" than matches later in the list. .PP The initial pattern is modified by applying the list of editing instructions specific to patterns found in the configuration; each consists of a match -predicate and a set of editing operations. They are executed in the order -they appeared in the configuration. Each match causes the associated +predicate and a set of editing operations. They are executed in the order +they appeared in the configuration. Each match causes the associated sequence of editing operations to be applied. .PP After the pattern has been edited, a sequence of default substitutions are @@ -126,25 +124,25 @@ font properties during rendering. The canonical font pattern is finally matched against all available fonts. The distance from the pattern to the font is measured for each of several properties: foundry, charset, family, lang, spacing, pixelsize, style, -slant, weight, antialias, rasterizer and outline. This list is in priority +slant, weight, antialias, rasterizer and outline. This list is in priority order -- results of comparing earlier elements of this list weigh more heavily than later elements. .PP There is one special case to this rule; family names are split into two -bindings; strong and weak. Strong family names are given greater precedence +bindings; strong and weak. Strong family names are given greater precedence in the match than lang elements while weak family names are given lower -precedence than lang elements. This permits the document language to drive +precedence than lang elements. This permits the document language to drive font selection when any document specified font is unavailable. .PP The pattern representing that font is augmented to include any properties found in the pattern but not found in the font itself; this permits the application to pass rendering instructions or any other data through the -matching system. Finally, the list of editing instructions specific to -fonts found in the configuration are applied to the pattern. This modified +matching system. Finally, the list of editing instructions specific to +fonts found in the configuration are applied to the pattern. This modified pattern is returned to the application. .PP The return value contains sufficient information to locate and rasterize the -font, including the file name, pixel size and other rendering data. As +font, including the file name, pixel size and other rendering data. As none of the information involved pertains to the FreeType library, applications are free to use any rasterization engine or even to take the identified font file and access it directly. @@ -152,26 +150,27 @@ the identified font file and access it directly. The match/edit sequences in the configuration are performed in two passes because there are essentially two different operations necessary -- the first is to modify how fonts are selected; aliasing families and adding -suitable defaults. The second is to modify how the selected fonts are -rasterized. Those must apply to the selected font, not the original pattern +suitable defaults. The second is to modify how the selected fonts are +rasterized. Those must apply to the selected font, not the original pattern as false matches will often occur. .SS "FONT NAMES" .PP Fontconfig provides a textual representation for patterns that the library -can both accept and generate. The representation is in three parts, first a +can both accept and generate. The representation is in three parts, first a list of family names, second a list of point sizes and finally a list of additional properties: - +.sp .nf -:=:=\&... +.sp .fi .PP -Values in a list are separated with commas. The name needn't include either -families or point sizes; they can be elided. In addition, there are +Values in a list are separated with commas. The name needn't include either +families or point sizes; they can be elided. In addition, there are symbolic constants that simultaneously indicate both a name and a value. Here are some examples: - +.sp .nf Name Meaning ---------------------------------------------------------- @@ -181,6 +180,7 @@ Here are some examples: Monospace:matrix=1 .1 0 1 The users preferred monospace font with artificial obliquing +.sp .fi .PP The '\\', '-', ':' and ',' characters in family names must be preceeded by a @@ -195,7 +195,7 @@ large amount of internal debugging left enabled. It is controlled by means of the FC_DEBUG environment variable. The value of this variable is interpreted as a number, and each bit within that value controls different debugging messages. - +.sp .nf Name Value Meaning --------------------------------------------------------- @@ -213,6 +213,7 @@ debugging messages. LANGSET 2048 Dump char sets used to construct lang values OBJTYPES 4096 Display message when value typechecks fail +.sp .fi .PP Add the value of the desired debug levels together and assign that (in @@ -220,42 +221,43 @@ base 10) to the FC_DEBUG environment variable before running the application. Output from these statements is sent to stdout. .SH "LANG TAGS" .PP -Each font in the database contains a list of languages it supports. This is +Each font in the database contains a list of languages it supports. This is computed by comparing the Unicode coverage of the font with the orthography -of each language. Languages are tagged using an RFC-3066 compatible naming +of each language. Languages are tagged using an RFC-3066 compatible naming and occur in two parts -- the ISO 639 language tag followed a hyphen and then -by the ISO 3166 country code. The hyphen and country code may be elided. +by the ISO 3166 country code. The hyphen and country code may be elided. .PP Fontconfig has orthographies for several languages built into the library. No provision has been made for adding new ones aside from rebuilding the -library. It currently supports 122 of the 139 languages named in ISO 639-1, +library. It currently supports 122 of the 139 languages named in ISO 639-1, 141 of the languages with two-letter codes from ISO 639-2 and another 30 -languages with only three-letter codes. Languages with both two and three +languages with only three-letter codes. Languages with both two and three letter codes are provided with only the two letter code. .PP For languages used in multiple territories with radically different -character sets, fontconfig includes per-territory orthographies. This +character sets, fontconfig includes per-territory orthographies. This includes Azerbaijani, Kurdish, Pashto, Tigrinya and Chinese. .SH "CONFIGURATION FILE FORMAT" .PP Configuration files for fontconfig are stored in XML format; this format makes external configuration tools easier to write and ensures that -they will generate syntactically correct configuration files. As XML +they will generate syntactically correct configuration files. As XML files are plain text, they can also be manipulated by the expert user using a text editor. .PP The fontconfig document type definition resides in the external entity "fonts.dtd"; this is normally stored in the default font configuration -directory (/etc/fonts). Each configuration file should contain the +directory (/etc/fonts). Each configuration file should contain the following structure: - +.sp .nf - ... +\&... +.sp .fi .SS "" .PP @@ -268,31 +270,31 @@ to include in the set of available fonts. .SS "" .PP This element contains a file name for the per-user cache of font -information. If it starts with '~', it refers to a file in the users -home directory. This file is used to hold information about fonts that -isn't present in the per-directory cache files. It is automatically -maintained by the fontconfig library. The default for this file +information. If it starts with '~', it refers to a file in the users +home directory. This file is used to hold information about fonts that +isn't present in the per-directory cache files. It is automatically +maintained by the fontconfig library. The default for this file is ``~/.fonts.cache-\&'', where is the font configuration file version number (currently 2). .SS "" .PP This element contains the name of an additional configuration file or -directory. If a directory, every file within that directory starting with an -ASCII digit (U+0030 - U+0039) and ending with the string ``.conf'' will be processed in sorted order. When +directory. If a directory, every file within that directory starting with an +ASCII digit (U+0030 - U+0039) and ending with the string ``.conf'' will be processed in sorted order. When the XML datatype is traversed by FcConfigParse, the contents of the file(s) will also be incorporated into the configuration by passing the filename(s) to -FcConfigLoadAndParse. If 'ignore_missing' is set to "yes" instead of the +FcConfigLoadAndParse. If 'ignore_missing' is set to "yes" instead of the default "no", a missing file or directory will elicit no warning message from the library. .SS "" .PP This element provides a place to consolidate additional configuration -information. can contain and elements in any +information. can contain and elements in any order. .SS "" .PP Fonts often include "broken" glyphs which appear in the encoding but are -drawn as blanks on the screen. Within the element, place each +drawn as blanks on the screen. Within the element, place each Unicode characters which is supposed to be blank in an element. Characters outside of this set which are drawn as blank will be elided from the set of characters supported by the font. @@ -305,47 +307,47 @@ automatically rebuild the internal datastructures when this interval passes. .SS "" .PP This element is used to black/white list fonts from being listed or matched -against. It holds acceptfont and rejectfont elements. +against. It holds acceptfont and rejectfont elements. .SS "" .PP Fonts matched by an acceptfont element are "whitelisted"; such fonts are explicitly included in the set of fonts used to resolve list and match requests; including them in this list protects them from being "blacklisted" -by a rejectfont element. Acceptfont elements include glob and pattern +by a rejectfont element. Acceptfont elements include glob and pattern elements which are used to match fonts. .SS "" .PP Fonts matched by an rejectfont element are "blacklisted"; such fonts are excluded from the set of fonts used to resolve list and match requests as if -they didn't exist in the system. Rejectfont elements include glob and +they didn't exist in the system. Rejectfont elements include glob and pattern elements which are used to match fonts. .SS "" .PP Glob elements hold shell-style filename matching patterns (including ? and -*) which match fonts based on their complete pathnames. This can be used to +*) which match fonts based on their complete pathnames. This can be used to exclude a set of directories (/usr/share/fonts/uglyfont*), or particular font file types (*.pcf.gz), but the latter mechanism relies rather heavily -on filenaming conventions which can't be relied upon. Note that globs +on filenaming conventions which can't be relied upon. Note that globs only apply to directories, not to individual fonts. .SS "" .PP Pattern elements perform list-style matching on incoming fonts; that is, -they hold a list of elements and associated values. If all of those -elements have a matching value, then the pattern matches the font. This can +they hold a list of elements and associated values. If all of those +elements have a matching value, then the pattern matches the font. This can be used to select fonts based on attributes of the font (scalable, bold, etc), which is a more reliable mechanism than using file extensions. Pattern elements include patelt elements. .SS "" .PP -Patelt elements hold a single pattern element and list of values. They must -have a 'name' attribute which indicates the pattern element name. Patelt +Patelt elements hold a single pattern element and list of values. They must +have a 'name' attribute which indicates the pattern element name. Patelt elements include int, double, string, matrix, bool, charset and const elements. .SS "" .PP This element holds first a (possibly empty) list of elements and then -a (possibly empty) list of elements. Patterns which match all of the -tests are subjected to all the edits. If 'target' is set to "font" instead +a (possibly empty) list of elements. Patterns which match all of the +tests are subjected to all the edits. If 'target' is set to "font" instead of the default "pattern", then this element applies to the font name resulting from a match rather than a font pattern to be matched. If 'target' is set to "scan", then this element applies when the font is scanned to @@ -355,24 +357,24 @@ build the fontconfig database. This element contains a single value which is compared with the target ('pattern', 'font', 'scan' or 'default') property "property" (substitute any of the property names seen above). 'compare' can be one of "eq", "not_eq", "less", "less_eq", "more", or -"more_eq". 'qual' may either be the default, "any", in which case the match +"more_eq". 'qual' may either be the default, "any", in which case the match succeeds if any value associated with the property matches the test value, or "all", in which case all of the values associated with the property must -match the test value. When used in a element, +match the test value. When used in a element, the target= attribute in the element selects between matching -the original pattern or the font. "default" selects whichever target the +the original pattern or the font. "default" selects whichever target the outer element has selected. .SS "" .PP This element contains a list of expression elements (any of the value or -operator elements). The expression elements are evaluated at run-time and -modify the property "property". The modification depends on whether +operator elements). The expression elements are evaluated at run-time and +modify the property "property". The modification depends on whether "property" was matched by one of the associated elements, if so, the -modification may affect the first matched value. Any values inserted into +modification may affect the first matched value. Any values inserted into the property are given the indicated binding ("strong", "weak" or "same") with "same" binding using the value from the matched pattern element. \&'mode' is one of: - +.sp .nf Mode With Match Without Match --------------------------------------------------------------------- @@ -383,11 +385,12 @@ with "same" binding using the value from the matched pattern element. "append" Append after matching Append at end of list "append_last" Append at end of list Append at end of list +.sp .fi .SS ", , , " .PP -These elements hold a single value of the indicated type. -elements hold either true or false. An important limitation exists in +These elements hold a single value of the indicated type. +elements hold either true or false. An important limitation exists in the parsing of floating point numbers -- fontconfig requires that the mantissa start with a digit, not a decimal point, so insert a leading zero for purely fractional values (e.g. use 0.5 instead of .5 and -0.5 @@ -398,13 +401,13 @@ This element holds the four elements of an affine transformation. .SS "" .PP -Holds a property name. Evaluates to the first value from the property of +Holds a property name. Evaluates to the first value from the property of the font, not the pattern. .SS "" .PP Holds the name of a constant; these are always integers and serve as symbolic names for common font values: - +.sp .nf Constant Property Value ------------------------------------- @@ -453,11 +456,12 @@ symbolic names for common font values: hintmedium hintstyle 2 hintfull hintstyle 3 +.sp .fi .SS ", , , , , " .PP These elements perform the specified operation on a list of expression -elements. and are boolean, not bitwise. +elements. and are boolean, not bitwise. .SS ", , , , , " .PP These elements compare two values, producing a boolean result. @@ -472,9 +476,9 @@ of the third. .SS "" .PP Alias elements provide a shorthand notation for the set of common match -operations needed to substitute one font family for another. They contain a +operations needed to substitute one font family for another. They contain a element followed by optional , and -elements. Fonts matching the element are edited to prepend the +elements. Fonts matching the element are edited to prepend the list of ed families before the matching , append the able families after the matching and append the families to the end of the family list. @@ -488,7 +492,7 @@ These hold a list of elements to be used by the element. .SS "SYSTEM CONFIGURATION FILE" .PP This is an example of a system-wide configuration file - +.sp .nf @@ -571,12 +575,13 @@ This is an example of a system-wide configuration file +.sp .fi .SS "USER CONFIGURATION FILE" .PP This is an example of a per-user configuration file that lives in ~/.fonts.conf - +.sp .nf @@ -598,6 +603,7 @@ This is an example of a per-user configuration file that lives in +.sp .fi .SH "FILES" .PP @@ -605,29 +611,34 @@ This is an example of a per-user configuration file that lives in contains configuration information for the fontconfig library consisting of directories to look at for font information as well as instructions on editing program specified font patterns before attempting to -match the available fonts. It is in xml format. +match the available fonts. It is in xml format. .PP \fBconf.d\fR is the conventional name for a directory of additional configuration files -managed by external applications or the local administrator. The +managed by external applications or the local administrator. The filenames starting with decimal digits are sorted in lexicographic order -and used as additional configuration files. All of these files are in xml -format. The master fonts.conf file references this directory in an +and used as additional configuration files. All of these files are in xml +format. The master fonts.conf file references this directory in an directive. .PP \fBfonts.dtd\fR is a DTD that describes the format of the configuration files. .PP +\fB~/.fonts.conf.d\fR +is the conventional name for a per-user directory of (typically +auto-generated) configuration files, although the +actual location is specified in the global fonts.conf file. +.PP \fB~/.fonts.conf\fR is the conventional location for per-user font configuration, although the actual location is specified in the global fonts.conf file. .PP -\fB ~/.fonts.cache-*\fR +\fB~/.fonts.cache-*\fR is the conventional repository of font information that isn't found in the -per-directory caches. This file is automatically maintained by fontconfig. +per-directory caches. This file is automatically maintained by fontconfig. .SH "SEE ALSO" .PP -fc-cache(1), fc-match(1), fc-list(1) +fc-cat(1), fc-cache(1), fc-list(1), fc-match(1), fc-query(1) .SH "VERSION" .PP -Fontconfig version 2.6.0 +Fontconfig version 2.8.0 diff --git a/lib/fontconfig/doc/func.sgml b/lib/fontconfig/doc/func.sgml index fe50c7395..0da5ae4a6 100644 --- a/lib/fontconfig/doc/func.sgml +++ b/lib/fontconfig/doc/func.sgml @@ -1,5 +1,5 @@ - Sep 22, 2005"> + Aug 13, 2008"> 1"> @@ -63,14 +63,14 @@ manpage.1: manpage.sgml &dhpackage; - + - + @@ -91,10 +91,7 @@ manpage.1: manpage.sgml Note that &dhpackage; must be executed once per architecture to generate font information customized - for that architecture. On a subsequent run, - &dhpackage; will augment the cache - information files with the information for the new - architecture. + for that architecture. @@ -139,7 +136,7 @@ manpage.1: manpage.sgml - + @@ -155,10 +152,10 @@ manpage.1: manpage.sgml - + - A list of directories to scan for fonts. + Directory to scan for fonts. @@ -168,7 +165,7 @@ manpage.1: manpage.sgml FILES - fonts.cache-2 + %cachdir%/*-%arch%.cache-2 These files are generated by &dhpackage; and contain maps from file names to font properties. They are @@ -182,7 +179,13 @@ manpage.1: manpage.sgml SEE ALSO - fc-list (1). + + fc-cat(1) + fc-list(1) + fc-match(1) + fc-query(1) + fc-scan(1) + The fontconfig user's guide, in HTML format: /usr/share/doc/fontconfig/fontconfig-user.html. diff --git a/lib/fontconfig/fc-case/Makefile.am b/lib/fontconfig/fc-case/Makefile.am index d4fa12d87..bf0198454 100644 --- a/lib/fontconfig/fc-case/Makefile.am +++ b/lib/fontconfig/fc-case/Makefile.am @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -34,7 +34,7 @@ TARG=fccase.h noinst_PROGRAMS=fc-case -noinst_MANS=fc-case.man +noinst_HEADERS=$(TARG) fc_case_SRCS= \ fc-case.c \ @@ -47,12 +47,13 @@ SCASEFOLDING=${top_srcdir}/fc-case/CaseFolding.txt EXTRA_DIST=$(TMPL) $(CASEFOLDING) $(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING) - rm -f $(TARG) - ./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG) + $(AM_V_GEN) $(RM) $(TARG); \ + ./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \ + mv $(TARG).tmp $(TARG) ALIAS_FILES = fcalias.h fcaliastail.h -BUILT_SOURCES = $(ALIAS_FILES) $(TARG) +BUILT_SOURCES = $(ALIAS_FILES) $(ALIAS_FILES): touch $(ALIAS_FILES) diff --git a/lib/fontconfig/fc-case/Makefile.in b/lib/fontconfig/fc-case/Makefile.in index c37008796..7ee2f8f09 100644 --- a/lib/fontconfig/fc-case/Makefile.in +++ b/lib/fontconfig/fc-case/Makefile.in @@ -29,15 +29,16 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -62,7 +63,8 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = fc-case$(EXEEXT) subdir = fc-case -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.in @@ -83,6 +85,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ CCLD = $(CC) SOURCES = fc-case.c DIST_SOURCES = fc-case.c +HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -114,7 +117,6 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ -DOCDIR = @DOCDIR@ DOCMAN3 = @DOCMAN3@ DOCSRC = @DOCSRC@ DOLT_BASH = @DOLT_BASH@ @@ -139,6 +141,7 @@ FC_FONTPATH = @FC_FONTPATH@ FFLAGS = @FFLAGS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GREP = @GREP@ HASDOCBOOK = @HASDOCBOOK@ HAVE_EXPAT = @HAVE_EXPAT@ HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@ @@ -170,7 +173,6 @@ MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -ORTH_FILES = @ORTH_FILES@ OS_WIN32_FALSE = @OS_WIN32_FALSE@ OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ @@ -182,6 +184,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -190,18 +193,9 @@ USEDOCBOOK_FALSE = @USEDOCBOOK_FALSE@ USEDOCBOOK_TRUE = @USEDOCBOOK_TRUE@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_NMEDIT = @ac_ct_NMEDIT@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -219,6 +213,9 @@ build_os = @build_os@ build_vendor = @build_vendor@ confdir = @confdir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ fc_cachedir = @fc_cachedir@ ft_config = @ft_config@ @@ -227,18 +224,22 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -248,7 +249,7 @@ INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) TMPL = fccase.tmpl.h STMPL = ${top_srcdir}/fc-case/${TMPL} TARG = fccase.h -noinst_MANS = fc-case.man +noinst_HEADERS = $(TARG) fc_case_SRCS = \ fc-case.c \ fccaseint.h \ @@ -258,7 +259,7 @@ CASEFOLDING = CaseFolding.txt SCASEFOLDING = ${top_srcdir}/fc-case/CaseFolding.txt EXTRA_DIST = $(TMPL) $(CASEFOLDING) ALIAS_FILES = fcalias.h fcaliastail.h -BUILT_SOURCES = $(ALIAS_FILES) $(TARG) +BUILT_SOURCES = $(ALIAS_FILES) CLEANFILES = $(TARG) $(ALIAS_FILES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -422,7 +423,7 @@ distdir: $(DISTFILES) check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(PROGRAMS) +all-am: Makefile $(PROGRAMS) $(HEADERS) installdirs: install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am @@ -516,8 +517,9 @@ uninstall-am: uninstall-info-am $(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING) - rm -f $(TARG) - ./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG) + $(AM_V_GEN) $(RM) $(TARG); \ + ./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \ + mv $(TARG).tmp $(TARG) $(ALIAS_FILES): touch $(ALIAS_FILES) diff --git a/lib/fontconfig/fc-case/fc-case.c b/lib/fontconfig/fc-case/fc-case.c index f08e71d7e..e86b34783 100644 --- a/lib/fontconfig/fc-case/fc-case.c +++ b/lib/fontconfig/fc-case/fc-case.c @@ -1,5 +1,5 @@ /* - * $Id: fc-case.c,v 1.1.1.1 2006/11/25 18:42:31 matthieu Exp $ + * fontconfig/fc-case/fc-case.c * * Copyright © 2004 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-case/fccase.tmpl.h b/lib/fontconfig/fc-case/fccase.tmpl.h index 06077f86f..62633293a 100644 --- a/lib/fontconfig/fc-case/fccase.tmpl.h +++ b/lib/fontconfig/fc-case/fccase.tmpl.h @@ -1,5 +1,5 @@ /* - * $Id: fccase.tmpl.h,v 1.1.1.1 2006/11/25 18:42:31 matthieu Exp $ + * fontconfig/fc-case/fccase.tmpl.h * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-cat/Makefile.am b/lib/fontconfig/fc-cat/Makefile.am index 8fb5cfa3f..27b637534 100644 --- a/lib/fontconfig/fc-cat/Makefile.am +++ b/lib/fontconfig/fc-cat/Makefile.am @@ -1,5 +1,5 @@ # -# $Id: Makefile.am,v 1.5 2009/04/05 16:43:36 matthieu Exp $ +# fontconfig/fc-cat/Makefile.am # # Copyright © 2003 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -46,7 +46,7 @@ if USEDOCBOOK ${man_MANS}: ${SGML} $(RM) $@ $(DOC2MAN) ${SGML} - $(RM) manpage.refs manpage.links + $(RM) manpage.* all-local: $(man_MANS) diff --git a/lib/fontconfig/fc-cat/Makefile.in b/lib/fontconfig/fc-cat/Makefile.in index a8062a6fd..e83774d7e 100644 --- a/lib/fontconfig/fc-cat/Makefile.in +++ b/lib/fontconfig/fc-cat/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.8 2009/04/05 16:43:36 matthieu Exp $ +# fontconfig/fc-cat/Makefile.am # # Copyright © 2003 Keith Packard # @@ -29,9 +29,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -120,7 +120,6 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ -DOCDIR = @DOCDIR@ DOCMAN3 = @DOCMAN3@ DOCSRC = @DOCSRC@ DOLT_BASH = @DOLT_BASH@ @@ -145,6 +144,7 @@ FC_FONTPATH = @FC_FONTPATH@ FFLAGS = @FFLAGS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GREP = @GREP@ HASDOCBOOK = @HASDOCBOOK@ HAVE_EXPAT = @HAVE_EXPAT@ HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@ @@ -176,7 +176,6 @@ MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -ORTH_FILES = @ORTH_FILES@ OS_WIN32_FALSE = @OS_WIN32_FALSE@ OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ @@ -188,6 +187,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -196,18 +196,9 @@ USEDOCBOOK_FALSE = @USEDOCBOOK_FALSE@ USEDOCBOOK_TRUE = @USEDOCBOOK_TRUE@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_NMEDIT = @ac_ct_NMEDIT@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -225,6 +216,9 @@ build_os = @build_os@ build_vendor = @build_vendor@ confdir = @confdir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ fc_cachedir = @fc_cachedir@ ft_config = @ft_config@ @@ -233,18 +227,22 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -583,7 +581,7 @@ uninstall-man: uninstall-man1 @USEDOCBOOK_TRUE@${man_MANS}: ${SGML} @USEDOCBOOK_TRUE@ $(RM) $@ @USEDOCBOOK_TRUE@ $(DOC2MAN) ${SGML} -@USEDOCBOOK_TRUE@ $(RM) manpage.refs manpage.links +@USEDOCBOOK_TRUE@ $(RM) manpage.* @USEDOCBOOK_TRUE@all-local: $(man_MANS) diff --git a/lib/fontconfig/fc-cat/fc-cat.1 b/lib/fontconfig/fc-cat/fc-cat.1 index d4e81fed0..3fbafb8ae 100644 --- a/lib/fontconfig/fc-cat/fc-cat.1 +++ b/lib/fontconfig/fc-cat/fc-cat.1 @@ -1,16 +1,12 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "FC-CAT" "1" "05 May 2008" "" "" - +.\\" auto-generated by docbook2man-spec $Revision: 1.3 $ +.TH "FC-CAT" "1" "Aug 13, 2008" "" "" .SH NAME fc-cat \- read font information cache files .SH SYNOPSIS +.sp +\fBfc-cat\fR [ \fB-rvVh\fR ] [ \fB--recurse\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] -\fBfc-cat\fR [ \fB-rvV?\fR ] [ \fB--recurse\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIfonts-cache-2-files\fB\fR ] [ \fB\fIdirs\fB\fR ] - + [ \fB [ \fIfonts-cache-2-files\fB ] [ \fIdirs\fB ] \fR\fI...\fR ] .SH "DESCRIPTION" .PP \fBfc-cat\fR reads the font information from @@ -19,30 +15,34 @@ and emits it in ASCII form. .SH "OPTIONS" .PP This program follows the usual GNU command line syntax, -with long options starting with two dashes (`-'). A summary of +with long options starting with two dashes (`-'). A summary of options is included below. .TP -\fB-r --recurse \fR +\fB-r\fR Recurse into subdirectories. .TP -\fB-v --verbose \fR +\fB-v\fR Be verbose. .TP -\fB-? --help \fR +\fB-h\fR Show summary of options. .TP -\fB-V --version \fR +\fB-V\fR Show version of the program and exit. .SH "SEE ALSO" .PP -\fBfc-cache\fR (1). +\fBfc-cache\fR(1) +\fBfc-list\fR(1) +\fBfc-match\fR(1) +\fBfc-query\fR(1) +\fBfc-scan\fR(1) .PP The fontconfig user's guide, in HTML format: \fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. .SH "AUTHOR" .PP This manual page was written by Patrick Lam \&. -...\" $Header: /home/cvs/xenocara/lib/fontconfig/fc-cat/Attic/fc-cat.1,v 1.2 2009/04/05 16:43:36 matthieu Exp $ +...\" $Header: /home/cvs/xenocara/lib/fontconfig/fc-cat/Attic/fc-cat.1,v 1.3 2010/03/25 21:48:45 matthieu Exp $ ...\" ...\" transcript compatibility for postscript use. ...\" diff --git a/lib/fontconfig/fc-cat/fc-cat.c b/lib/fontconfig/fc-cat/fc-cat.c index a2c238c35..a9326c8eb 100644 --- a/lib/fontconfig/fc-cat/fc-cat.c +++ b/lib/fontconfig/fc-cat/fc-cat.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/fc-cache/fc-cache.c,v 1.8tsi Exp $ + * fontconfig/fc-cat/fc-cat.c * * Copyright © 2002 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -56,7 +56,7 @@ const struct option longopts[] = { {"version", 0, 0, 'V'}, {"verbose", 0, 0, 'v'}, {"recurse", 0, 0, 'r'}, - {"help", 0, 0, '?'}, + {"help", 0, 0, 'h'}, {NULL,0,0,0}, }; #else @@ -146,32 +146,33 @@ write_string (FILE *f, const FcChar8 *string) } static void -usage (char *program) +usage (char *program, int error) { + FILE *file = error ? stderr : stdout; #if HAVE_GETOPT_LONG - fprintf (stderr, "usage: %s [-rv] [--recurse] [--verbose] [*-%s.cache-2|directory]...\n", + fprintf (file, "usage: %s [-rv] [--recurse] [--verbose] [*-%s.cache-2|directory]...\n", program, FC_ARCHITECTURE); - fprintf (stderr, " %s [-V?] [--version] [--help]\n", program); + fprintf (file, " %s [-Vh] [--version] [--help]\n", program); #else - fprintf (stderr, "usage: %s [-rvV?] [*-%s.cache-2|directory]...\n", + fprintf (file, "usage: %s [-rvVh] [*-%s.cache-2|directory]...\n", program, FC_ARCHITECTURE); #endif - fprintf (stderr, "Reads font information cache from:\n"); - fprintf (stderr, " 1) specified fontconfig cache file\n"); - fprintf (stderr, " 2) related to a particular font directory\n"); - fprintf (stderr, "\n"); + fprintf (file, "Reads font information cache from:\n"); + fprintf (file, " 1) specified fontconfig cache file\n"); + fprintf (file, " 2) related to a particular font directory\n"); + fprintf (file, "\n"); #if HAVE_GETOPT_LONG - fprintf (stderr, " -r, --recurse recurse into subdirectories\n"); - fprintf (stderr, " -v, --verbose be verbose\n"); - fprintf (stderr, " -V, --version display font config version and exit\n"); - fprintf (stderr, " -?, --help display this help and exit\n"); + fprintf (file, " -r, --recurse recurse into subdirectories\n"); + fprintf (file, " -v, --verbose be verbose\n"); + fprintf (file, " -V, --version display font config version and exit\n"); + fprintf (file, " -h, --help display this help and exit\n"); #else - fprintf (stderr, " -r (recurse) recurse into subdirectories\n"); - fprintf (stderr, " -v (verbose) be verbose\n"); - fprintf (stderr, " -V (version) display font config version and exit\n"); - fprintf (stderr, " -? (help) display this help and exit\n"); + fprintf (file, " -r (recurse) recurse into subdirectories\n"); + fprintf (file, " -v (verbose) be verbose\n"); + fprintf (file, " -V (version) display font config version and exit\n"); + fprintf (file, " -h (help) display this help and exit\n"); #endif - exit (1); + exit (error); } /* @@ -282,9 +283,9 @@ main (int argc, char **argv) int c; #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "Vvr?", longopts, NULL)) != -1) + while ((c = getopt_long (argc, argv, "Vvrh", longopts, NULL)) != -1) #else - while ((c = getopt (argc, argv, "Vvr?")) != -1) + while ((c = getopt (argc, argv, "Vvrh")) != -1) #endif { switch (c) { @@ -298,8 +299,10 @@ main (int argc, char **argv) case 'r': recurse++; break; + case 'h': + usage (argv[0], 0); default: - usage (argv[0]); + usage (argv[0], 1); } } i = optind; diff --git a/lib/fontconfig/fc-cat/fc-cat.sgml b/lib/fontconfig/fc-cat/fc-cat.sgml index cc06a7528..b042dc65f 100644 --- a/lib/fontconfig/fc-cat/fc-cat.sgml +++ b/lib/fontconfig/fc-cat/fc-cat.sgml @@ -20,7 +20,7 @@ manpage.1: manpage.sgml Patrick"> Lam"> - Sep 22, 2005"> + Aug 13, 2008"> 1"> @@ -63,13 +63,16 @@ manpage.1: manpage.sgml &dhpackage; - + - - + + + + + @@ -106,7 +109,7 @@ manpage.1: manpage.sgml - + @@ -127,7 +130,13 @@ manpage.1: manpage.sgml SEE ALSO - fc-cache (1). + + fc-cache(1) + fc-list(1) + fc-match(1) + fc-query(1) + fc-scan(1) + The fontconfig user's guide, in HTML format: /usr/share/doc/fontconfig/fontconfig-user.html. diff --git a/lib/fontconfig/fc-glyphname/Makefile.am b/lib/fontconfig/fc-glyphname/Makefile.am index 412d663ad..bcb4d0746 100644 --- a/lib/fontconfig/fc-glyphname/Makefile.am +++ b/lib/fontconfig/fc-glyphname/Makefile.am @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -34,22 +34,21 @@ TARG=fcglyphname.h noinst_PROGRAMS=fc-glyphname -noinst_MANS=fc-glyphname.man - GLYPHNAME=zapfdingbats.txt SGLYPHNAME=${top_srcdir}/fc-glyphname/zapfdingbats.txt EXTRA_DIST=$(TMPL) $(GLYPHNAME) $(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME) - rm -f $(TARG) - ./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG) + $(AM_V_GEN) $(RM) $(TARG); \ + ./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \ + mv $(TARG).tmp $(TARG) ALIAS_FILES = fcalias.h fcaliastail.h BUILT_SOURCES = $(ALIAS_FILES) $(TARG) -$(ALIAS_FILES): +$(ALIAS_FILES): touch $(ALIAS_FILES) CLEANFILES=$(TARG) $(ALIAS_FILES) diff --git a/lib/fontconfig/fc-glyphname/Makefile.in b/lib/fontconfig/fc-glyphname/Makefile.in index 2bcb2014f..c8b6edfbb 100644 --- a/lib/fontconfig/fc-glyphname/Makefile.in +++ b/lib/fontconfig/fc-glyphname/Makefile.in @@ -29,9 +29,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -114,7 +114,6 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ -DOCDIR = @DOCDIR@ DOCMAN3 = @DOCMAN3@ DOCSRC = @DOCSRC@ DOLT_BASH = @DOLT_BASH@ @@ -139,6 +138,7 @@ FC_FONTPATH = @FC_FONTPATH@ FFLAGS = @FFLAGS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GREP = @GREP@ HASDOCBOOK = @HASDOCBOOK@ HAVE_EXPAT = @HAVE_EXPAT@ HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@ @@ -170,7 +170,6 @@ MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -ORTH_FILES = @ORTH_FILES@ OS_WIN32_FALSE = @OS_WIN32_FALSE@ OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ @@ -182,6 +181,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -190,18 +190,9 @@ USEDOCBOOK_FALSE = @USEDOCBOOK_FALSE@ USEDOCBOOK_TRUE = @USEDOCBOOK_TRUE@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_NMEDIT = @ac_ct_NMEDIT@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -219,6 +210,9 @@ build_os = @build_os@ build_vendor = @build_vendor@ confdir = @confdir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ fc_cachedir = @fc_cachedir@ ft_config = @ft_config@ @@ -227,18 +221,22 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -248,7 +246,6 @@ INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) TMPL = fcglyphname.tmpl.h STMPL = ${top_srcdir}/fc-glyphname/${TMPL} TARG = fcglyphname.h -noinst_MANS = fc-glyphname.man GLYPHNAME = zapfdingbats.txt SGLYPHNAME = ${top_srcdir}/fc-glyphname/zapfdingbats.txt EXTRA_DIST = $(TMPL) $(GLYPHNAME) @@ -511,10 +508,11 @@ uninstall-am: uninstall-info-am $(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME) - rm -f $(TARG) - ./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG) + $(AM_V_GEN) $(RM) $(TARG); \ + ./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \ + mv $(TARG).tmp $(TARG) -$(ALIAS_FILES): +$(ALIAS_FILES): touch $(ALIAS_FILES) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/fontconfig/fc-glyphname/fc-glyphname.c b/lib/fontconfig/fc-glyphname/fc-glyphname.c index 0f8acd799..5e1e8816f 100644 --- a/lib/fontconfig/fc-glyphname/fc-glyphname.c +++ b/lib/fontconfig/fc-glyphname/fc-glyphname.c @@ -1,5 +1,5 @@ /* - * $Id: fc-glyphname.c,v 1.2 2009/04/05 16:43:36 matthieu Exp $ + * fontconfig/fc-glyphname/fc-glyphname.c * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -297,7 +297,7 @@ main (int argc, char **argv) * Dump out entries */ - printf ("static const struct { const FcChar32 ucs; const FcChar8 name[%d]; } glyphs[%d] = {\n", + printf ("static const struct { const FcChar32 ucs; const FcChar8 name[%d]; } _fc_glyph_names[%d] = {\n", max_name_len + 1, nraw); for (i = 0; i < nraw; i++) @@ -310,12 +310,12 @@ main (int argc, char **argv) * Dump out name_to_ucs table */ - dump (name_to_ucs, "name_to_ucs"); + dump (name_to_ucs, "_fc_name_to_ucs"); /* * Dump out ucs_to_name table */ - dump (ucs_to_name, "ucs_to_name"); + dump (ucs_to_name, "_fc_ucs_to_name"); while (fgets (line, sizeof (line), stdin)) fputs (line, stdout); diff --git a/lib/fontconfig/fc-glyphname/fcglyphname.tmpl.h b/lib/fontconfig/fc-glyphname/fcglyphname.tmpl.h index 8484b9d50..e2f76a2a5 100644 --- a/lib/fontconfig/fc-glyphname/fcglyphname.tmpl.h +++ b/lib/fontconfig/fc-glyphname/fcglyphname.tmpl.h @@ -1,5 +1,5 @@ /* - * $Id: fcglyphname.tmpl.h,v 1.1.1.1 2006/11/25 18:42:47 matthieu Exp $ + * fontconfig/fc-glyphname/fcglyphname.tmpl.h * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/Makefile.am b/lib/fontconfig/fc-lang/Makefile.am index 60e4f318b..923a4fff6 100644 --- a/lib/fontconfig/fc-lang/Makefile.am +++ b/lib/fontconfig/fc-lang/Makefile.am @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -36,13 +36,12 @@ noinst_PROGRAMS=fc-lang noinst_MANS=fc-lang.man -ORTH=@ORTH_FILES@ - EXTRA_DIST=$(TMPL) $(ORTH) $(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL) - rm -f $(TARG) - ./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG) + $(AM_V_GEN) $(RM) $(TARG); \ + ./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \ + mv $(TARG).tmp $(TARG) ALIAS_FILES = fcalias.h fcaliastail.h @@ -52,3 +51,250 @@ $(ALIAS_FILES): touch $(ALIAS_FILES) CLEANFILES = $(TARG) $(ALIAS_FILES) + +# NOTE: +# +# The order of the orth files here is extremely important (part of the cache +# format) and should not be modified. New orth files should be added at the +# end. No files should be removed either. +# +ORTH = \ + aa.orth \ + ab.orth \ + af.orth \ + am.orth \ + ar.orth \ + as.orth \ + ast.orth \ + av.orth \ + ay.orth \ + az_az.orth \ + az_ir.orth \ + ba.orth \ + bm.orth \ + be.orth \ + bg.orth \ + bh.orth \ + bho.orth \ + bi.orth \ + bin.orth \ + bn.orth \ + bo.orth \ + br.orth \ + bs.orth \ + bua.orth \ + ca.orth \ + ce.orth \ + ch.orth \ + chm.orth \ + chr.orth \ + co.orth \ + cs.orth \ + cu.orth \ + cv.orth \ + cy.orth \ + da.orth \ + de.orth \ + dz.orth \ + el.orth \ + en.orth \ + eo.orth \ + es.orth \ + et.orth \ + eu.orth \ + fa.orth \ + fi.orth \ + fj.orth \ + fo.orth \ + fr.orth \ + ff.orth \ + fur.orth \ + fy.orth \ + ga.orth \ + gd.orth \ + gez.orth \ + gl.orth \ + gn.orth \ + gu.orth \ + gv.orth \ + ha.orth \ + haw.orth \ + he.orth \ + hi.orth \ + ho.orth \ + hr.orth \ + hu.orth \ + hy.orth \ + ia.orth \ + ig.orth \ + id.orth \ + ie.orth \ + ik.orth \ + io.orth \ + is.orth \ + it.orth \ + iu.orth \ + ja.orth \ + ka.orth \ + kaa.orth \ + ki.orth \ + kk.orth \ + kl.orth \ + km.orth \ + kn.orth \ + ko.orth \ + kok.orth \ + ks.orth \ + ku_am.orth \ + ku_ir.orth \ + kum.orth \ + kv.orth \ + kw.orth \ + ky.orth \ + la.orth \ + lb.orth \ + lez.orth \ + ln.orth \ + lo.orth \ + lt.orth \ + lv.orth \ + mg.orth \ + mh.orth \ + mi.orth \ + mk.orth \ + ml.orth \ + mn_cn.orth \ + mo.orth \ + mr.orth \ + mt.orth \ + my.orth \ + nb.orth \ + nds.orth \ + ne.orth \ + nl.orth \ + nn.orth \ + no.orth \ + nr.orth \ + nso.orth \ + ny.orth \ + oc.orth \ + om.orth \ + or.orth \ + os.orth \ + pa.orth \ + pl.orth \ + ps_af.orth \ + ps_pk.orth \ + pt.orth \ + rm.orth \ + ro.orth \ + ru.orth \ + sa.orth \ + sah.orth \ + sco.orth \ + se.orth \ + sel.orth \ + sh.orth \ + shs.orth \ + si.orth \ + sk.orth \ + sl.orth \ + sm.orth \ + sma.orth \ + smj.orth \ + smn.orth \ + sms.orth \ + so.orth \ + sq.orth \ + sr.orth \ + ss.orth \ + st.orth \ + sv.orth \ + sw.orth \ + syr.orth \ + ta.orth \ + te.orth \ + tg.orth \ + th.orth \ + ti_er.orth \ + ti_et.orth \ + tig.orth \ + tk.orth \ + tl.orth \ + tn.orth \ + to.orth \ + tr.orth \ + ts.orth \ + tt.orth \ + tw.orth \ + tyv.orth \ + ug.orth \ + uk.orth \ + ur.orth \ + uz.orth \ + ve.orth \ + vi.orth \ + vo.orth \ + vot.orth \ + wa.orth \ + wen.orth \ + wo.orth \ + xh.orth \ + yap.orth \ + yi.orth \ + yo.orth \ + zh_cn.orth \ + zh_hk.orth \ + zh_mo.orth \ + zh_sg.orth \ + zh_tw.orth \ + zu.orth \ + ak.orth \ + an.orth \ + ber_dz.orth \ + ber_ma.orth \ + byn.orth \ + crh.orth \ + csb.orth \ + dv.orth \ + ee.orth \ + fat.orth \ + fil.orth \ + hne.orth \ + hsb.orth \ + ht.orth \ + hz.orth \ + ii.orth \ + jv.orth \ + kab.orth \ + kj.orth \ + kr.orth \ + ku_iq.orth \ + ku_tr.orth \ + kwm.orth \ + lg.orth \ + li.orth \ + mai.orth \ + mn_mn.orth \ + ms.orth \ + na.orth \ + ng.orth \ + nv.orth \ + ota.orth \ + pa_pk.orth \ + pap_an.orth \ + pap_aw.orth \ + qu.orth \ + rn.orth \ + rw.orth \ + sc.orth \ + sd.orth \ + sg.orth \ + sid.orth \ + sn.orth \ + su.orth \ + ty.orth \ + wal.orth \ + za.orth \ + lah.orth +# ^-------------- Add new orth files here diff --git a/lib/fontconfig/fc-lang/Makefile.in b/lib/fontconfig/fc-lang/Makefile.in index 1e5e34151..287b0eebb 100644 --- a/lib/fontconfig/fc-lang/Makefile.in +++ b/lib/fontconfig/fc-lang/Makefile.in @@ -29,9 +29,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -114,7 +114,6 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ -DOCDIR = @DOCDIR@ DOCMAN3 = @DOCMAN3@ DOCSRC = @DOCSRC@ DOLT_BASH = @DOLT_BASH@ @@ -139,6 +138,7 @@ FC_FONTPATH = @FC_FONTPATH@ FFLAGS = @FFLAGS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GREP = @GREP@ HASDOCBOOK = @HASDOCBOOK@ HAVE_EXPAT = @HAVE_EXPAT@ HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@ @@ -170,7 +170,6 @@ MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -ORTH_FILES = @ORTH_FILES@ OS_WIN32_FALSE = @OS_WIN32_FALSE@ OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ @@ -182,6 +181,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -190,18 +190,9 @@ USEDOCBOOK_FALSE = @USEDOCBOOK_FALSE@ USEDOCBOOK_TRUE = @USEDOCBOOK_TRUE@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_NMEDIT = @ac_ct_NMEDIT@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -219,6 +210,9 @@ build_os = @build_os@ build_vendor = @build_vendor@ confdir = @confdir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ fc_cachedir = @fc_cachedir@ ft_config = @ft_config@ @@ -227,18 +221,22 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -249,11 +247,257 @@ TMPL = fclang.tmpl.h STMPL = ${top_srcdir}/fc-lang/fclang.tmpl.h TARG = fclang.h noinst_MANS = fc-lang.man -ORTH = @ORTH_FILES@ EXTRA_DIST = $(TMPL) $(ORTH) ALIAS_FILES = fcalias.h fcaliastail.h BUILT_SOURCES = $(ALIAS_FILES) $(TARG) CLEANFILES = $(TARG) $(ALIAS_FILES) + +# NOTE: +# +# The order of the orth files here is extremely important (part of the cache +# format) and should not be modified. New orth files should be added at the +# end. No files should be removed either. +# +ORTH = \ + aa.orth \ + ab.orth \ + af.orth \ + am.orth \ + ar.orth \ + as.orth \ + ast.orth \ + av.orth \ + ay.orth \ + az_az.orth \ + az_ir.orth \ + ba.orth \ + bm.orth \ + be.orth \ + bg.orth \ + bh.orth \ + bho.orth \ + bi.orth \ + bin.orth \ + bn.orth \ + bo.orth \ + br.orth \ + bs.orth \ + bua.orth \ + ca.orth \ + ce.orth \ + ch.orth \ + chm.orth \ + chr.orth \ + co.orth \ + cs.orth \ + cu.orth \ + cv.orth \ + cy.orth \ + da.orth \ + de.orth \ + dz.orth \ + el.orth \ + en.orth \ + eo.orth \ + es.orth \ + et.orth \ + eu.orth \ + fa.orth \ + fi.orth \ + fj.orth \ + fo.orth \ + fr.orth \ + ff.orth \ + fur.orth \ + fy.orth \ + ga.orth \ + gd.orth \ + gez.orth \ + gl.orth \ + gn.orth \ + gu.orth \ + gv.orth \ + ha.orth \ + haw.orth \ + he.orth \ + hi.orth \ + ho.orth \ + hr.orth \ + hu.orth \ + hy.orth \ + ia.orth \ + ig.orth \ + id.orth \ + ie.orth \ + ik.orth \ + io.orth \ + is.orth \ + it.orth \ + iu.orth \ + ja.orth \ + ka.orth \ + kaa.orth \ + ki.orth \ + kk.orth \ + kl.orth \ + km.orth \ + kn.orth \ + ko.orth \ + kok.orth \ + ks.orth \ + ku_am.orth \ + ku_ir.orth \ + kum.orth \ + kv.orth \ + kw.orth \ + ky.orth \ + la.orth \ + lb.orth \ + lez.orth \ + ln.orth \ + lo.orth \ + lt.orth \ + lv.orth \ + mg.orth \ + mh.orth \ + mi.orth \ + mk.orth \ + ml.orth \ + mn_cn.orth \ + mo.orth \ + mr.orth \ + mt.orth \ + my.orth \ + nb.orth \ + nds.orth \ + ne.orth \ + nl.orth \ + nn.orth \ + no.orth \ + nr.orth \ + nso.orth \ + ny.orth \ + oc.orth \ + om.orth \ + or.orth \ + os.orth \ + pa.orth \ + pl.orth \ + ps_af.orth \ + ps_pk.orth \ + pt.orth \ + rm.orth \ + ro.orth \ + ru.orth \ + sa.orth \ + sah.orth \ + sco.orth \ + se.orth \ + sel.orth \ + sh.orth \ + shs.orth \ + si.orth \ + sk.orth \ + sl.orth \ + sm.orth \ + sma.orth \ + smj.orth \ + smn.orth \ + sms.orth \ + so.orth \ + sq.orth \ + sr.orth \ + ss.orth \ + st.orth \ + sv.orth \ + sw.orth \ + syr.orth \ + ta.orth \ + te.orth \ + tg.orth \ + th.orth \ + ti_er.orth \ + ti_et.orth \ + tig.orth \ + tk.orth \ + tl.orth \ + tn.orth \ + to.orth \ + tr.orth \ + ts.orth \ + tt.orth \ + tw.orth \ + tyv.orth \ + ug.orth \ + uk.orth \ + ur.orth \ + uz.orth \ + ve.orth \ + vi.orth \ + vo.orth \ + vot.orth \ + wa.orth \ + wen.orth \ + wo.orth \ + xh.orth \ + yap.orth \ + yi.orth \ + yo.orth \ + zh_cn.orth \ + zh_hk.orth \ + zh_mo.orth \ + zh_sg.orth \ + zh_tw.orth \ + zu.orth \ + ak.orth \ + an.orth \ + ber_dz.orth \ + ber_ma.orth \ + byn.orth \ + crh.orth \ + csb.orth \ + dv.orth \ + ee.orth \ + fat.orth \ + fil.orth \ + hne.orth \ + hsb.orth \ + ht.orth \ + hz.orth \ + ii.orth \ + jv.orth \ + kab.orth \ + kj.orth \ + kr.orth \ + ku_iq.orth \ + ku_tr.orth \ + kwm.orth \ + lg.orth \ + li.orth \ + mai.orth \ + mn_mn.orth \ + ms.orth \ + na.orth \ + ng.orth \ + nv.orth \ + ota.orth \ + pa_pk.orth \ + pap_an.orth \ + pap_aw.orth \ + qu.orth \ + rn.orth \ + rw.orth \ + sc.orth \ + sd.orth \ + sg.orth \ + sid.orth \ + sn.orth \ + su.orth \ + ty.orth \ + wal.orth \ + za.orth \ + lah.orth + all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -510,11 +754,13 @@ uninstall-am: uninstall-info-am $(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL) - rm -f $(TARG) - ./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG) + $(AM_V_GEN) $(RM) $(TARG); \ + ./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \ + mv $(TARG).tmp $(TARG) $(ALIAS_FILES): touch $(ALIAS_FILES) +# ^-------------- Add new orth files here # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lib/fontconfig/fc-lang/aa.orth b/lib/fontconfig/fc-lang/aa.orth index 6d2467f7c..58658ce84 100644 --- a/lib/fontconfig/fc-lang/aa.orth +++ b/lib/fontconfig/fc-lang/aa.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ab.orth,v 1.3 2002/07/12 09:12:36 keithp Exp $ +# fontconfig/fc-lang/aa.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ab.orth b/lib/fontconfig/fc-lang/ab.orth index c87c32ac7..7049ac1e8 100644 --- a/lib/fontconfig/fc-lang/ab.orth +++ b/lib/fontconfig/fc-lang/ab.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ab.orth,v 1.3 2002/07/12 09:12:36 keithp Exp $ +# fontconfig/fc-lang/ab.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/af.orth b/lib/fontconfig/fc-lang/af.orth index 9d671201a..4c34460e9 100644 --- a/lib/fontconfig/fc-lang/af.orth +++ b/lib/fontconfig/fc-lang/af.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/af.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ak.orth b/lib/fontconfig/fc-lang/ak.orth new file mode 100644 index 000000000..de94f0771 --- /dev/null +++ b/lib/fontconfig/fc-lang/ak.orth @@ -0,0 +1,30 @@ +# +# fontconfig/fc-lang/ak.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Akan (ak) +# +# According to ISO 639-3, Akan is a macro-language of Twi and Fanti. +# Information on the web indicates Twi and Fanti now have a unified +# orthography. We include Twi. +# +include tw.orth diff --git a/lib/fontconfig/fc-lang/am.orth b/lib/fontconfig/fc-lang/am.orth index f0dd365d9..2f00a9616 100644 --- a/lib/fontconfig/fc-lang/am.orth +++ b/lib/fontconfig/fc-lang/am.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/am.orth,v 1.1 2002/08/08 00:10:50 keithp Exp $ +# fontconfig/fc-lang/am.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/an.orth b/lib/fontconfig/fc-lang/an.orth new file mode 100644 index 000000000..7236886fc --- /dev/null +++ b/lib/fontconfig/fc-lang/an.orth @@ -0,0 +1,45 @@ +# +# fontconfig/fc-lang/an.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Aragonese (an) +# +# Source: +# * Consello d’a Fabla Aragonesa, "Normas graficas de l’aragonés", at +# http://www.charrando.com/normasgraficas.pdf +# +0041-005A +0061-007A +00C1 +00C9 +00CD +00D1 +00D3 +00DA +00DC +00E1 +00E9 +00ED +00F1 +00F3 +00FA +00FC diff --git a/lib/fontconfig/fc-lang/ar.orth b/lib/fontconfig/fc-lang/ar.orth index 38b738cad..39fcfa05d 100644 --- a/lib/fontconfig/fc-lang/ar.orth +++ b/lib/fontconfig/fc-lang/ar.orth @@ -1,7 +1,8 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ar.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/ar.orth # # Copyright © 2002 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that @@ -13,76 +14,26 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Arabic (AR) +# Arabic (ar) # -# General forms. Leave these out for now as most software -# expects presentation forms. +# We are assuming that: +# * Most fonts that claim to support an Arabic letter actually do so; +# * Most modern text rendering software use OpenType tables, instead of +# directly using presentation forms. +# * Some good Arabic fonts do not support codepoints for Arabic presentation +# forms. +# Thus, we are switching to general forms of Arabic letters. # -#060C # ARABIC COMMA -#061B # ARABIC SEMICOLON -#061F # ARABIC QUESTION MARK -#0621 # ARABIC LETTER HAMZA -#0622 # ARABIC LETTER ALEF WITH MADDA ABOVE -#0623 # ARABIC LETTER ALEF WITH HAMZA ABOVE -#0624 # ARABIC LETTER WAW WITH HAMZA ABOVE -#0625 # ARABIC LETTER ALEF WITH HAMZA BELOW -#0626 # ARABIC LETTER YEH WITH HAMZA ABOVE -#0627 # ARABIC LETTER ALEF -#0628 # ARABIC LETTER BEH -#0629 # ARABIC LETTER TEH MARBUTA -#062A # ARABIC LETTER TEH -#062B # ARABIC LETTER THEH -#062C # ARABIC LETTER JEEM -#062D # ARABIC LETTER HAH -#062E # ARABIC LETTER KHAH -#062F # ARABIC LETTER DAL -#0630 # ARABIC LETTER THAL -#0631 # ARABIC LETTER REH -#0632 # ARABIC LETTER ZAIN -#0633 # ARABIC LETTER SEEN -#0634 # ARABIC LETTER SHEEN -#0635 # ARABIC LETTER SAD -#0636 # ARABIC LETTER DAD -#0637 # ARABIC LETTER TAH -#0638 # ARABIC LETTER ZAH -#0639 # ARABIC LETTER AIN -#063A # ARABIC LETTER GHAIN -#0640 # ARABIC TATWEEL -#0641 # ARABIC LETTER FEH -#0642 # ARABIC LETTER QAF -#0643 # ARABIC LETTER KAF -#0644 # ARABIC LETTER LAM -#0645 # ARABIC LETTER MEEM -#0646 # ARABIC LETTER NOON -#0647 # ARABIC LETTER HEH -#0648 # ARABIC LETTER WAW -#0649 # ARABIC LETTER ALEF MAKSURA -#064A # ARABIC LETTER YEH -#064B # ARABIC FATHATAN -#064C # ARABIC DAMMATAN -#064D # ARABIC KASRATAN -#064E # ARABIC FATHA -#064F # ARABIC DAMMA -#0650 # ARABIC KASRA -#0651 # ARABIC SHADDA -#0652 # ARABIC SUKUN -# -# Data from Roozbeh Pournader -# -# Select fonts based on support for presentation forms; this may -# exclude some OpenType fonts, but the hope is those would be -# located by a clever shaper by Unicode codepoints in any case. -# -# General Forms: -#0621-063a -#0641-064a -# Presentations Forms: -fe80-fefc +# General forms: +0621-063a +0641-064a +# Presentations forms: +# fe80-fefc diff --git a/lib/fontconfig/fc-lang/as.orth b/lib/fontconfig/fc-lang/as.orth index b5d7294b2..7b7cef84a 100644 --- a/lib/fontconfig/fc-lang/as.orth +++ b/lib/fontconfig/fc-lang/as.orth @@ -1,28 +1,45 @@ # +# fontconfig/fc-lang/as.orth +# # Copyright © 2006 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting -# documentation, and that the name of Keith Packard not be used in +# documentation, and that the name of the author(s) not be used in # advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Keith Packard makes no +# specific, written prior permission. The author(s) make(s) no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Assamese +# Assamese (as) # -# Behdad Esfahbod says: -# -# Seems like copying file for Bengali should be enough. -# -include bn.orth +# Source: Unicode coverage and notes for Bengali script, Unicode internal +# documents, Wikipedia articles +0981-0983 +0985-098c +098f-0990 +0993-09a8 +09aa-09af +# 09b0 # Assamese uses U+09F0 instead +09b2 +09b6-09b9 +09bc +09be-09c4 +09c7-09c8 +09cb-09cd +# 09d7 # Only used as a part of U+09CC +09dc-09dd +09df +# 09e0-09e3 # These are for Sanskrit +09f0-09f1 diff --git a/lib/fontconfig/fc-lang/ast.orth b/lib/fontconfig/fc-lang/ast.orth index 24be22667..20b81f418 100644 --- a/lib/fontconfig/fc-lang/ast.orth +++ b/lib/fontconfig/fc-lang/ast.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/wa.orth,v 1.1 2002/07/07 19:30:52 keithp Exp $ +# fontconfig/fc-lang/ast.orth # # Copyright © 2002 Keith Packard # @@ -13,24 +13,20 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Orthography from http://www.everytype.com/alphabets/asturian.pdf +# Orthography from http://www.evertype.com/alphabets/asturian.pdf # -# Asturian (AST) +# Asturian/Bable/Leonese/Asturleonese (ast) # -0040-005a -0060-007a -00a1 -00ab -00bb -00bf +0041-005a +0061-007a 00c1 00c9 00cd diff --git a/lib/fontconfig/fc-lang/ava.orth b/lib/fontconfig/fc-lang/av.orth similarity index 89% rename from lib/fontconfig/fc-lang/ava.orth rename to lib/fontconfig/fc-lang/av.orth index 519d9995f..21e4c22de 100644 --- a/lib/fontconfig/fc-lang/ava.orth +++ b/lib/fontconfig/fc-lang/av.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/av.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -26,7 +26,7 @@ # # http://titus.uni-frankfurt.de/unicode/alphabet/nslatest.htm # -# Avaric (AVA) +# Avaric (av) # 0401 0406 diff --git a/lib/fontconfig/fc-lang/ay.orth b/lib/fontconfig/fc-lang/ay.orth index 4019462ec..8055e9336 100644 --- a/lib/fontconfig/fc-lang/ay.orth +++ b/lib/fontconfig/fc-lang/ay.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/kw.orth,v 1.1 2002/08/07 17:34:15 keithp Exp $ +# fontconfig/fc-lang/ay.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/az.orth b/lib/fontconfig/fc-lang/az_az.orth similarity index 51% rename from lib/fontconfig/fc-lang/az.orth rename to lib/fontconfig/fc-lang/az_az.orth index 36a4b6000..3c9671572 100644 --- a/lib/fontconfig/fc-lang/az.orth +++ b/lib/fontconfig/fc-lang/az_az.orth @@ -1,40 +1,44 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/az.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/az_az.orth # # Copyright © 2002 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting -# documentation, and that the name of Keith Packard not be used in +# documentation, and that the name of the author(s) not be used in # advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Keith Packard makes no +# specific, written prior permission. The author(s) make(s) no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Azerbaijani (AZ) +# Azerbaijani in Azerbaijan (az-AZ) # -# The complete orthography is from http://www.evertype.com +# The complete orthography was from http://www.evertype.com # -# This has been verified with the latin and cyrillic orthographies found at +# This had been verified with the latin and cyrillic orthographies found at # http://www.eki.ee/letter # +# Cyrillic was removed because the switch to Latin is almost finished. +# The letter “ä” is also deprecated and replaced with “ə” since 1992. +# 0041-005a 0061-007a -00C4 # LATIN CAPITAL LETTER A WITH DIAERESIS +#00C4 # LATIN CAPITAL LETTER A WITH DIAERESIS 00C7 # LATIN CAPITAL LETTER C WITH CEDILLA 00D6 # LATIN CAPITAL LETTER O WITH DIAERESIS 00DC # LATIN CAPITAL LETTER U WITH DIAERESIS -00E4 # LATIN SMALL LETTER A WITH DIAERESIS +#00E4 # LATIN SMALL LETTER A WITH DIAERESIS 00E7 # LATIN SMALL LETTER C WITH CEDILLA 00F6 # LATIN SMALL LETTER O WITH DIAERESIS 00FC # LATIN SMALL LETTER U WITH DIAERESIS @@ -42,25 +46,8 @@ 011F # LATIN SMALL LETTER G WITH BREVE 0130 # LATIN CAPITAL LETTER I WITH DOT ABOVE 0131 # LATIN SMALL LETTER DOTLESS I -015E # LATIN CAPITAL LETTER S WITH CEDILLA * -015F # LATIN SMALL LETTER S WITH CEDILLA * +015E # LATIN CAPITAL LETTER S WITH CEDILLA +015F # LATIN SMALL LETTER S WITH CEDILLA 018F # LATIN CAPITAL LETTER SCHWA 0259 # LATIN SMALL LETTER SCHWA #02BC # MODIFIER LETTER APOSTROPHE -0408 # CYRILLIC CAPITAL LETTER JE -0410-044f # CYRILLIC CAPITAL AND SMALL -0458 # CYRILLIC SMALL LETTER JE -0493 # CYRILLIC SMALL LETTER GHE WITH STROKE -0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE -049C # CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE -049D # CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE -04AE # CYRILLIC CAPITAL LETTER STRAIGHT U -04AF # CYRILLIC SMALL LETTER STRAIGHT U -04B8 # CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE -04B9 # CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE -04BA # CYRILLIC CAPITAL LETTER SHHA -04BB # CYRILLIC SMALL LETTER SHHA -04D8 # CYRILLIC CAPITAL LETTER SCHWA -04D9 # CYRILLIC SMALL LETTER SCHWA -04E8 # CYRILLIC CAPITAL LETTER BARRED O -04E9 # CYRILLIC SMALL LETTER BARRED O diff --git a/lib/fontconfig/fc-lang/az_ir.orth b/lib/fontconfig/fc-lang/az_ir.orth index 7dde88e7d..6899791b6 100644 --- a/lib/fontconfig/fc-lang/az_ir.orth +++ b/lib/fontconfig/fc-lang/az_ir.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/az_ir.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ba.orth b/lib/fontconfig/fc-lang/ba.orth index 74d922bb4..169083564 100644 --- a/lib/fontconfig/fc-lang/ba.orth +++ b/lib/fontconfig/fc-lang/ba.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ba.orth,v 1.3 2002/07/12 09:12:36 keithp Exp $ +# fontconfig/fc-lang/ba.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/be.orth b/lib/fontconfig/fc-lang/be.orth index 646f57eeb..ebcd19587 100644 --- a/lib/fontconfig/fc-lang/be.orth +++ b/lib/fontconfig/fc-lang/be.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/be.orth,v 1.3 2002/07/12 09:12:36 keithp Exp $ +# fontconfig/fc-lang/be.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ber_dz.orth b/lib/fontconfig/fc-lang/ber_dz.orth new file mode 100644 index 000000000..bfd20f7de --- /dev/null +++ b/lib/fontconfig/fc-lang/ber_dz.orth @@ -0,0 +1,27 @@ +# +# fontconfig/fc-lang/ber_dz.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Berber in Algeria (ber-DZ) +# +# Algerian Berber is usually Kabyle +include kab.orth diff --git a/lib/fontconfig/fc-lang/ber_ma.orth b/lib/fontconfig/fc-lang/ber_ma.orth new file mode 100644 index 000000000..3e63e91f6 --- /dev/null +++ b/lib/fontconfig/fc-lang/ber_ma.orth @@ -0,0 +1,46 @@ +# +# fontconfig/fc-lang/ber_ma.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Berber in Morocco (ber-MA) +# +# Tifinagh is the official script for Berber language(s) in Morocco. +# The character list comes from Institut Royal de la Culture Amazighe (IRCAM). +# Sources: +# http://www.omniglot.com/writing/tifinagh.htm +# http://www.win.tue.nl/~aeb/natlang/berber/tifinagh/tifinagh.html +2D30-2D31 +2D33 +2D37 +2D39 +2D3B-2D3D +2D40 +2D43-2D45 +2D47 +2D49-2D4A +2D4D-2D4F +2D53-2D56 +2D59-2D5C +2D5F +2D61-2D63 +2D65 +2D6F diff --git a/lib/fontconfig/fc-lang/bg.orth b/lib/fontconfig/fc-lang/bg.orth index 45bbc2233..7c84790c8 100644 --- a/lib/fontconfig/fc-lang/bg.orth +++ b/lib/fontconfig/fc-lang/bg.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/bg.orth,v 1.3 2002/07/12 21:05:58 keithp Exp $ +# fontconfig/fc-lang/bg.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/bh.orth b/lib/fontconfig/fc-lang/bh.orth index 913499495..4dc39ef6c 100644 --- a/lib/fontconfig/fc-lang/bh.orth +++ b/lib/fontconfig/fc-lang/bh.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/bh.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/bho.orth b/lib/fontconfig/fc-lang/bho.orth index c86042687..d5998b4d9 100644 --- a/lib/fontconfig/fc-lang/bho.orth +++ b/lib/fontconfig/fc-lang/bho.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/bho.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/bi.orth b/lib/fontconfig/fc-lang/bi.orth index 659e80deb..451783e7a 100644 --- a/lib/fontconfig/fc-lang/bi.orth +++ b/lib/fontconfig/fc-lang/bi.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/bi.orth,v 1.1 2002/07/12 19:19:15 keithp Exp $ +# fontconfig/fc-lang/bi.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/bin.orth b/lib/fontconfig/fc-lang/bin.orth index 13f8aba70..1ff2c4b14 100644 --- a/lib/fontconfig/fc-lang/bin.orth +++ b/lib/fontconfig/fc-lang/bin.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/bin.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/bam.orth b/lib/fontconfig/fc-lang/bm.orth similarity index 86% rename from lib/fontconfig/fc-lang/bam.orth rename to lib/fontconfig/fc-lang/bm.orth index 0aaf770a3..d87a5bf8f 100644 --- a/lib/fontconfig/fc-lang/bam.orth +++ b/lib/fontconfig/fc-lang/bm.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/bm.orth # # Copyright © 2002 Keith Packard # @@ -13,15 +13,15 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Bambara (BAM) +# Bambara (bm) # # Orthography from http://www.eki.ee/letter # diff --git a/lib/fontconfig/fc-lang/bn.orth b/lib/fontconfig/fc-lang/bn.orth index 11dc9624f..151ced25b 100644 --- a/lib/fontconfig/fc-lang/bn.orth +++ b/lib/fontconfig/fc-lang/bn.orth @@ -1,29 +1,31 @@ # -# $RCSId:$ +# fontconfig/fc-lang/bn.orth # # Copyright © 2002 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting -# documentation, and that the name of Keith Packard not be used in +# documentation, and that the name of the author(s) not be used in # advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Keith Packard makes no +# specific, written prior permission. The author(s) make(s) no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Bengali (BN) +# Bengali (bn) # -# Taken straight from the Unicode coverage for Bengali +# Source: Unicode coverage and notes for Bengali script, Unicode internal +# documents 0981-0983 0985-098c 098f-0990 @@ -35,7 +37,8 @@ 09be-09c4 09c7-09c8 09cb-09cd -09d7 +# 09d7 # Only used as a part of U+09CC 09dc-09dd -09df-09e3 -09e6-09fa +09df +# 09e0-09e3 # These are for Sanskrit +# 09f0-09f1 # These are for Assamese diff --git a/lib/fontconfig/fc-lang/bo.orth b/lib/fontconfig/fc-lang/bo.orth index 64f670c9b..f09d18e74 100644 --- a/lib/fontconfig/fc-lang/bo.orth +++ b/lib/fontconfig/fc-lang/bo.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/bo.orth,v 1.1 2002/07/07 19:18:51 keithp Exp $ +# fontconfig/fc-lang/bo.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/br.orth b/lib/fontconfig/fc-lang/br.orth index 11c971fb6..fb90f0ff7 100644 --- a/lib/fontconfig/fc-lang/br.orth +++ b/lib/fontconfig/fc-lang/br.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/br.orth,v 1.3 2002/07/12 09:12:36 keithp Exp $ +# fontconfig/fc-lang/br.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/bs.orth b/lib/fontconfig/fc-lang/bs.orth index bd608cf78..5df47069a 100644 --- a/lib/fontconfig/fc-lang/bs.orth +++ b/lib/fontconfig/fc-lang/bs.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/bs.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/bua.orth b/lib/fontconfig/fc-lang/bua.orth index dd9bd7ce7..cb6729964 100644 --- a/lib/fontconfig/fc-lang/bua.orth +++ b/lib/fontconfig/fc-lang/bua.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/bua.orth,v 1.1 2002/07/12 07:52:15 keithp Exp $ +# fontconfig/fc-lang/bua.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/byn.orth b/lib/fontconfig/fc-lang/byn.orth new file mode 100644 index 000000000..539feebc1 --- /dev/null +++ b/lib/fontconfig/fc-lang/byn.orth @@ -0,0 +1,27 @@ +# +# fontconfig/fc-lang/byn.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Blin/Bilin (byn) +# +# Copying Tigrinya of Eritrea, as does glibc +include ti_er.orth diff --git a/lib/fontconfig/fc-lang/ca.orth b/lib/fontconfig/fc-lang/ca.orth index 663a020c2..6ace8fa02 100644 --- a/lib/fontconfig/fc-lang/ca.orth +++ b/lib/fontconfig/fc-lang/ca.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ca.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/ca.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ce.orth b/lib/fontconfig/fc-lang/ce.orth index 2518cd33f..4db7fbdab 100644 --- a/lib/fontconfig/fc-lang/ce.orth +++ b/lib/fontconfig/fc-lang/ce.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ce.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ch.orth b/lib/fontconfig/fc-lang/ch.orth index 48b74422f..795c821a1 100644 --- a/lib/fontconfig/fc-lang/ch.orth +++ b/lib/fontconfig/fc-lang/ch.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ch.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/chm.orth b/lib/fontconfig/fc-lang/chm.orth index 1f3b1eb34..0f4b13cc6 100644 --- a/lib/fontconfig/fc-lang/chm.orth +++ b/lib/fontconfig/fc-lang/chm.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/chm.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/chr.orth b/lib/fontconfig/fc-lang/chr.orth index 756b2d61b..f41951164 100644 --- a/lib/fontconfig/fc-lang/chr.orth +++ b/lib/fontconfig/fc-lang/chr.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/chr.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/co.orth b/lib/fontconfig/fc-lang/co.orth index f50f6ebc8..ccfc7d4c9 100644 --- a/lib/fontconfig/fc-lang/co.orth +++ b/lib/fontconfig/fc-lang/co.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/co.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/crh.orth b/lib/fontconfig/fc-lang/crh.orth new file mode 100644 index 000000000..4e4a9860b --- /dev/null +++ b/lib/fontconfig/fc-lang/crh.orth @@ -0,0 +1,46 @@ +# +# fontconfig/fc-lang/crh.orth +# +# Copyright © 2009 Roozbeh Pournader +# Copyright © 2009 Reşat SABIQ +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Crimean Tatar/Crimean Turkish (crh) +# +# Sources: +# * http://www.omniglot.com/writing/crimeantatar.php +# * http://en.wikipedia.org/wiki/Crimean_Tatar_language +# * http://www.vatankirim.net/yazi.asp?yaziNo=31 +# +0041-005A +0061-007A +00C2 +00C7 +00D1 +00D6 +00DC +00E2 +00E7 +00F1 +00F6 +00FC +011E-011F +0130-0131 +015E-015F diff --git a/lib/fontconfig/fc-lang/cs.orth b/lib/fontconfig/fc-lang/cs.orth index 3df6828ba..aa7e7aa5d 100644 --- a/lib/fontconfig/fc-lang/cs.orth +++ b/lib/fontconfig/fc-lang/cs.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/cs.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/cs.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/csb.orth b/lib/fontconfig/fc-lang/csb.orth new file mode 100644 index 000000000..4f69fff52 --- /dev/null +++ b/lib/fontconfig/fc-lang/csb.orth @@ -0,0 +1,46 @@ +# +# fontconfig/fc-lang/csb.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Kashubian (CSB) +# +# Sources: +# http://www.omniglot.com/writing/kashubian.htm +# http://www.evertype.com/alphabets/kashubian.pdf +# +0041-005A +0061-007A +00C3 +00C9 +00CB +00D2-00D4 +00D9 +00E3 +00E9 +00EB +00F2-00F4 +00F9 +0104-0105 +#0118-0119 # E with ogonek - only in evertype +0141-0144 +#015A-015B # S with acute - only in evertype +017B-017C diff --git a/lib/fontconfig/fc-lang/cu.orth b/lib/fontconfig/fc-lang/cu.orth index 7e83f7cd9..043ad74fb 100644 --- a/lib/fontconfig/fc-lang/cu.orth +++ b/lib/fontconfig/fc-lang/cu.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/wen.orth,v 1.1 2002/07/12 19:19:16 keithp Exp $ +# fontconfig/fc-lang/cu.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/cv.orth b/lib/fontconfig/fc-lang/cv.orth index 42b790276..3fe1b02f7 100644 --- a/lib/fontconfig/fc-lang/cv.orth +++ b/lib/fontconfig/fc-lang/cv.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/cv.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/cy.orth b/lib/fontconfig/fc-lang/cy.orth index 197c4244c..db790c9ad 100644 --- a/lib/fontconfig/fc-lang/cy.orth +++ b/lib/fontconfig/fc-lang/cy.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/cy.orth,v 1.1 2002/07/12 19:19:15 keithp Exp $ +# fontconfig/fc-lang/cy.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/da.orth b/lib/fontconfig/fc-lang/da.orth index 83f75090e..b1f646714 100644 --- a/lib/fontconfig/fc-lang/da.orth +++ b/lib/fontconfig/fc-lang/da.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/da.orth,v 1.3 2002/07/12 09:12:36 keithp Exp $ +# fontconfig/fc-lang/da.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/de.orth b/lib/fontconfig/fc-lang/de.orth index b9a4dc296..15bf17855 100644 --- a/lib/fontconfig/fc-lang/de.orth +++ b/lib/fontconfig/fc-lang/de.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/de.orth,v 1.3 2002/07/12 09:12:36 keithp Exp $ +# fontconfig/fc-lang/de.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -47,4 +47,3 @@ #201c # double quotes #201e # double quotes #2039-203a # angle quotes -20AC # EURO SIGN diff --git a/lib/fontconfig/fc-lang/dv.orth b/lib/fontconfig/fc-lang/dv.orth new file mode 100644 index 000000000..289358480 --- /dev/null +++ b/lib/fontconfig/fc-lang/dv.orth @@ -0,0 +1,34 @@ +# +# fontconfig/fc-lang/dv.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Divehi/Dhivehi/Maldivian (dv) +# +# Sources: +# * The Unicode standard +# * http://www.omniglot.com/writing/thaana.htm +# * http://en.wikipedia.org/wiki/T%C4%81na +# +0780-0797 # main consonants +0798-07A5 # consonants used for loanwords +07A6-07B0 # vowels +#07B1 # used only in dialectic or historic Divehi diff --git a/lib/fontconfig/fc-lang/dz.orth b/lib/fontconfig/fc-lang/dz.orth index a904a5032..c7843af22 100644 --- a/lib/fontconfig/fc-lang/dz.orth +++ b/lib/fontconfig/fc-lang/dz.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/bo.orth,v 1.2 2002/07/12 21:05:58 keithp Exp $ +# fontconfig/fc-lang/dz.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ee.orth b/lib/fontconfig/fc-lang/ee.orth new file mode 100644 index 000000000..089c47e30 --- /dev/null +++ b/lib/fontconfig/fc-lang/ee.orth @@ -0,0 +1,77 @@ +# +# fontconfig/fc-lang/ee.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Ewe (ee) +# +# Sources: +# * http://www.uni-koeln.de/phil-fak/afrikanistik/down/publikationen/basic_ewe.pdf +# * http://en.wikipedia.org/wiki/Ewe_language +# * http://www.omniglot.com/writing/ewe.htm +# * http://www.panafril10n.org/wikidoc/pmwiki.php/PanAfrLoc/Gbe +# +# We amend the main alphabet with tone marks over each vowel, but some +# combinations lack precomposed forms in Unicode, so we also add indiviual +# combining marks. +# +# Sources also differ on the notation used for the fourth tone: circumflex +# vs combining line above (U+030D). At the moment, we are not including any +# of the two. +# +# There is also a nasalization mark for vowels (combining tilde), but there +# is a need for more research to find which vowels it's used with. The +# combination of nasalization and tones may also exist, resulting in double +# accents. +# +# C, J, and Q are not used. +# +0041-005A +0061-007A +00C0-00C1 +00C8-00C9 +00CC-00CD +00D2-00D3 +00D9-00DA +00E0-00E1 +00E8-00E9 +00EC-00ED +00F2-00F3 +00F9-00FA +011A-011B +014A-014B +0186 +0189 +# 018A # according to Unicode characters notes for U+0257 +0190-0192 +0194 +01B2 +01CD-01D4 +0254 +0256 +# 0257 # according to Unicode character notes +025B +0263 +028B +0300-0301 # to be used with open e and open o +# 0303 # combining tilde +030C # to be used with open e and open o +# 030D # combining vertical line above diff --git a/lib/fontconfig/fc-lang/el.orth b/lib/fontconfig/fc-lang/el.orth index 0e5a732ee..0b9782ea6 100644 --- a/lib/fontconfig/fc-lang/el.orth +++ b/lib/fontconfig/fc-lang/el.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/el.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/el.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -30,4 +30,3 @@ 038c 038e-03a1 03a3-03ce -20AC # EURO SIGN diff --git a/lib/fontconfig/fc-lang/en.orth b/lib/fontconfig/fc-lang/en.orth index 7e504fab4..c521e2183 100644 --- a/lib/fontconfig/fc-lang/en.orth +++ b/lib/fontconfig/fc-lang/en.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/en.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/en.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -38,4 +38,3 @@ 00f6 #2018-2019 # single quotes #201c-201d # double quotes -20AC # EURO SIGN diff --git a/lib/fontconfig/fc-lang/eo.orth b/lib/fontconfig/fc-lang/eo.orth index a7130a968..80501c7bf 100644 --- a/lib/fontconfig/fc-lang/eo.orth +++ b/lib/fontconfig/fc-lang/eo.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/eo.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/es.orth b/lib/fontconfig/fc-lang/es.orth index 77947f3db..603ef6062 100644 --- a/lib/fontconfig/fc-lang/es.orth +++ b/lib/fontconfig/fc-lang/es.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/es.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/es.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -47,5 +47,4 @@ 00F3 # LATIN SMALL LETTER O WITH ACUTE 00FA # LATIN SMALL LETTER U WITH ACUTE 00FC # LATIN SMALL LETTER U WITH DIAERESIS -20AC # EURO SIGN # diff --git a/lib/fontconfig/fc-lang/et.orth b/lib/fontconfig/fc-lang/et.orth index 7edd6ff77..db2d2c140 100644 --- a/lib/fontconfig/fc-lang/et.orth +++ b/lib/fontconfig/fc-lang/et.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/et.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/et.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/eu.orth b/lib/fontconfig/fc-lang/eu.orth index 67b871f6d..6ff35779d 100644 --- a/lib/fontconfig/fc-lang/eu.orth +++ b/lib/fontconfig/fc-lang/eu.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/eu.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/eu.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/fa.orth b/lib/fontconfig/fc-lang/fa.orth index b4284b052..2d9d7fa59 100644 --- a/lib/fontconfig/fc-lang/fa.orth +++ b/lib/fontconfig/fc-lang/fa.orth @@ -1,7 +1,8 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/fa.orth,v 1.1 2002/07/09 02:28:26 keithp Exp $ +# fontconfig/fc-lang/fa.orth # # Copyright © 2002 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that @@ -13,41 +14,60 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Persian (FA) +# Persian (fa) # -# Data from Roozbeh Pournader +# Sources: +# * ISIRI 6219:2002, "Information Technology — Persian Information +# Interchange and Display Mechanism, using Unicode" +# * "Dastur-e Khat-te Fārsi", Iranian Academy of Persian Language and +# Literature, 4th printing, December 2005, ISBN 964-7531-13-3. Available +# at http://www.persianacademy.ir/fa/das.aspx # -# Select fonts based on support for presentation forms; this may -# exclude some OpenType fonts, but the hope is those would be -# located by a clever shaper by Unicode codepoints in any case. +# We are assuming that: +# * Most fonts that claim to support an Arabic letter actually do so; +# * Most modern text rendering software use OpenType tables, instead of +# directly using presentation forms. +# * Some good Arabic fonts do not support codepoints for Arabic presentation +# forms. +# Thus, we are switching to general forms of Arabic letters. # -# General forms. -#0621-0624 -#0626-063a -#0641-0642 -#0644-0648 -#067e -#0686 -#0698 -#06a9 -#06af -#06cc -# Presentations Forms: -fb56-fb59 -fb7a-fb7d -fb8a-fb8b -fb8e-fb95 -fbfc-fbff -fe80-fe86 -fe89-fed8 -fedd-feee -#fef5-fef8 # These four happen very rarely -fefb-fefc +# General forms: +0621-0624 +0626-0628 +0629 # TEH MARBUTA, implicitly considered mandatory in the official orthography +062a-063a +0641-0642 +0644-0648 +064b # FATHATAN, considered mandatory in the official orthography +# 064b-064d # DAMMATAN and KASRATAN, considered mandatory in the official orthography, but very rare +# 064e-0650 # FATHA, DAMMA, and KASRA, not mandataroy in the official orthography +# 0651 # SHADDA, considered mandatory only for legal texts +# 0652 # SUKUN, not mandatory in the official orthography +0654 # HAMZA ABOVE, considered mandatory in the official orthography +# 0656 # SUBSCRIPT ALEF, not mentioned in official orthography, but sometimes used +# 0670 # SUPERSCRIPT ALEF, not explicilty listed in the official orthography, although used in the document; not mandatory +067e +0686 +0698 +06a9 +06af +06cc +# Presentations forms: +#fb56-fb59 +#fb7a-fb7d +#fb8a-fb8b +#fb8e-fb95 +#fbfc-fbff +#fe80-fe86 +#fe89-fed8 +#fedd-feee +##fef5-fef8 # These four happen very rarely +#fefb-fefc diff --git a/lib/fontconfig/fc-lang/fat.orth b/lib/fontconfig/fc-lang/fat.orth new file mode 100644 index 000000000..f3cba1036 --- /dev/null +++ b/lib/fontconfig/fc-lang/fat.orth @@ -0,0 +1,30 @@ +# +# fontconfig/fc-lang/fat.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Fanti (fat) +# +# According to ISO 639-3, Akan is a macro-language of Twi and Fanti. +# Information on the web indicates Twi and Fanti now have a unified +# orthography. We include Twi. +# +include tw.orth diff --git a/lib/fontconfig/fc-lang/fc-lang.c b/lib/fontconfig/fc-lang/fc-lang.c index 989a823b4..21d568d7e 100644 --- a/lib/fontconfig/fc-lang/fc-lang.c +++ b/lib/fontconfig/fc-lang/fc-lang.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/fc-lang/fc-lang.c,v 1.3 2002/08/22 07:36:43 keithp Exp $ + * fontconfig/fc-lang/fc-lang.c * * Copyright © 2002 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -129,7 +129,7 @@ static const FcCharSet * scan (FILE *f, char *file, FcCharSetFreezer *freezer) { FcCharSet *c = 0; - const FcCharSet *n; + FcCharSet *n; int start, end, ucs4; char line[1024]; int lineno = 0; @@ -138,18 +138,25 @@ scan (FILE *f, char *file, FcCharSetFreezer *freezer) { if (!strncmp (line, "include", 7)) { - file = strchr (line, ' '); - if (!file) - fatal (line, lineno, + FILE *included_f; + char *included_file; + included_file = strchr (line, ' '); + if (!included_file) + fatal (file, lineno, "invalid syntax, expected: include filename"); - while (isspace(*file)) - file++; - f = scanopen (file); - if (!f) - fatal (file, 0, "can't open"); - n = scan (f, file, freezer); - fclose (f); - return n; + while (isspace(*included_file)) + included_file++; + included_f = scanopen (included_file); + if (!included_f) + fatal (included_file, 0, "can't open"); + n = scan (included_f, included_file, freezer); + fclose (included_f); + if (!c) + c = FcCharSetCreate (); + if (!FcCharSetMerge (c, n, NULL)) + fatal (file, lineno, "out of memory"); + FcCharSetDestroy (n); + continue; } if (strchr (line, '-')) { @@ -217,22 +224,27 @@ get_lang (char *name) return lang; } +typedef struct _Entry { + int id; + char *file; +} Entry; + static int compare (const void *a, const void *b) { - const FcChar8 *const *as = a, *const *bs = b; - return FcStrCmpIgnoreCase (*as, *bs); + const Entry const *as = a, *bs = b; + return FcStrCmpIgnoreCase (as->file, bs->file); } #define MAX_LANG 1024 #define MAX_LANG_SET_MAP ((MAX_LANG + 31) / 32) -#define BitSet(map, id) ((map)[(id)>>5] |= ((FcChar32) 1 << ((id) & 0x1f))) -#define BitGet(map, id) ((map)[(id)>>5] >> ((id) & 0x1f)) & 1) +#define BitSet(map, i) ((map)[(entries[i].id)>>5] |= ((FcChar32) 1 << ((entries[i].id) & 0x1f))) +#define BitGet(map, i) ((map)[(entries[i].id)>>5] >> ((entries[i].id) & 0x1f)) & 1) int main (int argc, char **argv) { - static char *files[MAX_LANG]; + static Entry entries[MAX_LANG]; static const FcCharSet *sets[MAX_LANG]; static int duplicate[MAX_LANG]; static int country[MAX_LANG]; @@ -269,18 +281,20 @@ main (int argc, char **argv) } if (i == MAX_LANG) fatal (argv[0], 0, "Too many languages"); - files[i++] = argv[argi++]; + entries[i].id = i; + entries[i].file = argv[argi++]; + i++; } - files[i] = 0; - qsort (files, i, sizeof (char *), compare); + entries[i].file = 0; + qsort (entries, i, sizeof (Entry), compare); i = 0; - while (files[i]) + while (entries[i].file) { - f = scanopen (files[i]); + f = scanopen (entries[i].file); if (!f) - fatal (files[i], 0, strerror (errno)); - sets[i] = scan (f, files[i], freezer); - names[i] = get_name (files[i]); + fatal (entries[i].file, 0, strerror (errno)); + sets[i] = scan (f, entries[i].file, freezer); + names[i] = get_name (entries[i].file); langs[i] = get_lang(names[i]); if (strchr (langs[i], '-')) country[ncountry++] = i; @@ -355,6 +369,8 @@ main (int argc, char **argv) printf ("#define NUM(s,n) (NUM0 + n * sizeof (FcChar16) - SET(s))\n"); printf ("#define LEAF(o,l) (LEAF0 + l * sizeof (FcCharLeaf) - (OFF0 + o * sizeof (intptr_t)))\n"); printf ("#define fcLangCharSets (fcLangData.langCharSets)\n"); + printf ("#define fcLangCharSetIndices (fcLangData.langIndices)\n"); + printf ("#define fcLangCharSetIndicesInv (fcLangData.langIndicesInv)\n"); printf ("\n"); printf ("static const struct {\n" @@ -362,8 +378,11 @@ main (int argc, char **argv) " FcCharLeaf leaves[%d];\n" " intptr_t leaf_offsets[%d];\n" " FcChar16 numbers[%d];\n" + " FcChar%s langIndices[%d];\n" + " FcChar%s langIndicesInv[%d];\n" "} fcLangData = {\n", - nsets, tl, tn, tn); + nsets, tl, tn, tn, + nsets < 256 ? "8 " : "16", nsets, nsets < 256 ? "8 " : "16", nsets); /* * Dump sets @@ -450,10 +469,29 @@ main (int argc, char **argv) if (n % 8 != 0) printf ("\n"); } + printf ("},\n"); + + /* langIndices */ + printf ("{\n"); + for (i = 0; sets[i]; i++) + { + printf (" %d, /* %s */\n", entries[i].id, names[i]); + } + printf ("},\n"); + + /* langIndicesInv */ + printf ("{\n"); + { + static int entries_inv[MAX_LANG]; + for (i = 0; sets[i]; i++) + entries_inv[entries[i].id] = i; + for (i = 0; sets[i]; i++) + printf (" %d, /* %s */\n", entries_inv[i], names[entries_inv[i]]); + } printf ("}\n"); - + printf ("};\n\n"); - + printf ("#define NUM_LANG_CHAR_SET %d\n", i); num_lang_set_map = (i + 31) / 32; printf ("#define NUM_LANG_SET_MAP %d\n", num_lang_set_map); @@ -481,7 +519,7 @@ main (int argc, char **argv) for (d = c + 1; d < ncountry; d++) { int j = country[d]; - if (j >= 0 && !strncmp (langs[j], langs[i], l)) + if (j >= 0 && !strncmp (langs[j], langs[i], lang + 1)) { BitSet(map, j); country[d] = -1; @@ -520,7 +558,9 @@ main (int argc, char **argv) /* * Dump sets start/finish for the fastpath */ + printf ("\n"); printf ("static const FcLangCharSetRange fcLangCharSetRanges[] = {\n"); + printf ("\n"); for (setRangeChar = 'a'; setRangeChar <= 'z' ; setRangeChar++) { printf (" { %d, %d }, /* %c */\n", diff --git a/lib/fontconfig/fc-lang/fclang.tmpl.h b/lib/fontconfig/fc-lang/fclang.tmpl.h index 58ea1b1ba..c7d388918 100644 --- a/lib/fontconfig/fc-lang/fclang.tmpl.h +++ b/lib/fontconfig/fc-lang/fclang.tmpl.h @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/fc-lang/fclang.tmpl.h,v 1.1 2002/07/06 23:21:36 keithp Exp $ + * fontconfig/fc-lang/fclang.tmpl.h * * Copyright © 2002 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ful.orth b/lib/fontconfig/fc-lang/ff.orth similarity index 86% rename from lib/fontconfig/fc-lang/ful.orth rename to lib/fontconfig/fc-lang/ff.orth index 4763876ef..25b4e359c 100644 --- a/lib/fontconfig/fc-lang/ful.orth +++ b/lib/fontconfig/fc-lang/ff.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ff.orth # # Copyright © 2002 Keith Packard # @@ -13,15 +13,15 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Fulah (Fula) (ful) +# Fulah (Fula) (ff) # # Orthography from http://www.eki.ee/letter # diff --git a/lib/fontconfig/fc-lang/fi.orth b/lib/fontconfig/fc-lang/fi.orth index 971bb833e..ccac86e21 100644 --- a/lib/fontconfig/fc-lang/fi.orth +++ b/lib/fontconfig/fc-lang/fi.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/fi.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/fi.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -49,4 +49,3 @@ #2019 # single quote #201d # double quote #203a # angle quote -20AC # EURO SIGN diff --git a/lib/fontconfig/fc-lang/fil.orth b/lib/fontconfig/fc-lang/fil.orth new file mode 100644 index 000000000..0f2719522 --- /dev/null +++ b/lib/fontconfig/fc-lang/fil.orth @@ -0,0 +1,45 @@ +# +# fontconfig/fc-lang/fil.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Filipino (fil) +# +# Sources: +# * Paul Morrow, "A Brief Guide to Filipino Pronunciation", +# http://www.mts.net/~pmorrow/filpro.htm +# * Komisyon sa Wikang Filipino, "Ang Ortograpiya ng Wikang Pambansa", +# http://wika.pbwiki.com/f/ORTOPDF.pdf (in Filipino) +# * CLDR exemplar set for Filipino: +# http://unicode.org/cldr/data/common/main/fil.xml +# +0041-005A +0061-007A +00C0-00C2 +00C8-00CA +00CC-00CE +00D1-00D4 +00D9-00DB +00E0-00E2 +00E8-00EA +00EC-00EE +00F1-00F4 +00F9-00FB diff --git a/lib/fontconfig/fc-lang/fj.orth b/lib/fontconfig/fc-lang/fj.orth index 1427f25f8..5b7b6fb3f 100644 --- a/lib/fontconfig/fc-lang/fj.orth +++ b/lib/fontconfig/fc-lang/fj.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/kw.orth,v 1.1 2002/08/07 17:34:15 keithp Exp $ +# fontconfig/fc-lang/fj.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/fo.orth b/lib/fontconfig/fc-lang/fo.orth index a667fddb4..9d5d8c585 100644 --- a/lib/fontconfig/fc-lang/fo.orth +++ b/lib/fontconfig/fc-lang/fo.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/fo.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/fo.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/fr.orth b/lib/fontconfig/fc-lang/fr.orth index e3cc0522a..3441b9ec4 100644 --- a/lib/fontconfig/fc-lang/fr.orth +++ b/lib/fontconfig/fc-lang/fr.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/fr.orth,v 1.3 2002/07/12 09:12:37 keithp Exp $ +# fontconfig/fc-lang/fr.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -56,4 +56,3 @@ 00FF # LATIN SMALL LETTER Y WITH DIAERESIS 00C6 # LATIN CAPITAL LETTER AE (ash) * 00E6 # LATIN SMALL LETTER AE (ash) * -20AC # EURO SIGN diff --git a/lib/fontconfig/fc-lang/fur.orth b/lib/fontconfig/fc-lang/fur.orth index f2dfd5ef7..066feb0f1 100644 --- a/lib/fontconfig/fc-lang/fur.orth +++ b/lib/fontconfig/fc-lang/fur.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/wen.orth,v 1.1 2002/07/12 19:19:16 keithp Exp $ +# fontconfig/fc-lang/fur.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/fy.orth b/lib/fontconfig/fc-lang/fy.orth index 3bc0532e5..b17f4d68e 100644 --- a/lib/fontconfig/fc-lang/fy.orth +++ b/lib/fontconfig/fc-lang/fy.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/fy.orth,v 1.3 2002/08/07 17:34:15 keithp Exp $ +# fontconfig/fc-lang/fy.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ga.orth b/lib/fontconfig/fc-lang/ga.orth index 5102840a6..880114e4d 100644 --- a/lib/fontconfig/fc-lang/ga.orth +++ b/lib/fontconfig/fc-lang/ga.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ga.orth,v 1.3 2002/07/12 21:05:59 keithp Exp $ +# fontconfig/fc-lang/ga.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/gd.orth b/lib/fontconfig/fc-lang/gd.orth index e728216a8..39c308efd 100644 --- a/lib/fontconfig/fc-lang/gd.orth +++ b/lib/fontconfig/fc-lang/gd.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/gd.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/gd.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/gez.orth b/lib/fontconfig/fc-lang/gez.orth index eee170892..7d915fa28 100644 --- a/lib/fontconfig/fc-lang/gez.orth +++ b/lib/fontconfig/fc-lang/gez.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/gez.orth,v 1.2 2002/07/13 19:10:03 keithp Exp $ +# fontconfig/fc-lang/gez.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/gl.orth b/lib/fontconfig/fc-lang/gl.orth index 6cf5df581..5538be580 100644 --- a/lib/fontconfig/fc-lang/gl.orth +++ b/lib/fontconfig/fc-lang/gl.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/gl.orth,v 1.3 2002/07/12 09:12:37 keithp Exp $ +# fontconfig/fc-lang/gl.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/gn.orth b/lib/fontconfig/fc-lang/gn.orth index 5e68ad2be..36ddb7657 100644 --- a/lib/fontconfig/fc-lang/gn.orth +++ b/lib/fontconfig/fc-lang/gn.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/gn.orth,v 1.1 2002/07/12 19:19:15 keithp Exp $ +# fontconfig/fc-lang/gn.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/gu.orth b/lib/fontconfig/fc-lang/gu.orth index 400e0d710..464690737 100644 --- a/lib/fontconfig/fc-lang/gu.orth +++ b/lib/fontconfig/fc-lang/gu.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/gu.orth # # Copyright © 2002 Keith Packard # @@ -13,15 +13,15 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Gujarati (GU) +# Gujarati (gu) # # Taken from the Unicode coverage of this language # @@ -38,4 +38,4 @@ 0acb-0acd 0ad0 0ae0 -0ae6-0aef +#0ae6-0aef # Digits diff --git a/lib/fontconfig/fc-lang/gv.orth b/lib/fontconfig/fc-lang/gv.orth index efcd563e4..c22c666bb 100644 --- a/lib/fontconfig/fc-lang/gv.orth +++ b/lib/fontconfig/fc-lang/gv.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/wen.orth,v 1.1 2002/07/12 19:19:16 keithp Exp $ +# fontconfig/fc-lang/gv.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ha.orth b/lib/fontconfig/fc-lang/ha.orth index e58823406..cea4faf73 100644 --- a/lib/fontconfig/fc-lang/ha.orth +++ b/lib/fontconfig/fc-lang/ha.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ha.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/haw.orth b/lib/fontconfig/fc-lang/haw.orth index 817e64826..563fbd0d9 100644 --- a/lib/fontconfig/fc-lang/haw.orth +++ b/lib/fontconfig/fc-lang/haw.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/haw.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/he.orth b/lib/fontconfig/fc-lang/he.orth index fa4f3c645..bd68fa42a 100644 --- a/lib/fontconfig/fc-lang/he.orth +++ b/lib/fontconfig/fc-lang/he.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/he.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/hi.orth b/lib/fontconfig/fc-lang/hi.orth index de978859a..3e2226a90 100644 --- a/lib/fontconfig/fc-lang/hi.orth +++ b/lib/fontconfig/fc-lang/hi.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/hi.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/hne.orth b/lib/fontconfig/fc-lang/hne.orth new file mode 100644 index 000000000..3a0bacc9d --- /dev/null +++ b/lib/fontconfig/fc-lang/hne.orth @@ -0,0 +1,28 @@ +# +# fontconfig/fc-lang/hne.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Chhattisgarhi (hne) +# +# The government of India considers this a dialect of Hindi: +# including Hindi until further information is found. +include hi.orth diff --git a/lib/fontconfig/fc-lang/ho.orth b/lib/fontconfig/fc-lang/ho.orth index 62a111ee2..f488c3c0e 100644 --- a/lib/fontconfig/fc-lang/ho.orth +++ b/lib/fontconfig/fc-lang/ho.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ho.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/hr.orth b/lib/fontconfig/fc-lang/hr.orth index 444445b50..755c3670b 100644 --- a/lib/fontconfig/fc-lang/hr.orth +++ b/lib/fontconfig/fc-lang/hr.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/hr.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/hr.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/hsb.orth b/lib/fontconfig/fc-lang/hsb.orth new file mode 100644 index 000000000..b03e45437 --- /dev/null +++ b/lib/fontconfig/fc-lang/hsb.orth @@ -0,0 +1,42 @@ +# +# fontconfig/fc-lang/hsb.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Upper Sorbian (hsb) +# +# Sources: +# http://www.omniglot.com/writing/sorbian.htm +# http://www.evertype.com/alphabets/upper-sorbian.pdf +# +# Q, V, and X are not used +0041-005A +0061-007A +00D3 +00F3 +0106-0107 +010C-010D +011A-011B +0141-0144 +0158-0159 +0160-0161 +0179-017A +017D-017E diff --git a/lib/fontconfig/fc-lang/ht.orth b/lib/fontconfig/fc-lang/ht.orth new file mode 100644 index 000000000..d45302094 --- /dev/null +++ b/lib/fontconfig/fc-lang/ht.orth @@ -0,0 +1,35 @@ +# +# fontconfig/fc-lang/ht.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Haitian/Haitian Creole (ht) +# +# Sources: +# * http://www.omniglot.com/writing/haitiancreole.htm +# * http://www.lecorde.com/creole/kreyol/index.php?page=Pronunciation +# +0041-005A +0061-007A +00C8 +00D2 +00E8 +00F2 diff --git a/lib/fontconfig/fc-lang/hu.orth b/lib/fontconfig/fc-lang/hu.orth index 2fecc83c3..76c024ae9 100644 --- a/lib/fontconfig/fc-lang/hu.orth +++ b/lib/fontconfig/fc-lang/hu.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/hu.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/hu.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/hy.orth b/lib/fontconfig/fc-lang/hy.orth index ee8c7472b..22dd8291b 100644 --- a/lib/fontconfig/fc-lang/hy.orth +++ b/lib/fontconfig/fc-lang/hy.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/hy.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/hy.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/hz.orth b/lib/fontconfig/fc-lang/hz.orth new file mode 100644 index 000000000..91a32855c --- /dev/null +++ b/lib/fontconfig/fc-lang/hz.orth @@ -0,0 +1,35 @@ +# +# fontconfig/fc-lang/hz.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Herero (hz) +# +# Source: +# * http://www.omniglot.com/writing/herero.php +# +# C, Q, and X are not used. +# +0041-005A +0061-007A +032F # used under S and Z +1E12-1E13 +1E4A-1E4B diff --git a/lib/fontconfig/fc-lang/ia.orth b/lib/fontconfig/fc-lang/ia.orth index ee8d76509..e1ee8e76a 100644 --- a/lib/fontconfig/fc-lang/ia.orth +++ b/lib/fontconfig/fc-lang/ia.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ia.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/id.orth b/lib/fontconfig/fc-lang/id.orth index 11b2ee4b5..313c14643 100644 --- a/lib/fontconfig/fc-lang/id.orth +++ b/lib/fontconfig/fc-lang/id.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/id.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ie.orth b/lib/fontconfig/fc-lang/ie.orth index d464a5548..7c9440558 100644 --- a/lib/fontconfig/fc-lang/ie.orth +++ b/lib/fontconfig/fc-lang/ie.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ie.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ibo.orth b/lib/fontconfig/fc-lang/ig.orth similarity index 86% rename from lib/fontconfig/fc-lang/ibo.orth rename to lib/fontconfig/fc-lang/ig.orth index b1d832d70..5486fea17 100644 --- a/lib/fontconfig/fc-lang/ibo.orth +++ b/lib/fontconfig/fc-lang/ig.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ig.orth # # Copyright © 2002 Keith Packard # @@ -13,15 +13,15 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Igbo (Ibo) (IBO) +# Igbo (ig) # # Orthography from http://www.eki.ee/letter # diff --git a/lib/fontconfig/fc-lang/ii.orth b/lib/fontconfig/fc-lang/ii.orth new file mode 100644 index 000000000..52fe69966 --- /dev/null +++ b/lib/fontconfig/fc-lang/ii.orth @@ -0,0 +1,34 @@ +# +# fontconfig/fc-lang/ii.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Sichuan Yi/Nuosu (ii) +# +# Sources: +# * http://www.babelstone.co.uk/Yi/unicode.html +# * http://www.babelstone.co.uk/Yi/script.html +# * http://en.wikipedia.org/wiki/Yi_script +# +# As of Unicode 5.1, every encoded syllable (U+A000..A48C) is used. The +# radicals (U+A490..A4C6) are for linguistic use only. +# +A000-A48C diff --git a/lib/fontconfig/fc-lang/ik.orth b/lib/fontconfig/fc-lang/ik.orth index ac2e6830d..138018849 100644 --- a/lib/fontconfig/fc-lang/ik.orth +++ b/lib/fontconfig/fc-lang/ik.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ik.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/io.orth b/lib/fontconfig/fc-lang/io.orth index d1f52a991..eaaac3953 100644 --- a/lib/fontconfig/fc-lang/io.orth +++ b/lib/fontconfig/fc-lang/io.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/io.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/is.orth b/lib/fontconfig/fc-lang/is.orth index 871d68a4c..c33e7d271 100644 --- a/lib/fontconfig/fc-lang/is.orth +++ b/lib/fontconfig/fc-lang/is.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/is.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/is.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/it.orth b/lib/fontconfig/fc-lang/it.orth index 04e87038f..ad1a22d6c 100644 --- a/lib/fontconfig/fc-lang/it.orth +++ b/lib/fontconfig/fc-lang/it.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/it.orth,v 1.2 2002/07/06 23:59:15 keithp Exp $ +# fontconfig/fc-lang/it.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -49,4 +49,3 @@ 00f2-00f3 00f9 00fa -20AC # EURO SIGN diff --git a/lib/fontconfig/fc-lang/iu.orth b/lib/fontconfig/fc-lang/iu.orth index 904f2f404..1c1300a0b 100644 --- a/lib/fontconfig/fc-lang/iu.orth +++ b/lib/fontconfig/fc-lang/iu.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/iu.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ja.orth b/lib/fontconfig/fc-lang/ja.orth index 32ea258e6..572ca91e4 100644 --- a/lib/fontconfig/fc-lang/ja.orth +++ b/lib/fontconfig/fc-lang/ja.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ja.orth,v 1.3 2002/07/13 20:33:05 keithp Exp $ +# fontconfig/fc-lang/ja.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -6562,4 +6562,4 @@ 0x9F9C # 0x9F9D # 0x9FA0 # -0xFFE5 # FULLWIDTH YEN SIGN +#0xFFE5 # FULLWIDTH YEN SIGN diff --git a/lib/fontconfig/fc-lang/jv.orth b/lib/fontconfig/fc-lang/jv.orth new file mode 100644 index 000000000..0a8610bcd --- /dev/null +++ b/lib/fontconfig/fc-lang/jv.orth @@ -0,0 +1,36 @@ +# +# fontconfig/fc-lang/jv.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Javanese (jv) +# +# Sources: +# http://www.omniglot.com/writing/javanese.htm +# http://en.wikipedia.org/wiki/Javanese_language +# +# The historical Javanese script is not the main script anymore. Latin has +# replaced it. +# +0041-005A +0061-007A +00C8-00C9 +00E8-00E9 diff --git a/lib/fontconfig/fc-lang/ka.orth b/lib/fontconfig/fc-lang/ka.orth index 8a779838a..dda35ade5 100644 --- a/lib/fontconfig/fc-lang/ka.orth +++ b/lib/fontconfig/fc-lang/ka.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ka.orth,v 1.2 2002/07/06 23:59:16 keithp Exp $ +# fontconfig/fc-lang/ka.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/kaa.orth b/lib/fontconfig/fc-lang/kaa.orth index 41b717d01..fe641a567 100644 --- a/lib/fontconfig/fc-lang/kaa.orth +++ b/lib/fontconfig/fc-lang/kaa.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/kaa.orth,v 1.1 2002/07/12 07:52:16 keithp Exp $ +# fontconfig/fc-lang/kaa.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/kab.orth b/lib/fontconfig/fc-lang/kab.orth new file mode 100644 index 000000000..8513fd79b --- /dev/null +++ b/lib/fontconfig/fc-lang/kab.orth @@ -0,0 +1,42 @@ +# +# fontconfig/fc-lang/kab.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Kabyle (kab) +# +# Sources: +# http://www.omniglot.com/writing/kabyle.php +# http://www.geonames.de/alphkl.html +# +0041-005A +0061-007A +010C-010D +0190 +0194 +01E6-01E7 +025B +0263 +1E0C-1E0D +1E24-1E25 +1E62-1E63 +1E6C-1E6D +1E92-1E93 diff --git a/lib/fontconfig/fc-lang/ki.orth b/lib/fontconfig/fc-lang/ki.orth index 955d62660..147ce8584 100644 --- a/lib/fontconfig/fc-lang/ki.orth +++ b/lib/fontconfig/fc-lang/ki.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ki.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/kj.orth b/lib/fontconfig/fc-lang/kj.orth new file mode 100644 index 000000000..79edc316e --- /dev/null +++ b/lib/fontconfig/fc-lang/kj.orth @@ -0,0 +1,34 @@ +# +# fontconfig/fc-lang/kj.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Kuanyama/Kwanyama (kj) +# +# Sources: +# * http://www.omniglot.com/writing/oshiwambo.php +# * http://www.panafril10n.org/wikidoc/pmwiki.php/PanAfrLoc/Oshiwambo +# * http://wingolog.org/pub/hai-ti/hai-ti.pdf +# +# C, Q, and X are not used. +# +0041-005A +0061-007A diff --git a/lib/fontconfig/fc-lang/kk.orth b/lib/fontconfig/fc-lang/kk.orth index 81b83f542..009a97ec8 100644 --- a/lib/fontconfig/fc-lang/kk.orth +++ b/lib/fontconfig/fc-lang/kk.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/kk.orth,v 1.3 2002/07/12 09:12:37 keithp Exp $ +# fontconfig/fc-lang/kk.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/kl.orth b/lib/fontconfig/fc-lang/kl.orth index 78be8e58b..2763de26d 100644 --- a/lib/fontconfig/fc-lang/kl.orth +++ b/lib/fontconfig/fc-lang/kl.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/kl.orth,v 1.3 2002/07/12 09:12:37 keithp Exp $ +# fontconfig/fc-lang/kl.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/km.orth b/lib/fontconfig/fc-lang/km.orth index 2794b77c9..2bad0cfae 100644 --- a/lib/fontconfig/fc-lang/km.orth +++ b/lib/fontconfig/fc-lang/km.orth @@ -1,29 +1,39 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/km.orth,v 1.1 2002/07/07 19:18:51 keithp Exp $ +# fontconfig/fc-lang/km.orth # # Copyright © 2002 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting -# documentation, and that the name of Keith Packard not be used in +# documentation, and that the name of the author(s) not be used in # advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Keith Packard makes no +# specific, written prior permission. The author(s) make(s) no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Khmer (KM) +# Central Khmer (km) # -# Taken from the Unicode coverage of this language +# Taken from the Unicode coverage of Khmer script and Unicode character +# notes # -1780-17c5 +1780-179C +# 179D-179E # Pali/Sanskrit transliteration only +179F-17A2 +# 17A3-17A4 # Deprecated/Discouraged +17A5-17A7 +# 17A8 # Discouraged +17A9-17B3 +# 17B4-17B5 # Discouraged +17B6-17C5 diff --git a/lib/fontconfig/fc-lang/kn.orth b/lib/fontconfig/fc-lang/kn.orth index 8fce54da9..7b525304a 100644 --- a/lib/fontconfig/fc-lang/kn.orth +++ b/lib/fontconfig/fc-lang/kn.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/kn.orth # # Copyright © 2002 Keith Packard # @@ -13,15 +13,15 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Kannada (KN) +# Kannada (kn) # # Taken from the Unicode coverage of this language # @@ -37,4 +37,4 @@ 0cd5-0cd6 0cde 0ce0-0ce1 -0ce6-0cef +#0ce6-0cef # Digits diff --git a/lib/fontconfig/fc-lang/ko.orth b/lib/fontconfig/fc-lang/ko.orth index 6ecf1810c..1b02d9a8c 100644 --- a/lib/fontconfig/fc-lang/ko.orth +++ b/lib/fontconfig/fc-lang/ko.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ko.orth,v 1.3 2002/07/12 21:05:59 keithp Exp $ +# fontconfig/fc-lang/ko.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/kok.orth b/lib/fontconfig/fc-lang/kok.orth index 0d9cae05b..e77de6627 100644 --- a/lib/fontconfig/fc-lang/kok.orth +++ b/lib/fontconfig/fc-lang/kok.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/kok.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/kr.orth b/lib/fontconfig/fc-lang/kr.orth new file mode 100644 index 000000000..301da7f64 --- /dev/null +++ b/lib/fontconfig/fc-lang/kr.orth @@ -0,0 +1,43 @@ +# +# fontconfig/fc-lang/kr.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Kanuri (kr) +# +# Sources: +# * http://www.panafril10n.org/wikidoc/pmwiki.php/PanAfrLoc/Kanuri +# * http://www.sciences.univ-nantes.fr/info/perso/permanents/enguehard/recherche/Afrique/alphabet_kanuri.htm +# * http://sumale.vjf.cnrs.fr/phono/AfficheTableauOrtho2N.php?choixLangue=kanuri +# * http://www.rosettaproject.org/archive/kby/ortho-1 +# * http://std.dkuug.dk/jtc1/sc2/wg2/docs/n2906.pdf +# +# This is for Kanuri as written in the Latin script. An Arabic script +# orthography is also used (called Ajami), but I could not find much +# information about it. +# +# Q, V, and X are not used. +# +0041-005A +0061-007A +018E +01DD +024C-024D diff --git a/lib/fontconfig/fc-lang/ks.orth b/lib/fontconfig/fc-lang/ks.orth index 1c56b7464..e86ba0df0 100644 --- a/lib/fontconfig/fc-lang/ks.orth +++ b/lib/fontconfig/fc-lang/ks.orth @@ -1,25 +1,30 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ks.orth # -# Copyright © 2002 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting -# documentation, and that the name of Keith Packard not be used in +# documentation, and that the name of the author(s) not be used in # advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Keith Packard makes no +# specific, written prior permission. The author(s) make(s) no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Kashmiri (Devanagari script) (KS) -include hi.orth +# Kashmiri (ks) +# +# Kashmiri is written in Arabic in both India and Pakistan. The problem is, +# Unicode 5.1 does not contain all the letters required in the orthography, +# including Wavy Hamza Below and the Alef Maksura With Ring Below. We'll +# just include Urdu for now. +include ur.orth diff --git a/lib/fontconfig/fc-lang/ku.orth b/lib/fontconfig/fc-lang/ku_am.orth similarity index 87% rename from lib/fontconfig/fc-lang/ku.orth rename to lib/fontconfig/fc-lang/ku_am.orth index 8e783c8af..80e434079 100644 --- a/lib/fontconfig/fc-lang/ku.orth +++ b/lib/fontconfig/fc-lang/ku_am.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ku_am.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -26,7 +26,7 @@ # # http://titus.uni-frankfurt.de/unicode/alphabet/nslatest.htm # -# Kurdish (KU) +# Kurdish in Armenia (ku-AM) # 0410 0411 @@ -88,7 +88,4 @@ 04d9 04e6 04e7 -051 # Latin Q -057 # Latin W -071 # Latin q -077 # Latin w +051a-051d diff --git a/lib/fontconfig/fc-lang/ku_iq.orth b/lib/fontconfig/fc-lang/ku_iq.orth new file mode 100644 index 000000000..d2a065505 --- /dev/null +++ b/lib/fontconfig/fc-lang/ku_iq.orth @@ -0,0 +1,27 @@ +# +# fontconfig/fc-lang/ku_iq.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Kurdish in Iraq (ku-IQ) +# +# Assuming Iraqi Kurdish uses the same orthography as Iranian Kurdish +include ku_ir.orth diff --git a/lib/fontconfig/fc-lang/ku_ir.orth b/lib/fontconfig/fc-lang/ku_ir.orth index 713f73dab..6ca2e70f2 100644 --- a/lib/fontconfig/fc-lang/ku_ir.orth +++ b/lib/fontconfig/fc-lang/ku_ir.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ku_ir.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ku_tr.orth b/lib/fontconfig/fc-lang/ku_tr.orth new file mode 100644 index 000000000..1c0b33492 --- /dev/null +++ b/lib/fontconfig/fc-lang/ku_tr.orth @@ -0,0 +1,42 @@ +# +# fontconfig/fc-lang/ku_tr.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Kurdish in Turkey (ku-TR) +# +# This is based on the commonly used "Hawar" alphabet +# +# Sources: +# * http://www.omniglot.com/writing/kurdish.htm +# * http://www.kurdishacademy.org/?q=node/145 +# +0041-005A +0061-007A +00C7 +00CA +00CE +00DB +00E7 +00EA +00EE +00FB +015E-015F diff --git a/lib/fontconfig/fc-lang/kum.orth b/lib/fontconfig/fc-lang/kum.orth index 9ed7f8203..0107bfebd 100644 --- a/lib/fontconfig/fc-lang/kum.orth +++ b/lib/fontconfig/fc-lang/kum.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ku.orth,v 1.1 2002/07/12 07:52:16 keithp Exp $ +# fontconfig/fc-lang/kum.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/kv.orth b/lib/fontconfig/fc-lang/kv.orth index 3bcb941dd..87d4d93c2 100644 --- a/lib/fontconfig/fc-lang/kv.orth +++ b/lib/fontconfig/fc-lang/kv.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/kv.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/kw.orth b/lib/fontconfig/fc-lang/kw.orth index 38eb6f22a..11824b799 100644 --- a/lib/fontconfig/fc-lang/kw.orth +++ b/lib/fontconfig/fc-lang/kw.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/wen.orth,v 1.1 2002/07/12 19:19:16 keithp Exp $ +# fontconfig/fc-lang/kw.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/kwm.orth b/lib/fontconfig/fc-lang/kwm.orth new file mode 100644 index 000000000..34cd40584 --- /dev/null +++ b/lib/fontconfig/fc-lang/kwm.orth @@ -0,0 +1,29 @@ +# +# fontconfig/fc-lang/kwm.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Kwambi (kwm) +# +# Considered a sister language/dialect to Kuanyama (kj) and Ndonga (ng). +# We'll include Kuanyama. +# +include kj.orth diff --git a/lib/fontconfig/fc-lang/ky.orth b/lib/fontconfig/fc-lang/ky.orth index 3a0a2cf3c..ba8425027 100644 --- a/lib/fontconfig/fc-lang/ky.orth +++ b/lib/fontconfig/fc-lang/ky.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ky.orth,v 1.1 2002/07/12 07:52:16 keithp Exp $ +# fontconfig/fc-lang/ky.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/la.orth b/lib/fontconfig/fc-lang/la.orth index 22bc2d519..b28cbcce7 100644 --- a/lib/fontconfig/fc-lang/la.orth +++ b/lib/fontconfig/fc-lang/la.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/la.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/lah.orth b/lib/fontconfig/fc-lang/lah.orth new file mode 100644 index 000000000..c0321b67c --- /dev/null +++ b/lib/fontconfig/fc-lang/lah.orth @@ -0,0 +1,35 @@ +# +# fontconfig/fc-lang/lah.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Lahnda (lah) +# +# This is basically Western Panjabi/Punjabi, or Panjabi for Pakistan. It is +# written in the Arabic script, also known as Shahmukhi. According to +# ISO 639-3, the 'pa/pan' language code does not include Pakistani Panjabi, +# but 'lah' does: +# http://www.sil.org/iso639-3/documentation.asp?id=lah +# http://www.sil.org/iso639-3/documentation.asp?id=pan +# +# The letter list appears to be identical to Urdu. More research may be +# needed for rare letters. +include ur.orth diff --git a/lib/fontconfig/fc-lang/lb.orth b/lib/fontconfig/fc-lang/lb.orth index 3177a26c8..6f7b2c299 100644 --- a/lib/fontconfig/fc-lang/lb.orth +++ b/lib/fontconfig/fc-lang/lb.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/lb.orth,v 1.1 2002/07/12 19:19:15 keithp Exp $ +# fontconfig/fc-lang/lb.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/lez.orth b/lib/fontconfig/fc-lang/lez.orth index b6ba1a712..3fe9ac2eb 100644 --- a/lib/fontconfig/fc-lang/lez.orth +++ b/lib/fontconfig/fc-lang/lez.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/lez.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/lg.orth b/lib/fontconfig/fc-lang/lg.orth new file mode 100644 index 000000000..423cfe396 --- /dev/null +++ b/lib/fontconfig/fc-lang/lg.orth @@ -0,0 +1,33 @@ +# +# fontconfig/fc-lang/lg.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Ganda (lg) +# +# Sources: +# * http://www.buganda.com/luganda.htm +# * http://www.omniglot.com/writing/ganda.php +# * http://sumale.vjf.cnrs.fr/phono/AfficheTableauOrtho2N.php?choixLangue=luganda +# +0041-005A +0061-007A +014A-014B diff --git a/lib/fontconfig/fc-lang/li.orth b/lib/fontconfig/fc-lang/li.orth new file mode 100644 index 000000000..1b305386a --- /dev/null +++ b/lib/fontconfig/fc-lang/li.orth @@ -0,0 +1,43 @@ +# +# fontconfig/fc-lang/li.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Limburgan/Limburger/Limburgish (li) +# +# Sources: +# * http://www.limburgsedialecten.nl/pdf/Spellingbook-def.pdf +# * http://li.wikipedia.org/wiki/Wikipedia:Sjpellingssjpiekpagina +# +# There's also an apostrophe-like character that needs more research. U+02BB? +# +0041-005A +0061-007A +00C4 +00C8 +00CB +00D3 +00D6 +00E4 +00E8 +00EB +00F3 +00F6 diff --git a/lib/fontconfig/fc-lang/ln.orth b/lib/fontconfig/fc-lang/ln.orth index f90c30ea6..c32d66d74 100644 --- a/lib/fontconfig/fc-lang/ln.orth +++ b/lib/fontconfig/fc-lang/ln.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ln.orth,v 1.1 2006/03/08 14:22:16 plam Exp $ +# fontconfig/fc-lang/ln.orth # # Copyright © 2006 Danis Jacquerye # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/lo.orth b/lib/fontconfig/fc-lang/lo.orth index 3ad7237ab..7c2dd0320 100644 --- a/lib/fontconfig/fc-lang/lo.orth +++ b/lib/fontconfig/fc-lang/lo.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/lo.orth # # Copyright © 2002 Keith Packard # @@ -13,15 +13,15 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Lao (LO) +# Lao (lo) # # Taken from the Unicode coverage of this language # @@ -41,5 +41,5 @@ 0ec0-0ec4 0ec6 0ec8-0ecd -0ed0-0ed9 +#0ed0-0ed9 # Digits 0edc-0edd diff --git a/lib/fontconfig/fc-lang/lt.orth b/lib/fontconfig/fc-lang/lt.orth index a2e5c1482..4bdfe7633 100644 --- a/lib/fontconfig/fc-lang/lt.orth +++ b/lib/fontconfig/fc-lang/lt.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/lt.orth,v 1.2 2002/07/06 23:59:16 keithp Exp $ +# fontconfig/fc-lang/lt.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/lv.orth b/lib/fontconfig/fc-lang/lv.orth index 9b89576a9..fad04257e 100644 --- a/lib/fontconfig/fc-lang/lv.orth +++ b/lib/fontconfig/fc-lang/lv.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/lv.orth,v 1.2 2002/07/06 23:59:17 keithp Exp $ +# fontconfig/fc-lang/lv.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/mai.orth b/lib/fontconfig/fc-lang/mai.orth new file mode 100644 index 000000000..fd3971c01 --- /dev/null +++ b/lib/fontconfig/fc-lang/mai.orth @@ -0,0 +1,25 @@ +# +# fontconfig/fc-lang/mai.orth +# +# Copyright © 2002 Keith Packard +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Maithili (Devanagari script) (MAI) +include hi.orth diff --git a/lib/fontconfig/fc-lang/mg.orth b/lib/fontconfig/fc-lang/mg.orth index 513d242ec..3482c8f52 100644 --- a/lib/fontconfig/fc-lang/mg.orth +++ b/lib/fontconfig/fc-lang/mg.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/mg.orth,v 1.1 2002/07/12 19:19:15 keithp Exp $ +# fontconfig/fc-lang/mg.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/mh.orth b/lib/fontconfig/fc-lang/mh.orth index d2aab159a..cdd6fb46d 100644 --- a/lib/fontconfig/fc-lang/mh.orth +++ b/lib/fontconfig/fc-lang/mh.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/mh.orth,v 1.1 2002/07/12 19:19:15 keithp Exp $ +# fontconfig/fc-lang/mh.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/mi.orth b/lib/fontconfig/fc-lang/mi.orth index 9a3c2602d..1bc6832f7 100644 --- a/lib/fontconfig/fc-lang/mi.orth +++ b/lib/fontconfig/fc-lang/mi.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/mi.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/mk.orth b/lib/fontconfig/fc-lang/mk.orth index 6637a93ab..0dac53489 100644 --- a/lib/fontconfig/fc-lang/mk.orth +++ b/lib/fontconfig/fc-lang/mk.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/mk.orth,v 1.2 2002/07/06 23:59:17 keithp Exp $ +# fontconfig/fc-lang/mk.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ml.orth b/lib/fontconfig/fc-lang/ml.orth index 4b701a666..744eb7ce9 100644 --- a/lib/fontconfig/fc-lang/ml.orth +++ b/lib/fontconfig/fc-lang/ml.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ml.orth # # Copyright © 2002 Keith Packard # @@ -13,15 +13,15 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Malayalam (ML) +# Malayalam (ml) # # Taken from the Unicode coverage of this language # @@ -35,4 +35,4 @@ 0d4a-0d4d 0d57 0d60-0d61 -0d66-0d6f +#0d66-0d6f # Digits diff --git a/lib/fontconfig/fc-lang/mn.orth b/lib/fontconfig/fc-lang/mn_cn.orth similarity index 84% rename from lib/fontconfig/fc-lang/mn.orth rename to lib/fontconfig/fc-lang/mn_cn.orth index feaedad4a..c20497917 100644 --- a/lib/fontconfig/fc-lang/mn.orth +++ b/lib/fontconfig/fc-lang/mn_cn.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/mn.orth,v 1.1 2002/07/07 19:18:51 keithp Exp $ +# fontconfig/fc-lang/mn_cn.orth # # Copyright © 2002 Keith Packard # @@ -13,15 +13,15 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Mongolian (MN) +# Mongolian in China (mn-CN) # # Taken from the Unicode coverage of this language # diff --git a/lib/fontconfig/fc-lang/mn_mn.orth b/lib/fontconfig/fc-lang/mn_mn.orth new file mode 100644 index 000000000..af5d60213 --- /dev/null +++ b/lib/fontconfig/fc-lang/mn_mn.orth @@ -0,0 +1,35 @@ +# +# fontconfig/fc-lang/mn_mn.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Mongolian in Mongolia (mn-MN) +# +# Sources: +# http://www.omniglot.com/writing/mongolian.htm +# http://www.viahistoria.com/SilverHorde/main.html?research/MongolScripts.html +# http://unicode.org/cldr/data/common/main/mn.xml +# +0401 +0410-044F +0451 +04AE-04AF +04E8-04E9 diff --git a/lib/fontconfig/fc-lang/mo.orth b/lib/fontconfig/fc-lang/mo.orth index c3255020f..5b4263385 100644 --- a/lib/fontconfig/fc-lang/mo.orth +++ b/lib/fontconfig/fc-lang/mo.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/mo.orth,v 1.2 2002/07/06 23:59:17 keithp Exp $ +# fontconfig/fc-lang/mo.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/mr.orth b/lib/fontconfig/fc-lang/mr.orth index 86bc40d58..029d51e4d 100644 --- a/lib/fontconfig/fc-lang/mr.orth +++ b/lib/fontconfig/fc-lang/mr.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/mr.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ms.orth b/lib/fontconfig/fc-lang/ms.orth new file mode 100644 index 000000000..e6b03bd12 --- /dev/null +++ b/lib/fontconfig/fc-lang/ms.orth @@ -0,0 +1,32 @@ +# +# fontconfig/fc-lang/ms.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Malay (ms) +# +# Sources: +# http://www.omniglot.com/writing/malay.htm +# * CLDR exemplar set for Malay: +# http://unicode.org/cldr/data/common/main/ms.xml +# +0041-005A +0061-007A diff --git a/lib/fontconfig/fc-lang/mt.orth b/lib/fontconfig/fc-lang/mt.orth index b87849dbb..51edc4efb 100644 --- a/lib/fontconfig/fc-lang/mt.orth +++ b/lib/fontconfig/fc-lang/mt.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/mt.orth,v 1.2 2002/07/06 23:59:17 keithp Exp $ +# fontconfig/fc-lang/mt.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/my.orth b/lib/fontconfig/fc-lang/my.orth index 86de4e993..9046d26e5 100644 --- a/lib/fontconfig/fc-lang/my.orth +++ b/lib/fontconfig/fc-lang/my.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/kw.orth,v 1.1 2002/08/07 17:34:15 keithp Exp $ +# fontconfig/fc-lang/my.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/na.orth b/lib/fontconfig/fc-lang/na.orth new file mode 100644 index 000000000..9a829138a --- /dev/null +++ b/lib/fontconfig/fc-lang/na.orth @@ -0,0 +1,40 @@ +# +# fontconfig/fc-lang/na.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Nauru (na) +# +# Sources: +# * http://en.wikipedia.org/wiki/Nauruan_language +# * http://www.geonames.de/alphmq.html +# +# V and X are not used. +# +0041-005A +0061-007A +00C3 +00D1 +00D5 +00E3 +00F1 +00F5 +0168-0169 diff --git a/lib/fontconfig/fc-lang/nb.orth b/lib/fontconfig/fc-lang/nb.orth index 958a33cc5..ff8417687 100644 --- a/lib/fontconfig/fc-lang/nb.orth +++ b/lib/fontconfig/fc-lang/nb.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/nb.orth # # Copyright © 2002 Keith Packard # @@ -13,13 +13,13 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Norwegian Bokmäl (NB) +# Norwegian Bokmål (nb) include no.orth diff --git a/lib/fontconfig/fc-lang/nds.orth b/lib/fontconfig/fc-lang/nds.orth index 4b9c19a6b..3b2db30ce 100644 --- a/lib/fontconfig/fc-lang/nds.orth +++ b/lib/fontconfig/fc-lang/nds.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/de.orth,v 1.3 2002/07/12 09:12:36 keithp Exp $ +# fontconfig/fc-lang/nds.orth # # Copyright © 2004 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ne.orth b/lib/fontconfig/fc-lang/ne.orth index cb3f3d58b..18cf01119 100644 --- a/lib/fontconfig/fc-lang/ne.orth +++ b/lib/fontconfig/fc-lang/ne.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ne.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ng.orth b/lib/fontconfig/fc-lang/ng.orth new file mode 100644 index 000000000..9c62bc65c --- /dev/null +++ b/lib/fontconfig/fc-lang/ng.orth @@ -0,0 +1,29 @@ +# +# fontconfig/fc-lang/ng.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Ndonga (ng) +# +# Considered a sister language/dialect to Kuanyama (kj) and Kwambi (kwm). +# We'll include Kuanyama. +# +include kj.orth diff --git a/lib/fontconfig/fc-lang/nl.orth b/lib/fontconfig/fc-lang/nl.orth index c07dd464a..6f6315fd7 100644 --- a/lib/fontconfig/fc-lang/nl.orth +++ b/lib/fontconfig/fc-lang/nl.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/nl.orth,v 1.2 2002/07/06 23:59:17 keithp Exp $ +# fontconfig/fc-lang/nl.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -60,5 +60,4 @@ 00fb 00fc #0132-0133 # IJ and ij ligatures -20AC # EURO SIGN diff --git a/lib/fontconfig/fc-lang/nn.orth b/lib/fontconfig/fc-lang/nn.orth index 1ee92b656..b21e90f66 100644 --- a/lib/fontconfig/fc-lang/nn.orth +++ b/lib/fontconfig/fc-lang/nn.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/nn.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/no.orth b/lib/fontconfig/fc-lang/no.orth index c01c4363b..305c361cd 100644 --- a/lib/fontconfig/fc-lang/no.orth +++ b/lib/fontconfig/fc-lang/no.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/no.orth,v 1.3 2002/07/12 09:12:37 keithp Exp $ +# fontconfig/fc-lang/no.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/nr.orth b/lib/fontconfig/fc-lang/nr.orth index 1327533d9..0532cc112 100644 --- a/lib/fontconfig/fc-lang/nr.orth +++ b/lib/fontconfig/fc-lang/nr.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/nr.orth # # Copyright © 2007 Dwayne Bailey and Translate.org.za # diff --git a/lib/fontconfig/fc-lang/nso.orth b/lib/fontconfig/fc-lang/nso.orth index fcf9e333d..046fc8a1e 100644 --- a/lib/fontconfig/fc-lang/nso.orth +++ b/lib/fontconfig/fc-lang/nso.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/nso.orth # # Copyright © 2007 Dwayne Bailey and Translate.org.za # diff --git a/lib/fontconfig/fc-lang/nv.orth b/lib/fontconfig/fc-lang/nv.orth new file mode 100644 index 000000000..a64224ba9 --- /dev/null +++ b/lib/fontconfig/fc-lang/nv.orth @@ -0,0 +1,48 @@ +# +# fontconfig/fc-lang/nv.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Navajo/Navaho (nv) +# +# Sources: +# * http://en.wikipedia.org/wiki/Navajo_language +# * http://www.omniglot.com/writing/navajo.htm +# +# F, P, Q, R, U, and V are not used. A vertical glottal stop may be used. +# +0041-005A +0061-007A +00C1 +00C9 +00CD +00D3 +00E1 +00E9 +00ED +00F3 +0104-0105 +0118-0119 +012E-012F +0141-0142 +01EA-01EB +02BC # modifier letter apostrophe +0301 # combining acute accent, to be used with ogonek-ed forms of vowels diff --git a/lib/fontconfig/fc-lang/ny.orth b/lib/fontconfig/fc-lang/ny.orth index 36b10dfac..b846647e9 100644 --- a/lib/fontconfig/fc-lang/ny.orth +++ b/lib/fontconfig/fc-lang/ny.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ny.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/oc.orth b/lib/fontconfig/fc-lang/oc.orth index 12ff5b1a4..55b237e6c 100644 --- a/lib/fontconfig/fc-lang/oc.orth +++ b/lib/fontconfig/fc-lang/oc.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/oc.orth,v 1.2 2002/07/06 23:59:17 keithp Exp $ +# fontconfig/fc-lang/oc.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/om.orth b/lib/fontconfig/fc-lang/om.orth index 62c82b0cd..7f28d39bd 100644 --- a/lib/fontconfig/fc-lang/om.orth +++ b/lib/fontconfig/fc-lang/om.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/om.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/or.orth b/lib/fontconfig/fc-lang/or.orth index 99f9f1d36..3c54fe397 100644 --- a/lib/fontconfig/fc-lang/or.orth +++ b/lib/fontconfig/fc-lang/or.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/or.orth # # Copyright © 2002 Keith Packard # @@ -13,15 +13,15 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Oriya (OR) +# Oriya (or) # # Taken from the Unicode coverage of this language # @@ -38,4 +38,5 @@ 0b56-0b57 0b5c-0b5d 0b5f-0b61 -0b66-0b70 +#0b66-0b6f # Digits +#0b70 # Symbol diff --git a/lib/fontconfig/fc-lang/os.orth b/lib/fontconfig/fc-lang/os.orth index 4e7f49992..a5929df3e 100644 --- a/lib/fontconfig/fc-lang/os.orth +++ b/lib/fontconfig/fc-lang/os.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/os.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ota.orth b/lib/fontconfig/fc-lang/ota.orth new file mode 100644 index 000000000..77d75e590 --- /dev/null +++ b/lib/fontconfig/fc-lang/ota.orth @@ -0,0 +1,41 @@ +# +# fontconfig/fc-lang/ota.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Ottoman Turkish (ota) +# +# Sources: +# * Daniels and Bright, “The World’s Writing Systems”, pp. 756–759. +# * Library of Congress ALA-LC Romanization Tables: +# http://www.loc.gov/catdir/cpso/romanization/ottoman.pdf +# +# General forms, since presentation forms for one letter is not in Unicode. +# +0621-0622 +0626-063A +0641-0648 +067E +0686 +0698 +06AD +06AF +06CC diff --git a/lib/fontconfig/fc-lang/pa.orth b/lib/fontconfig/fc-lang/pa.orth index bd726ba1d..12588509c 100644 --- a/lib/fontconfig/fc-lang/pa.orth +++ b/lib/fontconfig/fc-lang/pa.orth @@ -1,29 +1,36 @@ # -# $RCSId:$ +# fontconfig/fc-lang/pa.orth # # Copyright © 2004 Red Hat, Inc. +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting -# documentation, and that the name of Red Hat not be used in +# documentation, and that the name of the author(s) not be used in # advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Red Hat makes no +# specific, written prior permission. The author(s) make(s) no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Punjabi (Gurumukhi script) (HI) +# Panjabi/Punjabi (pa) # -# From Unicode coverage for Gurumukhi, with modifications based on +# According to ISO 639-3, 'pa/pan' only applies to Panjabi as used in India: +# http://www.sil.org/iso639-3/documentation.asp?id=pan +# +# For Panjabi as used in Pakistan, use 'lah' or 'pa-PK': +# http://www.sil.org/iso639-3/documentation.asp?id=lah +# +# From Unicode coverage for Gurmukhi, with modifications based on # the 'Lohit Punjabi' font # # 0A01-0A03 # Various signs diff --git a/lib/fontconfig/fc-lang/pa_pk.orth b/lib/fontconfig/fc-lang/pa_pk.orth new file mode 100644 index 000000000..fba09e3d6 --- /dev/null +++ b/lib/fontconfig/fc-lang/pa_pk.orth @@ -0,0 +1,29 @@ +# +# fontconfig/fc-lang/pa_pk.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Panjabi/Punjabi in Pakistan (pa-PK) +# +# This file is kept for compatiblity for glibc: According to ISO 639-3, the +# proper code for Pakistani Panjabi is 'lah'. See the file 'lah.orth' for +# more information. +include lah.orth diff --git a/lib/fontconfig/fc-lang/pap_an.orth b/lib/fontconfig/fc-lang/pap_an.orth new file mode 100644 index 000000000..fa4b8a9ae --- /dev/null +++ b/lib/fontconfig/fc-lang/pap_an.orth @@ -0,0 +1,46 @@ +# +# fontconfig/fc-lang/pap_an.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Papiamento in Netherlands Antilles (pap-AN) +# +# This is based on Curaçao orthography, also called "Papiamentu". +# +# Sources: +# * http://papiamentu.pbwiki.com/Pronunciation +# * http://en.wikipedia.org/wiki/Papiamento +# * http://papiamentu.donamaro.nl/ +# +0041-005A +0061-007A +00C1 +00C8-00C9 +00CD +00D1-00D3 +00D9-00DA +00DC +00E1 +00E8-00E9 +00ED +00F1-00F3 +00F9-00FA +00FC diff --git a/lib/fontconfig/fc-lang/pap_aw.orth b/lib/fontconfig/fc-lang/pap_aw.orth new file mode 100644 index 000000000..b3af6949d --- /dev/null +++ b/lib/fontconfig/fc-lang/pap_aw.orth @@ -0,0 +1,31 @@ +# +# fontconfig/fc-lang/pap_aw.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Papiamento in Aruba (pap-AW) +# +# Sources: studying online newspapers, random wikipedia pages +# +0041-005A +0061-007A +00D1 +00F1 diff --git a/lib/fontconfig/fc-lang/pl.orth b/lib/fontconfig/fc-lang/pl.orth index 02bda12ef..e2d494e3f 100644 --- a/lib/fontconfig/fc-lang/pl.orth +++ b/lib/fontconfig/fc-lang/pl.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/pl.orth,v 1.2 2002/07/06 23:59:17 keithp Exp $ +# fontconfig/fc-lang/pl.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ps_af.orth b/lib/fontconfig/fc-lang/ps_af.orth index 2aba76672..5cae9eda9 100644 --- a/lib/fontconfig/fc-lang/ps_af.orth +++ b/lib/fontconfig/fc-lang/ps_af.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ps_af.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ps_pk.orth b/lib/fontconfig/fc-lang/ps_pk.orth index 0aa1aebd2..1ce76d5ad 100644 --- a/lib/fontconfig/fc-lang/ps_pk.orth +++ b/lib/fontconfig/fc-lang/ps_pk.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/fa.orth,v 1.1 2002/07/09 02:28:26 keithp Exp $ +# fontconfig/fc-lang/ps_pk.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/pt.orth b/lib/fontconfig/fc-lang/pt.orth index cca7bf080..77e97bfdd 100644 --- a/lib/fontconfig/fc-lang/pt.orth +++ b/lib/fontconfig/fc-lang/pt.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/pt.orth,v 1.2 2002/07/06 23:59:19 keithp Exp $ +# fontconfig/fc-lang/pt.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -62,4 +62,3 @@ 00fc ##203a # angle quote # -20AC # EURO SIGN diff --git a/lib/fontconfig/fc-lang/qu.orth b/lib/fontconfig/fc-lang/qu.orth new file mode 100644 index 000000000..118b65037 --- /dev/null +++ b/lib/fontconfig/fc-lang/qu.orth @@ -0,0 +1,36 @@ +# +# fontconfig/fc-lang/qu.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Quechua (qu) +# +# Sources: +# * http://en.wikipedia.org/wiki/Quechua_alphabet +# * http://www.omniglot.com/writing/quechua.htm +# +# Some basic Latin letters are not used, based on dialect +# +0041-005A +0061-007A +00D1 +00F1 +02C8 diff --git a/lib/fontconfig/fc-lang/rm.orth b/lib/fontconfig/fc-lang/rm.orth index b5110f343..4c62810ed 100644 --- a/lib/fontconfig/fc-lang/rm.orth +++ b/lib/fontconfig/fc-lang/rm.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/rm.orth,v 1.2 2002/07/06 23:59:19 keithp Exp $ +# fontconfig/fc-lang/rm.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/rn.orth b/lib/fontconfig/fc-lang/rn.orth new file mode 100644 index 000000000..3caf84b39 --- /dev/null +++ b/lib/fontconfig/fc-lang/rn.orth @@ -0,0 +1,32 @@ +# +# fontconfig/fc-lang/rn.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Rundi (rn) +# +# Sources: +# http://www.omniglot.com/writing/kirundi.php +# +# Q and X are not used. An apostrophe-like letter also exists. +# +0041-005A +0061-007A diff --git a/lib/fontconfig/fc-lang/ro.orth b/lib/fontconfig/fc-lang/ro.orth index 56261d500..8c97d4d27 100644 --- a/lib/fontconfig/fc-lang/ro.orth +++ b/lib/fontconfig/fc-lang/ro.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ro.orth,v 1.3 2002/07/12 21:06:00 keithp Exp $ +# fontconfig/fc-lang/ro.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ru.orth b/lib/fontconfig/fc-lang/ru.orth index c4c23bef1..b8cb2ee99 100644 --- a/lib/fontconfig/fc-lang/ru.orth +++ b/lib/fontconfig/fc-lang/ru.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ru.orth,v 1.3 2002/07/12 09:12:37 keithp Exp $ +# fontconfig/fc-lang/ru.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/rw.orth b/lib/fontconfig/fc-lang/rw.orth new file mode 100644 index 000000000..954c3335f --- /dev/null +++ b/lib/fontconfig/fc-lang/rw.orth @@ -0,0 +1,31 @@ +# +# fontconfig/fc-lang/rw.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Kinyarwanda (rw) +# +# Sources: +# http://www.omniglot.com/writing/kinyarwanda.htm +# +# Q and X are not used +0041-005A +0061-007A diff --git a/lib/fontconfig/fc-lang/sa.orth b/lib/fontconfig/fc-lang/sa.orth index 14072fc14..c7b08e16c 100644 --- a/lib/fontconfig/fc-lang/sa.orth +++ b/lib/fontconfig/fc-lang/sa.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/sa.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sah.orth b/lib/fontconfig/fc-lang/sah.orth index 5b50d3de7..b4f25d97e 100644 --- a/lib/fontconfig/fc-lang/sah.orth +++ b/lib/fontconfig/fc-lang/sah.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/sah.orth,v 1.1 2002/07/12 07:52:16 keithp Exp $ +# fontconfig/fc-lang/sah.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sc.orth b/lib/fontconfig/fc-lang/sc.orth new file mode 100644 index 000000000..c30ec1df2 --- /dev/null +++ b/lib/fontconfig/fc-lang/sc.orth @@ -0,0 +1,42 @@ +# +# fontconfig/fc-lang/sc.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Sardinian (sc) +# +# Sources: +# * http://www.omniglot.com/writing/sardinian.htm +# * http://www.limbasarda.it/lingui/ling_alfa.html +# +# K, W, X, and Y are not used. +0041-005A +0061-007A +00C0 +00C8 +00CC +00D2 +00D9 +00E0 +00E8 +00EC +00F2 +00F9 diff --git a/lib/fontconfig/fc-lang/sco.orth b/lib/fontconfig/fc-lang/sco.orth index da73aecf6..26bf0d60c 100644 --- a/lib/fontconfig/fc-lang/sco.orth +++ b/lib/fontconfig/fc-lang/sco.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/wen.orth,v 1.1 2002/07/12 19:19:16 keithp Exp $ +# fontconfig/fc-lang/sco.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sd.orth b/lib/fontconfig/fc-lang/sd.orth new file mode 100644 index 000000000..3fab4216e --- /dev/null +++ b/lib/fontconfig/fc-lang/sd.orth @@ -0,0 +1,58 @@ +# +# fontconfig/fc-lang/sd.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Sindhi (sd) +# +# Sindhi is mostly written in the Arabic script in both Pakistan and India. +# +# Sources: +# * http://www.user.uni-hannover.de/nhtcapri/sindhi-alphabet.html +# * http://www.omniglot.com/writing/sindhi.htm +# * http://tdil.mit.gov.in/sindhidesignguideoct02.pdf +# +# Some of the Sindhi letters are not available as presentation forms in +# Unicode, so we go with general-purpose Arabic letters. +# +0621-0622 +0624 +0626-0628 +062A-063A +0641-0642 +0644-0648 +064A +067A-067B +067D-0680 +0683-0684 +0686-0687 +068A +068C-068D +068F +0699 +06A6 +06A9-06AA +06AF +06B1 +06B3 +06BB +06BE +#06FD-06FD # signs are usually not included in orthographies diff --git a/lib/fontconfig/fc-lang/se.orth b/lib/fontconfig/fc-lang/se.orth index dd6dc80c4..e08733b8a 100644 --- a/lib/fontconfig/fc-lang/se.orth +++ b/lib/fontconfig/fc-lang/se.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/se.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sel.orth b/lib/fontconfig/fc-lang/sel.orth index 32780e21f..d76466a80 100644 --- a/lib/fontconfig/fc-lang/sel.orth +++ b/lib/fontconfig/fc-lang/sel.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/sel.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sg.orth b/lib/fontconfig/fc-lang/sg.orth new file mode 100644 index 000000000..aa9c0d179 --- /dev/null +++ b/lib/fontconfig/fc-lang/sg.orth @@ -0,0 +1,47 @@ +# +# fontconfig/fc-lang/sg.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Sango (sg) +# +# Sources: +# * http://en.wikipedia.org/wiki/Sango_language +# * http://www.omniglot.com/writing/sango.php +# +# C, Q, and X are not used. +# +0041-005A +0061-007A +00C2 +00C4 +00CA-00CB +00CE-00CF +00D4 +00D6 +00DB-00DC +00E2 +00E4 +00EA-00EB +00EE-00EF +00F4 +00F6 +00FB-00FC diff --git a/lib/fontconfig/fc-lang/sh.orth b/lib/fontconfig/fc-lang/sh.orth index e2deb92a5..80dae3ebd 100644 --- a/lib/fontconfig/fc-lang/sh.orth +++ b/lib/fontconfig/fc-lang/sh.orth @@ -1,25 +1,33 @@ # -# $RCSId:$ +# fontconfig/fc-lang/sh.orth # # Copyright © 2002 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting -# documentation, and that the name of Keith Packard not be used in +# documentation, and that the name of the author(s) not be used in # advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Keith Packard makes no +# specific, written prior permission. The author(s) make(s) no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Serbo-Croatian (SH) +# Serbo-Croatian (sh) +# +# This tag is deprecated since 2000 in ISO 639-1 and BCP 47. It is kept here +# for backward compatibility. Since ISO 639-3 defines this as a +# macrolanguage consisting of Bosnian, Croatian, and Serbian, we union +# those three. +include ba.orth +include hr.orth include sr.orth diff --git a/lib/fontconfig/fc-lang/shs.orth b/lib/fontconfig/fc-lang/shs.orth index 70ee95c0b..ca509b357 100644 --- a/lib/fontconfig/fc-lang/shs.orth +++ b/lib/fontconfig/fc-lang/shs.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/shs.orth # # Copyright © 2008 Neskie Manuel # diff --git a/lib/fontconfig/fc-lang/si.orth b/lib/fontconfig/fc-lang/si.orth index b6b7c86ff..8f8f15d33 100644 --- a/lib/fontconfig/fc-lang/si.orth +++ b/lib/fontconfig/fc-lang/si.orth @@ -1,40 +1,75 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/si.orth,v 1.1 2002/07/07 19:18:51 keithp Exp $ +# fontconfig/fc-lang/si.orth # # Copyright © 2002 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting -# documentation, and that the name of Keith Packard not be used in +# documentation, and that the name of the author(s) not be used in # advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Keith Packard makes no +# specific, written prior permission. The author(s) make(s) no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Sinhala (Sinhalese) (SI) +# Sinhala/Sinhalese (si) # -# Taken from the Unicode coverage of this language +# The document SINHALA CHARACTER CODE FOR INFORMATION INTERCHANGE, PART 2: +# REQUIREMENTS AND METHODS OF TEST (SLS 1134:PART2:2007 UDC 003.035:003.336) +# describes three (3) levels of compliance for Unicode Sinhala fonts. The +# first level describes the minimum requirements for SLS certification. The +# third level includes the first and second level requirements and additional +# requirements. # -# Independent vowels -0d85-0d96 +# To get a copy of this document contact the Sri Lanka Standards Institution +# (http://www.slsi.lk/). +# +# The Unicode document: http://unicode.org/charts/PDF/U0D80.PDF +# describes the base for level 3 compliance. +# +# Level 1 compliance can be described as level 3 with the exclusion of: +# U+0D8F ILUYANNA (Independent Vowel) +# U+0D90 ILUUYANNA (Independent Vowel) +# U+0DDF GAYANUKITTA (Dependent Vowel) +# U+0DF3 DIGA GAYANUKITTA (Dependent Vowel) +# U+0DF4 KUNDDALIYA (Punctuation) +# +# Sinhala and SLS1134 experts can be contacted at: +# sinhala-technical at lists.sourceforge.net +# ltrl at ucsc.cmb.ac.lk +# +# Semi Consonants +0d82-0d83 +# Independent Vowels +0d85-0d8d +# 0d8e IRUUYANNA (Level 1, but not in modern use) +# 0d8f ILUYANNA (Level 3) +# 0d90 ILUUYANNA (Level 3) +0d91-0d96 # Consonants -0d9a-0db1 +0d9a-0da5 +#0da6 SANYAKA JAYANNA (Level 1, but not in modern use) +0da7-0db1 0db3-0dbb 0dbd 0dc0-0dc6 -# Dependent vowel signs +# Dependent Vowels +0dca 0dcf-0dd4 0dd6 -0dd8-0ddf -# Additional dependent vowel signs -0df2-0df4 +0dd8-0dde +# 0ddf GAYANUKITTA (Level 3) +0df2 +# 0df3 DIGA GAYANUKITTA (Level 3) +# Punctuation +# 0df4 KUNDDALIYA (Level 3) diff --git a/lib/fontconfig/fc-lang/sid.orth b/lib/fontconfig/fc-lang/sid.orth new file mode 100644 index 000000000..179080b82 --- /dev/null +++ b/lib/fontconfig/fc-lang/sid.orth @@ -0,0 +1,27 @@ +# +# fontconfig/fc-lang/sid.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Sidamo (sid) +# +# Copying Tigrinya of Ethiopia, as does glibc +include ti_et.orth diff --git a/lib/fontconfig/fc-lang/sk.orth b/lib/fontconfig/fc-lang/sk.orth index d3786ba34..c7c870d87 100644 --- a/lib/fontconfig/fc-lang/sk.orth +++ b/lib/fontconfig/fc-lang/sk.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/sk.orth,v 1.2 2002/07/06 23:59:19 keithp Exp $ +# fontconfig/fc-lang/sk.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sl.orth b/lib/fontconfig/fc-lang/sl.orth index 986bde1d7..f37147587 100644 --- a/lib/fontconfig/fc-lang/sl.orth +++ b/lib/fontconfig/fc-lang/sl.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/sl.orth,v 1.2 2002/07/06 23:59:19 keithp Exp $ +# fontconfig/fc-lang/sl.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sm.orth b/lib/fontconfig/fc-lang/sm.orth index 3296e0845..fba7d3dfb 100644 --- a/lib/fontconfig/fc-lang/sm.orth +++ b/lib/fontconfig/fc-lang/sm.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/sm.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sma.orth b/lib/fontconfig/fc-lang/sma.orth index 246289981..f6e65ecb5 100644 --- a/lib/fontconfig/fc-lang/sma.orth +++ b/lib/fontconfig/fc-lang/sma.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/sma.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/smj.orth b/lib/fontconfig/fc-lang/smj.orth index 6356d7858..e708a907b 100644 --- a/lib/fontconfig/fc-lang/smj.orth +++ b/lib/fontconfig/fc-lang/smj.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/smj.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/smn.orth b/lib/fontconfig/fc-lang/smn.orth index 33ec30c5f..4c2e2d6db 100644 --- a/lib/fontconfig/fc-lang/smn.orth +++ b/lib/fontconfig/fc-lang/smn.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/smn.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sms.orth b/lib/fontconfig/fc-lang/sms.orth index 7c089ef13..04d1de366 100644 --- a/lib/fontconfig/fc-lang/sms.orth +++ b/lib/fontconfig/fc-lang/sms.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/sms.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sn.orth b/lib/fontconfig/fc-lang/sn.orth new file mode 100644 index 000000000..52839ee7b --- /dev/null +++ b/lib/fontconfig/fc-lang/sn.orth @@ -0,0 +1,35 @@ +# +# fontconfig/fc-lang/sn.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Shona (sn) +# +# Sources: +# * http://en.wikipedia.org/wiki/Shona_language +# * http://www.dokpro.uio.no/allex/gsd/fm/7-Mabhii.htm +# * http://www.omniglot.com/writing/shona.php +# +# Q and X are not used. An apostrophe-like modifier exists, +# that is used after N. More research is needed. +# +0041-005A +0061-007A diff --git a/lib/fontconfig/fc-lang/so.orth b/lib/fontconfig/fc-lang/so.orth index 814926a2e..243657802 100644 --- a/lib/fontconfig/fc-lang/so.orth +++ b/lib/fontconfig/fc-lang/so.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/so.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sq.orth b/lib/fontconfig/fc-lang/sq.orth index a277dde9a..252230202 100644 --- a/lib/fontconfig/fc-lang/sq.orth +++ b/lib/fontconfig/fc-lang/sq.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/sq.orth,v 1.2 2002/07/06 23:59:19 keithp Exp $ +# fontconfig/fc-lang/sq.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sr.orth b/lib/fontconfig/fc-lang/sr.orth index 148667178..5439d6334 100644 --- a/lib/fontconfig/fc-lang/sr.orth +++ b/lib/fontconfig/fc-lang/sr.orth @@ -1,7 +1,7 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/sr.orth,v 1.2 2002/07/06 23:59:19 keithp Exp $ +# fontconfig/fc-lang/sr.orth # -# Copyright © 2002 Keith Packard +# Copyright © 2008 Danilo Šegan # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -23,23 +23,13 @@ # # Serbian (SR) # -# Sources: -# www.evertype.com -# www.eki.ee/letter -# -# evertype.com marks a subset of the standard Cyrillic alphabet; I've -# simply included all of it here. -# 0402 -0408 -0409 -040a -040b +0408-040b 040f -0410-044f +0410-0418 +041a-0428 +0430-0438 +043a-0448 0452 -0458 -0459 -045a -045b +0458-045b 045f diff --git a/lib/fontconfig/fc-lang/ss.orth b/lib/fontconfig/fc-lang/ss.orth index 5223055d7..98d79e597 100644 --- a/lib/fontconfig/fc-lang/ss.orth +++ b/lib/fontconfig/fc-lang/ss.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ss.orth # # Copyright © 2007 Dwayne Bailey and Translate.org.za # diff --git a/lib/fontconfig/fc-lang/st.orth b/lib/fontconfig/fc-lang/st.orth index f77f6e9e3..7db6bff43 100644 --- a/lib/fontconfig/fc-lang/st.orth +++ b/lib/fontconfig/fc-lang/st.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/st.orth # # Copyright © 2007 Dwayne Bailey and Translate.org.za # diff --git a/lib/fontconfig/fc-lang/su.orth b/lib/fontconfig/fc-lang/su.orth new file mode 100644 index 000000000..5646fe281 --- /dev/null +++ b/lib/fontconfig/fc-lang/su.orth @@ -0,0 +1,33 @@ +# +# fontconfig/fc-lang/su.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Sundanese (su) +# +# Sources: +# * http://en.wikipedia.org/wiki/Sundanese_language +# * http://www.omniglot.com/writing/sundanese.php +# +0041-005A +0061-007A +00C9 +00E9 diff --git a/lib/fontconfig/fc-lang/sv.orth b/lib/fontconfig/fc-lang/sv.orth index ac888a19f..ac627c81f 100644 --- a/lib/fontconfig/fc-lang/sv.orth +++ b/lib/fontconfig/fc-lang/sv.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/sv.orth,v 1.2 2002/07/06 23:59:19 keithp Exp $ +# fontconfig/fc-lang/sv.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/sw.orth b/lib/fontconfig/fc-lang/sw.orth index 07f155eb9..81975e9f3 100644 --- a/lib/fontconfig/fc-lang/sw.orth +++ b/lib/fontconfig/fc-lang/sw.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/sw.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/syr.orth b/lib/fontconfig/fc-lang/syr.orth index 02ecd5d9f..b1f4a8dfc 100644 --- a/lib/fontconfig/fc-lang/syr.orth +++ b/lib/fontconfig/fc-lang/syr.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ab.orth,v 1.3 2002/07/12 09:12:36 keithp Exp $ +# fontconfig/fc-lang/syr.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ta.orth b/lib/fontconfig/fc-lang/ta.orth index a640327d9..cb6b215cd 100644 --- a/lib/fontconfig/fc-lang/ta.orth +++ b/lib/fontconfig/fc-lang/ta.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ta.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/te.orth b/lib/fontconfig/fc-lang/te.orth index 656f0f9b0..cb9989e9e 100644 --- a/lib/fontconfig/fc-lang/te.orth +++ b/lib/fontconfig/fc-lang/te.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/te.orth # # Copyright © 2002 Keith Packard # @@ -13,15 +13,15 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Telugu (GE) +# Telugu (te) # # Taken from the Unicode coverage of this language # @@ -36,4 +36,4 @@ 0c4a-0c4d 0c55-0c56 0c60-0c61 -0c66-0c6f +#0c66-0c6f # Digits diff --git a/lib/fontconfig/fc-lang/tg.orth b/lib/fontconfig/fc-lang/tg.orth index ea7248464..f11e6af47 100644 --- a/lib/fontconfig/fc-lang/tg.orth +++ b/lib/fontconfig/fc-lang/tg.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/tg.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/th.orth b/lib/fontconfig/fc-lang/th.orth index 7b0f3403b..47396bf30 100644 --- a/lib/fontconfig/fc-lang/th.orth +++ b/lib/fontconfig/fc-lang/th.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/th.orth # # Copyright © 2002 Keith Packard # @@ -13,14 +13,18 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Thai (TH) +# Thai (th) +# 0e01-0e3a -0e3f-0e5b +0e3f-0e4e +#0e4f # Punctuation +#0e50-0e59 # Digits +#0e5a-0e5b # Punctuation diff --git a/lib/fontconfig/fc-lang/ti_er.orth b/lib/fontconfig/fc-lang/ti_er.orth index 5edcc1cbd..b1f7dc634 100644 --- a/lib/fontconfig/fc-lang/ti_er.orth +++ b/lib/fontconfig/fc-lang/ti_er.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/gez.orth,v 1.2 2002/07/13 19:10:03 keithp Exp $ +# fontconfig/fc-lang/ti_er.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ti_et.orth b/lib/fontconfig/fc-lang/ti_et.orth index 1302eafcc..37ee0f7f7 100644 --- a/lib/fontconfig/fc-lang/ti_et.orth +++ b/lib/fontconfig/fc-lang/ti_et.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/ti.orth,v 1.1 2002/08/08 00:10:51 keithp Exp $ +# fontconfig/fc-lang/ti_et.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/tig.orth b/lib/fontconfig/fc-lang/tig.orth index 0e9144627..c5b9c0633 100644 --- a/lib/fontconfig/fc-lang/tig.orth +++ b/lib/fontconfig/fc-lang/tig.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/gez.orth,v 1.2 2002/07/13 19:10:03 keithp Exp $ +# fontconfig/fc-lang/tig.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/tk.orth b/lib/fontconfig/fc-lang/tk.orth index 658326cc4..7a8a985a4 100644 --- a/lib/fontconfig/fc-lang/tk.orth +++ b/lib/fontconfig/fc-lang/tk.orth @@ -1,106 +1,44 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/tk.orth,v 1.1 2002/07/12 07:52:16 keithp Exp $ +# fontconfig/fc-lang/tk.orth # -# Copyright © 2002 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting -# documentation, and that the name of Keith Packard not be used in +# documentation, and that the name of the author(s) not be used in # advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Keith Packard makes no +# specific, written prior permission. The author(s) make(s) no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Coverage taken from TITUS (Thesaurus Indogermanischer Text und -# Sprachmaterialien) +# Turkmen (tk) # -# http://titus.uni-frankfurt.de/unicode/alphabet/nslatest.htm +# Sources: +# http://www.omniglot.com/writing/turkmen.htm +# http://www.itscj.ipsj.or.jp/ISO-IR/230.pdf +# http://www.eki.ee/wgrs/rom2_tk.htm # -# Turkmen (TK) -# -0401 -0410 -0411 -0412 -0413 -0414 -0415 -0416 -0417 -0418 -0419 -041a -041b -041c -041d -041e -041f -0420 -0421 -0422 -0423 -0424 -0425 -0426 -0427 -0428 -0429 -042a -042b -042c -042d -042e -042f -0430 -0431 -0432 -0433 -0434 -0435 -0436 -0437 -0438 -0439 -043a -043b -043c -043d -043e -043f -0440 -0441 -0442 -0443 -0444 -0445 -0446 -0447 -0448 -0449 -044a -044b -044c -044d -044e -044f -0451 -#0472 # CYRILLIC CAPITAL LETTER FITA -#0473 # CYRILLIC SMALL LETTER FITA -0496 -0497 -04a2 -04a3 -04ae -04af -04d8 -04d9 +# C, Q, V, and X are not used +0041-005A +0061-007A +00C4 +00C7 +00D6 +00DC-00DD +00E4 +00E7 +00F6 +00FC-00FD +0147-0148 +015E-015F +017D-017E diff --git a/lib/fontconfig/fc-lang/tl.orth b/lib/fontconfig/fc-lang/tl.orth index 4ea737f46..6ab5c2dac 100644 --- a/lib/fontconfig/fc-lang/tl.orth +++ b/lib/fontconfig/fc-lang/tl.orth @@ -1,34 +1,27 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/tl.orth,v 1.1 2002/07/07 19:18:51 keithp Exp $ +# fontconfig/fc-lang/tl.orth # -# Copyright © 2002 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting -# documentation, and that the name of Keith Packard not be used in +# documentation, and that the name of the author(s) not be used in # advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Keith Packard makes no +# specific, written prior permission. The author(s) make(s) no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Tagalog (TL) +# Tagalog (tl) # -# Taken from the Unicode coverage of this language -# -# Independent vowels -1700-1702 -# Consonants -1703-170c -170e-1711 -# Dependent vowel signs -1712-1713 +# Since Filipino is standardized Tagalog, we just include that +include fil.orth diff --git a/lib/fontconfig/fc-lang/tn.orth b/lib/fontconfig/fc-lang/tn.orth index a057fc223..342281e03 100644 --- a/lib/fontconfig/fc-lang/tn.orth +++ b/lib/fontconfig/fc-lang/tn.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/tn.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/to.orth b/lib/fontconfig/fc-lang/to.orth index 4d5804607..3b85a1e8d 100644 --- a/lib/fontconfig/fc-lang/to.orth +++ b/lib/fontconfig/fc-lang/to.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/to.orth,v 1.1 2002/07/12 19:19:16 keithp Exp $ +# fontconfig/fc-lang/to.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/tr.orth b/lib/fontconfig/fc-lang/tr.orth index d46dd1737..155a69d37 100644 --- a/lib/fontconfig/fc-lang/tr.orth +++ b/lib/fontconfig/fc-lang/tr.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/tr.orth,v 1.2 2002/07/06 23:59:19 keithp Exp $ +# fontconfig/fc-lang/tr.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ts.orth b/lib/fontconfig/fc-lang/ts.orth index ec194ffbb..ffc180797 100644 --- a/lib/fontconfig/fc-lang/ts.orth +++ b/lib/fontconfig/fc-lang/ts.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ts.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/tt.orth b/lib/fontconfig/fc-lang/tt.orth index 8b947387e..a91d7c4fc 100644 --- a/lib/fontconfig/fc-lang/tt.orth +++ b/lib/fontconfig/fc-lang/tt.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/tt.orth,v 1.1 2002/07/12 07:52:16 keithp Exp $ +# fontconfig/fc-lang/tt.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/tw.orth b/lib/fontconfig/fc-lang/tw.orth index 56b5b0607..b6e654638 100644 --- a/lib/fontconfig/fc-lang/tw.orth +++ b/lib/fontconfig/fc-lang/tw.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/tw.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ty.orth b/lib/fontconfig/fc-lang/ty.orth new file mode 100644 index 000000000..fe4f24568 --- /dev/null +++ b/lib/fontconfig/fc-lang/ty.orth @@ -0,0 +1,41 @@ +# +# fontconfig/fc-lang/ty.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Tahitian (ty) +# +# Sources: +# * http://www.omniglot.com/writing/tahitian.htm +# * http://en.wikipedia.org/wiki/Tahitian_language +# +# B, C, D, G, J, K, L, Q, S, W, X, Y and Z are not used. +# +0041-005A +0061-007A +00CF # used in one word only? +00EF # used in one word only? +0100-0101 +0112-0113 +012A-012B +014C-014D +016A-016B +02BC # or possibly 02BB diff --git a/lib/fontconfig/fc-lang/tyv.orth b/lib/fontconfig/fc-lang/tyv.orth index d21c2c01d..9d5bd742e 100644 --- a/lib/fontconfig/fc-lang/tyv.orth +++ b/lib/fontconfig/fc-lang/tyv.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/tyv.orth,v 1.1 2002/07/12 07:52:16 keithp Exp $ +# fontconfig/fc-lang/tyv.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ug.orth b/lib/fontconfig/fc-lang/ug.orth index 918b86330..bf8e67450 100644 --- a/lib/fontconfig/fc-lang/ug.orth +++ b/lib/fontconfig/fc-lang/ug.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ug.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/uk.orth b/lib/fontconfig/fc-lang/uk.orth index 25058590f..593fc5c4c 100644 --- a/lib/fontconfig/fc-lang/uk.orth +++ b/lib/fontconfig/fc-lang/uk.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/uk.orth,v 1.3 2002/07/12 09:12:37 keithp Exp $ +# fontconfig/fc-lang/uk.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/ur.orth b/lib/fontconfig/fc-lang/ur.orth index 4026e2f1b..d9b944acc 100644 --- a/lib/fontconfig/fc-lang/ur.orth +++ b/lib/fontconfig/fc-lang/ur.orth @@ -1,7 +1,8 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ur.orth # # Copyright © 2002 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that @@ -13,50 +14,52 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Urdu (UR) +# Urdu (ur) # -# Data from Roozbeh Pournader +# We are assuming that: +# * Most fonts that claim to support an Arabic letter actually do so; +# * Most modern text rendering software use OpenType tables, instead of +# directly using presentation forms. +# * Some good Arabic fonts do not support codepoints for Arabic presentation +# forms. +# Thus, we are switching to general forms of Arabic letters. # -# Select fonts based on support for presentation forms; this may -# exclude some OpenType fonts, but the hope is those would be -# located by a clever shaper by Unicode codepoints in any case. -# -# General forms. -#0621-0624 -#0626-063a -#0641-0642 -#0644-0648 -#0679 -#067e -#0686 -#0688 -#0691 -#0698 -#06a9 -#06af -#06ba -#06be -#06cc -#06d2 -# Presentations Forms: -fb56-fb59 -fb66-fb69 -fb7a-fb7d -fb88-fb8d -fb8e-fb95 -fb9e-fb9f -fbfc-fbff -fbaa-fbaf -fe80-fe86 -fe89-fed8 -fedd-feee -#fef5-fef8 # These four happen very rarely -fefb-fefc +# General forms: +0621-0624 +0626-063a +0641-0642 +0644-0648 +0679 +067e +0686 +0688 +0691 +0698 +06a9 +06af +06ba +06be +06cc +06d2 +# Presentations forms: +#fb56-fb59 +#fb66-fb69 +#fb7a-fb7d +#fb88-fb8d +#fb8e-fb95 +#fb9e-fb9f +#fbfc-fbff +#fbaa-fbaf +#fe80-fe86 +#fe89-fed8 +#fedd-feee +##fef5-fef8 # These four happen very rarely +#fefb-fefc diff --git a/lib/fontconfig/fc-lang/uz.orth b/lib/fontconfig/fc-lang/uz.orth index 41593a317..a85670a4f 100644 --- a/lib/fontconfig/fc-lang/uz.orth +++ b/lib/fontconfig/fc-lang/uz.orth @@ -1,98 +1,36 @@ # -# $RCSId:$ +# fontconfig/fc-lang/uz.orth # -# Copyright © 2002 Keith Packard +# Copyright © 2009 Roozbeh Pournader # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that # copyright notice and this permission notice appear in supporting -# documentation, and that the name of Keith Packard not be used in +# documentation, and that the name of the author(s) not be used in # advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. Keith Packard makes no +# specific, written prior permission. The author(s) make(s) no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Coverage taken from TITUS (Thesaurus Indogermanischer Text und -# Sprachmaterialien) +# Uzbek (uz) # -# http://titus.uni-frankfurt.de/unicode/alphabet/nslatest.htm +# Sources: +# * http://ru.wikipedia.org/wiki/Узбекская_письменность +# * http://unicode.org/cldr/data/common/main/uz_Latn.xml +# * http://www.oxuscom.com/New_Uzbek_Latin_Alphabet.pdf # -# Uzbek (UZ) -# -0401 -0410 -0411 -0412 -0413 -0414 -0415 -0416 -0417 -0418 -0419 -041a -041b -041c -041d -041e -041f -0420 -0421 -0422 -0423 -0424 -0425 -0426 -0427 -0428 -042a -042d -042e -042f -0430 -0431 -0432 -0433 -0434 -0435 -0436 -0437 -0438 -0439 -043a -043b -043c -043d -043e -043f -0440 -0441 -0442 -0443 -0444 -0445 -0446 -0447 -0448 -044a -044d -044e -044f -0451 -0492 -0493 -049a -049b -04b2 -04b3 -04f0 -04f1 +0041-005A +0061-007A +# There are one to three modifier letters too, that are important for the +# orthography. But it's impossible to locate them in Unicode with the +# information available online. Possible candidates: +# U+02BB, U+02BC, U+02BF, U+02C8. diff --git a/lib/fontconfig/fc-lang/ven.orth b/lib/fontconfig/fc-lang/ve.orth similarity index 86% rename from lib/fontconfig/fc-lang/ven.orth rename to lib/fontconfig/fc-lang/ve.orth index ad4cda910..a7c91dba6 100644 --- a/lib/fontconfig/fc-lang/ven.orth +++ b/lib/fontconfig/fc-lang/ve.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/ve.orth # # Copyright © 2002 Keith Packard # @@ -13,15 +13,15 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. # -# Venda (VEN) +# Venda (ve) # # Orthography from http://www.eki.ee/letter # diff --git a/lib/fontconfig/fc-lang/vi.orth b/lib/fontconfig/fc-lang/vi.orth index 279263b84..7915cab2b 100644 --- a/lib/fontconfig/fc-lang/vi.orth +++ b/lib/fontconfig/fc-lang/vi.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/vi.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/vo.orth b/lib/fontconfig/fc-lang/vo.orth index 2fa80062f..8b334698e 100644 --- a/lib/fontconfig/fc-lang/vo.orth +++ b/lib/fontconfig/fc-lang/vo.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/vo.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/vot.orth b/lib/fontconfig/fc-lang/vot.orth index 0fa3d09a8..006b3e33c 100644 --- a/lib/fontconfig/fc-lang/vot.orth +++ b/lib/fontconfig/fc-lang/vot.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/vot.orth,v 1.1 2002/08/07 17:34:15 keithp Exp $ +# fontconfig/fc-lang/vot.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/wa.orth b/lib/fontconfig/fc-lang/wa.orth index f3ab44a1c..6b575271a 100644 --- a/lib/fontconfig/fc-lang/wa.orth +++ b/lib/fontconfig/fc-lang/wa.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/wa.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/wal.orth b/lib/fontconfig/fc-lang/wal.orth new file mode 100644 index 000000000..450e21a94 --- /dev/null +++ b/lib/fontconfig/fc-lang/wal.orth @@ -0,0 +1,27 @@ +# +# fontconfig/fc-lang/wal.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Wolaitta/Wolaytta (wal) +# +# Copying Tigrinya of Ethiopia, as does glibc +include ti_et.orth diff --git a/lib/fontconfig/fc-lang/wen.orth b/lib/fontconfig/fc-lang/wen.orth index d0f25bfe2..13d1714f3 100644 --- a/lib/fontconfig/fc-lang/wen.orth +++ b/lib/fontconfig/fc-lang/wen.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/wen.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/wo.orth b/lib/fontconfig/fc-lang/wo.orth index cc6eb6135..3e3fc3d73 100644 --- a/lib/fontconfig/fc-lang/wo.orth +++ b/lib/fontconfig/fc-lang/wo.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/wo.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/xh.orth b/lib/fontconfig/fc-lang/xh.orth index 746e8735c..a068709da 100644 --- a/lib/fontconfig/fc-lang/xh.orth +++ b/lib/fontconfig/fc-lang/xh.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/xh.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/yap.orth b/lib/fontconfig/fc-lang/yap.orth index bdf0eaaf0..6678b879f 100644 --- a/lib/fontconfig/fc-lang/yap.orth +++ b/lib/fontconfig/fc-lang/yap.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/yap.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/yi.orth b/lib/fontconfig/fc-lang/yi.orth index 113facc08..954b025d6 100644 --- a/lib/fontconfig/fc-lang/yi.orth +++ b/lib/fontconfig/fc-lang/yi.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/yi.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/yo.orth b/lib/fontconfig/fc-lang/yo.orth index b83ad9505..7e38d8a6d 100644 --- a/lib/fontconfig/fc-lang/yo.orth +++ b/lib/fontconfig/fc-lang/yo.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/yo.orth,v 1.1 2002/07/12 19:19:16 keithp Exp $ +# fontconfig/fc-lang/yo.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/za.orth b/lib/fontconfig/fc-lang/za.orth new file mode 100644 index 000000000..22deabe4a --- /dev/null +++ b/lib/fontconfig/fc-lang/za.orth @@ -0,0 +1,39 @@ +# +# fontconfig/fc-lang/za.orth +# +# Copyright © 2009 Roozbeh Pournader +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of the author(s) not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. The author(s) make(s) no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# Zhuang/Chuang (za) +# +# Sources: +# * http://www.omniglot.com/writing/zhuang.htm +# * http://www006.upp.so-net.ne.jp/FFS/zhuangyu_ch01.htm +# * http://en.wikipedia.org/wiki/Zhuang_language +# +# There is an older orthography with several uncommon letters that was +# reformed in 1986. In the 1986 orthography, just basic Latin letters are +# used. +# +# Some letters are not used. Apostrophe is used, but usage is comparable to +# usage in English. +# +0041-005A +0061-007A diff --git a/lib/fontconfig/fc-lang/zh_cn.orth b/lib/fontconfig/fc-lang/zh_cn.orth index 282c908c9..6438869ae 100644 --- a/lib/fontconfig/fc-lang/zh_cn.orth +++ b/lib/fontconfig/fc-lang/zh_cn.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/zh_cn.orth,v 1.2 2002/07/06 23:59:19 keithp Exp $ +# fontconfig/fc-lang/zh_cn.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/zh_hk.orth b/lib/fontconfig/fc-lang/zh_hk.orth index 1bea8332e..d280179bf 100644 --- a/lib/fontconfig/fc-lang/zh_hk.orth +++ b/lib/fontconfig/fc-lang/zh_hk.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/zh_hk.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/zh_mo.orth b/lib/fontconfig/fc-lang/zh_mo.orth index 92c5ba2ff..fe70977d7 100644 --- a/lib/fontconfig/fc-lang/zh_mo.orth +++ b/lib/fontconfig/fc-lang/zh_mo.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/zh_mo.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/zh_sg.orth b/lib/fontconfig/fc-lang/zh_sg.orth index 4418ea952..01919158f 100644 --- a/lib/fontconfig/fc-lang/zh_sg.orth +++ b/lib/fontconfig/fc-lang/zh_sg.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/zh_sg.orth,v 1.1 2002/07/08 07:31:51 keithp Exp $ +# fontconfig/fc-lang/zh_sg.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/zh_tw.orth b/lib/fontconfig/fc-lang/zh_tw.orth index 11e4e18e0..a052bfde1 100644 --- a/lib/fontconfig/fc-lang/zh_tw.orth +++ b/lib/fontconfig/fc-lang/zh_tw.orth @@ -1,5 +1,5 @@ # -# $RCSId: xc/lib/fontconfig/fc-lang/zh_tw.orth,v 1.2 2002/07/06 23:59:19 keithp Exp $ +# fontconfig/fc-lang/zh_tw.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-lang/zu.orth b/lib/fontconfig/fc-lang/zu.orth index 79f1f7646..dc236c820 100644 --- a/lib/fontconfig/fc-lang/zu.orth +++ b/lib/fontconfig/fc-lang/zu.orth @@ -1,5 +1,5 @@ # -# $RCSId:$ +# fontconfig/fc-lang/zu.orth # # Copyright © 2002 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/fc-list/Makefile.am b/lib/fontconfig/fc-list/Makefile.am index ade2835e0..b364271bd 100644 --- a/lib/fontconfig/fc-list/Makefile.am +++ b/lib/fontconfig/fc-list/Makefile.am @@ -1,5 +1,5 @@ # -# $Id: Makefile.am,v 1.5 2009/04/05 16:43:36 matthieu Exp $ +# fontconfig/fc-list/Makefile.am # # Copyright © 2003 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -46,7 +46,7 @@ if USEDOCBOOK ${man_MANS}: ${SGML} $(RM) $@ $(DOC2MAN) ${SGML} - $(RM) manpage.refs manpage.links + $(RM) manpage.* all-local: $(man_MANS) diff --git a/lib/fontconfig/fc-list/Makefile.in b/lib/fontconfig/fc-list/Makefile.in index db0ad8613..c4fa6f718 100644 --- a/lib/fontconfig/fc-list/Makefile.in +++ b/lib/fontconfig/fc-list/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.8 2009/04/05 16:43:36 matthieu Exp $ +# fontconfig/fc-list/Makefile.am # # Copyright © 2003 Keith Packard # @@ -29,9 +29,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -120,7 +120,6 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ -DOCDIR = @DOCDIR@ DOCMAN3 = @DOCMAN3@ DOCSRC = @DOCSRC@ DOLT_BASH = @DOLT_BASH@ @@ -145,6 +144,7 @@ FC_FONTPATH = @FC_FONTPATH@ FFLAGS = @FFLAGS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GREP = @GREP@ HASDOCBOOK = @HASDOCBOOK@ HAVE_EXPAT = @HAVE_EXPAT@ HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@ @@ -176,7 +176,6 @@ MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -ORTH_FILES = @ORTH_FILES@ OS_WIN32_FALSE = @OS_WIN32_FALSE@ OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ @@ -188,6 +187,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -196,18 +196,9 @@ USEDOCBOOK_FALSE = @USEDOCBOOK_FALSE@ USEDOCBOOK_TRUE = @USEDOCBOOK_TRUE@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_NMEDIT = @ac_ct_NMEDIT@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -225,6 +216,9 @@ build_os = @build_os@ build_vendor = @build_vendor@ confdir = @confdir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ fc_cachedir = @fc_cachedir@ ft_config = @ft_config@ @@ -233,18 +227,22 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -583,7 +581,7 @@ uninstall-man: uninstall-man1 @USEDOCBOOK_TRUE@${man_MANS}: ${SGML} @USEDOCBOOK_TRUE@ $(RM) $@ @USEDOCBOOK_TRUE@ $(DOC2MAN) ${SGML} -@USEDOCBOOK_TRUE@ $(RM) manpage.refs manpage.links +@USEDOCBOOK_TRUE@ $(RM) manpage.* @USEDOCBOOK_TRUE@all-local: $(man_MANS) diff --git a/lib/fontconfig/fc-list/fc-list.1 b/lib/fontconfig/fc-list/fc-list.1 index 2841e174c..d4e46657c 100644 --- a/lib/fontconfig/fc-list/fc-list.1 +++ b/lib/fontconfig/fc-list/fc-list.1 @@ -1,40 +1,45 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "FC-LIST" "1" "05 May 2008" "" "" - +.\\" auto-generated by docbook2man-spec $Revision: 1.3 $ +.TH "FC-LIST" "1" "Aug 13, 2008" "" "" .SH NAME fc-list \- list available fonts .SH SYNOPSIS +.sp +\fBfc-list\fR [ \fB-vVh\fR ] [ \fB--verbose\fR ] [ \fB [ -f \fIformat\fB ] [ --format \fIformat\fB ] \fR ] [ \fB--version\fR ] [ \fB--help\fR ] -\fBfc-list\fR [ \fB-vV?\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIpattern\fB\fR ] [ \fB\fIelement\fB\fR ] - + [ \fB\fIpattern\fB [ \fIelement\fB\fI...\fB ] \fR ] .SH "DESCRIPTION" .PP \fBfc-list\fR lists fonts and styles available on the system for applications using fontconfig. +If any elements are specified, only those are printed. +Otherwise family and style are printed, unless verbose +output is requested. .SH "OPTIONS" .PP This program follows the usual GNU command line syntax, -with long options starting with two dashes (`-'). A summary of +with long options starting with two dashes (`-'). A summary of options is included below. .TP -\fB-v --verbose \fR -Display status information while busy. +\fB-v\fR +Print verbose output of the whole font pattern for each match, +or \fIelement\fRs if any is +provided. .TP -\fB-? --help \fR -Show summary of options. +\fB-f\fR +Format output according to the format specifier +\fIformat\fR\&. .TP -\fB-V --version \fR +\fB-V\fR Show version of the program and exit. .TP -\fB\fIpattern\fB \fR +\fB-h\fR +Show summary of options. +.TP +\fB\fIpattern\fB\fR If this argument is set, only fonts matching \fIpattern\fR are displayed. .TP -\fB\fIelement\fB \fR +\fB\fIelement\fB\fR If set, the \fIelement\fR property is displayed for matching fonts. .SH "EXAMPLES" @@ -45,13 +50,19 @@ Lists all font faces. \fBfc-list :lang=hi\fR Lists font faces that cover Hindi. .TP -\fBfc-list : family style file spacing \fR +\fBfc-list : family style file spacing\fR Lists the filename and spacing value for each font -face. ``:'' is an empty pattern that matches all +face. ``:'' is an empty pattern that matches all fonts. .SH "SEE ALSO" .PP -\fBfc-cache\fR (1). +\fBfc-match\fR(1) +\fBFcFontList\fR(3) +\fBFcPatternFormat\fR(3) +\fBfc-cat\fR(1) +\fBfc-cache\fR(1) +\fBfc-query\fR(1) +\fBfc-scan\fR(1) .PP The fontconfig user's guide, in HTML format: \fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. @@ -59,7 +70,7 @@ The fontconfig user's guide, in HTML format: .PP This manual page was written by Keith Packard and Josselin Mouette \&. -...\" $Header: /home/cvs/xenocara/lib/fontconfig/fc-list/Attic/fc-list.1,v 1.2 2009/04/05 16:43:36 matthieu Exp $ +...\" $Header: /home/cvs/xenocara/lib/fontconfig/fc-list/Attic/fc-list.1,v 1.3 2010/03/25 21:48:46 matthieu Exp $ ...\" ...\" transcript compatibility for postscript use. ...\" diff --git a/lib/fontconfig/fc-list/fc-list.c b/lib/fontconfig/fc-list/fc-list.c index b85dfd7e4..e7813a6b4 100644 --- a/lib/fontconfig/fc-list/fc-list.c +++ b/lib/fontconfig/fc-list/fc-list.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/fc-list/fc-list.c,v 1.5 2002/06/30 23:45:40 keithp Exp $ + * fontconfig/fc-list/fc-list.c * * Copyright © 2002 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -26,6 +26,7 @@ #include #include #include +#include #ifdef HAVE_CONFIG_H #include #else @@ -47,9 +48,11 @@ #define _GNU_SOURCE #include const struct option longopts[] = { - {"version", 0, 0, 'V'}, {"verbose", 0, 0, 'v'}, - {"help", 0, 0, '?'}, + {"format", 1, 0, 'f'}, + {"quiet", 0, 0, 'q'}, + {"version", 0, 0, 'V'}, + {"help", 0, 0, 'h'}, {NULL,0,0,0}, }; #else @@ -59,33 +62,42 @@ extern int optind, opterr, optopt; #endif #endif -static void usage (char *program) +static void +usage (char *program, int error) { + FILE *file = error ? stderr : stdout; #if HAVE_GETOPT_LONG - fprintf (stderr, "usage: %s [-vV?] [--verbose] [--version] [--help] [pattern] {element ...} \n", + fprintf (file, "usage: %s [-vqVh] [-f FORMAT] [--verbose] [--format=FORMAT] [--quiet] [--version] [--help] [pattern] {element ...} \n", program); #else - fprintf (stderr, "usage: %s [-vV?] [pattern] {element ...} \n", + fprintf (file, "usage: %s [-vqVh] [-f FORMAT] [pattern] {element ...} \n", program); #endif - fprintf (stderr, "List fonts matching [pattern]\n"); - fprintf (stderr, "\n"); + fprintf (file, "List fonts matching [pattern]\n"); + fprintf (file, "\n"); #if HAVE_GETOPT_LONG - fprintf (stderr, " -v, --verbose display status information while busy\n"); - fprintf (stderr, " -V, --version display font config version and exit\n"); - fprintf (stderr, " -?, --help display this help and exit\n"); + fprintf (file, " -v, --verbose display entire font pattern verbosely\n"); + fprintf (file, " -f, --format=FORMAT use the given output format\n"); + fprintf (file, " -q, --quiet suppress all normal output, exit 1 if no fonts matched\n"); + fprintf (file, " -V, --version display font config version and exit\n"); + fprintf (file, " -h, --help display this help and exit\n"); #else - fprintf (stderr, " -v (verbose) display status information while busy\n"); - fprintf (stderr, " -V (version) display font config version and exit\n"); - fprintf (stderr, " -? (help) display this help and exit\n"); + fprintf (file, " -v (verbose) display entire font pattern verbosely\n"); + fprintf (file, " -f FORMAT (format) use the given output format\n"); + fprintf (file, " -q, (quiet) suppress all normal output, exit 1 if no fonts matched\n"); + fprintf (file, " -V (version) display font config version and exit\n"); + fprintf (file, " -h (help) display this help and exit\n"); #endif - exit (1); + exit (error); } int main (int argc, char **argv) { - /*int verbose = 0;*/ + int verbose = 0; + int quiet = 0; + FcChar8 *format = NULL; + int nfont = 0; int i; FcObjectSet *os = 0; FcFontSet *fs; @@ -94,21 +106,29 @@ main (int argc, char **argv) int c; #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "Vv?", longopts, NULL)) != -1) + while ((c = getopt_long (argc, argv, "vf:qVh", longopts, NULL)) != -1) #else - while ((c = getopt (argc, argv, "Vv?")) != -1) + while ((c = getopt (argc, argv, "vf:qVh")) != -1) #endif { switch (c) { + case 'v': + verbose = 1; + break; + case 'f': + format = (FcChar8 *) strdup (optarg); + break; + case 'q': + quiet = 1; + break; case 'V': - fprintf (stderr, "fontconfig version %d.%d.%d\n", + fprintf (stderr, "fontconfig version %d.%d.%d\n", FC_MAJOR, FC_MINOR, FC_REVISION); exit (0); - case 'v': - /* verbose = 1; */ - break; + case 'h': + usage (argv[0], 0); default: - usage (argv[0]); + usage (argv[0], 1); } } i = optind; @@ -133,33 +153,57 @@ main (int argc, char **argv) } else pat = FcPatternCreate (); - - if (!os) + if (quiet && !os) + os = FcObjectSetCreate (); + if (!verbose && !format && !os) os = FcObjectSetBuild (FC_FAMILY, FC_STYLE, (char *) 0); fs = FcFontList (0, pat, os); - FcObjectSetDestroy (os); + if (os) + FcObjectSetDestroy (os); if (pat) FcPatternDestroy (pat); - if (fs) + if (!quiet && fs) { int j; for (j = 0; j < fs->nfont; j++) { - FcChar8 *font; - FcChar8 *file; + if (verbose) + { + FcPatternPrint (fs->fonts[j]); + } + else if (format) + { + FcChar8 *s; - font = FcNameUnparse (fs->fonts[j]); - if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, &file) == FcResultMatch) - printf ("%s: ", file); - printf ("%s\n", font); - free (font); + s = FcPatternFormat (fs->fonts[j], format); + if (s) + { + printf ("%s", s); + free (s); + } + } + else + { + FcChar8 *str; + FcChar8 *file; + + str = FcNameUnparse (fs->fonts[j]); + if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, &file) == FcResultMatch) + printf ("%s: ", file); + printf ("%s\n", str); + free (str); + } } + } + + if (fs) { + nfont = fs->nfont; FcFontSetDestroy (fs); } FcFini (); - return 0; + return quiet ? (nfont == 0 ? 1 : 0) : 0; } diff --git a/lib/fontconfig/fc-list/fc-list.sgml b/lib/fontconfig/fc-list/fc-list.sgml index d0ec733e8..ffa089144 100644 --- a/lib/fontconfig/fc-list/fc-list.sgml +++ b/lib/fontconfig/fc-list/fc-list.sgml @@ -20,7 +20,7 @@ manpage.1: manpage.sgml Josselin"> Mouette"> - Sep 16, 2003"> + Aug 13, 2008"> 1"> @@ -63,12 +63,16 @@ manpage.1: manpage.sgml &dhpackage; - + + + + + - - + + @@ -76,8 +80,10 @@ manpage.1: manpage.sgml DESCRIPTION &dhpackage; lists fonts and styles - available on the system for applications using fontconfig. - + available on the system for applications using fontconfig. + If any elements are specified, only those are printed. + Otherwise family and style are printed, unless verbose + output is requested. OPTIONS @@ -92,15 +98,19 @@ manpage.1: manpage.sgml - Display status information while busy. + Print verbose output of the whole font pattern for each match, + or elements if any is + provided. - - + + + - Show summary of options. + Format output according to the format specifier + format. @@ -111,6 +121,14 @@ manpage.1: manpage.sgml Show version of the program and exit. + + + + + + Show summary of options. + + @@ -155,7 +173,15 @@ manpage.1: manpage.sgml SEE ALSO - fc-cache (1). + + fc-match(1) + FcFontList(3) + FcPatternFormat(3) + fc-cat(1) + fc-cache(1) + fc-query(1) + fc-scan(1) + The fontconfig user's guide, in HTML format: /usr/share/doc/fontconfig/fontconfig-user.html. diff --git a/lib/fontconfig/fc-match/Makefile.am b/lib/fontconfig/fc-match/Makefile.am index c555862af..9d725a582 100644 --- a/lib/fontconfig/fc-match/Makefile.am +++ b/lib/fontconfig/fc-match/Makefile.am @@ -1,5 +1,5 @@ # -# $Id: Makefile.am,v 1.5 2009/04/05 16:43:36 matthieu Exp $ +# fontconfig/fc-match/Makefile.am # # Copyright © 2003 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -46,7 +46,7 @@ if USEDOCBOOK ${man_MANS}: ${SGML} $(RM) $@ $(DOC2MAN) ${SGML} - $(RM) manpage.refs manpage.links + $(RM) manpage.* all-local: $(man_MANS) diff --git a/lib/fontconfig/fc-match/Makefile.in b/lib/fontconfig/fc-match/Makefile.in index c479d56a5..8cf295125 100644 --- a/lib/fontconfig/fc-match/Makefile.in +++ b/lib/fontconfig/fc-match/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.8 2009/04/05 16:43:36 matthieu Exp $ +# fontconfig/fc-match/Makefile.am # # Copyright © 2003 Keith Packard # @@ -29,9 +29,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -120,7 +120,6 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ -DOCDIR = @DOCDIR@ DOCMAN3 = @DOCMAN3@ DOCSRC = @DOCSRC@ DOLT_BASH = @DOLT_BASH@ @@ -145,6 +144,7 @@ FC_FONTPATH = @FC_FONTPATH@ FFLAGS = @FFLAGS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GREP = @GREP@ HASDOCBOOK = @HASDOCBOOK@ HAVE_EXPAT = @HAVE_EXPAT@ HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@ @@ -176,7 +176,6 @@ MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -ORTH_FILES = @ORTH_FILES@ OS_WIN32_FALSE = @OS_WIN32_FALSE@ OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ @@ -188,6 +187,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -196,18 +196,9 @@ USEDOCBOOK_FALSE = @USEDOCBOOK_FALSE@ USEDOCBOOK_TRUE = @USEDOCBOOK_TRUE@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_NMEDIT = @ac_ct_NMEDIT@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -225,6 +216,9 @@ build_os = @build_os@ build_vendor = @build_vendor@ confdir = @confdir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ fc_cachedir = @fc_cachedir@ ft_config = @ft_config@ @@ -233,18 +227,22 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -583,7 +581,7 @@ uninstall-man: uninstall-man1 @USEDOCBOOK_TRUE@${man_MANS}: ${SGML} @USEDOCBOOK_TRUE@ $(RM) $@ @USEDOCBOOK_TRUE@ $(DOC2MAN) ${SGML} -@USEDOCBOOK_TRUE@ $(RM) manpage.refs manpage.links +@USEDOCBOOK_TRUE@ $(RM) manpage.* @USEDOCBOOK_TRUE@all-local: $(man_MANS) diff --git a/lib/fontconfig/fc-match/fc-match.1 b/lib/fontconfig/fc-match/fc-match.1 index d3c7b9374..bdf68b99d 100644 --- a/lib/fontconfig/fc-match/fc-match.1 +++ b/lib/fontconfig/fc-match/fc-match.1 @@ -1,55 +1,77 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "FC-MATCH" "1" "05 May 2008" "" "" - +.\\" auto-generated by docbook2man-spec $Revision: 1.3 $ +.TH "FC-MATCH" "1" "Aug 13, 2008" "" "" .SH NAME fc-match \- match available fonts .SH SYNOPSIS +.sp +\fBfc-match\fR [ \fB-asvVh\fR ] [ \fB--all\fR ] [ \fB--sort\fR ] [ \fB--verbose\fR ] [ \fB [ -f \fIformat\fB ] [ --format \fIformat\fB ] \fR ] [ \fB--version\fR ] [ \fB--help\fR ] -\fBfc-match\fR [ \fB-svV?\fR ] [ \fB--sort\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIfont-pattern\fB\fR ] - + [ \fB\fIpattern\fB [ \fIelement\fB\fI...\fB ] \fR ] .SH "DESCRIPTION" .PP -\fBfc-match\fR matches font-pattern (empty +\fBfc-match\fR matches +\fIpattern\fR (empty pattern by default) using the normal fontconfig matching rules to find -the best font available. If --sort is given, the sorted list of best -matching fonts is displayed. With --verbose, the whole font pattern -for each match is printed, otherwise only the file, family and style -are printed.. +the best font available. If \fB--sort\fR is given, the sorted list of best +matching fonts is displayed. +The \fB--all\fR option works like +\fB--sort\fR except that no pruning is done on the list of fonts. +.PP +If any elements are specified, only those are printed. +Otherwise short file name, family, and style are printed, unless verbose +output is requested. .SH "OPTIONS" .PP This program follows the usual GNU command line syntax, -with long options starting with two dashes (`-'). A summary of +with long options starting with two dashes (`-'). A summary of options is included below. .TP -\fB-v --verbose \fR -Print whole font pattern for each match. +\fB-a\fR +Displays sorted list of best matching fonts, but do not do any +pruning on the list. .TP -\fB-? --help \fR -Show summary of options. -.TP -\fB-V --version \fR -Show version of the program and exit. -.TP -\fB-s --sort \fR +\fB-s\fR Displays sorted list of best matching fonts. .TP -\fB\fIfont-pattern\fB \fR +\fB-v\fR +Print verbose output of the whole font pattern for each match, +or \fIelement\fRs if any is +provided. +.TP +\fB-f\fR +Format output according to the format specifier +\fIformat\fR\&. +.TP +\fB-V\fR +Show version of the program and exit. +.TP +\fB-h\fR +Show summary of options. +.TP +\fB\fIpattern\fB\fR Displays fonts matching -\fIfont-pattern\fR (uses empty pattern by default). +\fIpattern\fR (uses empty pattern by default). +.TP +\fB\fIelement\fB\fR +If set, the \fIelement\fR property +is displayed for matching fonts. .SH "SEE ALSO" .PP -\fBfc-list\fR (1). +\fBfc-list\fR(1) +\fBFcFontMatch\fR(3) +\fBFcFontSort\fR(3) +\fBFcPatternFormat\fR(3) +\fBfc-cat\fR(1) +\fBfc-cache\fR(1) +\fBfc-query\fR(1) +\fBfc-scal\fR(1) .PP The fontconfig user's guide, in HTML format: \fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. .SH "AUTHOR" .PP This manual page was updated by Patrick Lam \&. -...\" $Header: /home/cvs/xenocara/lib/fontconfig/fc-match/Attic/fc-match.1,v 1.2 2009/04/05 16:43:36 matthieu Exp $ +...\" $Header: /home/cvs/xenocara/lib/fontconfig/fc-match/Attic/fc-match.1,v 1.3 2010/03/25 21:48:46 matthieu Exp $ ...\" ...\" transcript compatibility for postscript use. ...\" diff --git a/lib/fontconfig/fc-match/fc-match.c b/lib/fontconfig/fc-match/fc-match.c index aadd08aa5..8963e7af3 100644 --- a/lib/fontconfig/fc-match/fc-match.c +++ b/lib/fontconfig/fc-match/fc-match.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/fc-list/fc-list.c,v 1.5 2002/06/30 23:45:40 keithp Exp $ + * fontconfig/fc-match/fc-match.c * * Copyright © 2003 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -51,9 +51,10 @@ static const struct option longopts[] = { {"sort", 0, 0, 's'}, {"all", 0, 0, 'a'}, - {"version", 0, 0, 'V'}, {"verbose", 0, 0, 'v'}, - {"help", 0, 0, '?'}, + {"format", 1, 0, 'f'}, + {"version", 0, 0, 'V'}, + {"help", 0, 0, 'h'}, {NULL,0,0,0}, }; #else @@ -63,31 +64,35 @@ extern int optind, opterr, optopt; #endif #endif -static void usage (char *program) +static void +usage (char *program, int error) { + FILE *file = error ? stderr : stdout; #if HAVE_GETOPT_LONG - fprintf (stderr, "usage: %s [-svV?] [--sort] [--all] [--verbose] [--version] [--help] [pattern]\n", + fprintf (file, "usage: %s [-savVh] [-f FORMAT] [--sort] [--all] [--verbose] [--format=FORMAT] [--version] [--help] [pattern] {element...}\n", program); #else - fprintf (stderr, "usage: %s [-svV?] [pattern]\n", + fprintf (file, "usage: %s [-savVh] [-f FORMAT] [pattern] {element...}\n", program); #endif - fprintf (stderr, "List fonts matching [pattern]\n"); - fprintf (stderr, "\n"); + fprintf (file, "List best font matching [pattern]\n"); + fprintf (file, "\n"); #if HAVE_GETOPT_LONG - fprintf (stderr, " -s, --sort display sorted list of matches\n"); - fprintf (stderr, " -a, --all display unpruned sorted list of matches\n"); - fprintf (stderr, " -v, --verbose display entire font pattern\n"); - fprintf (stderr, " -V, --version display font config version and exit\n"); - fprintf (stderr, " -?, --help display this help and exit\n"); + fprintf (file, " -s, --sort display sorted list of matches\n"); + fprintf (file, " -a, --all display unpruned sorted list of matches\n"); + fprintf (file, " -v, --verbose display entire font pattern verbosely\n"); + fprintf (file, " -f, --format=FORMAT use the given output format\n"); + fprintf (file, " -V, --version display font config version and exit\n"); + fprintf (file, " -h, --help display this help and exit\n"); #else - fprintf (stderr, " -s, (sort) display sorted list of matches\n"); - fprintf (stderr, " -a (all) display unpruned sorted list of matches\n"); - fprintf (stderr, " -v (verbose) display entire font pattern\n"); - fprintf (stderr, " -V (version) display font config version and exit\n"); - fprintf (stderr, " -? (help) display this help and exit\n"); + fprintf (file, " -s, (sort) display sorted list of matches\n"); + fprintf (file, " -a (all) display unpruned sorted list of matches\n"); + fprintf (file, " -v (verbose) display entire font pattern verbosely\n"); + fprintf (file, " -f FORMAT (format) use the given output format\n"); + fprintf (file, " -V (version) display font config version and exit\n"); + fprintf (file, " -h (help) display this help and exit\n"); #endif - exit (1); + exit (error); } int @@ -95,7 +100,9 @@ main (int argc, char **argv) { int verbose = 0; int sort = 0, all = 0; + FcChar8 *format = NULL; int i; + FcObjectSet *os = 0; FcFontSet *fs; FcPattern *pat; FcResult result; @@ -103,9 +110,9 @@ main (int argc, char **argv) int c; #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "asVv?", longopts, NULL)) != -1) + while ((c = getopt_long (argc, argv, "asvf:Vh", longopts, NULL)) != -1) #else - while ((c = getopt (argc, argv, "asVv?")) != -1) + while ((c = getopt (argc, argv, "asvf:Vh")) != -1) #endif { switch (c) { @@ -115,15 +122,20 @@ main (int argc, char **argv) case 's': sort = 1; break; + case 'v': + verbose = 1; + break; + case 'f': + format = (FcChar8 *) strdup (optarg); + break; case 'V': fprintf (stderr, "fontconfig version %d.%d.%d\n", FC_MAJOR, FC_MINOR, FC_REVISION); exit (0); - case 'v': - verbose = 1; - break; + case 'h': + usage (argv[0], 0); default: - usage (argv[0]); + usage (argv[0], 1); } } i = optind; @@ -137,7 +149,15 @@ main (int argc, char **argv) return 1; } if (argv[i]) + { pat = FcNameParse ((FcChar8 *) argv[i]); + while (argv[++i]) + { + if (!os) + os = FcObjectSetCreate (); + FcObjectSetAdd (os, argv[i]); + } + } else pat = FcPatternCreate (); @@ -181,9 +201,31 @@ main (int argc, char **argv) for (j = 0; j < fs->nfont; j++) { + FcPattern *font; + + font = FcPatternFilter (fs->fonts[j], os); + if (verbose) { - FcPatternPrint (fs->fonts[j]); + FcPatternPrint (font); + } + else if (format) + { + FcChar8 *s; + + s = FcPatternFormat (font, format); + if (s) + { + printf ("%s", s); + free (s); + } + } + else if (os) + { + FcChar8 *str; + str = FcNameUnparse (font); + printf ("%s\n", str); + free (str); } else { @@ -191,7 +233,7 @@ main (int argc, char **argv) FcChar8 *style; FcChar8 *file; - if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, &file) != FcResultMatch) + if (FcPatternGetString (font, FC_FILE, 0, &file) != FcResultMatch) file = (FcChar8 *) ""; else { @@ -199,16 +241,23 @@ main (int argc, char **argv) if (slash) file = slash+1; } - if (FcPatternGetString (fs->fonts[j], FC_FAMILY, 0, &family) != FcResultMatch) + if (FcPatternGetString (font, FC_FAMILY, 0, &family) != FcResultMatch) family = (FcChar8 *) ""; - if (FcPatternGetString (fs->fonts[j], FC_STYLE, 0, &style) != FcResultMatch) + if (FcPatternGetString (font, FC_STYLE, 0, &style) != FcResultMatch) style = (FcChar8 *) ""; printf ("%s: \"%s\" \"%s\"\n", file, family, style); } + + FcPatternDestroy (font); } FcFontSetDestroy (fs); } + + if (os) + FcObjectSetDestroy (os); + FcFini (); + return 0; } diff --git a/lib/fontconfig/fc-match/fc-match.sgml b/lib/fontconfig/fc-match/fc-match.sgml index d68cc2214..390b733c3 100644 --- a/lib/fontconfig/fc-match/fc-match.sgml +++ b/lib/fontconfig/fc-match/fc-match.sgml @@ -20,7 +20,7 @@ manpage.1: manpage.sgml Patrick"> Lam"> - Apr 6, 2006"> + Aug 13, 2008"> 1"> @@ -63,25 +63,34 @@ manpage.1: manpage.sgml &dhpackage; - + + + + + + - + + DESCRIPTION - &dhpackage; matches font-pattern (empty + &dhpackage; matches + pattern (empty pattern by default) using the normal fontconfig matching rules to find -the best font available. If --sort is given, the sorted list of best -matching fonts is displayed. With --verbose, the whole font pattern -for each match is printed, otherwise only the file, family and style -are printed.. - +the best font available. If is given, the sorted list of best +matching fonts is displayed. +The option works like + except that no pruning is done on the list of fonts. +If any elements are specified, only those are printed. +Otherwise short file name, family, and style are printed, unless verbose +output is requested. OPTIONS @@ -92,27 +101,12 @@ are printed.. - - + + - Print whole font pattern for each match. - - - - - - - - Show summary of options. - - - - - - - - Show version of the program and exit. + Displays sorted list of best matching fonts, but do not do any + pruning on the list. @@ -124,11 +118,55 @@ are printed.. - + + + + + Print verbose output of the whole font pattern for each match, + or elements if any is + provided. + + + + + + + + + Format output according to the format specifier + format. + + + + + + + + Show version of the program and exit. + + + + + + + + Show summary of options. + + + + Displays fonts matching - font-pattern (uses empty pattern by default). + pattern (uses empty pattern by default). + + + + + + + If set, the element property + is displayed for matching fonts. @@ -137,7 +175,16 @@ are printed.. SEE ALSO - fc-list (1). + + fc-list(1) + FcFontMatch(3) + FcFontSort(3) + FcPatternFormat(3) + fc-cat(1) + fc-cache(1) + fc-query(1) + fc-scal(1) + The fontconfig user's guide, in HTML format: /usr/share/doc/fontconfig/fontconfig-user.html. diff --git a/lib/fontconfig/fc-query/Makefile.am b/lib/fontconfig/fc-query/Makefile.am new file mode 100644 index 000000000..114fd7f80 --- /dev/null +++ b/lib/fontconfig/fc-query/Makefile.am @@ -0,0 +1,59 @@ +# +# fontconfig/fc-query/Makefile.am +# +# Copyright © 2003 Keith Packard +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +bin_PROGRAMS=fc-query + +DOC2MAN = docbook2man + +FC_QUERY_SRC=${top_srcdir}/fc-query + +SGML = ${FC_QUERY_SRC}/fc-query.sgml + +INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) + +BUILT_MANS=fc-query.1 + +if ENABLE_DOCS +man_MANS=${BUILT_MANS} +endif + +EXTRA_DIST=fc-query.sgml $(BUILT_MANS) + +fc_query_LDADD = ${top_builddir}/src/libfontconfig.la + +if USEDOCBOOK + +${man_MANS}: ${SGML} + $(RM) $@ + $(DOC2MAN) ${SGML} + $(RM) manpage.* + +all-local: $(man_MANS) + +clean-local: + $(RM) $(man_MANS) + +else +all-local: +clean-local: +endif diff --git a/lib/fontconfig/fc-query/Makefile.in b/lib/fontconfig/fc-query/Makefile.in new file mode 100644 index 000000000..6660e1a91 --- /dev/null +++ b/lib/fontconfig/fc-query/Makefile.in @@ -0,0 +1,595 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# fontconfig/fc-query/Makefile.am +# +# Copyright © 2003 Keith Packard +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +bin_PROGRAMS = fc-query$(EXEEXT) +subdir = fc-query +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +fc_query_SOURCES = fc-query.c +fc_query_OBJECTS = fc-query.$(OBJEXT) +fc_query_DEPENDENCIES = ${top_builddir}/src/libfontconfig.la +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = fc-query.c +DIST_SOURCES = fc-query.c +man1dir = $(mandir)/man1 +NROFF = nroff +MANS = $(man_MANS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +ARCHITECTURE = @ARCHITECTURE@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CC_FOR_BUILD = @CC_FOR_BUILD@ +CFLAGS = @CFLAGS@ +CONFDIR = @CONFDIR@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DOCMAN3 = @DOCMAN3@ +DOCSRC = @DOCSRC@ +DOLT_BASH = @DOLT_BASH@ +DSYMUTIL = @DSYMUTIL@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ +EXEEXT = @EXEEXT@ +EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ +EXPAT_CFLAGS = @EXPAT_CFLAGS@ +EXPAT_LIBS = @EXPAT_LIBS@ +F77 = @F77@ +FC_ADD_FONTS = @FC_ADD_FONTS@ +FC_CACHEDIR = @FC_CACHEDIR@ +FC_DEFAULT_FONTS = @FC_DEFAULT_FONTS@ +FC_FONTDATE = @FC_FONTDATE@ +FC_FONTPATH = @FC_FONTPATH@ +FFLAGS = @FFLAGS@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ +FREETYPE_LIBS = @FREETYPE_LIBS@ +GREP = @GREP@ +HASDOCBOOK = @HASDOCBOOK@ +HAVE_EXPAT = @HAVE_EXPAT@ +HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@ +ICONV_LIBS = @ICONV_LIBS@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBT_CURRENT = @LIBT_CURRENT@ +LIBT_CURRENT_MINUS_AGE = @LIBT_CURRENT_MINUS_AGE@ +LIBT_REVISION = @LIBT_REVISION@ +LIBT_VERSION_INFO = @LIBT_VERSION_INFO@ +LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ +LIBXML2_LIBS = @LIBXML2_LIBS@ +LN_S = @LN_S@ +LTCOMPILE = @LTCOMPILE@ +LTCXXCOMPILE = @LTCXXCOMPILE@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OS_WIN32_FALSE = @OS_WIN32_FALSE@ +OS_WIN32_TRUE = @OS_WIN32_TRUE@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +RM = @RM@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USEDOCBOOK_FALSE = @USEDOCBOOK_FALSE@ +USEDOCBOOK_TRUE = @USEDOCBOOK_TRUE@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +confdir = @confdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +fc_cachedir = @fc_cachedir@ +ft_config = @ft_config@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +ms_librarian = @ms_librarian@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +DOC2MAN = docbook2man +FC_QUERY_SRC = ${top_srcdir}/fc-query +SGML = ${FC_QUERY_SRC}/fc-query.sgml +INCLUDES = -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) +BUILT_MANS = fc-query.1 +@ENABLE_DOCS_TRUE@man_MANS = ${BUILT_MANS} +EXTRA_DIST = fc-query.sgml $(BUILT_MANS) +fc_query_LDADD = ${top_builddir}/src/libfontconfig.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu fc-query/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu fc-query/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +fc-query$(EXEEXT): $(fc_query_OBJECTS) $(fc_query_DEPENDENCIES) + @rm -f fc-query$(EXEEXT) + $(LINK) $(fc_query_LDFLAGS) $(fc_query_OBJECTS) $(fc_query_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-query.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) $(MANS) all-local +installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: install-binPROGRAMS + +install-info: install-info-am + +install-man: install-man1 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 + +.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool clean-local \ + ctags distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-man1 \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-info-am uninstall-man \ + uninstall-man1 + + +@USEDOCBOOK_TRUE@${man_MANS}: ${SGML} +@USEDOCBOOK_TRUE@ $(RM) $@ +@USEDOCBOOK_TRUE@ $(DOC2MAN) ${SGML} +@USEDOCBOOK_TRUE@ $(RM) manpage.* + +@USEDOCBOOK_TRUE@all-local: $(man_MANS) + +@USEDOCBOOK_TRUE@clean-local: +@USEDOCBOOK_TRUE@ $(RM) $(man_MANS) + +@USEDOCBOOK_FALSE@all-local: +@USEDOCBOOK_FALSE@clean-local: +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/lib/fontconfig/fc-query/fc-query.1 b/lib/fontconfig/fc-query/fc-query.1 new file mode 100644 index 000000000..16c9f0f1d --- /dev/null +++ b/lib/fontconfig/fc-query/fc-query.1 @@ -0,0 +1,57 @@ +.\\" auto-generated by docbook2man-spec $Revision: 1.1 $ +.TH "FC-QUERY" "1" "Aug 13, 2008" "" "" +.SH NAME +fc-query \- query font files +.SH SYNOPSIS +.sp +\fBfc-query\fR [ \fB-Vh\fR ] + + [ \fB [ -i \fIindex\fB ] [ --index \fIindex\fB ] \fR ] [ \fB [ -f \fIformat\fB ] [ --format \fIformat\fB ] \fR ] [ \fB--version\fR ] [ \fB--help\fR ] \fB\fIfont-file\fB\fR\fI...\fR +.SH "DESCRIPTION" +.PP +\fBfc-query\fR queries +\fIfont-file\fR(s) using the normal fontconfig +rules and prints out font pattern for each face found. +If \fB--index\fR is given, only one face of each file is +queried, otherwise all faces are queried. +.SH "OPTIONS" +.PP +This program follows the usual GNU command line syntax, +with long options starting with two dashes (`-'). A summary of +options is included below. +.TP +\fB-i\fR +Only query face indexed \fIindex\fR of +each file. +.TP +\fB-f\fR +Format output according to the format specifier +\fIformat\fR\&. +.TP +\fB-V\fR +Show version of the program and exit. +.TP +\fB-h\fR +Show summary of options. +.TP +\fB\fIfont-file\fB\fR +Query \fIfont-file\fR for font faces. +.SH "RETURN CODES" +.PP +\fBfc-query\fR returns error code 0 for successful parsing, +or 1 if any errors occured or if at least one font face could not be opened. +.SH "SEE ALSO" +.PP +\fBfc-scan\fR(1) +\fBFcFreeTypeQuery\fR(3) +\fBFcPatternFormat\fR(3) +\fBfc-cat\fR(1) +\fBfc-cache\fR(1) +\fBfc-list\fR(1) +\fBfc-match\fR(1) +.PP +The fontconfig user's guide, in HTML format: +\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. +.SH "AUTHOR" +.PP +This manual page was updated by Behdad Esfahbod \&. diff --git a/lib/fontconfig/fc-query/fc-query.c b/lib/fontconfig/fc-query/fc-query.c new file mode 100644 index 000000000..f2693de59 --- /dev/null +++ b/lib/fontconfig/fc-query/fc-query.c @@ -0,0 +1,191 @@ +/* + * fontconfig/fc-query/fc-query.c + * + * Copyright © 2003 Keith Packard + * Copyright © 2008 Red Hat, Inc. + * Red Hat Author(s): Behdad Esfahbod + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#ifdef HAVE_CONFIG_H +#include +#else +#ifdef linux +#define HAVE_GETOPT_LONG 1 +#endif +#define HAVE_GETOPT 1 +#endif + +#include +#include +#include +#include +#include +#include + +#ifndef HAVE_GETOPT +#define HAVE_GETOPT 0 +#endif +#ifndef HAVE_GETOPT_LONG +#define HAVE_GETOPT_LONG 0 +#endif + +#if HAVE_GETOPT_LONG +#undef _GNU_SOURCE +#define _GNU_SOURCE +#include +static const struct option longopts[] = { + {"index", 1, 0, 'i'}, + {"format", 1, 0, 'f'}, + {"version", 0, 0, 'V'}, + {"help", 0, 0, 'h'}, + {NULL,0,0,0}, +}; +#else +#if HAVE_GETOPT +extern char *optarg; +extern int optind, opterr, optopt; +#endif +#endif + +static void +usage (char *program, int error) +{ + FILE *file = error ? stderr : stdout; +#if HAVE_GETOPT_LONG + fprintf (file, "usage: %s [-Vh] [-i index] [-f FORMAT] [--index index] [--format FORMAT] [--version] [--help] font-file...\n", + program); +#else + fprintf (file, "usage: %s [-Vh] [-i index] [-f FORMAT] font-file...\n", + program); +#endif + fprintf (file, "Query font files and print resulting pattern(s)\n"); + fprintf (file, "\n"); +#if HAVE_GETOPT_LONG + fprintf (file, " -i, --index INDEX display the INDEX face of each font file only\n"); + fprintf (file, " -f, --format=FORMAT use the given output format\n"); + fprintf (file, " -V, --version display font config version and exit\n"); + fprintf (file, " -h, --help display this help and exit\n"); +#else + fprintf (file, " -i INDEX (index) display the INDEX face of each font file only\n"); + fprintf (file, " -f FORMAT (format) use the given output format\n"); + fprintf (file, " -V (version) display font config version and exit\n"); + fprintf (file, " -h (help) display this help and exit\n"); +#endif + exit (error); +} + +int +main (int argc, char **argv) +{ + int index_set = 0; + int set_index = 0; + FcChar8 *format = NULL; + int err = 0; + int i; + FcBlanks *blanks; +#if HAVE_GETOPT_LONG || HAVE_GETOPT + int c; + +#if HAVE_GETOPT_LONG + while ((c = getopt_long (argc, argv, "i:f:Vh", longopts, NULL)) != -1) +#else + while ((c = getopt (argc, argv, "i:f:Vh")) != -1) +#endif + { + switch (c) { + case 'i': + index_set = 1; + set_index = atoi (optarg); + break; + case 'f': + format = (FcChar8 *) strdup (optarg); + break; + case 'V': + fprintf (stderr, "fontconfig version %d.%d.%d\n", + FC_MAJOR, FC_MINOR, FC_REVISION); + exit (0); + case 'h': + usage (argv[0], 0); + default: + usage (argv[0], 1); + } + } + i = optind; +#else + i = 1; +#endif + + if (i == argc) + usage (argv[0], 1); + + if (!FcInit ()) + { + fprintf (stderr, "Can't init font config library\n"); + return 1; + } + + blanks = FcConfigGetBlanks (NULL); + + for (; i < argc; i++) + { + int index; + int count = 0; + + index = set_index; + + do { + FcPattern *pat; + + pat = FcFreeTypeQuery ((FcChar8 *) argv[i], index, blanks, &count); + if (pat) + { + if (format) + { + FcChar8 *s; + + s = FcPatternFormat (pat, format); + if (s) + { + printf ("%s", s); + free (s); + } + } + else + { + FcPatternPrint (pat); + } + + FcPatternDestroy (pat); + } + else + { + fprintf (stderr, "Can't query face %d of font file %s\n", + index, argv[i]); + err = 1; + } + + index++; + } while (!index_set && index < count); + } + + FcFini (); + return err; +} diff --git a/lib/fontconfig/fc-query/fc-query.sgml b/lib/fontconfig/fc-query/fc-query.sgml new file mode 100644 index 000000000..59fd63548 --- /dev/null +++ b/lib/fontconfig/fc-query/fc-query.sgml @@ -0,0 +1,191 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + Behdad"> + Esfahbod"> + + Aug 13, 2008"> + + 1"> + behdad@behdad.org"> + + fc-query"> + + + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2008 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + query font files + + + + &dhpackage; + + + + + + + + + + + + + + + + + + + DESCRIPTION + + &dhpackage; queries + font-file(s) using the normal fontconfig + rules and prints out font pattern for each face found. + If is given, only one face of each file is + queried, otherwise all faces are queried. + + + + OPTIONS + + This program follows the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. + + + + + + + + + Only query face indexed index of + each file. + + + + + + + + + Format output according to the format specifier + format. + + + + + + + + Show version of the program and exit. + + + + + + + + Show summary of options. + + + + + + + Query font-file for font faces. + + + + + + + RETURN CODES + fc-query returns error code 0 for successful parsing, + or 1 if any errors occured or if at least one font face could not be opened. + + + + SEE ALSO + + + fc-scan(1) + FcFreeTypeQuery(3) + FcPatternFormat(3) + fc-cat(1) + fc-cache(1) + fc-list(1) + fc-match(1) + + + The fontconfig user's guide, in HTML format: + /usr/share/doc/fontconfig/fontconfig-user.html. + + + + AUTHOR + + This manual page was updated by &dhusername; &dhemail;. + + + + + diff --git a/lib/fontconfig/fc-scan/Makefile.am b/lib/fontconfig/fc-scan/Makefile.am new file mode 100644 index 000000000..af4383149 --- /dev/null +++ b/lib/fontconfig/fc-scan/Makefile.am @@ -0,0 +1,59 @@ +# +# fontconfig/fc-scan/Makefile.am +# +# Copyright © 2003 Keith Packard +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +bin_PROGRAMS=fc-scan + +DOC2MAN = docbook2man + +FC_SCAN_SRC=${top_srcdir}/fc-scan + +SGML = ${FC_SCAN_SRC}/fc-scan.sgml + +INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) + +BUILT_MANS=fc-scan.1 + +if ENABLE_DOCS +man_MANS=${BUILT_MANS} +endif + +EXTRA_DIST=fc-scan.sgml $(BUILT_MANS) + +fc_scan_LDADD = ${top_builddir}/src/libfontconfig.la + +if USEDOCBOOK + +${man_MANS}: ${SGML} + $(RM) $@ + $(DOC2MAN) ${SGML} + $(RM) manpage.* + +all-local: $(man_MANS) + +clean-local: + $(RM) $(man_MANS) + +else +all-local: +clean-local: +endif diff --git a/lib/fontconfig/fc-scan/Makefile.in b/lib/fontconfig/fc-scan/Makefile.in new file mode 100644 index 000000000..63e821177 --- /dev/null +++ b/lib/fontconfig/fc-scan/Makefile.in @@ -0,0 +1,595 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# fontconfig/fc-scan/Makefile.am +# +# Copyright © 2003 Keith Packard +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Keith Packard not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Keith Packard makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +bin_PROGRAMS = fc-scan$(EXEEXT) +subdir = fc-scan +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +fc_scan_SOURCES = fc-scan.c +fc_scan_OBJECTS = fc-scan.$(OBJEXT) +fc_scan_DEPENDENCIES = ${top_builddir}/src/libfontconfig.la +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = fc-scan.c +DIST_SOURCES = fc-scan.c +man1dir = $(mandir)/man1 +NROFF = nroff +MANS = $(man_MANS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +ARCHITECTURE = @ARCHITECTURE@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CC_FOR_BUILD = @CC_FOR_BUILD@ +CFLAGS = @CFLAGS@ +CONFDIR = @CONFDIR@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DOCMAN3 = @DOCMAN3@ +DOCSRC = @DOCSRC@ +DOLT_BASH = @DOLT_BASH@ +DSYMUTIL = @DSYMUTIL@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@ +ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@ +EXEEXT = @EXEEXT@ +EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ +EXPAT_CFLAGS = @EXPAT_CFLAGS@ +EXPAT_LIBS = @EXPAT_LIBS@ +F77 = @F77@ +FC_ADD_FONTS = @FC_ADD_FONTS@ +FC_CACHEDIR = @FC_CACHEDIR@ +FC_DEFAULT_FONTS = @FC_DEFAULT_FONTS@ +FC_FONTDATE = @FC_FONTDATE@ +FC_FONTPATH = @FC_FONTPATH@ +FFLAGS = @FFLAGS@ +FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ +FREETYPE_LIBS = @FREETYPE_LIBS@ +GREP = @GREP@ +HASDOCBOOK = @HASDOCBOOK@ +HAVE_EXPAT = @HAVE_EXPAT@ +HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@ +ICONV_LIBS = @ICONV_LIBS@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBT_CURRENT = @LIBT_CURRENT@ +LIBT_CURRENT_MINUS_AGE = @LIBT_CURRENT_MINUS_AGE@ +LIBT_REVISION = @LIBT_REVISION@ +LIBT_VERSION_INFO = @LIBT_VERSION_INFO@ +LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ +LIBXML2_LIBS = @LIBXML2_LIBS@ +LN_S = @LN_S@ +LTCOMPILE = @LTCOMPILE@ +LTCXXCOMPILE = @LTCXXCOMPILE@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OS_WIN32_FALSE = @OS_WIN32_FALSE@ +OS_WIN32_TRUE = @OS_WIN32_TRUE@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +RM = @RM@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USEDOCBOOK_FALSE = @USEDOCBOOK_FALSE@ +USEDOCBOOK_TRUE = @USEDOCBOOK_TRUE@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +confdir = @confdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +fc_cachedir = @fc_cachedir@ +ft_config = @ft_config@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +ms_librarian = @ms_librarian@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +DOC2MAN = docbook2man +FC_SCAN_SRC = ${top_srcdir}/fc-scan +SGML = ${FC_SCAN_SRC}/fc-scan.sgml +INCLUDES = -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) +BUILT_MANS = fc-scan.1 +@ENABLE_DOCS_TRUE@man_MANS = ${BUILT_MANS} +EXTRA_DIST = fc-scan.sgml $(BUILT_MANS) +fc_scan_LDADD = ${top_builddir}/src/libfontconfig.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu fc-scan/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu fc-scan/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +fc-scan$(EXEEXT): $(fc_scan_OBJECTS) $(fc_scan_DEPENDENCIES) + @rm -f fc-scan$(EXEEXT) + $(LINK) $(fc_scan_LDFLAGS) $(fc_scan_OBJECTS) $(fc_scan_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fc-scan.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) $(MANS) all-local +installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-man + +install-exec-am: install-binPROGRAMS + +install-info: install-info-am + +install-man: install-man1 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man + +uninstall-man: uninstall-man1 + +.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool clean-local \ + ctags distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-man1 \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-info-am uninstall-man \ + uninstall-man1 + + +@USEDOCBOOK_TRUE@${man_MANS}: ${SGML} +@USEDOCBOOK_TRUE@ $(RM) $@ +@USEDOCBOOK_TRUE@ $(DOC2MAN) ${SGML} +@USEDOCBOOK_TRUE@ $(RM) manpage.* + +@USEDOCBOOK_TRUE@all-local: $(man_MANS) + +@USEDOCBOOK_TRUE@clean-local: +@USEDOCBOOK_TRUE@ $(RM) $(man_MANS) + +@USEDOCBOOK_FALSE@all-local: +@USEDOCBOOK_FALSE@clean-local: +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/lib/fontconfig/fc-scan/fc-scan.1 b/lib/fontconfig/fc-scan/fc-scan.1 new file mode 100644 index 000000000..51c9386ad --- /dev/null +++ b/lib/fontconfig/fc-scan/fc-scan.1 @@ -0,0 +1,52 @@ +.\\" auto-generated by docbook2man-spec $Revision: 1.1 $ +.TH "FC-SCAN" "1" "Jan 15, 2009" "" "" +.SH NAME +fc-scan \- scan font files or directories +.SH SYNOPSIS +.sp +\fBfc-scan\fR [ \fB-Vh\fR ] + + [ \fB [ -f \fIformat\fB ] [ --format \fIformat\fB ] \fR ] [ \fB--version\fR ] [ \fB--help\fR ] \fB\fIfile\fB\fR\fI...\fR +.SH "DESCRIPTION" +.PP +\fBfc-scan\fR scans +\fIfile\fR(s) recursively +and prints out font pattern for each face found. +.SH "OPTIONS" +.PP +This program follows the usual GNU command line syntax, +with long options starting with two dashes (`-'). A summary of +options is included below. +.TP +\fB-f\fR +Format output according to the format specifier +\fIformat\fR\&. +.TP +\fB-V\fR +Show version of the program and exit. +.TP +\fB-h\fR +Show summary of options. +.TP +\fB\fIfile\fB\fR +Scan \fIfile\fR recursively for font faces. +.SH "RETURN CODES" +.PP +\fBfc-scan\fR returns error code 0 if at least one font +was found or 1 otherwise. +.SH "SEE ALSO" +.PP +\fBfc-query\fR(1) +\fBFcFileScan\fR(3) +\fBFcDirScan\fR(3) +\fBFcPatternFormat\fR(3) +\fBfc-cat\fR(1) +\fBfc-cache\fR(1) +\fBfc-list\fR(1) +\fBfc-match\fR(1) +.PP +The fontconfig user's guide, in HTML format: +\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. +.SH "AUTHOR" +.PP +This manual page was updated by Behdad Esfahbod \&. diff --git a/lib/fontconfig/fc-scan/fc-scan.c b/lib/fontconfig/fc-scan/fc-scan.c new file mode 100644 index 000000000..5f9a46670 --- /dev/null +++ b/lib/fontconfig/fc-scan/fc-scan.c @@ -0,0 +1,184 @@ +/* + * fontconfig/fc-scan/fc-scan.c + * + * Copyright © 2003 Keith Packard + * Copyright © 2008 Red Hat, Inc. + * Red Hat Author(s): Behdad Esfahbod + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#ifdef HAVE_CONFIG_H +#include +#else +#ifdef linux +#define HAVE_GETOPT_LONG 1 +#endif +#define HAVE_GETOPT 1 +#endif + +#include +#include +#include +#include +#include +#include + +#ifndef HAVE_GETOPT +#define HAVE_GETOPT 0 +#endif +#ifndef HAVE_GETOPT_LONG +#define HAVE_GETOPT_LONG 0 +#endif + +#if HAVE_GETOPT_LONG +#undef _GNU_SOURCE +#define _GNU_SOURCE +#include +static const struct option longopts[] = { + {"format", 1, 0, 'f'}, + {"version", 0, 0, 'V'}, + {"help", 0, 0, 'h'}, + {NULL,0,0,0}, +}; +#else +#if HAVE_GETOPT +extern char *optarg; +extern int optind, opterr, optopt; +#endif +#endif + +static void +usage (char *program, int error) +{ + FILE *file = error ? stderr : stdout; +#if HAVE_GETOPT_LONG + fprintf (file, "usage: %s [-Vh] [-f FORMAT] [--format FORMAT] [--version] [--help] font-file...\n", + program); +#else + fprintf (file, "usage: %s [-Vh] [-f FORMAT] font-file...\n", + program); +#endif + fprintf (file, "Scan font files and directories, and print resulting pattern(s)\n"); + fprintf (file, "\n"); +#if HAVE_GETOPT_LONG + fprintf (file, " -f, --format=FORMAT use the given output format\n"); + fprintf (file, " -V, --version display font config version and exit\n"); + fprintf (file, " -h, --help display this help and exit\n"); +#else + fprintf (file, " -f FORMAT (format) use the given output format\n"); + fprintf (file, " -V (version) display font config version and exit\n"); + fprintf (file, " -h (help) display this help and exit\n"); +#endif + exit (error); +} + +int +main (int argc, char **argv) +{ + FcChar8 *format = NULL; + int i; + FcFontSet *fs; +#if HAVE_GETOPT_LONG || HAVE_GETOPT + int c; + +#if HAVE_GETOPT_LONG + while ((c = getopt_long (argc, argv, "f:Vh", longopts, NULL)) != -1) +#else + while ((c = getopt (argc, argv, "f:Vh")) != -1) +#endif + { + switch (c) { + case 'f': + format = (FcChar8 *) strdup (optarg); + break; + case 'V': + fprintf (stderr, "fontconfig version %d.%d.%d\n", + FC_MAJOR, FC_MINOR, FC_REVISION); + exit (0); + case 'h': + usage (argv[0], 0); + default: + usage (argv[0], 1); + } + } + i = optind; +#else + i = 1; +#endif + + if (i == argc) + usage (argv[0], 1); + + if (!FcInit ()) + { + fprintf (stderr, "Can't init font config library\n"); + return 1; + } + + fs = FcFontSetCreate (); + + for (; i < argc; i++) + { + const FcChar8 *file = (FcChar8*) argv[i]; + + if (!FcFileIsDir (file)) + FcFileScan (fs, NULL, NULL, NULL, file, FcTrue); + else + { + FcStrSet *dirs = FcStrSetCreate (); + FcStrList *strlist = FcStrListCreate (dirs); + do + { + FcDirScan (fs, dirs, NULL, NULL, file, FcTrue); + } + while ((file = FcStrListNext (strlist))); + FcStrListDone (strlist); + FcStrSetDestroy (dirs); + } + } + + for (i = 0; i < fs->nfont; i++) + { + FcPattern *pat; + + pat = fs->fonts[i]; + + if (format) + { + FcChar8 *s; + + s = FcPatternFormat (pat, format); + if (s) + { + printf ("%s", s); + free (s); + } + } + else + { + FcPatternPrint (pat); + } + } + + FcFontSetDestroy (fs); + + FcFini (); + return i > 0 ? 0 : 1; +} diff --git a/lib/fontconfig/fc-scan/fc-scan.sgml b/lib/fontconfig/fc-scan/fc-scan.sgml new file mode 100644 index 000000000..b9f7714e2 --- /dev/null +++ b/lib/fontconfig/fc-scan/fc-scan.sgml @@ -0,0 +1,176 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + Behdad"> + Esfahbod"> + + Jan 15, 2009"> + + 1"> + behdad@behdad.org"> + + fc-scan"> + + + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2008 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + scan font files or directories + + + + &dhpackage; + + + + + + + + + + + + + + + DESCRIPTION + + &dhpackage; scans + file(s) recursively + and prints out font pattern for each face found. + + + + OPTIONS + + This program follows the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. + + + + + + + + + Format output according to the format specifier + format. + + + + + + + + Show version of the program and exit. + + + + + + + + Show summary of options. + + + + + + + Scan file recursively for font faces. + + + + + + + RETURN CODES + fc-scan returns error code 0 if at least one font + was found or 1 otherwise. + + + + SEE ALSO + + + fc-query(1) + FcFileScan(3) + FcDirScan(3) + FcPatternFormat(3) + fc-cat(1) + fc-cache(1) + fc-list(1) + fc-match(1) + + + The fontconfig user's guide, in HTML format: + /usr/share/doc/fontconfig/fontconfig-user.html. + + + + AUTHOR + + This manual page was updated by &dhusername; &dhemail;. + + + + + diff --git a/lib/fontconfig/fontconfig-zip.in b/lib/fontconfig/fontconfig-zip.in index ba6fd4aa5..1ca222cfb 100644 --- a/lib/fontconfig/fontconfig-zip.in +++ b/lib/fontconfig/fontconfig-zip.in @@ -15,7 +15,7 @@ etc/fonts/fonts.conf EOF rm -f $DEVZIP -zip -r $DEVZIP -@ <lck, &lck_stat) >= 0) + if (FcStat ((char *) atomic->lck, &lck_stat) >= 0) { time_t now = time (0); if ((long int) (now - lck_stat.st_mtime) > 10 * 60) diff --git a/lib/fontconfig/src/fcblanks.c b/lib/fontconfig/src/fcblanks.c index d52cca72f..bab3066e8 100644 --- a/lib/fontconfig/src/fcblanks.c +++ b/lib/fontconfig/src/fcblanks.c @@ -1,5 +1,5 @@ /* - * $RCSId:$ + * fontconfig/src/fcblanks.c * * Copyright © 2002 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/src/fccache.c b/lib/fontconfig/src/fccache.c index 241ebd089..69e1a6b82 100644 --- a/lib/fontconfig/src/fccache.c +++ b/lib/fontconfig/src/fccache.c @@ -12,9 +12,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -85,7 +85,7 @@ typedef __int64 INT64; * just use the UTC timestamps from NTFS, converted to the Unix epoch. */ -static int +int FcStat (const char *file, struct stat *statb) { WIN32_FILE_ATTRIBUTE_DATA wfad; @@ -131,11 +131,6 @@ FcStat (const char *file, struct stat *statb) return 0; } - -#else - -#define FcStat stat - #endif static const char bin2hex[] = { '0', '1', '2', '3', @@ -520,7 +515,7 @@ FcCacheTimeValid (FcCache *cache, struct stat *dir_stat) if (!dir_stat) { - if (stat ((const char *) FcCacheDir (cache), &dir_static) < 0) + if (FcStat ((const char *) FcCacheDir (cache), &dir_static) < 0) return FcFalse; dir_stat = &dir_static; } @@ -543,7 +538,13 @@ FcDirCacheMapFd (int fd, struct stat *fd_stat, struct stat *dir_stat) return NULL; cache = FcCacheFindByStat (fd_stat); if (cache) - return cache; + { + if (FcCacheTimeValid (cache, dir_stat)) + return cache; + FcDirCacheUnload (cache); + cache = NULL; + } + /* * Lage cache files are mmap'ed, smaller cache files are read. This * balances the system cost of mmap against per-process memory usage. @@ -552,6 +553,8 @@ FcDirCacheMapFd (int fd, struct stat *fd_stat, struct stat *dir_stat) { #if defined(HAVE_MMAP) || defined(__CYGWIN__) cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0); + if (cache == MAP_FAILED) + cache = NULL; #elif defined(_WIN32) { HANDLE hFileMap; @@ -822,9 +825,9 @@ FcMakeDirectory (const FcChar8 *dir) if (!parent) return FcFalse; if (access ((char *) parent, F_OK) == 0) - ret = mkdir ((char *) dir, 0777) == 0; + ret = mkdir ((char *) dir, 0755) == 0 && chmod ((char *) dir, 0755) == 0; else if (access ((char *) parent, F_OK) == -1) - ret = FcMakeDirectory (parent) && (mkdir ((char *) dir, 0777) == 0); + ret = FcMakeDirectory (parent) && (mkdir ((char *) dir, 0755) == 0) && chmod ((char *) dir, 0755) == 0; else ret = FcFalse; FcStrFree (parent); @@ -843,6 +846,8 @@ FcDirCacheWrite (FcCache *cache, FcConfig *config) FcStrList *list; FcChar8 *cache_dir = NULL; FcChar8 *test_dir; + FcCacheSkip *skip; + struct stat cache_stat; int magic; int written; @@ -854,7 +859,7 @@ FcDirCacheWrite (FcCache *cache, FcConfig *config) if (!list) return FcFalse; while ((test_dir = FcStrListNext (list))) { - if (access ((char *) test_dir, W_OK) == 0) + if (access ((char *) test_dir, W_OK|X_OK) == 0) { cache_dir = test_dir; break; @@ -871,6 +876,14 @@ FcDirCacheWrite (FcCache *cache, FcConfig *config) break; } } + /* + * Otherwise, try making it writable + */ + else if (chmod ((char *) test_dir, 0755) == 0) + { + cache_dir = test_dir; + break; + } } } FcStrListDone (list); @@ -920,6 +933,20 @@ FcDirCacheWrite (FcCache *cache, FcConfig *config) close(fd); if (!FcAtomicReplaceOrig(atomic)) goto bail4; + + /* If the file is small, update the cache chain entry such that the + * new cache file is not read again. If it's large, we don't do that + * such that we reload it, using mmap, which is shared across processes. + */ + if (cache->size < FC_CACHE_MIN_MMAP && + (skip = FcCacheFindByAddr (cache)) && + FcStat (cache_hashed, &cache_stat)) + { + skip->cache_dev = cache_stat.st_dev; + skip->cache_ino = cache_stat.st_ino; + skip->cache_mtime = cache_stat.st_mtime; + } + FcStrFree (cache_hashed); FcAtomicUnlock (atomic); FcAtomicDestroy (atomic); diff --git a/lib/fontconfig/src/fccfg.c b/lib/fontconfig/src/fccfg.c index acb0bb4aa..0f89b57a4 100644 --- a/lib/fontconfig/src/fccfg.c +++ b/lib/fontconfig/src/fccfg.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fccfg.c,v 1.23 2002/08/31 22:17:32 keithp Exp $ + * fontconfig/src/fccfg.c * * Copyright © 2000 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -92,6 +92,10 @@ FcConfigCreate (void) config->rescanTime = time(0); config->rescanInterval = 30; + + config->expr_pool = NULL; + + config->ref = 1; return config; @@ -127,7 +131,7 @@ FcConfigNewestFile (FcStrSet *files) if (list) { while ((file = FcStrListNext (list))) - if (stat ((char *) file, &statb) == 0) + if (FcStat ((char *) file, &statb) == 0) if (!newest.set || statb.st_mtime - newest.time > 0) { newest.set = FcTrue; @@ -191,10 +195,49 @@ FcSubstDestroy (FcSubst *s) } } +FcExpr * +FcConfigAllocExpr (FcConfig *config) +{ + if (!config->expr_pool || config->expr_pool->next == config->expr_pool->end) + { + FcExprPage *new_page; + + new_page = malloc (sizeof (FcExprPage)); + if (!new_page) + return 0; + FcMemAlloc (FC_MEM_EXPR, sizeof (FcExprPage)); + + new_page->next_page = config->expr_pool; + new_page->next = new_page->exprs; + config->expr_pool = new_page; + } + + return config->expr_pool->next++; +} + +FcConfig * +FcConfigReference (FcConfig *config) +{ + if (!config) + { + config = FcConfigGetCurrent (); + if (!config) + return 0; + } + + config->ref++; + + return config; +} + void FcConfigDestroy (FcConfig *config) { FcSetName set; + FcExprPage *page; + + if (--config->ref > 0) + return; if (config == _fcConfig) _fcConfig = 0; @@ -218,6 +261,15 @@ FcConfigDestroy (FcConfig *config) if (config->fonts[set]) FcFontSetDestroy (config->fonts[set]); + page = config->expr_pool; + while (page) + { + FcExprPage *next = page->next_page; + FcMemFree (FC_MEM_EXPR, sizeof (FcExprPage)); + free (page); + page = next; + } + free (config); FcMemFree (FC_MEM_CONFIG, sizeof (FcConfig)); } @@ -832,7 +884,8 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e) break; case FcOpString: v.type = FcTypeString; - v.u.s = FcStrStaticName(e->u.sval); + v.u.s = e->u.sval; + v = FcValueSave (v); break; case FcOpMatrix: v.type = FcTypeMatrix; @@ -1671,9 +1724,10 @@ FcConfigGetPath (void) #ifdef _WIN32 if (fontconfig_path[0] == '\0') { + char *p; if(!GetModuleFileName(NULL, fontconfig_path, sizeof(fontconfig_path))) goto bail1; - char *p = strrchr (fontconfig_path, '\\'); + p = strrchr (fontconfig_path, '\\'); if (p) *p = '\0'; strcat (fontconfig_path, "\\fonts"); } diff --git a/lib/fontconfig/src/fccharset.c b/lib/fontconfig/src/fccharset.c index f4042db07..d30e1614a 100644 --- a/lib/fontconfig/src/fccharset.c +++ b/lib/fontconfig/src/fccharset.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fccharset.c,v 1.18 2002/08/22 07:36:44 keithp Exp $ + * fontconfig/src/fccharset.c * * Copyright © 2001 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -68,11 +68,9 @@ FcCharSetDestroy (FcCharSet *fcs) } if (fcs->num) { + /* the numbers here are estimates */ FcMemFree (FC_MEM_CHARSET, fcs->num * sizeof (intptr_t)); free (FcCharSetLeaves (fcs)); - } - if (fcs->num) - { FcMemFree (FC_MEM_CHARSET, fcs->num * sizeof (FcChar16)); free (FcCharSetNumbers (fcs)); } @@ -80,6 +78,39 @@ FcCharSetDestroy (FcCharSet *fcs) free (fcs); } +/* + * Search for the leaf containing with the specified num. + * Return its index if it exists, otherwise return negative of + * the (position + 1) where it should be inserted + */ + + +static int +FcCharSetFindLeafForward (const FcCharSet *fcs, int start, FcChar16 num) +{ + FcChar16 *numbers = FcCharSetNumbers(fcs); + FcChar16 page; + int low = start; + int high = fcs->num - 1; + + if (!numbers) + return -1; + while (low <= high) + { + int mid = (low + high) >> 1; + page = numbers[mid]; + if (page == num) + return mid; + if (page < num) + low = mid + 1; + else + high = mid - 1; + } + if (high < 0 || (high < fcs->num && numbers[high] < num)) + high++; + return -(high + 1); +} + /* * Locate the leaf containing the specified char, return * its index if it exists, otherwise return negative of @@ -89,28 +120,7 @@ FcCharSetDestroy (FcCharSet *fcs) static int FcCharSetFindLeafPos (const FcCharSet *fcs, FcChar32 ucs4) { - FcChar16 *numbers = FcCharSetNumbers(fcs); - FcChar16 page; - int low = 0; - int high = fcs->num - 1; - - if (!numbers) - return -1; - ucs4 >>= 8; - while (low <= high) - { - int mid = (low + high) >> 1; - page = numbers[mid]; - if (page == ucs4) - return mid; - if (page < ucs4) - low = mid + 1; - else - high = mid - 1; - } - if (high < 0 || (high < fcs->num && numbers[high] < ucs4)) - high++; - return -(high + 1); + return FcCharSetFindLeafForward (fcs, 0, ucs4 >> 8); } static FcCharLeaf * @@ -122,6 +132,8 @@ FcCharSetFindLeaf (const FcCharSet *fcs, FcChar32 ucs4) return 0; } +#define FC_IS_ZERO_OR_POWER_OF_TWO(x) (!((x) & ((x)-1))) + static FcBool FcCharSetPutLeaf (FcCharSet *fcs, FcChar32 ucs4, @@ -134,42 +146,48 @@ FcCharSetPutLeaf (FcCharSet *fcs, ucs4 >>= 8; if (ucs4 >= 0x10000) return FcFalse; - if (!fcs->num) - leaves = malloc (sizeof (*leaves)); - else + + if (FC_IS_ZERO_OR_POWER_OF_TWO (fcs->num)) { - intptr_t *new_leaves = realloc (leaves, (fcs->num + 1) * - sizeof (*leaves)); - intptr_t distance = (intptr_t) new_leaves - (intptr_t) leaves; - + if (!fcs->num) + { + unsigned int alloced = 8; + leaves = malloc (alloced * sizeof (*leaves)); + numbers = malloc (alloced * sizeof (*numbers)); + FcMemAlloc (FC_MEM_CHARSET, alloced * sizeof (*leaves)); + FcMemAlloc (FC_MEM_CHARSET, alloced * sizeof (*numbers)); + } + else + { + unsigned int alloced = fcs->num; + intptr_t *new_leaves, distance; + + FcMemFree (FC_MEM_CHARSET, alloced * sizeof (*leaves)); + FcMemFree (FC_MEM_CHARSET, alloced * sizeof (*numbers)); + + alloced *= 2; + new_leaves = realloc (leaves, alloced * sizeof (*leaves)); + numbers = realloc (numbers, alloced * sizeof (*numbers)); + + FcMemAlloc (FC_MEM_CHARSET, alloced * sizeof (*leaves)); + FcMemAlloc (FC_MEM_CHARSET, alloced * sizeof (*numbers)); + + distance = (intptr_t) new_leaves - (intptr_t) leaves; if (new_leaves && distance) { int i; - for (i = 0; i < fcs->num; i++) new_leaves[i] -= distance; } leaves = new_leaves; + } + + if (!leaves || !numbers) + return FcFalse; + + fcs->leaves_offset = FcPtrToOffset (fcs, leaves); + fcs->numbers_offset = FcPtrToOffset (fcs, numbers); } - if (!leaves) - return FcFalse; - - if (fcs->num) - FcMemFree (FC_MEM_CHARSET, fcs->num * sizeof (intptr_t)); - FcMemAlloc (FC_MEM_CHARSET, (fcs->num + 1) * sizeof (intptr_t)); - fcs->leaves_offset = FcPtrToOffset (fcs, leaves); - - if (!fcs->num) - numbers = malloc (sizeof (FcChar16)); - else - numbers = realloc (numbers, (fcs->num + 1) * sizeof (FcChar16)); - if (!numbers) - return FcFalse; - - if (fcs->num) - FcMemFree (FC_MEM_CHARSET, fcs->num * sizeof (FcChar16)); - FcMemAlloc (FC_MEM_CHARSET, (fcs->num + 1) * sizeof (FcChar16)); - fcs->numbers_offset = FcPtrToOffset (fcs, numbers); memmove (leaves + pos + 1, leaves + pos, (fcs->num - pos) * sizeof (*leaves)); @@ -452,6 +470,57 @@ FcCharSetUnion (const FcCharSet *a, const FcCharSet *b) return FcCharSetOperate (a, b, FcCharSetUnionLeaf, FcTrue, FcTrue); } +FcBool +FcCharSetMerge (FcCharSet *a, const FcCharSet *b, FcBool *changed) +{ + int ai = 0, bi = 0; + FcChar16 an, bn; + + if (a->ref == FC_REF_CONSTANT) { + if (changed) + *changed = FcFalse; + return FcFalse; + } + + if (changed) { + *changed = !FcCharSetIsSubset(b, a); + if (!*changed) + return FcTrue; + } + + while (bi < b->num) + { + an = ai < a->num ? FcCharSetNumbers(a)[ai] : ~0; + bn = FcCharSetNumbers(b)[bi]; + + if (an < bn) + { + ai = FcCharSetFindLeafForward (a, ai + 1, bn); + if (ai < 0) + ai = -ai - 1; + } + else + { + FcCharLeaf *bl = FcCharSetLeaf(b, bi); + if (bn < an) + { + if (!FcCharSetAddLeaf (a, bn << 8, bl)) + return FcFalse; + } + else + { + FcCharLeaf *al = FcCharSetLeaf(a, ai); + FcCharSetUnionLeaf (al, al, bl); + } + + ai++; + bi++; + } + } + + return FcTrue; +} + static FcBool FcCharSetSubtractLeaf (FcCharLeaf *result, const FcCharLeaf *al, @@ -484,10 +553,14 @@ FcCharSetHasChar (const FcCharSet *fcs, FcChar32 ucs4) static FcChar32 FcCharSetPopCount (FcChar32 c1) { +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) + return __builtin_popcount (c1); +#else /* hackmem 169 */ FcChar32 c2 = (c1 >> 1) & 033333333333; c2 = c1 - c2 - ((c2 >> 1) & 033333333333); return (((c2 + (c2 >> 3)) & 030707070707) % 077); +#endif } FcChar32 @@ -620,29 +693,9 @@ FcCharSetIsSubset (const FcCharSet *a, const FcCharSet *b) return FcFalse; else { - int low = bi + 1; - int high = b->num - 1; - - /* - * Search for page 'an' in 'b' - */ - while (low <= high) - { - int mid = (low + high) >> 1; - bn = FcCharSetNumbers(b)[mid]; - if (bn == an) - { - high = mid; - break; - } - if (bn < an) - low = mid + 1; - else - high = mid - 1; - } - bi = high; - while (bi < b->num && FcCharSetNumbers(b)[bi] < an) - bi++; + bi = FcCharSetFindLeafForward (b, bi + 1, an); + if (bi < 0) + bi = -bi - 1; } } /* diff --git a/lib/fontconfig/src/fcdbg.c b/lib/fontconfig/src/fcdbg.c index 68f530e25..fd2d55a6b 100644 --- a/lib/fontconfig/src/fcdbg.c +++ b/lib/fontconfig/src/fcdbg.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcdbg.c,v 1.10 2002/08/22 18:53:22 keithp Exp $ + * fontconfig/src/fcdbg.c * * Copyright © 2000 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -116,13 +116,13 @@ FcCharSetPrint (const FcCharSet *c) } #endif + printf ("\n"); for (i = 0; i < c->num; i++) { intptr_t leaf_offset = leaves[i]; FcCharLeaf *leaf = FcOffsetToPtr (leaves, leaf_offset, FcCharLeaf); - if (i) - printf ("\t"); + printf ("\t"); printf ("%04x:", numbers[i]); for (j = 0; j < 256/32; j++) printf (" %08x", leaf->map[j]); @@ -146,26 +146,7 @@ FcPatternPrint (const FcPattern *p) { e = &FcPatternElts(p)[i]; printf ("\t%s:", FcObjectName(e->object)); - /* so that fc-match properly displays file: foo... */ - if (e->object == FC_FILE_OBJECT) - { - FcChar8 * s; - FcPatternObjectGetString (p, FC_FILE_OBJECT, 0, &s); - printf (" \"%s\"", s); - switch (FcPatternEltValues(e)->binding) { - case FcValueBindingWeak: - printf ("(w)"); - break; - case FcValueBindingStrong: - printf ("(s)"); - break; - case FcValueBindingSame: - printf ("(=)"); - break; - } - } - else - FcValueListPrint (FcPatternEltValues(e)); + FcValueListPrint (FcPatternEltValues(e)); printf ("\n"); } printf ("\n"); diff --git a/lib/fontconfig/src/fcdefault.c b/lib/fontconfig/src/fcdefault.c index e654dc49c..091276b70 100644 --- a/lib/fontconfig/src/fcdefault.c +++ b/lib/fontconfig/src/fcdefault.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcdefault.c,v 1.2 2002/07/09 22:08:14 keithp Exp $ + * fontconfig/src/fcdefault.c * * Copyright © 2001 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/src/fcdir.c b/lib/fontconfig/src/fcdir.c index 48755deb2..f927c0b28 100644 --- a/lib/fontconfig/src/fcdir.c +++ b/lib/fontconfig/src/fcdir.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcdir.c,v 1.9 2002/08/31 22:17:32 keithp Exp $ + * fontconfig/src/fcdir.c * * Copyright © 2000 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -30,7 +30,7 @@ FcFileIsDir (const FcChar8 *file) { struct stat statb; - if (stat ((const char *) file, &statb) != 0) + if (FcStat ((const char *) file, &statb) != 0) return FcFalse; return S_ISDIR(statb.st_mode); } @@ -117,7 +117,7 @@ FcFileScan (FcFontSet *set, const FcChar8 *file, FcBool force) { - return FcFileScanConfig (set, dirs, blanks, file, NULL); + return FcFileScanConfig (set, dirs, blanks, file, FcConfigGetCurrent ()); } /* @@ -129,27 +129,30 @@ cmpstringp(const void *p1, const void *p2) return strcmp(* (char **) p1, * (char **) p2); } -/* - * Scan the specified directory and construct a cache of its contents - */ -FcCache * -FcDirCacheScan (const FcChar8 *dir, FcConfig *config) +FcBool +FcDirScanConfig (FcFontSet *set, + FcStrSet *dirs, + FcBlanks *blanks, + const FcChar8 *dir, + FcBool force, /* XXX unused */ + FcConfig *config) { DIR *d; struct dirent *e; FcStrSet *files; - FcStrSet *dirs; FcChar8 *file; FcChar8 *base; FcBool ret = FcTrue; - FcFontSet *set; int i; - FcBlanks *blanks = FcConfigGetBlanks (config); - FcCache *cache = NULL; - struct stat dir_stat; - if (FcDebug () & FC_DBG_FONTSET) - printf ("cache scan dir %s\n", dir); + if (!force) + return FcFalse; + + if (!set && !dirs) + return FcTrue; + + if (!blanks) + blanks = FcConfigGetBlanks (config); /* freed below */ file = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + FC_MAX_FILE_LEN + 1); @@ -169,23 +172,9 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config) if (!d) { /* Don't complain about missing directories */ - if (errno == ENOENT) - ret = FcTrue; - else + if (errno != ENOENT) ret = FcFalse; - goto bail_1; - } - if (stat ((char *) dir, &dir_stat) < 0) - { - ret = FcFalse; - goto bail_1; - } - - set = FcFontSetCreate(); - if (!set) - { - ret = FcFalse; - goto bail0; + goto bail; } files = FcStrSetCreate (); @@ -210,41 +199,99 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config) * Sort files to make things prettier */ qsort(files->strs, files->num, sizeof(FcChar8 *), cmpstringp); - - dirs = FcStrSetCreate (); - if (!dirs) - goto bail2; - + /* * Scan file files to build font patterns */ for (i = 0; i < files->num; i++) FcFileScanConfig (set, dirs, blanks, files->strs[i], config); +bail2: + FcStrSetDestroy (files); +bail1: + closedir (d); +bail: + return ret; +} + +FcBool +FcDirScan (FcFontSet *set, + FcStrSet *dirs, + FcFileCache *cache, /* XXX unused */ + FcBlanks *blanks, + const FcChar8 *dir, + FcBool force /* XXX unused */) +{ + if (cache || !force) + return FcFalse; + + return FcDirScanConfig (set, dirs, blanks, dir, force, FcConfigGetCurrent ()); +} + +/* + * Scan the specified directory and construct a cache of its contents + */ +FcCache * +FcDirCacheScan (const FcChar8 *dir, FcConfig *config) +{ + FcStrSet *dirs; + FcBool ret = FcTrue; + FcFontSet *set; + FcCache *cache = NULL; + struct stat dir_stat; + + if (FcDebug () & FC_DBG_FONTSET) + printf ("cache scan dir %s\n", dir); + + if (FcStat ((char *) dir, &dir_stat) < 0) + { + if (errno != ENOENT) + ret = FcFalse; + goto bail; + } + + set = FcFontSetCreate(); + if (!set) + { + ret = FcFalse; + goto bail; + } + + dirs = FcStrSetCreate (); + if (!dirs) + { + ret = FcFalse; + goto bail1; + } + + /* + * Scan the dir + */ + if (!FcDirScanConfig (set, dirs, NULL, dir, FcTrue, config)) + { + ret = FcFalse; + goto bail2; + } + /* * Build the cache object */ cache = FcDirCacheBuild (set, dir, &dir_stat, dirs); if (!cache) - goto bail3; + { + ret = FcFalse; + goto bail2; + } /* * Write out the cache file, ignoring any troubles */ FcDirCacheWrite (cache, config); - bail3: - FcStrSetDestroy (dirs); bail2: - FcStrSetDestroy (files); + FcStrSetDestroy (dirs); bail1: FcFontSetDestroy (set); - - bail0: - closedir (d); - - bail_1: - free (file); bail: return cache; } @@ -271,28 +318,6 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config) return cache; } -FcBool -FcDirScanConfig (FcFontSet *set, - FcStrSet *dirs, - FcBlanks *blanks, - const FcChar8 *dir, - FcBool force, - FcConfig *config) -{ - return FcFalse; /* XXX deprecated */ -} - -FcBool -FcDirScan (FcFontSet *set, - FcStrSet *dirs, - FcFileCache *cache, /* XXX unused */ - FcBlanks *blanks, - const FcChar8 *dir, - FcBool force) -{ - return FcFalse; /* XXX deprecated */ -} - FcBool FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir) { diff --git a/lib/fontconfig/src/fcformat.c b/lib/fontconfig/src/fcformat.c new file mode 100644 index 000000000..bf9401740 --- /dev/null +++ b/lib/fontconfig/src/fcformat.c @@ -0,0 +1,1203 @@ +/* + * Copyright © 2008,2009 Red Hat, Inc. + * + * Red Hat Author(s): Behdad Esfahbod + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#include "fcint.h" +#include +#include +#include + + +/* The language is documented in doc/fcformat.fncs + * These are the features implemented: + * + * simple %{elt} + * width %width{elt} + * index %{elt[idx]} + * name= %{elt=} + * :name= %{:elt} + * default %{elt:-word} + * count %{#elt} + * subexpr %{{expr}} + * filter-out %{-elt1,elt2,elt3{expr}} + * filter-in %{+elt1,elt2,elt3{expr}} + * conditional %{?elt1,elt2,!elt3{}{}} + * enumerate %{[]elt1,elt2{expr}} + * langset langset enumeration using the same syntax + * builtin %{=blt} + * convert %{elt|conv1|conv2|conv3} + * + * converters: + * basename FcStrBasename + * dirname FcStrDirname + * downcase FcStrDowncase + * shescape + * cescape + * xmlescape + * delete delete chars + * escape escape chars + * translate translate chars + * + * builtins: + * unparse FcNameUnparse + * fcmatch fc-match default + * fclist fc-list default + * pkgkit PackageKit package tag format + * + * + * Some ideas for future syntax extensions: + * + * - verbose builtin that is like FcPatternPrint + * - allow indexing subexprs using '%{[idx]elt1,elt2{subexpr}}' + * - conditional/filtering/deletion on binding (using '(w)'/'(s)'/'(=)' notation) + */ + + +#define FCMATCH_FORMAT "%{file:-|basename}: \"%{family[0]:-}\" \"%{style[0]:-}\"" +#define FCLIST_FORMAT "%{?file{%{file}: }}%{=unparse}" +#define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}%{[]lang{font(:lang=%{lang|downcase|translate(_,-)})\n}}" + + +static void +message (const char *fmt, ...) +{ + va_list args; + va_start (args, fmt); + fprintf (stderr, "Fontconfig: Pattern format error: "); + vfprintf (stderr, fmt, args); + fprintf (stderr, ".\n"); + va_end (args); +} + + +typedef struct _FcFormatContext +{ + const FcChar8 *format_orig; + const FcChar8 *format; + int format_len; + FcChar8 *word; + FcBool word_allocated; +} FcFormatContext; + +static FcBool +FcFormatContextInit (FcFormatContext *c, + const FcChar8 *format, + FcChar8 *scratch, + int scratch_len) +{ + c->format_orig = c->format = format; + c->format_len = strlen ((const char *) format); + + if (c->format_len < scratch_len) + { + c->word = scratch; + c->word_allocated = FcFalse; + } + else + { + c->word = malloc (c->format_len + 1); + c->word_allocated = FcTrue; + } + + return c->word != NULL; +} + +static void +FcFormatContextDone (FcFormatContext *c) +{ + if (c && c->word_allocated) + { + free (c->word); + } +} + +static FcBool +consume_char (FcFormatContext *c, + FcChar8 term) +{ + if (*c->format != term) + return FcFalse; + + c->format++; + return FcTrue; +} + +static FcBool +expect_char (FcFormatContext *c, + FcChar8 term) +{ + FcBool res = consume_char (c, term); + if (!res) + { + if (c->format == c->format_orig + c->format_len) + message ("format ended while expecting '%c'", + term); + else + message ("expected '%c' at %d", + term, c->format - c->format_orig + 1); + } + return res; +} + +static FcBool +FcCharIsPunct (const FcChar8 c) +{ + if (c < '0') + return FcTrue; + if (c <= '9') + return FcFalse; + if (c < 'A') + return FcTrue; + if (c <= 'Z') + return FcFalse; + if (c < 'a') + return FcTrue; + if (c <= 'z') + return FcFalse; + if (c <= '~') + return FcTrue; + return FcFalse; +} + +static char escaped_char(const char ch) +{ + switch (ch) { + case 'a': return '\a'; + case 'b': return '\b'; + case 'f': return '\f'; + case 'n': return '\n'; + case 'r': return '\r'; + case 't': return '\t'; + case 'v': return '\v'; + default: return ch; + } +} + +static FcBool +read_word (FcFormatContext *c) +{ + FcChar8 *p; + + p = c->word; + + while (*c->format) + { + if (*c->format == '\\') + { + c->format++; + if (*c->format) + *p++ = escaped_char (*c->format++); + continue; + } + else if (FcCharIsPunct (*c->format)) + break; + + *p++ = *c->format++; + } + *p = '\0'; + + if (p == c->word) + { + message ("expected identifier at %d", + c->format - c->format_orig + 1); + return FcFalse; + } + + return FcTrue; +} + +static FcBool +read_chars (FcFormatContext *c, + FcChar8 term) +{ + FcChar8 *p; + + p = c->word; + + while (*c->format && *c->format != '}' && *c->format != term) + { + if (*c->format == '\\') + { + c->format++; + if (*c->format) + *p++ = escaped_char (*c->format++); + continue; + } + + *p++ = *c->format++; + } + *p = '\0'; + + if (p == c->word) + { + message ("expected character data at %d", + c->format - c->format_orig + 1); + return FcFalse; + } + + return FcTrue; +} + +static FcBool +FcPatternFormatToBuf (FcPattern *pat, + const FcChar8 *format, + FcStrBuf *buf); + +static FcBool +interpret_builtin (FcFormatContext *c, + FcPattern *pat, + FcStrBuf *buf) +{ + FcChar8 *new_str; + FcBool ret; + + if (!expect_char (c, '=') || + !read_word (c)) + return FcFalse; + + /* try simple builtins first */ + if (0) { } +#define BUILTIN(name, func) \ + else if (0 == strcmp ((const char *) c->word, name))\ + do { new_str = func (pat); ret = FcTrue; } while (0) + BUILTIN ("unparse", FcNameUnparse); + /* BUILTIN ("verbose", FcPatternPrint); XXX */ +#undef BUILTIN + else + ret = FcFalse; + + if (ret) + { + if (new_str) + { + FcStrBufString (buf, new_str); + free (new_str); + return FcTrue; + } + else + return FcFalse; + } + + /* now try our custom formats */ + if (0) { } +#define BUILTIN(name, format) \ + else if (0 == strcmp ((const char *) c->word, name))\ + ret = FcPatternFormatToBuf (pat, (const FcChar8 *) format, buf) + BUILTIN ("fcmatch", FCMATCH_FORMAT); + BUILTIN ("fclist", FCLIST_FORMAT); + BUILTIN ("pkgkit", PKGKIT_FORMAT); +#undef BUILTIN + else + ret = FcFalse; + + if (!ret) + message ("unknown builtin \"%s\"", + c->word); + + return ret; +} + +static FcBool +interpret_expr (FcFormatContext *c, + FcPattern *pat, + FcStrBuf *buf, + FcChar8 term); + +static FcBool +interpret_subexpr (FcFormatContext *c, + FcPattern *pat, + FcStrBuf *buf) +{ + return expect_char (c, '{') && + interpret_expr (c, pat, buf, '}') && + expect_char (c, '}'); +} + +static FcBool +maybe_interpret_subexpr (FcFormatContext *c, + FcPattern *pat, + FcStrBuf *buf) +{ + return (*c->format == '{') ? + interpret_subexpr (c, pat, buf) : + FcTrue; +} + +static FcBool +skip_subexpr (FcFormatContext *c); + +static FcBool +skip_percent (FcFormatContext *c) +{ + int width; + + if (!expect_char (c, '%')) + return FcFalse; + + /* skip an optional width specifier */ + width = strtol ((const char *) c->format, (char **) &c->format, 10); + + if (!expect_char (c, '{')) + return FcFalse; + + while(*c->format && *c->format != '}') + { + switch (*c->format) + { + case '\\': + c->format++; /* skip over '\\' */ + if (*c->format) + c->format++; + continue; + case '{': + if (!skip_subexpr (c)) + return FcFalse; + continue; + } + c->format++; + } + + return expect_char (c, '}'); +} + +static FcBool +skip_expr (FcFormatContext *c) +{ + while(*c->format && *c->format != '}') + { + switch (*c->format) + { + case '\\': + c->format++; /* skip over '\\' */ + if (*c->format) + c->format++; + continue; + case '%': + if (!skip_percent (c)) + return FcFalse; + continue; + } + c->format++; + } + + return FcTrue; +} + +static FcBool +skip_subexpr (FcFormatContext *c) +{ + return expect_char (c, '{') && + skip_expr (c) && + expect_char (c, '}'); +} + +static FcBool +maybe_skip_subexpr (FcFormatContext *c) +{ + return (*c->format == '{') ? + skip_subexpr (c) : + FcTrue; +} + +static FcBool +interpret_filter_in (FcFormatContext *c, + FcPattern *pat, + FcStrBuf *buf) +{ + FcObjectSet *os; + FcPattern *subpat; + + if (!expect_char (c, '+')) + return FcFalse; + + os = FcObjectSetCreate (); + if (!os) + return FcFalse; + + do + { + if (!read_word (c) || + !FcObjectSetAdd (os, (const char *) c->word)) + { + FcObjectSetDestroy (os); + return FcFalse; + } + } + while (consume_char (c, ',')); + + subpat = FcPatternFilter (pat, os); + FcObjectSetDestroy (os); + + if (!subpat || + !interpret_subexpr (c, subpat, buf)) + return FcFalse; + + FcPatternDestroy (subpat); + return FcTrue; +} + +static FcBool +interpret_filter_out (FcFormatContext *c, + FcPattern *pat, + FcStrBuf *buf) +{ + FcPattern *subpat; + + if (!expect_char (c, '-')) + return FcFalse; + + subpat = FcPatternDuplicate (pat); + if (!subpat) + return FcFalse; + + do + { + if (!read_word (c)) + { + FcPatternDestroy (subpat); + return FcFalse; + } + + FcPatternDel (subpat, (const char *) c->word); + } + while (consume_char (c, ',')); + + if (!interpret_subexpr (c, subpat, buf)) + return FcFalse; + + FcPatternDestroy (subpat); + return FcTrue; +} + +static FcBool +interpret_cond (FcFormatContext *c, + FcPattern *pat, + FcStrBuf *buf) +{ + FcBool pass; + + if (!expect_char (c, '?')) + return FcFalse; + + pass = FcTrue; + + do + { + FcBool negate; + FcValue v; + + negate = consume_char (c, '!'); + + if (!read_word (c)) + return FcFalse; + + pass = pass && + (negate ^ + (FcResultMatch == + FcPatternGet (pat, (const char *) c->word, 0, &v))); + } + while (consume_char (c, ',')); + + if (pass) + { + if (!interpret_subexpr (c, pat, buf) || + !maybe_skip_subexpr (c)) + return FcFalse; + } + else + { + if (!skip_subexpr (c) || + !maybe_interpret_subexpr (c, pat, buf)) + return FcFalse; + } + + return FcTrue; +} + +static FcBool +interpret_count (FcFormatContext *c, + FcPattern *pat, + FcStrBuf *buf) +{ + int count; + FcPatternElt *e; + FcChar8 buf_static[64]; + + if (!expect_char (c, '#')) + return FcFalse; + + if (!read_word (c)) + return FcFalse; + + count = 0; + e = FcPatternObjectFindElt (pat, + FcObjectFromName ((const char *) c->word)); + if (e) + { + FcValueListPtr l; + count++; + for (l = FcPatternEltValues(e); + l->next; + l = l->next) + count++; + } + + snprintf ((char *) buf_static, sizeof (buf_static), "%d", count); + FcStrBufString (buf, buf_static); + + return FcTrue; +} + +static FcBool +interpret_enumerate (FcFormatContext *c, + FcPattern *pat, + FcStrBuf *buf) +{ + FcObjectSet *os; + FcPattern *subpat; + const FcChar8 *format_save; + int idx; + FcBool ret, done; + FcStrList *lang_strs; + + if (!expect_char (c, '[') || + !expect_char (c, ']')) + return FcFalse; + + os = FcObjectSetCreate (); + if (!os) + return FcFalse; + + ret = FcTrue; + + do + { + if (!read_word (c) || + !FcObjectSetAdd (os, (const char *) c->word)) + { + FcObjectSetDestroy (os); + return FcFalse; + } + } + while (consume_char (c, ',')); + + /* If we have one element and it's of type FcLangSet, we want + * to enumerate the languages in it. */ + lang_strs = NULL; + if (os->nobject == 1) + { + FcLangSet *langset; + if (FcResultMatch == + FcPatternGetLangSet (pat, os->objects[0], idx, &langset)) + { + FcStrSet *ss; + if (!(ss = FcLangSetGetLangs (langset)) || + !(lang_strs = FcStrListCreate (ss))) + goto bail0; + } + } + + subpat = FcPatternDuplicate (pat); + if (!subpat) + goto bail0; + + format_save = c->format; + idx = 0; + do + { + int i; + + done = FcTrue; + + if (lang_strs) + { + FcChar8 *lang; + + FcPatternDel (subpat, os->objects[0]); + if ((lang = FcStrListNext (lang_strs))) + { + FcPatternAddString (subpat, os->objects[0], lang); + done = FcFalse; + } + } + else + { + for (i = 0; i < os->nobject; i++) + { + FcValue v; + + /* XXX this can be optimized by accessing valuelist linked lists + * directly and remembering where we were. Most (all) value lists + * in normal uses are pretty short though (language tags are + * stored as a LangSet, not separate values.). */ + FcPatternDel (subpat, os->objects[i]); + if (FcResultMatch == + FcPatternGet (pat, os->objects[i], idx, &v)) + { + FcPatternAdd (subpat, os->objects[i], v, FcFalse); + done = FcFalse; + } + } + } + + if (!done) + { + c->format = format_save; + ret = interpret_subexpr (c, subpat, buf); + if (!ret) + goto bail; + } + + idx++; + } while (!done); + + if (c->format == format_save) + skip_subexpr (c); + +bail: + FcPatternDestroy (subpat); +bail0: + if (lang_strs) + FcStrListDone (lang_strs); + FcObjectSetDestroy (os); + + return ret; +} + +static FcBool +interpret_simple (FcFormatContext *c, + FcPattern *pat, + FcStrBuf *buf) +{ + FcPatternElt *e; + FcBool add_colon = FcFalse; + FcBool add_elt_name = FcFalse; + int idx; + FcChar8 *else_string; + + if (consume_char (c, ':')) + add_colon = FcTrue; + + if (!read_word (c)) + return FcFalse; + + idx = -1; + if (consume_char (c, '[')) + { + idx = strtol ((const char *) c->format, (char **) &c->format, 10); + if (idx < 0) + { + message ("expected non-negative number at %d", + c->format-1 - c->format_orig + 1); + return FcFalse; + } + if (!expect_char (c, ']')) + return FcFalse; + } + + if (consume_char (c, '=')) + add_elt_name = FcTrue; + + /* modifiers */ + else_string = NULL; + if (consume_char (c, ':')) + { + FcChar8 *orig; + /* divert the c->word for now */ + orig = c->word; + c->word = c->word + strlen ((const char *) c->word) + 1; + /* for now we just support 'default value' */ + if (!expect_char (c, '-') || + !read_chars (c, '\0')) + { + c->word = orig; + return FcFalse; + } + else_string = c->word; + c->word = orig; + } + + e = FcPatternObjectFindElt (pat, + FcObjectFromName ((const char *) c->word)); + if (e || else_string) + { + FcValueListPtr l = NULL; + + if (add_colon) + FcStrBufChar (buf, ':'); + if (add_elt_name) + { + FcStrBufString (buf, c->word); + FcStrBufChar (buf, '='); + } + + if (e) + l = FcPatternEltValues(e); + + if (idx != -1) + { + while (l && idx > 0) + { + l = FcValueListNext(l); + idx--; + } + if (l && idx == 0) + { + if (!FcNameUnparseValue (buf, &l->value, '\0')) + return FcFalse; + } + else goto notfound; + } + else if (l) + { + FcNameUnparseValueList (buf, l, '\0'); + } + else + { + notfound: + if (else_string) + FcStrBufString (buf, else_string); + } + } + + return FcTrue; +} + +static FcBool +cescape (FcFormatContext *c, + const FcChar8 *str, + FcStrBuf *buf) +{ + while(*str) + { + switch (*str) + { + case '\\': + case '"': + FcStrBufChar (buf, '\\'); + break; + } + FcStrBufChar (buf, *str++); + } + return FcTrue; +} + +static FcBool +shescape (FcFormatContext *c, + const FcChar8 *str, + FcStrBuf *buf) +{ + FcStrBufChar (buf, '\''); + while(*str) + { + if (*str == '\'') + FcStrBufString (buf, (const FcChar8 *) "'\\''"); + else + FcStrBufChar (buf, *str); + str++; + } + FcStrBufChar (buf, '\''); + return FcTrue; +} + +static FcBool +xmlescape (FcFormatContext *c, + const FcChar8 *str, + FcStrBuf *buf) +{ + while(*str) + { + switch (*str) + { + case '&': FcStrBufString (buf, (const FcChar8 *) "&"); break; + case '<': FcStrBufString (buf, (const FcChar8 *) "<"); break; + case '>': FcStrBufString (buf, (const FcChar8 *) ">"); break; + default: FcStrBufChar (buf, *str); break; + } + str++; + } + return FcTrue; +} + +static FcBool +delete_chars (FcFormatContext *c, + const FcChar8 *str, + FcStrBuf *buf) +{ + /* XXX not UTF-8 aware */ + + if (!expect_char (c, '(') || + !read_chars (c, ')') || + !expect_char (c, ')')) + return FcFalse; + + while(*str) + { + FcChar8 *p; + + p = (FcChar8 *) strpbrk ((const char *) str, (const char *) c->word); + if (p) + { + FcStrBufData (buf, str, p - str); + str = p + 1; + } + else + { + FcStrBufString (buf, str); + break; + } + + } + + return FcTrue; +} + +static FcBool +escape_chars (FcFormatContext *c, + const FcChar8 *str, + FcStrBuf *buf) +{ + /* XXX not UTF-8 aware */ + + if (!expect_char (c, '(') || + !read_chars (c, ')') || + !expect_char (c, ')')) + return FcFalse; + + while(*str) + { + FcChar8 *p; + + p = (FcChar8 *) strpbrk ((const char *) str, (const char *) c->word); + if (p) + { + FcStrBufData (buf, str, p - str); + FcStrBufChar (buf, c->word[0]); + FcStrBufChar (buf, *p); + str = p + 1; + } + else + { + FcStrBufString (buf, str); + break; + } + + } + + return FcTrue; +} + +static FcBool +translate_chars (FcFormatContext *c, + const FcChar8 *str, + FcStrBuf *buf) +{ + char *from, *to, repeat; + int from_len, to_len; + + /* XXX not UTF-8 aware */ + + if (!expect_char (c, '(') || + !read_chars (c, ',') || + !expect_char (c, ',')) + return FcFalse; + + from = (char *) c->word; + from_len = strlen (from); + to = from + from_len + 1; + + /* hack: we temporarily divert c->word */ + c->word = (FcChar8 *) to; + if (!read_chars (c, ')')) + { + c->word = (FcChar8 *) from; + return FcFalse; + } + c->word = (FcChar8 *) from; + + to_len = strlen (to); + repeat = to[to_len - 1]; + + if (!expect_char (c, ')')) + return FcFalse; + + while(*str) + { + FcChar8 *p; + + p = (FcChar8 *) strpbrk ((const char *) str, (const char *) from); + if (p) + { + int i; + FcStrBufData (buf, str, p - str); + i = strchr (from, *p) - from; + FcStrBufChar (buf, i < to_len ? to[i] : repeat); + str = p + 1; + } + else + { + FcStrBufString (buf, str); + break; + } + + } + + return FcTrue; +} + +static FcBool +interpret_convert (FcFormatContext *c, + FcStrBuf *buf, + int start) +{ + const FcChar8 *str; + FcChar8 *new_str; + FcStrBuf new_buf; + FcChar8 buf_static[8192]; + FcBool ret; + + if (!expect_char (c, '|') || + !read_word (c)) + return FcFalse; + + /* prepare the buffer */ + FcStrBufChar (buf, '\0'); + if (buf->failed) + return FcFalse; + str = buf->buf + start; + buf->len = start; + + /* try simple converters first */ + if (0) { } +#define CONVERTER(name, func) \ + else if (0 == strcmp ((const char *) c->word, name))\ + do { new_str = func (str); ret = FcTrue; } while (0) + CONVERTER ("downcase", FcStrDowncase); + CONVERTER ("basename", FcStrBasename); + CONVERTER ("dirname", FcStrDirname); +#undef CONVERTER + else + ret = FcFalse; + + if (ret) + { + if (new_str) + { + FcStrBufString (buf, new_str); + free (new_str); + return FcTrue; + } + else + return FcFalse; + } + + FcStrBufInit (&new_buf, buf_static, sizeof (buf_static)); + + /* now try our custom converters */ + if (0) { } +#define CONVERTER(name, func) \ + else if (0 == strcmp ((const char *) c->word, name))\ + ret = func (c, str, &new_buf) + CONVERTER ("cescape", cescape); + CONVERTER ("shescape", shescape); + CONVERTER ("xmlescape", xmlescape); + CONVERTER ("delete", delete_chars); + CONVERTER ("escape", escape_chars); + CONVERTER ("translate", translate_chars); +#undef CONVERTER + else + ret = FcFalse; + + if (ret) + { + FcStrBufChar (&new_buf, '\0'); + FcStrBufString (buf, new_buf.buf); + } + else + message ("unknown converter \"%s\"", + c->word); + + FcStrBufDestroy (&new_buf); + + return ret; +} + +static FcBool +maybe_interpret_converts (FcFormatContext *c, + FcStrBuf *buf, + int start) +{ + while (*c->format == '|') + if (!interpret_convert (c, buf, start)) + return FcFalse; + + return FcTrue; +} + +static FcBool +align_to_width (FcStrBuf *buf, + int start, + int width) +{ + int len; + + if (buf->failed) + return FcFalse; + + len = buf->len - start; + if (len < -width) + { + /* left align */ + while (len++ < -width) + FcStrBufChar (buf, ' '); + } + else if (len < width) + { + int old_len; + old_len = len; + /* right align */ + while (len++ < width) + FcStrBufChar (buf, ' '); + if (buf->failed) + return FcFalse; + len = old_len; + memmove (buf->buf + buf->len - len, + buf->buf + buf->len - width, + len); + memset (buf->buf + buf->len - width, + ' ', + width - len); + } + + return !buf->failed; +} +static FcBool +interpret_percent (FcFormatContext *c, + FcPattern *pat, + FcStrBuf *buf) +{ + int width, start; + FcBool ret; + + if (!expect_char (c, '%')) + return FcFalse; + + if (consume_char (c, '%')) /* "%%" */ + { + FcStrBufChar (buf, '%'); + return FcTrue; + } + + /* parse an optional width specifier */ + width = strtol ((const char *) c->format, (char **) &c->format, 10); + + if (!expect_char (c, '{')) + return FcFalse; + + start = buf->len; + + switch (*c->format) { + case '=': ret = interpret_builtin (c, pat, buf); break; + case '{': ret = interpret_subexpr (c, pat, buf); break; + case '+': ret = interpret_filter_in (c, pat, buf); break; + case '-': ret = interpret_filter_out (c, pat, buf); break; + case '?': ret = interpret_cond (c, pat, buf); break; + case '#': ret = interpret_count (c, pat, buf); break; + case '[': ret = interpret_enumerate (c, pat, buf); break; + default: ret = interpret_simple (c, pat, buf); break; + } + + return ret && + maybe_interpret_converts (c, buf, start) && + align_to_width (buf, start, width) && + expect_char (c, '}'); +} + +static FcBool +interpret_expr (FcFormatContext *c, + FcPattern *pat, + FcStrBuf *buf, + FcChar8 term) +{ + while (*c->format && *c->format != term) + { + switch (*c->format) + { + case '\\': + c->format++; /* skip over '\\' */ + if (*c->format) + FcStrBufChar (buf, escaped_char (*c->format++)); + continue; + case '%': + if (!interpret_percent (c, pat, buf)) + return FcFalse; + continue; + } + FcStrBufChar (buf, *c->format++); + } + return FcTrue; +} + +static FcBool +FcPatternFormatToBuf (FcPattern *pat, + const FcChar8 *format, + FcStrBuf *buf) +{ + FcFormatContext c; + FcChar8 word_static[1024]; + FcBool ret; + + if (!FcFormatContextInit (&c, format, word_static, sizeof (word_static))) + return FcFalse; + + ret = interpret_expr (&c, pat, buf, '\0'); + + FcFormatContextDone (&c); + + return ret; +} + +FcChar8 * +FcPatternFormat (FcPattern *pat, + const FcChar8 *format) +{ + FcStrBuf buf; + FcChar8 buf_static[8192 - 1024]; + FcBool ret; + + FcStrBufInit (&buf, buf_static, sizeof (buf_static)); + + ret = FcPatternFormatToBuf (pat, format, &buf); + + if (ret) + return FcStrBufDone (&buf); + else + { + FcStrBufDestroy (&buf); + return NULL; + } +} + +#define __fcformat__ +#include "fcaliastail.h" +#undef __fcformat__ diff --git a/lib/fontconfig/src/fcfreetype.c b/lib/fontconfig/src/fcfreetype.c index a79308cf4..68596f5a4 100644 --- a/lib/fontconfig/src/fcfreetype.c +++ b/lib/fontconfig/src/fcfreetype.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcfreetype.c,v 1.11 2002/08/31 22:17:32 keithp Exp $ + * fontconfig/src/fcfreetype.c * * Copyright © 2001 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -120,11 +120,11 @@ static const FcFtEncoding fcFtEncoding[] = { { TT_PLATFORM_MACINTOSH, TT_MAC_ID_JAPANESE, "SJIS" }, { TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, "UTF-16BE" }, { TT_PLATFORM_MICROSOFT, TT_MS_ID_SJIS, "SJIS-WIN" }, - { TT_PLATFORM_MICROSOFT, TT_MS_ID_GB2312, "GB3212" }, + { TT_PLATFORM_MICROSOFT, TT_MS_ID_GB2312, "GB2312" }, { TT_PLATFORM_MICROSOFT, TT_MS_ID_BIG_5, "BIG-5" }, { TT_PLATFORM_MICROSOFT, TT_MS_ID_WANSUNG, "Wansung" }, { TT_PLATFORM_MICROSOFT, TT_MS_ID_JOHAB, "Johab" }, - { TT_PLATFORM_MICROSOFT, TT_MS_ID_UCS_4, "UCS4" }, + { TT_PLATFORM_MICROSOFT, TT_MS_ID_UCS_4, "UCS-2BE" }, { TT_PLATFORM_ISO, TT_ISO_ID_7BIT_ASCII, "ASCII" }, { TT_PLATFORM_ISO, TT_ISO_ID_10646, "UCS-2BE" }, { TT_PLATFORM_ISO, TT_ISO_ID_8859_1, "ISO-8859-1" }, @@ -1091,10 +1091,16 @@ static const FT_UShort platform_order[] = { #define NUM_PLATFORM_ORDER (sizeof (platform_order) / sizeof (platform_order[0])) static const FT_UShort nameid_order[] = { +#ifdef TT_NAME_ID_WWS_FAMILY + TT_NAME_ID_WWS_FAMILY, +#endif TT_NAME_ID_PREFERRED_FAMILY, TT_NAME_ID_FONT_FAMILY, TT_NAME_ID_MAC_FULL_NAME, TT_NAME_ID_FULL_NAME, +#ifdef TT_NAME_ID_WWS_SUBFAMILY + TT_NAME_ID_WWS_SUBFAMILY, +#endif TT_NAME_ID_PREFERRED_SUBFAMILY, TT_NAME_ID_FONT_SUBFAMILY, TT_NAME_ID_TRADEMARK, @@ -1119,7 +1125,7 @@ FcFreeTypeQueryFace (const FT_Face face, #if 0 FcChar8 *family = 0; #endif - FcChar8 *complex; + FcChar8 *complex_; const FcChar8 *foundry = 0; int spacing; TT_OS2 *os2; @@ -1236,6 +1242,9 @@ FcFreeTypeQueryFace (const FT_Face face, continue; switch (sname.name_id) { +#ifdef TT_NAME_ID_WWS_FAMILY + case TT_NAME_ID_WWS_FAMILY: +#endif case TT_NAME_ID_PREFERRED_FAMILY: case TT_NAME_ID_FONT_FAMILY: #if 0 @@ -1266,6 +1275,9 @@ FcFreeTypeQueryFace (const FT_Face face, np = &nfullname; nlangp = &nfullname_lang; break; +#ifdef TT_NAME_ID_WWS_SUBFAMILY + case TT_NAME_ID_WWS_SUBFAMILY: +#endif case TT_NAME_ID_PREFERRED_SUBFAMILY: case TT_NAME_ID_FONT_SUBFAMILY: if (FcDebug () & FC_DBG_SCANV) @@ -1478,14 +1490,14 @@ FcFreeTypeQueryFace (const FT_Face face, printf ("\tos2 width class %d maps to width %d\n", os2->usWidthClass, width); } - if (os2 && (complex = FcFontCapabilities(face))) + if (os2 && (complex_ = FcFontCapabilities(face))) { - if (!FcPatternAddString (pat, FC_CAPABILITY, complex)) + if (!FcPatternAddString (pat, FC_CAPABILITY, complex_)) { - free (complex); + free (complex_); goto bail1; } - free (complex); + free (complex_); } /* @@ -1662,7 +1674,7 @@ FcFreeTypeQueryFace (const FT_Face face, /* * Skip over PCF fonts that have no encoded characters; they're * usually just Unicode fonts transcoded to some legacy encoding - * ftglue.c forces us to approximate whether a font is a PCF font + * FT forces us to approximate whether a font is a PCF font * or not by whether it has any BDF properties. Try PIXEL_SIZE; * I don't know how to get a list of BDF properties on the font. -PL */ @@ -2314,10 +2326,10 @@ FcUcs4ToGlyphName (FcChar32 ucs4) int r = 0; FcGlyphId gn; - while ((gn = ucs_to_name[i]) != -1) + while ((gn = _fc_ucs_to_name[i]) != -1) { - if (glyphs[gn].ucs == ucs4) - return glyphs[gn].name; + if (_fc_glyph_names[gn].ucs == ucs4) + return _fc_glyph_names[gn].name; if (!r) { r = (int) (ucs4 % FC_GLYPHNAME_REHASH); @@ -2339,10 +2351,10 @@ FcGlyphNameToUcs4 (FcChar8 *name) int r = 0; FcGlyphId gn; - while ((gn = name_to_ucs[i]) != -1) + while ((gn = _fc_name_to_ucs[i]) != -1) { - if (!strcmp ((char *) name, (char *) glyphs[gn].name)) - return glyphs[gn].ucs; + if (!strcmp ((char *) name, (char *) _fc_glyph_names[gn].name)) + return _fc_glyph_names[gn].ucs; if (!r) { r = (int) (h % FC_GLYPHNAME_REHASH); @@ -2525,9 +2537,6 @@ FcFreeTypeCheckGlyph (FT_Face face, FcChar32 ucs4, return FcFalse; } -#define FC_MIN(a,b) ((a) < (b) ? (a) : (b)) -#define FC_MAX(a,b) ((a) > (b) ? (a) : (b)) -#define FC_ABS(a) ((a) < 0 ? -(a) : (a)) #define APPROXIMATELY_EQUAL(x,y) (FC_ABS ((x) - (y)) <= FC_MAX (FC_ABS (x), FC_ABS (y)) / 33) static FcCharSet * @@ -2551,11 +2560,13 @@ FcFreeTypeCharSetAndSpacingForSize (FT_Face face, FcBlanks *blanks, int *spacing if (!fcs) goto bail0; +#if HAVE_FT_SELECT_SIZE if (strike_index >= 0) { if (FT_Select_Size (face, strike_index) != FT_Err_Ok) goto bail1; using_strike = FcTrue; } +#endif #ifdef CHECK printf ("Family %s style %s\n", face->family_name, face->style_name); @@ -2801,10 +2812,6 @@ FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks) #define TTAG_GPOS FT_MAKE_TAG( 'G', 'P', 'O', 'S' ) #define TTAG_GSUB FT_MAKE_TAG( 'G', 'S', 'U', 'B' ) #define TTAG_SILF FT_MAKE_TAG( 'S', 'i', 'l', 'f') -#define TT_Err_Ok FT_Err_Ok -#define TT_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle -#define TTO_Err_Empty_Script 0x1005 -#define TTO_Err_Invalid_SubTable 0x1001 #define OTLAYOUT_HEAD "otlayout:" #define OTLAYOUT_HEAD_LEN 9 @@ -2820,7 +2827,7 @@ FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks) #define FcIsValidScript(x) (FcIsLower(x) || FcIsUpper (x) || FcIsSpace(x)) static void -addtag(FcChar8 *complex, FT_ULong tag) +addtag(FcChar8 *complex_, FT_ULong tag) { FcChar8 tagstring[OTLAYOUT_ID_LEN + 1]; @@ -2839,10 +2846,10 @@ addtag(FcChar8 *complex, FT_ULong tag) !FcIsValidScript(tagstring[3])) return; - if (*complex != '\0') - strcat ((char *) complex, " "); - strcat ((char *) complex, "otlayout:"); - strcat ((char *) complex, (char *) tagstring); + if (*complex_ != '\0') + strcat ((char *) complex_, " "); + strcat ((char *) complex_, "otlayout:"); + strcat ((char *) complex_, (char *) tagstring); } static int @@ -2854,29 +2861,30 @@ compareulong (const void *a, const void *b) } -static FT_Error -GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags, FT_UShort *script_count) +static int +GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags) { - FT_ULong cur_offset, new_offset, base_offset; + FT_ULong cur_offset, new_offset, base_offset; FT_Stream stream = face->stream; FT_Error error; - FT_UShort n, p; + FT_UShort n, p; FT_Memory memory; + int script_count; - if ( !stream ) - return TT_Err_Invalid_Face_Handle; + if (!stream) + return 0; memory = stream->memory; if (( error = ftglue_face_goto_table( face, tabletag, stream ) )) - return error; + return 0; base_offset = ftglue_stream_pos ( stream ); /* skip version */ if ( ftglue_stream_seek ( stream, base_offset + 4L ) || ftglue_stream_frame_enter( stream, 2L ) ) - return error; + return 0; new_offset = GET_UShort() + base_offset; @@ -2884,25 +2892,24 @@ GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags, FT_UShort *scri cur_offset = ftglue_stream_pos( stream ); - if ( ftglue_stream_seek( stream, new_offset ) != TT_Err_Ok ) - return error; + if ( ftglue_stream_seek( stream, new_offset ) != FT_Err_Ok ) + return 0; base_offset = ftglue_stream_pos( stream ); if ( ftglue_stream_frame_enter( stream, 2L ) ) - return error; + return 0; - *script_count = GET_UShort (); + script_count = GET_UShort (); ftglue_stream_frame_exit( stream ); - *stags = ftglue_alloc(memory, *script_count * sizeof( FT_ULong ), &error); - - if (error) - return error; + *stags = malloc(script_count * sizeof (FT_ULong)); + if (!stags) + return 0; p = 0; - for ( n = 0; n < *script_count; n++ ) + for ( n = 0; n < script_count; n++ ) { if ( ftglue_stream_frame_enter( stream, 6L ) ) goto Fail; @@ -2916,28 +2923,24 @@ GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags, FT_UShort *scri error = ftglue_stream_seek( stream, new_offset ); - if ( error == TT_Err_Ok ) + if ( error == FT_Err_Ok ) p++; (void)ftglue_stream_seek( stream, cur_offset ); } if (!p) - { - error = TTO_Err_Invalid_SubTable; goto Fail; - } /* sort the tag list before returning it */ - qsort(*stags, *script_count, sizeof(FT_ULong), compareulong); + qsort(*stags, script_count, sizeof(FT_ULong), compareulong); - return TT_Err_Ok; + return script_count; Fail: - *script_count = 0; - ftglue_free( memory, *stags ); + free(*stags); *stags = NULL; - return error; + return 0; } static FcChar8 * @@ -2949,53 +2952,50 @@ FcFontCapabilities(FT_Face face) FT_ULong *gsubtags=NULL, *gpostags=NULL; FT_UShort gsub_count=0, gpos_count=0; FT_ULong maxsize; - FT_Memory memory = face->stream->memory; - FcChar8 *complex = NULL; + FcChar8 *complex_ = NULL; int indx1 = 0, indx2 = 0; err = FT_Load_Sfnt_Table(face, TTAG_SILF, 0, 0, &len); issilgraphitefont = ( err == FT_Err_Ok); - if (GetScriptTags(face, TTAG_GPOS, &gpostags, &gpos_count) != FT_Err_Ok) - gpos_count = 0; - if (GetScriptTags(face, TTAG_GSUB, &gsubtags, &gsub_count) != FT_Err_Ok) - gsub_count = 0; - + gpos_count = GetScriptTags(face, TTAG_GPOS, &gpostags); + gsub_count = GetScriptTags(face, TTAG_GSUB, &gsubtags); + if (!issilgraphitefont && !gsub_count && !gpos_count) goto bail; maxsize = (((FT_ULong) gpos_count + (FT_ULong) gsub_count) * OTLAYOUT_LEN + (issilgraphitefont ? 13 : 0)); - complex = malloc (sizeof (FcChar8) * maxsize); - if (!complex) + complex_ = malloc (sizeof (FcChar8) * maxsize); + if (!complex_) goto bail; - complex[0] = '\0'; + complex_[0] = '\0'; if (issilgraphitefont) - strcpy((char *) complex, "ttable:Silf "); + strcpy((char *) complex_, "ttable:Silf "); while ((indx1 < gsub_count) || (indx2 < gpos_count)) { if (indx1 == gsub_count) { - addtag(complex, gpostags[indx2]); + addtag(complex_, gpostags[indx2]); indx2++; } else if ((indx2 == gpos_count) || (gsubtags[indx1] < gpostags[indx2])) { - addtag(complex, gsubtags[indx1]); + addtag(complex_, gsubtags[indx1]); indx1++; } else if (gsubtags[indx1] == gpostags[indx2]) { - addtag(complex, gsubtags[indx1]); + addtag(complex_, gsubtags[indx1]); indx1++; indx2++; } else { - addtag(complex, gpostags[indx2]); + addtag(complex_, gpostags[indx2]); indx2++; } } if (FcDebug () & FC_DBG_SCANV) - printf("complex features in this font: %s\n", complex); + printf("complex_ features in this font: %s\n", complex_); bail: - ftglue_free(memory, gsubtags); - ftglue_free(memory, gpostags); - return complex; + free(gsubtags); + free(gpostags); + return complex_; } #define __fcfreetype__ diff --git a/lib/fontconfig/src/fcfs.c b/lib/fontconfig/src/fcfs.c index 7bea73651..0e97501f8 100644 --- a/lib/fontconfig/src/fcfs.c +++ b/lib/fontconfig/src/fcfs.c @@ -1,5 +1,5 @@ /* - * $RCSId: $ + * fontconfig/src/fcfs.c * * Copyright © 2000 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/src/fcinit.c b/lib/fontconfig/src/fcinit.c index 0998abc02..3789d67b5 100644 --- a/lib/fontconfig/src/fcinit.c +++ b/lib/fontconfig/src/fcinit.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcinit.c,v 1.7 2002/08/22 07:36:44 keithp Exp $ + * fontconfig/src/fcinit.c * * Copyright © 2001 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR diff --git a/lib/fontconfig/src/fcint.h b/lib/fontconfig/src/fcint.h index 8912d1668..233b4c302 100644 --- a/lib/fontconfig/src/fcint.h +++ b/lib/fontconfig/src/fcint.h @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcint.h,v 1.27 2002/08/31 22:17:32 keithp Exp $ + * fontconfig/src/fcint.h * * Copyright © 2000 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -107,9 +107,9 @@ #define FC_MEM_NUM 30 -#define FC_BANK_DYNAMIC 0 -#define FC_BANK_FIRST 1 -#define FC_BANK_LANGS 0xfcfcfcfc +#define FC_MIN(a,b) ((a) < (b) ? (a) : (b)) +#define FC_MAX(a,b) ((a) > (b) ? (a) : (b)) +#define FC_ABS(a) ((a) < 0 ? -(a) : (a)) /* slim_internal.h */ #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun) @@ -247,6 +247,15 @@ typedef struct _FcExpr { } u; } FcExpr; +typedef struct _FcExprPage FcExprPage; + +struct _FcExprPage { + FcExprPage *next_page; + FcExpr *next; + FcExpr exprs[(1024 - 2/* two pointers */ - 2/* malloc overhead */) * sizeof (void *) / sizeof (FcExpr)]; + FcExpr end[0]; +}; + typedef enum _FcQual { FcQualAny, FcQualAll, FcQualFirst, FcQualNotFirst } FcQual; @@ -313,6 +322,7 @@ typedef struct _FcStrBuf { FcBool failed; int len; int size; + FcChar8 buf_static[16 * sizeof (void *)]; } FcStrBuf; struct _FcCache { @@ -341,6 +351,14 @@ struct _FcCache { #define FC_SERIALIZE_HASH_SIZE 8191 +typedef union _FcAlign { + double d; + int i; + intptr_t ip; + FcBool b; + void *p; +} FcAlign; + typedef struct _FcSerializeBucket { struct _FcSerializeBucket *next; const void *object; @@ -399,18 +417,9 @@ typedef struct _FcCaseFold { #define FC_MAX_FILE_LEN 4096 -/* XXX remove these when we're ready */ - -#define fc_value_string(v) FcValueString(v) -#define fc_value_charset(v) FcValueCharSet(v) -#define fc_value_langset(v) FcValueLangSet(v) -#define fc_storage_type(v) ((v)->type) - -#define fc_alignof(type) offsetof (struct { char c; type member; }, member) - #define FC_CACHE_MAGIC_MMAP 0xFC02FC04 #define FC_CACHE_MAGIC_ALLOC 0xFC02FC05 -#define FC_CACHE_CONTENT_VERSION 2 +#define FC_CACHE_CONTENT_VERSION 3 /* also check FC_CACHE_VERSION */ struct _FcAtomic { FcChar8 *file; /* original file name */ @@ -483,6 +492,10 @@ struct _FcConfig { */ time_t rescanTime; /* last time information was scanned */ int rescanInterval; /* interval between scans */ + + int ref; /* reference count */ + + FcExprPage *expr_pool; /* pool of FcExpr's */ }; extern FcPrivate FcConfig *_fcConfig; @@ -494,9 +507,6 @@ typedef struct _FcFileTime { typedef struct _FcCharMap FcCharMap; -/* watch out; assumes that v is void * -PL */ -#define ALIGN(v,type) ((void *)(((uintptr_t)(v) + fc_alignof(type) - 1) & ~(fc_alignof(type) - 1))) - /* fcblanks.c */ /* fccache.c */ @@ -522,8 +532,18 @@ FcCacheFini (void); FcPrivate void FcDirCacheReference (FcCache *cache, int nref); +#ifdef _WIN32 +FcPrivate int +FcStat (const char *file, struct stat *statb); +#else +#define FcStat stat +#endif + /* fccfg.c */ +FcPrivate FcExpr * +FcConfigAllocExpr (FcConfig *config); + FcPrivate FcBool FcConfigAddConfigDir (FcConfig *config, const FcChar8 *d); @@ -636,6 +656,16 @@ FcNameUnparseCharSet (FcStrBuf *buf, const FcCharSet *c); FcPrivate FcCharSet * FcNameParseCharSet (FcChar8 *string); +FcPrivate FcBool +FcNameUnparseValue (FcStrBuf *buf, + FcValue *v0, + FcChar8 *escape); + +FcPrivate FcBool +FcNameUnparseValueList (FcStrBuf *buf, + FcValueListPtr v, + FcChar8 *escape); + FcPrivate FcCharLeaf * FcCharSetFindLeafCreate (FcCharSet *fcs, FcChar32 ucs4); @@ -704,7 +734,7 @@ FcDirScanConfig (FcFontSet *set, /* fcfont.c */ FcPrivate int FcFontDebug (void); - + /* fcfs.c */ FcPrivate FcBool @@ -712,53 +742,11 @@ FcFontSetSerializeAlloc (FcSerialize *serialize, const FcFontSet *s); FcPrivate FcFontSet * FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s); - -/* fcgram.y */ -FcPrivate int -FcConfigparse (void); - -FcPrivate int -FcConfigwrap (void); - -FcPrivate void -FcConfigerror (char *fmt, ...); - -FcPrivate char * -FcConfigSaveField (const char *field); +/* fcxml.c */ FcPrivate void FcTestDestroy (FcTest *test); -FcPrivate FcExpr * -FcExprCreateInteger (int i); - -FcPrivate FcExpr * -FcExprCreateDouble (double d); - -FcPrivate FcExpr * -FcExprCreateString (const FcChar8 *s); - -FcPrivate FcExpr * -FcExprCreateMatrix (const FcMatrix *m); - -FcPrivate FcExpr * -FcExprCreateBool (FcBool b); - -FcPrivate FcExpr * -FcExprCreateNil (void); - -FcPrivate FcExpr * -FcExprCreateField (const char *field); - -FcPrivate FcExpr * -FcExprCreateConst (const FcChar8 *constant); - -FcPrivate FcExpr * -FcExprCreateOp (FcExpr *left, FcOp op, FcExpr *right); - -FcPrivate void -FcExprDestroy (FcExpr *e); - FcPrivate void FcEditDestroy (FcEdit *e); @@ -863,6 +851,9 @@ FcObjectFromName (const char * name); FcPrivate const char * FcObjectName (FcObject object); +FcPrivate FcObjectSet * +FcObjectGetSet (void); + FcPrivate FcBool FcObjectInit (void); @@ -995,6 +986,9 @@ FcStrBufDestroy (FcStrBuf *buf); FcPrivate FcChar8 * FcStrBufDone (FcStrBuf *buf); +FcPrivate FcChar8 * +FcStrBufDoneStatic (FcStrBuf *buf); + FcPrivate FcBool FcStrBufChar (FcStrBuf *buf, FcChar8 c); diff --git a/lib/fontconfig/src/fclang.c b/lib/fontconfig/src/fclang.c index 229a13e96..1d62c4e3f 100644 --- a/lib/fontconfig/src/fclang.c +++ b/lib/fontconfig/src/fclang.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fclang.c,v 1.7 2002/08/26 23:34:31 keithp Exp $ + * fontconfig/src/fclang.c * * Copyright © 2002 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -38,12 +38,38 @@ typedef struct { #include "../fc-lang/fclang.h" struct _FcLangSet { - FcChar32 map[NUM_LANG_SET_MAP]; FcStrSet *extra; + FcChar32 map_size; + FcChar32 map[NUM_LANG_SET_MAP]; }; -#define FcLangSetBitSet(ls, id) ((ls)->map[(id)>>5] |= ((FcChar32) 1 << ((id) & 0x1f))) -#define FcLangSetBitGet(ls, id) (((ls)->map[(id)>>5] >> ((id) & 0x1f)) & 1) +static void +FcLangSetBitSet (FcLangSet *ls, + unsigned int id) +{ + int bucket; + + id = fcLangCharSetIndices[id]; + bucket = id >> 5; + if (bucket >= ls->map_size) + return; /* shouldn't happen really */ + + ls->map[bucket] |= ((FcChar32) 1 << (id & 0x1f)); +} + +static FcBool +FcLangSetBitGet (const FcLangSet *ls, + unsigned int id) +{ + int bucket; + + id = fcLangCharSetIndices[id]; + bucket = id >> 5; + if (bucket >= ls->map_size) + return FcFalse; + + return ((ls->map[bucket] >> (id & 0x1f)) & 1) ? FcTrue : FcFalse; +} FcLangSet * FcFreeTypeLangSet (const FcCharSet *charset, @@ -61,7 +87,7 @@ FcFreeTypeLangSet (const FcCharSet *charset, return 0; if (FcDebug() & FC_DBG_LANGSET) { - printf ("font charset\n"); + printf ("font charset"); FcCharSetPrint (charset); printf ("\n"); } @@ -69,7 +95,7 @@ FcFreeTypeLangSet (const FcCharSet *charset, { if (FcDebug() & FC_DBG_LANGSET) { - printf ("%s charset\n", fcLangCharSets[i].lang); + printf ("%s charset", fcLangCharSets[i].lang); FcCharSetPrint (&fcLangCharSets[i].charset); printf ("\n"); } @@ -210,6 +236,7 @@ FcLangGetCharSet (const FcChar8 *lang) case FcLangDifferentTerritory: if (country == -1) country = i; + case FcLangDifferentLang: default: break; } @@ -245,6 +272,7 @@ FcLangSetCreate (void) return 0; FcMemAlloc (FC_MEM_LANGSET, sizeof (FcLangSet)); memset (ls->map, '\0', sizeof (ls->map)); + ls->map_size = NUM_LANG_SET_MAP; ls->extra = 0; return ls; } @@ -266,7 +294,8 @@ FcLangSetCopy (const FcLangSet *ls) new = FcLangSetCreate (); if (!new) goto bail0; - memcpy (new->map, ls->map, sizeof (new->map)); + memset (new->map, '\0', sizeof (new->map)); + memcpy (new->map, ls->map, FC_MIN (sizeof (new->map), ls->map_size * sizeof (ls->map[0]))); if (ls->extra) { FcStrList *list; @@ -442,15 +471,17 @@ FcLangSetCompareStrSet (const FcLangSet *ls, FcStrSet *set) FcLangResult FcLangSetCompare (const FcLangSet *lsa, const FcLangSet *lsb) { - int i, j; + int i, j, count; FcLangResult best, r; - for (i = 0; i < NUM_LANG_SET_MAP; i++) + count = FC_MIN (lsa->map_size, lsb->map_size); + count = FC_MIN (NUM_LANG_SET_MAP, count); + for (i = 0; i < count; i++) if (lsa->map[i] & lsb->map[i]) return FcLangEqual; best = FcLangDifferentLang; for (j = 0; j < NUM_COUNTRY_SET; j++) - for (i = 0; i < NUM_LANG_SET_MAP; i++) + for (i = 0; i < count; i++) if ((lsa->map[i] & fcLangCountrySets[j][i]) && (lsb->map[i] & fcLangCountrySets[j][i])) { @@ -506,9 +537,10 @@ FcChar32 FcLangSetHash (const FcLangSet *ls) { FcChar32 h = 0; - int i; + int i, count; - for (i = 0; i < NUM_LANG_SET_MAP; i++) + count = FC_MIN (ls->map_size, NUM_LANG_SET_MAP); + for (i = 0; i < count; i++) h ^= ls->map[i]; if (ls->extra) h ^= ls->extra->num; @@ -518,7 +550,7 @@ FcLangSetHash (const FcLangSet *ls) FcLangSet * FcNameParseLangSet (const FcChar8 *string) { - FcChar8 lang[32],c; + FcChar8 lang[32], c = 0; int i; FcLangSet *ls; @@ -551,11 +583,12 @@ bail0: FcBool FcNameUnparseLangSet (FcStrBuf *buf, const FcLangSet *ls) { - int i, bit; + int i, bit, count; FcChar32 bits; FcBool first = FcTrue; - for (i = 0; i < NUM_LANG_SET_MAP; i++) + count = FC_MIN (ls->map_size, NUM_LANG_SET_MAP); + for (i = 0; i < count; i++) { if ((bits = ls->map[i])) { @@ -566,7 +599,7 @@ FcNameUnparseLangSet (FcStrBuf *buf, const FcLangSet *ls) if (!first) if (!FcStrBufChar (buf, '|')) return FcFalse; - if (!FcStrBufString (buf, fcLangCharSets[id].lang)) + if (!FcStrBufString (buf, fcLangCharSets[fcLangCharSetIndicesInv[id]].lang)) return FcFalse; first = FcFalse; } @@ -602,9 +635,11 @@ FcNameUnparseLangSet (FcStrBuf *buf, const FcLangSet *ls) FcBool FcLangSetEqual (const FcLangSet *lsa, const FcLangSet *lsb) { - int i; + int i, count; - for (i = 0; i < NUM_LANG_SET_MAP; i++) + count = FC_MIN (lsa->map_size, lsb->map_size); + count = FC_MIN (NUM_LANG_SET_MAP, count); + for (i = 0; i < count; i++) { if (lsa->map[i] != lsb->map[i]) return FcFalse; @@ -672,7 +707,7 @@ FcLangSetContainsLang (const FcLangSet *ls, const FcChar8 *lang) FcBool FcLangSetContains (const FcLangSet *lsa, const FcLangSet *lsb) { - int i, j; + int i, j, count; FcChar32 missing; if (FcDebug() & FC_DBG_MATCHV) @@ -684,7 +719,9 @@ FcLangSetContains (const FcLangSet *lsa, const FcLangSet *lsb) /* * check bitmaps for missing language support */ - for (i = 0; i < NUM_LANG_SET_MAP; i++) + count = FC_MIN (lsa->map_size, lsb->map_size); + count = FC_MIN (NUM_LANG_SET_MAP, count); + for (i = 0; i < count; i++) { missing = lsb->map[i] & ~lsa->map[i]; if (missing) @@ -693,10 +730,10 @@ FcLangSetContains (const FcLangSet *lsa, const FcLangSet *lsb) if (missing & (1 << j)) { if (!FcLangSetContainsLang (lsa, - fcLangCharSets[i*32 + j].lang)) + fcLangCharSets[fcLangCharSetIndicesInv[i*32 + j]].lang)) { if (FcDebug() & FC_DBG_MATCHV) - printf ("\tMissing bitmap %s\n", fcLangCharSets[i*32+j].lang); + printf ("\tMissing bitmap %s\n", fcLangCharSets[fcLangCharSetIndicesInv[i*32+j]].lang); return FcFalse; } } @@ -741,9 +778,44 @@ FcLangSetSerialize(FcSerialize *serialize, const FcLangSet *l) if (!l_serialize) return NULL; - *l_serialize = *l; + memset (l_serialize->map, '\0', sizeof (l_serialize->map)); + memcpy (l_serialize->map, l->map, FC_MIN (sizeof (l_serialize->map), l->map_size * sizeof (l->map[0]))); + l_serialize->map_size = NUM_LANG_SET_MAP; + l_serialize->extra = NULL; /* We don't serialize ls->extra */ return l_serialize; } + +FcStrSet * +FcLangSetGetLangs (const FcLangSet *ls) +{ + FcStrSet *langs; + int i; + + langs = FcStrSetCreate(); + if (!langs) + return 0; + + for (i = 0; i < NUM_LANG_CHAR_SET; i++) + if (FcLangSetBitGet (ls, i)) + FcStrSetAdd (langs, fcLangCharSets[i].lang); + + if (ls->extra) + { + FcStrList *list = FcStrListCreate (ls->extra); + FcChar8 *extra; + + if (list) + { + while ((extra = FcStrListNext (list))) + FcStrSetAdd (langs, extra); + + FcStrListDone (list); + } + } + + return langs; +} + #define __fclang__ #include "fcaliastail.h" #include "fcftaliastail.h" diff --git a/lib/fontconfig/src/fclist.c b/lib/fontconfig/src/fclist.c index 3de04a009..d804c1503 100644 --- a/lib/fontconfig/src/fclist.c +++ b/lib/fontconfig/src/fclist.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fclist.c,v 1.11tsi Exp $ + * fontconfig/src/fclist.c * * Copyright © 2000 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -350,7 +350,10 @@ FcGetDefaultObjectLangIndex (FcPattern *font, FcObject object) if (value.type == FcTypeString) { FcLangResult res = FcLangCompare (value.u.s, lang); - if (res == FcLangEqual || (res == FcLangDifferentCountry && idx < 0)) + if (res == FcLangEqual) + return i; + + if (res == FcLangDifferentCountry && idx < 0) idx = i; } } @@ -457,6 +460,7 @@ FcFontSetList (FcConfig *config, FcListHashTable table; int i; FcListBucket *bucket; + int destroy_os = 0; if (!config) { @@ -468,6 +472,13 @@ FcFontSetList (FcConfig *config, goto bail0; } FcListHashTableInit (&table); + + if (!os) + { + os = FcObjectGetSet (); + destroy_os = 1; + } + /* * Walk all available fonts adding those that * match to the hash table @@ -532,6 +543,8 @@ bail2: bail1: FcListHashTableCleanup (&table); bail0: + if (destroy_os) + FcObjectSetDestroy (os); return 0; } @@ -545,6 +558,9 @@ FcFontList (FcConfig *config, if (!config) { + if (!FcInitBringUptoDate ()) + return 0; + config = FcConfigGetCurrent (); if (!config) return 0; diff --git a/lib/fontconfig/src/fcmatch.c b/lib/fontconfig/src/fcmatch.c index f104e0540..aa84eda83 100644 --- a/lib/fontconfig/src/fcmatch.c +++ b/lib/fontconfig/src/fcmatch.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcmatch.c,v 1.20 2002/08/31 22:17:32 keithp Exp $ + * fontconfig/src/fcmatch.c * * Copyright © 2000 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -61,7 +61,7 @@ FcCompareNumber (FcValue *value1, FcValue *value2) static double FcCompareString (FcValue *v1, FcValue *v2) { - return (double) FcStrCmpIgnoreCase (fc_value_string(v1), fc_value_string(v2)) != 0; + return (double) FcStrCmpIgnoreCase (FcValueString(v1), FcValueString(v2)) != 0; } static double @@ -69,10 +69,11 @@ FcCompareFamily (FcValue *v1, FcValue *v2) { /* rely on the guarantee in FcPatternAddWithBinding that * families are always FcTypeString. */ - const FcChar8* v1_string = fc_value_string(v1); - const FcChar8* v2_string = fc_value_string(v2); + const FcChar8* v1_string = FcValueString(v1); + const FcChar8* v2_string = FcValueString(v2); - if (FcToLower(*v1_string) != FcToLower(*v2_string)) + if (FcToLower(*v1_string) != FcToLower(*v2_string) && + *v1_string != ' ' && *v2_string != ' ') return 1.0; return (double) FcStrCmpIgnoreBlanksAndCase (v1_string, v2_string) != 0; @@ -128,7 +129,7 @@ FcCompareLang (FcValue *v1, FcValue *v2) static double FcCompareBool (FcValue *v1, FcValue *v2) { - if (fc_storage_type(v2) != FcTypeBool || fc_storage_type(v1) != FcTypeBool) + if (v2->type != FcTypeBool || v1->type != FcTypeBool) return -1.0; return (double) v2->u.b != v1->u.b; } @@ -136,7 +137,7 @@ FcCompareBool (FcValue *v1, FcValue *v2) static double FcCompareCharSet (FcValue *v1, FcValue *v2) { - return (double) FcCharSetSubtractCount (fc_value_charset(v1), fc_value_charset(v2)); + return (double) FcCharSetSubtractCount (FcValueCharSet(v1), FcValueCharSet(v2)); } static double @@ -183,72 +184,43 @@ typedef struct _FcMatcher { * each value, earlier values are more significant than * later values */ -static FcMatcher _FcMatchers [] = { +static const FcMatcher _FcMatchers [] = { { FC_FOUNDRY_OBJECT, FcCompareString, 0, 0 }, #define MATCH_FOUNDRY 0 -#define MATCH_FOUNDRY_INDEX 0 - { FC_CHARSET_OBJECT, FcCompareCharSet, 1, 1 }, #define MATCH_CHARSET 1 -#define MATCH_CHARSET_INDEX 1 - { FC_FAMILY_OBJECT, FcCompareFamily, 2, 4 }, #define MATCH_FAMILY 2 -#define MATCH_FAMILY_STRONG_INDEX 2 -#define MATCH_FAMILY_WEAK_INDEX 4 - { FC_LANG_OBJECT, FcCompareLang, 3, 3 }, #define MATCH_LANG 3 #define MATCH_LANG_INDEX 3 - { FC_SPACING_OBJECT, FcCompareNumber, 5, 5 }, #define MATCH_SPACING 4 -#define MATCH_SPACING_INDEX 5 - { FC_PIXEL_SIZE_OBJECT, FcCompareSize, 6, 6 }, #define MATCH_PIXEL_SIZE 5 -#define MATCH_PIXEL_SIZE_INDEX 6 - { FC_STYLE_OBJECT, FcCompareString, 7, 7 }, #define MATCH_STYLE 6 -#define MATCH_STYLE_INDEX 7 - { FC_SLANT_OBJECT, FcCompareNumber, 8, 8 }, #define MATCH_SLANT 7 -#define MATCH_SLANT_INDEX 8 - { FC_WEIGHT_OBJECT, FcCompareNumber, 9, 9 }, #define MATCH_WEIGHT 8 -#define MATCH_WEIGHT_INDEX 9 - { FC_WIDTH_OBJECT, FcCompareNumber, 10, 10 }, #define MATCH_WIDTH 9 -#define MATCH_WIDTH_INDEX 10 - { FC_DECORATIVE_OBJECT, FcCompareBool, 11, 11 }, #define MATCH_DECORATIVE 10 -#define MATCH_DECORATIVE_INDEX 11 - { FC_ANTIALIAS_OBJECT, FcCompareBool, 12, 12 }, #define MATCH_ANTIALIAS 11 -#define MATCH_ANTIALIAS_INDEX 12 - { FC_RASTERIZER_OBJECT, FcCompareString, 13, 13 }, #define MATCH_RASTERIZER 12 -#define MATCH_RASTERIZER_INDEX 13 - { FC_OUTLINE_OBJECT, FcCompareBool, 14, 14 }, #define MATCH_OUTLINE 13 -#define MATCH_OUTLINE_INDEX 14 - { FC_FONTVERSION_OBJECT, FcCompareNumber, 15, 15 }, #define MATCH_FONTVERSION 14 -#define MATCH_FONTVERSION_INDEX 15 }; #define NUM_MATCH_VALUES 16 -static FcMatcher* +static const FcMatcher* FcObjectToMatcher (FcObject object) { int i; @@ -304,7 +276,7 @@ FcCompareValueList (FcObject object, FcValueListPtr v1, v2; double v, best, bestStrong, bestWeak; int j; - FcMatcher *match = FcObjectToMatcher(object); + const FcMatcher *match = FcObjectToMatcher(object); if (!match) { @@ -316,7 +288,7 @@ FcCompareValueList (FcObject object, best = 1e99; bestStrong = 1e99; bestWeak = 1e99; - j = 0; + j = 1; for (v1 = v1orig; v1; v1 = FcValueListNext(v1)) { for (v2 = v2orig; v2; v2 = FcValueListNext(v2)) @@ -327,7 +299,7 @@ FcCompareValueList (FcObject object, *result = FcResultTypeMismatch; return FcFalse; } - v = v * 100 + j; + v = v * 1000 + j; if (v < best) { if (bestValue) @@ -458,12 +430,12 @@ FcFontRenderPrepare (FcConfig *config, return new; } -FcPattern * -FcFontSetMatch (FcConfig *config, - FcFontSet **sets, - int nsets, - FcPattern *p, - FcResult *result) +static FcPattern * +FcFontSetMatchInternal (FcConfig *config, + FcFontSet **sets, + int nsets, + FcPattern *p, + FcResult *result) { double score[NUM_MATCH_VALUES], bestscore[NUM_MATCH_VALUES]; int f; @@ -480,12 +452,6 @@ FcFontSetMatch (FcConfig *config, printf ("Match "); FcPatternPrint (p); } - if (!config) - { - config = FcConfigGetCurrent (); - if (!config) - return 0; - } for (set = 0; set < nsets; set++) { s = sets[set]; @@ -528,6 +494,7 @@ FcFontSetMatch (FcConfig *config, printf ("Best score"); for (i = 0; i < NUM_MATCH_VALUES; i++) printf (" %g", bestscore[i]); + printf ("\n"); FcPatternPrint (best); } if (!best) @@ -535,7 +502,29 @@ FcFontSetMatch (FcConfig *config, *result = FcResultNoMatch; return 0; } - return FcFontRenderPrepare (config, p, best); + return best; +} + +FcPattern * +FcFontSetMatch (FcConfig *config, + FcFontSet **sets, + int nsets, + FcPattern *p, + FcResult *result) +{ + FcPattern *best; + + if (!config) + { + config = FcConfigGetCurrent (); + if (!config) + return 0; + } + best = FcFontSetMatchInternal (config, sets, nsets, p, result); + if (best) + return FcFontRenderPrepare (config, p, best); + else + return NULL; } FcPattern * @@ -545,6 +534,7 @@ FcFontMatch (FcConfig *config, { FcFontSet *sets[2]; int nsets; + FcPattern *best; if (!config) { @@ -557,7 +547,12 @@ FcFontMatch (FcConfig *config, sets[nsets++] = config->fonts[FcSetSystem]; if (config->fonts[FcSetApplication]) sets[nsets++] = config->fonts[FcSetApplication]; - return FcFontSetMatch (config, sets, nsets, p, result); + + best = FcFontSetMatchInternal (config, sets, nsets, p, result); + if (best) + return FcFontRenderPrepare (config, p, best); + else + return NULL; } typedef struct _FcSortNode { @@ -582,52 +577,71 @@ FcSortCompare (const void *aa, const void *ab) } static FcBool -FcSortWalk (FcSortNode **n, int nnode, FcFontSet *fs, FcCharSet **cs, FcBool trim, FcBool build_cs) +FcSortWalk (FcSortNode **n, int nnode, FcFontSet *fs, FcCharSet **csp, FcBool trim) { - FcCharSet *ncs; - FcSortNode *node; + FcBool ret = FcFalse; + FcCharSet *cs; + + cs = 0; + if (trim || csp) + { + cs = FcCharSetCreate (); + if (cs == NULL) + goto bail; + } while (nnode--) { - node = *n++; - if (FcPatternGetCharSet (node->pattern, FC_CHARSET, 0, &ncs) == - FcResultMatch) - { - /* - * If this font isn't a subset of the previous fonts, - * add it to the list - */ - if (!trim || !*cs || !FcCharSetIsSubset (ncs, *cs)) - { - if (trim || build_cs) - { - if (*cs) - { - ncs = FcCharSetUnion (ncs, *cs); - if (!ncs) - return FcFalse; - FcCharSetDestroy (*cs); - } - else - ncs = FcCharSetCopy (ncs); - *cs = ncs; - } + FcSortNode *node = *n++; + FcBool adds_chars = FcFalse; - FcPatternReference (node->pattern); - if (FcDebug () & FC_DBG_MATCHV) - { - printf ("Add "); - FcPatternPrint (node->pattern); - } - if (!FcFontSetAdd (fs, node->pattern)) - { - FcPatternDestroy (node->pattern); - return FcFalse; - } + /* + * Only fetch node charset if we'd need it + */ + if (cs) + { + FcCharSet *ncs; + + if (FcPatternGetCharSet (node->pattern, FC_CHARSET, 0, &ncs) != + FcResultMatch) + continue; + + if (!FcCharSetMerge (cs, ncs, &adds_chars)) + goto bail; + } + + /* + * If this font isn't a subset of the previous fonts, + * add it to the list + */ + if (!trim || adds_chars) + { + FcPatternReference (node->pattern); + if (FcDebug () & FC_DBG_MATCHV) + { + printf ("Add "); + FcPatternPrint (node->pattern); + } + if (!FcFontSetAdd (fs, node->pattern)) + { + FcPatternDestroy (node->pattern); + goto bail; } } } - return FcTrue; + if (csp) + { + *csp = cs; + cs = 0; + } + + ret = FcTrue; + +bail: + if (cs) + FcCharSetDestroy (cs); + + return ret; } void @@ -651,7 +665,6 @@ FcFontSetSort (FcConfig *config, FcSortNode **nodeps, **nodep; int nnodes; FcSortNode *new; - FcCharSet *cs; int set; int f; int i; @@ -766,7 +779,7 @@ FcFontSetSort (FcConfig *config, } } if (!satisfies) - nodeps[f]->score[MATCH_LANG_INDEX] = 1000.0; + nodeps[f]->score[MATCH_LANG_INDEX] = 10000.0; } /* @@ -779,19 +792,9 @@ FcFontSetSort (FcConfig *config, if (!ret) goto bail1; - cs = 0; - - if (!FcSortWalk (nodeps, nnodes, ret, &cs, trim, (csp!=0))) + if (!FcSortWalk (nodeps, nnodes, ret, csp, trim)) goto bail2; - if (csp) - *csp = cs; - else - { - if (cs) - FcCharSetDestroy (cs); - } - free (nodes); if (FcDebug() & FC_DBG_MATCH) @@ -802,8 +805,6 @@ FcFontSetSort (FcConfig *config, return ret; bail2: - if (cs) - FcCharSetDestroy (cs); FcFontSetDestroy (ret); bail1: free (nodes); diff --git a/lib/fontconfig/src/fcmatrix.c b/lib/fontconfig/src/fcmatrix.c index 7f551460c..1d6e2f6b0 100644 --- a/lib/fontconfig/src/fcmatrix.c +++ b/lib/fontconfig/src/fcmatrix.c @@ -1,5 +1,5 @@ /* - * $RCSId: $ + * fontconfig/src/fcmatrix.c * * Copyright © 2000 Tuomas J. Lukka * diff --git a/lib/fontconfig/src/fcname.c b/lib/fontconfig/src/fcname.c index 7a5371b54..b4ce94421 100644 --- a/lib/fontconfig/src/fcname.c +++ b/lib/fontconfig/src/fcname.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcname.c,v 1.15 2002/09/26 00:17:28 keithp Exp $ + * fontconfig/src/fcname.c * * Copyright © 2000 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -327,6 +327,20 @@ FcObjectFromName (const char * name) return 0; } +FcObjectSet * +FcObjectGetSet (void) +{ + int i; + FcObjectSet *os = NULL; + + + os = FcObjectSetCreate (); + for (i = 0; i < FcObjectsNumber; i++) + FcObjectSetAdd (os, FcObjects[i].object); + + return os; +} + FcBool FcObjectInit (void) { @@ -769,7 +783,7 @@ FcNameUnparseString (FcStrBuf *buf, return FcTrue; } -static FcBool +FcBool FcNameUnparseValue (FcStrBuf *buf, FcValue *v0, FcChar8 *escape) @@ -804,7 +818,7 @@ FcNameUnparseValue (FcStrBuf *buf, return FcFalse; } -static FcBool +FcBool FcNameUnparseValueList (FcStrBuf *buf, FcValueListPtr v, FcChar8 *escape) diff --git a/lib/fontconfig/src/fcpat.c b/lib/fontconfig/src/fcpat.c index 35127f2a3..76263b655 100644 --- a/lib/fontconfig/src/fcpat.c +++ b/lib/fontconfig/src/fcpat.c @@ -11,9 +11,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -27,7 +27,7 @@ #include static FcBool -FcStrHashed (const FcChar8 *name); +FcHashOwnsName(const FcChar8 *name); FcPattern * FcPatternCreate (void) @@ -50,7 +50,7 @@ FcValueDestroy (FcValue v) { switch (v.type) { case FcTypeString: - if (!FcStrHashed (v.u.s)) + if (!FcHashOwnsName(v.u.s)) FcStrFree ((FcChar8 *) v.u.s); break; case FcTypeMatrix: @@ -75,15 +75,15 @@ FcValueCanonicalize (const FcValue *v) switch (v->type) { case FcTypeString: - new.u.s = fc_value_string(v); + new.u.s = FcValueString(v); new.type = FcTypeString; break; case FcTypeCharSet: - new.u.c = fc_value_charset(v); + new.u.c = FcValueCharSet(v); new.type = FcTypeCharSet; break; case FcTypeLangSet: - new.u.l = fc_value_langset(v); + new.u.l = FcValueLangSet(v); new.type = FcTypeLangSet; break; default: @@ -98,7 +98,7 @@ FcValueSave (FcValue v) { switch (v.type) { case FcTypeString: - v.u.s = FcStrCopy (v.u.s); + v.u.s = FcStrStaticName (v.u.s); if (!v.u.s) v.type = FcTypeVoid; break; @@ -131,7 +131,7 @@ FcValueListDestroy (FcValueListPtr l) { switch (l->value.type) { case FcTypeString: - if (!FcStrHashed ((FcChar8 *)l->value.u.s)) + if (!FcHashOwnsName((FcChar8 *)l->value.u.s)) FcStrFree ((FcChar8 *)l->value.u.s); break; case FcTypeMatrix: @@ -220,7 +220,7 @@ FcStringHash (const FcChar8 *s) static FcChar32 FcValueHash (const FcValue *v) { - switch (fc_storage_type(v)) { + switch (v->type) { case FcTypeVoid: return 0; case FcTypeInteger: @@ -228,7 +228,7 @@ FcValueHash (const FcValue *v) case FcTypeDouble: return FcDoubleHash (v->u.d); case FcTypeString: - return FcStringHash (fc_value_string(v)); + return FcStringHash (FcValueString(v)); case FcTypeBool: return (FcChar32) v->u.b; case FcTypeMatrix: @@ -237,12 +237,12 @@ FcValueHash (const FcValue *v) FcDoubleHash (v->u.m->yx) ^ FcDoubleHash (v->u.m->yy)); case FcTypeCharSet: - return (FcChar32) fc_value_charset(v)->num; + return (FcChar32) FcValueCharSet(v)->num; case FcTypeFTFace: return FcStringHash ((const FcChar8 *) ((FT_Face) v->u.f)->family_name) ^ FcStringHash ((const FcChar8 *) ((FT_Face) v->u.f)->style_name); case FcTypeLangSet: - return FcLangSetHash (fc_value_langset(v)); + return FcLangSetHash (FcValueLangSet(v)); } return FcFalse; } @@ -482,15 +482,7 @@ FcPatternObjectAddWithBinding (FcPattern *p, memset(new, 0, sizeof (FcValueList)); FcMemAlloc (FC_MEM_VALLIST, sizeof (FcValueList)); - /* dup string */ - if (value.type == FcTypeString) - { - value.u.s = FcStrStaticName (value.u.s); - if (!value.u.s) - value.type = FcTypeVoid; - } - else - value = FcValueSave (value); + value = FcValueSave (value); if (value.type == FcTypeVoid) goto bail1; @@ -954,23 +946,23 @@ FcPatternReference (FcPattern *p) } FcPattern * -FcPatternVaBuild (FcPattern *orig, va_list va) +FcPatternVaBuild (FcPattern *p, va_list va) { FcPattern *ret; - FcPatternVapBuild (ret, orig, va); + FcPatternVapBuild (ret, p, va); return ret; } FcPattern * -FcPatternBuild (FcPattern *orig, ...) +FcPatternBuild (FcPattern *p, ...) { va_list va; - va_start (va, orig); - FcPatternVapBuild (orig, orig, va); + va_start (va, p); + FcPatternVapBuild (p, p, va); va_end (va); - return orig; + return p; } /* @@ -997,6 +989,43 @@ FcPatternAppend (FcPattern *p, FcPattern *s) return FcTrue; } +FcPattern * +FcPatternFilter (FcPattern *p, const FcObjectSet *os) +{ + int i; + FcPattern *ret; + FcPatternElt *e; + FcValueListPtr v; + + if (!os) + return FcPatternDuplicate (p); + + ret = FcPatternCreate (); + if (!ret) + return NULL; + + for (i = 0; i < os->nobject; i++) + { + FcObject object = FcObjectFromName (os->objects[i]); + e = FcPatternObjectFindElt (p, object); + if (e) + { + for (v = FcPatternEltValues(e); v; v = FcValueListNext(v)) + { + if (!FcPatternObjectAddWithBinding (ret, e->object, + FcValueCanonicalize(&v->value), + v->binding, FcTrue)) + goto bail0; + } + } + } + return ret; + +bail0: + FcPatternDestroy (ret); + return NULL; +} + #define OBJECT_HASH_SIZE 31 static struct objectBucket { struct objectBucket *next; @@ -1004,14 +1033,14 @@ static struct objectBucket { } *FcObjectBuckets[OBJECT_HASH_SIZE]; static FcBool -FcStrHashed (const FcChar8 *name) +FcHashOwnsName (const FcChar8 *name) { FcChar32 hash = FcStringHash (name); struct objectBucket **p; struct objectBucket *b; for (p = &FcObjectBuckets[hash % OBJECT_HASH_SIZE]; (b = *p); p = &(b->next)) - if (b->hash == hash && !strcmp ((char *)name, (char *) (b + 1))) + if (b->hash == hash && ((char *)name == (char *) (b + 1))) return FcTrue; return FcFalse; } diff --git a/lib/fontconfig/src/fcserialize.c b/lib/fontconfig/src/fcserialize.c index a66d3889a..e5ec90bde 100644 --- a/lib/fontconfig/src/fcserialize.c +++ b/lib/fontconfig/src/fcserialize.c @@ -22,14 +22,6 @@ #include "fcint.h" -typedef union _FcAlign { - double d; - int i; - intptr_t ip; - FcBool b; - void *p; -} FcAlign; - intptr_t FcAlignSize (intptr_t size) { diff --git a/lib/fontconfig/src/fcstr.c b/lib/fontconfig/src/fcstr.c index f56f823bc..ea7c376c2 100644 --- a/lib/fontconfig/src/fcstr.c +++ b/lib/fontconfig/src/fcstr.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcstr.c,v 1.10 2002/08/31 22:17:32 keithp Exp $ + * fontconfig/src/fcstr.c * * Copyright © 2000 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -710,11 +710,18 @@ FcUtf16Len (const FcChar8 *string, void FcStrBufInit (FcStrBuf *buf, FcChar8 *init, int size) { - buf->buf = init; + if (init) + { + buf->buf = init; + buf->size = size; + } else + { + buf->buf = buf->buf_static; + buf->size = sizeof (buf->buf_static); + } buf->allocated = FcFalse; buf->failed = FcFalse; buf->len = 0; - buf->size = size; } void @@ -733,7 +740,10 @@ FcStrBufDone (FcStrBuf *buf) { FcChar8 *ret; - ret = malloc (buf->len + 1); + if (buf->failed) + ret = NULL; + else + ret = malloc (buf->len + 1); if (ret) { FcMemAlloc (FC_MEM_STRING, buf->len + 1); @@ -744,6 +754,17 @@ FcStrBufDone (FcStrBuf *buf) return ret; } +FcChar8 * +FcStrBufDoneStatic (FcStrBuf *buf) +{ + FcStrBufChar (buf, '\0'); + + if (buf->failed) + return NULL; + + return buf->buf; +} + FcBool FcStrBufChar (FcStrBuf *buf, FcChar8 c) { @@ -752,6 +773,9 @@ FcStrBufChar (FcStrBuf *buf, FcChar8 c) FcChar8 *new; int size; + if (buf->failed) + return FcFalse; + if (buf->allocated) { size = buf->size * 2; @@ -902,6 +926,9 @@ FcStrCanonAbsoluteFilename (const FcChar8 *s) if (slash) { switch (s - slash) { + case 1: + f -= 1; /* squash // and trim final / from file */ + break; case 2: if (!strncmp ((char *) slash, "/.", 2)) { @@ -940,7 +967,13 @@ FcConvertDosPath (char *str) char *dest = str; char *end = str + len; char last = 0; - + + if (*p == '\\') + { + *p = '/'; + p++; + dest++; + } while (p < end) { if (*p == '\\') @@ -965,10 +998,8 @@ FcStrCanonFilename (const FcChar8 *s) { #ifdef _WIN32 FcChar8 full[FC_MAX_FILE_LEN + 2]; - FcChar8 basename[FC_MAX_FILE_LEN + 2]; int size = GetFullPathName (s, sizeof (full) -1, - full, - basename); + full, NULL); if (size == 0) perror ("GetFullPathName"); diff --git a/lib/fontconfig/src/fcxml.c b/lib/fontconfig/src/fcxml.c index 90c079add..9428468a4 100644 --- a/lib/fontconfig/src/fcxml.c +++ b/lib/fontconfig/src/fcxml.c @@ -1,5 +1,5 @@ /* - * $RCSId: xc/lib/fontconfig/src/fcxml.c,v 1.21 2002/08/22 18:53:22 keithp Exp $ + * fontconfig/src/fcxml.c * * Copyright © 2002 Keith Packard * @@ -13,9 +13,9 @@ * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -53,11 +53,15 @@ #endif /* ENABLE_LIBXML2 */ #ifdef _WIN32 +#define _WIN32_WINNT 0x0500 #define STRICT #include #undef STRICT +#include #endif +static void +FcExprDestroy (FcExpr *e); void FcTestDestroy (FcTest *test) @@ -69,125 +73,96 @@ FcTestDestroy (FcTest *test) free (test); } -FcExpr * -FcExprCreateInteger (int i) +static FcExpr * +FcExprCreateInteger (FcConfig *config, int i) { - FcExpr *e = (FcExpr *) malloc (sizeof (FcExpr)); - + FcExpr *e = FcConfigAllocExpr (config); if (e) { - FcMemAlloc (FC_MEM_EXPR, sizeof (FcExpr)); e->op = FcOpInteger; e->u.ival = i; } return e; } -FcExpr * -FcExprCreateDouble (double d) +static FcExpr * +FcExprCreateDouble (FcConfig *config, double d) { - FcExpr *e = (FcExpr *) malloc (sizeof (FcExpr)); - + FcExpr *e = FcConfigAllocExpr (config); if (e) { - FcMemAlloc (FC_MEM_EXPR, sizeof (FcExpr)); e->op = FcOpDouble; e->u.dval = d; } return e; } -FcExpr * -FcExprCreateString (const FcChar8 *s) +static FcExpr * +FcExprCreateString (FcConfig *config, const FcChar8 *s) { - FcExpr *e = (FcExpr *) malloc (sizeof (FcExpr)); - + FcExpr *e = FcConfigAllocExpr (config); if (e) { - FcMemAlloc (FC_MEM_EXPR, sizeof (FcExpr)); e->op = FcOpString; - e->u.sval = FcStrCopy (s); + e->u.sval = FcStrStaticName (s); } return e; } -FcExpr * -FcExprCreateMatrix (const FcMatrix *m) +static FcExpr * +FcExprCreateMatrix (FcConfig *config, const FcMatrix *m) { - FcExpr *e = (FcExpr *) malloc (sizeof (FcExpr)); - + FcExpr *e = FcConfigAllocExpr (config); if (e) { - FcMemAlloc (FC_MEM_EXPR, sizeof (FcExpr)); e->op = FcOpMatrix; e->u.mval = FcMatrixCopy (m); } return e; } -FcExpr * -FcExprCreateBool (FcBool b) +static FcExpr * +FcExprCreateBool (FcConfig *config, FcBool b) { - FcExpr *e = (FcExpr *) malloc (sizeof (FcExpr)); - + FcExpr *e = FcConfigAllocExpr (config); if (e) { - FcMemAlloc (FC_MEM_EXPR, sizeof (FcExpr)); e->op = FcOpBool; e->u.bval = b; } return e; } -FcExpr * -FcExprCreateNil (void) +static FcExpr * +FcExprCreateField (FcConfig *config, const char *field) { - FcExpr *e = (FcExpr *) malloc (sizeof (FcExpr)); - + FcExpr *e = FcConfigAllocExpr (config); if (e) { - FcMemAlloc (FC_MEM_EXPR, sizeof (FcExpr)); - e->op = FcOpNil; - } - return e; -} - -FcExpr * -FcExprCreateField (const char *field) -{ - FcExpr *e = (FcExpr *) malloc (sizeof (FcExpr)); - - if (e) - { - FcMemAlloc (FC_MEM_EXPR, sizeof (FcExpr)); e->op = FcOpField; e->u.object = FcObjectFromName (field); } return e; } -FcExpr * -FcExprCreateConst (const FcChar8 *constant) +static FcExpr * +FcExprCreateConst (FcConfig *config, const FcChar8 *constant) { - FcExpr *e = (FcExpr *) malloc (sizeof (FcExpr)); - + FcExpr *e = FcConfigAllocExpr (config); if (e) { - FcMemAlloc (FC_MEM_EXPR, sizeof (FcExpr)); e->op = FcOpConst; - e->u.constant = FcStrCopy (constant); + e->u.constant = FcStrStaticName (constant); } return e; } -FcExpr * -FcExprCreateOp (FcExpr *left, FcOp op, FcExpr *right) +static FcExpr * +FcExprCreateOp (FcConfig *config, FcExpr *left, FcOp op, FcExpr *right) { - FcExpr *e = (FcExpr *) malloc (sizeof (FcExpr)); - + FcExpr *e = FcConfigAllocExpr (config); if (e) { - FcMemAlloc (FC_MEM_EXPR, sizeof (FcExpr)); e->op = op; e->u.tree.left = left; e->u.tree.right = right; @@ -195,7 +170,7 @@ FcExprCreateOp (FcExpr *left, FcOp op, FcExpr *right) return e; } -void +static void FcExprDestroy (FcExpr *e) { if (!e) @@ -206,7 +181,6 @@ FcExprDestroy (FcExpr *e) case FcOpDouble: break; case FcOpString: - FcStrFree (e->u.sval); break; case FcOpMatrix: FcMatrixFree (e->u.mval); @@ -219,7 +193,6 @@ FcExprDestroy (FcExpr *e) case FcOpField: break; case FcOpConst: - FcStrFree (e->u.constant); break; case FcOpAssign: case FcOpAssignReplace: @@ -258,8 +231,8 @@ FcExprDestroy (FcExpr *e) case FcOpInvalid: break; } - FcMemFree (FC_MEM_EXPR, sizeof (FcExpr)); - free (e); + + e->op = FcOpNil; } void @@ -272,12 +245,6 @@ FcEditDestroy (FcEdit *e) free (e); } -char * -FcConfigSaveField (const char *field) -{ - return (char *) FcStrCopy ((FcChar8 *) field); -} - typedef enum _FcElement { FcElementNone, FcElementFontconfig, @@ -414,6 +381,7 @@ typedef struct _FcPStack { FcElement element; FcChar8 **attr; FcStrBuf str; + FcChar8 *attr_buf_static[16]; } FcPStack; typedef enum _FcVStackTag { @@ -450,7 +418,7 @@ typedef struct _FcVStack { int integer; double _double; FcMatrix *matrix; - FcBool bool; + FcBool bool_; FcTest *test; FcQual qual; @@ -469,6 +437,10 @@ typedef struct _FcConfigParse { const FcChar8 *name; FcConfig *config; XML_Parser parser; + int pstack_static_used; + FcPStack pstack_static[8]; + int vstack_static_used; + FcVStack vstack_static[64]; } FcConfigParse; typedef enum _FcConfigSeverity { @@ -697,186 +669,130 @@ FcEditCreate (FcConfigParse *parse, return e; } -static void -FcVStackPush (FcConfigParse *parse, FcVStack *vstack) -{ - vstack->prev = parse->vstack; - vstack->pstack = parse->pstack ? parse->pstack->prev : 0; - parse->vstack = vstack; -} - static FcVStack * -FcVStackCreate (void) +FcVStackCreateAndPush (FcConfigParse *parse) { FcVStack *new; - new = malloc (sizeof (FcVStack)); - if (!new) - return 0; - FcMemAlloc (FC_MEM_VSTACK, sizeof (FcVStack)); + if (parse->vstack_static_used < sizeof (parse->vstack_static) / sizeof (parse->vstack_static[0])) + new = &parse->vstack_static[parse->vstack_static_used++]; + else + { + new = malloc (sizeof (FcVStack)); + if (!new) + return 0; + FcMemAlloc (FC_MEM_VSTACK, sizeof (FcVStack)); + } new->tag = FcVStackNone; new->prev = 0; + + new->prev = parse->vstack; + new->pstack = parse->pstack ? parse->pstack->prev : 0; + parse->vstack = new; + return new; } -static void -FcVStackDestroy (FcVStack *vstack) -{ - FcVStack *prev; - - for (; vstack; vstack = prev) - { - prev = vstack->prev; - switch (vstack->tag) { - case FcVStackNone: - break; - case FcVStackString: - case FcVStackFamily: - case FcVStackField: - case FcVStackConstant: - case FcVStackGlob: - FcStrFree (vstack->u.string); - break; - case FcVStackPattern: - FcPatternDestroy (vstack->u.pattern); - break; - case FcVStackInteger: - case FcVStackDouble: - break; - case FcVStackMatrix: - FcMatrixFree (vstack->u.matrix); - break; - case FcVStackBool: - break; - case FcVStackTest: - FcTestDestroy (vstack->u.test); - break; - case FcVStackExpr: - case FcVStackPrefer: - case FcVStackAccept: - case FcVStackDefault: - FcExprDestroy (vstack->u.expr); - break; - case FcVStackEdit: - FcEditDestroy (vstack->u.edit); - break; - } - FcMemFree (FC_MEM_VSTACK, sizeof (FcVStack)); - free (vstack); - } -} - static FcBool FcVStackPushString (FcConfigParse *parse, FcVStackTag tag, FcChar8 *string) { - FcVStack *vstack = FcVStackCreate (); + FcVStack *vstack = FcVStackCreateAndPush (parse); if (!vstack) return FcFalse; vstack->u.string = string; vstack->tag = tag; - FcVStackPush (parse, vstack); return FcTrue; } static FcBool FcVStackPushInteger (FcConfigParse *parse, int integer) { - FcVStack *vstack = FcVStackCreate (); + FcVStack *vstack = FcVStackCreateAndPush (parse); if (!vstack) return FcFalse; vstack->u.integer = integer; vstack->tag = FcVStackInteger; - FcVStackPush (parse, vstack); return FcTrue; } static FcBool FcVStackPushDouble (FcConfigParse *parse, double _double) { - FcVStack *vstack = FcVStackCreate (); + FcVStack *vstack = FcVStackCreateAndPush (parse); if (!vstack) return FcFalse; vstack->u._double = _double; vstack->tag = FcVStackDouble; - FcVStackPush (parse, vstack); return FcTrue; } static FcBool FcVStackPushMatrix (FcConfigParse *parse, FcMatrix *matrix) { - FcVStack *vstack = FcVStackCreate (); - if (!vstack) - return FcFalse; + FcVStack *vstack; matrix = FcMatrixCopy (matrix); if (!matrix) - { - FcVStackDestroy (vstack); return FcFalse; - } + vstack = FcVStackCreateAndPush (parse); + if (!vstack) + return FcFalse; vstack->u.matrix = matrix; vstack->tag = FcVStackMatrix; - FcVStackPush (parse, vstack); return FcTrue; } static FcBool -FcVStackPushBool (FcConfigParse *parse, FcBool bool) +FcVStackPushBool (FcConfigParse *parse, FcBool bool_) { - FcVStack *vstack = FcVStackCreate (); + FcVStack *vstack = FcVStackCreateAndPush (parse); if (!vstack) return FcFalse; - vstack->u.bool = bool; + vstack->u.bool_ = bool_; vstack->tag = FcVStackBool; - FcVStackPush (parse, vstack); return FcTrue; } static FcBool FcVStackPushTest (FcConfigParse *parse, FcTest *test) { - FcVStack *vstack = FcVStackCreate (); + FcVStack *vstack = FcVStackCreateAndPush (parse); if (!vstack) return FcFalse; vstack->u.test = test; vstack->tag = FcVStackTest; - FcVStackPush (parse, vstack); return FcTrue; } static FcBool FcVStackPushExpr (FcConfigParse *parse, FcVStackTag tag, FcExpr *expr) { - FcVStack *vstack = FcVStackCreate (); + FcVStack *vstack = FcVStackCreateAndPush (parse); if (!vstack) return FcFalse; vstack->u.expr = expr; vstack->tag = tag; - FcVStackPush (parse, vstack); return FcTrue; } static FcBool FcVStackPushEdit (FcConfigParse *parse, FcEdit *edit) { - FcVStack *vstack = FcVStackCreate (); + FcVStack *vstack = FcVStackCreateAndPush (parse); if (!vstack) return FcFalse; vstack->u.edit = edit; vstack->tag = FcVStackEdit; - FcVStackPush (parse, vstack); return FcTrue; } static FcBool FcVStackPushPattern (FcConfigParse *parse, FcPattern *pattern) { - FcVStack *vstack = FcVStackCreate (); + FcVStack *vstack = FcVStackCreateAndPush (parse); if (!vstack) return FcFalse; vstack->u.pattern = pattern; vstack->tag = FcVStackPattern; - FcVStackPush (parse, vstack); return FcTrue; } @@ -889,28 +805,74 @@ FcVStackFetch (FcConfigParse *parse, int off) return vstack; } -static void -FcVStackClear (FcConfigParse *parse) +static FcVStack * +FcVStackPeek (FcConfigParse *parse) { - while (parse->vstack && parse->vstack->pstack == parse->pstack) - { - FcVStack *vstack = parse->vstack; - parse->vstack = vstack->prev; - vstack->prev = 0; - FcVStackDestroy (vstack); - } + FcVStack *vstack = parse->vstack; + + return vstack && vstack->pstack == parse->pstack ? vstack : 0; } -static FcVStack * -FcVStackPop (FcConfigParse *parse) +static void +FcVStackPopAndDestroy (FcConfigParse *parse) { FcVStack *vstack = parse->vstack; if (!vstack || vstack->pstack != parse->pstack) - return 0; + return; + parse->vstack = vstack->prev; - vstack->prev = 0; - return vstack; + + switch (vstack->tag) { + case FcVStackNone: + break; + case FcVStackFamily: + break; + case FcVStackString: + case FcVStackField: + case FcVStackConstant: + case FcVStackGlob: + FcStrFree (vstack->u.string); + break; + case FcVStackPattern: + FcPatternDestroy (vstack->u.pattern); + break; + case FcVStackInteger: + case FcVStackDouble: + break; + case FcVStackMatrix: + FcMatrixFree (vstack->u.matrix); + break; + case FcVStackBool: + break; + case FcVStackTest: + FcTestDestroy (vstack->u.test); + break; + case FcVStackExpr: + case FcVStackPrefer: + case FcVStackAccept: + case FcVStackDefault: + FcExprDestroy (vstack->u.expr); + break; + case FcVStackEdit: + FcEditDestroy (vstack->u.edit); + break; + } + + if (vstack == &parse->vstack_static[parse->vstack_static_used - 1]) + parse->vstack_static_used--; + else + { + FcMemFree (FC_MEM_VSTACK, sizeof (FcVStack)); + free (vstack); + } +} + +static void +FcVStackClear (FcConfigParse *parse) +{ + while (FcVStackPeek (parse)) + FcVStackPopAndDestroy (parse); } static int @@ -927,7 +889,7 @@ FcVStackElements (FcConfigParse *parse) } static FcChar8 ** -FcConfigSaveAttr (const XML_Char **attr) +FcConfigSaveAttr (const XML_Char **attr, FcChar8 **buf, int size_bytes) { int slen; int i; @@ -939,10 +901,21 @@ FcConfigSaveAttr (const XML_Char **attr) slen = 0; for (i = 0; attr[i]; i++) slen += strlen ((char *) attr[i]) + 1; - new = malloc ((i + 1) * sizeof (FcChar8 *) + slen); - if (!new) + if (i == 0) return 0; - FcMemAlloc (FC_MEM_ATTR, 1); /* size is too expensive */ + slen += (i + 1) * sizeof (FcChar8 *); + if (slen <= size_bytes) + new = buf; + else + { + new = malloc (slen); + if (!new) + { + FcConfigMessage (0, FcSevereError, "out of memory"); + return 0; + } + FcMemAlloc (FC_MEM_ATTR, 1); /* size is too expensive */ + } s = (FcChar8 *) (new + (i + 1)); for (i = 0; attr[i]; i++) { @@ -957,26 +930,21 @@ FcConfigSaveAttr (const XML_Char **attr) static FcBool FcPStackPush (FcConfigParse *parse, FcElement element, const XML_Char **attr) { - FcPStack *new = malloc (sizeof (FcPStack)); + FcPStack *new; + + if (parse->pstack_static_used < sizeof (parse->pstack_static) / sizeof (parse->pstack_static[0])) + new = &parse->pstack_static[parse->pstack_static_used++]; + else + { + new = malloc (sizeof (FcPStack)); + if (!new) + return FcFalse; + FcMemAlloc (FC_MEM_PSTACK, sizeof (FcPStack)); + } - if (!new) - return FcFalse; - FcMemAlloc (FC_MEM_PSTACK, sizeof (FcPStack)); new->prev = parse->pstack; new->element = element; - if (attr) - { - new->attr = FcConfigSaveAttr (attr); - if (!new->attr) - { - FcConfigMessage (parse, FcSevereError, "out of memory"); - FcMemFree (FC_MEM_PSTACK, sizeof (FcPStack)); - free (new); - return FcFalse; - } - } - else - new->attr = 0; + new->attr = FcConfigSaveAttr (attr, new->attr_buf_static, sizeof (new->attr_buf_static)); FcStrBufInit (&new->str, 0, 0); parse->pstack = new; return FcTrue; @@ -996,13 +964,19 @@ FcPStackPop (FcConfigParse *parse) old = parse->pstack; parse->pstack = old->prev; FcStrBufDestroy (&old->str); - if (old->attr) + if (old->attr && old->attr != old->attr_buf_static) { FcMemFree (FC_MEM_ATTR, 1); /* size is to expensive */ free (old->attr); } - FcMemFree (FC_MEM_PSTACK, sizeof (FcPStack)); - free (old); + + if (old == &parse->pstack_static[parse->pstack_static_used - 1]) + parse->pstack_static_used--; + else + { + FcMemFree (FC_MEM_PSTACK, sizeof (FcPStack)); + free (old); + } return FcTrue; } @@ -1010,7 +984,9 @@ static FcBool FcConfigInit (FcConfigParse *parse, const FcChar8 *name, FcConfig *config, XML_Parser parser) { parse->pstack = 0; + parse->pstack_static_used = 0; parse->vstack = 0; + parse->vstack_static_used = 0; parse->error = FcFalse; parse->name = name; parse->config = config; @@ -1114,7 +1090,7 @@ FcParseInt (FcConfigParse *parse) if (!parse->pstack) return; - s = FcStrBufDone (&parse->pstack->str); + s = FcStrBufDoneStatic (&parse->pstack->str); if (!s) { FcConfigMessage (parse, FcSevereError, "out of memory"); @@ -1126,7 +1102,7 @@ FcParseInt (FcConfigParse *parse) FcConfigMessage (parse, FcSevereError, "\"%s\": not a valid integer", s); else FcVStackPushInteger (parse, l); - FcStrFree (s); + FcStrBufDestroy (&parse->pstack->str); } /* @@ -1195,7 +1171,7 @@ FcParseDouble (FcConfigParse *parse) if (!parse->pstack) return; - s = FcStrBufDone (&parse->pstack->str); + s = FcStrBufDoneStatic (&parse->pstack->str); if (!s) { FcConfigMessage (parse, FcSevereError, "out of memory"); @@ -1207,7 +1183,7 @@ FcParseDouble (FcConfigParse *parse) FcConfigMessage (parse, FcSevereError, "\"%s\": not a valid double", s); else FcVStackPushDouble (parse, d); - FcStrFree (s); + FcStrBufDestroy (&parse->pstack->str); } static void @@ -1234,7 +1210,7 @@ FcParseMatrix (FcConfigParse *parse) enum { m_done, m_xx, m_xy, m_yx, m_yy } matrix_state = m_yy; FcMatrix m; - while ((vstack = FcVStackPop (parse))) + while ((vstack = FcVStackPeek (parse))) { double v; switch (vstack->tag) { @@ -1256,7 +1232,7 @@ FcParseMatrix (FcConfigParse *parse) case m_yy: m.yy = v; break; default: break; } - FcVStackDestroy (vstack); + FcVStackPopAndDestroy (parse); matrix_state--; } if (matrix_state != m_done) @@ -1266,13 +1242,13 @@ FcParseMatrix (FcConfigParse *parse) } static FcBool -FcConfigLexBool (FcConfigParse *parse, const FcChar8 *bool) +FcConfigLexBool (FcConfigParse *parse, const FcChar8 *bool_) { FcBool result = FcFalse; - if (!FcNameBool (bool, &result)) + if (!FcNameBool (bool_, &result)) FcConfigMessage (parse, FcSevereWarning, "\"%s\" is not known boolean", - bool); + bool_); return result; } @@ -1283,14 +1259,14 @@ FcParseBool (FcConfigParse *parse) if (!parse->pstack) return; - s = FcStrBufDone (&parse->pstack->str); + s = FcStrBufDoneStatic (&parse->pstack->str); if (!s) { FcConfigMessage (parse, FcSevereError, "out of memory"); return; } FcVStackPushBool (parse, FcConfigLexBool (parse, s)); - FcStrFree (s); + FcStrBufDestroy (&parse->pstack->str); } static FcBool @@ -1326,20 +1302,20 @@ FcParseFamilies (FcConfigParse *parse, FcVStackTag tag) FcVStack *vstack; FcExpr *left, *expr = 0, *new; - while ((vstack = FcVStackPop (parse))) + while ((vstack = FcVStackPeek (parse))) { if (vstack->tag != FcVStackFamily) { FcConfigMessage (parse, FcSevereWarning, "non-family"); - FcVStackDestroy (vstack); + FcVStackPopAndDestroy (parse); continue; } left = vstack->u.expr; vstack->tag = FcVStackNone; - FcVStackDestroy (vstack); + FcVStackPopAndDestroy (parse); if (expr) { - new = FcExprCreateOp (left, FcOpComma, expr); + new = FcExprCreateOp (parse->config, left, FcOpComma, expr); if (!new) { FcConfigMessage (parse, FcSevereError, "out of memory"); @@ -1370,14 +1346,14 @@ FcParseFamily (FcConfigParse *parse) if (!parse->pstack) return; - s = FcStrBufDone (&parse->pstack->str); + s = FcStrBufDoneStatic (&parse->pstack->str); if (!s) { FcConfigMessage (parse, FcSevereError, "out of memory"); return; } - expr = FcExprCreateString (s); - FcStrFree (s); + expr = FcExprCreateString (parse->config, s); + FcStrBufDestroy (&parse->pstack->str); if (expr) FcVStackPushExpr (parse, FcVStackFamily, expr); } @@ -1393,13 +1369,13 @@ FcParseAlias (FcConfigParse *parse) if (!FcConfigLexBinding (parse, FcConfigGetAttribute (parse, "binding"), &binding)) return; - while ((vstack = FcVStackPop (parse))) + while ((vstack = FcVStackPeek (parse))) { switch (vstack->tag) { case FcVStackFamily: if (family) { - new = FcExprCreateOp (vstack->u.expr, FcOpComma, family); + new = FcExprCreateOp (parse->config, vstack->u.expr, FcOpComma, family); if (!new) FcConfigMessage (parse, FcSevereError, "out of memory"); else @@ -1435,7 +1411,7 @@ FcParseAlias (FcConfigParse *parse) FcConfigMessage (parse, FcSevereWarning, "bad alias"); break; } - FcVStackDestroy (vstack); + FcVStackPopAndDestroy (parse); } if (!family) { @@ -1504,7 +1480,7 @@ FcParseAlias (FcConfigParse *parse) static FcExpr * FcPopExpr (FcConfigParse *parse) { - FcVStack *vstack = FcVStackPop (parse); + FcVStack *vstack = FcVStackPeek (parse); FcExpr *expr = 0; if (!vstack) return 0; @@ -1513,13 +1489,13 @@ FcPopExpr (FcConfigParse *parse) break; case FcVStackString: case FcVStackFamily: - expr = FcExprCreateString (vstack->u.string); + expr = FcExprCreateString (parse->config, vstack->u.string); break; case FcVStackField: - expr = FcExprCreateField ((char *) vstack->u.string); + expr = FcExprCreateField (parse->config, (char *) vstack->u.string); break; case FcVStackConstant: - expr = FcExprCreateConst (vstack->u.string); + expr = FcExprCreateConst (parse->config, vstack->u.string); break; case FcVStackGlob: /* XXX: What's the correct action here? (CDW) */ @@ -1531,16 +1507,16 @@ FcPopExpr (FcConfigParse *parse) vstack->tag = FcVStackNone; break; case FcVStackInteger: - expr = FcExprCreateInteger (vstack->u.integer); + expr = FcExprCreateInteger (parse->config, vstack->u.integer); break; case FcVStackDouble: - expr = FcExprCreateDouble (vstack->u._double); + expr = FcExprCreateDouble (parse->config, vstack->u._double); break; case FcVStackMatrix: - expr = FcExprCreateMatrix (vstack->u.matrix); + expr = FcExprCreateMatrix (parse->config, vstack->u.matrix); break; case FcVStackBool: - expr = FcExprCreateBool (vstack->u.bool); + expr = FcExprCreateBool (parse->config, vstack->u.bool_); break; case FcVStackTest: break; @@ -1553,7 +1529,7 @@ FcPopExpr (FcConfigParse *parse) default: break; } - FcVStackDestroy (vstack); + FcVStackPopAndDestroy (parse); return expr; } @@ -1575,7 +1551,7 @@ FcPopBinary (FcConfigParse *parse, FcOp op) { if (expr) { - new = FcExprCreateOp (left, op, expr); + new = FcExprCreateOp (parse->config, left, op, expr); if (!new) { FcConfigMessage (parse, FcSevereError, "out of memory"); @@ -1611,7 +1587,7 @@ FcPopUnary (FcConfigParse *parse, FcOp op) if ((operand = FcPopExpr (parse))) { - new = FcExprCreateOp (operand, op, 0); + new = FcExprCreateOp (parse->config, operand, op, 0); if (!new) { FcExprDestroy (operand); @@ -1636,7 +1612,7 @@ FcParseInclude (FcConfigParse *parse) const FcChar8 *i; FcBool ignore_missing = FcFalse; - s = FcStrBufDone (&parse->pstack->str); + s = FcStrBufDoneStatic (&parse->pstack->str); if (!s) { FcConfigMessage (parse, FcSevereError, "out of memory"); @@ -1647,7 +1623,7 @@ FcParseInclude (FcConfigParse *parse) ignore_missing = FcTrue; if (!FcConfigParseAndLoad (parse->config, s, !ignore_missing)) parse->error = FcTrue; - FcStrFree (s); + FcStrBufDestroy (&parse->pstack->str); } typedef struct _FcOpMap { @@ -1856,7 +1832,7 @@ FcParseMatch (FcConfigParse *parse) return; } } - while ((vstack = FcVStackPop (parse))) + while ((vstack = FcVStackPeek (parse))) { switch (vstack->tag) { case FcVStackTest: @@ -1879,7 +1855,7 @@ FcParseMatch (FcConfigParse *parse) FcConfigMessage (parse, FcSevereWarning, "invalid match element"); break; } - FcVStackDestroy (vstack); + FcVStackPopAndDestroy (parse); } if (!FcConfigAddEdit (parse->config, test, edit, kind)) FcConfigMessage (parse, FcSevereError, "out of memory"); @@ -1890,7 +1866,7 @@ FcParseAcceptRejectFont (FcConfigParse *parse, FcElement element) { FcVStack *vstack; - while ((vstack = FcVStackPop (parse))) + while ((vstack = FcVStackPeek (parse))) { switch (vstack->tag) { case FcVStackGlob: @@ -1915,7 +1891,7 @@ FcParseAcceptRejectFont (FcConfigParse *parse, FcElement element) FcConfigMessage (parse, FcSevereWarning, "bad font selector"); break; } - FcVStackDestroy (vstack); + FcVStackPopAndDestroy (parse); } } @@ -1923,7 +1899,7 @@ FcParseAcceptRejectFont (FcConfigParse *parse, FcElement element) static FcValue FcPopValue (FcConfigParse *parse) { - FcVStack *vstack = FcVStackPop (parse); + FcVStack *vstack = FcVStackPeek (parse); FcValue value; value.type = FcTypeVoid; @@ -1933,7 +1909,7 @@ FcPopValue (FcConfigParse *parse) switch (vstack->tag) { case FcVStackString: - value.u.s = FcStrCopy (vstack->u.string); + value.u.s = FcStrStaticName (vstack->u.string); if (value.u.s) value.type = FcTypeString; break; @@ -1955,7 +1931,7 @@ FcPopValue (FcConfigParse *parse) value.type = FcTypeMatrix; break; case FcVStackBool: - value.u.b = vstack->u.bool; + value.u.b = vstack->u.bool_; value.type = FcTypeBool; break; default: @@ -1963,7 +1939,7 @@ FcPopValue (FcConfigParse *parse) vstack->tag); break; } - FcVStackDestroy (vstack); + FcVStackPopAndDestroy (parse); return value; } @@ -1997,8 +1973,10 @@ FcParsePatelt (FcConfigParse *parse) if (!FcPatternAdd (pattern, name, value, FcTrue)) { FcConfigMessage (parse, FcSevereError, "out of memory"); + FcValueDestroy(value); break; } + FcValueDestroy(value); } FcVStackPushPattern (parse, pattern); @@ -2016,7 +1994,7 @@ FcParsePattern (FcConfigParse *parse) return; } - while ((vstack = FcVStackPop (parse))) + while ((vstack = FcVStackPeek (parse))) { switch (vstack->tag) { case FcVStackPattern: @@ -2031,7 +2009,7 @@ FcParsePattern (FcConfigParse *parse) FcConfigMessage (parse, FcSevereWarning, "unknown pattern element"); break; } - FcVStackDestroy (vstack); + FcVStackPopAndDestroy (parse); } FcVStackPushPattern (parse, pattern); @@ -2042,7 +2020,10 @@ FcEndElement(void *userData, const XML_Char *name) { FcConfigParse *parse = userData; FcChar8 *data; - +#ifdef _WIN32 + FcChar8 buffer[1000]; +#endif + if (!parse->pstack) return; switch (parse->pstack->element) { @@ -2051,7 +2032,7 @@ FcEndElement(void *userData, const XML_Char *name) case FcElementFontconfig: break; case FcElementDir: - data = FcStrBufDone (&parse->pstack->str); + data = FcStrBufDoneStatic (&parse->pstack->str); if (!data) { FcConfigMessage (parse, FcSevereError, "out of memory"); @@ -2060,40 +2041,48 @@ FcEndElement(void *userData, const XML_Char *name) #ifdef _WIN32 if (strcmp (data, "CUSTOMFONTDIR") == 0) { - FcStrFree (data); - data = malloc (1000); - if (!data) - { - FcConfigMessage (parse, FcSevereError, "out of memory"); - break; - } - FcMemAlloc (FC_MEM_STRING, 1000); - if(!GetModuleFileName(NULL, data, 1000)) + char *p; + data = buffer; + if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20)) { FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed"); - FcStrFree (data); break; } - char *p = strrchr (data, '\\'); + /* + * Must use the multi-byte aware function to search + * for backslash because East Asian double-byte code + * pages have characters with backslash as the second + * byte. + */ + p = _mbsrchr (data, '\\'); if (p) *p = '\0'; strcat (data, "\\fonts"); } + else if (strcmp (data, "APPSHAREFONTDIR") == 0) + { + char *p; + data = buffer; + if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20)) + { + FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed"); + break; + } + p = _mbsrchr (data, '\\'); + if (p) *p = '\0'; + strcat (data, "\\..\\share\\fonts"); + } else if (strcmp (data, "WINDOWSFONTDIR") == 0) { int rc; - FcStrFree (data); - data = malloc (1000); - if (!data) + data = buffer; +#if _WIN32_WINNT >= 0x0500 + rc = GetSystemWindowsDirectory (buffer, sizeof (buffer) - 20); +#else + rc = GetWindowsDirectory (buffer, sizeof (buffer) - 20); +#endif + if (rc == 0 || rc > sizeof (buffer) - 20) { - FcConfigMessage (parse, FcSevereError, "out of memory"); - break; - } - FcMemAlloc (FC_MEM_STRING, 1000); - rc = GetWindowsDirectory (data, 800); - if (rc == 0 || rc > 800) - { - FcConfigMessage (parse, FcSevereError, "GetWindowsDirectory failed"); - FcStrFree (data); + FcConfigMessage (parse, FcSevereError, "GetSystemWindowsDirectory failed"); break; } if (data [strlen (data) - 1] != '\\') @@ -2108,7 +2097,7 @@ FcEndElement(void *userData, const XML_Char *name) if (!FcConfigAddDir (parse->config, data)) FcConfigMessage (parse, FcSevereError, "out of memory; cannot add directory %s", data); } - FcStrFree (data); + FcStrBufDestroy (&parse->pstack->str); break; case FcElementCacheDir: data = FcStrBufDone (&parse->pstack->str); @@ -2132,7 +2121,7 @@ FcEndElement(void *userData, const XML_Char *name) rc = GetTempPath (800, data); if (rc == 0 || rc > 800) { - FcConfigMessage (parse, FcSevereError, "GetWindowsDirectory failed"); + FcConfigMessage (parse, FcSevereError, "GetTempPath failed"); FcStrFree (data); break; } @@ -2150,14 +2139,14 @@ FcEndElement(void *userData, const XML_Char *name) break; case FcElementCache: - data = FcStrBufDone (&parse->pstack->str); + data = FcStrBufDoneStatic (&parse->pstack->str); if (!data) { FcConfigMessage (parse, FcSevereError, "out of memory"); break; } /* discard this data; no longer used */ - FcStrFree (data); + FcStrBufDestroy (&parse->pstack->str); break; case FcElementInclude: FcParseInclude (parse); diff --git a/lib/fontconfig/src/ftglue.c b/lib/fontconfig/src/ftglue.c index 9caad7c6a..1eca304cf 100644 --- a/lib/fontconfig/src/ftglue.c +++ b/lib/fontconfig/src/ftglue.c @@ -60,64 +60,7 @@ ftglue_qalloc( FT_Memory memory, } while (0) -FTGLUE_APIDEF( FT_Pointer ) -ftglue_alloc( FT_Memory memory, - FT_ULong size, - FT_Error *perror ) -{ - FT_Error error = 0; - FT_Pointer block = NULL; - - if ( size > 0 ) - { - block = memory->alloc( memory, size ); - if ( !block ) - error = FT_Err_Out_Of_Memory; - else - memset( (char*)block, 0, (size_t)size ); - } - - *perror = error; - return block; -} - - -FTGLUE_APIDEF( FT_Pointer ) -ftglue_realloc( FT_Memory memory, - FT_Pointer block, - FT_ULong old_size, - FT_ULong new_size, - FT_Error *perror ) -{ - FT_Pointer block2 = NULL; - FT_Error error = 0; - - if ( old_size == 0 || block == NULL ) - { - block2 = ftglue_alloc( memory, new_size, &error ); - } - else if ( new_size == 0 ) - { - ftglue_free( memory, block ); - } - else - { - block2 = memory->realloc( memory, old_size, new_size, block ); - if ( block2 == NULL ) - error = FT_Err_Out_Of_Memory; - else if ( new_size > old_size ) - memset( (char*)block2 + old_size, 0, (size_t)(new_size - old_size) ); - } - - if ( !error ) - block = block2; - - *perror = error; - return block; -} - - -FTGLUE_APIDEF( void ) +static void ftglue_free( FT_Memory memory, FT_Pointer block ) { @@ -125,7 +68,6 @@ ftglue_free( FT_Memory memory, memory->free( memory, block ); } - FTGLUE_APIDEF( FT_Long ) ftglue_stream_pos( FT_Stream stream ) { @@ -245,10 +187,17 @@ ftglue_face_goto_table( FT_Face face, /* parse the directory table directly, without using * FreeType's built-in data structures */ - FT_ULong offset = 0; + FT_ULong offset = 0, sig; FT_UInt count, nn; - if ( face->num_faces > 1 ) + if ( FILE_Seek( 0 ) || ACCESS_Frame( 4 ) ) + goto Exit; + + sig = GET_Tag4(); + + FORGET_Frame(); + + if ( sig == FT_MAKE_TAG( 't', 't', 'c', 'f' ) ) { /* deal with TrueType collections */ @@ -294,7 +243,7 @@ ftglue_face_goto_table( FT_Face face, goto FoundIt; } } - error = TT_Err_Table_Missing; + error = FT_Err_Table_Missing; FoundIt: FORGET_Frame(); diff --git a/lib/fontconfig/src/ftglue.h b/lib/fontconfig/src/ftglue.h index b273f30a5..e0fd1714e 100644 --- a/lib/fontconfig/src/ftglue.h +++ b/lib/fontconfig/src/ftglue.h @@ -51,12 +51,6 @@ FT_BEGIN_HEADER -/* utility macros */ -#define TT_Err_Ok FT_Err_Ok -#define TT_Err_Invalid_Argument FT_Err_Invalid_Argument -#define TT_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle -#define TT_Err_Table_Missing FT_Err_Table_Missing - #define SET_ERR(c) ( (error = (c)) != 0 ) #ifndef FTGLUE_API @@ -107,38 +101,11 @@ ftglue_stream_frame_enter( FT_Stream stream, FTGLUE_API( void ) ftglue_stream_frame_exit( FT_Stream stream ); -FTGLUE_API( FT_Byte ) -ftglue_stream_get_byte( FT_Stream stream ); - -FTGLUE_API( FT_Short ) -ftglue_stream_get_short( FT_Stream stream ); - -FTGLUE_API( FT_Long ) -ftglue_stream_get_long( FT_Stream stream ); - FTGLUE_API( FT_Error ) ftglue_face_goto_table( FT_Face face, FT_ULong tag, FT_Stream stream ); -FTGLUE_API( FT_Pointer ) -ftglue_alloc( FT_Memory memory, - FT_ULong size, - FT_Error *perror_ ); - -FTGLUE_API( FT_Pointer ) -ftglue_realloc( FT_Memory memory, - FT_Pointer block, - FT_ULong old_size, - FT_ULong new_size, - FT_Error *perror_ ); - -FTGLUE_API( void ) -ftglue_free( FT_Memory memory, - FT_Pointer block ); - -/* */ - FT_END_HEADER #endif /* __OPENTYPE_FTGLUE_H__ */ diff --git a/lib/fontconfig/test/Makefile.in b/lib/fontconfig/test/Makefile.in index b787362b5..e369fe29b 100644 --- a/lib/fontconfig/test/Makefile.in +++ b/lib/fontconfig/test/Makefile.in @@ -76,7 +76,6 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ -DOCDIR = @DOCDIR@ DOCMAN3 = @DOCMAN3@ DOCSRC = @DOCSRC@ DOLT_BASH = @DOLT_BASH@ @@ -101,6 +100,7 @@ FC_FONTPATH = @FC_FONTPATH@ FFLAGS = @FFLAGS@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GREP = @GREP@ HASDOCBOOK = @HASDOCBOOK@ HAVE_EXPAT = @HAVE_EXPAT@ HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@ @@ -132,7 +132,6 @@ MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -ORTH_FILES = @ORTH_FILES@ OS_WIN32_FALSE = @OS_WIN32_FALSE@ OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ @@ -144,6 +143,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +RM = @RM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -152,18 +152,9 @@ USEDOCBOOK_FALSE = @USEDOCBOOK_FALSE@ USEDOCBOOK_TRUE = @USEDOCBOOK_TRUE@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_NMEDIT = @ac_ct_NMEDIT@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -181,6 +172,9 @@ build_os = @build_os@ build_vendor = @build_vendor@ confdir = @confdir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ fc_cachedir = @fc_cachedir@ ft_config = @ft_config@ @@ -189,18 +183,22 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@