Commits March 2010

commits@lists.geany.org

5 participants
81 discussions

SF.net SVN: geany:[4746] trunk
by ntrel＠users.sourceforge.net 09 Mar '10

09 Mar '10

Revision: 4746 http://geany.svn.sourceforge.net/geany/?rev=4746&view=rev Author: ntrel Date: 2010-03-09 16:56:04 +0000 (Tue, 09 Mar 2010) Log Message: ----------- Merge gnu-regex branch: Use POSIX system/GNU regex engine for find & replace 'Use regular expressions' option. This alters regex syntax a bit - see the docs for details; we now support '?' operator and replacement backslash escaping is more standard. Make regex search imply replacing escaped chars. Allow \0 backreference replacement for the whole match. Note: Replace All may be slower; if this is a problem please let me know. - code: Add argument to utils_str_replace_escape() for keeping uninterpreted backslash escapes e.g. '\\', '\e'. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/document.c trunk/src/search.c trunk/src/search.h trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-03-08 23:05:58 UTC (rev 4745) +++ trunk/ChangeLog 2010-03-09 16:56:04 UTC (rev 4746) @@ -1,3 +1,21 @@ +2010-03-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/utils.c, src/utils.h, src/search.c, src/search.h, + src/document.c, doc/geany.txt, doc/geany.html: + Merge gnu-regex branch: + Use POSIX system/GNU regex engine for find & replace 'Use regular + expressions' option. This alters regex syntax a bit - see the docs + for details; we now support '?' operator and replacement backslash + escaping is more standard. + Make regex search imply replacing escaped chars. + Allow \0 backreference replacement for the whole match. + Note: Replace All may be slower; if this is a problem please let me + know. + - code: + Add argument to utils_str_replace_escape() for keeping + uninterpreted backslash escapes e.g. '\\', '\e'. + + 2010-03-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * wscript: Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2010-03-08 23:05:58 UTC (rev 4745) +++ trunk/doc/geany.html 2010-03-09 16:56:04 UTC (rev 4746) @@ -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.6: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2010-02-24" /> +<meta name="date" content="2010-03-07" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2010-02-24</td></tr> +<td>2010-03-07</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.19</td></tr> </tbody> @@ -149,343 +149,343 @@ 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 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> +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> <ul class="simple"> -<li><a class="reference internal" href="#introduction" id="id12">Introduction</a><ul> -<li><a class="reference internal" href="#about-geany" id="id13">About Geany</a></li> -<li><a class="reference internal" href="#where-to-get-it" id="id14">Where to get it</a></li> -<li><a class="reference internal" href="#license" id="id15">License</a></li> -<li><a class="reference internal" href="#about-this-document" id="id16">About this document</a></li> +<li><a class="reference" href="#introduction" id="id12" name="id12">Introduction</a><ul> +<li><a class="reference" href="#about-geany" id="id13" name="id13">About Geany</a></li> +<li><a class="reference" href="#where-to-get-it" id="id14" name="id14">Where to get it</a></li> +<li><a class="reference" href="#license" id="id15" name="id15">License</a></li> +<li><a class="reference" href="#about-this-document" id="id16" name="id16">About this document</a></li> </ul> </li> -<li><a class="reference internal" href="#installation" id="id17">Installation</a><ul> -<li><a class="reference internal" href="#requirements" id="id18">Requirements</a></li> -<li><a class="reference internal" href="#binary-packages" id="id19">Binary packages</a></li> -<li><a class="reference internal" href="#source-compilation" id="id20">Source compilation</a><ul> -<li><a class="reference internal" href="#autotools-based-build-system" id="id21">Autotools based build system</a></li> -<li><a class="reference internal" href="#waf-based-build-system" id="id22">Waf based build system</a><ul> -<li><a class="reference internal" href="#waf-cache" id="id23">Waf Cache</a><ul> -<li><a class="reference internal" href="#cleaning-the-cache" id="id24">Cleaning the Cache</a></li> +<li><a class="reference" href="#installation" id="id17" name="id17">Installation</a><ul> +<li><a class="reference" href="#requirements" id="id18" name="id18">Requirements</a></li> +<li><a class="reference" href="#binary-packages" id="id19" name="id19">Binary packages</a></li> +<li><a class="reference" href="#source-compilation" id="id20" name="id20">Source compilation</a><ul> +<li><a class="reference" href="#autotools-based-build-system" id="id21" name="id21">Autotools based build system</a></li> +<li><a class="reference" href="#waf-based-build-system" id="id22" name="id22">Waf based build system</a><ul> +<li><a class="reference" href="#waf-cache" id="id23" name="id23">Waf Cache</a><ul> +<li><a class="reference" href="#cleaning-the-cache" id="id24" name="id24">Cleaning the Cache</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#custom-installation" id="id25">Custom installation</a></li> -<li><a class="reference internal" href="#dynamic-linking-loader-support-and-vte" id="id26">Dynamic linking loader support and VTE</a></li> -<li><a class="reference internal" href="#build-problems" id="id27">Build problems</a></li> +<li><a class="reference" href="#custom-installation" id="id25" name="id25">Custom installation</a></li> +<li><a class="reference" href="#dynamic-linking-loader-support-and-vte" id="id26" name="id26">Dynamic linking loader support and VTE</a></li> +<li><a class="reference" href="#build-problems" id="id27" name="id27">Build problems</a></li> </ul> </li> -<li><a class="reference internal" href="#installation-prefix" id="id28">Installation prefix</a></li> +<li><a class="reference" href="#installation-prefix" id="id28" name="id28">Installation prefix</a></li> </ul> </li> -<li><a class="reference internal" href="#usage" id="id29">Usage</a><ul> -<li><a class="reference internal" href="#getting-started" id="id30">Getting started</a></li> -<li><a class="reference internal" href="#the-geany-workspace" id="id31">The Geany workspace</a></li> -<li><a class="reference internal" href="#command-line-options" id="id32">Command line options</a></li> -<li><a class="reference internal" href="#general" id="id33">General</a><ul> -<li><a class="reference internal" href="#startup" id="id34">Startup</a></li> -<li><a class="reference internal" href="#opening-files-from-the-command-line-in-a-running-instance" id="id35">Opening files from the command-line in a running instance</a></li> -<li><a class="reference internal" href="#virtual-terminal-emulator-widget-vte" id="id36">Virtual terminal emulator widget (VTE)</a></li> -<li><a class="reference internal" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id37">Defining own widget styles using .gtkrc-2.0</a></li> +<li><a class="reference" href="#usage" id="id29" name="id29">Usage</a><ul> +<li><a class="reference" href="#getting-started" id="id30" name="id30">Getting started</a></li> +<li><a class="reference" href="#the-geany-workspace" id="id31" name="id31">The Geany workspace</a></li> +<li><a class="reference" href="#command-line-options" id="id32" name="id32">Command line options</a></li> +<li><a class="reference" href="#general" id="id33" name="id33">General</a><ul> +<li><a class="reference" href="#startup" id="id34" name="id34">Startup</a></li> +<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id35" name="id35">Opening files from the command-line in a running instance</a></li> +<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id36" name="id36">Virtual terminal emulator widget (VTE)</a></li> +<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id37" name="id37">Defining own widget styles using .gtkrc-2.0</a></li> </ul> </li> -<li><a class="reference internal" href="#documents" id="id38">Documents</a><ul> -<li><a class="reference internal" href="#switching-between-documents" id="id39">Switching between documents</a></li> +<li><a class="reference" href="#documents" id="id38" name="id38">Documents</a><ul> +<li><a class="reference" href="#switching-between-documents" id="id39" name="id39">Switching between documents</a></li> </ul> </li> -<li><a class="reference internal" href="#character-sets-and-unicode-byte-order-mark-bom" id="id40">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> -<li><a class="reference internal" href="#using-character-sets" id="id41">Using character sets</a></li> -<li><a class="reference internal" href="#in-file-encoding-specification" id="id42">In-file encoding specification</a></li> -<li><a class="reference internal" href="#special-encoding-none" id="id43">Special encoding "None"</a></li> -<li><a class="reference internal" href="#unicode-byte-order-mark-bom" id="id44">Unicode Byte-Order-Mark (BOM)</a></li> +<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id40" name="id40">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> +<li><a class="reference" href="#using-character-sets" id="id41" name="id41">Using character sets</a></li> +<li><a class="reference" href="#in-file-encoding-specification" id="id42" name="id42">In-file encoding specification</a></li> +<li><a class="reference" href="#special-encoding-none" id="id43" name="id43">Special encoding "None"</a></li> +<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id44" name="id44">Unicode Byte-Order-Mark (BOM)</a></li> </ul> </li> -<li><a class="reference internal" href="#editing" id="id45">Editing</a><ul> -<li><a class="reference internal" href="#folding" id="id46">Folding</a></li> -<li><a class="reference internal" href="#column-mode-editing-rectangular-selections" id="id47">Column mode editing (rectangular selections)</a></li> -<li><a class="reference internal" href="#drag-and-drop-of-text" id="id48">Drag and drop of text</a></li> -<li><a class="reference internal" href="#indentation" id="id49">Indentation</a></li> -<li><a class="reference internal" href="#auto-indentation" id="id50">Auto-indentation</a></li> -<li><a class="reference internal" href="#bookmarks" id="id51">Bookmarks</a></li> -<li><a class="reference internal" href="#code-navigation-history" id="id52">Code navigation history</a></li> -<li><a class="reference internal" href="#sending-text-through-custom-commands" id="id53">Sending text through custom commands</a></li> -<li><a class="reference internal" href="#context-actions" id="id54">Context actions</a></li> -<li><a class="reference internal" href="#autocompletion" id="id55">Autocompletion</a><ul> -<li><a class="reference internal" href="#word-part-completion" id="id56">Word part completion</a></li> -<li><a class="reference internal" href="#scope-autocompletion" id="id57">Scope autocompletion</a></li> +<li><a class="reference" href="#editing" id="id45" name="id45">Editing</a><ul> +<li><a class="reference" href="#folding" id="id46" name="id46">Folding</a></li> +<li><a class="reference" href="#column-mode-editing-rectangular-selections" id="id47" name="id47">Column mode editing (rectangular selections)</a></li> +<li><a class="reference" href="#drag-and-drop-of-text" id="id48" name="id48">Drag and drop of text</a></li> +<li><a class="reference" href="#indentation" id="id49" name="id49">Indentation</a></li> +<li><a class="reference" href="#auto-indentation" id="id50" name="id50">Auto-indentation</a></li> +<li><a class="reference" href="#bookmarks" id="id51" name="id51">Bookmarks</a></li> +<li><a class="reference" href="#code-navigation-history" id="id52" name="id52">Code navigation history</a></li> +<li><a class="reference" href="#sending-text-through-custom-commands" id="id53" name="id53">Sending text through custom commands</a></li> +<li><a class="reference" href="#context-actions" id="id54" name="id54">Context actions</a></li> +<li><a class="reference" href="#autocompletion" id="id55" name="id55">Autocompletion</a><ul> +<li><a class="reference" href="#word-part-completion" id="id56" name="id56">Word part completion</a></li> +<li><a class="reference" href="#scope-autocompletion" id="id57" name="id57">Scope autocompletion</a></li> </ul> </li> -<li><a class="reference internal" href="#user-definable-snippets" id="id58">User-definable snippets</a></li> -<li><a class="reference internal" href="#inserting-unicode-characters" id="id59">Inserting Unicode characters</a></li> +<li><a class="reference" href="#user-definable-snippets" id="id58" name="id58">User-definable snippets</a></li> +<li><a class="reference" href="#inserting-unicode-characters" id="id59" name="id59">Inserting Unicode characters</a></li> </ul> </li> -<li><a class="reference internal" href="#search-replace-and-go-to" id="id60">Search, replace and go to</a><ul> -<li><a class="reference internal" href="#toolbar-entries" id="id61">Toolbar entries</a><ul> -<li><a class="reference internal" href="#search-bar" id="id62">Search bar</a></li> +<li><a class="reference" href="#search-replace-and-go-to" id="id60" name="id60">Search, replace and go to</a><ul> +<li><a class="reference" href="#toolbar-entries" id="id61" name="id61">Toolbar entries</a><ul> +<li><a class="reference" href="#search-bar" id="id62" name="id62">Search bar</a></li> </ul> </li> -<li><a class="reference internal" href="#find" id="id63">Find</a><ul> -<li><a class="reference internal" href="#matching-options" id="id64">Matching options</a></li> -<li><a class="reference internal" href="#find-all" id="id65">Find all</a></li> -<li><a class="reference internal" href="#change-font-in-search-dialog-text-fields" id="id66">Change font in search dialog text fields</a></li> +<li><a class="reference" href="#find" id="id63" name="id63">Find</a><ul> +<li><a class="reference" href="#matching-options" id="id64" name="id64">Matching options</a></li> +<li><a class="reference" href="#find-all" id="id65" name="id65">Find all</a></li> +<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id66" name="id66">Change font in search dialog text fields</a></li> </ul> </li> -<li><a class="reference internal" href="#find-usage" id="id67">Find usage</a></li> -<li><a class="reference internal" href="#find-in-files" id="id68">Find in files</a><ul> -<li><a class="reference internal" href="#filtering-out-version-control-files" id="id69">Filtering out version control files</a></li> +<li><a class="reference" href="#find-usage" id="id67" name="id67">Find usage</a></li> +<li><a class="reference" href="#find-in-files" id="id68" name="id68">Find in files</a><ul> +<li><a class="reference" href="#filtering-out-version-control-files" id="id69" name="id69">Filtering out version control files</a></li> </ul> </li> -<li><a class="reference internal" href="#replace" id="id70">Replace</a><ul> -<li><a class="reference internal" href="#replace-all" id="id71">Replace all</a></li> +<li><a class="reference" href="#replace" id="id70" name="id70">Replace</a><ul> +<li><a class="reference" href="#replace-all" id="id71" name="id71">Replace all</a></li> </ul> </li> -<li><a class="reference internal" href="#go-to-tag-definition" id="id72">Go to tag definition</a></li> -<li><a class="reference internal" href="#go-to-tag-declaration" id="id73">Go to tag declaration</a></li> -<li><a class="reference internal" href="#go-to-line" id="id74">Go to line</a></li> -<li><a class="reference internal" href="#regular-expressions" id="id75">Regular expressions</a></li> +<li><a class="reference" href="#go-to-tag-definition" id="id72" name="id72">Go to tag definition</a></li> +<li><a class="reference" href="#go-to-tag-declaration" id="id73" name="id73">Go to tag declaration</a></li> +<li><a class="reference" href="#go-to-line" id="id74" name="id74">Go to line</a></li> +<li><a class="reference" href="#regular-expressions" id="id75" name="id75">Regular expressions</a></li> </ul> </li> -<li><a class="reference internal" href="#tags" id="id76">Tags</a><ul> -<li><a class="reference internal" href="#workspace-tags" id="id77">Workspace tags</a></li> -<li><a class="reference internal" href="#global-tags" id="id78">Global tags</a><ul> -<li><a class="reference internal" href="#default-global-tags-files" id="id79">Default global tags files</a></li> -<li><a class="reference internal" href="#global-tags-file-format" id="id80">Global tags file format</a></li> -<li><a class="reference internal" href="#generating-a-global-tags-file" id="id81">Generating a global tags file</a></li> +<li><a class="reference" href="#tags" id="id76" name="id76">Tags</a><ul> +<li><a class="reference" href="#workspace-tags" id="id77" name="id77">Workspace tags</a></li> +<li><a class="reference" href="#global-tags" id="id78" name="id78">Global tags</a><ul> +<li><a class="reference" href="#default-global-tags-files" id="id79" name="id79">Default global tags files</a></li> +<li><a class="reference" href="#global-tags-file-format" id="id80" name="id80">Global tags file format</a></li> +<li><a class="reference" href="#generating-a-global-tags-file" id="id81" name="id81">Generating a global tags file</a></li> </ul> </li> -<li><a class="reference internal" href="#ignore-tags" id="id82">Ignore tags</a></li> +<li><a class="reference" href="#ignore-tags" id="id82" name="id82">Ignore tags</a></li> </ul> </li> -<li><a class="reference internal" href="#preferences" id="id83">Preferences</a><ul> -<li><a class="reference internal" href="#general-startup-preferences" id="id84">General Startup preferences</a><ul> -<li><a class="reference internal" href="#id1" id="id85">Startup</a></li> -<li><a class="reference internal" href="#shutdown" id="id86">Shutdown</a></li> -<li><a class="reference internal" href="#paths" id="id87">Paths</a></li> +<li><a class="reference" href="#preferences" id="id83" name="id83">Preferences</a><ul> +<li><a class="reference" href="#general-startup-preferences" id="id84" name="id84">General Startup preferences</a><ul> +<li><a class="reference" href="#id1" id="id85" name="id85">Startup</a></li> +<li><a class="reference" href="#shutdown" id="id86" name="id86">Shutdown</a></li> +<li><a class="reference" href="#paths" id="id87" name="id87">Paths</a></li> </ul> </li> -<li><a class="reference internal" href="#general-miscellaneous-preferences" id="id88">General Miscellaneous preferences</a><ul> -<li><a class="reference internal" href="#miscellaneous" id="id89">Miscellaneous</a></li> -<li><a class="reference internal" href="#search" id="id90">Search</a></li> -<li><a class="reference internal" href="#projects" id="id91">Projects</a></li> +<li><a class="reference" href="#general-miscellaneous-preferences" id="id88" name="id88">General Miscellaneous preferences</a><ul> +<li><a class="reference" href="#miscellaneous" id="id89" name="id89">Miscellaneous</a></li> +<li><a class="reference" href="#search" id="id90" name="id90">Search</a></li> +<li><a class="reference" href="#projects" id="id91" name="id91">Projects</a></li> </ul> </li> -<li><a class="reference internal" href="#interface-preferences" id="id92">Interface preferences</a><ul> -<li><a class="reference internal" href="#sidebar" id="id93">Sidebar</a></li> -<li><a class="reference internal" href="#fonts" id="id94">Fonts</a></li> -<li><a class="reference internal" href="#editor-tabs" id="id95">Editor tabs</a></li> -<li><a class="reference internal" href="#tab-positions" id="id96">Tab positions</a></li> -<li><a class="reference internal" href="#id2" id="id97">Miscellaneous</a></li> +<li><a class="reference" href="#interface-preferences" id="id92" name="id92">Interface preferences</a><ul> +<li><a class="reference" href="#sidebar" id="id93" name="id93">Sidebar</a></li> +<li><a class="reference" href="#fonts" id="id94" name="id94">Fonts</a></li> +<li><a class="reference" href="#editor-tabs" id="id95" name="id95">Editor tabs</a></li> +<li><a class="reference" href="#tab-positions" id="id96" name="id96">Tab positions</a></li> +<li><a class="reference" href="#id2" id="id97" name="id97">Miscellaneous</a></li> </ul> </li> -<li><a class="reference internal" href="#toolbar-preferences" id="id98">Toolbar preferences</a><ul> -<li><a class="reference internal" href="#toolbar" id="id99">Toolbar</a></li> -<li><a class="reference internal" href="#appearance" id="id100">Appearance</a></li> +<li><a class="reference" href="#toolbar-preferences" id="id98" name="id98">Toolbar preferences</a><ul> +<li><a class="reference" href="#toolbar" id="id99" name="id99">Toolbar</a></li> +<li><a class="reference" href="#appearance" id="id100" name="id100">Appearance</a></li> </ul> </li> -<li><a class="reference internal" href="#editor-features-preferences" id="id101">Editor Features preferences</a><ul> -<li><a class="reference internal" href="#features" id="id102">Features</a></li> +<li><a class="reference" href="#editor-features-preferences" id="id101" name="id101">Editor Features preferences</a><ul> +<li><a class="reference" href="#features" id="id102" name="id102">Features</a></li> </ul> </li> -<li><a class="reference internal" href="#editor-indentation-preferences" id="id103">Editor Indentation preferences</a><ul> -<li><a class="reference internal" href="#indentation-group" id="id104">Indentation group</a></li> +<li><a class="reference" href="#editor-indentation-preferences" id="id103" name="id103">Editor Indentation preferences</a><ul> +<li><a class="reference" href="#indentation-group" id="id104" name="id104">Indentation group</a></li> </ul> </li> -<li><a class="reference internal" href="#editor-completions-preferences" id="id105">Editor Completions preferences</a><ul> -<li><a class="reference internal" href="#completions" id="id106">Completions</a></li> -<li><a class="reference internal" href="#auto-close-quotes-and-brackets" id="id107">Auto-close quotes and brackets</a></li> +<li><a class="reference" href="#editor-completions-preferences" id="id105" name="id105">Editor Completions preferences</a><ul> +<li><a class="reference" href="#completions" id="id106" name="id106">Completions</a></li> +<li><a class="reference" href="#auto-close-quotes-and-brackets" id="id107" name="id107">Auto-close quotes and brackets</a></li> </ul> </li> -<li><a class="reference internal" href="#editor-display-preferences" id="id108">Editor Display preferences</a><ul> -<li><a class="reference internal" href="#display" id="id109">Display</a></li> -<li><a class="reference internal" href="#long-line-marker" id="id110">Long line marker</a></li> -<li><a class="reference internal" href="#virtual-spaces" id="id111">Virtual spaces</a></li> +<li><a class="reference" href="#editor-display-preferences" id="id108" name="id108">Editor Display preferences</a><ul> +<li><a class="reference" href="#display" id="id109" name="id109">Display</a></li> +<li><a class="reference" href="#long-line-marker" id="id110" name="id110">Long line marker</a></li> +<li><a class="reference" href="#virtual-spaces" id="id111" name="id111">Virtual spaces</a></li> </ul> </li> -<li><a class="reference internal" href="#files-preferences" id="id112">Files preferences</a><ul> -<li><a class="reference internal" href="#new-files" id="id113">New files</a></li> -<li><a class="reference internal" href="#saving-files" id="id114">Saving files</a></li> -<li><a class="reference internal" href="#id3" id="id115">Miscellaneous</a></li> +<li><a class="reference" href="#files-preferences" id="id112" name="id112">Files preferences</a><ul> +<li><a class="reference" href="#new-files" id="id113" name="id113">New files</a></li> +<li><a class="reference" href="#saving-files" id="id114" name="id114">Saving files</a></li> +<li><a class="reference" href="#id3" id="id115" name="id115">Miscellaneous</a></li> </ul> </li> -<li><a class="reference internal" href="#tools-preferences" id="id116">Tools preferences</a><ul> -<li><a class="reference internal" href="#tool-paths" id="id117">Tool paths</a></li> -<li><a class="reference internal" href="#commands" id="id118">Commands</a></li> +<li><a class="reference" href="#tools-preferences" id="id116" name="id116">Tools preferences</a><ul> +<li><a class="reference" href="#tool-paths" id="id117" name="id117">Tool paths</a></li> +<li><a class="reference" href="#commands" id="id118" name="id118">Commands</a></li> </ul> </li> -<li><a class="reference internal" href="#template-preferences" id="id119">Template preferences</a><ul> -<li><a class="reference internal" href="#template-data" id="id120">Template data</a></li> +<li><a class="reference" href="#template-preferences" id="id119" name="id119">Template preferences</a><ul> +<li><a class="reference" href="#template-data" id="id120" name="id120">Template data</a></li> </ul> </li> -<li><a class="reference internal" href="#keybinding-preferences" id="id121">Keybinding preferences</a></li> -<li><a class="reference internal" href="#printing-preferences" id="id122">Printing preferences</a></li> -<li><a class="reference internal" href="#terminal-vte-preferences" id="id123">Terminal (VTE) preferences</a><ul> -<li><a class="reference internal" href="#terminal-widget" id="id124">Terminal widget</a></li> +<li><a class="reference" href="#keybinding-preferences" id="id121" name="id121">Keybinding preferences</a></li> +<li><a class="reference" href="#printing-preferences" id="id122" name="id122">Printing preferences</a></li> +<li><a class="reference" href="#terminal-vte-preferences" id="id123" name="id123">Terminal (VTE) preferences</a><ul> +<li><a class="reference" href="#terminal-widget" id="id124" name="id124">Terminal widget</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#project-management" id="id125">Project Management</a><ul> -<li><a class="reference internal" href="#new-project" id="id126">New Project</a></li> -<li><a class="reference internal" href="#project-properties" id="id127">Project Properties</a><ul> -<li><a class="reference internal" href="#set-base-path-button" id="id128">Set Base Path Button</a></li> +<li><a class="reference" href="#project-management" id="id125" name="id125">Project Management</a><ul> +<li><a class="reference" href="#new-project" id="id126" name="id126">New Project</a></li> +<li><a class="reference" href="#project-properties" id="id127" name="id127">Project Properties</a><ul> +<li><a class="reference" href="#set-base-path-button" id="id128" name="id128">Set Base Path Button</a></li> </ul> </li> -<li><a class="reference internal" href="#open-project" id="id129">Open Project</a></li> -<li><a class="reference internal" href="#close-project" id="id130">Close Project</a></li> +<li><a class="reference" href="#open-project" id="id129" name="id129">Open Project</a></li> +<li><a class="reference" href="#close-project" id="id130" name="id130">Close Project</a></li> </ul> </li> -<li><a class="reference internal" href="#build-menu" id="id131">Build Menu</a><ul> -<li><a class="reference internal" href="#indicators" id="id132">Indicators</a></li> -<li><a class="reference internal" href="#default-build-menu-items" id="id133">Default Build Menu Items</a><ul> -<li><a class="reference internal" href="#compile" id="id134">Compile</a></li> -<li><a class="reference internal" href="#build" id="id135">Build</a></li> -<li><a class="reference internal" href="#make" id="id136">Make</a></li> -<li><a class="reference internal" href="#make-custom-target" id="id137">Make custom target</a></li> -<li><a class="reference internal" href="#make-object" id="id138">Make object</a></li> -<li><a class="reference internal" href="#next-error" id="id139">Next Error</a></li> -<li><a class="reference internal" href="#previous-error" id="id140">Previous Error</a></li> -<li><a class="reference internal" href="#execute" id="id141">Execute</a></li> -<li><a class="reference internal" href="#stopping-running-processes" id="id142">Stopping running processes</a><ul> -<li><a class="reference internal" href="#terminal-emulators" id="id143">Terminal emulators</a></li> +<li><a class="reference" href="#build-menu" id="id131" name="id131">Build Menu</a><ul> +<li><a class="reference" href="#indicators" id="id132" name="id132">Indicators</a></li> +<li><a class="reference" href="#default-build-menu-items" id="id133" name="id133">Default Build Menu Items</a><ul> +<li><a class="reference" href="#compile" id="id134" name="id134">Compile</a></li> +<li><a class="reference" href="#build" id="id135" name="id135">Build</a></li> +<li><a class="reference" href="#make" id="id136" name="id136">Make</a></li> +<li><a class="reference" href="#make-custom-target" id="id137" name="id137">Make custom target</a></li> +<li><a class="reference" href="#make-object" id="id138" name="id138">Make object</a></li> +<li><a class="reference" href="#next-error" id="id139" name="id139">Next Error</a></li> +<li><a class="reference" href="#previous-error" id="id140" name="id140">Previous Error</a></li> +<li><a class="reference" href="#execute" id="id141" name="id141">Execute</a></li> +<li><a class="reference" href="#stopping-running-processes" id="id142" name="id142">Stopping running processes</a><ul> +<li><a class="reference" href="#terminal-emulators" id="id143" name="id143">Terminal emulators</a></li> </ul> </li> -<li><a class="reference internal" href="#set-build-commands" id="id144">Set Build Commands</a></li> +<li><a class="reference" href="#set-build-commands" id="id144" name="id144">Set Build Commands</a></li> </ul> </li> -<li><a class="reference internal" href="#build-menu-configuration" id="id145">Build Menu Configuration</a></li> -<li><a class="reference internal" href="#build-menu-commands-dialog" id="id146">Build Menu Commands Dialog</a><ul> -<li><a class="reference internal" href="#substitutions-in-commands-and-working-directories" id="id147">Substitutions in Commands and Working Directories</a></li> -<li><a class="reference internal" href="#build-menu-keyboard-shortcuts" id="id148">Build Menu Keyboard Shortcuts</a></li> -<li><a class="reference internal" href="#configuration-files" id="id149">Configuration Files</a></li> +<li><a class="reference" href="#build-menu-configuration" id="id145" name="id145">Build Menu Configuration</a></li> +<li><a class="reference" href="#build-menu-commands-dialog" id="id146" name="id146">Build Menu Commands Dialog</a><ul> +<li><a class="reference" href="#substitutions-in-commands-and-working-directories" id="id147" name="id147">Substitutions in Commands and Working Directories</a></li> +<li><a class="reference" href="#build-menu-keyboard-shortcuts" id="id148" name="id148">Build Menu Keyboard Shortcuts</a></li> +<li><a class="reference" href="#configuration-files" id="id149" name="id149">Configuration Files</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#printing-support" id="id150">Printing support</a></li> -<li><a class="reference internal" href="#plugins" id="id151">Plugins</a></li> -<li><a class="reference internal" href="#keybindings" id="id152">Keybindings</a><ul> -<li><a class="reference internal" href="#switching-documents" id="id153">Switching documents</a></li> -<li><a class="reference internal" href="#configurable-keybindings" id="id154">Configurable keybindings</a><ul> -<li><a class="reference internal" href="#file-keybindings" id="id155">File keybindings</a></li> -<li><a class="reference internal" href="#editor-keybindings" id="id156">Editor keybindings</a></li> -<li><a class="reference internal" href="#clipboard-keybindings" id="id157">Clipboard keybindings</a></li> -<li><a class="reference internal" href="#select-keybindings" id="id158">Select keybindings</a></li> -<li><a class="reference internal" href="#insert-keybindings" id="id159">Insert keybindings</a></li> -<li><a class="reference internal" href="#format-keybindings" id="id160">Format keybindings</a></li> -<li><a class="reference internal" href="#settings-keybindings" id="id161">Settings keybindings</a></li> -<li><a class="reference internal" href="#search-keybindings" id="id162">Search keybindings</a></li> -<li><a class="reference internal" href="#go-to-keybindings" id="id163">Go to keybindings</a></li> -<li><a class="reference internal" href="#view-keybindings" id="id164">View keybindings</a></li> -<li><a class="reference internal" href="#focus-keybindings" id="id165">Focus keybindings</a></li> -<li><a class="reference internal" href="#notebook-tab-keybindings" id="id166">Notebook tab keybindings</a></li> -<li><a class="reference internal" href="#document-keybindings" id="id167">Document keybindings</a></li> -<li><a class="reference internal" href="#build-keybindings" id="id168">Build keybindings</a></li> -<li><a class="reference internal" href="#tools-keybindings" id="id169">Tools keybindings</a></li> -<li><a class="reference internal" href="#help-keybindings" id="id170">Help keybindings</a></li> +<li><a class="reference" href="#printing-support" id="id150" name="id150">Printing support</a></li> +<li><a class="reference" href="#plugins" id="id151" name="id151">Plugins</a></li> +<li><a class="reference" href="#keybindings" id="id152" name="id152">Keybindings</a><ul> +<li><a class="reference" href="#switching-documents" id="id153" name="id153">Switching documents</a></li> +<li><a class="reference" href="#configurable-keybindings" id="id154" name="id154">Configurable keybindings</a><ul> +<li><a class="reference" href="#file-keybindings" id="id155" name="id155">File keybindings</a></li> +<li><a class="reference" href="#editor-keybindings" id="id156" name="id156">Editor keybindings</a></li> +<li><a class="reference" href="#clipboard-keybindings" id="id157" name="id157">Clipboard keybindings</a></li> +<li><a class="reference" href="#select-keybindings" id="id158" name="id158">Select keybindings</a></li> +<li><a class="reference" href="#insert-keybindings" id="id159" name="id159">Insert keybindings</a></li> +<li><a class="reference" href="#format-keybindings" id="id160" name="id160">Format keybindings</a></li> +<li><a class="reference" href="#settings-keybindings" id="id161" name="id161">Settings keybindings</a></li> +<li><a class="reference" href="#search-keybindings" id="id162" name="id162">Search keybindings</a></li> +<li><a class="reference" href="#go-to-keybindings" id="id163" name="id163">Go to keybindings</a></li> +<li><a class="reference" href="#view-keybindings" id="id164" name="id164">View keybindings</a></li> +<li><a class="reference" href="#focus-keybindings" id="id165" name="id165">Focus keybindings</a></li> +<li><a class="reference" href="#notebook-tab-keybindings" id="id166" name="id166">Notebook tab keybindings</a></li> +<li><a class="reference" href="#document-keybindings" id="id167" name="id167">Document keybindings</a></li> +<li><a class="reference" href="#build-keybindings" id="id168" name="id168">Build keybindings</a></li> +<li><a class="reference" href="#tools-keybindings" id="id169" name="id169">Tools keybindings</a></li> +<li><a class="reference" href="#help-keybindings" id="id170" name="id170">Help keybindings</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#id4" id="id171">Configuration files</a><ul> -<li><a class="reference internal" href="#tools-menu-items" id="id172">Tools menu items</a></li> -<li><a class="reference internal" href="#global-configuration-file" id="id173">Global configuration file</a></li> -<li><a class="reference internal" href="#filetype-definition-files" id="id174">Filetype definition files</a><ul> -<li><a class="reference internal" href="#custom-filetypes" id="id175">Custom filetypes</a></li> -<li><a class="reference internal" href="#system-files" id="id176">System files</a></li> -<li><a class="reference internal" href="#user-files" id="id177">User files</a></li> -<li><a class="reference internal" href="#format" id="id178">Format</a><ul> -<li><a class="reference internal" href="#styling-section" id="id179">[styling] Section</a><ul> -<li><a class="reference internal" href="#using-a-named-style" id="id180">Using a named style</a></li> +<li><a class="reference" href="#id4" id="id171" name="id171">Configuration files</a><ul> +<li><a class="reference" href="#tools-menu-items" id="id172" name="id172">Tools menu items</a></li> +<li><a class="reference" href="#global-configuration-file" id="id173" name="id173">Global configuration file</a></li> +<li><a class="reference" href="#filetype-definition-files" id="id174" name="id174">Filetype definition files</a><ul> +<li><a class="reference" href="#custom-filetypes" id="id175" name="id175">Custom filetypes</a></li> +<li><a class="reference" href="#system-files" id="id176" name="id176">System files</a></li> +<li><a class="reference" href="#user-files" id="id177" name="id177">User files</a></li> +<li><a class="reference" href="#format" id="id178" name="id178">Format</a><ul> +<li><a class="reference" href="#styling-section" id="id179" name="id179">[styling] Section</a><ul> +<li><a class="reference" href="#using-a-named-style" id="id180" name="id180">Using a named style</a></li> </ul> </li> -<li><a class="reference internal" href="#keywords-section" id="id181">[keywords] Section</a></li> -<li><a class="reference internal" href="#lexer-properties-section" id="id182">[lexer_properties] Section</a></li> -<li><a class="reference internal" href="#settings-section" id="id183">[settings] Section</a></li> -<li><a class="reference internal" href="#build-settings-section" id="id184">[build_settings] Section</a></li> +<li><a class="reference" href="#keywords-section" id="id181" name="id181">[keywords] Section</a></li> +<li><a class="reference" href="#lexer-properties-section" id="id182" name="id182">[lexer_properties] Section</a></li> +<li><a class="reference" href="#settings-section" id="id183" name="id183">[settings] Section</a></li> +<li><a class="reference" href="#build-settings-section" id="id184" name="id184">[build_settings] Section</a></li> </ul> </li> -<li><a class="reference internal" href="#special-file-filetypes-common" id="id185">Special file filetypes.common</a><ul> -<li><a class="reference internal" href="#named-styles-section" id="id186">[named_styles] Section</a></li> -<li><a class="reference internal" href="#id5" id="id187">[styling] Section</a></li> -<li><a class="reference internal" href="#id6" id="id188">[settings] Section</a></li> +<li><a class="reference" href="#special-file-filetypes-common" id="id185" name="id185">Special file filetypes.common</a><ul> +<li><a class="reference" href="#named-styles-section" id="id186" name="id186">[named_styles] Section</a></li> +<li><a class="reference" href="#id5" id="id187" name="id187">[styling] Section</a></li> +<li><a class="reference" href="#id6" id="id188" name="id188">[settings] Section</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#filetype-extensions" id="id189">Filetype extensions</a></li> -<li><a class="reference internal" href="#preferences-file-format" id="id190">Preferences File Format</a><ul> -<li><a class="reference internal" href="#hidden-preferences" id="id191">Hidden preferences</a></li> -<li><a class="reference internal" href="#build-menu-section" id="id192">[build-menu] Section</a></li> +<li><a class="reference" href="#filetype-extensions" id="id189" name="id189">Filetype extensions</a></li> +<li><a class="reference" href="#preferences-file-format" id="id190" name="id190">Preferences File Format</a><ul> +<li><a class="reference" href="#hidden-preferences" id="id191" name="id191">Hidden preferences</a></li> +<li><a class="reference" href="#build-menu-section" id="id192" name="id192">[build-menu] Section</a></li> </ul> </li> -<li><a class="reference internal" href="#project-file-format" id="id193">Project File Format</a><ul> -<li><a class="reference internal" href="#build-menu-additions" id="id194">[build-menu] Additions</a></li> +<li><a class="reference" href="#project-file-format" id="id193" name="id193">Project File Format</a><ul> +<li><a class="reference" href="#build-menu-additions" id="id194" name="id194">[build-menu] Additions</a></li> </ul> </li> -<li><a class="reference internal" href="#templates" id="id195">Templates</a><ul> -<li><a class="reference internal" href="#template-meta-data" id="id196">Template meta data</a></li> -<li><a class="reference internal" href="#file-templates" id="id197">File templates</a><ul> -<li><a class="reference internal" href="#custom-file-templates" id="id198">Custom file templates</a></li> -<li><a class="reference internal" href="#filetype-templates" id="id199">Filetype templates</a></li> +<li><a class="reference" href="#templates" id="id195" name="id195">Templates</a><ul> +<li><a class="reference" href="#template-meta-data" id="id196" name="id196">Template meta data</a></li> +<li><a class="reference" href="#file-templates" id="id197" name="id197">File templates</a><ul> +<li><a class="reference" href="#custom-file-templates" id="id198" name="id198">Custom file templates</a></li> +<li><a class="reference" href="#filetype-templates" id="id199" name="id199">Filetype templates</a></li> </ul> </li> -<li><a class="reference internal" href="#customizing-templates" id="id200">Customizing templates</a><ul> -<li><a class="reference internal" href="#template-wildcards" id="id201">Template wildcards</a><ul> -<li><a class="reference internal" href="#special-command-wilcard" id="id202">Special {command:} wilcard</a></li> +<li><a class="reference" href="#customizing-templates" id="id200" name="id200">Customizing templates</a><ul> +<li><a class="reference" href="#template-wildcards" id="id201" name="id201">Template wildcards</a><ul> +<li><a class="reference" href="#special-command-wilcard" id="id202" name="id202">Special {command:} wilcard</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#customizing-the-toolbar" id="id203">Customizing the toolbar</a><ul> -<li><a class="reference internal" href="#manually-editing-of-the-toolbar-layout" id="id204">Manually editing of the toolbar layout</a></li> -<li><a class="reference internal" href="#available-toolbar-elements" id="id205">Available toolbar elements</a></li> +<li><a class="reference" href="#customizing-the-toolbar" id="id203" name="id203">Customizing the toolbar</a><ul> +<li><a class="reference" href="#manually-editing-of-the-toolbar-layout" id="id204" name="id204">Manually editing of the toolbar layout</a></li> +<li><a class="reference" href="#available-toolbar-elements" id="id205" name="id205">Available toolbar elements</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#plugin-documentation" id="id206">Plugin documentation</a><ul> -<li><a class="reference internal" href="#save-actions" id="id207">Save Actions</a><ul> -<li><a class="reference internal" href="#instant-save" id="id208">Instant Save</a></li> -<li><a class="reference internal" href="#backup-copy" id="id209">Backup Copy</a></li> +<li><a class="reference" href="#plugin-documentation" id="id206" name="id206">Plugin documentation</a><ul> +<li><a class="reference" href="#save-actions" id="id207" name="id207">Save Actions</a><ul> +<li><a class="reference" href="#instant-save" id="id208" name="id208">Instant Save</a></li> +<li><a class="reference" href="#backup-copy" id="id209" name="id209">Backup Copy</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#contributing-to-this-document" id="id210">Contributing to this document</a></li> -<li><a class="reference internal" href="#scintilla-keyboard-commands" id="id211">Scintilla keyboard commands</a><ul> -<li><a class="reference internal" href="#keyboard-commands" id="id212">Keyboard commands</a></li> +<li><a class="reference" href="#contributing-to-this-document" id="id210" name="id210">Contributing to this document</a></li> +<li><a class="reference" href="#scintilla-keyboard-commands" id="id211" name="id211">Scintilla keyboard commands</a><ul> +<li><a class="reference" href="#keyboard-commands" id="id212" name="id212">Keyboard commands</a></li> </ul> </li> -<li><a class="reference internal" href="#tips-and-tricks" id="id213">Tips and tricks</a><ul> -<li><a class="reference internal" href="#document-notebook" id="id214">Document notebook</a></li> -<li><a class="reference internal" href="#editor" id="id215">Editor</a></li> -<li><a class="reference internal" href="#interface" id="id216">Interface</a></li> -<li><a class="reference internal" href="#gtk-related" id="id217">GTK-related</a></li> +<li><a class="reference" href="#tips-and-tricks" id="id213" name="id213">Tips and tricks</a><ul> +<li><a class="reference" href="#document-notebook" id="id214" name="id214">Document notebook</a></li> +<li><a class="reference" href="#editor" id="id215" name="id215">Editor</a></li> +<li><a class="reference" href="#interface" id="id216" name="id216">Interface</a></li> +<li><a class="reference" href="#gtk-related" id="id217" name="id217">GTK-related</a></li> </ul> </li> -<li><a class="reference internal" href="#compile-time-options" id="id218">Compile-time options</a><ul> -<li><a class="reference internal" href="#src-geany-h" id="id219">src/geany.h</a></li> -<li><a class="reference internal" href="#project-h" id="id220">project.h</a></li> -<li><a class="reference internal" href="#editor-h" id="id221">editor.h</a></li> -<li><a class="reference internal" href="#keyfile-c" id="id222">keyfile.c</a></li> -<li><a class="reference internal" href="#build-h" id="id223">build.h</a></li> -<li><a class="reference internal" href="#build-c" id="id224">build.c</a></li> +<li><a class="reference" href="#compile-time-options" id="id218" name="id218">Compile-time options</a><ul> +<li><a class="reference" href="#src-geany-h" id="id219" name="id219">src/geany.h</a></li> +<li><a class="reference" href="#project-h" id="id220" name="id220">project.h</a></li> +<li><a class="reference" href="#editor-h" id="id221" name="id221">editor.h</a></li> +<li><a class="reference" href="#keyfile-c" id="id222" name="id222">keyfile.c</a></li> +<li><a class="reference" href="#build-h" id="id223" name="id223">build.h</a></li> +<li><a class="reference" href="#build-c" id="id224" name="id224">build.c</a></li> </ul> </li> -<li><a class="reference internal" href="#gnu-general-public-license" id="id225">GNU General Public License</a></li> -<li><a class="reference internal" href="#license-for-scintilla-and-scite" id="id226">License for Scintilla and SciTE</a></li> +<li><a class="reference" href="#gnu-general-public-license" id="id225" name="id225">GNU General Public License</a></li> +<li><a class="reference" href="#license-for-scintilla-and-scite" id="id226" name="id226">License for Scintilla and SciTE</a></li> </ul> </div> -<div class="section" id="introduction"> -<h1><a class="toc-backref" href="#id12">Introduction</a></h1> -<div class="section" id="about-geany"> -<h2><a class="toc-backref" href="#id13">About Geany</a></h2> +<div class="section"> +<h1><a class="toc-backref" href="#id12" id="introduction" name="introduction">Introduction</a></h1> +<div class="section"> +<h2><a class="toc-backref" href="#id13" id="about-geany" name="about-geany">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 on other packages. Another goal was to be as independent @@ -508,56 +508,56 @@ <li>Plugin interface</li> </ul> </div> -<div class="section" id="where-to-get-it"> -<h2><a class="toc-backref" href="#id14">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 +<div class="section"> +<h2><a class="toc-backref" href="#id14" 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 your distribution. For a list of available packages, please see -<a class="reference external" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> +<a class="reference" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> -<div class="section" id="license"> -<h2><a class="toc-backref" href="#id15">License</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id15" id="license" name="license">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 internal" href="#gnu-general-public-license">GNU General Public License</a>.</p> +code of this program and in the chapter, <a class="reference" href="#gnu-general-public-license">GNU General Public License</a>.</p> <p>The included Scintilla library (found in the subdirectory -<tt class="docutils literal">scintilla/</tt>) has its own license, which can be found in the chapter, -<a class="reference internal" href="#license-for-scintilla-and-scite">License for Scintilla and SciTE</a>.</p> +<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> </div> -<div class="section" id="about-this-document"> -<h2><a class="toc-backref" href="#id16">About this document</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id16" id="about-this-document" name="about-this-document">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 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> +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> </div> </div> -<div class="section" id="installation"> -<h1><a class="toc-backref" href="#id17">Installation</a></h1> -<div class="section" id="requirements"> -<h2><a class="toc-backref" href="#id18">Requirements</a></h2> +<div class="section"> +<h1><a class="toc-backref" href="#id17" id="installation" name="installation">Installation</a></h1> +<div class="section"> +<h2><a class="toc-backref" href="#id18" id="requirements" name="requirements">Requirements</a></h2> <p>You will need the GTK (>= 2.8.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 from the website which bundles these libraries.</p> </div> -<div class="section" id="binary-packages"> -<h2><a class="toc-backref" href="#id19">Binary packages</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id19" id="binary-packages" name="binary-packages">Binary packages</a></h2> <p>There are many binary packages available. For an up-to-date but maybe -incomplete list see <a class="reference external" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> +incomplete list see <a class="reference" href="http://www.geany.org/Download/ThirdPartyPackages">http://www.geany.org/Download/ThirdPartyPackages</a>.</p> </div> -<div class="section" id="source-compilation"> -<h2><a class="toc-backref" href="#id20">Source compilation</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id20" id="source-compilation" name="source-compilation">Source compilation</a></h2> <p>Compiling Geany is quite easy. To do so, you need the GTK (>= 2.8.0) libraries and header files. You also need the Pango, GLib and ATK libraries and header files. -All these files are available at <a class="reference external" href="http://www.gtk.org">http://www.gtk.org</a>, but very often +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 packages to save the trouble of building these yourself.</p> <p>Furthermore you need, of course, a C and C++ compiler. The GNU versions of these tools are recommended.</p> -<div class="section" id="autotools-based-build-system"> -<h3><a class="toc-backref" href="#id21">Autotools based build system</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id21" id="autotools-based-build-system" name="autotools-based-build-system">Autotools based build system</a></h3> <p>The Autotools based build system is very mature and has been well tested. To use it, you just need the Make tool, preferably GNU Make.</p> <p>Then run the following commands:</p> @@ -570,8 +570,8 @@ % make install </pre> </div> -<div class="section" id="waf-based-build-system"> -<h3><a class="toc-backref" href="#id22">Waf based build system</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id22" id="waf-based-build-system" name="waf-based-build-system">Waf based build system</a></h3> <p>The Waf build system is still quite young and under heavy development but already in a usable state. In contrast to the Autotools system, Waf needs Python. So before using Waf, you need to install Python on your system. @@ -579,7 +579,7 @@ build process might be a bit faster. Especially when you use the Waf cache feature for repetitive builds (e.g. when changing only a few source files to test something) will become much faster since Waf will cache and re-use the -unchanged built files and only compile the changed code again. See <a class="reference internal" href="#waf-cache">Waf Cache</a> for details. +unchanged built files and only compile the changed code again. See <a class="reference" href="#waf-cache">Waf Cache</a> for details. To build Geany with Waf as run:</p> <pre class="literal-block"> $ ./waf configure @@ -589,13 +589,13 @@ <pre class="literal-block"> % ./waf install </pre> -<div class="section" id="waf-cache"> -<h4><a class="toc-backref" href="#id23">Waf Cache</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id23" id="waf-cache" name="waf-cache">Waf Cache</a></h4> <p>The Waf build system has a nice and interesting feature which can help to avoid a lot of unnecessary rebuilding of unchanged code. This often happens when developing new features or trying to debug something in Geany. Waf is able to store and retrieve the object files from a cache. This cache is declared -using the environment variable <tt class="docutils literal">WAFCACHE</tt>. +using the environment variable <tt class="docutils literal"><span class="pre">WAFCACHE</span></tt>. A possible location of the cache directory could be <tt class="docutils literal"><span class="pre">~/.cache/waf</span></tt>. In order to make use of this, you first need to create this directory:</p> <pre class="literal-block"> @@ -606,11 +606,11 @@ <pre class="literal-block"> export WAFCACHE=/home/username/.cache/waf </pre> -<p>Remember to replace <tt class="docutils literal">username</tt> with your actual username.</p> +<p>Remember to replace <tt class="docutils literal"><span class="pre">username</span></tt> with your actual username.</p> <p>More information about the Waf cache feature are available at -<a class="reference external" href="http://code.google.com/p/waf/wiki/CacheObjectFiles">http://code.google.com/p/waf/wiki/CacheObjectFiles</a>.</p> -<div class="section" id="cleaning-the-cache"> -<h5><a class="toc-backref" href="#id24">Cleaning the Cache</a></h5> +<a class="reference" href="http://code.google.com/p/waf/wiki/CacheObjectFiles">http://code.google.com/p/waf/wiki/CacheObjectFiles</a>.</p> +<div class="section"> +<h5><a class="toc-backref" href="#id24" id="cleaning-the-cache" name="cleaning-the-cache">Cleaning the Cache</a></h5> <p>You should be careful about the size of the cache directory as it may grow rapidly over time. Waf doesn't do any cleaning or other house-keeping of the cache yet, so you need to keep it @@ -621,12 +621,12 @@ $ find /home/username/.cache/waf -mtime +14 -exec rm {} \; </pre> <p>This will delete all files in the cache directory which are older than 14 days.</p> -<p>For details about the <tt class="docutils literal">find</tt> command and its options, check its manual page.</p> +<p>For details about the <tt class="docutils literal"><span class="pre">find</span></tt> command and its options, check its manual page.</p> </div> </div> </div> -<div class="section" id="custom-installation"> -<h3><a class="toc-backref" href="#id25">Custom installation</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id25" id="custom-installation" name="custom-installation">Custom installation</a></h3> <p>The configure script supports several common options, for a detailed list, type:</p> <pre class="literal-block"> @@ -640,40 +640,40 @@ <p>You may also want to read the INSTALL file for advanced installation options.</p> <ul class="simple"> -<li>See also <a class="reference internal" href="#compile-time-options">Compile-time options</a>.</li> +<li>See also <a class="reference" href="#compile-time-options">Compile-time options</a>.</li> </ul> </div> -<div class="section" id="dynamic-linking-loader-support-and-vte"> -<h3><a class="toc-backref" href="#id26">Dynamic linking loader support and VTE</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id26" id="dynamic-linking-loader-support-and-vte" name="dynamic-linking-loader-support-and-vte">Dynamic linking loader support and VTE</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">configure</tt> +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 for automatically loading <tt class="docutils literal">libvte.so.4</tt> if available.</p> +support for automatically loading <tt class="docutils literal"><span class="pre">libvte.so.4</span></tt> if available.</p> </div> -<div class="section" id="build-problems"> -<h3><a class="toc-backref" href="#id27">Build problems</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id27" id="build-problems" name="build-problems">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 help from your distribution.</p> </div> </div> -<div class="section" id="installation-prefix"> -<h2><a class="toc-backref" href="#id28">Installation prefix</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id28" id="installation-prefix" name="installation-prefix">Installation prefix</a></h2> <p>If you want to edit any of Geany's system configuration files after installation you will need to know the installation prefix. Usually this is not necessary as you can just use per user configuration files and you will not need root permissions.</p> -<p>Use the <tt class="docutils literal"><span class="pre">--print-prefix</span></tt> option to Geany to check - see <a class="reference internal" href="#command-line-options">Command line +<p>Use the <tt class="docutils literal"><span class="pre">--print-prefix</span></tt> option to Geany to check - see <a class="reference" href="#command-line-options">Command line options</a>. The first path is the prefix.</p> -<p>This is commonly <tt class="docutils literal">/usr</tt> if you installed from a binary package, or -<tt class="docutils literal">/usr/local</tt> if you build from source.</p> +<p>This is commonly <tt class="docutils literal"><span class="pre">/usr</span></tt> if you installed from a binary package, or +<tt class="docutils literal"><span class="pre">/usr/local</span></tt> if you build from source.</p> </div> </div> -<div class="section" id="usage"> -<h1><a class="toc-backref" href="#id29">Usage</a></h1> -<div class="section" id="getting-started"> -<h2><a class="toc-backref" href="#id30">Getting started</a></h2> +<div class="section"> +<h1><a class="toc-backref" href="#id29" id="usage" name="usage">Usage</a></h1> +<div class="section"> +<h2><a class="toc-backref" href="#id30" id="getting-started" name="getting-started">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> @@ -689,8 +689,8 @@ </li> </ul> </div> -<div class="section" id="the-geany-workspace"> -<h2><a class="toc-backref" href="#id31">The Geany workspace</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id31" id="the-geany-workspace" name="the-geany-workspace">The Geany workspace</a></h2> <p>The Geany window is shown in the following figure:</p> <img alt="./images/main_window.png" src="./images/main_window.png" /> <p>The workspace has the following parts:</p> @@ -718,8 +718,8 @@ <p>The sizes of the sidebar and message window can be adjusted by dragging the dividers.</p> </div> -<div class="section" id="command-line-options"> -<h2><a class="toc-backref" href="#id32">Command line options</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id32" id="command-line-options" name="command-line-options">Command line options</a></h2> <table border="1" class="docutils"> <colgroup> <col width="9%" /> @@ -748,7 +748,7 @@ <td>--config=directory_name</td> <td>Use an alternate configuration directory. The default configuration directory is <tt class="docutils literal"><span class="pre">~/.config/geany/</span></tt> and that -is where <tt class="docutils literal">geany.conf</tt> and other configuration files +is where <tt class="docutils literal"><span class="pre">geany.conf</span></tt> and other configuration files reside.</td> </tr> <tr><td><em>none</em></td> @@ -759,7 +759,7 @@ <tr><td>-g</td> <td>--generate-tags</td> <td>Generate a global tags file (see -<a class="reference internal" href="#generating-a-global-tags-file">Generating a global tags file</a>).</td> +<a class="reference" href="#generating-a-global-tags-file">Generating a global tags file</a>).</td> </tr> <tr><td>-P</td> <td>--no-preprocessing</td> @@ -804,7 +804,7 @@ <td>--no-terminal</td> <td>Do not load terminal support. Use this option if you do not want to load the virtual terminal emulator widget -at startup. If you do not have <tt class="docutils literal">libvte.so.4</tt> installed, +at startup. If you do not have <tt class="docutils literal"><span class="pre">libvte.so.4</span></tt> installed, then terminal-support is automatically disabled. Only available if Geany was compiled with support for VTE.</td> </tr> @@ -822,7 +822,7 @@ <td>--vte-lib</td> <td>Specify explicitly the path including filename or only the filename to the VTE library, e.g. -<tt class="docutils literal">/usr/lib/libvte.so</tt> or <tt class="docutils literal">libvte.so</tt>. This option is +<tt class="docutils literal"><span class="pre">/usr/lib/libvte.so</span></tt> or <tt class="docutils literal"><span class="pre">libvte.so</span></tt>. This option is only needed when the auto-detection does not work. Only available if Geany was compiled with support for VTE.</td> </tr> @@ -861,13 +861,13 @@ <p>Geany supports all generic GTK options, a list is available on the help screen.</p> </div> -<div class="section" id="general"> -<h2><a class="toc-backref" href="#id33">General</a></h2> -<div class="section" id="startup"> -<h3><a class="toc-backref" href="#id34">Startup</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id33" id="general" name="general">General</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id34" id="startup" name="startup">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 internal" href="#general-startup-preferences">General Startup preferences</a>). If you specify some +(see <a class="reference" href="#general-startup-preferences">General Startup preferences</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 @@ -878,8 +878,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" id="opening-files-from-the-command-line-in-a-running-instance"> -<h3><a class="toc-backref" href="#id35">Opening files from the command-line in a running instance</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id35" 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> <p>Geany detects if there is an an instance of itself already running and opens files from the command-line in that instance. So, Geany can be used to view and edit files by opening them from other programs @@ -888,22 +888,22 @@ <pre class="literal-block"> geany some_file.foo:55:4 </pre> -<p>This would open the file <tt class="docutils literal">some_file.foo</tt> with the cursor on line 55, +<p>This would open the file <tt class="docutils literal"><span class="pre">some_file.foo</span></tt> with the cursor on line 55, 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 internal" href="#command-line-options">Command line options</a>.</p> +called <a class="reference" href="#command-line-options">Command line options</a>.</p> </div> -<div class="section" id="virtual-terminal-emulator-widget-vte"> -<h3><a class="toc-backref" href="#id36">Virtual terminal emulator widget (VTE)</a></h3> -<p>If you have installed <tt class="docutils literal">libvte.so</tt> on your system, it is loaded +<div class="section"> +<h3><a class="toc-backref" href="#id36" id="virtual-terminal-emulator-widget-vte" name="virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a></h3> +<p>If you have installed <tt class="docutils literal"><span class="pre">libvte.so</span></tt> on your system, it is loaded automatically by Geany, and you will have a terminal widget in the notebook at the bottom.</p> -<p>If Geany cannot find any <tt class="docutils literal">libvte.so</tt> at startup, the terminal widget +<p>If Geany cannot find any <tt class="docutils literal"><span class="pre">libvte.so</span></tt> at startup, the terminal widget 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 internal" href="#command-line-options">Command line options</a>.</p> +see the section called <a class="reference" href="#command-line-options">Command line options</a>.</p> <p>You can use this terminal (from now on called VTE) much as you would a terminal program like xterm. There is basic clipboard support. You can paste the contents of the clipboard by pressing the right mouse @@ -920,26 +920,26 @@ you can use the argument <tt class="docutils literal"><span class="pre">--login</span></tt>.</p> <div class="note"> <p class="first admonition-title">Note</p> -<p class="last">Geany tries to load <tt class="docutils literal">libvte.so</tt>. If this fails, it tries to load +<p class="last">Geany tries to load <tt class="docutils literal"><span class="pre">libvte.so</span></tt>. If this fails, it tries to load some other filenames. If this fails too, you should check whether you installed libvte correctly. Again note, Geany will run without this library.</p> </div> <p>It could be, that the library is called something else than -<tt class="docutils literal">libvte.so</tt> (e.g. on FreeBSD 6.0 it is called <tt class="docutils literal">libvte.so.8</tt>). If so +<tt class="docutils literal"><span class="pre">libvte.so</span></tt> (e.g. on FreeBSD 6.0 it is called <tt class="docutils literal"><span class="pre">libvte.so.8</span></tt>). If so please set a link to the correct file (as root):</p> <pre class="literal-block"> # ln -s /usr/lib/libvte.so.X /usr/lib/libvte.so </pre> <p>Obviously, you have to adjust the paths and set X to the number of your -<tt class="docutils literal">libvte.so</tt>.</p> +<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 internal" href="#command-line-options">Command line options</a>) or at compile time +line (see the section called <a class="reference" 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" id="defining-own-widget-styles-using-gtkrc-2-0"> -<h3><a class="toc-backref" href="#id37">Defining own widget styles using .gtkrc-2.0</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id37" 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> <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 @@ -979,10 +979,10 @@ </pre> </div> </div> -<div class="section" id="documents"> -<h2><a class="toc-backref" href="#id38">Documents</a></h2> -<div class="section" id="switching-between-documents"> -<h3><a class="toc-backref" href="#id39">Switching between documents</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id38" id="documents" name="documents">Documents</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id39" id="switching-between-documents" name="switching-between-documents">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 @@ -990,14 +990,14 @@ (regardless of whether or not editor tabs are visible).</p> <p>The tabs can be positioned at the top, bottom, left, or right of the main editing window, by a selection in the interface preferences.</p> -<p>See the <a class="reference internal" href="#notebook-tab-keybindings">Notebook tab keybindings</a> section for useful +<p>See the <a class="reference" href="#notebook-tab-keybindings">Notebook tab keybindings</a> section for useful shortcuts including for Most-Recently-Used document switching.</p> </div> </div> -<div class="section" id="character-sets-and-unicode-byte-order-mark-bom"> -<h2><a class="toc-backref" href="#id40">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> -<div class="section" id="using-character-sets"> -<h3><a class="toc-backref" href="#id41">Using character sets</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id40" 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="#id41" id="using-character-sets" name="using-character-sets">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 convert a file from one character set to another. To do this, @@ -1043,8 +1043,8 @@ </li> </ul> </div> -<div class="section" id="in-file-encoding-specification"> -<h3><a class="toc-backref" href="#id42">In-file encoding specification</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id42" id="in-file-encoding-specification" name="in-file-encoding-specification">In-file encoding specification</a></h3> <p>Geany detects meta tags of HTML files which contain charset information like:</p> <pre class="literal-block"> @@ -1071,7 +1071,7 @@ correctly the next time.</p> <p>Since Geany 0.15 you can also use lines which match the regular expression used to find the encoding string: -<tt class="docutils literal"><span class="pre">coding[\t</span> <span class="pre">]*[:=][\t</span> <span class="pre">]*([a-z0-9-]+)[\t</span> ]*</tt></p> +<tt class="docutils literal"><span class="pre">coding[\t</span> <span class="pre">]*[:=][\t</span> <span class="pre">]*([a-z0-9-]+)[\t</span> <span class="pre">]*</span></tt></p> <div class="note"> <p class="first admonition-title">Note</p> <p class="last">These specifications must be in the first 512 bytes of the file. @@ -1086,8 +1086,8 @@ # coding: ISO-8859-15 </pre> </div> -<div class="section" id="special-encoding-none"> -<h3><a class="toc-backref" href="#id43">Special encoding "None"</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id43" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> <p>There is a special encoding "None" which uses no encoding. It is useful when you know that Geany cannot auto-detect the encoding of a file and it is not displayed correctly. Especially @@ -1096,10 +1096,10 @@ of the first NULL-byte. Using this encoding opens the file as it is without any character conversion.</p> </div> -<div class="section" id="unicode-byte-order-mark-bom"> -<h3><a class="toc-backref" href="#id44">Unicode Byte-Order-Mark (BOM)</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id44" id="unicode-byte-order-mark-bom" name="unicode-byte-order-mark-bom">Unicode Byte-Order-Mark (BOM)</a></h3> <p>Furthermore, Geany detects a Unicode Byte Order Mark (see -<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, +<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, this feature is only available if the opened file is in a 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 @@ -1119,10 +1119,10 @@ </div> </div> </div> -<div class="section" id="editing"> -<h2><a class="toc-backref" href="#id45">Editing</a></h2> -<div class="section" id="folding"> -<h3><a class="toc-backref" href="#id46">Folding</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id45" id="editing" name="editing">Editing</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id46" id="folding" name="folding">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 @@ -1146,8 +1146,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" id="column-mode-editing-rectangular-selections"> -<h3><a class="toc-backref" href="#id47">Column mode editing (rectangular selections)</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id47" id="column-mode-editing-rectangular-selections" name="column-mode-editing-rectangular-selections">Column mode editing (rectangular selections)</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 keys (or Control and Alt if it doesn't work) while @@ -1157,18 +1157,18 @@ this selection and the modifications will be done for every line in the selection.</p> </div> -<div class="section" id="drag-and-drop-of-text"> -<h3><a class="toc-backref" href="#id48">Drag and drop of text</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id48" id="drag-and-drop-of-text" name="drag-and-drop-of-text">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" id="indentation"> -<h3><a class="toc-backref" href="#id49">Indentation</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id49" id="indentation" name="indentation">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 internal" href="#editor-features-preferences">Editor Features +multiple spaces. The default indent mode is set in the <a class="reference" href="#editor-features-preferences">Editor Features preferences</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, @@ -1186,8 +1186,8 @@ on a line.</dd> </dl> </div> -<div class="section" id="auto-indentation"> -<h3><a class="toc-backref" href="#id50">Auto-indentation</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id50" id="auto-indentation" name="auto-indentation">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> @@ -1207,8 +1207,8 @@ match the indentation of the line with the opening brace.</dd> </dl> </div> -<div class="section" id="bookmarks"> -<h3><a class="toc-backref" href="#id51">Bookmarks</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id51" id="bookmarks" name="bookmarks">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> @@ -1225,14 +1225,14 @@ (Ctrl-PgUp/PgDn and Ctrl-Tab) provides a particularly fast way to navigate around multiple files.</p> </div> -<div class="section" id="code-navigation-history"> -<h3><a class="toc-backref" href="#id52">Code navigation history</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id52" id="code-navigation-history" name="code-navigation-history">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 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><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>Symbol list items</li> <li>Build errors</li> <li>Message items</li> @@ -1244,8 +1244,8 @@ location". This makes it easier to navigate in e.g. foreign code and between different files.</p> </div> -<div class="section" id="sending-text-through-custom-commands"> -<h3><a class="toc-backref" href="#id53">Sending text through custom commands</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id53" id="sending-text-through-custom-commands" name="sending-text-through-custom-commands">Sending text through custom commands</a></h3> <p>You can define several custom commands in Geany and send the current selection to one of these commands using the "Edit->Format->Send Selection to" menu or keybindings. @@ -1263,17 +1263,17 @@ 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" id="context-actions"> -<h3><a class="toc-backref" href="#id54">Context actions</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id54" id="context-actions" name="context-actions">Context actions</a></h3> <p>You can execute the context action command on the current word at the cursor position or the available selection. This word or selection can be used as an argument to the command. The context action is invoked by a menu entry in the popup menu of the editor and also a keyboard shortcut (see the section called -<a class="reference internal" href="#keybindings">Keybindings</a>).</p> +<a class="reference" href="#keybindings">Keybindings</a>).</p> <p>The command can be specified in the preferences dialog and also for each filetype (see "context_action_cmd" in the section called -<a class="reference internal" href="#format">Format</a>). When the context action is invoked, the filetype +<a class="reference" href="#format">Format</a>). When the context action is invoked, the filetype specific command is used if available, otherwise the command specified in the preferences dialog is executed.</p> <p>The current word or selection can be referred with the wildcard "%s" @@ -1288,19 +1288,19 @@ <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 external" href="http://www.php.net/echo">http://www.php.net/echo</a>.</p> +called firefox) and it will open the address: <a class="reference" href="http://www.php.net/echo">http://www.php.net/echo</a>.</p> </div> -<div class="section" id="autocompletion"> -<h3><a class="toc-backref" href="#id55">Autocompletion</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id55" id="autocompletion" name="autocompletion">Autocompletion</a></h3> <p>Geany can offer a list of possible completions for symbols defined in the tags and for all words in a document.</p> <p>The autocompletion list for symbols is presented when the first few -characters of the symbol are typed (configurable, see <a class="reference internal" href="#editor-completions-preferences">Editor Completions +characters of the symbol are typed (configurable, see <a class="reference" href="#editor-completions-preferences">Editor Completions preferences</a>, default 4) or when the <em>Complete word</em> -keybinding is pressed (configurable, see <a class="reference internal" href="#editor-keybindings">Editor keybindings</a>, +keybinding is pressed (configurable, see <a class="reference" href="#editor-keybindings">Editor keybindings</a>, default Ctrl-Space).</p> <p>When the defined keybinding is typed and the <em>Autocomplete all words in -document</em> preference (in <a class="reference internal" href="#editor-completions-preferences">Editor Completions preferences</a>) +document</em> preference (in <a class="reference" href="#editor-completions-preferences">Editor Completions preferences</a>) is selected then the autocompletion list will show all matching words in the document, if there are no matching symbols.</p> <p>If you don't want to use autocompletion it can be dismissed until @@ -1312,13 +1312,13 @@ item on the autocompletion list can be chosen from the list by pressing Enter/Return. You can also double-click to select an item. The sequence will be completed to match the chosen item, and if the <em>Drop rest of -word on completion</em> preference is set (in <a class="reference internal" href="#editor-completions-preferences">Editor Completions +word on completion</em> preference is set (in <a class="reference" href="#editor-completions-preferences">Editor Completions preferences</a>) then any characters after the cursor that match a symbol or word are deleted.</p> -<div class="section" id="word-part-completion"> -<h4><a class="toc-backref" href="#id56">Word part completion</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id56" id="word-part-completion" name="word-part-completion">Word part completion</a></h4> <p>By default, pressing Tab will complete the selected item by word part; -useful e.g. for adding the prefix <tt class="docutils literal">gtk_combo_box_entry_</tt> without typing it +useful e.g. for adding the prefix <tt class="docutils literal"><span class="pre">gtk_combo_box_entry_</span></tt> without typing it manually:</p> <ul class="simple"> <li>gtk_com<TAB></li> @@ -1327,12 +1327,12 @@ <li>gtk_combo_box_entry_<s><ENTER></li> <li>gtk_combo_box_entry_set_text_column</li> </ul> -<p>The key combination can be changed from Tab - See <a class="reference internal" href="#editor-keybindings">Editor keybindings</a>. +<p>The key combination can be changed from Tab - See <a class="reference" href="#editor-keybindings">Editor keybindings</a>. If you clear/change the key combination for word part completion, Tab will complete the whole word instead, like Enter.</p> </div> -<div class="section" id="scope-autocompletion"> -<h4><a class="toc-backref" href="#id57">Scope autocompletion</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id57" id="scope-autocompletion" name="scope-autocompletion">Scope autocompletion</a></h4> <p>E.g.:</p> <pre class="literal-block"> struct @@ -1341,7 +1341,7 @@ char c; } foo; </pre> -<p>When you type <tt class="docutils literal">foo.</tt> it will show an autocompletion list with 'i' and +<p>When you type <tt class="docutils literal"><span class="pre">foo.</span></tt> it will show an autocompletion list with 'i' and 'c' symbols.</p> <p>It only works for languages that set parent scope names for e.g. struct members. Currently this means C-like languages. The C tag parser only @@ -1349,27 +1349,27 @@ in local scope.</p> </div> </div> -<div class="section" id="user-definable-snippets"> -<h3><a class="toc-backref" href="#id58">User-definable snippets</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id58" id="user-definable-snippets" name="user-definable-snippets">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 when typing common strings and letting Geany do the work for you. To know what to complete or replace Geany reads a configuration file -called <tt class="docutils literal">snippets.conf</tt> at startup.</p> +called <tt class="docutils literal"><span class="pre">snippets.conf</span></tt> at startup.</p> <p>Maybe you need to often type your name, so define a snippet like this:</p> <pre class="literal-block"> [Default] myname=Enrico Tröger </pre> -<p>Every time you write <tt class="docutils literal">myname</tt> <TAB> in Geany, it will replace "myname" +<p>Every time you write <tt class="docutils literal"><span class="pre">myname</span></tt> <TAB> in Geany, it will replace "myname" with "Enrico Tröger". The key to start autocompletion can be changed in the preferences dialog, by default it is TAB. The corresponding keybinding -is called <tt class="docutils literal">Complete snippet</tt>.</p> +is called <tt class="docutils literal"><span class="pre">Complete</span> <span class="pre">snippet</span></tt>.</p> <p>The system-wide configuration file can be found in -<tt class="docutils literal">$prefix/share/geany</tt>, where <tt class="docutils literal">$prefix</tt> is the path where Geany is -installed (see <a class="reference internal" href="#installation-prefix">Installation prefix</a>). It is not recommended to edit the +<tt class="docutils literal"><span class="pre">$prefix/share/geany</span></tt>, where <tt class="docutils literal"><span class="pre">$prefix</span></tt> is the path where Geany is +installed (see <a class="reference" href="#installation-prefix">Installation prefix</a>). It is not recommended to edit the system-wide file, because it will be overridden when Geany is updated.</p> -<p>To change the settings, copy the file from <tt class="docutils literal">$prefix/share/geany</tt> +<p>To change the settings, copy the file from <tt class="docutils literal"><span class="pre">$prefix/share/geany</span></tt> in your configuration directory (usually <tt class="docutils literal"><span class="pre">~/.config/geany/</span></tt>).</p> <p>For example:</p> <pre class="literal-block"> @@ -1380,15 +1380,15 @@ configuration directory. Alternatively, you can create a file <tt class="docutils literal"><span class="pre">~/.config/geany/snippets.conf</span></tt> and add only these settings you want to change. All missing settings will be read from the global snippets -file in <tt class="docutils literal">$prefix/share/geany</tt>.</p> -<p>The file <tt class="docutils literal">snippets.conf</tt> contains sections defining snippets that +file in <tt class="docutils literal"><span class="pre">$prefix/share/geany</span></tt>.</p> +<p>The file <tt class="docutils literal"><span class="pre">snippets.conf</span></tt> contains sections defining snippets that are available for particular filetypes and in general.</p> <p>The two sections "Default" and "Special" apply to all filetypes. "Default" contains all snippets which are available for every filetype and "Special" contains snippets which can only be used in other snippets. So you can define often used parts of snippets and just use the special snippet as a placeholder (see the -<tt class="docutils literal">snippets.conf</tt> for details).</p> +<tt class="docutils literal"><span class="pre">snippets.conf</span></tt> for details).</p> <p>You can define sections with the name of a filetype eg "C++". The snippets in that section are only available for use in files with that filetype. Snippets in filetype sections will hide snippets with the @@ -1418,7 +1418,7 @@ <tr><td>%cursor%</td> <td>Place the cursor at this position after completion has been done. You can define multiple %cursor% wildcards -and use the keybinding <tt class="docutils literal">Move cursor in snippet</tt> to jump +and use the keybinding <tt class="docutils literal"><span class="pre">Move</span> <span class="pre">cursor</span> <span class="pre">in</span> <span class="pre">snippet</span></tt> to jump to the next defined cursor position in the completed snippet.</td> </tr> @@ -1432,18 +1432,18 @@ <p>Snippet names must not contain spaces otherwise they won't work correctly. But beside that you can define almost any string as a snippet and use it later in Geany. It is not limited -to existing contructs of certain programming languages(like <tt class="docutils literal">if</tt>, -<tt class="docutils literal">for</tt>, <tt class="docutils literal">switch</tt>). Define whatever you need.</p> +to existing contructs of certain programming languages(like <tt class="docutils literal"><span class="pre">if</span></tt>, +<tt class="docutils literal"><span class="pre">for</span></tt>, <tt class="docutils literal"><span class="pre">switch</span></tt>). Define whatever you need.</p> <p>Since Geany 0.15 you can also use most of the available templates wildcards -listed in <a class="reference internal" href="#template-wildcards">Template wildcards</a>. All wildcards which are listed as +listed in <a class="reference" 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] myname=My name is {developer} mysystem=My system: {command:uname -a} </pre> -<p>this will replace <tt class="docutils literal">myname</tt> with "My name is " and the value of the template -preference <tt class="docutils literal">developer</tt>.</p> +<p>this will replace <tt class="docutils literal"><span class="pre">myname</span></tt> with "My name is " and the value of the template +preference <tt class="docutils literal"><span class="pre">developer</span></tt>.</p> <p>You can change the way Geany recognizes the word to complete, that is how the start and end of a word is recognised when the snippet completion is requested. The section "Special" may @@ -1452,8 +1452,8 @@ default characters or define it to add or remove characters to fit your needs.</p> </div> -<div class="section" id="inserting-unicode-characters"> -<h3><a class="toc-backref" href="#id59">Inserting Unicode characters</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id59" id="inserting-unicode-characters" name="inserting-unicode-characters">Inserting Unicode characters</a></h3> <p>With GTK 2.10 and above, you can insert Unicode code points by hitting Ctrl-Shift-u, then still holding Ctrl-Shift, type some hex digits representing the code point for the character you want and hit Enter or Return (still @@ -1462,7 +1462,7 @@ character is also entered. In the case of Enter/Return, it is a newline, as you might expect.</p> <p>In some earlier versions of Geany, you might need to first unbind Ctrl-Shift-u -in the <a class="reference internal" href="#keybinding-preferences">keybinding preferences</a>, then select <em>Tools->Reload Configuration</em> +in the <a class="reference" href="#keybinding-preferences">keybinding preferences</a>, then select <em>Tools->Reload Configuration</em> or 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 (and the Enter or Return to finish the code point).</p> @@ -1471,8 +1471,8 @@ keys conflict with other Geany keybindings.</p> </div> </div> -<div class="section" id="search-replace-and-go-to"> -<h2><a class="toc-backref" href="#id60">Search, replace and go to</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id60" id="search-replace-and-go-to" name="search-replace-and-go-to">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"> @@ -1485,38 +1485,42 @@ <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 <a class="reference internal" href="#search-keybindings">Search keybindings</a>).</p> -<div class="section" id="toolbar-entries"> -<h3><a class="toc-backref" href="#id61">Toolbar entries</a></h3> +using a keyboard shortcut (see <a class="reference" href="#search-keybindings">Search keybindings</a>).</p> +<div class="section"> +<h3><a class="toc-backref" href="#id61" id="toolbar-entries" name="toolbar-entries">Toolbar entries</a></h3> <p>There are also two toolbar entries:</p> <ul class="simple"> <li>Search bar</li> <li>Go to line entry</li> </ul> -<p>There are keybindings to focus each of these - see <a class="reference internal" href="#focus-keybindings">Focus +<p>There are keybindings to focus each of these - see <a class="reference" href="#focus-keybindings">Focus keybindings</a>. Pressing Escape will then focus the editor.</p> -<div class="section" id="search-bar"> -<h4><a class="toc-backref" href="#id62">Search bar</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id62" id="search-bar" name="search-bar">Search bar</a></h4> <p>The quickest way to find some text is to use the search bar entry in the toolbar. This performs a case-insensitive search in the current document whilst you type. Pressing Enter will search again.</p> </div> </div> -<div class="section" id="find"> -<h3><a class="toc-backref" href="#id63">Find</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id63" id="find" name="find">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" id="matching-options"> -<h4><a class="toc-backref" href="#id64">Matching options</a></h4> -<p>The syntax for the Use regular expressions option is shown in -<a class="reference internal" href="#regular-expressions">Regular expressions</a>.</p> -<p>The Use escape sequences option will transform any escaped characters +<div class="section"> +<h4><a class="toc-backref" href="#id64" id="matching-options" name="matching-options">Matching options</a></h4> +<p>The syntax for the <em>Use regular expressions</em> option is shown in +<a class="reference" href="#regular-expressions">Regular expressions</a>.</p> +<div class="note"> +<p class="first admonition-title">Note</p> +<p class="last"><em>Use escape sequences</em> is implied for regular expressions.</p> +</div> +<p>The <em>Use escape sequences</em> option will transform any escaped characters into their UTF-8 equivalent. For example, \t will be transformed into a tab character. Other recognized symbols are: \\, \n, \r, \uXXXX (Unicode characters).</p> </div> -<div class="section" id="find-all"> -<h4><a class="toc-backref" href="#id65">Find all</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id65" id="find-all" name="find-all">Find all</a></h4> <p>To find all matches, click on the Find All expander. This will reveal several options:</p> <ul class="simple"> @@ -1531,8 +1535,8 @@ colored box. These markers can be removed by selecting the Remove Markers command from the Document menu.</p> </div> -<div class="section" id="change-font-in-search-dialog-text-fields"> -<h4><a class="toc-backref" href="#id66">Change font in search dialog text fields</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id66" 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> <p>All search related dialogs use a Monospace for the text input fields to increase the readability of input text. This is useful when you are typing input such as regular expressions with spaces, periods and commas which @@ -1553,8 +1557,8 @@ for the search dialogs.</p> </div> </div> -<div class="section" id="find-usage"> -<h3><a class="toc-backref" href="#id67">Find usage</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id67" id="find-usage" name="find-usage">Find usage</a></h3> <p>Find usage searches all open files. It is similar to the Find All In Session option in the Find dialog.</p> <p>If there is a selection, then it is used as the search text; otherwise @@ -1563,8 +1567,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" id="find-in-files"> -<h3><a class="toc-backref" href="#id68">Find in files</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id68" id="find-in-files" name="find-in-files">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 @@ -1575,30 +1579,30 @@ and the search results are converted back to UTF-8. The Extra options field is used to pass any additional arguments to the grep tool.</p> -<div class="section" id="filtering-out-version-control-files"> -<h4><a class="toc-backref" href="#id69">Filtering out version control files</a></h4> +<div class="section"> @@ 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:[4745] trunk
by eht16＠users.sourceforge.net 09 Mar '10

