Commits November 2008

commits@lists.geany.org

4 participants
134 discussions

SF.net SVN: geany:[3208] trunk
by eht16＠users.sourceforge.net 11 Nov '08

11 Nov '08

Revision: 3208 http://geany.svn.sourceforge.net/geany/?rev=3208&view=rev Author: eht16 Date: 2008-11-11 18:07:35 +0000 (Tue, 11 Nov 2008) Log Message: ----------- Use 'utf8' as encoding package in the LaTeX template as it seems it is the most used version for UTF-8 support. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/export.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-11 18:07:16 UTC (rev 3207) +++ trunk/ChangeLog 2008-11-11 18:07:35 UTC (rev 3208) @@ -1,3 +1,13 @@ +2008-11-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * doc/Makefile.am, wscript, waf: + Improve the checking for 'rst2html.py' when creating HTML docs. + Update Waf to 1.5.0 (final). + * plugins/export.c: + Use 'utf8' as encoding package in the LaTeX template as it seems it + is the most used version for UTF-8 support. + + 2008-11-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/highlighting.c, src/plugindata.h, src/about.c, src/filetypes.c, Modified: trunk/plugins/export.c =================================================================== --- trunk/plugins/export.c 2008-11-11 18:07:16 UTC (rev 3207) +++ trunk/plugins/export.c 2008-11-11 18:07:35 UTC (rev 3208) @@ -77,7 +77,7 @@ % {export_filename} (LaTeX code generated by Geany " VERSION " on {export_date})\n\ \\documentclass[a4paper]{article}\n\ \\usepackage[a4paper,margin=2cm]{geometry}\n\ -\\usepackage[utf8x]{inputenc}\n\ +\\usepackage[utf8]{inputenc}\n\ \\usepackage[T1]{fontenc}\n\ \\usepackage{color}\n\ \\setlength{\\parindent}{0em}\n\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3207] trunk
by eht16＠users.sourceforge.net 11 Nov '08

11 Nov '08

Revision: 3207 http://geany.svn.sourceforge.net/geany/?rev=3207&view=rev Author: eht16 Date: 2008-11-11 18:07:16 +0000 (Tue, 11 Nov 2008) Log Message: ----------- Improve the checking for 'rst2html.py' when creating HTML docs. Update Waf to 1.5.0 (final). Modified Paths: -------------- trunk/doc/Makefile.am trunk/waf trunk/wscript Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2008-11-11 17:42:54 UTC (rev 3206) +++ trunk/doc/Makefile.am 2008-11-11 18:07:16 UTC (rev 3207) @@ -18,6 +18,7 @@ # when generating documentation, first try rst2html.py as it is the upstream default doc: geany.txt + (rst2html.py --version) < /dev/null > /dev/null 2>&1 && \ rst2html.py -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html || \ rst2html -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html Modified: trunk/waf =================================================================== --- trunk/waf 2008-11-11 17:42:54 UTC (rev 3206) +++ trunk/waf 2008-11-11 18:07:16 UTC (rev 3207) @@ -38,10 +38,10 @@ except:pass VERSION="1.5.0" -REVISION="e0730d02f63846cebb6d4c8b0dad1f79" +REVISION="80c6ad48eea21944e014f0f0e609ef9c" INSTALL=sys.platform=='win32' and 'c:/temp' or '/usr/local' C1='#(' -C2='#%' +C2='#&' cwd = os.getcwd() join = os.path.join @@ -127,5 +127,5 @@ Scripting.prepare(t, cwd, VERSION, wafdir) #==> @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3206] trunk
by ntrel＠users.sourceforge.net 11 Nov '08

11 Nov '08

Revision: 3206 http://geany.svn.sourceforge.net/geany/?rev=3206&view=rev Author: ntrel Date: 2008-11-11 17:42:54 +0000 (Tue, 11 Nov 2008) Log Message: ----------- Use separate keyword table for D (still missing keywords though). Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/c.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-11 16:33:20 UTC (rev 3205) +++ trunk/ChangeLog 2008-11-11 17:42:54 UTC (rev 3206) @@ -5,6 +5,8 @@ data/filetype_extensions.conf: Apply patch from Colomban Wendling to add Vala filetype (thanks). Fix c.c tagLetter() bug. + * tagmanager/c.c: + Use separate keyword table for D (still missing keywords though). 2008-11-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2008-11-11 16:33:20 UTC (rev 3205) +++ trunk/tagmanager/c.c 2008-11-11 17:42:54 UTC (rev 3206) @@ -95,7 +95,7 @@ typedef struct sKeywordDesc { const char *name; keywordId id; - short isValid [6]; /* indicates languages for which kw is valid */ + short isValid [7]; /* indicates languages for which kw is valid */ } keywordDesc; /* Used for reporting the type of object parsed by nextToken (). @@ -340,117 +340,118 @@ }; static const keywordDesc KeywordTable [] = { - /* C++ */ - /* ANSI C | C# Java */ - /* | | | | Vera */ - /* | | | | | Vala */ - /* keyword keyword ID | | | | | | */ - { "__attribute__", KEYWORD_ATTRIBUTE, { 1, 1, 1, 0, 0, 0 } }, - { "abstract", KEYWORD_ABSTRACT, { 0, 0, 1, 1, 0, 1 } }, - { "bad_state", KEYWORD_BAD_STATE, { 0, 0, 0, 0, 1, 0 } }, - { "bad_trans", KEYWORD_BAD_TRANS, { 0, 0, 0, 0, 1, 0 } }, - { "bind", KEYWORD_BIND, { 0, 0, 0, 0, 1, 0 } }, - { "bind_var", KEYWORD_BIND_VAR, { 0, 0, 0, 0, 1, 0 } }, - { "bit", KEYWORD_BIT, { 0, 0, 0, 0, 1, 0 } }, - { "boolean", KEYWORD_BOOLEAN, { 0, 0, 0, 1, 0, 0 } }, - { "byte", KEYWORD_BYTE, { 0, 0, 0, 1, 0, 0 } }, - { "case", KEYWORD_CASE, { 1, 1, 1, 1, 0, 1 } }, - { "catch", KEYWORD_CATCH, { 0, 1, 1, 0, 0, 1 } }, - { "char", KEYWORD_CHAR, { 1, 1, 1, 1, 0, 1 } }, - { "class", KEYWORD_CLASS, { 0, 1, 1, 1, 1, 1 } }, - { "const", KEYWORD_CONST, { 1, 1, 1, 1, 0, 1 } }, - { "constraint", KEYWORD_CONSTRAINT, { 0, 0, 0, 0, 1, 0 } }, - { "coverage_block", KEYWORD_COVERAGE_BLOCK, { 0, 0, 0, 0, 1, 0 } }, - { "coverage_def", KEYWORD_COVERAGE_DEF, { 0, 0, 0, 0, 1, 0 } }, - { "do", KEYWORD_DO, { 1, 1, 1, 1, 0, 1 } }, - { "default", KEYWORD_DEFAULT, { 1, 1, 1, 1, 0, 1 } }, - { "delegate", KEYWORD_DELEGATE, { 0, 0, 1, 0, 0, 1 } }, - { "delete", KEYWORD_DELETE, { 0, 1, 0, 0, 0, 1 } }, - { "double", KEYWORD_DOUBLE, { 1, 1, 1, 1, 0, 1 } }, - { "else", KEYWORD_ELSE, { 1, 1, 0, 1, 0, 1 } }, - { "enum", KEYWORD_ENUM, { 1, 1, 1, 1, 1, 1 } }, - { "errordomain", KEYWORD_ENUM, { 0, 0, 0, 0, 0, 1 } }, /* errordomain behaves like enum */ - { "event", KEYWORD_EVENT, { 0, 0, 1, 0, 1, 0 } }, - { "explicit", KEYWORD_EXPLICIT, { 0, 1, 1, 0, 0, 0 } }, - { "extends", KEYWORD_EXTENDS, { 0, 0, 0, 1, 1, 0 } }, - { "extern", KEYWORD_EXTERN, { 1, 1, 1, 0, 1, 1 } }, - { "final", KEYWORD_FINAL, { 0, 0, 0, 1, 0, 0 } }, - { "finally", KEYWORD_FINALLY, { 0, 0, 0, 0, 0, 1 } }, - { "float", KEYWORD_FLOAT, { 1, 1, 1, 1, 0, 1 } }, - { "for", KEYWORD_FOR, { 1, 1, 1, 1, 0, 1 } }, - { "friend", KEYWORD_FRIEND, { 0, 1, 0, 0, 0, 0 } }, - { "function", KEYWORD_FUNCTION, { 0, 0, 0, 0, 1, 0 } }, - { "get", KEYWORD_GET, { 0, 0, 0, 0, 0, 1 } }, - { "goto", KEYWORD_GOTO, { 1, 1, 1, 1, 0, 1 } }, - { "if", KEYWORD_IF, { 1, 1, 1, 1, 0, 1 } }, - { "implements", KEYWORD_IMPLEMENTS, { 0, 0, 0, 1, 0, 0 } }, - { "import", KEYWORD_IMPORT, { 0, 1, 0, 1, 0, 0 } }, /* D */ - { "inline", KEYWORD_INLINE, { 0, 1, 0, 0, 0, 1 } }, - { "inout", KEYWORD_INOUT, { 0, 0, 0, 0, 1, 0 } }, - { "input", KEYWORD_INPUT, { 0, 0, 0, 0, 1, 0 } }, - { "int", KEYWORD_INT, { 1, 1, 1, 1, 0, 1 } }, - { "integer", KEYWORD_INTEGER, { 0, 0, 0, 0, 1, 0 } }, - { "interface", KEYWORD_INTERFACE, { 0, 0, 1, 1, 1, 1 } }, - { "internal", KEYWORD_INTERNAL, { 0, 0, 1, 0, 0, 0 } }, - { "local", KEYWORD_LOCAL, { 0, 0, 0, 0, 1, 0 } }, - { "long", KEYWORD_LONG, { 1, 1, 1, 1, 0, 1 } }, - { "m_bad_state", KEYWORD_M_BAD_STATE, { 0, 0, 0, 0, 1, 0 } }, - { "m_bad_trans", KEYWORD_M_BAD_TRANS, { 0, 0, 0, 0, 1, 0 } }, - { "m_state", KEYWORD_M_STATE, { 0, 0, 0, 0, 1, 0 } }, - { "m_trans", KEYWORD_M_TRANS, { 0, 0, 0, 0, 1, 0 } }, - { "mutable", KEYWORD_MUTABLE, { 0, 1, 0, 0, 0, 0 } }, - { "module", KEYWORD_MODULE, { 0, 1, 0, 0, 0, 0 } }, /* D */ - { "namespace", KEYWORD_NAMESPACE, { 0, 1, 1, 0, 0, 1 } }, - { "native", KEYWORD_NATIVE, { 0, 0, 0, 1, 0, 0 } }, - { "new", KEYWORD_NEW, { 0, 1, 1, 1, 0, 1 } }, - { "newcov", KEYWORD_NEWCOV, { 0, 0, 0, 0, 1, 0 } }, - { "operator", KEYWORD_OPERATOR, { 0, 1, 1, 0, 0, 0 } }, - { "output", KEYWORD_OUTPUT, { 0, 0, 0, 0, 1, 0 } }, - { "overload", KEYWORD_OVERLOAD, { 0, 1, 0, 0, 0, 0 } }, - { "override", KEYWORD_OVERRIDE, { 0, 0, 1, 0, 0, 1 } }, - { "package", KEYWORD_PACKAGE, { 0, 0, 0, 1, 0, 0 } }, - { "packed", KEYWORD_PACKED, { 0, 0, 0, 0, 1, 0 } }, - { "port", KEYWORD_PORT, { 0, 0, 0, 0, 1, 0 } }, - { "private", KEYWORD_PRIVATE, { 0, 1, 1, 1, 0, 1 } }, - { "program", KEYWORD_PROGRAM, { 0, 0, 0, 0, 1, 0 } }, - { "protected", KEYWORD_PROTECTED, { 0, 1, 1, 1, 1, 1 } }, - { "public", KEYWORD_PUBLIC, { 0, 1, 1, 1, 1, 1 } }, - { "register", KEYWORD_REGISTER, { 1, 1, 0, 0, 0, 0 } }, - { "return", KEYWORD_RETURN, { 1, 1, 1, 1, 0, 1 } }, - { "set", KEYWORD_SET, { 0, 0, 0, 0, 0, 1 } }, - { "shadow", KEYWORD_SHADOW, { 0, 0, 0, 0, 1, 0 } }, - { "short", KEYWORD_SHORT, { 1, 1, 1, 1, 0, 1 } }, - { "signal", KEYWORD_SIGNAL, { 0, 0, 0, 0, 0, 1 } }, - { "signed", KEYWORD_SIGNED, { 1, 1, 0, 0, 0, 0 } }, - { "size_t", KEYWORD_SIZE_T, { 1, 1, 0, 0, 0, 1 } }, - { "state", KEYWORD_STATE, { 0, 0, 0, 0, 1, 0 } }, - { "static", KEYWORD_STATIC, { 1, 1, 1, 1, 1, 1 } }, - { "string", KEYWORD_STRING, { 0, 0, 1, 0, 1, 1 } }, - { "struct", KEYWORD_STRUCT, { 1, 1, 1, 0, 0, 1 } }, - { "switch", KEYWORD_SWITCH, { 1, 1, 1, 1, 0, 1 } }, - { "synchronized", KEYWORD_SYNCHRONIZED, { 0, 0, 0, 1, 0, 0 } }, - { "task", KEYWORD_TASK, { 0, 0, 0, 0, 1, 0 } }, - { "template", KEYWORD_TEMPLATE, { 0, 1, 0, 0, 0, 0 } }, - { "this", KEYWORD_THIS, { 0, 0, 1, 1, 0, 1 } }, /* allow D ctor tags */ - { "throw", KEYWORD_THROW, { 0, 1, 1, 1, 0, 1 } }, - { "throws", KEYWORD_THROWS, { 0, 0, 0, 1, 0, 1 } }, - { "trans", KEYWORD_TRANS, { 0, 0, 0, 0, 1, 0 } }, - { "transition", KEYWORD_TRANSITION, { 0, 0, 0, 0, 1, 0 } }, - { "transient", KEYWORD_TRANSIENT, { 0, 0, 0, 1, 0, 0 } }, - { "try", KEYWORD_TRY, { 0, 1, 1, 0, 0, 1 } }, - { "typedef", KEYWORD_TYPEDEF, { 1, 1, 1, 0, 1, 0 } }, - { "typename", KEYWORD_TYPENAME, { 0, 1, 0, 0, 0, 0 } }, - { "uint", KEYWORD_UINT, { 0, 0, 1, 0, 0, 1 } }, - { "ulong", KEYWORD_ULONG, { 0, 0, 1, 0, 0, 1 } }, - { "union", KEYWORD_UNION, { 1, 1, 0, 0, 0, 0 } }, - { "unsigned", KEYWORD_UNSIGNED, { 1, 1, 1, 0, 0, 0 } }, - { "ushort", KEYWORD_USHORT, { 0, 0, 1, 0, 0, 1 } }, - { "using", KEYWORD_USING, { 0, 1, 1, 0, 0, 1 } }, - { "virtual", KEYWORD_VIRTUAL, { 0, 1, 1, 0, 1, 1 } }, - { "void", KEYWORD_VOID, { 1, 1, 1, 1, 1, 1 } }, - { "volatile", KEYWORD_VOLATILE, { 1, 1, 1, 1, 0, 0 } }, - { "wchar_t", KEYWORD_WCHAR_T, { 1, 1, 1, 0, 0, 0 } }, - { "while", KEYWORD_WHILE, { 1, 1, 1, 1, 0, 1 } } + /* C++ */ + /* ANSI C | C# Java */ + /* | | | | Vera */ + /* | | | | | Vala */ + /* | | | | | | D */ + /* keyword keyword ID | | | | | | | */ + { "__attribute__", KEYWORD_ATTRIBUTE, { 1, 1, 1, 0, 0, 0, 1 } }, + { "abstract", KEYWORD_ABSTRACT, { 0, 0, 1, 1, 0, 1, 1 } }, + { "bad_state", KEYWORD_BAD_STATE, { 0, 0, 0, 0, 1, 0, 0 } }, + { "bad_trans", KEYWORD_BAD_TRANS, { 0, 0, 0, 0, 1, 0, 0 } }, + { "bind", KEYWORD_BIND, { 0, 0, 0, 0, 1, 0, 0 } }, + { "bind_var", KEYWORD_BIND_VAR, { 0, 0, 0, 0, 1, 0, 0 } }, + { "bit", KEYWORD_BIT, { 0, 0, 0, 0, 1, 0, 0 } }, + { "boolean", KEYWORD_BOOLEAN, { 0, 0, 0, 1, 0, 0, 0 } }, + { "byte", KEYWORD_BYTE, { 0, 0, 0, 1, 0, 0, 0 } }, + { "case", KEYWORD_CASE, { 1, 1, 1, 1, 0, 1, 1 } }, + { "catch", KEYWORD_CATCH, { 0, 1, 1, 0, 0, 1, 1 } }, + { "char", KEYWORD_CHAR, { 1, 1, 1, 1, 0, 1, 1 } }, + { "class", KEYWORD_CLASS, { 0, 1, 1, 1, 1, 1, 1 } }, + { "const", KEYWORD_CONST, { 1, 1, 1, 1, 0, 1, 1 } }, + { "constraint", KEYWORD_CONSTRAINT, { 0, 0, 0, 0, 1, 0, 0 } }, + { "coverage_block", KEYWORD_COVERAGE_BLOCK, { 0, 0, 0, 0, 1, 0, 0 } }, + { "coverage_def", KEYWORD_COVERAGE_DEF, { 0, 0, 0, 0, 1, 0, 0 } }, + { "do", KEYWORD_DO, { 1, 1, 1, 1, 0, 1, 1 } }, + { "default", KEYWORD_DEFAULT, { 1, 1, 1, 1, 0, 1, 1 } }, + { "delegate", KEYWORD_DELEGATE, { 0, 0, 1, 0, 0, 1, 1 } }, + { "delete", KEYWORD_DELETE, { 0, 1, 0, 0, 0, 1, 1 } }, + { "double", KEYWORD_DOUBLE, { 1, 1, 1, 1, 0, 1, 1 } }, + { "else", KEYWORD_ELSE, { 1, 1, 0, 1, 0, 1, 1 } }, + { "enum", KEYWORD_ENUM, { 1, 1, 1, 1, 1, 1, 1 } }, + { "errordomain", KEYWORD_ENUM, { 0, 0, 0, 0, 0, 1, 0 } }, /* errordomain behaves like enum */ + { "event", KEYWORD_EVENT, { 0, 0, 1, 0, 1, 0, 0 } }, + { "explicit", KEYWORD_EXPLICIT, { 0, 1, 1, 0, 0, 0, 1 } }, + { "extends", KEYWORD_EXTENDS, { 0, 0, 0, 1, 1, 0, 0 } }, + { "extern", KEYWORD_EXTERN, { 1, 1, 1, 0, 1, 1, 1 } }, + { "final", KEYWORD_FINAL, { 0, 0, 0, 1, 0, 0, 0 } }, + { "finally", KEYWORD_FINALLY, { 0, 0, 0, 0, 0, 1, 0 } }, + { "float", KEYWORD_FLOAT, { 1, 1, 1, 1, 0, 1, 1 } }, + { "for", KEYWORD_FOR, { 1, 1, 1, 1, 0, 1, 1 } }, + { "friend", KEYWORD_FRIEND, { 0, 1, 0, 0, 0, 0, 0 } }, + { "function", KEYWORD_FUNCTION, { 0, 0, 0, 0, 1, 0, 0 } }, + { "get", KEYWORD_GET, { 0, 0, 0, 0, 0, 1, 0 } }, + { "goto", KEYWORD_GOTO, { 1, 1, 1, 1, 0, 1, 1 } }, + { "if", KEYWORD_IF, { 1, 1, 1, 1, 0, 1, 1 } }, + { "implements", KEYWORD_IMPLEMENTS, { 0, 0, 0, 1, 0, 0, 0 } }, + { "import", KEYWORD_IMPORT, { 0, 0, 0, 1, 0, 0, 1 } }, + { "inline", KEYWORD_INLINE, { 0, 1, 0, 0, 0, 1, 0 } }, + { "inout", KEYWORD_INOUT, { 0, 0, 0, 0, 1, 0, 1 } }, + { "input", KEYWORD_INPUT, { 0, 0, 0, 0, 1, 0, 0 } }, + { "int", KEYWORD_INT, { 1, 1, 1, 1, 0, 1, 1 } }, + { "integer", KEYWORD_INTEGER, { 0, 0, 0, 0, 1, 0, 0 } }, + { "interface", KEYWORD_INTERFACE, { 0, 0, 1, 1, 1, 1, 1 } }, + { "internal", KEYWORD_INTERNAL, { 0, 0, 1, 0, 0, 0, 0 } }, + { "local", KEYWORD_LOCAL, { 0, 0, 0, 0, 1, 0, 0 } }, + { "long", KEYWORD_LONG, { 1, 1, 1, 1, 0, 1, 1 } }, + { "m_bad_state", KEYWORD_M_BAD_STATE, { 0, 0, 0, 0, 1, 0, 0 } }, + { "m_bad_trans", KEYWORD_M_BAD_TRANS, { 0, 0, 0, 0, 1, 0, 0 } }, + { "m_state", KEYWORD_M_STATE, { 0, 0, 0, 0, 1, 0, 0 } }, + { "m_trans", KEYWORD_M_TRANS, { 0, 0, 0, 0, 1, 0, 0 } }, + { "mutable", KEYWORD_MUTABLE, { 0, 1, 0, 0, 0, 0, 0 } }, + { "module", KEYWORD_MODULE, { 0, 0, 0, 0, 0, 0, 1 } }, + { "namespace", KEYWORD_NAMESPACE, { 0, 1, 1, 0, 0, 1, 1 } }, + { "native", KEYWORD_NATIVE, { 0, 0, 0, 1, 0, 0, 0 } }, + { "new", KEYWORD_NEW, { 0, 1, 1, 1, 0, 1, 1 } }, + { "newcov", KEYWORD_NEWCOV, { 0, 0, 0, 0, 1, 0, 0 } }, + { "operator", KEYWORD_OPERATOR, { 0, 1, 1, 0, 0, 0, 0 } }, + { "output", KEYWORD_OUTPUT, { 0, 0, 0, 0, 1, 0, 0 } }, + { "overload", KEYWORD_OVERLOAD, { 0, 1, 0, 0, 0, 0, 0 } }, + { "override", KEYWORD_OVERRIDE, { 0, 0, 1, 0, 0, 1, 1 } }, + { "package", KEYWORD_PACKAGE, { 0, 0, 0, 1, 0, 0, 1 } }, + { "packed", KEYWORD_PACKED, { 0, 0, 0, 0, 1, 0, 0 } }, + { "port", KEYWORD_PORT, { 0, 0, 0, 0, 1, 0, 0 } }, + { "private", KEYWORD_PRIVATE, { 0, 1, 1, 1, 0, 1, 1 } }, + { "program", KEYWORD_PROGRAM, { 0, 0, 0, 0, 1, 0, 0 } }, + { "protected", KEYWORD_PROTECTED, { 0, 1, 1, 1, 1, 1, 1 } }, + { "public", KEYWORD_PUBLIC, { 0, 1, 1, 1, 1, 1, 1 } }, + { "register", KEYWORD_REGISTER, { 1, 1, 0, 0, 0, 0, 0 } }, + { "return", KEYWORD_RETURN, { 1, 1, 1, 1, 0, 1, 1 } }, + { "set", KEYWORD_SET, { 0, 0, 0, 0, 0, 1, 0 } }, + { "shadow", KEYWORD_SHADOW, { 0, 0, 0, 0, 1, 0, 0 } }, + { "short", KEYWORD_SHORT, { 1, 1, 1, 1, 0, 1, 1 } }, + { "signal", KEYWORD_SIGNAL, { 0, 0, 0, 0, 0, 1, 0 } }, + { "signed", KEYWORD_SIGNED, { 1, 1, 0, 0, 0, 0, 0 } }, + { "size_t", KEYWORD_SIZE_T, { 1, 1, 0, 0, 0, 1, 1 } }, + { "state", KEYWORD_STATE, { 0, 0, 0, 0, 1, 0, 0 } }, + { "static", KEYWORD_STATIC, { 1, 1, 1, 1, 1, 1, 1 } }, + { "string", KEYWORD_STRING, { 0, 0, 1, 0, 1, 1, 0 } }, + { "struct", KEYWORD_STRUCT, { 1, 1, 1, 0, 0, 1, 1 } }, + { "switch", KEYWORD_SWITCH, { 1, 1, 1, 1, 0, 1, 1 } }, + { "synchronized", KEYWORD_SYNCHRONIZED, { 0, 0, 0, 1, 0, 0, 1 } }, + { "task", KEYWORD_TASK, { 0, 0, 0, 0, 1, 0, 0 } }, + { "template", KEYWORD_TEMPLATE, { 0, 1, 0, 0, 0, 0, 1 } }, + { "this", KEYWORD_THIS, { 0, 0, 1, 1, 0, 1, 0 } }, /* 0 to allow D ctor tags */ + { "throw", KEYWORD_THROW, { 0, 1, 1, 1, 0, 1, 1 } }, + { "throws", KEYWORD_THROWS, { 0, 0, 0, 1, 0, 1, 0 } }, + { "trans", KEYWORD_TRANS, { 0, 0, 0, 0, 1, 0, 0 } }, + { "transition", KEYWORD_TRANSITION, { 0, 0, 0, 0, 1, 0, 0 } }, + { "transient", KEYWORD_TRANSIENT, { 0, 0, 0, 1, 0, 0, 0 } }, + { "try", KEYWORD_TRY, { 0, 1, 1, 0, 0, 1, 1 } }, + { "typedef", KEYWORD_TYPEDEF, { 1, 1, 1, 0, 1, 0, 1 } }, + { "typename", KEYWORD_TYPENAME, { 0, 1, 0, 0, 0, 0, 0 } }, + { "uint", KEYWORD_UINT, { 0, 0, 1, 0, 0, 1, 1 } }, + { "ulong", KEYWORD_ULONG, { 0, 0, 1, 0, 0, 1, 1 } }, + { "union", KEYWORD_UNION, { 1, 1, 0, 0, 0, 0, 1 } }, + { "unsigned", KEYWORD_UNSIGNED, { 1, 1, 1, 0, 0, 0, 1 } }, + { "ushort", KEYWORD_USHORT, { 0, 0, 1, 0, 0, 1, 1 } }, + { "using", KEYWORD_USING, { 0, 1, 1, 0, 0, 1, 0 } }, + { "virtual", KEYWORD_VIRTUAL, { 0, 1, 1, 0, 1, 1, 0 } }, + { "void", KEYWORD_VOID, { 1, 1, 1, 1, 1, 1, 1 } }, + { "volatile", KEYWORD_VOLATILE, { 1, 1, 1, 1, 0, 0, 1 } }, + { "wchar_t", KEYWORD_WCHAR_T, { 1, 1, 1, 0, 0, 0, 1 } }, + { "while", KEYWORD_WHILE, { 1, 1, 1, 1, 0, 1, 1 } } }; @@ -2896,14 +2897,14 @@ { contextual_fake_count = 0; Lang_d = language; - buildKeywordHash (language, 1); /* C++ keywords */ + buildKeywordHash (language, 6); } static void initializeGLSLParser (const langType language) { contextual_fake_count = 0; Lang_glsl = language; - buildKeywordHash (language, 0); + buildKeywordHash (language, 0); /* C keywords */ } static void initializeFeriteParser (const langType language) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3205] trunk
by ntrel＠users.sourceforge.net 11 Nov '08

