Merge trunk

35 files changed, 6933 insertions, 258 deletions

diff --git a/doc/print.n b/doc/print.n
new file mode 100644
index 0000000..3f51866
--- /dev/null
+++ b/doc/print.n
@@ -0,0 +1,63 @@
+.\" Text automatically generated by txt2man
+'\"
+'\" Copyright (c) 2021 Kevin Walzer/WordTech Communications LLC.
+'\"
+'\" See the file "license.terms" for information on usage and redistribution
+'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+.TH tk print n "" Tk "Tk Built-in Commands"
+.so man.macros
+.SH NAME
+print \- Print canvas and text widgets using native dialogs and APIs.
+.SH SYNOPSIS
+\fBtk print \fIwindow\fR
+.
+.SH DESCRIPTION
+.PP
+The \fBtk print\fR command posts a dialog that allows users to print output
+from the \fBcanvas\fR and \fBtext\fR widgets. The printing will be done using
+platform-native APIs and dialogs where available.
+.PP
+The \fBcanvas\fR widget has long supported PostScript export and both
+PostScript and text files can be sent directly to a printer on Unix-like
+systems using the
+.QW "lp"
+and
+.QW "lpr"
+Unix commands, and the \fBtk print\fR command does not supersede that
+functionality; it builds on it. The \fBtk print\fR command is a fuller
+implementation that uses native dialogs on macOS and Windows, and a Tk-based
+dialog that provides parallel functionality on X11.
+.SH PLATFORM NOTES
+.TP
+\fBmacOS\fR
+.
+The Mac implementation uses native print dialogs and relies on the underlying
+Common Unix Printing System (CUPS) to render text output from the text widget
+and PostScript output from the canvas widget to the printer, to a PDF file, or
+a PostScript file.
+.TP
+\fBWindows\fR
+.
+The Windows implementation is based on the GDI (Graphics Device Interface)
+API. Because there are slight differences in how GDI and Tk's \fBcanvas\fR
+widget display graphics, printed output from the \fBcanvas\fR on Windows may
+not be identical to screen rendering.
+.TP
+\fBX11\fR
+.
+The X11 implementation uses a Tk GUI to configure print jobs for sending to a
+printer via the
+.QW "lpr"
+or
+.QW "lp"
+commands. While these commands have a large number of parameters for
+configuring print jobs, printers vary widely in how they support these
+parameters. As a result, only printer selection and number of copies are
+configured as arguments to the print command; many aspects of print rendering,
+such as grayscale or color for the canvas, are instead configured when
+PostScript is generated.
+.SH "SEE ALSO"
+canvas(n), text(n), tk(n)
+.SH KEYWORDS
+print, output, graphics, text, canvas
diff --git a/doc/sysnotify.n b/doc/sysnotify.n
index 2fa8cf0..ea1ab89 100644
--- a/doc/sysnotify.n
+++ b/doc/sysnotify.n
@@ -18,8 +18,10 @@ The \fBtk sysnotify\fR command creates a platform-specific system notification a
 .SH EXAMPLE
 .PP
 Here is an example of the \fBtk sysnotify\fR code:
+.PP
 .CS
-     tk sysnotify "Alert" "This is just a test of the Tk System Notification Code."
+tk sysnotify "Alert" \e
+      "This is just a test of the Tk System Notification Code."
 .CE
 .SH PLATFORM NOTES
 .PP
@@ -28,17 +30,27 @@ API's. The X11 version has a conditional dependency on libnotify, and
 falls back to a Tcl-only implementation if libnotify is not installed. On
 each platform the notification includes a platform-specific default image to
 accompany the text.
-.
 .TP
 \fBmacOS\fR
 .
 The macOS version will request permission from the user to authorize
-notifications. This must be activated in Apple's System Preferences Notifications section.
+notifications. This must be activated in Apple's System Preferences
+Notifications section.
+.RS
+.PP
+If deploying an application using the standalone version of Wish.app,
+setting the bundle ID in the applications Info.plist file to begin with
+.QW \fBcom\fR
+seems necessary for notifications to work. Using a different prefix
+for the bundle ID, such as something like
+.QW \fBtk.tcl.tkchat\fR ,
+will cause notifications to silently fail.
+.RE
 .TP
 \fBWindows\fR
 .
-The image is taken from the systray i.e. a sysnotify can only be
-called when a systray was installed.
+The image is taken from the system tray, i.e., \fBsysnotify\fR can only be
+called when a \fBsystray\fR was installed.
 .
 .SH KEYWORDS
 notify, alert
diff --git a/doc/tk.n b/doc/tk.n
index 74afcbf..27a2d58 100644
--- a/doc/tk.n
+++ b/doc/tk.n
@@ -86,6 +86,13 @@ error if tried.
 Controls the Tk font selection dialog. For more details see the
 \fBfontchooser\fR manual page.
 .TP
+\fBtk print \fIwindow\fR
+.
+The \fBtk print\fR command posts a dialog that allows users to print output
+from the \fBcanvas\fR and \fBtext\fR widgets. The printing will be done using
+platform-native APIs and dialogs where available. For more details see the
+\fBprint\fR manual page.
+.TP
 \fBtk scaling \fR?\fB\-displayof \fIwindow\fR? ?\fInumber\fR?
 .
 Sets and queries the current scaling factor used by Tk to convert between
@@ -139,9 +146,9 @@ Returns the current Tk windowing system, one of
 \fBx11\fR (X11-based), \fBwin32\fR (MS Windows),
 or \fBaqua\fR (Mac OS X Aqua).
 .SH "SEE ALSO"
-busy(n), fontchooser(n), send(n), sysnotify(n), systray(n), winfo(n)
+busy(n), fontchooser(n), print(n), send(n), sysnotify(n), systray(n), winfo(n)
 .SH KEYWORDS
-application name, send, sysnotify, systray
+application name, print, send, sysnotify, systray
 '\" Local Variables:
 '\" mode: nroff
 '\" End:
