Aligning text correctly

Taking advantage of brand new functionality in bytefield-svg
to align the text of box labels.

3 files changed, 52 insertions, 52 deletions

diff --git a/src/images/bytefield/rvc-instr-quad0.adoc b/src/images/bytefield/rvc-instr-quad0.adoc
index 4983092..3587e8e 100644
--- a/src/images/bytefield/rvc-instr-quad0.adoc
+++ b/src/images/bytefield/rvc-instr-quad0.adoc
@@ -11,13 +11,13 @@
 (draw-box "0" {:span 8})
 (draw-box "0" {:span 3})
 (draw-box "00" {:span 2})
-(draw-box (text "Illegal instruction" :math) [:math {:span 7 :borders {}}])
+(draw-box (text "Illegal instruction" :math) [:math {:span 7 :text-anchor "start" :borders {}}])
 
 (draw-box "000" {:span 3})
 (draw-box "nzuimm[5:4|9:6|2|3]" {:span 8})
 (draw-box (text "rd′" [:plain {:font-family "M+ 1p Fallback"}]) {:span 3})
 (draw-box "00" {:span 2})
-(draw-box "C.ADDI4SPN (RES, nzuimm=0)" {:span 7 :borders {}})
+(draw-box "C.ADDI4SPN (RES, nzuimm=0)" {:span 7 :text-anchor "start" :borders {}})
 
 (draw-box "001" {:span 3})
 (draw-box "uimm[5:3]" {:span 3})
@@ -25,7 +25,7 @@
 (draw-box (text "uimm[7:6]" {:font-size 16}) {:span 2})
 (draw-box "rd′" {:span 3})
 (draw-box "00" {:span 2})
-(draw-box "C.FLD (RV32/64)" {:span 7 :borders {}})
+(draw-box "C.FLD (RV32/64)" {:span 7 :text-anchor "start" :borders {}})
 
 (draw-box "001" {:span 3})
 (draw-box "uimm[5:4|8]" {:span 3})
@@ -33,7 +33,7 @@
 (draw-box (text "uimm[7:6]" {:font-size 16}) {:span 2})
 (draw-box "rd′" {:span 3})
 (draw-box "00" {:span 2})
-(draw-box "C.LQ (RV128)" {:span 7 :borders {}})
+(draw-box "C.LQ (RV128)" {:span 7 :text-anchor "start" :borders {}})
 
 (draw-box "010" {:span 3})
 (draw-box "uimm[5:3]" {:span 3})
@@ -41,7 +41,7 @@
 (draw-box (text "uimm[2|6]" {:font-size 16}) {:span 2})
 (draw-box "rd′" {:span 3})
 (draw-box "00" {:span 2})
-(draw-box "C.LW" {:span 7 :borders {}})
+(draw-box "C.LW" {:span 7 :text-anchor "start" :borders {}})
 
 (draw-box "011" {:span 3})
 (draw-box "uimm[5:3]" {:span 3})
@@ -49,7 +49,7 @@
 (draw-box (text "uimm[2|6]" {:font-size 16}) {:span 2})
 (draw-box "rd′" {:span 3})
 (draw-box "00" {:span 2})
-(draw-box "C.FLW (RV32)" {:span 7 :borders {}})
+(draw-box "C.FLW (RV32)" {:span 7 :text-anchor "start" :borders {}})
 
 (draw-box "011" {:span 3})
 (draw-box "uimm[5:3]" {:span 3})
@@ -57,12 +57,12 @@
 (draw-box (text "uimm[7:6]" {:font-size 16}) {:span 2})
 (draw-box "rd′" {:span 3})
 (draw-box "00" {:span 2})
