SF.net SVN: geany-plugins:[1888] trunk/geany-plugins

frlan at users.sourceforge.net frlan at xxxxx
Sat Jan 29 14:19:47 UTC 2011


Revision: 1888
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1888&view=rev
Author:   frlan
Date:     2011-01-29 14:19:47 +0000 (Sat, 29 Jan 2011)

Log Message:
-----------
Renamed HTMLTable to Tableconvert

Modified Paths:
--------------
    trunk/geany-plugins/Makefile.am
    trunk/geany-plugins/configure.ac
    trunk/geany-plugins/po/POTFILES.in

Added Paths:
-----------
    trunk/geany-plugins/build/tableconvert.m4
    trunk/geany-plugins/tableconvert/
    trunk/geany-plugins/tableconvert/AUTHORS
    trunk/geany-plugins/tableconvert/COPYING
    trunk/geany-plugins/tableconvert/ChangeLog
    trunk/geany-plugins/tableconvert/Makefile.am
    trunk/geany-plugins/tableconvert/NEWS
    trunk/geany-plugins/tableconvert/README
    trunk/geany-plugins/tableconvert/src/
    trunk/geany-plugins/tableconvert/src/Makefile.am
    trunk/geany-plugins/tableconvert/src/tableconvert.c
    trunk/geany-plugins/tableconvert/wscript_build

Removed Paths:
-------------
    trunk/geany-plugins/build/htmltable.m4
    trunk/geany-plugins/htmltable/AUTHORS
    trunk/geany-plugins/htmltable/COPYING
    trunk/geany-plugins/htmltable/ChangeLog
    trunk/geany-plugins/htmltable/Makefile.am
    trunk/geany-plugins/htmltable/NEWS
    trunk/geany-plugins/htmltable/README
    trunk/geany-plugins/htmltable/src/Makefile.am
    trunk/geany-plugins/htmltable/src/htmltable.c
    trunk/geany-plugins/htmltable/wscript_build

Modified: trunk/geany-plugins/Makefile.am
===================================================================
--- trunk/geany-plugins/Makefile.am	2011-01-29 13:43:08 UTC (rev 1887)
+++ trunk/geany-plugins/Makefile.am	2011-01-29 14:19:47 UTC (rev 1888)
@@ -13,10 +13,10 @@
 	geanyprj \
 	geanysendmail \
 	geanyvc \
-	htmltable \
 	pretty-printer \
 	shiftcolumn \
 	spellcheck \
+	tableconvert \
 	treebrowser \
 	updatechecker \
 	webhelper

Deleted: trunk/geany-plugins/build/htmltable.m4
===================================================================
--- trunk/geany-plugins/build/htmltable.m4	2011-01-29 13:43:08 UTC (rev 1887)
+++ trunk/geany-plugins/build/htmltable.m4	2011-01-29 14:19:47 UTC (rev 1888)
@@ -1,9 +0,0 @@
-AC_DEFUN([GP_CHECK_HTMLTABLE],
-[
-    GP_ARG_DISABLE([HTMLTable], [yes])
-    GP_STATUS_PLUGIN_ADD([HTMLTable], [$enable_htmltable])
-    AC_CONFIG_FILES([
-        htmltable/Makefile
-        htmltable/src/Makefile
-    ])
-])

Added: trunk/geany-plugins/build/tableconvert.m4
===================================================================
--- trunk/geany-plugins/build/tableconvert.m4	                        (rev 0)
+++ trunk/geany-plugins/build/tableconvert.m4	2011-01-29 14:19:47 UTC (rev 1888)
@@ -0,0 +1,9 @@
+AC_DEFUN([GP_CHECK_TABLECONVERT],
+[
+    GP_ARG_DISABLE([Tableconvert], [yes])
+    GP_STATUS_PLUGIN_ADD([Tableconvert], [$enable_tableconvert])
+    AC_CONFIG_FILES([
+        tableconvert/Makefile
+        tableconvert/src/Makefile
+    ])
+])

