From: Adam Di C. <adi...@us...> - 2003-04-27 04:49:13
|
Update of /cvsroot/docbook/dsssl/html In directory sc8-pr-cvs1:/tmp/cvs-serv15113 Modified Files: dbcompon.dsl Log Message: Simplify some code, no functional changes Index: dbcompon.dsl =================================================================== RCS file: /cvsroot/docbook/dsssl/html/dbcompon.dsl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** dbcompon.dsl 25 Mar 2003 19:53:39 -0000 1.6 --- dbcompon.dsl 27 Apr 2003 04:49:09 -0000 1.7 *************** *** 24,44 **** (if (node-list-empty? nl) nl ! (if (equal? (gi (node-list-first nl)) ! (normalize "epigraph")) ! (node-list-first nl) ! (if (or (equal? (gi (node-list-first nl)) ! (normalize "title")) ! (equal? (gi (node-list-first nl)) ! (normalize "subtitle")) ! (equal? (gi (node-list-first nl)) ! (normalize "titleabbrev")) ! (equal? (gi (node-list-first nl)) ! (normalize "docinfo")) ! (equal? (gi (node-list-first nl)) ! (normalize "chapterinfo")) ! (equal? (gi (node-list-first nl)) ! (normalize "appendixinfo"))) ! (loop (node-list-rest nl)) ! (loop (empty-node-list))))))) (notepigraph (let loop ((nl (children (current-node))) (ch (empty-node-list))) --- 24,38 ---- (if (node-list-empty? nl) nl ! (let ((first-gi (gi (node-list-first nl)))) ! (if (equal? first-gi (normalize "epigraph")) ! (node-list-first nl) ! (if (or (equal? first-gi (normalize "title")) ! (equal? first-gi (normalize "subtitle")) ! (equal? first-gi (normalize "titleabbrev")) ! (equal? first-gi (normalize "docinfo")) ! (equal? first-gi (normalize "chapterinfo")) ! (equal? first-gi (normalize "appendixinfo"))) ! (loop (node-list-rest nl)) ! (loop (empty-node-list)))))))) (notepigraph (let loop ((nl (children (current-node))) (ch (empty-node-list))) *************** *** 61,85 **** (define ($component-title$ #!optional (titlegi "H1") (subtitlegi "H2")) (let* ((info (cond - ((equal? (gi) (normalize "appendix")) - (select-elements (children (current-node)) (normalize "docinfo"))) ((equal? (gi) (normalize "article")) (node-list-filter-by-gi (children (current-node)) (list (normalize "artheader") (normalize "articleinfo")))) ! ((equal? (gi) (normalize "bibliography")) ! (select-elements (children (current-node)) (normalize "docinfo"))) ! ((equal? (gi) (normalize "chapter")) ! (select-elements (children (current-node)) (normalize "docinfo"))) ! ((equal? (gi) (normalize "dedication")) ! (empty-node-list)) ! ((equal? (gi) (normalize "glossary")) ! (select-elements (children (current-node)) (normalize "docinfo"))) ! ((equal? (gi) (normalize "index")) ! (select-elements (children (current-node)) (normalize "docinfo"))) ! ((equal? (gi) (normalize "preface")) ! (select-elements (children (current-node)) (normalize "docinfo"))) ! ((equal? (gi) (normalize "reference")) ! (select-elements (children (current-node)) (normalize "docinfo"))) ! ((equal? (gi) (normalize "setindex")) (select-elements (children (current-node)) (normalize "docinfo"))) (else --- 55,71 ---- (define ($component-title$ #!optional (titlegi "H1") (subtitlegi "H2")) (let* ((info (cond ((equal? (gi) (normalize "article")) (node-list-filter-by-gi (children (current-node)) (list (normalize "artheader") (normalize "articleinfo")))) ! ((or ! (equal? (gi) (normalize "appendix")) ! (equal? (gi) (normalize "bibliography")) ! (equal? (gi) (normalize "chapter")) ! (equal? (gi) (normalize "glossary")) ! (equal? (gi) (normalize "index")) ! (equal? (gi) (normalize "preface")) ! (equal? (gi) (normalize "reference")) ! (equal? (gi) (normalize "setindex"))) (select-elements (children (current-node)) (normalize "docinfo"))) (else |