Build: don't include AJAX by default.

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 5a8cec7c06fff0381c319a698bff08e6fa7f4a9b..ef979addab4852d1acb5408d5280f4ef57949835 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -178,7 +178,12 @@ local-clean:
 ifeq ($(out),www)
 local-WWW-1: $(OUT_TEXINFO_MANUALS) $(PDF_FILES) info
 
+ifeq ($(AJAX_SEARCH),1)
 local-WWW-2: txt-to-html $(OUT_HTML_FILES) $(DEEP_HTML_FILES) $(OUT_JS_FILES) $(OUT_PHP_FILES) $(source-links) $(OMF_FILES)
+else
+local-WWW-2: txt-to-html $(OUT_HTML_FILES) $(DEEP_HTML_FILES) $(source-links) $(OMF_FILES)
+endif
+
 endif
 
 

diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index 2ea8175c47f182fcdbba072e2b3e010f54aff1f0..96f4cb2d28765dae72cef1fedbedbb0d4349dc33 100644 (file)
--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -799,15 +799,17 @@ sub lilypond_css_lines ($$)
   $Texi2HTML::THISDOC{'CSS_LINES'} .=
       "<!--[if lte IE 7]>\n<link href=\"lilypond-ie-fixes.css\" rel=\"stylesheet\" type=\"text/css\">\n<![endif]-->\n";
 
-  # Add the JavaScript file only if we have an index.
-  # Unfortunately, init_out is called after css_lines, so as a workaround
-  # here we have to check again for the existence of an index...
-  my $ix = main::get_index ("cp");
-  $have_index_entries = (scalar $ix > 0);
-  my $reldir = "";
-  $reldir = "../" unless $bigpage;
-  if ($have_index_entries) {
-    $Texi2HTML::THISDOC{'CSS_LINES'} .= "<script language=\"JavaScript\" src=\"${reldir}lily_search.js\"></script>\n";
+  if ($ENV{'AJAX_SEARCH'} == 1) {
+    # Add the JavaScript file only if we have an index.
+    # Unfortunately, init_out is called after css_lines, so as a workaround
+    # here we have to check again for the existence of an index...
+    my $ix = main::get_index ("cp");
+    $have_index_entries = (scalar $ix > 0);
+    my $reldir = "";
+    $reldir = "../" unless $bigpage;
+    if ($have_index_entries) {
+      $Texi2HTML::THISDOC{'CSS_LINES'} .= "<script language=\"JavaScript\" src=\"${reldir}lily_search.js\"></script>\n";
+    }
   }
 }
 
@@ -1324,16 +1326,19 @@ sub lilypond_generate_page_toc_body($)
       push (@toc_entries, generate_ly_toc_entries($_, \%parentelements, $page_toc_depth, 0, $element));
     }
     # search box
