Re[2]: [PHP-DOC] Re: PHP Function List

2007-03-14 Thread anatoly techtonik
||*()*|| 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

2007-02-24 Thread anatoly techtonik
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] Starting on Unicode docs

2006-07-26 Thread anatoly techtonik
||*()*|| 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?



I'm really tired of it. Think about creating lively ecosystem instead
of calling for papers and cruising for money. =/



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
-- 


Re[2]: [PHP-DOC] Starting on Unicode docs

2006-07-26 Thread anatoly techtonik
||*()*|| 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] cvs: phpdoc /entities global.ent

2006-07-26 Thread anatoly techtonik
||*()*|| 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.266&r2=1.267&diff_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>  

Re: [PHP-DOC] Re: [PHP-DEV] Summer of Code

2006-05-02 Thread anatoly techtonik
||*()*|| 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 gather

[PHP-DOC] CHM build machine - Was[2]: [PHP-DOC] #34026 [Ver->Opn]: Polish CHM is corrupted

2006-05-02 Thread anatoly techtonik
||*()*|| 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] #34026 [Ver->Opn]: Polish CHM is corrupted

2006-04-19 Thread anatoly techtonik
||*()*|| 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: [PHP-DOC] Gabor resigns from the editor post

2006-02-25 Thread anatoly techtonik
||*()*|| 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[2]: [PHP-DOC] spam protection for user notes

2006-02-25 Thread anatoly techtonik
||*()*|| 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] cvs: peardoc /en/pecl cybermut.xml

2005-12-18 Thread anatoly techtonik
||*()*|| 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
-- 


[PHP-DOC] cvs: peardoc /en/pecl cybermut.xml

2005-12-13 Thread anatoly techtonik
techtonik   Wed Dec 14 05:48:45 2005 EDT

  Removed files:   
/peardoc/en/peclcybermut.xml 
  Log:
  - was never rendered and now moved to phpdoc
  


Re: [PHP-DOC] cvs: phpdoc /en/install/windows building.xml

2005-12-11 Thread anatoly techtonik
||*()*|| 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.8&r2=1.9&ty=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>  
NL> -
NL> +
NL>  
NL>   Building from source
NL>   
NL> @@ -154,7 +154,7 @@
NL> You must build the resolv.lib 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> 
NL>  

  

t
-- 


[PHP-DOC] cvs: phpdoc /howto tools.xml

2005-12-08 Thread anatoly techtonik
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.28&r2=1.29&ty=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 @@
 
 
  You may also consider using OpenJade
- a well maintained and extended version of Jade.
+ a well maintained and extended version of Jade (in fact, OpenJade is
+ recommended).
 

 


Re[2]: [PHP-DOC] Web site translation?

2005-11-25 Thread anatoly techtonik
||*()*|| 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

2005-10-12 Thread anatoly techtonik
||*()*|| 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: [PHP-DOC] Re: Bulgarian mirrors

2005-10-09 Thread anatoly techtonik
||*()*|| 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

2005-10-09 Thread anatoly techtonik
||*()*|| 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[2]: [PHP-DOC] Critical files in translation

2005-10-06 Thread anatoly techtonik
||*()*|| 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

2005-09-28 Thread anatoly techtonik
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.2&r2=1.3&ty=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

2005-09-25 Thread anatoly techtonik
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+
to http://master.php.net/manage/user-notes.php?action=predelete+
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']),"",
"Note id: $id\n",
"http://www.php.net/manual/en/{$row['sect']}.php\">http://www.php.net/manual/en/{$row['sect']}.php\n",
-"http://master.php.net/manage/user-notes.php?action=edit+$id\"; 
target=\"_blank\">Edit Note",
-"http://master.php.net/manage/user-notes.php?action=delete+$id&reason=integrated\";
 target=\"_blank\">Delete Note: Integrated in the manual",
-"http://master.php.net/manage/user-notes.php?action=delete+$id&reason=useless\";
 target=\"_blank\">Delete Note: useless",
-"http://master.php.net/manage/user-notes.php?action=delete+$id&reason=bad+code\";
 target=\"_blank\">Delete Note: bad code",
-"http://master.php.net/manage/user-notes.php?action=delete+$id&reason=spam\";
 target=\"_blank\">Delete Note: spam",
