texi2html: Use only one <pre class="example"> for @example -> valid HTML now

The @example environment should not create
   <pre class="example"><pre class="example">...</pre></pre>
which is invalid HTML, but rather only one <pre> tag. texi2html creates
the correct pre tag automatically from the env name, so remove it from
the settings.
Also adjust the css to get the correct margins/padding like before.

Now, the lilypond-big-file has only 3 HTML errors left instead of ~300.
(cherry picked from commit c55f7c4cd738e7123ae55649920fac39d0e9e9d6)

diff --git a/Documentation/lilypond-blue.css b/Documentation/lilypond-blue.css
index 74d470a4691205e1a5020ace65406be8a479bf68..47ac50773112ac7962114b8c14a413548c86aaa4 100644 (file)
--- a/Documentation/lilypond-blue.css
+++ b/Documentation/lilypond-blue.css
@@ -108,17 +108,12 @@ blockquote blockquote {
   /* border: thick red dashed; */
 }
 
-.verbatim, .example .example, .lisp {
+.verbatim, .example, .lisp {
   font-size: 1.25em;
   margin: 0;
   padding: 1em;
 }
 
-.example {
-  margin: 0;
-  padding: 0;
-}
-
 hr {
   display: none;
 }

diff --git a/Documentation/lilypond-mccarty.css b/Documentation/lilypond-mccarty.css
index 247b835494bf92d7c5f230a3b053d27894d03595..ee917448cc5c536461697738486b919fd24a6386 100644 (file)
--- a/Documentation/lilypond-mccarty.css
+++ b/Documentation/lilypond-mccarty.css
@@ -110,17 +110,12 @@ blockquote blockquote {
   border: none;
 }
 
-.verbatim, .example .example, .lisp {
+.verbatim, .example, .lisp {
   font-size: 1em;
   padding: 1em;
   margin: 0;
 }
 
-.example {
-  padding: 0;
-  margin: 0;
-}
-
 #main hr {
   height: 0;
   padding: 0;

diff --git a/lilypond-texi2html.init b/lilypond-texi2html.init
index a25f61847b1c5aa2755059297363010ae5f66e3e..8439436dbed81e9df5e2e7f9f8040f3dfd94a365 100644 (file)
--- a/lilypond-texi2html.init
+++ b/lilypond-texi2html.init
@@ -132,8 +132,8 @@ $Texi2HTML::Config::paragraph          = \&makeinfo_like_paragraph;
 
 # Examples should be formatted similar to quotes:
 $Texi2HTML::Config::complex_format_map->{'example'} = {
-  'begin' => q{"<blockquote><pre class=\"example\">"},
-  'end' => q{"</pre></blockquote>\n"},
+  'begin' => q{"<blockquote>"},
+  'end' => q{"</blockquote>\n"},
   'style' => 'code',
  };