Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond

diff --git a/Documentation/contributor/programming-work.itexi b/Documentation/contributor/programming-work.itexi
index adb411e7b3e4b85a5c4f487176528a13f8d79a93..17e4bc913b18ef44bc1c90b0b4c5e08e6cf1da99 100644 (file)
--- a/Documentation/contributor/programming-work.itexi
+++ b/Documentation/contributor/programming-work.itexi
@@ -1527,3 +1527,54 @@ p ly_display_scm(obj)
 
 this will display OBJ through GUILE.
 
+@subsection Music functions and GUILE debugging
+
+Ian Hulin was trying to do some debugging in music functions, and
+came up with the following question
+
+HI all,
+I'm working on the Guile Debugger Stuff, and would like to try
+debugging a music function definition such as:
+
+@example
+conditionalMark = #(define-music-function (parser location) ()
+    #@{ \tag #'instrumental-part @{\mark \default@}  #@} )
+@end example
+
+It appears conditionalMark does not get set up as an
+equivalent of a Scheme
+
+@example
+(define conditionalMark = define-music-function(parser location () ...
+@end example
+
+@noindent
+although something gets defined because Scheme apparently recognizes
+
+@example
+#(set-break! conditionalMark)
+@end example
+
+@noindent
+later on in the file without signalling any Guile errors.
+
+However the breakpoint trap is never encountered as
+define-music-function passed things on to ly:make-music-function,
+which is really C++ code ly_make_music_function, so Guile never
+finds out about the breakpoint.
+
+Han-Wen answered as follows:
+
+You can see the defintion by doing
+
+@example
+#(display conditionalMark)
+@end example
+
+noindent
+inside the .ly file.
+
+The breakpoint failing may have to do with the call sequence.  See
+parser.yy, run_music_function().  The function is called directly from
+C++, without going through the GUILE evaluator, so I think that is why
+there is no debugger trap.

diff --git a/Documentation/contributor/website-work.itexi b/Documentation/contributor/website-work.itexi
index a6cbbe5e9e423c2c8649680def95071899c15011..86892000b41dd9abb7aec1872cee6a4a4aad0645 100644 (file)
--- a/Documentation/contributor/website-work.itexi
+++ b/Documentation/contributor/website-work.itexi
@@ -34,6 +34,11 @@ manual should be not necessary.
 Sectioning: the website only uses chapters and sections; no
 subsections or subsubsections.
 
+@item
+@@ref@{@}s to other manuals (@@ruser, @@rlearning, etc): you can't
+link to any pieces of automatically generated documentation, like
+the IR or certain NR appendices.
+
 @dots{}
 
 @item

diff --git a/Documentation/css/lilypond-web.css b/Documentation/css/lilypond-web.css
index ff5dcb3ecb8cd5f7ee8a4d11fdda6d59eb8e79d2..623627f737e7f9b3d2930f72810bb9d6009b6583 100644 (file)
--- a/Documentation/css/lilypond-web.css
+++ b/Documentation/css/lilypond-web.css
@@ -174,7 +174,6 @@ div#tocframe {
 
 #tocframe li a:hover {
   background: url(../pictures/nav-hover.png);
-  text-decoration: underline;
 }
 
 #tocframe li.toc_current a,
@@ -228,13 +227,6 @@ div#tocframe {
   margin: 0;
 }
 
-#tocframe .toc .toc li.toc_current a,
-#tocframe .toc .toc li.toc_current a:hover {
-  background: #8cbc6c url(../pictures/nav-active-2.png) repeat-x top left;
-  color: #fff;
-  text-decoration: underline;
-}
-
 #tocframe .toc .toc li a:hover {
   background: #bdee9d;
 }
@@ -242,28 +234,32 @@ div#tocframe {
 /* colored second-level TOC items */
 #tocframe .toc .toc li.color1 a {
   background: #9ccc7c url(../pictures/color1-bg.png) repeat-x top left;
-  text-decoration: none;
 }
 
 #tocframe .toc .toc li.color2 a {
   background: #bbcf81 url(../pictures/color2-bg.png) repeat-x top left;
-  text-decoration: none;
 }
 
 #tocframe .toc .toc li.color3 a {
   background: #dbd286 url(../pictures/color3-bg.png) repeat-x top left;
-  text-decoration: none;
 }
 
 #tocframe .toc .toc li.color4 a {
   background: #fad58c url(../pictures/color4-bg.png) repeat-x top left;
