diff --git a/HaWeb/HTMLHelpers/ConversionHelpers.cs b/HaWeb/HTMLHelpers/ConversionHelpers.cs index f3f0f01..224e26f 100644 --- a/HaWeb/HTMLHelpers/ConversionHelpers.cs +++ b/HaWeb/HTMLHelpers/ConversionHelpers.cs @@ -34,6 +34,13 @@ public static class ConversionHelpers { if (Int32.TryParse(number, out a)) return a; else return RomanToInteger(number); } + + public static string ToRomanSafe(string number) { + var a = 0; + if (Int32.TryParse(number, out a)) return ToRoman(a); + else return number; + } + public static string ToRoman(int number) { if ((number < 0) || (number > 3999)) return string.Empty; if (number < 1) return string.Empty; diff --git a/HaWeb/README.md b/HaWeb/README.md index abff1f8..96ad974 100644 --- a/HaWeb/README.md +++ b/HaWeb/README.md @@ -39,9 +39,6 @@ Recommended vscode plugins include the XML Tools, c#, Tailwind CSS IntelliSense ## Release -To build a release version for the current server, build the css file, then run: - -`dotnet publish -a x64 --os win -c Release` For a Linux server run: diff --git a/HaWeb/Settings/ParsingRules/TextRules.cs b/HaWeb/Settings/ParsingRules/TextRules.cs index 86b96cb..464540f 100644 --- a/HaWeb/Settings/ParsingRules/TextRules.cs +++ b/HaWeb/Settings/ParsingRules/TextRules.cs @@ -93,7 +93,12 @@ public class TextRules { sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.INDEXEDTEXTCONTAINERCLASS)); sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.INDEXEDTEXTCLASS)); reader.State.activelinecount = true; - }) + }), + ( ( x, _) => x.Name == "text", (sb, tag, reader) => { + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.INDEXEDTEXTCONTAINERCLASS)); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, CSSClasses.INDEXEDTEXTCLASS)); + reader.State.activelinecount = false; + }), }; public static readonly TagFuncList CTagRules = new TagFuncList() { @@ -157,7 +162,14 @@ public class TextRules { reader.State.activelinecount = false; sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); - }) + }), + ( ( x, _) => x.Name == "text", (sb, tag, reader) => { + reader.State.currline = "-1"; + reader.State.currpage = "-1"; + reader.State.activelinecount = false; + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + }), }; public static readonly TextFuncList TRules = new TextFuncList() { diff --git a/HaWeb/Views/HKB/Dynamic/Briefe.cshtml b/HaWeb/Views/HKB/Dynamic/Briefe.cshtml index 3511a90..aa7aeaf 100644 --- a/HaWeb/Views/HKB/Dynamic/Briefe.cshtml +++ b/HaWeb/Views/HKB/Dynamic/Briefe.cshtml @@ -8,8 +8,6 @@ minwidthtrads = "ha-minwidth"; *@ } - -