From: Bruno Haible Date: Thu, 29 Jun 2023 15:31:55 +0000 (+0200) Subject: libtextstyle-optional: Update to gettext 0.21. X-Git-Tag: v1.0~1170 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=bbda4be507fe1a166ea2548adf8c01e1507f5a1b;p=gnulib.git libtextstyle-optional: Update to gettext 0.21. * lib/textstyle.in.h: Declare all functions that exist in textstyle.h from gettext-0.21, independently of iconv. --- diff --git a/ChangeLog b/ChangeLog index 08c0b31070..a35fd0ee12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-06-29 Bruno Haible + + libtextstyle-optional: Update to gettext 0.21. + * lib/textstyle.in.h: Declare all functions that exist in textstyle.h + from gettext-0.21, independently of iconv. + 2023-06-28 Bruno Haible doc: Mention c8rtomb and mbrtoc8 from ISO C 23. diff --git a/lib/textstyle.in.h b/lib/textstyle.in.h index c87fa38059..b45f56287e 100644 --- a/lib/textstyle.in.h +++ b/lib/textstyle.in.h @@ -301,6 +301,15 @@ typedef ostream_t term_ostream_t; #define term_ostream_flush ostream_flush #define term_ostream_free ostream_free +static inline term_color_t +term_ostream_rgb_to_color (_GL_ATTRIBUTE_MAYBE_UNUSED term_ostream_t stream, + _GL_ATTRIBUTE_MAYBE_UNUSED int red, + _GL_ATTRIBUTE_MAYBE_UNUSED int green, + _GL_ATTRIBUTE_MAYBE_UNUSED int blue) +{ + return COLOR_DEFAULT; +} + static inline term_color_t term_ostream_get_color (_GL_ATTRIBUTE_MAYBE_UNUSED term_ostream_t stream) { @@ -409,6 +418,75 @@ term_ostream_create (int fd, const char *filename, return fd_ostream_create (fd, filename, true); } +/* ------------------------- From memory-ostream.h ------------------------- */ + +typedef ostream_t memory_ostream_t; + +#define memory_ostream_write_mem ostream_write_mem +#define memory_ostream_flush ostream_flush +#define memory_ostream_free ostream_free + +static inline void +memory_ostream_contents (_GL_ATTRIBUTE_MAYBE_UNUSED memory_ostream_t stream, + const void **bufp, size_t *buflenp) +{ + *bufp = NULL; + *buflenp = 0; +} + +static inline memory_ostream_t +memory_ostream_create (void) +{ + /* Not supported without the real libtextstyle. */ + abort (); + return NULL; +} + +/* -------------------------- From html-ostream.h -------------------------- */ + +typedef ostream_t html_ostream_t; + +#define html_ostream_write_mem ostream_write_mem +#define html_ostream_flush ostream_flush +#define html_ostream_free ostream_free + +static inline void +html_ostream_begin_span (_GL_ATTRIBUTE_MAYBE_UNUSED html_ostream_t stream, + _GL_ATTRIBUTE_MAYBE_UNUSED const char *classname) +{ +} + +static inline void +html_ostream_end_span (_GL_ATTRIBUTE_MAYBE_UNUSED html_ostream_t stream, + _GL_ATTRIBUTE_MAYBE_UNUSED const char *classname) +{ +} + +static inline const char * +html_ostream_get_hyperlink_ref (_GL_ATTRIBUTE_MAYBE_UNUSED html_ostream_t stream) +{ + return NULL; +} + +static inline void +html_ostream_set_hyperlink_ref (_GL_ATTRIBUTE_MAYBE_UNUSED html_ostream_t stream, + _GL_ATTRIBUTE_MAYBE_UNUSED const char *ref) +{ +} + +static inline void +html_ostream_flush_to_current_style (_GL_ATTRIBUTE_MAYBE_UNUSED html_ostream_t stream) +{ +} + +static inline html_ostream_t +html_ostream_create (ostream_t destination) +{ + /* Not supported without the real libtextstyle. */ + abort (); + return NULL; +} + /* ----------------------- From term-styled-ostream.h ----------------------- */ typedef styled_ostream_t term_styled_ostream_t; @@ -435,14 +513,48 @@ term_styled_ostream_create (int fd, const char *filename, typedef styled_ostream_t html_styled_ostream_t; +#define html_styled_ostream_write_mem ostream_write_mem +#define html_styled_ostream_flush ostream_flush +#define html_styled_ostream_free ostream_free +#define html_styled_ostream_begin_use_class styled_ostream_begin_use_class +#define html_styled_ostream_end_use_class styled_ostream_end_use_class +#define html_styled_ostream_get_hyperlink_ref styled_ostream_get_hyperlink_ref +#define html_styled_ostream_get_hyperlink_id styled_ostream_get_hyperlink_id +#define html_styled_ostream_set_hyperlink styled_ostream_set_hyperlink +#define html_styled_ostream_flush_to_current_style styled_ostream_flush_to_current_style + static inline html_styled_ostream_t html_styled_ostream_create (_GL_ATTRIBUTE_MAYBE_UNUSED ostream_t destination, _GL_ATTRIBUTE_MAYBE_UNUSED const char *css_filename) { + /* Not supported without the real libtextstyle. */ abort (); return NULL; } +/* ----------------------- From noop-styled-ostream.h ----------------------- */ + +typedef styled_ostream_t noop_styled_ostream_t; + +#define noop_styled_ostream_write_mem ostream_write_mem +#define noop_styled_ostream_flush ostream_flush +#define noop_styled_ostream_free ostream_free +#define noop_styled_ostream_begin_use_class styled_ostream_begin_use_class +#define noop_styled_ostream_end_use_class styled_ostream_end_use_class +#define noop_styled_ostream_get_hyperlink_ref styled_ostream_get_hyperlink_ref +#define noop_styled_ostream_get_hyperlink_id styled_ostream_get_hyperlink_id +#define noop_styled_ostream_set_hyperlink styled_ostream_set_hyperlink +#define noop_styled_ostream_flush_to_current_style styled_ostream_flush_to_current_style + +static inline noop_styled_ostream_t +noop_styled_ostream_create (ostream_t destination, bool pass_ownership) +{ + if (!pass_ownership) + /* Not supported without the real libtextstyle. */ + abort (); + return destination; +} + /* ------------------------------ From color.h ------------------------------ */ #define color_test_mode false @@ -466,6 +578,7 @@ handle_style_option (_GL_ATTRIBUTE_MAYBE_UNUSED const char *option) static inline void print_color_test (void) { + /* Not supported without the real libtextstyle. */ abort (); }