Re[2]: [PHP-DOC] Re: PHP Function List
||*()*|| Hi, Philip. Would be nice if smb. update quickreference on CVS so it can be grabbed from there. Doing it yourself on windows system requires cvs, autoconf, make and a fresh php-src checkout as well. PO Hi Steffen and others, PO The trouble with these scripts is they aren't really maintained right PO now, so as other things change some develop bugs. But, they still PO work pretty well and are worth using (and fixing). You'll find them PO in scripts/, and will notice they are what make uses. Web scraping PO should not be used. PO Regards, PO Philip PO On Mar 7, 2007, at 5:52 AM, Richard A. Quadling wrote: http://cvs.php.net/viewvc.cgi/phpdoc/ You will see quickref.txt, funcsummary.txt and funclist.txt These files are NOT automatically maintained, but if you download the phpdoc CVS, you can autoconf ./configure make quickref.txt funcsummary.txt funclist.txt This took around 5 mins on my machine. Bandvulc GroupZend PHP CertificateRichard Quadling Software Developer Telephone +44 (0) 1752 893559 extension 286 Fax +44 (0) 1752 690794 Email [EMAIL PROTECTED] -Original Message- From: Hannes Magnusson [mailto:[EMAIL PROTECTED] Sent: 07 March 2007 13:30 To: Steffen Beck; PHP Documentation List Cc: [EMAIL PROTECTED] Subject: [PHP-DOC] Re: PHP Function List Hi Steffen (CC'ing the PHP Documentation team) On 3/3/07, Steffen Beck [EMAIL PROTECTED] wrote: Hi PHP Team, First of all thank you very much for your work on the PHP language, it's very appreciated!! Now to the point: I haven't been able to find a function reference anywhere on the net that comes in a txt form (maybe even csv format?), and I've been searching PHP.net and Zend.com up and down but can't find such a resource.. I did however find a simplified function list here http://www.php.net/quickref.php .. My question to the PHP team is if I can get permission to create a script that pulls out the functions from that resource? At first glance I say it would only be a matter of some sort of fopen in a loop in some way.. If you want I could break the script up into pieces so I don't create any higher amounts of traffic on php.net.. The reason I want to do this is that I need a csv-format of the php functions for a tcl script to an eggdrop.. After I have the data I'll also publish it om my blog if it's okay? Feel free. But we do have some scripts for this in CVS - and I thought we distributed this list somewhere on php.net as a part of the documentation. Doc team: anyone recall where it is? :) -Hannes Hope to hear from you.. /Steffen t --
[PHP-DOC] Shorten subjects of PHPDOC commit emails
Hello, everyb. Is it possible to shorten Subjects of commit emails for PHPDOC? To make it easier to see the end of line, i.e. exact file changed. From: [PHP-DOC] cvs: phpdoc /en/reference/filesystem/functions feof.xml To: [PHP-DOC] cvs: /en/reference/filesystem/functions feof.xml The only confusion could be possible if commits were mailed to [PHP-DOC] from different CVS modules, but that is not true. t -- --[ http://wiki.phpdoc.info/DocLinks ]--
Re: [PHP-DOC] cvs: phpdoc /entities global.ent
||*()*|| Hi, Nuno. I wonder if there is any link checker which runs once a month through documentation to catch all missing and/or outdated links? It can also save link contents with status 200, 302, checked manually - ok to detect when the pages are no longer contain desired content. NL nlopess Wed Jul 26 12:01:04 2006 UTC NL Modified files: NL /phpdoc/entitiesglobal.ent NL Log: NL update some urls NL http://cvs.php.net/viewvc.cgi/phpdoc/entities/global.ent?r1=1.266r2=1.267diff_format=u NL Index: phpdoc/entities/global.ent NL diff -u phpdoc/entities/global.ent:1.266 NL phpdoc/entities/global.ent:1.267 NL --- phpdoc/entities/global.ent:1.266Fri Jun 9 18:31:30 2006 NL +++ phpdoc/entities/global.ent Wed Jul 26 12:01:04 2006 NL @@ -1,6 +1,6 @@ NL !-- -*- SGML -*- NL - $Id: global.ent,v 1.266 2006/06/09 18:31:30 bjori Exp $ NL + $Id: global.ent,v 1.267 2006/07/26 12:01:04 nlopess Exp $ NL Contains global macros for all the XML documents. NL @@ -16,7 +16,7 @@ NL !ENTITY url.apache.source http://www.apache.org/dist/httpd/; NL !ENTITY url.apache.core NL http://httpd.apache.org/docs/2.0/en/mod/core.html; NL !ENTITY url.apache.tuscany NL http://incubator.apache.org/tuscany/; NL -!ENTITY url.apc.technotes NL http://cvs.php.net/co.php/pecl/apc/TECHNOTES.txt; NL +!ENTITY url.apc.technotes NL http://cvs.php.net/viewvc.cgi/pecl/apc/TECHNOTES.txt?view=markup; NL !ENTITY url.apd http://apd.communityconnect.com/; NL !ENTITY url.apt-get http://www.apt-get.org/; NL !ENTITY url.argsep NL http://www.w3.org/TR/html4/appendix/notes.html#h-B.2.2; NL @@ -24,7 +24,7 @@ NL !ENTITY url.aspell http://aspell.sourceforge.net/; NL !ENTITY url.asp2php http://asp2php.naken.cc/; NL !ENTITY url.asptranslator NL http://www.design215.com/toolbox/translator/; NL -!ENTITY url.browscap.download NL http://www.garykeith.com/browsers/downloads.asp; NL +!ENTITY url.browscap.download NL http://browsers.garykeith.com/downloads.asp; NL !ENTITY url.bzip2 http://www.bzip.org/; NL !ENTITY url.bison NL http://www.gnu.org/software/bison/bison.html; NL !ENTITY url.bidi.algorithm NL http://www.unicode.org/unicode/reports/tr9/; NL @@ -95,7 +95,7 @@ NL !ENTITY url.filepro http://www.fptech.com/; NL !ENTITY url.firebird http://www.firebirdsql.org/; NL !ENTITY url.flex http://www.gnu.org/software/flex/flex.html; NL -!ENTITY url.foldoc http://www.foldoc.org/; NL +!ENTITY url.foldoc http://foldoc.org/; NL !ENTITY url.foldoc.epoch NL http://wombat.doc.ic.ac.uk/foldoc/foldoc.cgi?EPOCH; NL !ENTITY url.freetds http://www.freetds.org/; NL !ENTITY url.freetype http://www.freetype.org/; NL @@ -388,7 +388,7 @@ NL !ENTITY url.yaz-marcxml http://www.loc.gov/standards/marcxml/; NL !ENTITY url.yaz.z3950.4 NL http://www.loc.gov/z3950/agency/markup/04.html#3.2.1.1.4; NL !ENTITY url.zend http://www.zend.com/; NL -!ENTITY url.zend.aliaslist NL http://zend.com/phpfunc/all_aliases.php; NL +!ENTITY url.zend.aliaslist NL http://www.zend.com/phpfunc/all_aliases.php; NL !ENTITY url.zend.articles http://www.zend.com/zend/art/; NL !ENTITY url.zend.comdotnet NL http://www.zend.com/php5/articles/php5-dotnet.php; NL !ENTITY url.zend.funclist http://www.zend.com/phpfunc/; t --
Re[2]: [PHP-DOC] Starting on Unicode docs
||*()*|| Hi, Sean. Since all appropriate functions will be unicode compatible in PHP 6.0.0 this seems like information overload and not something that should be mentioned in every functions documentation. Perhaps have a list offsite, maybe on docweb, for alpha/beta testers. SC Good point. I agree. SC This list already exists: SC http://www.php.net/~scoates/unicode/ Great page. I tried to make weekly mails with diffs about changes in Unicode progress, but did not have a chance to start up. Full history on site is also would be useful. Voting for most wanted functions which are still not ported. That's almost all. t --
Re: [PHP-DOC] Starting on Unicode docs
||*()*|| Hi, Andrei. AZ Hey guys, AZ I just wanted to shoot a quick email to the list to see when we could AZ start work on docs for Unicode upgrades (PHP 6). The main thing, IMO, AZ is having a way to mark functions as Unicode compatible and also have a AZ section (per-function) for any Unicode-related notes. Any other AZ thoughts on this? AZ -Andrei My opinion is that PHP6 manual needs to be cleaned of garbage collected from the previous years. Users, who will choose PHP6 does not need to know various quirks of PHP4 and PHP5. I suspect that PHP6 will not be compatible with PHP4 and PHP5 so there is no reason to keep them merged in one manual. Yes, this is a lot of work, but this refactoring is highly required at least from usability point of view. Unicode transistion efforts must have separate page with howto, status and diff ability. This way rather busy people may pertain interest by tracking activity and contributing from time to time. Make an environment first. ---[warning - critics below]-- Where is phpdoc-tools mailing list? Why 3 year drop dead php-doc-chm mailing list is still present? Where is a machine for autobuilding CHM manual? insert some foul words here I'm really tired of it. Think about creating lively ecosystem instead of calling for papers and cruising for money. =/ other foul lexicon goes here Make at least system to place requests with reminders an track their status. Easy votings like yes/no and not this cumbersome proposal system monster nobody have a time to play with. Take a look at software engineering disciplines, try to organize requirements gathering, try to make it interesting task to think, analyse and track instead of asking in mails - any ideas?. Take a look at development models used around the world to see that PHP volunteers doesn't have any tools to help them. No tools, no standards, no simple great ideas to get and follow. No support from systems either. I've just lost two important mails because of quarantine which doesn't processed them during last 8 hours, nobody replied me why and I do not have any means to see the status of the servers / mail queue. It is pity to see things in PHP are moving so slowly that lack of trust and time makes all collaboration useless. And one more idea to think about - SVN for phpdoc backend with interface through livedocs. P.S. Do not expect me to reply soon. t --
[PHP-DOC] CHM build machine - Was[2]: [PHP-DOC] #34026 [Ver-Opn]: Polish CHM is corrupted
||*()*|| Hi, Derick. Sorry, I forgot - is only Derick has access to upload this CHM? DR Sorta... I know the chm building stuff has been down for some time. I'll DR need to set it up again but it'll have to wait a bit as it's not on the DR top of my todo list. However, I guess I can upload this polish CHM. Will be great, but this doesn't remove the source of the problem, which in turn can be a part of another problem. Just let me expand this a bit. I'm speaking only about ordinary .chm's process. As far as I can understand the problem on the surface is in windows machine where hhc.exe needs to be executed. As the windows machine is not available for PHP folks at http://master.php.net/inventory.php we have to use somebody's private host to compile .chm's To make CHM available on http://www.php.net/download-docs.php we need 1. Compile orinary multipage HTML manual (can be done on unix box also) 2. Filter HTML pages (also can be done on either windows or unix box) 3. Build HTML Help project files (this also possible on unix box) 4. Launch HHC.EXE to get .CHM (the only operation requires windows) 5. Upload .CHM to php.net So everything can be done on unix box and in fact steps 1 and 5 are already running every two weeks (according to the dates of downloadable html manual archives). It is possible to setup a job on a windows machine, which will pull the output of step 1 from unix box, make necessary transformations in step 2,3,4 and upload result back to unix box together with build logs. Box will run necessary tests (try to open .chm with unix chm tools and 0 return status if ok). After this .chm can be uploaded onsite. To make the process completely transparent we can make analog of http://snaps.php.net/ with archive build dates and build logs to be available for general public. For a quick fix I can kanban my windows machine into the process. I need ftp to pull archives - this means they will be deleted as they are also flags to start the process - and after procesing they will be pushed to ftp in different folder. However, I have limited resources and I'd like to get as much as possible from official PHP unix build box. Ideally this means that the only thing that I have to do is point 4 - run HHC.EXE This way even PHP installation is not necessary. If everything will be fine the build process can be moved to snaps.php.net machine. At least I hope so. Launching HHC.EXE for an hour or two every two weeks does not place too much burden on usual server performance and is unlikely to cause any problems. Other features creeping in my head are - automatic one hour build postpone if last one failed, tight restrictions for user building manual to prevent script attacks through CVS just before the build starts (checkout for everything except manual can be made manually or triggered by the same people, who is able to upload files). To make the process more visible and maintainable for folks other than those who were lucky to read this letter I can render some BPEL diagrams later. And it is also possible to use SVN instead of FTP. Considering unmanagable featurecreep to time ratio of my own I can only hope that somebody will take care of these RFC. Perhaps as a subtask of Summer of Code. I could add much more detailed tasks at this page http://www.php.net/ideas.php I've just noticed. t --
Re: [PHP-DOC] Re: [PHP-DEV] Summer of Code
||*()*|| Hi, Nuno. Google is doing their Summer of Code thing again this year. You can read more about it here: http://code.google.com/summerofcode.html It doesn't actually mention PHP there yet, but it will soon. So if you are a student and have an interesting idea for a PHP-related project, start thinking about your proposal. For eligibility see: http://code.google.com/summfaq.html#who_is_eligible and the rest of the FAQ as well I guess. -Rasmus NL Ah great! :) NL This year I might participate. I would like to do something in the core or NL even in the zend engine. I'll think in something.. (I'm also open to NL suggestions, of course). NL I would also like to propose a project related with the documentation team, NL which is very useful to us: NL * working on livedocs (rewriting the indexer, improving docbook compat, NL pear/gtk/smarty docs support, php 6 support, etc..) Too bad your letter was lost in my usual phpdoc traffic. I wish we could discuss this this a little bit earlier and review RFC/ with howto/ to analyse the progress so far and plan the future steps for PHPDOC. This can help to guide sporadic PHPDOC tools development to make it more popular and clear among those potential ones from millions of PHP addicts, who is able and willing to help given that bottlenecks and stone blocks are removed from the steep enough learning curve. What I would like to see is: 1. Visibility of PHPDOC software architecture and process I guess for phpdoc/ howto is a good draft, but lacks some pictures. There can be additional chapter about how the docs are born and uploaded and who is involved in the process. Clear entrypoint to PHPDOC tools world is also must have, because amount of information can be frustating. 2. Issue tracker PHP bugtracker is good, well-tested, but not suitable for maintaining issues. Issue (in my vision) can not be bogus. Issue is a step in more general plan and it need to be resolved for the plan to be succeeded. Plan is an idea. Ideas can be possible or impossible. Possible ideas depend on resources. Impossible ideas are just that - impossible, but still contain explanation why (stoneblock, like on graveyards). Possible ideas, which depend on external factors can be frozen to wait for these factors (blockers) to resolve. Ideas can be frozen also if resources are scarce or just unavailable. To freeze an idea some current status must be written. Usually this means that somebody else can pick up the idea, resolve blocker issue and he will have every available information to fix it. Ideas are not proposals - idea is a more mild variant of requirement and issue within idea is a detailed specification of what should be done for this idea to be archieved. Idea status can be refactored - you can always write a different status to outline steps in development, keep duscussion focused. Discussions can be filtered accordingly, but you can always dig down levels to initial discussions. Input for notes or additions to issues can be everything - from emails to SVN/CVS commits, quotes and links, but with periodical link/consistency checks and perhaps even local copies of necessary information (cache). This can be used for gathering requirements and elaboration. Everything can be RSS'ed. 2. CVS to SVN, SVN as a Livedocs backend I can be a little bit misleaded, but it seems to me that SVN can be accessed from web application and we can use this ability. First idea is online patch generation, where user can edit the page (like in wiki), but instead of page text he is presented with XML source and preview is basically the a patch, which is after automatically assigned to an issue. Patch can be approved and directly applied to SVN. 3. Livedocs AJAX I do not know the status of livedocs and the abilities of this system to provide describe, validate and modify docbook structure. But if this functionality is suitable, we can try to move it into AJAX to provide some WYSIWYG features keeping internal XML structure in 1:1 with presentation on a visually edited web page. 4. PHP.NET API, Web-Services and visual tools Just for the Summer of Code. It would be nice to see PHP core to invent some advanced techniques (?PHP4EE) to let PHP technology make the step from scripting to modeling applications, to use abstraction as a survival instrument in complex projects. phpdoc/ is such complex project. It is a lot of work and it is more research work than actual coding. a. What would we like to achieve? b. How this could be achieved? c. What do we have? d. What is the current status? a. Convenient tools to communicate, edit PHPDOC documention, build it and control the process. Easy for new developers. b. Time, time and time (given you know what to do and how to) detailed plan, clear idea, steps (milestones), user feedback, requirements gathering, strong community support. Perhaps
Re: [PHP-DOC] #34026 [Ver-Opn]: Polish CHM is corrupted
||*()*|| Hi, phpdoc. Sorry, I forgot - is only Derick has access to upload this CHM? Here http://www.php.net/download-docs.php?sizes=1 tpn ID: 34026 tpn Updated by: [EMAIL PROTECTED] tpn Reported By: kamil dot figiela at gmail dot com tpn -Status: Verified tpn +Status: Open tpn Bug Type: Documentation problem tpn Operating System: WinXP tpn PHP Version: Irrelevant tpn New Comment: tpn Just compiled new CHM. A pity, but I do not know who has the rights to tpn upload it to the site. For now file is at tpn http://php.rainforce.org/POLISH_CHM/php_manual_pl.chm tpn Previous Comments: tpn tpn [2006-01-17 16:53:35] tomator at poczta dot onet dot pl tpn The freshest file, published 23 Nov 2005 is still corrupt. tpn Size is 402kB. tpn tpn [2005-09-19 15:16:48] [EMAIL PROTECTED] tpn Still broken. tpn tpn [2005-08-07 16:11:02] kamil dot figiela at gmail dot com tpn Description: tpn tpn Polish CHM is corrupted, file length is only 440 KB, while other CHM's tpn are 6 MB tpn t --
Re[2]: [PHP-DOC] spam protection for user notes
||*()*|| Hi, Nuno. NL I don't like those annoying images either. But we must do something.. I'm NL tired of receiving a lot of spam notes every day. Maybe throttling? You know - if one IP: 1. sends a lot of comments in one day and 2. IP is not in a white list and 3. these comments are identical and 4. there is a short period between comment posts these comments are grouped together with some flag and become hidden until somebody from php-notes ML either approves or deletes them. NL Using the same system as the bugs site seems to be the best choice.. because NL my attempts to stop spam (by checking IPs blacklists and by using words NL blacklist) didn't work for long. NL BTW, I don't agree with an 'accept' system. With that, almost zero notes NL will be approved each day, because no one will like to take the NL responsability to approve a note. Delete/reject is much simpler and provides NL a faster way to have good notes on-line. Yep. t --
Re: [PHP-DOC] Gabor resigns from the editor post
||*()*|| Hi, Gabor. I'm not as good as others in writing english, what's why I almost never took part in editing actual contents, but I agree with almost every word said by other folks here, except for the cases when I have to include my personal mark before respect. =) I don't mind if you want to exclude yourself from editors, but no matter how active you will be in this team further - you've already earned a honorable position in my personal list of good fellows. =) t --
Re: [PHP-DOC] cvs: peardoc /en/pecl cybermut.xml
||*()*|| Hi, anatoly. at techtonik Wed Dec 14 05:48:45 2005 EDT at Removed files: at /peardoc/en/peclcybermut.xml at Log: at - was never rendered and now moved to phpdoc This letter supposed to appear in PEARDOC mailing list. I didn't send it to PHPDOC manually. Can it be the case when files removed from PEARDOC CVS tree were used in PHP documentation? t --
Re: [PHP-DOC] cvs: phpdoc /en/install/windows building.xml
||*()*|| Hi, Nuno. Do not you mind if I ask you some dummy questions for PHP4? Do you know in which cases resolv.lib is required to be recompiled? What debug version helps to debug and when it is needed? Can debug version be the same .lib for W2K and W98? I've build it on Win98 and Win2K - release binaries are the same, so I guess if we find a way to update win32build.zip the excess requirement to download bindlib_w32.zip and compile resolv.lib can be removed completely. Updated version of library is available at http://php.rainDELMEforce.org with a patch to .dsp to make MSVC search for this resolv.lib in proposed directory structure. P.S. resolv.lib sources are unchanged for more than two years. NL nlopess Wed Nov 30 18:50:16 2005 EDT NL Modified files: NL /phpdoc/en/install/windows building.xml NL Log: NL a release build of libresolv can also link with php debug mode NL http://cvs.php.net/diff.php/phpdoc/en/install/windows/building.xml?r1=1.8r2=1.9ty=u NL Index: phpdoc/en/install/windows/building.xml NL diff -u phpdoc/en/install/windows/building.xml:1.8 NL phpdoc/en/install/windows/building.xml:1.9 NL --- phpdoc/en/install/windows/building.xml:1.8 Wed Nov 30 15:33:45 2005 NL +++ phpdoc/en/install/windows/building.xml Wed Nov 30 18:50:13 2005 NL @@ -1,5 +1,5 @@ NL ?xml version=1.0 encoding=iso-8859-1? NL -!-- $Revision: 1.8 $ -- NL +!-- $Revision: 1.9 $ -- NL sect1 id=install.windows.building NL titleBuilding from source/title NL para NL @@ -154,7 +154,7 @@ NL You must build the filenameresolv.lib/filename library. Decide whether NL you want to have debug symbols available (bindlib - Win32 Debug) or not NL (bindlib - Win32 Release), but please remember the choice you made, because NL - you'll have to build PHP in the same way, or you may get linking errors. NL + the debug build will only link with PHP when it is also built in debug mode. NL Build the appropriate configuration: NL itemizedlist NL listitem t --
[PHP-DOC] cvs: phpdoc /howto tools.xml
techtonik Thu Dec 8 16:50:40 2005 EDT Modified files: /phpdoc/howto tools.xml Log: * Jade does not understand KOI8-R russian encoding used in peardoc. OpenJade is reported to handle this correctly. http://cvs.php.net/diff.php/phpdoc/howto/tools.xml?r1=1.28r2=1.29ty=u Index: phpdoc/howto/tools.xml diff -u phpdoc/howto/tools.xml:1.28 phpdoc/howto/tools.xml:1.29 --- phpdoc/howto/tools.xml:1.28 Mon Apr 11 16:22:21 2005 +++ phpdoc/howto/tools.xml Thu Dec 8 16:50:38 2005 @@ -161,7 +161,8 @@ para You may also consider using ulink url=url.openjade;OpenJade/ulink - a well maintained and extended version of Jade. + a well maintained and extended version of Jade (in fact, OpenJade is + recommended). /para /sect2
Re[2]: [PHP-DOC] Web site translation?
||*()*|| Hi, Rasmus. RL Jacques Marneweck wrote: Rasmus Lerdorf wrote: Hey, what do you guys think of taking advantage of our big international doc team to translate the main web site pages as well? It is a much smaller project than translating the manual and we already have the language choosing mechanisms and everything in place. The biggest problem is figuring out whether we should try to pull the text parts out of the current pages and keep them somewhere separate, or simply clone the pages in individual /en /fr /de /ja top-level directories. -Rasmus One also needs to look at the aspect of do we have the requirement where content is first added to the english version of the php.net website prior to it being translated or can translators add news to say the french version of the site and then to the english? RL I think we need a single point of reference for news items, so yes, RL adding first to the English one so everyone can review makes sense. RL -Rasmus How about local PHP news and conferences? I know in russia there is a big PHP communtity, what uses russian language and organizes their own russian based conferences. Not too much people uses PHP.NET site for anything else than download and manual. For most russian language auditory monthly conference and training invitations available from PHP.NET site at the moment do not make sense at all and I do not see much sense in translation of local USA or China events into russian and russian local events announcements into english. PHP.NET must be personalized to be useful for everyone, so everyone can choose what to read in preferences. Good translation system must be wiki-template-based with an ability to maintain one-to-one mappings to docbook or to fictional simplified phpdocbook XML schema (where this schema still will be clearly one-to-one mapped to docbook) to continue generate documentation in various formats. This needs time and clear RFC/functional/technical and/or architectural documentation, because such a project can not be done by a one man army on a volunteer basis. Current php-web code is scattered among master, main and phpdoc and to realize how it works one has to spend some time. Needless to say, what core PHP.NET maintainers deny integrating patches, what they do not have time to review and this is the reason why featurecreep is not welcomed. PHP.NET is quite in stasis, because it's web code probably is not structurized enough, lacks documentation, is not easy to maintain, understand and keep in mind. PHP.NET needs some API or common description of it's reusable components and how they fit together if it is aimed to expand developers base. Even if we will make advanced translation service - somebody has to update news items and it likely will be people, who is not burdened with daily programming too much - good translators are often those, who don't realize what CVS account is about and why to ask for it. PHP.NET must revise it's policy to be community friendly and have to decide which kind of environment it would like to create - limited professional only cathedral or chaotic user friendly bazaar. The project like this system can turn out very complex and without developers it will not be available anytime soon (see livedocs for example of idea and good, but unwieldy code). Seems like PHP.NET need more full-time support/developers as much as abandoned zend php-collaboration project. t --
Re[2]: [PHP-DOC] Re: Bulgarian mirrors
||*()*|| Hi, Gabor. I wonder if PHP mirrors are being monitored? GH RTFM: http://php.net/mirrors They only checked for current online/offline status and I'm interested in statistics over the month/day/year such as failure percent/access time and such. t --
Re[2]: [PHP-DOC] Critical files in translation
||*()*|| Hi, Sean. P.S. I better prefer approach when outdated status is detected by number of lines changed between revisions. I have some sketches for PHP CVS protocol which can be used to do that without shell access. Perhaps this information can be cashed in livedocs. Livedoc authors can also find it convenient to flag critical revisions manually. SC One thing I think we should be careful of is resources.. both on the CVS SC server and on the Livedocs building machine. That's right, but I thougth livedocs work on the fly and use cache heavily, don't they? The amount of lines changed can be cached and incrementally calculated without additional CVS access. SC One of the main reasons for introducing Livedocs is because the build of SC the english HTML manual takes 5 hours (on the production box.. last I SC heard). Offtopic warning. I've stopped work on XSL templates, because on my machine it took about full working day to rebuild manual and resulting CHM file is broken despite of what it successfully compiled. Seems like these are bugs of indexing machine inside MS compiler, but I can't do anything about it and haven't found a workaround yet. To test it further I can only say what 256Mb box in not enough. =) I think optimal configuration for building machine is about 1-2Mb. Better 1.5-2Mb. SC We _can't_ get into that situation ever again. SC (What I'm saying is diffing against english is expensive.. relatively SC speaking) With incremental stats it is ok. Wiki holds changes/diffs in DB, and livedocs can do the same. t --
Re: [PHP-DOC] Re: Bulgarian mirrors
||*()*|| Hi, Kouber. So, IMO there are two solutions - www.php.net to stop automatic redirecting to bg2.php.net, or Data.BG to remove the shaping of bg2.php.net. Which one do you prefer? I don't think it'll be a problem to remove the shaping for this host only, so I suit it best. KS I agree. Data.bg mirror - bg2.php.net is sometimes hard to access, so if KS an automatic redirect have ot be performed, I'd rather prefer it to be KS to the Online.bg mirror - bg.php.net. I wonder if PHP mirrors are being monitored? KS However, I'm not sure whether this mailing list is the correct place to KS ask for such a change, since it is not concerning the documentation KS itself in any way. t --
Re[2]: [PHP-DOC] Critical files in translation
||*()*|| Hi, Gabor. Now Sean, Derick, how does the automatic livedocs package rsync project is, so we can step forward with livedocs? As always.. busy. This week, however, I'm TOO busy. The earliest I can look at this again is next week. GH The nice thing is that once this is set up, we only need to find people GH to handle the flow of bug reports we are going to get for livedocs, GH otherwise the packaging will work automatically :) The biggest problem with these people would be to explain them livedocs magic. =) P.S. I better prefer approach when outdated status is detected by number of lines changed between revisions. I have some sketches for PHP CVS protocol which can be used to do that without shell access. Perhaps this information can be cashed in livedocs. Livedoc authors can also find it convenient to flag critical revisions manually. t --
[PHP-DOC] cvs: phpdoc /scripts make-partial.php
techtonik Wed Sep 28 11:47:52 2005 EDT
Modified files:
/phpdoc/scripts make-partial.php
Log:
* (sync) recover manual.xml.in if the script was terminated unexpectedly
http://cvs.php.net/diff.php/phpdoc/scripts/make-partial.php?r1=1.2r2=1.3ty=u
Index: phpdoc/scripts/make-partial.php
diff -u phpdoc/scripts/make-partial.php:1.2 phpdoc/scripts/make-partial.php:1.3
--- phpdoc/scripts/make-partial.php:1.2 Tue Sep 13 19:41:19 2005
+++ phpdoc/scripts/make-partial.php Wed Sep 28 11:47:51 2005
@@ -12,7 +12,7 @@
*
* @authorMartin Jansen [EMAIL PROTECTED]
* @copyright 2005 The PEAR Group
- * @version CVS: $Id: make-partial.php,v 1.2 2005/09/13 23:41:19 techtonik
Exp $
+ * @version CVS: $Id: make-partial.php,v 1.3 2005/09/28 15:47:51 techtonik
Exp $
*/
// NOTE: originally from peardoc:/make-partial.php ;
@@ -33,6 +33,7 @@
$format = html;
$sections = array();
+$incflag = false;
foreach ($args[0] as $arg) {
if ($arg[0] == --help) {
showHelp();
@@ -41,6 +42,14 @@
$format = $arg[1];
} elseif ($arg[0] == '--include') {
$sections[] = $arg[1];
+$incflag = true;
+}
+}
+
+if ($incflag) {
+// collect other space delimited names as section names
+foreach ($args[1] as $arg) {
+$sections[] = $arg;
}
}
@@ -57,15 +66,18 @@
}
}
+// recover manual.xml.in if the script was terminated unexpectedly
+restoreFile();
+
+copy(manual.xml.in, manual.xml.in.partial-backup);
+register_shutdown_function(restoreFile, filemtime(manual.xml.in));
+
$file = file(manual.xml.in);
if (!$file) {
echo Error: Unable to read manual.xml.in!;
exit(1);
}
-copy(manual.xml.in, manual.xml.in.partial-backup);
-register_shutdown_function(restoreFile, filemtime(manual.xml.in));
-
$newFile = ;
$partStack = array();
$includePart = true;
@@ -162,14 +174,14 @@
/**
* Restores the original manual.xml.in file
*/
-function restoreFile($savedmtime) {
+function restoreFile($savedmtime = null) {
if (!is_file(manual.xml.in.partial-backup)) {
return;
}
unlink(manual.xml.in);
rename(manual.xml.in.partial-backup, manual.xml.in);
-touch(manual.xml.in, $savedmtime);
+if ($savedmtime) touch(manual.xml.in, $savedmtime);
}
/**
[PHP-DOC] user notes system patch
Hello, phpdoc@lists.php.net
Here is a patch for user notes to allow reason to be specified
when deleting note from online version of manual. The patch is for
master php.net. BTW, it seems that master operates in
register_globals=on mode - at least I was unable to find where
$reason variable is set in php-master-web/manage/user-notes.php
I didn't find a place where to fix links from user notes on
manual pages http://www.php.net/manual/en/ If somebody know how -
change
http://master.php.net/manage/user-notes.php?action=delete+NUMBER
to http://master.php.net/manage/user-notes.php?action=predelete+NUMBER
for this patch to work.
It will be good if somebody test this on some mirror first.
t
--
--[ http://wiki.phpdoc.info/DocLinks ]- user-notes_old.php Thu Sep 15 16:30:32 2005
+++ user-notes.php Sat Sep 24 19:44:48 2005
@@ -34,6 +34,16 @@
Your note has been removed from the online manual.';
+$delete_reasons = array(
+ 'integrated' = 'integrated in the manual',
+ 'useless' = 'useless',
+ 'bad+code' = 'bad code',
+ 'spam' = 'spam',
+ 'non-english' = 'non-english',
+ 'already+in+docs' = 'already in docs'
+);
+
+
db_connect();
$action = (isset($_REQUEST['action']) ? $_REQUEST['action'] : '');
@@ -77,14 +87,11 @@
hsc($row['user']),/spanbr /,
Note id: $idbr /\n,
a
href=\http://www.php.net/manual/en/{$row['sect']}.php\http://www.php.net/manual/en/{$row['sect']}.php/abr
/\n,
-a
href=\http://master.php.net/manage/user-notes.php?action=edit+$id\;
target=\_blank\Edit Note/abr /,
-a
href=\http://master.php.net/manage/user-notes.php?action=delete+$idreason=integrated\;
target=\_blank\Delete Note: Integrated in the manual/abr /,
-a
href=\http://master.php.net/manage/user-notes.php?action=delete+$idreason=useless\;
target=\_blank\Delete Note: useless/abr /,
-a
href=\http://master.php.net/manage/user-notes.php?action=delete+$idreason=bad+code\;
target=\_blank\Delete Note: bad code/abr /,
-a
href=\http://master.php.net/manage/user-notes.php?action=delete+$idreason=spam\;
target=\_blank\Delete Note: spam/abr /,
-a
href=\http://master.php.net/manage/user-notes.php?action=delete+$idreason=non-english\;
target=\_blank\Delete Note: non-english/abr /,
-a
href=\http://master.php.net/manage/user-notes.php?action=delete+$idreason=already+in+docs\;
target=\_blank\Delete Note: already in docs/abr /,
-a
href=\http://master.php.net/manage/user-notes.php?action=delete+$id\;
target=\_blank\Delete Note: other reason/abr /,
+a
href=\http://master.php.net/manage/user-notes.php?action=edit+$id\;
target=\_blank\Edit Note/abr /;
+foreach ($delete_reasons as $rk = $rv) {
+ echo a
href=\http://master.php.net/manage/user-notes.php?action=delete+$idreason=$rk\;
target=\_blank\Delete Note: $rv/abr /;
+}
+ echo a
href=\http://master.php.net/manage/user-notes.php?action=delete+$id\;
target=\_blank\Delete Note: other reason/abr /,
a
href=\http://master.php.net/manage/user-notes.php?action=reject+$id\;
target=\_blank\Reject Note/a,
/p,
hr /;
@@ -226,6 +233,20 @@
exit;
}
}
+case 'predelete': // used to choose reason when called from manual pages
+ if ($id) {
+echo htmlheadtitleDelete reason/title/head\n,
+ bodyChoose a reason for deletion:\n\n,
+ form method='get'
action='http://master.php.net/manage/user-notes.php'\n,
+ input type='hidden' name='action' value='delete $id'/\n\n;
+ foreach ($delete_reasons as $rk = $rv) {
+echo input type='radio' name='reason' value='$rk'/$rvbr/\n;
+ }
+echo \ninput type='radio' name='reason' value=''
checked='checked'/Other reasonbr/\n,
+echo \nbr/input type='submit' name='' value='Confirm'/\n;
+echo /form/body/html\n;
+exit;
+ }
case 'reject':
case 'delete':
if ($id) {
Re[2]: [PHP-DOC] wrong symbols in phpdoc/chm
||*()*|| Hi, Vlad. VJ Also, it's unclear which one directory is really used for building chm VJ files. VJ I see two concurent ways: phpdoc/htmlhelp/make_chm.bat and VJ phpdoc/chm/make_chm.bat Read chm/make_chm.README and htmlhelp/README.txt VJ Both set of tools expect all the files produced by running make in html VJ subdirectory while really it appears a level higher. VJ So with default setting neither works. It is invoked from makefile in directory level above. I.e. cd phpdoc/ and then make chm or make chm_xml t --
[PHP-DOC] cvs: phpdoc /scripts missing-entities.php.in
techtonik Thu Sep 22 05:50:31 2005 EDT
Modified files:
/phpdoc/scripts missing-entities.php.in
Log:
- fix cygwin path issues finally
* set environment variables within PHP rather from shell
http://cvs.php.net/diff.php/phpdoc/scripts/missing-entities.php.in?r1=1.20r2=1.21ty=u
Index: phpdoc/scripts/missing-entities.php.in
diff -u phpdoc/scripts/missing-entities.php.in:1.20
phpdoc/scripts/missing-entities.php.in:1.21
--- phpdoc/scripts/missing-entities.php.in:1.20 Thu Sep 15 04:16:45 2005
+++ phpdoc/scripts/missing-entities.php.in Thu Sep 22 05:50:30 2005
@@ -17,7 +17,7 @@
| Gabor Hojtsy [EMAIL PROTECTED] |
+--+
- $Id: missing-entities.php.in,v 1.20 2005/09/15 08:16:45 betz Exp $
+ $Id: missing-entities.php.in,v 1.21 2005/09/22 09:50:30 techtonik Exp $
*/
set_time_limit(0);
@@ -38,26 +38,25 @@
// Support for Windows systems
$windows = (strpos(PHP_OS, 'WIN') !== false);
-// If PHP wasn't compiled on Cygwin, the path needs to be fixed.
-// cygwin's path is hardcoded to C:\cygwin. change it if needed
-if ($windows (strpos(php_uname(), 'CYGWIN') === false)) {
-$NSGMLS = preg_replace('@/usr/bin/(.+)@', 'C:\cygwin\bin\1.exe',
$NSGMLS);
+// If PHP wasn't compiled on Cygwin, then the path to NSGMLS (if it is
+// *nix path in case NSGMLS is installed via Cygwin setup) should be
+// fixed for exec command to work
+if ($windows
+ (strpos(php_uname(), 'CYGWIN') === false)
+ (strncmp($NSGMLS, /usr/bin/, 9) === 0))
+{
+ $cygbin = exec(cygpath -d /usr/bin/);
+$NSGMLS = preg_replace(!^/usr/bin/!, $cygbin, $NSGMLS);
}
// Execute a test of the manual
-if(@SP_OPTIONS@ == || substr(PHP_OS, 0, 3) == 'WIN') {
-exec(
-$NSGMLS -f $NSGMLS_OUTPUT -i [EMAIL PROTECTED]@ -D . .
--s @SRCDIR@/dtds/dbxml-4.1.2/phpdocxml.dcl manual.xml
-);
-}
-else {
-exec(
-@SP_OPTIONS@ $NSGMLS -f $NSGMLS_OUTPUT -i [EMAIL PROTECTED]@ -D . .
--s @SRCDIR@/dtds/dbxml-4.1.2/phpdocxml.dcl manual.xml
-);
-}
+$envy = explode( , @SP_OPTIONS@);
+array_map('putenv', $envy);
+exec(
+$NSGMLS -f $NSGMLS_OUTPUT -i [EMAIL PROTECTED]@ -D . .
+-s @SRCDIR@/dtds/dbxml-4.1.2/phpdocxml.dcl manual.xml
+);
// Try to open files for rewriting
$ment = fopen(entities/missing-entities.ent, w);
[PHP-DOC] cvs: phpdoc /scripts missing-entities.php.in
techtonik Thu Sep 22 10:48:42 2005 EDT Modified files: /phpdoc/scripts missing-entities.php.in Log: - '..' components are not allowed in exec path to executable http://cvs.php.net/diff.php/phpdoc/scripts/missing-entities.php.in?r1=1.21r2=1.22ty=u Index: phpdoc/scripts/missing-entities.php.in diff -u phpdoc/scripts/missing-entities.php.in:1.21 phpdoc/scripts/missing-entities.php.in:1.22 --- phpdoc/scripts/missing-entities.php.in:1.21 Thu Sep 22 05:50:30 2005 +++ phpdoc/scripts/missing-entities.php.in Thu Sep 22 10:48:36 2005 @@ -17,7 +17,7 @@ | Gabor Hojtsy [EMAIL PROTECTED] | +--+ - $Id: missing-entities.php.in,v 1.21 2005/09/22 09:50:30 techtonik Exp $ + $Id: missing-entities.php.in,v 1.22 2005/09/22 14:48:36 techtonik Exp $ */ set_time_limit(0); @@ -48,6 +48,8 @@ $cygbin = exec(cygpath -d /usr/bin/); $NSGMLS = preg_replace(!^/usr/bin/!, $cygbin, $NSGMLS); } +// '..' components are not allowed in exec path to executable +$NSGMLS = realpath($NSGMLS); // Execute a test of the manual
Re[2]: [PHP-DOC] wrong symbols in phpdoc/chm
||*()*|| Hi, Vlad. Could you also post or place a link to your ./configure command output after autoconf? VJ Got phpdoc and necessary tools installed and now it fails with the error VJ below: VJ [EMAIL PROTECTED] phpdoc]$ make VJ rm -rf html mkdir html VJ /usr/local/bin/php -q ./scripts/rtlpatch/hackmanuallang.php en VJ SP_ENCODING=XML SP_CHARSET_FIXED=YES /usr/bin/openjade -D . -wno-idref -c VJ ./entities/ISO/catalog -c ./dsssl/docbook/catalog -c VJ ./dsssl/defaults/catalog -d dsssl/html.dsl -V use-output-dir -t sgml VJ ./dtds/dbxml-4.1.2/phpdocxml.dcl manual.xml VJ /usr/bin/openjade:E: error reading dsssl/catalog (Is a directory) VJ I checked ~/phpdoc/dssl/catalog is a directory. VJ OpenJade 1.3.1 VJ OpenSP 1.3.4 VJ The same problem happens under Windows/Cygwin (openjade 1.3.3pre1) and under VJ native Linux (openjade version is listed above). VJ Any ideas? VJ Thanks, VJ JV. VJ Nuno Lopes [EMAIL PROTECTED] wrote in message VJ news:[EMAIL PROTECTED] The chm build tools are available at http://cvs.php.net/phpdoc/chm However this is a problem in the server's configuration, because the chms I've built on my machine are fine. It's probably just a locales problem within openjade. Nuno - Original Message - Hi Nuno, Thanks for your prompt reply. Sorry for bothering, I'd have checked bugtracker myself. I'd like to contribute and fix this problem or at least find the origin VJ of the trouble. Could you please point me out to the instructions relevant to CHM VJ targets? Thanks, JV. Nuno Lopes [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED] Hi, This is a know problem and is being tracked at VJ http://bugs.php.net/33838 Regards, Nuno - Original Message - Hi all, What's wrong with php-doc in CHM format? There are a lot of symbols throughout all the manual. In stead of Next, Prev and many topic captions etc links I see VJ just series of ?. CHM file is dated 2005-09-19, md5sum = 0578af416d91cc9bdf3fed5e4ffa48ac, English. I tried an old and quite outdated CHMs and they work just fine. What's up with newer ones? Regards, JV. t --
[PHP-DOC] cvs: phpdoc /en/reference/filesystem/functions feof.xml
techtonik Tue Sep 20 08:06:17 2005 EDT
Modified files:
/phpdoc/en/reference/filesystem/functions feof.xml
Log:
+ document feof() pitfall if invalid handle passed
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/feof.xml?r1=1.9r2=1.10ty=u
Index: phpdoc/en/reference/filesystem/functions/feof.xml
diff -u phpdoc/en/reference/filesystem/functions/feof.xml:1.9
phpdoc/en/reference/filesystem/functions/feof.xml:1.10
--- phpdoc/en/reference/filesystem/functions/feof.xml:1.9 Mon Sep 6
15:48:29 2004
+++ phpdoc/en/reference/filesystem/functions/feof.xml Tue Sep 20 08:06:16 2005
@@ -1,5 +1,5 @@
?xml version=1.0 encoding=iso-8859-1?
-!-- $Revision: 1.9 $ --
+!-- $Revision: 1.10 $ --
!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --
refentry id=function.feof
refnamediv
@@ -26,6 +26,26 @@
/simpara
/warning
fs.validfp.all;
+ warning
+ If passed file pointer is not valid you may get an infinite loop,
because
+ EOF fails to return TRUE.
+ example
+programlisting role=php
+ ![CDATA[
+?php
+// if file can not be read or doesn't exist fopen function returns FALSE
+$file = @fopen(no_such_file, r);
+
+// FALSE from fopen will issue warning and result in infinite loop here
+while (!feof($file)) {
+}
+
+fclose($file);
+?
+?]]
+/programlisting
+ /example
+ /warning
/refsect1
/refentry
[PHP-DOC] cvs: phpdoc /en/reference/filesystem/functions is-readable.xml
techtonik Tue Sep 20 08:09:45 2005 EDT Modified files: /phpdoc/en/reference/filesystem/functions is-readable.xml Log: * also works for directories http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/is-readable.xml?r1=1.7r2=1.8ty=u Index: phpdoc/en/reference/filesystem/functions/is-readable.xml diff -u phpdoc/en/reference/filesystem/functions/is-readable.xml:1.7 phpdoc/en/reference/filesystem/functions/is-readable.xml:1.8 --- phpdoc/en/reference/filesystem/functions/is-readable.xml:1.7Tue Apr 5 13:36:37 2005 +++ phpdoc/en/reference/filesystem/functions/is-readable.xmlTue Sep 20 08:09:43 2005 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- $Revision: 1.7 $ -- +!-- $Revision: 1.8 $ -- !-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -- refentry id=function.is-readable refnamediv @@ -13,7 +13,8 @@ methodparamtypestring/typeparameterfilename/parameter/methodparam /methodsynopsis para - Returns true; if the filename exists and is readable. + Returns true; if the file or directory specified by + parameterfilename/parameter exists and is readable. /para para Keep in mind that PHP may be accessing the file as the user
Re[2]: [PHP-DOC] #34476 [Bgs-Opn]: ulink doesn't appear on livedocs
||*()*|| Hi, Sean. Sean, update your ulinks. =) http://docbook.org/tdg/en/html/ulink.html When the content of the ULink element is empty, i.e., for either of the following cases: ulink url=.../ and ulink url=.../ulink, the content of the url attribute should be rendered as the text of the link. SC This begs the question, then: SC Which docbook reference should we now consider definitive? Obviously, SC we're looking at two different references. If I'm using the wrong one, SC then I'm sorry, but let's settle this. OASIS hosts standard for docbook, but it is slightly outdated and as stated here http://www.oasis-open.org/docbook/documentation/reference/ The official homepage for DocBook: The Definitive Guide is http://docbook.org/; Is better to use reference which is most suitable for our templates. DocBook evolves and it might be ok to stick with old edition if only templates were stable, but templates change and along with new features from new DocBook standard there are a lot of bugfixes. In other words if we use new templates we need to use a reference that describes them best. BTW, http://farplugins.sourceforge.net/test/docbook/index.php DocBook element lookup AJAX+PHP. t --
[PHP-DOC] Directories on CVS
Hello, What for are these files?? http://cvs.php.net/phpdoc/html/ HTML directory is cleaned automatically with every build, so files in it will not persist. http://cvs.php.net/phpdoc/kr/ http://cvs.php.net/phpdoc/ja/ t -- --[ http://wiki.phpdoc.info/DocLinks ]--
[PHP-DOC] cvs: phpdoc /scripts make-partial.php
techtonik Tue Sep 13 19:41:21 2005 EDT
Modified files:
/phpdoc/scripts make-partial.php
Log:
* sync with peardoc
http://cvs.php.net/diff.php/phpdoc/scripts/make-partial.php?r1=1.1r2=1.2ty=u
Index: phpdoc/scripts/make-partial.php
diff -u phpdoc/scripts/make-partial.php:1.1 phpdoc/scripts/make-partial.php:1.2
--- phpdoc/scripts/make-partial.php:1.1 Fri Jan 28 10:17:01 2005
+++ phpdoc/scripts/make-partial.php Tue Sep 13 19:41:19 2005
@@ -1,6 +1,7 @@
#!/usr/bin/env php
?php
/** vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4:
+ *
* Script to trigger partial builds of the PEAR manual
*
* LICENSE: This source file is subject to version 3.0 of the PHP license
@@ -11,30 +12,21 @@
*
* @authorMartin Jansen [EMAIL PROTECTED]
* @copyright 2005 The PEAR Group
- * @version CVS: $Id: make-partial.php,v 1.1 2005/01/28 15:17:01 sean Exp $
+ * @version CVS: $Id: make-partial.php,v 1.2 2005/09/13 23:41:19 techtonik
Exp $
*/
// NOTE: originally from peardoc:/make-partial.php ;
// these files should be kept in sync
+if (substr(PHP_VERSION, 0, 1) == 4) {
+require_once PHP/Compat.php;
+$components = PHP_Compat::loadVersion('5.0.0');
+}
+
require_once Console/Getopt.php;
$console = new Console_Getopt;
$args = $console-getopt($console-readPHPArgv(), array(),
- array(format=, include=));
-
-if (!function_exists(readline)) {
-echo Error: The readline extension could not be found!;
-exit(1);
-}
-
-$file = file(manual.xml.in);
-if (!$file) {
-echo Error: Unable to read manual.xml.in!;
-exit(1);
-}
-
-copy(manual.xml.in, manual.xml.in.partial-backup);
-register_shutdown_function(restoreFile);
+ array(format=, include=, help));
// {{{ gather arguments
@@ -42,7 +34,10 @@
$sections = array();
foreach ($args[0] as $arg) {
-if ($arg[0] == --format) {
+if ($arg[0] == --help) {
+showHelp();
+exit(0);
+} elseif ($arg[0] == --format) {
$format = $arg[1];
} elseif ($arg[0] == '--include') {
$sections[] = $arg[1];
@@ -51,6 +46,25 @@
// }}}
+$hasReadline = true;
+if (!function_exists(readline)) {
+$hasReadline = false;
+echo Warning: The readline extension could not be found!\n;
+if (count($sections) == 0) {
+showHelp();
+echo Exiting because no --include parameters were specified.\n;
+exit(1);
+}
+}
+
+$file = file(manual.xml.in);
+if (!$file) {
+echo Error: Unable to read manual.xml.in!;
+exit(1);
+}
+
+copy(manual.xml.in, manual.xml.in.partial-backup);
+register_shutdown_function(restoreFile, filemtime(manual.xml.in));
$newFile = ;
$partStack = array();
@@ -68,12 +82,12 @@
if ($sections) {
echo Including . $matches[1] .? ;
-if ($includePart = in_string($sections, $matches[1])) {
+if ($includePart = inString($sections, $matches[1])) {
echo YES\n;
} else {
echo NO\n;
}
-} else {
+} else if ($hasReadline) {
$include = readline(Include . $matches[1] . ? [NO] );
$includePart = evaluate($include);
}
@@ -117,12 +131,12 @@
if ($sections) {
echo Including . $matches[2] .? ;
-if ($include = in_string($sections, $matches[2])) {
+if ($include = inString($sections, $matches[2])) {
echo YES\n;
} else {
echo NO\n;
}
-} else {
+} else if ($hasReadline) {
$include = evaluate(readline(Include . $matches[2] . ?
[NO] ));
}
@@ -148,12 +162,14 @@
/**
* Restores the original manual.xml.in file
*/
-function restoreFile() {
+function restoreFile($savedmtime) {
if (!is_file(manual.xml.in.partial-backup)) {
return;
}
+unlink(manual.xml.in);
rename(manual.xml.in.partial-backup, manual.xml.in);
+touch(manual.xml.in, $savedmtime);
}
/**
@@ -170,12 +186,16 @@
}
/**
- * $needle (array) is in $haystack?
+ * Checks if one element of the first parameter is part of the second parameter
*
+ * @param array List of needles
+ * @param string Haystack
+ * @return boolean True if one of the needles is in the haystack,
+ * false otherwise.
*/
-function in_string($needle, $haystack)
+function inString($needle, $haystack)
{
-foreach ((array) $needle AS $n) {
+foreach ((array) $needle as $n) {
if (stripos($haystack, $n) !== false) {
return true;
}
@@ -183,4 +203,22 @@
return false;
}
+/**
+ * Prints a usage notice for the script
+ *
+ * @return void
+ */
+function showHelp()
+{
+echo Usage: make-partial.php [--format format] [--include section1]
[--include section2] ...\n;
+echomake-partial.php --help\n;
+echo
Re[3]: [PHP-DOC] get the word out about livedocs
||*()*|| Hi, Derick. My opinion that PHP.NET need a public-available project map, where project description, technology, roadmap, status and general guidelines will be explained, but I'm afraid that without commercial support it is not real to get started. DR Why? 1. Developers are not enough motivated DR Bullshit, there were tons of commits last week that proved the opposite. 2. Developers don't have enough time DR Same here, nor do I fail to see how creating road maps helps here, that DR costs extra time, doesn't it? That costs extra time to create for one person, but greatly reduces the time for other to understand what can they do, how can they could do it and where should they start from. 3. OpenSource folks lack organization/planning/time and project management skills acquired in complex projects with appropriate commercial tools (such as MS Project, Rational) DR What makes you think that? Most OpenSource folks also work in a DR company, where those tools might be in use. I doubt anybody here wants DR to do anything with propietary Windows only tools too. The outcomes of no-using-planning-tools-at-all is that knowledge about structures and functinality is not shared. People have hard times trying to figure out how something works. Most of the time they just don't want to do this, becuase it seems to them too complex. 4. Responsibility, task distribution and timely support is not possible when you have full-time work contract somethere else to earn funds. DR I think it works pretty well right now, f.e. see the Unicode stuff, the DR OCI8 stuff. Remember that we're mostly all volunteers here, working on DR PHP because we need to solve a problem that we encounter. We're not a DR company. We are mostly separated here. I better say there are many small wes and Is. I agree that many of us volunteers, but everone is mostly concerned with his/her own problems. I.e. when I ask where to get or how to compile debug version of PHP4 for windows to track PHP crashes in complex PHP4 framework overburdened with patterns I'm getting suggestion to get PHP5 or provide a simple 10-20 script. I've told the guys that framework is for PHP4 only and it is impossible to get 10-20 lines testcase from it by design. That's why I need PHP4 debug version. And still the same reply - give reproducing script. Very kind of volunteers. That is what I call lack of motivation. Volunteers often don't have time/desire to work on complex/uninteresting/obscure problems. t --
Re[2]: [PHP-DOC] get the word out about livedocs
||*()*|| Hi, Sean. GH Project map about what projects? Project: PHPDOC Subprojects: PHPDOC TOOLS, LIVEDOCS, DOCWEB, USERNOTES Project: PEAR Subprojects: PEARDOC, PEARDOC TOOLS, PEARWEB, PEAR AUTOMATION Project: PHP.NET Subprojects: DEV-MASTER-WEB, DEV-BUGTRACK, SYSTEMS-MIRRORS, SYSTEMS-CVS, SYSTEMS-ML, PHP-WEB, PHP-NEWS, PHP-NET-AUTOMATION or PHP-NET-TOOLS Project: PHP Subprojects: PHP4, PHP5, PHP6, PHP-EXTENSIONS-CORE, PHP-EMBED, PHP-ISAPI or PHP-INTEGRATION + PHP-GTK =) 1. Developers are not enough motivated SC not true. SC Developers work on what we WANT to work on, WHEN we want, unless someone SC is paying them to work on something specific. Yep. I'd like to test second approach. SC My instant livedocs, for example, has not evolved, primarily because: SC lack of expressed interest from anyone but me and Goba, I haven't SC received much feedback, I got hung up on a bug SC (http://bugs.php.net/bug.php?id=33608), and: I've seen livedocs, but didn't understand how it works. It looks rather complicated with these shell scripts and I'm working on a windows platform. I was not sure it will work on cygwin, because I have separate locations for wwwroot, phpdoc repository and cygwin root. Me too doen't have time to read these 130k just to find out it should fill sqlite database somewhere, but that doesn't happen, because the package is still alphabuggy and cygwin/win uncompatible. You bug is a hard to solve, because it is logical mistake, but the parsing logic is unknown for me and others and we are not able to check it. There is no draft, no concept, no model, not even a glue about it - only raw PHP code. Everybody who want to help should do full logic reversing first or start from scratch. The last is what I've done with XSLT stylesheets, but I was highly motivated by new knowledge I gained about XML. 2. Developers don't have enough time SC That's the big one. I'm tasked at 100% right now, with working, working SC [sic], raising a kid, and having a new house that needs care. The same conflict I'm trying to resolve. I'd like to be more financially independent and work on PHP.NET issues at the same time, but this seems to be unreal. That's why for last half of year almost no progress has been done with CHM bugs and ToDo's. SC A roadmap won't help, here. We'll just miss deadlines, and become MORE SC discouraged. SC Unless, of course, you've got a few hundred thousand dollars to start a SC foundation and hire people to be your roadmap-deadline-meeting minions. SC If that's the case, by all means, start it up, and recruit developers! Roadmap != deadlines. It is a list of features/bugs that should be completed before release. It gives answers to question when livedocs will be available? in a manner after this, this and this bug will be fixed. It also tells what this bug is not so important and it is planned on a next livedocs rewrite. So it is a way to map bugs and features to releases and give others possibility to check box on this buglist to speed up the release. No deadlines here. It just increases visibility of the process. This bug and feature (issue) list can be extended to include other relevant information about arising problems, provide issue-dependency links. Issue != bugreport. SC (the foundation scenario is why roadmaps work for projects like Mozilla) SC One thing I HAVE noticed, however, is the project-momentum phenomenon. SC DocWeb is a perfect example. We go through commit-sprees -- someone SC commits some changes, and then within a few days we see dozens of SC commits.. a week later, the list is dead. Because project became too complicated and hard to maintain. The lack of planning makes further work painful patching and bugfixing leading to totally unmaintainable code. If you have a clear vision of project structure then you can always think about how to avoid the problem in the future in addition to how to fix this bug right now. Given structure of the project and some basic lifecycle procedures you can - no matter how it works - you can rewrite this project in a more clear way. And collected issues can help to optimize this structure and design new approach to old problems. This is called software engineering IIRC. SC The best way to lead, here, is to step up, do some work, and rally the SC troops, socially. If people are motivated, and they have time, they'll SC jump on the project and contribute. t --
Re: [PHP-DOC] get the word out about livedocs
||*()*|| Hi, Gabor. GH Isn't it time to post a news announcement about Sean's instant livedocs GH on php.net, so that we get actual testers finally? It seems that Sean GH have not received too many comments on his work, but it would allow us GH to get the word out finally. I know the original intention was to only GH test it internally in the doc team, then the blog post revealed it, now GH it might be the time to step further. GH Opinions? My opinion that PHP.NET need a public-available project map, where project description, technology, roadmap, status and general guidelines will be explained, but I'm afraid that without commercial support it is not real to get started. t --
Re[2]: [PHP-DOC] get the word out about livedocs
||*()*|| Hi, Derick. My opinion that PHP.NET need a public-available project map, where project description, technology, roadmap, status and general guidelines will be explained, but I'm afraid that without commercial support it is not real to get started. DR Why? 1. Developers are not enough motivated 2. Developers don't have enough time 3. OpenSource folks lack organization/planning/time and project management skills acquired in complex projects with appropriate commercial tools (such as MS Project, Rational) 4. Responsibility, task distribution and timely support is not possible when you have full-time work contract somethere else to earn funds. t --
Re[2]: [PHP-DOC] get the word out about livedocs
||*()*|| Hi, Gabor. GH Isn't it time to post a news announcement about Sean's instant livedocs GH on php.net, so that we get actual testers finally? It seems that Sean GH have not received too many comments on his work, but it would allow us GH to get the word out finally. I know the original intention was to only GH test it internally in the doc team, then the blog post revealed it, now GH it might be the time to step further. GH Opinions? My opinion that PHP.NET need a public-available project map, where project description, technology, roadmap, status and general guidelines will be explained, but I'm afraid that without commercial support it is not real to get started. GH Project map about what projects? Project: PHPDOC Subprojects: PHPDOC TOOLS, LIVEDOCS, DOCWEB, USERNOTES Project: PEAR Subprojects: PEARDOC, PEARDOC TOOLS, PEARWEB, PEAR AUTOMATION Project: PHP.NET Subprojects: DEV-MASTER-WEB, DEV-BUGTRACK, SYSTEMS-MIRRORS, SYSTEMS-CVS, SYSTEMS-ML, PHP-WEB, PHP-NEWS, PHP-NET-AUTOMATION or PHP-NET-TOOLS Project: PHP Subprojects: PHP4, PHP5, PHP6, PHP-EXTENSIONS-CORE, PHP-EMBED, PHP-ISAPI or PHP-INTEGRATION http://cvs.php.net/ to get more t --
Re[2]: [PHP-DOC] Manual Credits/Contributors
||*()*|| Hi, Sean. AFAIR we decided to not use hard numbers (so people will not do useless commits just to reach a limit, as it was done before), but put up names instead, and then wait some pre-specified time if someone votes against their inclusion. Since we are mostly only looking one year back, it is easier to discuss names. SC Good. I think that's fair. SC Now, at risk of patting myself on the back, I'd like to be included in SC the Authors and Editors block, as well as a Notes Maintainer. SC Obviously, if someone has a problem with this, we can discuss it. I'm SC open-minded, and I actually really hate ringing my own bell. Not a problem, but we can discuss it anyway. =) It would be nice to see your name on the wall. As for other developers I'm pretty out of sync, but if you mentioned them I think they worth something. t --
Re: [PHP-DOC] Porting recent DSSSL changes to XSL
||*()*|| Hi, Hartmut. HH now that i started to add a Zend API function and macro reference HH i need someone to port my function autolink changes from the DSSSL HH (my preciou ;) to the XSL version of the stylesheets HH the DSSSL changes are in this commit: HH http://cvs.php.net/diff.php/phpdoc/dsssl/html-common.dsl?r1=1.22r2=1.23ty=u HH any volunteers? I think I can make the necessary modifications, but somebody have to explain what needs to be changed in more ordinary-human-compatible format. =) (I'm not an expert in DSSSL) t --
Re[2]: [PHP-DOC] xCHM manual temporary borked issue
||*()*|| Hi, Nuno. Thanks. Good to know the problem didn't left the scope of my system. It should be in new DocBook templates I'm trying to integrate. NL I was able to build a xchm after your changes (it will go live tomorrow, as NL usual). NL Nuno NL - Original Message - Hello, phpdoc@lists.php.net I have troubles debugging latest customization layer for DocBook. Everything compiles ok, but HtmlHelp engine can't open target .chm file. If I will not succeed with resolving the problem until build on friday (it is very possible) please use snapshot of /xsl/ subdir dated no later than Jul 17 or skip this build. Sorry for inconvenience. t -- --[ http://wiki.phpdoc.info/DocLinks ]-- t --
[PHP-DOC] cvs: phpdoc /en/reference/strings/functions addcslashes.xml
techtonik Sat Aug 6 09:28:19 2005 EDT Modified files: /phpdoc/en/reference/strings/functions addcslashes.xml Log: * stress that C-like characters conversion is not automatic, i.e. they must be present in charlist http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/addcslashes.xml?r1=1.7r2=1.8ty=u Index: phpdoc/en/reference/strings/functions/addcslashes.xml diff -u phpdoc/en/reference/strings/functions/addcslashes.xml:1.7 phpdoc/en/reference/strings/functions/addcslashes.xml:1.8 --- phpdoc/en/reference/strings/functions/addcslashes.xml:1.7 Mon Aug 9 10:53:55 2004 +++ phpdoc/en/reference/strings/functions/addcslashes.xml Sat Aug 6 09:28:19 2005 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- $Revision: 1.7 $ -- +!-- $Revision: 1.8 $ -- !-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -- refentry id=function.addcslashes refnamediv @@ -15,10 +15,12 @@ /methodsynopsis para Returns a string with backslashes before characters that are - listed in parametercharlist/parameter parameter. It escapes - literal\n/literal, literal\r/literal etc. in C-like - style, characters with ASCII code lower than 32 and higher than - 126 are converted to octal representation. + listed in parametercharlist/parameter parameter. If + parametercharlist/parameter contains characters + literal\n/literal, literal\r/literal etc., they are + converted in C-like style, while other non-alphanumeric characters + with ASCII codes lower than 32 and higher than 126 converted to + octal representation. /para para Be careful if you choose to escape characters 0, a, b, f, n, r,
[PHP-DOC] xCHM manual temporary borked issue
Hello, phpdoc@lists.php.net I have troubles debugging latest customization layer for DocBook. Everything compiles ok, but HtmlHelp engine can't open target .chm file. If I will not succeed with resolving the problem until build on friday (it is very possible) please use snapshot of /xsl/ subdir dated no later than Jul 17 or skip this build. Sorry for inconvenience. t -- --[ http://wiki.phpdoc.info/DocLinks ]--
Re[2]: [PHP-DOC] proposal system
||*()*|| Hi, Sean. ... SC I look at the proposal system as a way to work ideas into a solution SC that the majority (and sure, ideally everyone) can be happy with. SC For example, I have a pseudo-proposal that I've been stalling on, SC waiting for the RFC system. Philip also has one (that may have already SC been adopted.. ?). http://wiki.phpdoc.info/RFC. My Nomenclature SC proposal, for example, isn't something I want to work out on my own. I SC don't want to say Here are the rules. Follow them. I want us to come SC to a concensus (as you put it) on the best practices. I think we can do SC that. SC Please don't look at it as conflict and force, but as problem and SC possible solution. Ok. =) But I think proposal system is bad technicaly, because: 1. It doesn't have revision history - you can't track discussion flow. 2. No revision history - smb. can't be sure, that he/she agreed on first revision of proposal or some later edition. 3. No separated feature votings - there is often a situation when you generally agree with proposal, but some of the features are badly wrong an you have to put accent on them every time. Well, frankly speaking I don't mind if we will use that system to draw more attention to this part of phpdoc activity. I don't even know why me personally dislike the PePr in application to RFC - perhaps I have a feeling, that it will not be so popular or will be misused. =) t --
[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Sun Jul 31 07:43:47 2005 EDT
Modified files:
/phpdoc/xsl htmlhelp.xsl
Log:
+ allow printing xCHM chapters - bug #29749
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.24r2=1.25ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.24 phpdoc/xsl/htmlhelp.xsl:1.25
--- phpdoc/xsl/htmlhelp.xsl:1.24Sat Jul 30 15:42:41 2005
+++ phpdoc/xsl/htmlhelp.xsl Sun Jul 31 07:43:45 2005
@@ -3,7 +3,7 @@
HTML Help specific stylesheet
- $Id: htmlhelp.xsl,v 1.24 2005/07/30 19:42:41 techtonik Exp $
+ $Id: htmlhelp.xsl,v 1.25 2005/07/31 11:43:45 techtonik Exp $
--
xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
@@ -404,7 +404,7 @@
body
xsl:call-template name=body.attributes/
- div id=pageContent style=display:none;
+ div id=pageContent
xsl:call-template name=user.header.navigation/
xsl:call-template name=header.navigation
@@ -442,12 +442,26 @@
xsl:template name=user.head.content
xsl:param name=node select=./
+xsl:text disable-output-escaping=yes![CDATA[
+ style type=text/css
+ #pageContent {display:none}
+ @media print {
+ #pageContent {display:block}
+ }
+ /style
script type=text/javascript language=JavaScript1.2
src=_script.js/script
+]]/xsl:text
/xsl:template
!-- We need quite different body attributes than the defaults --
xsl:template name=body.attributes
- xsl:attribute name=onloadif (typeof displayPage == 'function') {
displayPage(); } else {document.all['pageContent'].style.display =
'block';}/xsl:attribute
+ xsl:attribute name=onload
+ if (typeof displayPage == 'function') {
+displayPage();
+ } else if (typeof document.all['pageContent'].style != 'undefined') {
+ document.all['pageContent'].style.display = 'block';
+ }
+ /xsl:attribute
xsl:attribute name=oncontextmenuif(prefs_context_override){return
false;}/xsl:attribute
/xsl:template
[PHP-DOC] bugfixing policy
Hello, phpdoc@lists.php.net I forgot - what do we do with duplicate bugs if main bug is closed? These are marked bogus by default. for example: http://bugs.php.net/bug.php?id=30708 - main bug closed these are bogus: http://bugs.php.net/bug.php?id=33262 http://bugs.php.net/bug.php?id=29862 Should one work on bogus entries or leave them for some purpose? Can they be closed, reviewed to be suspended or asked to be retested against latest manual version to finally get one of the three status no feedback, won't fix or closed ? t -- --[ http://wiki.phpdoc.info/DocLinks ]--
[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Sat Jul 30 14:30:40 2005 EDT Modified files: /phpdoc/xsl htmlhelp.xsl Log: - attempt to fix javascript errors of Bug #29749 while printing http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.22r2=1.23ty=u Index: phpdoc/xsl/htmlhelp.xsl diff -u phpdoc/xsl/htmlhelp.xsl:1.22 phpdoc/xsl/htmlhelp.xsl:1.23 --- phpdoc/xsl/htmlhelp.xsl:1.22Thu Jul 14 09:42:28 2005 +++ phpdoc/xsl/htmlhelp.xsl Sat Jul 30 14:30:40 2005 @@ -1,755 +1,755 @@ -?xml version=1.0? -!-- - - HTML Help specific stylesheet - - $Id: htmlhelp.xsl,v 1.22 2005/07/14 13:42:28 techtonik Exp $ - --- -xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform; -xmlns:doc=http://nwalsh.com/xsl/documentation/1.0; -xmlns:exsl=http://exslt.org/common; -xmlns:set=http://exslt.org/sets; - version=1.0 -exclude-result-prefixes=doc exsl set -!-- - xCHM HTMLHELP customizations include: - - output directory for HTML and project Help files is 'htmlhelp/html/' - - open ulinks in _blank window - - CHM buttons settings - - custom .hhk file with index.html split in two files (titlepage and toc) - - custom .hhc file with same changes - - .hhk and .hhc are processed in html mode unlike native DocBook XSL templates - - proper escaping in .hhk and .hhc to reflect transition from text to html mode - - - DOCTYPE in output HTML defines DOM standard for browser to handle JS correctly - - strip link tags from HTML headers - - add javascript handlers in body attributes - - add root DHTML div with id =PageContent for skinning purposes - - header off, footer on (also custom with some js handlers and custom ids) - - - turn on function index page building (in appendixes) and turn off ToC for it - - output formal object titles enclosed in h3 tags -(abstract title, examples, tables, ...?) - - simple bold text for admonitions (note|important|warning|caution|tip) - - custom tables attributes - - special reference page - drop out description title, proper rendering for -seealso, move refname along with function prototype to page header and -render it appropriately -TODO: need convenient reference page skeleton - -NOTE: custom HTML xCHM layout described in phpdoc/en/chmonly/skins.xml or - http://wiki.phpdoc.info/xCHM --- - -!-- - BASED ON 1.66.1 HTMLHELP.XSL DOCBOOK XSL STYLESHEET - -- - -xsl:import href=./docbook/html/chunk.xsl/ -xsl:import href=./docbook/htmlhelp/htmlhelp-common.xsl/ -xsl:import href=common.xsl/ - -!-- configure/able/ parameters -- -xsl:include href=htmlhelp-config.xsl/ - -!-- we use CSS styling to make verbatim sections look nicy -- -xsl:param name=shade.verbatim select=0/ - -xsl:param name=chunker.output.doctype-system select='http://www.w3.org/TR/html4/loose.dtd'/ -xsl:param name=chunker.output.doctype-public select='-//W3C//DTD HTML 4.01 Transitional//EN'/ - -xsl:param name=base.dir select='htmlhelp/html/'/ -!-- project files for HTML Help are written into base.dir instead of current directory -- -xsl:param name=manifest.in.base.dir select=1/ -xsl:param name=use.id.as.filename select=1/ -xsl:param name=chunk.quietly select=1/ - -!-- Supress the ,figure,example,equation (like DSSSL output). -- -xsl:param name=generate.toc -appendix toc,title -article toc -book toc,title -chapter toc,title -part toc,title -preface toc -qandadiv toc -qandaset toc -reference toc,title -sect1 toc -sect2 toc -sect3 toc -sect4 toc -sect5 toc -section toc -set toc -/xsl:param - -!-- Target window for external ulinks -- -xsl:param name=ulink.target select='_blank'/ - - -!-- *** HTML HELP PROJECT PARAMETERS -- - -!-- Turn off Binary TOC used Prev/Next buttons on toolbar. Files with binary TOC can't be merged -- -xsl:param name=htmlhelp.hhc.binary select=0/ -xsl:param name=htmlhelp.generate.index select=1/ -xsl:param name=htmlhelp.use.hhk select=1/ -!-- xsl:param name=htmlhelp.use.hhk select=1/ doesn't work -- - -xsl:param name=htmlhelp.display.progress select=0/ -xsl:param name=htmlhelp.default.topic select='_index.html'/ -xsl:param name=htmlhelp.hhp.window select='phpdoc'/ -xsl:param name=htmlhelp.enhanced.decompilation select=1/ - -xsl:param name=htmlhelp.hhc.folders.instead.books select=0/ -xsl:param name=htmlhelp.hhc.show.root select=0/ - - -!-- xsl:with-param name=xnavigation select='0x23520'/ -- -xsl:param name=htmlhelp.show.menu select=0/ -xsl:param name=htmlhelp.show.toolbar.text select=1/ -xsl:param name=htmlhelp.show.advanced.search select=1/ -xsl:param name=htmlhelp.show.favorities select=1/ - -!-- xsl:with-param name=xbuttons select='0x386e'/ -- -!-- 0x4387E with additional stop and php.net buttons-- -xsl:param name=htmlhelp.button.hideshow select=1/ -xsl:param name=htmlhelp.button.locate select=1/ -xsl:param name=htmlhelp.button.back select=1/ -xsl:param name=htmlhelp.button.forward
[PHP-DOC] proposal system
Hello, phpdoc@lists.php.net I don't know who invented proposal system, but I dislike it. Proposals votings and so-called democratic system is evil. If we can't find a consensus then we are very bad team. I personally enjoy solving phpdoc tasks and act on my own, but programming proposal for my chaotic nature is not different from ordinary job, except that it is my free time. IMHO a proof of concept and fix to recent commit in many ways better than a good advice and appreciation of the work yet undone. Which problems (conflicts) do we want to solve? and Who we want to convince (force) with this system? t -- --[ http://wiki.phpdoc.info/DocLinks ]--
[PHP-DOC] cvs: phpdoc /htmlhelp/suppfiles/html _script.js
techtonik Sat Jul 30 15:26:45 2005 EDT
Modified files:
/phpdoc/htmlhelp/suppfiles/html _script.js
Log:
* give more time for clipboard copy operations to complete
http://cvs.php.net/diff.php/phpdoc/htmlhelp/suppfiles/html/_script.js?r1=1.9r2=1.10ty=u
Index: phpdoc/htmlhelp/suppfiles/html/_script.js
diff -u phpdoc/htmlhelp/suppfiles/html/_script.js:1.9
phpdoc/htmlhelp/suppfiles/html/_script.js:1.10
--- phpdoc/htmlhelp/suppfiles/html/_script.js:1.9 Tue Jun 14 10:47:47 2005
+++ phpdoc/htmlhelp/suppfiles/html/_script.js Sat Jul 30 15:26:43 2005
@@ -1,537 +1,537 @@
-// $Id: _script.js,v 1.9 2005/06/14 14:47:47 techtonik Exp $
-//
=
-// Preference handling
-
-// Handle all the preferences, including online functions custom
-// context menus, and skins [this is called from php_manual_prefs.js]
-function prefHandler()
-{
-// Find out what file stores the skin JS code
-switch (prefs_skin) {
-
-// Internal low skin
-case Low:
-skin_js_file = '_skin_lo.js';
-break;
-
-// Internal high skin
-case High:
-skin_js_file = '_skin_hi.js';
-break;
-
-// An external skin with full path (escape it just
-// to make sure that paths with spaces and other
-// unusual chars will work - and turn back : to
-// it's original form)
-default:
-//escaped_skin = escape(prefs_skin);
-//escaped_skin = escaped_skin.replace(/%3A/, ':')
-skin_js_file = file:/// + prefs_skin;
-break;
-}
-
-// Load in the skin JS code
-document.write('script src=' + skin_js_file + ''+ '/script');
-
-// OnContextMenu is only supported in IE5+ so do
-// not try to support the context menu otherwise
-if (ie_version_major = 5) {
-
-// Write out context menu for the first time into it's div
-document.write('div id=contextMenu');
-contextMenuRewrite(true);
-document.write('/div');
-
-// Assign our own event handlers to document events [5+]
-document.oncontextmenu = contextMenu;
-document.onclick = contextMenuCloseTimeout;
-window.onblur = contextMenuCloseTimeout;
-}
-}
-
-//
=
-// CHM path detection - Thanks to Pete Lees and Jeff Hall for this code
-
-// Get the path and name of the CHM file and assign values
-function getCHMFile()
-{
-var a, X, Y, Z;
-a = location.href.search(/:/);
-Y = location.href.lastIndexOf(::);
-if (a == 4) { // file: or http:
-Y = location.href.lastIndexOf(/);
-chmfile_page = unescape(location.href.substring(Y+1));
-if (location.href.substring(0,4) == file) {
-chmfile_path = unescape(location.href.substring(8, Y+1));
-}
-}
-else {
-if (a == 2) X = 14; // mk:@MSITStore:
-if (a == 7) X = 7; // ms-its:
-chmfile_fullname = unescape(location.href.substring(X, Y));
-Z = chmfile_fullname.lastIndexOf(\\);
-chmfile_path = unescape(chmfile_fullname.substring(0, Z+1));
-chmfile_name = unescape(chmfile_fullname.substring(Z+1));
-chmfile_page = unescape(location.href.substring(Y+3));
-}
-
-// RAQ : Wednesday, 16 March 2005 01:56 pm : If this page has been loaded
because
-// the notes were selected from the search results, then remove the
hash.
-if (location.hash == '#userNotes')
-chmfile_page = chmfile_page.substring(0,
chmfile_page.lastIndexOf('#'));
-
-//alert(
-// _script\n\n +
-// location\n+
-// location.hash = ' + location.hash + '\n +
-// location.host = ' + location.host + '\n +
-// location.hostname = ' + location.hostname + '\n +
-// location.href = ' + location.href + '\n +
-// location.pathname = ' + location.pathname + '\n +
-// location.port = ' + location.port + '\n +
-// location.protocol = ' + location.protocol + '\n +
-// location.search = ' + location.search + '\n\n +
-// chmfile\n+
-// chmfile_name = ' + chmfile_name + '\n +
-// chmfile_path = ' + chmfile_path + '\n +
-// chmfile_page = ' + chmfile_page + '\n
-// );
-
-}
-
-//
=
-// Page display and online functions code
-
-// Go online to see this page in an external window [called when a user
-// clicks on the this page oline link]
-function thisPageOnline()
-{
-if (!prefs_online) {
-alert(You are in offline mode.\nThis functionality is not available);
-} else {
-window.open(prefs_mirror + 'manual/' + this_lang + '/' +
this_page_php);
-}
-}
-
-// Report bug on this manual page, using GET method URL tricks
-// [called when a user clicks on
[PHP-DOC] cvs: phpdoc /htmlhelp/suppfiles/skins/phpZ skin.js
techtonik Sat Jul 30 15:36:19 2005 EDT
Modified files:
/phpdoc/htmlhelp/suppfiles/skins/phpZ skin.js
Log:
- fix javascript errors like on appendixes/configure options page when
navigation link has additional markup child
http://cvs.php.net/diff.php/phpdoc/htmlhelp/suppfiles/skins/phpZ/skin.js?r1=1.4r2=1.5ty=u
Index: phpdoc/htmlhelp/suppfiles/skins/phpZ/skin.js
diff -u phpdoc/htmlhelp/suppfiles/skins/phpZ/skin.js:1.4
phpdoc/htmlhelp/suppfiles/skins/phpZ/skin.js:1.5
--- phpdoc/htmlhelp/suppfiles/skins/phpZ/skin.js:1.4Wed Mar 16 13:04:13 2005
+++ phpdoc/htmlhelp/suppfiles/skins/phpZ/skin.jsSat Jul 30 15:36:18 2005
@@ -1,4 +1,4 @@
-// phpZ version 1.0.2 PHP Manual CHM version skin by Gonzalo De la Peña
[EMAIL PROTECTED]
+// phpZ version 1.0.3 PHP Manual CHM version skin by Gonzalo De la Peña
[EMAIL PROTECTED]
// Based partially on the PHP CHM base skin by Gabor Hojtsy
// Minor enhancements by Richard Quadling [EMAIL PROTECTED]
//
@@ -25,7 +25,7 @@
functionPage = true;
else
functionPage = false;
- manualVersion = 'phpZ skinBRver 1.0.2';
+ manualVersion = 'phpZ skinBRver 1.0.3';
manualDate = '';
}
@@ -276,34 +276,29 @@
var prev = document.all('navPrev');
var next = document.all('navNext');
var html = '';
- var prevText, nextText;
// RAQ : Friday, 18 February 2005 09:32 am : Initialise variables
var prevURL = '';
var prevText = '';
var nextURL = '';
var nextText = '';
- if ( ! prev || ! next )
- {
- next = document.createElement('DIV');
- next.innerHTML = 'nbsp;';
+ if ( ! prev ) {
prev = document.createElement('DIV');
prev.innerHTML = 'nbsp;';
- }
- else
- {
- if ( ie_version_major = 6 )
- {
- prevText = prev.childNodes[0].childNodes[0];
- prevText.data = prevText.substringData(3,
prevText.length - 3);
- nextText = next.childNodes[0].childNodes[0];
- nextText.data = nextText.substringData(0,
nextText.length - 3);
- }
+ } else {
// RAQ : Friday, 18 February 2005 09:33 am : Retrieve URL and Text for
next and previous.
prevURL = prev.all.tags('A')(0).href;
prevText = prev.all.tags('A')(0).innerText;
+ prevText = prevText.substring(3);
+}
+
+ if ( ! next ) {
+ next = document.createElement('DIV');
+ next.innerHTML = 'nbsp;';
+ } else {
nextURL = next.all.tags('A')(0).href;
nextText = next.all.tags('A')(0).innerText;
+ nextText = nextText.substring(0, nextText.length - 3);
}
html += 'DIV style=background-color:#BABFD4; border-top:2px solid
#00; margin-top:4; height:42; overflow:hidden;';
[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Sat Jul 30 15:42:43 2005 EDT Modified files: /phpdoc/xsl htmlhelp.xsl Log: - g.. convert endings back to lf http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.23r2=1.24ty=u Index: phpdoc/xsl/htmlhelp.xsl diff -u phpdoc/xsl/htmlhelp.xsl:1.23 phpdoc/xsl/htmlhelp.xsl:1.24 --- phpdoc/xsl/htmlhelp.xsl:1.23Sat Jul 30 14:30:40 2005 +++ phpdoc/xsl/htmlhelp.xsl Sat Jul 30 15:42:41 2005 @@ -1,755 +1,755 @@ -?xml version=1.0? -!-- - - HTML Help specific stylesheet - - $Id: htmlhelp.xsl,v 1.23 2005/07/30 18:30:40 techtonik Exp $ - --- -xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform; -xmlns:doc=http://nwalsh.com/xsl/documentation/1.0; -xmlns:exsl=http://exslt.org/common; -xmlns:set=http://exslt.org/sets; - version=1.0 -exclude-result-prefixes=doc exsl set -!-- - xCHM HTMLHELP customizations include: - - output directory for HTML and project Help files is 'htmlhelp/html/' - - open ulinks in _blank window - - CHM buttons settings - - custom .hhk file with index.html split in two files (titlepage and toc) - - custom .hhc file with same changes - - .hhk and .hhc are processed in html mode unlike native DocBook XSL templates - - proper escaping in .hhk and .hhc to reflect transition from text to html mode - - - DOCTYPE in output HTML defines DOM standard for browser to handle JS correctly - - strip link tags from HTML headers - - add javascript handlers in body attributes - - add root DHTML div with id =PageContent for skinning purposes - - header off, footer on (also custom with some js handlers and custom ids) - - - turn on function index page building (in appendixes) and turn off ToC for it - - output formal object titles enclosed in h3 tags -(abstract title, examples, tables, ...?) - - simple bold text for admonitions (note|important|warning|caution|tip) - - custom tables attributes - - special reference page - drop out description title, proper rendering for -seealso, move refname along with function prototype to page header and -render it appropriately -TODO: need convenient reference page skeleton - -NOTE: custom HTML xCHM layout described in phpdoc/en/chmonly/skins.xml or - http://wiki.phpdoc.info/xCHM --- - -!-- - BASED ON 1.66.1 HTMLHELP.XSL DOCBOOK XSL STYLESHEET - -- - -xsl:import href=./docbook/html/chunk.xsl/ -xsl:import href=./docbook/htmlhelp/htmlhelp-common.xsl/ -xsl:import href=common.xsl/ - -!-- configure/able/ parameters -- -xsl:include href=htmlhelp-config.xsl/ - -!-- we use CSS styling to make verbatim sections look nicy -- -xsl:param name=shade.verbatim select=0/ - -xsl:param name=chunker.output.doctype-system select='http://www.w3.org/TR/html4/loose.dtd'/ -xsl:param name=chunker.output.doctype-public select='-//W3C//DTD HTML 4.01 Transitional//EN'/ - -xsl:param name=base.dir select='htmlhelp/html/'/ -!-- project files for HTML Help are written into base.dir instead of current directory -- -xsl:param name=manifest.in.base.dir select=1/ -xsl:param name=use.id.as.filename select=1/ -xsl:param name=chunk.quietly select=1/ - -!-- Supress the ,figure,example,equation (like DSSSL output). -- -xsl:param name=generate.toc -appendix toc,title -article toc -book toc,title -chapter toc,title -part toc,title -preface toc -qandadiv toc -qandaset toc -reference toc,title -sect1 toc -sect2 toc -sect3 toc -sect4 toc -sect5 toc -section toc -set toc -/xsl:param - -!-- Target window for external ulinks -- -xsl:param name=ulink.target select='_blank'/ - - -!-- *** HTML HELP PROJECT PARAMETERS -- - -!-- Turn off Binary TOC used Prev/Next buttons on toolbar. Files with binary TOC can't be merged -- -xsl:param name=htmlhelp.hhc.binary select=0/ -xsl:param name=htmlhelp.generate.index select=1/ -xsl:param name=htmlhelp.use.hhk select=1/ -!-- xsl:param name=htmlhelp.use.hhk select=1/ doesn't work -- - -xsl:param name=htmlhelp.display.progress select=0/ -xsl:param name=htmlhelp.default.topic select='_index.html'/ -xsl:param name=htmlhelp.hhp.window select='phpdoc'/ -xsl:param name=htmlhelp.enhanced.decompilation select=1/ - -xsl:param name=htmlhelp.hhc.folders.instead.books select=0/ -xsl:param name=htmlhelp.hhc.show.root select=0/ - - -!-- xsl:with-param name=xnavigation select='0x23520'/ -- -xsl:param name=htmlhelp.show.menu select=0/ -xsl:param name=htmlhelp.show.toolbar.text select=1/ -xsl:param name=htmlhelp.show.advanced.search select=1/ -xsl:param name=htmlhelp.show.favorities select=1/ - -!-- xsl:with-param name=xbuttons select='0x386e'/ -- -!-- 0x4387E with additional stop and php.net buttons-- -xsl:param name=htmlhelp.button.hideshow select=1/ -xsl:param name=htmlhelp.button.locate select=1/ -xsl:param name=htmlhelp.button.back select=1/ -xsl:param name=htmlhelp.button.forward select=1/ -!-- next two buttons
[PHP-DOC] cvs: phpdoc /htmlhelp/suppfiles/html _script.js
techtonik Sat Jul 30 15:53:13 2005 EDT
Modified files:
/phpdoc/htmlhelp/suppfiles/html _script.js
Log:
- ws =(
http://cvs.php.net/diff.php/phpdoc/htmlhelp/suppfiles/html/_script.js?r1=1.10r2=1.11ty=u
Index: phpdoc/htmlhelp/suppfiles/html/_script.js
diff -u phpdoc/htmlhelp/suppfiles/html/_script.js:1.10
phpdoc/htmlhelp/suppfiles/html/_script.js:1.11
--- phpdoc/htmlhelp/suppfiles/html/_script.js:1.10 Sat Jul 30 15:26:43 2005
+++ phpdoc/htmlhelp/suppfiles/html/_script.js Sat Jul 30 15:53:11 2005
@@ -1,537 +1,537 @@
-// $Id: _script.js,v 1.10 2005/07/30 19:26:43 techtonik Exp $
-//
=
-// Preference handling
-
-// Handle all the preferences, including online functions custom
-// context menus, and skins [this is called from php_manual_prefs.js]
-function prefHandler()
-{
-// Find out what file stores the skin JS code
-switch (prefs_skin) {
-
-// Internal low skin
-case Low:
-skin_js_file = '_skin_lo.js';
-break;
-
-// Internal high skin
-case High:
-skin_js_file = '_skin_hi.js';
-break;
-
-// An external skin with full path (escape it just
-// to make sure that paths with spaces and other
-// unusual chars will work - and turn back : to
-// it's original form)
-default:
-//escaped_skin = escape(prefs_skin);
-//escaped_skin = escaped_skin.replace(/%3A/, ':')
-skin_js_file = file:/// + prefs_skin;
-break;
-}
-
-// Load in the skin JS code
-document.write('script src=' + skin_js_file + ''+ '/script');
-
-// OnContextMenu is only supported in IE5+ so do
-// not try to support the context menu otherwise
-if (ie_version_major = 5) {
-
-// Write out context menu for the first time into it's div
-document.write('div id=contextMenu');
-contextMenuRewrite(true);
-document.write('/div');
-
-// Assign our own event handlers to document events [5+]
-document.oncontextmenu = contextMenu;
-document.onclick = contextMenuCloseTimeout;
-window.onblur = contextMenuCloseTimeout;
-}
-}
-
-//
=
-// CHM path detection - Thanks to Pete Lees and Jeff Hall for this code
-
-// Get the path and name of the CHM file and assign values
-function getCHMFile()
-{
-var a, X, Y, Z;
-a = location.href.search(/:/);
-Y = location.href.lastIndexOf(::);
-if (a == 4) { // file: or http:
-Y = location.href.lastIndexOf(/);
-chmfile_page = unescape(location.href.substring(Y+1));
-if (location.href.substring(0,4) == file) {
-chmfile_path = unescape(location.href.substring(8, Y+1));
-}
-}
-else {
-if (a == 2) X = 14; // mk:@MSITStore:
-if (a == 7) X = 7; // ms-its:
-chmfile_fullname = unescape(location.href.substring(X, Y));
-Z = chmfile_fullname.lastIndexOf(\\);
-chmfile_path = unescape(chmfile_fullname.substring(0, Z+1));
-chmfile_name = unescape(chmfile_fullname.substring(Z+1));
-chmfile_page = unescape(location.href.substring(Y+3));
-}
-
-// RAQ : Wednesday, 16 March 2005 01:56 pm : If this page has been loaded
because
-// the notes were selected from the search results, then remove the
hash.
-if (location.hash == '#userNotes')
-chmfile_page = chmfile_page.substring(0,
chmfile_page.lastIndexOf('#'));
-
-//alert(
-// _script\n\n +
-// location\n+
-// location.hash = ' + location.hash + '\n +
-// location.host = ' + location.host + '\n +
-// location.hostname = ' + location.hostname + '\n +
-// location.href = ' + location.href + '\n +
-// location.pathname = ' + location.pathname + '\n +
-// location.port = ' + location.port + '\n +
-// location.protocol = ' + location.protocol + '\n +
-// location.search = ' + location.search + '\n\n +
-// chmfile\n+
-// chmfile_name = ' + chmfile_name + '\n +
-// chmfile_path = ' + chmfile_path + '\n +
-// chmfile_page = ' + chmfile_page + '\n
-// );
-
-}
-
-//
=
-// Page display and online functions code
-
-// Go online to see this page in an external window [called when a user
-// clicks on the this page oline link]
-function thisPageOnline()
-{
-if (!prefs_online) {
-alert(You are in offline mode.\nThis functionality is not available);
-} else {
-window.open(prefs_mirror + 'manual/' + this_lang + '/' +
this_page_php);
-}
-}
-
-// Report bug on this manual page, using GET method URL tricks
-// [called when a user clicks on the report bug on this page link]
-function
[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Thu Jul 14 09:42:28 2005 EDT Modified files: /phpdoc/xsl htmlhelp.xsl Log: * hide ToC header string in preface http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.21r2=1.22ty=u Index: phpdoc/xsl/htmlhelp.xsl diff -u phpdoc/xsl/htmlhelp.xsl:1.21 phpdoc/xsl/htmlhelp.xsl:1.22 --- phpdoc/xsl/htmlhelp.xsl:1.21Fri Jun 24 05:22:40 2005 +++ phpdoc/xsl/htmlhelp.xsl Thu Jul 14 09:42:28 2005 @@ -3,7 +3,7 @@ HTML Help specific stylesheet - $Id: htmlhelp.xsl,v 1.21 2005/06/24 09:22:40 techtonik Exp $ + $Id: htmlhelp.xsl,v 1.22 2005/07/14 13:42:28 techtonik Exp $ -- xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform; @@ -70,7 +70,7 @@ book toc,title chapter toc,title part toc,title -preface toc,title +preface toc qandadiv toc qandaset toc reference toc,title
Re[2]: [PHP-DOC] cvs: phpdoc /en/install/unix debian.xml index.xml
||*()*|| Hi, Guillaume. GP (I had trouble compiling openjade on Tiger, then I wasn't able to GP run a make test) You can try to compile xmllint to run make test_xml t --
[PHP-DOC] cvs: phpdoc /xsl/docbook/htmlhelp htmlhelp-common.xsl
techtonik Mon Jul 4 12:53:27 2005 EDT
Modified files:
/phpdoc/xsl/docbook/htmlhelphtmlhelp-common.xsl
Log:
- named templates can't have mode attribute
http://cvs.php.net/diff.php/phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl?r1=1.1r2=1.2ty=u
Index: phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl
diff -u phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl:1.1
phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl:1.2
--- phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl:1.1 Fri Oct 1 12:32:09 2004
+++ phpdoc/xsl/docbook/htmlhelp/htmlhelp-common.xsl Mon Jul 4 12:53:26 2005
@@ -8,7 +8,7 @@
exclude-result-prefixes=doc exsl set h
!--
- $Id: htmlhelp-common.xsl,v 1.1 2004/10/01 16:32:09 techtonik Exp $
+ $Id: htmlhelp-common.xsl,v 1.2 2005/07/04 16:53:26 techtonik Exp $
--
!-- --
@@ -358,7 +358,7 @@
xsl:call-template name=select.mediaobject.enumerate-images/
/xsl:template
-xsl:template name=select.mediaobject.enumerate-images
mode=enumerate-images
+xsl:template name=select.mediaobject.enumerate-images
xsl:param name=olist
select=imageobject|imageobjectco
|videoobject|audioobject|textobject/
@@ -420,7 +420,7 @@
/xsl:if
/xsl:template
-xsl:template name=mediaobject.filename.enumerate-images
mode=enumerate-images
+xsl:template name=mediaobject.filename.enumerate-images
xsl:param name=object/
xsl:variable name=urifilename
@@ -447,7 +447,7 @@
xsl:template match=text() mode=enumerate-images
/xsl:template
-xsl:template name=write.filename.enumerate-images mode=enumerate-images
+xsl:template name=write.filename.enumerate-images
xsl:param name=filename/
xsl:choose
xsl:when test=function-available('exsl:node-set') and
function-available('set:distinct')
[PHP-DOC] cvs: phpdoc /xsl/docbook/htmlhelp profile-htmlhelp-common.xsl
techtonik Mon Jul 4 12:54:22 2005 EDT
Modified files:
/phpdoc/xsl/docbook/htmlhelpprofile-htmlhelp-common.xsl
Log:
- named templates can't have mode attribute
http://cvs.php.net/diff.php/phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl?r1=1.1r2=1.2ty=u
Index: phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl
diff -u phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl:1.1
phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl:1.2
--- phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl:1.1 Fri Oct 1
12:32:09 2004
+++ phpdoc/xsl/docbook/htmlhelp/profile-htmlhelp-common.xsl Mon Jul 4
12:54:22 2005
@@ -4,7 +4,7 @@
xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
xmlns:doc=http://nwalsh.com/xsl/documentation/1.0;
xmlns:exsl=http://exslt.org/common; xmlns:set=http://exslt.org/sets;
xmlns:h=urn:x-hex xmlns:exslt=http://exslt.org/common; exslt:dummy=dummy
extension-element-prefixes=exslt version=1.0 exclude-result-prefixes=doc
exsl set h exslt
!--
- $Id: profile-htmlhelp-common.xsl,v 1.1 2004/10/01 16:32:09 techtonik Exp $
+ $Id: profile-htmlhelp-common.xsl,v 1.2 2005/07/04 16:54:22 techtonik Exp $
--
!-- --
@@ -335,7 +335,7 @@
xsl:call-template name=select.mediaobject.enumerate-images/
/xsl:template
-xsl:template name=select.mediaobject.enumerate-images
mode=enumerate-images
+xsl:template name=select.mediaobject.enumerate-images
xsl:param name=olist select=imageobject|imageobjectco
|videoobject|audioobject|textobject/
xsl:param name=count1/xsl:param
@@ -395,7 +395,7 @@
/xsl:if
/xsl:template
-xsl:template name=mediaobject.filename.enumerate-images
mode=enumerate-images
+xsl:template name=mediaobject.filename.enumerate-images
xsl:param name=object/
xsl:variable name=urifilename
@@ -422,7 +422,7 @@
xsl:template match=text() mode=enumerate-images
/xsl:template
-xsl:template name=write.filename.enumerate-images mode=enumerate-images
+xsl:template name=write.filename.enumerate-images
xsl:param name=filename/
xsl:choose
xsl:when test=function-available('exsl:node-set') and
function-available('set:distinct')
[PHP-DOC] cvs: phpdoc /xsl/docbook/html refentry.xsl
techtonik Mon Jul 4 13:04:32 2005 EDT
Modified files:
/phpdoc/xsl/docbook/htmlrefentry.xsl
Log:
- a name= double generated for reference
http://cvs.php.net/diff.php/phpdoc/xsl/docbook/html/refentry.xsl?r1=1.3r2=1.4ty=u
Index: phpdoc/xsl/docbook/html/refentry.xsl
diff -u phpdoc/xsl/docbook/html/refentry.xsl:1.3
phpdoc/xsl/docbook/html/refentry.xsl:1.4
--- phpdoc/xsl/docbook/html/refentry.xsl:1.3Fri Oct 1 12:32:08 2004
+++ phpdoc/xsl/docbook/html/refentry.xslMon Jul 4 13:04:31 2005
@@ -3,7 +3,7 @@
version='1.0'
!--
- $Id: refentry.xsl,v 1.3 2004/10/01 16:32:08 techtonik Exp $
+ $Id: refentry.xsl,v 1.4 2005/07/04 17:04:31 techtonik Exp $
This file is part of the XSL DocBook Stylesheet distribution.
@@ -17,9 +17,12 @@
xsl:template match=reference
div class={name(.)}
xsl:call-template name=language.attribute/
-xsl:call-template name=anchor
- xsl:with-param name=conditional select=0/
-/xsl:call-template
+xsl:if test=$generate.id.attributes != 0
+ xsl:attribute name=id
+xsl:call-template name=object.id/
+ /xsl:attribute
+/xsl:if
+
xsl:call-template name=reference.titlepage/
xsl:variable name=toc.params
[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php
techtonik Fri Jul 1 18:27:05 2005 EDT
Modified files:
/phpdoc/htmlhelpfilter_files.php
Log:
- rendered html page can have multiple titlepages - replace only first
http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.16r2=1.17ty=u
Index: phpdoc/htmlhelp/filter_files.php
diff -u phpdoc/htmlhelp/filter_files.php:1.16
phpdoc/htmlhelp/filter_files.php:1.17
--- phpdoc/htmlhelp/filter_files.php:1.16 Fri Jun 24 05:26:39 2005
+++ phpdoc/htmlhelp/filter_files.phpFri Jul 1 18:27:04 2005
@@ -1,4 +1,4 @@
-?php // $Id: filter_files.php,v 1.16 2005/06/24 09:26:39 techtonik Exp $
+?php // $Id: filter_files.php,v 1.17 2005/07/01 22:27:04 techtonik Exp $
/*
This file is part of the Windows Compiled HTML Help
@@ -121,7 +121,7 @@
// Additional divisions for skin support
// Adding div id=pageHeaders instead of titlepage div
-$content = str_replace('div class=titlepage', 'div
id=pageHeaders', $content);
+$content = preg_replace('|div class=titlepage|', 'div
id=pageHeaders', $content, 1);
// For headers we have several possibilities how to close div
id=pageHeaders
// and open div with id=pageText
[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php
techtonik Fri Jun 24 05:15:31 2005 EDT
Modified files:
/phpdoc/htmlhelpfilter_files.php
Log:
+ die if called without required parameters (i.e. not from make_chm.php)
http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.14r2=1.15ty=u
Index: phpdoc/htmlhelp/filter_files.php
diff -u phpdoc/htmlhelp/filter_files.php:1.14
phpdoc/htmlhelp/filter_files.php:1.15
--- phpdoc/htmlhelp/filter_files.php:1.14 Tue Jun 21 09:17:21 2005
+++ phpdoc/htmlhelp/filter_files.phpFri Jun 24 05:15:31 2005
@@ -1,4 +1,4 @@
-?php // $Id: filter_files.php,v 1.14 2005/06/21 13:17:21 nlopess Exp $
+?php // $Id: filter_files.php,v 1.15 2005/06/24 09:15:31 techtonik Exp $
/*
This file is part of the Windows Compiled HTML Help
@@ -9,6 +9,10 @@
be converted to XSL templates, but not all.
*/
+if (!isset($HTML_SRC)) {
+die(This script is called from make_chm.php to filter output from XSL
DocBook templates);
+}
+
$counter = filterFiles();
// Filter XSL generated files through some refine filters
[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Fri Jun 24 05:22:40 2005 EDT Modified files: /phpdoc/xsl htmlhelp.xsl Log: + add pageContent div in XSL template instead of in file_filter.php http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.20r2=1.21ty=u Index: phpdoc/xsl/htmlhelp.xsl diff -u phpdoc/xsl/htmlhelp.xsl:1.20 phpdoc/xsl/htmlhelp.xsl:1.21 --- phpdoc/xsl/htmlhelp.xsl:1.20Tue Jun 21 08:33:25 2005 +++ phpdoc/xsl/htmlhelp.xsl Fri Jun 24 05:22:40 2005 @@ -3,7 +3,7 @@ HTML Help specific stylesheet - $Id: htmlhelp.xsl,v 1.20 2005/06/21 12:33:25 techtonik Exp $ + $Id: htmlhelp.xsl,v 1.21 2005/06/24 09:22:40 techtonik Exp $ -- xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform; @@ -25,6 +25,7 @@ - DOCTYPE in output HTML defines DOM standard for browser to handle JS correctly - strip link tags from HTML headers - add javascript handlers in body attributes + - add root DHTML div with id =PageContent for skinning purposes - header off, footer on (also custom with some js handlers and custom ids) - turn on function index page building (in appendixes) and turn off ToC for it @@ -384,7 +385,53 @@ xsl:param name=label.from.part select=1/ -!-- *extra* slim HTML head from older templates to strip link tags -- +!-- custom HTML xCHM layout described in phpdoc/en/chmonly/skins.xml or + http://wiki.phpdoc.info/xCHM -- +!-- Add pageContent div for skinning support -- +xsl:template name=chunk-element-content + xsl:param name=prev/ + xsl:param name=next/ + xsl:param name=nav.context/ + xsl:param name=content +xsl:apply-imports/ + /xsl:param + + html +xsl:call-template name=html.head + xsl:with-param name=prev select=$prev/ + xsl:with-param name=next select=$next/ +/xsl:call-template + +body + xsl:call-template name=body.attributes/ + div id=pageContent style=display:none; +xsl:call-template name=user.header.navigation/ + +xsl:call-template name=header.navigation + xsl:with-param name=prev select=$prev/ + xsl:with-param name=next select=$next/ + xsl:with-param name=nav.context select=$nav.context/ +/xsl:call-template + +xsl:call-template name=user.header.content/ + +xsl:copy-of select=$content/ + +xsl:call-template name=user.footer.content/ + +xsl:call-template name=footer.navigation + xsl:with-param name=prev select=$prev/ + xsl:with-param name=next select=$next/ + xsl:with-param name=nav.context select=$nav.context/ +/xsl:call-template + +xsl:call-template name=user.footer.navigation/ + /div +/body + /html +/xsl:template + +!-- *extra* slim HTML head to strip link tags -- xsl:template name=html.head head xsl:call-template name=system.head.content/
[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php
techtonik Fri Jun 24 05:26:40 2005 EDT
Modified files:
/phpdoc/htmlhelpfilter_files.php
Log:
+ add pageContent div in XSL template instead of in file_filter.php
http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.15r2=1.16ty=u
Index: phpdoc/htmlhelp/filter_files.php
diff -u phpdoc/htmlhelp/filter_files.php:1.15
phpdoc/htmlhelp/filter_files.php:1.16
--- phpdoc/htmlhelp/filter_files.php:1.15 Fri Jun 24 05:15:31 2005
+++ phpdoc/htmlhelp/filter_files.phpFri Jun 24 05:26:39 2005
@@ -1,4 +1,4 @@
-?php // $Id: filter_files.php,v 1.15 2005/06/24 09:15:31 techtonik Exp $
+?php // $Id: filter_files.php,v 1.16 2005/06/24 09:26:39 techtonik Exp $
/*
This file is part of the Windows Compiled HTML Help
@@ -118,93 +118,69 @@
);
//--
-// Add divisions for skin support
+// Additional divisions for skin support
-// Make the document invisible by default, adding a new first div
-// with id=pageContent and opening div with id=pageHeaders
-$bodystart_regex = '!(div class=(\w+)( lang=\\w+\)?)!Us';
-if (!preg_match($bodystart_regex, $content)) {
-echo Can't add first div. No match in $filename\n;
-
-} else {
-$content = preg_replace(
-$bodystart_regex,
-'div id=pageContent style=display:none;\1div
id=pageHeaders',
-$content,
-1
-);
+// Adding div id=pageHeaders instead of titlepage div
+$content = str_replace('div class=titlepage', 'div
id=pageHeaders', $content);
-// Put there the end of this pageContent
-$content = str_replace(
-'/body/html',
-'/div/body/html',
-$content
-);
-}
-
-// For headers we have several possibilities to close div id=pageHeaders
+// For headers we have several possibilities how to close div
id=pageHeaders
// and open div with id=pageText
if (strpos($content, 'div class=refnamediv') !== FALSE) {
// A function page
-if (!strpos($content, refsynopsisdiv)) {
-$content = str_replace(
-'/h2/divdiv class=refsect1',
-'/h2/div/divdiv id=pageTextdiv class=refsect1',
-$content
-);
-}
-
-// The COM or VARIANT classes page (which contain refsynopsisdiv)
-else {
-$content = str_replace(
-'div class=refsynopsisdiv',
-'/divdiv id=pageTextdiv class=refsynopsisdiv',
-$content
-);
-}
+// extend pageHeaders div (former titlepage) to cover refnamediv with
funcAvail,
+// funcUsage and funcPurpose spans
+$content = str_replace('/h1/divdiv class=refnamediv', '/h1',
$content);
+
+// insert pageText div before first text division like refsect1, sect1
and so on
+// i.e. just after former titlepage end
+$content = preg_replace(
+'!(/h2/div)(div class=([^]+))!i',
+'\1div id=pageText\2',
+$content,
+1
+);
}
// The index page
elseif ($filename == $INDEX_FILE) {
-// Delete titlepage div and
-// add pageHeader end and pageText start
+// Need to close one more div on this page before adding pageHeader
end and pageText start
$content = str_replace(
-array(div class=\titlepage\, hr/div),
-array(, hr),
-$content
-);
-$content = preg_replace(
-'!/h1/divdiv!',
-'/h1/div/divdiv id=pageTextdiv',
+/h1/div,
+'/h1/div/div/divdiv id=pageTextdiv',
$content
);
+
+$content = str_replace(hr/div,/divhr, $content);
}
// Normal page
else {
-$headend_regex = '!/h1((/div)+)!';
-if (!preg_match($headend_regex, $content)) {
-echo Impossible to close pageHeaders div. No match in
$filename\n;
-
-} else {
-$content = preg_replace(
-$headend_regex,
-'/h1\1/divdiv id=pageText',
-$content
-);
-}
+// Remove empty wrapping divs for pageHeaders
+$content = preg_replace(
+'!div id=pageHeaders((div)+)(h1.+?/h1)((/div)+)!is',
+'div id=pageHeaders\3/div',
+$content,
+1
+);
+// Insert pageText like in function page
+$content = preg_replace(
+'!(/h1/div)(div class=([^]+)|p)!is',
+'\1div id=pageText\2',
+$content,
+1
+);
}
-// End that pageText div before the user notes
-$content = str_replace(
-'a id=user_notes',
-'/diva id=user_notes',
-$content
+// Instead of closing
[PHP-DOC] cvs: phpdoc /htmlhelp make_chm.php
techtonik Fri Jun 24 05:29:29 2005 EDT
Modified files:
/phpdoc/htmlhelpmake_chm.php
Log:
* add CR to make output pretty
http://cvs.php.net/diff.php/phpdoc/htmlhelp/make_chm.php?r1=1.5r2=1.6ty=u
Index: phpdoc/htmlhelp/make_chm.php
diff -u phpdoc/htmlhelp/make_chm.php:1.5 phpdoc/htmlhelp/make_chm.php:1.6
--- phpdoc/htmlhelp/make_chm.php:1.5Mon Nov 1 07:59:23 2004
+++ phpdoc/htmlhelp/make_chm.phpFri Jun 24 05:29:29 2005
@@ -111,7 +111,7 @@
;
$counter = 0;
require_once filter_files.php;
-echo $counter files are converted in previous step.
+echo \r $counter files are converted in previous step.
;
if ($USE_NOTES) {
[PHP-DOC] cvs: phpdoc /en/chapters streams.dir.xml streams.xml
techtonik Thu Jun 23 09:35:24 2005 EDT Modified files: /phpdoc/en/chapters streams.dir.xml streams.xml Log: * include reference elements according to DocBook http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.dir.xml?r1=1.3r2=1.4ty=u Index: phpdoc/en/chapters/streams.dir.xml diff -u phpdoc/en/chapters/streams.dir.xml:1.3 phpdoc/en/chapters/streams.dir.xml:1.4 --- phpdoc/en/chapters/streams.dir.xml:1.3 Wed Jun 22 15:41:40 2005 +++ phpdoc/en/chapters/streams.dir.xml Thu Jun 23 09:35:24 2005 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- $Revision: 1.3 $ -- +!-- $Revision: 1.4 $ -- !-- Author: Wez Furlong [EMAIL PROTECTED] Please contact me before making any major amendments to the content of this section. Splitting/Merging are fine if they are @@ -9,10 +9,12 @@ reference id=streams.dir-api titleStreams Dir API Reference/title - para - The functions listed in this section work on local files, as well as remote files - (provided that the wrapper supports this functionality!). - /para + partintro + para +The functions listed in this section work on local files, as well as remote files +(provided that the wrapper supports this functionality!). + /para + /partintro refentry id=streams.php-stream-opendir refnamediv http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.xml?r1=1.9r2=1.10ty=u Index: phpdoc/en/chapters/streams.xml diff -u phpdoc/en/chapters/streams.xml:1.9 phpdoc/en/chapters/streams.xml:1.10 --- phpdoc/en/chapters/streams.xml:1.9 Fri Dec 12 14:56:02 2003 +++ phpdoc/en/chapters/streams.xml Thu Jun 23 09:35:24 2005 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- $Revision: 1.9 $ -- +!-- $Revision: 1.10 $ -- !-- Author: Wez Furlong [EMAIL PROTECTED] Please contact me before making any major amendments to the content of this section. Splitting/Merging are fine if they are @@ -285,8 +285,8 @@ a stream. To do this, you can use functionphp_stream_auto_cleanup/function. /para /sect1 +/chapter - chapters.streams.common; chapters.streams.dir; chapters.streams.file; @@ -294,8 +294,6 @@ chapters.streams.structs; chapters.streams.constants; -/chapter - !-- Keep this comment at the end of the file Local variables: mode: sgml
[PHP-DOC] cvs: phpdoc /en/chapters streams.constants.xml streams.dir.xml streams.file.xml streams.socket.xml streams.structs.xml
techtonik Wed Jun 22 15:41:41 2005 EDT Modified files: /phpdoc/en/chapters streams.constants.xml streams.dir.xml streams.file.xml streams.socket.xml streams.structs.xml Log: * make reference wrapper for refentry instead of sect1 http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.constants.xml?r1=1.1r2=1.2ty=u Index: phpdoc/en/chapters/streams.constants.xml diff -u phpdoc/en/chapters/streams.constants.xml:1.1 phpdoc/en/chapters/streams.constants.xml:1.2 --- phpdoc/en/chapters/streams.constants.xml:1.1Sat Aug 10 19:38:41 2002 +++ phpdoc/en/chapters/streams.constants.xmlWed Jun 22 15:41:40 2005 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- $Revision: 1.1 $ -- +!-- $Revision: 1.2 $ -- !-- Author: Wez Furlong [EMAIL PROTECTED] Please contact me before making any major amendments to the content of this section. Splitting/Merging are fine if they are @@ -7,7 +7,7 @@ if you make a change (so I can update my local copy). -- - sect1 id=streams.constants + reference id=streams.constants titleStreams Constants/title refentry id=streams.options @@ -159,7 +159,7 @@ /refsect1 /refentry - /sect1 + /reference http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.dir.xml?r1=1.2r2=1.3ty=u Index: phpdoc/en/chapters/streams.dir.xml diff -u phpdoc/en/chapters/streams.dir.xml:1.2 phpdoc/en/chapters/streams.dir.xml:1.3 --- phpdoc/en/chapters/streams.dir.xml:1.2 Sun Jan 19 05:11:23 2003 +++ phpdoc/en/chapters/streams.dir.xml Wed Jun 22 15:41:40 2005 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- $Revision: 1.2 $ -- +!-- $Revision: 1.3 $ -- !-- Author: Wez Furlong [EMAIL PROTECTED] Please contact me before making any major amendments to the content of this section. Splitting/Merging are fine if they are @@ -7,7 +7,7 @@ if you make a change (so I can update my local copy). -- - sect1 id=streams.dir-api + reference id=streams.dir-api titleStreams Dir API Reference/title para The functions listed in this section work on local files, as well as remote files @@ -96,7 +96,7 @@ /refsect1 /refentry - /sect1 + /reference http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.file.xml?r1=1.2r2=1.3ty=u Index: phpdoc/en/chapters/streams.file.xml diff -u phpdoc/en/chapters/streams.file.xml:1.2 phpdoc/en/chapters/streams.file.xml:1.3 --- phpdoc/en/chapters/streams.file.xml:1.2 Fri May 21 10:08:08 2004 +++ phpdoc/en/chapters/streams.file.xml Wed Jun 22 15:41:40 2005 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- $Revision: 1.2 $ -- +!-- $Revision: 1.3 $ -- !-- Author: Wez Furlong [EMAIL PROTECTED] Please contact me before making any major amendments to the content of this section. Splitting/Merging are fine if they are @@ -7,7 +7,7 @@ if you make a change (so I can update my local copy). -- - sect1 id=streams.file-api + reference id=streams.file-api titleStreams File API Reference/title refentry id=streams.php-stream-fopen-from-file @@ -76,7 +76,7 @@ /refsect1 /refentry - /sect1 + /reference http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.socket.xml?r1=1.2r2=1.3ty=u Index: phpdoc/en/chapters/streams.socket.xml diff -u phpdoc/en/chapters/streams.socket.xml:1.2 phpdoc/en/chapters/streams.socket.xml:1.3 --- phpdoc/en/chapters/streams.socket.xml:1.2 Sat Dec 20 23:21:40 2003 +++ phpdoc/en/chapters/streams.socket.xml Wed Jun 22 15:41:40 2005 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- $Revision: 1.2 $ -- +!-- $Revision: 1.3 $ -- !-- Author: Wez Furlong [EMAIL PROTECTED] Please contact me before making any major amendments to the content of this section. Splitting/Merging are fine if they are @@ -7,7 +7,7 @@ if you make a change (so I can update my local copy). -- - sect1 id=streams.socket-api + reference id=streams.socket-api titleStreams Socket API Reference/title refentry id=streams.php-stream-sock-open-from-socket @@ -124,7 +124,7 @@ - /sect1 + /reference http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.structs.xml?r1=1.5r2=1.6ty=u Index: phpdoc/en/chapters/streams.structs.xml diff -u phpdoc/en/chapters/streams.structs.xml:1.5 phpdoc/en/chapters/streams.structs.xml:1.6 --- phpdoc/en/chapters/streams.structs.xml:1.5 Fri Dec 12 14:56:02 2003 +++ phpdoc/en/chapters/streams.structs.xml Wed Jun 22 15:41:40 2005 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- $Revision: 1.5 $ -- +!-- $Revision: 1.6 $ -- !-- Author: Wez Furlong [EMAIL PROTECTED] Please contact me before making any major amendments to the content of this section. Splitting/Merging are fine if they are @@ -7,7 +7,7 @@ if you make a change (so I can update my local copy). -- - sect1 id=streams.structs + reference id=streams.structs titleStreams Structures/title refentry
[PHP-DOC] cvs: phpdoc /en/chapters streams.common.xml
techtonik Wed Jun 22 15:45:49 2005 EDT Modified files: /phpdoc/en/chapters streams.common.xml Log: * make reference wrapper for refentry instead of sect1 * correct id http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.common.xml?r1=1.12r2=1.13ty=u Index: phpdoc/en/chapters/streams.common.xml diff -u phpdoc/en/chapters/streams.common.xml:1.12 phpdoc/en/chapters/streams.common.xml:1.13 --- phpdoc/en/chapters/streams.common.xml:1.12 Tue Jul 27 09:20:05 2004 +++ phpdoc/en/chapters/streams.common.xml Wed Jun 22 15:45:48 2005 @@ -1,13 +1,13 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- $Revision: 1.12 $ -- +!-- $Revision: 1.13 $ -- !-- Author: Wez Furlong [EMAIL PROTECTED] Please contact me before making any major amendments to the content of this section. Splitting/Merging are fine if they are required for php-doc restructuring purposes - just drop me a line if you make a change (so I can update my local copy). -- - sect1 id=stream.common-api -titleStreams Common API Reference/title + reference id=streams.common-api + titleStreams Common API Reference/title refentry id=streams.php-stream-stat-path refnamediv @@ -1030,7 +1030,7 @@ /note /refsect1 /refentry -/sect1 +/reference !-- Keep this comment at the end of the file Local variables:
[PHP-DOC] cvs: phpdoc /xsl README.txt
techtonik Tue Jun 21 08:26:35 2005 EDT Modified files: /phpdoc/xsl README.txt Log: - typo http://cvs.php.net/diff.php/phpdoc/xsl/README.txt?r1=1.2r2=1.3ty=u Index: phpdoc/xsl/README.txt diff -u phpdoc/xsl/README.txt:1.2 phpdoc/xsl/README.txt:1.3 --- phpdoc/xsl/README.txt:1.2 Sat Nov 13 12:49:41 2004 +++ phpdoc/xsl/README.txt Tue Jun 21 08:26:35 2005 @@ -27,7 +27,7 @@ DocBook templates upgrade you must merge these modifications. This becomes even worse if there will be major structural changes in XSL DocBook (not likely, but still possible) - that way you will have to start customizations almost from -scratch. Sometimes it is much more easier to patch output code with PHP scripts. +scratch. Sometimes it is much more easier to patch output HTML with PHP scripts. So, the first layer is minor customizations of DocBook XSL templates, where .html and HTMLHELP project files are created without major templates redefining. @@ -55,4 +55,4 @@ Contact him or the phpdoc list (phpdoc@lists.php.net) if you have any questions or suggestions... -Last modified $Date: 2004/11/13 17:49:41 $ \ No newline at end of file +Last modified $Date: 2005/06/21 12:26:35 $ \ No newline at end of file
[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
techtonik Tue Jun 21 08:33:26 2005 EDT
Modified files:
/phpdoc/xsl htmlhelp.xsl
Log:
* a name=_user_notes is deprecated - changing to a id=user_notes
+ javascript attributes to calm tidy
* comments
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.19r2=1.20ty=u
Index: phpdoc/xsl/htmlhelp.xsl
diff -u phpdoc/xsl/htmlhelp.xsl:1.19 phpdoc/xsl/htmlhelp.xsl:1.20
--- phpdoc/xsl/htmlhelp.xsl:1.19Sat Jan 8 13:30:48 2005
+++ phpdoc/xsl/htmlhelp.xsl Tue Jun 21 08:33:25 2005
@@ -3,7 +3,7 @@
HTML Help specific stylesheet
- $Id: htmlhelp.xsl,v 1.19 2005/01/08 18:30:48 hsc Exp $
+ $Id: htmlhelp.xsl,v 1.20 2005/06/21 12:33:25 techtonik Exp $
--
xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
@@ -14,18 +14,19 @@
exclude-result-prefixes=doc exsl set
!--
xCHM HTMLHELP customizations include:
- - output directory for HH files is 'htmlhelp/html/'
- - DOCTYPE in output HTML defines DOM standard for browser to handle JS
correctly
- - project files for HTML Help are written into 'htmlhelp/html/'
+ - output directory for HTML and project Help files is 'htmlhelp/html/'
- open ulinks in _blank window
- CHM buttons settings
- custom .hhk file with index.html split in two files (titlepage and toc)
- custom .hhc file with same changes
- .hhk and .hhc are processed in html mode unlike native DocBook XSL
templates
- proper escaping in .hhk and .hhc to reflect transition from text to html
mode
+
+ - DOCTYPE in output HTML defines DOM standard for browser to handle JS
correctly
- strip link tags from HTML headers
- add javascript handlers in body attributes
- header off, footer on (also custom with some js handlers and custom ids)
+
- turn on function index page building (in appendixes) and turn off ToC for
it
- output formal object titles enclosed in h3 tags
(abstract title, examples, tables, ...?)
@@ -35,6 +36,9 @@
seealso, move refname along with function prototype to page header and
render it appropriately
TODO: need convenient reference page skeleton
+
+NOTE: custom HTML xCHM layout described in phpdoc/en/chmonly/skins.xml or
+ http://wiki.phpdoc.info/xCHM
--
!-- - BASED ON 1.66.1 HTMLHELP.XSL DOCBOOK XSL STYLESHEET - --
@@ -391,7 +395,7 @@
xsl:template name=user.head.content
xsl:param name=node select=./
- script language=JavaScript1.2 src=_script.js/script
+ script type=text/javascript language=JavaScript1.2
src=_script.js/script
/xsl:template
!-- We need quite different body attributes than the defaults --
@@ -404,17 +408,20 @@
xsl:param name=suppress.navigation select=0/
xsl:param name=suppress.header.navigation select=1/
-!-- Footer part with special table for our special needs ;) --
-xsl:template name=footer.navigation
- xsl:param name=prev select=/foo/
- xsl:param name=next select=/foo/
-
- a name=_user_notes/a
+!-- DIV place for user notes to be inserted dynamically --
+xsl:template name=user.footer.content
+ a id=user_notes/a
div id=pageNotes/div
- script language=JavaScript1.2
+ script type=text/javascript language=JavaScript1.2
function displayNotes() { _displayNotes(); }
loadNotes();
/script
+/xsl:template
+
+!-- Footer part with special table for our special needs ;) --
+xsl:template name=footer.navigation
+ xsl:param name=prev select=/foo/
+ xsl:param name=next select=/foo/
div id=pageNav
table width=100% border=0 cellspacing=10 cellpadding=0
class=navigation
[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php
techtonik Tue Jun 21 08:35:34 2005 EDT Modified files: /phpdoc/htmlhelpfilter_files.php Log: * a name=_user_notes is deprecated - changing to a id=user_notes http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.12r2=1.13ty=u Index: phpdoc/htmlhelp/filter_files.php diff -u phpdoc/htmlhelp/filter_files.php:1.12 phpdoc/htmlhelp/filter_files.php:1.13 --- phpdoc/htmlhelp/filter_files.php:1.12 Mon Jun 20 05:35:26 2005 +++ phpdoc/htmlhelp/filter_files.phpTue Jun 21 08:35:34 2005 @@ -1,4 +1,4 @@ -?php // $Id: filter_files.php,v 1.12 2005/06/20 09:35:26 techtonik Exp $ +?php // $Id: filter_files.php,v 1.13 2005/06/21 12:35:34 techtonik Exp $ /* This file is part of the Windows Compiled HTML Help @@ -198,7 +198,7 @@ // End that pageText div before the user notes $content = str_replace( -'a name=_user_notes', +'a id=user_notes', '/diva name=_user_notes', $content ); @@ -259,7 +259,7 @@ // Get contents we need to build the _index.html file preg_match(!^(.+)hr!s, $content, $_index1); -preg_match(!(/div/diva name=\_user_notes\.+/html)!s, $content, $_index2); +preg_match(!(/div/diva id=\user_notes\.+/html)!s, $content, $_index2); // Write out the two components to form a complete file $fp = fopen($HTML_TARGET/_index.html, w);
[PHP-DOC] cvs: phpdoc /htmlhelp/suppfiles/skins/HeaderNostalgia skin.js
techtonik Tue Jun 21 08:37:26 2005 EDT Modified files: /phpdoc/htmlhelp/suppfiles/skins/HeaderNostalgiaskin.js Log: * a name=_user_notes is deprecated - changing to a id=user_notes http://cvs.php.net/diff.php/phpdoc/htmlhelp/suppfiles/skins/HeaderNostalgia/skin.js?r1=1.1r2=1.2ty=u Index: phpdoc/htmlhelp/suppfiles/skins/HeaderNostalgia/skin.js diff -u phpdoc/htmlhelp/suppfiles/skins/HeaderNostalgia/skin.js:1.1 phpdoc/htmlhelp/suppfiles/skins/HeaderNostalgia/skin.js:1.2 --- phpdoc/htmlhelp/suppfiles/skins/HeaderNostalgia/skin.js:1.1 Thu Dec 26 14:14:48 2002 +++ phpdoc/htmlhelp/suppfiles/skins/HeaderNostalgia/skin.js Tue Jun 21 08:37:25 2005 @@ -84,7 +84,7 @@ 'map name=phpdoc_menu' + 'area shape=poly coords=3,4,41,4,41,20,3,20,3,4 href=# alt=Path to this page onclick=skinShowMenu(navLinkPath, this)' + 'area shape=poly coords=44,4,92,4,92,20,44,20,44,4 href=# alt=Online functions onclick=skinShowMenu(navOnlineMenu, this)' + -'area shape=poly coords=96,4,141,4,141,20,96,20,96,4 href=#_user_notes alt=User notes' + +'area shape=poly coords=96,4,141,4,141,20,96,20,96,4 href=#user_notes alt=User notes' + '/map'; // If this is a function page, show those headers too
Re[2]: [PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl
||*()*|| Hi, Nuno. NL Sorry, I only saw your commits after writing the mail :) Tnx for finding that! There are more modifications to come when I'll test them eventually. So far I've found problems with ZendAPI's subtitle and PHP API reference being wrapped in sect1 instead of reference. These chapters are not present in xCHM so I left them uncommited and didn't modify the filters. t --
[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php
techtonik Mon Jun 20 05:35:26 2005 EDT
Modified files:
/phpdoc/htmlhelpfilter_files.php
Log:
+ $Id$
+ report file in process
http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.11r2=1.12ty=u
Index: phpdoc/htmlhelp/filter_files.php
diff -u phpdoc/htmlhelp/filter_files.php:1.11
phpdoc/htmlhelp/filter_files.php:1.12
--- phpdoc/htmlhelp/filter_files.php:1.11 Mon Jun 6 12:37:58 2005
+++ phpdoc/htmlhelp/filter_files.phpMon Jun 20 05:35:26 2005
@@ -1,4 +1,4 @@
-?php
+?php // $Id: filter_files.php,v 1.12 2005/06/20 09:35:26 techtonik Exp $
/*
This file is part of the Windows Compiled HTML Help
@@ -30,8 +30,9 @@
// Only process html files
if (strpos($filename, .html)) {
$counter++;
+echo \r
\r;
+echo $counter $filename;
refineFile($filename);
-echo $counter\r;
}
}
closedir($handle);
[PHP-DOC] shareware ircg extension
Hello, phpdoc@lists.php.net How about to comment ircg extension from PHP documentation - it is no longer available for free for all operation systems listed? I think it would be nice if documentation is updated to reflect this and supplied a link to smartirc class, which is the common place nowadays if you would like to write an irc bot with PHP. Also it will be interesting to know what means 10 concurrent connections - 10 servers or ten users attempting to query? http://www.php.net/ircg t -- --[ http://wiki.phpdoc.info/DocLinks ]--
Re[2]: [PHP-DOC] Livedocs Deployment to End Users
||*()*|| Hi, Sean. I don't know of a showstopper. It will probably only turn out, if we push it out to a lot of testers. It might be a good idea to package up a manual with some pregenerated sqlite db, and offer it as some BETA (how popular this designation is nowadays :). Since the code gets pushed out, we can get some review and patches/improvements maybe. My only fear is that it is possible that we get too many improvements without no common direction, and not accepting a good percentage of them might discouradge quite some contributors. SC Ilia, Wez, SC What do you two (as primary Livedocs contributors) think? SC S I'm not Ilia or Wez and from my POV livedocs is more like a codepile rather than some kind of idea I can think about like a project or planned product. This idea one can get from sources, but not many people have time or desire to do reversing. It would be nice to have more descriptive info about http://wiki.phpdoc.info/LiveDocs with basic principles livedocs is based upon and perhaps some kind of diagram to quickly show the structure of livedocs, it's problems and program parts need to be finished. I suppose clear understanding of final point can attract people. t --
[PHP-DOC] cvs: phpdoc /htmlhelp/suppfiles/html _script.js
techtonik Tue Jun 14 10:47:47 2005 EDT
Modified files:
/phpdoc/htmlhelp/suppfiles/html _script.js
Log:
+ $Id$
* whitespace fixes to increase readability
http://cvs.php.net/diff.php/phpdoc/htmlhelp/suppfiles/html/_script.js?r1=1.8r2=1.9ty=u
Index: phpdoc/htmlhelp/suppfiles/html/_script.js
diff -u phpdoc/htmlhelp/suppfiles/html/_script.js:1.8
phpdoc/htmlhelp/suppfiles/html/_script.js:1.9
--- phpdoc/htmlhelp/suppfiles/html/_script.js:1.8 Wed Mar 16 13:04:13 2005
+++ phpdoc/htmlhelp/suppfiles/html/_script.js Tue Jun 14 10:47:47 2005
@@ -1,3 +1,4 @@
+// $Id: _script.js,v 1.9 2005/06/14 14:47:47 techtonik Exp $
//
=
// Preference handling
@@ -74,7 +75,8 @@
chmfile_page = unescape(location.href.substring(Y+3));
}
-// RAQ : Wednesday, 16 March 2005 01:56 pm : If this page has been loaded
because the notes were selected from the search results, then remove the hash.
+// RAQ : Wednesday, 16 March 2005 01:56 pm : If this page has been loaded
because
+// the notes were selected from the search results, then remove the
hash.
if (location.hash == '#userNotes')
chmfile_page = chmfile_page.substring(0,
chmfile_page.lastIndexOf('#'));
@@ -144,7 +146,8 @@
// If we have that element, copy notes here [4+]
if (element) {
element.innerHTML = parent.nbuff.document.body.innerHTML;
-// RAQ : Wednesday, 16 March 2005 01:58 pm : Bring the notes into view
if the hash has been supplied
+// RAQ : Wednesday, 16 March 2005 01:58 pm : Bring the notes into view
+// if the hash has been supplied
if (location.hash == '#userNotes')
{
setTimeout('element.scrollIntoView(true);',200);
@@ -213,10 +216,10 @@
case _GoogleSearch_:
if (prefs_online) {
menuHTML +=
-'trtd style=background-color: #f5f5f5;form
action=http://www.google.com/search; class=thin' +
-'onsubmit=contextMenuClose() method=GET
target=_blank' +
-'img src=_google.gif align=absmiddle
alt=Googleinput type=text name=q ' +
-'style=width:120px;/form/td/tr';
+'trtd style=background-color: #f5f5f5;form
action=http://www.google.com/search; class=thin' +
+'onsubmit=contextMenuClose() method=GET target=_blank' +
+'img src=_google.gif align=absmiddle alt=Googleinput type=text
name=q ' +
+'style=width:120px;/form/td/tr';
}
break;
@@ -224,10 +227,10 @@
case _ATWSearch_:
if (prefs_online) {
menuHTML +=
-'trtd style=background-color: #f5f5f5;form
action=http://www.alltheweb.com/search; class=thin' +
-'onsubmit=contextMenuClose() method=GET
target=_blank' +
-'img src=_atw.gif align=absmiddle
alt=AlltheWebinput name=cat type=hidden value=web' +
-'input type=text name=query
style=width:120px;/form/td/tr';
+'trtd style=background-color: #f5f5f5;form
action=http://www.alltheweb.com/search; class=thin' +
+'onsubmit=contextMenuClose() method=GET target=_blank' +
+'img src=_atw.gif align=absmiddle alt=AlltheWebinput name=cat
type=hidden value=web' +
+'input type=text name=query style=width:120px;/form/td/tr';
}
break;
@@ -531,4 +534,4 @@
ie_version_minor = parseInt(navigator.appMinorVersion);
// Get the preferences file from outside
-document.write('script src=' + chmfile_path + 'php_manual_prefs.js'+
'/script');
\ No newline at end of file
+document.write('script src=' + chmfile_path + 'php_manual_prefs.js'+
'/script');
Re: [PHP-DOC] Re: [PHP-DOC-CHM] Getting PEAR documentation into the PHP Extended CHM Manual.
||*()*|| Hi, Gabor. Are there any plans to provide a means for people downloading the XML sources via CVS to be able to build a COMPLETE PHP Manual? By complete, I mean, PHP, PEAR, ZendAPI, etc, the whole lot. All documentation associated with PHP. I understand that most users would only want the PHP part, though, I think the PEAR documentation should be included also. Currently, I can ... ./configure --with-chm=yes --with-source=./../php-src --with-pecl-source=./../pecl --with-pear-source=./../pear ../conf.log The PEAR source doesn't seem to produce any output. The PECL documentation produces a single section with 4 subsections (HTML parser extension, EXIF tag access library, MDB data file access library and UUID extension). The level of documentation here is brief. GH CHM building uses interesting tricks, but it is still a good question, GH whether we can make it possible to build a complete PEAR+PHP manual. Could GH someone from the peardoc front comment on this? PEAR manual already renders in CHM and it takes about 2.4Mb additional load. ZendAPI is not included in xCHM, but present in standart CHM version. I guess it is possible to link these CHM's together, but I doubt somebody will benefit from this if Index and Search capabilities merge. PEAR index can greatly confuse users who learn PHP. Search results make it even worse producing informational garbage gathered from all three files rather than displaying only relevant info. I don't know a way to limit search scope and it seems to me, that having three separate manuals is the best solution. t --
Re[2]: [PHP-DOC] Hi Derick, please rebuild Chinese manual
||*()*|| Hi, Derick. I have fixed all encoding problems of Chinese manual and it's passed my local cygwin build. So would you please help us to rebuild the Simplified Chinese manual again? DR If Aidan wouldn't have introduced yet another error, it would have been DR built by now... sigh - need to start the build AGAIN. What is the reason for not using cron scripts and bg jobs with low priority? t --
[PHP-DOC] cvs: phpdoc /en/reference/filesystem/functions fseek.xml rewind.xml
techtonik Fri Apr 29 06:46:51 2005 EDT Modified files: /phpdoc/en/reference/filesystem/functions fseek.xml rewind.xml Log: a+ppend notes http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/fseek.xml?r1=1.9r2=1.10ty=u Index: phpdoc/en/reference/filesystem/functions/fseek.xml diff -u phpdoc/en/reference/filesystem/functions/fseek.xml:1.9 phpdoc/en/reference/filesystem/functions/fseek.xml:1.10 --- phpdoc/en/reference/filesystem/functions/fseek.xml:1.9 Mon Nov 8 05:28:10 2004 +++ phpdoc/en/reference/filesystem/functions/fseek.xml Fri Apr 29 06:46:49 2005 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- $Revision: 1.9 $ -- +!-- $Revision: 1.10 $ -- !-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -- refentry id=function.fseek refnamediv @@ -69,6 +69,12 @@ The parameterwhence/parameter argument was added after PHP 4.0.0. /para /note +note + para + If you have opened the file in append (a or a+) mode, any data you write + to the file will always be appended, regardless of the file position. + /para +/note para See also functionftell/function and functionrewind/function. http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/rewind.xml?r1=1.7r2=1.8ty=u Index: phpdoc/en/reference/filesystem/functions/rewind.xml diff -u phpdoc/en/reference/filesystem/functions/rewind.xml:1.7 phpdoc/en/reference/filesystem/functions/rewind.xml:1.8 --- phpdoc/en/reference/filesystem/functions/rewind.xml:1.7 Thu Jun 12 21:40:03 2003 +++ phpdoc/en/reference/filesystem/functions/rewind.xml Fri Apr 29 06:46:50 2005 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=iso-8859-1? -!-- $Revision: 1.7 $ -- +!-- $Revision: 1.8 $ -- !-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -- refentry id=function.rewind refnamediv @@ -25,7 +25,7 @@ /para note para - If you have opened the file in append (a) mode, any data you write + If you have opened the file in append (a or a+) mode, any data you write to the file will always be appended, regardless of the file position. /para /note
[PHP-DOC] cvs: phpdoc /howto tools.xml
techtonik Mon Apr 11 16:22:21 2005 EDT Modified files: /phpdoc/howto tools.xml Log: * perl needed for configure script doesn't work without crypt http://cvs.php.net/diff.php/phpdoc/howto/tools.xml?r1=1.27r2=1.28ty=u Index: phpdoc/howto/tools.xml diff -u phpdoc/howto/tools.xml:1.27 phpdoc/howto/tools.xml:1.28 --- phpdoc/howto/tools.xml:1.27 Wed Apr 6 13:19:18 2005 +++ phpdoc/howto/tools.xml Mon Apr 11 16:22:21 2005 @@ -284,8 +284,8 @@ to Windows, which are not needed for phpdoc. To install the minimal set of required packages select literaldevel/autoconf/literal, literaldevel/automake/literal, - literaldevel/make/literal, literaldoc/libxml2/literal - and literaltext/openjade/literal + literaldevel/make/literal, literaldoc/libxml2/literal, + literallib/crypt/literal and literaltext/openjade/literal along with components, which are selected in setup by default. You may also want to add literaldevel/cvs/literal to the installation list if you don't have a CVS client yet.
[PHP-DOC] cvs: phpdoc /scripts genfunclist.php
techtonik Mon Apr 11 16:35:24 2005 EDT
Modified files:
/phpdoc/scripts genfunclist.php
Log:
* minor visual adjustments
http://cvs.php.net/diff.php/phpdoc/scripts/genfunclist.php?r1=1.4r2=1.5ty=u
Index: phpdoc/scripts/genfunclist.php
diff -u phpdoc/scripts/genfunclist.php:1.4 phpdoc/scripts/genfunclist.php:1.5
--- phpdoc/scripts/genfunclist.php:1.4 Tue Apr 5 10:51:21 2005
+++ phpdoc/scripts/genfunclist.php Mon Apr 11 16:35:24 2005
@@ -19,7 +19,7 @@
| anatoly techtonik [EMAIL PROTECTED] |
+--+
- $Id: genfunclist.php,v 1.4 2005/04/05 14:51:21 techtonik Exp $
+ $Id: genfunclist.php,v 1.5 2005/04/11 20:35:24 techtonik Exp $
*/
/**
@@ -61,7 +61,7 @@
echo Usage:\n;
echo $argv[0] php source dir\n\n;
echo --help, -help, -h, -?\n;
-echo to get this help.;
+echo to get this help\n;
} else {
@@ -164,7 +164,7 @@
}
if ( $PHP3_lex ) {
-echo str_replace($argv[1], # php-src, $PHP3_lex).\n;
+echo preg_replace(|^[./]+|, # , $PHP3_lex).\n;
// worst case IN_PHPhighlight_file|show_source {
$LEX_regex = |IN_PHP\([\w\d_]+)\(?:\|\([\w\d_]+)\)? \{|;
[PHP-DOC] cvs: phpdoc / Makefile.in
techtonik Mon Apr 11 16:38:08 2005 EDT
Modified files:
/phpdoc Makefile.in
Log:
+ use genfuncsummary.php instead of both genfuncsummary.sh
and funcsummary.awk in phpdoc/scripts
http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.166r2=1.167ty=u
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.166 phpdoc/Makefile.in:1.167
--- phpdoc/Makefile.in:1.166Sun Apr 3 11:34:29 2005
+++ phpdoc/Makefile.in Mon Apr 11 16:38:08 2005
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.in,v 1.166 2005/04/03 15:34:29 techtonik Exp $
+# $Id: Makefile.in,v 1.167 2005/04/11 20:38:08 techtonik Exp $
#
all: html
@@ -128,7 +128,7 @@
fi
funcsummary.txt: FORCE
- $(scriptdir)/genfuncsummary.sh $(PHP_SOURCE) funcsummary.txt
+ $(PHP) -C -q $(scriptdir)/genfuncsummary.php $(PHP_SOURCE)
funcsummary.txt
revcheck.html: FORCE
PHPDOCDIR=$(srcdir) $(PHP) -c $(scriptdir) -f $(scriptdir)/revcheck.php
$(LANGDIR) revcheck.html
@@ -333,7 +333,7 @@
# {{{ cleanup
clean:
- rm -rf html php fancy figures howto/html howto/php
+ rm -rf html php fancy howto/html howto/php htmlhelp/html
rm -f @[EMAIL PROTECTED] [a-z]*.html @[EMAIL PROTECTED] manual.info
rm -f @[EMAIL PROTECTED] @[EMAIL PROTECTED] .manual.xml
rm -f manual_*.pdb @srcdir@/scripts/makedoc *.manifest
Re[2]: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl
||*()*|| Hi, Jakub. JV What about moving pcre.pattern.* to ref.pcre page? It will be long but JV still shorter than ref.mbstring :-). It consists of changing JV refentry to section and moving links to these two files to JV partintro (I already tested it). I don't think it is a good idea. It seems to me that PCRE reference has got many links from internet, and this part of manual perhaps even the most often visited at least by me. It will take a time to get accustomed to new reference position. This regexps reference is good not only for PHP users, but for many, who regexps more than PHP, but finds PHP manual more clear than MAN PCRE. Mixed with various specific PHP issues pcre.pattern will not be as clear and hence less useful. t --
Re[2]: [PHP-DOC] cvs: phpdoc /en/reference/errorfunc/functions restore-error-handler.xml
||*()*|| Hi, Gabor. +// redefine the user error constants - PHP 4 only +define(FATAL, E_USER_ERROR); +define(ERROR, E_USER_WARNING); +define(WARNING, E_USER_NOTICE); GH Is this from a different part of the manual? Is it supposed to be a good GH idea to rename WARNING to ERROR and NOTICE to WARNING? It is becoming a GH support nightmare then isn't it? Definitely bad practive. t --
[PHP-DOC] cvs: phpdoc /scripts genfunclist.php
techtonik Tue Apr 5 10:51:22 2005 EDT Modified files: /phpdoc/scripts genfunclist.php Log: * finally add documentation for last commit http://cvs.php.net/diff.php/phpdoc/scripts/genfunclist.php?r1=1.3r2=1.4ty=u Index: phpdoc/scripts/genfunclist.php diff -u phpdoc/scripts/genfunclist.php:1.3 phpdoc/scripts/genfunclist.php:1.4 --- phpdoc/scripts/genfunclist.php:1.3 Mon Apr 4 16:59:30 2005 +++ phpdoc/scripts/genfunclist.php Tue Apr 5 10:51:21 2005 @@ -19,7 +19,7 @@ | anatoly techtonik [EMAIL PROTECTED] | +--+ - $Id: genfunclist.php,v 1.3 2005/04/04 20:59:30 techtonik Exp $ + $Id: genfunclist.php,v 1.4 2005/04/05 14:51:21 techtonik Exp $ */ /** @@ -29,8 +29,6 @@ * information from them to build a list. Replacement for both funcparse.awk * and genfunclist.sh * - * Requires PEAR File_Find class. - * * Known limitations: * - can't handle multiline comments and precompiler directives *
[PHP-DOC] funcsummary.txt
Hello, phpdoc@lists.php.net
Today I will speak about funcsummary.txt, Zend Engine
documentation and function prototypes. At this time we have
funcsummary.txt, which is generated by scanning sourcefiles
of PHP for comments with lines like
/* {{{ proto string zend_version(void)
Get the version of the Zend Engine */
/* {{{ proto string bzread(int bz[, int length])
Reads up to length bytes from a BZip2 stream, or 1024 bytes if length is not
specified */
Should there be a page in Zend API (I hope it is the proper place)
describing this format for function prototypes? I haven't found any.
But! After I spent some time looking into PHP sources there is a file
called CODING_STANDARDS, which describes why and how pretty well.
Is it suitable for PECL and other third-party extensions to
follow this standard? Can it be added to Zend API docs as
recommendations?
After studying PECL site a bit I found some resources and tutorials
http://pecl.php.net/support.php#tutorials which can be merged with
Zend API to make this tutorial/manual even better. The only problem
is what myself has little skills with extension writing, and language
barrier is still too high to make the text readable after refactoring
of mine. =) But this can be put on some TODO if anybody will have
a desire to play with Zend API docs.
t
--
--[ http://wiki.phpdoc.info/DocLinks ]--
[PHP-DOC] cvs: phpdoc /en/reference/array/functions array-multisort.xml
techtonik Tue Apr 5 14:27:08 2005 EDT
Modified files:
/phpdoc/en/reference/array/functionsarray-multisort.xml
Log:
* more descriptive example
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/array-multisort.xml?r1=1.15r2=1.16ty=u
Index: phpdoc/en/reference/array/functions/array-multisort.xml
diff -u phpdoc/en/reference/array/functions/array-multisort.xml:1.15
phpdoc/en/reference/array/functions/array-multisort.xml:1.16
--- phpdoc/en/reference/array/functions/array-multisort.xml:1.15Sun Feb
13 23:13:13 2005
+++ phpdoc/en/reference/array/functions/array-multisort.xml Tue Apr 5
14:27:08 2005
@@ -1,5 +1,5 @@
?xml version=1.0 encoding=iso-8859-1?
-!-- $Revision: 1.15 $ --
+!-- $Revision: 1.16 $ --
!-- splitted from ./en/functions/array.xml, last change in rev 1.11 --
refentry id=function.array-multisort
refnamediv
@@ -119,32 +119,38 @@
programlisting role=php
![CDATA[
?php
-$ar = array(array(10, 100, 100, a), array(1, 3, 2, 1));
+$ar = array(
+ array(10, 11, 100, 100, a),
+ array( 1, 2, 2, 3, 1)
+ );
array_multisort($ar[0], SORT_ASC, SORT_STRING,
$ar[1], SORT_NUMERIC, SORT_DESC);
+var_dump($ar);
?
]]
/programlisting
para
- In this example, after sorting, the first array will contain 10,
- 100, 100, a (it was sorted as strings in ascending order). The
- second will contain 1, 3, 2, 1 (sorted as numbers, in
- descending order).
+ In this example, after sorting, the first array will transform to
+ 10, 100, 100, 11, a (it was sorted as strings in ascending
+ order). The second will contain 1, 3, 2, 2, 1 (sorted as numbers,
+ in descending order).
/para
screen
![CDATA[
array(2) {
- [0]= array(4) {
+ [0]= array(5) {
[0]= string(2) 10
[1]= int(100)
[2]= int(100)
-[3]= string(1) a
+[3]= int(11)
+[4]= string(1) a
}
- [1]= array(4) {
+ [1]= array(5) {
[0]= int(1)
[1]= int(3)
[2]= string(1) 2
-[3]= int(1)
+[3]= int(2)
+[4]= int(1)
}
}
]]
[PHP-DOC] cvs: phpdoc /scripts genfuncsummary.php
techtonik Tue Apr 5 15:37:58 2005 EDT
Modified files:
/phpdoc/scripts genfuncsummary.php
Log:
+ rewritten from scratch
Extract function summaries from sources of PHP and it's extensions
Replacement for both genfuncsummary.sh and funcsummary.awk in phpdoc/scripts
http://cvs.php.net/diff.php/phpdoc/scripts/genfuncsummary.php?r1=1.3r2=1.4ty=u
Index: phpdoc/scripts/genfuncsummary.php
diff -u phpdoc/scripts/genfuncsummary.php:1.3
phpdoc/scripts/genfuncsummary.php:1.4
--- phpdoc/scripts/genfuncsummary.php:1.3 Wed Dec 31 19:47:42 2003
+++ phpdoc/scripts/genfuncsummary.php Tue Apr 5 15:37:57 2005
@@ -3,7 +3,7 @@
+--+
| PHP Version 4|
+--+
- | Copyright (c) 1997-2004 The PHP Group|
+ | Copyright (c) 2005 The PHP Group |
+--+
| This source file is subject to version 3.0 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
@@ -13,77 +13,142 @@
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
- | Authors:Jesus M. Castagnetto [EMAIL PROTECTED] |
+ | Authors:anatoly techtonik [EMAIL PROTECTED]|
+--+
- $Id: genfuncsummary.php,v 1.3 2004/01/01 00:47:42 goba Exp $
+ $Id: genfuncsummary.php,v 1.4 2005/04/05 19:37:57 techtonik Exp $
*/
-// WARNING: still a work in progress
-// TODO: check why sometimes the regex is fubared
-$php4src = realpath(../../php4);
+// Extract function summaries from sources of PHP and it's extensions
+//
+// Example of block looked in .c, .cpp, .h and .ec files
+//
+// /* {{{ proto string zend_version(void)
+// Get the version of the Zend Engine */
+//
+
+if ($argc != 2 ||
+ in_array($argv[1], array('--help', '-help', '-h', '-?')) ||
+ !is_dir($argv[1])) {
+
+echo Extract function summaries from sources of PHP\n\n;
+echo Usage: $argv[0] php source dir\n;
+echo --help, -help, -h, -? - to get this help\n;
+die;
-include_once 'File/Find.php';
-$find = new File_Find();
-$filelist = $find-search(/.*\.(c|h|ec)$/,realpath($php4src), 'perl');
-sort($filelist);
-
-$proto_re =
/[[:space:]]*\/\*[[:space:]]*\{\{\{[[:space:]]*proto[[:space:]]*(.+)[[:space:]]*\*\//msU;
-$re_split1 = proto[[:space:]]+|\\*\/[[:space:]]*$;
-$re_split2 = \\**\/[[:space:]]*$;
-$re_proto_parts = /^(.+)[[:space:]]+([[:alnum:]_]+)\((.*)\)[[:space:]]*$/;
-
-foreach ($filelist as $filename) {
- $proto_arr = array();
- $parse = $same = false;
- $matches = array();
- $lines = implode(\n,file($filename));
- preg_match_all($proto_re, $lines, $matches);
- if (!empty($matches[1])) {
- $name = str_replace(realpath(../../)./, # , $filename);
- echo $name\n;
- echo str_replace(\n\n,\n,implode(\n, $matches[1])).\n;
- }
- /*
- foreach (file($filename) as $line) {
- $content = array();
- if (preg_match($proto_re, $line)) {
- list(,$proto) = split($re_split1, $line);
- $proto = trim($proto);
- $parse = $same = true;
- continue;
- } elseif (preg_match(/\*\//,$line)) {
- if ($parse) {
- $proto_info = implode( , $content);
- if ($same) {
- $temp = split($re_split2, $line);
- $proto_info .= .$temp[0];
- }
- // maybe this can be used for autogeneration of
protos in the manual
- $matches = array();
- preg_match($re_proto_parts, $proto, $matches);
- $funcname = trim($matches[2]);
- $proto_arr[$funcname] = sprintf(%s\n %s,
$proto, $proto_info);
- $parse = false;
- }
- continue;
- } else {
- if ($parse !$same) {
- $temp = split($re_split2, $line);
- $content[] = $temp[0];
- }
- $same = false;
- continue;
- }
- }
- if (!empty
[PHP-DOC] new funcsummary script
Hello, phpdoc@lists.php.net
I've commited a new summary script. Test it just to be sure it
produces the same output as old .sh + .awk
php -q -C scripts/genfuncsummary.php ../php-src funcsummary2.txt
Tell me if all is ok and I will add it to Makefile.
After test will be passed, PECL prototypes can also be added
to this list. Note the size, though. Now it is about 300 kbytes and
with PECL it can become twice as big.
P.S. php-src/ext/ldap/ldap.c contains incorrect prototype - no ret
value
/* {{{ proto _ldap_rebind_proc()
*/
t
--
--[ http://wiki.phpdoc.info/DocLinks ]--
[PHP-DOC] cvs: phpdoc / TODO
techtonik Tue Apr 5 16:34:12 2005 EDT Modified files: /phpdoc TODO Log: + Zend API additions http://cvs.php.net/diff.php/phpdoc/TODO?r1=1.53r2=1.54ty=u Index: phpdoc/TODO diff -u phpdoc/TODO:1.53 phpdoc/TODO:1.54 --- phpdoc/TODO:1.53Mon Aug 30 23:13:26 2004 +++ phpdoc/TODO Tue Apr 5 16:34:12 2005 @@ -87,6 +87,9 @@ i.e. constantE_NOTICE/constant - link linkend=e-noticeE_NOTICE/link GENERAL: + - Merge php-src/CODING_STANDARDS with Zend API documentation + - Review PECL resources available at http://pecl.php.net/support.php#tutorials +and merge them into Zend API where appropriate - Document php://stdout etc feature for file functions. (superseded by need of general description of the new streams features?) - Update setcookie
[PHP-DOC] cvs: phpdoc /scripts genfunclist.php
techtonik Mon Apr 4 16:59:31 2005 EDT
Modified files:
/phpdoc/scripts genfunclist.php
Log:
* get rid of PEAR File_Find dependency
http://cvs.php.net/diff.php/phpdoc/scripts/genfunclist.php?r1=1.2r2=1.3ty=u
Index: phpdoc/scripts/genfunclist.php
diff -u phpdoc/scripts/genfunclist.php:1.2 phpdoc/scripts/genfunclist.php:1.3
--- phpdoc/scripts/genfunclist.php:1.2 Sun Apr 3 05:56:18 2005
+++ phpdoc/scripts/genfunclist.php Mon Apr 4 16:59:30 2005
@@ -19,7 +19,7 @@
| anatoly techtonik [EMAIL PROTECTED] |
+--+
- $Id: genfunclist.php,v 1.2 2005/04/03 09:56:18 techtonik Exp $
+ $Id: genfunclist.php,v 1.3 2005/04/04 20:59:30 techtonik Exp $
*/
/**
@@ -72,10 +72,25 @@
? $argv[1]./language-scanner.lex
: NULL;
-require_once File/Find.php;
-//$parsefiles = File_Find::search('/\.(c|cpp|h|ec)$/i', $argv[1], 'perl');
-$ff = new File_Find();
-$parsefiles = $ff-search('/\.(c|cpp|h|ec)$/i', $argv[1], 'perl');
+// find all source files recursively - returns array with filenames
+function get_parsefiles($srcpath) {
+ $parsefiles = array();
+ $srcdir = dir($srcpath);
+ while (false !== ($file = $srcdir-read())) {
+ $filepath = $srcpath./.$file;
+ if (is_dir($filepath) $file !== . $file !== ..) {
+ $parsefiles = array_merge($parsefiles,
get_parsefiles($filepath));
+ continue;
+ }
+ if (preg_match('/\.(c|cpp|h|ec)$/i', $file)) {
+ $parsefiles[] = $filepath;
+ }
+ }
+ $srcdir-close();
+ return $parsefiles;
+}
+
+$parsefiles = get_parsefiles($argv[1]);
// make unified directory separator - /
if (DIRECTORY_SEPARATOR == '\\') {
@@ -115,7 +130,7 @@
foreach ($parsefiles as $key = $file) {
// output source file name
-echo str_replace($argv[1], # php-src, $file).\n;
+echo preg_replace(|^[./]+|, # , $file).\n;
foreach ($blocks[$key] as $bk = $bv) {
// output function block title
if ($show_block_names) {
Re[2]: [PHP-DOC] funclist.txt
||*()*|| Hi, Mehdi.
MA Here's a fresh version of funclist.txt:
MA http://www.php-help.net/funclist.txt
Seems Ok to be commited, but it will be better to generate it with latest
scripts/ update - I removed PEAR dependency and modified output of source
path in comments a bit.
BTW, this file in PECL http://cvs.php.net/co.php/pecl/esmtp/esmtp.c?r=1.1
contains bug at lines
156 {NULL, NULL, NULL, 0}
157 };
Function block normally ends with {NULL, NULL, NULL} or with {0}
t
--
[PHP-DOC] cvs: phpdoc /scripts funcparse.awk genfunclist.php genfunclist.sh
techtonik Sun Apr 3 05:56:19 2005 EDT Removed files: /phpdoc/scripts funcparse.awk genfunclist.sh Modified files: /phpdoc/scripts genfunclist.php Log: + genfunclist.php generator instead of genfunclist.sh and funcparse.awk (fell free to extract them from attic to check everything works as expected) http://cvs.php.net/diff.php/phpdoc/scripts/genfunclist.php?r1=1.1r2=1.2ty=u Index: phpdoc/scripts/genfunclist.php diff -u phpdoc/scripts/genfunclist.php:1.1 phpdoc/scripts/genfunclist.php:1.2 --- phpdoc/scripts/genfunclist.php:1.1 Mon Sep 13 09:36:00 2004 +++ phpdoc/scripts/genfunclist.php Sun Apr 3 05:56:18 2005 @@ -3,7 +3,7 @@ +--+ | PHP Version 4| +--+ - | Copyright (c) 1997-2004 The PHP Group| + | Copyright (c) 1997-2005 The PHP Group| +--+ | This source file is subject to version 3.0 of the PHP license, | | that is bundled with this package in the file LICENSE, and is| @@ -19,7 +19,7 @@ | anatoly techtonik [EMAIL PROTECTED] | +--+ - $Id: genfunclist.php,v 1.1 2004/09/13 13:36:00 techtonik Exp $ + $Id: genfunclist.php,v 1.2 2005/04/03 09:56:18 techtonik Exp $ */ /** @@ -33,6 +33,9 @@ * * Known limitations: * - can't handle multiline comments and precompiler directives + * + * TODO: + * - add PHPUnit regression tests */ /**
[PHP-DOC] funclist.txt
Hello, phpdoc@lists.php.net Do we need PECL functions to be present in funclist.txt? I can add necessary code to makefile, but I can't download pecl sources, but I can ask if somebody have a desire to checkout pecl and update funclist.txt for me to test it will have worked properly? t -- --[ http://wiki.phpdoc.info/DocLinks ]--
[PHP-DOC] cvs: phpdoc / configure.in
techtonik Sun Apr 3 07:49:19 2005 EDT Modified files: /phpdoc configure.in Log: + pecl autodetection by default http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.225r2=1.226ty=u Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.225 phpdoc/configure.in:1.226 --- phpdoc/configure.in:1.225 Sat Apr 2 16:25:41 2005 +++ phpdoc/configure.in Sun Apr 3 07:49:18 2005 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.225 2005/04/02 21:25:41 techtonik Exp $ +dnl $Id: configure.in,v 1.226 2005/04/03 11:49:18 techtonik Exp $ dnl autoconf initialisation AC_INIT() @@ -454,7 +454,10 @@ fi fi ],[ - PECL_SOURCE=no + PECL_SOURCE=$srcdir/../pecl + if test ! -d $PECL_SOURCE; then +PECL_SOURCE=no + fi ]) AC_MSG_RESULT($PECL_SOURCE) AC_SUBST(PECL_SOURCE)
[PHP-DOC] cvs: phpdoc / Makefile.in
techtonik Sun Apr 3 07:53:26 2005 EDT Modified files: /phpdoc Makefile.in Log: + include PECL functions in funclist.txt (not a fine solution, but i dk how to make nested if statement work on my pc) http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.164r2=1.165ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.164 phpdoc/Makefile.in:1.165 --- phpdoc/Makefile.in:1.164Sat Apr 2 16:30:54 2005 +++ phpdoc/Makefile.in Sun Apr 3 07:53:24 2005 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.164 2005/04/02 21:30:54 techtonik Exp $ +# $Id: Makefile.in,v 1.165 2005/04/03 11:53:24 techtonik Exp $ # all: html @@ -28,6 +28,7 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@/scripts [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -D . @@ -110,7 +111,21 @@ FORCE: funclist.txt: FORCE - $(PHP) -q $(scriptdir)/genfunclist.php $(PHP_SOURCE) funclist.txt + @if test $(PHP_SOURCE) = no; then \ + echo WARNING: recreating the function list needs php sources ;\ + echo which were not found by configure ;\ + echo aborting ;\ + else \ + $(PHP) -q $(scriptdir)/genfunclist.php $(PHP_SOURCE) funclist.txt ;\ + fi; \ +if test $(PECL_SOURCE) = no -a ! $(PHP_SOURCE) = no; then \ +echo WARNING: pecl sources not found - pecl functions ;\ +echo will not be present in funclist.txt ;\ +elif test ! $(PHP_SOURCE) = no; then \ +echofunclist.txt ;\ +echo # - PECL Stuff - funclist.txt ;\ +$(PHP) -q $(scriptdir)/genfunclist.php $(PECL_SOURCE) funclist.txt ;\ +fi funcsummary.txt: FORCE $(scriptdir)/genfuncsummary.sh $(PHP_SOURCE) funcsummary.txt
Re[2]: [PHP-DOC] funclist.txt
||*()*|| Hi, Gabor. Do we need PECL functions to be present in funclist.txt? GH Yes, some PECL stuff is bundled and some PECL stuff is getting to be GH used widely. Ok. I've added PECL_SOURCE autodetection. All of PECL functions will go into funclist.txt since I don't know how to get list of bundled and widelyused stuff. =) One can checkout required extensions into ./../pecl manually. P.S. I was unable to make a nested if statement in Makefile therefore operation became a little bloated. I wonder if it ever possible to created nested if in Makefiles. t --
Re: [PHP-DOC] Re: funclist.txt
||*()*|| Hi, Mehdi. Do we need PECL functions to be present in funclist.txt? I can add necessary code to makefile, but I can't download pecl sources, but I can ask if somebody have a desire to checkout pecl and update funclist.txt for me to test it will have worked properly? MA I have a pecl checkout, tell me what you need me to do. MA And yes, I do think we need PECL functions in funclist.txt Standard operations - update phpdoc autoconf ./configure make funclist.txt and checkin. That's all! =) After funclist.txt will be ready I'll take a look if it contains any garbage to adjust filters accordingly. t --
[PHP-DOC] cvs: phpdoc / Makefile.in
techtonik Sun Apr 3 11:34:30 2005 EDT Modified files: /phpdoc Makefile.in Log: - fix directory changes for cgi http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.165r2=1.166ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.165 phpdoc/Makefile.in:1.166 --- phpdoc/Makefile.in:1.165Sun Apr 3 07:53:24 2005 +++ phpdoc/Makefile.in Sun Apr 3 11:34:29 2005 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.165 2005/04/03 11:53:24 techtonik Exp $ +# $Id: Makefile.in,v 1.166 2005/04/03 15:34:29 techtonik Exp $ # all: html @@ -116,7 +116,7 @@ echo which were not found by configure ;\ echo aborting ;\ else \ - $(PHP) -q $(scriptdir)/genfunclist.php $(PHP_SOURCE) funclist.txt ;\ + $(PHP) -C -q $(scriptdir)/genfunclist.php $(PHP_SOURCE) funclist.txt ;\ fi; \ if test $(PECL_SOURCE) = no -a ! $(PHP_SOURCE) = no; then \ echo WARNING: pecl sources not found - pecl functions ;\ @@ -124,7 +124,7 @@ elif test ! $(PHP_SOURCE) = no; then \ echofunclist.txt ;\ echo # - PECL Stuff - funclist.txt ;\ -$(PHP) -q $(scriptdir)/genfunclist.php $(PECL_SOURCE) funclist.txt ;\ +$(PHP) -C -q $(scriptdir)/genfunclist.php $(PECL_SOURCE) funclist.txt ;\ fi funcsummary.txt: FORCE
Re[2]: [PHP-DOC] cvs: phpdoc /howto tools.xml
||*()*|| Hi, Gabor. nlopess Sun Apr 3 12:36:54 2005 EDT Modified files: /phpdoc/howto tools.xml Log: just put the PHP directory in the path GH So then the only remaining stuff out of installing cygwin, is getting GH jade/sp. It would definitely simpilfy the process, if this could be GH integrated into the cygwin setup :) I'll quote my letter from 20th of September 2004 (yes - that old). --*[cut]*-- There are some problems with using openjade from cygwin package on windows and native w32 PHP binary. ./configure script uses PHP version to determine full working path, used in file-entities.php and later in entities/file-entities.ent If PHP is compiled with cygwin, path should be prefixed with /cygdrive/, in this case openjade.exe in ../php-tools will not understand these paths. Also if openjade is from cygwin and PHP binary is from standard win32 distrubutive, paths produced by scripts/file-entities.php (i.e. c:/...) will be not understandable by openjade, so.. Is it really necessary to have absolute paths in entities/file-entities.ent? There's a comment indicating, that absolute paths are keeped to have meaningful error messages. Is there any other reasons? If there isn't - how about to use relative paths in entities/file-entities.ent? --*[cut]*-- Look here for the rest of the thread. http://www.manucorp.com/archives/phpdoc/200409/msg00536.php t --
Re[2]: [PHP-DOC] function.localtime
||*()*|| Hi, David. DM Is there anyone using native Windows tools to do PHP docs or does DM everyone just use Linux? I'm using native windows Far Manager + Colorer plugin for plain text stuff and Winmerge or Unired for unicode. Also I hate notepad. =) Sometimes Eclipse, but it is too heavy for my machine like any other java editor I've tried. t --
Re[2]: [PHP-DOC] cvs: phpdoc /howto tools.xml
||*()*|| Hi, Gabor. GH The file-entities.php script already distinguishes between the cygwin GH and the windows compiled PHP, so if the cygwin PHP is used, cygwin path GH values are generated into the output (so that implies a cygwin installed GH openjade). It does not need to be relative. Even if a windows PHP is GH used, we can pass on a parameter to generate cygwin path values. Why is GH that a problem later on? The problem is to autodetect which openjade version we use - cygwined or not. t --
Re[2]: [PHP-DOC] cvs: phpdoc /howto tools.xml
||*()*|| Hi, Gabor. GH The file-entities.php script already distinguishes between the cygwin GH and the windows compiled PHP, so if the cygwin PHP is used, cygwin path GH values are generated into the output (so that implies a cygwin installed GH openjade). It does not need to be relative. Even if a windows PHP is GH used, we can pass on a parameter to generate cygwin path values. Why is GH that a problem later on? The problem is to autodetect which openjade version we use - cygwined or not. GH Why? In configure, you can do quite some iteresting checks :) If the GH ../phpdoc-tools/jade/jade.exe is used, it is not cygwin, otherwise it is. It could work. Just don't forget about ../phpdoc-tools/openjade/openjade.exe =) t --
[PHP-DOC] cvs: phpdoc / configure.in
techtonik Sat Apr 2 04:50:23 2005 EDT Modified files: /phpdoc configure.in Log: + php source autodetection from cvs checkout http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.223r2=1.224ty=u Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.223 phpdoc/configure.in:1.224 --- phpdoc/configure.in:1.223 Sun Mar 20 09:49:17 2005 +++ phpdoc/configure.in Sat Apr 2 04:50:20 2005 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.223 2005/03/20 14:49:17 nlopess Exp $ +dnl $Id: configure.in,v 1.224 2005/04/02 09:50:20 techtonik Exp $ dnl autoconf initialisation AC_INIT() @@ -384,10 +384,24 @@ if test -d $withval ; then PHP_SOURCE=$withval else -PHP_SOURCE=$srcdir/../php4 +for PHP_SOURCE in \ + $srcdir/../php4 \ + $srcdir/../php-src +do + if test -d $PHP_SOURCE; then +break + fi +done fi ],[ - PHP_SOURCE=$srcdir/../php4 + for PHP_SOURCE in \ + $srcdir/../php4 \ + $srcdir/../php-src + do + if test -d $PHP_SOURCE; then + break + fi + done ]) if test ! -d $PHP_SOURCE; then PHP_SOURCE=no
[PHP-DOC] cvs: phpdoc / configure.in
techtonik Sat Apr 2 16:25:42 2005 EDT Modified files: /phpdoc configure.in Log: * convert slashes from windows envariables http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.224r2=1.225ty=u Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.224 phpdoc/configure.in:1.225 --- phpdoc/configure.in:1.224 Sat Apr 2 04:50:20 2005 +++ phpdoc/configure.in Sat Apr 2 16:25:41 2005 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.224 2005/04/02 09:50:20 techtonik Exp $ +dnl $Id: configure.in,v 1.225 2005/04/02 21:25:41 techtonik Exp $ dnl autoconf initialisation AC_INIT() @@ -43,7 +43,7 @@ else if test -e $PHP_PEAR_BIN_DIR/cli/php ; then AC_MSG_CHECKING([for php]) -PHP=$PHP_PEAR_BIN_DIR/cli/php +PHP=`echo $PHP_PEAR_BIN_DIR/cli/php | tr '' '/'` AC_MSG_RESULT($PHP) else AC_PATH_PROGS(PHP,php php4,no) @@ -58,7 +58,7 @@ else if test -e $PHP_PEAR_BIN_DIR/cli/php ; then AC_MSG_CHECKING([for php]) - PHP=$PHP_PEAR_BIN_DIR/cli/php + PHP=`echo $PHP_PEAR_BIN_DIR/cli/php | tr '' '/'` AC_MSG_RESULT($PHP) else AC_PATH_PROGS(PHP,php php4,no)
[PHP-DOC] cvs: phpdoc / Makefile.in
techtonik Sat Apr 2 16:30:57 2005 EDT Modified files: /phpdoc Makefile.in Log: + genfunclist.php generator instead of genfunclist.sh and funcparse.awk http://cvs.php.net/diff.php/phpdoc/Makefile.in?r1=1.163r2=1.164ty=u Index: phpdoc/Makefile.in diff -u phpdoc/Makefile.in:1.163 phpdoc/Makefile.in:1.164 --- phpdoc/Makefile.in:1.163Sun Mar 20 09:49:17 2005 +++ phpdoc/Makefile.in Sat Apr 2 16:30:54 2005 @@ -16,7 +16,7 @@ # # -# $Id: Makefile.in,v 1.163 2005/03/20 14:49:17 nlopess Exp $ +# $Id: Makefile.in,v 1.164 2005/04/02 21:30:54 techtonik Exp $ # all: html @@ -110,7 +110,7 @@ FORCE: funclist.txt: FORCE - $(scriptdir)/genfunclist.sh $(PHP_SOURCE) funclist.txt + $(PHP) -q $(scriptdir)/genfunclist.php $(PHP_SOURCE) funclist.txt funcsummary.txt: FORCE $(scriptdir)/genfuncsummary.sh $(PHP_SOURCE) funcsummary.txt @@ -126,8 +126,8 @@ touch funcindex.xml ;\ else \ $(XSLTPROC) -o quickref-temp.txt $(QUICKREF_XSL_SHEET) manual.xml ;\ - echo $(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt funcindex.xml ;\ - $(PHP) -q $(srcdir)/scripts/genfuncindex.php quickref-temp.txt funcindex.xml ;\ + echo $(PHP) -q $(scriptdir)/genfuncindex.php quickref-temp.txt funcindex.xml ;\ + $(PHP) -q $(scriptdir)/genfuncindex.php quickref-temp.txt funcindex.xml ;\ rm -f quickref-temp.txt ;\ fi