-"http://master.php.net/manage/user-notes.php?action=delete+$id&reason=non-english\";
 target=\"_blank\">Delete Note: non-english",
-"http://master.php.net/manage/user-notes.php?action=delete+$id&reason=already+in+docs\";
 target=\"_blank\">Delete Note: already in docs",
-"http://master.php.net/manage/user-notes.php?action=delete+$id\"; 
target=\"_blank\">Delete Note: other reason",
+"http://master.php.net/manage/user-notes.php?action=edit+$id\"; 
target=\"_blank\">Edit Note";
+foreach ($delete_reasons as $rk => $rv) {
+  echo "http://master.php.net/manage/user-notes.php?action=delete+$id&reason=$rk\";
 target=\"_blank\">Delete Note: $rv";
+}
+  echo "http://master.php.net/manage/user-notes.php?action=delete+$id\"; 
target=\"_blank\">Delete Note: other reason",
 "http://master.php.net/manage/user-notes.php?action=reject+$id\"; 
target=\"_blank\">Reject Note",
 "",
"";
@@ -226,6 +233,20 @@
   exit;
 }
   }
+case 'predelete': // used to choose reason when called from manual pages
+  if ($id) {
+echo "Delete reason\n",
+  "Choose a reason for deletion:\n\n",
+  "\n",
+  "\n\n";
+  foreach ($delete_reasons as $rk => $rv) {
+echo "$rv\n";
+  }
+echo "\nOther reason\n",
+echo "\n\n";
+echo "\n";
+exit;
+  }
 case 'reject':
 case 'delete':
   if ($id) {


Re[2]: [PHP-DOC] wrong symbols in phpdoc/chm

2005-09-24 Thread anatoly techtonik
||*()*|| 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
-- 


Re[2]: [PHP-DOC] wrong symbols in phpdoc/chm

2005-09-22 Thread anatoly techtonik
||*()*|| 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 /scripts missing-entities.php.in

2005-09-22 Thread anatoly techtonik
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.21&r2=1.22&ty=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


[PHP-DOC] cvs: phpdoc /scripts missing-entities.php.in

2005-09-22 Thread anatoly techtonik
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.20&r2=1.21&ty=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");


Re[2]: [PHP-DOC] #34476 [Bgs->Opn]: ulink doesn't appear on livedocs

2005-09-20 Thread anatoly techtonik
||*()*|| 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:  and ,
>> 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] cvs: phpdoc /en/reference/filesystem/functions is-readable.xml

2005-09-20 Thread anatoly techtonik
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.7&r2=1.8&ty=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 @@
 
-
+
 
   

@@ -13,7 +13,8 @@
   
stringfilename
  
 
- Returns &true; if the filename exists and is readable.
+ Returns &true; if the file or directory specified by 
+ filename exists and is readable.
 
 
  Keep in mind that PHP may be accessing the file as the user


[PHP-DOC] cvs: phpdoc /en/reference/filesystem/functions feof.xml

2005-09-20 Thread anatoly techtonik
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.9&r2=1.10&ty=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 @@
 
-
+
 
   

@@ -26,6 +26,26 @@
   
  
  &fs.validfp.all;
+ 
+   If passed file pointer is not valid you may get an infinite loop, 
because
+   EOF fails to return TRUE.
+   
+
+ 
+
+   
+ 

   
 


[PHP-DOC] Directories on CVS

2005-09-17 Thread anatoly techtonik
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

2005-09-13 Thread anatoly techtonik
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.1&r2=1.2&ty=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
 
  * @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 ] [--include ] 
[--include ] ...\n";
+echo "   make-partial.php --help\n";
+echo "\n";
+echo "  --format Which format to build. Can be one of 'html', 
'pearweb'.\n";
+echo "   Default is 'html'.\n";
+echo "  --include   Automatically include certa

Re[2]: [PHP-DOC] get the word out about livedocs

2005-09-11 Thread anatoly techtonik
||*()*|| 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[3]: [PHP-DOC] get the word out about livedocs

2005-09-11 Thread anatoly techtonik
||*()*|| 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 "we"s
and "I"s. 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

2005-09-10 Thread anatoly techtonik
||*()*|| 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] get the word out about livedocs

