Commits April 2019

commits@lists.geany.org

1 participants
43 discussions

[geany/geany] 585b16: COBOL: Import new upstream candidate parser
by Colomban Wendling 20 Apr '19

20 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 20 Apr 2019 09:36:03 UTC Commit: 585b16b0daec4f0f3a6e396692560cdb678774d6 https://github.com/geany/geany/commit/585b16b0daec4f0f3a6e396692560cdb67877… Log Message: ----------- COBOL: Import new upstream candidate parser This fixes support for COBOL symbols after the recent breakage of regex parsers, as well as introducing additional features and bug fixes. Also import some of the tests. https://github.com/universal-ctags/ctags/pull/2076 Part of #2119. Modified Paths: -------------- ctags/parsers/cobol.c src/symbols.c src/tagmanager/tm_parser.c tests/ctags/Makefile.am tests/ctags/cobol/helloworld.cbl tests/ctags/cobol/helloworld.cbl.tags tests/ctags/cobol/helloworld2.cbl tests/ctags/cobol/helloworld2.cbl.tags tests/ctags/cobol/levels.cbl tests/ctags/cobol/levels.cbl.tags tests/ctags/cobol/quoted-program-id.cbl tests/ctags/cobol/quoted-program-id.cbl.tags tests/ctags/cobol/simple.cbl tests/ctags/cobol/simple.cbl.tags tests/ctags/simple.cbl.tags Modified: ctags/parsers/cobol.c 520 lines changed, 497 insertions(+), 23 deletions(-) =================================================================== @@ -8,42 +8,516 @@ * files. */ +/* Some references: + * - https://www.cs.vu.nl/grammarware/browsable/cobol/ + * - https://www.cs.vu.nl/grammarware/browsable/vs-cobol-ii/ + * - https://open-cobol.sourceforge.io/guides/grammar.pdf + * - http://mapage.noos.fr/~bpinon/a_cobol_parser.htm + * - https://en.wikipedia.org/wiki/COBOL + */ + /* * INCLUDE FILES */ #include "general.h" /* must always come first */ +#include "debug.h" +#include "entry.h" +#include "keyword.h" +#include "nestlevel.h" #include "parse.h" +#include "read.h" #include "routines.h" -static tagRegexTable cobolTagRegexTable[] = { - {"^[ \t]*[0-9]+[ \t]+([A-Z0-9][A-Z0-9-]*)[ \t]+(" - "BLANK|OCCURS|IS|JUST|PIC|REDEFINES|RENAMES|SIGN|SYNC|USAGE|VALUE" - ")", "\\1", - "d,data,data items", "i", NULL}, - {"^[ \t]*[FSR]D[ \t]+([A-Z0-9][A-Z0-9-]*)\\.", "\\1", - "f,file,file descriptions (FD, SD, RD)", "i", NULL}, - {"^[ \t]*[0-9]+[ \t]+([A-Z0-9][A-Z0-9-]*)\\.", "\\1", - "g,group,group items", "i", NULL}, - {"^[ \t]*([A-Z0-9][A-Z0-9-]*)\\.", "\\1", - "p,paragraph,paragraphs", "i", NULL}, - {"^[ \t]*PROGRAM-ID\\.[ \t]+([A-Z0-9][A-Z0-9-]*)\\.", "\\1", - "P,program,program ids", "i", NULL}, - {"^[ \t]*([A-Z0-9][A-Z0-9-]*)[ \t]+SECTION\\.", "\\1", - "s,section,sections", "i", NULL}, +typedef enum { + K_FILE, + K_GROUP, + K_PROGRAM, + K_SECTION, + K_DIVISION, + K_PARAGRAPH, + K_DATA, + K_SOURCEFILE, +} cobolKind; + +typedef enum { + COBOL_SOURCEFILE_COPIED, +} cobolSourcefileRole; + +static roleDefinition CobolSourcefileRoles [] = { + { true, "copied", "copied in source file" }, }; -/* -* FUNCTION DEFINITIONS -*/ +static kindDefinition CobolKinds[] = { + { true, 'f', "fd", "file descriptions (FD, SD, RD)" }, + { true, 'g', "group", "group items" }, + { true, 'P', "program", "program ids" }, + { true, 's', "section", "sections" }, + { true, 'D', "division", "divisions" }, + { true, 'p', "paragraph", "paragraphs" }, + { true, 'd', "data", "data items" }, + { true, 'S', "sourcefile", "source code file", + .referenceOnly = true, ATTACH_ROLES(CobolSourcefileRoles)}, +}; + +static langType Lang_cobol; + +enum { + KEYWORD_FD, + KEYWORD_SD, + KEYWORD_RD, + KEYWORD_SECTION, + KEYWORD_DIVISION, + KEYWORD_CONTINUE, + KEYWORD_END_EXEC, + KEYWORD_FILLER, + KEYWORD_BLANK, + KEYWORD_OCCURS, + KEYWORD_IS, + KEYWORD_JUST, + KEYWORD_PIC, + KEYWORD_REDEFINES, + KEYWORD_RENAMES, + KEYWORD_SIGN, + KEYWORD_SYNC, + KEYWORD_USAGE, + KEYWORD_VALUE, + KEYWORD_PROGRAM_ID, + KEYWORD_EXIT, + KEYWORD_COPY, +}; + +static const keywordTable cobolKeywordTable[] = { +#define DEFINE_KEYWORD(n) { #n, KEYWORD_##n } + DEFINE_KEYWORD (FD), + DEFINE_KEYWORD (SD), + DEFINE_KEYWORD (RD), + DEFINE_KEYWORD (SECTION), + DEFINE_KEYWORD (DIVISION), + DEFINE_KEYWORD (CONTINUE), + { "END-EXEC", KEYWORD_END_EXEC }, + DEFINE_KEYWORD (EXIT), + DEFINE_KEYWORD (FILLER), + DEFINE_KEYWORD (BLANK), + DEFINE_KEYWORD (OCCURS), + DEFINE_KEYWORD (IS), + DEFINE_KEYWORD (JUST), + DEFINE_KEYWORD (PIC), + { "PICTURE", KEYWORD_PIC }, + DEFINE_KEYWORD (REDEFINES), + DEFINE_KEYWORD (RENAMES), + DEFINE_KEYWORD (SIGN), + DEFINE_KEYWORD (SYNC), + DEFINE_KEYWORD (USAGE), + DEFINE_KEYWORD (VALUE), + { "VALUES", KEYWORD_VALUE }, + { "PROGRAM-ID", KEYWORD_PROGRAM_ID }, + DEFINE_KEYWORD (COPY), +}; + +#define INDICATOR_COLUMN 7 +#define PROGRAM_NAME_AREA_COLUMN 73 + +#define isIdentifierChar(c) (isalnum(c) || (c) == '-') +#define isQuote(c) ((c) == '\'' || (c) == '"') + +typedef enum { + /* Fixed: program starts at column 8, ends at column 72 */ + FORMAT_FIXED = 0x1, + /* Free: program starts at column 1, no specific end */ + FORMAT_FREE = 0x2, + /* Variable: program starts at column 8, no specific end */ + FORMAT_VARIABLE = FORMAT_FIXED | FORMAT_FREE +} CobolFormat; + +static struct { + vString *line; + unsigned long int lineNumber; + MIOPos filePosition; + const char *nextLine; + CobolFormat format; +} CblInputState; + +static void cblppInit (const CobolFormat format) +{ + CblInputState.line = vStringNew (); + CblInputState.lineNumber = 0; + CblInputState.nextLine = NULL; + CblInputState.format = format; +} + +static void cblppDeinit (void) +{ + vStringDelete (CblInputState.line); +} + +static const char *cblppGetColumn (const char *line, + const unsigned int column) +{ + unsigned int col = 0; + + for (; *line; line++) + { + col += (*line == '\t') ? 8 : 1; + if (col >= column) + return line; + } + + return NULL; +} + +static void cblppAppendLine (vString *buffer, + const char *line) +{ + if (CblInputState.format & FORMAT_FIXED) + { + const char *indicator = cblppGetColumn (line, INDICATOR_COLUMN); + + if (indicator && *indicator && *indicator != '*' && *indicator != '/') + { + const char *lineStart = indicator + 1; + const char *lineEnd = cblppGetColumn (line, PROGRAM_NAME_AREA_COLUMN); + + if (*indicator == '-') + { + vStringStripTrailing (buffer); + while (isspace (*lineStart)) + lineStart++; + } + + if (CblInputState.format == FORMAT_FIXED) + vStringNCatS (buffer, lineStart, lineEnd - lineStart); + else + vStringCatS (buffer, lineStart); + } + } + else if (line[0] != '*' && line[0] != '/') + vStringCatS (buffer, line); +} + +/* TODO: skip *> comments */ +static const char *cblppGetLine (void) +{ + const char *line; + + if (CblInputState.nextLine) + { + line = CblInputState.nextLine; + CblInputState.nextLine = NULL; + } + else + line = (const char *) readLineFromInputFile (); + + CblInputState.lineNumber = getInputLineNumber (); + CblInputState.filePosition = getInputFilePosition (); + + if (!line) + return NULL; + + vStringClear (CblInputState.line); + cblppAppendLine (CblInputState.line, line); + + /* check for continuation lines */ + if (CblInputState.format & FORMAT_FIXED) + { + while (true) + { + const char *indicator; + line = (const char *) readLineFromInputFile (); + if (! line) + break; + indicator = cblppGetColumn (line, INDICATOR_COLUMN); + if (indicator && *indicator == '-') + cblppAppendLine (CblInputState.line, line); + else + break; + } + + CblInputState.nextLine = line; + } + + return vStringValue (CblInputState.line); +} + +static void initCOBOLRefTagEntry (tagEntryInfo *e, const char *name, + const cobolKind kind, const int role) +{ + initRefTagEntry (e, name, kind, role); + e->lineNumber = CblInputState.lineNumber; + e->filePosition = CblInputState.filePosition; +} + +static void initCOBOLTagEntry (tagEntryInfo *e, const char *name, const cobolKind kind) +{ + initCOBOLRefTagEntry (e, name, kind, ROLE_INDEX_DEFINITION); +} + +static int makeCOBOLRefTag (const char *name, const cobolKind kind, const int role) +{ + if (CobolKinds[kind].enabled) + { + tagEntryInfo e; + + initCOBOLRefTagEntry (&e, name, kind, role); + + return makeTagEntry (&e); + } + + return CORK_NIL; +} + +static int makeCOBOLTag (const char *name, const cobolKind kind) +{ + return makeCOBOLRefTag (name, kind, ROLE_INDEX_DEFINITION); +} + +#define CBL_NL(nl) (*((unsigned int *) (nestingLevelGetUserData (nl)))) + +static NestingLevel *popNestingLevelsToLevelNumber (NestingLevels *levels, const unsigned int levelNumber) +{ + NestingLevel *nl; + + while (true) + { + nl = nestingLevelsGetCurrent (levels); + if (! nl || CBL_NL (nl) < levelNumber) + break; + nestingLevelsPop (levels); + } + + return nl; +} + +static bool isNumeric (const char *nptr, unsigned long int *num) +{ + char *endptr; + unsigned long int v; + + v = strtoul (nptr, &endptr, 10); + if (nptr != endptr && *endptr == 0) + { + if (num) + *num = v; + return true; + } + return false; +} + +static void findCOBOLTags (const CobolFormat format) +{ + NestingLevels *levels; + const char *line; + + cblppInit (format); + + levels = nestingLevelsNew (sizeof (unsigned int)); + + while ((line = cblppGetLine ()) != NULL) + { + char word[64]; + int keyword; + unsigned long int levelNumber; + +#define READ_WHILE(word, cond) \ + do { \ + unsigned int i; \ + for (i = 0; i < (ARRAY_SIZE (word) - 1) && *line && (cond); line++) \ + word[i++] = *line; \ + word[i] = 0; \ + } while (0) +#define READ_LITERAL(word) \ + do { \ + const char READ_LITERAL__q = isQuote (*line) ? *line++ : 0; \ + READ_WHILE (word, (READ_LITERAL__q && READ_LITERAL__q != *line) || \ + isIdentifierChar (*line)); \ + if (READ_LITERAL__q && READ_LITERAL__q == *line) \ + line++; \ + keyword = lookupCaseKeyword (word, Lang_cobol); \ + } while (0) +#define READ_WORD(word, keyword) \ + do { \ + READ_WHILE (word, isIdentifierChar (*line)); \ + keyword = lookupCaseKeyword (word, Lang_cobol); \ + } while (0) +#define READ_KEYWORD(keyword) \ + do { \ + char READ_KEYWORD__word[64]; \ + READ_WORD (READ_KEYWORD__word, keyword); \ + } while (0) +#define SKIP_SPACES() do { while (isspace (*line)) line++; } while (0) + + SKIP_SPACES (); + READ_WORD (word, keyword); + SKIP_SPACES (); + + switch (keyword) + { + case KEYWORD_FD: + case KEYWORD_SD: + case KEYWORD_RD: + READ_WORD (word, keyword); + SKIP_SPACES (); + if (*word && *line == '.') + makeCOBOLTag (word, K_FILE); + break; + + case KEYWORD_PROGRAM_ID: + if (*line == '.') + { + line++; + SKIP_SPACES (); + } + READ_LITERAL (word); + if (*word) + makeCOBOLTag (word, K_PROGRAM); + break; + + case KEYWORD_COPY: + READ_WORD (word, keyword); // FIXME: also allow LITERAL + if (*word) + makeCOBOLRefTag (word, K_SOURCEFILE, COBOL_SOURCEFILE_COPIED); + break; + + case KEYWORD_CONTINUE: + case KEYWORD_END_EXEC: + case KEYWORD_EXIT: + case KEYWORD_FILLER: + /* nothing, just ignore those in following cases */; + break; + + default: + if (isNumeric (word, &levelNumber)) + { + READ_WORD (word, keyword); + SKIP_SPACES (); + + if (*word && keyword != KEYWORD_FILLER) + { + int kind = KIND_GHOST_INDEX; + + if (*line == '.') + kind = K_GROUP; + else + { + int keyword2; + + READ_KEYWORD (keyword2); + switch (keyword2) + { + case KEYWORD_BLANK: + case KEYWORD_OCCURS: + case KEYWORD_IS: + case KEYWORD_JUST: + case KEYWORD_PIC: + case KEYWORD_REDEFINES: + case KEYWORD_RENAMES: + case KEYWORD_SIGN: + case KEYWORD_SYNC: + case KEYWORD_USAGE: + case KEYWORD_VALUE: + kind = K_DATA; + } + } + + if (kind != KIND_GHOST_INDEX) + { + NestingLevel *nl; + tagEntryInfo entry; + int r; + unsigned int nestingLevelNumber; + + /* for nesting purposes, level 77 is identical to 1, + * and 66 to 2 */ + switch (levelNumber) + { + default: nestingLevelNumber = levelNumber; break; + case 77: nestingLevelNumber = 1; break; + case 66: nestingLevelNumber = 2; break; + } + + nl = popNestingLevelsToLevelNumber (levels, nestingLevelNumber); + initCOBOLTagEntry (&entry, word, kind); + if (nl && CBL_NL (nl) < nestingLevelNumber) + entry.extensionFields.scopeIndex = nl->corkIndex; + r = makeTagEntry (&entry); + if (levelNumber < 50 /* exclude special levels */) + { + nl = nestingLevelsPush (levels, r); + CBL_NL (nl) = levelNumber; + } + } + } + } + else if (*word && *line == '.') + makeCOBOLTag (word, K_PARAGRAPH); + else + { + int keyword2; + + READ_KEYWORD (keyword2); + SKIP_SPACES (); + + if (keyword2 == KEYWORD_DIVISION && *line == '.') + makeCOBOLTag (word, K_DIVISION); + else if (keyword2 == KEYWORD_SECTION && *line == '.') + makeCOBOLTag (word, K_SECTION); + } + } + } + + nestingLevelsFree (levels); + cblppDeinit (); +} + +static void findCOBOLFixedTags (void) +{ + findCOBOLTags (FORMAT_FIXED); +} + +static void findCOBOLFreeTags (void) +{ + findCOBOLTags (FORMAT_FREE); +} + +static void findCOBOLVariableTags (void) +{ + findCOBOLTags (FORMAT_VARIABLE); +} + +static void initializeCobolParser (langType language) +{ + Lang_cobol = language; +} + +static parserDefinition* commonCobolParserDefinition (const char *name, + simpleParser parser) +{ + parserDefinition* def = parserNew (name); + def->initialize = initializeCobolParser; + def->parser = parser; + def->kindTable = CobolKinds; + def->kindCount = ARRAY_SIZE(CobolKinds); + def->keywordTable = cobolKeywordTable; + def->keywordCount = ARRAY_SIZE(cobolKeywordTable); + def->useCork = true; + return def; +} extern parserDefinition* CobolParser (void) { static const char *const extensions [] = { - "cbl", "cob", "cpy", "CBL", "COB", NULL }; - parserDefinition* def = parserNew ("Cobol"); + "cbl", "cob", "CBL", "COB", NULL }; + parserDefinition* def = commonCobolParserDefinition ("Cobol", + findCOBOLFixedTags); def->extensions = extensions; - def->tagRegexTable = cobolTagRegexTable; - def->tagRegexCount = ARRAY_SIZE (cobolTagRegexTable); - def->method = METHOD_NOT_CRAFTED|METHOD_REGEX; return def; } + +extern parserDefinition* CobolFreeParser (void) +{ + return commonCobolParserDefinition ("CobolFree", findCOBOLFreeTags); +} + +extern parserDefinition* CobolVariableParser (void) +{ + return commonCobolParserDefinition ("CobolVariable", findCOBOLVariableTags); +} Modified: src/symbols.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -490,10 +490,12 @@ static void add_top_level_items(GeanyDocument *doc) tag_list_add_groups(tag_store, &tv_iters.tag_class, _("Program"), ICON_CLASS, &tv_iters.tag_function, _("File"), ICON_METHOD, + &tv_iters.tag_interface, _("Divisions"), ICON_NAMESPACE, &tv_iters.tag_namespace, _("Sections"), ICON_NAMESPACE, &tv_iters.tag_macro, _("Paragraph"), ICON_OTHER, &tv_iters.tag_struct, _("Group"), ICON_STRUCT, &tv_iters.tag_variable, _("Data"), ICON_VAR, + &tv_iters.tag_externvar, _("Copies"), ICON_NAMESPACE, NULL); break; case GEANY_FILETYPES_CONF: Modified: src/tagmanager/tm_parser.c 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -423,11 +423,13 @@ static TMParserMapEntry map_R[] = { static TMParserMapEntry map_COBOL[] = { {'d', tm_tag_variable_t}, + {'D', tm_tag_interface_t}, {'f', tm_tag_function_t}, {'g', tm_tag_struct_t}, {'p', tm_tag_macro_t}, {'P', tm_tag_class_t}, {'s', tm_tag_namespace_t}, + {'S', tm_tag_externvar_t}, }; static TMParserMapEntry map_OBJC[] = { @@ -768,6 +770,7 @@ gboolean tm_parser_has_full_context(TMParserType lang) case TM_PARSER_C: case TM_PARSER_CPP: case TM_PARSER_CSHARP: + case TM_PARSER_COBOL: case TM_PARSER_D: case TM_PARSER_FERITE: case TM_PARSER_GLSL: Modified: tests/ctags/Makefile.am 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -1,9 +1,6 @@ dist_check_SCRIPTS = runner.sh -# Disabled tests: -# simple.cbl - NULL = test_sources = \ 1795612.js \ @@ -117,6 +114,11 @@ test_sources = \ case_sensitivity.php \ char-selector.f90 \ classes.php \ + cobol/helloworld.cbl \ + cobol/helloworld2.cbl \ + cobol/levels.cbl \ + cobol/quoted-program-id.cbl \ + cobol/simple.cbl \ common.f \ complex-return.js \ continuation.f90 \ Modified: tests/ctags/cobol/helloworld.cbl 14 lines changed, 14 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,14 @@ + 00000* VALIDATION OF BASE COBOL INSTALL 00050000 + 01000 IDENTIFICATION DIVISION. 00060000 + 01100 PROGRAM-ID. 'HELLO'. 00070000 + 02000 ENVIRONMENT DIVISION. 00080000 + 02100 CONFIGURATION SECTION. 00090000 + 02110 SOURCE-COMPUTER. GNULINUX. 00100000 + 02120 OBJECT-COMPUTER. HERCULES. 00110000 + 02200 SPECIAL-NAMES. 00120000 + 02210 CONSOLE IS CONSL. 00130000 + 03000 DATA DIVISION. 00140000 + 04000 PROCEDURE DIVISION. 00150000 + 04100 00-MAIN. 00160000 + 04110 DISPLAY 'HELLO, WORLD' UPON CONSL. 00170000 + 04900 STOP RUN. 00180000 Modified: tests/ctags/cobol/helloworld.cbl.tags 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,11 @@ +# format=tagmanager +00-MAIN�65536�0 +CONFIGURATION�256�0 +DATA�32�0 +ENVIRONMENT�32�0 +HELLO�1�0 +IDENTIFICATION�32�0 +OBJECT-COMPUTER�65536�0 +PROCEDURE�32�0 +SOURCE-COMPUTER�65536�0 +SPECIAL-NAMES�65536�0 Modified: tests/ctags/cobol/helloworld2.cbl 19 lines changed, 19 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,19 @@ + 00000* VALIDATION OF BASE COBOL INSTALL + IDENTIFICATION DIVISION. + 01100 PROGRAM-ID. 'HELLO WORLD'. + 02000 ENVIRONMENT DIV + -ISION. + 02100 CONFIGURATION SECTION. + 02110 SOURCE-COMPUTER. GNULINUX. + 02120 OBJECT-COMPUTER. HERCULES. + 02200 SPECIAL + --NAMES. + 02210 CONSOLE IS CONSL. + 03000 DATA DIVISION. + 04000 PROCEDUR + - E DIVISION. + 04100 00-MAIN. + 04110 DISPLAY + 'HELLO, WORLD' + UPON CONSL. + 04900 STOP RUN. Modified: tests/ctags/cobol/helloworld2.cbl.tags 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,11 @@ +# format=tagmanager +00-MAIN�65536�0 +CONFIGURATION�256�0 +DATA�32�0 +ENVIRONMENT�32�0 +HELLO WORLD�1�0 +IDENTIFICATION�32�0 +OBJECT-COMPUTER�65536�0 +PROCEDURE�32�0 +SOURCE-COMPUTER�65536�0 +SPECIAL-NAMES�65536�0 Modified: tests/ctags/cobol/levels.cbl 27 lines changed, 27 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,27 @@ + IDENTIFICATION DIVISION. + PROGRAM-ID. Test-Items. + + DATA DIVISION. + WORKING-STORAGE SECTION. + 01 RECORD1. + 05 ITEM1 PIC X(1). + 05 ITEM2 PIC A(1). + 88 ODD VALUES 1, 3, 5, 7, 9. + 88 EVEN VALUES 2, 4, 6, 8. + 05 ITEM3 PIC X(6). + 66 RDITEM4 RENAMES ITEM1 THRU ITEM2. + 66 RDITEM5 RENAMES ITEM1 THROUGH ITEM3. + 77 STDLN1 PIC A(4). + 01 REC2. + 02 G1. + 05 ITEM1 PICTURE X(10). + 05 ITEM2 PIC X(10). + 66 OTHERNAME1 RENAMES ITEM1 IN REC2. + 66 OTHERNAME2 RENAMES G1. + + PROCEDURE DIVISION. + MAIN-PROCEDURE. + DISPLAY "Hello world". + DISPLAY OTHERNAME2. + STOP RUN. + END PROGRAM Test-Items. Modified: tests/ctags/cobol/levels.cbl.tags 22 lines changed, 22 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,22 @@ +# format=tagmanager +DATA�32�0 +EVEN�16384�RECORD1.ITEM2�0 +G1�2048�REC2�0 +IDENTIFICATION�32�0 +ITEM1�16384�REC2.G1�0 +ITEM1�16384�RECORD1�0 +ITEM2�16384�REC2.G1�0 +ITEM2�16384�RECORD1�0 +ITEM3�16384�RECORD1�0 +MAIN-PROCEDURE�65536�0 +ODD�16384�RECORD1.ITEM2�0 +OTHERNAME1�16384�REC2�0 +OTHERNAME2�16384�REC2�0 +PROCEDURE�32�0 +RDITEM4�16384�RECORD1�0 +RDITEM5�16384�RECORD1�0 +REC2�2048�0 +RECORD1�2048�0 +STDLN1�16384�0 +Test-Items�1�0 +WORKING-STORAGE�256�0 Modified: tests/ctags/cobol/quoted-program-id.cbl 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,7 @@ + IDENTIFICATION DIVISION. + PROGRAM-ID. 'Test program name'. + PROCEDURE DIVISION. + MAIN. + DISPLAY 'This is a test program'. + STOP RUN. + END PROGRAM 'Test program name'. Modified: tests/ctags/cobol/quoted-program-id.cbl.tags 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +# format=tagmanager +IDENTIFICATION�32�0 +MAIN�65536�0 +PROCEDURE�32�0 +Test program name�1�0 Modified: tests/ctags/cobol/simple.cbl 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tests/ctags/cobol/simple.cbl.tags 22 lines changed, 22 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,22 @@ +# format=tagmanager +AUTHOR�65536�0 +Begin�65536�0 +DATA�32�0 +DW-DAYS-IN-MONTH�16384�Group-Name.Data-Item1.DW-DAYS-IN-MONTHS�0 +DW-DAYS-IN-MONTHS�16384�Group-Name.Data-Item1�0 +Data-Item1�16384�Group-Name�0 +ENVIRONMENT�32�0 +FILE�256�0 +FILE-CONTROL�65536�0 +File-Data-Item�16384�File-Group-Name�0 +File-Group-Name�2048�0 +File-Name�16�0 +Group-Name�2048�0 +IDENTIFICATION�32�0 +INPUT-OUPUT�256�0 +PROCEDURE�32�0 +Program-Name�1�0 +SH-WORK-MMDDYYYY�16384�Group-Name.Data-Item1�0 +SH-WORK-MMDDYYYY-2�16384�Group-Name.Data-Item1�0 +Subprogram-Name�65536�0 +WORKING-STORAGE�256�0 Modified: tests/ctags/simple.cbl.tags 19 lines changed, 0 insertions(+), 19 deletions(-) =================================================================== @@ -1,19 +0,0 @@ -# format=tagmanager -AUTHOR�65536�0 -Begin�65536�0 -DW-DAYS-IN-MONTH�16384�0 -DW-DAYS-IN-MONTHS�16384�0 -Data-Item1�16384�0 -FILE�256�0 -FILE-CONTROL�65536�0 -File-Data-Item�16384�0 -File-Group-Name�2048�0 -File-Name�16�0 -Group-Name�2048�0 -INPUT-OUPUT�256�0 -PROGRAM-ID�65536�0 -Program-Name�1�0 -SH-WORK-MMDDYYYY�16384�0 -SH-WORK-MMDDYYYY-2�16384�0 -Subprogram-Name�65536�0 -WORKING-STORAGE�256�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] acebc2: scintilla: Accessible: emit the text deletion signal before deletion
by Colomban Wendling 17 Apr '19