Modified: trunk/geany-plugins/configure.ac
===================================================================
--- trunk/geany-plugins/configure.ac	2011-01-29 13:43:08 UTC (rev 1887)
+++ trunk/geany-plugins/configure.ac	2011-01-29 14:19:47 UTC (rev 1888)
@@ -36,11 +36,11 @@
 GP_CHECK_GEANYPRJ
 GP_CHECK_GEANYSENDMAIL
 GP_CHECK_GEANYVC
-GP_CHECK_HTMLTABLE
 GP_CHECK_PRETTYPRINTER
 GP_CHECK_SHIFTCOLUMN
 GP_CHECK_SPELLCHECK
 GP_CHECK_TREEBROWSER
+GP_CHECK_TABLECONVERT
 GP_CHECK_UPDATECHECKER
 GP_CHECK_WEBHELPER
 

Deleted: trunk/geany-plugins/htmltable/AUTHORS
===================================================================
--- trunk/geany-plugins/htmltable/AUTHORS	2011-01-29 13:43:08 UTC (rev 1887)
+++ trunk/geany-plugins/htmltable/AUTHORS	2011-01-29 14:19:47 UTC (rev 1888)
@@ -1 +0,0 @@
-Frank Lanitz <frank(at)frank(dot)uvena(dot)de>

Deleted: trunk/geany-plugins/htmltable/COPYING
===================================================================
--- trunk/geany-plugins/htmltable/COPYING	2011-01-29 13:43:08 UTC (rev 1887)
+++ trunk/geany-plugins/htmltable/COPYING	2011-01-29 14:19:47 UTC (rev 1888)
@@ -1,340 +0,0 @@
-            GNU GENERAL PUBLIC LICENSE
-               Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-            GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-             END OF TERMS AND CONDITIONS
-
-        How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

Deleted: trunk/geany-plugins/htmltable/ChangeLog
===================================================================
--- trunk/geany-plugins/htmltable/ChangeLog	2011-01-29 13:43:08 UTC (rev 1887)
+++ trunk/geany-plugins/htmltable/ChangeLog	2011-01-29 14:19:47 UTC (rev 1888)
@@ -1,9 +0,0 @@
-2011-01-27  Frank Lanitz  <frlan at frank.uvena.de>
-
- * Support creation of table with <thead> and <tbody>. Use it for the
-   moment as default.
-
-
-2011-01-26  Frank Lanitz  <frank at frank.uvena.de>
-
- * Initial Entry. New plugin: HTMLTable.

Deleted: trunk/geany-plugins/htmltable/Makefile.am
===================================================================
--- trunk/geany-plugins/htmltable/Makefile.am	2011-01-29 13:43:08 UTC (rev 1887)
+++ trunk/geany-plugins/htmltable/Makefile.am	2011-01-29 14:19:47 UTC (rev 1888)
@@ -1,8 +0,0 @@
-if ENABLE_HTMLTABLE
-include $(top_srcdir)/build/vars.auxfiles.mk
-else
-include $(top_srcdir)/build/vars.docs.mk
-endif
-
-SUBDIRS = src
-plugin = htmltable

Deleted: trunk/geany-plugins/htmltable/NEWS
===================================================================
Deleted: trunk/geany-plugins/htmltable/README
===================================================================
--- trunk/geany-plugins/htmltable/README	2011-01-29 13:43:08 UTC (rev 1887)
+++ trunk/geany-plugins/htmltable/README	2011-01-29 14:19:47 UTC (rev 1888)
@@ -1,82 +0,0 @@
-HTMLTable
------------
-
-.. contents::
-
-About
-------
-HTMLTable is a plugin which helps on converting a tabulator
-separated selection into a HTML-like table.
-
-
-Installation
-------------
-
-This version of the plugin is installed with the combined
-geany-plugins release. Please check README of this package
-
-
-Usage
------
-
-After the plugins has been installed successfully, load the plugin 
-via Geany's plugin manager. This will add a new keybinding into 
-Geany's list of keybindings inside the preferences dialog. You might 
-like to set up a keybinding for the function. Once this is done, the 
-plugin is ready to use.
-
-When using the plugin, just mark the area you like to transform and
-push your keybinding. All line endings will be token as end of a row
-and therefor transformed to <tr> and </tr>. Occurrences of tabulator
-will be interpreted as column separators and replaced by <td> and
-</td>.
-
-Rectangle selections are currently not supported and might lead to
-some weird output you didn't expect -- just don't try it if you have
-heart issues or working on an important document :)
-
-Development
------------
-
-You can checkout the current source code from the Subversion repository at
-Sourceforge.net. Get the code from:
-
-svn checkout
-http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-plugins/htmltable
-
-If you want to create a patch, please respect the license of
-HTMLTable as well as intellectual property of third. Patches that
-should be included to the default distribution must be licensed under
-the same conditions as HTMLTable by the copyright owner (GPL2+).
-
-
-Known issues
-------------
-
-The plugin currently is not supporting rectangle selections very
-well. Also it is not able to support <thead> and <tbody> at the
-moment. However, at least the second point is planned for some later
-release.
-
-For more recent information all reported issues will be tracked at
-http://sourceforge.net/tracker/?group_id=222729
-
-
-License
--------
-
-HTMLTable and all its parts 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. If not, you will be
-able to get a copy by contacting the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-Bugs, questions, bugs, homepage
--------------------------------
-
-If you found any bugs or want to provide a patch, please contact Frank
-Lanitz (frank(at)geany(dot)org). Please also do so, if you got any
-questions.

