[docbook-checkins] CVS: dsssl/html db31.dsl,1.6,1.7 dbhtml.dsl,1.3,1.4 dbinline.dsl,1.9,1.10 dbttlpg.dsl,1.8,1.9

[Adam Di C. <adi...@us...>]

Update of /cvsroot/docbook/dsssl/html
In directory sc8-pr-cvs1:/tmp/cvs-serv11753

Modified Files:
	db31.dsl dbhtml.dsl dbinline.dsl dbttlpg.dsl 
Log Message:
Deprecate TT; use CODE, KBD, SAMP, or VAR instead.

acronym make's use of HTML4's ACRONYM element if %html40%

abbrev make's use of HTML4's ABBR element if %html40%


Index: db31.dsl
===================================================================
RCS file: /cvsroot/docbook/dsssl/html/db31.dsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** db31.dsl	21 Apr 2002 16:44:27 -0000	1.6
--- db31.dsl	12 Feb 2003 01:22:30 -0000	1.7
***************
*** 289,301 ****
  )
  
- ;; ======================================================================
- ;; constant
- 
- (element constant 
-   ($mono-seq$))
- 
- ;; ======================================================================
- ;; varname
- 
- (element varname
-   ($mono-seq$))
--- 289,290 ----

Index: dbhtml.dsl
===================================================================
RCS file: /cvsroot/docbook/dsssl/html/dbhtml.dsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** dbhtml.dsl	15 Jan 2003 08:24:13 -0000	1.3
--- dbhtml.dsl	12 Feb 2003 01:22:30 -0000	1.4
***************
*** 363,367 ****
--- 363,411 ----
  
  (define ($mono-seq$ #!optional (sosofo (process-children)))
+   ;; please avoid using this, TT is presentational
    (make element gi: "TT"
+ 	attributes: (list
+ 		     (list "CLASS" (gi)))
+ 	sosofo))
+ 
+ (define ($code-seq$ #!optional (sosofo (process-children)))
+   ;; fragments of computer code
+   (make element gi: "CODE"
+ 	attributes: (list
+ 		     (list "CLASS" (gi)))
+ 	sosofo))
+ 
+ (define ($samp-seq$ #!optional (sosofo (process-children)))
+   ;; sample output from programs, scripts, etc
+   (make element gi: "SAMP"
+ 	attributes: (list
+ 		     (list "CLASS" (gi)))
+ 	sosofo))
+ 
+ (define ($kbd-seq$ #!optional (sosofo (process-children)))
+   ;; text to be entered by the user
+   (make element gi: "KBD"
+ 	attributes: (list
+ 		     (list "CLASS" (gi)))
+ 	sosofo))
+ 
+ (define ($abbr-seq$ #!optional (sosofo (process-children)))
+   ;; abbreviated form
+   ;; FIXME: html4 only
+   (make element gi: "ABBR"
+ 	attributes: (list
+ 		     (list "CLASS" (gi)))
+ 	sosofo))
+ 
+ (define ($acronym-seq$ #!optional (sosofo (process-children)))
+   ;; FIXME: html4 only
+   (make element gi: "ACRONYM"
+ 	attributes: (list
+ 		     (list "CLASS" (gi)))
+ 	sosofo))
+ 
+ (define ($var-seq$ #!optional (sosofo (process-children)))
+   ;; variable or program argument
+   (make element gi: "VAR"
  	attributes: (list
  		     (list "CLASS" (gi)))

Index: dbinline.dsl
===================================================================
RCS file: /cvsroot/docbook/dsssl/html/dbinline.dsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** dbinline.dsl	15 Jan 2003 08:24:13 -0000	1.9
--- dbinline.dsl	12 Feb 2003 01:22:30 -0000	1.10
***************
*** 7,20 ****
  ;; ============================== INLINES ===============================
  
  (element accel ($charseq$))
  (element action ($charseq$))
  (element application ($charseq$))
! (element classname ($mono-seq$))
  (element command ($bold-seq$))
! (element computeroutput ($mono-seq$))
  (element database ($charseq$))
  
  (element email 
!   ($mono-seq$ 
     (make sequence 
       (literal "<")
--- 7,27 ----
  ;; ============================== INLINES ===============================
  
+ (element abbrev (if %html40%
+                     ($abbr-seq$)
+                     ($charseq$)))
+ (element acronym (if %html40%
+                      ($acronym-seq$)
+                      ($charseq$)))
  (element accel ($charseq$))
  (element action ($charseq$))
  (element application ($charseq$))
! (element classname ($code-seq$))
! (element constant ($code-seq$))
  (element command ($bold-seq$))
! (element computeroutput ($samp-seq$))
  (element database ($charseq$))
  
  (element email 
!   ($code-seq$ 
     (make sequence 
       (literal "<")
***************
*** 29,35 ****
  (element errorname ($charseq$))
  (element errortype ($charseq$))
! (element envar ($mono-seq$))
! (element filename ($mono-seq$))
! (element function ($mono-seq$))
  (element guibutton ($charseq$))
  (element guiicon ($charseq$))
--- 36,42 ----
  (element errorname ($charseq$))
  (element errortype ($charseq$))
! (element envar ($var-seq$))
! (element filename ($mono-seq$))         ; unsure
! (element function ($code-seq$))
  (element guibutton ($charseq$))
  (element guiicon ($charseq$))
***************
*** 68,72 ****
  
  (element keysym ($charseq$))
! (element literal ($mono-seq$))
  (element medialabel ($italic-seq$))
  
--- 75,79 ----
  
  (element keysym ($charseq$))
! (element literal ($var-seq$))
  (element medialabel ($italic-seq$))
  
***************
*** 102,109 ****
  	    (literal ")"))))))
  
! (element methodname ($mono-seq$))
  (element shortcut ($bold-seq$))
  (element mousebutton ($charseq$))
! (element option ($mono-seq$))
  
  (element optional 
--- 109,116 ----
  	    (literal ")"))))))
  
! (element methodname ($code-seq$))
  (element shortcut ($bold-seq$))
  (element mousebutton ($charseq$))
! (element option ($var-seq$))
  
  (element optional 
***************
*** 113,130 ****
      (literal %arg-choice-opt-close-str%)))
  
! (element parameter ($italic-mono-seq$))
  (element property ($charseq$))
! (element prompt ($mono-seq$))
! (element replaceable ($italic-mono-seq$))
  (element returnvalue ($charseq$))
! (element structfield ($italic-mono-seq$))
! (element structname ($charseq$))
! (element symbol ($charseq$))
! (element systemitem ($charseq$))
  (element token ($charseq$))
! (element type ($charseq$))
! (element userinput ($bold-mono-seq$))
! (element abbrev ($charseq$))
! (element acronym ($charseq$))
  
  (element citation 
--- 120,136 ----
      (literal %arg-choice-opt-close-str%)))
  
! (element parameter ($var-seq$))
  (element property ($charseq$))
! (element prompt ($samp-seq$))
! (element replaceable ($var-seq$))
  (element returnvalue ($charseq$))
! (element structfield ($code-seq$))
! (element structname ($code-seq$))
! (element symbol ($var-seq$))
! (element systemitem ($charseq$))        ; ambiguous, should look at class
  (element token ($charseq$))
! (element type ($charseq$))              ; ambiguous
! (element userinput ($kbd-seq$))
! (element varname ($var-seq$))
  
  (element citation 
***************
*** 237,276 ****
  <![CDATA[
    (cond
!    ((equal? class (normalize "attribute")) ($mono-seq$))
!    ((equal? class (normalize "attvalue")) ($mono-seq$))
!    ((equal? class (normalize "element")) ($mono-seq$))
!    ((equal? class (normalize "endtag")) ($mono-seq$ (make sequence 
  						      (literal "</") 
  						      (process-children)
  						      (literal ">"))))
!    ((equal? class (normalize "genentity")) ($mono-seq$ (make sequence
  							 (literal "&")
  							 (process-children)
  							 (literal ";"))))
!    ((equal? class (normalize "numcharref")) ($mono-seq$ (make sequence
  							  (literal "&#")
  							  (process-children)
  							  (literal ";"))))
!    ((equal? class (normalize "paramentity")) ($mono-seq$ (make sequence
  							   (literal "%")
  							   (process-children)
  							   (literal ";"))))
!    ((equal? class (normalize "pi")) ($mono-seq$ (make sequence 
  						  (literal "<?")
  						  (process-children)
  						  (literal ">"))))
!    ((equal? class (normalize "xmlpi")) ($mono-seq$ (make sequence 
  						  (literal "<?")
  						  (process-children)
  						  (literal "?>"))))
!    ((equal? class (normalize "starttag")) ($mono-seq$ (make sequence 
  							(literal "<") 
  							(process-children)
  							(literal ">"))))
!    ((equal? class (normalize "emptytag")) ($mono-seq$ (make sequence 
  							(literal "<") 
  							(process-children)
  							(literal "/>"))))
!    ((equal? class (normalize "sgmlcomment")) ($mono-seq$ (make sequence 
  							   (literal "<!--")
  							   (process-children)
--- 243,282 ----
  <![CDATA[
    (cond
!    ((or (equal? class (normalize "attribute"))
!         (equal? class (normalize "attvalue"))
!         (equal? class (normalize "element"))) ($code-seq$))
!    ((equal? class (normalize "endtag")) ($code-seq$ (make sequence 
  						      (literal "</") 
  						      (process-children)
  						      (literal ">"))))
!    ((equal? class (normalize "genentity")) ($code-seq$ (make sequence
  							 (literal "&")
  							 (process-children)
  							 (literal ";"))))
!    ((equal? class (normalize "numcharref")) ($code-seq$ (make sequence
  							  (literal "&#")
  							  (process-children)
  							  (literal ";"))))
!    ((equal? class (normalize "paramentity")) ($code-seq$ (make sequence
  							   (literal "%")
  							   (process-children)
  							   (literal ";"))))
!    ((equal? class (normalize "pi")) ($code-seq$ (make sequence 
  						  (literal "<?")
  						  (process-children)
  						  (literal ">"))))
!    ((equal? class (normalize "xmlpi")) ($code-seq$ (make sequence 
  						  (literal "<?")
  						  (process-children)
  						  (literal "?>"))))
!    ((equal? class (normalize "starttag")) ($code-seq$ (make sequence 
  							(literal "<") 
  							(process-children)
  							(literal ">"))))
!    ((equal? class (normalize "emptytag")) ($code-seq$ (make sequence 
  							(literal "<") 
  							(process-children)
  							(literal "/>"))))
!    ((equal? class (normalize "sgmlcomment")) ($code-seq$ (make sequence 
  							   (literal "<!--")
  							   (process-children)

Index: dbttlpg.dsl
===================================================================
RCS file: /cvsroot/docbook/dsssl/html/dbttlpg.dsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** dbttlpg.dsl	7 Feb 2003 20:20:47 -0000	1.8
--- dbttlpg.dsl	12 Feb 2003 01:22:30 -0000	1.9
***************
*** 1167,1171 ****
  
    (element email
!     ($mono-seq$
       (make sequence
         (literal "&#60;")
--- 1167,1171 ----
  
    (element email
!     ($code-seq$
       (make sequence
         (literal "&#60;")