### -) All @unnumbered* sections are placed into the same file
### (implemented by split_at_numbered_sections)
### -) Use our custom CSS file, with IE-specific fixes in another CSS file,
-### impelmented by lilypond_css_lines
+### implemented by lilypond_css_lines
### -) TOC (folded, with the current page highlighted) in an overflown <div>
### is added to every page; implemented by:
### lilypond_print_element_header -- building of the TOC
### makeinfo_like_foot_line_and_ref
### makeinfo_like_foot_lines
### makeinfo_like_paragraph
+### -) In tables, don't wrap <p> around the contents. Implemented in
+### makeinfo_like_paragraph
###
###
### Useful helper functions:
$Texi2HTML::Config::DOCTYPE = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
@Texi2HTML::Config::CSS_REFS = (
- {FILENAME => "lilypond-mccarty.css", TITLE => "Default style"}
+ {FILENAME => "lilypond-manuals.css", TITLE => "Default style"}
);
@Texi2HTML::Config::ALT_CSS_REFS = (
- {FILENAME => "lilypond.css", TITLE => "Andrew Hawryluk's design" },
- {FILENAME => "lilypond-blue.css", TITLE => "Kurt Kroon's blue design" },
-);
+ );
sub web_settings() {
- print STDERR "Initializing settings for web site: [$Texi2HTML::THISDOC{current_lang}]\n";
+ print STDERR "Processing web site: [$Texi2HTML::THISDOC{current_lang}]\n";
$Texi2HTML::Config::BODYTEXT = "";
@Texi2HTML::Config::CSS_REFS = (
- {FILENAME => "lilypond-web.css", TITLE => "Patrick McCarty's design"}
+ {FILENAME => "lilypond-website.css", TITLE => "Default style"}
);
@Texi2HTML::Config::ALT_CSS_REFS = (
- {FILENAME => "lilypond-web-alt1.css", TITLE => "Alternate style 1"},
- {FILENAME => "lilypond-web-alt2.css", TITLE => "Alternate style 2"},
);
}
foreach my $ref (@CSS_REFS)
{
$Texi2HTML::THISDOC{'CSS_LINES'} .=
- "<link rel=\"stylesheet\" type=\"text/css\" title=\"$ref->{TITLE}\" href=\"$ref->{FILENAME}\">\n";
+ "<link rel=\"stylesheet\" type=\"text/css\" title=\"$ref->{TITLE}\" href=\"css/$ref->{FILENAME}\">\n";
}
foreach my $ref (@Texi2HTML::Config::ALT_CSS_REFS)
{
$Texi2HTML::THISDOC{'CSS_LINES'} .=
- "<link rel=\"alternate stylesheet\" type=\"text/css\" href=\"$ref->{FILENAME}\" title=\"$ref->{TITLE}\">\n";
+ "<link rel=\"alternate stylesheet\" type=\"text/css\" href=\"css/$ref->{FILENAME}\" title=\"$ref->{TITLE}\">\n";
}
# The ie-fixes stylesheet is needed for the docs, but not the website.
if (not ($web_manual)) {
$Texi2HTML::THISDOC{'CSS_LINES'} .=
- "<!--[if lte IE 7]>\n<link href=\"lilypond-ie-fixes.css\" rel=\"stylesheet\" type=\"text/css\">\n<![endif]-->\n";
+ "<!--[if lte IE 7]>\n<link href=\"css/lilypond-ie-fixes.css\" rel=\"stylesheet\" type=\"text/css\">\n<![endif]-->\n";
}
if ($ENV{'AJAX_SEARCH'} == 1) {
$href = &$default_external_href($node, $node_id, $node_xhtml_id, lc_last($file));
$href = remove_unneeded_anchor($href);
- # TODO: very yucky, but will be fixed in issue 1004
if ($web_manual) {
- my $only_web = $ENV{ONLY_WEB};
- if ($only_web) {
- $href = "../../doc/v2.13/Documentation/web/".$href;
+ my $only_web_version = $ENV{ONLY_WEB_VERSION};
+ if ($only_web_version) {
+ $href = "../../doc/".$only_web_version."/Documentation/web/".$href;
}
}
for ($i = 0; $i < @hrefsplit; $i++) {
$item = @hrefsplit[$i];
if ($item =~ /#/) {
- @splitted = split(".html#", $item);
- if (@splitted[0] eq @splitted[1]) {
- @hrefsplit[$i] = @splitted[0] . ".html";
+ @split = split(".html#", $item);
+ if (@split[0] eq @split[1]) {
+ @hrefsplit[$i] = @split[0] . ".html";
}
}
}
'introduction' => [2, 2, 2, 2, 3, 3, 4, 4],
'download' => [2, 2, 2, 3, 3, 4],
'manuals' => [1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4],
- 'community' => [1, 1, 1, 2, 2, 2, 3, 3],
+ 'community' => [1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4],
);
my $addColor = "colorDefault";
while (($top_section, $color_indices) = each %color_maps) {
return $text if (($format eq 'itemize' or $format eq 'enumerate') and
($$paragraph_number == 1));
}
+ # The cells of a table should not be wrapped in a <p> tag, so just return the text
+ if (defined($command_stack_at_begin->[0]) and $command_stack_at_begin->[0] eq 'multitable')
+ {
+ return $text;
+ }
+
+ # Adjust all footnotes so that they look like good old makeinfo
my $open = '<p';
if ($align)
{