Deleted: trunk/geany-plugins/htmltable/src/Makefile.am
===================================================================
--- trunk/geany-plugins/htmltable/src/Makefile.am	2011-01-29 13:43:08 UTC (rev 1887)
+++ trunk/geany-plugins/htmltable/src/Makefile.am	2011-01-29 14:19:47 UTC (rev 1888)
@@ -1,10 +0,0 @@
-include $(top_srcdir)/build/vars.build.mk
-
-if ENABLE_HTMLTABLE
-geanyplugins_LTLIBRARIES = htmltable.la
-else
-EXTRA_LTLIBRARIES = htmltable.la
-endif
-
-htmltable_la_SOURCES = htmltable.c
-htmltable_la_LIBADD = $(COMMONLIBS)

Deleted: trunk/geany-plugins/htmltable/src/htmltable.c
===================================================================
--- trunk/geany-plugins/htmltable/src/htmltable.c	2011-01-29 13:43:08 UTC (rev 1887)
+++ trunk/geany-plugins/htmltable/src/htmltable.c	2011-01-29 14:19:47 UTC (rev 1888)
@@ -1,169 +0,0 @@
-/*
- *	  htmltable.c
- *
- *	  Copyright 2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
- *
- *	  This program is free software; you can redistribute it and/or modify
- *	  it under the terms of the GNU General Public License as published by
- *	  the Free Software Foundation; either version 2 of the License, or
- *	  (at your option) any later version.
- *
- *	  This program is distributed in the hope that it will be useful,
- *	  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *	  GNU General Public License for more details.
- *
- *	  You should have received a copy of the GNU General Public License
- *	  along with this program; if not, write to the Free Software
- *	  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "geanyplugin.h"
-
-GeanyPlugin     *geany_plugin;
-GeanyData       *geany_data;
-GeanyFunctions  *geany_functions;
-
-PLUGIN_VERSION_CHECK(200)
-
-PLUGIN_SET_TRANSLATABLE_INFO(
-    LOCALEDIR, GETTEXT_PACKAGE, _("HTMLTable"),
-    _("A little plugin to convert list into HTML-like tables"),
-    VERSION, "Frank Lanitz <frank at frank.uvena.de>");
-
-enum
-{
-	KB_HTMLTABLE_CONVERT_TO_TABLE,
-	COUNT_KB
-};
-
-
-void convert_to_table(gboolean header)
-{
-	GeanyDocument *doc = NULL;
-	doc = document_get_current();
-
-	g_return_if_fail(doc != NULL);
-
-	if (sci_has_selection(doc->editor->sci))
-	{
-		gchar *selection = NULL;
-		gchar **rows = NULL;
-		GString *replacement_str = NULL;
-		gchar *replacement = NULL;
-
-		/* Actually grabbing selection and splitting it into single
-		 * lines we will work on later */
-		selection = sci_get_selection_contents(doc->editor->sci);
-		rows = g_strsplit_set(selection, "\r\n", -1);
-		g_free(selection);
-
-		/* Checking whether we do have something we can work on - Returning if not */
-		if (rows != NULL)
-		{
-			guint i;
-			guint j;
-
-			/* Adding header to replacement */
-			replacement_str = g_string_new("<table>\n");
-
-			/* Adding <thead> if requested */
-			if (header == TRUE)
-			{
-				g_string_append(replacement_str, "<thead>\n");
-			}
-
-			/* Iteration onto rows and building up lines of table for
-			 * replacement */
-
-			for (i = 0; rows[i] != NULL ; i++)
-			{
-				gchar **columns = NULL;
-				columns = g_strsplit_set(rows[i], "\t", -1);
-
-				/* Adding <tbody> after first line if header and body
-				 * is requested */
-				if (i == 1 &&
-					header == TRUE)
-				{
-					g_string_append(replacement_str, "<tbody>\n");
-				}
-
-				g_string_append(replacement_str, "\t<tr>\n");
-				for (j = 0; columns[j] != NULL; j++)
-				{
-					g_string_append(replacement_str, "\t\t<td>");
-					g_string_append(replacement_str, columns[j]);
-					g_string_append(replacement_str, "</td>\n");
-				}
-
-				g_string_append(replacement_str, "\t</tr>\n");
-
-				/* Adding closing </thead> after first row if header
-				 * is requested */
-				if (i == 0 &&
-					header == TRUE)
-				{
-					g_string_append(replacement_str, "</thead>\n");
-				}
-
-				g_free(columns);
-			}
-		}
-
-		/* Adding the footer of table */
-		/* Closing </tbody> if requested */
-		if (header == TRUE)
-		{
-			g_string_append(replacement_str, "</tbody>\n");
-		}
-
-		g_string_append(replacement_str, "</table>\n");
-
-		/* Replacing selection with new table */
-		replacement = g_string_free(replacement_str, FALSE);
-		sci_replace_sel(doc->editor->sci, replacement);
-
-		g_free(rows);
-		g_free(replacement);
-	}
-	else
-	{
-		/* OK. Something went not as expected.
-		 * We did have a selection but cannot parse it into rows.
-		 * Aborting */
-		g_warning(_("Something went went wrong on parsing selection. Aborting"));
-		return;
-	} /* Selection was given -- end
-	   * in case of there was no selection we are just doing nothing */
-	return;
-}
-
-void kb_convert_to_table(G_GNUC_UNUSED guint key_id)
-{
-	g_return_if_fail(document_get_current() != NULL);
-	convert_to_table(TRUE);
-}
-
-
-static void init_keybindings(void)
-{
-	GeanyKeyGroup *key_group;
-	key_group = plugin_set_key_group(geany_plugin, "htmltable", COUNT_KB, NULL);
-	keybindings_set_item(key_group, KB_HTMLTABLE_CONVERT_TO_TABLE,
-		kb_convert_to_table, 0, 0, "convert_to_table",
-		_("Convert selection to table"), NULL);
-}
-
-
-void plugin_init(GeanyData *data)
-{
-	init_keybindings();
-	main_locale_init(LOCALEDIR, GETTEXT_PACKAGE);
-}
-
-
-void plugin_cleanup(void)
-{
-	/* We don't need to do anything here at the moment */
-}

