diff --git a/d2compiler/compile.go b/d2compiler/compile.go index ada065e19..5801712b8 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -804,7 +804,7 @@ func (c *compiler) validateKey(obj *d2graph.Object, m *d2ast.Map, mk *d2ast.Key) if reserved == "" { c.errorf(mk.Range.Start, mk.Range.End, "image shapes cannot have children.") } - case d2target.ShapeCircle, d2target.ShapeSquare, d2target.ShapeDoubleCircle: + case d2target.ShapeCircle, d2target.ShapeSquare: checkEqual := (reserved == "width" && obj.Attributes.Height != nil) || (reserved == "height" && obj.Attributes.Width != nil) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index fffed16b9..94c690a26 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -363,7 +363,7 @@ func (obj *Object) GetFill(theme *d2themes.Theme) string { shape := obj.Attributes.Shape.Value - if shape == "" || strings.EqualFold(shape, d2target.ShapeSquare) || strings.EqualFold(shape, d2target.ShapeCircle) || strings.EqualFold(shape, d2target.ShapeDoubleCircle) || strings.EqualFold(shape, d2target.ShapeOval) || strings.EqualFold(shape, d2target.ShapeRectangle) { + if shape == "" || strings.EqualFold(shape, d2target.ShapeSquare) || strings.EqualFold(shape, d2target.ShapeCircle) || strings.EqualFold(shape, d2target.ShapeOval) || strings.EqualFold(shape, d2target.ShapeRectangle) { if level == 1 { if !obj.IsContainer() { return theme.Colors.B6 @@ -1111,7 +1111,7 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler paddingX, paddingY := obj.GetPadding() switch shapeType { - case d2target.ShapeSquare, d2target.ShapeCircle, d2target.ShapeDoubleCircle: + case d2target.ShapeSquare, d2target.ShapeCircle: if desiredWidth != 0 || desiredHeight != 0 { paddingX = 0. paddingY = 0. diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index ef7b9513c..625b24ccd 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -688,20 +688,6 @@ func drawShape(writer io.Writer, targetShape d2target.Shape, sketchRunner *d2ske fmt.Fprint(writer, renderDoubleOval(tl, width, height, style)) } } - // case d2target.ShapeDoubleCircle: - // if targetShape.Multiple { - // fmt.Fprint(writer, renderDoubleCircle(multipleTL, width, height, style)) - // } - // if sketchRunner != nil { - // out, err := d2sketch.DoubleOval(sketchRunner, targetShape) - // if err != nil { - // return "", err - // } - // fmt.Fprintf(writer, out) - // } else { - // fmt.Fprint(writer, renderDoubleCircle(tl, width, height, style)) - // } - case d2target.ShapeImage: fmt.Fprintf(writer, ``, html.EscapeString(targetShape.Icon.String()), diff --git a/d2target/d2target.go b/d2target/d2target.go index 35760cd85..5da6da8f0 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -332,7 +332,6 @@ const ( ShapeSQLTable = "sql_table" ShapeImage = "image" ShapeSequenceDiagram = "sequence_diagram" - ShapeDoubleCircle = "double_circle" ) var Shapes = []string{ @@ -359,7 +358,6 @@ var Shapes = []string{ ShapeSQLTable, ShapeImage, ShapeSequenceDiagram, - ShapeDoubleCircle, } func IsShape(s string) bool {