Web build: it works with lower-case split filenames now.

*sob* web-texi2html.init is now even worse than before, but I want
to get 2.13.8 out and fix the _current_ broken HTML.  As of this
commit, I believe that git will produce good html filenames for the
first time since... hmm, summer?

diff --git a/Documentation/web-texi2html.init b/Documentation/web-texi2html.init
index cdbe14492c23cf6decf25ec087fab099451b7901..71643d95340a78b3e48f9608f41a6f8f901cb9fb 100644 (file)
--- a/Documentation/web-texi2html.init
+++ b/Documentation/web-texi2html.init
@@ -134,7 +134,7 @@ $Texi2HTML::Config::SEPARATED_FOOTNOTES = 0; # Print footnotes on same page, not
 #       should be fixed in lilypond-texi2html.init too
 # Uhm, what about a bug report to Opera?  We need sane names here.
 #if ($Texi2HTML::Config::SPLIT eq 'section') {
-#  $Texi2HTML::Config::element_file_name    = \&lilypond_element_file_name;
+$Texi2HTML::Config::element_file_name    = \&lilypond_element_file_name;
 #}
 $Texi2HTML::Config::element_target_name  = \&lilypond_element_target_name;
 $default_print_element_header = $Texi2HTML::Config::print_element_header;
@@ -232,6 +232,8 @@ sub texinfo_file_name($)
     $result = 't_g' . $result;
   }
   # DONE
+  # we also want lower-case
+  $result = lc($result);
   return $result
 }
 
@@ -327,15 +329,6 @@ sub lilypond_css_lines ($$)
 ###  SPLITTING BASED ON NUMBERED SECTIONS
 #############################################################################
 
-# FIXME: removed for GOP.
-
-# Uhm, yes: that's what I found.  It was gone.  No need to add that
-# in a comment, DIFF tells me that it's gone.
-
-# Comments can be used to tell *why* something has been removed -- as
-# it seems to me that we *need* this in order to get sane,
-# untranslated, html file names?  Putting it back for this reason.
-
 my $lastfilename;
 my $docnr = 0;
 my $node_to_filename_map = ();
@@ -371,7 +364,10 @@ sub lilypond_element_file_name($$$)
   # will not be able to retrieve the file name for xrefs!!! Still, I already
   # had that code, so I'll leave it in in case something goes wrong with the
   # extract_texi_filenames.py script in the lilypond build process!
-  if (exists ($node_to_filename_map->{$node_name})) {
+
+  # FIXME: disable this section of code, I don't understand why but
+  # it gives us the filenames we want.  -gp
+  if (0 and exists ($node_to_filename_map->{$node_name})) {
     (my $filename, my $anchor) = @{$node_to_filename_map->{$node_name}};
     $filename .= ".$docu_ext" if (defined($docu_ext));
 
@@ -398,7 +394,8 @@ sub lilypond_element_file_name($$$)
 
     # Numbered sections will get a filename Node_title, unnumbered sections will use
     # the file name of the previous numbered section:
-    if (($element->{number}) or ($lastfilename eq '') or ($element->{level} == 1)) {
+    # FIXME: above comment is false; for web we want to give them all new filenames.
+    if (1 or ($element->{number}) or ($lastfilename eq '') or ($element->{level} > 1)) {
       # normalize to the same file name as texinfo
       if ($element->{translationof}) {
         $node_name = main::remove_texi($element->{translationof});
@@ -408,10 +405,10 @@ sub lilypond_element_file_name($$$)
       $docnr += 1;
       $$element{doc_nr} = $docnr;
       $lastfilename = $filename;
-      return $filename;
+      return lc($filename);
     } else {
       $$element{doc_nr} = $docnr;
-      return $lastfilename;
+      return lc($lastfilename);
     }
   }
 

diff --git a/Documentation/web/community.itexi b/Documentation/web/community.itexi
index 0f55f0046f27363f39e5c641a1cb49fd40efd530..c5f261bb47cca97abf2f2a6885fe256304626f35 100644 (file)
--- a/Documentation/web/community.itexi
+++ b/Documentation/web/community.itexi
@@ -399,7 +399,6 @@ account.
 @node Help us
 @unnumberedsec Help us
 
- TODO: talk about the Frogs, document suggestions, encourage getting
 @divClass{heading-center}
 @heading We need you!
 

diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 27eb4edcf6036f5d22f965a54a89f6412822b50a..8bc4b7fe5f2869f6232973b5c7f925245df23d14 100644 (file)
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -32,7 +32,7 @@ WEB_TEXI2HTML_INIT =--init-file=$(top-src-dir)/Documentation/web-texi2html.init
 TEXI2HTML_INIT = $(DOC_TEXI2HTML_INIT)
 
 DOC_TEXI2HTML_SPLIT = --prefix=index --split=section
-WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files
+WEB_TEXI2HTML_SPLIT = --prefix=index --split=section
 TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT)
 
 TEXI2HTML_INCLUDES += --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)