Deleted: trunk/geany-plugins/htmltable/wscript_build
===================================================================
--- trunk/geany-plugins/htmltable/wscript_build	2011-01-29 13:43:08 UTC (rev 1887)
+++ trunk/geany-plugins/htmltable/wscript_build	2011-01-29 14:19:47 UTC (rev 1888)
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# WAF build script for geany-plugins - HTMLTable
-#
-# Copyright 2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
-# Copyright 2111 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# $Id$
-
-from build.wafutils import build_plugin
-
-
-name = 'HTMLTable'
-includes = ['htmltable/src']
-
-build_plugin(bld, name, includes=includes)

Modified: trunk/geany-plugins/po/POTFILES.in
===================================================================
--- trunk/geany-plugins/po/POTFILES.in	2011-01-29 13:43:08 UTC (rev 1887)
+++ trunk/geany-plugins/po/POTFILES.in	2011-01-29 14:19:47 UTC (rev 1888)
@@ -83,8 +83,6 @@
 geanyvc/src/vc_svn.c
 geanyvc/src/utils.c
 
-# htmltable
-htmltable/src/htmltable.c
 
 # Spell Check
 spellcheck/src/speller.c
@@ -123,6 +121,9 @@
 # GeanyInsertnum
 geanyinsertnum/src/insertnum.c
 
