Development

BookGen.sln

@@ -54,14 +54,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookGen.Contents", "Libs\Bo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookGen.Cli", "Libs\BookGen.Cli\BookGen.Cli.csproj", "{859C300C-33B4-4F24-8A6C-F430520774DB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookGen.Native", "Libs\BookGen.Native\BookGen.Native.csproj", "{8A1FEF90-2B8F-4849-B7C9-63EDE7F120E0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookGen.ShortCodes", "Libs\BookGen.ShortCodes\BookGen.ShortCodes.csproj", "{079B77CD-3380-4947-BDE8-E0E774FD8E6F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookGen.Shell", "Prog\BookGen.Shell\BookGen.Shell.csproj", "{985728E4-6353-44A1-87BB-77BF366A5977}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookGen.Settings", "Libs\BookGen.Settings\BookGen.Settings.csproj", "{B1905B26-0649-4911-BA5F-9781BBC3D3E2}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BookGen.RenderEngine", "Libs\BookGen.RenderEngine\BookGen.RenderEngine.csproj", "{4E7C4D96-32DD-4E72-8B28-F4DCDB74E177}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -128,14 +126,6 @@ Global
 		{859C300C-33B4-4F24-8A6C-F430520774DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{859C300C-33B4-4F24-8A6C-F430520774DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{859C300C-33B4-4F24-8A6C-F430520774DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A1FEF90-2B8F-4849-B7C9-63EDE7F120E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A1FEF90-2B8F-4849-B7C9-63EDE7F120E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A1FEF90-2B8F-4849-B7C9-63EDE7F120E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A1FEF90-2B8F-4849-B7C9-63EDE7F120E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{079B77CD-3380-4947-BDE8-E0E774FD8E6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{079B77CD-3380-4947-BDE8-E0E774FD8E6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{079B77CD-3380-4947-BDE8-E0E774FD8E6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{079B77CD-3380-4947-BDE8-E0E774FD8E6F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{985728E4-6353-44A1-87BB-77BF366A5977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{985728E4-6353-44A1-87BB-77BF366A5977}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{985728E4-6353-44A1-87BB-77BF366A5977}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -144,6 +134,10 @@ Global
 		{B1905B26-0649-4911-BA5F-9781BBC3D3E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1905B26-0649-4911-BA5F-9781BBC3D3E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B1905B26-0649-4911-BA5F-9781BBC3D3E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E7C4D96-32DD-4E72-8B28-F4DCDB74E177}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E7C4D96-32DD-4E72-8B28-F4DCDB74E177}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E7C4D96-32DD-4E72-8B28-F4DCDB74E177}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E7C4D96-32DD-4E72-8B28-F4DCDB74E177}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -164,10 +158,9 @@ Global
 		{596AE4F8-A8C8-4B0E-8285-605E30498AFA} = {9C47BBFF-ACD8-40D8-9FB1-A3FA524B27C4}
 		{8166DFAD-9B7A-4CCE-BE8B-577AC52D5066} = {9C47BBFF-ACD8-40D8-9FB1-A3FA524B27C4}
 		{859C300C-33B4-4F24-8A6C-F430520774DB} = {9C47BBFF-ACD8-40D8-9FB1-A3FA524B27C4}
-		{8A1FEF90-2B8F-4849-B7C9-63EDE7F120E0} = {9C47BBFF-ACD8-40D8-9FB1-A3FA524B27C4}
-		{079B77CD-3380-4947-BDE8-E0E774FD8E6F} = {9C47BBFF-ACD8-40D8-9FB1-A3FA524B27C4}
 		{985728E4-6353-44A1-87BB-77BF366A5977} = {05B69A0E-343B-4E7C-B77B-24E84B57D5D2}
 		{B1905B26-0649-4911-BA5F-9781BBC3D3E2} = {9C47BBFF-ACD8-40D8-9FB1-A3FA524B27C4}
+		{4E7C4D96-32DD-4E72-8B28-F4DCDB74E177} = {9C47BBFF-ACD8-40D8-9FB1-A3FA524B27C4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {772515BA-79D4-4C5D-AF16-29DE649EC13E}

BookGenShell.ps1

@@ -1,7 +1,7 @@
 # -----------------------------------------------------------------------------
 # BookGen PowerShell Registration script
-# Version 2.7.0
-# Last modified: 2023-12-07
+# Version 2.9.0
+# Last modified: 2024-05-20
 # -----------------------------------------------------------------------------
 
 # cdg command
@@ -34,6 +34,20 @@ function www
 	}
 }
 
+# organize command
+function organize
+{
+    $argsAsString = $args -join ' '
+    if ([string]::IsNullOrWhiteSpace($argsAsString))
+    {
+        BookGen.Shell.exe "organize"
+    }
+    else
+    {
+        BookGen.Shell.exe "organize" "$argsAsString"
+    }
+}
+
 # info command
 function bookgen-info()
 {
@@ -116,6 +130,14 @@ Register-ArgumentCompleter -Native -CommandName dotnet -ScriptBlock {
 	 }
 }
 
+# PowerShell parameter completion shim for git
+Register-ArgumentCompleter -Native -CommandName git -ScriptBlock {
+	param($commandName, $wordToComplete, $cursorPosition)
+		BookGen.Shell.exe "git-complete" $cursorPosition "$wordToComplete" | ForEach-Object {
+			[System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_)
+	 }
+}
+
 # set prompt
 function prompt {
     $git = $(BookGen.Shell.exe "prompt" $(Get-Location).Path)

Bootstrappers/BookGen/Program.cs

@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------
-// (c) 2023 Ruzsinszki Gábor
+// (c) 2023-2024 Ruzsinszki Gábor
 // This code is licensed under MIT license (see LICENSE for details)
 //-----------------------------------------------------------------------------
 
@@ -19,9 +19,14 @@ public static class Program
         public static void Main()
         {
             string shellExe = InstallDetector.IsInstalled(Constants.PowershellCore)
-                ? Constants.PowershellCore 
+                ? Constants.PowershellCore
                 : Constants.Powershell;
 
+            if (InstallDetector.IsPowershellLocallyPresent(out string pwshPath))
+            {
+                shellExe = pwshPath;
+            }
+
             string shellScript = Path.Combine(AppContext.BaseDirectory, Constants.DataFolder, "BookGenShell.ps1");
 
             ExceptionHandler.Try(() =>

Bootstrappers/Bookgen.Win/Constants.cs

@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------
-// (c) 2023 Ruzsinszki Gábor
+// (c) 2023-2024 Ruzsinszki Gábor
 // This code is licensed under MIT license (see LICENSE for details)
 //-----------------------------------------------------------------------------
 
@@ -13,5 +13,6 @@ public static class Constants
         public const string WindowsTerminal = "wt.exe";
         public const string PowershellCore = "pwsh.exe";
         public const string Powershell = "powershell.exe";
+        public const string PowerShellFolder = "powershell";
     }
 }

Bootstrappers/Bookgen.Win/InstallDetector.cs

@@ -41,5 +41,11 @@ public static bool IsInstalled(string programName)
             }
             return false;
         }
+
+        public static bool IsPowershellLocallyPresent(out string pwshPath)
+        {
+            pwshPath = Path.Combine(AppContext.BaseDirectory, Constants.PowerShellFolder, Constants.PowershellCore);
+            return File.Exists(pwshPath);
+        }
     }
 }

Changelog.md

@@ -1,11 +1,16 @@
-# Next
+# 2024. 06. 04 (Pre release)
 
+* New: Added autocomplete in bookgen shell for basic git commands
+* New: ISO build now includes powershell core
+* New: Added table of contents support via the [toc] tag in markdown
+* New: JSON array support for subcommand configuration.
 * Change: Updated dependencies
-* Change: Cplipboard implementation replaced with TextCopy
+* Change: Cplipboard implementation replaced with TextCopy, now works multiplatform
 * Change: Linux distribution now uses a deb package for distribution
 * Change: SVG Passthrough implemented in md2html command
 * Change: md2thml is extended with templating and new options
 * Change: Various BookGen related settings now use a single .ZIP file for configuration
+* Change: Reworked templating engine
 * Fix: Various linux compatibility fixes
 * Fix: Various fixes in the Table of Contents generation
 * Fix: Template processor fixes

Commands.md

@@ -196,6 +196,27 @@ Initializes a folder as BookGen project
 
 Arguments:
 
+-d, --dir:
+    Optional argument. Specifies work directory. If not specified, then
+    the current directory will be used as working directory.
+
+# JsonArgs
+
+Creates an empty json arguments template file for a given bookgen command.
+
+`BookGen JsonArgs -c [command] {-d [directory]}`
+`BookGen JsonArgs --command [command] {--dir [directory]}`
+
+A Json arguments template can be used to store command line arguments,
+so the bookgen command can be invoked with the same arguments without having 
+to type them in again.
+
+Arguments:
+
+-c, --command:
+    Required argument. Specifies the command for which the json template
+    will be created.
+
 -d, --dir:
     Optional argument. Specifies work directory. If not specified, then
     the current directory will be used as working directory.
@@ -403,11 +424,6 @@ Arguments:
 -i, --input: 
     Input markdown file path
 
-# Shortcodes
-
-Displays the available shortcode names that can be used in markdown and 
-template files. 
-
 # Tags
 
 Create or update the tags database and display various stats

Libs/BookGen.Cli/ArgumentJsonItem.cs

@@ -0,0 +1,7 @@
+namespace BookGen.Cli;
+
+public sealed class ArgumentJsonItem
+{
+    public required string Name { get; init; }
+    public required string[] Arguments { get; init; }
+}

Libs/BookGen.Cli/ArgumentParsing/ArgumentBag.cs

@@ -66,6 +66,27 @@ public bool GetSwitch(SwitchAttribute @switch)
         return null;
     }
 
+    public string[] GetSwitchValues(SwitchAttribute @switch)
+    {
+        List<string> values = new();
+        for (int i = 0; i < _arguments.Length; i++)
+        {
+            if (_arguments[i] == $"-{@switch.ShortName}"
+                || _arguments[i] == $"--{@switch.LongName}")
+            {
+                int nextIndex = i + 1;
+                if (nextIndex < _arguments.Length)
+                {
+                    string? returnValue = _arguments[nextIndex];
+                    _arguments[i] = null;
+                    _arguments[nextIndex] = null;
+                    values.Add(returnValue ?? string.Empty);
+                }
+            }
+        }
+        return values.ToArray();
+    }
+
     public string? GetArgument(ArgumentAttribute argument)
     {
         int notNullIndex = -1;