Set fonts and boxes per row

Set font size to 24.
Set margins to 30.
Set boxes per row to 32.

3 files changed, 29 insertions, 29 deletions

diff --git a/src/images/bytefield/htinstreg.edn b/src/images/bytefield/htinstreg.edn
index 615fbd8..d9852bd 100644
--- a/src/images/bytefield/htinstreg.edn
+++ b/src/images/bytefield/htinstreg.edn
@@ -1,10 +1,10 @@
 [bytefield]
 ----
-(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 20}])
+(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 24}])
 (def row-height 40 )
 (def row-header-fn nil)
-(def left-margin 100)
-(def right-margin 100)
+(def left-margin 30)
+(def right-margin 30)
 (def boxes-per-row 32)
 
 (draw-box "HSXLEN-1" {:span 31 :text-anchor "start" :borders {}})
diff --git a/src/images/bytefield/rv32hgatp.edn b/src/images/bytefield/rv32hgatp.edn
index 8877c67..076c02a 100644
--- a/src/images/bytefield/rv32hgatp.edn
+++ b/src/images/bytefield/rv32hgatp.edn
@@ -1,30 +1,30 @@
 [bytefield]
 ----
-(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 22}])
+(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 24}])
 (def row-height 40 )
 (def row-header-fn nil)
-(def left-margin 100)
-(def right-margin 100)
-(def boxes-per-row 35)
+(def left-margin 30)
+(def right-margin 30)
+(def boxes-per-row 32)
 
 (draw-box "31" {:span 3 :borders {}})
 (draw-box "30" {:span 3 :text-anchor "start" :borders {}})
-(draw-box "29" {:span 5 :text-anchor "end" :borders {}})
+(draw-box "29" {:span 4 :text-anchor "end" :borders {}})
 (draw-box "28" {:span 4 :text-anchor "start" :borders {}})
-(draw-box "22" {:span 4 :text-anchor "end" :borders {}})
-(draw-box "21" {:span 8 :text-anchor "start" :borders {}})
+(draw-box "22" {:span 3 :text-anchor "end" :borders {}})
+(draw-box "21" {:span 7 :text-anchor "start" :borders {}})
 (draw-box "0" {:span 8 :text-anchor "end" :borders {}})
 
 (draw-box "MODE" {:span 3})
 (draw-box "0" {:span 3 :text-anchor "end" :borders {:left :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
-(draw-box (text "(WARL)" {:font-weight "bold" :font-size 22}) {:span 5 :text-anchor "start":borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
+(draw-box (text "(WARL)" {:font-weight "bold" :font-size 24}) {:span 4 :text-anchor "start":borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
 (draw-box "VMID" {:span 4 :text-anchor "end" :borders {:left :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
-(draw-box (text "(WARL)" {:font-weight "bold" :font-size 22}) {:span 4 :text-anchor "start" :borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
-(draw-box "PPN" {:span 8 :text-anchor "end":borders {:left :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
-(draw-box (text "(WARL)" {:font-weight "bold" :font-size 22}) {:span 8 :text-anchor "start" :borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
+(draw-box (text "(WARL)" {:font-weight "bold" :font-size 24}) {:span 3 :text-anchor "start" :borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
+(draw-box "PPN" {:span 7 :text-anchor "end":borders {:left :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
+(draw-box (text "(WARL)" {:font-weight "bold" :font-size 24}) {:span 8 :text-anchor "start" :borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
 
 (draw-box "1" {:span 3 :borders {}})
-(draw-box "2" {:span 8 :borders {}})
-(draw-box "7" {:span 8 :borders {}})
-(draw-box "22" {:span 16 :borders {}})
+(draw-box "2" {:span 7 :borders {}})
+(draw-box "7" {:span 7 :borders {}})
+(draw-box "22" {:span 15 :borders {}})
 ----
\ No newline at end of file
diff --git a/src/images/bytefield/rv64hgatp.edn b/src/images/bytefield/rv64hgatp.edn
index 11bac5e..bc79235 100644
--- a/src/images/bytefield/rv64hgatp.edn
+++ b/src/images/bytefield/rv64hgatp.edn
@@ -1,11 +1,11 @@
 [bytefield]
 ----
-(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 22}])
+(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 24}])
 (def row-height 40 )
 (def row-header-fn nil)
-(def left-margin 100)
-(def right-margin 100)
-(def boxes-per-row 38)
+(def left-margin 30)
+(def right-margin 30)
+(def boxes-per-row 32)
 
 (draw-box "63" {:span 4 :text-anchor "start" :borders {}})
 (draw-box "60" {:span 4 :text-anchor "end" :borders {}})
@@ -13,20 +13,20 @@
 (draw-box "58" {:span 3 :text-anchor "end" :borders {}})
 (draw-box "57" {:span 4 :text-anchor "start" :borders {}})
 (draw-box "44" {:span 4 :text-anchor "end" :borders {}})
-(draw-box "43" {:span 8 :text-anchor "start" :borders {}})
-(draw-box "0" {:span 8 :text-anchor "end" :borders {}})
+(draw-box "43" {:span 5 :text-anchor "start" :borders {}})
+(draw-box "0" {:span 5 :text-anchor "end" :borders {}})
 
 (draw-box "MODE" {:span 4 :text-anchor "end" :borders {:left :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
-(draw-box (text "(WARL)" {:font-weight "bold" :font-size 22}) {:span 4 :text-anchor "start":borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
+(draw-box (text "(WARL)" {:font-weight "bold" :font-size 24}) {:span 4 :text-anchor "start":borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
 (draw-box "0" {:span 3 :text-anchor "end" :borders {:left :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
-(draw-box (text "(WARL)" {:font-weight "bold" :font-size 22}) {:span 3 :text-anchor "start":borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
+(draw-box (text "(WARL)" {:font-weight "bold" :font-size 24}) {:span 3 :text-anchor "start":borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
 (draw-box "VMID" {:span 4 :text-anchor "end" :borders {:left :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
-(draw-box (text "(WARL)" {:font-weight "bold" :font-size 22}) {:span 4 :text-anchor "start" :borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
-(draw-box "PPN" {:span 8 :text-anchor "end":borders {:left :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
-(draw-box (text "(WARL)" {:font-weight "bold" :font-size 22}) {:span 8 :text-anchor "start" :borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
+(draw-box (text "(WARL)" {:font-weight "bold" :font-size 24}) {:span 4 :text-anchor "start" :borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
+(draw-box "PPN" {:span 5 :text-anchor "end":borders {:left :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
+(draw-box (text "(WARL)" {:font-weight "bold" :font-size 24}) {:span 5 :text-anchor "start" :borders {:right :border-unrelated :top :border-unrelated :bottom :border-unrelated}})
 
 (draw-box "4" {:span 8 :borders {}})
 (draw-box "2" {:span 6 :borders {}})
 (draw-box "14" {:span 8 :borders {}})
-(draw-box "44" {:span 16 :borders {}})
+(draw-box "44" {:span 10 :borders {}})
 ----
\ No newline at end of file