PR:

Obtained from:
Submitted by:
Reviewed by:
Added 'hyphenation-jar' build target,
Upated startup scripts to include the compiled jar-file


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198532 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 2 deletions

diff --git a/fop.sh b/fop.sh
index f19a7854d..5df50c073 100755
--- a/fop.sh
+++ b/fop.sh
@@ -46,6 +46,8 @@ fi
 if $cygwin ; then
   [ -n "$FOP_HOME" ] &&
     FOP_HOME=`cygpath --unix "$FOP_HOME"`
+  [ -n "$FOP_HYPHENATION_PATH" ] &&
+    FOP_HYPHENATION_PATH=`cygpath --unix "$FOP_HYPHENATION_PATH"`
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
   [ -n "$CLASSPATH" ] &&
@@ -75,8 +77,8 @@ if [ -n "$CLASSPATH" ] ; then
   LOCALCLASSPATH=$CLASSPATH
 fi
 
-# add fop.jar, which resides in $FOP_HOME/build
-LOCALCLASSPATH=${FOP_HOME}/build/fop.jar:$LOCALCLASSPATH
+# add fop.jar and fop-hyph.jar, which reside in $FOP_HOME/build
+LOCALCLASSPATH=${FOP_HOME}/build/fop.jar:${FOP_HOME}/build/fop-hyph.jar:$LOCALCLASSPATH
 
 # add in the dependency .jar files, which reside in $FOP_HOME/lib
 DIRLIBS=${FOP_HOME}/lib/*.jar
@@ -93,6 +95,11 @@ do
     fi
 done
 
+# add in user-defined hyphenation JARs
+if [ -n "$FOP_HYPHENATION_PATH" ] ; then
+  LOCALCLASSPATH=$LOCALCLASSPATH:$FOP_HYPHENATION_PATH
+fi
+
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
   FOP_HOME=`cygpath --path --windows "$FOP_HOME"`