diff --git a/generic/nanosvg.h b/generic/nanosvg.h
index 9a6eb3f..bb5ba25 100644
--- a/generic/nanosvg.h
+++ b/generic/nanosvg.h
@@ -1287,35 +1287,22 @@ static const char* nsvg__getNextPathItem(const char* s, char* it)
 
 static unsigned int nsvg__parseColorHex(const char* str)
 {
-	unsigned int c = 0, r = 0, g = 0, b = 0;
-	int n = 0;
-	str++; /* skip # */
-	/* Calculate number of characters. */
-	while(str[n] && !nsvg__isspace(str[n]))
-		n++;
-	if (n == 6) {
-		sscanf(str, "%x", &c);
-	} else if (n == 3) {
-		sscanf(str, "%x", &c);
-		c = (c&0xf) | ((c&0xf0) << 4) | ((c&0xf00) << 8);
-		c |= c<<4;
-	}
-	r = (c >> 16) & 0xff;
-	g = (c >> 8) & 0xff;
-	b = c & 0xff;
-	return NSVG_RGB(r,g,b);
+	unsigned int r=0, g=0, b=0;
+	if (sscanf(str, "#%2x%2x%2x", &r, &g, &b) == 3 )		/* 2 digit hex */
+		return NSVG_RGB(r, g, b);
+	if (sscanf(str, "#%1x%1x%1x", &r, &g, &b) == 3 )		/* 1 digit hex, e.g. #abc -> 0xccbbaa */
+		return NSVG_RGB(r*17, g*17, b*17);			/* same effect as (r<<4|r), (g<<4|g), .. */
+	return NSVG_RGB(128, 128, 128);
 }
 
 static unsigned int nsvg__parseColorRGB(const char* str)
 {
-	int r = -1, g = -1, b = -1;
-	char s1[32]="", s2[32]="";
-	sscanf(str + 4, "%d%[%%, \t]%d%[%%, \t]%d", &r, s1, &g, s2, &b);
-	if (strchr(s1, '%')) {
-		return NSVG_RGB((r*255)/100,(g*255)/100,(b*255)/100);
-	} else {
-		return NSVG_RGB(r,g,b);
-	}
+	unsigned int r=0, g=0, b=0;
+	if (sscanf(str, "rgb(%u, %u, %u)", &r, &g, &b) == 3)		/* decimal integers */
+		return NSVG_RGB(r, g, b);
+	if (sscanf(str, "rgb(%u%%, %u%%, %u%%)", &r, &g, &b) == 3)	/* decimal integer percentage */
+		return NSVG_RGB(r*255/100, g*255/100, b*255/100);
+	return NSVG_RGB(128, 128, 128);
 }
 
 typedef struct NSVGNamedColor {
diff --git a/library/demos/print.tcl b/library/demos/print.tcl
new file mode 100644
index 0000000..ebe6553
--- /dev/null
+++ b/library/demos/print.tcl
@@ -0,0 +1,53 @@
+# print.tcl --
+#
+# This demonstration script showcases the tk print commands.
+#
+
+if {![info exists widgetDemo]} {
+    error "This script should be run from the \"widget\" demo."
+}
+
+set w .print
+destroy $w
+toplevel $w
+wm title $w "Printing Demonstration"
+positionWindow $w
+
+image create photo logo -data {R0lGODlhMABLAPUAAP//////zP//mf//AP/MzP/Mmf/MAP+Zmf+ZZv+ZAMz//8zM/8zMzMyZzMyZmcyZZsyZAMxmZsxmM8xmAMwzM8wzAJnMzJmZzJmZmZlmmZlmZplmM5kzZpkzM5kzAGaZzGZmzGZmmWYzZmYzMzNmzDNmmTMzmTMzZgAzmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH+BSAtZGwtACH5BAEKAAIALAAAAAAwAEsAAAb+QIFwSCwahY9HRMI8Op/JJVNSqVqv2OvjyRU8slbIJGwYg60S5ZR6jRi/4ITBOhkYIOd8dltEnAdmFQMJeoVXCEd/VnKGjRVOZ3NVgHlsjpBxVRCEYBIEAAARl4lgZmVgEQAKFx8Mo0ZnpqgAFyi2JqKGmGebWRIAILbCIo27cYFWASTCtievRXqSVwQfzLYeeYESxlnSVRIW1igjWHJmjBXbpKXeFQTizlh1eJNVHbYf0LGc39XW2PIoVZE0whasWPSqFBBHrkKEA3QG0DFTEMXBUsjCWesg4oMFAGwgtKsiwqA+jGiCiRPGAM6pLCVLGKHQ6EGJlc0IuDxzAgX+CCOW9DjAaUsEyAoT+GHpeSRoHgxEUWgAUEUpFhMWgTbKEPUBAU15TBZxekYD0RMEqCDLIpYIWTAcmGEd9rWQBxQyjeQqdK/ZTWEO3mK5l+9No75SrcHhm9WwnlzNoA5zdM+JHz0HCPQdUauZowoFnSw+c2CBvw6dUXT4LMKE6EIHUqMexgCiIREknOwl7Q+FhNQoLuzOc6Kw3kIIVOLqjYKBYCwinmgo9CBEswfMAziK7mRDoQhcUZxwoBKFibq3n3jXI0GyCPLC0DrS8GR1oaEoRBRYVhT99/qG4DcCA/yNU4Ajbjhhnx4P2DJggR3YZog6RyyYxwM9PSgMBaP+sQdgIRL0JAKBwnTooRMAFWLdiPyJ8JwvTnyQoh5midCASh149ZkTIFAmHnzOZOBfIU6U4Mhd4zF34DNEoDAhARGY50BvJkioyxFOGkKAShGkFsJwejiR5Xf8aZAaBp89coQJjuDXAQOApekEm45ANaAtIbyYxREf0OlICCK841uaahZBQjyfjXCACYjuaASjhFagRKSFNtloHg+hYWIxRohnBQWCSSAhBVZ+hkgRnlbxwJIVgIqGlaU6wkeTxHxjm6gVLImrFbHWVEQ1taZjWxJX7KqqnqgUEUxDwtqajrOaRkqhEDcxWwECbEjxTYe9gojqOJQ6JO231ob72bSqAjh4RgfsjiDCCfDCK8K8I9TL7r33nvGtCO7CO1dUAONk3LcBFxzwwEMwZ/DC4iAsRIE+CWNCbzeV8FfEtoDwVwnlacxMkcKQYIE/F5TQ2QcedUZCagyc3NsFGrXVZMipWVBCzKv4Q0JvCviDsjAwf4ylxBeX0KcwGs81ccgqGS3MBxc3RjDDVAvdBRcfeFy1MFd3bcQHJEQdlddkP5E1Cf9yXfbaV2d9RBAAOw==
+}
+
+
+pack [label $w.l -text "This demonstration showcases
+        the tk print command. Clicking the buttons below
+        print the data from the canvas and text widgets
+        using platform-native dialogs."] -side top
+
+pack [frame $w.m] -fill both -expand yes -side top
+
+set c [canvas $w.m.c -bg white]
+pack $c -fill both -expand no -side left
+
+$c create rectangle 30 10 200 50 -fill blue -outline black
+$c create oval 30 60 200 110 -fill green
+$c create image 130 150 -image logo
+$c create text 150 250   -anchor n -font {Helvetica 12}  \
+	-text "A short demo of simple canvas elements."
+
+set txt {
+Tcl, or Tool Command Language, is an open-source multi-purpose C library which includes a powerful dynamic scripting language. Together they provide ideal cross-platform development environment for any programming project. It has served for decades as an essential system component in organizations ranging from NASA to Cisco Systems, is a must-know language in the fields of EDA, and powers companies such as FlightAware and F5 Networks.
+
+Tcl is fit for both the smallest and largest programming tasks, obviating the need to decide whether it is overkill for a given job or whether a system written in Tcl will scale up as needed. Wherever a shell script might be used Tcl is a better choice, and entire web ecosystems and mission-critical control and testing systems have also been written in Tcl. Tcl excels in all these roles due to the minimal syntax of the language, the unique programming paradigm exposed at the script level, and the careful engineering that has gone into the design of the Tcl internals.
+}
+
+set t [text $w.m.t -wrap word]
+pack $t -side right -fill both -expand no
+$t insert end $txt
+
+pack [frame $w.f] -side top -fill both -expand no
+pack [button $w.f.b -text "Print Canvas" -command [list tk print $w.m.c]]  -expand no
+pack [button $w.f.x -text "Print Text" -command [list tk print $w.m.t]]   -expand no
+
+## See Code / Dismiss buttons
+pack [addSeeDismiss $w.buttons $w] -side bottom -fill x
+
+
diff --git a/library/demos/widget b/library/demos/widget
index 39e4dc5..5bf1e2a 100644
--- a/library/demos/widget
+++ b/library/demos/widget
@@ -388,6 +388,8 @@ addFormattedText {
     @@demo fontchoose	Font selection dialog
     @@new
     @@demo systray      System tray icon and notification
+    @@new
+    @@demo print        Printing from canvas and text widgets
 
     @@subtitle	Animation
     @@demo anilabel	Animated labels
@@ -641,80 +643,7 @@ proc showCode w {
 # file -		Name of the original file (implicitly for title)
 
 proc printCode {w file} {
-    set code [$w get 1.0 end-1c]
-
-    set dir "."
-    if {[info exists ::env(HOME)]} {
-	set dir "$::env(HOME)"
-    }
-    if {[info exists ::env(TMP)]} {
-	set dir $::env(TMP)
-    }
-    if {[info exists ::env(TEMP)]} {
-	set dir $::env(TEMP)
-    }
-
-    set filename [file join $dir "tkdemo-$file"]
-    set outfile [open $filename "w"]
-    puts $outfile $code
-    close $outfile
-
-    switch -- $::tcl_platform(platform) {
-	unix {
-	    if {[catch {exec lp -c $filename} msg]} {
-		tk_messageBox -title "Print spooling failure" \
-			-message "Print spooling probably failed: $msg"
-	    }
-	}
-	windows {
-	    if {[catch {PrintTextWin32 $filename} msg]} {
-		tk_messageBox -title "Print spooling failure" \
-			-message "Print spooling probably failed: $msg"
-	    }
-	}
-	default {
-	    tk_messageBox -title "Operation not Implemented" \
-		    -message "Wow! Unknown platform: $::tcl_platform(platform)"
-	}
-    }
-
-    #
-    # Be careful to throw away the temporary file in a gentle manner ...
-    #
-    if {[file exists $filename]} {
-	catch {file delete $filename}
-    }
-}
-
-# PrintTextWin32 --
-#    Print a file under Windows using all the "intelligence" necessary
-#
-# Arguments:
-# filename -		Name of the file
-#
-# Note:
-# Taken from the Wiki page by Keith Vetter, "Printing text files under
-# Windows".
-# Note:
-# Do not execute the command in the background: that way we can dispose of the
-# file smoothly.
-#
-proc PrintTextWin32 {filename} {
-    package require registry
-    set app [auto_execok notepad.exe]
-    set pcmd "$app /p %1"
-    catch {
-	set app [registry get {HKEY_CLASSES_ROOT\.txt} {}]
-	set pcmd [registry get \
-		{HKEY_CLASSES_ROOT\\$app\\shell\\print\\command} {}]
-    }
-
-    regsub -all {%1} $pcmd $filename pcmd
-    puts $pcmd
-
-    regsub -all {\\} $pcmd {\\\\} pcmd
-    set command "[auto_execok start] /min $pcmd"
-    eval exec $command
+    tk print $w
 }
 
 # tkAboutDialog --
@@ -727,7 +656,8 @@ proc tkAboutDialog {} {
 "[mc "Copyright © %s" {1996-1997 Sun Microsystems, Inc.}]
 [mc "Copyright © %s" {1997-2000 Ajuba Solutions, Inc.}]
 [mc "Copyright © %s" {2001-2009 Donal K. Fellows}]
-[mc "Copyright © %s" {2002-2007 Daniel A. Steffen}]"
+[mc "Copyright © %s" {2002-2007 Daniel A. Steffen}]
+[mc "Copyright © %s" {2021 Kevin Walzer}]"
 }
 
 # Local Variables:
diff --git a/library/msgs/cs.msg b/library/msgs/cs.msg
index a93c4ec..c9ee256 100644
--- a/library/msgs/cs.msg
+++ b/library/msgs/cs.msg
@@ -75,3 +75,21 @@ namespace eval ::tk {
     ::msgcat::mcset cs "retry" "znovu"
     ::msgcat::mcset cs "yes" "ano"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  cs "Print" "Tisknout"
+	::msgcat::mcset  cs "Printer" "Tiskárna"
+	::msgcat::mcset  cs "Letter " "Dopis "
+	::msgcat::mcset  cs "Legal " "Legální "
+	::msgcat::mcset  cs "A4" "A4"
+	::msgcat::mcset  cs "Grayscale" "Stupně Šedi"
+	::msgcat::mcset  cs "RGB" "RGB"
+	::msgcat::mcset  cs "Options" "Možnosti"
+	::msgcat::mcset  cs "Copies" "Kopie"
+	::msgcat::mcset  cs "Paper" "Papír"
+	::msgcat::mcset  cs "Scale" "Škála"
+	::msgcat::mcset  cs "Orientation" "Orientace"
+	::msgcat::mcset  cs "Portrait" "Portrét"
+	::msgcat::mcset  cs "Landscape" "Krajina"
+	::msgcat::mcset  cs "Output" "Výstup"
+}
\ No newline at end of file
diff --git a/library/msgs/da.msg b/library/msgs/da.msg
index 282f919..eb86516 100644
--- a/library/msgs/da.msg
+++ b/library/msgs/da.msg
@@ -76,3 +76,21 @@ namespace eval ::tk {
     ::msgcat::mcset da "retry" "gentag"
     ::msgcat::mcset da "yes" "ja"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  da "Print" "Trykke"
+	::msgcat::mcset  da "Printer" "Printer"
+	::msgcat::mcset  da "Letter " "Brev"
+	::msgcat::mcset  da "Legal " "Juridisk"
+	::msgcat::mcset  da "A4" "A4"
+	::msgcat::mcset  da "Grayscale" "Gråtoneskala"
+	::msgcat::mcset  da "RGB" "Rgb"
+	::msgcat::mcset  da "Options" "Indstillinger"
+	::msgcat::mcset  da "Copies" "Kopier"
+	::msgcat::mcset  da "Paper" "Papir"
+	::msgcat::mcset  da "Scale" "Skalere"
+	::msgcat::mcset  da "Orientation" "Orientering"
+	::msgcat::mcset  da "Portrait" "Portræt"
+	::msgcat::mcset  da "Landscape" "Landskab"
+	::msgcat::mcset  da "Output" "Udskriv Publikation"
+}
\ No newline at end of file
diff --git a/library/msgs/de.msg b/library/msgs/de.msg
index 2cf25d2..fb4a8e7 100644
--- a/library/msgs/de.msg
+++ b/library/msgs/de.msg
@@ -89,3 +89,21 @@ namespace eval ::tk {
     ::msgcat::mcset de "retry" "wiederholen"
     ::msgcat::mcset de "yes" "ja"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  de "Print" "Drucken"
+	::msgcat::mcset  de "Printer" "Drucker"
+	::msgcat::mcset  de "Letter " "Brief"
+	::msgcat::mcset  de "Legal " "Rechtlich"
+	::msgcat::mcset  de "A4" "A4"
+	::msgcat::mcset  de "Grayscale" "Graustufen"
+	::msgcat::mcset  de "RGB" "Rgb"
+	::msgcat::mcset  de "Options" "Optionen"
+	::msgcat::mcset  de "Copies" "Kopien"
+	::msgcat::mcset  de "Paper" "Papier"
+	::msgcat::mcset  de "Scale" "Skala"
+	::msgcat::mcset  de "Orientation" "Ausrichtung"
+	::msgcat::mcset  de "Portrait" "Porträt"
+	::msgcat::mcset  de "Landscape" "Landschaft"
+	::msgcat::mcset  de "Output" "Ausgabe"
+}
\ No newline at end of file
diff --git a/library/msgs/el.msg b/library/msgs/el.msg
index 34f4aa7..7aa6246 100644
--- a/library/msgs/el.msg
+++ b/library/msgs/el.msg
@@ -84,3 +84,21 @@ namespace eval ::tk {
     ::msgcat::mcset el "retry"              "προσπάθησε ξανά"
     ::msgcat::mcset el "yes"                "ναι"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  el "Print" "Τυπώνω"
+	::msgcat::mcset  el "Printer" "Εκτυπωτής"
+	::msgcat::mcset  el "Letter " "Γράμμα"
+	::msgcat::mcset  el "Legal " "Νομικός"
+	::msgcat::mcset  el "A4" "Α4"
+	::msgcat::mcset  el "Grayscale" "Κλίμακα Του Γκρι"
+	::msgcat::mcset  el "RGB" "Rgb"
+	::msgcat::mcset  el "Options" "Επιλογές"
+	::msgcat::mcset  el "Copies" "Αντίγραφα"
+	::msgcat::mcset  el "Paper" "Χαρτί"
+	::msgcat::mcset  el "Scale" "Κλίμακα"
+	::msgcat::mcset  el "Orientation" "Προσανατολισμός"
+	::msgcat::mcset  el "Portrait" "Προσωπογραφία"
+	::msgcat::mcset  el "Landscape" "Τοπίο"
+	::msgcat::mcset  el "Output" "Έξοδος"
+}
\ No newline at end of file
diff --git a/library/msgs/en.msg b/library/msgs/en.msg
index 5ad1094..3f0d988 100644
--- a/library/msgs/en.msg
+++ b/library/msgs/en.msg
@@ -89,3 +89,22 @@ namespace eval ::tk {
     ::msgcat::mcset en "retry"
     ::msgcat::mcset en "yes"
 }
+
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  en "Print"
+	::msgcat::mcset  en "Printer"
+	::msgcat::mcset  en "Letter "
+	::msgcat::mcset  en "Legal "
+	::msgcat::mcset  en "A4"
+	::msgcat::mcset  en "Grayscale"
+	::msgcat::mcset  en "RGB"
+	::msgcat::mcset  en "Options"
+	::msgcat::mcset  en "Copies"
+	::msgcat::mcset  en "Paper"
+	::msgcat::mcset  en "Scale"
+	::msgcat::mcset  en "Orientation"
+	::msgcat::mcset  en "Portrait"
+	::msgcat::mcset  en "Landscape"
+	::msgcat::mcset  en "Output"
+}
diff --git a/library/msgs/eo.msg b/library/msgs/eo.msg
index d285fb8..08dfc1e 100644
--- a/library/msgs/eo.msg
+++ b/library/msgs/eo.msg
@@ -73,3 +73,21 @@ namespace eval ::tk {
     ::msgcat::mcset eo "retry" "ripetu"
     ::msgcat::mcset eo "yes" "jes"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  eo "Print" "Presi"
+	::msgcat::mcset  eo "Printer" "Presilo"
+	::msgcat::mcset  eo "Letter " "Letero"
+	::msgcat::mcset  eo "Legal " "Laŭleĝa"
+	::msgcat::mcset  eo "A4" "A4"
+	::msgcat::mcset  eo "Grayscale" "Grizskalo"
+	::msgcat::mcset  eo "RGB" "RGB"
+	::msgcat::mcset  eo "Options" "Opcioj"
+	::msgcat::mcset  eo "Copies" "Kopioj"
+	::msgcat::mcset  eo "Paper" "Papero"
+	::msgcat::mcset  eo "Scale" "Skalo"
+	::msgcat::mcset  eo "Orientation" "Orientiĝo"
+	::msgcat::mcset  eo "Portrait" "Portreto"
+	::msgcat::mcset  eo "Landscape" "Pejzaĝo"
+	::msgcat::mcset  eo "Output" "Eligo"
+}
\ No newline at end of file
diff --git a/library/msgs/es.msg b/library/msgs/es.msg
index f7082b8..724ea3b 100644
--- a/library/msgs/es.msg
+++ b/library/msgs/es.msg
@@ -74,3 +74,21 @@ namespace eval ::tk {
     ::msgcat::mcset es "retry" "reintentar"
     ::msgcat::mcset es "yes" "sí"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  es "Print" "Imprimir"
+	::msgcat::mcset  es "Printer" "Impresora"
+	::msgcat::mcset  es "Letter " "Carta"
+	::msgcat::mcset  es "Legal " "Legal"
+	::msgcat::mcset  es "A4" "A4"
+	::msgcat::mcset  es "Grayscale" "Escala De Grises"
+	::msgcat::mcset  es "RGB" "Rgb"
+	::msgcat::mcset  es "Options" "Opciones"
+	::msgcat::mcset  es "Copies" "Copias"
+	::msgcat::mcset  es "Paper" "Papel"
+	::msgcat::mcset  es "Scale" "Escama"
+	::msgcat::mcset  es "Orientation" "Orientación"
+	::msgcat::mcset  es "Portrait" "Retrato"
+	::msgcat::mcset  es "Landscape" "Paisaje"
+	::msgcat::mcset  es "Output" "Salida"
+}
\ No newline at end of file
diff --git a/library/msgs/fr.msg b/library/msgs/fr.msg
index cab8c50..0d3ef08 100644
--- a/library/msgs/fr.msg
+++ b/library/msgs/fr.msg
@@ -70,3 +70,21 @@ namespace eval ::tk {
     ::msgcat::mcset fr "retry" "réessayer"
     ::msgcat::mcset fr "yes" "oui"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  fr "Print" "Imprimer"
+	::msgcat::mcset  fr "Printer" "Imprimante"
+	::msgcat::mcset  fr "Letter " "Lettre"
+	::msgcat::mcset  fr "Legal " "Légal"
+	::msgcat::mcset  fr "A4" "A4"
+	::msgcat::mcset  fr "Grayscale" "Niveaux de Gris"
+	::msgcat::mcset  fr "RGB" "RVB"
+	::msgcat::mcset  fr "Options" "Options"
+	::msgcat::mcset  fr "Copies" "Nombre d'exemplaires"
+	::msgcat::mcset  fr "Paper" "Papier"
+	::msgcat::mcset  fr "Scale" "Échelle"
+	::msgcat::mcset  fr "Orientation" "Orientation"
+	::msgcat::mcset  fr "Portrait" "Portrait"
+	::msgcat::mcset  fr "Landscape" "Paysage"
+	::msgcat::mcset  fr "Output" "Sortie"
+}
\ No newline at end of file
diff --git a/library/msgs/hu.msg b/library/msgs/hu.msg
index 6d60cc6..5c1d929 100644
--- a/library/msgs/hu.msg
+++ b/library/msgs/hu.msg
@@ -76,3 +76,21 @@ namespace eval ::tk {
     ::msgcat::mcset hu "retry" "újra"
     ::msgcat::mcset hu "yes" "igen"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  hu "Print" "Nyomtat"
+	::msgcat::mcset  hu "Printer" "Nyomtató"
+	::msgcat::mcset  hu "Letter " "Levél"
+	::msgcat::mcset  hu "Legal " "Törvényes"
+	::msgcat::mcset  hu "A4" "A4"
+	::msgcat::mcset  hu "Grayscale" "Szürkeárnyalatos"
+	::msgcat::mcset  hu "RGB" "Rgb"
+	::msgcat::mcset  hu "Options" "Beállítások"
+	::msgcat::mcset  hu "Copies" "Másolatok"
+	::msgcat::mcset  hu "Paper" "Papír"
+	::msgcat::mcset  hu "Scale" "Hangsor"
+	::msgcat::mcset  hu "Orientation" "Tájékozódás"
+	::msgcat::mcset  hu "Portrait" "Portré"
+	::msgcat::mcset  hu "Landscape" "Táj"
+	::msgcat::mcset  hu "Output" "Hozam"
+}
\ No newline at end of file
diff --git a/library/msgs/it.msg b/library/msgs/it.msg
index f6ad124..d7d9263 100644
--- a/library/msgs/it.msg
+++ b/library/msgs/it.msg
@@ -71,3 +71,21 @@ namespace eval ::tk {
     ::msgcat::mcset it "retry" "riprova"
     ::msgcat::mcset it "yes" "sì"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  it "Print" "Stampare"
+	::msgcat::mcset  it "Printer" "Stampante"
+	::msgcat::mcset  it "Letter " "Lettera"
+	::msgcat::mcset  it "Legal " "Legale"
+	::msgcat::mcset  it "A4" "A4"
+	::msgcat::mcset  it "Grayscale" "Scala Di Grigi"
+	::msgcat::mcset  it "RGB" "Rgb"
+	::msgcat::mcset  it "Options" "Opzioni"
+	::msgcat::mcset  it "Copies" "Copie"
+	::msgcat::mcset  it "Paper" "Carta"
+	::msgcat::mcset  it "Scale" "Scala"
+	::msgcat::mcset  it "Orientation" "Orientamento"
+	::msgcat::mcset  it "Portrait" "Ritratto"
+	::msgcat::mcset  it "Landscape" "Paesaggio"
+	::msgcat::mcset  it "Output" "Prodotto"
+}
\ No newline at end of file
diff --git a/library/msgs/nl.msg b/library/msgs/nl.msg
index fd0348b..b751824 100644
--- a/library/msgs/nl.msg
+++ b/library/msgs/nl.msg
@@ -89,3 +89,21 @@ namespace eval ::tk {
     ::msgcat::mcset nl "retry" "opnieuw"
     ::msgcat::mcset nl "yes" "ja"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  nl "Print" "Afdrukken"
+	::msgcat::mcset  nl "Printer" "Printer"
+	::msgcat::mcset  nl "Letter " "Brief"
+	::msgcat::mcset  nl "Legal " "Legaal"
+	::msgcat::mcset  nl "A4" "A4"
+	::msgcat::mcset  nl "Grayscale" "Grijswaarden"
+	::msgcat::mcset  nl "RGB" "Rgb"
+	::msgcat::mcset  nl "Options" "Opties"
+	::msgcat::mcset  nl "Copies" "Kopieën"
+	::msgcat::mcset  nl "Paper" "Papier"
+	::msgcat::mcset  nl "Scale" "Schub"
+	::msgcat::mcset  nl "Orientation" "Oriëntatie"
+	::msgcat::mcset  nl "Portrait" "Portret"
+	::msgcat::mcset  nl "Landscape" "Landschap"
+	::msgcat::mcset  nl "Output" "Uitvoer"
+}
\ No newline at end of file
diff --git a/library/msgs/pl.msg b/library/msgs/pl.msg
index f616397..d47b834 100644
--- a/library/msgs/pl.msg
+++ b/library/msgs/pl.msg
@@ -89,3 +89,21 @@ namespace eval ::tk {
     ::msgcat::mcset pl "retry" "ponów"
     ::msgcat::mcset pl "yes" "tak"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  pl "Print" "Drukować"
+	::msgcat::mcset  pl "Printer" "Drukarka"
+	::msgcat::mcset  pl "Letter " "Litera"
+	::msgcat::mcset  pl "Legal " "Legalny"
+	::msgcat::mcset  pl "A4" "A4"
+	::msgcat::mcset  pl "Grayscale" "Skala Szarości"
+	::msgcat::mcset  pl "RGB" "Rgb"
+	::msgcat::mcset  pl "Options" "Opcje"
+	::msgcat::mcset  pl "Copies" "Kopie"
+	::msgcat::mcset  pl "Paper" "Papier"
+	::msgcat::mcset  pl "Scale" "Skala"
+	::msgcat::mcset  pl "Orientation" "Orientacja"
+	::msgcat::mcset  pl "Portrait" "Portret"
+	::msgcat::mcset  pl "Landscape" "Krajobraz"
+	::msgcat::mcset  pl "Output" "Produkt Wyjściowy"
+}
\ No newline at end of file
diff --git a/library/msgs/pt.msg b/library/msgs/pt.msg
index 91c7f7a..d4fdfea 100644
--- a/library/msgs/pt.msg
+++ b/library/msgs/pt.msg
@@ -72,3 +72,21 @@ namespace eval ::tk {
     ::msgcat::mcset pt "retry" "tentar novamente"
     ::msgcat::mcset pt "yes" "sim"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  pt "Print" "Imprimir"
+	::msgcat::mcset  pt "Printer" "Impressora"
+	::msgcat::mcset  pt "Letter " "Letra"
+	::msgcat::mcset  pt "Legal " "Legal"
+	::msgcat::mcset  pt "A4" "A4"
+	::msgcat::mcset  pt "Grayscale" "Escala De Cinza"
+	::msgcat::mcset  pt "RGB" "Rgb"
+	::msgcat::mcset  pt "Options" "Opções"
+	::msgcat::mcset  pt "Copies" "Exemplares"
+	::msgcat::mcset  pt "Paper" "Papel"
+	::msgcat::mcset  pt "Scale" "Escala"
+	::msgcat::mcset  pt "Orientation" "Orientação"
+	::msgcat::mcset  pt "Portrait" "Retrato"
+	::msgcat::mcset  pt "Landscape" "Paisagem"
+	::msgcat::mcset  pt "Output" "Saída"
+}
\ No newline at end of file
diff --git a/library/msgs/ru.msg b/library/msgs/ru.msg
index 3389ce8..bd7c7b2 100644
--- a/library/msgs/ru.msg
+++ b/library/msgs/ru.msg
@@ -73,3 +73,21 @@ namespace eval ::tk {
     ::msgcat::mcset ru "yes" "да"
 }
 
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  ru "Print" "Печатать"
+	::msgcat::mcset  ru "Printer" "Принтер"
+	::msgcat::mcset  ru "Letter " "Письмо"
+	::msgcat::mcset  ru "Legal " "Законный"
+	::msgcat::mcset  ru "A4" "A4"
+	::msgcat::mcset  ru "Grayscale" "Серый Масштаб"
+	::msgcat::mcset  ru "RGB" "Ргб"
+	::msgcat::mcset  ru "Options" "Параметры"
+	::msgcat::mcset  ru "Copies" "Копии"
+	::msgcat::mcset  ru "Paper" "Бумага"
+	::msgcat::mcset  ru "Scale" "Шкала"
+	::msgcat::mcset  ru "Orientation" "Ориентация"
+	::msgcat::mcset  ru "Portrait" "Портрет"
+	::msgcat::mcset  ru "Landscape" "Ландшафт"
+	::msgcat::mcset  ru "Output" "Выпуск"
+}
\ No newline at end of file
diff --git a/library/msgs/sv.msg b/library/msgs/sv.msg
index a1ef8c5..5858221 100644
--- a/library/msgs/sv.msg
+++ b/library/msgs/sv.msg
@@ -74,3 +74,21 @@ namespace eval ::tk {
     ::msgcat::mcset sv "retry" "försök igen"
     ::msgcat::mcset sv "yes" "ja"
 }
+#localization of print terms by Kevin Walzer via Microsoft Translator
+namespace eval ::tk {
+	::msgcat::mcset  sv "Print" "Trycka"
+	::msgcat::mcset  sv "Printer" "Skrivare"
+	::msgcat::mcset  sv "Letter " "Brev"
+	::msgcat::mcset  sv "Legal " "Laglig"
+	::msgcat::mcset  sv "A4" "A4 (På 199"
+	::msgcat::mcset  sv "Grayscale" "Gråskala"
+	::msgcat::mcset  sv "RGB" "Rgb"
+	::msgcat::mcset  sv "Options" "Alternativ"
+	::msgcat::mcset  sv "Copies" "Kopior"
+	::msgcat::mcset  sv "Paper" "Papper"
+	::msgcat::mcset  sv "Scale" "Skala"
+	::msgcat::mcset  sv "Orientation" "Orientering"
+	::msgcat::mcset  sv "Portrait" "Porträtt"
+	::msgcat::mcset  sv "Landscape" "Landskap"
+	::msgcat::mcset  sv "Output" "Utdata"
+}
\ No newline at end of file
diff --git a/library/print.tcl b/library/print.tcl
new file mode 100644
index 0000000..7820a5f
--- /dev/null
+++ b/library/print.tcl
@@ -0,0 +1,995 @@
+# print.tcl --
+
+# This file defines the 'tk print' command for printing of the canvas
+# widget and text on X11, Windows, and macOS. It implements an abstraction
+# layer that presents a consistent API across the three platforms.
+
+# Copyright © 2009 Michael I. Schwartz.
+# Copyright © 2021 Kevin Walzer/WordTech Communications LLC.
+# Copyright © 2021 Harald Oehlmann, Elmicron GmbH
+#
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+namespace eval ::tk::print {
+    namespace import -force ::tk::msgcat::*
+
+    # makeTempFile:
+    #    Create a temporary file and populate its contents
+    # Arguments:
+    #	 filename - base of the name of the file to create
+    #    contents - what to put in the file; defaults to empty
+    # Returns:
+    #    Full filename for created file
+    #
+    proc makeTempFile {filename {contents ""}} {
+	set f [file tempfile filename $filename]
+	try {
+	    puts -nonewline $f $contents
+	    return $filename
+	} finally {
+	    close $f
+	}
+    }
+
+    if {[tk windowingsystem] eq "win32"} {
+	variable printer_name
+	variable copies
+	variable dpi_x
+	variable dpi_y
+	variable paper_width
+	variable paper_height
+	variable margin_left
+	variable margin_top
+	variable printargs
+	array set printargs {}
+
+	# Multiple utility procedures for printing text based on the
+	# C printer primitives.
+
+	# _set_dc:
+	# Select printer and set device context and other parameters
+	# for print job.
+	#
+	proc _set_dc {} {
+	    variable printargs
+	    variable printer_name
+	    variable paper_width
+	    variable paper_height
+	    variable dpi_x
+	    variable dpi_y
+	    variable copies
+
+	    #First, we select the printer.
+	    _selectprinter
+
+	    #Next, set values. Some are taken from the printer,
+	    #some are sane defaults.
+
+        if {[info exists printer_name] && $printer_name ne ""} {
+	    set printargs(hDC) $printer_name
+	    set printargs(pw) $paper_width
+	    set printargs(pl) $paper_height
+	    set printargs(lm) 1000
+	    set printargs(tm) 1000
+	    set printargs(rm) 1000
+	    set printargs(bm) 1000
+	    set printargs(resx) $dpi_x
+	    set printargs(resy) $dpi_y
+	    set printargs(copies) $copies
+	    set printargs(resolution) [list $dpi_x $dpi_y]
+		}
+	}
+
+	# _print_data
+	# This function prints multiple-page files, using a line-oriented
+	# function, taking advantage of knowing the character widths.
+	# Arguments:
+	# data -       Text data for printing
+	# breaklines - If non-zero, keep newlines in the string as
+	#              newlines in the output.
+	# font -       Font for printing
+	proc _print_data {data {breaklines 1} {font ""}} {
+	    variable printargs
+	    variable printer_name
+
+	    _set_dc
+
+	    if {![info exists printer_name]} {
+		return
+	    }
+
+	    if {$font eq ""} {
+		_gdi characters $printargs(hDC) -array printcharwid
+	    } else {
+		_gdi characters $printargs(hDC) -font $font -array printcharwid
+	    }
+	    set pagewid [expr {($printargs(pw) - $printargs(rm) ) / 1000 * $printargs(resx)}]
+	    set pagehgt [expr {($printargs(pl) - $printargs(bm) ) / 1000 * $printargs(resy)}]
+	    set totallen [string length $data]
+	    set curlen 0
+	    set curhgt [expr {$printargs(tm) * $printargs(resy) / 1000}]
+
+	    _opendoc
+	    _openpage
+
+	    while {$curlen < $totallen} {
+		set linestring [string range $data $curlen end]
+		if {$breaklines} {
+		    set endind [string first "\n" $linestring]
+		    if {$endind != -1} {
+			set linestring [string range $linestring 0 $endind]
+			# handle blank lines....
+			if {$linestring eq ""} {
+			    set linestring " "
+			}
+		    }
+		}
+
+		set result [_print_page_nextline $linestring \
+				printcharwid printargs $curhgt $font]
+		incr curlen [lindex $result 0]
+		incr curhgt [lindex $result 1]
+		if {$curhgt + [lindex $result 1] > $pagehgt} {
+		    _closepage
+		    _openpage
+		    set curhgt [expr {$printargs(tm) * $printargs(resy) / 1000}]
+		}
+	    }
+
+	    _closepage
+	    _closedoc
+	}
+
+	# _print_file
+	# This function prints multiple-page files
+	# It will either break lines or just let them run over the
+	# margins (and thus truncate).
+	# The font argument is JUST the font name, not any additional
+	# arguments.
+	# Arguments:
+	#   filename -   File to open for printing
+	#   breaklines - 1 to break lines as done on input, 0 to ignore newlines
+	#   font -       Optional arguments to supply to the text command
+	proc _print_file {filename {breaklines 1} {font ""}} {
+	    set fn [open $filename r]
+	    set data [read $fn]
+	    close $fn
+	    _print_data $data $breaklines $font
+	}
+
+	# _print_page_nextline
+	# Returns the pair "chars y"
+	# where chars is the number of characters printed on the line
+	# and y is the height of the line printed
+	# Arguments:
+	#   string -         Data to print
+	#   pdata -         Array of values for printer characteristics
+	#   cdata -         Array of values for character widths
+	#   y -              Y value to begin printing at
+	#   font -           if non-empty specifies a font to draw the line in
+	proc _print_page_nextline {string carray parray y font} {
+	    upvar #0 $carray charwidths
+	    upvar #0 $parray printargs
+
+	    variable printargs
+
+	    set endindex 0
+	    set totwidth 0
+	    set maxwidth [expr {
+		(($printargs(pw) - $printargs(rm)) / 1000) * $printargs(resx)
+	    }]
+	    set maxstring [string length $string]
+	    set lm [expr {$printargs(lm) * $printargs(resx) / 1000}]
+
+	    for {set i 0} {($i < $maxstring) && ($totwidth < $maxwidth)} {incr i} {
+		incr totwidth $charwidths([string index $string $i])
+		# set width($i) $totwidth
+	    }
+
+	    set endindex $i
+	    set startindex $endindex
+
+	    if {$i < $maxstring} {
+		# In this case, the whole data string is not used up, and we
+		# wish to break on a word. Since we have all the partial
+		# widths calculated, this should be easy.
+
+		set endindex [expr {[string wordstart $string $endindex] - 1}]
+		set startindex [expr {$endindex + 1}]
+
+		# If the line is just too long (no word breaks), print as much
+		# as you can....
+		if {$endindex <= 1} {
+		    set endindex $i
+		    set startindex $i
+		}
+	    }
+
+	    set txt [string trim [string range $string 0 $endindex] "\r\n"]
+	    if {$font ne ""} {
+		set result [_gdi text $printargs(hDC) $lm $y \
+				 -anchor nw -justify left \
+				 -text $txt -font $font]
+	    } else {
+		set result [_gdi text $printargs(hDC) $lm $y \
+				 -anchor nw -justify left -text $txt]
+	    }
+	    return "$startindex $result"
+	}
+
+	# These procedures read in the canvas widget, and write all of
+	# its contents out to the Windows printer.
+
+	variable option
+	variable vtgPrint
+
+	proc _init_print_canvas {} {
+	    variable option
+	    variable vtgPrint
+	    variable printargs
+
+	    set vtgPrint(printer.bg) white
+	}
+
+	proc _is_win {} {
+	    variable printargs
+
+	    return [info exist tk_patchLevel]
+	}
+
+	# _print_widget
+	# Main procedure for printing a widget.  Currently supports
+	# canvas widgets.  Handles opening and closing of printer.
+	# Arguments:
+	#   wid -              The widget to be printed.
+	#   printer -          Flag whether to use the default printer.
+	#   name  -            App name to pass to printer.
+
+	proc _print_widget {wid {printer default} {name "Tk Print Output"}} {
+	    variable printargs
+	    variable printer_name
+
+	    _set_dc
+
+	    if {![info exists printer_name]} {
+		return
+	    }
+
+	    _opendoc
+	    _openpage
+
+	    # Here is where any scaling/gdi mapping should take place
+	    # For now, scale so the dimensions of the window are sized to the
+	    # width of the page. Scale evenly.
+
+	    # For normal windows, this may be fine--but for a canvas, one
+	    # wants the canvas dimensions, and not the WINDOW dimensions.
+	    if {[winfo class $wid] eq "Canvas"} {
+		set sc [$wid cget -scrollregion]
+		# if there is no scrollregion, use width and height.
+		if {$sc eq ""} {
+		    set window_x [$wid cget -width]
+		    set window_y [$wid cget -height]
+		} else {
+		    set window_x [lindex $sc 2]
+		    set window_y [lindex $sc 3]
+		}
+	    } else {
+		set window_x [winfo width $wid]
+		set window_y [winfo height $wid]
+	    }
+
+	    set printer_x [expr {
+		( $printargs(pw) - $printargs(lm) - $printargs(rm) ) *
+		$printargs(resx)  / 1000.0
+	    }]
+	    set printer_y [expr {
+		( $printargs(pl) - $printargs(tm) - $printargs(bm) ) *
+		$printargs(resy) / 1000.0
+	    }]
+	    set factor_x [expr {$window_x / $printer_x}]
+	    set factor_y [expr {$window_y / $printer_y}]
+
+	    if {$factor_x < $factor_y} {
+		set lo $window_y
+		set ph $printer_y
+	    } else {
+		set lo $window_x
+		set ph $printer_x
+	    }
+
+	    _gdi map $printargs(hDC) -logical $lo -physical $ph \
+		-offset $printargs(resolution)
+
+	    # Handling of canvas widgets.
+	    switch [winfo class $wid] {
+		Canvas {
+		    _print_canvas $printargs(hDC) $wid
+		}
+		default {
+		    puts "Can't print items of type [winfo class $wid]. No handler registered"
+		}
+	    }
+
+	    # End printing process.
+	    _closepage
+	    _closedoc
+	}
+
+	#  _print_canvas
+	# Main procedure for writing canvas widget items to printer.
+	# Arguments:
+	#    hdc -              The printer handle.
+	#    cw  -              The canvas widget.
+	proc _print_canvas {hdc cw} {
+	    variable  vtgPrint
+	    variable printargs
+
+	    # Get information about page being printed to
+	    # print_canvas.CalcSizing $cw
+	    set vtgPrint(canvas.bg) [string tolower [$cw cget -background]]
+
+	    # Re-write each widget from cw to printer
+	    foreach id [$cw find all] {
+		set type [$cw type $id]
+		if {[info commands _print_canvas.$type] eq "_print_canvas.$type"} {
+		    _print_canvas.[$cw type $id] $printargs(hDC) $cw $id
+		} else {
+		    puts "Omitting canvas item of type $type since there is no handler registered for it"
+		}
+	    }
+	}
+
+	# These procedures support the various canvas item types, reading the
+	# information about the item on the real canvas and then writing a
+	# similar item to the printer.
+
+	# _print_canvas.line
+	# Description:
+	#   Prints a line item.
+	# Arguments:
+	#   hdc -              The printer handle.
+	#   cw  -              The canvas widget.
+	#   id  -              The id of the canvas item.
+	proc _print_canvas.line {hdc cw id} {
+	    variable vtgPrint
+	    variable printargs
+
+	    set color [_print_canvas.TransColor [$cw itemcget $id -fill]]
+	    if {[string match $vtgPrint(printer.bg) $color]} {
+		return
+	    }
+
+	    set coords  [$cw coords $id]
+	    set wdth    [$cw itemcget $id -width]
+	    set arrow   [$cw itemcget $id -arrow]
+	    set arwshp  [$cw itemcget $id -arrowshape]
+	    set dash    [$cw itemcget $id -dash]
+	    set smooth  [$cw itemcget $id -smooth]
+	    set splinesteps [$cw itemcget $id -splinesteps]
+
+	    set cmdargs {}
+
+	    if {$wdth > 1} {
+		lappend cmdargs -width $wdth
+	    }
+	    if {$dash ne ""} {
+		lappend cmdargs -dash $dash
+	    }
+	    if {$smooth ne ""} {
+		lappend cmdargs -smooth $smooth
+	    }
+	    if {$splinesteps ne ""} {
+		lappend cmdargs -splinesteps $splinesteps
+	    }
+
+	    set result [_gdi line $hdc {*}$coords \
+			    -fill $color -arrow $arrow -arrowshape $arwshp \
+			    {*}$cmdargs]
+	    if {$result ne ""} {
+		puts $result
+	    }
+	}
+
+	# _print_canvas.arc
+	#   Prints a arc item.
+	# Args:
+	#   hdc -              The printer handle.
+	#   cw  -              The canvas widget.
+	#   id  -              The id of the canvas item.
+	proc _print_canvas.arc {hdc cw id} {
+	    variable vtgPrint
+	    variable printargs
+
+	    set color [_print_canvas.TransColor [$cw itemcget $id -outline]]
+	    if {[string match $vtgPrint(printer.bg) $color]} {
+		return
+	    }
+	    set coords  [$cw coords $id]
+	    set wdth    [$cw itemcget $id -width]
+	    set style   [$cw itemcget $id -style]
+	    set start   [$cw itemcget $id -start]
+	    set extent  [$cw itemcget $id -extent]
+	    set fill    [$cw itemcget $id -fill]
+
+	    set cmdargs {}
+	    if {$wdth > 1} {
+		lappend cmdargs -width $wdth
+	    }
+	    if {$fill ne ""} {
+		lappend cmdargs -fill $fill
+	    }
+
+	    _gdi arc $hdc {*}$coords \
+		-outline $color -style $style -start $start -extent $extent \
+		{*}$cmdargs
+	}
+
+	# _print_canvas.polygon
+	#   Prints a polygon item.
+	# Arguments:
+	#   hdc -              The printer handle.
+	#   cw  -              The canvas widget.
+	#   id  -              The id of the canvas item.
+	proc _print_canvas.polygon {hdc cw id} {
+	    variable vtgPrint
+	    variable printargs
+
+	    set fcolor [_print_canvas.TransColor [$cw itemcget $id -fill]]
+	    if {$fcolor eq ""} {
+		set fcolor $vtgPrint(printer.bg)
+	    }
+	    set ocolor [_print_canvas.TransColor [$cw itemcget $id -outline]]
+	    if {$ocolor eq ""} {
+		set ocolor $vtgPrint(printer.bg)
+	    }
+	    set coords  [$cw coords $id]
+	    set wdth [$cw itemcget $id -width]
+	    set smooth  [$cw itemcget $id -smooth]
+	    set splinesteps [$cw itemcget $id -splinesteps]
+
+	    set cmdargs {}
+	    if {$smooth ne ""} {
+		lappend cmdargs -smooth $smooth
+	    }
+	    if {$splinesteps ne ""} {
+		lappend cmdargs -splinesteps $splinesteps
+	    }
+
+	    _gdi polygon $hdc {*}$coords \
+		-width $wdth -fill $fcolor -outline $ocolor {*}$cmdargs
+	}
+
+	# _print_canvas.oval
+	#   Prints an oval item.
+	# Arguments:
+	#   hdc -              The printer handle.
+	#   cw  -              The canvas widget.
+	#   id  -              The id of the canvas item.
+	proc _print_canvas.oval {hdc cw id} {
+	    variable vtgPrint
+
+	    set fcolor [_print_canvas.TransColor [$cw itemcget $id -fill]]
+	    if {$fcolor eq ""} {
+		set fcolor $vtgPrint(printer.bg)
+	    }
+	    set ocolor [_print_canvas.TransColor [$cw itemcget $id -outline]]
+	    if {$ocolor eq ""} {
+		set ocolor $vtgPrint(printer.bg)
+	    }
+	    set coords  [$cw coords $id]
+	    set wdth [$cw itemcget $id -width]
+
+	    _gdi oval $hdc {*}$coords \
+		-width $wdth -fill $fcolor -outline $ocolor
+	}
+
+	# _print_canvas.rectangle
+	#   Prints a rectangle item.
+	# Arguments:
+	#   hdc -              The printer handle.
+	#   cw  -              The canvas widget.
+	#   id  -              The id of the canvas item.
+	proc _print_canvas.rectangle {hdc cw id} {
+	    variable vtgPrint
+
+	    set fcolor [_print_canvas.TransColor [$cw itemcget $id -fill]]
+	    if {$fcolor eq ""} {
+		set fcolor $vtgPrint(printer.bg)
+	    }
+	    set ocolor [_print_canvas.TransColor [$cw itemcget $id -outline]]
+	    if {$ocolor eq ""} {
+		set ocolor $vtgPrint(printer.bg)
+	    }
+	    set coords  [$cw coords $id]
+	    set wdth [$cw itemcget $id -width]
+
+	    _gdi rectangle $hdc {*}$coords \
+		-width $wdth -fill $fcolor -outline $ocolor
+	}
+
+	# _print_canvas.text
+	#   Prints a text item.
+	# Arguments:
+	#   hdc -              The printer handle.
+	#   cw  -              The canvas widget.
+	#   id  -              The id of the canvas item.
+	proc _print_canvas.text {hdc cw id} {
+	    variable vtgPrint
+	    variable printargs
+
+	    set color [_print_canvas.TransColor [$cw itemcget $id -fill]]
+	    #    if {"white" eq [string tolower $color]} {return}
+	    #    set color black
+	    set txt [$cw itemcget $id -text]
+	    if {$txt eq ""} {
+		return
+	    }
+	    set coords [$cw coords $id]
+	    set anchr [$cw itemcget $id -anchor]
+
+	    set bbox [$cw bbox $id]
+	    set wdth [expr {[lindex $bbox 2] - [lindex $bbox 0]}]
+
+	    set just [$cw itemcget $id -justify]
+
+	    # Get the real canvas font info and create a compatible font,
+	    # suitable for printer name extraction.
+	    set font [font create {*}[font actual [$cw itemcget $id -font]]]
+
+	    # Just get the name and family, or some of the _gdi commands will
+	    # fail.
+	    set font [list [font configure $font -family] \
+			  -[font configure $font -size]]
+
+	    _gdi text $hdc {*}$coords \
+		-fill $color -text $txt -font $font \
+		-anchor $anchr -width $wdth -justify $just
+	}
+
+	# _print_canvas.image
+	# Prints an image item.
+	# Arguments:
+	#   hdc -              The printer handle.
+	#   cw  -              The canvas widget.
+	#   id  -              The id of the canvas item.
+	proc _print_canvas.image {hdc cw id} {
+	    # First, we have to get the image name.
+	    set imagename [$cw itemcget $id -image]
+
+	    # Now we get the size.
+	    set wid [image width $imagename]
+	    set hgt [image height $imagename]
+
+	    # Next, we get the location and anchor
+	    set anchor [$cw itemcget $id -anchor]
+	    set coords [$cw coords $id]
+
+	    _gdi photo $hdc -destination $coords -photo $imagename
+	}
+
+	# _print_canvas.bitmap
+	#   Prints a bitmap item.
+	# Arguments:
+	#   hdc -              The printer handle.
+	#   cw  -              The canvas widget.
+	#   id  -              The id of the canvas item.
+	proc _print_canvas.bitmap {hdc cw id} {
+	    variable option
+	    variable vtgPrint
+
+	    # First, we have to get the bitmap name.
+	    set imagename [$cw itemcget $id -image]
+
+	    # Now we get the size.
+	    set wid [image width $imagename]
+	    set hgt [image height $imagename]
+
+	    #Next, we get the location and anchor.
+	    set anchor [$cw itemcget $id -anchor]
+	    set coords [$cw coords $id]
+
+	    # Since the GDI commands don't yet support images and bitmaps,
+	    # and since this represents a rendered bitmap, we CAN use
+	    # copybits IF we create a new temporary toplevel to hold the beast.
+	    # If this is too ugly, change the option!
+
+	    if {[info exist option(use_copybits)]} {
+		set firstcase $option(use_copybits)
+	    } else {
+		set firstcase 0
+	    }
+	    if {$firstcase > 0} {
+		set tl [toplevel .tmptop[expr {int( rand() * 65535 )}] \
+			    -height $hgt -width $wid \
+			    -background $vtgPrint(canvas.bg)]
+		canvas $tl.canvas -width $wid -height $hgt
+		$tl.canvas create image 0 0 -image $imagename -anchor nw
+		pack $tl.canvas -side left -expand false -fill none
+		tkwait visibility $tl.canvas
+		update
+		set srccoords [list 0 0 [expr {$wid - 1}] [expr {$hgt - 1}]]
+		set dstcoords [list [lindex $coords 0] [lindex $coords 1] [expr {$wid - 1}] [expr {$hgt - 1}]]
+		_gdi copybits $hdc -window $tl -client \
+		    -source $srccoords -destination $dstcoords
+		destroy $tl
+	    } else {
+		_gdi bitmap $hdc {*}$coords \
+		    -anchor $anchor -bitmap $imagename
+	    }
+	}
+
+	# These procedures transform attribute setting from the real
+	# canvas to the appropriate setting for printing to paper.
+
+	# _print_canvas.TransColor
+	#   Does the actual transformation of colors from the
+	#   canvas widget to paper.
+	# Arguments:
+	#   color -            The color value to be transformed.
+	proc _print_canvas.TransColor {color} {
+	    variable vtgPrint
+	    variable printargs
+
+	    switch [string toupper $color] {
+		$vtgPrint(canvas.bg)       {return $vtgPrint(printer.bg)}
+	    }
+	    return $color
+	}
+
+	# Initialize all the variables once.
+	_init_print_canvas
+    }
+    #end win32 procedures
+
+    #begin X11 procedures
+
+    # X11 procedures wrap standard Unix shell commands such as lp/lpr and
+    # lpstat for printing. Some output configuration that on other platforms
+    # is managed through the printer driver/dialog is configured through the
+    # canvas postscript command.
+
+    if {[tk windowingsystem] eq "x11"} {
+	variable printcmd ""
+	variable printlist {}
+	variable choosepaper
+	variable chooseprinter {}
+	variable p
+
+	# _setprintenv
+	#  Set the print environtment - print command, and list of printers.
+	#  Arguments:
+	#    none.
+
+	proc _setprintenv {} {
+	    variable printcmd
+	    variable printlist
+
+	    #Test for existence of lpstat command to obtain list of printers. Return error
+	    #if not found.
+
+	    catch {exec lpstat -a} msg
+	    set notfound "command not found"
+	    if {[string first $notfound $msg] != -1} {
+		error "Unable to obtain list of printers. Please install the CUPS package \
+		for your system."
+		return
+	    }
+		set notfound "No destinations added"
+		if {[string first $notfound $msg] != -1} {
+		error "Please check or update your CUPS installation."
+		return
+	    }
+
+	    # Select print command. We prefer lpr, but will fall back to lp if
+	    # necessary.
+	    if {[auto_execok lpr] ne ""} {
+		set printcmd lpr
+	    } else {
+		set printcmd lp
+	    }
+
+	    #Build list of printers.
+	    set printdata [exec lpstat -a]
+	    foreach item [split $printdata \n] {
+		lappend printlist [lindex [split $item] 0]
+	    }
+	}
+
+	# _print
+	#  Main printer dialog. Select printer, set options, and
+	#  fire print command.
+	# Arguments:
+	#  w - widget with contents to print.
+	#
+
+	proc _print {w} {
+	    variable printlist
+	    variable printcmd
+	    variable chooseprinter
+	    variable printcopies
+	    variable printorientation
+	    variable choosepaper
+	    variable color
+	    variable p
+	    variable zoomnumber
+
+	    _setprintenv
+
+	    set chooseprinter [lindex $printlist 0]
+
+	    set p ._print
+	    catch {destroy $p}
+
+	    toplevel $p
+	    wm title $p "Print"
+	    wm resizable $p 0 0
+
+	    frame $p.frame -padx 10 -pady 10
+	    pack $p.frame -fill x -expand no
+
+	    #The main dialog
+	    frame $p.frame.printframe -padx 5 -pady 5
+	    pack $p.frame.printframe -side top -fill x -expand no
+
+	    label $p.frame.printframe.printlabel -text [mc "Printer"]
+	    ttk::combobox $p.frame.printframe.mb \
+		-textvariable [namespace which -variable chooseprinter] \
+		-state readonly -values [lsort -unique $printlist]
+	    pack $p.frame.printframe.printlabel $p.frame.printframe.mb \
+		-side left -fill x -expand no
+
+	    bind $p.frame.printframe.mb <<ComboboxSelected>>  {
+		set chooseprinter {$p.frame.printframe.mb get}
+	    }
+
+	    set paperlist [list [mc Letter] [mc Legal] [mc A4]]
+	    set colorlist [list [mc Grayscale] [mc RGB]]
+
+	    #Initialize with sane defaults.
+	    set printcopies 1
+	    set choosepaper [mc A4]
+	    set color [mc RGB]
+	    set printorientation portrait
+
+	    set percentlist {100 90 80 70 60 50 40 30 20 10}
+
+	    #Base widgets to load.
+	    labelframe $p.frame.copyframe -text [mc "Options"] -padx 5 -pady 5
+	    pack $p.frame.copyframe -fill x -expand no
+
+	    frame $p.frame.copyframe.l -padx 5 -pady 5
+	    pack $p.frame.copyframe.l -side top -fill x -expand no
+
+	    label $p.frame.copyframe.l.copylabel -text [mc "Copies"]
+	    spinbox $p.frame.copyframe.l.field -from 1 -to 1000 \
+		-textvariable [namespace which -variable printcopies] -width 5
+
+	    pack  $p.frame.copyframe.l.copylabel $p.frame.copyframe.l.field \
+		-side left -fill x -expand  no
+
+	    set printcopies [$p.frame.copyframe.l.field get]
+
+	    frame $p.frame.copyframe.r -padx 5 -pady 5
+	    pack $p.frame.copyframe.r -fill x -expand no
+
+	    label $p.frame.copyframe.r.paper -text [mc "Paper"]
+	    tk_optionMenu $p.frame.copyframe.r.menu \
+		[namespace which -variable choosepaper] \
+		{*}$paperlist
+
+	    pack $p.frame.copyframe.r.paper $p.frame.copyframe.r.menu \
+		-side left -fill x -expand no
+
+	    #Widgets with additional options for canvas output.
+	    if {[winfo class $w] eq "Canvas"} {
+
+		frame $p.frame.copyframe.z -padx 5 -pady 5
+		pack $p.frame.copyframe.z  -fill x -expand no
+
+		label $p.frame.copyframe.z.zlabel -text [mc "Scale"]
+		tk_optionMenu $p.frame.copyframe.z.zentry \
+		    [namespace which -variable zoomnumber] \
+		    {*}$percentlist
+
+		pack $p.frame.copyframe.z.zlabel $p.frame.copyframe.z.zentry \
+		    -side left -fill x -expand no
+
+		frame $p.frame.copyframe.orient -padx 5 -pady 5
+		pack $p.frame.copyframe.orient  -fill x -expand no
+
+		label $p.frame.copyframe.orient.text -text [mc "Orientation"]
+		radiobutton $p.frame.copyframe.orient.v -text [mc "Portrait"] \
+		    -value portrait -compound left \
+		    -variable [namespace which -variable printorientation]
+		radiobutton $p.frame.copyframe.orient.h -text [mc "Landscape"] \
+		    -value landscape -compound left \
+		    -variable [namespace which -variable printorientation]
+
+		pack $p.frame.copyframe.orient.text \
+		    $p.frame.copyframe.orient.v $p.frame.copyframe.orient.h \
+		    -side left -fill x -expand no
+
+		frame $p.frame.copyframe.c -padx 5 -pady 5
+		pack $p.frame.copyframe.c  -fill x -expand no
+
+		label $p.frame.copyframe.c.l -text [mc "Output"]
+		tk_optionMenu $p.frame.copyframe.c.c \
+		    [namespace which -variable color] \
+		    {*}$colorlist
+		pack $p.frame.copyframe.c.l $p.frame.copyframe.c.c -side left \
+		    -fill x -expand no
+	    }
+
+	    #Build rest of GUI.
+	    frame $p.frame.buttonframe
+	    pack $p.frame.buttonframe -fill x -expand no -side bottom
+
+	    button $p.frame.buttonframe.printbutton -text [mc "Print"] \
+		-command [namespace code [list _runprint $w]]
+	    button $p.frame.buttonframe.cancel -text [mc "Cancel"] \
+		-command {destroy ._print}
+
+	    pack $p.frame.buttonframe.printbutton $p.frame.buttonframe.cancel \
+		-side right -fill x -expand no
+	    #Center the window as a dialog.
+	    ::tk::PlaceWindow $p
+	}
+
+	# _runprint -
+	#   Execute the print command--print the file.
+	# Arguments:
+	#  w - widget with contents to print.
+	#
+	proc _runprint {w} {
+	    variable printlist
+	    variable printcmd
+	    variable choosepaper
+	    variable chooseprinter
+	    variable color
+	    variable printcopies
+	    variable printorientation
+	    variable zoomnumber
+	    variable p
+
+	    #First, generate print file.
+
+	    if {[winfo class $w] eq "Text"} {
+		set file [makeTempFile tk_text.txt [$w get 1.0 end]]
+	    }
+
+	    if {[winfo class $w] eq "Canvas"} {
+		if {$color eq [mc "RGB"]} {
+		    set colormode color
+		} else {
+		    set colormode gray
+		}
+
+		if {$printorientation eq "landscape"} {
+		    set willrotate "1"
+		} else {
+		    set willrotate "0"
+		}
+
+		#Scale based on size of widget, not size of paper.
+		set printwidth [expr {$zoomnumber / 100.00 * [winfo width $w]}]
+		set file [makeTempFile tk_canvas.ps]
+		$w postscript -file $file -colormode $colormode \
+		    -rotate $willrotate -pagewidth $printwidth
+	    }
+
+	    #Build list of args to pass to print command.
+
+	    set printargs {}
+	    set printcopies [$p.frame.copyframe.l.field get]
+	    if {$printcmd eq "lpr"} {
+		lappend printargs -P $chooseprinter -# $printcopies
+	    } else {
+		lappend printargs -d $chooseprinter -n $printcopies
+	    }
+
+	    after 500
+	    exec $printcmd {*}$printargs -o PageSize=$choosepaper $file
+
+	    after 500
+	    destroy ._print
+	}
+    }
+    #end X11 procedures
+
+    #begin macOS Aqua procedures
+    if {[tk windowingsystem] eq "aqua"} {
+	# makePDF -
+	#   Convert a file to PDF
+	# Arguments:
+	#   inFilename -  file containing the data to convert; format is
+	#                 autodetected.
+	#   outFilename - base for filename to write to; conventionally should
+	#                 have .pdf as suffix
+	# Returns:
+	#   The full pathname of the generated PDF.
+	#
+	proc makePDF {inFilename outFilename} {
+	    set out [::tk::print::makeTempFile $outFilename]
+	    try {
+		exec /usr/sbin/cupsfilter $inFilename > $out
+	    } trap NONE {msg} {
+		# cupsfilter produces a lot of debugging output, which we
+		# don't want.
+		regsub -all -line {^(?:DEBUG|INFO):.*$} $msg "" msg
+		set msg [string trimleft [regsub -all {\n+} $msg "\n"] "\n"]
+		if {$msg ne ""} {
+		    # Lines should be prefixed with WARN or ERROR now
+		    puts $msg
+		}
+	    }
+	    return $out
+	}
+    }
+    #end macOS Aqua procedures
+
+    namespace export canvas text
+    namespace ensemble create
+}
+
+# tk print --
+# This procedure prints the canvas and text widgets using platform-
+# native API's.
+#   Arguments:
+#      w: Widget to print.
+proc ::tk::print {w} {
+    switch [winfo class $w],[tk windowingsystem] {
+	"Canvas,win32" {
+	    tailcall ::tk::print::_print_widget $w 0 "Tk Print Output"
+	}
+	"Canvas,x11" {
+	    tailcall ::tk::print::_print $w
+	}
+	"Canvas,aqua" {
+	    set psfile [::tk::print::makeTempFile tk_canvas.ps]
+	    try {
+		$w postscript -file $psfile
+		set printfile [::tk::print::makePDF $psfile tk_canvas.pdf]
+		::tk::print::_print $printfile
+	    } finally {
+		file delete $psfile
+	    }
+	}
+
+	"Text,win32" {
+	    tailcall ::tk::print::_print_data [$w get 1.0 end] 1 {Arial 12}
+	}
+	"Text,x11" {
+	    tailcall ::tk::print::_print $w
+	}
+	"Text,aqua" {
+	    set txtfile [::tk::print::makeTempFile tk_text.txt [$w get 1.0 end]]
+	    try {
+		set printfile [::tk::print::makePDF $txtfile tk_text.pdf]
+		::tk::print::_print $printfile
+	    } finally {
+		file delete $txtfile
+	    }
+	}
+
+	default {
+	    return -code error -errorcode {TK PRINT CLASS_UNSUPPORTED} \
+		"widgets of class [winfo class $w] are not supported on\
+		this platform"
+	}
+    }
+}
+
+#Add this command to the tk command ensemble: tk print
+#Thanks to Christian Gollwitzer for the guidance here
+namespace ensemble configure tk -map \
+    [dict merge [namespace ensemble configure tk -map] \
+	 {print ::tk::print}]
+
+return
+
+# Local Variables:
+# mode: tcl
+# fill-column: 78
+# End:
diff --git a/library/tk.tcl b/library/tk.tcl
index 63d90f9..538edd5 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -502,6 +502,7 @@ if {$::tk_library ne ""} {
 	SourceLibFile listbox
 	SourceLibFile menu
 	SourceLibFile panedwindow
+	SourceLibFile print
 	SourceLibFile scale
 	SourceLibFile scrlbar
 	SourceLibFile spinbox
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 0198504..7dc9f32 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -586,6 +586,7 @@ TkpInit(
     Tcl_CreateObjCommand(interp, "::tk::mac::GetAppPath",
 	    TkMacOSXGetAppPathCmd, NULL, NULL);
     MacSystrayInit(interp);
+    MacPrint_Init(interp);
 
     return TCL_OK;
 }
diff --git a/macosx/tkMacOSXPrint.c b/macosx/tkMacOSXPrint.c
new file mode 100644
index 0000000..38cd1ca
--- /dev/null
+++ b/macosx/tkMacOSXPrint.c
@@ -0,0 +1,353 @@
+/*
+ * tkMacOSXPrint.c --
+ *
+ *      This module implements native printing dialogs for macOS.
+ *
+ * Copyright © 2006 Apple Inc.
+ * Copyright © 2011-2021 Kevin Walzer/WordTech Communications LLC.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#include <tcl.h>
+#include <tk.h>
+#include <tkInt.h>
+#include <Cocoa/Cocoa.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreServices/CoreServices.h>
+#include <ApplicationServices/ApplicationServices.h>
+#include <tkMacOSXInt.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <fcntl.h>
+
+/* Forward declarations of functions and variables. */
+NSString * fileName = nil;
+CFStringRef urlFile = NULL;
+int			StartPrint(ClientData clientData, Tcl_Interp * interp,
+			    int objc, Tcl_Obj * const objv[]);
+OSStatus		FinishPrint(NSString *file, int buttonValue);
+int			MacPrint_Init(Tcl_Interp * interp);
+
+/* Delegate class for print dialogs. */
+@interface PrintDelegate: NSObject
+    - (id) init;
+    - (void) printPanelDidEnd: (NSPrintPanel *) printPanel
+		   returnCode: (int) returnCode
+		  contextInfo: (void *) contextInfo;
+@end
+
+@implementation PrintDelegate
+- (id) init {
+    self = [super init];
+    return self;
+}
+
+- (void) printPanelDidEnd: (NSPrintPanel *) printPanel
+	       returnCode: (int) returnCode
+	      contextInfo: (void *) contextInfo {
+    /*
+     * Pass returnCode to FinishPrint function to determine how to
+     * handle.
+     */
+    FinishPrint(fileName, returnCode);
+}
+@end
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * StartPrint --
+ *
+ * 	Launch native print dialog.
+ *
+ * Results:
+ *	Configures values and starts print process.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+StartPrint(
+    ClientData clientData,
+    Tcl_Interp * interp,
+    int objc,
+    Tcl_Obj *const objv[])
+{
+    (void) clientData;
+    NSPrintInfo * printInfo = [NSPrintInfo sharedPrintInfo];
+    NSPrintPanel * printPanel = [NSPrintPanel printPanel];
+    int accepted;
+    PMPrintSession printSession;
+    PMPageFormat pageFormat;
+    PMPrintSettings printSettings;
+    OSStatus status = noErr;
+
+    /* Check for proper number of arguments. */
+    if (objc < 2) {
+        Tcl_WrongNumArgs(interp, 1, objv, "file");
+        return TCL_ERROR;
+    }
+
+    fileName = [NSString stringWithUTF8String: Tcl_GetString(objv[1])];
+    urlFile = (CFStringRef) fileName;
+    CFRetain(urlFile);
+
+    /* Initialize the delegate for the callback from the page panel. */
+    PrintDelegate * printDelegate = [[PrintDelegate alloc] init];
+
+    status = PMCreateSession( & printSession);
+    if (status != noErr) {
+        NSLog(@ "Error creating print session.");
+        return TCL_ERROR;
+    }
+
+    status = PMCreatePrintSettings( & printSettings);
+    if (status != noErr) {
+        NSLog(@ "Error creating print settings.");
+        return TCL_ERROR;
+    }
+
+    status = PMSessionDefaultPrintSettings(printSession, printSettings);
+    if (status != noErr) {
+        NSLog(@ "Error creating default print settings.");
+        return TCL_ERROR;
+    }
+
+    printSession = (PMPrintSession)[printInfo PMPrintSession];
+    pageFormat = (PMPageFormat)[printInfo PMPageFormat];
+    printSettings = (PMPrintSettings)[printInfo PMPrintSettings];
+
+    accepted = [printPanel runModalWithPrintInfo: printInfo];
+    [printDelegate printPanelDidEnd: printPanel
+			 returnCode: accepted
+			contextInfo: printInfo];
+
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * FinishPrint --
+ *
+ * 	Handles print process based on input from dialog.
+ *
+ * Results:
+ *	Completes print process.
+ *
+ *----------------------------------------------------------------------
+ */
+
+OSStatus
+FinishPrint(
+    NSString *file,
+    int buttonValue)
+{
+    NSPrintInfo * printInfo = [NSPrintInfo sharedPrintInfo];
+    PMPrintSession printSession;
+    PMPageFormat pageFormat;
+    PMPrintSettings printSettings;
+    OSStatus status = noErr;
+    CFStringRef mimeType = NULL;
+
+    /*
+     * If value passed here is NSCancelButton, return noErr;
+     * otherwise printing will occur regardless of value.
+     */
+    if (buttonValue == NSModalResponseCancel) {
+        return noErr;
+    }
+
+    status = PMCreateSession( & printSession);
+    if (status != noErr) {
+        NSLog(@ "Error creating print session.");
+        return status;
+    }
+
+    status = PMCreatePrintSettings( & printSettings);
+    if (status != noErr) {
+        NSLog(@ "Error creating print settings.");
+        return status;
+    }
+
+    status = PMSessionDefaultPrintSettings(printSession, printSettings);
+    if (status != noErr) {
+        NSLog(@ "Error creating default print settings.");
+        return status;
+    }
+
+    printSession = (PMPrintSession)[printInfo PMPrintSession];
+    pageFormat = (PMPageFormat)[printInfo PMPageFormat];
+    printSettings = (PMPrintSettings)[printInfo PMPrintSettings];
+
+    /*Handle print operation.*/
+    if (buttonValue == NSModalResponseOK) {
+
+        if (urlFile == NULL) {
+            NSLog(@ "Could not get file to print.");
+            return noErr;
+        }
+
+        fileName = file;
+
+        CFURLRef printURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, urlFile, kCFURLPOSIXPathStyle, false);
+
+        PMPrinter currentPrinter;
+        PMDestinationType printDestination;
+
+        /*Get the intended destination.*/
+        status = PMSessionGetDestinationType(printSession, printSettings, & printDestination);
+
+        /*Destination is printer. Send file to printer.*/
+        if (status == noErr && printDestination == kPMDestinationPrinter) {
+
+            status = PMSessionGetCurrentPrinter(printSession, & currentPrinter);
+            if (status == noErr) {
+                CFArrayRef mimeTypes;
+                status = PMPrinterGetMimeTypes(currentPrinter, printSettings, & mimeTypes);
+                if (status == noErr && mimeTypes != NULL) {
+                    mimeType = CFSTR("application/pdf");
+                    if (CFArrayContainsValue(mimeTypes, CFRangeMake(0, CFArrayGetCount(mimeTypes)), mimeType)) {
+                        status = PMPrinterPrintWithFile(currentPrinter, printSettings, pageFormat, mimeType, printURL);
+                        CFRelease(urlFile);
+                        return status;
+                    }
+                }
+            }
+        }
+
+        /* Destination is file. Determine how to handle. */
+        if (status == noErr && printDestination == kPMDestinationFile) {
+            CFURLRef outputLocation = NULL;
+
+            status = PMSessionCopyDestinationLocation(printSession, printSettings, & outputLocation);
+            if (status == noErr) {
+                /*Get the source file and target destination, convert to strings.*/
+                CFStringRef sourceFile = CFURLCopyFileSystemPath(printURL, kCFURLPOSIXPathStyle);
+                CFStringRef savePath = CFURLCopyFileSystemPath(outputLocation, kCFURLPOSIXPathStyle);
+                NSString * sourcePath = (NSString * ) sourceFile;
+                NSString * finalPath = (NSString * ) savePath;
+                NSString * pathExtension = [finalPath pathExtension];
+                NSFileManager * fileManager = [NSFileManager defaultManager];
+		NSError * error = nil;
+
+                /*
+		 * Is the target file a PDF? If so, copy print file
+		 * to output location.
+		 */
+                if ([pathExtension isEqualToString: @ "pdf"]) {
+
+		    /*Make sure no file conflict exists.*/
+		    if ([fileManager fileExistsAtPath: finalPath]) {
+			[fileManager removeItemAtPath: finalPath error: &error];
+		    }
+                    if ([fileManager fileExistsAtPath: sourcePath]) {
+                        error = nil;
+                        [fileManager copyItemAtPath: sourcePath toPath: finalPath error: & error];
+                    }
+		    return status;
+                }
+
+                /*
+                 * Is the target file PostScript? If so, run print file
+                 * through CUPS filter to convert back to PostScript.
+                 */
+
+              if ([pathExtension isEqualToString: @ "ps"]) {
+                    char source[5012];
+                    char target[5012];
+                    [sourcePath getCString: source maxLength: (sizeof source) encoding: NSUTF8StringEncoding];
+                    [finalPath getCString: target maxLength: (sizeof target) encoding: NSUTF8StringEncoding];
+		    /*Make sure no file conflict exists.*/
+		    if ([fileManager fileExistsAtPath: finalPath]) {
+			[fileManager removeItemAtPath: finalPath error: &error];
+		    }
+
+		    /*
+		     *  Fork and start new process with command string. Thanks to Peter da Silva
+		     *  for assistance.
+		     */
+  		    pid_t pid;
+		    if ((pid = fork()) == -1) {
+		      return -1;
+		    } else if (pid == 0) {
+		      /* Redirect output to file and silence debugging output.*/
+		      dup2(open(target, O_RDWR | O_CREAT, 0777), 1);
+		      dup2(open("/dev/null", O_WRONLY), 2);
+		      execl("/usr/sbin/cupsfilter", "/usr/sbin/cupsfilter", "-m", "application/postscript", source, NULL);
+		      exit(0);
+		    }
+	      return status;
+	      }
+	    }
+	}
+
+        /* Destination is preview. Open file in default application for PDF. */
+        if ((status == noErr) && (printDestination == kPMDestinationPreview)) {
+            CFStringRef urlpath = CFURLCopyFileSystemPath(printURL, kCFURLPOSIXPathStyle);
+            NSString * path = (NSString * ) urlpath;
+            NSURL * url = [NSURL fileURLWithPath: path];
+            NSWorkspace * ws = [NSWorkspace sharedWorkspace];
+            [ws openURL: url];
+            status = noErr;
+            return status;
+        }
+
+        /*
+         * If destination is not printer, file or preview,
+         * we do not support it. Display alert.
+         */
+
+	if (((status == noErr) && (printDestination != kPMDestinationPreview)) || ((status == noErr) && (printDestination != kPMDestinationFile)) || ((status == noErr) &&  (printDestination != kPMDestinationPrinter))) {
+
+            NSAlert * alert = [[[NSAlert alloc] init] autorelease];
+            [alert addButtonWithTitle: @ "OK"];
+
+            [alert setMessageText: @ "Unsupported Printing Operation"];
+            [alert setInformativeText: @ "This printing operation is not supported."];
+            [alert setAlertStyle: NSAlertStyleInformational];
+            [alert runModal];
+            return status;
+        }
+    }
+
+    /* Return because cancel button was clicked. */
+    if (buttonValue == NSModalResponseCancel) {
+        PMRelease(printSession);
+        return status;
+    }
+
+    return status;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * MacPrint_Init--
+ *
+ * 	Initializes the printing module.
+ *
+ * Results:
+ *	Printing module initialized.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int MacPrint_Init(Tcl_Interp * interp) {
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+    Tcl_CreateObjCommand(interp, "::tk::print::_print", StartPrint, (ClientData) NULL, (Tcl_CmdDeleteProc * ) NULL);
+    [pool release];
+    return TCL_OK;
+}
+
+/*
+ * Local Variables:
+ * mode: objc
+ * c-basic-offset: 4
+ * fill-column: 79
+ * coding: utf-8
+ * End:
+ */
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 33df1d8..0de2805 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -298,6 +298,7 @@ MODULE_SCOPE Bool       TkMacOSXInDarkMode(Tk_Window tkwin);
 MODULE_SCOPE void	TkMacOSXDrawAllViews(ClientData clientData);
 MODULE_SCOPE unsigned long TkMacOSXClearPixel(void);
 MODULE_SCOPE int MacSystrayInit(Tcl_Interp *);
+MODULE_SCOPE int MacPrint_Init(Tcl_Interp *);
 
 
 #pragma mark Private Objective-C Classes
diff --git a/tests/tk.test b/tests/tk.test
index a42008f..0316a7b 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -17,7 +17,7 @@ test tk-1.1 {tk command: general} -body {
 } -returnCodes error -result {wrong # args: should be "tk subcommand ?arg ...?"}
 test tk-1.2 {tk command: general} -body {
     tk xyz
-} -returnCodes error -result {unknown or ambiguous subcommand "xyz": must be appname, busy, caret, fontchooser, inactive, scaling, sysnotify, systray, useinputmethods, or windowingsystem}
+} -returnCodes error -result {unknown or ambiguous subcommand "xyz": must be appname, busy, caret, fontchooser, inactive, print, scaling, sysnotify, systray, useinputmethods, or windowingsystem}
 
 # Value stored to restore default settings after 2.* tests
 set appname [tk appname]
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 0165697..89298fc 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -403,7 +403,8 @@ AQUA_OBJS = tkMacOSXBitmap.o tkMacOSXButton.o tkMacOSXClipboard.o \
 	tkMacOSXInit.o tkMacOSXKeyboard.o tkMacOSXKeyEvent.o \
 	tkMacOSXMenu.o \
 	tkMacOSXMenubutton.o tkMacOSXMenus.o tkMacOSXMouseEvent.o \
-	tkMacOSXNotify.o tkMacOSXRegion.o tkMacOSXScrlbr.o tkMacOSXSend.o \
+	tkMacOSXNotify.o tkMacOSXPrint.o tkMacOSXRegion.o \
+	tkMacOSXScrlbr.o tkMacOSXSend.o \
 	tkMacOSXServices.o tkMacOSXSubwindows.o tkMacOSXWindowEvent.o \
 	tkMacOSXWm.o tkMacOSXXStubs.o tkMacOSXSysTray.o\
 	tkFileFilter.o tkMacWinMenu.o tkPointer.o tkUnix3d.o tkUnixScale.o \
@@ -1427,6 +1428,9 @@ tkMacOSXMouseEvent.o: $(MAC_OSX_DIR)/tkMacOSXMouseEvent.c
 tkMacOSXNotify.o: $(MAC_OSX_DIR)/tkMacOSXNotify.c
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXNotify.c
 
+tkMacOSXPrint.o: $(MAC_OSX_DIR)/tkMacOSXPrint.c
+	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXPrint.c
+
 tkMacOSXRegion.o: $(MAC_OSX_DIR)/tkMacOSXRegion.c
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXRegion.c
 
diff --git a/unix/configure b/unix/configure
index 34a1968..bd4b7d8 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.70 for tk 8.7.
+# Generated by GNU Autoconf 2.71 for tk 8.7.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -1564,9 +1565,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 tk configure 8.7
-generated by GNU Autoconf 2.70
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2020 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1920,7 +1921,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by tk $as_me 8.7, which was
-generated by GNU Autoconf 2.70.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -3773,7 +3774,10 @@ else
     CFLAGS=
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
@@ -3797,28 +3801,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-ac_prog_cc_stdc_options=
-case "x$ac_cv_prog_cc_c11" in #(
-  x) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; } ;; #(
-  xno) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; } ;; #(
-  *) :
-    ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c11"
-    CC="$CC$ac_prog_cc_stdc_options"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c11" != xno
+
+if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  ac_prog_cc_stdc=c11
-		 ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
 else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
