diff --git a/HaWeb/Controllers/BriefeContoller.cs b/HaWeb/Controllers/BriefeContoller.cs index 32814ca..0ada1f2 100644 --- a/HaWeb/Controllers/BriefeContoller.cs +++ b/HaWeb/Controllers/BriefeContoller.cs @@ -59,8 +59,7 @@ public class Briefecontroller : Controller if (hands != null && hands.Any()) model.ParsedHands = HaWeb.HTMLHelpers.BriefeHelpers.CreateHands(_lib, hands); if (editreasons != null && editreasons.Any()) model.ParsedEdits = HaWeb.HTMLHelpers.BriefeHelpers.CreateEdits(_lib, _readerService, editreasons); if (tradition != null && !String.IsNullOrWhiteSpace(tradition.Element)) model.ParsedTradition = HaWeb.HTMLHelpers.BriefeHelpers.CreateTraditions(_lib, _readerService, marginals, tradition); - if (text != null && !String.IsNullOrWhiteSpace(text.Element)) - (model.ParsedLineCount, model.ParsedText, model.ParsedMarginals) = HaWeb.HTMLHelpers.BriefeHelpers.CreateLetter(_lib, _readerService, meta, text, marginals); + if (text != null && !String.IsNullOrWhiteSpace(text.Element)) model.ParsedText = HaWeb.HTMLHelpers.BriefeHelpers.CreateLetter(_lib, _readerService, meta, text, marginals); // Return return View(model); diff --git a/HaWeb/Controllers/RegisterController.cs b/HaWeb/Controllers/RegisterController.cs index c00c622..de2caab 100644 --- a/HaWeb/Controllers/RegisterController.cs +++ b/HaWeb/Controllers/RegisterController.cs @@ -54,14 +54,14 @@ public class RegisterController : Controller var res = new List(); foreach (var comm in comments) { - var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(_lib, _readerService, comm); + var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(_lib, _readerService, comm, category, Settings.ParsingState.CommentType.Comment); List? parsedSubComments = null; if (comm.Kommentare != null) { parsedSubComments = new List(); foreach (var subcomm in comm.Kommentare.OrderBy(x => x.Value.Order)) { - parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(_lib, _readerService, subcomm.Value)); + parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(_lib, _readerService, subcomm.Value, category, Settings.ParsingState.CommentType.Subcomment)); } } res.Add(new CommentModel(parsedComment, parsedSubComments)); @@ -101,14 +101,14 @@ public class RegisterController : Controller var res = new List(); foreach (var comm in comments) { - var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(_lib, _readerService, comm); + var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(_lib, _readerService, comm, category, Settings.ParsingState.CommentType.Comment); List? parsedSubComments = null; if (comm.Kommentare != null) { parsedSubComments = new List(); foreach (var subcomm in comm.Kommentare.OrderBy(x => x.Value.Lemma.Length).ThenBy(x => x.Value.Lemma)) { - parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(_lib, _readerService, subcomm.Value)); + parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(_lib, _readerService, subcomm.Value, category, Settings.ParsingState.CommentType.Subcomment)); } } res.Add(new CommentModel(parsedComment, parsedSubComments)); @@ -156,14 +156,14 @@ public class RegisterController : Controller var res = new List(); foreach (var comm in comments) { - var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(_lib, _readerService, comm); + var parsedComment = HTMLHelpers.CommentHelpers.CreateHTML(_lib, _readerService, comm, category, Settings.ParsingState.CommentType.Comment); List? parsedSubComments = null; if (comm.Kommentare != null) { parsedSubComments = new List(); foreach (var subcomm in comm.Kommentare.OrderBy(x => x.Value.Order)) { - parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(_lib, _readerService, subcomm.Value)); + parsedSubComments.Add(HTMLHelpers.CommentHelpers.CreateHTML(_lib, _readerService, subcomm.Value, category, Settings.ParsingState.CommentType.Subcomment)); } } res.Add(new CommentModel(parsedComment, parsedSubComments)); diff --git a/HaWeb/HTMLHelpers/BriefeHelpers.cs b/HaWeb/HTMLHelpers/BriefeHelpers.cs index c1264dc..3a96bf2 100644 --- a/HaWeb/HTMLHelpers/BriefeHelpers.cs +++ b/HaWeb/HTMLHelpers/BriefeHelpers.cs @@ -13,20 +13,20 @@ using HaWeb.Settings.ParsingRules; public static class BriefeHelpers { - public static (string, string, string) CreateLetter(ILibrary lib, IReaderService readerService, Meta meta, Letter letter, IEnumerable? marginals) + public static string CreateLetter(ILibrary lib, IReaderService readerService, Meta meta, Letter letter, IEnumerable? marginals) { var rd = readerService.RequestStringReader(letter.Element); var letterState = new LetterState(lib, readerService, meta, marginals); new HaWeb.HTMLParser.XMLHelper(letterState, rd, letterState.sb_lettertext, LetterRules.OTagRules, LetterRules.STagRules, LetterRules.CTagRules, LetterRules.TextRules, LetterRules.WhitespaceRules); - new HaWeb.HTMLParser.XMLHelper(letterState, rd, letterState.sb_linecount, null, LetterRules.STagRulesLineCount); + // new HaWeb.HTMLParser.XMLHelper(letterState, rd, letterState.sb_lettertext, null, LetterRules.STagRulesLineCount); - if (marginals != null && marginals.Any()) - { - new HaWeb.HTMLParser.XMLHelper(letterState, rd, letterState.sb_marginals, null, LetterRules.STagRulesMarginals); - } + // if (marginals != null && marginals.Any()) + // { + // new HaWeb.HTMLParser.XMLHelper(letterState, rd, letterState.sb_lettertext, null, LetterRules.STagRulesMarginals); + // } rd.Read(); - return (letterState.sb_linecount.ToString(), letterState.sb_lettertext.ToString(), letterState.sb_marginals.ToString()); + return letterState.sb_lettertext.ToString(); } public static string CreateTraditions(ILibrary lib, IReaderService readerService, IEnumerable? marginals, Tradition tradition) diff --git a/HaWeb/HTMLHelpers/CommentHelper.cs b/HaWeb/HTMLHelpers/CommentHelper.cs index 1e08ffa..dd55d99 100644 --- a/HaWeb/HTMLHelpers/CommentHelper.cs +++ b/HaWeb/HTMLHelpers/CommentHelper.cs @@ -15,11 +15,11 @@ public static class CommentHelpers private static readonly string COMMENTHEADCLASS = HaWeb.Settings.CSSClasses.COMMENTHEADCLASS; private static readonly string BACKLINKSHKBCLASS = HaWeb.Settings.CSSClasses.BACKLINKSHKBCLASS; - public static string CreateHTML(ILibrary lib, IReaderService readerService, Comment comment) + public static string CreateHTML(ILibrary lib, IReaderService readerService, Comment comment, string category, CommentType type) { var sb = new StringBuilder(); var rd = readerService.RequestStringReader(comment.Lemma); - var commentState = new CommentState(); + var commentState = new CommentState(category, type); new HTMLParser.XMLHelper(commentState, rd, sb, CommentRules.OTagRules, CommentRules.STagRules, CommentRules.CTagRules, CommentRules.TextRules, CommentRules.WhitespaceRules); sb.Append(HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, COMMENTHEADCLASS, comment.Index)); new HTMLHelpers.LinkHelper(lib, rd, sb); diff --git a/HaWeb/README.md b/HaWeb/README.md new file mode 100644 index 0000000..e192dc8 --- /dev/null +++ b/HaWeb/README.md @@ -0,0 +1,26 @@ +# Redesign der Hamann-Vebseite, drittes Major Upadte +Veränderungenen in der Funktionalität für den Benutzer +- Behutsames Redesign der Webseite: + - Schrift wird minimal größer auf großen Bildschirmen + - Redesign der Marginalspalte, sodass keine Überschneidungen vorkommen + - Leichtes Redesign der Zusatzinformationen für einen Brief (Tradition, Edits) an etwas prominenterer Stelle + - Anpassung der Webseite an Mobilgeräte und Tablets + +- Suche im Brieftext wird gefixt +- Seite wird zugänglich für Menschen mit eingeschränktem Sehvermögen / Screenreadern + +Veränderungen in der Funktionalität für die Forscher +- Online-Syntaxcheck für XML-Dateien +- Online-Cross-Dateien-Check (bsp. verweist jede Marginalie auf eine existierende Zeile)? +- Erstellung einer HAMANN.xml-Datei +- Hochladen der HAMANN.xml-Datei auf die Plattform + +Veränderungen im Code +- Anpassung des Codes an .NET 6 (Kopieren / Einfügen) +- Umzug nach CSS Framework Tailwind +- Code wird aufgeräumt und sortiert +- Leichtere Anpassungen an zukünftige Bedütfnisse (Wartungszeiten minimieren) +- Auslagerungen einzelner Einstellungen in Einstellungsdateien +- Code open source zugänglich machen? + +Für diese Anpassungen sind in etwa 3-4 Monate eingeplant. \ No newline at end of file diff --git a/HaWeb/Settings/CSSClassesSettings.cs b/HaWeb/Settings/CSSClassesSettings.cs index fb6d4c3..59fcde6 100644 --- a/HaWeb/Settings/CSSClassesSettings.cs +++ b/HaWeb/Settings/CSSClassesSettings.cs @@ -55,17 +55,20 @@ public static class CSSClasses { public const string EMPHCLASS = "ha-emph"; public const string APPCLASS = "ha-app"; public const string MARGINGALBOXCLASS = "ha-marginalbox"; - public const string TRADLINECOUNTCLASS = "ha-tradlinecount"; public const string TRADCOMMENTCOLUMNCLASS = "ha-tradcommentcolumn"; public const string TRADZHTEXTCLASS = "ha-tradzhtext"; public const string TRADZHTEXTBOXCLASS = "ha-tradtextbox"; // Zeilen: + public const string ZHLINECLASS = "ha-zhline"; + public const string FIRSTLINECLASS ="ha-firstline"; public const string ZHBREAKCLASS = "ha-zhbreak"; public const string LINELINECLASS = "ha-hr"; public const string LINEINDENTCLASS = "ha-indent-"; // TODO: GEN public const string ZHPAGECLASS = "ha-zhpage"; + public const string ZHLINECOUNTCLASS = "ha-linecount"; + public const string HIDDENZHLINECOUNT = "ha-hiddenlinecount"; public const string FIRSTPAGECLASS = "ha-firstpage"; public const string EMPTYLINECLASS = "ha-emptyline"; diff --git a/HaWeb/Settings/ParsingRules/CommentRules.cs b/HaWeb/Settings/ParsingRules/CommentRules.cs index 3afcbf5..836edc5 100644 --- a/HaWeb/Settings/ParsingRules/CommentRules.cs +++ b/HaWeb/Settings/ParsingRules/CommentRules.cs @@ -1,5 +1,6 @@ namespace HaWeb.Settings.ParsingRules; using System.Text; +using System.Text.RegularExpressions; using TagFuncList = List<(Func, bool>, Action>)>; using TextFuncList = List<(Func, bool>, Action>)>; @@ -30,8 +31,20 @@ public static class CommentRules { }; public static readonly TextFuncList TextRules = new TextFuncList() { - ( (x, _) => true, ( sb, txt, _) => sb.Append(txt.Value) ) - }; + ( (x, _) => true, ( sb, txt, reader) => { + sb.Append(txt.Value); + if (reader.State.Category == "bibel" && reader.State.Type == HaWeb.Settings.ParsingState.CommentType.Subcomment && + reader.OpenTags.Any() && reader.OpenTags.Last().Name == "lemma" && + !txt.Value.Contains("Stücke zu") && !txt.Value.Contains("ZusDan")) { + var lnkstring = Regex.Replace(txt.Value, @"\s+", ""); + sb.Append(HTMLHelpers.TagHelpers.CreateCustomElement("a", + new HaWeb.HTMLHelpers.TagHelpers.Attribute() { Name = "href", Value = "https://www.bibleserver.com/LUT/" + lnkstring}, + new HaWeb.HTMLHelpers.TagHelpers.Attribute() { Name = "target", Value = "_blank"}, + new HaWeb.HTMLHelpers.TagHelpers.Attribute() { Name = "rel", Value = "noopener noreferrer"})); + sb.Append(""); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement("a")); + } + })}; public static readonly WhitespaceFuncList WhitespaceRules = new WhitespaceFuncList() { ( (x, _) => true, ( sb, txt, _) => sb.Append(txt.Value) ) diff --git a/HaWeb/Settings/ParsingRules/LetterRules.cs b/HaWeb/Settings/ParsingRules/LetterRules.cs index bc0910d..73967c2 100644 --- a/HaWeb/Settings/ParsingRules/LetterRules.cs +++ b/HaWeb/Settings/ParsingRules/LetterRules.cs @@ -45,12 +45,16 @@ public class LetterRules private static readonly string MARGINGALBOXCLASS = HaWeb.Settings.CSSClasses.MARGINGALBOXCLASS; // Zeilen: + private static readonly string ZHLINECLASS = HaWeb.Settings.CSSClasses.ZHLINECLASS; + private static readonly string FIRSTLINECLASS = HaWeb.Settings.CSSClasses.FIRSTLINECLASS; private static readonly string ZHBREAKCLASS = HaWeb.Settings.CSSClasses.ZHBREAKCLASS; private static readonly string LINELINECLASS = HaWeb.Settings.CSSClasses.LINELINECLASS; private static readonly string LINEINDENTCLASS = HaWeb.Settings.CSSClasses.LINEINDENTCLASS; - private static readonly string ZHPAGECLASS = HaWeb.Settings.CSSClasses.ZHBREAKCLASS; + private static readonly string ZHPAGECLASS = HaWeb.Settings.CSSClasses.ZHPAGECLASS; + private static readonly string ZHLINECOUNTCLASS = HaWeb.Settings.CSSClasses.ZHLINECOUNTCLASS; private static readonly string FIRSTPAGECLASS = HaWeb.Settings.CSSClasses.FIRSTPAGECLASS; private static readonly string EMPTYLINECLASS = HaWeb.Settings.CSSClasses.EMPTYLINECLASS; + private static readonly string HIDDENZHLINECOUNT = HaWeb.Settings.CSSClasses.HIDDENZHLINECOUNT; // Root-Elemente private static readonly string COMMENTCLASS = HaWeb.Settings.CSSClasses.COMMENTCLASS; @@ -155,14 +159,90 @@ public class LetterRules })}; public static readonly TagFuncList STagRules = new TagFuncList() { - ( ( x, _) => x.Name == "line", (sb, tag, reader) => { - if(reader.State.currline != "-1") sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br", ZHBREAKCLASS)); + ( (x, _) => x.Name == "page", (sb, tag, reader) => reader.State.currpage = tag["index"] ), + ( (x, _) => x.Name == "line", (sb, tag, reader) => { + // This is the beginning of the Text, so no
needed, just a special linecount + if(reader.State.currline == "-1") { + reader.State.currline = tag["index"]; + + // First Linecount + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHLINECOUNTCLASS, reader.State.currpage + "-" + reader.State.currline)); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHPAGECLASS + " " + FIRSTLINECLASS, "")); + if(reader.State.Meta.ZH != null) { + sb.Append("ZH "); + sb.Append(HaWeb.HTMLHelpers.ConversionHelpers.ToRoman(Int32.Parse(reader.State.Meta.ZH.Volume))); + sb.Append(" "); + } + sb.Append("S." + " "); + if (tag["index"] != "1") + sb.Append(reader.State.currpage + " / " + tag["index"]); + else + sb.Append(reader.State.currpage); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + } + + // This is NOT the beginning of the text, so we set a br, and then, linecount + else { + reader.State.currline = tag["index"]; + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br", ZHBREAKCLASS)); + + // Linecount + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHLINECOUNTCLASS, reader.State.currpage + "-" + reader.State.currline)); + + // Fall 1: Neue Seite + if (reader.State.currline == "1") { + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHPAGECLASS, "")); + sb.Append("S. " + reader.State.currpage); + } + + // Fall 2: Neue Zeile, teilbar durch 5 + else if (Int32.TryParse(tag["index"], out var _) && Int32.Parse(tag["index"]) % 5 == 0) { + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHLINECLASS, "")); + sb.Append(tag["index"]); + } + + // Fall 3: Neue Zeile, nicht teilbar durch 5, deswegen versteckt + else { + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHLINECLASS + " " + HIDDENZHLINECOUNT, "")); + sb.Append(tag["index"]); + } + + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + } + + // Marginalien + if(reader.State.Marginals != null) { + var margs = reader.State.Marginals.Where(x => x.Page == reader.State.currpage && x.Line == reader.State.currline); + if (margs != null && margs.Any()) + { + margs = margs.OrderBy(x => Int32.Parse(x.Index)); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, MARGINGALBOXCLASS)); + foreach (var marginal in margs) + { + // In Marginal, the Root-Element () is somehow parsed, + // so we don't need to enclose it in a seperate div. + var rd = reader.State.ReaderService.RequestStringReader(marginal.Element); + new HaWeb.HTMLParser.XMLHelper(reader.State, rd, sb, LetterRules.OTagRules, null, LetterRules.CTagRules, LetterRules.TextRules, LetterRules.WhitespaceRules); + new HaWeb.HTMLHelpers.LinkHelper(reader.State.Lib, rd, sb, false); + rd.Read(); + } + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + } + } + + // Line type=line if(tag["type"] == "line") sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, LINELINECLASS)); - } ), - ( ( x, _) => x.Name == "line" && !String.IsNullOrWhiteSpace(x["tab"]), (sb, tag, _) => { - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, LINEINDENTCLASS + tag["tab"])); - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); - })}; + + // Line tab= + if(!String.IsNullOrWhiteSpace(tag["tab"])) { + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, LINEINDENTCLASS + tag["tab"])); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + } + } + )}; + public static readonly WhitespaceFuncList WhitespaceRules = new WhitespaceFuncList() { ( ( _, _) => true, ( sb, txt, reader) => { @@ -171,64 +251,4 @@ public class LetterRules else reader.State.active_skipwhitespace = !reader.State.active_skipwhitespace; })}; - - // Rules for the left sidebar - public static readonly TagFuncList STagRulesLineCount = new TagFuncList() { - ( ( x, _) => x.Name == "line", (sb, tag, reader) => { - if(reader.State.currline != "-1") { - if (reader.State.currpage == reader.State.oldpage) - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br", "", reader.State.currpage + "-" + reader.State.currline)); - else { - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br", "", reader.State.oldpage + "-" + reader.State.currline)); - reader.State.oldpage = reader.State.currpage; - } - } - else { - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHPAGECLASS + " " + FIRSTPAGECLASS, reader.State.currpage + "-" + tag["index"])); - sb.Append("S." + " "); - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); - if (tag["index"] != "1") - sb.Append(reader.State.currpage + " / " + tag["index"]); - else - sb.Append(reader.State.currpage); - reader.State.oldpage = reader.State.currpage; - } - }), - ( ( x, _) => x.Name == "line", (sb, tag, reader) => { - if(reader.State.currline != "-1" && Int32.TryParse(tag["index"], out var _) && Int32.Parse(tag["index"]) % 5 == 0) - sb.Append(tag["index"]); - }), - ( ( x, reader) => x.Name == "line" && x["index"] == "1" && reader.State.currline != "-1", (sb, tag, reader) => { - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHPAGECLASS, "")); - sb.Append("S. " + reader.State.currpage); - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); - }), - ( ( x, _) => x.Name == "line", (sb, tag, reader) => { reader.State.currline = tag["index"]; } ), - ( ( x, _) => x.Name == "page", (sb, tag, reader) => { reader.State.currpage = tag["index"]; } ) - }; - - // Rules for the right sidebar - public static readonly TagFuncList STagRulesMarginals = new TagFuncList() { - ( ( x, _) => x.Name == "line", (sb, tag, reader) => { - if(reader.State.currline != "-1" && reader.State.Marginals != null) { - var margs = reader.State.Marginals.Where(x => x.Page == reader.State.currpage && x.Line == reader.State.currline); - if (margs != null && margs.Any()) - { - margs = margs.OrderBy(x => Int32.Parse(x.Index)); - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, MARGINGALBOXCLASS, reader.State.commid.ToString())); - foreach (var marginal in margs) - { - var rd = reader.State.ReaderService.RequestStringReader(marginal.Element); - new HaWeb.HTMLParser.XMLHelper(reader.State, rd, sb, LetterRules.OTagRules, null, LetterRules.CTagRules, LetterRules.TextRules, LetterRules.WhitespaceRules); - new HaWeb.HTMLHelpers.LinkHelper(reader.State.Lib, rd, sb, false); - rd.Read(); - } - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br")); - } - else - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br", EMPTYLINECLASS)); - } - reader.State.commid++; - })}; } \ No newline at end of file diff --git a/HaWeb/Settings/ParsingRules/TraditionRules.cs b/HaWeb/Settings/ParsingRules/TraditionRules.cs index 9f27f5a..0adbce9 100644 --- a/HaWeb/Settings/ParsingRules/TraditionRules.cs +++ b/HaWeb/Settings/ParsingRules/TraditionRules.cs @@ -47,9 +47,11 @@ public static class TraditionRules private static readonly string ZHBREAKCLASS = HaWeb.Settings.CSSClasses.ZHBREAKCLASS; private static readonly string LINELINECLASS = HaWeb.Settings.CSSClasses.LINELINECLASS; private static readonly string LINEINDENTCLASS = HaWeb.Settings.CSSClasses.LINEINDENTCLASS; - private static readonly string ZHPAGECLASS = HaWeb.Settings.CSSClasses.ZHBREAKCLASS; + private static readonly string ZHPAGECLASS = HaWeb.Settings.CSSClasses.ZHPAGECLASS; + private static readonly string ZHLINECOUNTCLASS = HaWeb.Settings.CSSClasses.ZHLINECOUNTCLASS; private static readonly string FIRSTPAGECLASS = HaWeb.Settings.CSSClasses.FIRSTPAGECLASS; private static readonly string EMPTYLINECLASS = HaWeb.Settings.CSSClasses.EMPTYLINECLASS; + private static readonly string HIDDENZHLINECOUNT = HaWeb.Settings.CSSClasses.HIDDENZHLINECOUNT; // Root-Elemente private static readonly string COMMENTCLASS = HaWeb.Settings.CSSClasses.COMMENTCLASS; @@ -160,14 +162,82 @@ public static class TraditionRules })}; public static readonly TagFuncList STagRules = new TagFuncList() { - ( ( x, _) => x.Name == "line", (sb, tag, reader) => { - if(reader.State.currline != "-1") sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br", ZHBREAKCLASS)); + ( (x, _) => x.Name == "page", (sb, tag, reader) => reader.State.currpage = tag["index"] ), + ( (x, _) => x.Name == "line", (sb, tag, reader) => { + // This is the beginning of the Text, so no
needed, just a special linecount + if(reader.State.currline == "-1") { + reader.State.currline = tag["index"]; + + // First Linecount + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHLINECOUNTCLASS, reader.State.currpage + "-" + reader.State.currline)); + sb.Append("S." + " "); + if (tag["index"] != "1") + sb.Append(reader.State.currpage + " / " + tag["index"]); + else + sb.Append(reader.State.currpage); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + } + + // This is NOT the beginning of the text, so we set a br, and then, linecount + else { + reader.State.currline = tag["index"]; + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br", ZHBREAKCLASS)); + + // Linecount + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHLINECOUNTCLASS, reader.State.currpage + "-" + reader.State.currline)); + + // Fall 1: Neue Seite + if (reader.State.currline == "1") { + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHPAGECLASS, "")); + sb.Append("S. " + reader.State.currpage); + } + + // Fall 2: Neue Zeile, teilbar durch 5 + else if (Int32.TryParse(tag["index"], out var _) && Int32.Parse(tag["index"]) % 5 == 0) { + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHPAGECLASS, "")); + sb.Append(tag["index"]); + } + + // Fall 3: Neue Zeile, nicht teilbar durch 5, deswegen versteckt + else { + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHPAGECLASS + " " + HIDDENZHLINECOUNT, "")); + sb.Append(tag["index"]); + } + + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + } + + // Marginalien + if(reader.State.Marginals != null) { + var margs = reader.State.Marginals.Where(x => x.Page == reader.State.currpage && x.Line == reader.State.currline); + if (margs != null && margs.Any()) + { + margs = margs.OrderBy(x => Int32.Parse(x.Index)); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, MARGINGALBOXCLASS)); + foreach (var marginal in margs) + { + // In Marginal, the Root-Element () is somehow parsed, + // so we don't need to enclose it in a seperate div. + var rd = reader.State.ReaderService.RequestStringReader(marginal.Element); + new HaWeb.HTMLParser.XMLHelper(reader.State, rd, sb, TraditionRules.OTagRules, null, TraditionRules.CTagRules, TraditionRules.TextRules, TraditionRules.WhitespaceRules); + new HaWeb.HTMLHelpers.LinkHelper(reader.State.Lib, rd, sb, false); + rd.Read(); + } + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + } + } + + // Line type=line if(tag["type"] == "line") sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, LINELINECLASS)); - } ), - ( ( x, _) => x.Name == "line" && !String.IsNullOrWhiteSpace(x["tab"]), (sb, tag, _) => { - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, LINEINDENTCLASS + tag["tab"])); - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); - })}; + + // Line tab= + if(!String.IsNullOrWhiteSpace(tag["tab"])) { + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, LINEINDENTCLASS + tag["tab"])); + sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); + } + } + )}; public static readonly WhitespaceFuncList WhitespaceRules = new WhitespaceFuncList() { ( ( _, _) => true, ( sb, txt, reader) => { @@ -178,67 +248,8 @@ public static class TraditionRules })}; - // Rules for the left sidebar - public static readonly TagFuncList STagRulesLineCount = new TagFuncList() { - ( ( x, _) => x.Name == "line", (sb, tag, reader) => { - if(reader.State.currline != "-1") { - if (reader.State.currpage == reader.State.oldpage) - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br", "", reader.State.currpage + "-" + reader.State.currline)); - else { - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br", "", reader.State.oldpage + "-" + reader.State.currline)); - reader.State.oldpage = reader.State.currpage; - } - } - else { - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHPAGECLASS + " " + FIRSTPAGECLASS, reader.State.currpage + "-" + tag["index"])); - sb.Append("S." + " "); - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); - if (tag["index"] != "1") - sb.Append(reader.State.currpage + " / " + tag["index"]); - else - sb.Append(reader.State.currpage); - reader.State.oldpage = reader.State.currpage; - } - }), - ( ( x, _) => x.Name == "line", (sb, tag, reader) => { - if(reader.State.currline != "-1" && Int32.TryParse(tag["index"], out var _) && Int32.Parse(tag["index"]) % 5 == 0) - sb.Append(tag["index"]); - }), - ( ( x, reader) => x.Name == "line" && x["index"] == "1" && reader.State.currline != "-1", (sb, tag, reader) => { - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, ZHPAGECLASS, "")); - sb.Append("S. " + reader.State.currpage); - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); - }), - ( ( x, _) => x.Name == "line", (sb, tag, reader) => { reader.State.currline = tag["index"]; } ), - ( ( x, _) => x.Name == "page", (sb, tag, reader) => { reader.State.currpage = tag["index"]; } ) - }; - // Rules for the right sidebar - public static readonly TagFuncList STagRulesMarginals = new TagFuncList() { - ( ( x, _) => x.Name == "line", (sb, tag, reader) => { - if(reader.State.currline != "-1" && reader.State.Marginals != null) { - var margs = reader.State.Marginals.Where(x => x.Page == reader.State.currpage && x.Line == reader.State.currline); - if (margs != null && margs.Any()) - { - margs = margs.OrderBy(x => Int32.Parse(x.Index)); - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, MARGINGALBOXCLASS, reader.State.commid.ToString())); - foreach (var marginal in margs) - { - var rd = reader.State.ReaderService.RequestStringReader(marginal.Element); - new HaWeb.HTMLParser.XMLHelper(reader.State, rd, sb, TraditionRules.OTagRules, null, TraditionRules.CTagRules, TraditionRules.TextRules, TraditionRules.WhitespaceRules); - new HaWeb.HTMLHelpers.LinkHelper(reader.State.Lib, rd, sb, false); - rd.Read(); - } - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br")); - } - else - sb.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br", EMPTYLINECLASS)); - } - reader.State.commid++; - })}; - public static readonly TagFuncList OTagRulesInitial = new TagFuncList() { ( ( x, _) => x.Name == "app", (sb, tag, reader) => { if (!reader.State.active_firstedit) @@ -247,29 +258,14 @@ public static class TraditionRules reader.State.active_firstedit = false; }), ( ( x, _) => x.Name == "ZHText", (sb, tag, reader) => { - reader.State.sb_tradition.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, "row zhtext")); - reader.State.sb_tradition.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, "trad-text col order-2 letterbox")); - reader.State.sb_trad_left = new StringBuilder(); - reader.State.sb_trad_right = new StringBuilder(); + reader.State.sb_tradition.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, TRADZHTEXTCLASS)); reader.State.currline = "-1"; reader.State.currpage = ""; reader.State.active_trad = true; - reader.State.sb_trad_left.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, "trad-linecount countbox nnumber d-none d-lg-block order-1")); - reader.State.sb_trad_right.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement(DEFAULTELEMENT, "commentColumn trad-comm col-4 d-none d-lg-block order-3")); - reader.State.sb_trad_right.Append(HaWeb.HTMLHelpers.TagHelpers.CreateElement("br", EMPTYLINECLASS)); - if (reader.State.rd_tradition != null) { - new HaWeb.HTMLParser.XMLHelper(reader.State, reader.State.rd_tradition, reader.State.sb_trad_left, null, TraditionRules.STagRulesLineCount); - new HaWeb.HTMLParser.XMLHelper(reader.State, reader.State.rd_tradition, reader.State.sb_trad_right, null, TraditionRules.STagRulesMarginals); - } })}; public static readonly TagFuncList CTagRulesInitial = new TagFuncList() { ( ( x, _) => x.Name == "ZHText", (sb, tag, reader) => { - reader.State.sb_tradition.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); - reader.State.sb_trad_left.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); - reader.State.sb_trad_right.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); - reader.State.sb_tradition.Append(reader.State.sb_trad_left.ToString()); - reader.State.sb_tradition.Append(reader.State.sb_trad_right.ToString()); reader.State.sb_tradition.Append(HaWeb.HTMLHelpers.TagHelpers.CreateEndElement(DEFAULTELEMENT)); reader.State.active_trad = false; })}; diff --git a/HaWeb/Settings/ParsingState/CommentState.cs b/HaWeb/Settings/ParsingState/CommentState.cs index bdb93ad..b281f50 100644 --- a/HaWeb/Settings/ParsingState/CommentState.cs +++ b/HaWeb/Settings/ParsingState/CommentState.cs @@ -1,6 +1,19 @@ namespace HaWeb.Settings.ParsingState; using System.Text; +public enum CommentType { + Comment, + Subcomment +} + public class CommentState : HaWeb.HTMLParser.IState { + internal string Category; + internal CommentType Type; + + public CommentState(string category, CommentType type) { + this.Category = category; + this.Type = type; + } + public void SetupState() { } } \ No newline at end of file diff --git a/HaWeb/Settings/ParsingState/LetterState.cs b/HaWeb/Settings/ParsingState/LetterState.cs index da7acb4..3f3823d 100644 --- a/HaWeb/Settings/ParsingState/LetterState.cs +++ b/HaWeb/Settings/ParsingState/LetterState.cs @@ -22,13 +22,9 @@ public class LetterState : HaWeb.HTMLParser.IState { internal bool active_skipwhitespace; internal string currline; internal string currpage; - internal string oldpage; - internal int commid; // Parsing-Combinations - internal StringBuilder sb_lettertext; // Hauptext - internal StringBuilder sb_linecount; // Linke Spalte (Zeilenzählung) - internal StringBuilder sb_marginals; // Rechte Spalte (Kommentare) + internal StringBuilder sb_lettertext; public LetterState(ILibrary lib, IReaderService readerService, Meta meta, IEnumerable? marginals) { @@ -43,14 +39,9 @@ public class LetterState : HaWeb.HTMLParser.IState { public void SetupState() { sb_lettertext = new StringBuilder(); - sb_linecount = new StringBuilder(); - sb_marginals = new StringBuilder(); - active_skipwhitespace = true; currline = "-1"; currpage = ""; - oldpage = ""; - commid = 1; // Initialize State if (Meta.ZH != null) { diff --git a/HaWeb/Settings/ParsingState/TraditionState.cs b/HaWeb/Settings/ParsingState/TraditionState.cs index efb38d1..b7baf5f 100644 --- a/HaWeb/Settings/ParsingState/TraditionState.cs +++ b/HaWeb/Settings/ParsingState/TraditionState.cs @@ -17,14 +17,10 @@ public class TraditionState : HaWeb.HTMLParser.IState { internal bool active_firstedit; internal string currline; internal string currpage; - internal string oldpage; - internal int commid; internal bool active_trad; internal StringBuilder sb_tradition; // Überlieferung internal StringBuilder sb_trad_zhtext; // Überlieferung, ZHText - internal StringBuilder sb_trad_left; // Überlieferung ZHText linke Spalte (zeilenzählung) - internal StringBuilder sb_trad_right; // Überlieferung ZHText rechte Spalte (Kommentare) internal IReader rd_tradition; @@ -39,8 +35,6 @@ public class TraditionState : HaWeb.HTMLParser.IState { public void SetupState() { sb_tradition = new StringBuilder(); sb_trad_zhtext = new StringBuilder(); - sb_trad_left = new StringBuilder(); - sb_trad_right = new StringBuilder(); active_trad = false; active_del = false; @@ -48,7 +42,5 @@ public class TraditionState : HaWeb.HTMLParser.IState { active_firstedit = true; currline = "-1"; currpage = ""; - oldpage = ""; - commid = 1; } } \ No newline at end of file diff --git a/HaWeb/Views/Briefe/Index.cshtml b/HaWeb/Views/Briefe/Index.cshtml index 226587e..3d7bc91 100644 --- a/HaWeb/Views/Briefe/Index.cshtml +++ b/HaWeb/Views/Briefe/Index.cshtml @@ -2,16 +2,39 @@
@await Html.PartialAsync("/Views/Shared/_LetterHead.cshtml", Model.MetaData) +
+
+ Brieftext + Überlieferung & Textkritik + PDF +
+ + @if (Model.MetaData.Next != null || Model.MetaData.Prev != null) { +
+ @if (Model.MetaData.Prev != null) { + + @Model.MetaData.Prev.Value.Item1.Meta.Autopsic ◀ + + } +
+ HKB +
+ @if (Model.MetaData.Next != null) { + + ▶ @Model.MetaData.Next.Value.Item1.Meta.Autopsic + + } +
+ } +
-@if (Model.ParsedText != null) { - @Html.Raw(@Model.ParsedText) -} +
+
+ @if (Model.ParsedText != null) { + @Html.Raw(@Model.ParsedText) + } +
+
-@if (Model.ParsedLineCount != null) { - @Html.Raw(@Model.ParsedLineCount) -} -@if (Model.ParsedMarginals != null) { - @Html.Raw(@Model.ParsedMarginals) -} diff --git a/HaWeb/Views/Register/Index.cshtml b/HaWeb/Views/Register/Index.cshtml index f635bd8..45d140a 100644 --- a/HaWeb/Views/Register/Index.cshtml +++ b/HaWeb/Views/Register/Index.cshtml @@ -59,4 +59,16 @@ } - \ No newline at end of file + + + diff --git a/HaWeb/Views/Shared/_LetterHead.cshtml b/HaWeb/Views/Shared/_LetterHead.cshtml index a5374be..97f7f6d 100644 --- a/HaWeb/Views/Shared/_LetterHead.cshtml +++ b/HaWeb/Views/Shared/_LetterHead.cshtml @@ -2,19 +2,18 @@
- @Model.Meta.Autopsic +
+ @Model.Meta.Autopsic +
-
+
@Model.Meta.Date
-
- @Model.ParsedSenders -> @Model.ParsedReceivers +
+ @Model.ParsedSenders → @Model.ParsedReceivers
-
- -
\ No newline at end of file diff --git a/HaWeb/tailwind.config.js b/HaWeb/tailwind.config.js index 39c72df..6501724 100644 --- a/HaWeb/tailwind.config.js +++ b/HaWeb/tailwind.config.js @@ -2,7 +2,7 @@ module.exports = { content: [ "./wwwroot/**/*.{html,js}", "./Views/**/*.{cshtml,html,js}", - "./Settings/CSSClasses.cs" + "./Settings/CSSClassesSettings.cs" ], theme: { fontFamily: { diff --git a/HaWeb/wwwroot/css/output.css b/HaWeb/wwwroot/css/output.css index bfe69a1..a8deafc 100644 --- a/HaWeb/wwwroot/css/output.css +++ b/HaWeb/wwwroot/css/output.css @@ -520,12 +520,12 @@ body { margin-right: 1.5rem; display: none; --tw-text-opacity: 1; - color: rgb(55 65 81 / var(--tw-text-opacity)); + color: rgb(51 65 85 / var(--tw-text-opacity)); } .ha-topnav a:hover { --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); + color: rgb(15 23 42 / var(--tw-text-opacity)); } @media (min-width: 1190px) { @@ -567,7 +567,7 @@ body { min-width: 130px; border-bottom-width: 1px; --tw-border-opacity: 1; - border-color: rgb(156 163 175 / var(--tw-border-opacity)); + border-color: rgb(148 163 184 / var(--tw-border-opacity)); --tw-bg-opacity: 1; background-color: rgb(248 250 252 / var(--tw-bg-opacity)); padding-top: 0.25rem; @@ -597,7 +597,7 @@ body { .ha-topnav-dropdown .ha-topnav-dropdown-content a:hover { --tw-bg-opacity: 1; - background-color: rgb(243 244 246 / var(--tw-bg-opacity)); + background-color: rgb(241 245 249 / var(--tw-bg-opacity)); } .ha-footer { @@ -839,12 +839,12 @@ body { padding-left: 0.25rem; padding-right: 0.25rem; --tw-text-opacity: 1; - color: rgb(55 65 81 / var(--tw-text-opacity)); + color: rgb(51 65 85 / var(--tw-text-opacity)); } .ha-register .ha-register-head .ha-register-nav a:hover { --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); + color: rgb(15 23 42 / var(--tw-text-opacity)); } @media (min-width: 1024px) { @@ -962,7 +962,7 @@ body { font-weight: 400; line-height: 1.375; --tw-text-opacity: 1; - color: rgb(75 85 99 / var(--tw-text-opacity)); + color: rgb(71 85 105 / var(--tw-text-opacity)); font-variant-caps: all-petite-caps; } @@ -976,7 +976,7 @@ body { .ha-register .ha-register-body .ha-comment .ha-commenthead .ha-letlinks .ha-hkb { display: inline; --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); + color: rgb(15 23 42 / var(--tw-text-opacity)); } @media (min-width: 1190px) { @@ -989,6 +989,14 @@ body { } } +.ha-register .ha-bibel .ha-register-body .ha-commenthead .ha-lemma a { + padding-left: 0.5rem; +} + +.ha-register .ha-bibel .ha-register-body .ha-commenthead .ha-lemma svg { + display: inline; +} + .ha-register .ha-neuzeit .ha-register-body .ha-commenthead .ha-letlinks, .ha-register .ha-forschung .ha-register-body .ha-commenthead .ha-letlinks { padding-left: 0.5rem; } @@ -1016,17 +1024,73 @@ body { .ha-register .ha-register-body .ha-comment .ha-commenthead .ha-letlinks a:hover { --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); + color: rgb(15 23 42 / var(--tw-text-opacity)); +} + +/* Classes for MetaData View */ + +.ha-letterhead { + display: flex; + flex-direction: row; +} + +.ha-letterhead .ha-letternumber { + margin-right: 1rem; + display: flex; + font-size: 3rem; + line-height: 1; +} + +@media (min-width: 1190px) { + .ha-letterhead .ha-letternumber { + margin-right: 1.5rem; + font-size: 3.75rem; + line-height: 1; + font-weight: 400; + } +} + +.ha-letterhead .ha-letternumber .ha-letternumberinline { + display: inline; + vertical-align: middle; + line-height: 1; +} + +.ha-letterhead .ha-metadata { + display: flex; + flex-shrink: 0; + flex-grow: 1; + align-self: flex-end; +} + +.ha-letterhead .ha-metadata .ha-metadatarows { + display: flex; + flex-direction: column; +} + +.ha-letterhead .ha-metadata .ha-metadatarows .ha-metadatadate { + display: flex; + line-height: 1.375; + font-variant-numeric: oldstyle-nums; + font-variant-caps: petite-caps; +} + +.ha-letterhead .ha-metadata .ha-metadatarows .hametadatapersons { + display: flex; + line-height: 1.375; } /* Classes for Letter View */ .ha-letterheader { + border-bottom-width: 2px; + --tw-border-opacity: 1; + border-color: rgb(226 232 240 / var(--tw-border-opacity)); --tw-bg-opacity: 1; background-color: rgb(248 250 252 / var(--tw-bg-opacity)); - padding-left: 2.25rem; - padding-right: 2.25rem; - padding-top: 2.25rem; + padding-left: 1.5rem; + padding-right: 1.5rem; + padding-top: 2rem; } @media (min-width: 1024px) { @@ -1037,10 +1101,225 @@ body { } } -/* Classes for MetaData View */ +.ha-letterheader .ha-letterheadernav { + margin-top: 1.75rem; + display: flex; + flex-grow: 1; +} + +.ha-letterheader .ha-lettertabs { + display: flex; + flex-grow: 1; +} + +.ha-letterheader .ha-lettertabs a { + margin-right: 0.25rem; + display: inline-block; + padding-left: 0.25rem; + padding-right: 0.25rem; + --tw-text-opacity: 1; + color: rgb(51 65 85 / var(--tw-text-opacity)); +} + +.ha-letterheader .ha-lettertabs a:hover { + --tw-text-opacity: 1; + color: rgb(15 23 42 / var(--tw-text-opacity)); +} + +@media (min-width: 1024px) { + .ha-letterheader .ha-lettertabs a { + margin-right: 0.75rem; + } +} + +.ha-letterheader .ha-lettertabs a.active { + border-bottom-width: 2px; + --tw-border-opacity: 1; + border-color: rgb(226 232 240 / var(--tw-border-opacity)); + --tw-text-opacity: 1; + color: rgb(216 0 0 / var(--tw-text-opacity)); +} + +.ha-letterheader .ha-lettertabs a:first { + padding-left: 0px; +} + +.ha-letterheader .ha-lettermetalinks { + align-self: flex-end; + border-bottom-width: 2px; + --tw-border-opacity: 1; + border-color: rgb(226 232 240 / var(--tw-border-opacity)); +} + +.ha-letterheader .ha-lettermetalinks a { + align-self: flex-end; + --tw-text-opacity: 1; + color: rgb(51 65 85 / var(--tw-text-opacity)); + font-variant-caps: petite-caps; +} + +.ha-letterheader .ha-lettermetalinks a:hover { + --tw-text-opacity: 1; + color: rgb(15 23 42 / var(--tw-text-opacity)); +} + +.ha-letterheader .ha-lettermetalinks .ha-hkb { + display: inline-block; + font-variant-caps: all-petite-caps; +} + +.ha-letterbody { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + --tw-bg-opacity: 1; + background-color: rgb(248 250 252 / var(--tw-bg-opacity)); +} + +.ha-lettertext { + position: relative; + margin-left: 3rem; + flex-shrink: 0; + border-left-width: 2px; + --tw-bg-opacity: 1; + background-color: rgb(248 250 252 / var(--tw-bg-opacity)); + padding-left: 1rem; + padding-right: 1rem; + padding-top: 1rem; + padding-bottom: 1.75rem; + font-family: Libertine, serif; + line-height: 1.48; +} + +.ha-lettertext div { + display: inline; +} + +.ha-lettertext .ha-linecount .ha-firstline { + border-radius: 0.25rem; + --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); +} + +.ha-lettertext .ha-linecount { + position: absolute; + left: -8.6rem; + margin-top: 0.25rem; + width: 8rem; + text-align: right; + font-family: Biolinum, sans-serif; + font-size: 0.75rem; + line-height: 1rem; + --tw-numeric-figure: oldstyle-nums; + font-variant-numeric: var(--tw-ordinal) var(--tw-slashed-zero) var(--tw-numeric-figure) var(--tw-numeric-spacing) var(--tw-numeric-fraction); +} + +.ha-lettertext .ha-linecount .ha-zhpage, .ha-lettertext .ha-linecount .ha-zhline { + --tw-bg-opacity: 1; + background-color: rgb(248 250 252 / var(--tw-bg-opacity)); + padding-left: 0.25rem; + padding-right: 0.25rem; + padding-bottom: 0.25rem; + font-variant-numeric: normal; + font-variant-caps: all-petite-caps; +} + +.ha-lettertext .ha-linecount .ha-hiddenlinecount { + display: none; +} + +.ha-lettertext .ha-marginalbox { + position: absolute; + right: -28rem; + margin-right: 1rem; + margin-top: 0.25rem; + display: flex; + width: 24rem; + flex-wrap: wrap; + border-radius: 0.125rem; + border-left-width: 2px; + --tw-border-opacity: 1; + border-color: rgb(203 213 225 / var(--tw-border-opacity)); + --tw-bg-opacity: 1; + background-color: rgb(248 250 252 / var(--tw-bg-opacity)); + padding-left: 0.5rem; + padding-right: 0.25rem; + font-family: Biolinum, sans-serif; + font-size: 0.875rem; + line-height: 1.25rem; + line-height: 1.25; + -webkit-hyphens: auto; + -ms-hyphens: auto; + hyphens: auto; +} + +.ha-lettertext .ha-marginalbox .ha-marginal { + display: inline-block; +} + +.ha-lettertext .ha-marginalbox.ha-expanded-box { + padding-bottom: 0.25rem; +} + +.ha-lettertext .ha-marginalbox .ha-marginal:first { +} + +.ha-lettertext .ha-marginalbox .ha-marginal { + padding-right: 1.5rem; +} + +.ha-lettertext .ha-marginalbox .ha-marginal a { + -webkit-text-decoration-line: underline; + text-decoration-line: underline; + -webkit-text-decoration-style: dotted; + text-decoration-style: dotted; +} + +.ha-lettertext .ha-marginalbox .ha-marginal a:hover { + --tw-text-opacity: 1; + color: rgb(15 23 42 / var(--tw-text-opacity)); + -webkit-text-decoration-style: solid; + text-decoration-style: solid; +} + +.ha-lettertext .ha-btn-collapsed-box { + position: absolute; + right: -2.5rem; + margin-top: 2px; + display: none; + cursor: pointer; + line-height: 1; + --tw-text-opacity: 1; + color: rgb(71 85 105 / var(--tw-text-opacity)); +} + +.ha-lettertext .ha-btn-collapsed-box:hover { + --tw-text-opacity: 1; + color: rgb(15 23 42 / var(--tw-text-opacity)); +} + +@media (min-width: 1190px) { + .ha-lettertext .ha-btn-collapsed-box { + display: block; + } +} + +/* Classes from the General parser */ /* Classes from .NET */ +.ha-bzg { + font-family: Libertine, serif; + font-size: 0.75rem; + line-height: 1rem; + font-weight: 600; +} + +.ha-text { + display: inline; +} + .ha-title { display: inline; font-style: italic; @@ -1054,44 +1333,107 @@ body { font-family: Libertine, serif; } -.ha-aq { +.ha-aq, .ha-aq * { font-family: Biolinum, sans-serif; } -.ha-ul { +.ha-ul + .ha-ul * { -webkit-text-decoration-line: underline; text-decoration-line: underline; } -.ha-del { +.ha-del, .ha-del * { -webkit-text-decoration-line: line-through; text-decoration-line: line-through; } -.ha-hand { +.ha-hand, .ha-hand * { font-family: Playfair, serif; font-size: 0.9rem; } -.ha-added { +.ha-added, .ha-added * { --tw-bg-opacity: 1; - background-color: rgb(209 213 219 / var(--tw-bg-opacity)); + background-color: rgb(203 213 225 / var(--tw-bg-opacity)); padding-left: 0.25rem; padding-right: 0.25rem; } -.ha-note { +.ha-note, .ha-note * { font-style: italic; --tw-text-opacity: 1; - color: rgb(75 85 99 / var(--tw-text-opacity)); + color: rgb(51 65 85 / var(--tw-text-opacity)); } -.ha-sup { +.ha-sup, .ha-sup * { position: relative; - top: -0.5em; + top: -0.3em; font-size: 80%; } +/* TODO: Something dooesnt work here */ + +.ha-super { + position: relative; + top: -0.3em; + vertical-align: baseline; + font-size: 0.75rem; + line-height: 1rem; + line-height: 1; + font-variant-numeric: normal; +} + +.ha-sub { + position: relative; + bottom: -0.25em; + vertical-align: baseline; + font-size: 0.75rem; + line-height: 1rem; + line-height: 1; +} + +.ha-ful, .ha-ful * { + display: inline; + border-bottom-width: 1px; + --tw-border-opacity: 1; + border-color: rgb(0 0 0 / var(--tw-border-opacity)); + padding-bottom: 2px; +} + +.ha-dul, .ha-dul * { + -webkit-text-decoration-line: underline; + text-decoration-line: underline; + -webkit-text-decoration-style: double; + text-decoration-style: double; +} + +.ha-tul, .ha-tul * { + border-bottom-width: 3px; + border-style: double; + -webkit-text-decoration-line: underline; + text-decoration-line: underline; +} + +.ha-alignright { + position: absolute; + right: 0.25rem; +} + +.ha-aligncenter { + position: absolute; + right: 0px; + left: 0px; + min-width: 33%; + white-space: nowrap; + text-align: center; +} + +.ha-sal { + margin-left: 1.5rem; + display: inline-block; +} + /* Classes from Javascript */ .active { @@ -1232,12 +1574,12 @@ body { display: none; cursor: pointer; --tw-text-opacity: 1; - color: rgb(75 85 99 / var(--tw-text-opacity)); + color: rgb(71 85 105 / var(--tw-text-opacity)); } .ha-register .ha-btn-collapsed-box:hover { --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); + color: rgb(15 23 42 / var(--tw-text-opacity)); } @media (min-width: 1190px) { @@ -1246,12 +1588,12 @@ body { } } -.ha-register .ha-neuzeit .ha-register-body .ha-commenthead .ha-collapsed-box, .ha-register .ha-forschung .ha-register-body .ha-commenthead .ha-collapsed-box { +.ha-collapsed-box { z-index: 0; overflow: hidden; } -.ha-register .ha-neuzeit .ha-register-body .ha-commenthead .ha-expanded-box, .ha-register .ha-forschung .ha-register-body .ha-commenthead .ha-expanded-box { +.ha-expanded-box { z-index: 1000; height: auto !important; max-height: 100vh !important; @@ -1269,6 +1611,10 @@ body { pointer-events: none; } +.static { + position: static; +} + .sticky { position: -webkit-sticky; position: sticky; @@ -1571,6 +1917,42 @@ body { font-style: normal; } +.ha-lettertext .ha-marginalbox .ha-marginal::after { + content: ''; +} + +.ha-lettertext .ha-marginalbox .ha-marginal:last-of-type::after { + content: ''; +} + +.ha-nr::before { + content: ' \200E\25E6'; +} + +.ha-nr::after { + content: ' \200E\25E6'; +} + +.ha-added::before { + content: ''; +} + +.ha-added::after { + content: ''; +} + +.ha-note::before { + content: ''; +} + +.ha-note::after { + content: ''; +} + +.ha-bzg::after { + content: ']'; +} + * { -webkit-text-decoration-skip-ink: all; text-decoration-skip-ink: all; @@ -1585,6 +1967,52 @@ body { list-style-type:circle; } */ +.diagdel { + text-decoration: none; + position: relative; + display: inline-block; +} + +.diagdel::before, .diagdel::after { + content: ''; + width: 100%; + height: 0%; + position: absolute; + right: 0; + bottom: 1.5ex; +} + +.diagdel::before { + border-bottom: 1px solid black; + transform: skewY(-36deg); +} + +.del .del, +.del .del * { + -moz-text-decoration-style: double; + -webkit-text-decoration-style: double !important; + text-decoration-thickness: 1px; + text-decoration-style: double; +} + +.del .del .ul, +.ul .del .del, +.del .ul .del { + text-decoration: line-through underline; + -moz-text-decoration-style: double; + -webkit-text-decoration-style: double !important; + text-decoration-thickness: 1px; + text-decoration-style: double; +} + +.del .ul, +.ul .del { + text-decoration: line-through underline; + text-decoration-thickness: 1px; + text-decoration-skip-ink: auto; + -webkit-text-decoration-skip-ink: auto; +} + .downshadow-sm { box-shadow: 5px 6px 5px -7px rgba(0,0,0,0.79); } @@ -1609,10 +2037,14 @@ body { font-variant-numeric: normal; } -.caps-small { +.caps-allpetite { font-variant-caps: all-petite-caps; } +.caps-petite { + font-variant-caps: petite-caps; +} + .caps-normal { font-variant-caps: normal; } @@ -1659,6 +2091,579 @@ body { font-weight: 900; } +/* Classes for indents */ + +.ha-indent-1 { + padding-left: 1rem; + background-color: var(--hamannWeiss); +} + +.ha-indent-2 { + padding-left: 2rem; + background-color: var(--hamannWeiss); +} + +.ha-indent-3 { + padding-left: 3rem; + background-color: var(--hamannWeiss); +} + +.ha-indent-4 { + padding-left: 4rem; + background-color: var(--hamannWeiss); +} + +.ha-indent-5 { + padding-left: 5rem; + background-color: var(--hamannWeiss); +} + +.ha-indent-6 { + padding-left: 11rem; + background-color: var(--hamannWeiss); +} + +.ha-indent-7 { + padding-left: 16rem; + background-color: var(--hamannWeiss); +} + +/* Classes for tables */ + +.ha-table { + overflow: hidden; + white-space: nowrap; + font-variant-numeric: tabular-nums !important; +} + +.ha-hatab-0-2 { + display: inline; + position: static; + min-width: 50%; +} + +.ha-hatab-1-2 { + display: inline-block; + position: absolute; + left: 50%; + min-width: 50%; +} + +.ha-hatab-0-3 { + display: inline; + position: static; + min-width: 33.333%; +} + +.ha-hatab-1-3 { + display: inline-block; + position: absolute; + left: 33%; + min-width: 33.333%; +} + +.ha-hatab-2-3 { + display: inline-block; + position: absolute; + left: 66%; + min-width: 33.333%; +} + +.ha-hatab-0-4 { + display: inline; + position: static; + min-width: 25%; +} + +.ha-hatab-1-4 { + display: inline-block; + position: absolute; + left: 25%; + min-width: 25%; +} + +.ha-hatab-2-4 { + display: inline-block; + position: absolute; + left: 50%; + min-width: 25%; +} + +.ha-hatab-3-4 { + display: inline-block; + position: absolute; + left: 75%; + min-width: 25%; +} + +.ha-hatab-0-5 { + display: inline; + position: static; + min-width: 20%; +} + +.ha-hatab-1-5 { + display: inline-block; + position: absolute; + left: 20%; + min-width: 20%; +} + +.ha-hatab-2-5 { + display: inline-block; + position: absolute; + left: 40%; + min-width: 20%; +} + +.ha-hatab-3-5 { + display: inline-block; + position: absolute; + left: 60%; + min-width: 20%; +} + +.ha-hatab-4-5 { + display: inline-block; + position: absolute; + left: 80%; + min-width: 20%; +} + +.ha-hatab-0-6 { + display: inline; + position: static; + min-width: 16.667%; +} + +.ha-hatab-1-6 { + display: inline-block; + position: absolute; + left: 16.667%; + min-width: 16.667%; +} + +.ha-hatab-2-6 { + display: inline-block; + position: absolute; + left: 33.333%; + min-width: 16.667%; +} + +.ha-hatab-3-6 { + display: inline-block; + position: absolute; + left: 50%; + min-width: 16.667%; +} + +.ha-hatab-4-6 { + display: inline-block; + position: absolute; + left: 66.667%; + min-width: 16.667%; +} + +.ha-hatab-5-6 { + display: inline-block; + position: absolute; + left: 83.333%; + min-width: 16.667%; +} + +.ha-hatab-0-7 { + display: inline; + position: static; + min-width: 14.286%; +} + +.ha-hatab-1-7 { + display: inline-block; + position: absolute; + left: 14.286%; + min-width: 14.286%; +} + +.ha-hatab-2-7 { + display: inline-block; + position: absolute; + left: 28.571%; + min-width: 14.286%; +} + +.ha-hatab-3-7 { + display: inline-block; + position: absolute; + left: 42.857%; + min-width: 14.286%; +} + +.ha-hatab-4-7 { + display: inline-block; + position: absolute; + left: 57.143%; + min-width: 14.286%; +} + +.ha-hatab-5-7 { + display: inline-block; + position: absolute; + left: 71.429%; + min-width: 14.286%; +} + +.ha-hatab-6-7 { + display: inline-block; + position: absolute; + left: 85.714%; + min-width: 14.286%; +} + +.ha-hatab-0-8 { + display: inline; + position: static; + min-width: 12.5%; +} + +.ha-hatab-1-8 { + display: inline-block; + position: absolute; + left: 12.5%; + min-width: 12.5%; +} + +.ha-hatab-2-8 { + display: inline-block; + position: absolute; + left: 25%; + min-width: 12.5%; +} + +.ha-hatab-3-8 { + display: inline-block; + position: absolute; + left: 37.5%; + min-width: 12.5%; +} + +.ha-hatab-4-8 { + display: inline-block; + position: absolute; + left: 50%; + min-width: 12.5%; +} + +.ha-hatab-5-8 { + display: inline-block; + position: absolute; + left: 62.5%; + min-width: 12.5%; +} + +.ha-hatab-6-8 { + display: inline-block; + position: absolute; + left: 75%; + min-width: 12.5%; +} + +.ha-hatab-7-8 { + display: inline-block; + position: absolute; + left: 87.5%; + min-width: 12.5%; +} + +.ha-hatab-0-9 { + display: inline; + position: static; + min-width: 11.111%; +} + +.ha-hatab-1-9 { + display: inline-block; + position: absolute; + left: 11.111%; + min-width: 11.111%; +} + +.ha-hatab-2-9 { + display: inline-block; + position: absolute; + left: 22.222%; + min-width: 11.111%; +} + +.ha-hatab-3-9 { + display: inline-block; + position: absolute; + left: 33.333%; + min-width: 11.111%; +} + +.ha-hatab-4-9 { + display: inline-block; + position: absolute; + left: 44.444%; + min-width: 11.111%; +} + +.ha-hatab-5-9 { + display: inline-block; + position: absolute; + left: 55.555%; + min-width: 11.111%; +} + +.ha-hatab-6-9 { + display: inline-block; + position: absolute; + left: 66.666%; + min-width: 11.111%; +} + +.ha-hatab-7-9 { + display: inline-block; + position: absolute; + left: 77.777%; + min-width: 11.111%; +} + +.ha-hatab-8-9 { + display: inline-block; + position: absolute; + left: 88.888%; + min-width: 11.111%; +} + +.ha-hatab-0-10 { + display: inline-block; + position: absolute; + min-width: 10%; +} + +.ha-hatab-1-10 { + display: inline-block; + position: absolute; + left: 10%; + min-width: 10%; +} + +.ha-hatab-2-10 { + display: inline-block; + position: absolute; + left: 20%; + min-width: 10%; +} + +.ha-hatab-3-10 { + display: inline-block; + position: absolute; + left: 30%; + min-width: 10%; +} + +.ha-hatab-4-10 { + display: inline-block; + position: absolute; + left: 40%; + min-width: 10%; +} + +.ha-hatab-5-10 { + display: inline-block; + position: absolute; + left: 50%; + min-width: 10%; +} + +.ha-hatab-6-10 { + display: inline-block; + position: absolute; + left: 60%; + min-width: 10%; +} + +.ha-hatab-7-10 { + display: inline-block; + position: absolute; + left: 70%; + min-width: 10%; +} + +.ha-hatab-8-10 { + display: inline-block; + position: absolute; + left: 80%; + min-width: 10%; +} + +.ha-hatab-9-10 { + display: inline-block; + position: absolute; + left: 90%; + min-width: 10%; +} + +.ha-hatab-0-11 { + display: inline-block; + position: absolute; + min-width: 9.091%; +} + +.ha-hatab-1-11 { + display: inline-block; + position: absolute; + left: 9.091%; + min-width: 9.091%; +} + +.ha-hatab-2-11 { + display: inline-block; + position: absolute; + left: 18.182%; + min-width: 9.091%; +} + +.ha-hatab-3-11 { + display: inline-block; + position: absolute; + left: 27.273%; + min-width: 9.091%; +} + +.ha-hatab-4-11 { + display: inline-block; + position: absolute; + left: 36.364%; + min-width: 9.091%; +} + +.ha-hatab-5-11 { + display: inline-block; + position: absolute; + left: 45.455%; + min-width: 9.091%; +} + +.ha-hatab-6-11 { + display: inline-block; + position: absolute; + left: 54.545%; + min-width: 9.091%; +} + +.ha-hatab-7-11 { + display: inline-block; + position: absolute; + left: 63.636%; + min-width: 9.091%; +} + +.ha-hatab-8-11 { + display: inline-block; + position: absolute; + left: 72.727%; + min-width: 9.091%; +} + +.ha-hatab-9-11 { + display: inline-block; + position: absolute; + left: 81.818%; + min-width: 9.091%; +} + +.ha-hatab-10-11 { + display: inline-block; + position: absolute; + left: 90.909%; + min-width: 9.091%; +} + +.ha-hatab-0-12 { + display: inline-block; + position: absolute; + min-width: 8.333%; +} + +.ha-hatab-1-12 { + display: inline-block; + position: absolute; + left: 8.333%; + min-width: 8.333%; +} + +.ha-hatab-2-12 { + display: inline-block; + position: absolute; + left: 16.666%; + min-width: 8.333%; +} + +.ha-hatab-3-12 { + display: inline-block; + position: absolute; + left: 25%; + min-width: 8.333%; +} + +.ha-hatab-4-12 { + display: inline-block; + position: absolute; + left: 33.333%; + min-width: 8.333%; +} + +.ha-hatab-5-12 { + display: inline-block; + position: absolute; + left: 41.666%; + min-width: 8.333%; +} + +.ha-hatab-6-12 { + display: inline-block; + position: absolute; + left: 50%; + min-width: 8.333%; +} + +.ha-hatab-7-12 { + display: inline-block; + position: absolute; + left: 58.333%; + min-width: 8.333%; +} + +.ha-hatab-8-12 { + display: inline-block; + position: absolute; + left: 66.666%; + min-width: 8.333%; +} + +.ha-hatab-9-12 { + display: inline-block; + position: absolute; + left: 75%; + min-width: 8.333%; +} + +.ha-hatab-10-12 { + display: inline-block; + position: absolute; + left: 83.333%; + min-width: 8.333%; +} + +.ha-hatab-11-12 { + display: inline-block; + position: absolute; + left: 91.666%; + min-width: 8.333%; +} + /* Not possible otherwise, overwrites javascript set style values, which cant be defined before render */ /* @media (max-width: 1190px) { diff --git a/HaWeb/wwwroot/css/site.css b/HaWeb/wwwroot/css/site.css index 3b52175..41a4ffe 100644 --- a/HaWeb/wwwroot/css/site.css +++ b/HaWeb/wwwroot/css/site.css @@ -90,7 +90,7 @@ } .ha-topnav a { - @apply hidden text-gray-700 hover:text-gray-900 desktop:inline-block mr-6 2xl:mr-7 + @apply hidden text-slate-700 hover:text-slate-900 desktop:inline-block mr-6 2xl:mr-7 } .ha-topnav a:last-child { @@ -106,7 +106,7 @@ } .ha-topnav-dropdown .ha-topnav-dropdown-content { - @apply hidden mr-6 pt-1 right-0 desktop:absolute bg-slate-50 min-w-[130px] shadow-md border-gray-400 border-b z-50 + @apply hidden mr-6 pt-1 right-0 desktop:absolute bg-slate-50 min-w-[130px] shadow-md border-slate-400 border-b z-50 } .ha-topnav-dropdown .ha-topnav-dropdown-content a { @@ -118,7 +118,7 @@ } .ha-topnav-dropdown .ha-topnav-dropdown-content a:hover { - @apply bg-gray-100 + @apply bg-slate-100 } .ha-footer { @@ -215,7 +215,7 @@ } .ha-register .ha-register-head .ha-register-nav a { - @apply inline-block px-1 mr-1 md:mr-3 text-gray-700 hover:text-gray-900 + @apply inline-block px-1 mr-1 md:mr-3 text-slate-700 hover:text-slate-900 } .ha-register .ha-register-head .ha-register-nav a:first { @@ -271,11 +271,11 @@ } .ha-register .ha-register-body .ha-comment .ha-commenthead .ha-letlinks { - @apply inline-block font-normal text-xs md:text-sm leading-snug font-sans text-gray-600 caps-small ml-2 + @apply inline-block font-normal text-xs md:text-sm leading-snug font-sans text-slate-600 caps-allpetite ml-2 } .ha-register .ha-register-body .ha-comment .ha-commenthead .ha-letlinks .ha-hkb { - @apply inline text-gray-900 + @apply inline text-slate-900 } .ha-register .ha-neuzeit .ha-register-body .ha-headcomment .ha-commenthead .ha-letlinks, @@ -288,28 +288,165 @@ @apply desktop:left-[46rem] } + .ha-register .ha-bibel .ha-register-body .ha-commenthead .ha-lemma a { + @apply pl-2 + } + + .ha-register .ha-bibel .ha-register-body .ha-commenthead .ha-lemma svg { + @apply inline + } + .ha-register .ha-neuzeit .ha-register-body .ha-commenthead .ha-letlinks, .ha-register .ha-forschung .ha-register-body .ha-commenthead .ha-letlinks { @apply desktop:indent-0 desktop:top-0 desktop:w-80 desktop:block desktop:bg-slate-50 desktop:absolute desktop:border-l-2 desktop:border-t-[3px] desktop:border-t-slate-50 pl-2 } .ha-register .ha-register-body .ha-comment .ha-commenthead .ha-letlinks a { - @apply hover:text-gray-900 no-underline + @apply hover:text-slate-900 no-underline + } + +/* Classes for MetaData View */ + + .ha-letterhead { + @apply flex flex-row + } + + .ha-letterhead .ha-letternumber { + @apply flex text-5xl desktop:font-normal desktop:text-6xl mr-4 desktop:mr-6 + } + + .ha-letterhead .ha-letternumber .ha-letternumberinline { + @apply inline align-middle leading-none + } + + .ha-letterhead .ha-metadata { + @apply flex self-end grow shrink-0 + } + + .ha-letterhead .ha-metadata .ha-metadatarows { + @apply flex flex-col + } + + .ha-letterhead .ha-metadata .ha-metadatarows .ha-metadatadate { + @apply flex caps-petite leading-snug numeric-mediaeval + } + + .ha-letterhead .ha-metadata .ha-metadatarows .hametadatapersons { + @apply flex leading-snug } /* Classes for Letter View */ .ha-letterheader { - @apply bg-slate-50 pt-9 md:pt-12 px-9 md:px-16 + @apply bg-slate-50 pt-8 md:pt-12 px-6 md:px-16 border-slate-200 border-b-2 } -/* Classes for MetaData View */ - + .ha-letterheader .ha-letterheadernav { + @apply mt-7 flex grow + } + + .ha-letterheader .ha-lettertabs { + @apply flex grow + } + + .ha-letterheader .ha-lettertabs a { + @apply inline-block px-1 mr-1 md:mr-3 text-slate-700 hover:text-slate-900 + } + + .ha-letterheader .ha-lettertabs a.active { + @apply border-b-2 border-slate-200 text-hamannHighlight + } + + .ha-letterheader .ha-lettertabs a:first { + @apply pl-0 + } + + .ha-letterheader .ha-lettermetalinks { + @apply self-end border-b-2 border-slate-200 + } + + .ha-letterheader .ha-lettermetalinks a { + @apply self-end caps-petite text-slate-700 hover:text-slate-900 + } + + .ha-letterheader .ha-lettermetalinks .ha-hkb { + @apply inline-block caps-allpetite + } + + .ha-letterbody { + @apply flex flex-row flex-nowrap bg-slate-50 + } + + .ha-lettertext { + @apply shrink-0 border-l-2 ml-12 px-4 pt-4 relative font-serif leading-[1.48] pb-7 bg-slate-50 + } + + .ha-rightsidebar { + @apply shrink-0 grow basis-1/3 + } + + .ha-lettertext div { + @apply inline + } + + .ha-lettertext .ha-linecount .ha-firstline { + @apply shadow rounded + } + + .ha-lettertext .ha-linecount { + @apply absolute -left-[8.6rem] text-right w-32 text-xs oldstyle-nums mt-1 font-sans + } + + .ha-lettertext .ha-linecount .ha-zhpage, + .ha-lettertext .ha-linecount .ha-zhline { + @apply px-1 pb-1 bg-slate-50 caps-allpetite normal-nums + } + + .ha-lettertext .ha-linecount .ha-hiddenlinecount { + @apply hidden + } + + .ha-lettertext .ha-marginalbox { + @apply absolute -right-[28rem] w-[24rem] text-sm border-l-2 border-slate-300 leading-tight pl-2 bg-slate-50 mr-4 pr-1 hyphenate mt-1 rounded-sm font-sans flex flex-wrap + } + + .ha-lettertext .ha-marginalbox .ha-marginal { + @apply inline-block + } + + .ha-lettertext .ha-marginalbox.ha-expanded-box { + @apply pb-1 + } + + .ha-lettertext .ha-marginalbox .ha-marginal:first { + + } + + .ha-lettertext .ha-marginalbox .ha-marginal { + @apply pr-6 + } + + .ha-lettertext .ha-marginalbox .ha-marginal a { + @apply underline decoration-dotted hover:decoration-solid hover:text-slate-900 + } + + .ha-lettertext .ha-btn-collapsed-box { + @apply hidden desktop:block absolute text-slate-600 hover:text-slate-900 cursor-pointer -right-[2.5rem] leading-none mt-[2px] + } +/* Classes from the General parser */ /* Classes from .NET */ + .ha-bzg { + @apply font-serif text-xs font-semibold + } + + .ha-text { + @apply inline + } + .ha-title { @apply inline italic } @@ -322,32 +459,83 @@ @apply font-serif } - .ha-aq { + .ha-aq, + .ha-aq * { @apply font-sans } - .ha-ul { + .ha-ul + .ha-ul * { @apply underline } - .ha-del { + .ha-del, + .ha-del * { @apply line-through } - .ha-hand { + .ha-hand, + .ha-hand * { @apply font-classy text-[0.9rem] } - .ha-added { - @apply bg-gray-300 px-1 + .ha-added, + .ha-added * { + @apply bg-slate-300 px-1 } - .ha-note { - @apply italic text-gray-600 + .ha-note, + .ha-note * { + @apply italic text-slate-700 } - .ha-sup { - @apply relative -top-[0.5em] text-[80%] + .ha-sup, + .ha-sup * { + @apply relative -top-[0.3em] text-[80%] + } + + /* TODO: Something dooesnt work here */ + .ha-super { + @apply numeric-normal relative text-xs leading-none align-baseline -top-[0.3em] + } + + .ha-sub { + @apply relative text-xs leading-none align-baseline -bottom-[0.25em] + } + + .ha-ful, + .ha-ful * { + @apply inline border-b border-black pb-[2px] + } + + .ha-dul, + .ha-dul * { + @apply underline decoration-double + } + + .ha-tul, + .ha-tul * { + @apply underline border-b-[3px] border-double + } + + .up { + @apply relative -top[0.5em] + } + + .ha-alignright { + @apply absolute right-1 + } + + .ha-aligncenter { + @apply absolute right-0 left-0 whitespace-nowrap min-w-[33%] text-center + } + + .ha-lineline { + @apply border-t border-black w-1/3 mx-40 mt-[0.6rem] absolute + } + + .ha-sal { + @apply inline-block ml-6 } /* Classes from Javascript */ @@ -398,16 +586,14 @@ } .ha-register .ha-btn-collapsed-box { - @apply hidden desktop:block absolute -top-[0.15rem] text-gray-600 hover:text-gray-900 cursor-pointer + @apply hidden desktop:block absolute -top-[0.15rem] text-slate-600 hover:text-slate-900 cursor-pointer } - .ha-register .ha-neuzeit .ha-register-body .ha-commenthead .ha-collapsed-box, - .ha-register .ha-forschung .ha-register-body .ha-commenthead .ha-collapsed-box { + .ha-collapsed-box { @apply z-0 overflow-hidden } - .ha-register .ha-neuzeit .ha-register-body .ha-commenthead .ha-expanded-box, - .ha-register .ha-forschung .ha-register-body .ha-commenthead .ha-expanded-box { + .ha-expanded-box { @apply shadow-md z-[1000] !h-auto !max-h-screen } @@ -417,6 +603,42 @@ } */ } +.ha-lettertext .ha-marginalbox .ha-marginal::after { + content: ''; +} + +.ha-lettertext .ha-marginalbox .ha-marginal:last-of-type::after { + content: ''; +} + +.ha-nr::before { + content: ' \200E\25E6'; +} + +.ha-nr::after { + content: ' \200E\25E6'; +} + +.ha-added::before { + content: ''; +} + +.ha-added::after { + content: ''; +} + +.ha-note::before { + content: ''; +} + +.ha-note::after { + content: ''; +} + +.ha-bzg::after { + content: ']'; +} + * { text-decoration-skip-ink: all; } @@ -430,6 +652,54 @@ body { list-style-type:circle; } */ +.diagdel { + text-decoration: none; + position: relative; + display: inline-block; +} + +.diagdel::before, .diagdel::after { + content: ''; + width: 100%; + height: 0%; + position: absolute; + right: 0; + bottom: 1.5ex; +} + +.diagdel::before { + border-bottom: 1px solid black; + -webkit-transform: skewY(-36deg); + transform: skewY(-36deg); +} + + +.del .del, +.del .del * { + -moz-text-decoration-style: double; + -webkit-text-decoration-style: double !important; + text-decoration-thickness: 1px; + text-decoration-style: double; +} + +.del .del .ul, +.ul .del .del, +.del .ul .del { + text-decoration: line-through underline; + -moz-text-decoration-style: double; + -webkit-text-decoration-style: double !important; + text-decoration-thickness: 1px; + text-decoration-style: double; +} + +.del .ul, +.ul .del { + text-decoration: line-through underline; + text-decoration-thickness: 1px; + text-decoration-skip-ink: auto; + -webkit-text-decoration-skip-ink: auto; +} + .downshadow-sm { -webkit-box-shadow: 5px 6px 5px -7px rgba(0,0,0,0.79); box-shadow: 5px 6px 5px -7px rgba(0,0,0,0.79); @@ -451,10 +721,14 @@ body { font-variant-numeric: normal; } -.caps-small { +.caps-allpetite { font-variant-caps: all-petite-caps; } +.caps-petite { + font-variant-caps: petite-caps; +} + .caps-normal { font-variant-caps: normal; } @@ -490,6 +764,7 @@ body { color:#000000; } + .ha-open-btn-collapsed-box::before { content: '\200E+'; font-weight: 900; @@ -500,6 +775,580 @@ body { font-weight: 900; } +/* Classes for indents */ +.ha-indent-1 { + padding-left: 1rem; + background-color: var(--hamannWeiss); +} + +.ha-indent-2 { + padding-left: 2rem; + background-color: var(--hamannWeiss); +} + +.ha-indent-3 { + padding-left: 3rem; + background-color: var(--hamannWeiss); +} + +.ha-indent-4 { + padding-left: 4rem; + background-color: var(--hamannWeiss); +} + +.ha-indent-5 { + padding-left: 5rem; + background-color: var(--hamannWeiss); +} + +.ha-indent-6 { + padding-left: 11rem; + background-color: var(--hamannWeiss); +} + +.ha-indent-7 { + padding-left: 16rem; + background-color: var(--hamannWeiss); +} + +/* Classes for tables */ +.ha-table { + overflow: hidden; + white-space: nowrap; + font-variant-numeric: tabular-nums !important; +} + +.ha-hatab-0-2 { + display: inline; + position: static; + min-width: 50%; +} + +.ha-hatab-1-2 { + display: inline-block; + position: absolute; + left: 50%; + min-width: 50%; +} + +.ha-hatab-0-3 { + display: inline; + position: static; + min-width: 33.333%; +} + +.ha-hatab-1-3 { + display: inline-block; + position: absolute; + left: 33%; + min-width: 33.333%; +} + +.ha-hatab-2-3 { + display: inline-block; + position: absolute; + left: 66%; + min-width: 33.333%; +} + +.ha-hatab-0-4 { + display: inline; + position: static; + min-width: 25%; +} + +.ha-hatab-1-4 { + display: inline-block; + position: absolute; + left: 25%; + min-width: 25%; +} + +.ha-hatab-2-4 { + display: inline-block; + position: absolute; + left: 50%; + min-width: 25%; +} + +.ha-hatab-3-4 { + display: inline-block; + position: absolute; + left: 75%; + min-width: 25%; +} + +.ha-hatab-0-5 { + display: inline; + position: static; + min-width: 20%; +} + +.ha-hatab-1-5 { + display: inline-block; + position: absolute; + left: 20%; + min-width: 20%; +} + +.ha-hatab-2-5 { + display: inline-block; + position: absolute; + left: 40%; + min-width: 20%; +} + +.ha-hatab-3-5 { + display: inline-block; + position: absolute; + left: 60%; + min-width: 20%; +} + +.ha-hatab-4-5 { + display: inline-block; + position: absolute; + left: 80%; + min-width: 20%; +} + +.ha-hatab-0-6 { + display: inline; + position: static; + min-width: 16.667%; +} + +.ha-hatab-1-6 { + display: inline-block; + position: absolute; + left: 16.667%; + min-width: 16.667%; +} + +.ha-hatab-2-6 { + display: inline-block; + position: absolute; + left: 33.333%; + min-width: 16.667%; +} + +.ha-hatab-3-6 { + display: inline-block; + position: absolute; + left: 50%; + min-width: 16.667%; +} + +.ha-hatab-4-6 { + display: inline-block; + position: absolute; + left: 66.667%; + min-width: 16.667%; +} + +.ha-hatab-5-6 { + display: inline-block; + position: absolute; + left: 83.333%; + min-width: 16.667%; +} + +.ha-hatab-0-7 { + display: inline; + position: static; + min-width: 14.286%; +} + +.ha-hatab-1-7 { + display: inline-block; + position: absolute; + left: 14.286%; + min-width: 14.286%; +} + +.ha-hatab-2-7 { + display: inline-block; + position: absolute; + left: 28.571%; + min-width: 14.286%; +} + +.ha-hatab-3-7 { + display: inline-block; + position: absolute; + left: 42.857%; + min-width: 14.286%; +} + +.ha-hatab-4-7 { + display: inline-block; + position: absolute; + left: 57.143%; + min-width: 14.286%; +} + +.ha-hatab-5-7 { + display: inline-block; + position: absolute; + left: 71.429%; + min-width: 14.286%; +} + +.ha-hatab-6-7 { + display: inline-block; + position: absolute; + left: 85.714%; + min-width: 14.286%; +} + +.ha-hatab-0-8 { + display: inline; + position: static; + min-width: 12.5%; +} + +.ha-hatab-1-8 { + display: inline-block; + position: absolute; + left: 12.5%; + min-width: 12.5%; +} + +.ha-hatab-2-8 { + display: inline-block; + position: absolute; + left: 25%; + min-width: 12.5%; +} + +.ha-hatab-3-8 { + display: inline-block; + position: absolute; + left: 37.5%; + min-width: 12.5%; +} + +.ha-hatab-4-8 { + display: inline-block; + position: absolute; + left: 50%; + min-width: 12.5%; +} + +.ha-hatab-5-8 { + display: inline-block; + position: absolute; + left: 62.5%; + min-width: 12.5%; +} + +.ha-hatab-6-8 { + display: inline-block; + position: absolute; + left: 75%; + min-width: 12.5%; +} + +.ha-hatab-7-8 { + display: inline-block; + position: absolute; + left: 87.5%; + min-width: 12.5%; +} + +.ha-hatab-0-9 { + display: inline; + position: static; + min-width: 11.111%; +} + +.ha-hatab-1-9 { + display: inline-block; + position: absolute; + left: 11.111%; + min-width: 11.111%; +} + +.ha-hatab-2-9 { + display: inline-block; + position: absolute; + left: 22.222%; + min-width: 11.111%; +} + +.ha-hatab-3-9 { + display: inline-block; + position: absolute; + left: 33.333%; + min-width: 11.111%; +} + +.ha-hatab-4-9 { + display: inline-block; + position: absolute; + left: 44.444%; + min-width: 11.111%; +} + +.ha-hatab-5-9 { + display: inline-block; + position: absolute; + left: 55.555%; + min-width: 11.111%; +} + +.ha-hatab-6-9 { + display: inline-block; + position: absolute; + left: 66.666%; + min-width: 11.111%; +} + +.ha-hatab-7-9 { + display: inline-block; + position: absolute; + left: 77.777%; + min-width: 11.111%; +} + +.ha-hatab-8-9 { + display: inline-block; + position: absolute; + left: 88.888%; + min-width: 11.111%; +} + + +.ha-hatab-0-10 { + display: inline-block; + position: absolute; + min-width: 10%; +} + +.ha-hatab-1-10 { + display: inline-block; + position: absolute; + left: 10%; + min-width: 10%; +} + +.ha-hatab-2-10 { + display: inline-block; + position: absolute; + left: 20%; + min-width: 10%; +} + +.ha-hatab-3-10 { + display: inline-block; + position: absolute; + left: 30%; + min-width: 10%; +} + +.ha-hatab-4-10 { + display: inline-block; + position: absolute; + left: 40%; + min-width: 10%; +} + +.ha-hatab-5-10 { + display: inline-block; + position: absolute; + left: 50%; + min-width: 10%; +} + +.ha-hatab-6-10 { + display: inline-block; + position: absolute; + left: 60%; + min-width: 10%; +} + +.ha-hatab-7-10 { + display: inline-block; + position: absolute; + left: 70%; + min-width: 10%; +} + +.ha-hatab-8-10 { + display: inline-block; + position: absolute; + left: 80%; + min-width: 10%; +} + +.ha-hatab-9-10 { + display: inline-block; + position: absolute; + left: 90%; + min-width: 10%; +} + +.ha-hatab-0-11 { + display: inline-block; + position: absolute; + min-width: 9.091%; +} + +.ha-hatab-1-11 { + display: inline-block; + position: absolute; + left: 9.091%; + min-width: 9.091%; +} + +.ha-hatab-2-11 { + display: inline-block; + position: absolute; + left: 18.182%; + min-width: 9.091%; +} + +.ha-hatab-3-11 { + display: inline-block; + position: absolute; + left: 27.273%; + min-width: 9.091%; +} + +.ha-hatab-4-11 { + display: inline-block; + position: absolute; + left: 36.364%; + min-width: 9.091%; +} + +.ha-hatab-5-11 { + display: inline-block; + position: absolute; + left: 45.455%; + min-width: 9.091%; +} + +.ha-hatab-6-11 { + display: inline-block; + position: absolute; + left: 54.545%; + min-width: 9.091%; +} + +.ha-hatab-7-11 { + display: inline-block; + position: absolute; + left: 63.636%; + min-width: 9.091%; +} + +.ha-hatab-8-11 { + display: inline-block; + position: absolute; + left: 72.727%; + min-width: 9.091%; +} + +.ha-hatab-9-11 { + display: inline-block; + position: absolute; + left: 81.818%; + min-width: 9.091%; +} + +.ha-hatab-10-11 { + display: inline-block; + position: absolute; + left: 90.909%; + min-width: 9.091%; +} + +.ha-hatab-0-12 { + display: inline-block; + position: absolute; + min-width: 8.333%; +} + +.ha-hatab-1-12 { + display: inline-block; + position: absolute; + left: 8.333%; + min-width: 8.333%; +} + +.ha-hatab-2-12 { + display: inline-block; + position: absolute; + left: 16.666%; + min-width: 8.333%; +} + +.ha-hatab-3-12 { + display: inline-block; + position: absolute; + left: 25%; + min-width: 8.333%; +} + +.ha-hatab-4-12 { + display: inline-block; + position: absolute; + left: 33.333%; + min-width: 8.333%; +} + +.ha-hatab-5-12 { + display: inline-block; + position: absolute; + left: 41.666%; + min-width: 8.333%; +} + +.ha-hatab-6-12 { + display: inline-block; + position: absolute; + left: 50%; + min-width: 8.333%; +} + +.ha-hatab-7-12 { + display: inline-block; + position: absolute; + left: 58.333%; + min-width: 8.333%; +} + +.ha-hatab-8-12 { + display: inline-block; + position: absolute; + left: 66.666%; + min-width: 8.333%; +} + +.ha-hatab-9-12 { + display: inline-block; + position: absolute; + left: 75%; + min-width: 8.333%; +} + +.ha-hatab-10-12 { + display: inline-block; + position: absolute; + left: 83.333%; + min-width: 8.333%; +} + +.ha-hatab-11-12 { + display: inline-block; + position: absolute; + left: 91.666%; + min-width: 8.333%; +} + + + /* Not possible otherwise, overwrites javascript set style values, which cant be defined before render */ /* @media (max-width: 1190px) { .ha-register .ha-neuzeit .ha-register-body .ha-subcomment .ha-commenthead .ha-letlinks { diff --git a/HaWeb/wwwroot/js/site.js b/HaWeb/wwwroot/js/site.js index 8e96671..a47e74e 100644 --- a/HaWeb/wwwroot/js/site.js +++ b/HaWeb/wwwroot/js/site.js @@ -173,4 +173,5 @@ window.addEventListener("load", function () { markactive_exact(document.getElementById("ha-register-nav")); overlappingcollapsebox(".ha-neuzeit .ha-letlinks", true); overlappingcollapsebox(".ha-forschung .ha-letlinks", true); + overlappingcollapsebox(".ha-lettertext .ha-marginalbox", true); });