diff --git a/processing/app/PdeBase.java b/processing/app/PdeBase.java index 831f957c8..4058435fd 100644 --- a/processing/app/PdeBase.java +++ b/processing/app/PdeBase.java @@ -43,7 +43,7 @@ import com.apple.mrj.*; * files and images, etc) that comes from that. */ public class PdeBase { - static final String VERSION = "0070 Alpha"; + static final String VERSION = "0071 Alpha"; PdeEditor editor; diff --git a/processing/build/macosx/dist.sh b/processing/build/macosx/dist.sh index 38d172c1f..0d3328c16 100755 --- a/processing/build/macosx/dist.sh +++ b/processing/build/macosx/dist.sh @@ -29,7 +29,7 @@ echo Creating P5 distribution for revision $REVISION... # remove any old boogers rm -rf processing rm -rf Processing* -#rm -rf processing-* +rm -rf processing-* # use 'shared' files as starting point cp -r ../shared processing @@ -67,19 +67,16 @@ cp -a dist/Processing.app processing/ chmod +x processing/Processing.app/Contents/MacOS/JavaApplicationStub # put jar files into the resource dir, leave the rest in lib -RES=processing/Processing.app/Contents/Resources/Java/ +RES=processing/Processing.app/Contents/Resources/Java mkdir -p $RES mv processing/lib/*.jar $RES/ -mv $RES/core.jar processing/lib/ # directories used by the app mkdir processing/lib/build # grab pde.jar and export from the working dir cp work/lib/pde.jar $RES/ -cp work/lib/core.jar $RES/ -#cp -r work/lib/export processing/lib/ -#rm -rf processing/lib/export/CVS +cp work/lib/core.jar processing/lib/ # get platform-specific goodies from the dist dir #cp `which jikes` processing diff --git a/processing/build/macosx/make.sh b/processing/build/macosx/make.sh index 1d51f7f1f..b7eef2bb4 100755 --- a/processing/build/macosx/make.sh +++ b/processing/build/macosx/make.sh @@ -108,7 +108,6 @@ cd ../.. # get the libs mkdir -p work/Processing.app/Contents/Resources/Java/ cp work/lib/*.jar work/Processing.app/Contents/Resources/Java/ -cp work/lib/core.jar work/lib/ ### -- BUILD LIBRARIES ------------------------------------------------ diff --git a/processing/core/PFont.java b/processing/core/PFont.java index fc9859513..31659b117 100644 --- a/processing/core/PFont.java +++ b/processing/core/PFont.java @@ -205,7 +205,7 @@ public class PFont implements PConstants { cached = false; resetSize(); - resetLeading(); // ?? + //resetLeading(); // ?? space = OBJECT_SPACE; align = ALIGN_LEFT; } @@ -295,7 +295,7 @@ public class PFont implements PConstants { this.space = which; if (space == SCREEN_SPACE) { resetSize(); - resetLeading(); + //resetLeading(); } } @@ -313,6 +313,7 @@ public class PFont implements PConstants { public void resetSize() { //size = 12; size = mbox; // default size for the font + resetLeading(); // has to happen with the resize } diff --git a/processing/todo.txt b/processing/todo.txt index 4a0c4aa5c..9e53bf289 100644 --- a/processing/todo.txt +++ b/processing/todo.txt @@ -30,14 +30,14 @@ X will cause bizarro recursive folder action X remove grow box from applet frame macosx -_ verify that export is working from processing.app -_ check into ryan's macosx java bug.. -_ see why coords are going negative - -_ allow to use doubles on casting -- particularly for Math.cos() et al +X verify that export is working from processing.app +o check into ryan's macosx java bug.. +o see why coords are going negative // +_ allow to use doubles on casting -- particularly for Math.cos() et al + _ ctrl-tab to switch between tabs _ make notes about preproc