updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4191 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

8 files changed, 28 insertions, 40 deletions

diff --git a/test/functional/expected/standalone_rst_s5_html_1.html b/test/functional/expected/standalone_rst_s5_html_1.html
index ab7b2d5bc..02e7bff91 100644
--- a/test/functional/expected/standalone_rst_s5_html_1.html
+++ b/test/functional/expected/standalone_rst_s5_html_1.html
@@ -58,8 +58,12 @@
 ======= -->
 <!-- Text Sizes
 ========== -->
-<!-- Print-Only
-========== -->
+<!-- Display in Slides (Presentation Mode) Only
+========================================== -->
+<!-- Display in Outline Mode Only
+============================ -->
+<!-- Display in Print Only
+===================== -->
 <!-- Incremental Display
 =================== -->
 <div class="contents handout topic">
diff --git a/test/functional/expected/standalone_rst_s5_html_2.html b/test/functional/expected/standalone_rst_s5_html_2.html
index 029eeeb7c..ee8353467 100644
--- a/test/functional/expected/standalone_rst_s5_html_2.html
+++ b/test/functional/expected/standalone_rst_s5_html_2.html
@@ -54,8 +54,12 @@
 ======= -->
 <!-- Text Sizes
 ========== -->
-<!-- Print-Only
-========== -->
+<!-- Display in Slides (Presentation Mode) Only
+========================================== -->
+<!-- Display in Outline Mode Only
+============================ -->
+<!-- Display in Print Only
+===================== -->
 <!-- Incremental Display
 =================== -->
 <div class="contents handout topic">
diff --git a/test/functional/expected/ui/default/outline.css b/test/functional/expected/ui/default/outline.css
index cb3588d5a..f2b1e04c9 100644
--- a/test/functional/expected/ui/default/outline.css
+++ b/test/functional/expected/ui/default/outline.css
@@ -11,11 +11,9 @@ html>body #toggle {position: fixed; top: 0; right: 0;}
 /* making the outline look pretty-ish */
 
 #slide0 h1, #slide0 h2, #slide0 h3, #slide0 h4 {border: none; margin: 0;}
