* packaging/osx-app.sh, packaging/macosx/Resources/etc/fonts/fonts.conf:

      Use a modified fonts.conf file for Mac OS X that includes the
      standard user font directory ~/Library/Fonts.

diff --git a/ChangeLog b/ChangeLog
index 2cafe4bebc1f6ab348c427c75eaf1900a290e2c4..57233d47381c500aa29987eff1e412e8a9d752db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-17  Michael Wybrow  <mjwybrow@users.sourceforge.net>
+
+       * packaging/osx-app.sh, packaging/macosx/Resources/etc/fonts/fonts.conf:
+         Use a modified fonts.conf file for Mac OS X that includes the 
+         standard user font directory ~/Library/Fonts.
+
 2006-01-16  Michael Wybrow  <mjwybrow@users.sourceforge.net>
 
        * src/svg/Makefile_insert: Updated to reflect a previous header

diff --git a/packaging/macosx/Resources/etc/fonts/fonts.conf b/packaging/macosx/Resources/etc/fonts/fonts.conf
new file mode 100644 (file)
index 0000000..33b3b60
--- /dev/null
+++ b/packaging/macosx/Resources/etc/fonts/fonts.conf
@@ -0,0 +1,309 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts.conf file to configure system font access -->
+<fontconfig>
+
+<!--
+       The intent of this standard configuration file is to be adequate for
+       most environments.  If you have a reasonably normal environment and
+       have found problems with this configuration, they are probably
+       things that others will also want fixed.  Please send any suggested
+       changes to fonts@xfree86.org so that future releases can include
+       such changes.
+
+       Note that the normal 'make install' procedure for XFree86 is to
+       replace any existing fonts.conf file with the new version.  Place
+       any local customizations in local.conf which this file references.
+
+       Keith Packard
+-->
+
+<!-- Font directory list configured on Sun Mar 20 20:10:20 PST 2005 -->
+
+       <dir>/Library/Fonts</dir>
+       <dir>/Network/Library/Fonts</dir>
+       <dir>/System/Library/Fonts</dir>
+       <dir>/usr/X11R6/lib/X11/fonts</dir>
+       <dir>/usr/share/fonts</dir>
+       <dir>/var/root/Library/Fonts</dir>
+       <dir>~/.fonts</dir>
+       <dir>~/Library/Fonts</dir>
+
+<!--
+  Enable sub-pixel rendering
+       <match target="font">
+               <test qual="all" name="rgba">
+                       <const>unknown</const>
+               </test>
+               <edit name="rgba" mode="assign"><const>rgb</const></edit>
+       </match>
+-->
+
+<!--
+  Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>mono</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>monospace</string>
+               </edit>
+       </match>
+
+<!--
+  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>sans serif</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>sans-serif</string>
+               </edit>
+       </match>
+
+<!--
+  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>sans</string>
+               </test>
+               <edit name="family" mode="assign">
+                       <string>sans-serif</string>
+               </edit>
+       </match>
+
+<!--
+  Mark common families with their generics so we'll get
+  something reasonable
+-->
+
+<!--
+  Serif faces
+ -->
+       <alias>
+               <family>Times</family>
+               <family>Times New Roman</family>
+               <family>Nimbus Roman No9 L</family>
+               <family>Luxi Serif</family>
+               <family>Kochi Mincho</family>
+               <family>AR PL SungtiL GB</family>
+               <family>AR PL Mingti2L Big5</family>
+               <family>Baekmuk Batang</family>                 
+               <default><family>serif</family></default>
+       </alias>
+<!--
+  Sans-serif faces
+ -->
+       <alias>
+               <family>Helvetica</family>
+               <family>Arial</family>
+               <family>Verdana</family>
+               <family>Nimbus Sans L</family>
+               <family>Luxi Sans</family>
+               <family>Kochi Gothic</family>
+               <family>AR PL KaitiM GB</family>
+               <family>AR PL KaitiM Big5</family>
+               <family>Baekmuk Dotum</family>
+               <family>SimSun</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+<!--
+  Monospace faces
+ -->
+       <alias>
+               <family>Courier</family>
+               <family>Courier New</family>
+               <family>Andale Mono</family>
+               <family>Luxi Mono</family>
+               <family>Nimbus Mono L</family>
+               <family>NSimSun</family>
+               <default><family>monospace</family></default>
+       </alias>
+<!--
+  If the font still has no generic name, add sans-serif
+ -->
+       <match target="pattern">
+               <test qual="all" name="family" compare="not_eq">
+                       <string>sans-serif</string>
+               </test>
+               <test qual="all" name="family" compare="not_eq">
+                       <string>serif</string>
+               </test>
+               <test qual="all" name="family" compare="not_eq">
+                       <string>monospace</string>
+               </test>
+               <edit name="family" mode="append_last">
+                       <string>sans-serif</string>
+               </edit>
+       </match>
+       
+<!--
+  Load per-user customization file
+-->
+       <include ignore_missing="yes">~/.fonts.conf</include>
+
+<!--
+  Load local system customization file
+-->
+       <include ignore_missing="yes">local.conf</include>
+
+<!--
+  Alias well known font names to available TrueType fonts
+-->
+       <alias>
+               <family>Times</family>
+               <accept><family>Times New Roman</family></accept>
+       </alias>
+       <alias>
+               <family>Helvetica</family>
+               <accept><family>Verdana</family></accept>
+       </alias>
+       <alias>
+               <family>Arial</family>
+               <accept><family>Verdana</family></accept>
+       </alias>
+       <alias>
+               <family>Courier</family>
+               <accept><family>Courier New</family></accept>
+       </alias>
+
+<!--
+  Provide required aliases for standard names
+-->
+       <alias>
+               <family>serif</family>
+               <prefer>
+                       <family>Times New Roman</family>
+                       <family>Nimbus Roman No9 L</family>
+                       <family>Luxi Serif</family>
+                       <family>Times</family>
+                       <family>Kochi Mincho</family>
+                       <family>AR PL SungtiL GB</family>
+                       <family>AR PL Mingti2L Big5</family>
+                       <family>Baekmuk Batang</family>                 
+               </prefer>
+       </alias>
+       <alias>
+               <family>sans-serif</family>
+               <prefer>
+                       <family>Verdana</family>
+                       <family>Nimbus Sans L</family>
+                       <family>Luxi Sans</family>
+                       <family>Arial</family>
+                       <family>Helvetica</family>
+                       <family>Kochi Gothic</family>
+                       <family>AR PL KaitiM GB</family>
+                       <family>AR PL KaitiM Big5</family>
+                       <family>Baekmuk Dotum</family>
+                       <family>SimSun</family>
+               </prefer>
+       </alias>
+       <alias>
+               <family>monospace</family>
+               <prefer>
+                       <family>Andale Mono</family>
+                       <family>Courier New</family>
+                       <family>Luxi Mono</family>
+                       <family>Nimbus Mono L</family>
+                       <family>Kochi Gothic</family>
+                       <family>AR PL KaitiM GB</family>
+                       <family>Baekmuk Dotum</family>
+               </prefer>
+       </alias>
+
+<!-- 
+ Artificial oblique for fonts without an italic or oblique version
+ -->
+ 
+       <match target="font">
+               <!-- check to see if the font is roman -->
+               <test name="slant">
+                       <const>roman</const>
+               </test>
+               <!-- check to see if the pattern requested non-roman -->
+               <test target="pattern" name="slant" compare="not_eq">
+                       <const>roman</const>
+               </test>
+               <!-- multiply the matrix to slant the font -->
+               <edit name="matrix" mode="assign">
+                       <times>
+                               <name>matrix</name>
+                               <matrix><double>1</double><double>.2</double>
+                                       <double>0</double><double>1</double>
+                               </matrix>
+                       </times>
+               </edit>
+               <!-- pretend the font is oblique now -->
+               <edit name="slant" mode="assign">
+                       <const>oblique</const>
+               </edit>
+       </match>
+
+       <config>
+<!--
+  These are the default Unicode chars that are expected to be blank
+  in fonts.  All other blank chars are assumed to be broken and
+  won't appear in the resulting charsets
+ -->
+               <blank>
+                       <int>0x0020</int>       <!-- SPACE -->
+                       <int>0x00a0</int>       <!-- NO-BREAK SPACE -->
+                       <int>0x00ad</int>       <!-- SOFT HYPHEN -->
+                       <int>0x115f</int>       <!-- HANGUL CHOSEONG FILLER -->
+                       <int>0x1160</int>       <!-- HANGUL JUNGSEONG FILLER -->
+                       <int>0x1680</int>       <!-- OGHAM SPACE MARK -->
+                       <int>0x2000</int>       <!-- EN QUAD -->
+                       <int>0x2001</int>       <!-- EM QUAD -->
+                       <int>0x2002</int>       <!-- EN SPACE -->
+                       <int>0x2003</int>       <!-- EM SPACE -->
+                       <int>0x2004</int>       <!-- THREE-PER-EM SPACE -->
+                       <int>0x2005</int>       <!-- FOUR-PER-EM SPACE -->
+                       <int>0x2006</int>       <!-- SIX-PER-EM SPACE -->
+                       <int>0x2007</int>       <!-- FIGURE SPACE -->
+                       <int>0x2008</int>       <!-- PUNCTUATION SPACE -->
+                       <int>0x2009</int>       <!-- THIN SPACE -->
+                       <int>0x200a</int>       <!-- HAIR SPACE -->
+                       <int>0x200b</int>       <!-- ZERO WIDTH SPACE -->
+                       <int>0x200c</int>       <!-- ZERO WIDTH NON-JOINER -->
+                       <int>0x200d</int>       <!-- ZERO WIDTH JOINER -->
+                       <int>0x200e</int>       <!-- LEFT-TO-RIGHT MARK -->
+                       <int>0x200f</int>       <!-- RIGHT-TO-LEFT MARK -->
+                       <int>0x2028</int>       <!-- LINE SEPARATOR -->
+                       <int>0x2029</int>       <!-- PARAGRAPH SEPARATOR -->
+                       <int>0x202a</int>       <!-- LEFT-TO-RIGHT EMBEDDING -->
+                       <int>0x202b</int>       <!-- RIGHT-TO-LEFT EMBEDDING -->
+                       <int>0x202c</int>       <!-- POP DIRECTIONAL FORMATTING -->
+                       <int>0x202d</int>       <!-- LEFT-TO-RIGHT OVERRIDE -->
+                       <int>0x202e</int>       <!-- RIGHT-TO-LEFT OVERRIDE -->
+                       <int>0x202f</int>       <!-- NARROW NO-BREAK SPACE -->
+                       <int>0x205f</int>       <!-- MEDIUM MATHEMATICAL SPACE -->
+                       <int>0x2060</int>       <!-- WORD JOINER -->
+                       <int>0x2061</int>       <!-- FUNCTION APPLICATION -->
+                       <int>0x2062</int>       <!-- INVISIBLE TIMES -->
+                       <int>0x2063</int>       <!-- INVISIBLE SEPARATOR -->
+                       <int>0x206A</int>       <!-- INHIBIT SYMMETRIC SWAPPING -->
+                       <int>0x206B</int>       <!-- ACTIVATE SYMMETRIC SWAPPING -->
+                       <int>0x206C</int>       <!-- INHIBIT ARABIC FORM SHAPING -->
+                       <int>0x206D</int>       <!-- ACTIVATE ARABIC FORM SHAPING -->
+                       <int>0x206E</int>       <!-- NATIONAL DIGIT SHAPES -->
+                       <int>0x206F</int>       <!-- NOMINAL DIGIT SHAPES -->
+                       <int>0x3000</int>       <!-- IDEOGRAPHIC SPACE -->
+                       <int>0x3164</int>       <!-- HANGUL FILLER -->
+                       <int>0xfeff</int>       <!-- ZERO WIDTH NO-BREAK SPACE -->
+                       <int>0xffa0</int>       <!-- HALFWIDTH HANGUL FILLER -->
+                       <int>0xfff9</int>       <!-- INTERLINEAR ANNOTATION ANCHOR -->
+                       <int>0xfffa</int>       <!-- INTERLINEAR ANNOTATION SEPARATOR -->
+                       <int>0xfffa</int>       <!-- INTERLINEAR ANNOTATION TERMINATOR -->
+               </blank>
+<!--
+  Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+               <rescan>
+                       <int>30</int>
+               </rescan>
+       </config>
+
+</fontconfig>

diff --git a/packaging/osx-app.sh b/packaging/osx-app.sh
index 954ccb9fccea7e81fc88e069206a01d286933d65..aa78b10bab7b5783221db17dd485a9f46d02456f 100644 (file)
--- a/packaging/osx-app.sh
+++ b/packaging/osx-app.sh
@@ -158,8 +158,8 @@ ModuleFiles = "\${HOME}/.inkscape-etc/pango.modules"
 AliasFiles = "\${HOME}/.inkscape-etc/pangox.aliases"
 END_PANGO
 
-mkdir -p $pkgetc/fonts/
-cp /etc/fonts/* $pkgetc/fonts/
+# We use a modified fonts.conf file so only need the dtd
+cp /etc/fonts/fonts.dtd $pkgetc/fonts/
 
 mkdir -p $pkgetc/gtk-2.0
 sed -e "s,$SW,\${CWD},g" $SW/etc/gtk-2.0/gdk-pixbuf.loaders > $pkgetc/gtk-2.0/gdk-pixbuf.loaders