17 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 17 Apr 2019 21:15:19 UTC Commit: acebc2d6db11b7ba05a4fecbfbddb511ab9d8114 https://github.com/geany/geany/commit/acebc2d6db11b7ba05a4fecbfbddb511ab9d8… Log Message: ----------- scintilla: Accessible: emit the text deletion signal before deletion This allows the accessibility layer to request detail, such as which characters have been deleted. ATK will query the deleted range to report the data that was removed, so it must still be available for the query to give a correct answer. So, emit the signal in BEFOREDELETE instead of DELETETEXT. X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/2095/ X-Scintilla-Commit-ID: 0a937b4c0b2be02042473baed62543ff73d90807 Modified Paths: -------------- scintilla/gtk/ScintillaGTKAccessible.cxx scintilla/gtk/ScintillaGTKAccessible.h Modified: scintilla/gtk/ScintillaGTKAccessible.cxx 10 lines changed, 3 insertions(+), 7 deletions(-) =================================================================== @@ -156,7 +156,6 @@ ScintillaGTKAccessible *ScintillaGTKAccessible::FromAccessible(GtkAccessible *ac ScintillaGTKAccessible::ScintillaGTKAccessible(GtkAccessible *accessible_, GtkWidget *widget_) : accessible(accessible_), sci(ScintillaGTK::FromWidget(widget_)), - deletionLengthChar(0), old_pos(-1) { SetAccessibility(true); g_signal_connect(widget_, "sci-notify", G_CALLBACK(SciNotify), this); @@ -882,14 +881,11 @@ void ScintillaGTKAccessible::Notify(GtkWidget *, gint, SCNotification *nt) { UpdateCursor(); } if (nt->modificationType & SC_MOD_BEFOREDELETE) { - // We cannot compute the deletion length in DELETETEXT as it requires accessing the - // buffer, so that the character are still present. So, we cache the value here, - // and use it in DELETETEXT that fires quickly after. - deletionLengthChar = sci->pdoc->CountCharacters(nt->position, nt->position + nt->length); + int startChar = CharacterOffsetFromByteOffset(nt->position); + int lengthChar = sci->pdoc->CountCharacters(nt->position, nt->position + nt->length); + g_signal_emit_by_name(accessible, "text-changed::delete", startChar, lengthChar); } if (nt->modificationType & SC_MOD_DELETETEXT) { - int startChar = CharacterOffsetFromByteOffset(nt->position); - g_signal_emit_by_name(accessible, "text-changed::delete", startChar, deletionLengthChar); UpdateCursor(); } if (nt->modificationType & SC_MOD_CHANGESTYLE) { Modified: scintilla/gtk/ScintillaGTKAccessible.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -18,8 +18,6 @@ class ScintillaGTKAccessible { GtkAccessible *accessible; ScintillaGTK *sci; - // cached length of the deletion, in characters (see Notify()) - int deletionLengthChar; // local state for comparing Sci::Position old_pos; std::vector<SelectionRange> old_sels; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a58738: scintilla: Accessible: use the built-in character position cache
by Colomban Wendling 17 Apr '19

