tig · tig · Feb 7, 2022 · Feb 7, 2022 · Feb 7, 2022 · Feb 7, 2022
diff --git a/.gitignore b/.gitignore
@@ -55,7 +55,7 @@ BenchmarkDotNet.Artifacts/
 project.lock.json
 project.fragment.lock.json
 artifacts/
-**/Properties/launchSettings.json
+#**/Properties/launchSettings.json
 
 # StyleCop
 StyleCopReport.xml
@@ -341,4 +341,6 @@ tests/*_.html
 
 #Wix 
 *.g.wxs
-install/
+install/
+Deploy/
+*.CA.dll
diff --git a/Build.ps1 b/Build.ps1
@@ -0,0 +1,16 @@
+echo "If build fails, do this:"
+echo "cmd.exe ""/K"" '""C:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\Tools\VsDevCmd.bat"" && pwsh -noexit'"
+
+echo "Cleaning Deploy folder"
+rm -Recurse -Path setup/Deploy -Include *.* 
+
+echo "Building"
+$env:winprint_telemetryId="put Kindel Systems key here"
+texttransform .\src\WinPrint.Core\Services\TelemetryService.tt
+msbuild /p:Configuration=Debug /p:Platform=x64 src/WinPrint.sln 
+
+echo "Testing Out-winprint"
+pwsh.exe -NoLogo -Command "Import-Module '.\setup\Deploy\winprint.dll'; Out-WinPrint .\testfiles\Program.cs -WhatIf -Verbose;"
+
+echo "Testing winprintgui"
+.\setup\Deploy\winprintgui.exe .\testfiles\Program.cs 
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ![.NET Core](https://github.com/tig/winprint/workflows/.NET%20Core/badge.svg)
 [![CodeFactor](https://www.codefactor.io/repository/github/tig/winprint/badge?s=93affda0738af869187afe5296914b814511f529)](https://www.codefactor.io/repository/github/tig/winprint)
 
-# winprint 2.0
+# winprint 2
 
 *winprint - A modern take on the the classic source code printing app from [1988](https://tig.github.io/winprint/about.html).*
 
@@ -13,12 +13,11 @@ Advanced source code and text file printing for PowerShell. The perfect tool for
 * Complete control over page formatting options, including headers and footers, margins, fonts, page orientation, etc...
 * Headers and Footers support detailed file and print information macros with rich date/time formatting.
 * Simple and elegant graphical user interface with accurate print preview.
-* The most capable PowerShell printing tool enabling printing from the command line.
+* The most capable PowerShell printing tool for printing from the command line.
   * Complete control of printing features with dozens of parameters, including *Intellicode* parameter completion (using `tab` key).
-  * Allows **winprint** to be used from other applications or solutions. The **winpprint** PowerShell `out-winprint` CmdLet is a drop-in replacement for `out-printer`.
+  * Allows **winprint** to be used from other applications or solutions. The **winpprint** PowerShell `Out-WinPrint` CmdLet is a drop-in replacement for `out-printer`.
 * Sheet Definitions make it easy to save settings for frequent print jobs.
 * Comprehensive logging.
-* Cross platform. Even though it's named **win**print, it works on Windows, Linux (command line only; some assembly required), and (not yet tested) Mac OS.
 
 ## Documentation
 
@@ -30,15 +29,15 @@ Advanced source code and text file printing for PowerShell. The perfect tool for
 
 ## Graphical Interface
 
-![winprint 2.0](https://tig.github.io/winprint/winprint2.png)
+![winprint 2](https://tig.github.io/winprint/winprint2.png)
 
 ## PowerShell Command Line Interface
 
 See what version is installed:
 
 ```powershell
-PS > out-winprint -verbose
-VERBOSE: Out-WinPrint 2.0.5.0 - Copyright Kindel Systems, LLC - https://tig.github.io/winprint
+PS > Out-WinPrint -verbose
+VERBOSE: Out-WinPrint 2.0.5.0 - Copyright Kindel, LLC - https://tig.github.io/winprint
 ```
 
 Print a Powershell profile using the default sheet definition and default printer:
@@ -48,9 +47,9 @@ Get-Content $profile.CurrentUserAllHosts | winprint -Language powershell
 ```
 
 ```powershell
-PS > cat Program.cs | wp -PrinterName PDF -Orientation Portrait -Verbose -Title Program.cs
-VERBOSE: Out-WinPrint 2.0.5.0 - Copyright Kindel Systems, LLC - https://tig.github.io/winprint
-VERBOSE:     Printer:          PDF
+PS > cat Program.cs | wp -PrinterName "Epson MX-80" -Orientation Portrait -Verbose -Title Program.cs
+VERBOSE: Out-WinPrint 2.0.5.0 - Copyright Kindel, LLC - https://tig.github.io/winprint
+VERBOSE:     Printer:          Epson MX-80
 VERBOSE:     Paper Size:       Letter
 VERBOSE:     Orientation:      Portrait
 VERBOSE:     Sheet Definition: Default 2-Up (0002a500-0000-0000-c000-000000000046)
@@ -63,7 +62,7 @@ PS >
 The following all do the same thing:
 
 ```powershell
-out-winprint -FileName program.cs
+Out-WinPrint -FileName program.cs
 wp program.cs
 winprint program.cs
 cat program.cs | wp -Title "program.cs"
@@ -72,7 +71,7 @@ cat program.cs | wp -Title "program.cs"
 Print all `.c` and `.h` files in the current directory to the "HP LaserJet" printer, ensuring the `{Title`} in the header/footers shows the filename. Present verbose output along the way:
 
 ```powershell
-ls .\* -include ('*.c', '*.h') | foreach { cat $_.FullName | out-winPrint -p "HP LaserJet" -title $_.FullName -verbose}
+ls .\* -include ('*.c', '*.h') | foreach { cat $_.FullName | Out-WinPrint -p "Epson MX-80" -title $_.FullName -verbose}
 ```
 
 ## Contributing

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -1,4 +1,4 @@
-title: winprint 2.0
+title: WinPrint 2
 description: winprint - Advanced source code and text file printing for PowerShell.
 logo: https://tig.github.io/winprint/winprint-icon.png
 theme: jekyll-theme-dinky

diff --git a/docs/about.md b/docs/about.md
@@ -1,28 +1,28 @@
 # About & History
 
-Ever since I started programming on an Apple ][+ in 1981, I've had a thing for printing. My earliest apps focused on printing and my first money-making endeavor was "Tapes", which printed casette tape '[J-cards](https://en.wikipedia.org/wiki/J-card)' for all the mix-tapes of great '80s music we made for the girls. Whenever I learned a new programming language or OS, the first app I'd write was **[Spit](https://github.com/tig/Tigger/blob/a2013af12fef6d9946adea7fe510f8c649766160/College/C_SRC/SPIT153.C)**, an app for printing my source code all pretty (it "spits" source code out of a printer). Over the years, I wrote Spit for AppleDOS (Apple BASIC), UCSD-Pascal, CP/M (Turbo Pascal), DOS (8086 assembly and C), VAX/VMS (Pascal and FORTRAN-77), and Mac (Pascal).
+I've had a thing for printing since I started programming on an Apple ][+ in 1981. My first money-making endeavor was "Tapes", which printed casette tape '[J-cards](https://en.wikipedia.org/wiki/J-card)' for all the mix-tapes of great '80s music we made for the girls. Whenever I learned a new programming language or OS, the first app I'd write was **[Spit](https://github.com/tig/Tigger/blob/a2013af12fef6d9946adea7fe510f8c649766160/College/C_SRC/SPIT153.C)**, an app for printing my source code all pretty (it "spits" source code out of a printer). Over the years, I wrote Spit for AppleDOS (Apple BASIC), UCSD-Pascal, CP/M (Turbo Pascal), DOS (8086 assembly and C), VAX/VMS (Pascal and FORTRAN-77), and Mac (Pascal).
 
-In 1988, as a college junior at the University of Arizona (Go Cats!), I decided Windows was going to win over OS/2 and I was going to work for Microsoft. I bought Charles Petzold's [Programming Windows](https://www.amazon.com/Programming-Windows-Writing-Developer-Reference/dp/0735671761?tag=ceklog-20) and conned my dad into buying me a copy of the Windows 2.0 SDK (which was like $300 back then!). On my amazeballs ALR 386/33 PC I set about becoming a Windows programmer. The first useful) app I wrote was **WinSpit**. In a rare moment of adulting, I renamed the app [WinPrint and listed it on CompuServe](http://www.kindel.com/products/winprint/) as shareware ($25). For over ten years I received $25 checks the mail from folks all over the world. Even better, WinPrint demonstrated to Microsoft I could actually, really write code. So they hired me.
+In 1988, as a college junior at the University of Arizona (Go Cats!), I decided Windows was going to win over OS/2 and I was going to work for Microsoft. I bought Charles Petzold's [Programming Windows](https://www.amazon.com/Programming-Windows-Writing-Developer-Reference/dp/0735671761?tag=ceklog-20) and conned my dad into buying me a copy of the Windows 2.0 SDK (which was like $300 back then!). On my amazeballs ALR 386/33 PC I set about becoming a Windows programmer. The first useful app I wrote was **WinSpit**. In a rare moment of adulting, I renamed the app [WinPrint and listed it on CompuServe](http://www.kindel.com/products/winprint/) as shareware ($25). For over ten years I received $25 checks the mail from folks all over the world. Even better, WinPrint demonstrated to Microsoft I could actually, really write code and they hired me.
 
-![Winrpint 1.54](winprint-154.gif)
+![WinPrint 1.54](winprint-154.gif)
 
 Several times in the early 1990s I started writing WinPrint 2.0. Each time I had the basics working and realized three things: 1) Nobody cares about printing source code, 3) I'd over-engineered things, and 2) the technology I choose was already dated (e.g. MFC). Two of those abandoned efforts can be found in my GitHub archive [here (1992)](https://github.com/tig/Tigger/tree/master/Shareware/WINPRT2/WINPRINT) and [here (1994)](https://github.com/tig/Tigger/tree/master/Shareware/WINPRT2/WINPRT20).
 
-Last year (2019) I got a wild-hair to write some code as a way of blowing off steam, and proving to myself I was still cool. It all started with Microsoft releasing the [Cascadia Code](https://devblogs.microsoft.com/commandline/cascadia-code/) font. I have a thing for fixed-pitch fonts. It's weird. Anyway, I installed the font in Terminal and VScode but just looking at stuff didn't satisfy me. I needed to *use the font in anger*! So I fixed some long-standing issues in [MCE Controller](https://tig.github.io/mcec/) (another app I wrote that nobody uses anymore).
+In 2019 got a wild-hair to write some code as a way of blowing off steam, and proving to myself I was still cool. It all started with Microsoft releasing the [Cascadia Code](https://devblogs.microsoft.com/commandline/cascadia-code/) font. I have a thing for fixed-pitch fonts. It's weird. Anyway, I installed the font in Terminal and VScode but just looking at stuff didn't satisfy me. I needed to *use the font in anger*! So I fixed some long-standing issues in [MCE Controller](https://tig.github.io/mcec/) (another app I wrote that nobody uses anymore).
 
 This all led to me re-discovering my old WinPrint 2.0 source code. Reminiscing on how much time I wasted back then, and how effective it was as a procrastination tool, I just had to try again. So I did. And, just to be clear, here's what I did:
 
 1) I wrote a *printing* app in 2019-2020. Nobody prints these days. *I* don't even print anymore.
-2) I over-engineered it. It has a full GUI with print preview. Headers and Footers with *Macros*. A full command-line interface. It can syntax-highlight over 200 different programming languages. It's cross-platfom. It's written in C# using the very latest .NET Core. It uses NodeJS and C++ under the covers. And more.
+2) I over-engineered it. It has a full GUI with print preview. Headers and Footers with *Macros*. A full command-line interface. It can syntax-highlight over 200 different programming languages. It's cross-platform. It's written in C# using the very latest .NET Core. It uses NodeJS and C++ under the covers. And more.
 3) I used .NET and C#. Ok, this part I can defend (assuming you get past point #1 and #2): First, I know C# well and it is awesome. Second, no other modern language/app-framework can even SPELL "print". I tried both Electron and Flutter and both suck when it comes to printing.
 
-So, there you are: I present to you winprint 2.0. I hope you enjoy it.
+So, there you are: I present to you WinPrint 2.0. I hope you enjoy it.
 
 -tig ([@ckindel](twitter.com/ckindel) on twitter; see my [blog](https://ceklog.kindel.com))
 
 ## License (MIT)
 
-Copyright (c) Kindel Systems, LLC
+Copyright (c) Kindel, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/docs/index.md b/docs/index.md
@@ -1,15 +1,15 @@
-# winprint 2.0
+# WinPrint
 
 *A modern take on the the classic source code printing app from [1988](about.md).*
 
 Advanced source code and text file printing for PowerShell. The perfect tool for printing source code, web pages, reports generated by legacy systems, documentation, or any text or HTML file. It works interactively or from the command line making it great for single users or whole enterprises.
 
-![winprint 2.0](winprint2.png)
+![WinPrint 2.0](winprint2.png)
 
 
 ```powershell
 winprint -verbose
-VERBOSE: Out-WinPrint 2.0.3.0 - Copyright Kindel Systems, LLC - https://tig.github.io/winprint
+VERBOSE: Out-WinPrint 2.3.0 - Copyright Kindel Systems, LLC - https://tig.github.io/winprint
 ```
 
 ```powershell
@@ -21,7 +21,7 @@ cat $profile.CurrentUserAllHosts | wp -Language powershell
 ```
 
 ```powershell
-ls .\* -include ('*.c', '*.h') | foreach { cat $_.FullName | out-winprint -p "LaserJet" -title $_.FullName -verbose}
+ls .\* -include ('*.c', '*.h') | foreach { cat $_.FullName | out-winprint -p "Epson MX-80" -title $_.FullName -verbose}
 ```
 
 ## Features
@@ -34,21 +34,29 @@ ls .\* -include ('*.c', '*.h') | foreach { cat $_.FullName | out-winprint -p "La
 * Simple and elegant graphical user interface with accurate print preview.
 * The most capable PowerShell printing tool enabling printing from the command line.
   * Complete control of printing features with dozens of parameters, including *Intellicode* parameter completion (using `tab` key).
-  * Allows **winprint** to be used from other applications or solutions. The **winpprint** PowerShell `out-winprint` CmdLet is a drop-in replacement for `out-printer`.
+  * Allows **WinPrint** to be used from other applications or solutions. The **WinPrint** PowerShell `Out-WinPrint` CmdLet is a drop-in replacement for `Out-Printer`.
 * Sheet Definitions make it easy to save settings for frequent print jobs.
 * Comprehensive logging.
-* Cross platform. Even though it's named **win**print, it works on Windows, Linux (command line only; some assembly required), and (not yet tested) Mac OS.
+* Theoretically Cross platform. Even though it's named **Win**pPrint, it works on Windows, Linux (command line only; some assembly required), and (not yet tested) Mac OS.
 
 See [User's Guide](users-guide.md) for more details.
 
 ## History
 
-See [About](about.md) for the history prior to *winprint 2.0*.
+See [About](about.md) for the history prior to **WinPrint 2,x**.
 
-* 03-May-2020 - 2.0.5 (RC2) -
+* 09-Sept-2022 - 2.1.0 - Significant bug and usability fixes.
+  * Fixes #35 - Detects if pre-reqs (Python and Pygments) are installed when run. Installs Pygments if needed.
+  * Fixes #37 - Rendering is stupidly slow.
+  * Fixes #30 - Switch to launch GUI (-gui) not working
+  * Fixes #33 - Pygments not loading
+  * Fixes #24 - Line Numbers greater than 999 are too wide
+
+* 03-May-2020 - 2.0.5 (RC2) - First public release
   * Fixed content type / file extension detection.
   * Changed Header/Footer macros to support `{Language}`, `{ContentType}`, and `{CteName}` instead of just `{FileType}`.
   * Installer detects if .NET Core 3.1 is installed. Makes it easy to install it if not installed.
+
 * 30-Apr-2020 - 2.0.4 (RC1) - Totally new rendering engine
   * Replaced the nodejs `Prism.js`-based syntax highlighter with the Python `Pygments`-based system. This:
     * Long lines now wrap correctly. Issue #12
@@ -59,6 +67,7 @@ See [About](about.md) for the history prior to *winprint 2.0*.
     * Enabled printing of ANSI Escape sequence encoded files (because `winprint` uses Pygments `terminal` formatter as input).
     * Removed dependency on nodejs. Issue #17
   * Dozens of small bug fixes and improvements.
+
 * 12-Apr-2020 - 2.0.0.6100 (Beta3) - Updated PowerShell cmdlet to run as a standalone app (e.g. wp foo.cs or out-winprint foo.cs.
   * Added ability to choose fonts from GUI
   * fixed print preview status bugs
@@ -71,4 +80,4 @@ See [About](about.md) for the history prior to *winprint 2.0*.
 * 20-Feb-2020 - 2.0.0.1034 (Alpha) - Minor bug fixes. Added version number to GUI.
 * 18-Feb-2020 - 2.0.0.1003 (Alpha) - First public build (alpha).
 
-I'm embarrased by a few bugs and performance issues that I want to fix before I declare beta; see [Issues](https://github.com/tig/winprint/issues).
+See [Issues](https://github.com/tig/winprint/issues).
diff --git a/docs/install.md b/docs/install.md
@@ -1,6 +1,6 @@
 # Installation Instructions
 
-***winprint*** 2.0 is almost not beta. It works well (on my machine), and I've had a dozen or so users verify it works well for them; see [Issues](https://github.com/tig/winprint/issues).*
+***WinPrint*** works well (on my machine), and I've had a dozen or so users verify it works well for them; see [Issues](https://github.com/tig/winprint/issues).*
 
 *Please report any problems or feature requests [here](https://github.com/tig/winprint/issues).*
 
@@ -18,4 +18,4 @@ Good luck. Start by cloning the *winprint* repo, installing .NET Core 3, and bui
 
 ### On Mac
 
-I haven't even tried as my old Macbook Air died and Apple wont fix it. I refuse to buy anything from Apple (except for for my family who are all all-in with Apple...sigh). I'll buy beer for someone who contributes to getting the Mac version working. It should not be hard given I've proven the stupid things works on Linux already.
+I haven't even tried as my old Macbook Air died and Apple wont fix it. I'll buy beer for someone who contributes to getting the Mac version working. It should not be hard given I've proven the stupid things works on Linux already.
diff --git a/proto/netpygments/Program.cs b/proto/netpygments/Program.cs
@@ -0,0 +1,23 @@
+static void Main(string[] args)
+{
+    using (Py.GIL())
+    {
+        dynamic np = Py.Import("numpy");
+        Console.WriteLine(np.cos(np.pi * 2));
+
+        dynamic sin = np.sin;
+        Console.WriteLine(sin(5));
+
+        double c = (double)(np.cos(5) + sin(5));
+        Console.WriteLine(c);
+
+        dynamic a = np.array(new List<float> { 1, 2, 3 });
+        Console.WriteLine(a.dtype);
+
+        dynamic b = np.array(new List<float> { 6, 5, 4 }, dtype: np.int32);
+        Console.WriteLine(b.dtype);
+
+        Console.WriteLine(a * b);
+        Console.ReadKey();
+    }
+}
diff --git a/proto/netpygments/netpygments.csproj b/proto/netpygments/netpygments.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/proto/winforms/WinPrint.Core/Models/Uuid.cs b/proto/winforms/WinPrint.Core/Models/Uuid.cs
@@ -4,7 +4,7 @@
 
 namespace WinPrint.Core {
 
-    // WinPrint 2.0 has been assigned the following GUIDs by Microsoft
+    // WinPrint 2 has been assigned the following GUIDs by Microsoft
     //
     // Available range: 0002A5xx-0000-0000-C000-000000000046
     //

diff --git a/setup/WinPrint.Installer/App.config b/setup/WinPrint.Installer/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup useLegacyV2RuntimeActivationPolicy="true"> 
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
 </configuration>
diff --git a/setup/WinPrint.Installer/EmbeddedUI.config b/setup/WinPrint.Installer/EmbeddedUI.config
@@ -2,7 +2,8 @@
 <configuration>
     <startup useLegacyV2RuntimeActivationPolicy="true">
         <supportedRuntime version="v4.0.30319"/>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
     </startup>
 </configuration>
diff --git a/setup/WinPrint.Installer/EmbeddedUI_WPF.CA.dll b/setup/WinPrint.Installer/EmbeddedUI_WPF.CA.dll