added fontpaths to the pd-settings files

svn path=/trunk/; revision=4819

4 files changed, 177 insertions, 39 deletions

diff --git a/packages/darwin_app/org.puredata.pd.plist b/packages/darwin_app/org.puredata.pd.plist
index 50088f11..d522b47e 100644
--- a/packages/darwin_app/org.puredata.pd.plist
+++ b/packages/darwin_app/org.puredata.pd.plist
@@ -2,8 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-   <key>defeatrt</key>
-   <string>1</string>
+	<key>defeatrt</key>
+	<string>1</string>
 	<key>loadlib1</key>
 	<string>Gem</string>
 	<key>loadlib2</key>
@@ -39,35 +39,45 @@
 	<key>loadlib17</key>
 	<string>motex</string>
 	<key>loadlib18</key>
-	<string>oscx</string>
+	<string>mtx</string>
 	<key>loadlib19</key>
-	<string>pddp</string>
+	<string>oscx</string>
 	<key>loadlib20</key>
-	<string>pdogg</string>
+	<string>pddp</string>
 	<key>loadlib21</key>
-	<string>pdp</string>
+	<string>pdogg</string>
 	<key>loadlib22</key>
-	<string>pidip</string>
+	<string>pdp</string>
 	<key>loadlib23</key>
-	<string>pixeltango</string>
+	<string>pidip</string>
 	<key>loadlib24</key>
-	<string>pmpd</string>
+	<string>pixeltango</string>
 	<key>loadlib25</key>
-	<string>rradical</string>
+	<string>pmpd</string>
 	<key>loadlib26</key>
-	<string>sigpack</string>
+	<string>rradical</string>
 	<key>loadlib27</key>
-	<string>smlib</string>
+	<string>sigpack</string>
 	<key>loadlib28</key>
-	<string>toxy</string>
+	<string>smlib</string>
 	<key>loadlib29</key>
-	<string>unauthorized</string>
+	<string>toxy</string>
 	<key>loadlib30</key>
-	<string>vasp</string>
+	<string>unauthorized</string>
 	<key>loadlib31</key>
-	<string>vbap</string>
+	<string>vasp</string>
 	<key>loadlib32</key>
+	<string>vbap</string>
+	<key>loadlib33</key>
 	<string>xsample</string>
+	<key>path1</key>
+	<string>/System/Library/Fonts</string>
+	<key>path2</key>
+	<string>/Library/Fonts</string>
+	<key>path3</key>
+	<string>/usr/X11R6/lib/X11/fonts/TTF</string>
+	<key>path4</key>
+	<string>/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts</string>
 </dict>
  </plist>
 
diff --git a/packages/linux_make/.pdsettings b/packages/linux_make/.pdsettings
new file mode 100644
index 00000000..705b4391
--- /dev/null
+++ b/packages/linux_make/.pdsettings
@@ -0,0 +1,40 @@
+standardpath: 1
+verbose: 0
+loadlib1: Gem
+loadlib2: cyclone
+loadlib3: zexy
+loadlib4: cxc
+loadlib5: ext13
+loadlib6: fftease
+loadlib7: hid
+loadlib8: iemabs
+loadlib9: iemmatrix
+loadlib10: liblist
+loadlib11: list-abs
+loadlib12: mapping
+loadlib13: markex
+loadlib14: maxlib
+loadlib15: memento
+loadlib16: mjlib
+loadlib17: motex
+loadlib18: mtx
+loadlib19: oscx
+loadlib20: pddp
+loadlib21: pdogg
+loadlib22: pdp
+loadlib23: pidip
+loadlib24: pixeltango
+loadlib25: pmpd
+loadlib26: rradical
+loadlib27: sigpack
+loadlib28: smlib
+loadlib29: toxy
+loadlib30: unauthorized
+loadlib31: vasp
+loadlib32: vbap
+loadlib33: xsample
+path1: /usr/X11R6/lib/X11/fonts
+path2: /usr/X11R6/lib/X11/fonts/TTF
+path3: /usr/lib/X11/fonts
+path4: /usr/share/fonts/truetype
+nloadlib: 4
diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index 92a9b1db..88d90496 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -18,22 +18,52 @@ Windows Registry Editor Version 5.00
 "loadlib15"="memento"
 "loadlib16"="mjlib"
 "loadlib17"="motex"