17 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 17 Apr 2019 21:12:35 UTC Commit: a587385de0b004399090480b852a907ced46f66f https://github.com/geany/geany/commit/a587385de0b004399090480b852a907ced46f… Log Message: ----------- scintilla: Accessible: use the built-in character position cache It's quite a lot faster even after trying and optimizing the custom version, and it makes the code simpler. Also improve ByteOffsetFromCharacterOffset() to make use of the cache, making it drastically faster. X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/2094/ X-Scintilla-Commit-ID: 01aab5f24e50ed14551c8c9c8ecce7ece0594c09 X-Scintilla-Commit-ID: 2c8b52af4ae5de2abe7c00fd18e78be60340cbf9 Fixes #2092. Modified Paths: -------------- scintilla/gtk/ScintillaGTK.cxx scintilla/gtk/ScintillaGTKAccessible.cxx scintilla/gtk/ScintillaGTKAccessible.h Modified: scintilla/gtk/ScintillaGTK.cxx 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -859,7 +859,7 @@ sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam if (accessible) { ScintillaGTKAccessible *sciAccessible = ScintillaGTKAccessible::FromAccessible(accessible); if (sciAccessible) { - sciAccessible->SetAccessibility(); + sciAccessible->SetAccessibility(accessibilityEnabled); } } break; Modified: scintilla/gtk/ScintillaGTKAccessible.cxx 16 lines changed, 6 insertions(+), 10 deletions(-) =================================================================== @@ -158,6 +158,7 @@ ScintillaGTKAccessible::ScintillaGTKAccessible(GtkAccessible *accessible_, GtkWi sci(ScintillaGTK::FromWidget(widget_)), deletionLengthChar(0), old_pos(-1) { + SetAccessibility(true); g_signal_connect(widget_, "sci-notify", G_CALLBACK(SciNotify), this); } @@ -861,24 +862,19 @@ void ScintillaGTKAccessible::NotifyReadOnly() { #endif } -void ScintillaGTKAccessible::SetAccessibility() { +void ScintillaGTKAccessible::SetAccessibility(bool enabled) { // Called by ScintillaGTK when application has enabled or disabled accessibility - character_offsets.resize(0); - character_offsets.push_back(0); + if (enabled) + sci->pdoc->AllocateLineCharacterIndex(SC_LINECHARACTERINDEX_UTF32); + else + sci->pdoc->ReleaseLineCharacterIndex(SC_LINECHARACTERINDEX_UTF32); } void ScintillaGTKAccessible::Notify(GtkWidget *, gint, SCNotification *nt) { if (!Enabled()) return; switch (nt->nmhdr.code) { case SCN_MODIFIED: { - if (nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT)) { - // invalidate character offset cache if applicable - const Sci::Line line = sci->pdoc->LineFromPosition(nt->position); - if (character_offsets.size() > static_cast<size_t>(line + 1)) { - character_offsets.resize(line + 1); - } - } if (nt->modificationType & SC_MOD_INSERTTEXT) { int startChar = CharacterOffsetFromByteOffset(nt->position); int lengthChar = sci->pdoc->CountCharacters(nt->position, nt->position + nt->length); Modified: scintilla/gtk/ScintillaGTKAccessible.h 32 lines changed, 18 insertions(+), 14 deletions(-) =================================================================== @@ -18,9 +18,6 @@ class ScintillaGTKAccessible { GtkAccessible *accessible; ScintillaGTK *sci; - // cache holding character offset for each line start, see CharacterOffsetFromByteOffset() - std::vector<Sci::Position> character_offsets; - // cached length of the deletion, in characters (see Notify()) int deletionLengthChar; // local state for comparing @@ -37,6 +34,19 @@ class ScintillaGTKAccessible { } Sci::Position ByteOffsetFromCharacterOffset(Sci::Position startByte, int characterOffset) { + if (!(sci->pdoc->LineCharacterIndex() & SC_LINECHARACTERINDEX_UTF32)) { + return startByte + characterOffset; + } + if (characterOffset > 0) { + // Try and reduce the range by reverse-looking into the character offset cache + Sci::Line lineStart = sci->pdoc->LineFromPosition(startByte); + Sci::Position posStart = sci->pdoc->IndexLineStart(lineStart, SC_LINECHARACTERINDEX_UTF32); + Sci::Line line = sci->pdoc->LineFromPositionIndex(posStart + characterOffset, SC_LINECHARACTERINDEX_UTF32); + if (line != lineStart) { + startByte += sci->pdoc->LineStart(line) - sci->pdoc->LineStart(lineStart); + characterOffset -= sci->pdoc->IndexLineStart(line, SC_LINECHARACTERINDEX_UTF32) - posStart; + } + } Sci::Position pos = sci->pdoc->GetRelativePosition(startByte, characterOffset); if (pos == INVALID_POSITION) { // clamp invalid positions inside the document @@ -54,18 +64,12 @@ class ScintillaGTKAccessible { } Sci::Position CharacterOffsetFromByteOffset(Sci::Position byteOffset) { - const Sci::Line line = sci->pdoc->LineFromPosition(byteOffset); - if (character_offsets.size() <= static_cast<size_t>(line)) { - if (character_offsets.empty()) - character_offsets.push_back(0); - for (Sci::Position i = character_offsets.size(); i <= line; i++) { - const Sci::Position start = sci->pdoc->LineStart(i - 1); - const Sci::Position end = sci->pdoc->LineStart(i); - character_offsets.push_back(character_offsets[i - 1] + sci->pdoc->CountCharacters(start, end)); - } + if (!(sci->pdoc->LineCharacterIndex() & SC_LINECHARACTERINDEX_UTF32)) { + return byteOffset; } + const Sci::Line line = sci->pdoc->LineFromPosition(byteOffset); const Sci::Position lineStart = sci->pdoc->LineStart(line); - return character_offsets[line] + sci->pdoc->CountCharacters(lineStart, byteOffset); + return sci->pdoc->IndexLineStart(line, SC_LINECHARACTERINDEX_UTF32) + sci->pdoc->CountCharacters(lineStart, byteOffset); } void CharacterRangeFromByteRange(Sci::Position startByte, Sci::Position endByte, int *startChar, int *endChar) { @@ -135,7 +139,7 @@ class ScintillaGTKAccessible { // So ScintillaGTK can notify us void ChangeDocument(Document *oldDoc, Document *newDoc); void NotifyReadOnly(); - void SetAccessibility(); + void SetAccessibility(bool enabled); // Helper GtkWidget methods static AtkObject *WidgetGetAccessibleImpl(GtkWidget *widget, AtkObject **cache, gpointer widget_parent_class); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b6a132: Small update of the French translation
by Colomban Wendling 17 Apr '19

