enable russian PDF builds

.gitattributes

@@ -1,2 +1,6 @@
 * text=auto !eol
+docs/fop/thryb.ttf -text
+docs/fop/thrybi.ttf -text
+docs/fop/thryi.ttf -text
+docs/fop/thryn.ttf -text
 misc/smarty_icon.gif -text

.gitignore

@@ -8,7 +8,6 @@ docs/dsssl/html-common.dsl
 docs/entities/file-entities.ent
 docs/entities/version.ent
 docs/html
-docs/manual.fo
 docs/manual.pdf
 docs/manual.xml
 docs/phpweb

docs/.cvsignore

@@ -8,5 +8,4 @@ html
 phpweb
 diff
 revcheck.html
-manual.fo
 manual.pdf

docs/Makefile.in

@@ -25,7 +25,6 @@ PHP=@PHP@
 LANG=@LANG@
 NSGMLS=@NSGMLS@
 JADE=@JADE@  -D . -wno-idref
-XSLTPROC=@XSLTPROC@
 XMLLINT=@XMLLINT@
 FOP=@FOP@
 XMLDCL=./dtds/dbxml-4.1.2/phpdocxml.dcl
@@ -52,8 +51,7 @@ web: FORCE
 	$(PHP) scripts/html_syntax.php php phpweb/
 
 pdf: FORCE
-	${XSLTPROC} -o manual.fo xsl/fo.xsl manual.xml
+	${FOP} -xml manual.xml -xsl xsl/fo.xsl -pdf manual.pdf
-	${FOP} -fo manual.fo -pdf manual.pdf
 
 test:
 	$(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml 

docs/configure.in

@@ -171,48 +171,6 @@ AC_SUBST(NSGMLS)
 
 dnl }}}
 
-dnl {{{   check for xsltproc
-
-AC_ARG_WITH(xsltproc,
-[  --with-xsltproc=PATH    look for xsltproc],
-[
-  if test $withval != "yes"; then
-    AC_MSG_CHECKING([for xsltproc])
-    if test -x $withval -a -f $withval
-    then
-      XSLTPROC=$withval
-      AC_MSG_RESULT($XSLTPROC)
-    else
-      XSLTPROC=no
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR([$withval: not an executable file])
-    fi
-  else
-    if test -e ../../phpdoc-tools/libxml/xsltproc.exe ; then
-      AC_MSG_CHECKING([for xsltproc])
-      XSLTPROC=../../phpdoc-tools/libxml/xsltproc.exe
-      AC_MSG_RESULT($XSLTPROC)
-    else
-      AC_PATH_PROG(XSLTPROC,"xsltproc",no)
-    fi
-  fi
-],[
-  if test -e ../../phpdoc-tools/libxml/xsltproc.exe ; then
-    AC_MSG_CHECKING([for xsltproc])
-    XSLTPROC=../../phpdoc-tools/libxml/xsltproc.exe
-    AC_MSG_RESULT($XSLTPROC)
-  else
-    AC_PATH_PROG(XSLTPROC,"xsltproc",no)
-  fi
-]
-)
-if test $XSLTPROC = "no"; then
-  AC_MSG_WARN([no xsltproc binary found, XSL Transformations won't work])
-fi
-AC_SUBST(XSLTPROC)
-
-dnl }}}
-
 dnl {{{   check for FOP
 
 AC_ARG_WITH(fop,
@@ -251,8 +209,6 @@ AC_ARG_WITH(fop,
 if test $FOP = "no"; then
   AC_MSG_WARN([no fop binary found, PDF generation won't work])
 fi
-AC_SUBST(FOP)
-
 dnl }}}
 
 dnl {{{   check for xmllint
@@ -375,11 +331,13 @@ AC_SUBST(LANG)
 AC_SUBST(BUILD_DATE)
 
 case "$LANG" in
-  ru) ENCODING="windows-1251";;
+  ru) ENCODING="windows-1251"
+      FOP="$FOP -c fop/ru.cfg";;
   *) ENCODING="ISO-8859-1";;
 esac
 
 AC_SUBST(ENCODING)
+AC_SUBST(FOP)
 
 dnl }}}
 

docs/fop/README

@@ -0,0 +1,14 @@
+README
+======
+
+This directory contains some files needed by FOP to generate the PDF files.
+
+*.cfg => some languages need a configuration file to embed fonts (e.g. Russian)
+*.ttf => fonts needed to embed in the PDF files
+*.xml => Font Metrics generated with FOP's TTF reader
+
+
+Fonts included
+==============
+1) Thryomanes (thry*.ttf)
+  -> Languages: Russian

docs/fop/ru.cfg

@@ -0,0 +1,33 @@
+<configuration>
+  <fonts>
+
+    <!-- normal -->
+    <font metrics-file="fop/thryn.xml" embed-file="fop/thryn.ttf" kerning="yes">
+      <font-triplet name="serif" style="normal" weight="normal"/>
+      <font-triplet name="sans-serif" style="normal" weight="normal"/>
+      <font-triplet name="monospace" style="normal" weight="normal"/>
+    </font>
+
+    <!-- bold -->
+    <font metrics-file="fop/thryb.xml" embed-file="fop/thryb.ttf" kerning="yes">
+      <font-triplet name="serif" style="normal" weight="bold"/>
+      <font-triplet name="sans-serif" style="normal" weight="bold"/>
+      <font-triplet name="monospace" style="normal" weight="bold"/>
+    </font>
+
+    <!-- italic -->
+    <font metrics-file="fop/thryi.xml" embed-file="fop/thryi.ttf" kerning="yes">
+      <font-triplet name="serif" style="italic" weight="normal"/>
+      <font-triplet name="sans-serif" style="italic" weight="normal"/>
+      <font-triplet name="monospace" style="italic" weight="normal"/>
+    </font>
+
+    <!-- italic and bold -->
+    <font metrics-file="fop/thrybi.xml" embed-file="fop/thrybi.ttf" kerning="yes">
+      <font-triplet name="serif" style="italic" weight="bold"/>
+      <font-triplet name="sans-serif" style="italic" weight="bold"/>
+      <font-triplet name="monospace" style="italic" weight="bold"/>
+    </font>
+
+  </fonts>
+</configuration>