Adjusting fonts and row size.

Moved all rows to be 32 boxes to accommodate 24 pt fonts.

2 files changed, 52 insertions, 48 deletions

diff --git a/src/images/bytefield/sstatus32-1.edn b/src/images/bytefield/sstatus32-1.edn
index 2d6d39f..2c0e102 100644
--- a/src/images/bytefield/sstatus32-1.edn
+++ b/src/images/bytefield/sstatus32-1.edn
@@ -1,32 +1,36 @@
 [bytefield]
 ----
-(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 16}])
-(def row-height 30 )
+(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 20)
+(def left-margin 30)
+(def right-margin 30)
+(def boxes-per-row 32)
 
+(draw-box nil {:span 6 :borders {}})
 (draw-box "31" {:span 2 :borders {}})
 (draw-box "30" {:span 4 :text-anchor "start" :borders {}})
 (draw-box "20" {:span 4 :text-anchor "end" :borders {}})
 (draw-box "19" {:span 3 :borders {}})
 (draw-box "18" {:span 3 :borders {}})
 (draw-box "17" {:span 3 :borders {}})
-(draw-box nil {:span 1 :borders {}})
+(draw-box nil {:span 7 :borders {}})
 
+(draw-box nil {:span 6 :borders{}})
 (draw-box "SD" {:span 2})
-(draw-box (text "WPRI" {:font-weight "bold"}) {:span 8})
+(draw-box (text "WPRI" {:font-weight "bold" :font-size 24}) {:span 8})
 (draw-box "MXR" {:span 3})
 (draw-box "SUM" {:span 3})
-(draw-box (text "WPRI" {:font-weight "bold"}) {:span 3})
-(draw-box nil {:borders {:top :border-unrelated :bottom :border-unrelated :left :border-unrelated}})
+(draw-box (text "WPRI" {:font-weight "bold" :font-size 24}) {:span 3})
+(draw-box nil {:span 1 :borders {:top :border-unrelated :bottom :border-unrelated :left :border-unrelated}})
+(draw-box nil {:span 6 :borders {}})
 
+(draw-box nil {:span 6 :borders{}})
 (draw-box "1" {:span 2 :borders {}})
 (draw-box "11" {:span 8 :borders {}})
 (draw-box "1" {:span 3 :borders {}})
 (draw-box "1" {:span 3 :borders {}})
 (draw-box "1" {:span 3 :borders {}})
-(draw-box nil {:span 1 :borders {}})
+(draw-box nil {:span 7 :borders {}})
 
 ----
\ No newline at end of file
diff --git a/src/images/bytefield/sstatus32-2.edn b/src/images/bytefield/sstatus32-2.edn
index b502dc0..55f01e4 100644
--- a/src/images/bytefield/sstatus32-2.edn
+++ b/src/images/bytefield/sstatus32-2.edn
@@ -1,53 +1,53 @@
 [bytefield]
 ----
-(defattrs :plain [:plain {:font-family "M+ 1p Fallback" :font-size 16}])
-(def row-height 30 )
+(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 20)
+(def left-margin 30)
+(def right-margin 30)
+(def boxes-per-row 32)
 
 (draw-box nil {:span 1 :borders {}})
-(draw-box "16" {:span 1 :borders {}})
-(draw-box "15" {:span 1 :borders {}})
-(draw-box "14" {:span 1 :borders {}})
-(draw-box "13" {:span 1 :borders {}})
-(draw-box "12" {:span 1 :borders {}})
-(draw-box "11" {:span 1 :borders {}})
-(draw-box "10" {:span 1 :borders {}})
-(draw-box "9" {:span 1 :borders {}})
-(draw-box "8" {:span 1 :borders {}})
+(draw-box "16" {:span 2 :borders {}})
+(draw-box "15" {:span 2 :borders {}})
+(draw-box "14" {:span 2 :borders {}})
+(draw-box "13" {:span 2 :borders {}})
+(draw-box "12" {:span 2 :borders {}})
+(draw-box "11" {:span 2 :borders {}})
+(draw-box "10" {:span 2 :borders {}})
+(draw-box "9" {:span 2 :borders {}})
+(draw-box "8" {:span 2 :borders {}})
 (draw-box "7" {:span 2 :borders {}})
-(draw-box "6" {:span 1 :borders {}})
-(draw-box "5" {:span 1 :borders {}})
-(draw-box "4" {:span 2 :borders {}})
-(draw-box "2" {:span 1 :borders {}})
-(draw-box "1" {:span 1 :borders {}})
+(draw-box "6" {:span 2 :borders {}})
+(draw-box "5" {:span 2 :borders {}})
+(draw-box "4" {:span 2 :text-anchor "start" :borders {}})
+(draw-box "2" {:span 1 :text-anchor "end" :borders {}})
+(draw-box "1" {:span 2 :borders {}})
 (draw-box "0" {:span 2 :borders {}})
 
 (draw-box nil {:span 1 :borders {:top :border-unrelated :bottom :border-unrelated}})
-(draw-box "XS[1:0]" {:span 2 })
-(draw-box "FS[1:0]" {:span 2})
-(draw-box (text "WPRI" {:font-weight "bold"}) {:span 2})
-(draw-box "VS[1:0]" {:span 2})
-(draw-box "SPP" {:span 1})
-(draw-box (text "WPRI" {:font-weight "bold"}) {:span 2})
-(draw-box "UBE" {:span 1})
-(draw-box "SPIE" {:span 1})
-(draw-box (text "WPRI" {:font-weight "bold"}) {:span 3})
-(draw-box "SIE" {:span 1})
-(draw-box (text "WPRI" {:font-weight "bold"}) {:span 2})
+(draw-box "XS[1:0]" {:span 4 })
+(draw-box "FS[1:0]" {:span 4})
+(draw-box (text "WPRI" {:font-weight "bold" :font-size 24}) {:span 4})
+(draw-box "VS[1:0]" {:span 4})
+(draw-box "SPP" {:span 2})
+(draw-box (text "WPRI" {:font-weight "bold" :font-size 24}) {:span 2})
+(draw-box "UBE" {:span 2})
+(draw-box "SPIE" {:span 2})
+(draw-box (text "WPRI" {:font-weight "bold" :font-size 24}) {:span 3})
+(draw-box "SIE" {:span 2})
+(draw-box (text "WPRI" {:font-weight "bold" :font-size 24}) {:span 2})
 
 (draw-box nil {:span 1 :borders {}})
-(draw-box "2" {:span 2 :borders {}})
-(draw-box "2" {:span 2 :borders {}})
-(draw-box "2" {:span 2 :borders {}})
-(draw-box "2" {:span 2 :borders {}})
-(draw-box "1" {:span 1 :borders {}})
+(draw-box "2" {:span 4 :borders {}})
+(draw-box "2" {:span 4 :borders {}})
+(draw-box "2" {:span 4 :borders {}})
+(draw-box "2" {:span 4 :borders {}})
+(draw-box "1" {:span 2 :borders {}})
+(draw-box "1" {:span 2 :borders {}})
+(draw-box "1" {:span 2 :borders {}})
 (draw-box "1" {:span 2 :borders {}})
-(draw-box "1" {:span 1 :borders {}})
-(draw-box "1" {:span 1 :borders {}})
 (draw-box "3" {:span 3 :borders {}})
-(draw-box "1" {:span 1 :borders {}})
+(draw-box "1" {:span 2 :borders {}})
 (draw-box "1" {:span 2 :borders {}})
 ----
\ No newline at end of file