added creb and user font folder for Mac OS X, but I don't think Pd will handle the ~

svn path=/trunk/; revision=4858

4 files changed, 89 insertions, 84 deletions

diff --git a/packages/darwin_app/org.puredata.pd.plist b/packages/darwin_app/org.puredata.pd.plist
index c46fa906..1dc78877 100644
--- a/packages/darwin_app/org.puredata.pd.plist
+++ b/packages/darwin_app/org.puredata.pd.plist
@@ -11,70 +11,74 @@
 	<key>loadlib3</key>
 	<string>zexy</string>
 	<key>loadlib4</key>
-	<string>cxc</string>
+	<string>creb</string>
 	<key>loadlib5</key>
-	<string>ext13</string>
+	<string>cxc</string>
 	<key>loadlib6</key>
-	<string>hid</string>
+	<string>ext13</string>
 	<key>loadlib7</key>
-	<string>iemabs</string>
+	<string>hid</string>
 	<key>loadlib8</key>
-	<string>iemmatrix</string>
+	<string>iemabs</string>
 	<key>loadlib9</key>
-	<string>list-abs</string>
+	<string>iemmatrix</string>
 	<key>loadlib10</key>
-	<string>mapping</string>
+	<string>list-abs</string>
 	<key>loadlib11</key>
-	<string>markex</string>
+	<string>mapping</string>
 	<key>loadlib12</key>
-	<string>maxlib</string>
+	<string>markex</string>
 	<key>loadlib13</key>
-	<string>memento</string>
+	<string>maxlib</string>
 	<key>loadlib14</key>
-	<string>mjlib</string>
+	<string>memento</string>
 	<key>loadlib15</key>
-	<string>motex</string>
+	<string>mjlib</string>
 	<key>loadlib16</key>
-	<string>mtx</string>
+	<string>motex</string>
 	<key>loadlib17</key>
-	<string>oscx</string>
+	<string>mtx</string>
 	<key>loadlib18</key>
-	<string>pddp</string>
+	<string>oscx</string>
 	<key>loadlib19</key>
-	<string>pdogg</string>
+	<string>pddp</string>
 	<key>loadlib20</key>
-	<string>pdp</string>
+	<string>pdogg</string>
 	<key>loadlib21</key>
-	<string>pidip</string>
+	<string>pdp</string>
 	<key>loadlib22</key>
-	<string>pixeltango</string>
+	<string>pidip</string>
 	<key>loadlib23</key>
-	<string>pmpd</string>
+	<string>pixeltango</string>
 	<key>loadlib24</key>
-	<string>rradical</string>
+	<string>pmpd</string>
 	<key>loadlib25</key>
-	<string>sigpack</string>
+	<string>rradical</string>
 	<key>loadlib26</key>
-	<string>smlib</string>
+	<string>sigpack</string>
 	<key>loadlib27</key>
-	<string>toxy</string>
+	<string>smlib</string>
 	<key>loadlib28</key>
-	<string>unauthorized</string>
+	<string>toxy</string>
 	<key>loadlib29</key>
+	<string>unauthorized</string>
+	<key>loadlib30</key>
 	<string>vbap</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>
+	<string>~/Library/Fonts</string>
 	<key>path4</key>
-	<string>/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts</string>
+	<string>/usr/X11R6/lib/X11/fonts/TTF</string>
 	<key>path5</key>
-	<string>/sw/lib/X11/fonts/msttf</string>
+	<string>/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts</string>
 	<key>path6</key>
-	<string>/sw/lib/X11/fonts/intl/TrueType</string>
+	<string>/sw/lib/X11/fonts/msttf</string>
 	<key>path7</key>
+	<string>/sw/lib/X11/fonts/intl/TrueType</string>
+	<key>path8</key>
 	<string>/sw/lib/X11/fonts/applettf</string>
 </dict>
  </plist>
diff --git a/packages/linux_make/.pdsettings b/packages/linux_make/.pdsettings
index ec52ca1f..c07b90d2 100644
--- a/packages/linux_make/.pdsettings
+++ b/packages/linux_make/.pdsettings
@@ -3,32 +3,33 @@ verbose: 0
 loadlib1: Gem
 loadlib2: cyclone
 loadlib3: zexy
