resolve conflicts

ci/release/changelogs/next.md

@@ -8,6 +8,8 @@
 
 #### Improvements 🧹
 
+- Code snippets use bold and italic font styles as determined by highlighter [#710](https://github.com/terrastruct/d2/issues/710), [#741](https://github.com/terrastruct/d2/issues/741)
+
 #### Bugfixes ⛑️
 
 - Fixes groups overlapping in sequence diagrams when they end in a self loop. [#728](https://github.com/terrastruct/d2/pull/728)

d2renderers/d2svg/code.go

@@ -47,7 +47,8 @@ func styleAttr(styles map[chroma.TokenType]string, tt chroma.TokenType) string {
 			}
 		}
 	}
-	return styles[tt]
+	out := strings.Replace(styles[tt], `font-weight="bold"`, `class="text-mono-bold"`, -1)
+	return strings.Replace(out, `font-style="italic"`, `class="text-mono-italic"`, -1)
 }
 
 // <<< END

d2renderers/d2svg/d2svg.go

@@ -1300,6 +1300,82 @@ func embedFonts(buf *bytes.Buffer, fontFamily *d2fonts.FontFamily) string {
 		}
 	}
 
+	triggers = []string{
+		`class="text-mono-bold"`,
+	}
+
+	for _, t := range triggers {
+		if strings.Contains(content, t) {
+			fmt.Fprintf(buf, `
+.text-mono-bold {
+	font-family: "font-mono-bold";
+}
+@font-face {
+	font-family: font-mono-bold;
+	src: url("%s");
+}`,
+				d2fonts.FontEncodings[d2fonts.SourceCodePro.Font(0, d2fonts.FONT_STYLE_BOLD)])
+			break
+		}
+	}
+
+	triggers = []string{
+		`class="text-mono-italic"`,
+	}
+
+	for _, t := range triggers {
+		if strings.Contains(content, t) {
+			fmt.Fprintf(buf, `
+.text-mono-italic {
+	font-family: "font-mono-italic";
+}
+@font-face {
+	font-family: font-mono-italic;
+	src: url("%s");
+}`,
+				d2fonts.FontEncodings[d2fonts.SourceCodePro.Font(0, d2fonts.FONT_STYLE_ITALIC)])
+			break
+		}
+	}
+
+	triggers = []string{
+		`class="text-mono-bold"`,
+	}
+
+	for _, t := range triggers {
+		if strings.Contains(content, t) {
+			fmt.Fprintf(buf, `
+.text-mono-bold {
+	font-family: "font-mono-bold";
+}
+@font-face {
+	font-family: font-mono-bold;
+	src: url("%s");
+}`,
+				d2fonts.FontEncodings[d2fonts.SourceCodePro.Font(0, d2fonts.FONT_STYLE_BOLD)])
+			break
+		}
+	}
+
+	triggers = []string{
+		`class="text-mono-italic"`,
+	}
+
+	for _, t := range triggers {
+		if strings.Contains(content, t) {
+			fmt.Fprintf(buf, `
+.text-mono-italic {
+	font-family: "font-mono-italic";
+}
+@font-face {
+	font-family: font-mono-italic;
+	src: url("%s");
+}`,
+				d2fonts.FontEncodings[d2fonts.SourceCodePro.Font(0, d2fonts.FONT_STYLE_ITALIC)])
+			break
+		}
+	}
+
 	triggers = []string{
 		`sketch-overlay-bright`,
 	}