Enhance html generation, so it can handle the "©" copy-sign as well

5 files changed, 5 insertions, 5 deletions

diff --git a/tools/tcltk-man2html-utils.tcl b/tools/tcltk-man2html-utils.tcl
index 78aa8ec..63e1fb9 100644
--- a/tools/tcltk-man2html-utils.tcl
+++ b/tools/tcltk-man2html-utils.tcl
@@ -1271,7 +1271,7 @@ proc output-directive {line} {
 ##
 proc merge-copyrights {l1 l2} {
     set merge {}
-    set re1 {^Copyright +(?:\(c\)|\\\(co|©) +(\w.*?)(?:all rights reserved)?(?:\. )*$}
+    set re1 {^Copyright +(?:\(c\)|\\\(©|co|©) +(\w.*?)(?:all rights reserved)?(?:\. )*$}
     set re2 {^(\d+) +(?:by +)?(\w.*)$}         ;# date who
     set re3 {^(\d+)-(\d+) +(?:by +)?(\w.*)$}   ;# from to who
     set re4 {^(\d+), *(\d+) +(?:by +)?(\w.*)$} ;# date1 date2 who
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index 5f211f3..2b35bd8 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -29,7 +29,7 @@ set ::CSSFILE "docs.css"
 ## Source the utility functions that provide most of the
 ## implementation of the transformation from nroff to html.
 ##
-source [file join [file dirname [info script]] tcltk-man2html-utils.tcl]
+source -encoding utf-8 [file join [file dirname [info script]] tcltk-man2html-utils.tcl]
 
 proc getversion {tclh {name {}}} {
     if {[file exists $tclh]} {
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 802472b..996cd30 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2424,7 +2424,7 @@ html-tk: ${NATIVE_TCLSH}
 	@EXTRA_BUILD_HTML@
 
 BUILD_HTML = \
-	@${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl \
+	@${NATIVE_TCLSH} -encoding utf-8 $(TOOL_DIR)/tcltk-man2html.tcl \
 		--useversion=$(MAJOR_VERSION).$(MINOR_VERSION) \
 		--htmldir="$(HTML_INSTALL_DIR)" \
 		--srcdir=$(TOP_DIR) $(BUILD_HTML_FLAGS)
diff --git a/win/Makefile.in b/win/Makefile.in
index 6c92749..b282452 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -974,7 +974,7 @@ runtest: tcltest
 # `make shell SCRIPT=foo.tcl`
 shell: binaries
 	@TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
-	$(WINE) ./$(TCLSH) $(SCRIPT)
+	$(WINE) ./$(TCLSH) -encoding utf-8 $(SCRIPT)
 
 # This target can be used to run tclsh inside either gdb or insight
 gdb: binaries
diff --git a/win/makefile.vc b/win/makefile.vc
index d1f4ef3..b1a8b6a 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -676,7 +676,7 @@ CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
 htmlhelp: chmsetup $(CHMFILE)

 

 $(CHMFILE): $(DOCDIR)\*

-	@$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"

+	@$(TCLSH) -encoding utf-8 $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"

 	@echo Compiling HTML help project

 	-"$(HHC)" <<$(HHPFILE) >NUL

 [OPTIONS]