Merge pull request #1679 from cogentcore/contmeta

contmeta: render rest of meta data for content, also super / subscript

Author: rcoreilly

content/content.go

@@ -241,6 +241,14 @@ func (ct *Content) pageMaker(p *tree.Plan, tabIdx int) {
 					})
 				})
 			}
+			if !ct.inPDFRender && len(ct.current.Page.Affiliations) > 0 {
+				tree.Add(p, func(w *core.Text) {
+					w.SetType(core.TextBodyLarge)
+					w.Updater(func() {
+						w.SetText(ct.current.Page.Affiliations)
+					})
+				})
+			}
 			if !ct.inPDFRender && !ct.current.Page.Date.IsZero() {
 				tree.Add(p, func(w *core.Text) {
 					w.SetType(core.TextTitleMedium)
@@ -249,6 +257,14 @@ func (ct *Content) pageMaker(p *tree.Plan, tabIdx int) {
 					})
 				})
 			}
+			if !ct.inPDFRender && len(ct.current.Page.Abstract) > 0 {
+				tree.Add(p, func(w *core.Text) {
+					w.SetType(core.TextBodyLarge)
+					w.Updater(func() {
+						w.SetText("<b>Abstract:</b> " + ct.current.Page.Abstract)
+					})
+				})
+			}
 			tree.Add(p, func(w *core.Frame) {
 				w.Styler(func(s *styles.Style) {
 					s.Direction = styles.Column

content/examples/basic/content/button.md

@@ -1,8 +1,9 @@
 +++
 Categories = ["Widgets"]
 Authors = "Bea A. Author<sup>1</sup> and Test Ing Name<sup>2</sup>"
-Affiliations = "<sup>1</sup>University of Somwhere <sup>2</sup>University of Elsewhere"
+Affiliations = "<sup>1</sup>University of Somewhere <sup>2</sup>University of Elsewhere"
 Abstract = "The button is an essential element of any GUI framework, with the capability of triggering actions of any sort. Actions are very important because they allow people to actually do something."
+Date = "2026-05-01"
 +++
 
 A **button** is a [[widget]] that a user can click on to trigger a described action. See [[func button]] for a button [[value binding|bound]] to a function. There are various [[#types]] of buttons.

content/page_test.go

@@ -6,6 +6,7 @@ package content
 
 import (
 	"testing"
+	"time"
 
 	"cogentcore.org/core/content/bcontent"
 	"github.com/stretchr/testify/assert"
@@ -14,6 +15,9 @@ import (
 func TestNewPage(t *testing.T) {
 	pg, err := bcontent.NewPage(exampleContent, "button.md")
 	assert.NoError(t, err)
+	dstr := "2026-05-01"
+	date, err := time.Parse(time.DateOnly, dstr)
+	assert.NoError(t, err)
 	assert.Equal(t, bcontent.Page{
 		Source:       exampleContent,
 		Filename:     "button.md",
@@ -22,7 +26,9 @@ func TestNewPage(t *testing.T) {
 		Title:        "Button",
 		Categories:   []string{"Widgets"},
 		Authors:      "Bea A. Author<sup>1</sup> and Test Ing Name<sup>2</sup>",
-		Affiliations: "<sup>1</sup>University of Somwhere <sup>2</sup>University of Elsewhere",
+		Affiliations: "<sup>1</sup>University of Somewhere <sup>2</sup>University of Elsewhere",
 		Abstract:     "The button is an essential element of any GUI framework, with the capability of triggering actions of any sort. Actions are very important because they allow people to actually do something.",
+		DateString:   dstr,
+		Date:         date,
 	}, *pg)
 }

docs/content/text.md

@@ -43,3 +43,13 @@ core.NewText(b).SetText("Hello,\n\tworld!").Styler(func(s *styles.Style) {
     s.Font.Family = rich.Monospace
 })
 ```
+
+The `Type` of text provides predefined size values according to the Material 3 standards, with the default being `TextBodyLarge`:
+
+```Go
+	for _, typ := range core.TextTypesValues() {
+		s := strcase.ToSentence(typ.String())
+		core.NewText(b).SetType(typ).SetText(s)
+	}
+```
+

paint/pdf/pdf_test.go

@@ -98,7 +98,7 @@ func TestText(t *testing.T) {
 		prv := UseStandardFonts()
 		sh := shaped.NewShaper()
 
-		src := "PDF can put <b>HTML</b> <br>formatted Text where you <i>want</i>"
+		src := "PDF can put <b>HTML</b> <br>formatted Text where you <i>want</i> <br>including<sup>1</sup> and sub<sub>script</sub>"
 		rsty := &sty.Font
 		tsty := &sty.Text
 

paint/pdf/text.go

@@ -122,7 +122,6 @@ func (r *PDF) textRunRegions(m math32.Matrix2, run *shapedgt.Run, ln *shaped.Lin
 func (r *PDF) textRun(style *styles.Paint, m math32.Matrix2, run *shapedgt.Run, ln *shaped.Line, lns *shaped.Lines, runes []rune, clr image.Image, off math32.Vector2) {
 	// dir := run.Direction
 	region := run.Runes()
-	offTrans := math32.Translate2D(off.X, off.Y)
 	rbb := run.MaxBounds.Translate(off)
 	fill := clr
 	if run.FillColor != nil {
@@ -131,14 +130,24 @@ func (r *PDF) textRun(style *styles.Paint, m math32.Matrix2, run *shapedgt.Run,
 	fsz := math32.FromFixed(run.Size)
 	lineW := max(fsz/16, 1) // 1 at 16, bigger if biggerr
 	if run.Math.Path != nil {
-		r.w.PushTransform(offTrans)
+		r.w.PushTransform(math32.Translate2D(off.X, off.Y))
 		psty := *style
 		psty.Stroke.Color = run.StrokeColor
 		psty.Fill.Color = fill
 		r.Path(*run.Math.Path, &psty, math32.Identity2())
 		r.w.PopStack()
 		return
 	}
+	sty := run.Font.Style(&style.Text)
+	// https://en.wikipedia.org/wiki/Subscript_and_superscript: latex does -.14 sub, .25 super
+	// others often use -.33 and .33
+	if sty.Special == rich.Super {
+		off.X += 0.05 * fsz // tends to be cramped otherwise
+		off.Y -= 0.25 * fsz
+	} else if sty.Special == rich.Sub {
+		off.X += 0.05 * fsz // tends to be cramped otherwise
+		off.Y += 0.14 * fsz
+	}
 
 	idm := math32.Identity2()
 	if run.Decoration.HasFlag(rich.Underline) || run.Decoration.HasFlag(rich.DottedUnderline) {
@@ -160,7 +169,7 @@ func (r *PDF) textRun(style *styles.Paint, m math32.Matrix2, run *shapedgt.Run,
 		}
 	}
 
-	r.w.StartTextObject(offTrans)
+	r.w.StartTextObject(math32.Translate2D(off.X, off.Y))
 	r.setTextStyle(&run.Font, style, fill, run.StrokeColor, math32.FromFixed(run.Size), lns.LineHeight)
 	raw := string(runes[region.Start:region.End])
 	r.w.WriteText(raw)

paint/renderers/htmlcanvas/text.go

@@ -120,6 +120,14 @@ func (rs *Renderer) TextRun(ctx *render.Context, run *shapedgt.Run, ln *shaped.L
 		rs.setTransform(ctx)
 		return
 	}
+	sty := run.Font.Style(&ctx.Style.Text)
+	// https://en.wikipedia.org/wiki/Subscript_and_superscript: latex does -.14 sub, .25 super
+	// others often use -.33 and .33
+	if sty.Special == rich.Super {
+		off.Y -= 0.25 * fsz
+	} else if sty.Special == rich.Sub {
+		off.Y += 0.14 * fsz
+	}
 
 	if run.Decoration.HasFlag(rich.Underline) || run.Decoration.HasFlag(rich.DottedUnderline) {
 		dash := []float32{2, 2}

paint/renderers/rasterx/text.go

@@ -131,6 +131,15 @@ func (rs *Renderer) TextRun(ctx *render.Context, run *shapedgt.Run, ln *shaped.L
 		return
 	}
 
+	sty := run.Font.Style(&ctx.Style.Text)
+	// https://en.wikipedia.org/wiki/Subscript_and_superscript: latex does -.14 sub, .25 super
+	// others often use -.33 and .33
+	if sty.Special == rich.Super {
+		off.Y -= 0.25 * fsz
+	} else if sty.Special == rich.Sub {
+		off.Y += 0.14 * fsz
+	}
+
 	if run.Decoration.HasFlag(rich.Underline) || run.Decoration.HasFlag(rich.DottedUnderline) {
 		dash := []float32{2, 2}
 		if run.Decoration.HasFlag(rich.Underline) {

text/shaped/shaped_test.go

@@ -415,3 +415,16 @@ func TestGlyphAlign(t *testing.T) {
 		pc.DrawText(lns, pos)
 	})
 }
+
+func TestGlyphSuperSub(t *testing.T) {
+	RunTest(t, "supersub", 300, 300, func(pc *paint.Painter, sh Shaper, tsty *text.Style) {
+		src := "Super<sup>script</sup> and Sub<sub>script</sub>"
+		sty := rich.NewStyle()
+		sty.Size = 0.845
+		tx, err := htmltext.HTMLToRich([]byte(src), sty, nil)
+		assert.NoError(t, err)
+		lns := sh.WrapLines(tx, sty, tsty, math32.Vec2(250, 250))
+		pos := math32.Vec2(10.3, 10.96875)
+		pc.DrawText(lns, pos)
+	})
+}