+# Tableconvert
+tableconvert/src/tableconvert.c
+
 # treebrowser
 treebrowser/src/treebrowser.c
 

Copied: trunk/geany-plugins/tableconvert/AUTHORS (from rev 1887, trunk/geany-plugins/htmltable/AUTHORS)
===================================================================
--- trunk/geany-plugins/tableconvert/AUTHORS	                        (rev 0)
+++ trunk/geany-plugins/tableconvert/AUTHORS	2011-01-29 14:19:47 UTC (rev 1888)
@@ -0,0 +1 @@
+Frank Lanitz <frank(at)frank(dot)uvena(dot)de>

Copied: trunk/geany-plugins/tableconvert/COPYING (from rev 1887, trunk/geany-plugins/htmltable/COPYING)
===================================================================
--- trunk/geany-plugins/tableconvert/COPYING	                        (rev 0)
+++ trunk/geany-plugins/tableconvert/COPYING	2011-01-29 14:19:47 UTC (rev 1888)
@@ -0,0 +1,340 @@
+            GNU GENERAL PUBLIC LICENSE
+               Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+            GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+             END OF TERMS AND CONDITIONS
+
+        How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

Copied: trunk/geany-plugins/tableconvert/ChangeLog (from rev 1887, trunk/geany-plugins/htmltable/ChangeLog)
===================================================================
--- trunk/geany-plugins/tableconvert/ChangeLog	                        (rev 0)
+++ trunk/geany-plugins/tableconvert/ChangeLog	2011-01-29 14:19:47 UTC (rev 1888)
@@ -0,0 +1,14 @@
+2011-01-29  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
+
+ * Rename plugin to Tableconvert.
+
+
+2011-01-27  Frank Lanitz  <frlan at frank.uvena.de>
+
+ * Support creation of table with <thead> and <tbody>. Use it for the
+   moment as default.
+
+
+2011-01-26  Frank Lanitz  <frank at frank.uvena.de>
+
+ * Initial Entry. New plugin: HTMLTable.

Copied: trunk/geany-plugins/tableconvert/Makefile.am (from rev 1887, trunk/geany-plugins/htmltable/Makefile.am)
===================================================================
--- trunk/geany-plugins/tableconvert/Makefile.am	                        (rev 0)
+++ trunk/geany-plugins/tableconvert/Makefile.am	2011-01-29 14:19:47 UTC (rev 1888)
@@ -0,0 +1,8 @@
+if ENABLE_TABLECONVERT
+include $(top_srcdir)/build/vars.auxfiles.mk
+else
+include $(top_srcdir)/build/vars.docs.mk
+endif
+
+SUBDIRS = src
+plugin = tableconvert