11 Nov '08

Revision: 3205 http://geany.svn.sourceforge.net/geany/?rev=3205&view=rev Author: ntrel Date: 2008-11-11 16:33:20 +0000 (Tue, 11 Nov 2008) Log Message: ----------- Apply patch from Colomban Wendling to add Vala filetype (thanks). Fix c.c tagLetter() bug. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetype_extensions.conf trunk/src/about.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c trunk/src/plugindata.h trunk/tagmanager/c.c trunk/tagmanager/parsers.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-11 09:27:49 UTC (rev 3204) +++ trunk/ChangeLog 2008-11-11 16:33:20 UTC (rev 3205) @@ -1,3 +1,12 @@ +2008-11-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/highlighting.c, src/plugindata.h, src/about.c, src/filetypes.c, + src/filetypes.h, tagmanager/parsers.h, tagmanager/c.c, + data/filetype_extensions.conf: + Apply patch from Colomban Wendling to add Vala filetype (thanks). + Fix c.c tagLetter() bug. + + 2008-11-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * doc/geany.txt, doc/geany.html, src/templates.c, src/templates.c, Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2008-11-11 09:27:49 UTC (rev 3204) +++ trunk/data/filetype_extensions.conf 2008-11-11 16:33:20 UTC (rev 3205) @@ -7,7 +7,7 @@ ASM=*.asm; C=*.c;*.h; C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C; -C#=*.cs;*.vala; +C#=*.cs; CAML=*.ml;*.mli; D=*.d;*.di; F77=*.f;*.for;*.ftn;*.f77; @@ -18,6 +18,7 @@ Haxe=*.hx; Java=*.java;*.jsp; Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk; +Vala=*.vala;*.vapi; VHDL=*.vhd;*.vhdl; Ferite=*.fe; Javascript=*.js; Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2008-11-11 09:27:49 UTC (rev 3204) +++ trunk/src/about.c 2008-11-11 16:33:20 UTC (rev 3205) @@ -79,7 +79,7 @@ static const gchar *contributors = "Alexander Rodin, Andrew Rowland, Anh Phạm, blackdog, Bo Lorentsen, Bob Doan, Bronisław Białek, Catalin Marinas, " -"Christoph Berg, Conrad Steenberg, Daniel Richard G., Dave Moore, Dirk Weber, Felipe Pena, François Cami, " +"Christoph Berg, Colomban Wendling, Conrad Steenberg, Daniel Richard G., Dave Moore, Dirk Weber, Felipe Pena, François Cami, " "Giuseppe Torelli, Guillaume Hoffmann, Jason Oster, Jean-François Wauthy, Jeff Pohlmeyer, " "John Gabriele, Josef Whiter, Kevin Ellwood, Kristoffer A. Tjernås, Marko Peric, Matti Mårds, " "Peter Strand, Pierre Joye, Rob van der Linde, Robert McGinley, S Jagannathan, Saleem Abdulrasool, " Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-11-11 09:27:49 UTC (rev 3204) +++ trunk/src/filetypes.c 2008-11-11 16:33:20 UTC (rev 3205) @@ -107,11 +107,22 @@ ft->name = g_strdup("C#"); ft->title = g_strdup_printf(_("%s source file"), "C#"); ft->extension = g_strdup("cs"); - ft->pattern = utils_strv_new("*.cs", "*.vala", NULL); + ft->pattern = utils_strv_new("*.cs", NULL); ft->comment_open = g_strdup("//"); ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_COMPILED; +#define VALA + ft = filetypes[GEANY_FILETYPES_VALA]; + ft->lang = 33; + ft->name = g_strdup("Vala"); + ft->title = g_strdup_printf(_("%s source file"), "Vala"); + ft->extension = g_strdup("vala"); + ft->pattern = utils_strv_new("*.vala", "*.vapi", NULL); + ft->comment_open = g_strdup("//"); + ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_COMPILED; + #define D ft = filetypes[GEANY_FILETYPES_D]; ft->lang = 17; Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2008-11-11 09:27:49 UTC (rev 3204) +++ trunk/src/filetypes.h 2008-11-11 16:33:20 UTC (rev 3205) @@ -50,6 +50,7 @@ GEANY_FILETYPES_HAXE, GEANY_FILETYPES_JAVA, GEANY_FILETYPES_PASCAL, + GEANY_FILETYPES_VALA, GEANY_FILETYPES_VHDL, /* script languages */ Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2008-11-11 09:27:49 UTC (rev 3204) +++ trunk/src/highlighting.c 2008-11-11 16:33:20 UTC (rev 3205) @@ -898,6 +898,66 @@ } +static void styleset_vala_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +{ + new_style_array(GEANY_FILETYPES_VALA, 21); + styleset_c_like_init(config, config_home, GEANY_FILETYPES_VALA); + get_keyfile_int(config, config_home, "styling", "styling_within_preprocessor", + 1, 0, &style_sets[GEANY_FILETYPES_VALA].styling[20]); + + style_sets[GEANY_FILETYPES_VALA].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_VALA, 0, + "else if switch case default break continue return for foreach in do while is " + "try catch finally throw " + "namespace interface class struct enum signal errordomain " + "construct callback get set base " + "const static var weak " + "virtual abstract override inline extern " + "public protected private delegate " + "out ref " + + "lock using " + + "true false null " + + "generic new delete base this value typeof sizeof " + "throws requires ensures " + + "void bool char uchar int uint short ushort long ulong size_t ssize_t " + "int8 uint8 int16 uint16 int32 uint32 int64 uint64 float double unichar string " + + /* this types are not referenced by the reference manual but are in glib.vapi + * as simple types */ + /*"constpointer time_t "*/ + ); + get_keyfile_keywords(config, config_home, "keywords", "secondary", GEANY_FILETYPES_VALA, 1, ""); + get_keyfile_keywords(config, config_home, "keywords", "docComment", GEANY_FILETYPES_VALA, 2, ""); + style_sets[GEANY_FILETYPES_VALA].keywords[3] = NULL; + + get_keyfile_wordchars(config, config_home, + &style_sets[GEANY_FILETYPES_VALA].wordchars); +} + + +static void styleset_vala(ScintillaObject *sci) +{ + const filetype_id ft_id = GEANY_FILETYPES_VALA; + + apply_filetype_properties(sci, SCLEX_CPP, ft_id); + + SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[ft_id].keywords[0]); + SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[ft_id].keywords[2]); + + /* assign global types, merge them with user defined keywords and set them */ + assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang); + + styleset_c_like(sci, ft_id); + + if (style_sets[ft_id].styling[20].foreground == 1) + SSM(sci, ft_id, (sptr_t) "styling.within.preprocessor", (sptr_t) "1"); +} + + static void styleset_pascal_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { new_style_array(GEANY_FILETYPES_PASCAL, 12); @@ -3145,6 +3205,7 @@ init_styleset_case(GEANY_FILETYPES_SH, sh); init_styleset_case(GEANY_FILETYPES_SQL, sql); init_styleset_case(GEANY_FILETYPES_TCL, tcl); + init_styleset_case(GEANY_FILETYPES_VALA, vala); init_styleset_case(GEANY_FILETYPES_VHDL, vhdl); init_styleset_case(GEANY_FILETYPES_XML, markup); } @@ -3202,6 +3263,7 @@ styleset_case(GEANY_FILETYPES_SH, sh); styleset_case(GEANY_FILETYPES_SQL, sql); styleset_case(GEANY_FILETYPES_TCL, tcl); + styleset_case(GEANY_FILETYPES_VALA, vala); styleset_case(GEANY_FILETYPES_VHDL, vhdl); styleset_case(GEANY_FILETYPES_XML, xml); default: Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-11-11 09:27:49 UTC (rev 3204) +++ trunk/src/plugindata.h 2008-11-11 16:33:20 UTC (rev 3205) @@ -50,7 +50,7 @@ * existing fields in the plugin data types have to be changed or reordered. */ /* This should usually stay the same if fields are only appended, assuming only pointers to * structs and not structs themselves are declared by plugins. */ - GEANY_ABI_VERSION = 48 + GEANY_ABI_VERSION = 49 }; /** Check the plugin can be loaded by Geany. @@ -483,9 +483,9 @@ void (*set_indicator_full) (struct GeanyEditor *editor, gint indic, gint start, gint end); void (*set_indicator_on_line_full) (struct GeanyEditor *editor, gint indic, gint line); void (*clear_indicators_full) (struct GeanyEditor *editor, gint indic); - + void (*set_indent_type)(struct GeanyEditor *editor, GeanyIndentType type); - + /* Remember to convert any GeanyDocument or ScintillaObject pointers in any * appended functions to GeanyEditor pointers. */ } Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2008-11-11 09:27:49 UTC (rev 3204) +++ trunk/tagmanager/c.c 2008-11-11 16:33:20 UTC (rev 3205) @@ -64,8 +64,8 @@ KEYWORD_DOUBLE, KEYWORD_ELSE, KEYWORD_ENUM, KEYWORD_EXPLICIT, KEYWORD_EXTERN, KEYWORD_EXTENDS, KEYWORD_EVENT, - KEYWORD_FINAL, KEYWORD_FLOAT, KEYWORD_FOR, KEYWORD_FRIEND, KEYWORD_FUNCTION, - KEYWORD_GOTO, + KEYWORD_FINAL, KEYWORD_FINALLY, KEYWORD_FLOAT, KEYWORD_FOR, KEYWORD_FRIEND, KEYWORD_FUNCTION, + KEYWORD_GET, KEYWORD_GOTO, KEYWORD_IF, KEYWORD_IMPLEMENTS, KEYWORD_IMPORT, KEYWORD_INLINE, KEYWORD_INT, KEYWORD_INOUT, KEYWORD_INPUT, KEYWORD_INTEGER, KEYWORD_INTERFACE, KEYWORD_INTERNAL, @@ -78,7 +78,7 @@ KEYWORD_PROGRAM, KEYWORD_PROTECTED, KEYWORD_PUBLIC, KEYWORD_REGISTER, KEYWORD_RETURN, KEYWORD_SHADOW, KEYWORD_STATE, - KEYWORD_SHORT, KEYWORD_SIGNED, KEYWORD_SIZE_T, KEYWORD_STATIC, KEYWORD_STRING, + KEYWORD_SET, KEYWORD_SHORT, KEYWORD_SIGNAL, KEYWORD_SIGNED, KEYWORD_SIZE_T, KEYWORD_STATIC, KEYWORD_STRING, KEYWORD_STRUCT, KEYWORD_SWITCH, KEYWORD_SYNCHRONIZED, KEYWORD_TASK, KEYWORD_TEMPLATE, KEYWORD_THIS, KEYWORD_THROW, KEYWORD_THROWS, KEYWORD_TRANSIENT, KEYWORD_TRANS, KEYWORD_TRANSITION, @@ -95,7 +95,7 @@ typedef struct sKeywordDesc { const char *name; keywordId id; - short isValid [5]; /* indicates languages for which kw is valid */ + short isValid [6]; /* indicates languages for which kw is valid */ } keywordDesc; /* Used for reporting the type of object parsed by nextToken (). @@ -135,6 +135,7 @@ DECL_CLASS, DECL_ENUM, DECL_EVENT, + DECL_SIGNAL, DECL_FUNCTION, DECL_IGNORE, /* non-taggable "declaration" */ DECL_INTERFACE, @@ -223,6 +224,7 @@ TAG_EXTERN_VAR, /* external variable declaration */ TAG_MACRO, /* #define s */ TAG_EVENT, /* event */ + TAG_SIGNAL, /* signal */ TAG_LOCAL, /* local variable definition */ TAG_PROPERTY, /* property name */ TAG_COUNT /* must be last */ @@ -250,6 +252,7 @@ static langType Lang_d; static langType Lang_glsl; static langType Lang_ferite; +static langType Lang_vala; /* Used to index into the CKinds table. */ typedef enum { @@ -314,112 +317,140 @@ { TRUE, 't', "typedef", "typedefs"}, }; +typedef enum { + VK_UNDEFINED = -1, + VK_CLASS, VK_DEFINE, VK_ENUMERATOR, VK_FIELD, + VK_ENUMERATION, VK_INTERFACE, VK_LOCAL, VK_METHOD, + VK_NAMESPACE, VK_PROPERTY, VK_SIGNAL, VK_STRUCT +} valaKind; + +static kindOption ValaKinds [] = { + { TRUE, 'c', "class", "classes"}, + { TRUE, 'd', "macro", "macro definitions"}, + { TRUE, 'e', "enumerator", "enumerators (values inside an enumeration)"}, + { TRUE, 'f', "field", "fields"}, + { TRUE, 'g', "enum", "enumeration names"}, + { TRUE, 'i', "interface", "interfaces"}, + { FALSE, 'l', "local", "local variables"}, + { TRUE, 'm', "method", "methods"}, + { TRUE, 'n', "namespace", "namespaces"}, + { TRUE, 'p', "property", "properties"}, + { TRUE, 'S', "signal", "signals"}, + { TRUE, 's', "struct", "structure names"}, +}; + static const keywordDesc KeywordTable [] = { - /* C++ */ - /* ANSI C | C# Java */ - /* | | | | Vera */ - /* keyword keyword ID | | | | | */ - { "__attribute__", KEYWORD_ATTRIBUTE, { 1, 1, 1, 0, 0 } }, - { "abstract", KEYWORD_ABSTRACT, { 0, 0, 1, 1, 0 } }, - { "bad_state", KEYWORD_BAD_STATE, { 0, 0, 0, 0, 1 } }, - { "bad_trans", KEYWORD_BAD_TRANS, { 0, 0, 0, 0, 1 } }, - { "bind", KEYWORD_BIND, { 0, 0, 0, 0, 1 } }, - { "bind_var", KEYWORD_BIND_VAR, { 0, 0, 0, 0, 1 } }, - { "bit", KEYWORD_BIT, { 0, 0, 0, 0, 1 } }, - { "boolean", KEYWORD_BOOLEAN, { 0, 0, 0, 1, 0 } }, - { "byte", KEYWORD_BYTE, { 0, 0, 0, 1, 0 } }, - { "case", KEYWORD_CASE, { 1, 1, 1, 1, 0 } }, - { "catch", KEYWORD_CATCH, { 0, 1, 1, 0, 0 } }, - { "char", KEYWORD_CHAR, { 1, 1, 1, 1, 0 } }, - { "class", KEYWORD_CLASS, { 0, 1, 1, 1, 1 } }, - { "const", KEYWORD_CONST, { 1, 1, 1, 1, 0 } }, - { "constraint", KEYWORD_CONSTRAINT, { 0, 0, 0, 0, 1 } }, - { "coverage_block", KEYWORD_COVERAGE_BLOCK, { 0, 0, 0, 0, 1 } }, - { "coverage_def", KEYWORD_COVERAGE_DEF, { 0, 0, 0, 0, 1 } }, - { "do", KEYWORD_DO, { 1, 1, 1, 1, 0 } }, - { "default", KEYWORD_DEFAULT, { 1, 1, 1, 1, 0 } }, - { "delegate", KEYWORD_DELEGATE, { 0, 0, 1, 0, 0 } }, - { "delete", KEYWORD_DELETE, { 0, 1, 0, 0, 0 } }, - { "double", KEYWORD_DOUBLE, { 1, 1, 1, 1, 0 } }, - { "else", KEYWORD_ELSE, { 1, 1, 0, 1, 0 } }, - { "enum", KEYWORD_ENUM, { 1, 1, 1, 1, 1 } }, - { "event", KEYWORD_EVENT, { 0, 0, 1, 0, 1 } }, - { "explicit", KEYWORD_EXPLICIT, { 0, 1, 1, 0, 0 } }, - { "extends", KEYWORD_EXTENDS, { 0, 0, 0, 1, 1 } }, - { "extern", KEYWORD_EXTERN, { 1, 1, 1, 0, 1 } }, - { "final", KEYWORD_FINAL, { 0, 0, 0, 1, 0 } }, - { "float", KEYWORD_FLOAT, { 1, 1, 1, 1, 0 } }, - { "for", KEYWORD_FOR, { 1, 1, 1, 1, 0 } }, - { "friend", KEYWORD_FRIEND, { 0, 1, 0, 0, 0 } }, - { "function", KEYWORD_FUNCTION, { 0, 0, 0, 0, 1 } }, - { "goto", KEYWORD_GOTO, { 1, 1, 1, 1, 0 } }, - { "if", KEYWORD_IF, { 1, 1, 1, 1, 0 } }, - { "implements", KEYWORD_IMPLEMENTS, { 0, 0, 0, 1, 0 } }, - { "import", KEYWORD_IMPORT, { 0, 1, 0, 1, 0 } }, /* D */ - { "inline", KEYWORD_INLINE, { 0, 1, 0, 0, 0 } }, - { "inout", KEYWORD_INOUT, { 0, 0, 0, 0, 1 } }, - { "input", KEYWORD_INPUT, { 0, 0, 0, 0, 1 } }, - { "int", KEYWORD_INT, { 1, 1, 1, 1, 0 } }, - { "integer", KEYWORD_INTEGER, { 0, 0, 0, 0, 1 } }, - { "interface", KEYWORD_INTERFACE, { 0, 0, 1, 1, 1 } }, - { "internal", KEYWORD_INTERNAL, { 0, 0, 1, 0, 0 } }, - { "local", KEYWORD_LOCAL, { 0, 0, 0, 0, 1 } }, - { "long", KEYWORD_LONG, { 1, 1, 1, 1, 0 } }, - { "m_bad_state", KEYWORD_M_BAD_STATE, { 0, 0, 0, 0, 1 } }, - { "m_bad_trans", KEYWORD_M_BAD_TRANS, { 0, 0, 0, 0, 1 } }, - { "m_state", KEYWORD_M_STATE, { 0, 0, 0, 0, 1 } }, - { "m_trans", KEYWORD_M_TRANS, { 0, 0, 0, 0, 1 } }, - { "mutable", KEYWORD_MUTABLE, { 0, 1, 0, 0, 0 } }, - { "module", KEYWORD_MODULE, { 0, 1, 0, 0, 0 } }, /* D */ - { "namespace", KEYWORD_NAMESPACE, { 0, 1, 1, 0, 0 } }, - { "native", KEYWORD_NATIVE, { 0, 0, 0, 1, 0 } }, - { "new", KEYWORD_NEW, { 0, 1, 1, 1, 0 } }, - { "newcov", KEYWORD_NEWCOV, { 0, 0, 0, 0, 1 } }, - { "operator", KEYWORD_OPERATOR, { 0, 1, 1, 0, 0 } }, - { "output", KEYWORD_OUTPUT, { 0, 0, 0, 0, 1 } }, - { "overload", KEYWORD_OVERLOAD, { 0, 1, 0, 0, 0 } }, - { "override", KEYWORD_OVERRIDE, { 0, 0, 1, 0, 0 } }, - { "package", KEYWORD_PACKAGE, { 0, 0, 0, 1, 0 } }, - { "packed", KEYWORD_PACKED, { 0, 0, 0, 0, 1 } }, - { "port", KEYWORD_PORT, { 0, 0, 0, 0, 1 } }, - { "private", KEYWORD_PRIVATE, { 0, 1, 1, 1, 0 } }, - { "program", KEYWORD_PROGRAM, { 0, 0, 0, 0, 1 } }, - { "protected", KEYWORD_PROTECTED, { 0, 1, 1, 1, 1 } }, - { "public", KEYWORD_PUBLIC, { 0, 1, 1, 1, 1 } }, - { "register", KEYWORD_REGISTER, { 1, 1, 0, 0, 0 } }, - { "return", KEYWORD_RETURN, { 1, 1, 1, 1, 0 } }, - { "shadow", KEYWORD_SHADOW, { 0, 0, 0, 0, 1 } }, - { "short", KEYWORD_SHORT, { 1, 1, 1, 1, 0 } }, - { "signed", KEYWORD_SIGNED, { 1, 1, 0, 0, 0 } }, - { "size_t", KEYWORD_SIZE_T, { 1, 1, 0, 0, 0 } }, - { "state", KEYWORD_STATE, { 0, 0, 0, 0, 1 } }, - { "static", KEYWORD_STATIC, { 1, 1, 1, 1, 1 } }, - { "string", KEYWORD_STRING, { 0, 0, 1, 0, 1 } }, - { "struct", KEYWORD_STRUCT, { 1, 1, 1, 0, 0 } }, - { "switch", KEYWORD_SWITCH, { 1, 1, 1, 1, 0 } }, - { "synchronized", KEYWORD_SYNCHRONIZED, { 0, 0, 0, 1, 0 } }, - { "task", KEYWORD_TASK, { 0, 0, 0, 0, 1 } }, - { "template", KEYWORD_TEMPLATE, { 0, 1, 0, 0, 0 } }, - { "this", KEYWORD_THIS, { 0, 0, 1, 1, 0 } }, /* allow D ctor tags */ - { "throw", KEYWORD_THROW, { 0, 1, 1, 1, 0 } }, - { "throws", KEYWORD_THROWS, { 0, 0, 0, 1, 0 } }, - { "trans", KEYWORD_TRANS, { 0, 0, 0, 0, 1 } }, - { "transition", KEYWORD_TRANSITION, { 0, 0, 0, 0, 1 } }, - { "transient", KEYWORD_TRANSIENT, { 0, 0, 0, 1, 0 } }, - { "try", KEYWORD_TRY, { 0, 1, 1, 0, 0 } }, - { "typedef", KEYWORD_TYPEDEF, { 1, 1, 1, 0, 1 } }, - { "typename", KEYWORD_TYPENAME, { 0, 1, 0, 0, 0 } }, - { "uint", KEYWORD_UINT, { 0, 0, 1, 0, 0 } }, - { "ulong", KEYWORD_ULONG, { 0, 0, 1, 0, 0 } }, - { "union", KEYWORD_UNION, { 1, 1, 0, 0, 0 } }, - { "unsigned", KEYWORD_UNSIGNED, { 1, 1, 1, 0, 0 } }, - { "ushort", KEYWORD_USHORT, { 0, 0, 1, 0, 0 } }, - { "using", KEYWORD_USING, { 0, 1, 1, 0, 0 } }, - { "virtual", KEYWORD_VIRTUAL, { 0, 1, 1, 0, 1 } }, - { "void", KEYWORD_VOID, { 1, 1, 1, 1, 1 } }, - { "volatile", KEYWORD_VOLATILE, { 1, 1, 1, 1, 0 } }, - { "wchar_t", KEYWORD_WCHAR_T, { 1, 1, 1, 0, 0 } }, - { "while", KEYWORD_WHILE, { 1, 1, 1, 1, 0 } } + /* C++ */ + /* ANSI C | C# Java */ + /* | | | | Vera */ + /* | | | | | Vala */ + /* keyword keyword ID | | | | | | */ + { "__attribute__", KEYWORD_ATTRIBUTE, { 1, 1, 1, 0, 0, 0 } }, + { "abstract", KEYWORD_ABSTRACT, { 0, 0, 1, 1, 0, 1 } }, + { "bad_state", KEYWORD_BAD_STATE, { 0, 0, 0, 0, 1, 0 } }, + { "bad_trans", KEYWORD_BAD_TRANS, { 0, 0, 0, 0, 1, 0 } }, + { "bind", KEYWORD_BIND, { 0, 0, 0, 0, 1, 0 } }, + { "bind_var", KEYWORD_BIND_VAR, { 0, 0, 0, 0, 1, 0 } }, + { "bit", KEYWORD_BIT, { 0, 0, 0, 0, 1, 0 } }, + { "boolean", KEYWORD_BOOLEAN, { 0, 0, 0, 1, 0, 0 } }, + { "byte", KEYWORD_BYTE, { 0, 0, 0, 1, 0, 0 } }, + { "case", KEYWORD_CASE, { 1, 1, 1, 1, 0, 1 } }, + { "catch", KEYWORD_CATCH, { 0, 1, 1, 0, 0, 1 } }, + { "char", KEYWORD_CHAR, { 1, 1, 1, 1, 0, 1 } }, + { "class", KEYWORD_CLASS, { 0, 1, 1, 1, 1, 1 } }, + { "const", KEYWORD_CONST, { 1, 1, 1, 1, 0, 1 } }, + { "constraint", KEYWORD_CONSTRAINT, { 0, 0, 0, 0, 1, 0 } }, + { "coverage_block", KEYWORD_COVERAGE_BLOCK, { 0, 0, 0, 0, 1, 0 } }, + { "coverage_def", KEYWORD_COVERAGE_DEF, { 0, 0, 0, 0, 1, 0 } }, + { "do", KEYWORD_DO, { 1, 1, 1, 1, 0, 1 } }, + { "default", KEYWORD_DEFAULT, { 1, 1, 1, 1, 0, 1 } }, + { "delegate", KEYWORD_DELEGATE, { 0, 0, 1, 0, 0, 1 } }, + { "delete", KEYWORD_DELETE, { 0, 1, 0, 0, 0, 1 } }, + { "double", KEYWORD_DOUBLE, { 1, 1, 1, 1, 0, 1 } }, + { "else", KEYWORD_ELSE, { 1, 1, 0, 1, 0, 1 } }, + { "enum", KEYWORD_ENUM, { 1, 1, 1, 1, 1, 1 } }, + { "errordomain", KEYWORD_ENUM, { 0, 0, 0, 0, 0, 1 } }, /* errordomain behaves like enum */ + { "event", KEYWORD_EVENT, { 0, 0, 1, 0, 1, 0 } }, + { "explicit", KEYWORD_EXPLICIT, { 0, 1, 1, 0, 0, 0 } }, + { "extends", KEYWORD_EXTENDS, { 0, 0, 0, 1, 1, 0 } }, + { "extern", KEYWORD_EXTERN, { 1, 1, 1, 0, 1, 1 } }, + { "final", KEYWORD_FINAL, { 0, 0, 0, 1, 0, 0 } }, + { "finally", KEYWORD_FINALLY, { 0, 0, 0, 0, 0, 1 } }, + { "float", KEYWORD_FLOAT, { 1, 1, 1, 1, 0, 1 } }, + { "for", KEYWORD_FOR, { 1, 1, 1, 1, 0, 1 } }, + { "friend", KEYWORD_FRIEND, { 0, 1, 0, 0, 0, 0 } }, + { "function", KEYWORD_FUNCTION, { 0, 0, 0, 0, 1, 0 } }, + { "get", KEYWORD_GET, { 0, 0, 0, 0, 0, 1 } }, + { "goto", KEYWORD_GOTO, { 1, 1, 1, 1, 0, 1 } }, + { "if", KEYWORD_IF, { 1, 1, 1, 1, 0, 1 } }, + { "implements", KEYWORD_IMPLEMENTS, { 0, 0, 0, 1, 0, 0 } }, + { "import", KEYWORD_IMPORT, { 0, 1, 0, 1, 0, 0 } }, /* D */ + { "inline", KEYWORD_INLINE, { 0, 1, 0, 0, 0, 1 } }, + { "inout", KEYWORD_INOUT, { 0, 0, 0, 0, 1, 0 } }, + { "input", KEYWORD_INPUT, { 0, 0, 0, 0, 1, 0 } }, + { "int", KEYWORD_INT, { 1, 1, 1, 1, 0, 1 } }, + { "integer", KEYWORD_INTEGER, { 0, 0, 0, 0, 1, 0 } }, + { "interface", KEYWORD_INTERFACE, { 0, 0, 1, 1, 1, 1 } }, + { "internal", KEYWORD_INTERNAL, { 0, 0, 1, 0, 0, 0 } }, + { "local", KEYWORD_LOCAL, { 0, 0, 0, 0, 1, 0 } }, + { "long", KEYWORD_LONG, { 1, 1, 1, 1, 0, 1 } }, + { "m_bad_state", KEYWORD_M_BAD_STATE, { 0, 0, 0, 0, 1, 0 } }, + { "m_bad_trans", KEYWORD_M_BAD_TRANS, { 0, 0, 0, 0, 1, 0 } }, + { "m_state", KEYWORD_M_STATE, { 0, 0, 0, 0, 1, 0 } }, + { "m_trans", KEYWORD_M_TRANS, { 0, 0, 0, 0, 1, 0 } }, + { "mutable", KEYWORD_MUTABLE, { 0, 1, 0, 0, 0, 0 } }, + { "module", KEYWORD_MODULE, { 0, 1, 0, 0, 0, 0 } }, /* D */ + { "namespace", KEYWORD_NAMESPACE, { 0, 1, 1, 0, 0, 1 } }, + { "native", KEYWORD_NATIVE, { 0, 0, 0, 1, 0, 0 } }, + { "new", KEYWORD_NEW, { 0, 1, 1, 1, 0, 1 } }, + { "newcov", KEYWORD_NEWCOV, { 0, 0, 0, 0, 1, 0 } }, + { "operator", KEYWORD_OPERATOR, { 0, 1, 1, 0, 0, 0 } }, + { "output", KEYWORD_OUTPUT, { 0, 0, 0, 0, 1, 0 } }, + { "overload", KEYWORD_OVERLOAD, { 0, 1, 0, 0, 0, 0 } }, + { "override", KEYWORD_OVERRIDE, { 0, 0, 1, 0, 0, 1 } }, + { "package", KEYWORD_PACKAGE, { 0, 0, 0, 1, 0, 0 } }, + { "packed", KEYWORD_PACKED, { 0, 0, 0, 0, 1, 0 } }, + { "port", KEYWORD_PORT, { 0, 0, 0, 0, 1, 0 } }, + { "private", KEYWORD_PRIVATE, { 0, 1, 1, 1, 0, 1 } }, + { "program", KEYWORD_PROGRAM, { 0, 0, 0, 0, 1, 0 } }, + { "protected", KEYWORD_PROTECTED, { 0, 1, 1, 1, 1, 1 } }, + { "public", KEYWORD_PUBLIC, { 0, 1, 1, 1, 1, 1 } }, + { "register", KEYWORD_REGISTER, { 1, 1, 0, 0, 0, 0 } }, + { "return", KEYWORD_RETURN, { 1, 1, 1, 1, 0, 1 } }, + { "set", KEYWORD_SET, { 0, 0, 0, 0, 0, 1 } }, + { "shadow", KEYWORD_SHADOW, { 0, 0, 0, 0, 1, 0 } }, + { "short", KEYWORD_SHORT, { 1, 1, 1, 1, 0, 1 } }, + { "signal", KEYWORD_SIGNAL, { 0, 0, 0, 0, 0, 1 } }, + { "signed", KEYWORD_SIGNED, { 1, 1, 0, 0, 0, 0 } }, + { "size_t", KEYWORD_SIZE_T, { 1, 1, 0, 0, 0, 1 } }, + { "state", KEYWORD_STATE, { 0, 0, 0, 0, 1, 0 } }, + { "static", KEYWORD_STATIC, { 1, 1, 1, 1, 1, 1 } }, + { "string", KEYWORD_STRING, { 0, 0, 1, 0, 1, 1 } }, + { "struct", KEYWORD_STRUCT, { 1, 1, 1, 0, 0, 1 } }, + { "switch", KEYWORD_SWITCH, { 1, 1, 1, 1, 0, 1 } }, + { "synchronized", KEYWORD_SYNCHRONIZED, { 0, 0, 0, 1, 0, 0 } }, + { "task", KEYWORD_TASK, { 0, 0, 0, 0, 1, 0 } }, + { "template", KEYWORD_TEMPLATE, { 0, 1, 0, 0, 0, 0 } }, + { "this", KEYWORD_THIS, { 0, 0, 1, 1, 0, 1 } }, /* allow D ctor tags */ + { "throw", KEYWORD_THROW, { 0, 1, 1, 1, 0, 1 } }, + { "throws", KEYWORD_THROWS, { 0, 0, 0, 1, 0, 1 } }, + { "trans", KEYWORD_TRANS, { 0, 0, 0, 0, 1, 0 } }, + { "transition", KEYWORD_TRANSITION, { 0, 0, 0, 0, 1, 0 } }, + { "transient", KEYWORD_TRANSIENT, { 0, 0, 0, 1, 0, 0 } }, + { "try", KEYWORD_TRY, { 0, 1, 1, 0, 0, 1 } }, + { "typedef", KEYWORD_TYPEDEF, { 1, 1, 1, 0, 1, 0 } }, + { "typename", KEYWORD_TYPENAME, { 0, 1, 0, 0, 0, 0 } }, + { "uint", KEYWORD_UINT, { 0, 0, 1, 0, 0, 1 } }, + { "ulong", KEYWORD_ULONG, { 0, 0, 1, 0, 0, 1 } }, + { "union", KEYWORD_UNION, { 1, 1, 0, 0, 0, 0 } }, + { "unsigned", KEYWORD_UNSIGNED, { 1, 1, 1, 0, 0, 0 } }, + { "ushort", KEYWORD_USHORT, { 0, 0, 1, 0, 0, 1 } }, + { "using", KEYWORD_USING, { 0, 1, 1, 0, 0, 1 } }, + { "virtual", KEYWORD_VIRTUAL, { 0, 1, 1, 0, 1, 1 } }, + { "void", KEYWORD_VOID, { 1, 1, 1, 1, 1, 1 } }, + { "volatile", KEYWORD_VOLATILE, { 1, 1, 1, 1, 0, 0 } }, + { "wchar_t", KEYWORD_WCHAR_T, { 1, 1, 1, 0, 0, 0 } }, + { "while", KEYWORD_WHILE, { 1, 1, 1, 1, 0, 1 } } }; @@ -754,19 +785,31 @@ static boolean isContextualStatement (const statementInfo *const st) { boolean result = FALSE; - if (st != NULL) switch (st->declaration) - { - case DECL_CLASS: - case DECL_ENUM: - case DECL_INTERFACE: - case DECL_NAMESPACE: - case DECL_STRUCT: - case DECL_UNION: - result = TRUE; - break; - default: result = FALSE; break; - } + if (st != NULL) + { + if (isLanguage (Lang_vala)) + { + /* All can be a contextual statment as properties can be of any type */ + result = TRUE; + } + else + { + switch (st->declaration) + { + case DECL_CLASS: + case DECL_ENUM: + case DECL_INTERFACE: + case DECL_NAMESPACE: + case DECL_STRUCT: + case DECL_UNION: + result = TRUE; + break; + + default: result = FALSE; break; + } + } + } return result; } @@ -925,6 +968,28 @@ return result; } +static valaKind valaTagKind (const tagType type) +{ + valaKind result = VK_UNDEFINED; + switch (type) + { + case TAG_CLASS: result = VK_CLASS; break; + case TAG_ENUM: result = VK_ENUMERATION; break; + case TAG_ENUMERATOR: result = VK_ENUMERATOR; break; + case TAG_SIGNAL: result = VK_SIGNAL; break; + case TAG_FIELD: result = VK_FIELD ; break; + case TAG_INTERFACE: result = VK_INTERFACE; break; + case TAG_LOCAL: result = VK_LOCAL; break; + case TAG_METHOD: result = VK_METHOD; break; + case TAG_NAMESPACE: result = VK_NAMESPACE; break; + case TAG_PROPERTY: result = VK_PROPERTY; break; + case TAG_STRUCT: result = VK_STRUCT; break; + + default: Assert ("Bad Vala tag type" == NULL); break; + } + return result; +} + static javaKind javaTagKind (const tagType type) { javaKind result = JK_UNDEFINED; @@ -948,6 +1013,8 @@ result = JavaKinds [javaTagKind (type)].name; else if (isLanguage (Lang_csharp)) result = CsharpKinds [csharpTagKind (type)].name; + else if (isLanguage (Lang_vala)) + result = ValaKinds [valaTagKind (type)].name; else result = CKinds [cTagKind (type)].name; return result; @@ -956,10 +1023,12 @@ static int tagLetter (const tagType type) { int result; - if (isLanguage (Lang_java)) + if (isLanguage (Lang_csharp)) + result = CsharpKinds [csharpTagKind (type)].letter; + else if (isLanguage (Lang_java)) result = JavaKinds [javaTagKind (type)].letter; - if (isLanguage (Lang_csharp)) - result = CsharpKinds [csharpTagKind (type)].letter; + else if (isLanguage (Lang_vala)) + result = ValaKinds [valaTagKind (type)].letter; else result = CKinds [cTagKind (type)].letter; return result; @@ -1050,7 +1119,7 @@ vStringValue (st->parentClasses); } if (st->implementation != IMP_DEFAULT && - (isLanguage (Lang_cpp) || isLanguage (Lang_csharp) || + (isLanguage (Lang_cpp) || isLanguage (Lang_csharp) || isLanguage (Lang_vala) || isLanguage (Lang_java) || isLanguage (Lang_d) || isLanguage (Lang_ferite))) { tag->extensionFields.implementation = @@ -1131,7 +1200,7 @@ if (isLanguage (Lang_c) || isLanguage (Lang_cpp)) vStringCatS (scope, "::"); else if (isLanguage (Lang_java) || - isLanguage (Lang_d) || isLanguage (Lang_ferite) || isLanguage (Lang_csharp)) + isLanguage (Lang_d) || isLanguage (Lang_ferite) || isLanguage (Lang_csharp) || isLanguage (Lang_vala)) vStringCatS (scope, "."); } @@ -1301,7 +1370,7 @@ { if (isType (nameToken, TOKEN_NAME)) { - const tagType type = (isLanguage (Lang_java) || isLanguage (Lang_csharp)) + const tagType type = (isLanguage (Lang_java) || isLanguage (Lang_csharp) || isLanguage (Lang_vala)) ? TAG_METHOD : TAG_FUNCTION; const boolean isFileScope = (boolean) (st->member.access == ACCESS_PRIVATE || @@ -1316,11 +1385,11 @@ { if (! isType (nameToken, TOKEN_NAME)) ; - else if (isLanguage (Lang_java) || isLanguage (Lang_csharp)) + else if (isLanguage (Lang_java) || isLanguage (Lang_csharp) || isLanguage (Lang_vala)) qualifyFunctionTag (st, nameToken); else if (st->scope == SCOPE_TYPEDEF) makeTag (nameToken, st, TRUE, TAG_TYPEDEF); - else if (isValidTypeSpecifier (st->declaration) && ! isLanguage (Lang_csharp)) + else if (isValidTypeSpecifier (st->declaration) && ! (isLanguage (Lang_csharp) || isLanguage (Lang_vala))) makeTag (nameToken, st, TRUE, TAG_PROTOTYPE); } @@ -1332,7 +1401,9 @@ const tagType type = declToTagType (st->declaration); if (type != TAG_UNDEFINED) - makeTag (nameToken, st, (boolean) (! isLanguage (Lang_java) && ! isLanguage (Lang_csharp)), type); + makeTag (nameToken, st, (boolean) (! isLanguage (Lang_java) && + ! isLanguage (Lang_csharp) && + ! isLanguage (Lang_vala)), type); } } @@ -1374,7 +1445,7 @@ { if (isMember (st)) { - if (isLanguage (Lang_java) || isLanguage (Lang_csharp)) + if (isLanguage (Lang_java) || isLanguage (Lang_csharp) || isLanguage (Lang_vala)) makeTag (nameToken, st, (boolean) (st->member.access == ACCESS_PRIVATE), TAG_FIELD); @@ -1588,7 +1659,7 @@ { st->declaration = declaration; - if (declaration == DECL_NAMESPACE && !isLanguage (Lang_csharp)) + if (declaration == DECL_NAMESPACE && !(isLanguage (Lang_csharp) || isLanguage (Lang_vala))) { /* In C++ a namespace is specified one level at a time. */ return; @@ -1840,6 +1911,11 @@ st->declaration = DECL_EVENT; break; + case KEYWORD_SIGNAL: + if (isLanguage (Lang_vala)) + st->declaration = DECL_SIGNAL; + break; + case KEYWORD_EXTERN: if (! isLanguage (Lang_csharp) || !st->gotName) { @@ -1850,7 +1926,7 @@ break; case KEYWORD_STATIC: - if (! isLanguage (Lang_java) && ! isLanguage (Lang_csharp)) + if (! isLanguage (Lang_java) && ! isLanguage (Lang_csharp) && ! isLanguage (Lang_vala)) { /*reinitStatement (st, FALSE);*/ st->scope = SCOPE_STATIC; @@ -2071,7 +2147,7 @@ cppUngetc (c); if (isOneOf (c, "{;,=")) ; - else if (isLanguage (Lang_java)) + else if (isLanguage (Lang_java) || isLanguage (Lang_vala)) skipJavaThrows (st); else { @@ -2217,7 +2293,7 @@ --depth; } if (st->argEndPosition == 0) - { + { if (useFile()) st->argEndPosition = ftell(File.fp); else @@ -2300,7 +2376,8 @@ if (isLanguage (Lang_c) || isLanguage (Lang_cpp)) vStringCatS (st->context->name, "::"); else if (isLanguage (Lang_java) || - isLanguage (Lang_d) || isLanguage (Lang_ferite) || isLanguage (Lang_csharp)) + isLanguage (Lang_d) || isLanguage (Lang_ferite) || + isLanguage (Lang_csharp) || isLanguage (Lang_vala)) vStringCatS (st->context->name, "."); } vStringCat (st->context->name, token->name); @@ -2329,7 +2406,7 @@ else { cppUngetc (c); - if (((isLanguage (Lang_cpp) || isLanguage (Lang_csharp)) && + if (((isLanguage (Lang_cpp) || isLanguage (Lang_csharp) || isLanguage (Lang_vala)) && inheritingDeclaration (st->declaration)) || isLanguage (Lang_d)) { @@ -2542,10 +2619,10 @@ if (isType (token, TOKEN_SEMICOLON)) isEnd = TRUE; else if (isType (token, TOKEN_BRACE_CLOSE)) - /* Java, D, C# do not require semicolons to end a block. Neither do C++ - * namespaces. All other blocks require a semicolon to terminate them. + /* Java, D, C#, Vala do not require semicolons to end a block. Neither do + * C++ namespaces. All other blocks require a semicolon to terminate them. */ - isEnd = (boolean) (isLanguage (Lang_java) || isLanguage (Lang_d) || isLanguage (Lang_csharp) || + isEnd = (boolean) (isLanguage (Lang_java) || isLanguage (Lang_d) || isLanguage (Lang_csharp) || isLanguage (Lang_vala) || ! isContextualStatement (st)); else isEnd = FALSE; @@ -2626,12 +2703,36 @@ else if (isContextualStatement (st)) { tokenInfo *name_token = (tokenInfo *)prev; + if (isType (name_token, TOKEN_NAME)) { - copyToken (st->blockName, name_token); + if (!isLanguage (Lang_vala)) + copyToken (st->blockName, name_token); + else + { + switch (st->declaration) + { + case DECL_CLASS: + case DECL_ENUM: + case DECL_INTERFACE: + case DECL_NAMESPACE: + case DECL_STRUCT: + copyToken (st->blockName, name_token); + break; + + /* anything else can be a property */ + default: + /* makeTag (prev, st, FALSE, TAG_PROPERTY); */ + /* FIXME: temporary hack to get properties shown */ + makeTag (prev, st, FALSE, TAG_FIELD); + break; + } + } } else if (isLanguage (Lang_csharp)) + { makeTag (prev, st, FALSE, TAG_PROPERTY); + } else { tokenInfo *contextual_token = (tokenInfo *)prev; @@ -2735,7 +2836,7 @@ boolean retry; Assert (passCount < 3); - cppInit ((boolean) (passCount > 1), isLanguage (Lang_csharp)); + cppInit ((boolean) (passCount > 1), (isLanguage (Lang_csharp) || isLanguage (Lang_vala))); exception = (exception_t) setjmp (Exception); retry = FALSE; @@ -2819,6 +2920,13 @@ buildKeywordHash (language, 2); } +static void initializeValaParser (const langType language) +{ + contextual_fake_count = 0; + Lang_vala = language; + buildKeywordHash (language, 5); +} + extern parserDefinition* CParser (void) { static const char *const extensions [] = { "c", "pc", "sc", NULL }; @@ -2909,4 +3017,16 @@ def->initialize = initializeCsharpParser; return def; } + +extern parserDefinition* ValaParser (void) +{ + static const char *const extensions [] = { "vala", NULL }; + parserDefinition* def = parserNew ("Vala"); + def->kinds = ValaKinds; + def->kindCount = KIND_COUNT (ValaKinds); + def->extensions = extensions; + def->parser2 = findCTags; + def->initialize = initializeValaParser; + return def; +} /* vi:set tabstop=8 shiftwidth=4: */ Modified: trunk/tagmanager/parsers.h =================================================================== --- trunk/tagmanager/parsers.h 2008-11-11 09:27:49 UTC (rev 3204) +++ trunk/tagmanager/parsers.h 2008-11-11 16:33:20 UTC (rev 3205) @@ -47,7 +47,8 @@ HtmlParser, \ F77Parser, \ GLSLParser, \ - MatlabParser + MatlabParser, \ + ValaParser /* langType of each parser @@ -84,6 +85,7 @@ 30 F77Parser 31 GLSLParser 32 MatlabParser +33 ValaParser */ #endif /* _PARSERS_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3204] branches/build-system
by elextr＠users.sourceforge.net 11 Nov '08

