From e1366b073dfeaacfdc4a7ef742750ffff92f8b2f Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Wed, 15 Jul 2009 00:06:04 +0200 Subject: [PATCH] Make Perl treat all I/O streams as UTF-8 This is necessary to the upcoming translation of node names in Texinfo source. (cherry picked from commit 0f8a7478c0b63576c14f2950e6d41890daeed689) --- Documentation/lilypond-texi2html.init | 2 +- make/doc-i18n-user-vars.make | 2 +- stepmake/stepmake/texinfo-vars.make | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init index 5fd88f9325..90779602d9 100644 --- a/Documentation/lilypond-texi2html.init +++ b/Documentation/lilypond-texi2html.init @@ -221,7 +221,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 = ) { # 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 85075c27fb..ac3b0d9b9c 100644 --- 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 b203240a3f..bcd5f1e576 100644 --- 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) -- 2.39.2