09 Mar '10

Revision: 4745 http://geany.svn.sourceforge.net/geany/?rev=4745&view=rev Author: eht16 Date: 2010-03-08 23:05:58 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Skip unavailable languages in LINGUAS (thanks to Christian Dywan). Modified Paths: -------------- trunk/ChangeLog trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-03-08 22:43:14 UTC (rev 4744) +++ trunk/ChangeLog 2010-03-08 23:05:58 UTC (rev 4745) @@ -1,3 +1,9 @@ +2010-03-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * wscript: + Skip unavailable languages in LINGUAS (thanks to Christian Dywan). + + 2010-03-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * wscript, scintilla/*, scintilla/include/*: Modified: trunk/wscript =================================================================== --- trunk/wscript 2010-03-08 22:43:14 UTC (rev 4744) +++ trunk/wscript 2010-03-08 23:05:58 UTC (rev 4745) @@ -521,7 +521,10 @@ def write_linguas_file(self): linguas = '' if 'LINGUAS' in Build.bld.env: - linguas = Build.bld.env['LINGUAS'] + files = Build.bld.env['LINGUAS'] + for po_filename in files.split(' '): + if os.path.exists ('po/%s.po' % po_filename): + linguas += '%s ' % po_filename else: files = os.listdir('%s/po' % self.path.abspath()) files.sort() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4744] trunk/ChangeLog
by eht16＠users.sourceforge.net 08 Mar '10

