diff --git a/graphics/text/config.py b/graphics/text/config.py index 2c7ddfc9..fa6ac55e 100644 --- a/graphics/text/config.py +++ b/graphics/text/config.py @@ -40,9 +40,12 @@ import re # visually appealing. This is highly dependent on the font graphics, # and if the font is changed this probably needs to be redone. +# TODO: Add more rule for lower-case characters. + FONT_KERNING_RULES = { # Right character fits under left character: r'[TY][07ACOSZ]': -2, + r'[TYty][a]': -2, r'P[A]': -3, r'P[7]': -2, r'P[Z]': -1, @@ -61,6 +64,9 @@ FONT_KERNING_RULES = { r'Q[Y]': -1, r'A[TYV]': -2, r'A[GC]': -1, + r'a[TYty]': -2, + r'a[vV]': -2, + r'a[g]': -1, # Fits into "hole" in left character: r'[BCX8][0CGOQ]': -2, diff --git a/graphics/text/font/denex_bigfont_imagetool.pcx b/graphics/text/font/denex_bigfont_imagetool.pcx index 485b7d47..0ac5605e 100644 Binary files a/graphics/text/font/denex_bigfont_imagetool.pcx and b/graphics/text/font/denex_bigfont_imagetool.pcx differ diff --git a/graphics/text/fontchars/font047.gif b/graphics/text/fontchars/font047.gif index ccc7c806..e85126b3 100644 Binary files a/graphics/text/fontchars/font047.gif and b/graphics/text/fontchars/font047.gif differ diff --git a/graphics/text/fontchars/font092.gif b/graphics/text/fontchars/font092.gif index d430a326..e77e0fa4 100644 Binary files a/graphics/text/fontchars/font092.gif and b/graphics/text/fontchars/font092.gif differ diff --git a/graphics/text/fontchars/font097.gif b/graphics/text/fontchars/font097.gif new file mode 100644 index 00000000..7ca4657e Binary files /dev/null and b/graphics/text/fontchars/font097.gif differ diff --git a/graphics/text/fontchars/font098.gif b/graphics/text/fontchars/font098.gif new file mode 100644 index 00000000..863df681 Binary files /dev/null and b/graphics/text/fontchars/font098.gif differ diff --git a/graphics/text/fontchars/font099.gif b/graphics/text/fontchars/font099.gif new file mode 100644 index 00000000..d83d6abe Binary files /dev/null and b/graphics/text/fontchars/font099.gif differ diff --git a/graphics/text/fontchars/font100.gif b/graphics/text/fontchars/font100.gif new file mode 100644 index 00000000..a563ab63 Binary files /dev/null and b/graphics/text/fontchars/font100.gif differ diff --git a/graphics/text/fontchars/font101.gif b/graphics/text/fontchars/font101.gif new file mode 100644 index 00000000..74bbd928 Binary files /dev/null and b/graphics/text/fontchars/font101.gif differ diff --git a/graphics/text/fontchars/font102.gif b/graphics/text/fontchars/font102.gif new file mode 100644 index 00000000..b3b6bbc8 Binary files /dev/null and b/graphics/text/fontchars/font102.gif differ diff --git a/graphics/text/fontchars/font103.gif b/graphics/text/fontchars/font103.gif new file mode 100644 index 00000000..3dc04a9e Binary files /dev/null and b/graphics/text/fontchars/font103.gif differ diff --git a/graphics/text/fontchars/font104.gif b/graphics/text/fontchars/font104.gif new file mode 100644 index 00000000..7a926ef2 Binary files /dev/null and b/graphics/text/fontchars/font104.gif differ diff --git a/graphics/text/fontchars/font105.gif b/graphics/text/fontchars/font105.gif new file mode 100644 index 00000000..67d4a184 Binary files /dev/null and b/graphics/text/fontchars/font105.gif differ diff --git a/graphics/text/fontchars/font106.gif b/graphics/text/fontchars/font106.gif new file mode 100644 index 00000000..d28f328b Binary files /dev/null and b/graphics/text/fontchars/font106.gif differ diff --git a/graphics/text/fontchars/font107.gif b/graphics/text/fontchars/font107.gif new file mode 100644 index 00000000..02717061 Binary files /dev/null and b/graphics/text/fontchars/font107.gif differ diff --git a/graphics/text/fontchars/font108.gif b/graphics/text/fontchars/font108.gif new file mode 100644 index 00000000..2083b5cf Binary files /dev/null and b/graphics/text/fontchars/font108.gif differ diff --git a/graphics/text/fontchars/font109.gif b/graphics/text/fontchars/font109.gif new file mode 100644 index 00000000..06b6d904 Binary files /dev/null and b/graphics/text/fontchars/font109.gif differ diff --git a/graphics/text/fontchars/font110.gif b/graphics/text/fontchars/font110.gif new file mode 100644 index 00000000..4d090ad1 Binary files /dev/null and b/graphics/text/fontchars/font110.gif differ diff --git a/graphics/text/fontchars/font111.gif b/graphics/text/fontchars/font111.gif new file mode 100644 index 00000000..b3957cc3 Binary files /dev/null and b/graphics/text/fontchars/font111.gif differ diff --git a/graphics/text/fontchars/font112.gif b/graphics/text/fontchars/font112.gif new file mode 100644 index 00000000..8c7c65c4 Binary files /dev/null and b/graphics/text/fontchars/font112.gif differ diff --git a/graphics/text/fontchars/font113.gif b/graphics/text/fontchars/font113.gif new file mode 100644 index 00000000..98bf9b5a Binary files /dev/null and b/graphics/text/fontchars/font113.gif differ diff --git a/graphics/text/fontchars/font114.gif b/graphics/text/fontchars/font114.gif new file mode 100644 index 00000000..392406cf Binary files /dev/null and b/graphics/text/fontchars/font114.gif differ diff --git a/graphics/text/fontchars/font115.gif b/graphics/text/fontchars/font115.gif new file mode 100644 index 00000000..babb8544 Binary files /dev/null and b/graphics/text/fontchars/font115.gif differ diff --git a/graphics/text/fontchars/font116.gif b/graphics/text/fontchars/font116.gif new file mode 100644 index 00000000..0d0a53fb Binary files /dev/null and b/graphics/text/fontchars/font116.gif differ diff --git a/graphics/text/fontchars/font117.gif b/graphics/text/fontchars/font117.gif new file mode 100644 index 00000000..0d67f010 Binary files /dev/null and b/graphics/text/fontchars/font117.gif differ diff --git a/graphics/text/fontchars/font118.gif b/graphics/text/fontchars/font118.gif new file mode 100644 index 00000000..e2daa1d7 Binary files /dev/null and b/graphics/text/fontchars/font118.gif differ diff --git a/graphics/text/fontchars/font119.gif b/graphics/text/fontchars/font119.gif new file mode 100644 index 00000000..c7454690 Binary files /dev/null and b/graphics/text/fontchars/font119.gif differ diff --git a/graphics/text/fontchars/font120.gif b/graphics/text/fontchars/font120.gif new file mode 100644 index 00000000..9f52850d Binary files /dev/null and b/graphics/text/fontchars/font120.gif differ diff --git a/graphics/text/fontchars/font121.gif b/graphics/text/fontchars/font121.gif new file mode 100644 index 00000000..d82e4973 Binary files /dev/null and b/graphics/text/fontchars/font121.gif differ diff --git a/graphics/text/fontchars/font122.gif b/graphics/text/fontchars/font122.gif new file mode 100644 index 00000000..228a6dc8 Binary files /dev/null and b/graphics/text/fontchars/font122.gif differ diff --git a/graphics/text/fontchars/font123.gif b/graphics/text/fontchars/font123.gif new file mode 100644 index 00000000..bacc7e43 Binary files /dev/null and b/graphics/text/fontchars/font123.gif differ diff --git a/graphics/text/fontchars/font124.gif b/graphics/text/fontchars/font124.gif new file mode 100644 index 00000000..7d756eb3 Binary files /dev/null and b/graphics/text/fontchars/font124.gif differ diff --git a/graphics/text/fontchars/font125.gif b/graphics/text/fontchars/font125.gif new file mode 100644 index 00000000..d725a1c2 Binary files /dev/null and b/graphics/text/fontchars/font125.gif differ diff --git a/graphics/text/fontchars/font126.gif b/graphics/text/fontchars/font126.gif new file mode 100644 index 00000000..8fbe3cfc Binary files /dev/null and b/graphics/text/fontchars/font126.gif differ diff --git a/graphics/text/textgen b/graphics/text/textgen index bfa67550..e0e34c54 100755 --- a/graphics/text/textgen +++ b/graphics/text/textgen @@ -55,10 +55,10 @@ BACKGROUND_COLOR = '#00ffff' # Height of font in pixels. FONT_HEIGHT = 15 -FONT_LC_HEIGHT = 12 +FONT_LC_HEIGHT = 15 #12 # If true, the font only has uppercase characters. -UPPERCASE_FONT = True +UPPERCASE_FONT = False # Width of a space character in pixels. SPACE_WIDTH = 7