2009/7/14 Philip Olson <[email protected]>:
>> Or have I missed something?
>
> This is now fixed as of a couple of minutes ago but I cannot test on Windows
> so please do that. The only problem I see now is with images/figures, likely
> to do with PhD (the build system).
>
> Regards,
> Philip
>
>
Found and hopefully fixed the build issues. Well, at least on windows...
I've lost commit karma, so patch is below and attached.
Regards,
Richard Quadling.
Index: manual.xml.in
===================================================================
--- manual.xml.in (revision 284062)
+++ manual.xml.in (working copy)
@@ -14,9 +14,9 @@
%isopub;
<!-- Add translated specific definitions and snippets -->
-<!ENTITY % language-defs SYSTEM "./@LANGDIR@/language-defs.ent">
-<!ENTITY % language-snippets SYSTEM "./@LANGDIR@/language-snippets.ent">
-<!ENTITY % extensions SYSTEM "./@LANGDIR@/extensions.ent">
+<!ENTITY % language-defs SYSTEM "../@LANGDIR@/language-defs.ent">
+<!ENTITY % language-snippets SYSTEM "../@LANGDIR@/language-snippets.ent">
+<!ENTITY % extensions SYSTEM "../@LANGDIR@/extensions.ent">
%language-defs;
%extensions;
Property changes on: scripts
___________________________________________________________________
Modified: svn:ignore
- entities.*.xml
+ entities.*.xml
file-entities.php
Index: scripts/file-entities.php.in
===================================================================
--- scripts/file-entities.php.in (revision 284061)
+++ scripts/file-entities.php.in (working copy)
@@ -303,7 +303,7 @@
if ($filename == "") {
return sprintf("<!ENTITY %-40s ''>\n", $entname);
} else {
- return sprintf("<!ENTITY %-40s SYSTEM '%s'>\n", $entname,
str_replace(str_replace("\\", "/", $GLOBALS['out_dir']), '..',
str_replace("\\", "/", $filename)));
+ return sprintf("<!ENTITY %-40s SYSTEM 'file:///%s'>\n",
$entname, str_replace(str_replace("\\", "/", $GLOBALS['out_dir']),
'..', str_replace(array("\\", " "), array("/", "%20"), $filename)));
}
}
--
-----
Richard Quadling
Zend Certified Engineer : http://zend.com/zce.php?c=ZEND002498&r=213474731
"Standing on the shoulders of some very clever giants!"
ZOPA : http://uk.zopa.com/member/RQuadling
Index: manual.xml.in
===================================================================
--- manual.xml.in (revision 284062)
+++ manual.xml.in (working copy)
@@ -14,9 +14,9 @@
%isopub;
<!-- Add translated specific definitions and snippets -->
-<!ENTITY % language-defs SYSTEM "./@LANGDIR@/language-defs.ent">
-<!ENTITY % language-snippets SYSTEM "./@LANGDIR@/language-snippets.ent">
-<!ENTITY % extensions SYSTEM "./@LANGDIR@/extensions.ent">
+<!ENTITY % language-defs SYSTEM "../@LANGDIR@/language-defs.ent">
+<!ENTITY % language-snippets SYSTEM "../@LANGDIR@/language-snippets.ent">
+<!ENTITY % extensions SYSTEM "../@LANGDIR@/extensions.ent">
%language-defs;
%extensions;
Property changes on: scripts
___________________________________________________________________
Modified: svn:ignore
- entities.*.xml
+ entities.*.xml
file-entities.php
Index: scripts/file-entities.php.in
===================================================================
--- scripts/file-entities.php.in (revision 284061)
+++ scripts/file-entities.php.in (working copy)
@@ -303,7 +303,7 @@
if ($filename == "") {
return sprintf("<!ENTITY %-40s ''>\n", $entname);
} else {
- return sprintf("<!ENTITY %-40s SYSTEM '%s'>\n", $entname,
str_replace(str_replace("\\", "/", $GLOBALS['out_dir']), '..',
str_replace("\\", "/", $filename)));
+ return sprintf("<!ENTITY %-40s SYSTEM 'file:///%s'>\n", $entname,
str_replace(str_replace("\\", "/", $GLOBALS['out_dir']), '..',
str_replace(array("\\", " "), array("/", "%20"), $filename)));
}
}