-"loadlib18"="oscx"
-"loadlib19"="pddp"
-"loadlib20"="pdogg"
-"loadlib21"="pdp"
-"loadlib22"="pidip"
-"loadlib23"="pixeltango"
-"loadlib24"="pmpd"
-"loadlib25"="rradical"
-"loadlib26"="sigpack"
-"loadlib27"="smlib"
-"loadlib28"="toxy"
-"loadlib29"="unauthorized"
-"loadlib30"="vasp"
-"loadlib31"="vbap"
-"loadlib32"="xsample"
+"loadlib18"="mtx"
+"loadlib19"="oscx"
+"loadlib20"="pddp"
+"loadlib21"="pdogg"
+"loadlib22"="pdp"
+"loadlib23"="pidip"
+"loadlib24"="pixeltango"
+"loadlib25"="pmpd"
+"loadlib26"="rradical"
+"loadlib27"="sigpack"
+"loadlib28"="smlib"
+"loadlib29"="toxy"
+"loadlib30"="unauthorized"
+"loadlib31"="vasp"
+"loadlib32"="vbap"
+"loadlib33"="xsample"
 ; delete any previous loadlib flags
+"loadlib4"="-"
+"loadlib5"="-"
+"loadlib6"="-"
+"loadlib7"="-"
+"loadlib8"="-"
+"loadlib9"="-"
+"loadlib10"="-"
+"loadlib11"="-"
+"loadlib12"="-"
+"loadlib13"="-"
+"loadlib14"="-"
+"loadlib15"="-"
+"loadlib16"="-"
+"loadlib17"="-"
+"loadlib18"="-"
+"loadlib19"="-"
+"loadlib20"="-"
+"loadlib21"="-"
+"loadlib22"="-"
+"loadlib23"="-"
+"loadlib24"="-"
+"loadlib25"="-"
+"loadlib26"="-"
+"loadlib27"="-"
+"loadlib28"="-"
+"loadlib29"="-"
+"loadlib30"="-"
+"loadlib31"="-"
+"loadlib32"="-"
 "loadlib33"="-"
 "loadlib34"="-"
 "loadlib35"="-"
@@ -51,6 +81,7 @@ Windows Registry Editor Version 5.00
 "loadlib47"="-"
 "loadlib48"="-"
 "loadlib49"="-"
+"path1"="%SystemRoot%/Fonts"
 ; delete all existing path flags
 "path1"="-"
 "path2"="-"
diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh
index cf2da3fc..f31919c8 100755
--- a/scripts/generate-pd-settings-files.sh
+++ b/scripts/generate-pd-settings-files.sh
@@ -1,16 +1,22 @@
 #!/bin/sh
 
-LIBS="Gem cyclone zexy cxc ext13 fftease hid iemabs iemmatrix liblist list-abs mapping markex maxlib memento mjlib motex oscx pddp pdogg pdp pidip pixeltango pmpd rradical sigpack smlib toxy unauthorized vasp vbap xsample"
+LIBS="Gem cyclone zexy cxc ext13 fftease hid iemabs iemmatrix liblist list-abs mapping markex maxlib memento mjlib motex mtx oscx pddp pdogg pdp pidip pixeltango pmpd rradical sigpack smlib toxy unauthorized vasp vbap xsample"
 
+GNULINUX_FONTPATH="/usr/X11R6/lib/X11/fonts /usr/X11R6/lib/X11/fonts/TTF /usr/lib/X11/fonts /usr/share/fonts/truetype"
+MACOSX_FONTPATH="/System/Library/Fonts /Library/Fonts /usr/X11R6/lib/X11/fonts/TTF /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts /sw/lib/X11/fonts/msttf /sw/lib/X11/fonts/intl/TrueType /sw/lib/X11/fonts/applettf"
+WINDOWS_FONTPATH="%SystemRoot%/Fonts"
 
 ROOT_DIR=~/cvs/pure-data/packages
 
