goba Sat Feb 16 08:19:20 2002 EDT
Added files:
/phpdoc installpart.xml.in
Modified files:
/phpdoc chmonly.xml.in manual.xml.in configure.in
Log:
So test before commit is an important thing. Jade/NSGMLS allows conditional
sections in internal DTD subsets, which is IMHO a good thing, but XML 1.0
only allow conditionals in external subsets, so reverting to use extarnal
files for install and chmonly.
The two advantages I added previously are still here (=> detection of
install.xml is easy, and relative paths are relative to manual.xml.in).
Index: phpdoc/chmonly.xml.in
diff -u /dev/null phpdoc/chmonly.xml.in:1.3
--- /dev/null Sat Feb 16 08:19:20 2002
+++ phpdoc/chmonly.xml.in Sat Feb 16 08:19:19 2002
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='@ENCODING@' ?>
+
+<part id="chmonly">
+ <title>&CHMEdition;</title>
+ &chmonly.aboutchm;
+</part>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.113 phpdoc/manual.xml.in:1.114
--- phpdoc/manual.xml.in:1.113 Sat Feb 16 06:14:55 2002
+++ phpdoc/manual.xml.in Sat Feb 16 08:19:19 2002
@@ -24,47 +24,6 @@
%global.chapters;
%build.version;
-<!-- Include CHMonly parts, if we are generating for CHM target -->
-<![%chmonly-enabled;[
- <!ENTITY chmonly '
- <part id="chmonly">
- <title>&CHMEdition;</title>
- &chmonly.aboutchm;
- </part>
- '>
-]]>
-<!ENTITY chmonly ''>
-
-<!-- Backwards compatible installation part inclusion -->
-<![%new-install-chapter;[
- <!ENTITY install-chapter '
- <chapter id="installation">
- <title>&Installation;</title>
- &chapters.install.general;
- &chapters.install.hpux;
- &chapters.install.linux;
- &chapters.install.macosx;
- &chapters.install.openbsd;
- &chapters.install.solaris;
- &chapters.install.unix;
- &chapters.install.windows;
- &chapters.install.commandline;
- &chapters.install.apache;
- &chapters.install.caudium;
- &chapters.install.fhttpd;
- &chapters.install.iis;
- &chapters.install.iplanet;
- &chapters.install.omnihttpd;
- &chapters.install.oreilly;
- &chapters.install.xitami;
- &chapters.install.otherhttpd;
- &chapters.install.problems;
- &chapters.install.configure;
- </chapter>
- '>
-]]>
-<!ENTITY install-chapter '&chapters.install;'>
-
<!-- Autogenerated missing entites and IDs to make build work -->
<!ENTITY % missing-entities SYSTEM "entities/missing-entities.ent">
%missing-entities;
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.136 phpdoc/configure.in:1.137
--- phpdoc/configure.in:1.136 Sat Feb 16 06:14:55 2002
+++ phpdoc/configure.in Sat Feb 16 08:19:20 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.136 2002/02/16 11:14:55 goba Exp $
+dnl $Id: configure.in,v 1.137 2002/02/16 13:19:20 goba Exp $
dnl autoconf initialisation
AC_INIT()
@@ -750,25 +750,25 @@
fi
if test "$CHMENABLED" = "yes"; then
echo "<!-- chmonly pages inclusion enabled -->" >> entities/chapters.ent
- echo "<!ENTITY % chmonly-enabled \"INCLUDE\">" >> entities/chapters.ent
+ echo "<!ENTITY chmonly SYSTEM 'chmonly.xml'>" >> entities/chapters.ent
echo >> entities/chapters.ent
echo " CHM inclusion enabled"
else
echo "<!-- chmonly pages inclusion disabled -->" >> entities/chapters.ent
- echo "<!ENTITY % chmonly-enabled \"IGNORE\">" >> entities/chapters.ent
+ echo "<!ENTITY chmonly ''>" >> entities/chapters.ent
echo >> entities/chapters.ent
echo " CHM inclusion disabled"
fi
if test -f "$srcdir/$LANGDIR/chapters/install.xml"; then
echo "<!-- old install.xml found in langauge dir -->" >> entities/chapters.ent
- echo "<!ENTITY % new-install-chapter \"IGNORE\">" >> entities/chapters.ent
+ echo "<!ENTITY install-chapter '&chapters.install;'>" >> entities/chapters.ent
echo >> entities/chapters.ent
echo " Using install.xml"
else
echo "<!-- old install.xml not found in langauge dir -->" >> entities/chapters.ent
- echo "<!ENTITY % new-install-chapter \"INCLUDE\">" >> entities/chapters.ent
+ echo "<!ENTITY install-chapter 'installpart.xml'>" >> entities/chapters.ent
echo >> entities/chapters.ent
- echo " Using the install part from manual.xml"
+ echo " Using the install part from installpart.xml"
fi
for file in `find $srcdir/en -name "*.xml" | sed -e"s%^$srcdir\/en\/%%g" | sort`
do
Index: phpdoc/installpart.xml.in
+++ phpdoc/installpart.xml.in
<?xml version='1.0' encoding='@ENCODING@' ?>
<chapter id="installation">
<title>&Installation;</title>
&chapters.install.general;
&chapters.install.hpux;
&chapters.install.linux;
&chapters.install.macosx;
&chapters.install.openbsd;
&chapters.install.solaris;
&chapters.install.unix;
&chapters.install.windows;
&chapters.install.commandline;
&chapters.install.apache;
&chapters.install.caudium;
&chapters.install.fhttpd;
&chapters.install.iis;
&chapters.install.iplanet;
&chapters.install.omnihttpd;
&chapters.install.oreilly;
&chapters.install.xitami;
&chapters.install.otherhttpd;
&chapters.install.problems;
&chapters.install.configure;
</chapter>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
sgml-omittag:t
sgml-shorttag:t
sgml-minimize-attributes:nil
sgml-always-quote-attributes:t
sgml-indent-step:1
sgml-indent-data:t
indent-tabs-mode:nil
sgml-parent-document:nil
sgml-default-dtd-file:"manual.ced"
sgml-exposed-tags:nil
sgml-local-catalogs:nil
sgml-local-ecat-files:nil
End:
-->