11 Nov '08

Revision: 3204 http://geany.svn.sourceforge.net/geany/?rev=3204&view=rev Author: elextr Date: 2008-11-11 09:27:49 +0000 (Tue, 11 Nov 2008) Log Message: ----------- Symbol fixes to .h and .hpp filetype prototypes Modified Paths: -------------- branches/build-system/ChangeLog branches/build-system/src/filetypes.c branches/build-system/src/symbols.c Modified: branches/build-system/ChangeLog =================================================================== --- branches/build-system/ChangeLog 2008-11-10 18:28:14 UTC (rev 3203) +++ branches/build-system/ChangeLog 2008-11-11 09:27:49 UTC (rev 3204) @@ -1,3 +1,17 @@ +2008-11-11 Lex Trotman <elextr(at)gmail(dot)com> + + fix tagmanager interaction with H and HPP filetypes + + * src/filetypes.c + fix h and hpp filetype names to pretend to be c and c++ for tags + purposes + filetypes_detect_from_file_internal() modified to detect C++ anywhere + between -*- and another -*- + * src/symbols.c + add GEANY_FILETYPES_H and GEANY_FILETYPES_HPP as alternates where ever + GEANY_FILETYPES_C and GEANY_FILETYPES_CPP occur + + 2008-11-10 Lex Trotman <elextr(at)gmail(dot)com> Prototype C and CPP header filetypes, also detects .h or no extension Modified: branches/build-system/src/filetypes.c =================================================================== --- branches/build-system/src/filetypes.c 2008-11-10 18:28:14 UTC (rev 3203) +++ branches/build-system/src/filetypes.c 2008-11-11 09:27:49 UTC (rev 3204) @@ -92,7 +92,7 @@ #define CH ft = filetypes[GEANY_FILETYPES_H]; ft->lang = 0; - ft->name = g_strdup("H"); + ft->name = g_strdup("C"); ft->title = g_strdup_printf(_("%s header file"), "C"); ft->extension = g_strdup("h"); ft->pattern = utils_strv_new("*.h", NULL); @@ -115,7 +115,7 @@ #define HPP ft = filetypes[GEANY_FILETYPES_HPP]; ft->lang = 1; - ft->name = g_strdup("H++"); + ft->name = g_strdup("C++"); ft->title = g_strdup_printf(_("%s header file"), "C++"); ft->extension = g_strdup("hpp"); ft->pattern = utils_strv_new("*.h", "*.hpp", "*.hxx", "*.h++", "*.hh", NULL); @@ -804,8 +804,11 @@ id = FILETYPE_ID(ft); if (id == GEANY_FILETYPES_H || id == GEANY_FILETYPES_NONE) { - if (strstr(line, "-*-C++-*-")) - ft = filetypes[GEANY_FILETYPES_HPP]; + char *c; + if (c=strstr(line, "-*-")) /* look for C++ between -*- es */ + if (c=strstr(c,"C++")) + if (strstr(c,"-*-")) + ft = filetypes[GEANY_FILETYPES_HPP]; } return ft; } Modified: branches/build-system/src/symbols.c =================================================================== --- branches/build-system/src/symbols.c 2008-11-10 18:28:14 UTC (rev 3203) +++ branches/build-system/src/symbols.c 2008-11-11 09:27:49 UTC (rev 3204) @@ -118,7 +118,8 @@ gint tag_type; /* load ignore list for C/C++ parser */ - if ((file_type_idx == GEANY_FILETYPES_C || file_type_idx == GEANY_FILETYPES_CPP) && + if ((file_type_idx == GEANY_FILETYPES_C || file_type_idx == GEANY_FILETYPES_CPP + || file_type_idx == GEANY_FILETYPES_H || file_type_idx == GEANY_FILETYPES_HPP ) && c_tags_ignore == NULL) { load_c_ignore_tags(); @@ -138,9 +139,11 @@ switch (file_type_idx) { case GEANY_FILETYPES_CPP: + case GEANY_FILETYPES_HPP: symbols_global_tags_loaded(GEANY_FILETYPES_C); /* load C global tags */ /* no C++ tagfile yet */ return; + case GEANY_FILETYPES_H: case GEANY_FILETYPES_C: tag_type = GTF_C; break; case GEANY_FILETYPES_PASCAL:tag_type = GTF_PASCAL; break; case GEANY_FILETYPES_PHP: tag_type = GTF_PHP; break; @@ -232,6 +235,8 @@ switch (ft_id) { case GEANY_FILETYPES_C: /* for C++ .h headers or C structs */ + case GEANY_FILETYPES_H: + case GEANY_FILETYPES_HPP: case GEANY_FILETYPES_CPP: case GEANY_FILETYPES_GLSL: /* for structs */ /*case GEANY_FILETYPES_RUBY:*/ /* not sure what to use atm*/ @@ -1025,11 +1030,13 @@ return 1; } /* load ignore list for C/C++ parser */ - if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP) - load_c_ignore_tags(); + if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP + || ft->id == GEANY_FILETYPES_H || ft->id == GEANY_FILETYPES_HPP ) + load_c_ignore_tags(); - if (want_preprocess && (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP)) - command = g_strdup_printf("%s %s", pre_process, NVL(getenv("CFLAGS"), "")); + if (want_preprocess && (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP + || ft->id == GEANY_FILETYPES_H || ft->id == GEANY_FILETYPES_HPP )) + command = g_strdup_printf("%s %s", pre_process, NVL(getenv("CFLAGS"), "")); else command = NULL; /* don't preprocess */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3203] trunk
by eht16＠users.sourceforge.net 10 Nov '08