-GNULINUX_FILE=${ROOT_DIR}/linux_make/pdsettings
+GNULINUX_FILE=${ROOT_DIR}/linux_make/.pdsettings
 MACOSX_FILE=${ROOT_DIR}/darwin_app/org.puredata.pd.plist
 WINDOWS_FILE=${ROOT_DIR}/win32_inno/pd-settings.reg
 
 
-MACOSX_HEADER='<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<dict>'
+GNULINUX_HEADER='standardpath: 1\nverbose: 0'
+
+
+MACOSX_HEADER='<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<dict>\n\t<key>defeatrt</key>\n\t<string>1</string>'
 MACOSX_FOOTER='</dict>\n
 </plist>\n'
 
@@ -18,36 +24,87 @@ MACOSX_FOOTER='</dict>\n
 WINDOWS_HEADER='Windows Registry Editor Version 5.00\n\n[HKEY_LOCAL_MACHINE\SOFTWARE\Pd]'
 
 
-#echo -e $GNULINUX_HEADER > $GNULINUX_FILE
+echo -e $GNULINUX_HEADER > $GNULINUX_FILE
 echo -e $MACOSX_HEADER > $MACOSX_FILE
 echo -e $WINDOWS_HEADER > $WINDOWS_FILE
 
+# GNU/Linux -------------------------------------------------------------------#
+function print_gnulinux ()
+{
+	 echo "loadlib$1: $2" >> $GNULINUX_FILE
+}
+
+function print_gnulinux_fontpath ()
+{
+	 i=0
+	 for fontpath in $GNULINUX_FONTPATH; do
+		  ((++i)) 
+		  echo "path${i}: ${fontpath}" >> $GNULINUX_FILE
+	 done
+}
+
+function print_gnulinux_footer ()
+{
+	 echo "nloadlib: $1" >> $GNULINUX_FILE
+}
+
+# Mac OS X --------------------------------------------------------------------#
 function print_macosx () 
 {
 	 echo -e "\t<key>loadlib$1</key>" >> $MACOSX_FILE
 	 echo -e "\t<string>$2</string>" >> $MACOSX_FILE
 }
 
+function print_macosx_fontpath ()
+{
+	 i=0
+	 for fontpath in $MACOSX_FONTPATH; do
+		  ((++i)) 
+		  echo -e "\t<key>path${i}</key>" >> $MACOSX_FILE
+		  echo -e "\t<string>${fontpath}</string>" >> $MACOSX_FILE
+	 done
+}
+
+# Windows ---------------------------------------------------------------------#
 function print_windows ()
 {
 	 echo "\"loadlib$1\"=\"$2\"" >> $WINDOWS_FILE
 }
 
+function print_windows_fontpath ()
+{
+	 i=0
+	 for fontpath in $WINDOWS_FONTPATH; do
+		  ((++i)) 
+		  echo "\"path${i}\"=\"${fontpath}\"" >> $WINDOWS_FILE
+	 done
+}
+
 function print_windows_delete ()
 {
 	 echo "\"${1}${2}\"=\"-\"" >> $WINDOWS_FILE
 }
 
+#==============================================================================#
 
-i=1
+i=0
 for lib in $LIBS; do
+	 ((++i)) 
 	 echo -n "$lib "
+	 print_gnulinux $i $lib
 	 print_macosx $i $lib
 	 print_windows $i $lib
-	 ((++i)) 
 done
 echo " "
 
+# the .pd-settings file needs an end tag for the loadlib statements
+print_gnulinux_fontpath
+print_gnulinux_footer $i
+
+print_macosx_fontpath
+echo -e $MACOSX_FOOTER >> $MACOSX_FILE
+
+
 # print lines to delete existing loadlib flags
 echo "; delete any previous loadlib flags" >> $WINDOWS_FILE
 while [ $i -lt 50 ]; do
@@ -55,7 +112,8 @@ while [ $i -lt 50 ]; do
 	 ((++i)) 
 done
 
-i=1
+print_windows_fontpath
+
 # print lines to delete existing path flags
 echo "; delete all existing path flags" >> $WINDOWS_FILE
 while [ $i -lt 50 ]; do
@@ -63,4 +121,3 @@ while [ $i -lt 50 ]; do
 	 ((++i)) 
 done
 
-echo -e $MACOSX_FOOTER >> $MACOSX_FILE