Prep for 1.5 A3 release

nhmkdev · nhmkdev · commit 1fd097a48297 · 2025-11-25T07:47:11.000-08:00
diff --git a/CardMaker/Card/Translation/InceptTranslator.cs b/CardMaker/Card/Translation/InceptTranslator.cs
@@ -28,6 +28,7 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using CardMaker.Card.FormattedText.Util;
 using CardMaker.Data;
 using CardMaker.Events.Managers;
 using CardMaker.XML;
@@ -78,6 +79,9 @@ private enum LogicCheck
         private static readonly Regex s_regexIfSet = new Regex(@"(\[)(.*?)(\])", RegexOptions.Compiled);
         private static readonly Regex s_regexSwitchStatement = new Regex(@"(switch)(;)(.*?)(;)(.*)", RegexOptions.Compiled);
         private static readonly Regex s_regexPadStatement = new Regex(@"(.*)(#pad)([l|r])(;)(\d+)(;)(\d+)(;)(.*?)(#)(.*)", RegexOptions.Compiled);
+        private static readonly Regex s_regexCaps = new Regex(@"(.*)(#\(caps)(;)(.*?)(\)#)(.*)", RegexOptions.Compiled);
+        private static readonly Regex s_regexNoCaps = new Regex(@"(.*)(#\(nocaps)(;)(.*?)(\)#)(.*)", RegexOptions.Compiled);
+        private static readonly Regex s_regexTitleCase = new Regex(@"(.*)(#\(titlecase)(;)(.*?)(\)#)(.*)", RegexOptions.Compiled);
 
         private const string SWITCH = "switch";
         