10 Nov '08

Revision: 3203 http://geany.svn.sourceforge.net/geany/?rev=3203&view=rev Author: eht16 Date: 2008-11-10 18:28:14 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Remove unused lexers. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/KeyWords.cxx Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-10 18:27:23 UTC (rev 3202) +++ trunk/ChangeLog 2008-11-10 18:28:14 UTC (rev 3203) @@ -6,6 +6,8 @@ file to the filename of the new document. Make {datetime} wildcard generally available for most template types. Allow use of most available wildcards for custom file templates, too. + * scintilla/KeyWords.cxx: + Remove unused lexers. 2008-11-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/scintilla/KeyWords.cxx =================================================================== --- trunk/scintilla/KeyWords.cxx 2008-11-10 18:27:23 UTC (rev 3202) +++ trunk/scintilla/KeyWords.cxx 2008-11-10 18:28:14 UTC (rev 3203) @@ -142,17 +142,13 @@ //++Autogenerated -- run src/LexGen.py to regenerate //**$\tLINK_LEXER(\*);\n$ LINK_LEXER(lmAsm); - LINK_LEXER(lmASP); LINK_LEXER(lmBash); LINK_LEXER(lmFreeBasic); - LINK_LEXER(lmBatch); LINK_LEXER(lmCaml); LINK_LEXER(lmCPP); - LINK_LEXER(lmCPPNoCase); LINK_LEXER(lmCss); LINK_LEXER(lmD); LINK_LEXER(lmDiff); - LINK_LEXER(lmErrorList); LINK_LEXER(lmF77); LINK_LEXER(lmFortran); LINK_LEXER(lmHaskell); @@ -161,13 +157,10 @@ LINK_LEXER(lmLua); LINK_LEXER(lmMake); LINK_LEXER(lmMatlab); - LINK_LEXER(lmNncrontab); LINK_LEXER(lmNull); LINK_LEXER(lmOMS); LINK_LEXER(lmPascal); LINK_LEXER(lmPerl); - LINK_LEXER(lmPHP); - LINK_LEXER(lmPHPSCRIPT); LINK_LEXER(lmPo); LINK_LEXER(lmProps); LINK_LEXER(lmPython); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3202] trunk
by eht16＠users.sourceforge.net 10 Nov '08

10 Nov '08

