Merge pull request #377 from cogentcore/pdf

pdf: canvas updates to pdf branch for exporting pdf, and new setting api

Author: kkoreilly

.github/workflows/core.yml

@@ -37,10 +37,10 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.4'
+          go-version: '1.25.6'
 
       - name: Install Core
-        run: go install cogentcore.org/core@main
+        run: go install cogentcore.org/core@main && core setup
 
       - name: Build Docs
         run: core build web -dir docs -o static -vanity-url cogentcore.org/cogent -github-vanity-repository cogentcore/cogent
@@ -76,4 +76,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v4

.github/workflows/go.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: '1.23.4'
+        go-version: '1.25.6'
 
     - name: Set up Core
       run: go install cogentcore.org/core@main && core setup
@@ -28,7 +28,7 @@ jobs:
       run: go test -v ./... -coverprofile cover.out -timeout 30s
 
     - name: Update coverage report
-      uses: ncruces/go-coverage-report@v0
+      uses: cogentcore/goal-coverage-report@v0
       with:
         coverage-file: cover.out
       if: github.event_name == 'push'

canvas/TODO.md

@@ -15,6 +15,8 @@ but is instead constraining to diagonal movement, which is not the same!
 
 * grouping can change front / back order -- it is using the selection order instead of the existing order?
 
+* align chooser -> switches, without Align prefix (first, last, etc)
+
 * more subtle logic about duplicating groups:
     + is it duplicating all the elements within the same group?
     + duplicating single element within group puts it in the group.. not what you expect.

canvas/canvas.go