-(draw-box "C.LD (RV64/128)" {:span 7 :borders {}})
+(draw-box "C.LD (RV64/128)" {:span 7 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "---" {:span 11})
 (draw-box "00" {:span 2})
-(draw-box "Reserved" {:span 7 :borders {}})
+(draw-box "Reserved" {:span 7 :text-anchor "start" :borders {}})
 
 (draw-box "101" {:span 3})
 (draw-box "uimm[5:3]" {:span 3})
@@ -70,7 +70,7 @@
 (draw-box (text "uimm[7:6]" {:font-size 16}) {:span 2})
 (draw-box "rs2′" {:span 3})
 (draw-box "00" {:span 2})
-(draw-box "C.FSD (RV32/64)" {:span 7 :borders {}})
+(draw-box "C.FSD (RV32/64)" {:span 7 :text-anchor "start" :borders {}})
 
 (draw-box "101" {:span 3})
 (draw-box "uimm[5:4|8]" {:span 3})
@@ -78,7 +78,7 @@
 (draw-box (text "uimm[7:6]" {:font-size 16}) {:span 2})
 (draw-box "rs2′" {:span 3})
 (draw-box "00" {:span 2})
-(draw-box "C.SQ (RV128)" {:span 7 :borders {}})
+(draw-box "C.SQ (RV128)" {:span 7 :text-anchor "start" :borders {}})
 
 (draw-box "110" {:span 3})
 (draw-box "uimm[5:3]" {:span 3})
@@ -86,7 +86,7 @@
 (draw-box (text "uimm[2|6]" {:font-size 16}) {:span 2})
 (draw-box "rs2′" {:span 3})
 (draw-box "00" {:span 2})
-(draw-box "C.SW" {:span 7 :borders {}})
+(draw-box "C.SW" {:span 7 :text-anchor "start" :borders {}})
 
 (draw-box "111" {:span 3})
 (draw-box "uimm[5:3]" {:span 3})
@@ -94,7 +94,7 @@
 (draw-box (text "uimm[2|6]" {:font-size 16}) {:span 2})
 (draw-box "rs2′" {:span 3})
 (draw-box "00" {:span 2})
-(draw-box "C.FSW (RV32)" {:span 7 :borders {}})
+(draw-box "C.FSW (RV32)" {:span 7 :text-anchor "start" :borders {}})
 
 (draw-box "111" {:span 3})
 (draw-box "uimm[5:3]" {:span 3})
@@ -102,5 +102,5 @@
 (draw-box (text "uimm[7:6]" {:font-size 16}) {:span 2})
 (draw-box "rs2′" {:span 3})
 (draw-box "00" {:span 2})
-(draw-box "C.SD (RV64/128)" {:span 7 :borders {}})
+(draw-box "C.SD (RV64/128)" {:span 7 :text-anchor "start" :borders {}})
 ----
\ No newline at end of file
diff --git a/src/images/bytefield/rvc-instr-quad1.adoc b/src/images/bytefield/rvc-instr-quad1.adoc
index 86d84be..3579a4a 100644
--- a/src/images/bytefield/rvc-instr-quad1.adoc
+++ b/src/images/bytefield/rvc-instr-quad1.adoc
@@ -12,47 +12,47 @@
 (draw-box "0" {:span 5})
 (draw-box "nzimm[4:0]" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.NOP (HINT, nzimm̸=0)" {:span 8 :borders {}})
+(draw-box "C.NOP (HINT, nzimm̸=0)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "000" {:span 3})
 (draw-box "nzimm[5]" {:span 1})
 (draw-box "rs1/rd≠0" {:span 5})
 (draw-box "nzimm[4:0]" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.ADDI (HINT, nzimm=0)" {:span 8 :borders {}})
+(draw-box "C.ADDI (HINT, nzimm=0)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "001" {:span 3})
 (draw-box "imm[11|4|9:8|10|6|7|3:1|5]" {:span 11})
 (draw-box "01" {:span 2})
-(draw-box "C.JAL (RV32)" {:span 8 :borders {}})
+(draw-box "C.JAL (RV32)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "001" {:span 3})
 (draw-box "imm[5]" {:span 1})
 (draw-box "rs1/rd≠0" {:span 5})
 (draw-box "imm[4:0]" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.ADDIW (RV64/128; RES, rd=0)" {:span 8 :borders {}})
+(draw-box "C.ADDIW (RV64/128; RES, rd=0)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "010" {:span 3})
 (draw-box "imm[5]" {:span 1})
 (draw-box "rd̸=0" {:span 5})
 (draw-box "imm[4:0]" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.LI (HINT, rd=0)" {:span 8 :borders {}})
+(draw-box "C.LI (HINT, rd=0)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "011" {:span 3})
 (draw-box "nzimm[9]" {:span 1})
 (draw-box "2" {:span 5})
 (draw-box "imm[4:0]" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.ADDI16SP (RES, nzimm=0)" {:span 8 :borders {}})
+(draw-box "C.ADDI16SP (RES, nzimm=0)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "011" {:span 3})
 (draw-box "nzimm[17]" {:span 1})
 (draw-box "rd̸={0, 2}" {:span 5})
 (draw-box "nzimm[16:12]" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.LUI (RES, nzimm=0; HINT, rd=0)" {:span 8 :borders {}})
+(draw-box "C.LUI (RES, nzimm=0; HINT, rd=0)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "nzuimm[5]" {:span 1})
@@ -60,7 +60,7 @@
 (draw-box "rs1ʹ/rdʹ" {:span 3})
 (draw-box "nzuimm[4:0]" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.SRLI (RV32 Custom, nzuimm[5]=1)" {:span 8 :borders {}})
+(draw-box "C.SRLI (RV32 Custom, nzuimm[5]=1)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "0" {:span 1})
@@ -68,7 +68,7 @@
 (draw-box "rs1ʹ/rdʹ" {:span 3})
 (draw-box "0" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.SRLI64 (RV128; RV32/64 HINT)" {:span 8 :borders {}})
+(draw-box "C.SRLI64 (RV128; RV32/64 HINT)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "nzuimm[5]" {:span 1})
@@ -76,7 +76,7 @@
 (draw-box "rs1ʹ/rdʹ" {:span 3})
 (draw-box "nzuimm[4:0]" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.SRAI (RV32 Custom, nzuimm[5]=1)" {:span 8 :borders {}})
+(draw-box "C.SRAI (RV32 Custom, nzuimm[5]=1)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "0" {:span 1})
@@ -84,7 +84,7 @@
 (draw-box "rs1ʹ/rdʹ" {:span 3})
 (draw-box "0" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.SRAI64 (RV128; RV32/64 HINT)" {:span 8 :borders {}})
+(draw-box "C.SRAI64 (RV128; RV32/64 HINT)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "imm[5]" {:span 1})
@@ -92,7 +92,7 @@
 (draw-box "rs1ʹ/rdʹ" {:span 3})
 (draw-box "imm[4:0]" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.ANDI" {:span 8 :borders {}})
+(draw-box "C.ANDI" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "0" {:span 1})
@@ -101,7 +101,7 @@
 (draw-box "00" {:span 2})
 (draw-box "rs2′" {:span 3})
 (draw-box "01" {:span 2})
-(draw-box "C.SUB" {:span 8 :borders {}})
+(draw-box "C.SUB" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "0" {:span 1})
@@ -110,7 +110,7 @@
 (draw-box "01" {:span 2})
 (draw-box "rs2′" {:span 3})
 (draw-box "01" {:span 2})
-(draw-box "C.XOR (RV64/128)" {:span 8 :borders {}})
+(draw-box "C.XOR (RV64/128)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "0" {:span 1})
@@ -119,7 +119,7 @@
 (draw-box "10" {:span 2})
 (draw-box "rs2′" {:span 3})
 (draw-box "01" {:span 2})
-(draw-box "C.OR" {:span 8 :borders {}})
+(draw-box "C.OR" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "0" {:span 1})
@@ -128,7 +128,7 @@
 (draw-box "11" {:span 2})
 (draw-box "rs2′" {:span 3})
 (draw-box "01" {:span 2})
-(draw-box "C.AND" {:span 8 :borders {}})
+(draw-box "C.AND" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "1" {:span 1})
@@ -137,7 +137,7 @@
 (draw-box "00" {:span 2})
 (draw-box "rs2′" {:span 3})
 (draw-box "01" {:span 2})
-(draw-box "C.SUBW (RV64/128; RV32 RES)" {:span 8 :borders {}})
+(draw-box "C.SUBW (RV64/128; RV32 RES)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "1" {:span 1})
@@ -146,7 +146,7 @@
 (draw-box "01" {:span 2})
 (draw-box "rs2′" {:span 3})
 (draw-box "01" {:span 2})
-(draw-box "C.ADDW (RV64/128; RV32 RES)" {:span 8 :borders {}})
+(draw-box "C.ADDW (RV64/128; RV32 RES)" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "1" {:span 1})
@@ -155,7 +155,7 @@
 (draw-box "10" {:span 2})
 (draw-box "---" {:span 3})
 (draw-box "01" {:span 2})
-(draw-box "Reserved" {:span 8 :borders {}})
+(draw-box "Reserved" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "1" {:span 1})
@@ -164,24 +164,24 @@
 (draw-box "11" {:span 2})
 (draw-box "---" {:span 3})
 (draw-box "01" {:span 2})
-(draw-box "Reserved" {:span 8 :borders {}})
+(draw-box "Reserved" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "101" {:span 3})
 (draw-box "imm[11|4|9:8|10|6|7|3:1|5]" {:span 11})
 (draw-box "01" {:span 2})
-(draw-box "C.J" {:span 8 :borders {}})
+(draw-box "C.J" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "110" {:span 3})
 (draw-box "imm[8|4:3]" {:span 3})
 (draw-box "rs1′" {:span 3})
 (draw-box "imm[7:6|2:1|5]" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.BEQZ" {:span 8 :borders {}})
+(draw-box "C.BEQZ" {:span 8 :text-anchor "start" :borders {}})
 
 (draw-box "111" {:span 3})
 (draw-box "imm[8|4:3]" {:span 3})
 (draw-box "rs1′" {:span 3})
 (draw-box "imm[7:6|2:1|5]" {:span 5})
 (draw-box "01" {:span 2})
-(draw-box "C.BNEZ" {:span 8 :borders {}})
+(draw-box "C.BNEZ" {:span 8 :text-anchor "start" :borders {}})
 ----
\ No newline at end of file
diff --git a/src/images/bytefield/rvc-instr-quad2.adoc b/src/images/bytefield/rvc-instr-quad2.adoc
index c3db844..0bb2cb2 100644
--- a/src/images/bytefield/rvc-instr-quad2.adoc
+++ b/src/images/bytefield/rvc-instr-quad2.adoc
@@ -12,105 +12,105 @@
 (draw-box "rs1/rd≠0" {:span 5})
 (draw-box "nzuimm[4:0]" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.SLLI (HINT, rd=0; RV32 Custom, nzuimm[5]=1)" {:span 9 :borders {}})
+(draw-box "C.SLLI (HINT, rd=0; RV32 Custom, nzuimm[5]=1)" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "000" {:span 3})
 (draw-box "0" {:span 1})
 (draw-box "rs1/rd≠0" {:span 5})
 (draw-box "0" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.SLLI64 (RV128; RV32/64 HINT; HINT, rd=0)" {:span 9 :borders {}})
+(draw-box "C.SLLI64 (RV128; RV32/64 HINT; HINT, rd=0)" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "001" {:span 3})
 (draw-box "uimm[5]" {:span 1})
 (draw-box "rd" {:span 5})
 (draw-box "uimm[4:3|8:6]" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.FLDSP (RV32/64)" {:span 9 :borders {}})
+(draw-box "C.FLDSP (RV32/64)" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "001" {:span 3})
 (draw-box "uimm[5]" {:span 1})
 (draw-box "rd≠0" {:span 5})
 (draw-box "uimm[4|9:6]" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.LWSP (RES, rd=0)" {:span 9 :borders {}})
+(draw-box "C.LWSP (RES, rd=0)" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "011" {:span 3})
 (draw-box "uimm[5]" {:span 1})
 (draw-box "rd" {:span 5})
 (draw-box "uimm[4:2|7:6]" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.FLWSP (RV32)" {:span 9 :borders {}})
+(draw-box "C.FLWSP (RV32)" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "011" {:span 3})
 (draw-box "uimm[5]" {:span 1})
 (draw-box "rd≠0" {:span 5})
 (draw-box "uimm[4:3|8:6]" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.LDSP (RV64/128; RES, rd=0)" {:span 9 :borders {}})
+(draw-box "C.LDSP (RV64/128; RES, rd=0)" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "0" {:span 1})
 (draw-box "rs1≠0" {:span 5})
 (draw-box "0" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.JR (RES, rs1=0)" {:span 9 :borders {}})
+(draw-box "C.JR (RES, rs1=0)" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "0" {:span 1})
 (draw-box "rd≠0" {:span 5})
 (draw-box "rs2≠0" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.MV (HINT, rd=0)" {:span 9 :borders {}})
+(draw-box "C.MV (HINT, rd=0)" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "1" {:span 1})
 (draw-box "0" {:span 5})
 (draw-box "0" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.EBREAK" {:span 9 :borders {}})
+(draw-box "C.EBREAK" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "1" {:span 1})
 (draw-box "rs1≠0" {:span 5})
 (draw-box "0" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.JALR" {:span 9 :borders {}})
+(draw-box "C.JALR" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "100" {:span 3})
 (draw-box "1" {:span 1})
 (draw-box "rs1/rd≠0" {:span 5})
 (draw-box "rs2≠0" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.ADD (HINT, rd=0)" {:span 9 :borders {}})
+(draw-box "C.ADD (HINT, rd=0)" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "101" {:span 3})
 (draw-box "uimm[5:3|8:6]" {:span 6})
 (draw-box "rs2" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.FSDSP (RV32/64)" {:span 9 :borders {}})
+(draw-box "C.FSDSP (RV32/64)" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "101" {:span 3})
 (draw-box "uimm[5:4|9:6]" {:span 6})
 (draw-box "rs2" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.SQSP (RV128)" {:span 9 :borders {}})
+(draw-box "C.SQSP (RV128)" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "110" {:span 3})
 (draw-box "uimm[5:2|7:6]" {:span 6})
 (draw-box "rs2" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.SWSP" {:span 9 :borders {}})
+(draw-box "C.SWSP" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "111" {:span 3})
 (draw-box "uimm[5:2|7:6]" {:span 6})
 (draw-box "rs2" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.FSWSP (RV32)" {:span 9 :borders {}})
+(draw-box "C.FSWSP (RV32)" {:span 9 :text-anchor "start" :borders {}})
 
 (draw-box "111" {:span 3})
 (draw-box "uimm[5:3|8:6]" {:span 6})
 (draw-box "rs2" {:span 5})
 (draw-box "10" {:span 2})
-(draw-box "C.SDSP (RV64/128)" {:span 9 :borders {}})
+(draw-box "C.SDSP (RV64/128)" {:span 9 :text-anchor "start" :borders {}})
 ----
\ No newline at end of file