From 95d20e87121549fc014e25dbcd1e417f31f5344e Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 2 Oct 2015 11:38:29 +0900 Subject: xgettext: Rewrite AppData scanner in ITS * gettext-tools/its/appdata.loc: New file. * gettext-tools/its/appdata.its: New file. * gettext-tools/its/Makefile.am (dist_its_DATA): Add new files. * gettext-tools/src/Makefile.am (xgettext_SOURCES): Remove x-appdata.c. * gettext-tools/src/x-appdata.c: Remove. * gettext-tools/src/x-appdata.h (EXTENSIONS_APPDATA): Set language field to NULL. (SCANNERS_APPDATA): Set func field to NULL. --- gettext-tools/its/Makefile.am | 2 +- gettext-tools/its/appdata.its | 10 + gettext-tools/its/appdata.loc | 6 + gettext-tools/src/Makefile.am | 2 +- gettext-tools/src/x-appdata.c | 373 --------------------------------- gettext-tools/src/x-appdata.h | 12 +- gettext-tools/tests/xgettext-appdata-1 | 8 + 7 files changed, 30 insertions(+), 383 deletions(-) create mode 100644 gettext-tools/its/appdata.its create mode 100644 gettext-tools/its/appdata.loc delete mode 100644 gettext-tools/src/x-appdata.c diff --git a/gettext-tools/its/Makefile.am b/gettext-tools/its/Makefile.am index c8c1d10..3028945 100644 --- a/gettext-tools/its/Makefile.am +++ b/gettext-tools/its/Makefile.am @@ -20,4 +20,4 @@ AUTOMAKE_OPTIONS = 1.2 gnits pkgdatadir = $(datadir)/gettext itsdir = $(pkgdatadir)$(PACKAGE_SUFFIX)/its -dist_its_DATA = +dist_its_DATA = appdata.loc appdata.its diff --git a/gettext-tools/its/appdata.its b/gettext-tools/its/appdata.its new file mode 100644 index 0000000..734a8e5 --- /dev/null +++ b/gettext-tools/its/appdata.its @@ -0,0 +1,10 @@ + + + + + diff --git a/gettext-tools/its/appdata.loc b/gettext-tools/its/appdata.loc new file mode 100644 index 0000000..9bed649 --- /dev/null +++ b/gettext-tools/its/appdata.loc @@ -0,0 +1,6 @@ + + + + + + diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index 279e553..52f351f 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -183,7 +183,7 @@ xgettext_SOURCES += \ x-c.c x-po.c x-sh.c x-python.c x-lisp.c x-elisp.c x-librep.c x-scheme.c \ x-smalltalk.c x-java.c x-csharp.c x-awk.c x-ycp.c x-tcl.c x-perl.c x-php.c \ x-rst.c x-glade.c x-lua.c x-javascript.c x-vala.c x-gsettings.c \ - x-desktop.c x-appdata.c + x-desktop.c if !WOE32DLL msgattrib_SOURCES = msgattrib.c else diff --git a/gettext-tools/src/x-appdata.c b/gettext-tools/src/x-appdata.c deleted file mode 100644 index 31020a0..0000000 --- a/gettext-tools/src/x-appdata.c +++ /dev/null @@ -1,373 +0,0 @@ -/* xgettext AppData schema file backend. - Copyright (C) 2002-2003, 2005-2009, 2013, 2015 Free Software - Foundation, Inc. - - Written by Philip Withnall , 2015. - Based on GSettings extractor by Daiki Ueno , 2013. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -/* Specification. */ -#include "x-appdata.h" - -#include -#include -#include -#include -#include -#include - -#include "message.h" -#include "xgettext.h" -#include "error.h" -#include "xerror.h" -#include "xvasprintf.h" -#include "basename.h" -#include "progname.h" -#include "xalloc.h" -#include "hash.h" -#include "po-charset.h" -#include "gettext.h" -#include "libexpat-compat.h" - -#define _(s) gettext(s) - - -/* AppData is an XML format for describing application information. - The syntax is described here: - http://people.freedesktop.org/~hughsient/appdata/ - Translation is described in the ITS file: - http://people.freedesktop.org/~hughsient/appdata/#translation */ - - -/* ====================== Keyword set customization. ====================== */ - -/* If true extract all strings. */ -static bool extract_all = false; - - -/* ============================= XML parsing. ============================= */ - -#if DYNLOAD_LIBEXPAT || HAVE_LIBEXPAT - -/* Accumulator for the extracted messages. */ -static message_list_ty *mlp; - -/* Logical filename, used to label the extracted messages. */ -static char *logical_file_name; - -/* XML parser. */ -static XML_Parser parser; - -enum whitespace_type_ty -{ - none, - normalize, - strip -}; -typedef enum whitespace_type_ty whitespace_type_ty; - -struct element_state -{ - bool is_component; /* the element */ - bool is_description; /* the element */ - bool extract_string; - whitespace_type_ty whitespace; - int lineno; - char *buffer; - size_t bufmax; - size_t buflen; -}; -static struct element_state *stack; -static size_t stack_size; - -static char * -normalize_whitespace (const char *text, whitespace_type_ty whitespace) -{ - if (whitespace == none) - return xstrdup (text); - else - { - char *result, *p; - - /* Strip whitespaces at the beginning/end of the text. */ - result = xstrdup (text + strspn (text, " \t\n")); - for (p = result + strlen (result); - p > result && (*p == '\0' || *p == ' ' || *p == '\t' || *p == '\n'); - p--) - ; - if (p > result) - *++p = '\0'; - - /* Normalize whitespaces within the text. */ - if (whitespace == normalize) - { - char *end = result + strlen (result); - for (p = result; *p != '\0';) - { - size_t len = strspn (p, " \t\n"); - if (len > 0) - { - *p = ' '; - memmove (p + 1, p + len, end - (p + len)); - end -= len - 1; - *end = '\0'; - p++; - } - p += strcspn (p, " \t\n"); - } - } - return result; - } -} - -/* Ensures stack_size >= size. */ -static void -ensure_stack_size (size_t size) -{ - if (size > stack_size) - { - stack_size = 2 * stack_size; - if (stack_size < size) - stack_size = size; - stack = - (struct element_state *) - xrealloc (stack, stack_size * sizeof (struct element_state)); - } -} - -static size_t stack_depth; - -/* Callback called when is seen. */ -static void -start_element_handler (void *userData, const char *name, - const char **attributes) -{ - struct element_state *p; - - /* Increase stack depth. */ - stack_depth++; - ensure_stack_size (stack_depth + 1); - - /* Don't extract a string for the containing element. */ - stack[stack_depth - 1].extract_string = false; - - p = &stack[stack_depth]; - p->is_component = (strcmp (name, "component") == 0); - p->is_description = (strcmp (name, "description") == 0); - p->extract_string = extract_all; - - if (!p->extract_string) - { - bool has_translatable = false; - whitespace_type_ty whitespace = none; - if ((stack_depth == 2 - && stack[1].is_component - && (strcmp (name, "name") == 0 - || strcmp (name, "summary") == 0)) - || (stack_depth > 2 - && stack[1].is_component - && stack[2].is_description)) - { - has_translatable = true; - whitespace = normalize; - } - - p->extract_string = has_translatable; - p->whitespace = whitespace; - } - - p->lineno = XML_GetCurrentLineNumber (parser); - p->buffer = NULL; - p->bufmax = 0; - p->buflen = 0; - if (!p->extract_string) - savable_comment_reset (); -} - -/* Callback called when is seen. */ -static void -end_element_handler (void *userData, const char *name) -{ - struct element_state *p = &stack[stack_depth]; - - /* Actually extract string. */ - if (p->extract_string) - { - /* Don't extract the empty string. */ - if (p->buflen > 0) - { - lex_pos_ty pos; - - if (p->buflen == p->bufmax) - p->buffer = (char *) xrealloc (p->buffer, p->buflen + 1); - p->buffer[p->buflen] = '\0'; - - pos.file_name = logical_file_name; - pos.line_number = p->lineno; - - if (p->buffer != NULL) - { - remember_a_message (mlp, NULL, - normalize_whitespace (p->buffer, - p->whitespace), - null_context, &pos, - NULL, savable_comment); - } - } - } - - /* Free memory for this stack level. */ - if (p->buffer != NULL) - free (p->buffer); - - /* Decrease stack depth. */ - stack_depth--; - - savable_comment_reset (); -} - -/* Callback called when some text is seen. */ -static void -character_data_handler (void *userData, const char *s, int len) -{ - struct element_state *p = &stack[stack_depth]; - - /* Accumulate character data. */ - if (len > 0) - { - if (p->buflen + len > p->bufmax) - { - p->bufmax = 2 * p->bufmax; - if (p->bufmax < p->buflen + len) - p->bufmax = p->buflen + len; - p->buffer = (char *) xrealloc (p->buffer, p->bufmax); - } - memcpy (p->buffer + p->buflen, s, len); - p->buflen += len; - } -} - -/* Callback called when some comment text is seen. */ -static void -comment_handler (void *userData, const char *data) -{ - /* Split multiline comment into lines, and remove leading and trailing - whitespace. */ - char *copy = xstrdup (data); - char *p; - char *q; - - for (p = copy; (q = strchr (p, '\n')) != NULL; p = q + 1) - { - while (p[0] == ' ' || p[0] == '\t') - p++; - while (q > p && (q[-1] == ' ' || q[-1] == '\t')) - q--; - *q = '\0'; - savable_comment_add (p); - } - q = p + strlen (p); - while (p[0] == ' ' || p[0] == '\t') - p++; - while (q > p && (q[-1] == ' ' || q[-1] == '\t')) - q--; - *q = '\0'; - savable_comment_add (p); - free (copy); -} - - -static void -do_extract_appdata (FILE *fp, - const char *real_filename, const char *logical_filename, - msgdomain_list_ty *mdlp) -{ - mlp = mdlp->item[0]->messages; - - /* expat feeds us strings in UTF-8 encoding. */ - xgettext_current_source_encoding = po_charset_utf8; - - logical_file_name = xstrdup (logical_filename); - - parser = XML_ParserCreate (NULL); - if (parser == NULL) - error (EXIT_FAILURE, 0, _("memory exhausted")); - - XML_SetElementHandler (parser, start_element_handler, end_element_handler); - XML_SetCharacterDataHandler (parser, character_data_handler); - XML_SetCommentHandler (parser, comment_handler); - - stack_depth = 0; - - while (!feof (fp)) - { - char buf[4096]; - int count = fread (buf, 1, sizeof buf, fp); - - if (count == 0) - { - if (ferror (fp)) - error (EXIT_FAILURE, errno, _("\ -error while reading \"%s\""), real_filename); - /* EOF reached. */ - break; - } - - if (XML_Parse (parser, buf, count, 0) == 0) - error (EXIT_FAILURE, 0, _("%s:%lu:%lu: %s"), logical_filename, - (unsigned long) XML_GetCurrentLineNumber (parser), - (unsigned long) XML_GetCurrentColumnNumber (parser) + 1, - XML_ErrorString (XML_GetErrorCode (parser))); - } - - if (XML_Parse (parser, NULL, 0, 1) == 0) - error (EXIT_FAILURE, 0, _("%s:%lu:%lu: %s"), logical_filename, - (unsigned long) XML_GetCurrentLineNumber (parser), - (unsigned long) XML_GetCurrentColumnNumber (parser) + 1, - XML_ErrorString (XML_GetErrorCode (parser))); - - XML_ParserFree (parser); - - /* Close scanner. */ - logical_file_name = NULL; - parser = NULL; -} - -#endif - -void -extract_appdata (FILE *fp, - const char *real_filename, const char *logical_filename, - flag_context_list_table_ty *flag_table, - msgdomain_list_ty *mdlp) -{ -#if DYNLOAD_LIBEXPAT || HAVE_LIBEXPAT - if (LIBEXPAT_AVAILABLE ()) - do_extract_appdata (fp, real_filename, logical_filename, mdlp); - else -#endif - { - multiline_error (xstrdup (""), - xasprintf (_("\ -Language \"appdata\" is not supported. %s relies on expat.\n\ -This version was built without expat.\n"), - basename (program_name))); - exit (EXIT_FAILURE); - } -} diff --git a/gettext-tools/src/x-appdata.h b/gettext-tools/src/x-appdata.h index 57de593..6171673 100644 --- a/gettext-tools/src/x-appdata.h +++ b/gettext-tools/src/x-appdata.h @@ -28,17 +28,13 @@ extern "C" { #endif +/* The scanner is implemented as ITS rules, in its/appdata.its. */ + #define EXTENSIONS_APPDATA \ - { "appdata.xml", "appdata" }, \ + { "appdata.xml", NULL }, \ #define SCANNERS_APPDATA \ - { "appdata", extract_appdata, NULL, NULL, NULL, NULL }, \ - -/* Scan an AppData XML file and add its translatable strings to mdlp. */ -extern void extract_appdata (FILE *fp, const char *real_filename, - const char *logical_filename, - flag_context_list_table_ty *flag_table, - msgdomain_list_ty *mdlp); + { "appdata", NULL, NULL, NULL, NULL, NULL }, \ #ifdef __cplusplus diff --git a/gettext-tools/tests/xgettext-appdata-1 b/gettext-tools/tests/xgettext-appdata-1 index 14543d0..47a8884 100755 --- a/gettext-tools/tests/xgettext-appdata-1 +++ b/gettext-tools/tests/xgettext-appdata-1 @@ -110,6 +110,14 @@ msgid "" "problems with your laptop battery, or are trying to work out what programs " "are using significant amounts of power." msgstr "" + +#: xg-gs-1.appdata.xml:28 +msgid "The main window showing the application in action" +msgstr "" + +#: xg-gs-1.appdata.xml:32 +msgid "The preferences window where you can change the defaults" +msgstr "" EOF : ${DIFF=diff} -- cgit v1.1