[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2006-01-16 Thread Hartmut Holzgraefe
hholzgraMon Jan 16 15:51:53 2006 UTC

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  WS
  
  
http://cvs.php.net/viewcvs.cgi/phpdoc/dsssl/html-common.dsl?r1=1.24r2=1.25diff_format=u
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.24 phpdoc/dsssl/html-common.dsl:1.25
--- phpdoc/dsssl/html-common.dsl:1.24   Sun Jan 15 13:55:26 2006
+++ phpdoc/dsssl/html-common.dslMon Jan 16 15:51:53 2006
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.24 2006/01/15 13:55:26 hholzgra Exp $
+;; $Id: html-common.dsl,v 1.25 2006/01/16 15:51:53 hholzgra Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -25,9 +25,9 @@
 ;; convert to lower case unless all characters are upper case
 (define (case-fold-updown str)
   (let (
-   (upstr (case-fold-up   str))
-   (downstr (case-fold-down str))
-   )
+(upstr (case-fold-up   str))
+(downstr (case-fold-down str))
+)
 (if (equal? upstr str) upstr downstr )
 )
 )
@@ -158,22 +158,22 @@
 (let* (
(function-name (data (current-node)))
(role-name (if (attribute-string (normalize role))
- (attribute-string (normalize 
role))
-   (normalize php)) 
- )
+  (attribute-string (normalize role))
+(normalize php)) 
+  )
(id-base (case-fold-down (string-replace (string-replace 
function-name _ -) :: .)))
(target (cond 
-((equal-ci? role-name php)
- (href-to (element-with-id 
(string-append function.   id-base 
-((equal-ci? role-name zend-api)   
- (href-to (element-with-id 
(string-append zend-api.   id-base 
-((equal-ci? role-name zend-macro) 
- (href-to (element-with-id 
(string-append zend-macro. id-base 
-((equal-ci? role-name libc)   
- (string-append %manpage-url-base% 
function-name %manpage-url-ext%))
-(else )
-)
-  )
+ ((equal-ci? role-name php)
+  (href-to (element-with-id (string-append function.   
id-base 
+ ((equal-ci? role-name zend-api)   
+  (href-to (element-with-id (string-append zend-api.   
id-base 
+ ((equal-ci? role-name zend-macro) 
+  (href-to (element-with-id (string-append zend-macro. 
id-base 
+ ((equal-ci? role-name libc)   
+  (string-append %manpage-url-base% function-name 
%manpage-url-ext%))
+ (else )
+ )
+   )
(parent-gi (gi (parent)))
)
  


[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2006-01-16 Thread Hartmut Holzgraefe
hholzgraMon Jan 16 15:54:11 2006 UTC

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  only show version info for internal and PECL functions,
  not for Zend API and TSRM
  
  
http://cvs.php.net/viewcvs.cgi/phpdoc/dsssl/html-common.dsl?r1=1.25r2=1.26diff_format=u
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.25 phpdoc/dsssl/html-common.dsl:1.26
--- phpdoc/dsssl/html-common.dsl:1.25   Mon Jan 16 15:51:53 2006
+++ phpdoc/dsssl/html-common.dslMon Jan 16 15:54:11 2006
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.25 2006/01/16 15:51:53 hholzgra Exp $
+;; $Id: html-common.dsl,v 1.26 2006/01/16 15:54:11 hholzgra Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -332,11 +332,13 @@
 ;; on pcre reference pages (these are masked as function pages, but are
 ;; not function pages themselfs)
 (element (refnamediv refname)
-  (let ((refid (attribute-string (normalize id) (parent (parent 
(current-node))
-(if (or (not (string? refid))
-(not (string=?
-  (substring refid 0 (min (string-length refid) 14))
-  reference.pcre)))
+  (let ((refid (attribute-string (normalize id) (parent (parent 
(current-node)
+(partid (attribute-string (normalize id) (parent (parent (parent 
(parent (current-node
+(if (and (or (not (string? refid))
+ (not (string=? (substring refid 0 (min (string-length refid) 
14)) reference.pcre))
+ )
+ (or (string=? partid funcref) (string=? partid pecl-funcref))
+ )
   (make sequence
 (make element gi: P
   (literal ()


[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-08-28 Thread Hartmut Holzgraefe
hholzgraSun Aug 28 20:39:38 2005 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  whitespace (untabified)
  
http://cvs.php.net/diff.php/phpdoc/dsssl/html-common.dsl?r1=1.21r2=1.22ty=u
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.21 phpdoc/dsssl/html-common.dsl:1.22
--- phpdoc/dsssl/html-common.dsl:1.21   Mon Jul 18 08:28:49 2005
+++ phpdoc/dsssl/html-common.dslSun Aug 28 20:39:37 2005
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.21 2005/07/18 12:28:49 nlopess Exp $
+;; $Id: html-common.dsl,v 1.22 2005/08/29 00:39:37 hholzgra Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -244,7 +244,7 @@
  ;; If a valid ID for the target constant is not found
  ;; make it bold, but don't make a link
  ((or (node-list-empty? target)(attribute-string (normalize 
id)(current-node)))
-   ($bold-mono-seq$
+($bold-mono-seq$
(process-children)))
  
  ;; Else make a link to the constant
@@ -306,9 +306,9 @@
 (element (refnamediv refname)
   (let ((refid (attribute-string (normalize id) (parent (parent 
(current-node))
 (if (or (not (string? refid))
-   (not (string=?
- (substring refid 0 (min (string-length refid) 14))
- reference.pcre)))
+(not (string=?
+  (substring refid 0 (min (string-length refid) 14))
+  reference.pcre)))
   (make sequence
 (make element gi: P
   (literal ()
@@ -317,7 +317,7 @@
 )
 (process-children)
   )
- (process-children)
+  (process-children)
 )
   )
 )
@@ -370,27 +370,27 @@
 ;; Special handling of note role=seealso
 (define ($admonpara$)
   (let* ((title (select-elements 
-(children (parent (current-node))) (normalize title)))
-(has-title (not (node-list-empty? title)))
-(adm-title (if has-title 
-   (make sequence
- (with-mode title-sosofo-mode
-   (process-node-list (node-list-first title)))
- (literal (gentext-label-title-sep 
-   (gi (parent (current-node))
-   (literal
-(gentext-element-name 
- (if (equal? (normalize seealso) (attribute-string 
(normalize role) (parent (current-node
-  (normalize seealsoie)
-  (parent (current-node
-(gentext-label-title-sep 
- (gi (parent (current-node
+ (children (parent (current-node))) (normalize title)))
+ (has-title (not (node-list-empty? title)))
+ (adm-title (if has-title 
+(make sequence
+  (with-mode title-sosofo-mode
+(process-node-list (node-list-first title)))
+  (literal (gentext-label-title-sep 
+(gi (parent (current-node))
+(literal
+ (gentext-element-name 
+  (if (equal? (normalize seealso) (attribute-string (normalize 
role) (parent (current-node
+   (normalize seealsoie)
+   (parent (current-node
+ (gentext-label-title-sep 
+  (gi (parent (current-node
 (make element gi: P
- (if (and (not %admon-graphics%) (= (child-number) 1))
- (make element gi: B
-   adm-title)
- (empty-sosofo))
- (process-children
+  (if (and (not %admon-graphics%) (= (child-number) 1))
+  (make element gi: B
+adm-title)
+  (empty-sosofo))
+  (process-children
 
 
 


[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-08-28 Thread Hartmut Holzgraefe
hholzgraSun Aug 28 20:42:21 2005 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  we now have three different places to look for a function reference:
  
  - regular functions
  - api functions 
  - api macros
  
  where api macros are assumed to be all upper case
  
http://cvs.php.net/diff.php/phpdoc/dsssl/html-common.dsl?r1=1.22r2=1.23ty=u
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.22 phpdoc/dsssl/html-common.dsl:1.23
--- phpdoc/dsssl/html-common.dsl:1.22   Sun Aug 28 20:39:37 2005
+++ phpdoc/dsssl/html-common.dslSun Aug 28 20:42:19 2005
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.22 2005/08/29 00:39:37 hholzgra Exp $
+;; $Id: html-common.dsl,v 1.23 2005/08/29 00:42:19 hholzgra Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -21,6 +21,17 @@
 (attribute-string (normalize id) elem)
 (generate-anchor elem
 
+
+;; convert to lower case unless all characters are upper case
+(define (case-fold-updown str)
+  (let (
+   (upstr (case-fold-up   str))
+   (downstr (case-fold-down str))
+   )
+(if (equal? upstr str) upstr downstr )
+)
+)
+
 ;; Make function definitions bold
 (element (funcdef function) 
   ($bold-seq$
@@ -140,16 +151,24 @@
   )
 )
 
+
+
+
 (element function
-  (let* ((function-name (data (current-node)))
- (linkend 
-  (string-append
-   function. 
-   (case-fold-down (string-replace
-(string-replace function-name _ -)
-:: .
- (target (element-with-id linkend))
- (parent-gi (gi (parent
+(let* (
+   (function-name (data (current-node)))
+   (id-base (string-replace
+ (string-replace function-name _ -)
+ :: .))
+   (linkend (string-append function. (case-fold-down id-base )))
+   (target (element-with-id linkend))
+   (linkend2 (string-append zend-api. (case-fold-down id-base )))
+   (target2 (element-with-id linkend2))
+   (linkend3 (string-append zend-api-macro. id-base ))
+   (target3 (element-with-id linkend3))
+   (parent-gi (gi (parent)))
+   )
+ 
 (cond
  ;; function names should be plain in FUNCDEF
  ((equal? parent-gi funcdef)
@@ -158,8 +177,8 @@
  ;; If a valid ID for the target function is not found, or if the
  ;; FUNCTION tag is within the definition of the same function,
  ;; make it bold, add (), but don't make a link
- ((or (node-list-empty? target)
-  (equal? (case-fold-down
+ ((or (and (node-list-empty? target) (node-list-empty? target2) 
(node-list-empty? target3))
+  (equal? (case-fold-updown
(data (node-list-first
   (select-elements
(node-list-first
@@ -169,7 +188,7 @@
(ancestor-member (parent) (list refentry)))
   refnamediv)))
refname
-  (case-fold-down function-name)))
+  (case-fold-updown function-name)))
   ($bold-seq$
(make sequence
  (process-children)
@@ -178,14 +197,20 @@
  ;; Else make a link to the function and add ()
  (else
   (make element gi: A
-attributes: (list
- (list HREF (href-to target)))
-($bold-seq$
- (make sequence
-   (process-children)
-   (literal
-)
-   (literal ()
+attributes: (list
+ (list HREF (href-to (cond ((not (node-list-empty? 
target3)) (case-fold-down target3))  
+ ((not (node-list-empty? 
target2)) target2)
+ ((not (node-list-empty? 
target)) target)
+ ))
+   )
+ )
+($bold-seq$
+ (make sequence
+   (process-children)
+   (literal
+)
+   (literal ())
+ )))
 
 
 ;; Link for classnames


[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-07-18 Thread Nuno Lopes
nlopess Mon Jul 18 07:43:11 2005 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  kill the other warning when building the manual with dsssl
  #Im testing now to check if there are any more warnings
  
http://cvs.php.net/diff.php/phpdoc/dsssl/html-common.dsl?r1=1.19r2=1.20ty=u
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.19 phpdoc/dsssl/html-common.dsl:1.20
--- phpdoc/dsssl/html-common.dsl:1.19   Thu Jul 14 17:13:08 2005
+++ phpdoc/dsssl/html-common.dslMon Jul 18 07:43:10 2005
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.19 2005/07/14 21:13:08 nlopess Exp $
+;; $Id: html-common.dsl,v 1.20 2005/07/18 11:43:10 nlopess Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -305,7 +305,8 @@
 ;; not function pages themselfs)
 (element (refnamediv refname)
   (let* ((refid (attribute-string (normalize id) (parent (parent 
(current-node)
-(refid-length (if (string? refid) (string-length refid) 0)))
+(refid (if (string? refid) refid ))
+(refid-length (string-length refid)))
 (if (not (string=? 
   (substring refid 0 (if (= refid-length 14) refid-length 14))
   reference.pcre))


[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-07-18 Thread Nuno Lopes
nlopess Mon Jul 18 08:28:52 2005 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  I dont know why, but last commit didnt fixed the error..
  it seems to be fixed now. sorry for the noise
  
http://cvs.php.net/diff.php/phpdoc/dsssl/html-common.dsl?r1=1.20r2=1.21ty=u
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.20 phpdoc/dsssl/html-common.dsl:1.21
--- phpdoc/dsssl/html-common.dsl:1.20   Mon Jul 18 07:43:10 2005
+++ phpdoc/dsssl/html-common.dslMon Jul 18 08:28:49 2005
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.20 2005/07/18 11:43:10 nlopess Exp $
+;; $Id: html-common.dsl,v 1.21 2005/07/18 12:28:49 nlopess Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -304,12 +304,11 @@
 ;; on pcre reference pages (these are masked as function pages, but are
 ;; not function pages themselfs)
 (element (refnamediv refname)
-  (let* ((refid (attribute-string (normalize id) (parent (parent 
(current-node)
-(refid (if (string? refid) refid ))
-(refid-length (string-length refid)))
-(if (not (string=? 
-  (substring refid 0 (if (= refid-length 14) refid-length 14))
-  reference.pcre))
+  (let ((refid (attribute-string (normalize id) (parent (parent 
(current-node))
+(if (or (not (string? refid))
+   (not (string=?
+ (substring refid 0 (min (string-length refid) 14))
+ reference.pcre)))
   (make sequence
 (make element gi: P
   (literal ()


[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-07-14 Thread Nuno Lopes
nlopess Thu Jul 14 17:13:12 2005 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  fix warning when doing 'make html'
  
http://cvs.php.net/diff.php/phpdoc/dsssl/html-common.dsl?r1=1.18r2=1.19ty=u
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.18 phpdoc/dsssl/html-common.dsl:1.19
--- phpdoc/dsssl/html-common.dsl:1.18   Sun Apr 10 12:19:55 2005
+++ phpdoc/dsssl/html-common.dslThu Jul 14 17:13:08 2005
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.18 2005/04/10 16:19:55 goba Exp $
+;; $Id: html-common.dsl,v 1.19 2005/07/14 21:13:08 nlopess Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -304,9 +304,10 @@
 ;; on pcre reference pages (these are masked as function pages, but are
 ;; not function pages themselfs)
 (element (refnamediv refname)
-  (let ((refid (attribute-string (normalize id) (parent (parent 
(current-node))
+  (let* ((refid (attribute-string (normalize id) (parent (parent 
(current-node)
+(refid-length (if (string? refid) (string-length refid) 0)))
 (if (not (string=? 
-  (substring refid 0 (if (= (string-length refid) 14) (string-length 
refid) 14))
+  (substring refid 0 (if (= refid-length 14) refid-length 14))
   reference.pcre))
   (make sequence
 (make element gi: P


Re: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-12 Thread Jakub Vrana
Gabor Hojtsy wrote:
   The substring match can be easily abstracted, so more checks
   can be made (and it can be done not only in HTML, but also in
   other outputs). Let me know what you think.
  
Wow. Can you please remove version info also from streams.*?

Jakub Vrana


[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-10 Thread Gabor Hojtsy
gobaSun Apr 10 12:04:51 2005 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  an exclusive dsssl fix, on request: do not print version information on dsssl 
pages.
  how it works: it tries to check the ID of the
  refentry for which the version information is written out,
  and it if seems to be a PCRE description page, it does not
  generate the version info
  
  The substring match can be easily abstracted, so more checks
  can be made (and it can be done not only in HTML, but also in
  other outputs). Let me know what you think.
  
http://cvs.php.net/diff.php/phpdoc/dsssl/html-common.dsl?r1=1.16r2=1.17ty=u
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.16 phpdoc/dsssl/html-common.dsl:1.17
--- phpdoc/dsssl/html-common.dsl:1.16   Thu Apr  7 08:21:49 2005
+++ phpdoc/dsssl/html-common.dslSun Apr 10 12:04:50 2005
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.16 2005/04/07 12:21:49 vrana Exp $
+;; $Id: html-common.dsl,v 1.17 2005/04/10 16:04:50 goba Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -300,18 +300,24 @@
 )
 
 
-;; Put version info where the refname part in the refnamediv is
+;; Put version info where the refname part in the refnamediv is, except
+;; on pcre reference pages (these are masked as function pages, but are
+;; not function pages themselfs)
 (element (refnamediv refname)
-  (make sequence
-(make element gi: P
-  (literal ()
-  (version-info (current-node))
-  (literal ))
+  (let ((refid (attribute-string (normalize id) (parent (parent 
(current-node))
+(if (not (string=? (substring refid 0 14) reference.pcre)) 
+  (make sequence
+(make element gi: P
+  (literal ()
+  (version-info (current-node))
+  (literal ))
+)
+(process-children)
   )
-(process-children)
+ (process-children)
 )
   )
-
+)
 
 ;; Display of question tags, link targets
 (element question


[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-10 Thread Gabor Hojtsy
gobaSun Apr 10 12:19:55 2005 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  handle the few exceptions when a function id is less then 14 chars, and this 
printed an error
  
http://cvs.php.net/diff.php/phpdoc/dsssl/html-common.dsl?r1=1.17r2=1.18ty=u
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.17 phpdoc/dsssl/html-common.dsl:1.18
--- phpdoc/dsssl/html-common.dsl:1.17   Sun Apr 10 12:04:50 2005
+++ phpdoc/dsssl/html-common.dslSun Apr 10 12:19:55 2005
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.17 2005/04/10 16:04:50 goba Exp $
+;; $Id: html-common.dsl,v 1.18 2005/04/10 16:19:55 goba Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -305,7 +305,9 @@
 ;; not function pages themselfs)
 (element (refnamediv refname)
   (let ((refid (attribute-string (normalize id) (parent (parent 
(current-node))
-(if (not (string=? (substring refid 0 14) reference.pcre)) 
+(if (not (string=? 
+  (substring refid 0 (if (= (string-length refid) 14) (string-length 
refid) 14))
+  reference.pcre))
   (make sequence
 (make element gi: P
   (literal ()


Re[2]: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-09 Thread anatoly techtonik
||*()*|| Hi, Jakub.

JV What about moving pcre.pattern.* to ref.pcre page? It will be long but
JV still shorter than ref.mbstring :-). It consists of changing
JV refentry to section and moving links to these two files to
JV partintro (I already tested it).

I don't think it is a good idea. It seems to me that PCRE reference has
got many links from internet, and this part of manual perhaps even the
most often visited at least by me. It will take a time to get accustomed
to new reference position. This regexps reference is good not only for
PHP users, but for many, who regexps more than PHP, but finds PHP
manual more clear than MAN PCRE. Mixed with various specific PHP issues
pcre.pattern will not be as clear and hence less useful.

t
-- 


Re[2]: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-09 Thread Derick Rethans
On Fri, 8 Apr 2005, anatoly techtonik wrote:

 This regexps reference is good not only for
 PHP users, but for many, who regexps more than PHP, but finds PHP
 manual more clear than MAN PCRE.

Our man page is an exact copy of man pcrepattern - albeit an older 
version...

Derick

-- 
Derick Rethans
http://derickrethans.nl | http://ez.no | http://xdebug.org


Re: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-09 Thread Jakub Vrana
anatoly techtonik wrote:
 I don't think it is a good idea. It seems to me that PCRE reference has
 got many links from internet, and this part of manual perhaps even the
 most often visited at least by me. It will take a time to get accustomed
 to new reference position. This regexps reference is good not only for
 PHP users, but for many, who regexps more than PHP, but finds PHP
 manual more clear than MAN PCRE. Mixed with various specific PHP issues
 pcre.pattern will not be as clear and hence less useful.

I agree but we need to find a solution to hide meaningless no version
information from these two pages. I offered moving them to appendix
(they can still live in reference/pcre directory and can retain their
ids thus URLs AFAIK) but it was rejected.

Jakub Vrana


Re: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-08 Thread Jakub Vrana
Jakub Vrana wrote:
   # Side effects detected in function.main, function.die, pcre.pattern.* - 
 will be fixed
  
 Patch for function.die sent, function.main is not a big deal (it's a
 dummy entry anyway), pcre.pattern.* remain. My idea is to move them to
 appendix and provide a link from ref.pcre. Any objections, Goba and
 others?

Another side effects detected in Streams API (e.g.
http://php.net/streams.php-stream-closedir ) - not a big deal IMHO as
no version information, might be only in CVS is currently displayed
too.

Another in reserved.constants.* - I will change refentry to sect2
if there are no objections. It will put these two pages on one page,
which is a plus IMHO.

Jakub Vrana


Re: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-08 Thread Jakub Vrana
Jakub Vrana wrote:
   # Side effects detected in function.main, function.die, pcre.pattern.* - 
 will be fixed
 Patch for function.die sent, function.main is not a big deal (it's a
 dummy entry anyway), pcre.pattern.* remain. My idea is to move them to
 appendix and provide a link from ref.pcre. Any objections, Goba and
 others?

What about moving pcre.pattern.* to ref.pcre page? It will be long but
still shorter than ref.mbstring :-). It consists of changing
refentry to section and moving links to these two files to
partintro (I already tested it).

Jakub Vrana


Re: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-08 Thread Gabor Hojtsy
I agree with Nuno here! They should stay where they are, the script
should get fixed.
I simple don't know how to fix the script. Docbook requires
refentry in reference, refnamediv in refentry, etc. I don't
know where to put the logic to disable versioning on these two pages
because they look like any other page. Maybe something ugly as
refentry role=noversion can work but I'm not sure how implement it
in DSSSL anyway.
Another option is to move these two pages to partintro (thus they
will display directly on ref.pcre.php) but they are quite long to put
here IMHO. There are other long pages (DOM, mbstring) but not so long
:-).
What if we use PHP: Hypertext Postprocessor :) I know it is hackish, I 
know. Anyway, I will first look into how this can be done in DSSSL (with 
a role=noversion).

Goba


Re: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-08 Thread Gabor Hojtsy
 # Side effects detected in function.main, function.die, pcre.pattern.* - will be fixed
Patch for function.die sent, function.main is not a big deal (it's a
dummy entry anyway), pcre.pattern.* remain. My idea is to move them to
appendix and provide a link from ref.pcre. Any objections, Goba and
others?
What about moving pcre.pattern.* to ref.pcre page? It will be long but
still shorter than ref.mbstring :-). It consists of changing
refentry to section and moving links to these two files to
partintro (I already tested it).
No, please don't do that long pages. I will look into the DSSSL way of 
getting the version info off the pcre pages.

Goba


[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-07 Thread Jakub Vrana
vrana   Thu Apr  7 08:21:49 2005 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  Aliases version info (bug #24157)
  # Side effects detected in function.main, function.die, pcre.pattern.* - will 
be fixed
  
http://cvs.php.net/diff.php/phpdoc/dsssl/html-common.dsl?r1=1.15r2=1.16ty=u
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.15 phpdoc/dsssl/html-common.dsl:1.16
--- phpdoc/dsssl/html-common.dsl:1.15   Thu Jun  3 09:06:55 2004
+++ phpdoc/dsssl/html-common.dslThu Apr  7 08:21:49 2005
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.15 2004/06/03 13:06:55 didou Exp $
+;; $Id: html-common.dsl,v 1.16 2005/04/07 12:21:49 vrana Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -303,18 +303,11 @@
 ;; Put version info where the refname part in the refnamediv is
 (element (refnamediv refname)
   (make sequence
-   (if (node-list-empty? 
- (select-elements (children
-   (select-elements (children (parent (parent (current-node (normalize 
refsect1))
-  ) (normalize methodsynopsis))
-)
-(empty-sosofo)
 (make element gi: P
   (literal ()
   (version-info (current-node))
   (literal ))
   )
-)
 (process-children)
 )
   )


Re: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-07 Thread Jakub Vrana
Jakub Vrana wrote:
   # Side effects detected in function.main, function.die, pcre.pattern.* - 
 will be fixed
  
Patch for function.die sent, function.main is not a big deal (it's a
dummy entry anyway), pcre.pattern.* remain. My idea is to move them to
appendix and provide a link from ref.pcre. Any objections, Goba and
others?

Jakub Vrana


Re: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-07 Thread Nuno Lopes
Jakub Vrana wrote:
   # Side effects detected in function.main, function.die, 
 pcre.pattern.* - will be fixed

Patch for function.die sent, function.main is not a big deal (it's a
dummy entry anyway), pcre.pattern.* remain. My idea is to move them to
appendix and provide a link from ref.pcre. Any objections, Goba and
others?
I don't think its a good idea to move pcre.pattern.* to the appendix..
They belong to the pcre extension and they should be in the extension's dir. 
Just because they cause problems in this script or in livedocs (oh, live 
what?..), it doesn't mean we should move the files.

Just my opinion, anyway..
Nuno 


Re: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-07 Thread Gabor Hojtsy
Jakub Vrana wrote:
   # Side effects detected in function.main, function.die,  
pcre.pattern.* - will be fixed

Patch for function.die sent, function.main is not a big deal (it's a
dummy entry anyway), pcre.pattern.* remain. My idea is to move them to
appendix and provide a link from ref.pcre. Any objections, Goba and
others?
I don't think its a good idea to move pcre.pattern.* to the appendix..
They belong to the pcre extension and they should be in the extension's 
dir. Just because they cause problems in this script or in livedocs (oh, 
live what?..), it doesn't mean we should move the files.

Just my opinion, anyway..
Nuno
I agree with Nuno here! They should stay where they are, the script 
should get fixed.

Goba


Re: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-07 Thread Jakub Vrana
Gabor Hojtsy wrote:
 I agree with Nuno here! They should stay where they are, the script
 should get fixed.

I simple don't know how to fix the script. Docbook requires
refentry in reference, refnamediv in refentry, etc. I don't
know where to put the logic to disable versioning on these two pages
because they look like any other page. Maybe something ugly as
refentry role=noversion can work but I'm not sure how implement it
in DSSSL anyway.

Another option is to move these two pages to partintro (thus they
will display directly on ref.pcre.php) but they are quite long to put
here IMHO. There are other long pages (DOM, mbstring) but not so long
:-).

Jakub Vrana


Re: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2005-04-07 Thread Friedhelm Betz
Hi Jakub,
Gabor Hojtsy wrote:
I agree with Nuno here! They should stay where they are, the script
should get fixed.

I simple don't know how to fix the script. Docbook requires
refentry in reference, refnamediv in refentry, etc. I don't
know where to put the logic to disable versioning on these two pages
because they look like any other page. Maybe something ugly as
refentry role=noversion can work but I'm not sure how implement it
in DSSSL anyway.
Another option is to move these two pages to partintro (thus they
will display directly on ref.pcre.php) but they are quite long to put
here IMHO. There are other long pages (DOM, mbstring) but not so long
:-).
As you mentioned mbstring: I think it might be worth to concentrate the 
infos about the charsets on that page a bit, imho.
Supported Character Encodings and Summaries of supported encodings 
is abit out of range?

http://www.php.net/manual/en/ref.mbstring.php
Friedhelm


[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2004-06-03 Thread Mehdi Achour
didou   Thu Jun  3 06:33:43 2004 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  new docs
  
http://cvs.php.net/diff.php/phpdoc/dsssl/html-common.dsl?r1=1.13r2=1.14ty=u
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.13 phpdoc/dsssl/html-common.dsl:1.14
--- phpdoc/dsssl/html-common.dsl:1.13   Fri Jan  2 14:00:10 2004
+++ phpdoc/dsssl/html-common.dslThu Jun  3 06:33:42 2004
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.13 2004/01/02 19:00:10 hholzgra Exp $
+;; $Id: html-common.dsl,v 1.14 2004/06/03 10:33:42 didou Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -8,7 +8,7 @@
 (define (toc-depth nd)
   (if (string=? (gi nd) book)
   2 ; the depth of the top-level TOC
-  1 ; the depth of all other TOCs
+  3 ; the depth of all other TOCs
   ))
 
 ;; re-defining element-id as we need to get the id of the parent
@@ -112,34 +112,6 @@
 )
   )
 
-
-;; Linking types to the correct place
-(element type
-  (let* 
-((orig-name (data (current-node)))
-  (type-name (cond 
-((equal-ci? orig-name bool)   boolean)
-((equal-ci? orig-name double) float)
-((equal-ci? orig-name int)   integer)
-((equal-ci? orig-name NULL)   null)
-(else orig-name))
-  )
-  (linkend (string-append language.types. type-name))
-  (target (element-with-id linkend))
-)
-(cond ((node-list-empty? target)
-  (make sequence (process-children) )
-  )
-  (else 
-(make element gi: A
-  attributes: (list (list HREF (href-to target)))
-  ( $bold-seq$(make sequence (process-children) ) )
-)
-  )
-)
-  )
-)
-
 (element function
   (let* ((function-name (data (current-node)))
  (linkend 
@@ -188,74 +160,6 @@
(literal ()
 
 
-;; Link for classnames
-(element classname
-  (let* ((class-name (data (current-node)))
- (linkend 
-  (string-append
-   class. 
-(string-replace
- (case-fold-down class-name) _ -)))
- (target (element-with-id linkend))
- (parent-gi (gi (parent
-(cond
- ;; Function names should be plain in SYNOPSIS
- ((equal? parent-gi synopsis)
-  (process-children))
- 
- ;; If a valid ID for the target class is not found, or if the
- ;; CLASSNAME tag is within the definition of the same class,
- ;; make it bold, but don't make a link
- ((or (node-list-empty? target)
-  (equal? (case-fold-down
-   (data (node-list-first
-  (select-elements
-   (node-list-first
-(children
- (select-elements
-  (children
-   (ancestor-member (parent) (list refentry)))
-  refnamediv)))
-   refname
-  class-name))
-  ($bold-seq$
-   (process-children)))
- 
- ;; Else make a link to the class
- (else
-  (make element gi: A
-attributes: (list
- (list HREF (href-to target)))
-($bold-seq$
- (process-children)))
-
-
-;; Linking to constants
-(element constant
-  (let* ((constant-name (data (current-node)))
- (linkend 
-  (string-append constant. 
- (case-fold-down
-  (string-replace constant-name _ -
- (target (element-with-id linkend))
- (parent-gi (gi (parent
-
-(cond
- ;; If a valid ID for the target constant is not found
- ;; make it bold, but don't make a link
- ((or (node-list-empty? target)(attribute-string (normalize id)(current-node)))
-   ($bold-mono-seq$
-   (process-children)))
- 
- ;; Else make a link to the constant
- (else
-  (make element gi: A
-attributes: (list
- (list HREF (href-to target)))
-($bold-mono-seq$
- (process-children)))
-
-
 ;; Dispaly of examples
 (element example
   (make sequence
@@ -299,27 +203,6 @@
   (literal editor-name)
 )
 
-
-;; Put version info where the refname part in the refnamediv is
-(element (refnamediv refname)
-  (make sequence
-   (if (node-list-empty? 
- (select-elements (children
-   (select-elements (children (parent (parent (current-node (normalize 
refsect1))
-  ) (normalize methodsynopsis))
-)
-(empty-sosofo)
-(make element gi: P
-  (literal ()
-  (version-info (current-node))
-  (literal ))
-  )
-)
-(process-children)
-)
-  )
-
-
 ;; Display of question tags, link targets
 (element question
   (let* ((chlist   (children (current-node)))
@@ -365,34 +248,7 @@
   content
   (para-check 'restart)
 
-;; Special handling of note role=seealso
-(define ($admonpara$)
-  (let* ((title (select-elements 
-(children (parent (current-node))) (normalize title)))
-(has-title (not (node-list-empty? title)))
-(adm-title 

Re: [PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2004-06-03 Thread Derick Rethans
On Thu, 3 Jun 2004, Mehdi Achour wrote:

 didou Thu Jun  3 06:33:43 2004 EDT

   Modified files:
 /phpdoc/dsssl html-common.dsl
   Log:
   new docs

Why eare you changing this? This new structure is not applied yet and
you removed a lot of stuff that is needed.

regards,
Derick


[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2004-06-03 Thread Mehdi Achour
didou   Thu Jun  3 09:06:55 2004 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  revert last commit
  # :|
  
http://cvs.php.net/diff.php/phpdoc/dsssl/html-common.dsl?r1=1.14r2=1.15ty=u
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.14 phpdoc/dsssl/html-common.dsl:1.15
--- phpdoc/dsssl/html-common.dsl:1.14   Thu Jun  3 06:33:42 2004
+++ phpdoc/dsssl/html-common.dslThu Jun  3 09:06:55 2004
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.14 2004/06/03 10:33:42 didou Exp $
+;; $Id: html-common.dsl,v 1.15 2004/06/03 13:06:55 didou Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -8,7 +8,7 @@
 (define (toc-depth nd)
   (if (string=? (gi nd) book)
   2 ; the depth of the top-level TOC
-  3 ; the depth of all other TOCs
+  1 ; the depth of all other TOCs
   ))
 
 ;; re-defining element-id as we need to get the id of the parent
@@ -112,6 +112,34 @@
 )
   )
 
+
+;; Linking types to the correct place
+(element type
+  (let* 
+((orig-name (data (current-node)))
+  (type-name (cond 
+((equal-ci? orig-name bool)   boolean)
+((equal-ci? orig-name double) float)
+((equal-ci? orig-name int)   integer)
+((equal-ci? orig-name NULL)   null)
+(else orig-name))
+  )
+  (linkend (string-append language.types. type-name))
+  (target (element-with-id linkend))
+)
+(cond ((node-list-empty? target)
+  (make sequence (process-children) )
+  )
+  (else 
+(make element gi: A
+  attributes: (list (list HREF (href-to target)))
+  ( $bold-seq$(make sequence (process-children) ) )
+)
+  )
+)
+  )
+)
+
 (element function
   (let* ((function-name (data (current-node)))
  (linkend 
@@ -160,6 +188,74 @@
(literal ()
 
 
+;; Link for classnames
+(element classname
+  (let* ((class-name (data (current-node)))
+ (linkend 
+  (string-append
+   class. 
+(string-replace
+ (case-fold-down class-name) _ -)))
+ (target (element-with-id linkend))
+ (parent-gi (gi (parent
+(cond
+ ;; Function names should be plain in SYNOPSIS
+ ((equal? parent-gi synopsis)
+  (process-children))
+ 
+ ;; If a valid ID for the target class is not found, or if the
+ ;; CLASSNAME tag is within the definition of the same class,
+ ;; make it bold, but don't make a link
+ ((or (node-list-empty? target)
+  (equal? (case-fold-down
+   (data (node-list-first
+  (select-elements
+   (node-list-first
+(children
+ (select-elements
+  (children
+   (ancestor-member (parent) (list refentry)))
+  refnamediv)))
+   refname
+  class-name))
+  ($bold-seq$
+   (process-children)))
+ 
+ ;; Else make a link to the class
+ (else
+  (make element gi: A
+attributes: (list
+ (list HREF (href-to target)))
+($bold-seq$
+ (process-children)))
+
+
+;; Linking to constants
+(element constant
+  (let* ((constant-name (data (current-node)))
+ (linkend 
+  (string-append constant. 
+ (case-fold-down
+  (string-replace constant-name _ -
+ (target (element-with-id linkend))
+ (parent-gi (gi (parent
+
+(cond
+ ;; If a valid ID for the target constant is not found
+ ;; make it bold, but don't make a link
+ ((or (node-list-empty? target)(attribute-string (normalize id)(current-node)))
+   ($bold-mono-seq$
+   (process-children)))
+ 
+ ;; Else make a link to the constant
+ (else
+  (make element gi: A
+attributes: (list
+ (list HREF (href-to target)))
+($bold-mono-seq$
+ (process-children)))
+
+
 ;; Dispaly of examples
 (element example
   (make sequence
@@ -203,6 +299,27 @@
   (literal editor-name)
 )
 
+
+;; Put version info where the refname part in the refnamediv is
+(element (refnamediv refname)
+  (make sequence
+   (if (node-list-empty? 
+ (select-elements (children
+   (select-elements (children (parent (parent (current-node (normalize 
refsect1))
+  ) (normalize methodsynopsis))
+)
+(empty-sosofo)
+(make element gi: P
+  (literal ()
+  (version-info (current-node))
+  (literal ))
+  )
+)
+(process-children)
+)
+  )
+
+
 ;; Display of question tags, link targets
 (element question
   (let* ((chlist   (children (current-node)))
@@ -248,7 +365,34 @@
   content
   (para-check 'restart)
 
+;; Special handling of note role=seealso
+(define ($admonpara$)
+  (let* ((title (select-elements 
+(children (parent (current-node))) (normalize title)))
+(has-title (not (node-list-empty? title)))
+

[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2003-02-20 Thread Philip Olson
philip  Thu Feb 20 03:49:33 2003 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  Make typebool/type link like typeboolean/type does.
  
  
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.9 phpdoc/dsssl/html-common.dsl:1.10
--- phpdoc/dsssl/html-common.dsl:1.9Thu Sep 19 03:46:57 2002
+++ phpdoc/dsssl/html-common.dslThu Feb 20 03:49:32 2003
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.9 2002/09/19 07:46:57 hholzgra Exp $
+;; $Id: html-common.dsl,v 1.10 2003/02/20 08:49:32 philip Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -162,6 +162,7 @@
   (let* 
 ((orig-name (data (current-node)))
   (type-name (cond 
+((equal-ci? orig-name bool)   boolean)
 ((equal-ci? orig-name double) float)
 ((equal-ci? orig-name int)   integer)
 (else orig-name))



-- 
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php




[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2003-02-20 Thread Philip Olson
philip  Thu Feb 20 04:28:02 2003 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  Make typeNULL/type link to type NULL
  
  
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.10 phpdoc/dsssl/html-common.dsl:1.11
--- phpdoc/dsssl/html-common.dsl:1.10   Thu Feb 20 03:49:32 2003
+++ phpdoc/dsssl/html-common.dslThu Feb 20 04:28:02 2003
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.10 2003/02/20 08:49:32 philip Exp $
+;; $Id: html-common.dsl,v 1.11 2003/02/20 09:28:02 philip Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -165,6 +165,7 @@
 ((equal-ci? orig-name bool)   boolean)
 ((equal-ci? orig-name double) float)
 ((equal-ci? orig-name int)   integer)
+((equal-ci? orig-name NULL)   null)
 (else orig-name))
   )
   (linkend (string-append language.types. type-name))



-- 
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php




[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2002-09-19 Thread Hartmut Holzgraefe

hholzgraThu Sep 19 03:46:58 2002 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  make sure that function version info only apears on refentry pages 
  that have a methodsynopsys in them (and not e.g. on the preg pattern
  descriptions)
  
  
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.8 phpdoc/dsssl/html-common.dsl:1.9
--- phpdoc/dsssl/html-common.dsl:1.8Mon Jun 17 18:48:46 2002
+++ phpdoc/dsssl/html-common.dslThu Sep 19 03:46:57 2002
 -1,6 +1,6 
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.8 2002/06/17 22:48:46 hholzgra Exp $
+;; $Id: html-common.dsl,v 1.9 2002/09/19 07:46:57 hholzgra Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
 -346,11 +346,18 
 ;; Put version info where the refname part in the refnamediv is
 (element (refnamediv refname)
   (make sequence
+   (if (node-list-empty? 
+ (select-elements (children
+   (select-elements (children (parent (parent (current-node (normalize 
+refsect1))
+  ) (normalize methodsynopsis))
+)
+(empty-sosofo)
 (make element gi: P
   (literal ()
   (version-info (current-node))
   (literal ))
   )
+)
 (process-children)
 )
   )



-- 
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php




[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2002-04-06 Thread Hartmut Holzgraefe

hholzgraSun Apr  7 04:06:40 2002 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  fixed case-sensitivity problem in function-linking
  constant-linking finally works
  
  
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.6 phpdoc/dsssl/html-common.dsl:1.7
--- phpdoc/dsssl/html-common.dsl:1.6Tue Mar 26 14:15:58 2002
+++ phpdoc/dsssl/html-common.dslSun Apr  7 04:06:40 2002
 -1,6 +1,6 
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.6 2002/03/26 19:15:58 betz Exp $
+;; $Id: html-common.dsl,v 1.7 2002/04/07 08:06:40 hholzgra Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
 -212,7 +212,7 
(ancestor-member (parent) (list refentry)))
   refnamediv)))
refname
-  function-name))
+  (case-fold-down function-name)))
   ($bold-seq$
(make sequence
  (process-children)
 -282,27 +282,12 
   (string-replace constant-name _ -
  (target (element-with-id linkend))
  (parent-gi (gi (parent
+
 (cond
-; ;; constant names should be plain in FUNCDEF
-; ((equal? parent-gi funcdef)
-;  (process-children))
- 
- ;; If a valid ID for the target constant is not found, or if the
- ;; CONSTANT tag is within the definition of the same constant,
+ ;; If a valid ID for the target constant is not found
  ;; make it bold, but don't make a link
- ((or (node-list-empty? target)
-  (equal? (case-fold-down
-   (data (node-list-first
-  (select-elements
-   (node-list-first
-(children
- (select-elements
-  (children
-   (ancestor-member (parent) (list refentry)))
-  refnamediv)))
-   refname
-  constant-name))
-  ($bold-mono-seq$
+ ((or (node-list-empty? target)(attribute-string (normalize id)(current-node)))
+   ($bold-mono-seq$
(process-children)))
  
  ;; Else make a link to the constant





[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2002-03-26 Thread Friedhelm Betz

betzTue Mar 26 14:15:58 2002 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  changed title and question in comment
  
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.5 phpdoc/dsssl/html-common.dsl:1.6
--- phpdoc/dsssl/html-common.dsl:1.5Thu Mar 21 19:08:11 2002
+++ phpdoc/dsssl/html-common.dslTue Mar 26 14:15:58 2002
 -1,6 +1,6 
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.5 2002/03/22 00:08:11 hholzgra Exp $
+;; $Id: html-common.dsl,v 1.6 2002/03/26 19:15:58 betz Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
 -12,7 +12,7 
   ))
 
 ;; re-defining element-id as we need to get the id of the parent
-;; element not only for title but also for question in the faq
+;; element not only for title but also for question in the faq
 (define (element-id #!optional (nd (current-node)))
   (let ((elem (if (equal? (gi nd) (normalize title)) (parent nd)  
(if (equal? (gi nd) (normalize question)) (parent nd) 





[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl

2002-03-21 Thread Hartmut Holzgraefe

hholzgraThu Mar 21 19:08:11 2002 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl 
  Log:
  faq-anchor problem solved
  
  
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.4 phpdoc/dsssl/html-common.dsl:1.5
--- phpdoc/dsssl/html-common.dsl:1.4Thu Mar 14 07:07:39 2002
+++ phpdoc/dsssl/html-common.dslThu Mar 21 19:08:11 2002
 -1,6 +1,6 
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.4 2002/03/14 12:07:39 hholzgra Exp $
+;; $Id: html-common.dsl,v 1.5 2002/03/22 00:08:11 hholzgra Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
 -10,6 +10,16 
   2 ; the depth of the top-level TOC
   1 ; the depth of all other TOCs
   ))
+
+;; re-defining element-id as we need to get the id of the parent
+;; element not only for title but also for question in the faq
+(define (element-id #!optional (nd (current-node)))
+  (let ((elem (if (equal? (gi nd) (normalize title)) (parent nd)  
+   (if (equal? (gi nd) (normalize question)) (parent nd) 
+   nd
+(if (attribute-string (normalize id) elem)
+(attribute-string (normalize id) elem)
+(generate-anchor elem
 
 ;; Make function definitions bold
 (element (funcdef function) 





[PHP-DOC] cvs: phpdoc /dsssl html-common.dsl print.dsl.in

2002-01-14 Thread Jirka Kosek

jkj Mon Jan 14 17:12:59 2002 EDT

  Modified files:  
/phpdoc/dsssl   html-common.dsl print.dsl.in 
  Log:
  Added support for note role=seealso
  
  
Index: phpdoc/dsssl/html-common.dsl
diff -u phpdoc/dsssl/html-common.dsl:1.1 phpdoc/dsssl/html-common.dsl:1.2
--- phpdoc/dsssl/html-common.dsl:1.1Sun Jan  6 10:42:27 2002
+++ phpdoc/dsssl/html-common.dslMon Jan 14 17:12:59 2002
@@ -1,6 +1,6 @@
 ;; -*- Scheme -*-
 ;;
-;; $Id: html-common.dsl,v 1.1 2002/01/06 15:42:27 hholzgra Exp $
+;; $Id: html-common.dsl,v 1.2 2002/01/14 22:12:59 jkj Exp $
 ;;
 
 ;; Returns the depth of the auto-generated TOC (table of
@@ -404,5 +404,30 @@
   (para-check)
   content
   (para-check 'restart)
+
+;; Special handling of note role=seealso
+(define ($admonpara$)
+  (let* ((title (select-elements 
+(children (parent (current-node))) (normalize title)))
+(has-title (not (node-list-empty? title)))
+(adm-title (if has-title 
+   (make sequence
+ (with-mode title-sosofo-mode
+   (process-node-list (node-list-first title)))
+ (literal (gentext-label-title-sep 
+   (gi (parent (current-node))
+   (literal
+(gentext-element-name 
+ (if (equal? (normalize seealso) (attribute-string 
+(normalize role) (parent (current-node
+  (normalize seealsoie)
+  (parent (current-node
+(gentext-label-title-sep 
+ (gi (parent (current-node
+(make element gi: P
+ (if (and (not %admon-graphics%) (= (child-number) 1))
+ (make element gi: B
+   adm-title)
+ (empty-sosofo))
+ (process-children
 
 ;; vim: ts=2 sw=2 et
Index: phpdoc/dsssl/print.dsl.in
diff -u phpdoc/dsssl/print.dsl.in:1.1 phpdoc/dsssl/print.dsl.in:1.2
--- phpdoc/dsssl/print.dsl.in:1.1   Sun Jan  6 10:42:27 2002
+++ phpdoc/dsssl/print.dsl.in   Mon Jan 14 17:12:59 2002
@@ -7,7 +7,7 @@
 
 !--
 
-  $Id: print.dsl.in,v 1.1 2002/01/06 15:42:27 hholzgra Exp $
+  $Id: print.dsl.in,v 1.2 2002/01/14 22:12:59 jkj Exp $
 
   This file contains printout-specific stylesheet customization.
 
@@ -346,6 +346,34 @@
  )
(literal ()))
 
+;; Special handling of note role=seealso
+(define ($admonpara$)
+  (let* ((title (select-elements 
+(children (parent (current-node))) (normalize title)))
+(has-title (not (node-list-empty? title)))
+(adm-title (if has-title 
+   (make sequence
+ (with-mode title-sosofo-mode
+   (process-node-list (node-list-first title)))
+ (literal (gentext-label-title-sep 
+   (gi (parent (current-node))
+   (literal
+(gentext-element-name 
+ (if (equal? (normalize seealso) (attribute-string 
+(normalize role) (parent (current-node
+  (normalize seealsoie)
+  (parent (current-node
+(gentext-label-title-sep 
+ (gi (parent (current-node
+(make paragraph
+  space-before: %para-sep%
+  space-after: %para-sep%
+  (if (and (not %admon-graphics%) (= (child-number) 1))
+ (make sequence
+   font-family-name: %title-font-family%
+   font-weight: 'bold
+   adm-title)
+ (empty-sosofo))
+  (process-children-trim
 
 
 common.dsl;