Make Perl treat all I/O streams as UTF-8

This is necessary to the upcoming translation of node names in Texinfo
source.

diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index e8393f1fc0b1d800173ce8b46c5ae2b09f5bbfd8..1ce6896867d0fb089e6b24b7f0449a8a71007f01 100644 (file)
--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -224,7 +224,7 @@ sub load_map_file ($)
     my $mapfile = shift;
     my $node_map = ();
 
-    if (open(XREFFILE, $mapfile)) {
+    if (open(XREFFILE,'<:encoding(utf8)', $mapfile)) {
         my $line;
         while ( $line = <XREFFILE> ) {
             # parse the tab-separated entries and insert them into the map:

diff --git a/make/doc-i18n-user-vars.make b/make/doc-i18n-user-vars.make
index 85075c27fbc98224c1974d7e43a23b28d45ae90d..ac3b0d9b9ceeb60c47a681c6756e636cb9be6b0c 100644 (file)
--- a/make/doc-i18n-user-vars.make
+++ b/make/doc-i18n-user-vars.make
@@ -34,7 +34,7 @@ TEXI2HTML_INIT= --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
 TEXI2HTML_LANG=--lang=$(ISOLANG)
 TEXI2HTML_FLAGS += $(TEXI2HTML_LANG) $(DOCUMENTATION_INCLUDES) \
   -I $(XREF_MAPS_DIR)
-TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM)
+TEXI2HTML = PERL_UNICODE=SD LANG= $(TEXI2HTML_PROGRAM)
 
 TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES)
 

diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index b203240a3f1dc0fc9b476bb298d32d46da6e4792..bcd5f1e57623b633146ba36e9cac34e92c149f72 100644 (file)
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -23,7 +23,7 @@ TEXI2HTML_LANG = --lang=$(ISOLANG)
 endif
 TEXI2HTML_FLAGS += $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
 TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
-TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) $(TEXI2HTML_LANG)
+TEXI2HTML = PERL_UNICODE=SD $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) $(TEXI2HTML_LANG)
 
 TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)