08 Mar '10

Revision: 4744 http://geany.svn.sourceforge.net/geany/?rev=4744&view=rev Author: eht16 Date: 2010-03-08 22:43:14 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Adjust ChangeLog due to Can Koy's request Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-03-08 17:03:03 UTC (rev 4743) +++ trunk/ChangeLog 2010-03-08 22:43:14 UTC (rev 4744) @@ -15,8 +15,7 @@ more compatible with the Gnome HIG. Fix broken 'Save' action in 'Resave missing file' dialog. * tagmanager/php.c: - Improve PHP parser to parse also the argument lists of PHP - functions (patch by Can Koy, thanks). + Improve PHP parser to parse also the argument lists of PHP functions. * src/prefs.c: Correctly set the parent widget for the keybinding overwrite confirmation dialog. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4743] branches/gnu-regex
by ntrel＠users.sourceforge.net 08 Mar '10

08 Mar '10

Revision: 4743 http://geany.svn.sourceforge.net/geany/?rev=4743&view=rev Author: ntrel Date: 2010-03-08 17:03:03 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Update for POSIX-regexes. Modified Paths: -------------- branches/gnu-regex/ChangeLog branches/gnu-regex/doc/geany.html branches/gnu-regex/doc/geany.txt Modified: branches/gnu-regex/ChangeLog =================================================================== --- branches/gnu-regex/ChangeLog 2010-03-08 16:27:51 UTC (rev 4742) +++ branches/gnu-regex/ChangeLog 2010-03-08 17:03:03 UTC (rev 4743) @@ -9,6 +9,8 @@ * src/search.c: Implement POSIX-regex Replace All (could be more efficient but seems OK for now). + * doc/geany.txt, doc/geany.html: + Update for POSIX-regexes. 2010-03-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/gnu-regex/doc/geany.html =================================================================== --- branches/gnu-regex/doc/geany.html 2010-03-08 16:27:51 UTC (rev 4742) +++ branches/gnu-regex/doc/geany.html 2010-03-08 17:03:03 UTC (rev 4743) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2010-02-21" /> +<meta name="date" content="2010-02-24" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2010-02-21</td></tr> +<td>2010-02-24</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.19</td></tr> </tbody> @@ -1507,9 +1507,13 @@ <img alt="./images/find_dialog.png" src="./images/find_dialog.png" /> <div class="section"> <h4><a class="toc-backref" href="#id64" id="matching-options" name="matching-options">Matching options</a></h4> -<p>The syntax for the Use regular expressions option is shown in +<p>The syntax for the <em>Use regular expressions</em> option is shown in <a class="reference" href="#regular-expressions">Regular expressions</a>.</p> -<p>The Use escape sequences option will transform any escaped characters +<div class="note"> +<p class="first admonition-title">Note</p> +<p class="last"><em>Use escape sequences</em> is implied for regular expressions.</p> +</div> +<p>The <em>Use escape sequences</em> option will transform any escaped characters into their UTF-8 equivalent. For example, \t will be transformed into a tab character. Other recognized symbols are: \\, \n, \r, \uXXXX (Unicode characters).</p> @@ -1633,23 +1637,18 @@ <div class="section"> <h3><a class="toc-backref" href="#id75" id="regular-expressions" name="regular-expressions">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> +by selecting the <em>Use regular expressions</em> check box (see <a class="reference" href="#matching-options">Matching +options</a>). The syntax is POSIX compatible, as described in the table +below.</p> <div class="note"> <p class="first admonition-title">Note</p> -<ol class="last arabic simple"> -<li>Searching backwards with regular expressions is not supported.</li> -<li>\r and \n are never matched because regular expression -searches are made line per line (stripped of end-of-line chars).</li> -<li>The POSIX '?' regular expression character for optional -matching is not supported.</li> -</ol> +<p class="last">Searching backwards with regular expressions is not supported.</p> </div> <p><strong>In a regular expression, the following characters are interpreted:</strong></p> <table border="1" class="docutils"> <colgroup> -<col width="8%" /> -<col width="92%" /> +<col width="10%" /> +<col width="90%" /> </colgroup> <tbody valign="top"> <tr><td>.</td> @@ -1667,11 +1666,11 @@ Fred([1-9])XXX and the replace string was Sam\1YYY, when applied to Fred2XXX this would generate Sam2YYY.</td> </tr> -<tr><td>\<</td> -<td>This matches the start of a word.</td> +<tr><td>\0</td> +<td>When replacing, the whole matching text.</td> </tr> -<tr><td>\></td> -<td>This matches the end of a word.</td> +<tr><td>\b</td> +<td>This matches a word boundary.</td> </tr> <tr><td>\c</td> <td><p class="first">A backslash followed by d, D, s, S, w or W, becomes a @@ -1681,8 +1680,8 @@ <li>D: any char except decimal digits</li> <li>s: whitespace (space, \t \n \r \f \v)</li> <li>S: any char except whitespace (see above)</li> -<li>w: alphanumeric & underscore (changed by user setting)</li> -<li>W: any char except alphanumeric & underscore (see above)</li> +<li>w: alphanumeric & underscore</li> +<li>W: any char except alphanumeric & underscore</li> </ul> </td> </tr> @@ -1692,25 +1691,25 @@ and not as the start of a character set. Use \\ for a literal backslash.</td> </tr> -<tr><td>\xHH</td> -<td>A backslash followed by x and two hexa digits, becomes the -character whose Ascii code is equal to these digits. If not -followed by two digits, it is 'x' char itself.</td> +<tr><td>\uHHHH</td> +<td>A backslash followed by u and one, two or four hexa digits, +becomes the character whose Unicode is equal to these digits.</td> </tr> <tr><td>[...]</td> <td><p class="first">Matches one of the characters in the set. If the first character in the set is ^, it matches the characters NOT in the set, i.e. complements the set. A shorthand S-E (start dash end) is used to specify a set of characters S up to E, -inclusive. The special characters ] and - have no special -meaning if they appear as the first chars in the set. To -include both, put - first: [-]A-Z] (or just backslash them).</p> +inclusive.</p> +<p>The special characters ] and - have no special +meaning if they appear first in the set. - can also be last +in the set. To include both, put ] first: []A-Z-].</p> <p>Examples:</p> <pre class="last literal-block"> -[-]|] matches these 3 chars +[]|-] matches these 3 chars []-|] matches from ] to | chars [a-z] any lowercase alpha -[^-]] any char except - and ] +[^]-] any char except - and ] [^A-Z] any char except uppercase alpha [a-zA-Z] any alpha </pre> @@ -1731,6 +1730,9 @@ <td>This matches 1 or more times. For example, Sa+m matches Sam, Saam, Saaam and so on.</td> </tr> +<tr><td>?</td> +<td>This matches 0 or 1 time(s). For example, Joh?n matches John, Jon.</td> +</tr> </tbody> </table> <div class="note"> @@ -5932,7 +5934,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2010-02-24 15:04 UTC. +Generated on: 2010-03-08 16:57 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: branches/gnu-regex/doc/geany.txt =================================================================== --- branches/gnu-regex/doc/geany.txt 2010-03-08 16:27:51 UTC (rev 4742) +++ branches/gnu-regex/doc/geany.txt 2010-03-08 17:03:03 UTC (rev 4743) @@ -1127,10 +1127,13 @@ Matching options ```````````````` -The syntax for the Use regular expressions option is shown in +The syntax for the *Use regular expressions* option is shown in `Regular expressions`_. -The Use escape sequences option will transform any escaped characters +.. note:: + *Use escape sequences* is implied for regular expressions. + +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 recognized symbols are: \\\\, \\n, \\r, \\uXXXX (Unicode characters). @@ -1286,19 +1289,16 @@ ^^^^^^^^^^^^^^^^^^^ 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. +by selecting the *Use regular expressions* check box (see `Matching +options`_). The syntax is POSIX compatible, as described in the table +below. .. note:: - (1) Searching backwards with regular expressions is not supported. - (2) \\r and \\n are never matched because regular expression - searches are made line per line (stripped of end-of-line chars). - (3) The POSIX '?' regular expression character for optional - matching is not supported. + Searching backwards with regular expressions is not supported. **In a regular expression, the following characters are interpreted:** -====== ============================================================ +======= ============================================================ . Matches any character. ( This marks the start of a region for tagging a match. @@ -1310,9 +1310,9 @@ Fred([1-9])XXX and the replace string was Sam\\1YYY, when applied to Fred2XXX this would generate Sam2YYY. -\\< This matches the start of a word. +\\0 When replacing, the whole matching text. -\\> This matches the end of a word. +\\b This matches a word boundary. \\c A backslash followed by d, D, s, S, w or W, becomes a character class (both inside and outside sets []). @@ -1321,32 +1321,33 @@ * D: any char except decimal digits * s: whitespace (space, \\t \\n \\r \\f \\v) * S: any char except whitespace (see above) - * w: alphanumeric & underscore (changed by user setting) - * W: any char except alphanumeric & underscore (see above) + * w: alphanumeric & underscore + * W: any char except alphanumeric & underscore \\x This allows you to use a character x that would otherwise have a special meaning. For example, \\[ would be interpreted as [ and not as the start of a character set. Use \\\\ for a literal backslash. -\\xHH A backslash followed by x and two hexa digits, becomes the - character whose Ascii code is equal to these digits. If not - followed by two digits, it is 'x' char itself. +\\uHHHH A backslash followed by u and one, two or four hexa digits, + becomes the character whose Unicode is equal to these digits. [...] Matches one of the characters in the set. If the first character in the set is ^, it matches the characters NOT in the set, i.e. complements the set. A shorthand S-E (start dash end) is used to specify a set of characters S up to E, - inclusive. The special characters ] and - have no special - meaning if they appear as the first chars in the set. To - include both, put - first: [-]A-Z] (or just backslash them). + inclusive. + The special characters ] and - have no special + meaning if they appear first in the set. - can also be last + in the set. To include both, put ] first: []A-Z-]. + Examples:: - [-]|] matches these 3 chars + []|-] matches these 3 chars []-|] matches from ] to | chars [a-z] any lowercase alpha - [^-]] any char except - and ] + [^]-] any char except - and ] [^A-Z] any char except uppercase alpha [a-zA-Z] any alpha @@ -1360,8 +1361,10 @@ \+ This matches 1 or more times. For example, Sa+m matches Sam, Saam, Saaam and so on. -====== ============================================================ +\? This matches 0 or 1 time(s). For example, Joh?n matches John, Jon. +======= ============================================================ + .. note:: This table is adapted from Scintilla and SciTE documentation, distributed under the `License for Scintilla and SciTE`_. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4742] branches/gnu-regex/src/search.c
by ntrel＠users.sourceforge.net 08 Mar '10