Revision: 3202 http://geany.svn.sourceforge.net/geany/?rev=3202&view=rev Author: eht16 Date: 2008-11-10 18:27:23 +0000 (Mon, 10 Nov 2008) Log Message: ----------- When using custom file templates, add the extension of the template file to the filename of the new document. Make {datetime} wildcard generally available for most template types. Allow use of most available wildcards for custom file templates, too. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/editor.c trunk/src/templates.c trunk/src/templates.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-10 17:31:45 UTC (rev 3201) +++ trunk/ChangeLog 2008-11-10 18:27:23 UTC (rev 3202) @@ -1,3 +1,13 @@ +2008-11-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * doc/geany.txt, doc/geany.html, src/templates.c, src/templates.c, + src/editor.c: + When using custom file templates, add the extension of the template + file to the filename of the new document. + Make {datetime} wildcard generally available for most template types. + Allow use of most available wildcards for custom file templates, too. + + 2008-11-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/about.c, src/treeviews.c, src/treeviews.h, src/symbols.c, Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-11-10 17:31:45 UTC (rev 3201) +++ trunk/doc/geany.html 2008-11-10 18:27:23 UTC (rev 3202) @@ -3,10 +3,10 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2008-10-27" /> +<meta name="date" content="$Date$" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2008-10-27</td></tr> +<td>$Date$</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.16</td></tr> </tbody> @@ -149,255 +149,255 @@ License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING included with the source code -of this program, and also in the chapter <a class="reference" href="#gnu-general-public-license">GNU General Public License</a>.</p> -<div class="contents topic"> -<p class="topic-title first"><a id="contents" name="contents">Contents</a></p> +of this program, and also in the chapter <a class="reference internal" href="#gnu-general-public-license">GNU General Public License</a>.</p> +<div class="contents topic" id="contents"> +<p class="topic-title first">Contents</p> <ul class="simple"> -<li><a class="reference" href="#introduction" id="id9" name="id9">Introduction</a><ul> -<li><a class="reference" href="#about-geany" id="id10" name="id10">About Geany</a></li> -<li><a class="reference" href="#where-to-get-it" id="id11" name="id11">Where to get it</a></li> -<li><a class="reference" href="#license" id="id12" name="id12">License</a></li> -<li><a class="reference" href="#about-this-document" id="id13" name="id13">About this document</a></li> +<li><a class="reference internal" href="#introduction" id="id9">Introduction</a><ul> +<li><a class="reference internal" href="#about-geany" id="id10">About Geany</a></li> +<li><a class="reference internal" href="#where-to-get-it" id="id11">Where to get it</a></li> +<li><a class="reference internal" href="#license" id="id12">License</a></li> +<li><a class="reference internal" href="#about-this-document" id="id13">About this document</a></li> </ul> </li> -<li><a class="reference" href="#installation" id="id14" name="id14">Installation</a><ul> -<li><a class="reference" href="#requirements" id="id15" name="id15">Requirements</a></li> -<li><a class="reference" href="#binary-packages" id="id16" name="id16">Binary packages</a></li> -<li><a class="reference" href="#source-compilation" id="id17" name="id17">Source compilation</a><ul> -<li><a class="reference" href="#custom-installation" id="id18" name="id18">Custom installation</a></li> -<li><a class="reference" href="#dynamic-linking-loader-support" id="id19" name="id19">Dynamic linking loader support</a></li> -<li><a class="reference" href="#build-problems" id="id20" name="id20">Build problems</a></li> +<li><a class="reference internal" href="#installation" id="id14">Installation</a><ul> +<li><a class="reference internal" href="#requirements" id="id15">Requirements</a></li> +<li><a class="reference internal" href="#binary-packages" id="id16">Binary packages</a></li> +<li><a class="reference internal" href="#source-compilation" id="id17">Source compilation</a><ul> +<li><a class="reference internal" href="#custom-installation" id="id18">Custom installation</a></li> +<li><a class="reference internal" href="#dynamic-linking-loader-support" id="id19">Dynamic linking loader support</a></li> +<li><a class="reference internal" href="#build-problems" id="id20">Build problems</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#usage" id="id21" name="id21">Usage</a><ul> -<li><a class="reference" href="#getting-started" id="id22" name="id22">Getting started</a></li> -<li><a class="reference" href="#command-line-options" id="id23" name="id23">Command line options</a></li> -<li><a class="reference" href="#general" id="id24" name="id24">General</a><ul> -<li><a class="reference" href="#startup" id="id25" name="id25">Startup</a></li> -<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id26" name="id26">Opening files from the command-line in a running instance</a></li> -<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id27" name="id27">Virtual terminal emulator widget (VTE)</a></li> -<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id28" name="id28">Defining own widget styles using .gtkrc-2.0</a></li> +<li><a class="reference internal" href="#usage" id="id21">Usage</a><ul> +<li><a class="reference internal" href="#getting-started" id="id22">Getting started</a></li> +<li><a class="reference internal" href="#command-line-options" id="id23">Command line options</a></li> +<li><a class="reference internal" href="#general" id="id24">General</a><ul> +<li><a class="reference internal" href="#startup" id="id25">Startup</a></li> +<li><a class="reference internal" href="#opening-files-from-the-command-line-in-a-running-instance" id="id26">Opening files from the command-line in a running instance</a></li> +<li><a class="reference internal" href="#virtual-terminal-emulator-widget-vte" id="id27">Virtual terminal emulator widget (VTE)</a></li> +<li><a class="reference internal" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id28">Defining own widget styles using .gtkrc-2.0</a></li> </ul> </li> -<li><a class="reference" href="#documents" id="id29" name="id29">Documents</a><ul> -<li><a class="reference" href="#switching-between-documents" id="id30" name="id30">Switching between documents</a></li> +<li><a class="reference internal" href="#documents" id="id29">Documents</a><ul> +<li><a class="reference internal" href="#switching-between-documents" id="id30">Switching between documents</a></li> </ul> </li> -<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id31" name="id31">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> -<li><a class="reference" href="#using-character-sets" id="id32" name="id32">Using character sets</a></li> -<li><a class="reference" href="#in-file-encoding-specification" id="id33" name="id33">In-file encoding specification</a></li> -<li><a class="reference" href="#special-encoding-none" id="id34" name="id34">Special encoding "None"</a></li> -<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id35" name="id35">Unicode Byte-Order-Mark (BOM)</a></li> +<li><a class="reference internal" href="#character-sets-and-unicode-byte-order-mark-bom" id="id31">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> +<li><a class="reference internal" href="#using-character-sets" id="id32">Using character sets</a></li> +<li><a class="reference internal" href="#in-file-encoding-specification" id="id33">In-file encoding specification</a></li> +<li><a class="reference internal" href="#special-encoding-none" id="id34">Special encoding "None"</a></li> +<li><a class="reference internal" href="#unicode-byte-order-mark-bom" id="id35">Unicode Byte-Order-Mark (BOM)</a></li> </ul> </li> -<li><a class="reference" href="#editing" id="id36" name="id36">Editing</a><ul> -<li><a class="reference" href="#folding" id="id37" name="id37">Folding</a></li> -<li><a class="reference" href="#column-mode-editing" id="id38" name="id38">Column mode editing</a></li> -<li><a class="reference" href="#drag-and-drop-of-text" id="id39" name="id39">Drag and drop of text</a></li> -<li><a class="reference" href="#indentation" id="id40" name="id40">Indentation</a></li> -<li><a class="reference" href="#auto-indentation" id="id41" name="id41">Auto-indentation</a></li> -<li><a class="reference" href="#bookmarks" id="id42" name="id42">Bookmarks</a></li> -<li><a class="reference" href="#code-navigation-history" id="id43" name="id43">Code Navigation History</a></li> -<li><a class="reference" href="#send-text-through-definable-commands" id="id44" name="id44">Send text through definable commands</a></li> -<li><a class="reference" href="#context-actions" id="id45" name="id45">Context actions</a></li> -<li><a class="reference" href="#user-definable-snippets" id="id46" name="id46">User-definable snippets</a></li> -<li><a class="reference" href="#inserting-unicode-characters" id="id47" name="id47">Inserting unicode characters</a></li> +<li><a class="reference internal" href="#editing" id="id36">Editing</a><ul> +<li><a class="reference internal" href="#folding" id="id37">Folding</a></li> +<li><a class="reference internal" href="#column-mode-editing" id="id38">Column mode editing</a></li> +<li><a class="reference internal" href="#drag-and-drop-of-text" id="id39">Drag and drop of text</a></li> +<li><a class="reference internal" href="#indentation" id="id40">Indentation</a></li> +<li><a class="reference internal" href="#auto-indentation" id="id41">Auto-indentation</a></li> +<li><a class="reference internal" href="#bookmarks" id="id42">Bookmarks</a></li> +<li><a class="reference internal" href="#code-navigation-history" id="id43">Code Navigation History</a></li> +<li><a class="reference internal" href="#send-text-through-definable-commands" id="id44">Send text through definable commands</a></li> +<li><a class="reference internal" href="#context-actions" id="id45">Context actions</a></li> +<li><a class="reference internal" href="#user-definable-snippets" id="id46">User-definable snippets</a></li> +<li><a class="reference internal" href="#inserting-unicode-characters" id="id47">Inserting unicode characters</a></li> </ul> </li> -<li><a class="reference" href="#search-replace-and-go-to" id="id48" name="id48">Search, replace and go to</a><ul> -<li><a class="reference" href="#find" id="id49" name="id49">Find</a><ul> -<li><a class="reference" href="#matching-options" id="id50" name="id50">Matching options</a></li> -<li><a class="reference" href="#find-all" id="id51" name="id51">Find all</a></li> -<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id52" name="id52">Change font in search dialog text fields</a></li> +<li><a class="reference internal" href="#search-replace-and-go-to" id="id48">Search, replace and go to</a><ul> +<li><a class="reference internal" href="#find" id="id49">Find</a><ul> +<li><a class="reference internal" href="#matching-options" id="id50">Matching options</a></li> +<li><a class="reference internal" href="#find-all" id="id51">Find all</a></li> +<li><a class="reference internal" href="#change-font-in-search-dialog-text-fields" id="id52">Change font in search dialog text fields</a></li> </ul> </li> -<li><a class="reference" href="#find-usage" id="id53" name="id53">Find usage</a></li> -<li><a class="reference" href="#find-in-files" id="id54" name="id54">Find in files</a><ul> -<li><a class="reference" href="#filtering-out-version-control-files" id="id55" name="id55">Filtering out version control files</a></li> +<li><a class="reference internal" href="#find-usage" id="id53">Find usage</a></li> +<li><a class="reference internal" href="#find-in-files" id="id54">Find in files</a><ul> +<li><a class="reference internal" href="#filtering-out-version-control-files" id="id55">Filtering out version control files</a></li> </ul> </li> -<li><a class="reference" href="#replace" id="id56" name="id56">Replace</a><ul> -<li><a class="reference" href="#replace-all" id="id57" name="id57">Replace all</a></li> +<li><a class="reference internal" href="#replace" id="id56">Replace</a><ul> +<li><a class="reference internal" href="#replace-all" id="id57">Replace all</a></li> </ul> </li> -<li><a class="reference" href="#go-to-tag-definition" id="id58" name="id58">Go to tag definition</a></li> -<li><a class="reference" href="#go-to-tag-declaration" id="id59" name="id59">Go to tag declaration</a></li> -<li><a class="reference" href="#go-to-line" id="id60" name="id60">Go to line</a></li> -<li><a class="reference" href="#regular-expressions" id="id61" name="id61">Regular expressions</a><ul> -<li><a class="reference" href="#partial-posix-compatibility" id="id62" name="id62">Partial POSIX compatibility</a></li> +<li><a class="reference internal" href="#go-to-tag-definition" id="id58">Go to tag definition</a></li> +<li><a class="reference internal" href="#go-to-tag-declaration" id="id59">Go to tag declaration</a></li> +<li><a class="reference internal" href="#go-to-line" id="id60">Go to line</a></li> +<li><a class="reference internal" href="#regular-expressions" id="id61">Regular expressions</a><ul> +<li><a class="reference internal" href="#partial-posix-compatibility" id="id62">Partial POSIX compatibility</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#tags" id="id63" name="id63">Tags</a><ul> -<li><a class="reference" href="#workspace-tags" id="id64" name="id64">Workspace tags</a></li> -<li><a class="reference" href="#global-tags" id="id65" name="id65">Global tags</a><ul> -<li><a class="reference" href="#default-global-tags-files" id="id66" name="id66">Default global tags files</a></li> -<li><a class="reference" href="#generating-a-global-tags-file" id="id67" name="id67">Generating a global tags file</a></li> +<li><a class="reference internal" href="#tags" id="id63">Tags</a><ul> +<li><a class="reference internal" href="#workspace-tags" id="id64">Workspace tags</a></li> +<li><a class="reference internal" href="#global-tags" id="id65">Global tags</a><ul> +<li><a class="reference internal" href="#default-global-tags-files" id="id66">Default global tags files</a></li> +<li><a class="reference internal" href="#generating-a-global-tags-file" id="id67">Generating a global tags file</a></li> </ul> </li> -<li><a class="reference" href="#ignore-tags" id="id68" name="id68">Ignore tags</a></li> +<li><a class="reference internal" href="#ignore-tags" id="id68">Ignore tags</a></li> </ul> </li> -<li><a class="reference" href="#preferences" id="id69" name="id69">Preferences</a><ul> -<li><a class="reference" href="#general-tab-in-preferences-dialog" id="id70" name="id70">General tab in preferences dialog</a><ul> -<li><a class="reference" href="#id1" id="id71" name="id71">Startup</a></li> -<li><a class="reference" href="#shutdown" id="id72" name="id72">Shutdown</a></li> -<li><a class="reference" href="#projects" id="id73" name="id73">Projects</a></li> -<li><a class="reference" href="#miscellaneous" id="id74" name="id74">Miscellaneous</a></li> +<li><a class="reference internal" href="#preferences" id="id69">Preferences</a><ul> +<li><a class="reference internal" href="#general-tab-in-preferences-dialog" id="id70">General tab in preferences dialog</a><ul> +<li><a class="reference internal" href="#id1" id="id71">Startup</a></li> +<li><a class="reference internal" href="#shutdown" id="id72">Shutdown</a></li> +<li><a class="reference internal" href="#projects" id="id73">Projects</a></li> +<li><a class="reference internal" href="#miscellaneous" id="id74">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#interface-tab-in-preferences-dialog" id="id75" name="id75">Interface tab in preferences dialog</a><ul> -<li><a class="reference" href="#sidebar" id="id76" name="id76">Sidebar</a></li> -<li><a class="reference" href="#fonts" id="id77" name="id77">Fonts</a></li> -<li><a class="reference" href="#editor-tabs" id="id78" name="id78">Editor tabs</a></li> -<li><a class="reference" href="#tab-positions" id="id79" name="id79">Tab positions</a></li> -<li><a class="reference" href="#id2" id="id80" name="id80">Miscellaneous</a></li> +<li><a class="reference internal" href="#interface-tab-in-preferences-dialog" id="id75">Interface tab in preferences dialog</a><ul> +<li><a class="reference internal" href="#sidebar" id="id76">Sidebar</a></li> +<li><a class="reference internal" href="#fonts" id="id77">Fonts</a></li> +<li><a class="reference internal" href="#editor-tabs" id="id78">Editor tabs</a></li> +<li><a class="reference internal" href="#tab-positions" id="id79">Tab positions</a></li> +<li><a class="reference internal" href="#id2" id="id80">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#toolbar-tab-in-preferences-dialog" id="id81" name="id81">Toolbar tab in preferences dialog</a><ul> -<li><a class="reference" href="#toolbar" id="id82" name="id82">Toolbar</a></li> -<li><a class="reference" href="#items" id="id83" name="id83">Items</a></li> -<li><a class="reference" href="#appearance" id="id84" name="id84">Appearance</a></li> +<li><a class="reference internal" href="#toolbar-tab-in-preferences-dialog" id="id81">Toolbar tab in preferences dialog</a><ul> +<li><a class="reference internal" href="#toolbar" id="id82">Toolbar</a></li> +<li><a class="reference internal" href="#items" id="id83">Items</a></li> +<li><a class="reference internal" href="#appearance" id="id84">Appearance</a></li> </ul> </li> -<li><a class="reference" href="#editor-features-tab-in-preferences-dialog" id="id85" name="id85">Editor Features tab in preferences dialog</a><ul> -<li><a class="reference" href="#indentation-group" id="id86" name="id86">Indentation group</a></li> -<li><a class="reference" href="#features" id="id87" name="id87">Features</a></li> +<li><a class="reference internal" href="#editor-features-tab-in-preferences-dialog" id="id85">Editor Features tab in preferences dialog</a><ul> +<li><a class="reference internal" href="#indentation-group" id="id86">Indentation group</a></li> +<li><a class="reference internal" href="#features" id="id87">Features</a></li> </ul> </li> -<li><a class="reference" href="#editor-completions-tab-in-preferences-dialog" id="id88" name="id88">Editor Completions tab in preferences dialog</a></li> -<li><a class="reference" href="#editor-display-tab-in-preferences-dialog" id="id89" name="id89">Editor Display tab in preferences dialog</a><ul> -<li><a class="reference" href="#display" id="id90" name="id90">Display</a></li> -<li><a class="reference" href="#long-line-marker" id="id91" name="id91">Long line marker</a></li> +<li><a class="reference internal" href="#editor-completions-tab-in-preferences-dialog" id="id88">Editor Completions tab in preferences dialog</a></li> +<li><a class="reference internal" href="#editor-display-tab-in-preferences-dialog" id="id89">Editor Display tab in preferences dialog</a><ul> +<li><a class="reference internal" href="#display" id="id90">Display</a></li> +<li><a class="reference internal" href="#long-line-marker" id="id91">Long line marker</a></li> </ul> </li> -<li><a class="reference" href="#files-tab-in-preferences-dialog" id="id92" name="id92">Files tab in preferences dialog</a><ul> -<li><a class="reference" href="#new-files" id="id93" name="id93">New files</a></li> -<li><a class="reference" href="#saving-files" id="id94" name="id94">Saving files</a></li> -<li><a class="reference" href="#id3" id="id95" name="id95">Miscellaneous</a></li> +<li><a class="reference internal" href="#files-tab-in-preferences-dialog" id="id92">Files tab in preferences dialog</a><ul> +<li><a class="reference internal" href="#new-files" id="id93">New files</a></li> +<li><a class="reference internal" href="#saving-files" id="id94">Saving files</a></li> +<li><a class="reference internal" href="#id3" id="id95">Miscellaneous</a></li> </ul> </li> -<li><a class="reference" href="#search-tab-in-preferences-dialog" id="id96" name="id96">Search tab in preferences dialog</a></li> -<li><a class="reference" href="#tools-tab-in-preferences-dialog" id="id97" name="id97">Tools tab in preferences dialog</a><ul> -<li><a class="reference" href="#tool-paths" id="id98" name="id98">Tool paths</a></li> -<li><a class="reference" href="#commands" id="id99" name="id99">Commands</a></li> +<li><a class="reference internal" href="#search-tab-in-preferences-dialog" id="id96">Search tab in preferences dialog</a></li> +<li><a class="reference internal" href="#tools-tab-in-preferences-dialog" id="id97">Tools tab in preferences dialog</a><ul> +<li><a class="reference internal" href="#tool-paths" id="id98">Tool paths</a></li> +<li><a class="reference internal" href="#commands" id="id99">Commands</a></li> </ul> </li> -<li><a class="reference" href="#template-tab-in-preferences-dialog" id="id100" name="id100">Template tab in preferences dialog</a><ul> -<li><a class="reference" href="#template-data" id="id101" name="id101">Template data</a></li> +<li><a class="reference internal" href="#template-tab-in-preferences-dialog" id="id100">Template tab in preferences dialog</a><ul> +<li><a class="reference internal" href="#template-data" id="id101">Template data</a></li> </ul> </li> -<li><a class="reference" href="#keybinding-tab-in-preferences-dialog" id="id102" name="id102">Keybinding tab in preferences dialog</a></li> -<li><a class="reference" href="#printing-tab-in-preferences-dialog" id="id103" name="id103">Printing tab in preferences dialog</a></li> -<li><a class="reference" href="#vte-tab-in-preferences-dialog" id="id104" name="id104">VTE tab in preferences dialog</a><ul> -<li><a class="reference" href="#terminal-widget" id="id105" name="id105">Terminal widget</a></li> +<li><a class="reference internal" href="#keybinding-tab-in-preferences-dialog" id="id102">Keybinding tab in preferences dialog</a></li> +<li><a class="reference internal" href="#printing-tab-in-preferences-dialog" id="id103">Printing tab in preferences dialog</a></li> +<li><a class="reference internal" href="#vte-tab-in-preferences-dialog" id="id104">VTE tab in preferences dialog</a><ul> +<li><a class="reference internal" href="#terminal-widget" id="id105">Terminal widget</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#project-management" id="id106" name="id106">Project Management</a><ul> -<li><a class="reference" href="#new-project" id="id107" name="id107">New Project</a></li> -<li><a class="reference" href="#project-properties" id="id108" name="id108">Project Properties</a><ul> -<li><a class="reference" href="#make-in-base-path" id="id109" name="id109">Make in base path</a></li> -<li><a class="reference" href="#run-command" id="id110" name="id110">Run command</a></li> +<li><a class="reference internal" href="#project-management" id="id106">Project Management</a><ul> +<li><a class="reference internal" href="#new-project" id="id107">New Project</a></li> +<li><a class="reference internal" href="#project-properties" id="id108">Project Properties</a><ul> +<li><a class="reference internal" href="#make-in-base-path" id="id109">Make in base path</a></li> +<li><a class="reference internal" href="#run-command" id="id110">Run command</a></li> </ul> </li> -<li><a class="reference" href="#open-project" id="id111" name="id111">Open Project</a></li> -<li><a class="reference" href="#close-project" id="id112" name="id112">Close Project</a></li> +<li><a class="reference internal" href="#open-project" id="id111">Open Project</a></li> +<li><a class="reference internal" href="#close-project" id="id112">Close Project</a></li> </ul> </li> -<li><a class="reference" href="#build-system" id="id113" name="id113">Build system</a><ul> -<li><a class="reference" href="#compile" id="id114" name="id114">Compile</a></li> -<li><a class="reference" href="#build" id="id115" name="id115">Build</a></li> -<li><a class="reference" href="#make-all" id="id116" name="id116">Make all</a></li> -<li><a class="reference" href="#make-custom-target" id="id117" name="id117">Make custom target</a></li> -<li><a class="reference" href="#make-object" id="id118" name="id118">Make object</a></li> -<li><a class="reference" href="#execute" id="id119" name="id119">Execute</a></li> -<li><a class="reference" href="#stopping-running-processes" id="id120" name="id120">Stopping running processes</a><ul> -<li><a class="reference" href="#terminal-emulators" id="id121" name="id121">Terminal emulators</a></li> +<li><a class="reference internal" href="#build-system" id="id113">Build system</a><ul> +<li><a class="reference internal" href="#compile" id="id114">Compile</a></li> +<li><a class="reference internal" href="#build" id="id115">Build</a></li> +<li><a class="reference internal" href="#make-all" id="id116">Make all</a></li> +<li><a class="reference internal" href="#make-custom-target" id="id117">Make custom target</a></li> +<li><a class="reference internal" href="#make-object" id="id118">Make object</a></li> +<li><a class="reference internal" href="#execute" id="id119">Execute</a></li> +<li><a class="reference internal" href="#stopping-running-processes" id="id120">Stopping running processes</a><ul> +<li><a class="reference internal" href="#terminal-emulators" id="id121">Terminal emulators</a></li> </ul> </li> -<li><a class="reference" href="#set-includes-and-arguments" id="id122" name="id122">Set Includes and Arguments</a><ul> -<li><a class="reference" href="#one-step-compilation" id="id123" name="id123">One step compilation</a></li> +<li><a class="reference internal" href="#set-includes-and-arguments" id="id122">Set Includes and Arguments</a><ul> +<li><a class="reference internal" href="#one-step-compilation" id="id123">One step compilation</a></li> </ul> </li> -<li><a class="reference" href="#indicators" id="id124" name="id124">Indicators</a></li> +<li><a class="reference internal" href="#indicators" id="id124">Indicators</a></li> </ul> </li> -<li><a class="reference" href="#printing-support" id="id125" name="id125">Printing support</a></li> -<li><a class="reference" href="#plugins" id="id126" name="id126">Plugins</a></li> -<li><a class="reference" href="#keybindings" id="id127" name="id127">Keybindings</a><ul> -<li><a class="reference" href="#switching-documents" id="id128" name="id128">Switching documents</a></li> -<li><a class="reference" href="#configurable-keybindings" id="id129" name="id129">Configurable keybindings</a></li> +<li><a class="reference internal" href="#printing-support" id="id125">Printing support</a></li> +<li><a class="reference internal" href="#plugins" id="id126">Plugins</a></li> +<li><a class="reference internal" href="#keybindings" id="id127">Keybindings</a><ul> +<li><a class="reference internal" href="#switching-documents" id="id128">Switching documents</a></li> +<li><a class="reference internal" href="#configurable-keybindings" id="id129">Configurable keybindings</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#configuration-files" id="id130" name="id130">Configuration files</a><ul> -<li><a class="reference" href="#global-configuration-file" id="id131" name="id131">Global configuration file</a></li> -<li><a class="reference" href="#filetype-definition-files" id="id132" name="id132">Filetype definition files</a><ul> -<li><a class="reference" href="#format" id="id133" name="id133">Format</a><ul> -<li><a class="reference" href="#styling-section" id="id134" name="id134">[styling] Section</a></li> -<li><a class="reference" href="#keywords-section" id="id135" name="id135">[keywords] Section</a></li> -<li><a class="reference" href="#settings-section" id="id136" name="id136">[settings] Section</a></li> -<li><a class="reference" href="#build-settings-section" id="id137" name="id137">[build_settings] Section</a></li> +<li><a class="reference internal" href="#configuration-files" id="id130">Configuration files</a><ul> +<li><a class="reference internal" href="#global-configuration-file" id="id131">Global configuration file</a></li> +<li><a class="reference internal" href="#filetype-definition-files" id="id132">Filetype definition files</a><ul> +<li><a class="reference internal" href="#format" id="id133">Format</a><ul> +<li><a class="reference internal" href="#styling-section" id="id134">[styling] Section</a></li> +<li><a class="reference internal" href="#keywords-section" id="id135">[keywords] Section</a></li> +<li><a class="reference internal" href="#settings-section" id="id136">[settings] Section</a></li> +<li><a class="reference internal" href="#build-settings-section" id="id137">[build_settings] Section</a></li> </ul> </li> -<li><a class="reference" href="#special-file-filetypes-common" id="id138" name="id138">Special file filetypes.common</a></li> +<li><a class="reference internal" href="#special-file-filetypes-common" id="id138">Special file filetypes.common</a></li> </ul> </li> -<li><a class="reference" href="#filetype-extensions" id="id139" name="id139">Filetype extensions</a></li> -<li><a class="reference" href="#templates" id="id140" name="id140">Templates</a><ul> -<li><a class="reference" href="#template-metadata" id="id141" name="id141">Template metadata</a></li> -<li><a class="reference" href="#file-templates" id="id142" name="id142">File templates</a><ul> -<li><a class="reference" href="#custom-file-templates" id="id143" name="id143">Custom file templates</a></li> -<li><a class="reference" href="#filetype-templates" id="id144" name="id144">Filetype templates</a></li> +<li><a class="reference internal" href="#filetype-extensions" id="id139">Filetype extensions</a></li> +<li><a class="reference internal" href="#templates" id="id140">Templates</a><ul> +<li><a class="reference internal" href="#template-metadata" id="id141">Template metadata</a></li> +<li><a class="reference internal" href="#file-templates" id="id142">File templates</a><ul> +<li><a class="reference internal" href="#custom-file-templates" id="id143">Custom file templates</a></li> +<li><a class="reference internal" href="#filetype-templates" id="id144">Filetype templates</a></li> </ul> </li> -<li><a class="reference" href="#customizing-templates" id="id145" name="id145">Customizing templates</a><ul> -<li><a class="reference" href="#template-wildcards" id="id146" name="id146">Template wildcards</a></li> +<li><a class="reference internal" href="#customizing-templates" id="id145">Customizing templates</a><ul> +<li><a class="reference internal" href="#template-wildcards" id="id146">Template wildcards</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference" href="#plugin-documentation" id="id147" name="id147">Plugin documentation</a><ul> -<li><a class="reference" href="#instant-save" id="id148" name="id148">Instant Save</a></li> -<li><a class="reference" href="#backup-copy" id="id149" name="id149">Backup Copy</a></li> +<li><a class="reference internal" href="#plugin-documentation" id="id147">Plugin documentation</a><ul> +<li><a class="reference internal" href="#instant-save" id="id148">Instant Save</a></li> +<li><a class="reference internal" href="#backup-copy" id="id149">Backup Copy</a></li> </ul> </li> -<li><a class="reference" href="#contributing-to-this-document" id="id150" name="id150">Contributing to this document</a></li> -<li><a class="reference" href="#scintilla-keyboard-commands" id="id151" name="id151">Scintilla keyboard commands</a><ul> -<li><a class="reference" href="#keyboard-commands" id="id152" name="id152">Keyboard commands</a></li> +<li><a class="reference internal" href="#contributing-to-this-document" id="id150">Contributing to this document</a></li> +<li><a class="reference internal" href="#scintilla-keyboard-commands" id="id151">Scintilla keyboard commands</a><ul> +<li><a class="reference internal" href="#keyboard-commands" id="id152">Keyboard commands</a></li> </ul> </li> -<li><a class="reference" href="#tips-and-tricks" id="id153" name="id153">Tips and tricks</a><ul> -<li><a class="reference" href="#document-notebook" id="id154" name="id154">Document notebook</a></li> -<li><a class="reference" href="#editor" id="id155" name="id155">Editor</a></li> -<li><a class="reference" href="#interface" id="id156" name="id156">Interface</a></li> -<li><a class="reference" href="#gtk-related" id="id157" name="id157">GTK-related</a></li> +<li><a class="reference internal" href="#tips-and-tricks" id="id153">Tips and tricks</a><ul> +<li><a class="reference internal" href="#document-notebook" id="id154">Document notebook</a></li> +<li><a class="reference internal" href="#editor" id="id155">Editor</a></li> +<li><a class="reference internal" href="#interface" id="id156">Interface</a></li> +<li><a class="reference internal" href="#gtk-related" id="id157">GTK-related</a></li> </ul> </li> -<li><a class="reference" href="#hidden-preferences" id="id158" name="id158">Hidden preferences</a></li> -<li><a class="reference" href="#compile-time-options" id="id159" name="id159">Compile-time options</a><ul> -<li><a class="reference" href="#src-geany-h" id="id160" name="id160">src/geany.h</a></li> -<li><a class="reference" href="#project-h" id="id161" name="id161">project.h</a></li> -<li><a class="reference" href="#editor-h" id="id162" name="id162">editor.h</a></li> -<li><a class="reference" href="#keyfile-c" id="id163" name="id163">keyfile.c</a></li> +<li><a class="reference internal" href="#hidden-preferences" id="id158">Hidden preferences</a></li> +<li><a class="reference internal" href="#compile-time-options" id="id159">Compile-time options</a><ul> +<li><a class="reference internal" href="#src-geany-h" id="id160">src/geany.h</a></li> +<li><a class="reference internal" href="#project-h" id="id161">project.h</a></li> +<li><a class="reference internal" href="#editor-h" id="id162">editor.h</a></li> +<li><a class="reference internal" href="#keyfile-c" id="id163">keyfile.c</a></li> </ul> </li> -<li><a class="reference" href="#gnu-general-public-license" id="id164" name="id164">GNU General Public License</a></li> -<li><a class="reference" href="#license-for-scintilla-and-scite" id="id165" name="id165">License for Scintilla and SciTE</a></li> +<li><a class="reference internal" href="#gnu-general-public-license" id="id164">GNU General Public License</a></li> +<li><a class="reference internal" href="#license-for-scintilla-and-scite" id="id165">License for Scintilla and SciTE</a></li> </ul> </div> -<div class="section"> -<h1><a class="toc-backref" href="#id9" id="introduction" name="introduction">Introduction</a></h1> -<div class="section"> -<h2><a class="toc-backref" href="#id10" id="about-geany" name="about-geany">About Geany</a></h2> +<div class="section" id="introduction"> +<h1><a class="toc-backref" href="#id9">Introduction</a></h1> +<div class="section" id="about-geany"> +<h2><a class="toc-backref" href="#id10">About Geany</a></h2> <p>Geany is a small and lightweight Integrated Development Environment. It was developed to provide a small and fast IDE, which has only a few dependencies from other packages. Another goal was to be as independent @@ -420,50 +420,50 @@ <li>Plugin interface</li> </ul> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id11" id="where-to-get-it" name="where-to-get-it">Where to get it</a></h2> -<p>You can obtain Geany from <a class="reference" href="http://www.geany.org/">http://www.geany.org/</a> or perhaps also from +<div class="section" id="where-to-get-it"> +<h2><a class="toc-backref" href="#id11">Where to get it</a></h2> +<p>You can obtain Geany from <a class="reference external" href="http://www.geany.org/">http://www.geany.org/</a> or perhaps also from your distributor. For a list of available packages, please see -<a class="reference" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> +<a class="reference external" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id12" id="license" name="license">License</a></h2> +<div class="section" id="license"> +<h2><a class="toc-backref" href="#id12">License</a></h2> <p>Geany is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING included with the source -code of this program and in the chapter, <a class="reference" href="#gnu-general-public-license">GNU General Public License</a>.</p> +code of this program and in the chapter, <a class="reference internal" href="#gnu-general-public-license">GNU General Public License</a>.</p> <p>The included Scintilla library (found in the subdirectory <tt class="docutils literal"><span class="pre">scintilla/</span></tt>) has its own license, which can be found in the chapter, -<a class="reference" href="#license-for-scintilla-and-scite">License for Scintilla and SciTE</a>.</p> +<a class="reference internal" href="#license-for-scintilla-and-scite">License for Scintilla and SciTE</a>.</p> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id13" id="about-this-document" name="about-this-document">About this document</a></h2> +<div class="section" id="about-this-document"> +<h2><a class="toc-backref" href="#id13">About this document</a></h2> <p>This documentation is available in HTML and text formats. -The latest version can always be found at <a class="reference" href="http://www.geany.org/">http://www.geany.org/</a>.</p> -<p>If you want to contribute to it, see <a class="reference" href="#contributing-to-this-document">Contributing to this document</a>.</p> +The latest version can always be found at <a class="reference external" href="http://www.geany.org/">http://www.geany.org/</a>.</p> +<p>If you want to contribute to it, see <a class="reference internal" href="#contributing-to-this-document">Contributing to this document</a>.</p> </div> </div> -<div class="section"> -<h1><a class="toc-backref" href="#id14" id="installation" name="installation">Installation</a></h1> -<div class="section"> -<h2><a class="toc-backref" href="#id15" id="requirements" name="requirements">Requirements</a></h2> +<div class="section" id="installation"> +<h1><a class="toc-backref" href="#id14">Installation</a></h1> +<div class="section" id="requirements"> +<h2><a class="toc-backref" href="#id15">Requirements</a></h2> <p>You will need the GTK (>= 2.6.0) libraries and their dependencies (Pango, GLib and ATK). Your distro should provide packages for these, usually installed by default. For Windows, you can download an installer which bundles these libraries from the website.</p> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id16" id="binary-packages" name="binary-packages">Binary packages</a></h2> +<div class="section" id="binary-packages"> +<h2><a class="toc-backref" href="#id16">Binary packages</a></h2> <p>There are many binary packages available. For an up-to-date but maybe -incomplete list see <a class="reference" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> +incomplete list see <a class="reference external" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id17" id="source-compilation" name="source-compilation">Source compilation</a></h2> +<div class="section" id="source-compilation"> +<h2><a class="toc-backref" href="#id17">Source compilation</a></h2> <p>For compiling Geany yourself, you will need the GTK (>= 2.6.0) libraries and header files. You will also need the Pango, GLib and ATK libraries and header files. All these files are available at -<a class="reference" href="http://www.gtk.org">http://www.gtk.org</a>, but very often your distro will provide development +<a class="reference external" href="http://www.gtk.org">http://www.gtk.org</a>, but very often your distro will provide development packages to save the trouble of building these yourself.</p> <p>Furthermore you need, of course, a C compiler and the Make tool; a C++ compiler is also required (for the included Scintilla library). The @@ -477,8 +477,8 @@ <pre class="literal-block"> % make install </pre> -<div class="section"> -<h3><a class="toc-backref" href="#id18" id="custom-installation" name="custom-installation">Custom installation</a></h3> +<div class="section" id="custom-installation"> +<h3><a class="toc-backref" href="#id18">Custom installation</a></h3> <p>The configure script supports several common options, for a detailed list, type:</p> <pre class="literal-block"> @@ -487,18 +487,18 @@ <p>You may also want to read the INSTALL file for advanced installation options.</p> <ul class="simple"> -<li>See also <a class="reference" href="#compile-time-options">Compile-time options</a>.</li> +<li>See also <a class="reference internal" href="#compile-time-options">Compile-time options</a>.</li> </ul> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id19" id="dynamic-linking-loader-support" name="dynamic-linking-loader-support">Dynamic linking loader support</a></h3> +<div class="section" id="dynamic-linking-loader-support"> +<h3><a class="toc-backref" href="#id19">Dynamic linking loader support</a></h3> <p>In the case that your system lacks dynamic linking loader support, you probably want to pass the option <tt class="docutils literal"><span class="pre">--disable-vte</span></tt> to the <tt class="docutils literal"><span class="pre">configure</span></tt> script. This prevents compiling Geany with dynamic linking loader support to automatically load <tt class="docutils literal"><span class="pre">libvte.so.4</span></tt> if available.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id20" id="build-problems" name="build-problems">Build problems</a></h3> +<div class="section" id="build-problems"> +<h3><a class="toc-backref" href="#id20">Build problems</a></h3> <p>If there are any errors during compilation, check your build environment and try to find the error, otherwise contact the mailing list or one the authors. Sometimes you might need to ask for specific @@ -506,10 +506,10 @@ </div> </div> </div> -<div class="section"> -<h1><a class="toc-backref" href="#id21" id="usage" name="usage">Usage</a></h1> -<div class="section"> -<h2><a class="toc-backref" href="#id22" id="getting-started" name="getting-started">Getting started</a></h2> +<div class="section" id="usage"> +<h1><a class="toc-backref" href="#id21">Usage</a></h1> +<div class="section" id="getting-started"> +<h2><a class="toc-backref" href="#id22">Getting started</a></h2> <p>You can start Geany in the following ways:</p> <ul> <li><p class="first">From the Desktop Environment menu:</p> @@ -525,8 +525,8 @@ </li> </ul> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id23" id="command-line-options" name="command-line-options">Command line options</a></h2> +<div class="section" id="command-line-options"> +<h2><a class="toc-backref" href="#id23">Command line options</a></h2> <table border="1" class="docutils"> <colgroup> <col width="13%" /> @@ -570,7 +570,7 @@ <tr><td>-g</td> <td>--generate-tags</td> <td>Generate a global tags file (see -<a class="reference" href="#generating-a-global-tags-file">Generating a global tags file</a>).</td> +<a class="reference internal" href="#generating-a-global-tags-file">Generating a global tags file</a>).</td> </tr> <tr><td>-P</td> <td>--no-preprocessing</td> @@ -658,13 +658,13 @@ <p>Geany supports all generic GTK options, a list is available on the help screen.</p> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id24" id="general" name="general">General</a></h2> -<div class="section"> -<h3><a class="toc-backref" href="#id25" id="startup" name="startup">Startup</a></h3> +<div class="section" id="general"> +<h2><a class="toc-backref" href="#id24">General</a></h2> +<div class="section" id="startup"> +<h3><a class="toc-backref" href="#id25">Startup</a></h3> <p>At startup, Geany loads all files from the last time Geany was launched. You can disable this feature in the preferences dialog -(see <a class="reference" href="#general-tab-in-preferences-dialog">General tab in preferences dialog</a>). If you specify some +(see <a class="reference internal" href="#general-tab-in-preferences-dialog">General tab in preferences dialog</a>). If you specify some files on the command line, only these files will be opened, but you can find the files from the last session in the file menu under the "Recent files" item. By default this contains the last 10 recently @@ -675,8 +675,8 @@ do not specify any filenames on the command-line, or disable opening files in a running instance using the appropriate command line option.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id26" id="opening-files-from-the-command-line-in-a-running-instance" name="opening-files-from-the-command-line-in-a-running-instance">Opening files from the command-line in a running instance</a></h3> +<div class="section" id="opening-files-from-the-command-line-in-a-running-instance"> +<h3><a class="toc-backref" href="#id26">Opening files from the command-line in a running instance</a></h3> <p>Geany detects an already running instance of itself and opens files from the command-line in the already running instance. So, Geany can be used to view and edit files by opening them from other programs @@ -689,10 +689,10 @@ column 4.</p> <p>If you do not like this for some reason, you can disable using the first instance by using the appropriate command line option -- see the section -called <a class="reference" href="#command-line-options">Command line options</a>.</p> +called <a class="reference internal" href="#command-line-options">Command line options</a>.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id27" id="virtual-terminal-emulator-widget-vte" name="virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a></h3> +<div class="section" id="virtual-terminal-emulator-widget-vte"> +<h3><a class="toc-backref" href="#id27">Virtual terminal emulator widget (VTE)</a></h3> <p>If you have installed <tt class="docutils literal"><span class="pre">libvte.so</span></tt> in your system, it is loaded automatically by Geany, and you will have a terminal widget in the notebook at the bottom.</p> @@ -700,7 +700,7 @@ will not be loaded. So there is no need to install the package containing this file in order to run Geany. Additionally, you can disable the use of the terminal widget by command line option, for more information -see the section called <a class="reference" href="#command-line-options">Command line options</a>.</p> +see the section called <a class="reference internal" href="#command-line-options">Command line options</a>.</p> <p>You can use this terminal (from now on called VTE) nearly as an usual terminal program like xterm. There is basic clipboard support. You can paste the contents of the clipboard by pressing the right mouse @@ -731,12 +731,12 @@ <p>Obviously, you have to adjust the paths and set X to the number of your <tt class="docutils literal"><span class="pre">libvte.so</span></tt>.</p> <p>You can also specify the filename of the VTE library to use on the command -line (see the section called <a class="reference" href="#command-line-options">Command line options</a>) or at compile time +line (see the section called <a class="reference internal" href="#command-line-options">Command line options</a>) or at compile time by specifying the command line option <tt class="docutils literal"><span class="pre">--with-vte-module-path</span></tt> to ./configure.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id28" id="defining-own-widget-styles-using-gtkrc-2-0" name="defining-own-widget-styles-using-gtkrc-2-0">Defining own widget styles using .gtkrc-2.0</a></h3> +<div class="section" id="defining-own-widget-styles-using-gtkrc-2-0"> +<h3><a class="toc-backref" href="#id28">Defining own widget styles using .gtkrc-2.0</a></h3> <p>You can define your widget style for many of Geany's GUI parts. To do this, just edit your <tt class="docutils literal"><span class="pre">.gtkrc-2.0</span></tt> (usually found in your home directory on UNIX-like systems and in the etc subdirectory of your @@ -774,10 +774,10 @@ </pre> </div> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id29" id="documents" name="documents">Documents</a></h2> -<div class="section"> -<h3><a class="toc-backref" href="#id30" id="switching-between-documents" name="switching-between-documents">Switching between documents</a></h3> +<div class="section" id="documents"> +<h2><a class="toc-backref" href="#id29">Documents</a></h2> +<div class="section" id="switching-between-documents"> +<h3><a class="toc-backref" href="#id30">Switching between documents</a></h3> <p>The documents list and the editor tabs are two different ways to switch between documents using the mouse. When you hit the key combination to move between tabs, the order is determined by the tab @@ -785,10 +785,10 @@ of whether or not editor tabs are visible).</p> </div> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id31" id="character-sets-and-unicode-byte-order-mark-bom" name="character-sets-and-unicode-byte-order-mark-bom">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> -<div class="section"> -<h3><a class="toc-backref" href="#id32" id="using-character-sets" name="using-character-sets">Using character sets</a></h3> +<div class="section" id="character-sets-and-unicode-byte-order-mark-bom"> +<h2><a class="toc-backref" href="#id31">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> +<div class="section" id="using-character-sets"> +<h3><a class="toc-backref" href="#id32">Using character sets</a></h3> <p>Geany provides support for detecting and converting character sets. So you can open and save files in different character sets and even can convert a file from a character set to another one. To do this, @@ -833,8 +833,8 @@ </li> </ul> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id33" id="in-file-encoding-specification" name="in-file-encoding-specification">In-file encoding specification</a></h3> +<div class="section" id="in-file-encoding-specification"> +<h3><a class="toc-backref" href="#id33">In-file encoding specification</a></h3> <p>Geany detects meta tags of HTML files which contain charset information like:</p> <pre class="literal-block"> @@ -875,8 +875,8 @@ Anything after the first 512 bytes will not be recognised.</p> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id34" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> +<div class="section" id="special-encoding-none"> +<h3><a class="toc-backref" href="#id34">Special encoding "None"</a></h3> <p>There is a special encoding "None" which is actually no real encoding. It is useful when you know that Geany cannot auto-detect the encoding of a file and it is not displayed correctly. Especially @@ -885,10 +885,10 @@ of the first NUL-byte. Using this encoding opens the file as it is without any character conversion.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id35" id="unicode-byte-order-mark-bom" name="unicode-byte-order-mark-bom">Unicode Byte-Order-Mark (BOM)</a></h3> +<div class="section" id="unicode-byte-order-mark-bom"> +<h3><a class="toc-backref" href="#id35">Unicode Byte-Order-Mark (BOM)</a></h3> <p>Furthermore, Geany detects an Unicode Byte Order Mark (see -<a class="reference" href="http://en.wikipedia.org/wiki/Byte_Order_Mark">http://en.wikipedia.org/wiki/Byte_Order_Mark</a> for details). Of course, +<a class="reference external" href="http://en.wikipedia.org/wiki/Byte_Order_Mark">http://en.wikipedia.org/wiki/Byte_Order_Mark</a> for details). Of course, this feature is only available if the opened file is in an unicode encoding. The Byte Order Mark helps to detect the encoding of a file, e.g. whether it is UTF-16LE or UTF-16BE and so on. On Unix-like systems @@ -906,10 +906,10 @@ </div> </div> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id36" id="editing" name="editing">Editing</a></h2> -<div class="section"> -<h3><a class="toc-backref" href="#id37" id="folding" name="folding">Folding</a></h3> +<div class="section" id="editing"> +<h2><a class="toc-backref" href="#id36">Editing</a></h2> +<div class="section" id="folding"> +<h3><a class="toc-backref" href="#id37">Folding</a></h3> <p>Geany provides basic code folding support. Folding means the ability to show and hide parts of the text in the current file. You can hide unimportant code sections and concentrate on the parts you are working on @@ -932,8 +932,8 @@ children of a fold point" option is enabled, pressing Shift will disable it for this click and vice versa.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id38" id="column-mode-editing" name="column-mode-editing">Column mode editing</a></h3> +<div class="section" id="column-mode-editing"> +<h3><a class="toc-backref" href="#id38">Column mode editing</a></h3> <p>There is basic support for column mode editing. To use it, create a rectangular selection by holding down the Control and Shift key while selecting some text. It is also possible to create a zero-column selection @@ -942,18 +942,18 @@ this selection and the modifications will be done for every line in the selection.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id39" id="drag-and-drop-of-text" name="drag-and-drop-of-text">Drag and drop of text</a></h3> +<div class="section" id="drag-and-drop-of-text"> +<h3><a class="toc-backref" href="#id39">Drag and drop of text</a></h3> <p>If you drag selected text in the editor widget of Geany the text is moved to the position where the mouse pointer is when releasing the mouse button. Holding Control when releasing the mouse button will copy the text instead. This behaviour was changed in Geany 0.11 - before the selected text was copied to the new position.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id40" id="indentation" name="indentation">Indentation</a></h3> +<div class="section" id="indentation"> +<h3><a class="toc-backref" href="#id40">Indentation</a></h3> <p>Geany allows each document to indent either with a tab character or -multiple spaces. The default indent mode is set in the <a class="reference" href="#editor-features-tab-in-preferences-dialog">Editor Features +multiple spaces. The default indent mode is set in the <a class="reference internal" href="#editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a> (see the link for more information). But this can be overridden using either the <em>Document->Indent Type</em> menu, or by using the <em>Detect from file</em> indentation preference. When enabled, @@ -971,8 +971,8 @@ on a line.</dd> </dl> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id41" id="auto-indentation" name="auto-indentation">Auto-indentation</a></h3> +<div class="section" id="auto-indentation"> +<h3><a class="toc-backref" href="#id41">Auto-indentation</a></h3> <p>When enabled, auto-indentation happens when pressing <em>Enter</em> in the Editor. It adds a certain amount of indentation to the new line so the user doesn't always have to indent each line manually.</p> @@ -992,8 +992,8 @@ match the indentation of the line with the opening brace.</dd> </dl> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id42" id="bookmarks" name="bookmarks">Bookmarks</a></h3> +<div class="section" id="bookmarks"> +<h3><a class="toc-backref" href="#id42">Bookmarks</a></h3> <p>Geany provides a handy bookmarking feature that lets you mark one or more lines in a document, and return the cursor to them using a key combination.</p> @@ -1010,14 +1010,14 @@ (Ctrl-PgUp/PgDn and Ctrl-Tab) provides a particularly fast way to navigate around multiple files.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id43" id="code-navigation-history" name="code-navigation-history">Code Navigation History</a></h3> +<div class="section" id="code-navigation-history"> +<h3><a class="toc-backref" href="#id43">Code Navigation History</a></h3> <p>To ease navigation in source files and especially between different files, Geany lets you jump between different navigation points. Currently, this works for the following:</p> <ul class="simple"> -<li><a class="reference" href="#go-to-tag-declaration">Go to tag declaration</a></li> -<li><a class="reference" href="#go-to-tag-definition">Go to tag definition</a></li> +<li><a class="reference internal" href="#go-to-tag-declaration">Go to tag declaration</a></li> +<li><a class="reference internal" href="#go-to-tag-definition">Go to tag definition</a></li> <li>Symbol list items</li> <li>Build errors</li> <li>Message items</li> @@ -1029,8 +1029,8 @@ location". This makes it easier to navigate in e.g. foreign code and between different files.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id44" id="send-text-through-definable-commands" name="send-text-through-definable-commands">Send text through definable commands</a></h3> +<div class="section" id="send-text-through-definable-commands"> +<h3><a class="toc-backref" href="#id44">Send text through definable commands</a></h3> <p>You can define several custom commands in Geany and send the current selection to one of these commands. The output of the command will be used to replace the current selection. So, it is possible to use text @@ -1046,18 +1046,18 @@ some command line options. To delete a command, just clear the text entry and press OK. It will be deleted automatically.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id45" id="context-actions" name="context-actions">Context actions</a></h3> +<div class="section" id="context-actions"> +<h3><a class="toc-backref" href="#id45">Context actions</a></h3> <p>You can execute a specified command on the current word near the cursor position or an available selection and this word is passed as an argument to this command. It can be used for example to open some API documentation in a browser window or open any other external program. To do this, there is an menu entry in the popup menu of the editor widget and also a keyboard shortcut(see the section called -<a class="reference" href="#keybindings">Keybindings</a>).</p> +<a class="reference internal" href="#keybindings">Keybindings</a>).</p> <p>The command can be specified in the preferences dialog and additionally for each filetype (see "context_action_cmd" in the section called -<a class="reference" href="#format">Format</a>). At executing, the filetype specific command is used if +<a class="reference internal" href="#format">Format</a>). At executing, the filetype specific command is used if available otherwise the command specified in the preferences dialog is executed.</p> <p>The passed word can be referred with the wildcard "%s" everywhere @@ -1070,10 +1070,10 @@ <p>when executing the command, the %s is substituted by the word near the cursor position or by the current selection. If the cursor is at the word "echo", a browser window will open(assumed your browser is -called firefox) and it will open the address: <a class="reference" href="http://www.php.net/echo">http://www.php.net/echo</a>.</p> +called firefox) and it will open the address: <a class="reference external" href="http://www.php.net/echo">http://www.php.net/echo</a>.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id46" id="user-definable-snippets" name="user-definable-snippets">User-definable snippets</a></h3> +<div class="section" id="user-definable-snippets"> +<h3><a class="toc-backref" href="#id46">User-definable snippets</a></h3> <p>Snippets are small strings or code constructs which can be replaced or completed to a more complex string. So you can save a lot of time by not typing often used strings and letting Geany do the work for you. @@ -1153,7 +1153,7 @@ with "Enrico Tröger". The key to start auto completion can be changed in the preferences dialog, by default it is TAB.</p> <p>Since Geany 0.15 you can also use most of the available templates wildcards -listed in <a class="reference" href="#template-wildcards">Template wildcards</a>. All wildcards which are listed as +listed in <a class="reference internal" href="#template-wildcards">Template wildcards</a>. All wildcards which are listed as <cite>available in snippets</cite> can be used. For instance to improve the above example:</p> <pre class="literal-block"> [Default] @@ -1168,14 +1168,14 @@ default characters or define it to add or remove characters to fit your needs.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id47" id="inserting-unicode-characters" name="inserting-unicode-characters">Inserting unicode characters</a></h3> +<div class="section" id="inserting-unicode-characters"> +<h3><a class="toc-backref" href="#id47">Inserting unicode characters</a></h3> <p>With GTK 2.10 and above, you can hit Ctrl-Shift-u, then still holding Ctrl-Shift, type some hex digits representing the code point for the character you want, then let go of Ctrl-Shift and hit a key such as the right arrow.</p> <p>For this to work in Geany, you'll need to first unbind Ctrl-Shift-u -in the <a class="reference" href="#keybinding-tab-in-preferences-dialog">keybinding tab in preferences dialog</a>, then restart Geany. +in the <a class="reference internal" href="#keybinding-tab-in-preferences-dialog">keybinding tab in preferences dialog</a>, then restart Geany. Note that it works slightly differently from other GTK applications, in that you'll need to continue to hold down the Ctrl and Shift keys while typing the code point hex digits.</p> @@ -1184,8 +1184,8 @@ keys conflict with other Geany keybindings.</p> </div> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id48" id="search-replace-and-go-to" name="search-replace-and-go-to">Search, replace and go to</a></h2> +<div class="section" id="search-replace-and-go-to"> +<h2><a class="toc-backref" href="#id48">Search, replace and go to</a></h2> <p>This section describes search-related commands from the Search menu and the editor window's popup menu:</p> <ul class="simple"> @@ -1198,22 +1198,22 @@ <li>Go to line</li> </ul> <p>* These items are available from the editor window's popup menu, or by -using a keyboard shortcut (see the section called <a class="reference" href="#keybindings">Keybindings</a>).</p> -<div class="section"> -<h3><a class="toc-backref" href="#id49" id="find" name="find">Find</a></h3> +using a keyboard shortcut (see the section called <a class="reference internal" href="#keybindings">Keybindings</a>).</p> +<div class="section" id="find"> +<h3><a class="toc-backref" href="#id49">Find</a></h3> <p>The Find dialog is used for finding text in one or more open documents.</p> <img alt="./images/find_dialog.png" src="./images/find_dialog.png" /> -<div class="section"> -<h4><a class="toc-backref" href="#id50" id="matching-options" name="matching-options">Matching options</a></h4> +<div class="section" id="matching-options"> +<h4><a class="toc-backref" href="#id50">Matching options</a></h4> <p>The syntax for the Use regular expressions option is shown in -<a class="reference" href="#regular-expressions">Regular expressions</a>.</p> +<a class="reference internal" href="#regular-expressions">Regular expressions</a>.</p> <p>The Use escape sequences option will transform any escaped characters into their UTF-8 equivalent. For example, \t will be transformed into a tab character. Other recognised symbols are: \\, \n, \r, \uXXXX (Unicode chararacters).</p> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id51" id="find-all" name="find-all">Find all</a></h4> +<div class="section" id="find-all"> +<h4><a class="toc-backref" href="#id51">Find all</a></h4> <p>To find all matches, click on the Find All expander. This will reveal several options:</p> <ul class="simple"> @@ -1228,8 +1228,8 @@ coloured box. These markers can be removed by selecting the Remove Markers command from the Document menu.</p> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id52" id="change-font-in-search-dialog-text-fields" name="change-font-in-search-dialog-text-fields">Change font in search dialog text fields</a></h4> +<div class="section" id="change-font-in-search-dialog-text-fields"> +<h4><a class="toc-backref" href="#id52">Change font in search dialog text fields</a></h4> <p>All search related dialogs use a Monospace for the text input fields to increase the readibility of input text. This is useful when you are typing e.g. regular expressions with spaces, periods and commas which @@ -1250,8 +1250,8 @@ for the search dialogs.</p> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id53" id="find-usage" name="find-usage">Find usage</a></h3> +<div class="section" id="find-usage"> +<h3><a class="toc-backref" href="#id53">Find usage</a></h3> <p>Find usage searches all open files. It is similar to the Find All In Session Find dialog command.</p> <p>If there is a selection, then it is used as the search text; otherwise @@ -1260,8 +1260,8 @@ click position when the popup menu is used. The search results are shown in the Messages tab of the Message Window.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id54" id="find-in-files" name="find-in-files">Find in files</a></h3> +<div class="section" id="find-in-files"> +<h3><a class="toc-backref" href="#id54">Find in files</a></h3> <p>Find in files is a more powerful version of Find usage that searches all files in a certain directory using the Grep tool. The Grep tool must be correctly set in Preferences to the path of the system's Grep @@ -1269,8 +1269,8 @@ <img alt="./images/find_in_files_dialog.png" src="./images/find_in_files_dialog.png" /> <p>The Extra options field is used to pass any additional arguments to the grep tool.</p> -<div class="section"> -<h4><a class="toc-backref" href="#id55" id="filtering-out-version-control-files" name="filtering-out-version-control-files">Filtering out version control files</a></h4> +<div class="section" id="filtering-out-version-control-files"> +<h4><a class="toc-backref" href="#id55">Filtering out version control files</a></h4> <p>When using the <em>Recurse in subfolders</em> option with a directory that's under version control, you can set the <em>Extra options</em> field to use grep's <tt class="docutils literal"><span class="pre">--exclude</span></tt> flag to filter out filenames.</p> @@ -1281,18 +1281,18 @@ <p>Example: <tt class="docutils literal"><span class="pre">--exclude-dir=.*</span> <span class="pre">--exclude-dir=CVS</span></tt></p> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id56" id="replace" name="replace">Replace</a></h3> +<div class="section" id="replace"> +<h3><a class="toc-backref" href="#id56">Replace</a></h3> <p>The Replace dialog is used for replacing text in one or more open documents.</p> <img alt="./images/replace_dialog.png" src="./images/replace_dialog.png" /> <p>The Replace dialog has the same options for matching text as the Find -dialog. See the section called <a class="reference" href="#matching-options">Matching options</a>.</p> +dialog. See the section called <a class="reference internal" href="#matching-options">Matching options</a>.</p> <p>The <em>Use regular expressions</em> option applies both to the search string and to the replacement text; for the latter back references can be -used -- see the entry for '\n' in <a class="reference" href="#regular-expressions">Regular expressions</a>.</p> -<div class="section"> -<h4><a class="toc-backref" href="#id57" id="replace-all" name="replace-all">Replace all</a></h4> +used -- see the entry for '\n' in <a class="reference internal" href="#regular-expressions">Regular expressions</a>.</p> +<div class="section" id="replace-all"> +<h4><a class="toc-backref" href="#id57">Replace all</a></h4> <p>To replace several matches, click on the <em>Replace All</em> expander. This will reveal several options:</p> <ul class="simple"> @@ -1306,8 +1306,8 @@ in the current selection of the current document.</p> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id58" id="go-to-tag-definition" name="go-to-tag-definition">Go to tag definition</a></h3> +<div class="section" id="go-to-tag-definition"> +<h3><a class="toc-backref" href="#id58">Go to tag definition</a></h3> <p>If the current word is the name of a tag definition (like a function body) and the file containing the tag definition is open, this command will switch to that file and go to the corresponding line number. The @@ -1315,18 +1315,18 @@ or the word underneath the popup menu click position when the popup menu is used.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id59" id="go-to-tag-declaration" name="go-to-tag-declaration">Go to tag declaration</a></h3> +<div class="section" id="go-to-tag-declaration"> +<h3><a class="toc-backref" href="#id59">Go to tag declaration</a></h3> <p>Like Go to tag definition, but for a forward declaration such as a function prototype or <tt class="docutils literal"><span class="pre">extern</span></tt> declaration instead of a function body.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id60" id="go-to-line" name="go-to-line">Go to line</a></h3> +<div class="section" id="go-to-line"> +<h3><a class="toc-backref" href="#id60">Go to line</a></h3> <p>Go to a particular line number in the current file.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id61" id="regular-expressions" name="regular-expressions">Regular expressions</a></h3> +<div class="section" id="regular-expressions"> +<h3><a class="toc-backref" href="#id61">Regular expressions</a></h3> <p>You can use regular expressions in the Find and Replace dialogs by selecting the Use regular expressions check box. The syntax is POSIX-like, as described in the table below.</p> @@ -1398,15 +1398,15 @@ </tr> </tbody> </table> -<div class="section"> -<h4><a class="toc-backref" href="#id62" id="partial-posix-compatibility" name="partial-posix-compatibility">Partial POSIX compatibility</a></h4> +<div class="section" id="partial-posix-compatibility"> +<h4><a class="toc-backref" href="#id62">Partial POSIX compatibility</a></h4> <p>Note that the POSIX '?' regular expression character for optional matching is not supported by the Find and Replace dialogs.</p> </div> </div> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id63" id="tags" name="tags">Tags</a></h2> +<div class="section" id="tags"> +<h2><a class="toc-backref" href="#id63">Tags</a></h2> <p>Geany has built-in functionality for generating tag information (aka "workspace tags") for supported filetypes when you open a file. You can also have Geany automatically load external tag files (aka "global @@ -1415,17 +1415,17 @@ <p>Geany uses its own tag file format, similar to what <tt class="docutils literal"><span class="pre">ctags</span></tt> uses (but is incompatible with ctags). You use Geany to generate global tags files, as described below.</p> -<div class="section"> -<h3><a class="toc-backref" href="#id64" id="workspace-tags" name="workspace-tags">Workspace tags</a></h3> +<div class="section" id="workspace-tags"> +<h3><a class="toc-backref" href="#id64">Workspace tags</a></h3> <p>Tags for each document are parsed whenever a file is loaded or saved. These are shown in the Symbol list in the Sidebar. These tags are also used for autocompletion of symbols and calltips for all documents open in the current session that have the same filetype.</p> <p>The <em>Go to Tag</em> commands can be used with all workspace tags. See -<a class="reference" href="#go-to-tag-definition">Go to tag definition</a>.</p> +<a class="reference internal" href="#go-to-tag-definition">Go to tag definition</a>.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id65" id="global-tags" name="global-tags">Global tags</a></h3> +<div class="section" id="global-tags"> +<h3><a class="toc-backref" href="#id65">Global tags</a></h3> <p>Global tags are used to provide autocompletion of symbols and calltips without having to open the corresponding source files. This is intended for library APIs, as the tags file only has to be updated when you upgrade @@ -1442,10 +1442,10 @@ name.lang_ext.tags </pre> <p><em>lang_ext</em> is one of the extensions set for the filetype associated -with the tags. See the section called <a class="reference" href="#filetype-extensions">Filetype extensions</a> for +with the tags. See the section called <a class="reference internal" href="#filetype-extensions">Filetype extensions</a> for more information.</p> -<div class="section"> -<h4><a class="toc-backref" href="#id66" id="default-global-tags-files" name="default-global-tags-files">Default global tags files</a></h4> +<div class="section" id="default-global-tags-files"> +<h4><a class="toc-backref" href="#id66">Default global tags files</a></h4> <p>For some languages, a list of global tags is loaded when the corresponding filetype is first used. Currently these are for:</p> <ul class="simple"> @@ -1456,8 +1456,8 @@ <li>LaTeX</li> </ul> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id67" id="generating-a-global-tags-file" name="generating-a-global-tags-file">Generating a global tags file</a></h4> +<div class="section" id="generating-a-global-tags-file"> +<h4><a class="toc-backref" href="#id67">Generating a global tags file</a></h4> <p><em>Filetypes support:</em></p> <p>Currently this is not yet supported for Pascal, PHP and LaTeX filetypes.</p> @@ -1468,7 +1468,7 @@ </pre> <ul class="simple"> <li>Tag File should be in the format described earlier -- see the -section called <a class="reference" href="#global-tags">Global tags</a>.</li> +section called <a class="reference internal" href="#global-tags">Global tags</a>.</li> <li>File list is a list of filenames, each with a full path (unless you are generating C/C++ tags and have set the CFLAGS environment variable appropriately).</li> @@ -1504,8 +1504,8 @@ upgrading Geany.</p> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id68" id="ignore-tags" name="ignore-tags">Ignore tags</a></h3> +<div class="section" id="ignore-tags"> +<h3><a class="toc-backref" href="#id68">Ignore tags</a></h3> <p>You can also ignore certain tags if they would lead to wrong parsing of the code. Simply create a file called "ignore.tags" in your Geany configuration directory (usually <tt class="docutils literal"><span class="pre">~/.geany/</span></tt>). Then list all tags @@ -1528,8 +1528,8 @@ Exuberant Ctags.</p> </div> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id69" id="preferences" name="preferences">Preferences</a></h2> +<div class="section" id="preferences"> +<h2><a class="toc-backref" href="#id69">Preferences</a></h2> <p>You may adjust Geany's settings using the Edit --> Preferences dialog. Any changes you make there can be applied by hitting either the Apply or the OK button. These settings will persist between Geany @@ -1540,17 +1540,17 @@ persist between Geany sessions. The settings under the Document menu, however, are only for the current document and revert to defaults when restarting Geany.</p> -<p>There are also some rarer <a class="reference" href="#hidden-preferences">Hidden preferences</a>.</p> +<p>There are also some rarer <a class="reference internal" href="#hidden-preferences">Hidden preferences</a>.</p> <div class="note"> <p class="first admonition-title">Note</p> <p class="last">In the paragraphs that follow, the text describing a dialog tab comes after the screenshot of that tab.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id70" id="general-tab-in-preferences-dialog" name="general-tab-in-preferences-dialog">General tab in preferences dialog</a></h3> +<div class="section" id="general-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id70">General tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_gen.png" src="./images/pref_dialog_gen.png" /> -<div class="section"> -<h4><a class="toc-backref" href="#id71" id="id1" name="id1">Startup</a></h4> +<div class="section" id="id1"> +<h4><a class="toc-backref" href="#id71">Startup</a></h4> <dl class="docutils"> <dt>Load files from the last session</dt> <dd>On startup, load the same files you had open the last time you @@ -1561,8 +1561,8 @@ <dd>Allow plugins to be used in Geany.</dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id72" id="shutdown" name="shutdown">Shutdown</a></h4> +<div class="section" id="shutdown"> +<h4><a class="toc-backref" href="#id72">Shutdown</a></h4> <dl class="docutils"> <dt>Save window position and geometry</dt> <dd>Save the current position and size of the main window so next time @@ -1571,8 +1571,8 @@ <dd>Have a dialog pop up to confirm that you really want to quit Geany.</dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id73" id="projects" name="projects">Projects</a></h4> +<div class="section" id="projects"> +<h4><a class="toc-backref" href="#id73">Projects</a></h4> <dl class="docutils"> <dt>Use project-based session files</dt> <dd>Save your current session when closing projects. You will be able to @@ -1586,8 +1586,8 @@ dialog. This option is just for your convenience to get a proper default path.</dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id74" id="miscellaneous" name="miscellaneous">Miscellaneous</a></h4> +<div class="section" id="miscellaneous"> +<h4><a class="toc-backref" href="#id74">Miscellaneous</a></h4> <dl class="docutils"> <dt>Beep on errors when compilation has finished</dt> <dd>Have the computer make a beeping sound when compilation of your program @@ -1604,26 +1604,26 @@ </dl> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id75" id="interface-tab-in-preferences-dialog" name="interface-tab-in-preferences-dialog">Interface tab in preferences dialog</a></h3> +<div class="section" id="interface-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id75">Interface tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_interface.png" src="./images/pref_dialog_interface.png" /> -<div class="section"> -<h4><a class="toc-backref" href="#id76" id="sidebar" name="sidebar">Sidebar</a></h4> +<div class="section" id="sidebar"> +<h4><a class="toc-backref" href="#id76">Sidebar</a></h4> <dl class="docutils"> <dt>Show symbol list</dt> <dd>Show the list of functions, variables, and other information in the current document you are editing.</dd> <dt>Show documents list</dt> <dd>Show all the documents you have open currently. This can be used to -change between documents (see <a class="reference" href="#switching-between-documents">Switching between documents</a>) and +change between documents (see <a class="reference internal" href="#switching-between-documents">Switching between documents</a>) and to perform some common operations such as saving, closing and reloading.</dd> <dt>Show full path name in documents list</dt> <dd>Show the full directory path of the files you are editing in the <em>Documents</em> list.</dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id77" id="fonts" name="fonts">Fonts</a></h4> +<div class="section" id="fonts"> +<h4><a class="toc-backref" href="#id77">Fonts</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Change the font used to display documents.</dd> @@ -1633,8 +1633,8 @@ <dd>Change the font used for the message window area.</dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id78" id="editor-tabs" name="editor-tabs">Editor tabs</a></h4> +<div class="section" id="editor-tabs"> +<h4><a class="toc-backref" href="#id78">Editor tabs</a></h4> <dl class="docutils"> <dt>Show editor tabs</dt> <dd>Show a notebook tab for all documents so you can switch between them @@ -1647,8 +1647,8 @@ right of all existing tabs.</dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id79" id="tab-positions" name="tab-positions">Tab positions</a></h4> +<div class="section" id="tab-positions"> +<h4><a class="toc-backref" href="#id79">Tab positions</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Set the positioning of the editor's notebook tabs to the right, @@ -1661,8 +1661,8 @@ right, left, top, or bottom of the message window.</dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id80" id="id2" name="id2">Miscellaneous</a></h4> +<div class="section" id="id2"> +<h4><a class="toc-backref" href="#id80">Miscellaneous</a></h4> <dl class="docutils"> <dt>Show status bar</dt> <dd>Show the status bar at the bottom of the main window. It gives information about @@ -1671,19 +1671,19 @@ </dl> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id81" id="toolbar-tab-in-preferences-dialog" name="toolbar-tab-in-preferences-dialog">Toolbar tab in preferences dialog</a></h3> +<div class="section" id="toolbar-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id81">Toolbar tab in preferences dialog</a></h3> <p>Affects the main toolbar underneath the menu bar.</p> <img alt="./images/pref_dialog_toolbar.png" src="./images/pref_dialog_toolbar.png" /> -<div class="section"> -<h4><a class="toc-backref" href="#id82" id="toolbar" name="toolbar">Toolbar</a></h4> +<div class="section" id="toolbar"> +<h4><a class="toc-backref" href="#id82">Toolbar</a></h4> <dl class="docutils"> <dt>Show Toolbar</dt> <dd>Whether to show the toolbar.</dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id83" id="items" name="items">Items</a></h4> +<div class="section" id="items"> +<h4><a class="toc-backref" href="#id83">Items</a></h4> <dl class="docutils"> <dt>Show File Operation buttons</dt> <dd>Show the buttons to open a new file, open an existing file, save a file, @@ -1716,8 +1716,8 @@ <dd>Show a button to quit geany.</dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id84" id="appearance" name="appearance">Appearance</a></h4> +<div class="section" id="appearance"> +<h4><a class="toc-backref" href="#id84">Appearance</a></h4> <dl class="docutils"> <dt>Icon Style</dt> <dd>Select the toolbar icon style to use - either icons and text, just @@ -1727,12 +1727,12 @@ </dl> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id85" id="editor-features-tab-in-preferences-dialog" name="editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a></h3> +<div class="section" id="editor-features-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id85">Editor Features tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_edit_features.png" src="./images/pref_dialog_edit_features.png" /> -<div class="section"> -<h4><a class="toc-backref" href="#id86" id="indentation-group" name="indentation-group">Indentation group</a></h4> -<p>See <a class="reference" href="#indentation">Indentation</a> for more information.</p> +<div class="section" id="indentation-group"> +<h4><a class="toc-backref" href="#id86">Indentation group</a></h4> +<p>See <a class="reference internal" href="#indentation">Indentation</a> for more information.</p> <dl class="docutils"> <dt>Type</dt> <dd><p class="first">When Geany inserts indentation, whether to use:</p> @@ -1773,7 +1773,7 @@ unindent when pressing Shift-tab. Otherwise, the tab key will insert a tab character into the document (which can be different from indentation, depending on the indent type).</p> -<div class="last note"> +<div class="note last"> <p class="first admonition-title">Note</p> <p class="last">There are also separate configurable keybindings for indent & unindent, but this pref allows the tab key to have different @@ -1782,8 +1782,8 @@ </dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id87" id="features" name="features">Features</a></h4> +<div class="section" id="features"> +<h4><a class="toc-backref" href="#id87">Features</a></h4> <dl class="docutils"> <dt>Line wrapping</dt> <dd>Show long lines wrapped around to new display lines.</dd> @@ -1814,14 +1814,14 @@ </dl> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id88" id="editor-completions-tab-in-preferences-dialog" name="editor-completions-tab-in-preferences-dialog">Editor Completions tab in preferences dialog</a></h3> +<div class="section" id="editor-completions-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id88">Editor Completions tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_edit_completions.png" src="./images/pref_dialog_edit_completions.png" /> <dl class="docutils"> <dt>Snippet Completion</dt> <dd>Whether to replace special keywords after typing Tab into a pre-defined text snippet. -See <a class="reference" href="#user-definable-snippets">User-definable snippets</a>.</dd> +See <a class="reference internal" href="#user-definable-snippets">User-definable snippets</a>.</dd> <dt>XML tag autocompletion</dt> <dd>When you open an XML tag automatically generate its completion tag.</dd> <dt>Automatic continuation multi-line comments</dt> @@ -1853,12 +1853,12 @@ <dd>The maximum number of entries to display in the auto completion list.</dd> </dl> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id89" id="editor-display-tab-in-preferences-dialog" name="editor-display-tab-in-preferences-dialog">Editor Display tab in preferences dialog</a></h3> +<div class="section" id="editor-display-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id89">Editor Display tab in preferences dialog</a></h3> <p>This is for visual elements displayed in the editor window.</p> <img alt="./images/pref_dialog_edit_display.png" src="./images/pref_dialog_edit_display.png" /> -<div class="section"> -<h4><a class="toc-backref" href="#id90" id="display" name="display">Display</a></h4> +<div class="section" id="display"> +<h4><a class="toc-backref" href="#id90">Display</a></h4> <dl class="docutils"> <dt>Show indendation guides</dt> <dd>Show vertical lines to help show how much leading indentation there @@ -1874,8 +1874,8 @@ Otherwise you can scroll one more page even if there are no real lines.</dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id91" id="long-line-marker" name="long-line-marker">Long line marker</a></h4> +<div class="section" id="long-line-marker"> +<h4><a class="toc-backref" href="#id91">Long line marker</a></h4> <p>The long line marker helps to indicate overly-long lines, or as a hint to the user for when to break the line.</p> <dl class="docutils"> @@ -1900,11 +1900,11 @@ </dl> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id92" id="files-tab-in-preferences-dialog" name="files-tab-in-preferences-dialog">Files tab in preferences dialog</a></h3> +<div class="section" id="files-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id92">Files tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_files.png" src="./images/pref_dialog_files.png" /> -<div class="section"> -<h4><a class="toc-backref" href="#id93" id="new-files" name="new-files">New files</a></h4> +<div class="section" id="new-files"> +<h4><a class="toc-backref" href="#id93">New files</a></h4> <dl class="docutils"> <dt>Open new documents from the command-line</dt> <dd>Whether to create new documents when passing filenames that don't @@ -1923,8 +1923,8 @@ On Unix-like systems, LF is default and CR is used on MAC systems.</dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id94" id="saving-files" name="saving-files">Saving files</a></h4> +<div class="section" id="saving-files"> +<h4><a class="toc-backref" href="#id94">Saving files</a></h4> <p>Perform special formatting operations when a document is saved. These can each be undone with the Undo command as usual.</p> <dl class="docutils"> @@ -1934,16 +1934,16 @@ <dd>Remove the trailing spaces on each line of the document.</dd> <dt>Replace tabs by space</dt> <dd><p class="first">Replace all tabs in the document with the equivalent number of spaces.</p> -<div class="last note"> +<div class="note last"> <p class="first admonition-title">Note</p> <p class="last">It is better to use spaces to indent than use this preference - see -<a class="reference" href="#indentation">Indentation</a>.</p> +<a class="reference internal" href="#indentation">Indentation</a>.</p> </div> </dd> </dl> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id95" id="id3" name="id3">Miscellaneous</a></h4> +<div class="section" id="id3"> +<h4><a class="toc-backref" href="#id95">Miscellaneous</a></h4> <dl class="docutils"> <dt>Recent files list length</dt> <dd>The number of files to remember in the recently used files list.</dd> @@ -1953,8 +1953,8 @@ </dl> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id96" id="search-tab-in-preferences-dialog" name="search-tab-in-preferences-dialog">Search tab in preferences dialog</a></h3> +<div class="section" id="search-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id96">Search tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_search.png" src="./images/pref_dialog_search.png" /> <dl class="docutils"> <dt>Always wrap search and hide the Find dialog</dt> @@ -1970,11 +1970,11 @@ dialog is used.</dd> </dl> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id97" id="tools-tab-in-preferences-dialog" name="tools-tab-in-preferences-dialog">Tools tab in preferences dialog</a></h3> +<div class="section" id="tools-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id97">Tools tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_tools.png" src="./images/pref_dialog_tools.png" /> -<div class="section"> -<h4><a class="toc-backref" href="#id98" id="tool-paths" name="tool-paths">Tool paths</a></h4> +<div class="section" id="tool-paths"> +<h4><a class="toc-backref" href="#id98">Tool paths</a></h4> <dl class="docutils"> <dt>Make</dt> <dd>The location of the make executable.</dd> @@ -1989,12 +1989,12 @@ <p class="first admonition-title">Note</p> <p class="last">For Windows users: at the time of writing it is recommended to use the grep.exe from the UnxUtils project -(<a class="reference" href="http://sourceforge.net/projects/unxutils">http://sourceforge.net/projects/unxutils</a>). The grep.exe from the +(<a class="reference external" href="http://sourceforge.net/projects/unxutils">http://sourceforge.net/projects/unxutils</a>). The grep.exe from the Mingw project for instance might not work with Geany at the moment.</p> </div> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id99" id="commands" name="commands">Commands</a></h4> +<div class="section" id="commands"> +<h4><a class="toc-backref" href="#id99">Commands</a></h4> <dl class="docutils"> <dt>Context action</dt> <dd>Set this to a command to execute on the current word. @@ -2003,8 +2003,8 @@ </dl> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id100" id="template-tab-in-preferences-dialog" name="template-tab-in-preferences-dialog">Template tab in preferences dialog</a></h3> +<div class="section" id="template-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id100">Template tab in preferences dialog</a></h3> <p>This data is used as metadata for various template text to insert into a document, such as the file header. You only need to set fields that you want to use in your template files.</p> @@ -2013,8 +2013,8 @@ <p class="last">For changes made here to take effect a restart of geany is required.</p> </div> <img alt="./images/pref_dialog_templ.png" src="./images/pref_dialog_templ.png" /> -<div class="section"> -<h4><a class="toc-backref" href="#id101" id="template-data" name="template-data">Template data</a></h4> +<div class="section" id="template-data"> +<h4><a class="toc-backref" href="#id101">Template data</a></h4> <dl class="docutils"> <dt>Developer</dt> <dd>The name of the developer who will be creating files.</dd> @@ -2022,7 +2022,7 @@ <dd>The initials of the developer.</dd> <dt>Mail address</dt> <dd><p class="first">The email address of the developer.</p> -<div class="last note"> +<div class="note last"> <p class="first admonition-title">Note</p> <p class="last">You may wish to add anti-spam markup, e.g. <tt class="docutils literal"><span class="pre">name<at>site<dot>ext</span></tt>.</p> </div> @@ -2034,30 +2034,30 @@ <dt>Year</dt> <dd>Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function. For details please see -<a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +<a class="reference external" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> <dt>Date</dt> <dd>Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function. For details please see -<a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +<a class="reference external" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> <dt>Date & Time</dt> <dd>Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function. For details please see -<a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +<a class="reference external" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> </dl> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id102" id="keybinding-tab-in-preferences-dialog" name="keybinding-tab-in-preferences-dialog">Keybinding tab in preferences dialog</a></h3> +<div class="section" id="keybinding-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id102">Keybinding tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_keys.png" src="./images/pref_dialog_keys.png" /> <p>There are some handy commands in here that are not, by default, bound to a key combination, and may not be available as a menu item.</p> <div class="note"> <p class="first admonition-title">Note</p> -<p class="last">For more information see the section called <a class="reference" href="#keybindings">Keybindings</a>.</p> +<p class="last">For more information see the section called <a class="reference internal" href="#keybindings">Keybindings</a>.</p> </div> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id103" id="printing-tab-in-preferences-dialog" name="printing-tab-in-preferences-dialog">Printing tab in preferences dialog</a></h3> +<div class="section" id="printing-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id103">Printing tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_printing.png" src="./images/pref_dialog_printing.png" /> <dl class="docutils"> <dt>Use external command for printing</dt> @@ -2075,15 +2075,15 @@ <dt>Date format</dt> <dd>How the date should be printed. You can use the same format specifiers as in the ANSI C function strftime(). For details please -see <a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +see <a class="reference external" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> </dl> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id104" id="vte-tab-in-preferences-dialog" name="vte-tab-in-preferences-dialog">VTE tab in preferences dialog</a></h3> -<p>See also: <a class="reference" href="#virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a>.</p> +<div class="section" id="vte-tab-in-preferences-dialog"> +<h3><a class="toc-backref" href="#id104">VTE tab in preferences dialog</a></h3> +<p>See also: <a class="reference internal" href="#virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a>.</p> <img alt="./images/pref_dialog_vte.png" src="./images/pref_dialog_vte.png" /> -<div class="section"> -<h4><a class="toc-backref" href="#id105" id="terminal-widget" name="terminal-widget">Terminal widget</a></h4> +<div class="section" id="terminal-widget"> +<h4><a class="toc-backref" href="#id105">Terminal widget</a></h4> <dl class="docutils"> <dt>Terminal font</dt> <dd>Select the font that will be used in the terminal emulation control.</dd> @@ -2123,8 +2123,8 @@ </div> </div> </div> -<div class="section"> -<h2><a class="toc-backref" href="#id106" id="project-management" name="project-management">Project Management</a></h2> +<div class="section" id="project-management"> +<h2><a class="toc-backref" href="#id106">Project Management</a></h2> <p>Project Management is optional in Geany. Currently it can be used for:</p> <ul class="simple"> <li>Storing and opening session files on a project basis.</li> @@ -2133,7 +2133,7 @@ </ul> <p>A list of session files can be stored and opened with the project when the <em>Use project-based session files</em> preference is enabled, -in the <em>Project</em> group of the <a class="reference" href="#preferences">Preferences</a> dialog.</p> +in the <em>Project</em> group of the <a class="reference internal" href="#preferences">Preferences</a> dialog.</p> <p>As long as a project is open, the Make and Run commands will use the project's settings, instead of the defaults. These will be used whichever document is currently displayed.</p> @@ -2141,8 +2141,8 @@ Geany is shutdown. When restarting Geany, the previously opened project file that was in use at the end of the last session will be reopened.</p> <p>Below are the commands used to create, modify, open and close projects.</p> -<div class="section"> -<h3><a class="toc-backref" href="#id107" id="new-project" name="new-project">New Project</a></h3> +<div class="section" id="new-project"> +<h3><a class="toc-backref" href="#id107">New Project</a></h3> <p>To create a new project, fill in the <em>Name</em> field. By default this will setup a new project file <tt class="docutils literal"><span class="pre">~/projects/name.geany</span></tt>. Usually it's best to store all your project files in the same directory (they are @@ -2151,8 +2151,8 @@ can safely be set to any existing path -- it will not touch the file structure contained in it.</p> </div> -<div class="section"> -<h3><a class="toc-backref" href="#id108" id="project-properties" name="project-properties">Project Properties</a></h3> +<div class="section" id="project-properties"> +<h3><a class="toc-backref" href="#id108">Project Properties</a></h3> <p>You can set an optional description for the project, but it is not used elsewhere by Geany.</p> <p>The <em>Base path</em> field is used as the directory to run the Make and Make @@ -2160,14 +2160,14 @@ specific <em>Run command</em>. The specified path can be an absolute path or relative to the project's file name.</p> -<div class="section"> -<h4><a class="toc-backref" href="#id109" id="make-in-base-path" name="make-in-base-path">Make in base path</a></h4> +<div class="section" id="make-in-base-path"> +<h4><a class="toc-backref" href="#id109">Make in base path</a></h4> <p>This setting makes the <em>Build->Make</em> command use the project's base path. Uncheck this if you want to use the current file's directory instead.</p> </div> -<div class="section"> -<h4><a class="toc-backref" href="#id110" id="run-command" name="run-command">Run command</a></h4> +<div class="section" id="run-command"> +<h4><a class="toc-backref" href="#id110">Run command</a></h4> <p>The <em>Run command</em> overrides the default run command. You can set this to the executable or main script file for the project, and append any command-line arguments.</p> @@ -2176,26 +2176,26 @@ <li>%f -- complete filename without path</li> @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3201] trunk
by ntrel＠users.sourceforge.net 10 Nov '08