17 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 17 Apr 2019 17:22:48 UTC Commit: b6a132bc12df47bc92994792572ea962fd6f4aa6 https://github.com/geany/geany/commit/b6a132bc12df47bc92994792572ea962fd6f4… Log Message: ----------- Small update of the French translation Modified Paths: -------------- po/fr.po Modified: po/fr.po 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -2298,6 +2298,8 @@ msgid "" "Copyright (c) 2005\n" "The Geany contributors" msgstr "" +"Copyright (c) 2005\n" +"Les contributeurs de Geany" #: ../src/about.c:169 msgid "About Geany" @@ -4009,10 +4011,10 @@ msgid "Configuration directory could not be created (%s)." msgstr "Le dossier de configuration n'a pas pu être créé (%s)." #: ../src/libmain.c:1184 -#, fuzzy msgid "IPC socket could not be created, see Help->Debug Messages for details." msgstr "" -"La recherche a échoué (voir Aide->Messages de débogage pour plus de détails)." +"Le socket IPC n'a pas pu être créé, voyez Aide->Messages de débogage pour " +"plus de détails." #: ../src/libmain.c:1413 msgid "Do you really want to quit?" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 75a736: Merge branch 'master' of github.com:geany/geany
by Frank Lanitz 17 Apr '19

17 Apr '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 17 Apr 2019 16:41:09 UTC Commit: 75a736bf7188e1db06417d4fc5140b9f36ae60e5 https://github.com/geany/geany/commit/75a736bf7188e1db06417d4fc5140b9f36ae6… Log Message: ----------- Merge branch 'master' of github.com:geany/geany Modified Paths: -------------- po/sk.po src/about.c Modified: po/sk.po 41 lines changed, 14 insertions(+), 27 deletions(-) =================================================================== @@ -2,14 +2,14 @@ # Copyright (C) 2006 The Geany contributors. # This file is distributed under the same license as the Geany package. # Tomáš Havlas <tomas.havlas(a)raven-systems.eu>, 2014. -# Andrej Herceg <chrono.i18n(a)gmail.com>, 2015-2018. +# Andrej Herceg <chrono.i18n(a)gmail.com>, 2015-2019. # msgid "" msgstr "" "Project-Id-Version: Geany 1.34\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-15 17:13+0200\n" -"PO-Revision-Date: 2018-12-04 19:26+0100\n" +"PO-Revision-Date: 2019-04-16 20:38+0200\n" "Last-Translator: Andrej Herceg <chrono.i18n(a)gmail.com>\n" "Language-Team: Slovak\n" "Language: sk\n" @@ -864,7 +864,7 @@ msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" msgstr "" -"Automatické dokončovanie známych symbolov v otvorenom súbore (názvy funkcií, " +"Automatické dokončovanie známych symbolov v otvorenom súbore (názvov funkcií, " "globálnych premenných, …)" #: ../data/geany.glade.h:177 @@ -1211,7 +1211,7 @@ msgid "" "Ensures that newline characters always get converted before saving, avoiding " "mixed line endings in the same file" msgstr "" -"Pred uloženým budú znaky konca riadkov konvertované na rovnaký znak, čím sa " +"Pred uložením budú znaky konca riadkov konvertované na rovnaký znak, čím sa " "predchádza výskytu rôznych znakov konca riadkov v jednom súbore" #: ../data/geany.glade.h:251 @@ -2237,6 +2237,8 @@ msgid "" "Copyright (c) 2005\n" "The Geany contributors" msgstr "" +"Copyright (c) 2005\n" +"Prispievatelia do Geany" #: ../src/about.c:169 msgid "About Geany" @@ -3928,6 +3930,8 @@ msgstr "Nebolo možné vytvoriť adresár s konfiguráciou (%s)." #: ../src/libmain.c:1184 msgid "IPC socket could not be created, see Help->Debug Messages for details." msgstr "" +"Nebolo možné vytvoriť IPC soket, pre viac detailov pozrite Pomoc->Ladiace " +"správy." #: ../src/libmain.c:1413 msgid "Do you really want to quit?" @@ -3988,7 +3992,7 @@ msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -"Zásuvný modul „%s“ nie je binárne kompatibilný s aktuálnou verziou Geany - " +"Zásuvný modul „%s“ nie je binárne kompatibilný s aktuálnou verziou Geany - " "prosím zostavte modul znovu." #: ../src/plugins.c:1270 @@ -4336,7 +4340,7 @@ msgid "" "Use Perl-like regular expressions. For detailed information about using " "regular expressions, please refer to the manual." msgstr "" -"Používať regulárne výrazy jayzka Perl. Pre viac detailov o používaní " +"Používať regulárne výrazy jazyka Perl. Pre viac detailov o používaní " "regulárnych výrazov, si prečítajte dokumentáciu." #: ../src/search.c:317 @@ -4730,7 +4734,7 @@ msgstr "Moduly" #: ../src/symbols.c:556 ../src/symbols.c:603 msgid "Traits" -msgstr "" +msgstr "Črty" #: ../src/symbols.c:557 msgid "Implementations" @@ -5008,7 +5012,7 @@ msgid "" "Cannot execute template command \"%s\". Hint: incorrect paths in the command " "are a common cause of errors. Error: %s." msgstr "" -"Nie je možné spustíť príkaz šablóny „%s“. Tip: nesprávne cesty v príkaze sú " +"Nie je možné spustiť príkaz šablóny „%s“. Tip: nesprávne cesty v príkaze sú " "častou príčinou chýb. Chyba: %s." #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" @@ -5412,7 +5416,7 @@ msgstr "Zavrieť všetko" #: ../src/ui_utils.c:2446 msgid "Geany cannot start!" -msgstr "Nie je možné zapnúť Geany!" +msgstr "Geany sa nedá spustiť!" #: ../src/utils.c:87 msgid "Select Browser" @@ -5550,7 +5554,7 @@ msgstr "Globálna" #: ../plugins/classbuilder.c:526 msgid "Base GType:" -msgstr "Zakladný GType:" +msgstr "Základný GType:" #: ../plugins/classbuilder.c:531 msgid "Implements:" @@ -5992,20 +5996,3 @@ msgstr "Vedľa seba" #: ../plugins/splitwindow.c:467 msgid "Top and Bottom" msgstr "Nad sebou" - -#~ msgid "" -#~ "Copyright (c) 2005-2019\n" -#~ "Colomban Wendling\n" -#~ "Nick Treleaven\n" -#~ "Matthew Brush\n" -#~ "Enrico Tröger\n" -#~ "Frank Lanitz\n" -#~ "All rights reserved." -#~ msgstr "" -#~ "Copyright (c) 2005-2019\n" -#~ "Colomban Wendling\n" -#~ "Nick Treleaven\n" -#~ "Matthew Brush\n" -#~ "Enrico Tröger\n" -#~ "Frank Lanitz\n" -#~ "Všetky práva vyhradené." Modified: src/about.c 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -81,7 +81,7 @@ static const gchar *translators[][2] = { "Rafael Peregrino da Silva <rperegrino(a)linuxnewmedia.com.br>"}, { "ro", "Alex Eftimie <alex(a)rosedu.org>" }, { "ru", "brahmann_ <brahmann(a)lifec0re.net>,\nNikita E. Shalaev <nshalaev(a)eu.spb.ru>" }, - { "sk", "Tomáš Vadina <kyberdev(a)gmail.com>" }, + { "sk", "Andrej Herceg <chrono.i18n(a)gmail.com>" }, { "sl", "Jože Klepec <joze.klepec(a)siol.net>"}, { "sv", "Tony Mattsson <superxorn(a)gmail.com>" }, { "sr", "Nikola Radovanovic <cobisimo(a)gmail.com>"}, @@ -96,7 +96,8 @@ static const guint translators_len = G_N_ELEMENTS(translators); static const gchar *prev_translators[][2] = { { "es", "Damián Viano <debian(a)damianv.com.ar>\nNacho Cabanes <ncabanes(a)gmail.com>" }, { "pl", "Jacek Wolszczak <shutdownrunner(a)o2.xn--pl>\njarosaw-ctc Foksa <jfoksa(a)gmail.com>" }, - { "nl", "Kurt De Bree <kdebree(a)telenet.be>" } + { "nl", "Kurt De Bree <kdebree(a)telenet.be>" }, + { "sk", "Tomáš Vadina <kyberdev(a)gmail.com>" } }; static const guint prev_translators_len = G_N_ELEMENTS(prev_translators); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f744f3: Update of Russian translation
by Frank Lanitz 17 Apr '19