08 Mar '10

Revision: 4742 http://geany.svn.sourceforge.net/geany/?rev=4742&view=rev Author: ntrel Date: 2010-03-08 16:27:51 +0000 (Mon, 08 Mar 2010) Log Message: ----------- s/geany_find_text/search_find_text Modified Paths: -------------- branches/gnu-regex/src/search.c Modified: branches/gnu-regex/src/search.c =================================================================== --- branches/gnu-regex/src/search.c 2010-03-08 13:45:14 UTC (rev 4741) +++ branches/gnu-regex/src/search.c 2010-03-08 16:27:51 UTC (rev 4742) @@ -1758,7 +1758,7 @@ } -static gint geany_find_text(ScintillaObject *sci, gint flags, struct Sci_TextToFind *ttf) +static gint search_find_text(ScintillaObject *sci, gint flags, struct Sci_TextToFind *ttf) { regex_t regex; gint pos; @@ -1800,7 +1800,7 @@ { gint pos, line, start, find_len; - pos = geany_find_text(doc->editor->sci, flags, &ttf); + pos = search_find_text(doc->editor->sci, flags, &ttf); if (pos == -1) break; /* no more matches */ find_len = ttf.chrgText.cpMax - ttf.chrgText.cpMin; @@ -1897,7 +1897,7 @@ gint search_pos; gint find_len = 0, replace_len = 0; - search_pos = geany_find_text(sci, flags, ttf); + search_pos = search_find_text(sci, flags, ttf); find_len = ttf->chrgText.cpMax - ttf->chrgText.cpMin; if (search_pos == -1) break; /* no more matches */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4741] branches/gnu-regex
by ntrel＠users.sourceforge.net 08 Mar '10