10 Nov '08

Revision: 3201 http://geany.svn.sourceforge.net/geany/?rev=3201&view=rev Author: ntrel Date: 2008-11-10 17:31:45 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Make Python symbol tree method icon look more like a function than variable. Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-10 17:16:35 UTC (rev 3200) +++ trunk/ChangeLog 2008-11-10 17:31:45 UTC (rev 3201) @@ -22,6 +22,9 @@ Group Conf symbol list tags by section. * src/symbols.c: Add icons for Conf symbol tree items. + * src/symbols.c: + Make Python symbol tree method icon look more like a function than + variable. 2008-11-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-11-10 17:16:35 UTC (rev 3200) +++ trunk/src/symbols.c 2008-11-10 17:31:45 UTC (rev 3201) @@ -667,7 +667,7 @@ { tag_list_add_groups(tag_store, &(tv_iters.tag_class), _("Classes"), "classviewer-class", - &(tv_iters.tag_member), _("Methods"), "classviewer-member", + &(tv_iters.tag_member), _("Methods"), "classviewer-macro", &(tv_iters.tag_function), _("Functions"), "classviewer-method", &(tv_iters.tag_variable), _("Variables"), "classviewer-var", NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3200] trunk
by ntrel＠users.sourceforge.net 10 Nov '08

