diff --git a/.gitattributes b/.gitattributes
index 11670a8e..e8a29fc0 100644
--- a/.gitattributes
+++ b/.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
diff --git a/.gitignore b/.gitignore
index 244a3179..abc9f38a 100644
--- a/.gitignore
+++ b/.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
diff --git a/docs/.cvsignore b/docs/.cvsignore
index 121d3650..6fe78eb1 100644
--- a/docs/.cvsignore
+++ b/docs/.cvsignore
@@ -8,5 +8,4 @@ html
phpweb
diff
revcheck.html
-manual.fo
manual.pdf
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 8fff55c4..e779b4f0 100755
--- a/docs/Makefile.in
+++ b/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} -fo manual.fo -pdf manual.pdf
+ ${FOP} -xml manual.xml -xsl xsl/fo.xsl -pdf manual.pdf
test:
$(NSGMLS) -i lang-$(LANG) -s $(XMLDCL) manual.xml
diff --git a/docs/configure.in b/docs/configure.in
index 96444443..e941055c 100755
--- a/docs/configure.in
+++ b/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 }}}
diff --git a/docs/fop/README b/docs/fop/README
new file mode 100755
index 00000000..f4a36360
--- /dev/null
+++ b/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
diff --git a/docs/fop/ru.cfg b/docs/fop/ru.cfg
new file mode 100755
index 00000000..19e3464b
--- /dev/null
+++ b/docs/fop/ru.cfg
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/fop/thryb.ttf b/docs/fop/thryb.ttf
new file mode 100755
index 00000000..75f5bf4e
Binary files /dev/null and b/docs/fop/thryb.ttf differ
diff --git a/docs/fop/thryb.xml b/docs/fop/thryb.xml
new file mode 100755
index 00000000..872254ae
--- /dev/null
+++ b/docs/fop/thryb.xml
@@ -0,0 +1,2 @@
+
+Thryomanes,Bold693447850-234-555-319137810403300TYPE0CIDFontType20
\ No newline at end of file
diff --git a/docs/fop/thrybi.ttf b/docs/fop/thrybi.ttf
new file mode 100755
index 00000000..9a178e56
Binary files /dev/null and b/docs/fop/thrybi.ttf differ
diff --git a/docs/fop/thrybi.xml b/docs/fop/thrybi.xml
new file mode 100755
index 00000000..f6e494e5
--- /dev/null
+++ b/docs/fop/thrybi.xml
@@ -0,0 +1,2 @@
+
+Thryomanes,BoldItalic692457850-234-604-31914671040970-12TYPE0CIDFontType20
\ No newline at end of file
diff --git a/docs/fop/thryi.ttf b/docs/fop/thryi.ttf
new file mode 100755
index 00000000..b1089289
Binary files /dev/null and b/docs/fop/thryi.ttf differ
diff --git a/docs/fop/thryi.xml b/docs/fop/thryi.xml
new file mode 100755
index 00000000..8995d6fd
--- /dev/null
+++ b/docs/fop/thryi.xml
@@ -0,0 +1,2 @@
+
+Thryomanes,Italic692457850-234-599-31914431032970-12TYPE0CIDFontType20
\ No newline at end of file
diff --git a/docs/fop/thryn.ttf b/docs/fop/thryn.ttf
new file mode 100755
index 00000000..cb7962fa
Binary files /dev/null and b/docs/fop/thryn.ttf differ
diff --git a/docs/fop/thryn.xml b/docs/fop/thryn.xml
new file mode 100755
index 00000000..3fdc194a
--- /dev/null
+++ b/docs/fop/thryn.xml
@@ -0,0 +1,2 @@
+
+Thryomanes693447850-234-545-319133410323300TYPE0CIDFontType20
\ No newline at end of file