X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fgfx%2Ftext.h;h=aea4b1dd7fbd5a5470284e115a57bf6b6ac7a5ff;hb=a5b1dc3c2884ee2160c6fee43e4a34b83453b87f;hp=bcd29ccecf78cf253a903122952651c68b3e7901;hpb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;p=bertos.git

diff --git a/bertos/gfx/text.h b/bertos/gfx/text.h
index bcd29cce..aea4b1dd 100644
--- a/bertos/gfx/text.h
+++ b/bertos/gfx/text.h
@@ -31,11 +31,16 @@
  *
  * -->
  *
+ * \defgroup text Text handling on graphical displays.
+ * \ingroup graphics
+ * \{
  * \brief Text graphic routines (interface)
  *
  * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
- * \version $Id$
+ *
+ * $WIZ$ module_name = "text"
+ * $WIZ$ module_depends = "bitmap", "line"
  */
 
 #ifndef GFX_TEXT_H
@@ -106,13 +111,16 @@ int text_widthf(struct Bitmap *bm, const char * fmt, ...) FORMAT(__printf__, 2,
 
 /* Text formatting functions for program-memory strings (mware/text_format.c) */
 #if CPU_HARVARD
-#include <mware/pgm.h>
+#include <cpu/pgm.h>
 int text_puts_P(const char * PROGMEM str, struct Bitmap *bm);
 int text_vprintf_P(struct Bitmap *bm, const char * PROGMEM fmt, va_list ap);
 int text_printf_P(struct Bitmap *bm, const char * PROGMEM fmt, ...) FORMAT(__printf__, 2, 3);
+int text_xyvprintf_P(struct Bitmap *bm, coord_t x, coord_t y, uint16_t mode, const char *fmt, va_list ap);
+int text_xyprintf_P(struct Bitmap *bm, coord_t x, coord_t col, uint16_t mode, const char *fmt, ...) FORMAT(__printf__, 5, 6);
 int text_xprintf_P(struct Bitmap *bm, uint8_t row, uint8_t col, uint16_t mode, const char * PROGMEM fmt, ...) FORMAT(__printf__, 5, 6);
 int text_vwidthf_P(struct Bitmap *bm, const char * PROGMEM fmt, va_list ap);
 int text_widthf_P(struct Bitmap *bm, const char * PROGMEM fmt, ...);
 #endif /* CPU_HARVARD */
 
+/** \} */ //defgroup text
 #endif /* GFX_TEXT_H */