@@ -26,6 +26,7 @@ import (
 	"cogentcore.org/core/math32"
 	"cogentcore.org/core/styles"
 	"cogentcore.org/core/styles/abilities"
+	"cogentcore.org/core/styles/units"
 	"cogentcore.org/core/svg"
 	"cogentcore.org/core/system"
 	"cogentcore.org/core/tree"
@@ -347,11 +348,28 @@ func (cv *Canvas) ExportPNG(width, height float32) error { //types:add
 }
 
 // ExportPDF exports drawing to a PDF file (auto-names to same name
-// with .pdf suffix).  Calls inkscape -- needs to be on the PATH.
+// with .pdf suffix). Uses native PDF rendering or optionally
+// calls inkscape from the command line -- needs to be on the PATH.
 // specify DPI of resulting image for effects rendering.
 // Renders full current page -- do ResizeToContents
 // to render just current contents.
-func (cv *Canvas) ExportPDF(dpi float32) error { //types:add
+func (cv *Canvas) ExportPDF(dpi float32, inkscape bool) error { //types:add
+	if inkscape {
+		return cv.ExportPDFInkscape(dpi)
+	}
+	fext := filepath.Ext(string(cv.Filename))
+	onm := strings.TrimSuffix(string(cv.Filename), fext) + ".pdf"
+
+	sv := cv.SSVG()
+	ctx := units.NewContext()
+	sz := math32.Vector2{}
+	sz.X = ctx.ToDots(sv.PhysicalWidth.Value, sv.PhysicalWidth.Unit)
+	sz.Y = ctx.ToDots(sv.PhysicalHeight.Value, sv.PhysicalHeight.Unit)
+	nsv := sv.CloneSVG(sz)
+	return nsv.SavePDF(onm)
+}
+
+func (cv *Canvas) ExportPDFInkscape(dpi float32) error {
 	path, _ := filepath.Split(string(cv.Filename))
 	fnm := filepath.Join(path, "export_pdf.svg")
 	sv := cv.SVG

canvas/cmd/canvas/canvas.go

@@ -9,6 +9,7 @@ import (
 
 	"cogentcore.org/cogent/canvas"
 	"cogentcore.org/core/core"
+	"cogentcore.org/core/system"
 )
 
 func main() {
@@ -18,7 +19,7 @@ func main() {
 	var fnms []string
 	if len(ofs) > 0 {
 		fnms = ofs
-	} else if len(os.Args) > 1 {
+	} else if !system.GenerateHTMLArg() && len(os.Args) > 1 {
 		fnms = os.Args[1:]
 	}
 

canvas/path.go

@@ -58,8 +58,8 @@ func (sv *SVG) PathNodes(path *svg.Path) []*PathNode {
 		cmd := scan.Cmd()
 		end := scan.End()
 		start := scan.Start()
-		tend := xf.MulVector2AsPoint(end)
-		tstart := xf.MulVector2AsPoint(start)
+		tend := xf.MulPoint(end)
+		tstart := xf.MulPoint(start)
 
 		pn := &PathNode{CmdPath: cmd, Index: scan.Index(), PtIndex: pti, Start: start, End: end, TStart: tstart, TEnd: tend}
 		pns = append(pns, pn)
@@ -73,13 +73,13 @@ func (sv *SVG) PathNodes(path *svg.Path) []*PathNode {
 		case ppath.QuadTo:
 			pn.Cmd = SpQuadTo
 			pn.Cp1 = scan.CP1()
-			pn.TCp1 = xf.MulVector2AsPoint(pn.Cp1)
+			pn.TCp1 = xf.MulPoint(pn.Cp1)
 		case ppath.CubeTo:
 			pn.Cmd = SpCubeTo
 			pn.Cp1 = scan.CP1()
 			pn.Cp2 = scan.CP2()
-			pn.TCp1 = xf.MulVector2AsPoint(pn.Cp1)
-			pn.TCp2 = xf.MulVector2AsPoint(pn.Cp2)
+			pn.TCp1 = xf.MulPoint(pn.Cp1)
+			pn.TCp2 = xf.MulPoint(pn.Cp2)
 		// todo: arc
 		case ppath.Close:
 			pn.Cmd = SpClose
@@ -368,7 +368,7 @@ func (sv *SVG) PathNodeMove(pidx int, pointOnly bool, dv math32.Vector2, dxf mat
 	path := es.ActivePath
 	pn := es.PathNodesOrig[pidx]
 	_, isSel := es.NodeSelect[pidx]
-	end := dxf.MulVector2AsPoint(pn.End)
+	end := dxf.MulPoint(pn.End)
 	switch pn.Cmd {
 	case SpMoveTo, SpLineTo, SpClose:
 		path.Data[pn.Index+1] = end.X
@@ -377,7 +377,7 @@ func (sv *SVG) PathNodeMove(pidx int, pointOnly bool, dv math32.Vector2, dxf mat
 		path.Data[pn.Index+3] = end.X
 		path.Data[pn.Index+4] = end.Y
 		if !pointOnly && isSel {
-			cp1 := dxf.MulVector2AsPoint(pn.Cp1)
+			cp1 := dxf.MulPoint(pn.Cp1)
 			path.Data[pn.Index+1] = cp1.X
 			path.Data[pn.Index+2] = cp1.Y
 			if sp1, ok := sprites.SpriteByNameNoLock(SpriteName(SpNodeCtrl, SpQuad1, pidx)); ok {
@@ -388,7 +388,7 @@ func (sv *SVG) PathNodeMove(pidx int, pointOnly bool, dv math32.Vector2, dxf mat
 		path.Data[pn.Index+5] = end.X
 		path.Data[pn.Index+6] = end.Y
 		if !pointOnly && isSel {
-			cp2 := dxf.MulVector2AsPoint(pn.Cp2)
+			cp2 := dxf.MulPoint(pn.Cp2)
 			path.Data[pn.Index+3] = cp2.X
 			path.Data[pn.Index+4] = cp2.Y
 			if sp2, ok := sprites.SpriteByNameNoLock(SpriteName(SpNodeCtrl, SpCube2, pidx)); ok {
@@ -406,7 +406,7 @@ func (sv *SVG) PathNodeMove(pidx int, pointOnly bool, dv math32.Vector2, dxf mat
 	if pn.Cmd != SpCubeTo {
 		return
 	}
-	cp1 := dxf.MulVector2AsPoint(pn.Cp1)
+	cp1 := dxf.MulPoint(pn.Cp1)
 	path.Data[pn.Index+1] = cp1.X
 	path.Data[pn.Index+2] = cp1.Y
 	sp1, ok := sprites.SpriteByNameNoLock(SpriteName(SpNodeCtrl, SpCube1, pidx))
@@ -423,12 +423,12 @@ func (sv *SVG) PathCtrlMove(pidx int, ctyp Sprites, dxf math32.Matrix2) math32.V
 	pn := es.PathNodesOrig[pidx]
 	switch ctyp {
 	case SpQuad1, SpCube1:
-		cp1 := dxf.MulVector2AsPoint(pn.Cp1)
+		cp1 := dxf.MulPoint(pn.Cp1)
 		path.Data[pn.Index+1] = cp1.X
 		path.Data[pn.Index+2] = cp1.Y
 		return pn.TCp1
 	case SpCube2:
-		cp2 := dxf.MulVector2AsPoint(pn.Cp2)
+		cp2 := dxf.MulPoint(pn.Cp2)
 		path.Data[pn.Index+3] = cp2.X
 		path.Data[pn.Index+4] = cp2.Y
 		return pn.TCp2
@@ -571,8 +571,8 @@ func (sv *SVG) NodeAdd(ntyp Sprites, p ppath.Path, end, start math32.Vector2) pp
 	es := sv.EditState()
 	path := es.ActivePath
 	xf := path.ParentTransform(true).Inverse()
-	lend := xf.MulVector2AsPoint(end)
-	lstart := xf.MulVector2AsPoint(start)
+	lend := xf.MulPoint(end)
+	lstart := xf.MulPoint(start)
 	del := lend.Sub(lstart)
 	switch ntyp {
 	case SpClose:

canvas/select.go

@@ -640,7 +640,7 @@ func (sv *SVG) SelectContainsPoint(pt image.Point, leavesOnly, excludeSel bool)
 			return tree.Break
 		}
 		xf := p.ParentTransform(true).Inverse()
-		pxf := xf.MulVector2AsPoint(ptv)
+		pxf := xf.MulPoint(ptv)
 		if intersect.Contains(p.Data, pxf.X, pxf.Y, p.Paint.Fill.Rule) {
 			rval = n
 			return tree.Break

canvas/settings.go

@@ -6,7 +6,6 @@ package canvas
 
 import (
 	"path/filepath"
-	"slices"
 
 	"cogentcore.org/core/base/errors"
 	"cogentcore.org/core/base/fsx"
@@ -17,7 +16,7 @@ import (
 
 func init() {
 	core.TheApp.SetName("Cogent Canvas")
-	core.AllSettings = slices.Insert(core.AllSettings, 1, core.Settings(Settings))
+	core.AddAppSettings(Settings)
 }
 
 // Settings are the overall Code settings

canvas/shapes.go

@@ -80,10 +80,10 @@ func NewSVGElementDrag[T tree.NodeValue](sv *SVG, start, end image.Point) *T {
 	snb := sn.AsNodeBase()
 
 	xfi := sv.Root().Paint.Transform.Inverse()
-	pos := xfi.MulVector2AsPoint(st)
+	pos := xfi.MulPoint(st)
 	sn.SetNodePos(pos)
 	sz := dv.Abs().Max(math32.Vector2Scalar(minsz / 2))
-	sz = xfi.MulVector2AsVector(sz)
+	sz = xfi.MulVector(sz)
 	sn.SetNodeSize(sz)
 	sn.BBoxes(sv.SVG, snb.ParentTransform(false))
 
@@ -111,11 +111,11 @@ func (sv *SVG) NewText(start, end image.Point) svg.Node {
 	pos := math32.FromPoint(start)
 	// minsz := float32(20)
 	pos.Y += 20 // todo: need the font size..
-	pos = xfi.MulVector2AsPoint(pos)
+	pos = xfi.MulPoint(pos)
 	tspan.Properties = maps.Clone(es.Text.TextProperties())
 	tspan.Pos = pos
 	sz := dv.Abs().Max(math32.Vector2Scalar(minsz / 2))
-	sz = xfi.MulVector2AsVector(sz)
+	sz = xfi.MulVector(sz)
 	tspan.SetNodeSize(sz)
 	tspan.BBoxes(sv.SVG, tspan.ParentTransform(false))
 
@@ -136,8 +136,8 @@ func (sv *SVG) NewPath(start, end image.Point) *svg.Path {
 	sv.ManipStart(NewPath, "")
 	n := NewSVGElement[svg.Path](sv, false)
 	xfi := sv.Root().Paint.Transform.Inverse()
-	pos := xfi.MulVector2AsPoint(math32.FromPoint(start))
-	sz := xfi.MulVector2AsVector(dv)
+	pos := xfi.MulPoint(math32.FromPoint(start))
+	sz := xfi.MulVector(dv)
 	fmt.Println(n.Data)
 	n.Data = nil
 	n.Data.MoveTo(pos.X, pos.Y)

canvas/text.go

@@ -89,7 +89,7 @@ func (ts *TextStyle) TextProperties() map[string]any {
 	delete(tps, "select-color")
 	delete(tps, "highlight-color")
 	if ts.Stroke == colors.Transparent { // need to explicitly set to none
-		tps["stroke-color"] = "none"
+		tps["stroke"] = "none"
 	}
 	return tps
 }