-#slide0 h1 {padding-top: 1.5em;}
-.slide h1 {margin: 1.5em 0 0.75em; padding-top: 0.25em;
-  border-top: 1px solid #888; border-bottom: 1px solid #AAA;}
 #toggle {border: 1px solid; border-width: 0 0 1px 1px; background: #FFF;}
 
-.handout {border-left: solid #BBB; padding-left: 0.5em;}
+.handout {border-left: solid thin #BBB;
+  padding-left: 0.5em; margin-left: -0.5em;}
 
-.print-block, .print-inline {display: none;}
+.outline {display: inline ! important;}
diff --git a/test/functional/expected/ui/default/pretty.css b/test/functional/expected/ui/default/pretty.css
index f83ca2bf5..1cede72d4 100644
--- a/test/functional/expected/ui/default/pretty.css
+++ b/test/functional/expected/ui/default/pretty.css
@@ -17,7 +17,7 @@ blockquote p {margin: 0;}
 kbd {font-weight: bold; font-size: 1em;}
 sup {font-size: smaller; line-height: 1px;}
 
-.slide pre {padding: 0; margin: 0 0 0.5em 0; font-size: 90%;}
+.slide pre {padding: 0; margin-left: 0; margin-right: 0; font-size: 90%;}
 .slide ul ul li {list-style: square;}
 .slide img.leader {display: block; margin: 0 auto;}
 .slide tt {font-size: 90%;}
@@ -68,7 +68,7 @@ html>body .external {border-bottom: none;}
 img.incremental {visibility: hidden;}
 .slide .current {color: green;}
 
-.print-block, .print-inline {display: none;}
+.slide-display {display: inline ! important;}
 
 .huge {font-family: sans-serif; font-weight: bold; font-size: 150%;}
 .big {font-family: sans-serif; font-weight: bold; font-size: 120%;}
@@ -102,8 +102,6 @@ img.incremental {visibility: hidden;}
 .center {text-align: center ! important;}
 .right {text-align: right ! important;}
 
-.borderless, .borderless td {border: 0;}
-
 .animation {position: relative; margin: 1em 0; padding: 0;}
 .animation img {position: absolute;}
 
diff --git a/test/functional/expected/ui/default/print.css b/test/functional/expected/ui/default/print.css
index 76e6352ee..de71fc932 100644
--- a/test/functional/expected/ui/default/print.css
+++ b/test/functional/expected/ui/default/print.css
@@ -12,21 +12,15 @@ body {font-size: 12pt; background: white;}
 #slide0 h4 {margin: 0 0 0.5em; padding: 0;}
 #slide0 {margin-bottom: 3em;}
 
-h1 {border-top: 2pt solid gray; border-bottom: 1px dotted silver;}
-.extra {background: transparent !important;}
-div.extra, pre.extra, .example {font-size: 10pt; color: #333;}
-ul.extra a {font-weight: bold;}
-p.example {display: none;}
-
 #header {display: none;}
 #footer h1 {margin: 0; border-bottom: 1px solid; color: gray;
   font-style: italic;}
 #footer h2, #controls {display: none;}
 
-.handout {border-left: solid #BBB; padding-left: 0.5em;}
+.handout {border-left: solid thin #BBB;
+  padding-left: 0.5em; margin-left: -0.5em;}
 
-.print-block {display: block !important;}
-.print-inline {display: inline !important;}
+.print {display: inline ! important;}
 
 /* The following rule keeps the layout stuff out of print.
    Remove at your own risk! */
diff --git a/test/functional/expected/ui/small-black/outline.css b/test/functional/expected/ui/small-black/outline.css
index cb3588d5a..f2b1e04c9 100644
--- a/test/functional/expected/ui/small-black/outline.css
+++ b/test/functional/expected/ui/small-black/outline.css
@@ -11,11 +11,9 @@ html>body #toggle {position: fixed; top: 0; right: 0;}
 /* making the outline look pretty-ish */
 
 #slide0 h1, #slide0 h2, #slide0 h3, #slide0 h4 {border: none; margin: 0;}
-#slide0 h1 {padding-top: 1.5em;}
-.slide h1 {margin: 1.5em 0 0.75em; padding-top: 0.25em;
-  border-top: 1px solid #888; border-bottom: 1px solid #AAA;}
 #toggle {border: 1px solid; border-width: 0 0 1px 1px; background: #FFF;}
 
-.handout {border-left: solid #BBB; padding-left: 0.5em;}
+.handout {border-left: solid thin #BBB;
+  padding-left: 0.5em; margin-left: -0.5em;}
 
-.print-block, .print-inline {display: none;}
+.outline {display: inline ! important;}
diff --git a/test/functional/expected/ui/small-black/pretty.css b/test/functional/expected/ui/small-black/pretty.css
index 991bb9fdb..5c1932704 100644
--- a/test/functional/expected/ui/small-black/pretty.css
+++ b/test/functional/expected/ui/small-black/pretty.css
@@ -14,7 +14,7 @@ blockquote p {margin: 0;}
 kbd {font-weight: bold; font-size: 1em;}
 sup {font-size: smaller; line-height: 1px;}
 
-.slide pre {padding: 0; margin: 0 0 0.5em 0; font-size: 90%;}
+.slide pre {padding: 0; margin-left: 0; margin-right: 0; font-size: 90%;}
 .slide ul ul li {list-style: square;}
 .slide img.leader {display: block; margin: 0 auto;}
 .slide tt {font-size: 90%;}
@@ -62,7 +62,7 @@ html>body .external {border-bottom: none;}
 img.incremental {visibility: hidden;}
 .slide .current {color: lime;}
 
-.print-block, .print-inline {display: none;}
+.slide-display {display: inline ! important;}
 
 .huge {font-family: sans-serif; font-weight: bold; font-size: 150%;}
 .big {font-family: sans-serif; font-weight: bold; font-size: 120%;}
@@ -96,8 +96,6 @@ img.incremental {visibility: hidden;}
 .center {text-align: center ! important;}
 .right {text-align: right ! important;}
 
-.borderless, .borderless td {border: 0;}
-
 .animation {position: relative; margin: 1em 0; padding: 0;}
 .animation img {position: absolute;}
 
diff --git a/test/functional/expected/ui/small-black/print.css b/test/functional/expected/ui/small-black/print.css
index 76e6352ee..de71fc932 100644
--- a/test/functional/expected/ui/small-black/print.css
+++ b/test/functional/expected/ui/small-black/print.css
@@ -12,21 +12,15 @@ body {font-size: 12pt; background: white;}
 #slide0 h4 {margin: 0 0 0.5em; padding: 0;}
 #slide0 {margin-bottom: 3em;}
 
-h1 {border-top: 2pt solid gray; border-bottom: 1px dotted silver;}
-.extra {background: transparent !important;}
-div.extra, pre.extra, .example {font-size: 10pt; color: #333;}
-ul.extra a {font-weight: bold;}
-p.example {display: none;}
-
 #header {display: none;}
 #footer h1 {margin: 0; border-bottom: 1px solid; color: gray;
   font-style: italic;}
 #footer h2, #controls {display: none;}
 
-.handout {border-left: solid #BBB; padding-left: 0.5em;}
+.handout {border-left: solid thin #BBB;
+  padding-left: 0.5em; margin-left: -0.5em;}
 
-.print-block {display: block !important;}
-.print-inline {display: inline !important;}
+.print {display: inline ! important;}
 
 /* The following rule keeps the layout stuff out of print.
    Remove at your own risk! */