Copied: trunk/geany-plugins/tableconvert/NEWS (from rev 1887, trunk/geany-plugins/htmltable/NEWS)
===================================================================
Copied: trunk/geany-plugins/tableconvert/README (from rev 1887, trunk/geany-plugins/htmltable/README)
===================================================================
--- trunk/geany-plugins/tableconvert/README	                        (rev 0)
+++ trunk/geany-plugins/tableconvert/README	2011-01-29 14:19:47 UTC (rev 1888)
@@ -0,0 +1,82 @@
+Tableconvert
+-----------
+
+.. contents::
+
+About
+------
+Tableconvert is a plugin which helps on converting a tabulator
+separated selection into a HTML-like table.
+
+
+Installation
+------------
+
+This version of the plugin is installed with the combined
+geany-plugins release. Please check README of this package
+
+
+Usage
+-----
+
+After the plugins has been installed successfully, load the plugin
+via Geany's plugin manager. This will add a new keybinding into
+Geany's list of keybindings inside the preferences dialog. You might
+like to set up a keybinding for the function. Once this is done, the
+plugin is ready to use.
+
+When using the plugin, just mark the area you like to transform and
+push your keybinding. All line endings will be token as end of a row
+and therefor transformed to <tr> and </tr>. Occurrences of tabulator
+will be interpreted as column separators and replaced by <td> and
+</td>.
+
+Rectangle selections are currently not supported and might lead to
+some weird output you didn't expect -- just don't try it if you have
+heart issues or working on an important document :)
+
+Development
+-----------
+
+You can checkout the current source code from the Subversion repository at
+Sourceforge.net. Get the code from:
+
+svn checkout
+http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-plugins/tableconvert
+
+If you want to create a patch, please respect the license of
+Tableconvert as well as intellectual property of third. Patches that
+should be included to the default distribution must be licensed under
+the same conditions as Tableconvert by the copyright owner (GPL2+).
+
+
+Known issues
+------------
+
+The plugin currently is not supporting rectangle selections very
+well. Also it is not able to support <thead> and <tbody> at the
+moment. However, at least the second point is planned for some later
+release.
+
+For more recent information all reported issues will be tracked at
+http://sourceforge.net/tracker/?group_id=222729
+
+
+License
+-------
+
+Tableconvert and all its parts 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. If not, you will be
+able to get a copy by contacting the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+Bugs, questions, bugs, homepage
+-------------------------------
+
+If you found any bugs or want to provide a patch, please contact Frank
+Lanitz (frank(at)geany(dot)org). Please also do so, if you got any
+questions.

Added: trunk/geany-plugins/tableconvert/src/Makefile.am
===================================================================
--- trunk/geany-plugins/tableconvert/src/Makefile.am	                        (rev 0)
+++ trunk/geany-plugins/tableconvert/src/Makefile.am	2011-01-29 14:19:47 UTC (rev 1888)
@@ -0,0 +1,10 @@
+include $(top_srcdir)/build/vars.build.mk
+
+if ENABLE_TABLECONVERT
+geanyplugins_LTLIBRARIES = tableconvert.la
+else
+EXTRA_LTLIBRARIES = tableconvert.la
+endif
+
+tableconvert_la_SOURCES = tableconvert.c
+tableconvert_la_LIBADD = $(COMMONLIBS)