-loadlib4: cxc
-loadlib5: ext13
-loadlib6: hid
-loadlib7: iemabs
-loadlib8: iemmatrix
-loadlib9: list-abs
-loadlib10: mapping
-loadlib11: markex
-loadlib12: maxlib
-loadlib13: memento
-loadlib14: mjlib
-loadlib15: motex
-loadlib16: mtx
-loadlib17: oscx
-loadlib18: pddp
-loadlib19: pdogg
-loadlib20: pdp
-loadlib21: pidip
-loadlib22: pixeltango
-loadlib23: pmpd
-loadlib24: rradical
-loadlib25: sigpack
-loadlib26: smlib
-loadlib27: toxy
-loadlib28: unauthorized
-loadlib29: vbap
+loadlib4: creb
+loadlib5: cxc
+loadlib6: ext13
+loadlib7: hid
+loadlib8: iemabs
+loadlib9: iemmatrix
+loadlib10: list-abs
+loadlib11: mapping
+loadlib12: markex
+loadlib13: maxlib
+loadlib14: memento
+loadlib15: mjlib
+loadlib16: motex
+loadlib17: mtx
+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: vbap
 path1: /usr/X11R6/lib/X11/fonts
 path2: /usr/X11R6/lib/X11/fonts/TTF
 path3: /usr/lib/X11/fonts
diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index 40ee8b44..f0f0c3cc 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -4,34 +4,34 @@ Windows Registry Editor Version 5.00
 "loadlib1"="Gem"
 "loadlib2"="cyclone"
 "loadlib3"="zexy"
-"loadlib4"="cxc"
-"loadlib5"="ext13"
-"loadlib6"="hid"
-"loadlib7"="iemabs"
-"loadlib8"="iemmatrix"
-"loadlib9"="list-abs"
-"loadlib10"="mapping"
-"loadlib11"="markex"
-"loadlib12"="maxlib"
-"loadlib13"="memento"
-"loadlib14"="mjlib"
-"loadlib15"="motex"
-"loadlib16"="mtx"
-"loadlib17"="oscx"
-"loadlib18"="pddp"
-"loadlib19"="pdogg"
-"loadlib20"="pdp"
-"loadlib21"="pidip"
-"loadlib22"="pixeltango"
-"loadlib23"="pmpd"
-"loadlib24"="rradical"
-"loadlib25"="sigpack"
-"loadlib26"="smlib"
-"loadlib27"="toxy"
-"loadlib28"="unauthorized"
-"loadlib29"="vbap"
+"loadlib4"="creb"
+"loadlib5"="cxc"
+"loadlib6"="ext13"
+"loadlib7"="hid"
+"loadlib8"="iemabs"
+"loadlib9"="iemmatrix"
+"loadlib10"="list-abs"
+"loadlib11"="mapping"
+"loadlib12"="markex"
+"loadlib13"="maxlib"
+"loadlib14"="memento"
+"loadlib15"="mjlib"
+"loadlib16"="motex"
+"loadlib17"="mtx"
+"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"="vbap"
 ; delete any previous loadlib flags
-"loadlib7"="-"
 "loadlib8"="-"
 "loadlib9"="-"
 "loadlib10"="-"
diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh
index 96f05bfc..d7472927 100755
--- a/scripts/generate-pd-settings-files.sh
+++ b/scripts/generate-pd-settings-files.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-LIBS="Gem cyclone zexy cxc ext13 hid iemabs iemmatrix list-abs mapping markex maxlib memento mjlib motex mtx oscx pddp pdogg pdp pidip pixeltango pmpd rradical sigpack smlib toxy unauthorized vbap"
+LIBS="Gem cyclone zexy creb cxc ext13 hid iemabs iemmatrix list-abs mapping markex maxlib memento mjlib motex mtx oscx pddp pdogg pdp pidip pixeltango pmpd rradical sigpack smlib toxy unauthorized vbap"
 
 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"
+MACOSX_FONTPATH="/System/Library/Fonts /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