2005-09-10 Thread anatoly techtonik
||*()*|| 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: [PHP-DOC] get the word out about livedocs

2005-09-10 Thread anatoly techtonik
||*()*|| 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] Manual Credits/Contributors

2005-09-07 Thread anatoly techtonik
||*()*|| 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

2005-08-31 Thread anatoly techtonik
||*()*|| 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.22&r2=1.23&ty=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
-- 


[PHP-DOC] cvs: phpdoc /en/reference/strings/functions addcslashes.xml

2005-08-06 Thread anatoly techtonik
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.7&r2=1.8&ty=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 @@
 
-
+
 
   

@@ -15,10 +15,12 @@
  
 
  Returns a string with backslashes before characters that are
- listed in charlist parameter. It escapes
- \n, \r etc. in C-like
- style, characters with ASCII code lower than 32 and higher than
- 126 are converted to octal representation. 
+ listed in charlist parameter. If
+ charlist contains characters
+ \n, \r 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.
 
 
  Be careful if you choose to escape characters 0, a, b, f, n, r, 


Re[2]: [PHP-DOC] xCHM manual temporary borked issue

2005-08-06 Thread anatoly techtonik
||*()*|| 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] xCHM manual temporary borked issue

2005-08-03 Thread anatoly techtonik
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 ]--


[PHP-DOC] bugfixing policy

2005-07-31 Thread anatoly techtonik
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

2005-07-31 Thread anatoly techtonik
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.24&r2=1.25&ty=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 $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -404,7 +404,7 @@
 
 
   
-  
+  
 
 
 
@@ -442,12 +442,26 @@
 
 
   
+
 
 
 
 
-  if (typeof displayPage == 'function') { 
displayPage(); } else {document.all['pageContent'].style.display = 
'block';}
+  
+ if (typeof displayPage == 'function') {
+displayPage(); 
+ } else if (typeof document.all['pageContent'].style != 'undefined') {
+ document.all['pageContent'].style.display = 'block';
+ }
+  
   if(prefs_context_override){return 
false;}
 
 


Re[2]: [PHP-DOC] proposal system

2005-07-31 Thread anatoly techtonik
||*()*|| 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 /htmlhelp/suppfiles/html _script.js

2005-07-30 Thread anatoly techtonik
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.10&r2=1.11&ty=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>');
-
-// 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('
'); -contextMenuRewrite(true); -document.write('
'); - -// 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 t