10 Nov '08

Revision: 3200 http://geany.svn.sourceforge.net/geany/?rev=3200&view=rev Author: ntrel Date: 2008-11-10 17:16:35 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Add icons for Conf symbol tree items. Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-10 17:03:11 UTC (rev 3199) +++ trunk/ChangeLog 2008-11-10 17:16:35 UTC (rev 3200) @@ -20,6 +20,8 @@ Use TMTag pointer tree model column instead of line number. * tagmanager/conf.c: Group Conf symbol list tags by section. + * src/symbols.c: + Add icons for Conf symbol tree items. 2008-11-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-11-10 17:03:11 UTC (rev 3199) +++ trunk/src/symbols.c 2008-11-10 17:16:35 UTC (rev 3200) @@ -567,8 +567,8 @@ break; case GEANY_FILETYPES_CONF: tag_list_add_groups(tag_store, - &tv_iters.tag_namespace, _("Sections"), NULL, - &tv_iters.tag_macro, _("Keys"), NULL, + &tv_iters.tag_namespace, _("Sections"), "classviewer-other", + &tv_iters.tag_macro, _("Keys"), "classviewer-var", NULL); break; case GEANY_FILETYPES_LATEX: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3199] trunk
by ntrel＠users.sourceforge.net 10 Nov '08

