From 302f52865a06f7d5ba65e5ffbdf4c57b7b875be1 Mon Sep 17 00:00:00 2001
From: Jean-Charles Malahieude <address@hidden>
Date: Sat, 15 Aug 2015 20:04:52 +0200
Subject: [PATCH 1/2] Doc-build: move to texi2any - initial steps

 - texi2html -> texi2any as TEXI2HTML_PROGRAM
 - declare that output is html
 - path addition: --I -> -I
 - follow some advices: @xx -> $xx in some places
---
 Documentation/lilypond-texi2html.init | 8 ++++----
 configure.ac                          | 2 +-
 make/website.make                     | 2 +-
 stepmake/stepmake/texinfo-vars.make   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index 9cb5772..0651598 100644
--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -1087,7 +1087,7 @@ sub lc_last($)
   # change the last portion (the filename), if it exists;
   # if it is a plain filename with no path, change the string as a whole
   if ($#hrefsplit > 0) {
-    @hrefsplit[$#hrefsplit] = lc( @hrefsplit[$#hrefsplit] );
+    $hrefsplit[$#hrefsplit] = lc( $hrefsplit[$#hrefsplit] );
     $href = join("/", @hrefsplit);
   } else {
     $href = lc($href);
@@ -1606,11 +1606,11 @@ sub remove_unneeded_anchor($)
   my $href = shift;
   my @hrefsplit = split("/", $href);
   for ($i = 0; $i < @hrefsplit; $i++) {
-    $item = @hrefsplit[$i];
+    $item = $hrefsplit[$i];
     if ($item =~ /#/) {
       @split = split(".html#", $item);
-      if (@split[0] eq @split[1]) {
-        @hrefsplit[$i] = @split[0] . ".html";
+      if ($split[0] eq $split[1]) {
+        $hrefsplit[$i] = $split[0] . ".html";
       }
     }
   }
diff --git a/configure.ac b/configure.ac
index a403e35..21bfc32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -294,7 +294,7 @@ fi
 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, $DOCUMENTATION_REQUIRED, 8.60)
 
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
-STEPMAKE_PROGS(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82)
+STEPMAKE_PROGS(TEXI2HTML, texi2any, $DOCUMENTATION_REQUIRED, 6.0)
 STEPMAKE_PROGS(DBLATEX, dblatex, $DOCUMENTATION_REQUIRED, 0.1.4)
 STEPMAKE_PROGS(BIBTEX, bibtex, $DOCUMENTATION_REQUIRED)
 STEPMAKE_PROGS(PDFLATEX, pdflatex, $DOCUMENTATION_REQUIRED)
diff --git a/make/website.make b/make/website.make
index 3e8df62..2b712bd 100644
--- a/make/website.make
+++ b/make/website.make
@@ -17,7 +17,7 @@ ifeq ($(WEBSITE_ONLY_BUILD),1)
   top-htaccess=$(trusted-dir)/lilypond.org.htaccess
   dir-htaccess=$(trusted-dir)/website-dir.htaccess
   # grab it from PATH
-  TEXI2HTML_PROGRAM=texi2html
+  TEXI2HTML_PROGRAM=texi2any
   PYTHON=python
   PYTHONPATH=$(TRUSTED_DIR)
 else
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 20170d3..d18ec77 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -54,8 +54,8 @@ TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.ini
 
 TEXI2HTML_SPLIT = --prefix=index --split=section
 
-TEXI2HTML_INCLUDES += --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
-TEXI2HTML_FLAGS += --error-limit=0 $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
+TEXI2HTML_INCLUDES += -I=$(src-dir) -I=$(outdir) $(DOCUMENTATION_INCLUDES) -I=$(XREF_MAPS_DIR)
+TEXI2HTML_FLAGS += --error-limit=0 --html $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
 TEXI2HTML = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 ###########
 
-- 
2.5.0