cvs: smarty /docs Makefile.in configure.in manual.xml.in /docs/dsssl html-common.dsl html-common.dsl.in

http://cvs.php.net/diff.php/smarty/docs/Makefile.in?r1=1.5&r2=1.6&ty=u
Index: smarty/docs/Makefile.in
diff -u smarty/docs/Makefile.in:1.5 smarty/docs/Makefile.in:1.6
--- smarty/docs/Makefile.in:1.5	Wed Mar 24 10:54:30 2004
+++ smarty/docs/Makefile.in	Sat Apr  3 08:48:44 2004
@@ -14,7 +14,7 @@
 #
 
 #
-# $Id: Makefile.in,v 1.5 2004/03/24 15:54:30 nlopess Exp $
+# $Id: Makefile.in,v 1.6 2004/04/03 13:48:44 nlopess Exp $
 #
 
 all: html
@@ -55,7 +55,7 @@
 # {{{ cleanup 
 
 clean:
-	rm -f Makefile config.* manual.xml configure entities/version.ent *.fot
+	rm -f Makefile config.* manual.xml configure entities/version.ent *.fot dsssl/html-common.dsl
 	rm -fr autom4te.cache html phpweb
 
 # }}}
http://cvs.php.net/diff.php/smarty/docs/configure.in?r1=1.4&r2=1.5&ty=u
Index: smarty/docs/configure.in
diff -u smarty/docs/configure.in:1.4 smarty/docs/configure.in:1.5
--- smarty/docs/configure.in:1.4	Tue Mar 23 13:15:52 2004
+++ smarty/docs/configure.in	Sat Apr  3 08:48:44 2004
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.4 2004/03/23 18:15:52 nlopess Exp $
+dnl $Id: configure.in,v 1.5 2004/04/03 13:48:44 nlopess Exp $
 
 dnl autoconf initialisation
 AC_INIT()
@@ -222,8 +222,6 @@
 
 AC_MSG_CHECKING(for language)
 
-BUILD_DATE=`date '+%Y-%m-%d'`
-
 AC_ARG_WITH(lang,
 [  --with-lang=LANG        choose a language to work with],[
   if test "$withval" = "yes"; then
@@ -245,7 +243,13 @@
   AC_MSG_RESULT([en (default)])
 ])
 AC_SUBST(LANG)
-AC_SUBST(BUILD_DATE)
+
+case "$LANG" in
+  ru) ENCODING="windows-1251";;
+  *) ENCODING="ISO-8859-1";;
+esac
+
+AC_SUBST(ENCODING)
 
 dnl }}}
 
http://cvs.php.net/diff.php/smarty/docs/manual.xml.in?r1=1.6&r2=1.7&ty=u
Index: smarty/docs/manual.xml.in
diff -u smarty/docs/manual.xml.in:1.6 smarty/docs/manual.xml.in:1.7
--- smarty/docs/manual.xml.in:1.6	Sun Mar 28 13:56:08 2004
+++ smarty/docs/manual.xml.in	Sat Apr  3 08:48:44 2004
@@ -1,3 +1,4 @@
+<?xml version='1.0' encoding='@ENCODING@' ?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
           "./dtds/dbxml-4.1.2/docbookx.dtd" [
 <!ENTITY % build.version SYSTEM "entities/version.ent">

http://cvs.php.net/co.php/smarty/docs/dsssl/html-common.dsl.in?r=1.1&p=1
Index: smarty/docs/dsssl/html-common.dsl.in
+++ smarty/docs/dsssl/html-common.dsl.in
;; -*- Scheme -*-
;;
;; $Id: html-common.dsl.in,v 1.1 2004/04/03 13:48:48 nlopess Exp $
;;

;; Returns the depth of the auto-generated TOC (table of
;; contents) that should be made at the nd-level
(define (toc-depth nd)
  (if (string=? (gi nd) "book")
      3 ; 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) 
  ($bold-seq$
   (make sequence
     (process-children)
     )
   )
  )


;; There are two different kinds of optionals
;; optional parameters and optional parameter parts.
;; An optional parameter is identified by an optional tag
;; with a parameter tag as its parent 
;; and only whitespace between them
(element optional 
  ;;check for true optional parameter
  (if (is-true-optional (current-node))
      ;; yes - handle '[...]' in paramdef
      (process-children-trim) 
      ;; no - do '[...]' output
      (make sequence
        (literal %arg-choice-opt-open-str%)
        (process-children-trim)
        (literal %arg-choice-opt-close-str%)
        )
      )
  )                

;; Print out parameters in italic
(element (paramdef parameter)
  (make sequence
    font-posture: 'italic                                                       
    (process-children-trim)
    )
  )                                                       

;; Now this is going to be tricky
(element paramdef  
  (make sequence
    ;; special treatment for first parameter in funcsynopsis
    (if (equal? (child-number (current-node)) 1)
        ;; is first ?
        (make sequence
          ;; start parameter list
          (literal " (") 
          ;; is optional ?
          ( if (has-true-optional (current-node))
               (literal %arg-choice-opt-open-str%)
               (empty-sosofo)
               )
          )
        ;; not first
        (empty-sosofo)
        )
    
    ;;
    (process-children-trim)
    
    ;; special treatment for last parameter 
    (if (equal? (gi (ifollow (current-node))) (normalize "paramdef"))                                        
        ;; more parameters will follow
        (make sequence
          ;; next is optional ?
          ( if (has-true-optional (ifollow (current-node)))
               ;; optional
               (make sequence
                 (literal " ")
                 (literal %arg-choice-opt-open-str%)
                 )
               ;; not optional
               (empty-sosofo)
               )
          (literal ", " ) 
          )
        ;; last parameter
        (make sequence
          (literal 
           (let loop ((result "")(count (count-true-optionals (parent (current-node)))))
             (if (<= count 0)
                 result
                 (loop (string-append result %arg-choice-opt-close-str%)(- count 1))
                 )
             )
           )
          ( literal ")" )
          )
        )
    )
  )

(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))))
    (cond
     ;; function names should be plain in FUNCDEF
     ((equal? parent-gi "funcdef")
      (process-children))
     
     ;; 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
           (data (node-list-first
              (select-elements
               (node-list-first
                (children
                 (select-elements
                  (children
                   (ancestor-member (parent) (list "refentry")))
                  "refnamediv")))
               "refname"))))
          (case-fold-down function-name)))
      ($bold-seq$
       (make sequence
     (process-children)
     (literal "()"))))
     
     ;; 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 "()"))))))))