17 Apr '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 17 Apr 2019 16:39:40 UTC Commit: f744f34d4a3f71c11c32a22eccdc455116a53a48 https://github.com/geany/geany/commit/f744f34d4a3f71c11c32a22eccdc455116a53… Log Message: ----------- Update of Russian translation Modified Paths: -------------- po/ru.po Modified: po/ru.po 29 lines changed, 7 insertions(+), 22 deletions(-) =================================================================== @@ -1,17 +1,17 @@ # Translation Geany to Russian. -# Copyright (C) 2006 The Geany contributors. +# Copyright (C) 2006-2019 The Geany contributors. # This file is distributed under the same license as the Geany package. # John Wehin <john.wehin(a)gmail.com>, 2008-2009. # Denis Koryavov <dkoryavov(a)yandex.ru>, 2010. # Igor Burmistrov <meyday(a)yandex.ru>, 2012 # Maxim Musatov <m1kc(a)yandex.ru>, 2012 -# Pavel Roschin <rpg89(at)post(dot)ru>, 2014-2015 +# Pavel Roschin <rpg89(at)post(dot)ru>, 2014-2019 msgid "" msgstr "" -"Project-Id-Version: Geany 1.34\n" +"Project-Id-Version: Geany 1.35\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-15 17:13+0200\n" -"PO-Revision-Date: 2018-12-07 05:52+0400\n" +"PO-Revision-Date: 2019-04-16 21:50+0400\n" "Last-Translator: Pavel Roschin <rpg89(at)post(dot)ru>\n" "Language-Team: Russian <ru(a)li.org>\n" "Language: ru\n" @@ -2248,6 +2248,8 @@ msgid "" "Copyright (c) 2005\n" "The Geany contributors" msgstr "" +"Copyright (c) 2005\n" +"Участники проекта Geany" #: ../src/about.c:169 msgid "About Geany" @@ -3945,7 +3947,7 @@ msgstr "Каталог настроек не может быть создан (% #: ../src/libmain.c:1184 msgid "IPC socket could not be created, see Help->Debug Messages for details." -msgstr "" +msgstr "IPC-сокет не может быть создан, подробнее смотрите Справка->Отладочные сообщения." #: ../src/libmain.c:1413 msgid "Do you really want to quit?" @@ -6020,20 +6022,3 @@ msgstr "По вертикали" #: ../plugins/splitwindow.c:467 msgid "Top and Bottom" msgstr "По горизонтали" - -#~ msgid "" -#~ "Copyright (c) 2005-2019\n" -#~ "Colomban Wendling\n" -#~ "Nick Treleaven\n" -#~ "Matthew Brush\n" -#~ "Enrico Tröger\n" -#~ "Frank Lanitz\n" -#~ "All rights reserved." -#~ msgstr "" -#~ "Copyright (c) 2005-2019\n" -#~ "Colomban Wendling\n" -#~ "Nick Treleaven\n" -#~ "Matthew Brush\n" -#~ "Enrico Tröger\n" -#~ "Frank Lanitz\n" -#~ "Все права защищены." -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b6fc42: Update of Slovak translation (#2126)
by Andrej Herceg 17 Apr '19

