X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Readme;h=436e6b35bec11b399be80500296c602c3b069f72;hb=8092994319f38eda5005e2896d9bdffe583fec4a;hp=b8abf114e3ad83d4b8ac4110057b45a764ddc5e3;hpb=3722474e4fb8de564a4952e4cff24b926bc82743;p=ttf2png.git

diff --git a/Readme b/Readme
index b8abf11..436e6b3 100644
--- a/Readme
+++ b/Readme
@@ -22,10 +22,11 @@ Command-line options
     Number of characters to put in one line.  Defaults to autodetect.  Ignored
     if -p is used.
 
-  -c <pixels>
-    Character cell size.  The special values auto and autorect may be used to
-    choose an autodetected square or rectangle cell, respectively.  Defaults to
-    autodetected square.  Ignored if -p is used.
+  -c <pixels>[x<pixels>]
+    Character cell size.  If only a single number is given, a square cell is
+    used.  The special values auto and autorect may be used to choose an
+    autodetected square or rectangle cell, respectively.  The default is auto.
+    Ignored if -p is used.
 
   -o <filename>
     Output file name.  Use - for stdout; the output is a png image, so it's
@@ -56,6 +57,14 @@ Command-line options
     definition file is recommended, as the resulting image can seem rather
     messy.
 
+  -m <pixels>
+    Leave a margin around the edges of the generated image.  By default glyphs
+    can touch the edges.  Only used with -p.
+
+  -n <pixels>
+    Control the amount of padding between glyphs.  The default is 1 pixel.
+    Only used with -p.
+
   -d
     File name to write glyph definitions.  See the section below for details.
 
@@ -70,17 +79,17 @@ information, called font metrics.  To that end, ttf2png can write a definition
 file alongside the image.
 
 The basic format is line-based.  Empty lines, or those starting with a hash
-sign (#), should be ignored.  Data lines consist of fields separated with
-spaces.
+sign (#), should be ignored.  Data lines consist of a keyword followed by
+space-separated fields.
 
-The first data line contains five fields with overall information about the
-image and the font:
+The keyword "font" is followed by five fields with overall information about
+the image and the font:
 
   Fields 1-2: width and height of the image
   Field 3: nominal size of the font
   Fields 4-5: ascent and descent of the font
 
-Subsequent data lines each describe a single glyph and contain eight fields:
+The keyword "glyph" is followed by eight fields describing a single glyph:
 
   Field 1: the code point of the glyph
   Fields 2-3: x and y position of the glyph in the image
@@ -88,6 +97,13 @@ Subsequent data lines each describe a single glyph and contain eight fields:
   Fields 6-7: x and y offset of the glyph from its base point
   Field 8: advance from this glyph to the next
 
+The keyword "kern" is followed by three fields describing kerning between two
+glyphs:
+
+  Field 1: the code point of the left-hand glyph
+  Field 2: the code point of the right-hand glyph
+  Field 3: kerning distance between the glyphs
+
 The following ASCII art image illustrates most of these metrics.  Note that in
 some fonts, not all of the glyphs fit completely inside the character box.
 
@@ -116,10 +132,15 @@ some fonts, not all of the glyphs fit completely inside the character box.
 
 Changelog
 
-next
+1.1
+- Controllable margin and padding in packed mode
+- Do not generate overly large images in sequential grid mode
+
+1.0
 - Improve the packing algorithm
 - Non-square cells for grid mode
 - Option to invert colors
+- Include kerning information in definition file
 
 0.3
 - Restructure the code