-  text-decoration: none;
+}
+
+#tocframe .toc .toc li.toc_current a,
+#tocframe .toc .toc li.toc_current a:hover {
+  color: #000;
+  text-decoration: underline;
 }
 
 /* having this useless style makes the perl init file easier */
 #tocframe .toc .toc li.colorDefault a,
 #tocframe .toc .toc li.colorDefault a:hover {
+  background: #8cbc6c url(../pictures/nav-active-2.png) repeat-x top left;
   color: #fff;
+  text-decoration: underline;
 }
 
 #tocframe .toc .toc li.color1 a:hover {

diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index 098caf43993d3f0ba82acf304a4df4255bc36d0d..c2f6f20635e98177b6546268a170aafb274588cd 100644 (file)
--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -409,19 +409,17 @@ $Texi2HTML::Config::DOCTYPE = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Tran
 );
 
 sub web_settings() {
-    print STDERR "Initializing settings for web site\n";
-    $Texi2HTML::Config::BODYTEXT = "";
-    @Texi2HTML::Config::CSS_REFS      = (
+  print STDERR "Initializing settings for web site\n";
+  $Texi2HTML::Config::BODYTEXT = "";
+  @Texi2HTML::Config::CSS_REFS      = (
       {FILENAME => "lilypond-web.css", TITLE => "Patrick McCarty's design"}
-    );
-    @Texi2HTML::Config::ALT_CSS_REFS      = (
+      );
+  @Texi2HTML::Config::ALT_CSS_REFS      = (
       {FILENAME => "lilypond-web-alt1.css", TITLE => "Alternate style 1"},
       {FILENAME => "lilypond-web-alt2.css", TITLE => "Alternate style 2"},
-    );
+      );
 }
 
-# web_settings() if (exists($main::value{'web_manual'}));
-
 $Texi2HTML::Config::USE_ACCESSKEY = 1;
 $Texi2HTML::Config::USE_LINKS     = 1;
 $Texi2HTML::Config::USE_REL_REV   = 1;
