X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lilypond-texi2html.init;h=8439436dbed81e9df5e2e7f9f8040f3dfd94a365;hb=8574d4349026c4ac5a15a27c50e264bf548e29fb;hp=7f4c32a1750f29eb6b083c8c9bdc256f481eeee2;hpb=5cfe4870e6871699219fa7a27a27d852d47bc54f;p=lilypond.git
diff --git a/lilypond-texi2html.init b/lilypond-texi2html.init
index 7f4c32a175..8439436dbe 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"},
+ 'begin' => q{""},
- 'end' => q{"
"},
+ 'end' => q{"
\n"},
'style' => 'code',
};
@@ -216,7 +241,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;
@@ -255,7 +280,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";
}
@@ -284,7 +309,7 @@ my $node_to_filename_map = ();
# according to node titles, which works by simply overriding the id element of
# the $element hash.
# If an external nodename<=>filename/anchor map file is found (loaded in
-# lilypond_init_out, use the externally created values, otherwise use the
+# the command handler, use the externally created values, otherwise use the
# same logic here.
sub lilypond_element_file_name($$$)
{
@@ -464,7 +489,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);
}
@@ -536,49 +561,66 @@ sub lilypond_external_href($$$)
my $page_toc_depth = 2;
my @default_toc = [];
+
+# Initialize the toc_depth to 1 if the command-line option -D=short_toc is given
+sub lilypond_init_toc_depth ()
+{
+ if (exists($main::value{'short_toc'}) and not exists($main::value{'bigpage'})) {
+ $page_toc_depth = 1;
+ }
+}
+# Set the TOC-depth (depending on a texinfo variable short_toc) in a
+# command-handler, so we have them available when creating the pages
+push @Texi2HTML::Config::command_handler_process, \&lilypond_init_toc_depth;
+
+
# 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\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, "