@@ -3829,9 +3833,9 @@ else $as_nop
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_c_conftest_c89_program
+$ac_c_conftest_c99_program
 _ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -3843,28 +3847,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-ac_prog_cc_stdc_options=
-case "x$ac_cv_prog_cc_c99" in #(
-  x) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; } ;; #(
-  xno) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; } ;; #(
-  *) :
-    ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c99"
-    CC="$CC$ac_prog_cc_stdc_options"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c99" != xno
+
+if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  ac_prog_cc_stdc=c99
-		    ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
 else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
@@ -3877,8 +3881,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c89_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -3890,34 +3893,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-ac_prog_cc_stdc_options=
-case "x$ac_cv_prog_cc_c89" in #(
-  x) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; } ;; #(
-  xno) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; } ;; #(
-  *) :
-    ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c89"
-    CC="$CC$ac_prog_cc_stdc_options"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno
+
+if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  ac_prog_cc_stdc=c89
-		       ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
 else $as_nop
-  ac_prog_cc_stdc=no
-		       ac_cv_prog_cc_stdc=no
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
 fi
-
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
 fi
-
 fi
 
 ac_ext=c
@@ -9559,7 +9553,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by tk $as_me 8.7, which was
-generated by GNU Autoconf 2.70.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -9618,10 +9612,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 tk config.status 8.7
-configured by $0, generated by GNU Autoconf 2.70,
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2020 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
diff --git a/win/Makefile.in b/win/Makefile.in
index 377fba4..c95c5a4 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -307,6 +307,7 @@ TK_OBJS = \
 	tkWinDraw.$(OBJEXT) \
 	tkWinEmbed.$(OBJEXT) \
 	tkWinFont.$(OBJEXT) \
+	tkWinGDI.$(OBJEXT) \
 	tkWinIco.$(OBJEXT) \
 	tkWinImage.$(OBJEXT) \
 	tkWinInit.$(OBJEXT) \
diff --git a/win/configure b/win/configure
index 4e212c5..1b38323 100755
--- a/win/configure
+++ b/win/configure
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.70 for tk 8.7.
+# Generated by GNU Autoconf 2.71 for tk 8.7.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -1525,9 +1526,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 tk configure 8.7
-generated by GNU Autoconf 2.70
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2020 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1729,7 +1730,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by tk $as_me 8.7, which was
-generated by GNU Autoconf 2.70.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -3271,7 +3272,10 @@ else
     CFLAGS=
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
 printf %s "checking for $CC option to enable C11 features... " >&6; }
 if test ${ac_cv_prog_cc_c11+y}
 then :
@@ -3295,28 +3299,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-ac_prog_cc_stdc_options=
-case "x$ac_cv_prog_cc_c11" in #(
-  x) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; } ;; #(
-  xno) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; } ;; #(
-  *) :
-    ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c11"
-    CC="$CC$ac_prog_cc_stdc_options"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c11" != xno
+
+if test "x$ac_cv_prog_cc_c11" = xno
 then :
-  ac_prog_cc_stdc=c11
-		 ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
 else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
 printf %s "checking for $CC option to enable C99 features... " >&6; }
 if test ${ac_cv_prog_cc_c99+y}
@@ -3327,9 +3331,9 @@ else $as_nop
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_c_conftest_c89_program
+$ac_c_conftest_c99_program
 _ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -3341,28 +3345,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-ac_prog_cc_stdc_options=
-case "x$ac_cv_prog_cc_c99" in #(
-  x) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; } ;; #(
-  xno) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; } ;; #(
-  *) :
-    ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c99"
-    CC="$CC$ac_prog_cc_stdc_options"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c99" != xno
+
+if test "x$ac_cv_prog_cc_c99" = xno
 then :
-  ac_prog_cc_stdc=c99
-		    ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
 else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
 printf %s "checking for $CC option to enable C89 features... " >&6; }
 if test ${ac_cv_prog_cc_c89+y}
@@ -3375,8 +3379,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_c_conftest_c89_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"
@@ -3388,34 +3391,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-ac_prog_cc_stdc_options=
-case "x$ac_cv_prog_cc_c89" in #(
-  x) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; } ;; #(
-  xno) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; } ;; #(
-  *) :
-    ac_prog_cc_stdc_options=" $ac_cv_prog_cc_c89"
-    CC="$CC$ac_prog_cc_stdc_options"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno
+
+if test "x$ac_cv_prog_cc_c89" = xno
 then :
-  ac_prog_cc_stdc=c89
-		       ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
 else $as_nop
-  ac_prog_cc_stdc=no
-		       ac_cv_prog_cc_stdc=no
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
 fi
-
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
 fi
-
 fi
 
 ac_ext=c
@@ -6498,7 +6492,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by tk $as_me 8.7, which was
-generated by GNU Autoconf 2.70.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -6553,10 +6547,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 tk config.status 8.7
-configured by $0, generated by GNU Autoconf 2.70,
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2020 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
diff --git a/win/makefile.vc b/win/makefile.vc
index e99043f..68daeee 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -188,6 +188,7 @@ TKOBJS = \
 	$(TMP_DIR)\tkWinDraw.obj \

 	$(TMP_DIR)\tkWinEmbed.obj \

 	$(TMP_DIR)\tkWinFont.obj \

+	$(TMP_DIR)\tkWinGDI.obj \

 	$(TMP_DIR)\tkWinIco.obj \

 	$(TMP_DIR)\tkWinImage.obj \

 	$(TMP_DIR)\tkWinInit.obj \