08 Mar '10

Revision: 4741 http://geany.svn.sourceforge.net/geany/?rev=4741&view=rev Author: ntrel Date: 2010-03-08 13:45:14 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Implement POSIX-regex Replace All (could be more efficient but seems OK for now). Modified Paths: -------------- branches/gnu-regex/ChangeLog branches/gnu-regex/src/search.c Modified: branches/gnu-regex/ChangeLog =================================================================== --- branches/gnu-regex/ChangeLog 2010-03-08 13:28:04 UTC (rev 4740) +++ branches/gnu-regex/ChangeLog 2010-03-08 13:45:14 UTC (rev 4741) @@ -6,6 +6,9 @@ Refactor document_replace_range() with search_replace_range(). * src/search.c, src/search.h, src/document.c: Move search_replace_range() to search.c. + * src/search.c: + Implement POSIX-regex Replace All (could be more efficient but + seems OK for now). 2010-03-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/gnu-regex/src/search.c =================================================================== --- branches/gnu-regex/src/search.c 2010-03-08 13:28:04 UTC (rev 4740) +++ branches/gnu-regex/src/search.c 2010-03-08 13:45:14 UTC (rev 4741) @@ -1878,6 +1878,8 @@ /* ttf is updated to include the last match positions. * Note: Normally you would call sci_start/end_undo_action() around this call. */ +/* Warning: Scintilla recommends caching replacements to do all at once to avoid + * performance issues with SCI_GETCHARACTERPOINTER. */ guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf, gint flags, const gchar *replace_text) { @@ -1895,7 +1897,7 @@ gint search_pos; gint find_len = 0, replace_len = 0; - search_pos = sci_find_text(sci, flags, ttf); + search_pos = geany_find_text(sci, flags, ttf); find_len = ttf->chrgText.cpMax - ttf->chrgText.cpMin; if (search_pos == -1) break; /* no more matches */ @@ -1918,7 +1920,7 @@ if (chNext == '\r' || chNext == '\n') movepastEOL = 1; } - replace_len = sci_replace_target(sci, replace_text, + replace_len = search_replace_target(sci, replace_text, flags & SCFIND_REGEXP); count++; if (search_pos == end) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4740] branches/gnu-regex
by ntrel＠users.sourceforge.net 08 Mar '10

