fix latex uppercasing

terrastruct · Mar 30, 2023 · 76cc889 · 76cc889
1 parent 273f5d3
commit 76cc889
Show file tree

Hide file tree

Showing 7 changed files with 369 additions and 193 deletions.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -14,3 +14,4 @@
 
 - prevent an object's `near` from targeting a text near a constant. [#1100](https://github.com/terrastruct/d2/pull/1100)
 - fixes inaccurate bold edge label padding. [#1108](https://github.com/terrastruct/d2/pull/1108)
+- Prevents Latex blocks from being uppercased in special themes. [#1111](https://github.com/terrastruct/d2/pull/1111)
diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go
@@ -1305,7 +1305,9 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
 		}
 
 		if g.Theme != nil && g.Theme.SpecialRules.CapsLock && !strings.EqualFold(obj.Attributes.Shape.Value, d2target.ShapeCode) {
-			obj.Attributes.Label.Value = strings.ToUpper(obj.Attributes.Label.Value)
+			if obj.Attributes.Language != "latex" {
+				obj.Attributes.Label.Value = strings.ToUpper(obj.Attributes.Label.Value)
+			}
 		}
 
 		labelDims, err := obj.GetLabelSize(mtexts, ruler, fontFamily)
@@ -1455,7 +1457,9 @@ func (g *Graph) Texts() []*d2target.MText {
 		if obj.Attributes.Label.Value != "" {
 			text := obj.Text()
 			if capsLock && !strings.EqualFold(obj.Attributes.Shape.Value, d2target.ShapeCode) {
-				text.Text = strings.ToUpper(text.Text)
+				if obj.Attributes.Language != "latex" {
+					text.Text = strings.ToUpper(text.Text)
+				}
 			}
 			texts = appendTextDedup(texts, text)
 		}

diff --git a/e2etests/testdata/themes/terminal/dagre/board.exp.json b/e2etests/testdata/themes/terminal/dagre/board.exp.json
diff --git a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg
diff --git a/e2etests/testdata/themes/terminal/elk/board.exp.json b/e2etests/testdata/themes/terminal/elk/board.exp.json
diff --git a/e2etests/testdata/themes/terminal/elk/sketch.exp.svg b/e2etests/testdata/themes/terminal/elk/sketch.exp.svg
diff --git a/e2etests/themes_test.go b/e2etests/themes_test.go
@@ -104,7 +104,11 @@ func main() {
 }
 |
 
-markdown -> code
+markdown -> code -> ex
+ex: |tex
+	\\displaylines{x = a + b \\\\ y = b + c}
+	\\sum_{k=1}^{n} h_{k} \\int_{0}^{1} \\bigl(\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\partial_{k} f(a)\\bigr) \\,dt
+|
 `,
 		},
 		{
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,3 +14,4 @@

		- prevent an object's `near` from targeting a text near a constant. [#1100](https://github.com/terrastruct/d2/pull/1100)
		- fixes inaccurate bold edge label padding. [#1108](https://github.com/terrastruct/d2/pull/1108)
		- Prevents Latex blocks from being uppercased in special themes. [#1111](https://github.com/terrastruct/d2/pull/1111)