@@ -537,33 +535,33 @@ sub texinfo_file_name($)
 # Returns a ref to a hash "Node title" => ["FilenameWithoutExt", "Anchor"]
 sub load_map_file ($)
 {
-    my $mapfile = shift;
-    my $node_map = ();
-
-    # For some unknown reason, Perl on my system (5.10.0 on Fedora 12)
-    # refuses to open map files of translated documents with
-    # '<:encoding(utf8)', but decoding from UTF-8 line by line works. -jm
-    if (open(XREFFILE,'<', $mapfile)) {
-        my $line;
-       # print STDERR "*** PRINTING MAP FILE LINES ***\n";
-        while ( $line = decode ('UTF-8', <XREFFILE>) ) {
-            # parse the tab-separated entries and insert them into the map:
-            chomp($line);
-            my @entries = split(/\t/, $line);
-            if (scalar (@entries) == 3) {
-              $node_map->{$entries[0]} = [$entries[1], $entries[2]];
-             $, = " ";
-             # print STDERR @entries;
-             # print STDERR "\n";
-            } else {
-              print STDERR "Invalid entry in the node file $mapfile: $line\n";
-            }
-        }
-        close (XREFFILE);
-    } else {
-        print STDERR "WARNING: Unable to load the map file $mapfile\n";
+  my $mapfile = shift;
+  my $node_map = ();
+
+  # For some unknown reason, Perl on my system (5.10.0 on Fedora 12)
+  # refuses to open map files of translated documents with
+  # '<:encoding(utf8)', but decoding from UTF-8 line by line works. -jm
+  if (open(XREFFILE,'<', $mapfile)) {
+    my $line;
+    # print STDERR "*** PRINTING MAP FILE LINES ***\n";
+    while ( $line = decode ('UTF-8', <XREFFILE>) ) {
+      # parse the tab-separated entries and insert them into the map:
+      chomp($line);
+      my @entries = split(/\t/, $line);
+      if (scalar (@entries) == 3) {
+       $node_map->{$entries[0]} = [$entries[1], $entries[2]];
+       $, = " ";
+       # print STDERR @entries;
+       # print STDERR "\n";
+      } else {
+       print STDERR "Invalid entry in the node file $mapfile: $line\n";
+      }
     }
-    return $node_map;
+    close (XREFFILE);
+  } else {
+    print STDERR "WARNING: Unable to load the map file $mapfile\n";
+  }
+  return $node_map;
 }
 
 
@@ -597,27 +595,30 @@ sub split_texi_filename ($)
 # For IE, conditionally include the lilypond-ie-fixes.css style sheet
 sub lilypond_css_lines ($$)
 {
-    my $import_lines = shift;
-    my $rule_lines = shift;
-    return if (defined($Texi2HTML::THISDOC{'CSS_LINES'}));
-    if (@$rule_lines or @$import_lines)
-    {
-        $Texi2HTML::THISDOC{'CSS_LINES'} = "<style type=\"text/css\">\n<!--\n";
-        $Texi2HTML::THISDOC{'CSS_LINES'} .= join('',@$import_lines) . "\n" if (@$import_lines);
-        $Texi2HTML::THISDOC{'CSS_LINES'} .= join('',@$rule_lines) . "\n" if (@$rule_lines);
-        $Texi2HTML::THISDOC{'CSS_LINES'} .= "-->\n</style>\n";
-    }
-    foreach my $ref (@CSS_REFS)
-    {
-        $Texi2HTML::THISDOC{'CSS_LINES'} .= "<link rel=\"stylesheet\" type=\"text/css\" title=\"$ref->{TITLE}\" href=\"$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";
-    }
-    # FIXME: the website doesn't use ie7-specific fixes; do the
-    # docs still need this?  -gp
-    $Texi2HTML::THISDOC{'CSS_LINES'} .= "<!--[if lte IE 7]>\n<link href=\"lilypond-ie-fixes.css\" rel=\"stylesheet\" type=\"text/css\">\n<![endif]-->\n";
+  my $import_lines = shift;
+  my $rule_lines = shift;
+  return if (defined($Texi2HTML::THISDOC{'CSS_LINES'}));
+  if (@$rule_lines or @$import_lines)
+  {
+    $Texi2HTML::THISDOC{'CSS_LINES'} = "<style type=\"text/css\">\n<!--\n";
+    $Texi2HTML::THISDOC{'CSS_LINES'} .= join('',@$import_lines) . "\n" if (@$import_lines);
+    $Texi2HTML::THISDOC{'CSS_LINES'} .= join('',@$rule_lines) . "\n" if (@$rule_lines);
+    $Texi2HTML::THISDOC{'CSS_LINES'} .= "-->\n</style>\n";
+  }
+  foreach my $ref (@CSS_REFS)
+  {
+    $Texi2HTML::THISDOC{'CSS_LINES'} .=
+       "<link rel=\"stylesheet\" type=\"text/css\" title=\"$ref->{TITLE}\" href=\"$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";
+  }
+  # FIXME: the website doesn't use ie7-specific fixes; do the
+  # docs still need this?  -gp
+  $Texi2HTML::THISDOC{'CSS_LINES'} .=
+      "<!--[if lte IE 7]>\n<link href=\"lilypond-ie-fixes.css\" rel=\"stylesheet\" type=\"text/css\">\n<![endif]-->\n";
 }
 
 
@@ -684,7 +685,8 @@ sub lilypond_element_file_name($$$)
     print STDERR "Output file name: $filename\n";
     return $filename;
 
-  } elsif ($type eq "top" or $type eq "toc" or $type eq "doc" or $type eq "stoc" or $type eq "foot" or $type eq "about") {
+  } elsif ($type eq "top" or $type eq "toc" or $type eq "doc" or
+          $type eq "stoc" or $type eq "foot" or $type eq "about") {
     return;
   } else {
     print STDERR "WARNING: Node '$node_name' was NOT found in the map\n"
@@ -942,30 +944,28 @@ sub generate_ly_toc_entries($$$$)
   my $level = $element->{'toc_level'};
   my $is_parent_of_current = $element->{'id'} && $element_path->{$element->{'id'}};
   my $ind = '  ' x $level;
-  my $this_css_class;
-  if ($web_manual) {
-    $this_css_class = " class=\"";
-  } else {
-    $this_css_class = "";
-  }
-  $this_css_class .= $is_parent_of_current ? " toc_current" : "";
-
+  my $this_css_class = " class=\"";
   # color indices for the second navigation bar on the website
-  my %color_maps = (
-      '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],
-  );
-  my $addColor = " colorDefault";
-  while (($top_section, $color_indices) = each %color_maps) {
-      if (index ($element->{'sectionup'}->{'file'}, $top_section) >= 0) {
-         $addColor = " color" . $color_indices->[$child_count];
+  if ($web_manual) {
+      my %color_maps = (
+         '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],
+         );
+      my $addColor = "colorDefault";
+      while (($top_section, $color_indices) = each %color_maps) {
+         if (index ($element->{'sectionup'}->{'file'}, $top_section) >= 0) {
+             $addColor = "color" . $color_indices->[$child_count];
+         }
       }
+      $this_css_class .= $addColor;
   }
-  $this_css_class .= $addColor . "\"";
-
-  my $entry = "$ind<li$this_css_class>" . &$anchor ($element->{'tocid'}, "$element->{'file'}#$element->{'target'}",$element->{'text'});
+  $this_css_class .= $is_parent_of_current ? ' toc_current"' : '"';
+  my $entry = "$ind<li$this_css_class>" .
+      &$anchor ($element->{'tocid'},
+               "$element->{'file'}#$element->{'target'}",
+               $element->{'text'});
 
   push (@result, $entry);
   my $children = $element->{'section_childs'};
@@ -977,7 +977,8 @@ sub generate_ly_toc_entries($$$$)
       my $is_numbered_child = defined ($c->{'number'});
       my $below_maxlevel = $c->{'toc_level'} le $maxlevel;
       if ($force_children or ($is_numbered_child and $below_maxlevel)) {
-        my @child_res = generate_ly_toc_entries($c, $element_path, $maxlevel, $sub_child_count);
+        my @child_res =
+           generate_ly_toc_entries($c, $element_path, $maxlevel, $sub_child_count);
         push (@child_result, @child_res);
        $sub_child_count += 1;
       }
@@ -987,7 +988,10 @@ sub generate_ly_toc_entries($$$$)
     if (@child_result) {
       push (@result, "\n$ind<ul$NO_BULLET_LIST_ATTRIBUTE>\n");
       if ($web_manual) {
-        push (@result, "$ind<li$this_css_class>" . &$anchor ($element->{'tocid'}, "$element->{'file'}#$element->{'target'}", $element->{'text'}));
+        push (@result, "$ind<li class=\"colorDefault toc_current\">" .
+             &$anchor ($element->{'tocid'},
+                       "$element->{'file'}#$element->{'target'}",
+                       $element->{'text'}) . "</li>\n");
       }
       push (@result, @child_result);
       push (@result, "$ind</ul>\n");
@@ -1029,7 +1033,8 @@ sub lilypond_generate_page_toc_body($)
             # it's not the top element
             push (@toc_entries, "<li><a href=\"index.html\">Main</a></li>\n");
         } else {
-            push (@toc_entries, "<li class=\"toc_current\"><a href=\"index.html\">Main</a></li>\n");
+            push (@toc_entries,
+                 "<li class=\"toc_current\"><a href=\"index.html\">Main</a></li>\n");
         }
     } else {
         push (@toc_entries, "<div class=\"contents\">\n");
@@ -1252,11 +1257,13 @@ sub lilypond_print_navigation
                 if ($Texi2HTML::HREF{$button_href})
                 {
                   my $anchor_attributes = '';
-                  if ($USE_ACCESSKEY and (defined($BUTTONS_ACCESSKEY{$button_href})) and ($BUTTONS_ACCESSKEY{$button_href} ne ''))
+                  if ($USE_ACCESSKEY and (defined($BUTTONS_ACCESSKEY{$button_href})) and
+                     ($BUTTONS_ACCESSKEY{$button_href} ne ''))
                   {
                       $anchor_attributes = "accesskey=\"$BUTTONS_ACCESSKEY{$button_href}\"";
                   }
-                  if ($USE_REL_REV and (defined($BUTTONS_REL{$button_href})) and ($BUTTONS_REL{$button_href} ne ''))
+                  if ($USE_REL_REV and (defined($BUTTONS_REL{$button_href})) and
+                     ($BUTTONS_REL{$button_href} ne ''))
                   {
                       $anchor_attributes .= " rel=\"$BUTTONS_REL{$button_href}\"";
                   }
@@ -1285,11 +1292,13 @@ sub lilypond_print_navigation
         {                       # button is active
             my $btitle = $BUTTONS_GOTO{$button} ?
                 'title="' . $BUTTONS_GOTO{$button} . '"' : '';
-            if ($USE_ACCESSKEY and (defined($BUTTONS_ACCESSKEY{$button})) and ($BUTTONS_ACCESSKEY{$button} ne ''))
+            if ($USE_ACCESSKEY and (defined($BUTTONS_ACCESSKEY{$button})) and
+               ($BUTTONS_ACCESSKEY{$button} ne ''))
             {
                 $btitle .= " accesskey=\"$BUTTONS_ACCESSKEY{$button}\"";
             }
-            if ($USE_REL_REV and (defined($BUTTONS_REL{$button})) and ($BUTTONS_REL{$button} ne ''))
+            if ($USE_REL_REV and (defined($BUTTONS_REL{$button})) and
+               ($BUTTONS_REL{$button} ne ''))
             {
                 $btitle .= " rel=\"$BUTTONS_REL{$button}\"";
             }
@@ -1351,7 +1360,8 @@ sub lilypond_print_navigation
     );
 
 # buttons for misc stuff
-@Texi2HTML::Config::MISC_BUTTONS = ('center-aligned-cell-3', 'Top', 'Contents', 'Index', 'About');
+@Texi2HTML::Config::MISC_BUTTONS = ('center-aligned-cell-3',
+                                   'Top', 'Contents', 'Index', 'About');
 
 # buttons for chapter file footers
 # (and headers but only if SECTION_NAVIGATION is false)
@@ -1422,8 +1432,11 @@ sub makeinfo_like_foot_line_and_ref($$$$$$$$)
         $from_file = $footnote_file = '';
     }
 
-    my $foot_anchor = "<sup>" . &$anchor($docid, "$footnote_file#$footid", $relative_num) . "</sup>";
-    $foot_anchor = &$anchor($docid, "$footnote_file#$footid", "($relative_num)") if ($state->{'preformatted'});
+    my $foot_anchor = "<sup>" .
+       &$anchor($docid, "$footnote_file#$footid", $relative_num) . "</sup>";
+    $foot_anchor = &$anchor($docid,
+                           "$footnote_file#$footid",
+                           "($relative_num)") if ($state->{'preformatted'});
 
 #    unshift @$lines, "<li>";
 #    push @$lines, "</li>\n";

diff --git a/Documentation/pictures/nav-bg-2.png b/Documentation/pictures/nav-bg-2.png
index 25cd2dad848a4dc49750906962c9fe3ad994cb39..f368e918697cae4e60e96a969d206a7478ae16dd 100644 (file)
Binary files a/Documentation/pictures/nav-bg-2.png and b/Documentation/pictures/nav-bg-2.png differ

diff --git a/Documentation/pictures/nav-hover-2.png b/Documentation/pictures/nav-hover-2.png
index 26ec34c92de51a03b6bcafd831157c05ce0686ce..09f1cb69d22a5eeeff771c4007db41ef667ed4f8 100644 (file)
Binary files a/Documentation/pictures/nav-hover-2.png and b/Documentation/pictures/nav-hover-2.png differ

diff --git a/Documentation/web/basic-authors.itexi b/Documentation/web/basic-authors.itexi
index 33ba2a492fad1888c96ae30a170e86c1a3159ef6..17d176750c2e23fb8d43c14912b9076fbf21e935 100644 (file)
--- a/Documentation/web/basic-authors.itexi
+++ b/Documentation/web/basic-authors.itexi
@@ -85,7 +85,7 @@ Assistant documentation editor, Code cleanup
 Core developer
 
 @item Nicolas Sceaux:
-Core developer, Schemer extrodinaire
+Core developer, Schemer extraordinaire
 
 @item Carl Sorensen:
 @email{c_sorensen@@byu.edu},

diff --git a/website.make b/website.make
index 5e1e9ce22e894ab16ce26f43be4003762eda27e1..2f8a2eaebfcdc9f227444ba88d1f528708abe879 100644 (file)
--- a/website.make
+++ b/website.make
@@ -27,7 +27,7 @@ TEXI2HTML = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 EXTRACT_TEXI_FILENAMES=python $(script-dir)/extract_texi_filenames.py
 CREATE_VERSION=python $(script-dir)/create-version-itexi.py
 
-EXAMPLES=$(HOME)/media/examples/
+EXAMPLES=$(HOME)/media/ly-examples/
 PICTURES=$(HOME)/media/pictures