Copied: trunk/geany-plugins/tableconvert/src/tableconvert.c (from rev 1887, trunk/geany-plugins/htmltable/src/htmltable.c)
===================================================================
--- trunk/geany-plugins/tableconvert/src/tableconvert.c	                        (rev 0)
+++ trunk/geany-plugins/tableconvert/src/tableconvert.c	2011-01-29 14:19:47 UTC (rev 1888)
@@ -0,0 +1,169 @@
+/*
+ *	  tableconvert.c
+ *
+ *	  Copyright 2011 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+ *
+ *	  This program is free software; you can redistribute it and/or modify
+ *	  it under the terms of the GNU General Public License as published by
+ *	  the Free Software Foundation; either version 2 of the License, or
+ *	  (at your option) any later version.
+ *
+ *	  This program is distributed in the hope that it will be useful,
+ *	  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *	  GNU General Public License for more details.
+ *
+ *	  You should have received a copy of the GNU General Public License
+ *	  along with this program; if not, write to the Free Software
+ *	  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "geanyplugin.h"
+
+GeanyPlugin     *geany_plugin;
+GeanyData       *geany_data;
+GeanyFunctions  *geany_functions;
+
+PLUGIN_VERSION_CHECK(200)
+
+PLUGIN_SET_TRANSLATABLE_INFO(
+    LOCALEDIR, GETTEXT_PACKAGE, _("Tableconvert"),
+    _("A little plugin to convert lists into tables"),
+    VERSION, "Frank Lanitz <frank at frank.uvena.de>");
+
+enum
+{
+	KB_HTMLTABLE_CONVERT_TO_TABLE,
+	COUNT_KB
+};
+
+
+void convert_to_table(gboolean header)
+{
+	GeanyDocument *doc = NULL;
+	doc = document_get_current();
+
+	g_return_if_fail(doc != NULL);
+
+	if (sci_has_selection(doc->editor->sci))
+	{
+		gchar *selection = NULL;
+		gchar **rows = NULL;
+		GString *replacement_str = NULL;
+		gchar *replacement = NULL;
+
+		/* Actually grabbing selection and splitting it into single
+		 * lines we will work on later */
+		selection = sci_get_selection_contents(doc->editor->sci);
+		rows = g_strsplit_set(selection, "\r\n", -1);
+		g_free(selection);
+
+		/* Checking whether we do have something we can work on - Returning if not */
+		if (rows != NULL)
+		{
+			guint i;
+			guint j;
+
+			/* Adding header to replacement */
+			replacement_str = g_string_new("<table>\n");
+
+			/* Adding <thead> if requested */
+			if (header == TRUE)
+			{
+				g_string_append(replacement_str, "<thead>\n");
+			}
+
+			/* Iteration onto rows and building up lines of table for
+			 * replacement */
+
+			for (i = 0; rows[i] != NULL ; i++)
+			{
+				gchar **columns = NULL;
+				columns = g_strsplit_set(rows[i], "\t", -1);
+
+				/* Adding <tbody> after first line if header and body
+				 * is requested */
+				if (i == 1 &&
+					header == TRUE)
+				{
+					g_string_append(replacement_str, "<tbody>\n");
+				}
+
+				g_string_append(replacement_str, "\t<tr>\n");
+				for (j = 0; columns[j] != NULL; j++)
+				{
+					g_string_append(replacement_str, "\t\t<td>");
+					g_string_append(replacement_str, columns[j]);
+					g_string_append(replacement_str, "</td>\n");
+				}
+
+				g_string_append(replacement_str, "\t</tr>\n");
+
+				/* Adding closing </thead> after first row if header
+				 * is requested */
+				if (i == 0 &&
+					header == TRUE)
+				{
+					g_string_append(replacement_str, "</thead>\n");
+				}
+
+				g_free(columns);
+			}
+		}
+
+		/* Adding the footer of table */
+		/* Closing </tbody> if requested */
+		if (header == TRUE)
+		{
+			g_string_append(replacement_str, "</tbody>\n");
+		}
+
+		g_string_append(replacement_str, "</table>\n");
+
+		/* Replacing selection with new table */
+		replacement = g_string_free(replacement_str, FALSE);
+		sci_replace_sel(doc->editor->sci, replacement);
+
+		g_free(rows);
+		g_free(replacement);
+	}
+	else
+	{
+		/* OK. Something went not as expected.
+		 * We did have a selection but cannot parse it into rows.
+		 * Aborting */
+		g_warning(_("Something went went wrong on parsing selection. Aborting"));
+		return;
+	} /* Selection was given -- end
+	   * in case of there was no selection we are just doing nothing */
+	return;
+}
+
+void kb_convert_to_table(G_GNUC_UNUSED guint key_id)
+{
+	g_return_if_fail(document_get_current() != NULL);
+	convert_to_table(TRUE);
+}
+
+
+static void init_keybindings(void)
+{
+	GeanyKeyGroup *key_group;
+	key_group = plugin_set_key_group(geany_plugin, "htmltable", COUNT_KB, NULL);
+	keybindings_set_item(key_group, KB_HTMLTABLE_CONVERT_TO_TABLE,
+		kb_convert_to_table, 0, 0, "convert_to_table",
+		_("Convert selection to table"), NULL);
+}
+
+
+void plugin_init(GeanyData *data)
+{
+	init_keybindings();
+	main_locale_init(LOCALEDIR, GETTEXT_PACKAGE);
+}
+
+
+void plugin_cleanup(void)
+{
+	/* We don't need to do anything here at the moment */
+}

Copied: trunk/geany-plugins/tableconvert/wscript_build (from rev 1887, trunk/geany-plugins/htmltable/wscript_build)
===================================================================
--- trunk/geany-plugins/tableconvert/wscript_build	                        (rev 0)
+++ trunk/geany-plugins/tableconvert/wscript_build	2011-01-29 14:19:47 UTC (rev 1888)
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+#
+# WAF build script for geany-plugins - Tableconvert
+#
+# Copyright 2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+# Copyright 2111 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# $Id$
+
+from build.wafutils import build_plugin
+
+
+name = 'Tableconvert'
+includes = ['tableconvert/src']
+
+build_plugin(bld, name, includes=includes)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the Plugins-Commits mailing list