08 Mar '10

Revision: 4740 http://geany.svn.sourceforge.net/geany/?rev=4740&view=rev Author: ntrel Date: 2010-03-08 13:28:04 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Move search_replace_range() to search.c. Modified Paths: -------------- branches/gnu-regex/ChangeLog branches/gnu-regex/src/document.c branches/gnu-regex/src/search.c branches/gnu-regex/src/search.h Modified: branches/gnu-regex/ChangeLog =================================================================== --- branches/gnu-regex/ChangeLog 2010-03-08 13:23:32 UTC (rev 4739) +++ branches/gnu-regex/ChangeLog 2010-03-08 13:28:04 UTC (rev 4740) @@ -4,6 +4,8 @@ Implement POSIX-regex Find All. * src/document.c: Refactor document_replace_range() with search_replace_range(). + * src/search.c, src/search.h, src/document.c: + Move search_replace_range() to search.c. 2010-03-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/gnu-regex/src/document.c =================================================================== --- branches/gnu-regex/src/document.c 2010-03-08 13:23:32 UTC (rev 4739) +++ branches/gnu-regex/src/document.c 2010-03-08 13:28:04 UTC (rev 4740) @@ -2086,67 +2086,6 @@ } -/* ttf is updated to include the last match positions. - * Note: Normally you would call sci_start/end_undo_action() around this call. */ -static guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf, - gint flags, const gchar *replace_text) -{ - gint count = 0; - const gchar *find_text = ttf->lpstrText; - gint start = ttf->chrg.cpMin; - gint end = ttf->chrg.cpMax; - - g_return_val_if_fail(sci != NULL && find_text != NULL && replace_text != NULL, 0); - if (! *find_text) - return 0; - - while (TRUE) - { - gint search_pos; - gint find_len = 0, replace_len = 0; - - search_pos = sci_find_text(sci, flags, ttf); - find_len = ttf->chrgText.cpMax - ttf->chrgText.cpMin; - if (search_pos == -1) - break; /* no more matches */ - if (find_len == 0 && ! NZV(replace_text)) - break; /* nothing to do */ - - if (search_pos + find_len > end) - break; /* found text is partly out of range */ - else - { - gint movepastEOL = 0; - - sci_set_target_start(sci, search_pos); - sci_set_target_end(sci, search_pos + find_len); - - if (find_len <= 0) - { - gchar chNext = sci_get_char_at(sci, sci_get_target_end(sci)); - - if (chNext == '\r' || chNext == '\n') - movepastEOL = 1; - } - replace_len = sci_replace_target(sci, replace_text, - flags & SCFIND_REGEXP); - count++; - if (search_pos == end) - break; /* Prevent hang when replacing regex $ */ - - /* make the next search start after the replaced text */ - start = search_pos + replace_len + movepastEOL; - if (find_len == 0) - start = sci_get_position_after(sci, start); /* prevent '[ ]*' regex rematching part of replaced text */ - ttf->chrg.cpMin = start; - end += replace_len - find_len; /* update end of range now text has changed */ - ttf->chrg.cpMax = end; - } - } - return count; -} - - /* Replace all text matches in a certain range within document. * If not NULL, *new_range_end is set to the new range endpoint after replacing, * or -1 if no text was found. Modified: branches/gnu-regex/src/search.c =================================================================== --- branches/gnu-regex/src/search.c 2010-03-08 13:23:32 UTC (rev 4739) +++ branches/gnu-regex/src/search.c 2010-03-08 13:28:04 UTC (rev 4740) @@ -1876,3 +1876,64 @@ } +/* ttf is updated to include the last match positions. + * Note: Normally you would call sci_start/end_undo_action() around this call. */ +guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf, + gint flags, const gchar *replace_text) +{ + gint count = 0; + const gchar *find_text = ttf->lpstrText; + gint start = ttf->chrg.cpMin; + gint end = ttf->chrg.cpMax; + + g_return_val_if_fail(sci != NULL && find_text != NULL && replace_text != NULL, 0); + if (! *find_text) + return 0; + + while (TRUE) + { + gint search_pos; + gint find_len = 0, replace_len = 0; + + search_pos = sci_find_text(sci, flags, ttf); + find_len = ttf->chrgText.cpMax - ttf->chrgText.cpMin; + if (search_pos == -1) + break; /* no more matches */ + if (find_len == 0 && ! NZV(replace_text)) + break; /* nothing to do */ + + if (search_pos + find_len > end) + break; /* found text is partly out of range */ + else + { + gint movepastEOL = 0; + + sci_set_target_start(sci, search_pos); + sci_set_target_end(sci, search_pos + find_len); + + if (find_len <= 0) + { + gchar chNext = sci_get_char_at(sci, sci_get_target_end(sci)); + + if (chNext == '\r' || chNext == '\n') + movepastEOL = 1; + } + replace_len = sci_replace_target(sci, replace_text, + flags & SCFIND_REGEXP); + count++; + if (search_pos == end) + break; /* Prevent hang when replacing regex $ */ + + /* make the next search start after the replaced text */ + start = search_pos + replace_len + movepastEOL; + if (find_len == 0) + start = sci_get_position_after(sci, start); /* prevent '[ ]*' regex rematching part of replaced text */ + ttf->chrg.cpMin = start; + end += replace_len - find_len; /* update end of range now text has changed */ + ttf->chrg.cpMax = end; + } + } + return count; +} + + Modified: branches/gnu-regex/src/search.h =================================================================== --- branches/gnu-regex/src/search.h 2010-03-08 13:23:32 UTC (rev 4739) +++ branches/gnu-regex/src/search.h 2010-03-08 13:28:04 UTC (rev 4740) @@ -80,4 +80,9 @@ gint search_replace_target(struct _ScintillaObject *sci, const gchar *replace_text, gboolean regex); +struct Sci_TextToFind; + +guint search_replace_range(struct _ScintillaObject *sci, struct Sci_TextToFind *ttf, + gint flags, const gchar *replace_text); + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4739] branches/gnu-regex
by ntrel＠users.sourceforge.net 08 Mar '10

