Mercurial > hg > nginx-site

changeset 473:cac48e2d0d9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added the "compact" attribute to the "list" element.
author Ruslan Ermilov <ru@nginx.com>
date Fri, 30 Mar 2012 13:31:55 +0000
parents 7054e1c9c9c2
children eececc9281f4
files dtd/content.dtd dtd/module.dtd xsls/content.xsls xsls/style.xsls
diffstat 4 files changed, 30 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/dtd/content.dtd	Thu Mar 29 18:59:02 2012 +0000
+++ b/dtd/content.dtd	Fri Mar 30 13:31:55 2012 +0000
@@ -43,7 +43,8 @@
 <!ELEMENT  list         (listitem+) >
 <!ATTLIST  list
            type         (bullet | enum) #REQUIRED
-           >
+           compact      (yes | no) "yes"
+>
 
 <!ELEMENT  listitem     (#PCDATA | para | br | nobr | list | i | b | url |
                          path | literal | value | programlisting |
--- a/dtd/module.dtd	Thu Mar 29 18:59:02 2012 +0000
+++ b/dtd/module.dtd	Fri Mar 30 13:31:55 2012 +0000
@@ -60,6 +60,7 @@
 <!ELEMENT   list        (listitem+ | (tag-name | tag-desc)+) >
 <!ATTLIST   list
             type        (bullet | enum | tag) #REQUIRED
+            compact     (yes | no) "yes"
 >
 
 <!ELEMENT   listitem    ANY >
--- a/xsls/content.xsls	Thu Mar 29 18:59:02 2012 +0000
+++ b/xsls/content.xsls	Fri Mar 30 13:31:55 2012 +0000
@@ -39,17 +39,37 @@
         X:text disable-output-escaping="yes" {&lt;p&gt; }
     }
 
-    X:template = "list[@type='bullet']" { <ul> !!; </ul> }
+    X:template = "list[@type='bullet']" {
+        X:if "@compact = 'yes'" {
+            <ul class="compact"> !!; </ul>
+        } else {
+            <ul> !!; </ul>
+        }
+    }
     X:template = "para/list[@type='bullet']" {
         X:text disable-output-escaping="yes" {&lt;/p&gt; }
-        <ul> !!; </ul>
+        X:if "@compact = 'yes'" {
+            <ul class="compact"> !!; </ul>
+        } else {
+            <ul> !!; </ul>
+        }
         X:text disable-output-escaping="yes" {&lt;p&gt; }
     }
 
-    X:template = "list[@type='enum']" { <ol> !!; </ol> }
+    X:template = "list[@type='enum']" {
+        X:if "@compact = 'yes'" {
+            <ol class="compact"> !!; </ol>
+        } else {
+            <ol> !!; </ol>
+        }
+    }
     X:template = "para/list[@type='enum']" {
         X:text disable-output-escaping="yes" {&lt;/p&gt; }
-        <ol> !!; </ol>
+        X:if "@compact = 'yes'" {
+            <ol class="compact"> !!; </ol>
+        } else {
+            <ol> !!; </ol>
+        }
         X:text disable-output-escaping="yes" {&lt;p&gt; }
     }
 
--- a/xsls/style.xsls	Thu Mar 29 18:59:02 2012 +0000
+++ b/xsls/style.xsls	Fri Mar 30 13:31:55 2012 +0000
@@ -20,7 +20,9 @@
         span.initial      { font-size:      200%;
                             float:          left;
                             padding-right:  10pt;}
-        li                { text-align:     justify; }
+        li                { text-align:     justify;
+                            padding-top:    0.5em; }
+        .compact li       { padding-top:    0; }
         dd                { text-align:     justify; }
         td.list           { background:     #EEEEEE; }
         blockquote.note   { text-align:     justify;