[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2005-07-30 Thread anatoly techtonik
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.23&r2=1.24&ty=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 @@
-
-
-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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-http://www.w3.org/TR/html4/loose.dtd'"/>
-
-
-
-
-
-
-
-
-
-
-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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-  
-  
-
-  
-  
-
-  
-
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-
-
-  
-  
-
-
-
-  
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-  
-  
-
-
-  
-  
-
-  
-
-
-
-  
-
-  
-
-  
-  
-
-
-
-
-
-  
-
-  
-
-
-  
-
-  
-
-
-
-
-  
-
-
-
-
-  
-  
-  
-
-
-
-
-
-
-
-
-
-  
-  
-  
-  
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-
-  
-
-  
-
-  
-  
-
-  
-
-
-  
-  
-
-  
-  
-
-  
-
-  
-
-  
-  
-  
-
-
-  
-  
-  
-  
-
-
-  
-  
-  
-
-  
-
-
-
-
-
-
-  
-
-  
-
-  
-  
-
-
-
-  
-
-
-  
-
-
-
-
-
-  
-
-  
-
-  
-  
-
-  
-
-
-  
-  
-
-  
-
-  
-  
-  
-
-
-  
-  
-  
-
-  
-
-  
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-  
-  
-  
-  
-
-  
-
-  
-
-  
-  
-
-
-
-  
-  
-
-
-
-   
-   
-   
-
-
-
-
-
-
-
-
-
-   
-   
-   
-
-
-
-  
-
-  
-
-
-
-
-  
-
-
-
-  
-
-
-
-  
-  
-
-
-
-
-  if (typeof displayPage == 'function') { 
displayPage(); } else {document.all['pageContent'].style.display = 
'block';}
-  if(prefs_context_override){return 
false;}
-
-
- 
-
-
-
-
-
-  
-  
-  
-   function displayNotes() { _displayNotes(); }
-   if (typeof loadNotes == "function") { loadNotes(); }
-  
-
-
-
-
-  
-  
-  
-  
-  
- 
-  
-
-  
-  
-
-  
-
-  
-
-<< 
-
-  
-  
-
-  
-  
-
-
-  
-
-
-  
-  
-
-  
-  
-
-  
-
-  
-
-
- >>
-  
-  
-
-  
-
- 
-  
-
-  This 
page online
-     
-  Report a 
bug
-
-  
-
-  
-  
-
-
-
-
-  
-  
-
-  
-  
-
-  
-
-  
-  
-  
-  
-
-  
-
-  
-  
-
-  
-
-  
-
-  
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-   : 
-
-  
-
-
-
-
-  
-
-
-
-
-
-  
-  
-
-  
-  
-
-
-
-  
-  
-
-
-
-
-
-
-
-
-
-  
-  
-
-
-  
-
-  
-
-
-
-
-  
-
-  
-
-  
-
-
-
-  
-  
-  : 
-
-
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-  
-
-
-
-
-  
-
-
-  
-  ()
-  
-  
-
-  
-
-
-
-
-
-  
-
- 
-
-
- 
-
- ( 
-
-
-  ]
-
- )
-  
-
-
-
-
-  
- [
-  
-  
-, 
-  
-  
-   
-  
-   
-  
-
-  &
-
-   
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-   
-
-
-
-
-
-
+
+
+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">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://www.w3.org/TR/html4/loose.dtd'"/>
+
+
+
+
+
+
+
+
+
+
+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

[PHP-DOC] cvs: phpdoc /htmlhelp/suppfiles/skins/phpZ skin.js

2005-07-30 Thread anatoly techtonik
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.4&r2=1.5&ty=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 skinver 1.0.2';
+   manualVersion = 'phpZ skinver 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 = ' ';
+   if ( ! prev ) {
prev = document.createElement('DIV');
prev.innerHTML = ' ';
-   }
-   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 = ' ';
+   } else {
nextURL = next.all.tags('A')(0).href;
nextText = next.all.tags('A')(0).innerText;
+   nextText = nextText.substring(0, nextText.length - 3);
}

html += '';


[PHP-DOC] cvs: phpdoc /htmlhelp/suppfiles/html _script.js

2005-07-30 Thread anatoly techtonik
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.9&r2=1.10&ty=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>');
-
-// 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('
'); -contextMenuRewrite(true); -document.write('
'); - -// 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 metho

[PHP-DOC] proposal system

2005-07-30 Thread anatoly techtonik
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 /xsl htmlhelp.xsl

