Revision: 5894
http://geany.svn.sourceforge.net/geany/?rev=5894&view=rev
Author: colombanw
Date: 2011-08-19 22:15:59 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
Fix tags for one-letter Haskell symbols
The tokens were not properly terminated when they were 1 character long,
leading them to contain parts of the previous token.
Closes #3289160.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tagmanager/haskell.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-08-19 13:12:53 UTC (rev 5893)
+++ trunk/ChangeLog 2011-08-19 22:15:59 UTC (rev 5894)
@@ -1,3 +1,9 @@
+2011-08-20 Colomban Wendling <colomban(at)geany(dot)org>
+
+ * tagmanager/haskell.c:
+ Fix tags for one-letter Haskell symbols (closes #3289160).
+
+
2011-08-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* doc/plugins.dox:
Modified: trunk/tagmanager/haskell.c
===================================================================
--- trunk/tagmanager/haskell.c 2011-08-19 13:12:53 UTC (rev 5893)
+++ trunk/tagmanager/haskell.c 2011-08-19 22:15:59 UTC (rev 5894)
@@ -122,10 +122,10 @@
i++;
c = fileGetc();
}
+ token[i] = '\0';
if (c == EOF)
return 0;
if (i != n) {
- token[i] = '\0';
fileUngetc(c);
return 1;
} else {
@@ -283,7 +283,6 @@
}
}
token[0] = c;
- token[1] = '\0';
if (!isident(c)) {
skip_rest_of_line();
c = get_next_char();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5892
http://geany.svn.sourceforge.net/geany/?rev=5892&view=rev
Author: frlan
Date: 2011-08-19 10:07:26 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
Extend list of primary keywords for Cython.
Patch by Alexander Ebersp?\195?\164cher. Thanks.
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/filetypes.Cython.conf
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-08-19 06:55:34 UTC (rev 5891)
+++ trunk/ChangeLog 2011-08-19 10:07:26 UTC (rev 5892)
@@ -3,6 +3,8 @@
* doc/plugins.dox:
Update of wording to fix some grammatical issues etc. on plugin howto.
Patch provided by Matthew Brush. Thanks.
+ * data/filetype_extensions.conf:
+ Extend list of primary keywords. Patch by Alexander Eberspächer. Thanks.
2011-08-19 Colomban Wendling <colomban(at)geany(dot)org>
Modified: trunk/data/filetypes.Cython.conf
===================================================================
--- trunk/data/filetypes.Cython.conf 2011-08-19 06:55:34 UTC (rev 5891)
+++ trunk/data/filetypes.Cython.conf 2011-08-19 10:07:26 UTC (rev 5892)
@@ -1,7 +1,7 @@
[styling=Python]
[keywords]
-primary=and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True api by cdef cimport cpdef ctypedef enum extern gil include inline nogil property public readonly struct union DEF IF ELIF ELSE NULL bint char Py_ssize_t short size_t void
+primary=and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True api by cdef cimport cpdef ctypedef enum extern gil include inline nogil property public readonly struct union DEF IF ELIF ELSE NULL bint char Py_ssize_t short size_t void double int real long complex
identifiers=ArithmeticError AssertionError AttributeError BaseException BufferError BytesWarning DeprecationWarning EOFError Ellipsis EnvironmentError Exception False FloatingPointError FutureWarning GeneratorExit IOError ImportError ImportWarning IndentationError IndexError KeyError KeyboardInterrupt LookupError MemoryError NameError None NotImplemented NotImplementedError OSError OverflowError PendingDeprecationWarning ReferenceError RuntimeError RuntimeWarning StandardError StopIteration SyntaxError SyntaxWarning SystemError SystemExit TabError True TypeError UnboundLocalError UnicodeDecodeError UnicodeEncodeError UnicodeError UnicodeTranslateError UnicodeWarning UserWarning ValueError Warning ZeroDivisionError __debug__ __doc__ __import__ __name__ __package__ abs all any apply basestring bin bool buffer bytearray bytes callable chr classmethod cmp coerce compile complex copyright credits delattr dict dir divmod enumerate eval execfile exit file filter float format frozenset getattr globals hasattr hash help hex id input int intern isinstance issubclass iter len license list locals long map max min next object oct open ord pow print property quit range raw_input reduce reload repr reversed round set setattr slice sorted staticmethod str sum super tuple type unichr unicode vars xrange zip
[settings]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5891
http://geany.svn.sourceforge.net/geany/?rev=5891&view=rev
Author: frlan
Date: 2011-08-19 06:55:34 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
Update of wording to fix some grammatical issues etc. on plugin howto.
Patch provided by Matthew Brush. Thanks.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/plugins.dox
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-08-19 00:07:41 UTC (rev 5890)
+++ trunk/ChangeLog 2011-08-19 06:55:34 UTC (rev 5891)
@@ -1,3 +1,10 @@
+2011-08-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * doc/plugins.dox:
+ Update of wording to fix some grammatical issues etc. on plugin howto.
+ Patch provided by Matthew Brush. Thanks.
+
+
2011-08-19 Colomban Wendling <colomban(at)geany(dot)org>
* data/filetype_extensions.conf, data/filetypes.Cython.conf,
Modified: trunk/doc/plugins.dox
===================================================================
--- trunk/doc/plugins.dox 2011-08-19 00:07:41 UTC (rev 5890)
+++ trunk/doc/plugins.dox 2011-08-19 06:55:34 UTC (rev 5891)
@@ -194,7 +194,7 @@
* @a plugindata.h contains the biggest part of the plugin API and provides some basic macros.
* @a geanyfunctions.h provides some macros for convenient access to plugin API functions.
*
- * The you should define three basic variables which will give access to data fields and
+ * Then you should define three basic variables which will give access to data fields and
* functions provided by the plugin API.
* @code
GeanyPlugin *geany_plugin;
@@ -215,7 +215,7 @@
* For the next step, you will need to tell Geany some basic information about your plugin
* which will be shown in the plugin manager dialog.
*
- * For doing this, you should use PLUGIN_SET_INFO() which expects 4 values:
+ * To do this you should use the PLUGIN_SET_INFO() macro, which expects 4 parameters:
* - Plugin name
* - Short description
* - Version
@@ -231,7 +231,8 @@
* plugin is loaded. Part of that function could be adding and removing of an item to
* Geany's Tools menu, setting up keybindings or registering some callbacks. Also you will
* need to implement the function that is called when your plugin is unloaded.
- * These functions are called plugin_init() and plugin_cleanup(). Let's see how it could look like:
+ * These functions are called plugin_init() and plugin_cleanup(). Let's see what this
+ * looks like:
* @code
PLUGIN_VERSION_CHECK(211)
@@ -384,18 +385,18 @@
* @section furtherimprovements Furter Improvements and next steps
* @subsection translatable_plugin_information Translatable plugin information
*
- * After we have done our first plugin, there is still some place for improvements.
+ * After having written our first plugin, there is still room for improvement.
*
- * Per default PLUGIN_SET_INFO() is not allowing to translate the basic plugin
- * information for a plugin which is not shipped with Geany's core distribution.
- * In most cases, a plugin is shipped as a standalone and so it might make sense
- * to enable translation on loading time so it is localized also inside plugin manager.
- * With Geany 0.19 the plugin API is shipping the PLUGIN_SET_TRANSLATABLE_INFO()
- * macro which is enabling translation of the basic plugin details already on
- * loading time.
+ * By default, PLUGIN_SET_INFO() does not allow translation of the basic plugin
+ * information for plugins which are not shipped with Geany's core distribution.
+ * Since most plugins are not shipped with Geany's core, it makes sense to
+ * enable translation when the plugin is loaded so that it gets translated
+ * inside Geany's Plugin Manager. As of Geany 0.19, the plugin API contains
+ * the PLUGIN_SET_TRANSLATABLE_INFO() macro which enables translation of the
+ * basic plugin details passed to PLUGIN_SET_INFO() when the plugin is loaded.
*
- * PLUGIN_SET_TRANSLATABLE_INFO() is taking in difference to
- * PLUGIN_SET_INFO() two more parameters, which it makes to take 6 parameters.
+ * PLUGIN_SET_TRANSLATABLE_INFO() takes two more parameters than PLUGIN_SET_INFO(),
+ * for a total of six parameters.
*
* - Localedir
* - Gettextpackage
@@ -404,41 +405,40 @@
* - Version
* - Author
*
- * Localdir and the gettext package shall be set inside the build system.
- * If this has been done, the call for above mentioned HelloWorld-world
+ * The @a Localdir and the @a Gettextpackage parameters are usually set inside
+ * the build system. If this has been done, the call for example HelloWorld
* plugin could look like:
*
* @code
-
PLUGIN_SET_TRANSLATABLE_INFO(
LOCALEDIR, GETTEXT_PACKAGE, _("Hello World"),
_("Just another tool to say hello world"),
"1.0", "John Doe <john.doe(a)example.org>");
* @endcode
*
- * When using the macro, you should use the gettext macro _() to mark
+ * When using this macro, you should use the gettext macro @a _() to mark
* the strings like name and the short description as translatable as well. You
- * can see the usage inside the little example listed above.
+ * can see how this is done in the above example.
*
- * As you can see the author's informations are not marked translatable inside
- * this little example. This has been discussed onto mailing list where it has
- * been agreed to use if possible latin version of author's name
- * followed by in case of its apply able nativ spelling inside braces.
+ * As you can see the author's information is not marked as translatable in
+ * this example. The community has agreed that the best practice here is to
+ * use, if possible, the latin version of the author's name followed by the
+ * native spelling inside parenthesis, where applicable.
*
* @subsection plugin_i18n Using i18n/l10n inside Plugin
*
- * Not only the meta information of a plugin shall be translateable,
- * but also the text like menu entries, information boxes or strings
- * inside configuration dialog should be translateable too. Geany is
- * offering a way to enable this from code point of view by using a
- * function provided by the Geany API -- main_locale_init().
-
- * The function is taking over two parameters LOCALEDIR and
- * GETTEXT_PACKAGE which we already know from previous sesction.
-
- * As the function is called best on plugin initialization, it should be
- * placed into plugin_init() so the hello world example could look like:
+ * You can (and should) also mark other strings beside the plugin's meta
+ * information as translatable. Strings used in menu entries, information
+ * boxes or configuration dialogs should also be translatable as well. Geany
+ * offers a way to enable this in the plugin's code using the main_locale_init()
+ * function provided by the plugin API. This function takes the same two
+ * parameters discussed in the previous section; @a GETTEXT_PACKAGE and
+ * @a LOCALEDIR.
+ *
+ * The main_locale_init() function is best called during initialization in the
+ * plugin's plugin_init() function. Adding this to the HelloWorld example could
+ * look like:
* @code
void plugin_init(GeanyData *data)
{
@@ -452,6 +452,7 @@
}
* @endcode
*
- * If you already did use PLUGIN_SET_TRANSLATABLE_INFO() you don't need
- * to add main_locale_init() as it has already been called.
+ * @note If you've previously called the PLUGIN_SET_TRANSLATABLE_INFO() you do not
+ * need to call main_locale_init() yourself, as this has been already been
+ * done for you.
**/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5889
http://geany.svn.sourceforge.net/geany/?rev=5889&view=rev
Author: colombanw
Date: 2011-08-18 23:01:45 +0000 (Thu, 18 Aug 2011)
Log Message:
-----------
Add Cython filetype
Patch by Matthew Brush, thanks.
Also remove the Cython keywords from Python filetype.
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/filetype_extensions.conf
trunk/data/filetypes.python
Added Paths:
-----------
trunk/data/filetypes.Cython.conf
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-08-15 19:26:36 UTC (rev 5888)
+++ trunk/ChangeLog 2011-08-18 23:01:45 UTC (rev 5889)
@@ -1,3 +1,10 @@
+2011-08-19 Colomban Wendling <colomban(at)geany(dot)org>
+
+ * data/filetype_extensions.conf, data/filetypes.Cython.conf,
+ data/filetypes.python:
+ Add Cython filetype (patch by Matthew Brush, thanks).
+
+
2011-08-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* doc/plugins.dox:
Modified: trunk/data/filetype_extensions.conf
===================================================================
--- trunk/data/filetype_extensions.conf 2011-08-15 19:26:36 UTC (rev 5888)
+++ trunk/data/filetype_extensions.conf 2011-08-18 23:01:45 UTC (rev 5889)
@@ -14,6 +14,7 @@
COBOL=*.cob;*.cpy;*.cbl;*.cobol;
Conf=*.conf;*.ini;config;*rc;*.cfg;*.desktop;
CSS=*.css;
+Cython=*.pyx;*.pxd;*.pxi;
D=*.d;*.di;
Diff=*.diff;*.patch;*.rej;
Docbook=*.docbook;
@@ -59,7 +60,7 @@
# Note: restarting is required after editing groups
[Groups]
-Programming=Genie;Scala;
+Programming=Cython;Genie;Scala;
Script=
Markup=
Misc=
Added: trunk/data/filetypes.Cython.conf
===================================================================
--- trunk/data/filetypes.Cython.conf (rev 0)
+++ trunk/data/filetypes.Cython.conf 2011-08-18 23:01:45 UTC (rev 5889)
@@ -0,0 +1,16 @@
+[styling=Python]
+
+[keywords]
+primary=and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True api by cdef cimport cpdef ctypedef enum extern gil include inline nogil property public readonly struct union DEF IF ELIF ELSE NULL bint char Py_ssize_t short size_t void
+identifiers=ArithmeticError AssertionError AttributeError BaseException BufferError BytesWarning DeprecationWarning EOFError Ellipsis EnvironmentError Exception False FloatingPointError FutureWarning GeneratorExit IOError ImportError ImportWarning IndentationError IndexError KeyError KeyboardInterrupt LookupError MemoryError NameError None NotImplemented NotImplementedError OSError OverflowError PendingDeprecationWarning ReferenceError RuntimeError RuntimeWarning StandardError StopIteration SyntaxError SyntaxWarning SystemError SystemExit TabError True TypeError UnboundLocalError UnicodeDecodeError UnicodeEncodeError UnicodeError UnicodeTranslateError UnicodeWarning UserWarning ValueError Warning ZeroDivisionError __debug__ __doc__ __import__ __name__ __package__ abs all any apply basestring bin bool buffer bytearray bytes callable chr classmethod cmp coerce compile complex copyright credits delattr dict dir divmod enumerate eval execfile exit file filter float format frozenset getattr globals hasattr hash help hex id input int intern isinstance issubclass iter len license list locals long map max min next object oct open ord pow print property quit range raw_input reduce reload repr reversed round set setattr slice sorted staticmethod str sum super tuple type unichr unicode vars xrange zip
+
+[settings]
+lexer_filetype=Python
+tag_parser=Python
+extension=pyx
+comment_single=#
+
+[build-menu]
+FT_00_LB=_Compile
+FT_00_CM=cython "%f"
+FT_00_WD=
Modified: trunk/data/filetypes.python
===================================================================
--- trunk/data/filetypes.python 2011-08-15 19:26:36 UTC (rev 5888)
+++ trunk/data/filetypes.python 2011-08-18 23:01:45 UTC (rev 5889)
@@ -21,7 +21,7 @@
[keywords]
# all items must be in one line
-primary=and as assert break cdef cimport class continue cpdef def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True
+primary=and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True
# additional keywords, will be highlighted with style "word2"
# these are the builtins for Python 2.5 created with ' '.join(dir(__builtins__))
identifiers=ArithmeticError AssertionError AttributeError BaseException BufferError BytesWarning DeprecationWarning EOFError Ellipsis EnvironmentError Exception False FloatingPointError FutureWarning GeneratorExit IOError ImportError ImportWarning IndentationError IndexError KeyError KeyboardInterrupt LookupError MemoryError NameError None NotImplemented NotImplementedError OSError OverflowError PendingDeprecationWarning ReferenceError RuntimeError RuntimeWarning StandardError StopIteration SyntaxError SyntaxWarning SystemError SystemExit TabError True TypeError UnboundLocalError UnicodeDecodeError UnicodeEncodeError UnicodeError UnicodeTranslateError UnicodeWarning UserWarning ValueError Warning ZeroDivisionError __debug__ __doc__ __import__ __name__ __package__ abs all any apply basestring bin bool buffer bytearray bytes callable chr classmethod cmp coerce compile complex copyright credits delattr dict dir divmod enumerate eval execfile exit file filter float format frozenset getattr globals hasattr hash help hex id input int intern isinstance issubclass iter len license list locals long map max min next object oct open ord pow print property quit range raw_input reduce reload repr reversed round set setattr slice sorted staticmethod str sum super tuple type unichr unicode vars xrange zip
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5888
http://geany.svn.sourceforge.net/geany/?rev=5888&view=rev
Author: frlan
Date: 2011-08-15 19:26:36 +0000 (Mon, 15 Aug 2011)
Log Message:
-----------
Update API version used inside plugin howto to a more recent version (API v211).
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/plugins.dox
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-08-13 20:44:39 UTC (rev 5887)
+++ trunk/ChangeLog 2011-08-15 19:26:36 UTC (rev 5888)
@@ -1,3 +1,10 @@
+2011-08-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+
+ * doc/plugins.dox:
+ Update API version used inside plugin howto to a more recent version
+ (API v211).
+
+
2011-08-13 Colomban Wendling <colomban(at)geany(dot)org>
* src/msgwindow.c, src/msgwindow.h, src/ui_utils.c, src/ui_utils.h:
Modified: trunk/doc/plugins.dox
===================================================================
--- trunk/doc/plugins.dox 2011-08-13 20:44:39 UTC (rev 5887)
+++ trunk/doc/plugins.dox 2011-08-15 19:26:36 UTC (rev 5888)
@@ -233,7 +233,7 @@
* need to implement the function that is called when your plugin is unloaded.
* These functions are called plugin_init() and plugin_cleanup(). Let's see how it could look like:
* @code
-PLUGIN_VERSION_CHECK(147)
+PLUGIN_VERSION_CHECK(211)
PLUGIN_SET_INFO("HelloWorld", "Just another tool to say hello world",
"1.0", "Joe Doe <joe.doe(a)example.org>");
@@ -348,7 +348,7 @@
GeanyData *geany_data;
GeanyFunctions *geany_functions;
-PLUGIN_VERSION_CHECK(147)
+PLUGIN_VERSION_CHECK(211)
PLUGIN_SET_INFO("HelloWorld", "Just another tool to say hello world",
"1.0", "John Doe <john.doe(a)example.org>");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.