diff --git a/win/tkWinGDI.c b/win/tkWinGDI.c
new file mode 100644
index 0000000..3f36363
--- /dev/null
+++ b/win/tkWinGDI.c
@@ -0,0 +1,4995 @@
+/*
+ * tkWinGDI.c --
+ *
+ *      This module implements access to the Win32 GDI API.
+ *
+ * Copyright © 1991-2018 Microsoft Corp.
+ * Copyright © 2009, Michael I. Schwartz.
+ * Copyright © 1998-2019 Harald Oehlmann, Elmicron GmbH
+ * Copyright © 2021 Kevin Walzer/WordTech Communications LLC.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+
+#include <windows.h>
+#include <stdlib.h>
+#include <math.h>
+#include <wtypes.h>
+#include <winspool.h>
+#include <commdlg.h>
+#include <wingdi.h>
+
+#include <tcl.h>
+
+#include "tkWinInt.h"
+
+/*
+ * Create a standard "DrawFunc" to make this more workable....
+ */
+#ifdef _MSC_VER
+typedef BOOL (WINAPI *DrawFunc) (
+	HDC, int, int, int, int, int, int, int, int); /* Arc, Chord, Pie. */
+#else
+typedef BOOL WINAPI (*DrawFunc) (
+	HDC, int, int, int, int, int, int, int, int); /* Arc, Chord, Pie. */
+#endif
+
+/* Real functions. */
+static int		GdiArc(ClientData clientData, Tcl_Interp *interp,
+			    int argc, const char **argv);
+static int		GdiBitmap(ClientData clientData, Tcl_Interp *interp,
+			    int argc, const char **argv);
+static int		GdiCharWidths(ClientData clientData,
+			    Tcl_Interp *interp, int argc, const char **argv);
+static int		GdiImage(ClientData clientData, Tcl_Interp *interp,
+			    int argc, const char **argv);
+static int		GdiPhoto(ClientData clientData, Tcl_Interp *interp,
+			    int argc, const char **argv);
+static int		GdiLine(ClientData clientData, Tcl_Interp *interp,
+			    int argc, const char **argv);
+static int		GdiOval(ClientData clientData, Tcl_Interp *interp,
+			    int argc, const char **argv);
+static int		GdiPolygon(ClientData clientData, Tcl_Interp *interp,
+			    int argc, const char **argv);
+static int		GdiRectangle(ClientData clientData, Tcl_Interp *interp,
+			    int argc, const char **argv);
+static int		GdiText(ClientData clientData, Tcl_Interp *interp,
+			    int argc, const char **argv);
+static int		GdiMap(ClientData clientData, Tcl_Interp *interp,
+			    int argc, const char **argv);
+static int		GdiCopyBits(ClientData clientData, Tcl_Interp *interp,
+			    int argc, const char **argv);
+
+/* Local copies of similar routines elsewhere in Tcl/Tk. */
+static int		GdiParseColor(const char *name, unsigned long *color);
+static int		GdiGetColor(const char *name, unsigned long *color);
+static int		TkGdiMakeBezierCurve(Tk_Canvas, double *, int, int,
+			    XPoint[], double[]);
+
+/*
+ * Helper functions.
+ */
+static int		GdiMakeLogFont(Tcl_Interp *interp, const char *str,
+			    LOGFONTW *lf, HDC hDC);
+static int		GdiMakePen(Tcl_Interp *interp, int width,
+			    int dashstyle, const char *dashstyledata,
+			    int capstyle, int joinstyle,
+			    int stipplestyle, const char *stippledata,
+			    unsigned long color, HDC hDC, HGDIOBJ *oldPen);
+static int		GdiFreePen(Tcl_Interp *interp, HDC hDC, HGDIOBJ oldPen);
+static int		GdiMakeBrush(Tcl_Interp *interp, unsigned int style,
+			    unsigned long color, long hatch, LOGBRUSH *lb,
+			    HDC hDC, HGDIOBJ *oldBrush);
+static int		GdiFreeBrush(Tcl_Interp *interp, HDC hDC,
+			    HGDIOBJ oldBcrush);
+static int		GdiGetHdcInfo(HDC hdc,
+			    LPPOINT worigin, LPSIZE wextent,
+			    LPPOINT vorigin, LPSIZE vextent);
+
+/* Helper functions for printing the window client area. */
+enum PrintType { PTWindow = 0, PTClient = 1, PTScreen = 2 };
+
+static HANDLE		CopyToDIB(HWND wnd, enum PrintType type);
+static HBITMAP		CopyScreenToBitmap(LPRECT lpRect);
+static HANDLE		BitmapToDIB(HBITMAP hb, HPALETTE hp);
+static HANDLE		CopyScreenToDIB(LPRECT lpRect);
+static int		DIBNumColors(LPBITMAPINFOHEADER lpDIB);
+static int		PalEntriesOnDevice(HDC hDC);
+static HPALETTE		GetSystemPalette(void);
+static void		GetDisplaySize(LONG *width, LONG *height);
+static int		GdiWordToWeight(const char *str);
+static int		GdiParseFontWords(Tcl_Interp *interp, LOGFONTW *lf,
+			    const char *str[], int numargs);
+static int		PrintSelectPrinter(ClientData clientData,
+			    Tcl_Interp *interp, int argc,
+			    Tcl_Obj *const objv[]);
+static int		PrintOpenPrinter(ClientData clientData,
+			    Tcl_Interp *interp, int argc,
+			    Tcl_Obj *const objv[]);
+static int		PrintClosePrinter(ClientData clientData,
+			    Tcl_Interp *interp, int argc,
+			    Tcl_Obj *const objv[]);
+static int		PrintOpenDoc(ClientData clientData, Tcl_Interp *interp,
+			    int argc, Tcl_Obj *const objv[]);
+static int		PrintCloseDoc(ClientData clientData, Tcl_Interp *interp,
+			    int argc, Tcl_Obj *const objv[]);
+static int		PrintOpenPage(ClientData clientData, Tcl_Interp *interp,
+			    int argc, Tcl_Obj *const objv[]);
+static int		PrintClosePage(ClientData clientData,
+			    Tcl_Interp *interp, int argc,
+			    Tcl_Obj *const objv[]);
+
+/*
+ * Global state.
+ */
+
+static PRINTDLGW pd;
+static DOCINFOW di;
+static WCHAR *localPrinterName = NULL;
+static int copies, paper_width, paper_height, dpi_x, dpi_y;
+static LPDEVNAMES devnames;
+static HDC printDC;
+
+/*
+ * To make the "subcommands" follow a standard convention, add them to this
+ * array. The first element is the subcommand name, and the second a standard
+ * Tcl command handler.
+ */
+
+static const struct gdi_command {
+    const char *command_string;
+    Tcl_CmdProc *command;
+} gdi_commands[] = {
+    { "arc",        GdiArc },
+    { "bitmap",     GdiBitmap },
+    { "characters", GdiCharWidths },
+    { "image",      GdiImage },
+    { "line",       GdiLine },
+    { "map",        GdiMap },
+    { "oval",       GdiOval },
+    { "photo",      GdiPhoto },
+    { "polygon",    GdiPolygon },
+    { "rectangle",  GdiRectangle },
+    { "text",       GdiText },
+    { "copybits",   GdiCopyBits },
+};
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiArc --
+ *
+ * 	Map canvas arcs to GDI context.
+ *
+ * Results:
+ *	Renders arcs.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiArc(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int argc,
+    const char **argv)
+{
+    static const char usage_message[] =
+	"::tk::print::_gdi arc hdc x1 y1 x2 y2 "
+	"-extent angle -start angle -style arcstyle "
+	"-fill color -outline color "
+	"-width dimension -dash dashrule "
+	"-outlinestipple ignored -stipple ignored\n" ;
+    int x1, y1, x2, y2;
+    int xr0, yr0, xr1, yr1;
+    HDC hDC;
+    double extent = 0.0, start = 0.0;
+    DrawFunc drawfunc;
+    int width = 0;
+    HPEN hPen;
+    COLORREF linecolor = 0, fillcolor = BS_NULL;
+    int dolinecolor = 0, dofillcolor = 0;
+    HBRUSH hBrush;
+    LOGBRUSH lbrush;
+    HGDIOBJ oldobj;
+    int dodash = 0;
+    const char *dashdata = 0;
+
+    drawfunc = Pie;
+
+    /* Verrrrrry simple for now.... */
+    if (argc < 6) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    hDC = printDC;
+
+    x1 = atoi(argv[2]);
+    y1 = atoi(argv[3]);
+    x2 = atoi(argv[4]);
+    y2 = atoi(argv[5]);
+
+    argc -= 6;
+    argv += 6;
+    while (argc >= 2) {
+	if (strcmp(argv[0], "-extent") == 0) {
+	    extent = atof(argv[1]);
+	} else if (strcmp(argv[0], "-start") == 0) {
+	    start = atof(argv[1]);
+	} else if (strcmp(argv[0], "-style") == 0) {
+	    if (strcmp(argv[1], "pieslice") == 0) {
+		drawfunc = Pie;
+	    } else if (strcmp(argv[1], "arc") == 0) {
+		drawfunc = Arc;
+	    } else if (strcmp(argv[1], "chord") == 0) {
+		drawfunc = Chord;
+	    }
+	} else if (strcmp(argv[0], "-fill") == 0) {
+	    /* Handle all args, even if we don't use them yet. */
+	    if (GdiGetColor(argv[1], &fillcolor)) {
+		dofillcolor = 1;
+	    }
+	} else if (strcmp(argv[0], "-outline") == 0) {
+	    if (GdiGetColor(argv[1], &linecolor)) {
+		dolinecolor = 1;
+	    }
+	} else if (strcmp(argv[0], "-outlinestipple") == 0) {
+	    /* ignored */
+	} else if (strcmp(argv[0], "-stipple") == 0) {
+	    /* ignored */
+	} else if (strcmp(argv[0], "-width") == 0) {
+	    width = atoi(argv[1]);
+	} else if (strcmp(argv[0], "-dash") == 0) {
+	    if (argv[1]) {
+		dodash = 1;
+		dashdata = argv[1];
+	    }
+	} else {
+	    /* Don't know that option! */
+	    Tcl_AppendResult(interp, usage_message, NULL);
+	    return TCL_ERROR;
+	}
+	argc -= 2;
+	argv += 2;
+    }
+    xr0 = xr1 = (x1 + x2) / 2;
+    yr0 = yr1 = (y1 + y2) / 2;
+
+    /*
+     * The angle used by the arc must be "warped" by the eccentricity of the
+     * ellipse.  Thanks to Nigel Dodd <nigel.dodd@avellino.com> for bringing a
+     * nice example.
+     */
+
+    xr0 += (int)(100.0 * (x2 - x1) * cos((start * 2.0 * 3.14159265) / 360.0));
+    yr0 -= (int)(100.0 * (y2 - y1) * sin((start * 2.0 * 3.14159265) / 360.0));
+    xr1 += (int)(100.0 * (x2 - x1) * cos(((start+extent) * 2.0 * 3.14159265) / 360.0));
+    yr1 -= (int)(100.0 * (y2 - y1) * sin(((start+extent) * 2.0 * 3.14159265) / 360.0));
+
+    /*
+     * Under Win95, SetArcDirection isn't implemented--so we have to assume
+     * that arcs are drawn counterclockwise (e.g., positive extent) So if it's
+     * negative, switch the coordinates!
+     */
+
+    if (extent < 0) {
+	int xr2 = xr0;
+	int yr2 = yr0;
+
+	xr0 = xr1;
+	xr1 = xr2;
+	yr0 = yr1;
+	yr1 = yr2;
+    }
+
+    if (dofillcolor) {
+	GdiMakeBrush(interp, 0, fillcolor, 0, &lbrush, hDC, (HGDIOBJ *)&hBrush);
+    } else {
+	oldobj = SelectObject(hDC, GetStockObject(HOLLOW_BRUSH));
+    }
+
+    if (width || dolinecolor) {
+	GdiMakePen(interp, width, dodash, dashdata,
+		0, 0, 0, 0, linecolor, hDC, (HGDIOBJ *)&hPen);
+    }
+
+    (*drawfunc)(hDC, x1, y1, x2, y2, xr0, yr0, xr1, yr1);
+
+    if (width || dolinecolor) {
+	GdiFreePen(interp, hDC, hPen);
+    }
+    if (dofillcolor) {
+	GdiFreeBrush(interp, hDC, hBrush);
+    } else {
+	SelectObject(hDC, oldobj);
+    }
+
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiBitmap --
+ *
+ * 	Unimplemented for now. Should use the same techniques as
+ * 	CanvasPsBitmap (tkCanvPs.c).
+ *
+ * Results:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiBitmap(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    TCL_UNUSED(int),
+    TCL_UNUSED(const char **))
+{
+    static const char usage_message[] =
+	"::tk::print::_gdi bitmap hdc x y "
+	"-anchor [center|n|e|s|w] -background color "
+	"-bitmap bitmap -foreground color\n"
+	"Not implemented yet. Sorry!";
+
+    /*
+     * Skip this for now. Should be based on common code with the copybits
+     * command.
+     */
+
+    Tcl_AppendResult(interp, usage_message, NULL);
+    return TCL_ERROR;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiImage --
+ *
+ *	Unimplemented for now. Unimplemented for now. Should switch on image
+ *	type and call either GdiPhoto or GdiBitmap. This code is similar to
+ *	that in tkWinImage.c.
+ *
+ * Results:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiImage(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    TCL_UNUSED(int),
+    TCL_UNUSED(const char **))
+{
+    static const char usage_message[] =
+	"::tk::print::_gdi image hdc x y -anchor [center|n|e|s|w] -image name\n"
+	"Not implemented yet. Sorry!";
+
+    /* Skip this for now..... */
+    /* Should be based on common code with the copybits command. */
+
+    Tcl_AppendResult(interp, usage_message, NULL);
+    /* Normally, usage results in TCL_ERROR--but wait til' it's implemented. */
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiPhoto --
+ *
+ *	Contributed by Lukas Rosenthaler <lukas.rosenthaler@balcab.ch>
+ *
+ *	Note: The canvas doesn't directly support photos (only as images), so
+ *	this is the first ::tk::print::_gdi command without an equivalent
+ *	canvas command.  This code may be modified to support photo images on
+ *	the canvas.
+ *
+ * Results:
+ *	Renders a photo.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiPhoto(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int argc,
+    const char **argv)
+{
+    static const char usage_message[] =
+	"::tk::print::_gdi photo hdc [-destination x y [w [h]]] -photo name\n";
+    HDC dst;
+    int dst_x = 0, dst_y = 0, dst_w = 0, dst_h = 0;
+    int nx, ny, sll;
+    const char *photoname = 0;	/* For some reason Tk_FindPhoto takes a char *. */
+    Tk_PhotoHandle photo_handle;
+    Tk_PhotoImageBlock img_block;
+    BITMAPINFO bitmapinfo;	/* Since we don't need the bmiColors table,
+				 * there is no need for dynamic allocation. */
+    int oldmode;		/* For saving the old stretch mode. */
+    POINT pt;			/* For saving the brush org. */
+    char *pbuf = NULL;
+    int i, j, k;
+    int retval = TCL_OK;
+
+    /*
+     * Parse the arguments.
+     */
+
+    /* HDC is required. */
+    if (argc < 2) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    dst = printDC;
+
+    /*
+     * Next, check to see if 'dst' can support BitBlt.
+     * If not, raise an error.
+     */
+
+    if ((GetDeviceCaps(dst, RASTERCAPS) & RC_STRETCHDIB) == 0) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"::tk::print::_gdi photo not supported on device context (0x%s)",
+		argv[1]));
+	return TCL_ERROR;
+    }
+
+    /* Parse the command line arguments. */
+    for (j = 2; j < argc; j++) {
+	if (strcmp(argv[j], "-destination") == 0) {
+	    double x, y, w, h;
+	    int count = 0;
+	    char dummy;
+
+	    if (j < argc) {
+		count = sscanf(argv[++j], "%lf%lf%lf%lf%c",
+			&x, &y, &w, &h, &dummy);
+	    }
+
+	    if (count < 2 || count > 4) {
+		/* Destination must provide at least 2 arguments. */
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"-destination requires a list of 2 to 4 numbers\n%s",
+			usage_message));
+		return TCL_ERROR;
+	    }
+
+	    dst_x = (int) x;
+	    dst_y = (int) y;
+	    if (count == 3) {
+		dst_w = (int) w;
+		dst_h = -1;
+	    } else if (count == 4) {
+		dst_w = (int) w;
+		dst_h = (int) h;
+	    }
+	} else if (strcmp(argv[j], "-photo") == 0) {
+	    photoname = argv[++j];
+	}
+    }
+
+    if (photoname == 0) {	/* No photo provided. */
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"No photo name provided to ::tk::print::_gdi photo\n%s",
+		usage_message));
+	return TCL_ERROR;
+    }
+
+    photo_handle = Tk_FindPhoto(interp, photoname);
+    if (photo_handle == 0) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"::tk::print::_gdi photo: Photo name %s can't be located\n%s",
+		photoname, usage_message));
+	return TCL_ERROR;
+    }
+    Tk_PhotoGetImage(photo_handle, &img_block);
+
+    nx  = img_block.width;
+    ny  = img_block.height;
+    sll = ((3*nx + 3) / 4)*4; /* Must be multiple of 4. */
+
+    /*
+     * Buffer is potentially large enough that failure to allocate might be
+     * recoverable.
+     */
+
+    pbuf = (char *) Tcl_AttemptAlloc(sll * ny * sizeof(char));
+    if (pbuf == 0) { /* Memory allocation failure. */
+	Tcl_AppendResult(interp,
+		"::tk::print::_gdi photo failed--out of memory", NULL);
+	return TCL_ERROR;
+    }
+
+    /* After this, all returns must go through retval. */
+
+    /* BITMAP expects BGR; photo provides RGB. */
+    for (k = 0; k < ny; k++) {
+	for (i = 0; i < nx; i++) {
+	    pbuf[k*sll + 3*i] = img_block.pixelPtr[
+		    k*img_block.pitch + i*img_block.pixelSize + img_block.offset[2]];
+	    pbuf[k*sll + 3*i + 1] = img_block.pixelPtr[
+		    k*img_block.pitch + i*img_block.pixelSize + img_block.offset[1]];
+	    pbuf[k*sll + 3*i + 2] = img_block.pixelPtr[
+		    k*img_block.pitch + i*img_block.pixelSize + img_block.offset[0]];
+	}
+    }
+
+    memset(&bitmapinfo, 0L, sizeof(BITMAPINFO));
+
+    bitmapinfo.bmiHeader.biSize          = sizeof(BITMAPINFOHEADER);
+    bitmapinfo.bmiHeader.biWidth         = nx;
+    bitmapinfo.bmiHeader.biHeight        = -ny;
+    bitmapinfo.bmiHeader.biPlanes        = 1;
+    bitmapinfo.bmiHeader.biBitCount      = 24;
+    bitmapinfo.bmiHeader.biCompression   = BI_RGB;
+    bitmapinfo.bmiHeader.biSizeImage     = 0; /* sll*ny;. */
+    bitmapinfo.bmiHeader.biXPelsPerMeter = 0;
+    bitmapinfo.bmiHeader.biYPelsPerMeter = 0;
+    bitmapinfo.bmiHeader.biClrUsed       = 0;
+    bitmapinfo.bmiHeader.biClrImportant  = 0;
+
+    oldmode = SetStretchBltMode(dst, HALFTONE);
+    /*
+     * According to the Win32 Programmer's Manual, we have to set the brush
+     * org, now.
+     */
+    SetBrushOrgEx(dst, 0, 0, &pt);
+
+    if (dst_w <= 0) {
+	dst_w = nx;
+	dst_h = ny;
+    } else if (dst_h <= 0) {
+	dst_h = ny*dst_w / nx;
+    }
+
+    if (StretchDIBits(dst, dst_x, dst_y, dst_w, dst_h, 0, 0, nx, ny,
+	    pbuf, &bitmapinfo, DIB_RGB_COLORS, SRCCOPY) == (int)GDI_ERROR) {
+	int errcode = GetLastError();
+
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"::tk::print::_gdi photo internal failure: "
+		"StretchDIBits error code %d", errcode));
+	retval = TCL_ERROR;
+    }
+
+    /* Clean up the hDC. */
+    if (oldmode != 0) {
+	SetStretchBltMode(dst, oldmode);
+	SetBrushOrgEx(dst, pt.x, pt.y, &pt);
+    }
+
+    Tcl_Free(pbuf);
+
+    if (retval == TCL_OK) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"%d %d %d %d", dst_x, dst_y, dst_w, dst_h));
+    }
+
+    return retval;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Bezierize --
+ *
+ *	Interface to Tk's line smoother, used for lines and pollies.
+ *	Provided by Jasper Taylor <jasper.taylor@ed.ac.uk>.
+ *
+ * Results:
+ *	Smooths lines.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int Bezierize(
+    POINT* polypoints,
+    int npoly,
+    int nStep,
+    POINT* bpointptr)
+{
+    /* First, translate my points into a list of doubles. */
+    double *inPointList, *outPointList;
+    int n;
+    int nbpoints = 0;
+    POINT* bpoints;
+
+    inPointList = (double *) Tcl_AttemptAlloc(2 * sizeof(double) * npoly);
+    if (inPointList == 0) {
+	/* TODO: unreachable */
+        return nbpoints; /* 0. */
+    }
+
+    for (n=0; n<npoly; n++) {
+        inPointList[2*n] = polypoints[n].x;
+        inPointList[2*n + 1] = polypoints[n].y;
+    }
+
+    nbpoints = 1 + npoly * nStep; /* this is the upper limit. */
+    outPointList = (double *) Tcl_AttemptAlloc(2 * sizeof(double) * nbpoints);
+    if (outPointList == 0) {
+	/* TODO: unreachable */
+        Tcl_Free((void *) inPointList);
+        return 0;
+    }
+
+    nbpoints = TkGdiMakeBezierCurve(NULL, inPointList, npoly, nStep,
+	    NULL, outPointList);
+
+    Tcl_Free((void *) inPointList);
+    bpoints = (POINT *) Tcl_AttemptAlloc(sizeof(POINT)*nbpoints);
+    if (bpoints == 0) {
+	/* TODO: unreachable */
+        Tcl_Free((void *) outPointList);
+        return 0;
+    }
+
+    for (n=0; n<nbpoints; n++) {
+        bpoints[n].x = (long) outPointList[2*n];
+        bpoints[n].y = (long) outPointList[2*n + 1];
+    }
+    Tcl_Free((void *) outPointList);
+    *bpointptr = *bpoints;
+    return nbpoints;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiLine --
+ *
+ *	Maps lines to GDI context.
+ *
+ * Results:
+ *	Renders lines.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiLine(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int argc,
+    const char **argv)
+{
+    static const char usage_message[] =
+	"::tk::print::_gdi line hdc x1 y1 ... xn yn "
+	"-arrow [first|last|both|none] -arrowshape {d1 d2 d3} "
+	"-dash dashlist "
+	"-capstyle [butt|projecting|round] -fill color "
+	"-joinstyle [bevel|miter|round] -smooth [true|false|bezier] "
+	"-splinesteps number -stipple bitmap -width linewid";
+    char *strend;
+    POINT *polypoints;
+    int npoly;
+    int x, y;
+    HDC hDC;
+    HPEN hPen;
+
+    LOGBRUSH lbrush;
+    HBRUSH hBrush;
+
+    int width          = 0;
+    COLORREF linecolor = 0;
+    int dolinecolor    = 0;
+    int dosmooth       = 0;
+    int doarrow        = 0; /* 0=none; 1=end; 2=start; 3=both. */
+    int arrowshape[3];
+
+    int nStep = 12;
+
+    int dodash = 0;
+    const char *dashdata = 0;
+
+    arrowshape[0] = 8;
+    arrowshape[1] = 10;
+    arrowshape[2] = 3;
+
+    /* Verrrrrry simple for now.... */
+    if (argc < 6) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    hDC = printDC;
+
+    polypoints = (POINT *) Tcl_AttemptAlloc((argc - 1) * sizeof(POINT));
+    if (polypoints == 0) {
+	Tcl_AppendResult(interp, "Out of memory in GdiLine", NULL);
+	return TCL_ERROR;
+    }
+    polypoints[0].x = atol(argv[2]);
+    polypoints[0].y = atol(argv[3]);
+    polypoints[1].x = atol(argv[4]);
+    polypoints[1].y = atol(argv[5]);
+    argc -= 6;
+    argv += 6;
+    npoly = 2;
+
+    while (argc >= 2) {
+	/* Check for a number. */
+	x = strtoul(argv[0], &strend, 0);
+	if (strend > argv[0]) {
+	    /* One number.... */
+	    y = strtoul(argv[1], &strend, 0);
+	    if (strend > argv[1]) {
+		/* TWO numbers!. */
+		polypoints[npoly].x = x;
+		polypoints[npoly].y = y;
+		npoly++;
+		argc -= 2;
+		argv += 2;
+	    } else {
+		/* Only one number... Assume a usage error. */
+		Tcl_Free((void *)polypoints);
+		Tcl_AppendResult(interp, usage_message, NULL);
+		return TCL_ERROR;
+	    }
+	} else {
+	    if (strcmp(*argv, "-arrow") == 0) {
+		if (strcmp(argv[1], "none") == 0) {
+		    doarrow = 0;
+		} else if (strcmp(argv[1], "both") == 0) {
+		    doarrow = 3;
+		} else if (strcmp(argv[1], "first") == 0) {
+		    doarrow = 2;
+		} else if (strcmp(argv[1], "last") == 0) {
+		    doarrow = 1;
+		}
+		argv += 2;
+		argc -= 2;
+	    } else if (strcmp(*argv, "-arrowshape") == 0) {
+		/* List of 3 numbers--set arrowshape array. */
+		int a1, a2, a3;
+		char dummy;
+
+		if (sscanf(argv[1], "%d%d%d%c", &a1, &a2, &a3, &dummy) == 3
+			&& a1 > 0 && a2 > 0 && a3 > 0) {
+		    arrowshape[0] = a1;
+		    arrowshape[1] = a2;
+		    arrowshape[2] = a3;
+		}
+		/* Else the argument was bad. */
+
+		argv += 2;
+		argc -= 2;
+	    } else if (strcmp(*argv, "-capstyle") == 0) {
+		argv += 2;
+		argc -= 2;
+	    } else if (strcmp(*argv, "-fill") == 0) {
+		if (GdiGetColor(argv[1], &linecolor)) {
+		    dolinecolor = 1;
+		}
+		argv += 2;
+		argc -= 2;
+	    } else if (strcmp(*argv, "-joinstyle") == 0) {
+		argv += 2;
+		argc -= 2;
+	    } else if (strcmp(*argv, "-smooth") == 0) {
+		/* Argument is true/false or 1/0 or bezier. */
+		if (argv[1]) {
+		    switch (argv[1][0]) {
+		    case 't': case 'T':
+		    case '1':
+		    case 'b': case 'B': /* bezier. */
+			dosmooth = 1;
+			break;
+		    default:
+			dosmooth = 0;
+			break;
+		    }
+		    argv += 2;
+		    argc -= 2;
+		}
+	    } else if (strcmp(*argv, "-splinesteps") == 0) {
+		nStep = atoi(argv[1]);
+		argv += 2;
+		argc -= 2;
+	    } else if (strcmp(*argv, "-dash") == 0) {
+		if (argv[1]) {
+		    dodash = 1;
+		    dashdata = argv[1];
+		}
+		argv += 2;
+		argc -= 2;
+	    } else if (strcmp(*argv, "-dashoffset") == 0) {
+		argv += 2;
+		argc -= 2;
+	    } else if (strcmp(*argv, "-stipple") == 0) {
+		argv += 2;
+		argc -= 2;
+	    } else if (strcmp(*argv, "-width") == 0) {
+		width = atoi(argv[1]);
+		argv += 2;
+		argc -= 2;
+	    } else { /* It's an unknown argument!. */
+		argc--;
+		argv++;
+	    }
+	    /* Check for arguments
+	     * Most of the arguments affect the "Pen"
+	     */
+	}
+    }
+
+    if (width || dolinecolor || dodash) {
+	GdiMakePen(interp, width, dodash, dashdata,
+		0, 0, 0, 0, linecolor, hDC, (HGDIOBJ *)&hPen);
+    }
+    if (doarrow != 0) {
+	GdiMakeBrush(interp, 0, linecolor, 0, &lbrush, hDC, (HGDIOBJ *)&hBrush);
+    }
+
+    if (dosmooth) { /* Use PolyBezier. */
+	int nbpoints;
+	POINT *bpoints = 0;
+
+	nbpoints = Bezierize(polypoints,npoly,nStep,bpoints);
+	if (nbpoints > 0) {
+	    Polyline(hDC, bpoints, nbpoints);
+	} else {
+	    Polyline(hDC, polypoints, npoly); /* Out of memory? Just draw a regular line. */
+	}
+	if (bpoints != 0) {
+	    Tcl_Free((void *)bpoints);
+	}
+    } else {
+	Polyline(hDC, polypoints, npoly);
+    }
+
+    if (dodash && doarrow) {  /* Don't use dashed or thick pen for the arrows! */
+	GdiFreePen(interp, hDC, hPen);
+	GdiMakePen(interp, width, 0, 0, 0, 0, 0, 0,
+		linecolor, hDC, (HGDIOBJ *)&hPen);
+    }
+
+    /* Now the arrowheads, if any. */
+    if (doarrow & 1) {
+	/* Arrowhead at end = polypoints[npoly-1].x, polypoints[npoly-1].y. */
+	POINT ahead[6];
+	double dx, dy, length;
+	double sinTheta, cosTheta;
+	double vertX, vertY, temp;
+	double fracHeight;
+
+	fracHeight = 2.0 / arrowshape[2];
+
+	ahead[0].x = ahead[5].x = polypoints[npoly-1].x;
+	ahead[0].y = ahead[5].y = polypoints[npoly-1].y;
+	dx = ahead[0].x - polypoints[npoly-2].x;
+	dy = ahead[0].y - polypoints[npoly-2].y;
+	if ((length = hypot(dx, dy)) == 0) {
+	    sinTheta = cosTheta = 0.0;
+	} else {
+	    sinTheta = dy / length;
+	    cosTheta = dx / length;
+	}
+	vertX = ahead[0].x - arrowshape[0]*cosTheta;
+	vertY = ahead[0].y - arrowshape[0]*sinTheta;
+	temp = arrowshape[2]*sinTheta;
+	ahead[1].x = (long)(ahead[0].x - arrowshape[1]*cosTheta + temp);
+	ahead[4].x = (long)(ahead[1].x - 2 * temp);
+	temp = arrowshape[2]*cosTheta;
+	ahead[1].y = (long)(ahead[0].y - arrowshape[1]*sinTheta - temp);
+	ahead[4].y = (long)(ahead[1].y + 2 * temp);
+	ahead[2].x = (long)(ahead[1].x*fracHeight + vertX*(1.0-fracHeight));
+	ahead[2].y = (long)(ahead[1].y*fracHeight + vertY*(1.0-fracHeight));
+	ahead[3].x = (long)(ahead[4].x*fracHeight + vertX*(1.0-fracHeight));
+	ahead[3].y = (long)(ahead[4].y*fracHeight + vertY*(1.0-fracHeight));
+
+	Polygon(hDC, ahead, 6);
+    }
+
+    if (doarrow & 2) {
+	/* Arrowhead at end = polypoints[0].x, polypoints[0].y. */
+	POINT ahead[6];
+	double dx, dy, length;
+	double sinTheta, cosTheta;
+	double vertX, vertY, temp;
+	double fracHeight;
+
+	fracHeight = 2.0 / arrowshape[2];
+
+	ahead[0].x = ahead[5].x = polypoints[0].x;
+	ahead[0].y = ahead[5].y = polypoints[0].y;
+	dx = ahead[0].x - polypoints[1].x;
+	dy = ahead[0].y - polypoints[1].y;
+	if ((length = hypot(dx, dy)) == 0) {
+	    sinTheta = cosTheta = 0.0;
+	} else {
+	    sinTheta = dy / length;
+	    cosTheta = dx / length;
+	}
+	vertX = ahead[0].x - arrowshape[0]*cosTheta;
+	vertY = ahead[0].y - arrowshape[0]*sinTheta;
+	temp = arrowshape[2]*sinTheta;
+	ahead[1].x = (long)(ahead[0].x - arrowshape[1]*cosTheta + temp);
+	ahead[4].x = (long)(ahead[1].x - 2 * temp);
+	temp = arrowshape[2]*cosTheta;
+	ahead[1].y = (long)(ahead[0].y - arrowshape[1]*sinTheta - temp);
+	ahead[4].y = (long)(ahead[1].y + 2 * temp);
+	ahead[2].x = (long)(ahead[1].x*fracHeight + vertX*(1.0-fracHeight));
+	ahead[2].y = (long)(ahead[1].y*fracHeight + vertY*(1.0-fracHeight));
+	ahead[3].x = (long)(ahead[4].x*fracHeight + vertX*(1.0-fracHeight));
+	ahead[3].y = (long)(ahead[4].y*fracHeight + vertY*(1.0-fracHeight));
+
+	Polygon(hDC, ahead, 6);
+    }
+
+    if (width || dolinecolor || dodash) {
+	GdiFreePen(interp, hDC, hPen);
+    }
+    if (doarrow) {
+	GdiFreeBrush(interp, hDC, hBrush);
+    }
+
+    Tcl_Free((void *)polypoints);
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiOval --
+ *
+ *	Maps ovals to GDI context.
+ *
+ * Results:
+ *	Renders ovals.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiOval(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int argc,
+    const char **argv)
+{
+    static const char usage_message[] =
+	"::tk::print::_gdi oval hdc x1 y1 x2 y2 -fill color -outline color "
+	"-stipple bitmap -width linewid";
+    int x1, y1, x2, y2;
+    HDC hDC;
+    HPEN hPen;
+    int width = 0;
+    COLORREF linecolor = 0, fillcolor = 0;
+    int dolinecolor = 0, dofillcolor = 0;
+    HBRUSH hBrush;
+    LOGBRUSH lbrush;
+    HGDIOBJ oldobj;
+
+    int dodash = 0;
+    const char *dashdata = 0;
+
+    /* Verrrrrry simple for now.... */
+    if (argc < 6) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    hDC = printDC;
+
+    x1 = atol(argv[2]);
+    y1 = atol(argv[3]);
+    x2 = atol(argv[4]);
+    y2 = atol(argv[5]);
+    if (x1 > x2) {
+	int x3 = x1;
+	x1 = x2;
+	x2 = x3;
+    }
+    if (y1 > y2) {
+	int y3 = y1;
+	y1 = y2;
+	y2 = y3;
+    }
+    argc -= 6;
+    argv += 6;
+
+    while (argc > 0) {
+	/* Now handle any other arguments that occur. */
+	if (strcmp(argv[0], "-fill") == 0) {
+	    if (argv[1] && GdiGetColor(argv[1], &fillcolor)) {
+		dofillcolor = 1;
+	    }
+	} else if (strcmp(argv[0], "-outline") == 0) {
+	    if (argv[1] && GdiGetColor(argv[1], &linecolor)) {
+		dolinecolor = 1;
+	    }
+	} else if (strcmp(argv[0], "-stipple") == 0) {
+	    /* Not actually implemented */
+	} else if (strcmp(argv[0], "-width") == 0) {
+	    if (argv[1]) {
+		width = atoi(argv[1]);
+	    }
+	} else if (strcmp(argv[0], "-dash") == 0) {
+	    if (argv[1]) {
+		dodash = 1;
+		dashdata = argv[1];
+	    }
+	}
+	argv += 2;
+	argc -= 2;
+    }
+
+    if (dofillcolor) {
+	GdiMakeBrush(interp, 0, fillcolor, 0, &lbrush, hDC, (HGDIOBJ *)&hBrush);
+    } else {
+	oldobj = SelectObject(hDC, GetStockObject(HOLLOW_BRUSH));
+    }
+
+    if (width || dolinecolor) {
+	GdiMakePen(interp, width, dodash, dashdata,
+		0, 0, 0, 0, linecolor, hDC, (HGDIOBJ *)&hPen);
+    }
+    /*
+     * Per Win32, Rectangle includes lower and right edges--per Tcl8.3.2 and
+     * earlier documentation, canvas rectangle does not. Thus, add 1 to right
+     * and lower bounds to get appropriate behavior.
+     */
+    Ellipse(hDC, x1, y1, x2+1, y2+1);
+
+    if (width || dolinecolor) {
+	GdiFreePen(interp, hDC, hPen);
+    }
+    if (dofillcolor) {
+	GdiFreeBrush(interp, hDC, hBrush);
+    } else {
+	SelectObject(hDC, oldobj);
+    }
+
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiPolygon --
+ *
+ *	Maps polygons to GDI context.
+ *
+ * Results:
+ *	Renders polygons.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiPolygon(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int argc,
+    const char **argv)
+{
+    static const char usage_message[] =
+	"::tk::print::_gdi polygon hdc x1 y1 ... xn yn "
+	"-fill color -outline color -smooth [true|false|bezier] "
+	"-splinesteps number -stipple bitmap -width linewid";
+
+    char *strend;
+    POINT *polypoints;
+    int npoly;
+    int dosmooth = 0;
+    int nStep = 12;
+    int x, y;
+    HDC hDC;
+    HPEN hPen;
+    int width = 0;
+    COLORREF linecolor = 0, fillcolor = BS_NULL;
+    int dolinecolor = 0, dofillcolor = 0;
+    LOGBRUSH lbrush;
+    HBRUSH hBrush;
+    HGDIOBJ oldobj;
+
+    int dodash = 0;
+    const char *dashdata = 0;
+
+    /* Verrrrrry simple for now.... */
+    if (argc < 6) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    hDC = printDC;
+
+    polypoints = (POINT *) Tcl_AttemptAlloc((argc - 1) * sizeof(POINT));
+    if (polypoints == 0) {
+	/* TODO: unreachable */
+	Tcl_AppendResult(interp, "Out of memory in GdiLine", NULL);
+	return TCL_ERROR;
+    }
+    polypoints[0].x = atol(argv[2]);
+    polypoints[0].y = atol(argv[3]);
+    polypoints[1].x = atol(argv[4]);
+    polypoints[1].y = atol(argv[5]);
+    argc -= 6;
+    argv += 6;
+    npoly = 2;
+
+    while (argc >= 2) {
+	/* Check for a number */
+	x = strtoul(argv[0], &strend, 0);
+	if (strend > argv[0]) {
+	    /* One number.... */
+	    y = strtoul(argv[1], &strend, 0);
+	    if (strend > argv[1]) {
+		/* TWO numbers!. */
+		polypoints[npoly].x = x;
+		polypoints[npoly].y = y;
+		npoly++;
+		argc -= 2;
+		argv += 2;
+	    } else {
+		/* Only one number... Assume a usage error. */
+		Tcl_Free((void *) polypoints);
+		Tcl_AppendResult(interp, usage_message, NULL);
+		return TCL_ERROR;
+	    }
+	} else {
+	    /*
+	     * Check for arguments.
+	     * Most of the arguments affect the "Pen" and "Brush".
+	     */
+	    if (strcmp(argv[0], "-fill") == 0) {
+		if (argv[1] && GdiGetColor(argv[1], &fillcolor)) {
+		    dofillcolor = 1;
+		}
+	    } else if (strcmp(argv[0], "-outline") == 0) {
+		if (GdiGetColor(argv[1], &linecolor)) {
+		    dolinecolor = 0;
+		}
+	    } else if (strcmp(argv[0], "-smooth") == 0) {
+		if (argv[1]) {
+		    switch (argv[1][0]) {
+		    case 't': case 'T':
+		    case '1':
+		    case 'b': case 'B': /* bezier. */
+			dosmooth = 1;
+			break;
+		    default:
+			dosmooth = 0;
+			break;
+		    }
+		}
+	    } else if (strcmp(argv[0], "-splinesteps") == 0) {
+		if (argv[1]) {
+		    nStep = atoi(argv[1]);
+		}
+	    } else if (strcmp(argv[0], "-stipple") == 0) {
+		/* Not supported */
+	    } else if (strcmp(argv[0], "-width") == 0) {
+		if (argv[1]) {
+		    width = atoi(argv[1]);
+		}
+	    } else if (strcmp(argv[0], "-dash") == 0) {
+		if (argv[1]) {
+		    dodash = 1;
+		    dashdata = argv[1];
+		}
+	    }
+	    argc -= 2;
+	    argv += 2;
+	}
+    }
+
+    if (dofillcolor) {
+	GdiMakeBrush(interp, 0, fillcolor, 0, &lbrush, hDC, (HGDIOBJ *)&hBrush);
+    } else {
+	oldobj = SelectObject(hDC, GetStockObject(HOLLOW_BRUSH));
+    }
+
+    if (width || dolinecolor) {
+	GdiMakePen(interp, width, dodash, dashdata, 0, 0, 0, 0,
+		linecolor, hDC, (HGDIOBJ *)&hPen);
+    }
+
+    if (dosmooth) {
+	int nbpoints;
+	POINT *bpoints = 0;
+	nbpoints = Bezierize(polypoints,npoly,nStep,bpoints);
+	if (nbpoints > 0) {
+	    Polygon(hDC, bpoints, nbpoints);
+	} else {
+	    Polygon(hDC, polypoints, npoly);
+	}
+	if (bpoints != 0) {
+	    Tcl_Free((void *)bpoints);
+	}
+    } else {
+	Polygon(hDC, polypoints, npoly);
+    }
+
+    if (width || dolinecolor) {
+	GdiFreePen(interp, hDC, hPen);
+    }
+    if (dofillcolor) {
+	GdiFreeBrush(interp, hDC, hBrush);
+    } else {
+	SelectObject(hDC, oldobj);
+    }
+
+    Tcl_Free((void *)polypoints);
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiRectangle --
+ *
+ *	Maps rectangles to GDI context.
+ *
+ * Results:
+ *	Renders rectangles.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiRectangle(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int argc,
+    const char **argv)
+{
+    static const char usage_message[] =
+	"::tk::print::_gdi rectangle hdc x1 y1 x2 y2 "
+	"-fill color -outline color "
+	"-stipple bitmap -width linewid";
+
+    int x1, y1, x2, y2;
+    HDC hDC;
+    HPEN hPen;
+    int width = 0;
+    COLORREF linecolor = 0, fillcolor = BS_NULL;
+    int dolinecolor = 0, dofillcolor = 0;
+    LOGBRUSH lbrush;
+    HBRUSH hBrush;
+    HGDIOBJ oldobj;
+
+    int dodash = 0;
+    const char *dashdata = 0;
+
+    /* Verrrrrry simple for now.... */
+    if (argc < 6) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    hDC = printDC;
+
+    x1 = atol(argv[2]);
+    y1 = atol(argv[3]);
+    x2 = atol(argv[4]);
+    y2 = atol(argv[5]);
+    if (x1 > x2) {
+	int x3 = x1;
+	x1 = x2;
+	x2 = x3;
+    }
+    if (y1 > y2) {
+	int y3 = y1;
+	y1 = y2;
+	y2 = y3;
+    }
+    argc -= 6;
+    argv += 6;
+
+    /* Now handle any other arguments that occur. */
+    while (argc > 1) {
+	if (strcmp(argv[0], "-fill") == 0) {
+	    if (argv[1] && GdiGetColor(argv[1], &fillcolor)) {
+		dofillcolor = 1;
+	    }
+	} else if (strcmp(argv[0], "-outline") == 0) {
+	    if (argv[1] && GdiGetColor(argv[1], &linecolor)) {
+		dolinecolor = 1;
+	    }
+	} else if (strcmp(argv[0], "-stipple") == 0) {
+	    /* Not supported; ignored */
+	} else if (strcmp(argv[0], "-width") == 0) {
+	    if (argv[1]) {
+		width = atoi(argv[1]);
+	    }
+	} else if (strcmp(argv[0], "-dash") == 0) {
+	    if (argv[1]) {
+		dodash = 1;
+		dashdata = argv[1];
+	    }
+	}
+
+	argc -= 2;
+	argv += 2;
+    }
+
+    /*
+     * Note: If any fill is specified, the function must create a brush and
+     * put the coordinates in a RECTANGLE structure, and call FillRect.
+     * FillRect requires a BRUSH / color.
+     * If not, the function Rectangle must be called.
+     */
+    if (dofillcolor) {
+	GdiMakeBrush(interp, 0, fillcolor, 0, &lbrush, hDC, (HGDIOBJ *)&hBrush);
+    } else {
+	oldobj = SelectObject(hDC, GetStockObject(HOLLOW_BRUSH));
+    }
+
+    if (width || dolinecolor) {
+	GdiMakePen(interp, width, dodash, dashdata,
+		0, 0, 0, 0, linecolor, hDC, (HGDIOBJ *)&hPen);
+    }
+    /*
+     * Per Win32, Rectangle includes lower and right edges--per Tcl8.3.2 and
+     * earlier documentation, canvas rectangle does not. Thus, add 1 to
+     * right and lower bounds to get appropriate behavior.
+     */
+    Rectangle(hDC, x1, y1, x2+1, y2+1);
+
+    if (width || dolinecolor) {
+	GdiFreePen(interp, hDC, hPen);
+    }
+    if (dofillcolor) {
+	GdiFreeBrush(interp, hDC, hBrush);
+    } else {
+	SelectObject(hDC, oldobj);
+    }
+
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiCharWidths --
+ *
+ *	Computes /character widths. This is completely inadequate for
+ *	typesetting, but should work for simple text manipulation.
+ *
+ * Results:
+ *	Returns character width.
+ *
+ *----------------------------------------------------------------------
+ */
+
+
+static int GdiCharWidths(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int argc,
+    const char **argv)
+{
+    static const char usage_message[] =
+	"::tk::print::_gdi characters hdc [-font fontname] [-array ary]";
+    /*
+     * Returns widths of characters from font in an associative array.
+     * Font is currently selected font for HDC if not specified.
+     * Array name is GdiCharWidths if not specified.
+     * Widths should be in the same measures as all other values (1/1000 inch).
+     */
+
+    HDC hDC;
+    LOGFONTW lf;
+    HFONT hfont, oldfont;
+    int made_font = 0;
+    const char *aryvarname = "GdiCharWidths";
+    /* For now, assume 256 characters in the font.... */
+    int widths[256];
+    int retval;
+
+    if (argc < 2) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    hDC = printDC;
+
+    argc -= 2;
+    argv += 2;
+
+    while (argc > 0) {
+	if (strcmp(argv[0], "-font") == 0) {
+	    argc--;
+	    argv++;
+	    if (GdiMakeLogFont(interp, argv[0], &lf, hDC)) {
+		if ((hfont = CreateFontIndirectW(&lf)) != NULL) {
+		    made_font = 1;
+		    oldfont = SelectObject(hDC, hfont);
+		}
+	    }
+	    /* Else leave the font alone!. */
+	} else if (strcmp(argv[0], "-array") == 0) {
+	    argv++;
+	    argc--;
+	    if (argc > 0) {
+		aryvarname = argv[0];
+	    }
+	}
+	argv++;
+	argc--;
+    }
+
+    /* Now, get the widths using the correct function for font type. */
+    if ((retval = GetCharWidth32W(hDC, 0, 255, widths)) == FALSE) {
+	retval = GetCharWidthW(hDC, 0, 255, widths);
+    }
+
+    /*
+     * Retval should be 1 (TRUE) if the function succeeded. If the function
+     * fails, get the "extended" error code and return. Be sure to deallocate
+     * the font if necessary.
+     */
+    if (retval == FALSE) {
+	DWORD val = GetLastError();
+
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+                "::tk::print::_gdi character failed with code %ld", val));
+	if (made_font) {
+	    SelectObject(hDC, oldfont);
+	    DeleteObject(hfont);
+	}
+	return TCL_ERROR;
+    }
+
+    {
+	int i;
+	char ind[2];
+	ind[1] = '\0';
+
+	for (i = 0; i < 255; i++) {
+	    /* TODO: use a bytearray for the index name so NUL works */
+	    ind[0] = i;
+	    Tcl_SetVar2Ex(interp, aryvarname, ind, Tcl_NewIntObj(widths[i]),
+		    TCL_GLOBAL_ONLY);
+	}
+    }
+    /* Now, remove the font if we created it only for this function. */
+    if (made_font) {
+	SelectObject(hDC, oldfont);
+	DeleteObject(hfont);
+    }
+
+    /* The return value should be the array name(?). */
+    Tcl_AppendResult(interp, (char *)aryvarname, NULL);
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiText --
+ *
+ *	Maps text to GDI context.
+ *
+ * Results:
+ *	Renders text.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int GdiText(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int argc,
+    const char **argv)
+{
+    static const char usage_message[] =
+	"::tk::print::_gdi text hdc x y -anchor [center|n|e|s|w] "
+	"-fill color -font fontname "
+	"-justify [left|right|center] "
+	"-stipple bitmap -text string -width linelen "
+	"-single -backfill";
+
+    HDC hDC;
+    int x, y;
+    const char *string = 0;
+    RECT sizerect;
+    UINT format_flags = DT_EXPANDTABS|DT_NOPREFIX; /* Like the canvas. */
+    Tk_Anchor anchor = 0;
+    LOGFONTW lf;
+    HFONT hfont, oldfont;
+    int made_font = 0;
+    int retval;
+    int dotextcolor = 0;
+    int dobgmode = 0;
+    int bgmode;
+    COLORREF textcolor = 0;
+    int usesingle = 0;
+    WCHAR *wstring;
+    Tcl_DString tds;
+
+    if (argc < 4) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    /* Parse the command. */
+
+    hDC = printDC;
+
+    x = atol(argv[2]);
+    y = atol(argv[3]);
+    argc -= 4;
+    argv += 4;
+
+    sizerect.left = sizerect.right = x;
+    sizerect.top = sizerect.bottom = y;
+
+    while (argc > 0) {
+	if (strcmp(argv[0], "-anchor") == 0) {
+	    argc--;
+	    argv++;
+	    if (argc > 0) {
+		Tk_GetAnchor(interp, argv[0], &anchor);
+	    }
+	} else if (strcmp(argv[0], "-justify") == 0) {
+	    argc--;
+	    argv++;
+	    if (argc > 0) {
+		if (strcmp(argv[0], "left") == 0) {
+		    format_flags |= DT_LEFT;
+		} else if (strcmp(argv[0], "center") == 0) {
+		    format_flags |= DT_CENTER;
+		} else if (strcmp(argv[0], "right") == 0) {
+		    format_flags |= DT_RIGHT;
+		}
+	    }
+	} else if (strcmp(argv[0], "-text") == 0) {
+	    argc--;
+	    argv++;
+	    if (argc > 0) {
+		string = argv[0];
+	    }
+	} else if (strcmp(argv[0], "-font") == 0) {
+	    argc--;
+	    argv++;
+	    if (GdiMakeLogFont(interp, argv[0], &lf, hDC)) {
+		if ((hfont = CreateFontIndirectW(&lf)) != NULL) {
+		    made_font = 1;
+		    oldfont = SelectObject(hDC, hfont);
+		}
+	    }
+	    /* Else leave the font alone! */
+	} else if (strcmp(argv[0], "-stipple") == 0) {
+	    argc--;
+	    argv++;
+	    /* Not implemented yet. */
+	} else if (strcmp(argv[0], "-fill") == 0) {
+	    argc--;
+	    argv++;
+	    /* Get text color. */
+	    if (GdiGetColor(argv[0], &textcolor)) {
+		dotextcolor = 1;
+	    }
+	} else if (strcmp(argv[0], "-width") == 0) {
+	    argc--;
+	    argv++;
+	    if (argc > 0) {
+		sizerect.right += atol(argv[0]);
+	    }
+	    /* If a width is specified, break at words. */
+	    format_flags |= DT_WORDBREAK;
+	} else if (strcmp(argv[0], "-single") == 0) {
+	    usesingle = 1;
+	} else if (strcmp(argv[0], "-backfill") == 0) {
+	    dobgmode = 1;
+	}
+
+	argc--;
+	argv++;
+    }
+
+    if (string == 0) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    /* Set the format flags for -single: Overrides -width. */
+    if (usesingle == 1) {
+	format_flags |= DT_SINGLELINE;
+	format_flags |= DT_NOCLIP;
+	format_flags &= ~DT_WORDBREAK;
+    }
+
+    Tcl_DStringInit(&tds);
+    /* Just for fun, let's try translating string to Unicode. */
+    wstring = Tcl_UtfToWCharDString(string, -1, &tds);
+    DrawTextW(hDC, wstring, Tcl_DStringLength(&tds)/2, &sizerect,
+	    format_flags | DT_CALCRECT);
+
+    /* Adjust the rectangle according to the anchor. */
+    x = y = 0;
+    switch (anchor) {
+    case TK_ANCHOR_N:
+	x = (sizerect.right - sizerect.left) / 2;
+	break;
+    case TK_ANCHOR_S:
+	x = (sizerect.right - sizerect.left) / 2;
+	y = (sizerect.bottom - sizerect.top);
+	break;
+    case TK_ANCHOR_E:
+	x = (sizerect.right - sizerect.left);
+	y = (sizerect.bottom - sizerect.top) / 2;
+	break;
+    case TK_ANCHOR_W:
+	y = (sizerect.bottom - sizerect.top) / 2;
+	break;
+    case TK_ANCHOR_NE:
+	x = (sizerect.right - sizerect.left);
+	break;
+    case TK_ANCHOR_NW:
+	break;
+    case TK_ANCHOR_SE:
+	x = (sizerect.right - sizerect.left);
+	y = (sizerect.bottom - sizerect.top);
+	break;
+    case TK_ANCHOR_SW:
+	y = (sizerect.bottom - sizerect.top);
+	break;
+    case TK_ANCHOR_CENTER:
+	x = (sizerect.right - sizerect.left) / 2;
+	y = (sizerect.bottom - sizerect.top) / 2;
+	break;
+    }
+    sizerect.right  -= x;
+    sizerect.left   -= x;
+    sizerect.top    -= y;
+    sizerect.bottom -= y;
+
+    /* Get the color right. */
+    if (dotextcolor) {
+	textcolor = SetTextColor(hDC, textcolor);
+    }
+
+    if (dobgmode) {
+	bgmode = SetBkMode(hDC, OPAQUE);
+    } else {
+	bgmode = SetBkMode(hDC, TRANSPARENT);
+    }
+
+    /* Print the text. */
+    retval = DrawTextW(hDC, wstring,
+	    Tcl_DStringLength(&tds)/2, &sizerect, format_flags);
+    Tcl_DStringFree(&tds);
+
+    /* Get the color set back. */
+    if (dotextcolor) {
+	textcolor = SetTextColor(hDC, textcolor);
+    }
+    SetBkMode(hDC, bgmode);
+    if (made_font) {
+	SelectObject(hDC, oldfont);
+	DeleteObject(hfont);
+    }
+
+    /* In this case, the return value is the height of the text. */
+    Tcl_SetObjResult(interp, Tcl_NewIntObj(retval));
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiGetHdcInfo --
+ *
+ *	Gets salient characteristics of the CTM.
+ *
+ * Results:
+ *	The return value is 0 if any failure occurs--in which case none of the
+ *	other values are meaningful.  Otherwise the return value is the
+ *	current mapping mode.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiGetHdcInfo(
+    HDC hdc,
+    LPPOINT worigin,
+    LPSIZE wextent,
+    LPPOINT vorigin,
+    LPSIZE vextent)
+{
+    int mapmode;
+    int retval;
+
+    memset(worigin, 0, sizeof(POINT));
+    memset(vorigin, 0, sizeof(POINT));
+    memset(wextent, 0, sizeof(SIZE));
+    memset(vextent, 0, sizeof(SIZE));
+
+    if ((mapmode = GetMapMode(hdc)) == 0) {
+	/* Failed! */
+	retval = 0;
+    } else {
+	retval = mapmode;
+    }
+
+    if (GetWindowExtEx(hdc, wextent) == FALSE) {
+	/* Failed! */
+	retval = 0;
+    }
+    if (GetViewportExtEx(hdc, vextent) == FALSE) {
+	/* Failed! */
+	retval = 0;
+    }
+    if (GetWindowOrgEx(hdc, worigin) == FALSE) {
+	/* Failed! */
+	retval = 0;
+    }
+    if (GetViewportOrgEx(hdc, vorigin) == FALSE) {
+	/* Failed! */
+	retval = 0;
+    }
+
+    return retval;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiNameToMode --
+ *
+ *	Converts Windows mapping mode names.
+ *
+ * Results:
+ *	Mapping modes are delineated.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiNameToMode(
+    const char *name)
+{
+    static const struct gdimodes {
+	int mode;
+	const char *name;
+    } modes[] = {
+	{ MM_ANISOTROPIC, "MM_ANISOTROPIC" },
+	{ MM_HIENGLISH,   "MM_HIENGLISH" },
+	{ MM_HIMETRIC,    "MM_HIMETRIC" },
+	{ MM_ISOTROPIC,   "MM_ISOTROPIC" },
+	{ MM_LOENGLISH,   "MM_LOENGLISH" },
+	{ MM_LOMETRIC,    "MM_LOMETRIC" },
+	{ MM_TEXT,        "MM_TEXT" },
+	{ MM_TWIPS,       "MM_TWIPS" }
+    };
+
+    size_t i;
+    for (i=0; i < sizeof(modes) / sizeof(struct gdimodes); i++) {
+	if (strcmp(modes[i].name, name) == 0) {
+	    return modes[i].mode;
+	}
+    }
+    return atoi(name);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiModeToName --
+ *
+ *	Converts the mode number to a printable form.
+ *
+ * Results:
+ *	Mapping numbers are delineated.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static const char *GdiModeToName(
+    int mode)
+{
+    static const struct gdi_modes {
+	int mode;
+	const char *name;
+    } modes[] = {
+	{ MM_ANISOTROPIC, "Anisotropic" },
+	{ MM_HIENGLISH,   "1/1000 inch" },
+	{ MM_HIMETRIC,    "1/100 mm" },
+	{ MM_ISOTROPIC,   "Isotropic" },
+	{ MM_LOENGLISH,   "1/100 inch" },
+	{ MM_LOMETRIC,    "1/10 mm" },
+	{ MM_TEXT,        "1 to 1" },
+	{ MM_TWIPS,       "1/1440 inch" }
+    };
+
+    size_t i;
+    for (i=0; i < sizeof(modes) / sizeof(struct gdi_modes); i++) {
+	if (modes[i].mode == mode) {
+	    return modes[i].name;
+	}
+    }
+    return "Unknown";
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiMap --
+ *
+ *	Sets mapping mode between logical and physical device space.
+ *
+ * Results:
+ *	Bridges map modes.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiMap(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int argc,
+    const char **argv)
+{
+    static const char usage_message[] =
+	"::tk::print::_gdi map hdc "
+	"[-logical x[y]] [-physical x[y]] "
+	"[-offset {x y} ] [-default] [-mode mode]";
+    HDC hdc;
+    int mapmode;	/* Mapping mode. */
+    SIZE wextent;	/* Device extent. */
+    SIZE vextent;	/* Viewport extent. */
+    POINT worigin;	/* Device origin. */
+    POINT vorigin;	/* Viewport origin. */
+    int argno;
+
+    /* Keep track of what parts of the function need to be executed. */
+    int need_usage   = 0;
+    int use_logical  = 0;
+    int use_physical = 0;
+    int use_offset   = 0;
+    int use_default  = 0;
+    int use_mode     = 0;
+
+    /* Required parameter: HDC for printer. */
+    if (argc < 2) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    hdc = printDC;
+
+    if ((mapmode = GdiGetHdcInfo(hdc, &worigin, &wextent, &vorigin, &vextent)) == 0) {
+	/* Failed!. */
+	Tcl_AppendResult(interp, "Cannot get current HDC info", NULL);
+	return TCL_ERROR;
+    }
+
+    /* Parse remaining arguments. */
+    for (argno = 2; argno < argc; argno++) {
+	if (strcmp(argv[argno], "-default") == 0) {
+	    vextent.cx = vextent.cy = wextent.cx = wextent.cy = 1;
+	    vorigin.x = vorigin.y = worigin.x = worigin.y = 0;
+	    mapmode = MM_TEXT;
+	    use_default = 1;
+	} else if (strcmp(argv[argno], "-mode") == 0) {
+	    if (argno + 1 >= argc) {
+		need_usage = 1;
+	    } else {
+		mapmode = GdiNameToMode(argv[argno + 1]);
+		use_mode = 1;
+		argno++;
+	    }
+	} else if (strcmp(argv[argno], "-offset") == 0) {
+	    if (argno + 1 >= argc) {
+		need_usage = 1;
+	    } else {
+		/* It would be nice if this parsed units as well.... */
+		if (sscanf(argv[argno + 1], "%ld%ld",
+			&vorigin.x, &vorigin.y) == 2) {
+		    use_offset = 1;
+		} else {
+		    need_usage = 1;
+		}
+		argno++;
+	    }
+	} else if (strcmp(argv[argno], "-logical") == 0) {
+	    if (argno + 1 >= argc) {
+		need_usage = 1;
+	    } else {
+		int count;
+
+		argno++;
+		/* In "real-life", this should parse units as well.. */
+		if ((count = sscanf(argv[argno], "%ld%ld",
+			&wextent.cx, &wextent.cy)) != 2) {
+		    if (count == 1) {
+			mapmode = MM_ISOTROPIC;
+			use_logical = 1;
+			wextent.cy = wextent.cx;  /* Make them the same. */
+		    } else {
+			need_usage = 1;
+		    }
+		} else {
+		    mapmode = MM_ANISOTROPIC;
+		    use_logical = 2;
+		}
+	    }
+	} else if (strcmp(argv[argno], "-physical") == 0) {
+	    if (argno + 1 >= argc) {
+		need_usage = 1;
+	    } else {
+		int count;
+
+		argno++;
+		/* In "real-life", this should parse units as well.. */
+		if ((count = sscanf(argv[argno], "%ld%ld",
+			&vextent.cx, &vextent.cy)) != 2) {
+		    if (count == 1) {
+			mapmode = MM_ISOTROPIC;
+			use_physical = 1;
+			vextent.cy = vextent.cx;  /* Make them the same. */
+		    } else {
+			need_usage = 1;
+		    }
+		} else {
+		    mapmode = MM_ANISOTROPIC;
+		    use_physical = 2;
+		}
+	    }
+	}
+    }
+
+    /* Check for any impossible combinations. */
+    if (use_logical != use_physical) {
+	need_usage = 1;
+    }
+    if (use_default && (use_logical || use_offset || use_mode)) {
+	need_usage = 1;
+    }
+    if (use_mode && use_logical &&
+	    (mapmode != MM_ISOTROPIC && mapmode != MM_ANISOTROPIC)) {
+	need_usage = 1;
+    }
+
+    if (need_usage) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    /* Call Windows CTM functions. */
+    if (use_logical || use_default || use_mode) { /* Don't call for offset only. */
+	SetMapMode(hdc, mapmode);
+    }
+
+    if (use_offset || use_default) {
+	POINT oldorg;
+	SetViewportOrgEx(hdc, vorigin.x, vorigin.y, &oldorg);
+	SetWindowOrgEx(hdc, worigin.x, worigin.y, &oldorg);
+    }
+
+    if (use_logical) {  /* Same as use_physical. */
+	SIZE oldsiz;
+	SetWindowExtEx(hdc, wextent.cx, wextent.cy, &oldsiz);
+	SetViewportExtEx(hdc, vextent.cx, vextent.cy, &oldsiz);
+    }
+
+    /*
+     * Since we may not have set up every parameter, get them again for the
+     * report.
+     */
+    mapmode = GdiGetHdcInfo(hdc, &worigin, &wextent, &vorigin, &vextent);
+
+    /*
+     * Output current CTM info.
+     * Note: This should really be in terms that can be used in a
+     * ::tk::print::_gdi map command!
+     */
+    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+	    "Transform: \"(%ld, %ld) -> (%ld, %ld)\" "
+	    "Origin: \"(%ld, %ld)\" "
+	    "MappingMode: \"%s\"",
+	    vextent.cx, vextent.cy, wextent.cx, wextent.cy,
+	    vorigin.x, vorigin.y,
+	    GdiModeToName(mapmode)));
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiCopyBits --
+ *
+ *	Copies window bits from source to destination.
+ *
+ * Results:
+ *	Copies window bits.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiCopyBits(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int argc,
+    const char **argv)
+{
+    /* Goal: get the Tk_Window from the top-level
+     * convert it to an HWND
+     * get the HDC
+     * Do a bitblt to the given hdc
+     * Use an optional parameter to point to an arbitrary window instead of
+     * the main
+     * Use optional parameters to map to the width and height required for the
+     * dest.
+     */
+    static const char usage_message[] =
+	"::tk::print::_gdi copybits hdc [-window w|-screen] [-client] "
+	"[-source \"a b c d\"] "
+	"[-destination \"a b c d\"] [-scale number] [-calc]";
+
+    Tk_Window mainWin;
+    Tk_Window workwin;
+    Window wnd;
+    HDC src;
+    HDC dst;
+    HWND hwnd = 0;
+
+    HANDLE hDib;    /* Handle for device-independent bitmap. */
+    LPBITMAPINFOHEADER lpDIBHdr;
+    LPSTR lpBits;
+    enum PrintType wintype = PTWindow;
+
+    int hgt, wid;
+    char *strend;
+    long errcode;
+    int k;
+
+    /* Variables to remember what we saw in the arguments. */
+    int do_window = 0;
+    int do_screen = 0;
+    int do_scale = 0;
+    int do_print = 1;
+
+    /* Variables to remember the values in the arguments. */
+    const char *window_spec;
+    double scale = 1.0;
+    int src_x = 0, src_y = 0, src_w = 0, src_h = 0;
+    int dst_x = 0, dst_y = 0, dst_w = 0, dst_h = 0;
+    int is_toplevel = 0;
+
+    /*
+     * The following steps are peculiar to the top level window.
+     * There is likely a clever way to do the mapping of a widget pathname to
+     * the proper window, to support the idea of using a parameter for this
+     * purpose.
+     */
+    if ((workwin = mainWin = Tk_MainWindow(interp)) == 0) {
+	Tcl_AppendResult(interp, "Can't find main Tk window", NULL);
+	return TCL_ERROR;
+    }
+
+    /*
+     * Parse the arguments.
+     */
+    /* HDC is required. */
+    if (argc < 2) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    dst = printDC;
+
+    /*
+     * Next, check to see if 'dst' can support BitBlt.  If not, raise an
+     * error.
+     */
+    if ((GetDeviceCaps(dst, RASTERCAPS) & RC_BITBLT) == 0) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"Can't do bitmap operations on device context\n"));
+	return TCL_ERROR;
+    }
+
+    /* Loop through the remaining arguments. */
+    for (k=2; k<argc; k++) {
+	if (strcmp(argv[k], "-window") == 0) {
+	    if (argv[k+1] && argv[k+1][0] == '.') {
+		do_window = 1;
+		workwin = Tk_NameToWindow(interp, window_spec = argv[++k], mainWin);
+		if (workwin == NULL) {
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "Can't find window %s in this application",
+			    window_spec));
+		    return TCL_ERROR;
+		}
+	    } else {
+		/* Use strtoul() so octal or hex representations will be
+		 * parsed. */
+		hwnd = (HWND) INT2PTR(strtoul(argv[++k], &strend, 0));
+		if (strend == 0 || strend == argv[k]) {
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "Can't understand window id %s", argv[k]));
+		    return TCL_ERROR;
+		}
+	    }
+	} else if (strcmp(argv[k], "-screen") == 0) {
+	    do_screen = 1;
+	    wintype = PTScreen;
+	} else if (strcmp(argv[k], "-client") == 0) {
+	    wintype = PTClient;
+	} else if (strcmp(argv[k], "-source") == 0) {
+	    float a, b, c, d;
+	    int count = sscanf(argv[++k], "%f%f%f%f", &a, &b, &c, &d);
+
+	    if (count < 2) { /* Can't make heads or tails of it.... */
+		Tcl_AppendResult(interp, usage_message, NULL);
+		return TCL_ERROR;
+	    }
+	    src_x = (int)a;
+	    src_y = (int)b;
+	    if (count == 4) {
+		src_w = (int)c;
+		src_h = (int)d;
+	    }
+	} else if (strcmp(argv[k], "-destination") == 0) {
+	    float a, b, c, d;
+	    int count;
+
+	    count = sscanf(argv[++k], "%f%f%f%f", &a, &b, &c, &d);
+	    if (count < 2) { /* Can't make heads or tails of it.... */
+		Tcl_AppendResult(interp, usage_message, NULL);
+		return TCL_ERROR;
+	    }
+	    dst_x = (int)a;
+	    dst_y = (int)b;
+	    if (count == 3) {
+		dst_w = (int)c;
+		dst_h = -1;
+	    } else if (count == 4) {
+		dst_w = (int)c;
+		dst_h = (int)d;
+	    }
+	} else if (strcmp(argv[k], "-scale") == 0) {
+	    if (argv[++k]) {
+		scale = strtod(argv[k], &strend);
+		if (strend == 0 || strend == argv[k]) {
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "Can't understand scale specification %s",
+			    argv[k]));
+		    return TCL_ERROR;
+		}
+		if (scale <= 0.01 || scale >= 100.0) {
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "Unreasonable scale specification %s", argv[k]));
+		    return TCL_ERROR;
+		}
+		do_scale = 1;
+	    }
+	} else if (strcmp(argv[k], "-noprint") == 0
+		|| strncmp(argv[k], "-calc", 5) == 0) {
+	    /* This option suggested by Pascal Bouvier to get sizes without
+	     * printing. */
+	    do_print = 0;
+	}
+    }
+
+    /*
+     * Check to ensure no incompatible arguments were used.
+     */
+    if (do_window && do_screen) {
+	Tcl_AppendResult(interp, usage_message, NULL);
+	return TCL_ERROR;
+    }
+
+    /*
+     * Get the MS Window we want to copy.  Given the HDC, we can get the
+     * "Window".
+     */
+    if (hwnd == 0) {
+	if (Tk_IsTopLevel(workwin)) {
+	    is_toplevel = 1;
+	}
+
+	if ((wnd = Tk_WindowId(workwin)) == 0) {
+	    Tcl_AppendResult(interp, "Can't get id for Tk window", NULL);
+	    return TCL_ERROR;
+	}
+
+	/* Given the "Window" we can get a Microsoft Windows HWND. */
+
+	if ((hwnd = Tk_GetHWND(wnd)) == 0) {
+	    Tcl_AppendResult(interp, "Can't get Windows handle for Tk window",
+		    NULL);
+	    return TCL_ERROR;
+	}
+
+	/*
+	 * If it's a toplevel, give it special treatment: Get the top-level
+	 * window instead.  If the user only wanted the client, the -client
+	 * flag will take care of it.  This uses "windows" tricks rather than
+	 * Tk since the obvious method of getting the wrapper window didn't
+	 * seem to work.
+	 */
+	if (is_toplevel) {
+	    HWND tmpWnd = hwnd;
+	    while ((tmpWnd = GetParent(tmpWnd)) != 0) {
+		hwnd = tmpWnd;
+	    }
+	}
+    }
+
+    /* Given the HWND, we can get the window's device context. */
+    if ((src = GetWindowDC(hwnd)) == 0) {
+	Tcl_AppendResult(interp, "Can't get device context for Tk window", NULL);
+	return TCL_ERROR;
+    }
+
+    if (do_screen) {
+	LONG w, h;
+	GetDisplaySize(&w, &h);
+	wid = w;
+	hgt = h;
+    } else if (is_toplevel) {
+	RECT tl;
+	GetWindowRect(hwnd, &tl);
+	wid = tl.right - tl.left;
+	hgt = tl.bottom - tl.top;
+    } else {
+	if ((hgt = Tk_Height(workwin)) <= 0) {
+	    Tcl_AppendResult(interp, "Can't get height of Tk window", NULL);
+	    ReleaseDC(hwnd,src);
+	    return TCL_ERROR;
+	}
+
+	if ((wid = Tk_Width(workwin)) <= 0) {
+	    Tcl_AppendResult(interp, "Can't get width of Tk window", NULL);
+	    ReleaseDC(hwnd,src);
+	    return TCL_ERROR;
+	}
+    }
+
+    /*
+     * Ensure all the widths and heights are set up right
+     * A: No dimensions are negative
+     * B: No dimensions exceed the maximums
+     * C: The dimensions don't lead to a 0 width or height image.
+     */
+    if (src_x < 0) {
+	src_x = 0;
+    }
+    if (src_y < 0) {
+	src_y = 0;
+    }
+    if (dst_x < 0) {
+	dst_x = 0;
+    }
+    if (dst_y < 0) {
+	dst_y = 0;
+    }
+
+    if (src_w > wid || src_w <= 0) {
+	src_w = wid;
+    }
+
+    if (src_h > hgt || src_h <= 0) {
+	src_h = hgt;
+    }
+
+    if (do_scale && dst_w == 0) {
+	/* Calculate destination width and height based on scale. */
+	dst_w = (int)(scale * src_w);
+	dst_h = (int)(scale * src_h);
+    }
+
+    if (dst_h == -1) {
+	dst_h = (int) (((long)src_h * dst_w) / (src_w + 1)) + 1;
+    }
+
+    if (dst_h == 0 || dst_w == 0) {
+	dst_h = src_h;
+	dst_w = src_w;
+    }
+
+    if (do_print) {
+	/*
+	 * Based on notes from Heiko Schock and Arndt Roger Schneider, create
+	 * this as a DIBitmap, to allow output to a greater range of devices.
+	 * This approach will also allow selection of
+	 *   a) Whole screen
+	 *   b) Whole window
+	 *   c) Client window only
+	 * for the "grab"
+	 */
+	hDib = CopyToDIB(hwnd, wintype);
+
+	/* GdiFlush();. */
+
+	if (!hDib) {
+	    Tcl_AppendResult(interp, "Can't create DIB", NULL);
+	    ReleaseDC(hwnd,src);
+	    return TCL_ERROR;
+	}
+
+	lpDIBHdr = (LPBITMAPINFOHEADER) GlobalLock(hDib);
+	if (!lpDIBHdr) {
+	    Tcl_AppendResult(interp, "Can't get DIB header", NULL);
+	    ReleaseDC(hwnd,src);
+	    return TCL_ERROR;
+	}
+
+	lpBits = (LPSTR) lpDIBHdr + lpDIBHdr->biSize + DIBNumColors(lpDIBHdr) * sizeof(RGBQUAD);
+
+	/* stretch the DIBbitmap directly in the target device. */
+
+	if (StretchDIBits(dst,
+		dst_x, dst_y, dst_w, dst_h,
+		src_x, src_y, src_w, src_h,
+		lpBits, (LPBITMAPINFO)lpDIBHdr, DIB_RGB_COLORS,
+		SRCCOPY) == (int)GDI_ERROR) {
+	    errcode = GetLastError();
+	    GlobalUnlock(hDib);
+	    GlobalFree(hDib);
+	    ReleaseDC(hwnd,src);
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		    "StretchDIBits failed with code %ld", errcode));
+	    return TCL_ERROR;
+	}
+
+	/* free allocated memory. */
+	GlobalUnlock(hDib);
+	GlobalFree(hDib);
+    }
+
+    ReleaseDC(hwnd,src);
+
+    /*
+     * The return value should relate to the size in the destination space.
+     * At least the height should be returned (for page layout purposes).
+     */
+    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+	    "%d %d %d %d", dst_x, dst_y, dst_w, dst_h));
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * DIBNumColors --
+ *
+ *	Computes the number of colors required for a DIB palette.
+ *
+ * Results:
+ *	Returns number of colors.
+
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int DIBNumColors(
+    LPBITMAPINFOHEADER lpDIB)
+{
+    WORD wBitCount;	/* DIB bit count. */
+    DWORD dwClrUsed;
+
+    /*
+     * If this is a Windows-style DIB, the number of colors in the color table
+     * can be less than the number of bits per pixel allows for (i.e.
+     * lpbi->biClrUsed can be set to some value).  If this is the case, return
+     * the appropriate value..
+     */
+
+    dwClrUsed = lpDIB->biClrUsed;
+    if (dwClrUsed) {
+	return (WORD) dwClrUsed;
+    }
+
+    /*
+     * Calculate the number of colors in the color table based on.
+     * The number of bits per pixel for the DIB.
+     */
+
+    wBitCount = lpDIB->biBitCount;
+
+    /* Return number of colors based on bits per pixel. */
+
+    switch (wBitCount) {
+    case 1:
+	return 2;
+    case 4:
+	return 16;
+    case 8:
+	return 256;
+    default:
+	return 0;
+    }
+}
+
+/*
+ * Helper functions
+ */
+
+/*
+ * ParseFontWords converts various keywords to modifyers of a
+ * font specification.
+ * For all words, later occurrences override earlier occurrences.
+ * Overstrike and underline cannot be "undone" by other words
+ */
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiParseFontWords --
+ *
+ *	Converts various keywords to modifiers of a font specification.  For
+ *	all words, later occurrences override earlier occurrences.  Overstrike
+ *	and underline cannot be "undone" by other words
+ *
+ * Results:
+ *	 Keywords converted to modifiers.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiParseFontWords(
+    TCL_UNUSED(Tcl_Interp *),
+    LOGFONTW *lf,
+    const char *str[],
+    int numargs)
+{
+    int i;
+    int retval = 0; /* Number of words that could not be parsed. */
+
+    for (i=0; i<numargs; i++) {
+	if (str[i]) {
+	    int wt;
+	    if ((wt = GdiWordToWeight(str[i])) != -1) {
+		lf->lfWeight = wt;
+	    } else if (strcmp(str[i], "roman") == 0) {
+		lf->lfItalic = FALSE;
+	    } else if (strcmp(str[i], "italic") == 0) {
+		lf->lfItalic = TRUE;
+	    } else if (strcmp(str[i], "underline") == 0) {
+		lf->lfUnderline = TRUE;
+	    } else if (strcmp(str[i], "overstrike") == 0) {
+		lf->lfStrikeOut = TRUE;
+	    } else {
+		retval++;
+	    }
+	}
+    }
+    return retval;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiWordToWeight --
+ *
+ *	Converts keywords to font weights.
+ *
+ * Results:
+ *	Helps set the proper font for GDI rendering.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiWordToWeight(
+    const char *str)
+{
+    int retval = -1;
+    size_t i;
+    static const struct font_weight {
+	const char *name;
+	int weight;
+    } font_weights[] = {
+	{ "thin", FW_THIN },
+	{ "extralight", FW_EXTRALIGHT },
+	{ "ultralight", FW_EXTRALIGHT },
+	{ "light", FW_LIGHT },
+	{ "normal", FW_NORMAL },
+	{ "regular", FW_NORMAL },
+	{ "medium", FW_MEDIUM },
+	{ "semibold", FW_SEMIBOLD },
+	{ "demibold", FW_SEMIBOLD },
+	{ "bold", FW_BOLD },
+	{ "extrabold", FW_EXTRABOLD },
+	{ "ultrabold", FW_EXTRABOLD },
+	{ "heavy", FW_HEAVY },
+	{ "black", FW_HEAVY },
+    };
+
+    if (str == 0) {
+	return -1;
+    }
+
+    for (i=0; i<sizeof(font_weights) / sizeof(struct font_weight); i++) {
+	if (strcmp(str, font_weights[i].name) == 0) {
+	    retval = font_weights[i].weight;
+	    break;
+	}
+    }
+
+    return retval;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * MakeLogFont --
+ *
+ *	Takes the font description string and converts this into a logical
+ *	font spec.
+ *
+ * Results:
+ *	 Sets font weight.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiMakeLogFont(
+    Tcl_Interp *interp,
+    const char *str,
+    LOGFONTW *lf,
+    HDC hDC)
+{
+    const char **list;
+    int count;
+
+    /* Set up defaults for logical font. */
+    memset(lf, 0, sizeof(*lf));
+    lf->lfWeight  = FW_NORMAL;
+    lf->lfCharSet = DEFAULT_CHARSET;
+    lf->lfOutPrecision = OUT_DEFAULT_PRECIS;
+    lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;
+    lf->lfQuality = DEFAULT_QUALITY;
+    lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
+
+    /* The cast to (char *) is silly, based on prototype of Tcl_SplitList. */
+    if (Tcl_SplitList(interp, str, &count, &list) != TCL_OK) {
+	return 0;
+    }
+
+    /* Now we have the font structure broken into name, size, weight. */
+    if (count >= 1) {
+	Tcl_DString ds;
+
+	Tcl_DStringInit(&ds);
+	wcsncpy(lf->lfFaceName, Tcl_UtfToWCharDString(list[0], -1, &ds),
+		LF_FACESIZE-1);
+	Tcl_DStringFree(&ds);
+	lf->lfFaceName[LF_FACESIZE-1] = 0;
+    } else {
+	return 0;
+    }
+
+    if (count >= 2) {
+	int siz;
+	char *strend;
+	siz = strtol(list[1], &strend, 0);
+
+	/*
+	 * Assumptions:
+	 * 1) Like canvas, if a positive number is specified, it's in points.
+	 * 2) Like canvas, if a negative number is specified, it's in pixels.
+	 */
+	if (strend > list[1]) { /* If it looks like a number, it is a number.... */
+	    if (siz > 0) {  /* Size is in points. */
+		SIZE wextent, vextent;
+		POINT worigin, vorigin;
+		double factor;
+
+		switch (GdiGetHdcInfo(hDC, &worigin, &wextent, &vorigin, &vextent)) {
+		case MM_ISOTROPIC:
+		    if (vextent.cy < -1 || vextent.cy > 1) {
+			factor = (double)wextent.cy / vextent.cy;
+			if (factor < 0.0) {
+			    factor = -factor;
+			}
+			lf->lfHeight = (int)(-siz * GetDeviceCaps(hDC, LOGPIXELSY) * factor / 72.0);
+		    } else if (vextent.cx < -1 || vextent.cx > 1) {
+			factor = (double)wextent.cx / vextent.cx;
+			if (factor < 0.0) {
+			    factor = -factor;
+			}
+			lf->lfHeight = (int)(-siz * GetDeviceCaps(hDC, LOGPIXELSY) * factor / 72.0);
+		    } else {
+			lf->lfHeight = -siz; /* This is bad news.... */
+		    }
+		    break;
+		case MM_ANISOTROPIC:
+		    if (vextent.cy != 0) {
+			factor = (double)wextent.cy / vextent.cy;
+			if (factor < 0.0) {
+			    factor = -factor;
+			}
+			lf->lfHeight = (int)(-siz * GetDeviceCaps(hDC, LOGPIXELSY) * factor / 72.0);
+		    } else {
+			lf->lfHeight = -siz; /* This is bad news.... */
+		    }
+		    break;
+		case MM_TEXT:
+		default:
+		    /* If mapping mode is MM_TEXT, use the documented
+		     * formula. */
+		    lf->lfHeight = -MulDiv(siz, GetDeviceCaps(hDC, LOGPIXELSY), 72);
+		    break;
+		case MM_HIENGLISH:
+		    lf->lfHeight = -MulDiv(siz, 1000, 72);
+		    break;
+		case MM_LOENGLISH:
+		    lf->lfHeight = -MulDiv(siz, 100, 72);
+		    break;
+		case MM_HIMETRIC:
+		    lf->lfHeight = -MulDiv(siz, (int)(1000*2.54), 72);
+		    break;
+		case MM_LOMETRIC:
+		    lf->lfHeight = -MulDiv(siz, (int)(100*2.54), 72);
+		    break;
+		case MM_TWIPS:
+		    lf->lfHeight = -MulDiv(siz, 1440, 72);
+		    break;
+		}
+	    } else if (siz == 0) {   /* Use default size of 12 points. */
+		lf->lfHeight = -MulDiv(12, GetDeviceCaps(hDC, LOGPIXELSY), 72);
+	    } else {                 /* Use pixel size. */
+		lf->lfHeight = siz;  /* Leave this negative. */
+	    }
+	} else {
+	    GdiParseFontWords(interp, lf, list+1, count-1);
+	}
+    }
+
+    if (count >= 3) {
+	GdiParseFontWords(interp, lf, list+2, count-2);
+    }
+
+    Tcl_Free((char *)list);
+    return 1;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiMakePen --
+ *
+ *	Creates a logical pen based on input parameters and selects it into
+ *	the hDC.
+ *
+ * Results:
+ *	Sets rendering pen.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiMakePen(
+    Tcl_Interp *interp,
+    int width,
+    int dashstyle,
+    const char *dashstyledata,
+    TCL_UNUSED(int),		/* Ignored for now. */
+    TCL_UNUSED(int),		/* Ignored for now. */
+    TCL_UNUSED(int),
+    TCL_UNUSED(const char *),	/* Ignored for now. */
+    unsigned long color,
+    HDC hDC,
+    HGDIOBJ *oldPen)
+{
+    /*
+     * The LOGPEN structure takes the following dash options:
+     * PS_SOLID: a solid pen
+     * PS_DASH:  a dashed pen
+     * PS_DOT:   a dotted pen
+     * PS_DASHDOT: a pen with a dash followed by a dot
+     * PS_DASHDOTDOT: a pen with a dash followed by 2 dots
+     *
+     * It seems that converting to ExtCreatePen may be more advantageous, as
+     * it matches the Tk canvas pens much better--but not for Win95, which
+     * does not support PS_USERSTYLE. An explicit test (or storage in a static
+     * after first failure) may suffice for working around this. The
+     * ExtCreatePen is not supported at all under Win32.
+     */
+
+    HPEN hPen;
+    LOGBRUSH lBrush;
+    DWORD pStyle = PS_SOLID;           /* -dash should override*/
+    DWORD endStyle = PS_ENDCAP_ROUND;  /* -capstyle should override. */
+    DWORD joinStyle = PS_JOIN_ROUND;   /* -joinstyle should override. */
+    DWORD styleCount = 0;
+    DWORD *styleArray = 0;
+
+    /*
+     * To limit the propagation of allocated memory, the dashes will have a
+     * maximum here.  If one wishes to remove the static allocation, please be
+     * sure to update GdiFreePen and ensure that the array is NOT freed if the
+     * LOGPEN option is used.
+     */
+    static DWORD pStyleData[24];
+    if (dashstyle != 0 && dashstyledata != 0) {
+	const char *cp;
+	size_t i;
+	char *dup = (char *) Tcl_Alloc(strlen(dashstyledata) + 1);
+	strcpy(dup, dashstyledata);
+	/* DEBUG. */
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"DEBUG: Found a dash spec of |%s|\n",
+		dashstyledata));
+
+	/* Parse the dash spec. */
+	if (isdigit(dashstyledata[0])) {
+	    cp = strtok(dup, " \t,;");
+	    for (i = 0; cp && i < sizeof(pStyleData) / sizeof(DWORD); i++) {
+		pStyleData[styleCount++] = atoi(cp);
+		cp = strtok(NULL, " \t,;");
+	    }
+	} else {
+	    for (i=0; dashstyledata[i] != '\0' && i< sizeof(pStyleData) / sizeof(DWORD); i++) {
+		switch (dashstyledata[i]) {
+		case ' ':
+		    pStyleData[styleCount++] = 8;
+		    break;
+		case ',':
+		    pStyleData[styleCount++] = 4;
+		    break;
+		case '_':
+		    pStyleData[styleCount++] = 6;
+		    break;
+		case '-':
+		    pStyleData[styleCount++] = 4;
+		    break;
+		case '.':
+		    pStyleData[styleCount++] = 2;
+		    break;
+		default:
+		    break;
+		}
+	    }
+	}
+	if (styleCount > 0) {
+	    styleArray = pStyleData;
+	} else {
+	    dashstyle = 0;
+	}
+	if (dup) {
+	    Tcl_Free(dup);
+	}
+    }
+
+    if (dashstyle != 0) {
+	pStyle = PS_USERSTYLE;
+    }
+
+    /* -stipple could affect this.... */
+    lBrush.lbStyle = BS_SOLID;
+    lBrush.lbColor = color;
+    lBrush.lbHatch = 0;
+
+    /* We only use geometric pens, even for 1-pixel drawing. */
+    hPen = ExtCreatePen(PS_GEOMETRIC|pStyle|endStyle|joinStyle,
+	    width, &lBrush, styleCount, styleArray);
+
+    if (hPen == 0) { /* Failed for some reason...Fall back on CreatePenIndirect. */
+	LOGPEN lf;
+	lf.lopnWidth.x = width;
+	lf.lopnWidth.y = 0;		/* Unused in LOGPEN. */
+	if (dashstyle == 0) {
+	    lf.lopnStyle = PS_SOLID;	/* For now...convert 'style' in the future. */
+	} else {
+	    lf.lopnStyle = PS_DASH;	/* REALLLLY simple for now. */
+	}
+	lf.lopnColor = color;		/* Assume we're getting a COLORREF. */
+	/* Now we have a logical pen. Create the "real" pen and put it in the
+	 * hDC. */
+	hPen = CreatePenIndirect(&lf);
+    }
+
+    *oldPen = SelectObject(hDC, hPen);
+    return 1;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiFreePen --
+ *
+ *	Wraps the protocol to delete a created pen.
+ *
+ * Results:
+ *	Deletes pen.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiFreePen(
+    TCL_UNUSED(Tcl_Interp *),
+    HDC hDC,
+    HGDIOBJ oldPen)
+{
+    HGDIOBJ gonePen = SelectObject(hDC, oldPen);
+
+    DeleteObject(gonePen);
+    return 1;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiMakeBrush--
+ *
+ *	Creates a logical brush based on input parameters, and selects it into
+ *	the hdc.
+ *
+ * Results:
+ *	 Creates brush.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiMakeBrush(
+    TCL_UNUSED(Tcl_Interp *),
+    TCL_UNUSED(unsigned int),
+    unsigned long color,
+    long hatch,
+    LOGBRUSH *lb,
+    HDC hDC,
+    HGDIOBJ *oldBrush)
+{
+    HBRUSH hBrush;
+    lb->lbStyle = BS_SOLID; /* Support other styles later. */
+    lb->lbColor = color;    /* Assume this is a COLORREF. */
+    lb->lbHatch = hatch;    /* Ignored for now, given BS_SOLID in the Style. */
+
+    /* Now we have the logical brush. Create the "real" brush and put it in
+     * the hDC. */
+    hBrush = CreateBrushIndirect(lb);
+    *oldBrush = SelectObject(hDC, hBrush);
+    return 1;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiFreeBrush --
+ *
+ *	Wraps the protocol to delete a created brush.
+ *
+ * Results:
+ *	 Deletes brush.
+ *
+ *----------------------------------------------------------------------
+ */
+static int GdiFreeBrush(
+    TCL_UNUSED(Tcl_Interp *),
+    HDC hDC,
+    HGDIOBJ oldBrush)
+{
+    HGDIOBJ goneBrush;
+
+    goneBrush = SelectObject(hDC, oldBrush);
+    DeleteObject(goneBrush);
+    return 1;
+}
+
+/*
+ * Utility functions from elsewhere in Tcl.
+ * Functions have removed reliance on X and Tk libraries, as well as removing
+ * the need for TkWindows.
+ * GdiGetColor is a copy of a TkpGetColor from tkWinColor.c
+ * GdiParseColor is a copy of XParseColor from xcolors.c
+ */
+typedef struct {
+    const char *name;
+    int index;
+} SystemColorEntry;
+
+static const SystemColorEntry sysColors[] = {
+    {"3dDarkShadow",		COLOR_3DDKSHADOW},
+    {"3dLight",			COLOR_3DLIGHT},
+    {"ActiveBorder",		COLOR_ACTIVEBORDER},
+    {"ActiveCaption",		COLOR_ACTIVECAPTION},
+    {"AppWorkspace",		COLOR_APPWORKSPACE},
+    {"Background",		COLOR_BACKGROUND},
+    {"ButtonFace",		COLOR_BTNFACE},
+    {"ButtonHighlight",		COLOR_BTNHIGHLIGHT},
+    {"ButtonShadow",		COLOR_BTNSHADOW},
+    {"ButtonText",		COLOR_BTNTEXT},
+    {"CaptionText",		COLOR_CAPTIONTEXT},
+    {"DisabledText",		COLOR_GRAYTEXT},
+    {"GrayText",		COLOR_GRAYTEXT},
+    {"Highlight",		COLOR_HIGHLIGHT},
+    {"HighlightText",		COLOR_HIGHLIGHTTEXT},
+    {"InactiveBorder",		COLOR_INACTIVEBORDER},
+    {"InactiveCaption",		COLOR_INACTIVECAPTION},
+    {"InactiveCaptionText",	COLOR_INACTIVECAPTIONTEXT},
+    {"InfoBackground",		COLOR_INFOBK},
+    {"InfoText",		COLOR_INFOTEXT},
+    {"Menu",			COLOR_MENU},
+    {"MenuText",		COLOR_MENUTEXT},
+    {"Scrollbar",		COLOR_SCROLLBAR},
+    {"Window",			COLOR_WINDOW},
+    {"WindowFrame",		COLOR_WINDOWFRAME},
+    {"WindowText",		COLOR_WINDOWTEXT}
+};
+
+static int numsyscolors = 0;
+
+typedef struct {
+    const char *name;
+    unsigned char red;
+    unsigned char green;
+    unsigned char blue;
+} XColorEntry;
+
+static const XColorEntry xColors[] = {
+    {"alice blue", 240, 248, 255},
+    {"AliceBlue", 240, 248, 255},
+    {"antique white", 250, 235, 215},
+    {"AntiqueWhite", 250, 235, 215},
+    {"AntiqueWhite1", 255, 239, 219},
+    {"AntiqueWhite2", 238, 223, 204},
+    {"AntiqueWhite3", 205, 192, 176},
+    {"AntiqueWhite4", 139, 131, 120},
+    {"aquamarine", 127, 255, 212},
+    {"aquamarine1", 127, 255, 212},
+    {"aquamarine2", 118, 238, 198},
+    {"aquamarine3", 102, 205, 170},
+    {"aquamarine4", 69, 139, 116},
+    {"azure", 240, 255, 255},
+    {"azure1", 240, 255, 255},
+    {"azure2", 224, 238, 238},
+    {"azure3", 193, 205, 205},
+    {"azure4", 131, 139, 139},
+    {"beige", 245, 245, 220},
+    {"bisque", 255, 228, 196},
+    {"bisque1", 255, 228, 196},
+    {"bisque2", 238, 213, 183},
+    {"bisque3", 205, 183, 158},
+    {"bisque4", 139, 125, 107},
+    {"black", 0, 0, 0},
+    {"blanched almond", 255, 235, 205},
+    {"BlanchedAlmond", 255, 235, 205},
+    {"blue", 0, 0, 255},
+    {"blue violet", 138, 43, 226},
+    {"blue1", 0, 0, 255},
+    {"blue2", 0, 0, 238},
+    {"blue3", 0, 0, 205},
+    {"blue4", 0, 0, 139},
+    {"BlueViolet", 138, 43, 226},
+    {"brown", 165, 42, 42},
+    {"brown1", 255, 64, 64},
+    {"brown2", 238, 59, 59},
+    {"brown3", 205, 51, 51},
+    {"brown4", 139, 35, 35},
+    {"burlywood", 222, 184, 135},
+    {"burlywood1", 255, 211, 155},
+    {"burlywood2", 238, 197, 145},
+    {"burlywood3", 205, 170, 125},
+    {"burlywood4", 139, 115, 85},
+    {"cadet blue", 95, 158, 160},
+    {"CadetBlue", 95, 158, 160},
+    {"CadetBlue1", 152, 245, 255},
+    {"CadetBlue2", 142, 229, 238},
+    {"CadetBlue3", 122, 197, 205},
+    {"CadetBlue4", 83, 134, 139},
+    {"chartreuse", 127, 255, 0},
+    {"chartreuse1", 127, 255, 0},
+    {"chartreuse2", 118, 238, 0},
+    {"chartreuse3", 102, 205, 0},
+    {"chartreuse4", 69, 139, 0},
+    {"chocolate", 210, 105, 30},
+    {"chocolate1", 255, 127, 36},
+    {"chocolate2", 238, 118, 33},
+    {"chocolate3", 205, 102, 29},
+    {"chocolate4", 139, 69, 19},
+    {"coral", 255, 127, 80},
+    {"coral1", 255, 114, 86},
+    {"coral2", 238, 106, 80},
+    {"coral3", 205, 91, 69},
+    {"coral4", 139, 62, 47},
+    {"cornflower blue", 100, 149, 237},
+    {"CornflowerBlue", 100, 149, 237},
+    {"cornsilk", 255, 248, 220},
+    {"cornsilk1", 255, 248, 220},
+    {"cornsilk2", 238, 232, 205},
+    {"cornsilk3", 205, 200, 177},
+    {"cornsilk4", 139, 136, 120},
+    {"cyan", 0, 255, 255},
+    {"cyan1", 0, 255, 255},
+    {"cyan2", 0, 238, 238},
+    {"cyan3", 0, 205, 205},
+    {"cyan4", 0, 139, 139},
+    {"dark goldenrod", 184, 134, 11},
+    {"dark green", 0, 100, 0},
+    {"dark khaki", 189, 183, 107},
+    {"dark olive green", 85, 107, 47},
+    {"dark orange", 255, 140, 0},
+    {"dark orchid", 153, 50, 204},
+    {"dark salmon", 233, 150, 122},
+    {"dark sea green", 143, 188, 143},
+    {"dark slate blue", 72, 61, 139},
+    {"dark slate gray", 47, 79, 79},
+    {"dark slate grey", 47, 79, 79},
+    {"dark turquoise", 0, 206, 209},
+    {"dark violet", 148, 0, 211},
+    {"DarkGoldenrod", 184, 134, 11},
+    {"DarkGoldenrod1", 255, 185, 15},
+    {"DarkGoldenrod2", 238, 173, 14},
+    {"DarkGoldenrod3", 205, 149, 12},
+    {"DarkGoldenrod4", 139, 101, 8},
+    {"DarkGreen", 0, 100, 0},
+    {"DarkKhaki", 189, 183, 107},
+    {"DarkOliveGreen", 85, 107, 47},
+    {"DarkOliveGreen1", 202, 255, 112},
+    {"DarkOliveGreen2", 188, 238, 104},
+    {"DarkOliveGreen3", 162, 205, 90},
+    {"DarkOliveGreen4", 110, 139, 61},
+    {"DarkOrange", 255, 140, 0},
+    {"DarkOrange1", 255, 127, 0},
+    {"DarkOrange2", 238, 118, 0},
+    {"DarkOrange3", 205, 102, 0},
+    {"DarkOrange4", 139, 69, 0},
+    {"DarkOrchid", 153, 50, 204},
+    {"DarkOrchid1", 191, 62, 255},
+    {"DarkOrchid2", 178, 58, 238},
+    {"DarkOrchid3", 154, 50, 205},
+    {"DarkOrchid4", 104, 34, 139},
+    {"DarkSalmon", 233, 150, 122},
+    {"DarkSeaGreen", 143, 188, 143},
+    {"DarkSeaGreen1", 193, 255, 193},
+    {"DarkSeaGreen2", 180, 238, 180},
+    {"DarkSeaGreen3", 155, 205, 155},
+    {"DarkSeaGreen4", 105, 139, 105},
+    {"DarkSlateBlue", 72, 61, 139},
+    {"DarkSlateGray", 47, 79, 79},
+    {"DarkSlateGray1", 151, 255, 255},
+    {"DarkSlateGray2", 141, 238, 238},
+    {"DarkSlateGray3", 121, 205, 205},
+    {"DarkSlateGray4", 82, 139, 139},
+    {"DarkSlateGrey", 47, 79, 79},
+    {"DarkTurquoise", 0, 206, 209},
+    {"DarkViolet", 148, 0, 211},
+    {"deep pink", 255, 20, 147},
+    {"deep sky blue", 0, 191, 255},
+    {"DeepPink", 255, 20, 147},
+    {"DeepPink1", 255, 20, 147},
+    {"DeepPink2", 238, 18, 137},
+    {"DeepPink3", 205, 16, 118},
+    {"DeepPink4", 139, 10, 80},
+    {"DeepSkyBlue", 0, 191, 255},
+    {"DeepSkyBlue1", 0, 191, 255},
+    {"DeepSkyBlue2", 0, 178, 238},
+    {"DeepSkyBlue3", 0, 154, 205},
+    {"DeepSkyBlue4", 0, 104, 139},
+    {"dim gray", 105, 105, 105},
+    {"dim grey", 105, 105, 105},
+    {"DimGray", 105, 105, 105},
+    {"DimGrey", 105, 105, 105},
+    {"dodger blue", 30, 144, 255},
+    {"DodgerBlue", 30, 144, 255},
+    {"DodgerBlue1", 30, 144, 255},
+    {"DodgerBlue2", 28, 134, 238},
+    {"DodgerBlue3", 24, 116, 205},
+    {"DodgerBlue4", 16, 78, 139},
+    {"firebrick", 178, 34, 34},
+    {"firebrick1", 255, 48, 48},
+    {"firebrick2", 238, 44, 44},
+    {"firebrick3", 205, 38, 38},
+    {"firebrick4", 139, 26, 26},
+    {"floral white", 255, 250, 240},
+    {"FloralWhite", 255, 250, 240},
+    {"forest green", 34, 139, 34},
+    {"ForestGreen", 34, 139, 34},
+    {"gainsboro", 220, 220, 220},
+    {"ghost white", 248, 248, 255},
+    {"GhostWhite", 248, 248, 255},
+    {"gold", 255, 215, 0},
+    {"gold1", 255, 215, 0},
+    {"gold2", 238, 201, 0},
+    {"gold3", 205, 173, 0},
+    {"gold4", 139, 117, 0},
+    {"goldenrod", 218, 165, 32},
+    {"goldenrod1", 255, 193, 37},
+    {"goldenrod2", 238, 180, 34},
+    {"goldenrod3", 205, 155, 29},
+    {"goldenrod4", 139, 105, 20},
+    {"gray", 190, 190, 190},
+    {"gray0", 0, 0, 0},
+    {"gray1", 3, 3, 3},
+    {"gray10", 26, 26, 26},
+    {"gray100", 255, 255, 255},
+    {"gray11", 28, 28, 28},
+    {"gray12", 31, 31, 31},
+    {"gray13", 33, 33, 33},
+    {"gray14", 36, 36, 36},
+    {"gray15", 38, 38, 38},
+    {"gray16", 41, 41, 41},
+    {"gray17", 43, 43, 43},
+    {"gray18", 46, 46, 46},
+    {"gray19", 48, 48, 48},
+    {"gray2", 5, 5, 5},
+    {"gray20", 51, 51, 51},
+    {"gray21", 54, 54, 54},
+    {"gray22", 56, 56, 56},
+    {"gray23", 59, 59, 59},
+    {"gray24", 61, 61, 61},
+    {"gray25", 64, 64, 64},
+    {"gray26", 66, 66, 66},
+    {"gray27", 69, 69, 69},
+    {"gray28", 71, 71, 71},
+    {"gray29", 74, 74, 74},
+    {"gray3", 8, 8, 8},
+    {"gray30", 77, 77, 77},
+    {"gray31", 79, 79, 79},
+    {"gray32", 82, 82, 82},
+    {"gray33", 84, 84, 84},
+    {"gray34", 87, 87, 87},
+    {"gray35", 89, 89, 89},
+    {"gray36", 92, 92, 92},
+    {"gray37", 94, 94, 94},
+    {"gray38", 97, 97, 97},
+    {"gray39", 99, 99, 99},
+    {"gray4", 10, 10, 10},
+    {"gray40", 102, 102, 102},
+    {"gray41", 105, 105, 105},
+    {"gray42", 107, 107, 107},
+    {"gray43", 110, 110, 110},
+    {"gray44", 112, 112, 112},
+    {"gray45", 115, 115, 115},
+    {"gray46", 117, 117, 117},
+    {"gray47", 120, 120, 120},
+    {"gray48", 122, 122, 122},
+    {"gray49", 125, 125, 125},
+    {"gray5", 13, 13, 13},
+    {"gray50", 127, 127, 127},
+    {"gray51", 130, 130, 130},
+    {"gray52", 133, 133, 133},
+    {"gray53", 135, 135, 135},
+    {"gray54", 138, 138, 138},
+    {"gray55", 140, 140, 140},
+    {"gray56", 143, 143, 143},
+    {"gray57", 145, 145, 145},
+    {"gray58", 148, 148, 148},
+    {"gray59", 150, 150, 150},
+    {"gray6", 15, 15, 15},
+    {"gray60", 153, 153, 153},
+    {"gray61", 156, 156, 156},
+    {"gray62", 158, 158, 158},
+    {"gray63", 161, 161, 161},
+    {"gray64", 163, 163, 163},
+    {"gray65", 166, 166, 166},
+    {"gray66", 168, 168, 168},
+    {"gray67", 171, 171, 171},
+    {"gray68", 173, 173, 173},
+    {"gray69", 176, 176, 176},
+    {"gray7", 18, 18, 18},
+    {"gray70", 179, 179, 179},
+    {"gray71", 181, 181, 181},
+    {"gray72", 184, 184, 184},
+    {"gray73", 186, 186, 186},
+    {"gray74", 189, 189, 189},
+    {"gray75", 191, 191, 191},
+    {"gray76", 194, 194, 194},
+    {"gray77", 196, 196, 196},
+    {"gray78", 199, 199, 199},
+    {"gray79", 201, 201, 201},
+    {"gray8", 20, 20, 20},
+    {"gray80", 204, 204, 204},
+    {"gray81", 207, 207, 207},
+    {"gray82", 209, 209, 209},
+    {"gray83", 212, 212, 212},
+    {"gray84", 214, 214, 214},
+    {"gray85", 217, 217, 217},
+    {"gray86", 219, 219, 219},
+    {"gray87", 222, 222, 222},
+    {"gray88", 224, 224, 224},
+    {"gray89", 227, 227, 227},
+    {"gray9", 23, 23, 23},
+    {"gray90", 229, 229, 229},
+    {"gray91", 232, 232, 232},
+    {"gray92", 235, 235, 235},
+    {"gray93", 237, 237, 237},
+    {"gray94", 240, 240, 240},
+    {"gray95", 242, 242, 242},
+    {"gray96", 245, 245, 245},
+    {"gray97", 247, 247, 247},
+    {"gray98", 250, 250, 250},
+    {"gray99", 252, 252, 252},
+    {"green", 0, 255, 0},
+    {"green yellow", 173, 255, 47},
+    {"green1", 0, 255, 0},
+    {"green2", 0, 238, 0},
+    {"green3", 0, 205, 0},
+    {"green4", 0, 139, 0},
+    {"GreenYellow", 173, 255, 47},
+    {"grey", 190, 190, 190},
+    {"grey0", 0, 0, 0},
+    {"grey1", 3, 3, 3},
+    {"grey10", 26, 26, 26},
+    {"grey100", 255, 255, 255},
+    {"grey11", 28, 28, 28},
+    {"grey12", 31, 31, 31},
+    {"grey13", 33, 33, 33},
+    {"grey14", 36, 36, 36},
+    {"grey15", 38, 38, 38},
+    {"grey16", 41, 41, 41},
+    {"grey17", 43, 43, 43},
+    {"grey18", 46, 46, 46},
+    {"grey19", 48, 48, 48},
+    {"grey2", 5, 5, 5},
+    {"grey20", 51, 51, 51},
+    {"grey21", 54, 54, 54},
+    {"grey22", 56, 56, 56},
+    {"grey23", 59, 59, 59},
+    {"grey24", 61, 61, 61},
+    {"grey25", 64, 64, 64},
+    {"grey26", 66, 66, 66},
+    {"grey27", 69, 69, 69},
+    {"grey28", 71, 71, 71},
+    {"grey29", 74, 74, 74},
+    {"grey3", 8, 8, 8},
+    {"grey30", 77, 77, 77},
+    {"grey31", 79, 79, 79},
+    {"grey32", 82, 82, 82},
+    {"grey33", 84, 84, 84},
+    {"grey34", 87, 87, 87},
+    {"grey35", 89, 89, 89},
+    {"grey36", 92, 92, 92},
+    {"grey37", 94, 94, 94},
+    {"grey38", 97, 97, 97},
+    {"grey39", 99, 99, 99},
+    {"grey4", 10, 10, 10},
+    {"grey40", 102, 102, 102},
+    {"grey41", 105, 105, 105},
+    {"grey42", 107, 107, 107},
+    {"grey43", 110, 110, 110},
+    {"grey44", 112, 112, 112},
+    {"grey45", 115, 115, 115},
+    {"grey46", 117, 117, 117},
+    {"grey47", 120, 120, 120},
+    {"grey48", 122, 122, 122},
+    {"grey49", 125, 125, 125},
+    {"grey5", 13, 13, 13},
+    {"grey50", 127, 127, 127},
+    {"grey51", 130, 130, 130},
+    {"grey52", 133, 133, 133},
+    {"grey53", 135, 135, 135},
+    {"grey54", 138, 138, 138},
+    {"grey55", 140, 140, 140},
+    {"grey56", 143, 143, 143},
+    {"grey57", 145, 145, 145},
+    {"grey58", 148, 148, 148},
+    {"grey59", 150, 150, 150},
+    {"grey6", 15, 15, 15},
+    {"grey60", 153, 153, 153},
+    {"grey61", 156, 156, 156},
+    {"grey62", 158, 158, 158},
+    {"grey63", 161, 161, 161},
+    {"grey64", 163, 163, 163},
+    {"grey65", 166, 166, 166},
+    {"grey66", 168, 168, 168},
+    {"grey67", 171, 171, 171},
+    {"grey68", 173, 173, 173},
+    {"grey69", 176, 176, 176},
+    {"grey7", 18, 18, 18},
+    {"grey70", 179, 179, 179},
+    {"grey71", 181, 181, 181},
+    {"grey72", 184, 184, 184},
+    {"grey73", 186, 186, 186},
+    {"grey74", 189, 189, 189},
+    {"grey75", 191, 191, 191},
+    {"grey76", 194, 194, 194},
+    {"grey77", 196, 196, 196},
+    {"grey78", 199, 199, 199},
+    {"grey79", 201, 201, 201},
+    {"grey8", 20, 20, 20},
+    {"grey80", 204, 204, 204},
+    {"grey81", 207, 207, 207},
+    {"grey82", 209, 209, 209},
+    {"grey83", 212, 212, 212},
+    {"grey84", 214, 214, 214},
+    {"grey85", 217, 217, 217},
+    {"grey86", 219, 219, 219},
+    {"grey87", 222, 222, 222},
+    {"grey88", 224, 224, 224},
+    {"grey89", 227, 227, 227},
+    {"grey9", 23, 23, 23},
+    {"grey90", 229, 229, 229},
+    {"grey91", 232, 232, 232},
+    {"grey92", 235, 235, 235},
+    {"grey93", 237, 237, 237},
+    {"grey94", 240, 240, 240},
+    {"grey95", 242, 242, 242},
+    {"grey96", 245, 245, 245},
+    {"grey97", 247, 247, 247},
+    {"grey98", 250, 250, 250},
+    {"grey99", 252, 252, 252},
+    {"honeydew", 240, 255, 240},
+    {"honeydew1", 240, 255, 240},
+    {"honeydew2", 224, 238, 224},
+    {"honeydew3", 193, 205, 193},
+    {"honeydew4", 131, 139, 131},
+    {"hot pink", 255, 105, 180},
+    {"HotPink", 255, 105, 180},
+    {"HotPink1", 255, 110, 180},
+    {"HotPink2", 238, 106, 167},
+    {"HotPink3", 205, 96, 144},
+    {"HotPink4", 139, 58, 98},
+    {"indian red", 205, 92, 92},
+    {"IndianRed", 205, 92, 92},
+    {"IndianRed1", 255, 106, 106},
+    {"IndianRed2", 238, 99, 99},
+    {"IndianRed3", 205, 85, 85},
+    {"IndianRed4", 139, 58, 58},
+    {"ivory", 255, 255, 240},
+    {"ivory1", 255, 255, 240},
+    {"ivory2", 238, 238, 224},
+    {"ivory3", 205, 205, 193},
+    {"ivory4", 139, 139, 131},
+    {"khaki", 240, 230, 140},
+    {"khaki1", 255, 246, 143},
+    {"khaki2", 238, 230, 133},
+    {"khaki3", 205, 198, 115},
+    {"khaki4", 139, 134, 78},
+    {"lavender", 230, 230, 250},
+    {"lavender blush", 255, 240, 245},
+    {"LavenderBlush", 255, 240, 245},
+    {"LavenderBlush1", 255, 240, 245},
+    {"LavenderBlush2", 238, 224, 229},
+    {"LavenderBlush3", 205, 193, 197},
+    {"LavenderBlush4", 139, 131, 134},
+    {"lawn green", 124, 252, 0},
+    {"LawnGreen", 124, 252, 0},
+    {"lemon chiffon", 255, 250, 205},
+    {"LemonChiffon", 255, 250, 205},
+    {"LemonChiffon1", 255, 250, 205},
+    {"LemonChiffon2", 238, 233, 191},
+    {"LemonChiffon3", 205, 201, 165},
+    {"LemonChiffon4", 139, 137, 112},
+    {"light blue", 173, 216, 230},
+    {"light coral", 240, 128, 128},
+    {"light cyan", 224, 255, 255},
+    {"light goldenrod", 238, 221, 130},
+    {"light goldenrod yellow", 250, 250, 210},
+    {"light gray", 211, 211, 211},
+    {"light grey", 211, 211, 211},
+    {"light pink", 255, 182, 193},
+    {"light salmon", 255, 160, 122},
+    {"light sea green", 32, 178, 170},
+    {"light sky blue", 135, 206, 250},
+    {"light slate blue", 132, 112, 255},
+    {"light slate gray", 119, 136, 153},
+    {"light slate grey", 119, 136, 153},
+    {"light steel blue", 176, 196, 222},
+    {"light yellow", 255, 255, 224},
+    {"LightBlue", 173, 216, 230},
+    {"LightBlue1", 191, 239, 255},
+    {"LightBlue2", 178, 223, 238},
+    {"LightBlue3", 154, 192, 205},
+    {"LightBlue4", 104, 131, 139},
+    {"LightCoral", 240, 128, 128},
+    {"LightCyan", 224, 255, 255},
+    {"LightCyan1", 224, 255, 255},
+    {"LightCyan2", 209, 238, 238},
+    {"LightCyan3", 180, 205, 205},
+    {"LightCyan4", 122, 139, 139},
+    {"LightGoldenrod", 238, 221, 130},
+    {"LightGoldenrod1", 255, 236, 139},
+    {"LightGoldenrod2", 238, 220, 130},
+    {"LightGoldenrod3", 205, 190, 112},
+    {"LightGoldenrod4", 139, 129, 76},
+    {"LightGoldenrodYellow", 250, 250, 210},
+    {"LightGray", 211, 211, 211},
+    {"LightGrey", 211, 211, 211},
+    {"LightPink", 255, 182, 193},
+    {"LightPink1", 255, 174, 185},
+    {"LightPink2", 238, 162, 173},
+    {"LightPink3", 205, 140, 149},
+    {"LightPink4", 139, 95, 101},
+    {"LightSalmon", 255, 160, 122},
+    {"LightSalmon1", 255, 160, 122},
+    {"LightSalmon2", 238, 149, 114},
+    {"LightSalmon3", 205, 129, 98},
+    {"LightSalmon4", 139, 87, 66},
+    {"LightSeaGreen", 32, 178, 170},
+    {"LightSkyBlue", 135, 206, 250},
+    {"LightSkyBlue1", 176, 226, 255},
+    {"LightSkyBlue2", 164, 211, 238},
+    {"LightSkyBlue3", 141, 182, 205},
+    {"LightSkyBlue4", 96, 123, 139},
+    {"LightSlateBlue", 132, 112, 255},
+    {"LightSlateGray", 119, 136, 153},
+    {"LightSlateGrey", 119, 136, 153},
+    {"LightSteelBlue", 176, 196, 222},
+    {"LightSteelBlue1", 202, 225, 255},
+    {"LightSteelBlue2", 188, 210, 238},
+    {"LightSteelBlue3", 162, 181, 205},
+    {"LightSteelBlue4", 110, 123, 139},
+    {"LightYellow", 255, 255, 224},
+    {"LightYellow1", 255, 255, 224},
+    {"LightYellow2", 238, 238, 209},
+    {"LightYellow3", 205, 205, 180},
+    {"LightYellow4", 139, 139, 122},
+    {"lime green", 50, 205, 50},
+    {"LimeGreen", 50, 205, 50},
+    {"linen", 250, 240, 230},
+    {"magenta", 255, 0, 255},
+    {"magenta1", 255, 0, 255},
+    {"magenta2", 238, 0, 238},
+    {"magenta3", 205, 0, 205},
+    {"magenta4", 139, 0, 139},
+    {"maroon", 176, 48, 96},
+    {"maroon1", 255, 52, 179},
+    {"maroon2", 238, 48, 167},
+    {"maroon3", 205, 41, 144},
+    {"maroon4", 139, 28, 98},
+    {"medium aquamarine", 102, 205, 170},
+    {"medium blue", 0, 0, 205},
+    {"medium orchid", 186, 85, 211},
+    {"medium purple", 147, 112, 219},
+    {"medium sea green", 60, 179, 113},
+    {"medium slate blue", 123, 104, 238},
+    {"medium spring green", 0, 250, 154},
+    {"medium turquoise", 72, 209, 204},
+    {"medium violet red", 199, 21, 133},
+    {"MediumAquamarine", 102, 205, 170},
+    {"MediumBlue", 0, 0, 205},
+    {"MediumOrchid", 186, 85, 211},
+    {"MediumOrchid1", 224, 102, 255},
+    {"MediumOrchid2", 209, 95, 238},
+    {"MediumOrchid3", 180, 82, 205},
+    {"MediumOrchid4", 122, 55, 139},
+    {"MediumPurple", 147, 112, 219},
+    {"MediumPurple1", 171, 130, 255},
+    {"MediumPurple2", 159, 121, 238},
+    {"MediumPurple3", 137, 104, 205},
+    {"MediumPurple4", 93, 71, 139},
+    {"MediumSeaGreen", 60, 179, 113},
+    {"MediumSlateBlue", 123, 104, 238},
+    {"MediumSpringGreen", 0, 250, 154},
+    {"MediumTurquoise", 72, 209, 204},
+    {"MediumVioletRed", 199, 21, 133},
+    {"midnight blue", 25, 25, 112},
+    {"MidnightBlue", 25, 25, 112},
+    {"mint cream", 245, 255, 250},
+    {"MintCream", 245, 255, 250},
+    {"misty rose", 255, 228, 225},
+    {"MistyRose", 255, 228, 225},
+    {"MistyRose1", 255, 228, 225},
+    {"MistyRose2", 238, 213, 210},
+    {"MistyRose3", 205, 183, 181},
+    {"MistyRose4", 139, 125, 123},
+    {"moccasin", 255, 228, 181},
+    {"navajo white", 255, 222, 173},
+    {"NavajoWhite", 255, 222, 173},
+    {"NavajoWhite1", 255, 222, 173},
+    {"NavajoWhite2", 238, 207, 161},
+    {"NavajoWhite3", 205, 179, 139},
+    {"NavajoWhite4", 139, 121, 94},
+    {"navy", 0, 0, 128},
+    {"navy blue", 0, 0, 128},
+    {"NavyBlue", 0, 0, 128},
+    {"old lace", 253, 245, 230},
+    {"OldLace", 253, 245, 230},
+    {"olive drab", 107, 142, 35},
+    {"OliveDrab", 107, 142, 35},
+    {"OliveDrab1", 192, 255, 62},
+    {"OliveDrab2", 179, 238, 58},
+    {"OliveDrab3", 154, 205, 50},
+    {"OliveDrab4", 105, 139, 34},
+    {"orange", 255, 165, 0},
+    {"orange red", 255, 69, 0},
+    {"orange1", 255, 165, 0},
+    {"orange2", 238, 154, 0},
+    {"orange3", 205, 133, 0},
+    {"orange4", 139, 90, 0},
+    {"OrangeRed", 255, 69, 0},
+    {"OrangeRed1", 255, 69, 0},
+    {"OrangeRed2", 238, 64, 0},
+    {"OrangeRed3", 205, 55, 0},
+    {"OrangeRed4", 139, 37, 0},
+    {"orchid", 218, 112, 214},
+    {"orchid1", 255, 131, 250},
+    {"orchid2", 238, 122, 233},
+    {"orchid3", 205, 105, 201},
+    {"orchid4", 139, 71, 137},
+    {"pale goldenrod", 238, 232, 170},
+    {"pale green", 152, 251, 152},
+    {"pale turquoise", 175, 238, 238},
+    {"pale violet red", 219, 112, 147},
+    {"PaleGoldenrod", 238, 232, 170},
+    {"PaleGreen", 152, 251, 152},
+    {"PaleGreen1", 154, 255, 154},
+    {"PaleGreen2", 144, 238, 144},
+    {"PaleGreen3", 124, 205, 124},
+    {"PaleGreen4", 84, 139, 84},
+    {"PaleTurquoise", 175, 238, 238},
+    {"PaleTurquoise1", 187, 255, 255},
+    {"PaleTurquoise2", 174, 238, 238},
+    {"PaleTurquoise3", 150, 205, 205},
+    {"PaleTurquoise4", 102, 139, 139},
+    {"PaleVioletRed", 219, 112, 147},
+    {"PaleVioletRed1", 255, 130, 171},
+    {"PaleVioletRed2", 238, 121, 159},
+    {"PaleVioletRed3", 205, 104, 137},
+    {"PaleVioletRed4", 139, 71, 93},
+    {"papaya whip", 255, 239, 213},
+    {"PapayaWhip", 255, 239, 213},
+    {"peach puff", 255, 218, 185},
+    {"PeachPuff", 255, 218, 185},
+    {"PeachPuff1", 255, 218, 185},
+    {"PeachPuff2", 238, 203, 173},
+    {"PeachPuff3", 205, 175, 149},
+    {"PeachPuff4", 139, 119, 101},
+    {"peru", 205, 133, 63},
+    {"pink", 255, 192, 203},
+    {"pink1", 255, 181, 197},
+    {"pink2", 238, 169, 184},
+    {"pink3", 205, 145, 158},
+    {"pink4", 139, 99, 108},
+    {"plum", 221, 160, 221},
+    {"plum1", 255, 187, 255},
+    {"plum2", 238, 174, 238},
+    {"plum3", 205, 150, 205},
+    {"plum4", 139, 102, 139},
+    {"powder blue", 176, 224, 230},
+    {"PowderBlue", 176, 224, 230},
+    {"purple", 160, 32, 240},
+    {"purple1", 155, 48, 255},
+    {"purple2", 145, 44, 238},
+    {"purple3", 125, 38, 205},
+    {"purple4", 85, 26, 139},
+    {"red", 255, 0, 0},
+    {"red1", 255, 0, 0},
+    {"red2", 238, 0, 0},
+    {"red3", 205, 0, 0},
+    {"red4", 139, 0, 0},
+    {"rosy brown", 188, 143, 143},
+    {"RosyBrown", 188, 143, 143},
+    {"RosyBrown1", 255, 193, 193},
+    {"RosyBrown2", 238, 180, 180},
+    {"RosyBrown3", 205, 155, 155},
+    {"RosyBrown4", 139, 105, 105},
+    {"royal blue", 65, 105, 225},
+    {"RoyalBlue", 65, 105, 225},
+    {"RoyalBlue1", 72, 118, 255},
+    {"RoyalBlue2", 67, 110, 238},
+    {"RoyalBlue3", 58, 95, 205},
+    {"RoyalBlue4", 39, 64, 139},
+    {"saddle brown", 139, 69, 19},
+    {"SaddleBrown", 139, 69, 19},
+    {"salmon", 250, 128, 114},
+    {"salmon1", 255, 140, 105},
+    {"salmon2", 238, 130, 98},
+    {"salmon3", 205, 112, 84},
+    {"salmon4", 139, 76, 57},
+    {"sandy brown", 244, 164, 96},
+    {"SandyBrown", 244, 164, 96},
+    {"sea green", 46, 139, 87},
+    {"SeaGreen", 46, 139, 87},
+    {"SeaGreen1", 84, 255, 159},
+    {"SeaGreen2", 78, 238, 148},
+    {"SeaGreen3", 67, 205, 128},
+    {"SeaGreen4", 46, 139, 87},
+    {"seashell", 255, 245, 238},
+    {"seashell1", 255, 245, 238},
+    {"seashell2", 238, 229, 222},
+    {"seashell3", 205, 197, 191},
+    {"seashell4", 139, 134, 130},
+    {"sienna", 160, 82, 45},
+    {"sienna1", 255, 130, 71},
+    {"sienna2", 238, 121, 66},
+    {"sienna3", 205, 104, 57},
+    {"sienna4", 139, 71, 38},
+    {"sky blue", 135, 206, 235},
+    {"SkyBlue", 135, 206, 235},
+    {"SkyBlue1", 135, 206, 255},
+    {"SkyBlue2", 126, 192, 238},
+    {"SkyBlue3", 108, 166, 205},
+    {"SkyBlue4", 74, 112, 139},
+    {"slate blue", 106, 90, 205},
+    {"slate gray", 112, 128, 144},
+    {"slate grey", 112, 128, 144},
+    {"SlateBlue", 106, 90, 205},
+    {"SlateBlue1", 131, 111, 255},
+    {"SlateBlue2", 122, 103, 238},
+    {"SlateBlue3", 105, 89, 205},
+    {"SlateBlue4", 71, 60, 139},
+    {"SlateGray", 112, 128, 144},
+    {"SlateGray1", 198, 226, 255},
+    {"SlateGray2", 185, 211, 238},
+    {"SlateGray3", 159, 182, 205},
+    {"SlateGray4", 108, 123, 139},
+    {"SlateGrey", 112, 128, 144},
+    {"snow", 255, 250, 250},
+    {"snow1", 255, 250, 250},
+    {"snow2", 238, 233, 233},
+    {"snow3", 205, 201, 201},
+    {"snow4", 139, 137, 137},
+    {"spring green", 0, 255, 127},
+    {"SpringGreen", 0, 255, 127},
+    {"SpringGreen1", 0, 255, 127},
+    {"SpringGreen2", 0, 238, 118},
+    {"SpringGreen3", 0, 205, 102},
+    {"SpringGreen4", 0, 139, 69},
+    {"steel blue", 70, 130, 180},
+    {"SteelBlue", 70, 130, 180},
+    {"SteelBlue1", 99, 184, 255},
+    {"SteelBlue2", 92, 172, 238},
+    {"SteelBlue3", 79, 148, 205},
+    {"SteelBlue4", 54, 100, 139},
+    {"tan", 210, 180, 140},
+    {"tan1", 255, 165, 79},
+    {"tan2", 238, 154, 73},
+    {"tan3", 205, 133, 63},
+    {"tan4", 139, 90, 43},
+    {"thistle", 216, 191, 216},
+    {"thistle1", 255, 225, 255},
+    {"thistle2", 238, 210, 238},
+    {"thistle3", 205, 181, 205},
+    {"thistle4", 139, 123, 139},
+    {"tomato", 255, 99, 71},
+    {"tomato1", 255, 99, 71},
+    {"tomato2", 238, 92, 66},
+    {"tomato3", 205, 79, 57},
+    {"tomato4", 139, 54, 38},
+    {"turquoise", 64, 224, 208},
+    {"turquoise1", 0, 245, 255},
+    {"turquoise2", 0, 229, 238},
+    {"turquoise3", 0, 197, 205},
+    {"turquoise4", 0, 134, 139},
+    {"violet", 238, 130, 238},
+    {"violet red", 208, 32, 144},
+    {"VioletRed", 208, 32, 144},
+    {"VioletRed1", 255, 62, 150},
+    {"VioletRed2", 238, 58, 140},
+    {"VioletRed3", 205, 50, 120},
+    {"VioletRed4", 139, 34, 82},
+    {"wheat", 245, 222, 179},
+    {"wheat1", 255, 231, 186},
+    {"wheat2", 238, 216, 174},
+    {"wheat3", 205, 186, 150},
+    {"wheat4", 139, 126, 102},
+    {"white", 255, 255, 255},
+    {"white smoke", 245, 245, 245},
+    {"WhiteSmoke", 245, 245, 245},
+    {"yellow", 255, 255, 0},
+    {"yellow green", 154, 205, 50},
+    {"yellow1", 255, 255, 0},
+    {"yellow2", 238, 238, 0},
+    {"yellow3", 205, 205, 0},
+    {"yellow4", 139, 139, 0},
+    {"YellowGreen", 154, 205, 50},
+};
+
+static int numxcolors = 0;
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiGetColor --
+ *
+ *	Convert color name to color specification.
+ *
+ * Results:
+ *	 Color name converted.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiGetColor(
+    const char *name,
+    unsigned long *color)
+{
+    if (numsyscolors == 0) {
+	numsyscolors = sizeof(sysColors) / sizeof(SystemColorEntry);
+    }
+    if (_strnicmp(name, "system", 6) == 0) {
+	int i, l, u, r;
+
+	l = 0;
+	u = numsyscolors;
+	while (l <= u) {
+	    i = (l + u) / 2;
+	    if ((r = _strcmpi(name+6, sysColors[i].name)) == 0) {
+		break;
+	    }
+	    if (r < 0) {
+		u = i - 1;
+	    } else {
+		l = i + 1;
+	    }
+	}
+	if (l > u) {
+	    return 0;
+	}
+	*color = GetSysColor(sysColors[i].index);
+	return 1;
+    } else {
+	return GdiParseColor(name, color);
+    }
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GdiParseColor --
+ *
+ *	Convert color specification string (which could be an RGB string)
+ *	to a color RGB triple.
+ *
+ * Results:
+ *	Color specification converted.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int GdiParseColor(
+    const char *name,
+    unsigned long *color)
+{
+    /* TODO: replace with XParseColor, used by rest of Tk */
+    if (name[0] == '#') {
+	char fmt[40];
+	int i;
+	unsigned red, green, blue;
+
+	if ((i = strlen(name+1))%3 != 0 || i > 12 || i < 3) {
+	    return 0;
+	}
+	i /= 3;
+	sprintf(fmt, "%%%dx%%%dx%%%dx", i, i, i);
+	if (sscanf(name+1, fmt, &red, &green, &blue) != 3) {
+	    return 0;
+	}
+	/* Now this is Windows-specific -- each component is at most 8 bits. */
+	switch (i) {
+	case 1:
+	    red <<= 4;
+	    green <<= 4;
+	    blue <<= 4;
+	    break;
+	case 2:
+	    break;
+	case 3:
+	    red >>= 4;
+	    green >>= 4;
+	    blue >>= 4;
+	    break;
+	case 4:
+	    red >>= 8;
+	    green >>= 8;
+	    blue >>= 8;
+	    break;
+	}
+	*color = RGB(red, green, blue);
+	return 1;
+    } else {
+	int i, u, r, l;
+
+	if (numxcolors == 0) {
+	    numxcolors = sizeof(xColors) / sizeof(XColorEntry);
+	}
+	l = 0;
+	u = numxcolors;
+
+	while (l <= u) {
+	    i = (l + u) / 2;
+	    if ((r = _strcmpi(name, xColors[i].name)) == 0) {
+		break;
+	    }
+	    if (r < 0) {
+		u = i - 1;
+	    } else {
+		l = i + 1;
+	    }
+	}
+	if (l > u) {
+	    return 0;
+	}
+	*color = RGB(xColors[i].red, xColors[i].green, xColors[i].blue);
+	return 1;
+    }
+}
+
+/*
+ * Beginning of functions for screen-to-dib translations.
+ *
+ * Several of these functions are based on those in the WINCAP32 program
+ * provided as a sample by Microsoft on the VC++ 5.0 disk. The copyright on
+ * these functions is retained, even for those with significant changes.
+ */
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * CopyToDIB --
+ *
+ *	Copy window bits to a DIB.
+ *
+ * Results:
+ *	 Color specification converted.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static HANDLE CopyToDIB(
+    HWND hWnd,
+    enum PrintType type)
+{
+    HANDLE hDIB;
+    HBITMAP hBitmap;
+    HPALETTE hPalette;
+
+    /* Check for a valid window handle. */
+
+    if (!hWnd) {
+        return NULL;
+    }
+
+    switch (type) {
+    case PTWindow: {	/* Copy entire window. */
+	RECT rectWnd;
+
+	/* Get the window rectangle. */
+
+	GetWindowRect(hWnd, &rectWnd);
+
+	/*
+	 * Get the DIB of the window by calling CopyScreenToDIB and passing it
+	 * the window rect.
+	 */
+
+	hDIB = CopyScreenToDIB(&rectWnd);
+	break;
+    }
+
+    case PTClient: {	/* Copy client area. */
+	RECT rectClient;
+	POINT pt1, pt2;
+
+	/* Get the client area dimensions. */
+
+	GetClientRect(hWnd, &rectClient);
+
+	/* Convert client coords to screen coords. */
+
+	pt1.x = rectClient.left;
+	pt1.y = rectClient.top;
+	pt2.x = rectClient.right;
+	pt2.y = rectClient.bottom;
+	ClientToScreen(hWnd, &pt1);
+	ClientToScreen(hWnd, &pt2);
+	rectClient.left = pt1.x;
+	rectClient.top = pt1.y;
+	rectClient.right = pt2.x;
+	rectClient.bottom = pt2.y;
+
+	/*
+	 * Get the DIB of the client area by calling CopyScreenToDIB and
+	 * passing it the client rect.
+	 */
+
+	hDIB = CopyScreenToDIB(&rectClient);
+	break;
+    }
+
+    case PTScreen: { /* Entire screen. */
+	RECT Rect;
+
+	/*
+	 * Get the device-dependent bitmap in lpRect by calling
+	 * CopyScreenToBitmap and passing it the rectangle to grab.
+	 */
+	Rect.top = Rect.left = 0;
+	GetDisplaySize(&Rect.right, &Rect.bottom);
+
+	hBitmap = CopyScreenToBitmap(&Rect);
+
+	/* Check for a valid bitmap handle. */
+
+	if (!hBitmap) {
+	    return NULL;
+	}
+
+	/* Get the current palette. */
+
+	hPalette = GetSystemPalette();
+
+	/* Convert the bitmap to a DIB. */
+
+	hDIB = BitmapToDIB(hBitmap, hPalette);
+
+	/* Clean up. */
+
+	DeleteObject(hPalette);
+	DeleteObject(hBitmap);
+
+	/* Return handle to the packed-DIB. */
+	break;
+    }
+    default:	/* Invalid print area. */
+	return NULL;
+    }
+
+    /* Return the handle to the DIB. */
+    return hDIB;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GetDisplaySize--
+ *
+ *	GetDisplaySize does just that.  There may be an easier way, but it is
+ *	not apparent.
+ *
+ * Results:
+ *	Returns display size.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static void GetDisplaySize(
+    LONG *width,
+    LONG *height)
+{
+    HDC hDC;
+
+    hDC = CreateDCW(L"DISPLAY", 0, 0, 0);
+    *width = GetDeviceCaps(hDC, HORZRES);
+    *height = GetDeviceCaps(hDC, VERTRES);
+    DeleteDC(hDC);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * CopyScreenToBitmap--
+ *
+ *	Copies screen to bitmap.
+ *
+ * Results:
+ *	Screen is copied.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static HBITMAP CopyScreenToBitmap(
+    LPRECT lpRect)
+{
+    HDC     hScrDC, hMemDC;	/* Screen DC and memory DC. */
+    HBITMAP hBitmap, hOldBitmap; /* Handles to deice-dependent bitmaps. */
+    int     nX, nY, nX2, nY2;	/* Coordinates of rectangle to grab. */
+    int     nWidth, nHeight;	/* DIB width and height */
+    int     xScrn, yScrn;	/* Screen resolution. */
+
+    /* Check for an empty rectangle. */
+
+    if (IsRectEmpty(lpRect)) {
+	return NULL;
+    }
+
+    /*
+     * Create a DC for the screen and create a memory DC compatible to screen
+     * DC.
+     */
+
+    hScrDC = CreateDCW(L"DISPLAY", NULL, NULL, NULL);
+    hMemDC = CreateCompatibleDC(hScrDC);
+
+    /* Get points of rectangle to grab. */
+
+    nX = lpRect->left;
+    nY = lpRect->top;
+    nX2 = lpRect->right;
+    nY2 = lpRect->bottom;
+
+    /* Get screen resolution. */
+
+    xScrn = GetDeviceCaps(hScrDC, HORZRES);
+    yScrn = GetDeviceCaps(hScrDC, VERTRES);
+
+    /* Make sure bitmap rectangle is visible. */
+
+    if (nX < 0) {
+        nX = 0;
+    }
+    if (nY < 0) {
+        nY = 0;
+    }
+    if (nX2 > xScrn) {
+        nX2 = xScrn;
+    }
+    if (nY2 > yScrn) {
+        nY2 = yScrn;
+    }
+
+    nWidth = nX2 - nX;
+    nHeight = nY2 - nY;
+
+    /* Create a bitmap compatible with the screen DC. */
+    hBitmap = CreateCompatibleBitmap(hScrDC, nWidth, nHeight);
+
+    /* Select new bitmap into memory DC. */
+    hOldBitmap = SelectObject(hMemDC, hBitmap);
+
+    /* Bitblt screen DC to memory DC. */
+    BitBlt(hMemDC, 0, 0, nWidth, nHeight, hScrDC, nX, nY, SRCCOPY);
+
+    /*
+     * Select old bitmap back into memory DC and get handle to bitmap of the
+     * screen.
+     */
+
+    hBitmap = SelectObject(hMemDC, hOldBitmap);
+
+    /* Clean up. */
+
+    DeleteDC(hScrDC);
+    DeleteDC(hMemDC);
+
+    /* Return handle to the bitmap. */
+
+    return hBitmap;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * BitmapToDIB--
+ *
+ *	Converts bitmap to DIB.
+ *
+ * Results:
+ *	Bitmap converted.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static HANDLE BitmapToDIB(
+    HBITMAP hBitmap,
+    HPALETTE hPal)
+{
+    BITMAP              bm;
+    BITMAPINFOHEADER    bi;
+    LPBITMAPINFOHEADER  lpbi;
+    DWORD               dwLen;
+    HANDLE              hDIB;
+    HANDLE              h;
+    HDC                 hDC;
+    WORD                biBits;
+
+    /* Check if bitmap handle is valid. */
+
+    if (!hBitmap) {
+        return NULL;
+    }
+
+    /* Fill in BITMAP structure, return NULL if it didn't work. */
+
+    if (!GetObjectW(hBitmap, sizeof(bm), (LPWSTR)&bm)) {
+        return NULL;
+    }
+
+    /* Ff no palette is specified, use default palette. */
+
+    if (hPal == NULL) {
+        hPal = GetStockObject(DEFAULT_PALETTE);
+    }
+
+    /* Calculate bits per pixel. */
+
+    biBits = bm.bmPlanes * bm.bmBitsPixel;
+
+    /* Make sure bits per pixel is valid. */
+
+    if (biBits <= 1) {
+        biBits = 1;
+    } else if (biBits <= 4) {
+        biBits = 4;
+    } else if (biBits <= 8) {
+        biBits = 8;
+    } else { /* If greater than 8-bit, force to 24-bit. */
+        biBits = 24;
+    }
+
+    /* Initialize BITMAPINFOHEADER. */
+
+    bi.biSize = sizeof(BITMAPINFOHEADER);
+    bi.biWidth = bm.bmWidth;
+    bi.biHeight = bm.bmHeight;
+    bi.biPlanes = 1;
+    bi.biBitCount = biBits;
+    bi.biCompression = BI_RGB;
+    bi.biSizeImage = 0;
+    bi.biXPelsPerMeter = 0;
+    bi.biYPelsPerMeter = 0;
+    bi.biClrUsed = 0;
+    bi.biClrImportant = 0;
+
+    /* Calculate size of memory block required to store BITMAPINFO. */
+
+    dwLen = bi.biSize + DIBNumColors(&bi) * sizeof(RGBQUAD);
+
+    /* Get a DC. */
+
+    hDC = GetDC(NULL);
+
+    /* Select and realize our palette. */
+
+    hPal = SelectPalette(hDC, hPal, FALSE);
+    RealizePalette(hDC);
+
+    /* Alloc memory block to store our bitmap. */
+
+    hDIB = GlobalAlloc(GHND, dwLen);
+
+    /* If we couldn't get memory block. */
+
+    if (!hDIB) {
+	/* clean up and return NULL. */
+
+	SelectPalette(hDC, hPal, TRUE);
+	RealizePalette(hDC);
+	ReleaseDC(NULL, hDC);
+	return NULL;
+    }
+
+    /* Lock memory and get pointer to it. */
+
+    lpbi = (LPBITMAPINFOHEADER)GlobalLock(hDIB);
+
+    /* Use our bitmap info. to fill BITMAPINFOHEADER. */
+
+    *lpbi = bi;
+
+    /* Call GetDIBits with a NULL lpBits param, so it will calculate the
+     * biSizeImage field for us
+     */
+
+    GetDIBits(hDC, hBitmap, 0, (UINT)bi.biHeight, NULL, (LPBITMAPINFO)lpbi,
+	    DIB_RGB_COLORS);
+
+    /* get the info. returned by GetDIBits and unlock memory block. */
+
+    bi = *lpbi;
+    GlobalUnlock(hDIB);
+
+    /* If the driver did not fill in the biSizeImage field, make one up. */
+    if (bi.biSizeImage == 0) {
+        bi.biSizeImage = (((((DWORD)bm.bmWidth * biBits) + 31) / 32) * 4)
+		* bm.bmHeight;
+    }
+
+    /* Realloc the buffer big enough to hold all the bits. */
+
+    dwLen = bi.biSize + DIBNumColors(&bi) * sizeof(RGBQUAD) + bi.biSizeImage;
+
+    if ((h = GlobalReAlloc(hDIB, dwLen, 0)) != 0) {
+        hDIB = h;
+    } else {
+	/* Clean up and return NULL. */
+
+	GlobalFree(hDIB);
+	SelectPalette(hDC, hPal, TRUE);
+	RealizePalette(hDC);
+	ReleaseDC(NULL, hDC);
+	return NULL;
+    }
+
+    /* Lock memory block and get pointer to it. */
+
+    lpbi = (LPBITMAPINFOHEADER)GlobalLock(hDIB);
+
+    /* Call GetDIBits with a NON-NULL lpBits param, and actualy get the
+     * bits this time.
+     */
+
+    if (GetDIBits(hDC, hBitmap, 0, (UINT)bi.biHeight, (LPSTR)lpbi +
+	    (WORD)lpbi->biSize + DIBNumColors(lpbi) * sizeof(RGBQUAD),
+	    (LPBITMAPINFO)lpbi, DIB_RGB_COLORS) == 0) {
+	/* Clean up and return NULL. */
+
+	GlobalUnlock(hDIB);
+	SelectPalette(hDC, hPal, TRUE);
+	RealizePalette(hDC);
+	ReleaseDC(NULL, hDC);
+	return NULL;
+    }
+
+    bi = *lpbi;
+
+    /* Clean up. */
+    GlobalUnlock(hDIB);
+    SelectPalette(hDC, hPal, TRUE);
+    RealizePalette(hDC);
+    ReleaseDC(NULL, hDC);
+
+    /* Return handle to the DIB. */
+    return hDIB;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * CopyScreenToDIB--
+ *
+ *	Copies screen to DIB.
+ *
+ * Results:
+ *	Screen copied.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static HANDLE CopyScreenToDIB(
+    LPRECT lpRect)
+{
+    HBITMAP     hBitmap;
+    HPALETTE    hPalette;
+    HANDLE      hDIB;
+
+    /*
+     * Get the device-dependent bitmap in lpRect by calling CopyScreenToBitmap
+     * and passing it the rectangle to grab.
+     */
+
+    hBitmap = CopyScreenToBitmap(lpRect);
+
+    /* Check for a valid bitmap handle. */
+
+    if (!hBitmap) {
+	return NULL;
+    }
+
+    /* Get the current palette. */
+
+    hPalette = GetSystemPalette();
+
+    /* convert the bitmap to a DIB. */
+
+    hDIB = BitmapToDIB(hBitmap, hPalette);
+
+    /* Clean up. */
+
+    DeleteObject(hPalette);
+    DeleteObject(hBitmap);
+
+    /* Return handle to the packed-DIB. */
+    return hDIB;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GetSystemPalette--
+ *
+ *	Obtains the system palette.
+ *
+ * Results:
+ *	Returns palette.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static HPALETTE GetSystemPalette(void)
+{
+    HDC hDC;                /* Handle to a DC. */
+    static HPALETTE hPal = NULL;   /* Handle to a palette. */
+    HANDLE hLogPal;         /* Handle to a logical palette. */
+    LPLOGPALETTE lpLogPal;  /* Pointer to a logical palette. */
+    int nColors;            /* Number of colors. */
+
+    /* Find out how many palette entries we want.. */
+
+    hDC = GetDC(NULL);
+    if (!hDC) {
+        return NULL;
+    }
+
+    nColors = PalEntriesOnDevice(hDC);   /* Number of palette entries. */
+
+    /* Allocate room for the palette and lock it.. */
+
+    hLogPal = GlobalAlloc(GHND, sizeof(LOGPALETTE) + nColors *
+	    sizeof(PALETTEENTRY));
+    if (!hLogPal) {
+	/* If we didn't get a logical palette, return NULL. */
+
+        return NULL;
+    }
+
+    /* get a pointer to the logical palette. */
+
+    lpLogPal = (LPLOGPALETTE)GlobalLock(hLogPal);
+
+    /* Set some important fields. */
+
+    lpLogPal->palVersion = 0x300;
+    lpLogPal->palNumEntries = nColors;
+
+    /* Copy the current system palette into our logical palette. */
+
+    GetSystemPaletteEntries(hDC, 0, nColors,
+	    (LPPALETTEENTRY) lpLogPal->palPalEntry);
+
+    /*
+     * Go ahead and create the palette.  Once it's created, we no longer need
+     * the LOGPALETTE, so free it.
+     */
+
+    hPal = CreatePalette(lpLogPal);
+
+    /* Clean up. */
+
+    GlobalUnlock(hLogPal);
+    GlobalFree(hLogPal);
+    ReleaseDC(NULL, hDC);
+
+    return hPal;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * PalEntriesOnDevice--
+ *
+ *	Returns the palettes on the device.
+ *
+ * Results:
+ *	Returns palettes.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int PalEntriesOnDevice(
+    HDC hDC)
+{
+    return (1 << (GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES)));
+}
+
+/*
+ * --------------------------------------------------------------------------
+ *
+ * Winprint_Init--
+ *
+ *	Initializes printing module on Windows.
+ *
+ * Results:
+ *	Module initialized.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+int Winprint_Init(
+    Tcl_Interp * interp)
+{
+    size_t i;
+    Tcl_Namespace *namespacePtr;
+    static const char *gdiName = "::tk::print::_gdi";
+    static const size_t numCommands =
+	    sizeof(gdi_commands) / sizeof(struct gdi_command);
+
+    /*
+     * Set up the low-level [_gdi] command.
+     */
+
+    namespacePtr = Tcl_CreateNamespace(interp, gdiName,
+	    (ClientData) NULL, (Tcl_NamespaceDeleteProc *) NULL);
+    for (i=0; i<numCommands; i++) {
+	char buffer[100];
+
+	sprintf(buffer, "%s::%s", gdiName, gdi_commands[i].command_string);
+	Tcl_CreateCommand(interp, buffer, gdi_commands[i].command,
+		(ClientData) 0, (Tcl_CmdDeleteProc *) 0);
+	Tcl_Export(interp, namespacePtr, gdi_commands[i].command_string, 0);
+    }
+    Tcl_CreateEnsemble(interp, gdiName, namespacePtr, 0);
+
+    /*
+     * The other printing-related commands.
+     */
+
+    Tcl_CreateObjCommand(interp, "::tk::print::_selectprinter",
+	    PrintSelectPrinter, NULL, NULL);
+    Tcl_CreateObjCommand(interp, "::tk::print::_openprinter",
+	    PrintOpenPrinter, NULL, NULL);
+    Tcl_CreateObjCommand(interp, "::tk::print::_closeprinter",
+	    PrintClosePrinter, NULL, NULL);
+    Tcl_CreateObjCommand(interp, "::tk::print::_opendoc",
+	    PrintOpenDoc, NULL, NULL);
+    Tcl_CreateObjCommand(interp, "::tk::print::_closedoc",
+	    PrintCloseDoc, NULL, NULL);
+    Tcl_CreateObjCommand(interp, "::tk::print::_openpage",
+	    PrintOpenPage, NULL, NULL);
+    Tcl_CreateObjCommand(interp, "::tk::print::_closepage",
+	    PrintClosePage, NULL, NULL);
+    return TCL_OK;
+}
+
+/*
+ * The following functions are adapted from tkTrig.c.
+ */
+
+/*
+ *--------------------------------------------------------------
+ *
+ * TkGdiBezierScreenPoints --
+ *
+ *	Given four control points, create a larger set of XPoints for a Bezier
+ *	spline based on the points.
+ *
+ * Results:
+ *	The array at *xPointPtr gets filled in with numSteps XPoints
+ *	corresponding to the Bezier spline defined by the four control points.
+ *
+ *	Note: no output point is generated for the first input point, but an
+ *	output point *is* generated for the last input point.
+ *
+ * Side effects:
+ *	None.
+ *
+ *--------------------------------------------------------------
+ */
+
+static void
+TkGdiBezierScreenPoints(
+    Tk_Canvas canvas,		/* Canvas in which curve is to be drawn.. */
+    double control[],		/* Array of coordinates for four control
+				 * points: x0, y0, x1, y1, ... x3 y3.. */
+    int numSteps,		/* Number of curve points to generate. */
+    register XPoint *xPointPtr)	/* Where to put new points.. */
+{
+    int i;
+    double u, u2, u3, t, t2, t3;
+
+    for (i = 1; i <= numSteps; i++, xPointPtr++) {
+	t = ((double) i)/((double) numSteps);
+	t2 = t*t;
+	t3 = t2*t;
+	u = 1.0 - t;
+	u2 = u*u;
+	u3 = u2*u;
+	Tk_CanvasDrawableCoords(canvas,
+		(control[0]*u3 + 3.0 * (control[2]*t*u2 + control[4]*t2*u)
+		+ control[6]*t3),
+		(control[1]*u3 + 3.0 * (control[3]*t*u2 + control[5]*t2*u)
+		+ control[7]*t3),
+		&xPointPtr->x, &xPointPtr->y);
+    }
+}
+
+/*
+ *--------------------------------------------------------------
+ *
+ * TkGdiBezierPoints --
+ *
+ *	Given four control points, create a larger set of points for a Bezier
+ *	spline based on the points.
+ *
+ * Results:
+ *	The array at *coordPtr gets filled in with 2*numSteps coordinates,
+ *	which correspond to the Bezier spline defined by the four control
+ *	points.
+ *
+ *	Note: no output point is generated for the first input point, but an
+ *	output point *is* generated for the last input point.
+ *
+ * Side effects:
+ *	None.
+ *
+ *--------------------------------------------------------------
+ */
+
+static void
+TkGdiBezierPoints(
+    double control[],		/* Array of coordinates for four control
+				 * points: x0, y0, x1, y1, ... x3 y3.. */
+    int numSteps,		/* Number of curve points to generate. */
+    register double *coordPtr)	/* Where to put new points.. */
+{
+    int i;
+    double u, u2, u3, t, t2, t3;
+
+    for (i = 1; i <= numSteps; i++, coordPtr += 2) {
+	t = ((double) i)/((double) numSteps);
+	t2 = t*t;
+	t3 = t2*t;
+	u = 1.0 - t;
+	u2 = u*u;
+	u3 = u2*u;
+	coordPtr[0] = control[0]*u3
+		+ 3.0 * (control[2]*t*u2 + control[4]*t2*u) + control[6]*t3;
+	coordPtr[1] = control[1]*u3
+		+ 3.0 * (control[3]*t*u2 + control[5]*t2*u) + control[7]*t3;
+    }
+}
+
+/*
+ *--------------------------------------------------------------
+ *
+ * TkGdiMakeBezierCurve --
+ *
+ *	Given a set of points, create a new set of points that fit parabolic
+ *	splines to the line segments connecting the original points.  Produces
+ *	output points in either of two forms.
+ *
+ *	Note: in spite of this procedure's name, it does *not* generate Bezier
+ *	curves.  Since only three control points are used for each curve
+ *	segment, not four, the curves are actually just parabolic.
+ *
+ * Results:
+ *
+ *	Either or both of the xPoints or dblPoints arrays are filled in.  The
+ *	return value is the number of points placed in the arrays.
+ *
+ *	Note: if the first and last points are the same, then a closed curve
+ *	is generated.
+ *
+ * Side effects:
+ *	None.
+ *
+ *--------------------------------------------------------------
+ */
+static int
+TkGdiMakeBezierCurve(
+    Tk_Canvas canvas,		/* Canvas in which curve is to be drawn.*/
+    double *pointPtr,		/* Array of input coordinates:
+				 *    x0, y0, x1, y1, etc... */
+    int numPoints,		/* Number of points at pointPtr.. */
+    int numSteps,		/* Number of steps to use for each spline
+				 * segments. */
+    XPoint xPoints[],		/* Array of XPoints to fill in. */
+    double dblPoints[])		/* Array of points to fill in as doubles, in
+				 * the form x0, y0, x1, y1. */
+
+{
+    int closed, outputPoints, i;
+    int numCoords = numPoints*2;
+    double control[8];
+
+    /*
+     * If the curve is a closed one then generate a special spline that spans
+     * the last points and the first ones.  Otherwise just put the first point
+     * into the output.
+     */
+
+    if (!pointPtr) {
+	/*
+	 * Of pointPtr == NULL, this function returns an upper limit of the
+	 * array size to store the coordinates. This can be used to allocate
+	 * storage, before the actual coordinates are calculated.
+	 */
+	return 1 + numPoints * numSteps;
+    }
+
+    outputPoints = 0;
+    if ((pointPtr[0] == pointPtr[numCoords-2])
+	    && (pointPtr[1] == pointPtr[numCoords-1])) {
+	closed = 1;
+	control[0] = 0.5*pointPtr[numCoords-4] + 0.5*pointPtr[0];
+	control[1] = 0.5*pointPtr[numCoords-3] + 0.5*pointPtr[1];
+	control[2] = 0.167*pointPtr[numCoords-4] + 0.833*pointPtr[0];
+	control[3] = 0.167*pointPtr[numCoords-3] + 0.833*pointPtr[1];
+	control[4] = 0.833*pointPtr[0] + 0.167*pointPtr[2];
+	control[5] = 0.833*pointPtr[1] + 0.167*pointPtr[3];
+	control[6] = 0.5*pointPtr[0] + 0.5*pointPtr[2];
+	control[7] = 0.5*pointPtr[1] + 0.5*pointPtr[3];
+	if (xPoints != NULL) {
+	    Tk_CanvasDrawableCoords(canvas, control[0], control[1],
+		    &xPoints->x, &xPoints->y);
+	    TkGdiBezierScreenPoints(canvas, control, numSteps, xPoints+1);
+	    xPoints += numSteps+1;
+	}
+	if (dblPoints != NULL) {
+	    dblPoints[0] = control[0];
+	    dblPoints[1] = control[1];
+	    TkGdiBezierPoints(control, numSteps, dblPoints+2);
+	    dblPoints += 2*(numSteps+1);
+	}
+	outputPoints += numSteps+1;
+    } else {
+	closed = 0;
+	if (xPoints != NULL) {
+	    Tk_CanvasDrawableCoords(canvas, pointPtr[0], pointPtr[1],
+		    &xPoints->x, &xPoints->y);
+	    xPoints += 1;
+	}
+	if (dblPoints != NULL) {
+	    dblPoints[0] = pointPtr[0];
+	    dblPoints[1] = pointPtr[1];
+	    dblPoints += 2;
+	}
+	outputPoints += 1;
+    }
+
+    for (i = 2; i < numPoints; i++, pointPtr += 2) {
+	/*
+	 * Set up the first two control points.  This is done differently for
+	 * the first spline of an open curve than for other cases.
+	 */
+
+	if ((i == 2) && !closed) {
+	    control[0] = pointPtr[0];
+	    control[1] = pointPtr[1];
+	    control[2] = 0.333*pointPtr[0] + 0.667*pointPtr[2];
+	    control[3] = 0.333*pointPtr[1] + 0.667*pointPtr[3];
+	} else {
+	    control[0] = 0.5*pointPtr[0] + 0.5*pointPtr[2];
+	    control[1] = 0.5*pointPtr[1] + 0.5*pointPtr[3];
+	    control[2] = 0.167*pointPtr[0] + 0.833*pointPtr[2];
+	    control[3] = 0.167*pointPtr[1] + 0.833*pointPtr[3];
+	}
+
+	/*
+	 * Set up the last two control points.  This is done differently for
+	 * the last spline of an open curve than for other cases.
+	 */
+
+	if ((i == (numPoints-1)) && !closed) {
+	    control[4] = .667*pointPtr[2] + .333*pointPtr[4];
+	    control[5] = .667*pointPtr[3] + .333*pointPtr[5];
+	    control[6] = pointPtr[4];
+	    control[7] = pointPtr[5];
+	} else {
+	    control[4] = .833*pointPtr[2] + .167*pointPtr[4];
+	    control[5] = .833*pointPtr[3] + .167*pointPtr[5];
+	    control[6] = 0.5*pointPtr[2] + 0.5*pointPtr[4];
+	    control[7] = 0.5*pointPtr[3] + 0.5*pointPtr[5];
+	}
+
+	/*
+	 * If the first two points coincide, or if the last two points
+	 * coincide, then generate a single straight-line segment by
+	 * outputting the last control point.
+	 */
+
+	if (((pointPtr[0] == pointPtr[2]) && (pointPtr[1] == pointPtr[3]))
+		|| ((pointPtr[2] == pointPtr[4])
+			&& (pointPtr[3] == pointPtr[5]))) {
+	    if (xPoints != NULL) {
+		Tk_CanvasDrawableCoords(canvas, control[6], control[7],
+			&xPoints[0].x, &xPoints[0].y);
+		xPoints++;
+	    }
+	    if (dblPoints != NULL) {
+		dblPoints[0] = control[6];
+		dblPoints[1] = control[7];
+		dblPoints += 2;
+	    }
+	    outputPoints += 1;
+	    continue;
+	}
+
+	/*
+	 * Generate a Bezier spline using the control points.
+	 */
+
+	if (xPoints != NULL) {
+	    TkGdiBezierScreenPoints(canvas, control, numSteps, xPoints);
+	    xPoints += numSteps;
+	}
+	if (dblPoints != NULL) {
+	    TkGdiBezierPoints(control, numSteps, dblPoints);
+	    dblPoints += 2*numSteps;
+	}
+	outputPoints += numSteps;
+    }
+    return outputPoints;
+}
+
+/* Print API functions. */
+
+/*----------------------------------------------------------------------
+ *
+ * PrintSelectPrinter--
+ *
+ *	Main dialog for selecting printer and initializing data for print job.
+ *
+ * Results:
+ *	Printer selected.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int PrintSelectPrinter(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    TCL_UNUSED(int),
+    TCL_UNUSED(Tcl_Obj* const*))
+{
+    LPCWSTR printerName = NULL;
+    PDEVMODEW returnedDevmode = NULL;
+    PDEVMODEW localDevmode = NULL;
+
+    copies = 0;
+    paper_width = 0;
+    paper_height = 0;
+    dpi_x = 0;
+    dpi_y = 0;
+
+    /* Set up print dialog and initalize property structure. */
+
+    ZeroMemory(&pd, sizeof(pd));
+    pd.lStructSize = sizeof(pd);
+    pd.hwndOwner = GetDesktopWindow();
+    pd.Flags = PD_HIDEPRINTTOFILE | PD_DISABLEPRINTTOFILE | PD_NOSELECTION;
+
+    if (PrintDlgW(&pd) == TRUE) {
+
+	/*Get document info.*/
+	ZeroMemory(&di, sizeof(di));
+	di.cbSize = sizeof(di);
+	di.lpszDocName = L"Tk Print Output";
+
+	/* Copy print attributes to local structure. */
+	returnedDevmode = (PDEVMODEW) GlobalLock(pd.hDevMode);
+	devnames = (LPDEVNAMES) GlobalLock(pd.hDevNames);
+	printerName = (LPCWSTR) devnames + devnames->wDeviceOffset;
+	localDevmode = (LPDEVMODEW) HeapAlloc(GetProcessHeap(),
+		HEAP_ZERO_MEMORY | HEAP_GENERATE_EXCEPTIONS,
+		returnedDevmode->dmSize);
+
+	if (localDevmode != NULL) {
+	    memcpy((LPVOID)localDevmode, (LPVOID)returnedDevmode,
+		    returnedDevmode->dmSize);
+
+	    /* Get values from user-set and built-in properties. */
+	    localPrinterName = localDevmode->dmDeviceName;
+	    dpi_y = localDevmode->dmYResolution;
+	    dpi_x = localDevmode->dmPrintQuality;
+	    /* Convert height and width to logical points. */
+	    paper_height = (int) localDevmode->dmPaperLength / 0.254;
+	    paper_width = (int) localDevmode->dmPaperWidth / 0.254;
+	    copies = pd.nCopies;
+	    /* Set device context here for all GDI printing operations. */
+	    printDC = CreateDCW(L"WINSPOOL", printerName, NULL, localDevmode);
+	} else {
+	    localDevmode = NULL;
+	}
+    }
+
+    if (pd.hDevMode != NULL) {
+	GlobalFree(pd.hDevMode);
+    }
+
+    /*
+     * Store print properties and link variables so they can be accessed from
+     * script level.
+     */
+    if (localPrinterName != NULL) {
+        char* varlink1 = (char*)Tcl_Alloc(100 * sizeof(char));
+        char** varlink2 = (char**)Tcl_Alloc(sizeof(char*));
+        *varlink2 = varlink1;
+        WideCharToMultiByte(CP_UTF8, 0, localPrinterName, -1, varlink1, 0, NULL, NULL);
+
+        Tcl_LinkVar(interp, "::tk::print::printer_name", (char*)varlink2,
+            TCL_LINK_STRING | TCL_LINK_READ_ONLY);
+        Tcl_LinkVar(interp, "::tk::print::copies", (char*)&copies,
+            TCL_LINK_INT | TCL_LINK_READ_ONLY);
+        Tcl_LinkVar(interp, "::tk::print::dpi_x", (char*)&dpi_x,
+            TCL_LINK_INT | TCL_LINK_READ_ONLY);
+        Tcl_LinkVar(interp, "::tk::print::dpi_y", (char*)&dpi_y,
+            TCL_LINK_INT | TCL_LINK_READ_ONLY);
+        Tcl_LinkVar(interp, "::tk::print::paper_width", (char*)&paper_width,
+            TCL_LINK_INT | TCL_LINK_READ_ONLY);
+        Tcl_LinkVar(interp, "::tk::print::paper_height", (char*)&paper_height,
+            TCL_LINK_INT | TCL_LINK_READ_ONLY);
+    }
+
+    return TCL_OK;
+}
+
+/*
+ * --------------------------------------------------------------------------
+ *
+ * PrintOpenPrinter--
+ *
+ *	Open the given printer.
+ *
+ * Results:
+ *	Opens the selected printer.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+int PrintOpenPrinter(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    int argc,
+    Tcl_Obj *const objv[])
+{
+    Tcl_DString ds;
+
+    if (argc < 2) {
+	Tcl_WrongNumArgs(interp, 1, objv, "printer");
+	return TCL_ERROR;
+    }
+
+    /*Start an individual page.*/
+    if (StartPage(printDC) <= 0) {
+	return TCL_ERROR;
+    }
+
+    const char *printer = Tcl_GetString(objv[1]);
+
+    if (printDC == NULL) {
+	Tcl_AppendResult(interp, "unable to establish device context", NULL);
+	return TCL_ERROR;
+    }
+
+    Tcl_DStringInit(&ds);
+    if ((OpenPrinterW(Tcl_UtfToWCharDString(printer, -1, &ds),
+	    (LPHANDLE)&printDC, NULL)) == FALSE) {
+	Tcl_AppendResult(interp, "unable to open printer", NULL);
+	Tcl_DStringFree(&ds);
+	return TCL_ERROR;
+    }
+
+    Tcl_DStringFree(&ds);
+    return TCL_OK;
+}
+
+/*
+ * --------------------------------------------------------------------------
+ *
+ * PrintClosePrinter--
+ *
+ *	Closes the given printer.
+ *
+ * Results:
+ *	Printer closed.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+int PrintClosePrinter(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    TCL_UNUSED(int),
+    TCL_UNUSED(Tcl_Obj *const *))
+{
+    if (printDC == NULL) {
+	Tcl_AppendResult(interp, "unable to establish device context", NULL);
+	return TCL_ERROR;
+    }
+
+    ClosePrinter(printDC);
+    return TCL_OK;
+}
+
+/*
+ * --------------------------------------------------------------------------
+ *
+ * PrintOpenDoc--
+ *
+ *     Opens the document for printing.
+ *
+ * Results:
+ *      Opens the print document.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+int PrintOpenDoc(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    TCL_UNUSED(int),
+    TCL_UNUSED(Tcl_Obj *const *))
+{
+    int output = 0;
+
+    if (printDC == NULL) {
+	Tcl_AppendResult(interp, "unable to establish device context", NULL);
+	return TCL_ERROR;
+    }
+
+    /*
+     * Start printing.
+     */
+    output = StartDocW(printDC, &di);
+    if (output <= 0) {
+	Tcl_AppendResult(interp, "unable to start document", NULL);
+	return TCL_ERROR;
+    }
+
+    return TCL_OK;
+}
+
+/*
+ * --------------------------------------------------------------------------
+ *
+ * PrintCloseDoc--
+ *
+ *	Closes the document for printing.
+ *
+ * Results:
+ *	Closes the print document.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+int PrintCloseDoc(
+    TCL_UNUSED(ClientData),
+    Tcl_Interp *interp,
+    TCL_UNUSED(int),
+    TCL_UNUSED(Tcl_Obj *const *))
+{
+    if (printDC == NULL) {
+	Tcl_AppendResult(interp, "unable to establish device context", NULL);
+	return TCL_ERROR;
+    }
+
+    if (EndDoc(printDC) <= 0) {
+	Tcl_AppendResult(interp, "unable to establish close document", NULL);
+	return TCL_ERROR;
+    }
+    DeleteDC(printDC);
+    return TCL_OK;
+}
+
+/*
+ * --------------------------------------------------------------------------
+ *
+ * PrintOpenPage--
+ *
+ *    Opens a page for printing.
+ *
+ * Results:
+ *      Opens the print page.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+int PrintOpenPage(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    TCL_UNUSED(int),
+    TCL_UNUSED(Tcl_Obj *const *))
+{
+    if (printDC == NULL) {
+	Tcl_AppendResult(interp, "unable to establish device context", NULL);
+	return TCL_ERROR;
+    }
+
+    /*Start an individual page.*/
+    if (StartPage(printDC) <= 0) {
+	Tcl_AppendResult(interp, "unable to start page", NULL);
+	return TCL_ERROR;
+    }
+
+    return TCL_OK;
+}
+
+/*
+ * --------------------------------------------------------------------------
+ *
+ * PrintClosePage--
+ *
+ *	Closes the printed page.
+ *
+ * Results:
+ *	Closes the page.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+int PrintClosePage(
+    TCL_UNUSED(void *),
+    Tcl_Interp *interp,
+    TCL_UNUSED(int),
+    TCL_UNUSED(Tcl_Obj *const *))
+{
+    if (printDC == NULL) {
+	Tcl_AppendResult(interp, "unable to establish device context", NULL);
+	return TCL_ERROR;
+    }
+
+    if (EndPage(printDC) <= 0) {
+	Tcl_AppendResult(interp, "unable to close page", NULL);
+	return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/win/tkWinInit.c b/win/tkWinInit.c
index 1f630e4..42ff46f 100644
--- a/win/tkWinInit.c
+++ b/win/tkWinInit.c
@@ -39,10 +39,11 @@ TkpInit(
     /*
      * This is necessary for static initialization, and is ok otherwise
      * because TkWinXInit flips a static bit to do its work just once. Also,
-     * initialize the Windows systray command here.
+     * initialize printing and systray API's here.
      */
 
     WinIcoInit(interp);
+    Winprint_Init(interp);
     TkWinXInit(Tk_GetHINSTANCE());
     return TCL_OK;
 }
diff --git a/win/tkWinInt.h b/win/tkWinInt.h
index d25ff0a..30e8c88 100644
--- a/win/tkWinInt.h
+++ b/win/tkWinInt.h
@@ -214,6 +214,17 @@ MODULE_SCOPE void		TkWinPointerEvent(HWND hwnd, int x, int y);
 
 MODULE_SCOPE void		TkSetCursorPos(int x, int y);
 
+/*
+ * The following is implemented in tkWinSysTray.c
+ */
+
+MODULE_SCOPE  int       WinIcoInit (Tcl_Interp* interp);
+
+/*
+ * The following is implemented in tkWinGDI.c
+ */
+
+MODULE_SCOPE  int       Winprint_Init(Tcl_Interp* interp);
 
 /*
  * The following is implemented in tkWinSysTray.c