2005-07-30 Thread anatoly techtonik
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.22&r2=1.23&ty=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 @@
-
-
-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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-http://www.w3.org/TR/html4/loose.dtd'"/>
-
-
-
-
-
-
-
-
-
-
-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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-  
-  
-
-  
-  
-
-  
-
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-
-
-  
-  
-
-
-
-  
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-  
-  
-  
-
-
-  
-  
-
-  
-
-
-
-  
-
-  
-
-  
-  
-
-
-
-
-
-  
-
-  
-
-
-  
-
-  
-
-
-
-
-  
-
-
-
-
-  
-  
-  
-
-
-
-
-
-
-
-
-
-  
-  
-  
-  
-  
-
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-
-  
-
-  
-
-  
-  
-
-  
-
-
-  
-  
-
-  
-  
-
-  
-
-  
-
-  
-  
-  
-
-
-  
-  
-  
-  
-
-
-  
-  
-  
-
-  
-
-
-
-
-
-
-  
-
-  
-
-  
-  
-
-
-
-  
-
-
-  
-
-
-
-
-
-  
-
-  
-
-  
-  
-
-  
-
-
-  
-  
-
-  
-
-  
-  
-  
-
-
-  
-  
-  
-
-  
-
-  
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-  
-  
-  
-  
-
-  
-
-  
-
-  
-  
-
-
-
-  
-  
-
-
-
-   
-   
-   
-
-
-
-
-
-
-
-
-
-   
-   
-   
-
-
-
-  
-
-  
-
-
-
-
-  
-
-
-
-  
-
-
-
-  
-  
-
-
-
-
-  displayPage();
-  if(prefs_context_override){return 
false;}
-
-
- 
-
-
-
-
-
-  
-  
-  
-   function displayNotes() { _displayNotes(); }
-   loadNotes();
-  
-
-
-
-
-  
-  
-  
-  
-  
- 
-  
-
-  
-  
-
-  
-
-  
-
-<< 
-
-  
-  
-
-  
-  
-
-
-  
-
-
-  
-  
-
-  
-  
-
-  
-
-  
-
-
- >>
-  
-  
-
-  
-
- 
-  
-
-  This 
page online
-     
-  Report a 
bug
-
-  
-
-  
-  
-
-
-
-
-  
-  
-
-  
-  
-
-  
-
-  
-  
-  
-  
-
-  
-
-  
-  
-
-  
-
-  
-
-  
-  
-
-  
-
-
-  
-
-  
-
-  
-
-
-  
-   : 
-
-  
-
-
-
-
-  
-
-
-
-
-
-  
-  
-
-  
-  
-
-
-
-  
-  
-
-
-
-
-
-
-
-
-
-  
-  
-
-
-  
-
-  
-
-
-
-
-  
-
-  
-
-  
-
-
-
-  
-  
-  : 
-
-
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-  
-
-
-
-
-  
-
-
-  
-  ()
-  
-  
-
-  
-
-
-
-
-
-  
-
- 
-
-
- 
-
- ( 
-
-
-  ]
-
- )
-  
-
-
-
-
-  
- [
-  
-  
-, 
-  
-  
-   
-  
-   
-  
-
-  &
-
-   
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-   
-
-
-
-
-
-
+
+
+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">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://www.w3.org/TR/html4/loose.dtd'"/>
+
+
+
+
+
+
+
+
+
+
+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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

[PHP-DOC] cvs: phpdoc /xsl common.xsl

2005-07-15 Thread anatoly techtonik
techtonik   Fri Jul 15 05:20:44 2005 EDT

  Modified files:  
/phpdoc/xsl common.xsl 
  Log:
  - titleabbrev mod now in std. distribution
  
http://cvs.php.net/diff.php/phpdoc/xsl/common.xsl?r1=1.27&r2=1.28&ty=u
Index: phpdoc/xsl/common.xsl
diff -u phpdoc/xsl/common.xsl:1.27 phpdoc/xsl/common.xsl:1.28
--- phpdoc/xsl/common.xsl:1.27  Sat Jan  8 13:30:48 2005
+++ phpdoc/xsl/common.xsl   Fri Jul 15 05:20:44 2005
@@ -3,7 +3,7 @@
 
   common.xsl: Common customizations for all HTML formats
 
-  $Id: common.xsl,v 1.27 2005/01/08 18:30:48 hsc Exp $
+  $Id: common.xsl,v 1.28 2005/07/15 09:20:44 techtonik Exp $
 
   What is done in this stylesheet as common to all HTML output formats:
 
@@ -39,8 +39,6 @@
 
 
 
-
-
 
 
 



[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2005-07-14 Thread anatoly techtonik
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.21&r2=1.22&ty=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 $
 
 -->
 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

2005-07-07 Thread anatoly techtonik
||*()*|| 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/html refentry.xsl

2005-07-04 Thread anatoly techtonik
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.3&r2=1.4&ty=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'>
 
 

[PHP-DOC] cvs: phpdoc /xsl/docbook/htmlhelp profile-htmlhelp-common.xsl

2005-07-04 Thread anatoly techtonik
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.1&r2=1.2&ty=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 @@
 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">
 
 
 
 
@@ -335,7 +335,7 @@
   
 
 
-
+
   
   1
 
@@ -395,7 +395,7 @@
   
 
 
-
+
   
 
   
@@ -422,7 +422,7 @@
 
 
 
-
+
   
   
 


[PHP-DOC] cvs: phpdoc /xsl/docbook/htmlhelp htmlhelp-common.xsl

2005-07-04 Thread anatoly techtonik
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.1&r2=1.2&ty=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">
 
 
 
 
@@ -358,7 +358,7 @@
   
 
 
-
+
   
@@ -420,7 +420,7 @@
   
 
 
-
+
   
 
   
@@ -447,7 +447,7 @@
 
 
 
-
+
   
   
 


[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php

2005-07-01 Thread anatoly techtonik
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.16&r2=1.17&ty=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 @@
-', '', $content);
+$content = preg_replace('||', '', $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 make_chm.php

2005-06-24 Thread anatoly techtonik
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.5&r2=1.6&ty=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 /htmlhelp filter_files.php

2005-06-24 Thread anatoly techtonik
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.15&r2=1.16&ty=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 @@
-)!Us';
-if (!preg_match($bodystart_regex, $content)) {
-echo "Can't add first div. No match in $filename\n";
-
-} else {
-$content = preg_replace(
-$bodystart_regex,
-'\1',
-$content,
-1
-);
+// Adding div id="pageHeaders" instead of titlepage div
+$content = str_replace('', '', $content);
 
-// Put there the end of this pageContent
-$content = str_replace(
-'',
-'',
-$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, '') !== FALSE) {
 
 // A function page
-if (!strpos($content, "refsynopsisdiv")) {
-$content = str_replace(
-'', '', 
$content);
+
+// insert pageText div before first text division like refsect1, sect1 
and so on
+// i.e. just after former titlepage end
+$content = preg_replace(
+'!()(\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("", ""),
-array("", ""),
-$content
-);
-$content = preg_replace(
-'!!',
-'',
+"",
+'',
 $content
 );
+
+$content = str_replace("","", $content);
 }
 
 // Normal page
 else {
 
-$headend_regex = '!(()+)!';
-if (!preg_match($headend_regex, $content)) {
-echo "Impossible to close pageHeaders div. No match in 
$filename\n";
-
-} else {
-$content = preg_replace(
-$headend_regex,
-'\1',
-$content
-);
-}
+// Remove empty wrapping divs for pageHeaders
+$content = preg_replace(
+'!(()+)()(()+)!is',
+'\3',
+$content,
+1
+);
 
+// Insert pageText like in function page
+$content = preg_replace(
+'!()()!is',
+'\1\2',
+$content,
+1
+);
 }
 
-// End that pageText div before the user notes
-$content = str_replace(
-'',
-'',
-$content
+// Instead of closing pageText div right before div with id="pageNotes" we 
delete start
+// tag of top level div with class="refentry", "sect1" or any other 
chunkable class name.
+// This div ends just where we need our pageText to end and is not 
overlapped by pageHeaders
+$content = preg_replace(
+'!!i', "", $content, 1
 );
 
 // If this is the index file, correct it
@@ -263,7 +239,7 @@
 
 // Get contents we need to build the _index.html file
 preg_match("!^(.+)!s", $content, $_index1);
-preg_match("!(.+)!s", $content, 
$_index2);
+preg_match("!(.+)!s", $content, 
$_index2);
 
 // Write out the two components to form a complete file
 $fp = fopen("$HTML_TARGET/_index.html", "w");


[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2005-06-24 Thread anatoly techtonik
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.20&r2=1.21&ty=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 $
 
 -->
 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  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 @@
 
 
 
-
+
+
+
+  
+  
+  
+  
+
+  
+
+  
+
+  
+  
+
+
+
+  
+  
+
+
+
+   
+   
+   
+
+
+
+
+
+
+
+
+
+   
+   
+   
+
+
+
+  
+
+  
+
+
+
 
   
 


[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php

2005-06-24 Thread anatoly techtonik
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.14&r2=1.15&ty=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-DOC] cvs: phpdoc /en/chapters streams.dir.xml streams.xml

2005-06-23 Thread anatoly techtonik
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.3&r2=1.4&ty=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 @@
 
-
+
 
+
 

[PHP-DOC] cvs: phpdoc /en/chapters streams.common.xml

2005-06-22 Thread anatoly techtonik
techtonik   Wed Jun 22 15:45:49 2005 EDT

  Modified files:  
/phpdoc/en/chapters streams.common.xml 
  Log:
  * make  wrapper for refentry instead of 
  * correct id
  
http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.common.xml?r1=1.12&r2=1.13&ty=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 @@
 
-
+
 
- 
-Streams Common API Reference
+ 
+   Streams Common API Reference
   
   

@@ -1030,7 +1030,7 @@
 

   
-
+
 
 

[PHP-DOC] cvs: phpdoc /en/chapters streams.constants.xml streams.dir.xml streams.file.xml streams.socket.xml streams.structs.xml

2005-06-22 Thread anatoly techtonik
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  wrapper for refentry instead of 
  
http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.constants.xml?r1=1.1&r2=1.2&ty=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 @@
 
-
+
 
 
- 
+ 
   Streams Constants
   
   
@@ -159,7 +159,7 @@

   
 
- 
+ 
  
  
  
http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.dir.xml?r1=1.2&r2=1.3&ty=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 @@
 
-
+
 
 
- 
+ 
   Streams Dir API Reference
   
The functions listed in this section work on local files, as well as remote 
files
@@ -96,7 +96,7 @@

   
 
- 
+ 
  
  
  
http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.file.xml?r1=1.2&r2=1.3&ty=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 @@
 
-
+
 
 
- 
+ 
   Streams File API Reference
 
   
@@ -76,7 +76,7 @@

   
 
- 
+ 
  
  
  
http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.socket.xml?r1=1.2&r2=1.3&ty=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 @@
 
-
+
 
 
- 
+ 
   Streams Socket API Reference
 
   
@@ -124,7 +124,7 @@
 
 
 
- 
+ 
  
  
  
http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.structs.xml?r1=1.5&r2=1.6&ty=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 @@
 
-
+
 
 
- 
+ 
   Streams Structures
 
   
@@ -181,7 +181,7 @@
  
 
   
- 
+ 
  
  
  


Re[2]: [PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2005-06-21 Thread anatoly techtonik
||*()*|| 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  instead of
. These chapters are not present in xCHM so I left them
uncommited and didn't modify the filters.

t
-- 


[PHP-DOC] cvs: phpdoc /htmlhelp/suppfiles/skins/HeaderNostalgia skin.js

2005-06-21 Thread anatoly techtonik
techtonik   Tue Jun 21 08:37:26 2005 EDT

  Modified files:  
/phpdoc/htmlhelp/suppfiles/skins/HeaderNostalgiaskin.js 
  Log:
  *  is deprecated - changing to 
  
  
http://cvs.php.net/diff.php/phpdoc/htmlhelp/suppfiles/skins/HeaderNostalgia/skin.js?r1=1.1&r2=1.2&ty=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 @@
 '' +
 '' +
 '' +
-'' +
+'' +
 '';
 
 // If this is a function page, show those headers too


[PHP-DOC] cvs: phpdoc /htmlhelp filter_files.php

2005-06-21 Thread anatoly techtonik
techtonik   Tue Jun 21 08:35:34 2005 EDT

  Modified files:  
/phpdoc/htmlhelpfilter_files.php 
  Log:
  *  is deprecated - changing to 
  
  
http://cvs.php.net/diff.php/phpdoc/htmlhelp/filter_files.php?r1=1.12&r2=1.13&ty=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 @@
-',
+'',
 '',
 $content
 );
@@ -259,7 +259,7 @@
 
 // Get contents we need to build the _index.html file
 preg_match("!^(.+)!s", $content, $_index1);
-preg_match("!(.+)!s", $content, 
$_index2);
+preg_match("!(.+)!s", $content, 
$_index2);
 
 // Write out the two components to form a complete file
 $fp = fopen("$HTML_TARGET/_index.html", "w");


[PHP-DOC] cvs: phpdoc /xsl htmlhelp.xsl

2005-06-21 Thread anatoly techtonik
techtonik   Tue Jun 21 08:33:26 2005 EDT

  Modified files:  
/phpdoc/xsl htmlhelp.xsl 
  Log:
  *  is deprecated - changing to 
  + javascript attributes to calm tidy
  * comments
  
  
http://cvs.php.net/diff.php/phpdoc/xsl/htmlhelp.xsl?r1=1.19&r2=1.20&ty=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 $
 
 -->
 http://www.w3.org/1999/XSL/Transform";
@@ -14,18 +14,19 @@
 exclude-result-prefixes="doc exsl set">
 
 
 
@@ -391,7 +395,7 @@
 
 
   
-  
+  
 
 
 
@@ -404,17 +408,20 @@
 
 
 
-
-
-  
-  
-  
-  
+
+
+  
   
-  
+