sidenote ende

helpers/functions/textparse.go

@@ -90,16 +90,16 @@ func Parse(lib *xmlmodels.Library) func(s string) string {
 						elem.Token.Attributes["pos"] != "" {
 						note := Note{Id: id}
 						note.Tokens.AppendDivElement(id, "note-sidenote-meta")
-						if elem.Token.Attributes["annotation"] != "" {
-							note.Tokens.AppendDivElement("", "sidenote-note")
-							note.Tokens.AppendText(elem.Token.Attributes["annotation"])
-							note.Tokens.AppendEndElement()
-						}
 						if elem.Token.Attributes["page"] != "" {
 							note.Tokens.AppendDivElement("", "sidenote-page")
 							note.Tokens.AppendText(elem.Token.Attributes["page"])
 							note.Tokens.AppendEndElement()
 						}
+						if elem.Token.Attributes["annotation"] != "" {
+							note.Tokens.AppendDivElement("", "sidenote-note")
+							note.Tokens.AppendText(elem.Token.Attributes["annotation"])
+							note.Tokens.AppendEndElement()
+						}
 						if elem.Token.Attributes["pos"] != "" {
 							note.Tokens.AppendDivElement("", "sidenote-pos")
 							note.Tokens.AppendText(elem.Token.Attributes["pos"])
@@ -161,8 +161,10 @@ func Parse(lib *xmlmodels.Library) func(s string) string {
 						if !ps.LineBreak {
 							ps.Tokens.AppendLink("#"+ps.PC, "eanchor-page")
 							ps.Tokens.AppendEndElement()
+							ps.Tokens.AppendDivElement(ps.PC, "page", "page-inside")
+						} else {
+							ps.Tokens.AppendDivElement(ps.PC, "page", "page-outside")
 						}
-						ps.Tokens.AppendDivElement(ps.PC, "page")
 						ps.Tokens.AppendText(ps.PC)
 						ps.Tokens.AppendEndElement()
 						strings.TrimLeft(elem.Token.Data, " \t\n\r")

scratchpad.md

@@ -12,8 +12,7 @@ TODO
 <subst><del>gelösche</del><insertion>hinz</insertion></subst>
 <tl> text loss
 extent bei nr
-Mouseover hand sidenote
+mouseover hand sidenote 
-
 NOTE ANDERS
 -Tab ist falsch
 

views/transform/site.css

@@ -183,7 +183,7 @@
 
 	.text .eanchor-page::before {
 		content: "|";
-		@apply text-slate-600 font-sans text-sm relative bottom-[0.1rem] pr-0.5;
+		@apply text-slate-600 font-sans text-sm relative bottom-[0.15rem] pr-[1ch];
 	}
 
 	/* .text .page + br { */
@@ -231,20 +231,24 @@
 	}
 
 	.text .insertion::before {
+		@apply text-slate-700;
 		margin-right: -0.2em;
 		content: "⌞";
 	}
 
 	.text .insertion::after {
+		@apply text-slate-700;
 		margin-left: -0.2em;
 		content: "⌟";
 	}
 
 	.text .nr::before {
+		@apply text-slate-700;
 		content: "⸰";
 	}
 
 	.text .nr::after {
+		@apply text-slate-700;
 		content: "⸰";
 	}
 
@@ -262,16 +266,24 @@
 		top: 55%;
 	}
 
-	.text .note-note {
-		@apply inline text-sm text-gray-500 relative left-[0.1rem];
-	}
-
 	.text .sidenote {
 		@apply border-l-4 border-slate-200 pl-2 my-1;
 	}
 
+	.text .hand {
+		@apply inline text-blue-950 font-didone text-[0.9rem];
+	}
+
 	.text .sidenote-page::before {
-		content: "; S. ";
+		content: "S. ";
+	}
+
+	.text .note-sidenote-meta.margin-note {
+		@apply mt-1;
+	}
+
+	.text .sidenote-page::after {
+		content: "; ";
 	}
 
 	.text .note-sidenote-meta > div {
@@ -282,15 +294,24 @@
 		@apply !hidden;
 	}
 
-	.text .hand {
+	.text .note-note {
-		@apply inline text-blue-950 font-didone text-[0.9rem];
+		@apply block;
 	}
 
 	.text .margin-note {
 		@apply absolute w-[13rem] text-sm;
 	}
 
+	.text div[class^="note-"],
+	.text div[class*=" note-"] {
+		@apply text-sm text-slate-800;
+	}
+
 	.text .note-hand {
 		@apply text-blue-950;
 	}
+
+	.text .note-hand.margin-note {
+		@apply -mt-1;
+	}
 }