2007-01-19 Dov Grobgeld <dov.grobgeld@gmail.com>

        * configure.in: Bumped version to 0.6.8

        * src/libpaps.c: Removed warnings.

        * src/paps.c: Added --help info about units.

        * src/paps.1: Added info about units.

3 files changed, 21 insertions, 23 deletions

diff --git a/src/libpaps.c b/src/libpaps.c
index 11abaaf..6081d0d 100644
--- a/src/libpaps.c
+++ b/src/libpaps.c
@@ -155,16 +155,16 @@ void draw_bezier_outline(paps_private_t *paps,
                          double pos_y
                          );
 /* Countour traveling functions */
-static int paps_ps_move_to( FT_Vector* to,
+static int paps_ps_move_to( const FT_Vector* to,
                             void *user_data);
-static int paps_ps_line_to( FT_Vector*  to,
+static int paps_ps_line_to( const FT_Vector*  to,
                             void *user_data);
-static int paps_ps_conic_to( FT_Vector*  control,
-                             FT_Vector*  to,
+static int paps_ps_conic_to( const FT_Vector*  control,
+                             const FT_Vector*  to,
                              void *user_data);
-static int paps_ps_cubic_to( FT_Vector*  control1,
-                             FT_Vector*  control2,
-                             FT_Vector*  to,
+static int paps_ps_cubic_to( const FT_Vector*  control1,
+                             const FT_Vector*  control2,
+                             const FT_Vector*  to,
                              void *user_data);
 static void get_glyph_hash_string(FT_Face face,
                                   PangoGlyphInfo *glyph_info,
@@ -447,10 +447,10 @@ void draw_bezier_outline(paps_private_t *paps,
   /* Output outline */
   static FT_Outline_Funcs ps_outlinefunc = 
     {
-      paps_ps_move_to,
-      paps_ps_line_to,
-      paps_ps_conic_to,
-      paps_ps_cubic_to
+      (FT_Outline_MoveToFunc)paps_ps_move_to,
+      (FT_Outline_LineToFunc )paps_ps_line_to,
+      (FT_Outline_ConicToFunc)paps_ps_conic_to,
+      (FT_Outline_CubicToFunc)paps_ps_cubic_to
     };
   FT_Outline_Funcs *outlinefunc;
   OutlineInfo outline_info;
@@ -574,7 +574,7 @@ void draw_bezier_outline(paps_private_t *paps,
 /*======================================================================
 //  outline traversing functions.
 //----------------------------------------------------------------------*/
-static int paps_ps_move_to( FT_Vector* to,
+static int paps_ps_move_to( const FT_Vector* to,
                             void *user_data)
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
@@ -585,7 +585,7 @@ static int paps_ps_move_to( FT_Vector* to,
   return 0;
 }
 
-static int paps_ps_line_to( FT_Vector*  to,
+static int paps_ps_line_to( const FT_Vector*  to,
                             void *user_data)
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
@@ -597,8 +597,8 @@ static int paps_ps_line_to( FT_Vector*  to,
   return 0;
 }
 
-static int paps_ps_conic_to( FT_Vector*  control,
-                             FT_Vector*  to,
+static int paps_ps_conic_to( const FT_Vector*  control,
+                             const FT_Vector*  to,
                              void *user_data)
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
@@ -612,9 +612,9 @@ static int paps_ps_conic_to( FT_Vector*  control,
   return 0;
 }
 
-static int paps_ps_cubic_to( FT_Vector*  control1,
-                             FT_Vector*  control2,
-                             FT_Vector*  to,
+static int paps_ps_cubic_to( const FT_Vector*  control1,
+                             const FT_Vector*  control2,
+                             const FT_Vector*  to,
                              void *user_data)
 {
   OutlineInfo *outline_info = (OutlineInfo*)user_data;
diff --git a/src/paps.1 b/src/paps.1
index 563bb81..89505bf 100644
--- a/src/paps.1
+++ b/src/paps.1
@@ -44,7 +44,7 @@ Do rtl layout.
 Choose paper size. Known paper sizes are legal, letter, a4. Default is A4.
 .TP
 .B \-\-bottom-margin=bm
-Set bottom margin. Default is 36.
+Set bottom margin in postscript points (1/72 inch). Default is 36.
 .TP
 .B \-\-top-margin=tm
 Set top margin. Default is 36.
@@ -61,7 +61,7 @@ Show summary of options.
 .B \-\-header
 Draw page header for each page.
 .TP
-.B \-\-mark
+.B \-\-markup
 Interpret the text as pango markup.
 .TP
 .B \-\-lpi
diff --git a/src/paps.c b/src/paps.c
index c39d56d..97213c0 100644
--- a/src/paps.c
+++ b/src/paps.c
@@ -296,7 +296,7 @@ int main(int argc, char *argv[])
     {"paper", 0, 0, G_OPTION_ARG_CALLBACK, _paps_arg_paper_cb,
      "Choose paper size. Known paper sizes are legal,\n"
      "                          letter, a4. (Default: a4)", "PAPER"},
-    {"bottom-margin", 0, 0, G_OPTION_ARG_INT, &bottom_margin, "Set bottom margin. (Default: 36)", "NUM"},
+    {"bottom-margin", 0, 0, G_OPTION_ARG_INT, &bottom_margin, "Set bottom margin in postscript point units (1/72inch). (Default: 36)", "NUM"},
     {"top-margin", 0, 0, G_OPTION_ARG_INT, &top_margin, "Set top margin. (Default: 36)", "NUM"},
     {"right-margin", 0, 0, G_OPTION_ARG_INT, &right_margin, "Set right margin. (Default: 36)", "NUM"},
     {"left-margin", 0, 0, G_OPTION_ARG_INT, &left_margin, "Set left margin. (Default: 36)", "NUM"},
@@ -472,8 +472,6 @@ int main(int argc, char *argv[])
       // Now figure out how to scale the font to get that size
       scale = 1 / page_layout.cpi * 72.0 * PANGO_SCALE / max_width;
 
-      fprintf(stderr, "scale = %f\n", scale);
-      
       // update the font size to that width
       pango_font_description_set_size (font_description, (int)(atoi(DEFAULT_FONT_SIZE) * PANGO_SCALE * scale));
       pango_context_set_font_description (pango_context, font_description);