;; Dispaly of examples
(element example
  (make sequence
    (make element gi: "TABLE"
      attributes: (list
               (list "WIDTH" "100%")
               (list "BORDER" "0")
               (list "CELLPADDING" "0")
               (list "CELLSPACING" "0")
               (list "CLASS" "EXAMPLE"))
      (make element gi: "TR"
        (make element gi: "TD"
              ($formal-object$))))))


;; Prosessing tasks for the frontpage
(mode book-titlepage-recto-mode
  (element authorgroup
    (process-children))
    
  (element author
    (let ((author-name  (author-string))
          (author-affil (select-elements (children (current-node)) 
                                         (normalize "affiliation"))))
      (make sequence      
        (make element gi: "DIV"
              attributes: (list (list "CLASS" (gi)))
              (literal author-name))
        (process-node-list author-affil))))

  (element editor
    (let ((editor-name (author-string)))
      (make sequence
        (if (first-sibling?)
            (make element gi: "H2"
                  attributes: (list (list "CLASS" "EDITEDBY"))
                  (literal (gentext-edited-by)))
            (empty-sosofo))
        (make element gi: "DIV"
              attributes: (list (list "CLASS" (gi)))
              (literal editor-name)))))
)

;; Display of question tags, link targets
(element question
  (let* ((chlist   (children (current-node)))
         (firstch  (node-list-first chlist))
         (restch   (node-list-rest chlist)))
    (make element gi: "B"
    (make element gi: "DIV"
          attributes: (list (list "CLASS" (gi)))
          (make element gi: "P"
                (make element gi: "A"
                      attributes: (list (list "NAME" (element-id)))
                      (empty-sosofo))
                (make element gi: "B"
                      (literal (question-answer-label (current-node)) " "))
                (process-node-list (children firstch)))
          (process-node-list restch))))   )          

;; Adding class HTML parameter to examples
;; having a role parameter, to make PHP examples
;; distinguisable from other ones in the manual
(define ($verbatim-display$ indent line-numbers?)
  (let (
(content (make element gi: "PRE"
       attributes: (list
    (list "CLASS" (if (attribute-string (normalize "role"))
      (attribute-string (normalize "role"))
      (gi))))
       (if (or indent line-numbers?)
   ($verbatim-line-by-line$ indent line-numbers?)
   (process-children-trim)))))
    (if %shade-verbatim%
(make element gi: "TABLE"
      attributes: (list 
                   (list "BORDER" "0")
                   (list "BGCOLOR" "#E0E0E0")
                   (list "CELLPADDING" "5")
                   )
      (make element gi: "TR"
    (make element gi: "TD"
  content)))
(make sequence
  (para-check)
  content
  (para-check 'restart)))))

(define (linebreak) (make element gi: "BR" (empty-sosofo)))

(define %html-header-tags%
  '(("META" ("HTTP-EQUIV" "Content-type") ("CONTENT" "text/html; charset=@ENCODING@"))))