08 Mar '10

Revision: 4739 http://geany.svn.sourceforge.net/geany/?rev=4739&view=rev Author: ntrel Date: 2010-03-08 13:23:32 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Refactor document_replace_range() with search_replace_range(). Modified Paths: -------------- branches/gnu-regex/ChangeLog branches/gnu-regex/src/document.c Modified: branches/gnu-regex/ChangeLog =================================================================== --- branches/gnu-regex/ChangeLog 2010-03-08 12:27:31 UTC (rev 4738) +++ branches/gnu-regex/ChangeLog 2010-03-08 13:23:32 UTC (rev 4739) @@ -2,6 +2,8 @@ * src/search.c: Implement POSIX-regex Find All. + * src/document.c: + Refactor document_replace_range() with search_replace_range(). 2010-03-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/gnu-regex/src/document.c =================================================================== --- branches/gnu-regex/src/document.c 2010-03-08 12:27:31 UTC (rev 4738) +++ branches/gnu-regex/src/document.c 2010-03-08 13:23:32 UTC (rev 4739) @@ -2086,42 +2086,27 @@ } -/* Replace all text matches in a certain range within document. - * If not NULL, *new_range_end is set to the new range endpoint after replacing, - * or -1 if no text was found. - * scroll_to_match is whether to scroll the last replacement in view (which also - * clears the selection). - * Returns: the number of replacements made. */ -static guint -document_replace_range(GeanyDocument *doc, const gchar *find_text, const gchar *replace_text, - gint flags, gint start, gint end, gboolean scroll_to_match, gint *new_range_end) +/* ttf is updated to include the last match positions. + * Note: Normally you would call sci_start/end_undo_action() around this call. */ +static guint search_replace_range(ScintillaObject *sci, struct Sci_TextToFind *ttf, + gint flags, const gchar *replace_text) { gint count = 0; - struct Sci_TextToFind ttf; - ScintillaObject *sci; + const gchar *find_text = ttf->lpstrText; + gint start = ttf->chrg.cpMin; + gint end = ttf->chrg.cpMax; - if (new_range_end != NULL) - *new_range_end = -1; - - g_return_val_if_fail(doc != NULL && find_text != NULL && replace_text != NULL, 0); - - if (! *find_text || doc->readonly) + g_return_val_if_fail(sci != NULL && find_text != NULL && replace_text != NULL, 0); + if (! *find_text) return 0; - sci = doc->editor->sci; - - sci_start_undo_action(sci); - ttf.chrg.cpMin = start; - ttf.chrg.cpMax = end; - ttf.lpstrText = (gchar*)find_text; - while (TRUE) { gint search_pos; gint find_len = 0, replace_len = 0; - search_pos = sci_find_text(sci, flags, &ttf); - find_len = ttf.chrgText.cpMax - ttf.chrgText.cpMin; + search_pos = sci_find_text(sci, flags, ttf); + find_len = ttf->chrgText.cpMax - ttf->chrgText.cpMin; if (search_pos == -1) break; /* no more matches */ if (find_len == 0 && ! NZV(replace_text)) @@ -2153,11 +2138,45 @@ start = search_pos + replace_len + movepastEOL; if (find_len == 0) start = sci_get_position_after(sci, start); /* prevent '[ ]*' regex rematching part of replaced text */ - ttf.chrg.cpMin = start; + ttf->chrg.cpMin = start; end += replace_len - find_len; /* update end of range now text has changed */ - ttf.chrg.cpMax = end; + ttf->chrg.cpMax = end; } } + return count; +} + + +/* Replace all text matches in a certain range within document. + * If not NULL, *new_range_end is set to the new range endpoint after replacing, + * or -1 if no text was found. + * scroll_to_match is whether to scroll the last replacement in view (which also + * clears the selection). + * Returns: the number of replacements made. */ +static guint +document_replace_range(GeanyDocument *doc, const gchar *find_text, const gchar *replace_text, + gint flags, gint start, gint end, gboolean scroll_to_match, gint *new_range_end) +{ + gint count = 0; + struct Sci_TextToFind ttf; + ScintillaObject *sci; + + if (new_range_end != NULL) + *new_range_end = -1; + + g_return_val_if_fail(doc != NULL && find_text != NULL && replace_text != NULL, 0); + + if (! *find_text || doc->readonly) + return 0; + + sci = doc->editor->sci; + + ttf.chrg.cpMin = start; + ttf.chrg.cpMax = end; + ttf.lpstrText = (gchar*)find_text; + + sci_start_undo_action(sci); + count = search_replace_range(sci, &ttf, flags, replace_text); sci_end_undo_action(sci); if (count > 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4738] branches/gnu-regex
by ntrel＠users.sourceforge.net 08 Mar '10