10 Nov '08

Revision: 3199 http://geany.svn.sourceforge.net/geany/?rev=3199&view=rev Author: ntrel Date: 2008-11-10 17:03:11 +0000 (Mon, 10 Nov 2008) Log Message: ----------- Group Conf symbol list tags by section. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/conf.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-10 16:58:33 UTC (rev 3198) +++ trunk/ChangeLog 2008-11-10 17:03:11 UTC (rev 3199) @@ -18,6 +18,8 @@ Free tag list straight after use, instead of next time the list is generated. Use TMTag pointer tree model column instead of line number. + * tagmanager/conf.c: + Group Conf symbol list tags by section. 2008-11-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/tagmanager/conf.c =================================================================== --- trunk/tagmanager/conf.c 2008-11-10 16:58:33 UTC (rev 3198) +++ trunk/tagmanager/conf.c 2008-11-10 17:03:11 UTC (rev 3199) @@ -23,8 +23,8 @@ * DATA DEFINITIONS */ typedef enum { - K_NAMESPACE, - K_MACRO + K_SECTION, + K_KEY } confKind; static kindOption ConfKinds [] = { @@ -45,6 +45,7 @@ static void findConfTags (void) { vString *name = vStringNew (); + vString *scope = vStringNew (); const unsigned char *line; while ((line = fileReadLine ()) != NULL) @@ -67,7 +68,10 @@ ++cp; } vStringTerminate (name); - makeSimpleTag (name, ConfKinds, K_NAMESPACE); + makeSimpleTag (name, ConfKinds, K_SECTION); + /* remember section name */ + vStringCopy (scope, name); + vStringTerminate (scope); vStringClear (name); continue; } @@ -86,7 +90,13 @@ while (isspace ((int) *cp)) ++cp; if (*cp == '=') - makeSimpleTag (name, ConfKinds, K_MACRO); + { + if (vStringLength (scope) > 0) + makeSimpleScopedTag (name, ConfKinds, K_KEY, + "section", vStringValue(scope), NULL); + else + makeSimpleTag (name, ConfKinds, K_KEY); + } vStringClear (name); } else if (isspace ((int) *cp)) @@ -99,6 +109,7 @@ } } vStringDelete (name); + vStringDelete (scope); } extern parserDefinition* ConfParser (void) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
7
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2008