From dc761d2dc2e6e1d6adb17782d67c2869ac0addcb Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@almesberger.net>
Date: Mon, 1 Aug 2016 10:37:24 -0300
Subject: [PATCH] sch2fig/: use #848400 for hierarchical labels et al., not
 #c06000

---
 sch2fig/TODO    | 2 --
 sch2fig/fig.c   | 3 +++
 sch2fig/style.c | 1 +
 sch2fig/style.h | 4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sch2fig/TODO b/sch2fig/TODO
index 0697dd1..f90f699 100644
--- a/sch2fig/TODO
+++ b/sch2fig/TODO
@@ -14,8 +14,6 @@
 - PDF TOC
 - let user set PNG size or zoom level
 - implement dashed lines in cairo.c
-- use correct color for hierarchical items, 0x848400 (or close) instead of
-  COLOR_BROWN2
 - directly pick versions out of git, without requiring checkout to file
 - handle differences
 - parse .kicad_wks
diff --git a/sch2fig/fig.c b/sch2fig/fig.c
index 59b5c31..04ec9f4 100644
--- a/sch2fig/fig.c
+++ b/sch2fig/fig.c
@@ -197,6 +197,9 @@ static void fig_header(void)
 	printf("Single\n");
 	printf("-2\n");
 	printf("1200 2\n");
+
+	/* User32, COLOR_DARK_YELLOW */
+	printf("0 32 #848400\n");
 }
 
 
diff --git a/sch2fig/style.c b/sch2fig/style.c
index c043b6c..7f86798 100644
--- a/sch2fig/style.c
+++ b/sch2fig/style.c
@@ -27,4 +27,5 @@ uint32_t color_rgb[] = {
 	[COLOR_RED3]		= 0xb00000,
 	[COLOR_MAGENTA4]	= 0x900090,
 	[COLOR_BROWN2]		= 0xc06000,
+	[COLOR_DARK_YELLOW]	= 0x848400,
 };
diff --git a/sch2fig/style.h b/sch2fig/style.h
index fc07a05..95e5e39 100644
--- a/sch2fig/style.h
+++ b/sch2fig/style.h
@@ -31,6 +31,8 @@
 #define	COLOR_MAGENTA4		21
 #define	COLOR_BROWN2		26
 
+#define	COLOR_DARK_YELLOW	32	/* user-defined */
+
 #define	COLOR_COMP_DWG		COLOR_RED4
 #define	COLOR_COMP_DWG_BG	COLOR_YELLOW
 #define	COLOR_SHEET_DWG		COLOR_BLUE
@@ -39,7 +41,7 @@
 #define	COLOR_BUS		COLOR_BLUE
 #define	COLOR_NOCONN		COLOR_BLUE
 #define	COLOR_GLABEL		COLOR_RED4
-#define	COLOR_HLABEL		COLOR_BROWN2	/* @@@ */
+#define	COLOR_HLABEL		COLOR_DARK_YELLOW
 #define	COLOR_HSHEET_BOX	COLOR_MAGENTA4
 #define	COLOR_HSHEET_SHEET	COLOR_FIELD
 #define	COLOR_HSHEET_FILE	COLOR_HLABEL