diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-05-24 15:29:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-05-24 15:29:11 (GMT) |
| commit | 231fd112f959c258117188b044681643f30129f1 (patch) | |
| tree | d3c3a9e9938c44a0437c988559ba263b612c7fc8 /tools | |
| parent | 9a6a7030e80397a55a4ee8d090ec9f85b585f13d (diff) | |
| parent | 70a3d08fc4eb639c20c5613ea5952a0dfdd5e935 (diff) | |
| download | tcl-231fd112f959c258117188b044681643f30129f1.zip tcl-231fd112f959c258117188b044681643f30129f1.tar.gz tcl-231fd112f959c258117188b044681643f30129f1.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tcltk-man2html-utils.tcl | 2 | ||||
| -rwxr-xr-x | tools/tcltk-man2html.tcl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/tcltk-man2html-utils.tcl b/tools/tcltk-man2html-utils.tcl index 78aa8ec..c658d71 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 f4466b5..7c45fa9 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]} { |