08 Mar '10

Revision: 4738 http://geany.svn.sourceforge.net/geany/?rev=4738&view=rev Author: ntrel Date: 2010-03-08 12:27:31 +0000 (Mon, 08 Mar 2010) Log Message: ----------- Implement POSIX-regex Find All. Modified Paths: -------------- branches/gnu-regex/ChangeLog branches/gnu-regex/src/search.c Modified: branches/gnu-regex/ChangeLog =================================================================== --- branches/gnu-regex/ChangeLog 2010-03-07 19:33:15 UTC (rev 4737) +++ branches/gnu-regex/ChangeLog 2010-03-08 12:27:31 UTC (rev 4738) @@ -1,3 +1,9 @@ +2010-03-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/search.c: + Implement POSIX-regex Find All. + + 2010-03-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/search.c, src/search.h, src/document.c: Modified: branches/gnu-regex/src/search.c =================================================================== --- branches/gnu-regex/src/search.c 2010-03-07 19:33:15 UTC (rev 4737) +++ branches/gnu-regex/src/search.c 2010-03-08 12:27:31 UTC (rev 4738) @@ -1758,6 +1758,30 @@ } +static gint geany_find_text(ScintillaObject *sci, gint flags, struct Sci_TextToFind *ttf) +{ + regex_t regex; + gint pos; + gint ret; + + if (~flags & SCFIND_REGEXP) + return sci_find_text(sci, flags, ttf); + + if (!compile_regex(&regex, ttf->lpstrText, flags)) + return -1; + + pos = ttf->chrg.cpMin; + ret = find_regex(sci, pos, &regex); + if (ret >= 0) + { + ttf->chrgText.cpMin = regex_matches[0].rm_so + pos; + ttf->chrgText.cpMax = regex_matches[0].rm_eo + pos; + } + regfree(&regex); + return ret; +} + + static gint find_document_usage(GeanyDocument *doc, const gchar *search_text, gint flags) { gchar *buffer, *short_file_name; @@ -1776,7 +1800,7 @@ { gint pos, line, start, find_len; - pos = sci_find_text(doc->editor->sci, flags, &ttf); + pos = geany_find_text(doc->editor->sci, flags, &ttf); if (pos == -1) break; /* no more matches */ find_len = ttf.chrgText.cpMax - ttf.chrgText.cpMin; @@ -1789,7 +1813,7 @@ { buffer = sci_get_line(doc->editor->sci, line); msgwin_msg_add(COLOR_BLACK, line + 1, doc, - "%s:%d : %s", short_file_name, line + 1, g_strstrip(buffer)); + "%s:%d: %s", short_file_name, line + 1, g_strstrip(buffer)); g_free(buffer); prev_line = line; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4737] trunk
by eht16＠users.sourceforge.net 07 Mar '10

07 Mar '10

Revision: 4737 http://geany.svn.sourceforge.net/geany/?rev=4737&view=rev Author: eht16 Date: 2010-03-07 19:33:15 +0000 (Sun, 07 Mar 2010) Log Message: ----------- Add and use convenience function ui_is_keyval_enter_or_return() and add it to the plugin API. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/filebrowser.c trunk/plugins/geanyfunctions.h trunk/src/msgwindow.c trunk/src/plugindata.h trunk/src/plugins.c trunk/src/sidebar.c trunk/src/ui_utils.c trunk/src/ui_utils.h trunk/src/vte.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-03-07 18:48:12 UTC (rev 4736) +++ trunk/ChangeLog 2010-03-07 19:33:15 UTC (rev 4737) @@ -35,6 +35,11 @@ * plugins/filebrowser.c: After opening files, focus the editor widget (based on a patch by Can Koy, thanks). + * plugins/filebrowser.c, plugins/geanyfunctions.h, src/msgwindow.c, + src/plugindata.h, src/plugins.c, src/sidebar.c, src/ui_utils.c, + src/ui_utils.h, src/vte.c: + Add and use convenience function ui_is_keyval_enter_or_return() and + add it to the plugin API. 2010-03-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2010-03-07 18:48:12 UTC (rev 4736) +++ trunk/plugins/filebrowser.c 2010-03-07 19:33:15 UTC (rev 4737) @@ -35,7 +35,7 @@ GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(163) +PLUGIN_VERSION_CHECK(175) PLUGIN_SET_INFO(_("File Browser"), _("Adds a file browser tab to the sidebar."), VERSION, _("The Geany developer team")) @@ -649,9 +649,7 @@ static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) { - if (event->keyval == GDK_Return - || event->keyval == GDK_ISO_Enter - || event->keyval == GDK_KP_Enter) + if (ui_is_keyval_enter_or_return(event->keyval)) { on_open_clicked(NULL, NULL); return TRUE; Modified: trunk/plugins/geanyfunctions.h =================================================================== --- trunk/plugins/geanyfunctions.h 2010-03-07 18:48:12 UTC (rev 4736) +++ trunk/plugins/geanyfunctions.h 2010-03-07 19:33:15 UTC (rev 4737) @@ -262,6 +262,8 @@ geany_functions->p_ui->ui_menu_add_document_items #define ui_widget_modify_font_from_string \ geany_functions->p_ui->ui_widget_modify_font_from_string +#define ui_is_keyval_enter_or_return \ + geany_functions->p_ui->ui_is_keyval_enter_or_return #define dialogs_show_question \ geany_functions->p_dialogs->dialogs_show_question #define dialogs_show_msgbox \ Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2010-03-07 18:48:12 UTC (rev 4736) +++ trunk/src/msgwindow.c 2010-03-07 19:33:15 UTC (rev 4737) @@ -111,15 +111,9 @@ } -static gboolean is_keyval_enter_or_return(guint keyval) -{ - return (keyval == GDK_Return || keyval == GDK_ISO_Enter || keyval == GDK_KP_Enter); -} - - static gboolean on_msgwin_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) { - if (is_keyval_enter_or_return(event->keyval) || event->keyval == GDK_space) + if (ui_is_keyval_enter_or_return(event->keyval) || event->keyval == GDK_space) { switch (GPOINTER_TO_INT(data)) { @@ -643,7 +637,7 @@ editor_indicator_set_on_line(doc->editor, GEANY_INDICATOR_ERROR, line - 1); ret = navqueue_goto_line(old_doc, doc, line); - if (ret && is_keyval_enter_or_return(keyval)) + if (ret && ui_is_keyval_enter_or_return(keyval)) gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); return ret; @@ -986,7 +980,7 @@ if (line >= 0 && DOC_VALID(doc)) { ret = navqueue_goto_line(old_doc, doc, line); - if (ret && is_keyval_enter_or_return(keyval)) + if (ret && ui_is_keyval_enter_or_return(keyval)) gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); } else if (line < 0 && string != NULL) @@ -1000,7 +994,7 @@ if (doc != NULL) { ret = navqueue_goto_line(old_doc, doc, line); - if (ret && is_keyval_enter_or_return(keyval)) + if (ret && ui_is_keyval_enter_or_return(keyval)) gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); } } Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2010-03-07 18:48:12 UTC (rev 4736) +++ trunk/src/plugindata.h 2010-03-07 19:33:15 UTC (rev 4737) @@ -50,7 +50,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 174, + GEANY_API_VERSION = 175, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -426,6 +426,7 @@ void (*ui_menu_add_document_items) (GtkMenu *menu, struct GeanyDocument *active, GCallback callback); void (*ui_widget_modify_font_from_string) (GtkWidget *widget, const gchar *str); + gboolean (*ui_is_keyval_enter_or_return) (guint keyval); } UIUtilsFuncs; Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2010-03-07 18:48:12 UTC (rev 4736) +++ trunk/src/plugins.c 2010-03-07 19:33:15 UTC (rev 4737) @@ -209,7 +209,7 @@ &utils_string_replace_first, &utils_str_middle_truncate, &utils_str_remove_chars, - &utils_get_file_list_full + &utils_get_file_list_full, }; static UIUtilsFuncs uiutils_funcs = { @@ -227,7 +227,8 @@ &ui_progress_bar_stop, &ui_entry_add_clear_icon, &ui_menu_add_document_items, - &ui_widget_modify_font_from_string + &ui_widget_modify_font_from_string, + &ui_is_keyval_enter_or_return }; static DialogFuncs dialog_funcs = { Modified: trunk/src/sidebar.c =================================================================== --- trunk/src/sidebar.c 2010-03-07 18:48:12 UTC (rev 4736) +++ trunk/src/sidebar.c 2010-03-07 19:33:15 UTC (rev 4737) @@ -784,10 +784,7 @@ gpointer user_data) { may_steal_focus = FALSE; - if (event->keyval == GDK_Return || - event->keyval == GDK_ISO_Enter || - event->keyval == GDK_KP_Enter || - event->keyval == GDK_space) + if (ui_is_keyval_enter_or_return(event->keyval) || event->keyval == GDK_space) { GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); may_steal_focus = TRUE; Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2010-03-07 18:48:12 UTC (rev 4736) +++ trunk/src/ui_utils.c 2010-03-07 19:33:15 UTC (rev 4737) @@ -28,6 +28,7 @@ #include "geany.h" #include <string.h> +#include <gdk/gdkkeysyms.h> #include "ui_utils.h" #include "prefs.h" @@ -2245,3 +2246,14 @@ } +/** Check whether the passed @a keyval is the Enter or Return key. + * There are three different Enter/Return key values + * (@c GDK_Return, @c GDK_ISO_Enter, @c GDK_KP_Enter). + * This is just a convenience function. + * @param keyval A keyval. + * @return @c TRUE if @a keyval is the one of the Enter/Return key values, otherwise @c FALSE. + * @since 0.19 */ +gboolean ui_is_keyval_enter_or_return(guint keyval) +{ + return (keyval == GDK_Return || keyval == GDK_ISO_Enter|| keyval == GDK_KP_Enter); +} Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2010-03-07 18:48:12 UTC (rev 4736) +++ trunk/src/ui_utils.h 2010-03-07 19:33:15 UTC (rev 4737) @@ -304,4 +304,6 @@ void ui_swap_sidebar_pos(void); +gboolean ui_is_keyval_enter_or_return(guint keyval); + #endif Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2010-03-07 18:48:12 UTC (rev 4736) +++ trunk/src/vte.c 2010-03-07 19:33:15 UTC (rev 4737) @@ -296,10 +296,8 @@ static gboolean vte_keyrelease_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { - if (event->keyval == GDK_Return || - event->keyval == GDK_ISO_Enter || - event->keyval == GDK_KP_Enter || - ((event->keyval == GDK_c) && (event->state & GDK_CONTROL_MASK))) + if (ui_is_keyval_enter_or_return(event->keyval) || + ((event->keyval == GDK_c) && (event->state & GDK_CONTROL_MASK))) { /* assume any text on the prompt has been executed when pressing Enter/Return */ clean = TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2010