@@ -155,6 +159,11 @@ protected override ElementString TranslateToElementString(Deck zDeck, string sRa
             // Translate element fields
             sOutput = LoopTranslateRegex(s_regexElementFields, sOutput, zTranslationContext, TranslateElementFields);
 
+            // Translate capitalization 
+            sOutput = LoopTranslateRegex(s_regexCaps, sOutput, zTranslationContext, TranslateCaps);
+            sOutput = LoopTranslateRegex(s_regexNoCaps, sOutput, zTranslationContext, TranslateNoCaps);
+            sOutput = LoopTranslateRegex(s_regexTitleCase, sOutput, zTranslationContext, TranslateTitleCase);
+
             // Translate string length
             sOutput = LoopTranslateRegex(s_regexStringLength, sOutput, zTranslationContext, TranslateStringLength);
 
@@ -586,6 +595,42 @@ private string TranslateElementFields(Match zMatch, TranslationContext zTranslat
             return zMatch.Groups[1].Value + sTranslated + zMatch.Groups[5].Value;
         }
 
+        private string TranslateCaps(Match zMatch, TranslationContext zTranslationContext)
+        {
+            // Override evaluation:
+            // Translate element fields
+            // Groups
+            //    1   2        3  4    5    6
+            // @"(.*)(#\(caps)(;)(.*?)(\)#)(.*)"
+            var sTranslated = zMatch.Groups[4].ToString().ToUpper(CultureInfo.CurrentCulture);
+
+            return zMatch.Groups[1].Value + sTranslated + zMatch.Groups[6].Value;
+        }
+
+        private string TranslateNoCaps(Match zMatch, TranslationContext zTranslationContext)
+        {
+            // Override evaluation:
+            // Translate element fields
+            // Groups
+            //    1   2          3  4    5    6
+            // @"(.*)(#\(nocaps)(;)(.*?)(\)#)(.*)"
+            var sTranslated = zMatch.Groups[4].ToString().ToLower(CultureInfo.CurrentCulture);
+
+            return zMatch.Groups[1].Value + sTranslated + zMatch.Groups[6].Value;
+        }
+
+        private string TranslateTitleCase(Match zMatch, TranslationContext zTranslationContext)
+        {
+            // Override evaluation:
+            // Translate element fields
+            // Groups
+            //    1   2             3  4    5    6
+            // @"(.*)(#\(titlecase)(;)(.*?)(\)#)(.*)"
+            var sTranslated = StringUtil.ConvertToTitleCase(zMatch.Groups[4].ToString());
+
+            return zMatch.Groups[1].Value + sTranslated + zMatch.Groups[6].Value;
+        }
+
         private string TranslateOverrides(Match zMatch, TranslationContext zTranslationContext)
         {
             // Override evaluation:
diff --git a/CardMaker/CardMakerBuild.cs b/CardMaker/CardMakerBuild.cs
@@ -31,7 +31,7 @@ public static class CardMakerBuild
         public static string GetBuildSuffix()
         {
 #if UNSTABLE
-            return "[UNSTABLE] V.A2";
+            return "[UNSTABLE] V.A3";
 #else
             return string.Empty;
 #endif
diff --git a/CardMaker/Test/UnitTest/Card/FormattedText/Util/StringUtilTests.cs b/CardMaker/Test/UnitTest/Card/FormattedText/Util/StringUtilTests.cs
@@ -1,4 +1,28 @@
-﻿using CardMaker.Card.FormattedText.Util;
+﻿////////////////////////////////////////////////////////////////////////////////
+// The MIT License (MIT)
+//
+// Copyright (c) 2024 Tim Stair
+//
+// 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:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+////////////////////////////////////////////////////////////////////////////////
+
+using CardMaker.Card.FormattedText.Util;
 using NUnit.Framework;
 
 namespace UnitTest.Card.FormattedText.Util
diff --git a/CardMaker/Test/UnitTest/DeckObject/InceptStringTranslation.cs b/CardMaker/Test/UnitTest/DeckObject/InceptStringTranslation.cs
@@ -26,6 +26,7 @@
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using CardMaker.Data;
 using Moq;
@@ -150,6 +151,54 @@ public string ValidateElementFields(string input)
             return result.String;
         }
 
+        [TestCase("#(caps;)#", ExpectedResult = "")]
+        [TestCase("#(caps;A)#", ExpectedResult = "A")]
+        [TestCase("#(caps;a)#", ExpectedResult = "A")]
+        [TestCase("#(caps;abc)#", ExpectedResult = "ABC")]
+        [TestCase("#(caps;ABC)#", ExpectedResult = "ABC")]
+        [TestCase("xy#(caps;abc)#zy", ExpectedResult = "xyABCzy")]
+        [TestCase("xy#(caps;ABC)#zy", ExpectedResult = "xyABCzy")]
+        public string ValidateCaps(string input)
+        {
+            _testDeck.ProcessLinesPublic(new List<List<string>>(), new List<List<string>>(), "test");
+            var result = _testDeck.TranslateString(input, _testDeck.CurrentLine, _testElement);
+            return result.String;
+        }
+
+        [TestCase("#(nocaps;)#", ExpectedResult = "")]
+        [TestCase("#(nocaps;A)#", ExpectedResult = "a")]
+        [TestCase("#(nocaps;a)#", ExpectedResult = "a")]
+        [TestCase("#(nocaps;abc)#", ExpectedResult = "abc")]
+        [TestCase("#(nocaps;ABC)#", ExpectedResult = "abc")]
+        [TestCase("xy#(nocaps;abc)#zy", ExpectedResult = "xyabczy")]
+        [TestCase("xy#(nocaps;ABC)#zy", ExpectedResult = "xyabczy")]
+        public string ValidateNoCaps(string input)
+        {
+            _testDeck.ProcessLinesPublic(new List<List<string>>(), new List<List<string>>(), "test");
+            var result = _testDeck.TranslateString(input, _testDeck.CurrentLine, _testElement);
+            return result.String;
+        }
+
+
+        [TestCase("#(titlecase;)#", ExpectedResult = "")]
+        [TestCase("#(titlecase;\t)#", ExpectedResult = "\t")]
+        [TestCase("#(titlecase;\ta)#", ExpectedResult = "\tA")]
+        [TestCase("#(titlecase;\ta\tb)#", ExpectedResult = "\tA\tB")]
+        [TestCase("#(titlecase;a\tb)#", ExpectedResult = "A\tB")]
+        [TestCase("#(titlecase;alpha beta gamma)#", ExpectedResult = "Alpha Beta Gamma")]
+        [TestCase("#(titlecase;1alpha 2beta 3gamma)#", ExpectedResult = "1alpha 2beta 3gamma")]
+        [TestCase("#(titlecase;-alpha =beta !gamma)#", ExpectedResult = "-alpha =beta !gamma")]
+        [TestCase("#(titlecase;alpha,beta, gamma)#", ExpectedResult = "Alpha,beta, Gamma")]
+        [TestCase("#(titlecase;Alpha Beta Gamma)#", ExpectedResult = "Alpha Beta Gamma")]
+        [TestCase("00#(titlecase;Alpha Beta Gamma\t  )#11", ExpectedResult = "00Alpha Beta Gamma\t  11")]
+        [TestCase(" 00 #(titlecase;ALPHA BETA gAmma\t  )#11 ", ExpectedResult = " 00 Alpha Beta Gamma\t  11 ")]
+        public string ValidateTitleCase(string input)
+        {
+            _testDeck.ProcessLinesPublic(new List<List<string>>(), new List<List<string>>(), "test");
+            var result = _testDeck.TranslateString(input, _testDeck.CurrentLine, _testElement);
+            return result.String;
+        }
+
         [TestCase("aa#padl;5;0;123#bb", ExpectedResult = "aa00123bb")]
         [TestCase("aa#padr;5;0;123#bb", ExpectedResult = "aa12300bb")]
         [TestCase("aa#padl;3;0;123#bb", ExpectedResult = "aa123bb")]
diff --git a/CardMaker/bin/Release/Card_Maker.odt b/CardMaker/bin/Release/Card_Maker.odt
diff --git a/CardMaker/bin/Release/Sample/sample_project.cmp b/CardMaker/bin/Release/Sample/sample_project.cmp

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public static class CardMakerBuild`
`31`	`31`	`public static string GetBuildSuffix()`
`32`	`32`	`{`
`33`	`33`	`#if UNSTABLE`
`34`		`- return "[UNSTABLE] V.A2";`
	`34`	`+ return "[UNSTABLE] V.A3";`
`35`	`35`	`#else`
`36`	`36`	`return string.Empty;`
`37`	`37`	`#endif`