X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lilypond-texi2html.init;h=7e319e9c0ceacf9a12614953808fb55162c0fc56;hb=413aeab5abbb9ebe01f41154ac6cd49bd806b2fe;hp=60a13ed342ce85f9ea14c07c5f4643e60b0d81a8;hpb=0bf10e418a7d6542d6e3a0c3e2dcf70b4ec61f70;p=lilypond.git
diff --git a/lilypond-texi2html.init b/lilypond-texi2html.init
index 60a13ed342..7e319e9c0c 100644
--- a/lilypond-texi2html.init
+++ b/lilypond-texi2html.init
@@ -1,4 +1,5 @@
#!/usr/bin/env perl
+# -*- coding: utf-8; -*-
### texi2html customization script for Lilypond
### Author: Reinhold Kainhofer
\n"},
+ 'style' => 'code',
};
%Texi2HTML::config::misc_pages_targets = (
@@ -215,7 +242,7 @@ sub load_map_file ($)
sub split_texi_filename ($)
{
my $docu = shift;
- my $docu_dir, $docu_name;
+ my ($docu_dir, $docu_name);
if ($docu =~ /(.*\/)/) {
chop($docu_dir = $1);
$docu_name = $docu;
@@ -254,7 +281,7 @@ sub lilypond_css_lines ($$)
{
$Texi2HTML::THISDOC{'CSS_LINES'} .= "{TITLE}\" href=\"$ref->{FILENAME}\">\n";
}
- foreach my $ref (@ALT_CSS_REFS)
+ foreach my $ref (@Texi2HTML::Config::ALT_CSS_REFS)
{
$Texi2HTML::THISDOC{'CSS_LINES'} .= "{FILENAME}\" title=\"$ref->{TITLE}\">\n";
}
@@ -463,7 +490,7 @@ sub lilypond_unknown($$$$$)
if (ref($state->{'element'}) eq 'HASH') {
$state->{'element'}->{'translationof'} = main::normalise_space($line);
}
- return ('', true, undef, undef);
+ return ('', 1, undef, undef);
} else {
return t2h_default_unknown($macro, $line, $pass, $stack, $state);
}
@@ -538,46 +565,50 @@ my @default_toc = [];
# recursively generate the TOC entries for the element and its children (which
# are only shown up to maxlevel. All ancestors of the current element are also
# shown with their immediate children, irrespective of their level.
-# Unnumbered entries are only printed out if they are at top-level or their
-# parent element is an ancestor of the currently viewed node.
-sub generate_ly_toc_entries($$$$)
+# Unnumbered entries are only printed out if they are at top-level or 2nd level
+# or their parent element is an ancestor of the currently viewed node.
+# The conditions to call this method to print the entry for a child node is:
+# -) the parent is an ancestor of the current page node
+# -) the parent is a numbered element at top-level toplevel (i.e. show numbered
+# and unnumbered 2nd-level children of numbered nodes)
+# -) the child element is a numbered node below level maxlevel
+sub generate_ly_toc_entries($$$)
{
my $element = shift;
my $element_path = shift;
my $maxlevel = shift;
- my $always_show_unnumbered_children = shift;
# Skip undefined sections, plus all sections generated by index splitting
return() if (not defined($element) or exists($element->{'index_page'}));
my @result = ();
my $level = $element->{'toc_level'};
my $is_parent_of_current = $element->{'id'} && $element_path->{$element->{'id'}};
- my $print_children = ( ($level < $maxlevel) or $is_parent_of_current );
my $ind = ' ' x $level;
my $this_css_class = $is_parent_of_current ? " class=\"toc_current\"" : "";
my $entry = "$ind"},
'end' => q{"
\n");
push (@result, @child_result);
- push (@result, "$ind
\n");
my $children = $current_element->{'section_childs'};
foreach ( @$children ) {
- push (@toc_entries, generate_ly_toc_entries($_, \%parentelements, $page_toc_depth, False));
+ push (@toc_entries, generate_ly_toc_entries($_, \%parentelements, $page_toc_depth));
}
push (@toc_entries, "
\n");
push (@toc_entries, "