Menu
▾
▴
[Docutils-checkins] r6341 - in trunk/sandbox/html4strict: data/simple-lists.html data/simple-lists.txt html4strict/__init__.py html4strict/html4css2.css
|
From: <mi...@us...> - 2010-06-14 20:52:43
|
Author: milde
Date: 2010-06-14 22:52:33 +0200 (Mon, 14 Jun 2010)
New Revision: 6341
Modified:
trunk/sandbox/html4strict/data/simple-lists.html
trunk/sandbox/html4strict/data/simple-lists.txt
trunk/sandbox/html4strict/html4strict/__init__.py
trunk/sandbox/html4strict/html4strict/html4css2.css
Log:
bugfix release
properly close citation element,
remove invalid CSS code
fix compact lists in midori/konqueror/opera
Modified: trunk/sandbox/html4strict/data/simple-lists.html
===================================================================
--- trunk/sandbox/html4strict/data/simple-lists.html 2010-06-11 10:31:18 UTC (rev 6340)
+++ trunk/sandbox/html4strict/data/simple-lists.html 2010-06-14 20:52:33 UTC (rev 6341)
@@ -332,7 +332,9 @@
body {
padding: 0 5%;
margin: 8px 0;
- line-height:1.2;
+ line-height:1.3;
+ /* http://ilovetypography.com/2008/02/28/a-guide-to-web-typography/
+ recommends "line-spacing that’s at least 140% of your text size" */
}
div.document {
@@ -346,10 +348,12 @@
}
.compact li, .compact p, .compact ul, .compact ol
dl.simple > dd, .simple li, .simple p, .simple ul, .simple ol {
+ margin-top: 0;
margin-bottom: 0;
/* background: magenta; */
}
-dl.simple > dd, dl.compact > dd { /* separate to be more specific */
+dl.simple, dl.compact, dl.simple > dd, dl.compact > dd {
+ margin-top: 0;
margin-bottom: 0;
/* background: lightgreen; */
}
@@ -358,10 +362,6 @@
dl > dd p:first-child {
margin: 0;
}
-dl > dd p:last-child {
- margin-bottom: 0;
-/* background: lightgreen; */
-}
/* Sidebar */
/* ------- */
@@ -382,6 +382,7 @@
margin: 0;
padding: 0;
padding-right: 0.5em;
+/* background: yellow; */
}
/* Definition list with the layout of a LaTeX `description` list */
@@ -477,6 +478,10 @@
/* footnotes */
+a.footnote-reference, a.fn-backref {
+ text-decoration: inherit; /* do not underline footnote links */
+}
+
dl.footnote, dl.citation {
/* line on the left */
padding-left: 1ex;
@@ -539,9 +544,6 @@
display: inline-block;
/* background: lightblue; */
}
-ol > li > p:last-child {
- margin-bottom: 0;
-}
/* default separator variants */
ol.loweralpha > li:before {
@@ -733,7 +735,7 @@
<ul class="simple">
<li>This list is simple</li>
<li><dl class="first field-list simple">
-<dt>l1.1</dt>
+<dt>11</dt>
<dd>There should be no space beween items.</dd>
</dl>
</li>
@@ -742,7 +744,7 @@
<li><p class="first">This list is simple</p>
</li>
<li><dl class="first field-list simple">
-<dt>l11</dt>
+<dt>11</dt>
<dd><p>There should be no space beween items.</p>
</dd>
</dl>
@@ -754,7 +756,7 @@
</dd>
<dt>l2</dt>
<dd><dl class="field-list simple">
-<dt>l11</dt>
+<dt>11</dt>
<dd><p>There should be no space beween items.</p>
</dd>
</dl>
@@ -828,9 +830,9 @@
</dl>
<ul class="simple">
<li>This list is simple<dl class="field-list simple">
-<dt>l11</dt>
+<dt>11</dt>
<dd>this item contains a field list.</dd>
-<dt>l12</dt>
+<dt>12</dt>
<dd>this item contains a field list.</dd>
</dl>
</li>
@@ -839,10 +841,10 @@
<ol class="arabic simple">
<li><p class="first">This list is simple</p>
<dl class="field-list simple">
-<dt>l11</dt>
+<dt>11</dt>
<dd><p>this item contains a field list.</p>
</dd>
-<dt>l12</dt>
+<dt>12</dt>
<dd><p>this item contains a field list.</p>
</dd>
</dl>
@@ -854,7 +856,7 @@
<dt>l1</dt>
<dd><p>This list is simple</p>
<dl class="field-list simple">
-<dt>l11</dt>
+<dt>11</dt>
<dd><p>this item contains a field list.</p>
</dd>
</dl>
@@ -870,14 +872,14 @@
<li><p class="first">This list is not simple</p>
</li>
<li><p class="first">Watch the space beween items</p>
-<p>because of this paragraph</p>
+<p>It is caused by this paragraph</p>
</li>
</ul>
<ol class="arabic">
<li><p class="first">This list is not simple</p>
</li>
<li><p class="first">Watch the space beween items</p>
-<p>because of this paragraph</p>
+<p>It is caused by this paragraph</p>
</li>
</ol>
<dl class="field-list">
@@ -886,7 +888,7 @@
</dd>
<dt>l2</dt>
<dd><p>Watch the space beween items</p>
-<p>because of this paragraph</p>
+<p>It is caused by this paragraph</p>
</dd>
</dl>
<ul>
@@ -918,7 +920,7 @@
<li><ul class="first simple">
<li>Watch the space beween items</li>
</ul>
-<p>because of this paragraph</p>
+<p>It is caused by this paragraph</p>
</li>
</ul>
<ol class="arabic">
@@ -927,7 +929,7 @@
<li><ul class="first simple">
<li>Watch the space beween items</li>
</ul>
-<p>because of this paragraph</p>
+<p>It is caused by this paragraph</p>
</li>
</ol>
<dl class="field-list">
@@ -938,7 +940,7 @@
<dd><ul class="simple">
<li>Watch the space beween items</li>
</ul>
-<p>because of this paragraph</p>
+<p>It is caused by this paragraph</p>
</dd>
</dl>
</div>
Modified: trunk/sandbox/html4strict/data/simple-lists.txt
===================================================================
--- trunk/sandbox/html4strict/data/simple-lists.txt 2010-06-11 10:31:18 UTC (rev 6340)
+++ trunk/sandbox/html4strict/data/simple-lists.txt 2010-06-14 20:52:33 UTC (rev 6341)
@@ -55,51 +55,51 @@
/* background: yellow; */
}
--></style>
-
+
Simple lists
~~~~~~~~~~~~
* This list is simple
-* There should be no space beween items.
+* There should be no space beween items.
#. This list is simple
-#. There should be no space beween items.
+#. There should be no space beween items.
:l1: This list is simple
-:l2: There should be no space beween items.
+:l2: There should be no space beween items.
Simple nested lists
~~~~~~~~~~~~~~~~~~~
* This list is simple
-* * There should be no space beween items.
+* * There should be no space beween items.
#. This list is simple
-#. * There should be no space beween items.
- * There should be no space beween items.
+#. * There should be no space beween items.
+ * There should be no space beween items.
:l1: This list is simple
-:l2: * There should be no space beween items.
+:l2: * There should be no space beween items.
* This list is simple
-* #. There should be no space beween items.
+* #. There should be no space beween items.
#. This list is simple
-#. #. There should be no space beween items.
+#. #. There should be no space beween items.
:l1: This list is simple
-:l2: #. There should be no space beween items.
+:l2: #. There should be no space beween items.
* This list is simple
-* :l1.1: There should be no space beween items.
+* :11: There should be no space beween items.
#. This list is simple
-#. :l11: There should be no space beween items.
+#. :11: There should be no space beween items.
:l1: This list is simple
-:l2: :l11: There should be no space beween items.
+:l2: :11: There should be no space beween items.
Combined paragraph and list in a list item
""""""""""""""""""""""""""""""""""""""""""
@@ -108,67 +108,67 @@
#. Enumeration in first item
#. second enumeration item
-
-* There should be no space beween items.
+* There should be no space beween items.
+
#. This list is simple
#. Enumeration in first item
#. second enumeration item
-
-#. There should be no space beween items.
+#. There should be no space beween items.
+
:l1: This list is simple
#. Enumeration in first item
#. second enumeration item
-:l2: There should be no space beween items.
+:l2: There should be no space beween items.
* This list is simple
* Bullet list in first item
* Bullet list in first item
-
-* There should be no space beween items.
+* There should be no space beween items.
+
#. This list is simple
* Bullet list in first item
* Bullet list in first item
-
-#. There should be no space beween items.
+#. There should be no space beween items.
+
:l1: This list is simple
* Bullet list in first item
* Bullet list in first item
-:l2: There should be no space beween items.
+:l2: There should be no space beween items.
* This list is simple
- :l11: this item contains a field list.
- :l12: this item contains a field list.
-
-* there should be no space beween items.
+ :11: this item contains a field list.
+ :12: this item contains a field list.
+* there should be no space beween items.
+
#. This list is simple
- :l11: this item contains a field list.
- :l12: this item contains a field list.
-
-#. there should be no space beween items.
+ :11: this item contains a field list.
+ :12: this item contains a field list.
+#. there should be no space beween items.
+
:l1: This list is simple
- :l11: this item contains a field list.
+ :11: this item contains a field list.
-:l2: There should be no space beween items.
+:l2: There should be no space beween items.
Complex lists
@@ -178,58 +178,57 @@
* Watch the space beween items
- because of this paragraph
+ It is caused by this paragraph
#. This list is not simple
#. Watch the space beween items
- because of this paragraph
+ It is caused by this paragraph
:l1: This list is not simple
:l2: Watch the space beween items
- because of this paragraph
+ It is caused by this paragraph
* This list is not simple
second paragraph in first item
-
-* Watch the space beween items.
+* Watch the space beween items.
+
#. This list is not simple
second paragraph in first item
-
-#. Watch the space beween items.
+#. Watch the space beween items.
+
:l1: This list is not simple
second paragraph in first item
-:l2: Watch the space beween items.
+:l2: Watch the space beween items.
* This list is not simple
* * Watch the space beween items
- because of this paragraph
+ It is caused by this paragraph
#. This list is not simple
#. * Watch the space beween items
- because of this paragraph
+ It is caused by this paragraph
:l1: This list is not simple
:l2: * Watch the space beween items
- because of this paragraph
-
+ It is caused by this paragraph
Modified: trunk/sandbox/html4strict/html4strict/__init__.py
===================================================================
--- trunk/sandbox/html4strict/html4strict/__init__.py 2010-06-11 10:31:18 UTC (rev 6340)
+++ trunk/sandbox/html4strict/html4strict/__init__.py 2010-06-14 20:52:33 UTC (rev 6341)
@@ -124,7 +124,7 @@
self.footnote_backrefs(node)
def depart_citation(self, node):
- self.body.append('<dd>\n')
+ self.body.append('</dd>\n')
if isinstance(node.next_node(), nodes.citation):
self.body.append('<-- next citation -->')
else:
Modified: trunk/sandbox/html4strict/html4strict/html4css2.css
===================================================================
--- trunk/sandbox/html4strict/html4strict/html4css2.css 2010-06-11 10:31:18 UTC (rev 6340)
+++ trunk/sandbox/html4strict/html4strict/html4css2.css 2010-06-14 20:52:33 UTC (rev 6341)
@@ -16,7 +16,9 @@
body {
padding: 0 5%;
margin: 8px 0;
- line-height:1.2;
+ line-height:1.3;
+ /* http://ilovetypography.com/2008/02/28/a-guide-to-web-typography/
+ recommends "line-spacing that’s at least 140% of your text size" */
}
div.document {
@@ -30,10 +32,12 @@
}
.compact li, .compact p, .compact ul, .compact ol
dl.simple > dd, .simple li, .simple p, .simple ul, .simple ol {
+ margin-top: 0;
margin-bottom: 0;
/* background: magenta; */
}
-dl.simple > dd, dl.compact > dd { /* separate to be more specific */
+dl.simple, dl.compact, dl.simple > dd, dl.compact > dd {
+ margin-top: 0;
margin-bottom: 0;
/* background: lightgreen; */
}
@@ -42,10 +46,6 @@
dl > dd p:first-child {
margin: 0;
}
-dl > dd p:last-child {
- margin-bottom: 0;
-/* background: lightgreen; */
-}
/* Sidebar */
/* ------- */
@@ -66,6 +66,7 @@
margin: 0;
padding: 0;
padding-right: 0.5em;
+/* background: yellow; */
}
/* Definition list with the layout of a LaTeX `description` list */
@@ -161,6 +162,10 @@
/* footnotes */
+a.footnote-reference, a.fn-backref {
+ text-decoration: inherit; /* do not underline footnote links */
+}
+
dl.footnote, dl.citation {
/* line on the left */
padding-left: 1ex;
@@ -223,9 +228,6 @@
display: inline-block;
/* background: lightblue; */
}
-ol > li > p:last-child {
- margin-bottom: 0;
-}
/* default separator variants */
ol.loweralpha > li:before {
|