17 Apr '19

Branch: refs/heads/master Author: Andrej Herceg <chrono.i18n(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 17 Apr 2019 07:01:44 UTC Commit: b6fc42f5f7e3538d27bfaaa73c6285fadc894361 https://github.com/geany/geany/commit/b6fc42f5f7e3538d27bfaaa73c6285fadc894… Log Message: ----------- Update of Slovak translation (#2126) Modified Paths: -------------- po/sk.po src/about.c Modified: po/sk.po 41 lines changed, 14 insertions(+), 27 deletions(-) =================================================================== @@ -2,14 +2,14 @@ # Copyright (C) 2006 The Geany contributors. # This file is distributed under the same license as the Geany package. # Tomáš Havlas <tomas.havlas(a)raven-systems.eu>, 2014. -# Andrej Herceg <chrono.i18n(a)gmail.com>, 2015-2018. +# Andrej Herceg <chrono.i18n(a)gmail.com>, 2015-2019. # msgid "" msgstr "" "Project-Id-Version: Geany 1.34\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-15 17:13+0200\n" -"PO-Revision-Date: 2018-12-04 19:26+0100\n" +"PO-Revision-Date: 2019-04-16 20:38+0200\n" "Last-Translator: Andrej Herceg <chrono.i18n(a)gmail.com>\n" "Language-Team: Slovak\n" "Language: sk\n" @@ -864,7 +864,7 @@ msgid "" "Automatic completion of known symbols in open files (function names, global " "variables, ...)" msgstr "" -"Automatické dokončovanie známych symbolov v otvorenom súbore (názvy funkcií, " +"Automatické dokončovanie známych symbolov v otvorenom súbore (názvov funkcií, " "globálnych premenných, …)" #: ../data/geany.glade.h:177 @@ -1211,7 +1211,7 @@ msgid "" "Ensures that newline characters always get converted before saving, avoiding " "mixed line endings in the same file" msgstr "" -"Pred uloženým budú znaky konca riadkov konvertované na rovnaký znak, čím sa " +"Pred uložením budú znaky konca riadkov konvertované na rovnaký znak, čím sa " "predchádza výskytu rôznych znakov konca riadkov v jednom súbore" #: ../data/geany.glade.h:251 @@ -2237,6 +2237,8 @@ msgid "" "Copyright (c) 2005\n" "The Geany contributors" msgstr "" +"Copyright (c) 2005\n" +"Prispievatelia do Geany" #: ../src/about.c:169 msgid "About Geany" @@ -3928,6 +3930,8 @@ msgstr "Nebolo možné vytvoriť adresár s konfiguráciou (%s)." #: ../src/libmain.c:1184 msgid "IPC socket could not be created, see Help->Debug Messages for details." msgstr "" +"Nebolo možné vytvoriť IPC soket, pre viac detailov pozrite Pomoc->Ladiace " +"správy." #: ../src/libmain.c:1413 msgid "Do you really want to quit?" @@ -3988,7 +3992,7 @@ msgid "" "The plugin \"%s\" is not binary compatible with this release of Geany - " "please recompile it." msgstr "" -"Zásuvný modul „%s“ nie je binárne kompatibilný s aktuálnou verziou Geany - " +"Zásuvný modul „%s“ nie je binárne kompatibilný s aktuálnou verziou Geany - " "prosím zostavte modul znovu." #: ../src/plugins.c:1270 @@ -4336,7 +4340,7 @@ msgid "" "Use Perl-like regular expressions. For detailed information about using " "regular expressions, please refer to the manual." msgstr "" -"Používať regulárne výrazy jayzka Perl. Pre viac detailov o používaní " +"Používať regulárne výrazy jazyka Perl. Pre viac detailov o používaní " "regulárnych výrazov, si prečítajte dokumentáciu." #: ../src/search.c:317 @@ -4730,7 +4734,7 @@ msgstr "Moduly" #: ../src/symbols.c:556 ../src/symbols.c:603 msgid "Traits" -msgstr "" +msgstr "Črty" #: ../src/symbols.c:557 msgid "Implementations" @@ -5008,7 +5012,7 @@ msgid "" "Cannot execute template command \"%s\". Hint: incorrect paths in the command " "are a common cause of errors. Error: %s." msgstr "" -"Nie je možné spustíť príkaz šablóny „%s“. Tip: nesprávne cesty v príkaze sú " +"Nie je možné spustiť príkaz šablóny „%s“. Tip: nesprávne cesty v príkaze sú " "častou príčinou chýb. Chyba: %s." #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" @@ -5412,7 +5416,7 @@ msgstr "Zavrieť všetko" #: ../src/ui_utils.c:2446 msgid "Geany cannot start!" -msgstr "Nie je možné zapnúť Geany!" +msgstr "Geany sa nedá spustiť!" #: ../src/utils.c:87 msgid "Select Browser" @@ -5550,7 +5554,7 @@ msgstr "Globálna" #: ../plugins/classbuilder.c:526 msgid "Base GType:" -msgstr "Zakladný GType:" +msgstr "Základný GType:" #: ../plugins/classbuilder.c:531 msgid "Implements:" @@ -5992,20 +5996,3 @@ msgstr "Vedľa seba" #: ../plugins/splitwindow.c:467 msgid "Top and Bottom" msgstr "Nad sebou" - -#~ msgid "" -#~ "Copyright (c) 2005-2019\n" -#~ "Colomban Wendling\n" -#~ "Nick Treleaven\n" -#~ "Matthew Brush\n" -#~ "Enrico Tröger\n" -#~ "Frank Lanitz\n" -#~ "All rights reserved." -#~ msgstr "" -#~ "Copyright (c) 2005-2019\n" -#~ "Colomban Wendling\n" -#~ "Nick Treleaven\n" -#~ "Matthew Brush\n" -#~ "Enrico Tröger\n" -#~ "Frank Lanitz\n" -#~ "Všetky práva vyhradené." Modified: src/about.c 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -81,7 +81,7 @@ static const gchar *translators[][2] = { "Rafael Peregrino da Silva <rperegrino(a)linuxnewmedia.com.br>"}, { "ro", "Alex Eftimie <alex(a)rosedu.org>" }, { "ru", "brahmann_ <brahmann(a)lifec0re.net>,\nNikita E. Shalaev <nshalaev(a)eu.spb.ru>" }, - { "sk", "Tomáš Vadina <kyberdev(a)gmail.com>" }, + { "sk", "Andrej Herceg <chrono.i18n(a)gmail.com>" }, { "sl", "Jože Klepec <joze.klepec(a)siol.net>"}, { "sv", "Tony Mattsson <superxorn(a)gmail.com>" }, { "sr", "Nikola Radovanovic <cobisimo(a)gmail.com>"}, @@ -96,7 +96,8 @@ static const guint translators_len = G_N_ELEMENTS(translators); static const gchar *prev_translators[][2] = { { "es", "Damián Viano <debian(a)damianv.com.ar>\nNacho Cabanes <ncabanes(a)gmail.com>" }, { "pl", "Jacek Wolszczak <shutdownrunner(a)o2.xn--pl>\njarosaw-ctc Foksa <jfoksa(a)gmail.com>" }, - { "nl", "Kurt De Bree <kdebree(a)telenet.be>" } + { "nl", "Kurt De Bree <kdebree(a)telenet.be>" }, + { "sk", "Tomáš Vadina <kyberdev(a)gmail.com>" } }; static const guint prev_translators_len = G_N_ELEMENTS(prev_translators); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 46797d: Update off Spanish translation
by Frank Lanitz 16 Apr '19

16 Apr '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 16 Apr 2019 15:46:14 UTC Commit: 46797da804cbea7f011feeb715e4220cb26d52b5 https://github.com/geany/geany/commit/46797da804cbea7f011feeb715e4220cb26d5… Log Message: ----------- Update off Spanish translation Modified Paths: -------------- po/es.po Modified: po/es.po 20 lines changed, 11 insertions(+), 9 deletions(-) =================================================================== @@ -1,24 +1,24 @@ # translation of es.po to -# Spanish translation file for Geany 1.33 -# Copyright (C) 2006 The Geany contributors. +# Spanish translation file for Geany 1.35 +# Copyright (C) 2006-2019 The Geany contributors. # This file is distributed under the same license as the geany package. -# Damián Viano <des(a)damianv.com.ar>, 2006, 2007. +# Damián Viano <des(a)damianv.com.ar>, 2006 - 2007. # Antonio Jiménez González <ajimenez(a)linuxmail.org>, 2009 - 2010. -# Lucas Vieites <lucas.vieites(a)gmail.com>, 2010 - 2018. +# Lucas Vieites <lucas.vieites(a)gmail.com>, 2010 - 2019. msgid "" msgstr "" -"Project-Id-Version: Geany 1.34\n" +"Project-Id-Version: Geany 1.35\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-15 17:13+0200\n" -"PO-Revision-Date: 2018-12-05 15:34+0100\n" +"POT-Creation-Date: 2019-04-16 02:36+0000\n" +"PO-Revision-Date: 2019-04-16 11:34+0200\n" "Last-Translator: Lucas Vieites Fariña <lucas(a)codexion.com>\n" "Language-Team: Español <geany-i18n(a)uvena.de>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Geany 1.32\n" +"X-Generator: Geany / PoHelper 1.34\n" #: ../geany.desktop.in.h:1 ../data/geany.glade.h:343 msgid "Geany" @@ -2278,6 +2278,8 @@ msgid "" "Copyright (c) 2005\n" "The Geany contributors" msgstr "" +"Copyright (c) 2005\n" +"The Geany contributors" #: ../src/about.c:169 msgid "About Geany" @@ -3984,7 +3986,7 @@ msgstr "No se ha podido crear el directorio de configuración (%s)." #: ../src/libmain.c:1184 msgid "IPC socket could not be created, see Help->Debug Messages for details." -msgstr "" +msgstr "No se ha podido crear el socket IPC, consulte Ayuda->Mensajes de depuración para obtener más información." #: ../src/libmain.c:1413 msgid "Do you really want to quit?" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ada85a: Update of Portugese translation
by Frank Lanitz 16 Apr '19

16 Apr '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 16 Apr 2019 15:18:39 UTC Commit: ada85ab331490b4449007947388ad6ce38a578ae https://github.com/geany/geany/commit/ada85ab331490b4449007947388ad6ce38a57… Log Message: ----------- Update of Portugese translation Modified Paths: -------------- po/pt.po Modified: po/pt.po 19 lines changed, 10 insertions(+), 9 deletions(-) =================================================================== @@ -1,23 +1,23 @@ # Portuguese translation for geany -# Copyright (C) 2006 The Geany contributors. +# Copyright (C) 2006-2019 The Geany contributors. # This file is distributed under the same license as the geany package. # # André Glória <gloria_dot_andre_at_gmail_dot_com> 2009 - 2014 -# Pedro Albuquerque <palbuquerque73(a)gmail.com>, 2015 - 2017, 2018. +# Pedro Albuquerque <palbuquerque73(a)gmail.com>, 2015 - 2019. # msgid "" msgstr "" -"Project-Id-Version: Geany 1.34\n" +"Project-Id-Version: Geany 1.35\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-15 17:13+0200\n" -"PO-Revision-Date: 2018-12-05 07:26+0000\n" +"POT-Creation-Date: 2019-04-16 02:36+0000\n" +"PO-Revision-Date: 2019-04-16 10:20+0100\n" "Last-Translator: Pedro Albuquerque <palbuquerque73(a)gmail.com>\n" "Language-Team: Português <palbuquerque73(a)gmail.com>\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" "X-Launchpad-Export-Date: 2010-03-08 13:33+0000\n" "X-Generator: Gtranslator 2.91.7\n" @@ -2263,6 +2263,8 @@ msgid "" "Copyright (c) 2005\n" "The Geany contributors" msgstr "" +"Copyright (c) 2005\n" +"Os colaboradores do Geany" #: ../src/about.c:169 msgid "About Geany" @@ -3957,11 +3959,10 @@ msgid "Configuration directory could not be created (%s)." msgstr "A pasta de configurações não pôde ser criada (%s)." #: ../src/libmain.c:1184 -#, fuzzy msgid "IPC socket could not be created, see Help->Debug Messages for details." msgstr "" -"Procura falhou (consulte Ajuda->Mensagens de depuração (debug) para " -"detalhes)." +"Impossível criar o socket IPC, veja Ajuda->Mensagens de depuração para " +"detalhes." #: ../src/libmain.c:1413 msgid "Do you really want to quit?" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b1d10d: Update danish translation to 1.35 (#2125)
by scootergrisen 15 Apr '19

15 Apr '19

Branch: refs/heads/master Author: scootergrisen <scootergrisen(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 15 Apr 2019 21:44:36 UTC Commit: b1d10d55bf7c82635575062971c88d806cbb28db https://github.com/geany/geany/commit/b1d10d55bf7c82635575062971c88d806cbb2… Log Message: ----------- Update danish translation to 1.35 (#2125) Add 2 new strings Modified Paths: -------------- po/da.po Modified: po/da.po 25 lines changed, 5 insertions(+), 20 deletions(-) =================================================================== @@ -4,10 +4,10 @@ # scootergrisen, 2018. msgid "" msgstr "" -"Project-Id-Version: geany 1.34\n" +"Project-Id-Version: geany 1.35\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-15 17:13+0200\n" -"PO-Revision-Date: 2018-12-04 22:46+0200\n" +"PO-Revision-Date: 2019-04-15 23:17+0200\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish\n" "Language: da\n" @@ -2227,6 +2227,8 @@ msgid "" "Copyright (c) 2005\n" "The Geany contributors" msgstr "" +"Ophavsret (c) 2005\n" +"Geany-bidragsyderne" #: ../src/about.c:169 msgid "About Geany" @@ -3915,7 +3917,7 @@ msgstr "Konfigurationsmappen kunne ikke oprettes (%s)." #: ../src/libmain.c:1184 msgid "IPC socket could not be created, see Help->Debug Messages for details." -msgstr "" +msgstr "IPC-soklen kunne ikke oprettes, se Hjælp->Fejlretningsmeddelelser for detaljer." #: ../src/libmain.c:1413 msgid "Do you really want to quit?" @@ -5989,20 +5991,3 @@ msgstr "Side om side" #: ../plugins/splitwindow.c:467 msgid "Top and Bottom" msgstr "Øverst og nederst" - -#~ msgid "" -#~ "Copyright (c) 2005-2019\n" -#~ "Colomban Wendling\n" -#~ "Nick Treleaven\n" -#~ "Matthew Brush\n" -#~ "Enrico Tröger\n" -#~ "Frank Lanitz\n" -#~ "All rights reserved." -#~ msgstr "" -#~ "Ophavsret (c) 2005-2019\n" -#~ "Colomban Wendling\n" -#~ "Nick Treleaven\n" -#~ "Matthew Brush\n" -#~ "Enrico Tröger\n" -#~ "Frank Lanitz\n" -#~ "Alle rettigheder forbeholdes." -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2019