-    local $/=undef;
-    my $name = "search-box";
-    $lang = $Texi2HTML::THISDOC{current_lang};
-    open FILE, "$ENV{TOP_SRC_DIR}/Documentation/$lang/$name.ihtml" or
+    #  I'm assuming that we wouldn't keep the google search box? -gp
+    if (!($ENV{AJAX_SEARCH} == 1)) {
+      local $/=undef;
+      my $name = "search-box";
+      $lang = $Texi2HTML::THISDOC{current_lang};
+      open FILE, "$ENV{TOP_SRC_DIR}/Documentation/$lang/$name.ihtml" or
        open FILE, "$ENV{TOP_SRC_DIR}/Documentation/$name.ihtml"  or
        die "no such file: $name.ihtml: $!";
-    my $search_string = decode ('UTF-8', <FILE>);
-    $search_string = "<li>\n" . $search_string . "</li>\n";
-    push (@toc_entries, $search_string);
-    close FILE;
+      my $search_string = decode ('UTF-8', <FILE>);
+      $search_string = "<li>\n" . $search_string . "</li>\n";
+      push (@toc_entries, $search_string);
+      close FILE;
+    }
 
     push (@toc_entries, "</ul>\n");
     if ($web_manual) {
@@ -1376,11 +1381,13 @@ sub lilypond_print_toc_div ($$)
         "</a></p>\n";
 
       # AJAX search box, written in JavaScript
-      if ($have_index_entries) {
-        my ($docu_dir, $docu_name) = split_texi_filename ($Texi2HTML::THISDOC{'input_file_name'});
-        print $fh '<script language="JavaScript">print_search_field ("' . 
+      if ($ENV{'AJAX_SEARCH'} == 1) {
+        if ($have_index_entries) {
+          my ($docu_dir, $docu_name) = split_texi_filename ($Texi2HTML::THISDOC{'input_file_name'});
+          print $fh '<script language="JavaScript">print_search_field ("' .
              $Texi2HTML::THISDOC{current_lang} . '", "' . 
              $docu_name . "\", " . $bigpage . ")</script>\n";
+        }
       }
 
       print $fh '<h4 class="toc_header"> ' . &$anchor('',
@@ -1836,25 +1843,29 @@ sub lilypond_index_summary_file_entry ($$$$$$$$$)
   my $is_printed = shift;
   my $manual_name = shift;
 
-  if ($index_name eq "cp")
-  {
-    # The entries in the index file have the form:
-    # SearchText \t FormattedText \t EntryURL \t SectionText \t SectionURL
-    push @index_entries, "$entry_text\t$formatted_entry\t$entry_reference\t$entry_element_header\t$entry_element_reference\n";
+  if ($ENV{'AJAX_SEARCH'}==1) {
+    if ($index_name eq "cp")
+    {
+      # The entries in the index file have the form:
+      # SearchText \t FormattedText \t EntryURL \t SectionText \t SectionURL
+      push @index_entries, "$entry_text\t$formatted_entry\t$entry_reference\t$entry_element_header\t$entry_element_reference\n";
+    }
   }
 }
 
 sub lilypond_finish_out ()
 {
-  if (((scalar @index_entries) > 0) and $have_index_entries) {
-    my $lang = $Texi2HTML::THISDOC{current_lang};
-    my $big = "";
-    $big = "-big-page" if $bigpage;
-    my ($docu_dir, $docu_name) = split_texi_filename ($Texi2HTML::THISDOC{'input_file_name'});
-    my $idx_file = "$docu_dir/$docu_name$big.$lang.idx";
-    open IDXOUTFILE, ">:utf8", $idx_file;
-    print IDXOUTFILE @index_entries;
-    close IDXOUTFILE;
+  if ($ENV{'AJAX_SEARCH'}==1) {
+    if (((scalar @index_entries) > 0) and $have_index_entries) {
+      my $lang = $Texi2HTML::THISDOC{current_lang};
+      my $big = "";
+      $big = "-big-page" if $bigpage;
+      my ($docu_dir, $docu_name) = split_texi_filename ($Texi2HTML::THISDOC{'input_file_name'});
+      my $idx_file = "$docu_dir/$docu_name$big.$lang.idx";
+      open IDXOUTFILE, ">:utf8", $idx_file;
+      print IDXOUTFILE @index_entries;
+      close IDXOUTFILE;
+    }
   }
 }
 

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 6e3a102c2e2386377b833bf44e0b17e45fe4803f..f9e471a167242e88bde6946cd523f058ed924506 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -35,20 +35,20 @@ endif
 
 $(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi $(outdir)/weblinks.itexi
 ifeq ($(WEB_VERSION),yes)
-       DEPTH=$(depth) $(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage -D web_version --output=$@ $<
+       DEPTH=$(depth) AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage -D web_version --output=$@ $<
 else
-       DEPTH=$(depth) $(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage --output=$@ $<
+       DEPTH=$(depth) AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage --output=$@ $<
 endif
 
 $(outdir)/%.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi $(outdir)/weblinks.itexi
-       DEPTH=$(depth) $(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$@ $<
+       DEPTH=$(depth) AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$@ $<
 
 $(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi $(outdir)/weblinks.itexi $(outdir)/%.html.omf
        mkdir -p $(dir $@)
 ifeq ($(WEB_VERSION),yes)
-       DEPTH=$(depth)/../ $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) -D web_version --output=$(dir $@) $<
+       DEPTH=$(depth)/../ AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) -D web_version --output=$(dir $@) $<
 else
-       DEPTH=$(depth)/../ $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output=$(dir $@) $<
+       DEPTH=$(depth)/../ AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output=$(dir $@) $<
 endif
        cp $(top-src-dir)/Documentation/css/*.css $(dir $@)