luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into pdf-link-overlay

Browse source
This commit is contained in:
Bernard Xie 2023-02-28 13:46:49 -08:00
commit 731a29bd07
No known key found for this signature in database
GPG key ID: 3C3E0036CE0F892C
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
d2renderers/d2svg/appendix/appendix.go
View file

@ -52,6 +52,7 @@ const (
var viewboxRegex = regexp.MustCompile(`viewBox=\"([0-9\- ]+)\"`) var viewboxRegex = regexp.MustCompile(`viewBox=\"([0-9\- ]+)\"`)
var widthRegex = regexp.MustCompile(`width=\"([.0-9]+)\"`) var widthRegex = regexp.MustCompile(`width=\"([.0-9]+)\"`)
var heightRegex = regexp.MustCompile(`height=\"([.0-9]+)\"`) var heightRegex = regexp.MustCompile(`height=\"([.0-9]+)\"`)
var svgRegex = regexp.MustCompile(`<svg(.*?)>`)
func FindViewboxSlice(svg []byte) []string { func FindViewboxSlice(svg []byte) []string {
viewboxMatches := viewboxRegex.FindAllStringSubmatch(string(svg), 2) viewboxMatches := viewboxRegex.FindAllStringSubmatch(string(svg), 2)
@ -98,14 +99,22 @@ func Append(diagram *d2target.Diagram, ruler *textmeasure.Ruler, in []byte) []by
newOuterViewbox := fmt.Sprintf(`viewBox="0 0 %d %d"`, viewboxWidth, viewboxHeight) newOuterViewbox := fmt.Sprintf(`viewBox="0 0 %d %d"`, viewboxWidth, viewboxHeight)
newViewbox := fmt.Sprintf(`viewBox="%s %s %s %s"`, viewboxSlice[0], viewboxSlice[1], strconv.Itoa(viewboxWidth), strconv.Itoa(viewboxHeight)) newViewbox := fmt.Sprintf(`viewBox="%s %s %s %s"`, viewboxSlice[0], viewboxSlice[1], strconv.Itoa(viewboxWidth), strconv.Itoa(viewboxHeight))
widthMatches := widthRegex.FindAllStringSubmatch(svg, 2) dimensionsToUpdate := 2
heightMatches := heightRegex.FindAllStringSubmatch(svg, 2) outerSVG := svgRegex.FindString(svg)
// if outer svg has dimensions set we also need to update it
if widthRegex.FindString(outerSVG) != "" {
dimensionsToUpdate++
}
// update 1st 3 matches of width and height 1st is outer svg (if dimensions are set), 2nd inner svg, 3rd is background color rect
widthMatches := widthRegex.FindAllStringSubmatch(svg, dimensionsToUpdate)
heightMatches := heightRegex.FindAllStringSubmatch(svg, dimensionsToUpdate)
newWidth := fmt.Sprintf(`width="%s"`, strconv.Itoa(viewboxWidth)) newWidth := fmt.Sprintf(`width="%s"`, strconv.Itoa(viewboxWidth))
newHeight := fmt.Sprintf(`height="%s"`, strconv.Itoa(viewboxHeight)) newHeight := fmt.Sprintf(`height="%s"`, strconv.Itoa(viewboxHeight))
svg = strings.Replace(svg, viewboxMatches[0][0], newOuterViewbox, 1) svg = strings.Replace(svg, viewboxMatches[0][0], newOuterViewbox, 1)
svg = strings.Replace(svg, viewboxMatch[0], newViewbox, 1) svg = strings.Replace(svg, viewboxMatch[0], newViewbox, 1)
for i := 0; i < 2; i++ { for i := 0; i < dimensionsToUpdate; i++ {
svg = strings.Replace(svg, widthMatches[i][0], newWidth, 1) svg = strings.Replace(svg, widthMatches[i][0], newWidth, 1)
svg = strings.Replace(svg, heightMatches[i][0], newHeight, 1) svg = strings.Replace(svg, heightMatches[i][0], newHeight, 1)
} }