Commits September 2008

commits@lists.geany.org

3 participants
92 discussions

SF.net SVN: geany:[3023] trunk
by eht16＠users.sourceforge.net 29 Sep '08

29 Sep '08

Revision: 3023 http://geany.svn.sourceforge.net/geany/?rev=3023&view=rev Author: eht16 Date: 2008-09-29 18:10:42 +0000 (Mon, 29 Sep 2008) Log Message: ----------- Fix syntax highlighting for filetype R, synchronise the colours with those other filetypes. Add two more keyword types and add many many more keywords. Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.r trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-29 18:09:43 UTC (rev 3022) +++ trunk/ChangeLog 2008-09-29 18:10:42 UTC (rev 3023) @@ -1,3 +1,11 @@ +2008-09-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/filetypes.r, src/highlighting.c: + Fix syntax highlighting for filetype R, synchronise the colours with + those other filetypes. + Add two more keyword types and add many many more keywords. + + 2008-09-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * doc/geany.txt, doc/geany.html: Modified: trunk/data/filetypes.r =================================================================== --- trunk/data/filetypes.r 2008-09-29 18:09:43 UTC (rev 3022) +++ trunk/data/filetypes.r 2008-09-29 18:10:42 UTC (rev 3023) @@ -2,26 +2,32 @@ [styling] # foreground;background;bold;italic default=0x000000;0xffffff;false;false -#comment=0x000fff;0xffffff;true;false -#kword=0x66ff33;0xffffff;true;false -#operator=0x660000;0xffffff;false;false -#basekword=0x66ff33;0xffffff;false;false -#otherkword=0x66ff33;0xffffff;false;false -#number=0xcc00ff;0xffffff;false;false -#string=0xcc00ff;0xffffff;false;false -#string2=0xcc00ff;0xffffff;false;false -#identifier=0x6600ff;0xffffff;false;false -#infix=0xcc00ff;0xffffff;false;false -#infixeol=0xcc00ff;0xffffff;false;false +comment=0x808080;0xffffff;false;false +# primary keyword +kword=0x00007f;0xffffff;false;false +operator=0x301010;0xffffff;false;false +# package keyword +basekword=0x991111;0xffffff;false;false +# package_other keyword +otherkword=0x991111;0xffffff;false;false +number=0x007f00;0xffffff;false;false +# "blah" string +string=0xff901e;0xffffff;false;false +# 'blah' string +string2=0x008000;0xffffff;false;false +identifier=0x000000;0xffffff;false;false +infix=0x008000;0xffffff;false;false +infixeol=0x000000;0xe0c0e0;false;false [keywords] # all items must be in one line -#primary=source if else for cbind rbind break array matrix -#secondary= +primary=abs array break data.frame diag else FALSE for function if in Inf matrix NA NaN NCOL next NROW NULL print read.table repeat require return solve source sqrt sum TRUE while +package=abbreviate abline abs acf acos acosh addmargins aggregate agrep alarm alias alist all anova any aov aperm append apply approx approxfun apropos ar args arima array arrows asin asinh assign assocplot atan atanh attach attr attributes autoload autoloader ave axis backsolve barplot basename beta bindtextdomain binomial biplot bitmap bmp body box boxplot bquote break browser builtins bxp by bzfile c call cancor capabilities casefold cat category cbind ccf ceiling character charmatch chartr chol choose chull citation class close cm cmdscale codes coef coefficients col colnames colors colorspaces colours comment complex confint conflicts contour contrasts contributors convolve cophenetic coplot cor cos cosh cov covratio cpgram crossprod cummax cummin cumprod cumsum curve cut cutree cycle data dataentry date dbeta dbinom dcauchy dchisq de debug debugger decompose delay deltat demo dendrapply density deparse deriv det detach determinant deviance dexp df dfbeta dfbetas dffits dgamma dgeom dget dhyper diag diff diffinv difftime digamma dim dimnames dir dirname dist dlnorm dlogis dmultinom dnbinom dnorm dotchart double dpois dput drop dsignrank dt dump dunif duplicated dweibull dwilcox eapply ecdf edit effects eigen emacs embed end environment eval evalq example exists exp expression factanal factor factorial family fft fifo file filter find fitted fivenum fix floor flush for force formals format formula forwardsolve fourfoldplot frame frequency ftable function gamma gaussian gc gcinfo gctorture get getenv geterrmessage gettext gettextf getwd gl glm globalenv gray grep grey grid gsub gzcon gzfile hat hatvalues hcl hclust head heatmap help hist history hsv httpclient iconv iconvlist identical identify if ifelse image influence inherits integer integrate interaction interactive intersect invisible isoreg jitter jpeg julian kappa kernapply kernel kmeans knots kronecker ksmooth labels lag lapply layout lbeta lchoose lcm legend length letters levels lfactorial lgamma library licence license line lines list lm load loadhistory loadings local locator loess log logb logical loglin lowess ls lsfit machine mad mahalanobis makepredictcall manova mapply match matlines matplot matpoints matrix max mean median medpolish menu merge message methods mget min missing mode monthplot months mosaicplot mtext mvfft names napredict naprint naresid nargs nchar ncol next nextn ngettext nlevels nlm nls noquote nrow numeric objects offset open optim optimise optimize options order ordered outer pacf page pairlist pairs palette par parse paste pbeta pbinom pbirthday pcauchy pchisq pdf pentagamma person persp pexp pf pgamma pgeom phyper pi pico pictex pie piechart pipe plclust plnorm plogis plot pmatch pmax pmin pnbinom png pnorm points poisson poly polygon polym polyroot postscript power ppoints ppois ppr prcomp predict preplot pretty princomp print prmatrix prod profile profiler proj promax prompt provide psigamma psignrank pt ptukey punif pweibull pwilcox q qbeta qbinom qbirthday qcauchy qchisq qexp qf qgamma qgeom qhyper qlnorm qlogis qnbinom qnorm qpois qqline qqnorm qqplot qr qsignrank qt qtukey quantile quarters quasi quasibinomial quasipoisson quit qunif quote qweibull qwilcox rainbow range rank raw rbeta rbind rbinom rcauchy rchisq readline real recover rect reformulate regexpr relevel remove reorder rep repeat replace replicate replications require reshape resid residuals restart return rev rexp rf rgamma rgb rgeom rhyper rle rlnorm rlogis rm rmultinom rnbinom rnorm round row rownames rowsum rpois rsignrank rstandard rstudent rt rug runif runmed rweibull rwilcox sample sapply save savehistory scale scan screen screeplot sd search searchpaths seek segments seq sequence serialize setdiff setequal setwd shell sign signif sin single sinh sink smooth solve sort source spectrum spline splinefun split sprintf sqrt stack stars start stderr stdin stdout stem step stepfun stl stop stopifnot str strftime strheight stripchart strptime strsplit strtrim structure strwidth strwrap sub subset substitute substr substring sum summary sunflowerplot supsmu svd sweep switch symbols symnum system t table tabulate tail tan tanh tapply tempdir tempfile termplot terms tetragamma text time title toeplitz tolower topenv toupper trace traceback transform trigamma trunc truncate try ts tsdiag tsp typeof unclass undebug union unique uniroot unix unlink unlist unname unserialize unsplit unstack untrace unz update upgrade url var varimax vcov vector version vi vignette warning warnings weekdays weights which while window windows with write wsbrowser xedit xemacs xfig xinch xor xtabs xyinch yinch zapsmall +package_other=acme aids aircondit amis aml banking barchart barley beaver bigcity boot brambles breslow bs bwplot calcium cane capability cav censboot channing city claridge cloth cloud coal condense contourplot control corr darwin densityplot dogs dotplot ducks empinf envelope environmental ethanol fir frets gpar grav gravity grob hirose histogram islay knn larrows levelplot llines logit lpoints lsegments lset ltext lvqinit lvqtest manaus melanoma melanoma motor multiedit neuro nitrofen nodal ns nuclear oneway parallel paulsen poisons polar qq qqmath remission rfs saddle salinity shingle simplex singer somgrid splom stripplot survival tau tmd tsboot tuna unit urine viewport wireframe wool xyplot [settings] # default extension used when saving files -extension=R +#extension=R # the following characters are these which a "word" can contains, see documentation #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2008-09-29 18:09:43 UTC (rev 3022) +++ trunk/src/highlighting.c 2008-09-29 18:10:42 UTC (rev 3023) @@ -1549,21 +1549,23 @@ new_style_array(GEANY_FILETYPES_R, 12); get_keyfile_hex(config, config_home, "styling", "default", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[0]); - get_keyfile_hex(config, config_home, "styling", "comment", "0x0066ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[1]); - get_keyfile_hex(config, config_home, "styling", "kword", "0x66ff33", "0xffffff", "true", &style_sets[GEANY_FILETYPES_R].styling[2]); - get_keyfile_hex(config, config_home, "styling", "operator", "0x660000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[3]); - get_keyfile_hex(config, config_home, "styling", "basekword", "0x66ff33", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[4]); - get_keyfile_hex(config, config_home, "styling", "otherkword", "0x66ff33", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[5]); - get_keyfile_hex(config, config_home, "styling", "number", "0xcc00ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[6]); - get_keyfile_hex(config, config_home, "styling", "string", "0xcc00ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[7]); - get_keyfile_hex(config, config_home, "styling", "string2", "0xcc00ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[8]); - get_keyfile_hex(config, config_home, "styling", "identifier", "0x6600ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[9]); - get_keyfile_hex(config, config_home, "styling", "infix", "0xcc00ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[10]); - get_keyfile_hex(config, config_home, "styling", "infixeol", "0xcc00ff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[11]); + get_keyfile_hex(config, config_home, "styling", "comment", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[1]); + get_keyfile_hex(config, config_home, "styling", "kword", "0x00007f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[2]); + get_keyfile_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[3]); + get_keyfile_hex(config, config_home, "styling", "basekword", "0x991111", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[4]); + get_keyfile_hex(config, config_home, "styling", "otherkword", "0x991111", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[5]); + get_keyfile_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[6]); + get_keyfile_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[7]); + get_keyfile_hex(config, config_home, "styling", "string2", "0x008000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[8]); + get_keyfile_hex(config, config_home, "styling", "identifier", "0x000000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[9]); + get_keyfile_hex(config, config_home, "styling", "infix", "0x008000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_R].styling[10]); + get_keyfile_hex(config, config_home, "styling", "infixeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_R].styling[11]); - style_sets[GEANY_FILETYPES_R].keywords = g_new(gchar*, 2); - get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_R, 0, "require if source array matrix diag solve for data.frame read.table NROW NCOL abs sqrt sum print while function"); - style_sets[GEANY_FILETYPES_R].keywords[1] = NULL; + style_sets[GEANY_FILETYPES_R].keywords = g_new(gchar*, 4); + get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_R, 0, "abs array data.frame diag for function if matrix NCOL NROW print read.table require return solve source sqrt sum while"); + get_keyfile_keywords(config, config_home, "keywords", "package", GEANY_FILETYPES_R, 1, NULL); + get_keyfile_keywords(config, config_home, "keywords", "package_other", GEANY_FILETYPES_R, 2, NULL); + style_sets[GEANY_FILETYPES_R].keywords[3] = NULL; get_keyfile_wordchars(config, config_home, &style_sets[GEANY_FILETYPES_R].wordchars); @@ -1577,6 +1579,8 @@ apply_filetype_properties(sci, SCLEX_R, ft_id); SSM(sci, SCI_SETKEYWORDS, 0, (sptr_t) style_sets[GEANY_FILETYPES_R].keywords[0]); + SSM(sci, SCI_SETKEYWORDS, 1, (sptr_t) style_sets[GEANY_FILETYPES_R].keywords[1]); + SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_R].keywords[2]); set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_R, 0); set_sci_style(sci, SCE_R_DEFAULT, GEANY_FILETYPES_R, 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:[3022] trunk
by eht16＠users.sourceforge.net 29 Sep '08

29 Sep '08

Revision: 3022 http://geany.svn.sourceforge.net/geany/?rev=3022&view=rev Author: eht16 Date: 2008-09-29 18:09:43 +0000 (Mon, 29 Sep 2008) Log Message: ----------- When generating documentation, first try rst2html.py as it is the upstream default. Modified Paths: -------------- trunk/ChangeLog trunk/doc/Makefile.am trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-29 12:44:31 UTC (rev 3021) +++ trunk/ChangeLog 2008-09-29 18:09:43 UTC (rev 3022) @@ -25,6 +25,9 @@ the correct value from Scintilla and use it (this fixes a display problem with Perl code like 'sub test()'). Add missing styles for filetype Perl. + * doc/Makefile.am, wscript: + When generating documentation, first try rst2html.py as it is + the upstream default. 2008-09-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2008-09-29 12:44:31 UTC (rev 3021) +++ trunk/doc/Makefile.am 2008-09-29 18:09:43 UTC (rev 3022) @@ -13,7 +13,9 @@ api-doc: Doxyfile doxygen +# when generating documentation, first try rst2html.py as it is the upstream default doc: geany.txt + rst2html.py -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html || \ rst2html -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html doc-clean: Modified: trunk/wscript =================================================================== --- trunk/wscript 2008-09-29 12:44:31 UTC (rev 3021) +++ trunk/wscript 2008-09-29 18:09:43 UTC (rev 3022) @@ -438,8 +438,12 @@ if Options.options.htmldoc: os.chdir('doc') - launch('rst2html -stg --stylesheet=geany.css geany.txt geany.html', + # first try rst2html.py as it is the upstream default + ret = launch('rst2html.py -stg --stylesheet=geany.css geany.txt geany.html', 'Generating HTML documentation') + if not ret == 0: + launch('rst2html -stg --stylesheet=geany.css geany.txt geany.html', + 'Generating HTML documentation (using fallback "rst2html")') if Options.options.update_po: # the following code was taken from midori's WAF script, thanks @@ -467,6 +471,9 @@ Utils.pprint(success_color, status) try: ret = subprocess.call(command.split()) + except OSError, e: + ret = 1 + print str(e), ":", command except: ret = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3020] trunk
by ntrel＠users.sourceforge.net 29 Sep '08

29 Sep '08

Revision: 3020 http://geany.svn.sourceforge.net/geany/?rev=3020&view=rev Author: ntrel Date: 2008-09-29 12:13:45 +0000 (Mon, 29 Sep 2008) Log Message: ----------- Remove use of non-greedy matching in error_regex - this doesn't seem to be supported by common versions of glibc (thanks to AC for reporting). Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-28 18:07:08 UTC (rev 3019) +++ trunk/ChangeLog 2008-09-29 12:13:45 UTC (rev 3020) @@ -1,3 +1,11 @@ +2008-09-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * doc/geany.txt, doc/geany.html: + Remove use of non-greedy matching in error_regex - this doesn't seem + to be supported by common versions of glibc (thanks to AC for + reporting). + + 2008-09-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * geany.glade, src/interface.c, src/notebook.c: Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-09-28 18:07:08 UTC (rev 3019) +++ trunk/doc/geany.html 2008-09-29 12:13:45 UTC (rev 3020) @@ -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.5: 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="$Date$" /> +<meta name="date" content="2008-09-26" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>$Date$</td></tr> +<td>2008-09-26</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.15</td></tr> </tbody> @@ -149,248 +149,248 @@ 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="id9">Introduction</a><ul> -<li><a class="reference internal" href="#about-geany" id="id10">About Geany</a></li> -<li><a class="reference internal" href="#where-to-get-it" id="id11">Where to get it</a></li> -<li><a class="reference internal" href="#license" id="id12">License</a></li> -<li><a class="reference internal" href="#about-this-document" id="id13">About this document</a></li> +<li><a class="reference" href="#introduction" id="id9" name="id9">Introduction</a><ul> +<li><a class="reference" href="#about-geany" id="id10" name="id10">About Geany</a></li> +<li><a class="reference" href="#where-to-get-it" id="id11" name="id11">Where to get it</a></li> +<li><a class="reference" href="#license" id="id12" name="id12">License</a></li> +<li><a class="reference" href="#about-this-document" id="id13" name="id13">About this document</a></li> </ul> </li> -<li><a class="reference internal" href="#installation" id="id14">Installation</a><ul> -<li><a class="reference internal" href="#requirements" id="id15">Requirements</a></li> -<li><a class="reference internal" href="#binary-packages" id="id16">Binary packages</a></li> -<li><a class="reference internal" href="#source-compilation" id="id17">Source compilation</a><ul> -<li><a class="reference internal" href="#custom-installation" id="id18">Custom installation</a></li> -<li><a class="reference internal" href="#dynamic-linking-loader-support" id="id19">Dynamic linking loader support</a></li> -<li><a class="reference internal" href="#build-problems" id="id20">Build problems</a></li> +<li><a class="reference" href="#installation" id="id14" name="id14">Installation</a><ul> +<li><a class="reference" href="#requirements" id="id15" name="id15">Requirements</a></li> +<li><a class="reference" href="#binary-packages" id="id16" name="id16">Binary packages</a></li> +<li><a class="reference" href="#source-compilation" id="id17" name="id17">Source compilation</a><ul> +<li><a class="reference" href="#custom-installation" id="id18" name="id18">Custom installation</a></li> +<li><a class="reference" href="#dynamic-linking-loader-support" id="id19" name="id19">Dynamic linking loader support</a></li> +<li><a class="reference" href="#build-problems" id="id20" name="id20">Build problems</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#usage" id="id21">Usage</a><ul> -<li><a class="reference internal" href="#getting-started" id="id22">Getting started</a></li> -<li><a class="reference internal" href="#command-line-options" id="id23">Command line options</a></li> -<li><a class="reference internal" href="#general" id="id24">General</a><ul> -<li><a class="reference internal" href="#startup" id="id25">Startup</a></li> -<li><a class="reference internal" href="#opening-files-from-the-command-line-in-a-running-instance" id="id26">Opening files from the command-line in a running instance</a></li> -<li><a class="reference internal" href="#virtual-terminal-emulator-widget-vte" id="id27">Virtual terminal emulator widget (VTE)</a></li> -<li><a class="reference internal" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id28">Defining own widget styles using .gtkrc-2.0</a></li> +<li><a class="reference" href="#usage" id="id21" name="id21">Usage</a><ul> +<li><a class="reference" href="#getting-started" id="id22" name="id22">Getting started</a></li> +<li><a class="reference" href="#command-line-options" id="id23" name="id23">Command line options</a></li> +<li><a class="reference" href="#general" id="id24" name="id24">General</a><ul> +<li><a class="reference" href="#startup" id="id25" name="id25">Startup</a></li> +<li><a class="reference" href="#opening-files-from-the-command-line-in-a-running-instance" id="id26" name="id26">Opening files from the command-line in a running instance</a></li> +<li><a class="reference" href="#virtual-terminal-emulator-widget-vte" id="id27" name="id27">Virtual terminal emulator widget (VTE)</a></li> +<li><a class="reference" href="#defining-own-widget-styles-using-gtkrc-2-0" id="id28" name="id28">Defining own widget styles using .gtkrc-2.0</a></li> </ul> </li> -<li><a class="reference internal" href="#documents" id="id29">Documents</a><ul> -<li><a class="reference internal" href="#switching-between-documents" id="id30">Switching between documents</a></li> +<li><a class="reference" href="#documents" id="id29" name="id29">Documents</a><ul> +<li><a class="reference" href="#switching-between-documents" id="id30" name="id30">Switching between documents</a></li> </ul> </li> -<li><a class="reference internal" href="#character-sets-and-unicode-byte-order-mark-bom" id="id31">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> -<li><a class="reference internal" href="#using-character-sets" id="id32">Using character sets</a></li> -<li><a class="reference internal" href="#in-file-encoding-specification" id="id33">In-file encoding specification</a></li> -<li><a class="reference internal" href="#special-encoding-none" id="id34">Special encoding "None"</a></li> -<li><a class="reference internal" href="#unicode-byte-order-mark-bom" id="id35">Unicode Byte-Order-Mark (BOM)</a></li> +<li><a class="reference" href="#character-sets-and-unicode-byte-order-mark-bom" id="id31" name="id31">Character sets and Unicode Byte-Order-Mark (BOM)</a><ul> +<li><a class="reference" href="#using-character-sets" id="id32" name="id32">Using character sets</a></li> +<li><a class="reference" href="#in-file-encoding-specification" id="id33" name="id33">In-file encoding specification</a></li> +<li><a class="reference" href="#special-encoding-none" id="id34" name="id34">Special encoding "None"</a></li> +<li><a class="reference" href="#unicode-byte-order-mark-bom" id="id35" name="id35">Unicode Byte-Order-Mark (BOM)</a></li> </ul> </li> -<li><a class="reference internal" href="#editing" id="id36">Editing</a><ul> -<li><a class="reference internal" href="#folding" id="id37">Folding</a></li> -<li><a class="reference internal" href="#column-mode-editing" id="id38">Column mode editing</a></li> -<li><a class="reference internal" href="#drag-and-drop-of-text" id="id39">Drag and drop of text</a></li> -<li><a class="reference internal" href="#indentation" id="id40">Indentation</a></li> -<li><a class="reference internal" href="#auto-indentation" id="id41">Auto-indentation</a></li> -<li><a class="reference internal" href="#bookmarks" id="id42">Bookmarks</a></li> -<li><a class="reference internal" href="#code-navigation-history" id="id43">Code Navigation History</a></li> -<li><a class="reference internal" href="#send-text-through-definable-commands" id="id44">Send text through definable commands</a></li> -<li><a class="reference internal" href="#context-actions" id="id45">Context actions</a></li> -<li><a class="reference internal" href="#user-definable-snippets" id="id46">User-definable snippets</a></li> -<li><a class="reference internal" href="#inserting-unicode-characters" id="id47">Inserting unicode characters</a></li> +<li><a class="reference" href="#editing" id="id36" name="id36">Editing</a><ul> +<li><a class="reference" href="#folding" id="id37" name="id37">Folding</a></li> +<li><a class="reference" href="#column-mode-editing" id="id38" name="id38">Column mode editing</a></li> +<li><a class="reference" href="#drag-and-drop-of-text" id="id39" name="id39">Drag and drop of text</a></li> +<li><a class="reference" href="#indentation" id="id40" name="id40">Indentation</a></li> +<li><a class="reference" href="#auto-indentation" id="id41" name="id41">Auto-indentation</a></li> +<li><a class="reference" href="#bookmarks" id="id42" name="id42">Bookmarks</a></li> +<li><a class="reference" href="#code-navigation-history" id="id43" name="id43">Code Navigation History</a></li> +<li><a class="reference" href="#send-text-through-definable-commands" id="id44" name="id44">Send text through definable commands</a></li> +<li><a class="reference" href="#context-actions" id="id45" name="id45">Context actions</a></li> +<li><a class="reference" href="#user-definable-snippets" id="id46" name="id46">User-definable snippets</a></li> +<li><a class="reference" href="#inserting-unicode-characters" id="id47" name="id47">Inserting unicode characters</a></li> </ul> </li> -<li><a class="reference internal" href="#search-replace-and-go-to" id="id48">Search, replace and go to</a><ul> -<li><a class="reference internal" href="#find" id="id49">Find</a><ul> -<li><a class="reference internal" href="#matching-options" id="id50">Matching options</a></li> -<li><a class="reference internal" href="#find-all" id="id51">Find all</a></li> -<li><a class="reference internal" href="#change-font-in-search-dialog-text-fields" id="id52">Change font in search dialog text fields</a></li> +<li><a class="reference" href="#search-replace-and-go-to" id="id48" name="id48">Search, replace and go to</a><ul> +<li><a class="reference" href="#find" id="id49" name="id49">Find</a><ul> +<li><a class="reference" href="#matching-options" id="id50" name="id50">Matching options</a></li> +<li><a class="reference" href="#find-all" id="id51" name="id51">Find all</a></li> +<li><a class="reference" href="#change-font-in-search-dialog-text-fields" id="id52" name="id52">Change font in search dialog text fields</a></li> </ul> </li> -<li><a class="reference internal" href="#find-usage" id="id53">Find usage</a></li> -<li><a class="reference internal" href="#find-in-files" id="id54">Find in files</a><ul> -<li><a class="reference internal" href="#filtering-out-version-control-files" id="id55">Filtering out version control files</a></li> +<li><a class="reference" href="#find-usage" id="id53" name="id53">Find usage</a></li> +<li><a class="reference" href="#find-in-files" id="id54" name="id54">Find in files</a><ul> +<li><a class="reference" href="#filtering-out-version-control-files" id="id55" name="id55">Filtering out version control files</a></li> </ul> </li> -<li><a class="reference internal" href="#replace" id="id56">Replace</a><ul> -<li><a class="reference internal" href="#replace-all" id="id57">Replace all</a></li> +<li><a class="reference" href="#replace" id="id56" name="id56">Replace</a><ul> +<li><a class="reference" href="#replace-all" id="id57" name="id57">Replace all</a></li> </ul> </li> -<li><a class="reference internal" href="#go-to-tag-definition" id="id58">Go to tag definition</a></li> -<li><a class="reference internal" href="#go-to-tag-declaration" id="id59">Go to tag declaration</a></li> -<li><a class="reference internal" href="#go-to-line" id="id60">Go to line</a></li> -<li><a class="reference internal" href="#regular-expressions" id="id61">Regular expressions</a><ul> -<li><a class="reference internal" href="#partial-posix-compatibility" id="id62">Partial POSIX compatibility</a></li> +<li><a class="reference" href="#go-to-tag-definition" id="id58" name="id58">Go to tag definition</a></li> +<li><a class="reference" href="#go-to-tag-declaration" id="id59" name="id59">Go to tag declaration</a></li> +<li><a class="reference" href="#go-to-line" id="id60" name="id60">Go to line</a></li> +<li><a class="reference" href="#regular-expressions" id="id61" name="id61">Regular expressions</a><ul> +<li><a class="reference" href="#partial-posix-compatibility" id="id62" name="id62">Partial POSIX compatibility</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#tags" id="id63">Tags</a><ul> -<li><a class="reference internal" href="#workspace-tags" id="id64">Workspace tags</a></li> -<li><a class="reference internal" href="#global-tags" id="id65">Global tags</a><ul> -<li><a class="reference internal" href="#default-global-tags-files" id="id66">Default global tags files</a></li> -<li><a class="reference internal" href="#generating-a-global-tags-file" id="id67">Generating a global tags file</a></li> +<li><a class="reference" href="#tags" id="id63" name="id63">Tags</a><ul> +<li><a class="reference" href="#workspace-tags" id="id64" name="id64">Workspace tags</a></li> +<li><a class="reference" href="#global-tags" id="id65" name="id65">Global tags</a><ul> +<li><a class="reference" href="#default-global-tags-files" id="id66" name="id66">Default global tags files</a></li> +<li><a class="reference" href="#generating-a-global-tags-file" id="id67" name="id67">Generating a global tags file</a></li> </ul> </li> -<li><a class="reference internal" href="#ignore-tags" id="id68">Ignore tags</a></li> +<li><a class="reference" href="#ignore-tags" id="id68" name="id68">Ignore tags</a></li> </ul> </li> -<li><a class="reference internal" href="#preferences" id="id69">Preferences</a><ul> -<li><a class="reference internal" href="#general-tab-in-preferences-dialog" id="id70">General tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#id1" id="id71">Startup</a></li> -<li><a class="reference internal" href="#shutdown" id="id72">Shutdown</a></li> -<li><a class="reference internal" href="#projects" id="id73">Projects</a></li> -<li><a class="reference internal" href="#miscellaneous" id="id74">Miscellaneous</a></li> +<li><a class="reference" href="#preferences" id="id69" name="id69">Preferences</a><ul> +<li><a class="reference" href="#general-tab-in-preferences-dialog" id="id70" name="id70">General tab in preferences dialog</a><ul> +<li><a class="reference" href="#id1" id="id71" name="id71">Startup</a></li> +<li><a class="reference" href="#shutdown" id="id72" name="id72">Shutdown</a></li> +<li><a class="reference" href="#projects" id="id73" name="id73">Projects</a></li> +<li><a class="reference" href="#miscellaneous" id="id74" name="id74">Miscellaneous</a></li> </ul> </li> -<li><a class="reference internal" href="#interface-tab-in-preferences-dialog" id="id75">Interface tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#sidebar" id="id76">Sidebar</a></li> -<li><a class="reference internal" href="#fonts" id="id77">Fonts</a></li> -<li><a class="reference internal" href="#editor-tabs" id="id78">Editor tabs</a></li> -<li><a class="reference internal" href="#tab-positions" id="id79">Tab positions</a></li> -<li><a class="reference internal" href="#id2" id="id80">Miscellaneous</a></li> +<li><a class="reference" href="#interface-tab-in-preferences-dialog" id="id75" name="id75">Interface tab in preferences dialog</a><ul> +<li><a class="reference" href="#sidebar" id="id76" name="id76">Sidebar</a></li> +<li><a class="reference" href="#fonts" id="id77" name="id77">Fonts</a></li> +<li><a class="reference" href="#editor-tabs" id="id78" name="id78">Editor tabs</a></li> +<li><a class="reference" href="#tab-positions" id="id79" name="id79">Tab positions</a></li> +<li><a class="reference" href="#id2" id="id80" name="id80">Miscellaneous</a></li> </ul> </li> -<li><a class="reference internal" href="#toolbar-tab-in-preferences-dialog" id="id81">Toolbar tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#toolbar" id="id82">Toolbar</a></li> -<li><a class="reference internal" href="#items" id="id83">Items</a></li> -<li><a class="reference internal" href="#appearance" id="id84">Appearance</a></li> +<li><a class="reference" href="#toolbar-tab-in-preferences-dialog" id="id81" name="id81">Toolbar tab in preferences dialog</a><ul> +<li><a class="reference" href="#toolbar" id="id82" name="id82">Toolbar</a></li> +<li><a class="reference" href="#items" id="id83" name="id83">Items</a></li> +<li><a class="reference" href="#appearance" id="id84" name="id84">Appearance</a></li> </ul> </li> -<li><a class="reference internal" href="#editor-features-tab-in-preferences-dialog" id="id85">Editor Features tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#indentation-group" id="id86">Indentation group</a></li> -<li><a class="reference internal" href="#features" id="id87">Features</a></li> +<li><a class="reference" href="#editor-features-tab-in-preferences-dialog" id="id85" name="id85">Editor Features tab in preferences dialog</a><ul> +<li><a class="reference" href="#indentation-group" id="id86" name="id86">Indentation group</a></li> +<li><a class="reference" href="#features" id="id87" name="id87">Features</a></li> </ul> </li> -<li><a class="reference internal" href="#editor-completions-tab-in-preferences-dialog" id="id88">Editor Completions tab in preferences dialog</a></li> -<li><a class="reference internal" href="#editor-display-tab-in-preferences-dialog" id="id89">Editor Display tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#display" id="id90">Display</a></li> -<li><a class="reference internal" href="#long-line-marker" id="id91">Long line marker</a></li> +<li><a class="reference" href="#editor-completions-tab-in-preferences-dialog" id="id88" name="id88">Editor Completions tab in preferences dialog</a></li> +<li><a class="reference" href="#editor-display-tab-in-preferences-dialog" id="id89" name="id89">Editor Display tab in preferences dialog</a><ul> +<li><a class="reference" href="#display" id="id90" name="id90">Display</a></li> +<li><a class="reference" href="#long-line-marker" id="id91" name="id91">Long line marker</a></li> </ul> </li> -<li><a class="reference internal" href="#files-tab-in-preferences-dialog" id="id92">Files tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#new-files" id="id93">New files</a></li> -<li><a class="reference internal" href="#saving-files" id="id94">Saving files</a></li> -<li><a class="reference internal" href="#id3" id="id95">Miscellaneous</a></li> +<li><a class="reference" href="#files-tab-in-preferences-dialog" id="id92" name="id92">Files tab in preferences dialog</a><ul> +<li><a class="reference" href="#new-files" id="id93" name="id93">New files</a></li> +<li><a class="reference" href="#saving-files" id="id94" name="id94">Saving files</a></li> +<li><a class="reference" href="#id3" id="id95" name="id95">Miscellaneous</a></li> </ul> </li> -<li><a class="reference internal" href="#tools-tab-in-preferences-dialog" id="id96">Tools tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#tool-paths" id="id97">Tool paths</a></li> -<li><a class="reference internal" href="#commands" id="id98">Commands</a></li> +<li><a class="reference" href="#tools-tab-in-preferences-dialog" id="id96" name="id96">Tools tab in preferences dialog</a><ul> +<li><a class="reference" href="#tool-paths" id="id97" name="id97">Tool paths</a></li> +<li><a class="reference" href="#commands" id="id98" name="id98">Commands</a></li> </ul> </li> -<li><a class="reference internal" href="#template-tab-in-preferences-dialog" id="id99">Template tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#template-data" id="id100">Template data</a></li> +<li><a class="reference" href="#template-tab-in-preferences-dialog" id="id99" name="id99">Template tab in preferences dialog</a><ul> +<li><a class="reference" href="#template-data" id="id100" name="id100">Template data</a></li> </ul> </li> -<li><a class="reference internal" href="#keybinding-tab-in-preferences-dialog" id="id101">Keybinding tab in preferences dialog</a></li> -<li><a class="reference internal" href="#printing-tab-in-preferences-dialog" id="id102">Printing tab in preferences dialog</a></li> -<li><a class="reference internal" href="#vte-tab-in-preferences-dialog" id="id103">VTE tab in preferences dialog</a><ul> -<li><a class="reference internal" href="#terminal-widget" id="id104">Terminal widget</a></li> +<li><a class="reference" href="#keybinding-tab-in-preferences-dialog" id="id101" name="id101">Keybinding tab in preferences dialog</a></li> +<li><a class="reference" href="#printing-tab-in-preferences-dialog" id="id102" name="id102">Printing tab in preferences dialog</a></li> +<li><a class="reference" href="#vte-tab-in-preferences-dialog" id="id103" name="id103">VTE tab in preferences dialog</a><ul> +<li><a class="reference" href="#terminal-widget" id="id104" name="id104">Terminal widget</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#project-management" id="id105">Project Management</a><ul> -<li><a class="reference internal" href="#new-project" id="id106">New Project</a></li> -<li><a class="reference internal" href="#project-properties" id="id107">Project Properties</a><ul> -<li><a class="reference internal" href="#make-in-base-path" id="id108">Make in base path</a></li> -<li><a class="reference internal" href="#run-command" id="id109">Run command</a></li> +<li><a class="reference" href="#project-management" id="id105" name="id105">Project Management</a><ul> +<li><a class="reference" href="#new-project" id="id106" name="id106">New Project</a></li> +<li><a class="reference" href="#project-properties" id="id107" name="id107">Project Properties</a><ul> +<li><a class="reference" href="#make-in-base-path" id="id108" name="id108">Make in base path</a></li> +<li><a class="reference" href="#run-command" id="id109" name="id109">Run command</a></li> </ul> </li> -<li><a class="reference internal" href="#open-project" id="id110">Open Project</a></li> -<li><a class="reference internal" href="#close-project" id="id111">Close Project</a></li> +<li><a class="reference" href="#open-project" id="id110" name="id110">Open Project</a></li> +<li><a class="reference" href="#close-project" id="id111" name="id111">Close Project</a></li> </ul> </li> -<li><a class="reference internal" href="#build-system" id="id112">Build system</a><ul> -<li><a class="reference internal" href="#compile" id="id113">Compile</a></li> -<li><a class="reference internal" href="#build" id="id114">Build</a></li> -<li><a class="reference internal" href="#make-all" id="id115">Make all</a></li> -<li><a class="reference internal" href="#make-custom-target" id="id116">Make custom target</a></li> -<li><a class="reference internal" href="#make-object" id="id117">Make object</a></li> -<li><a class="reference internal" href="#execute" id="id118">Execute</a></li> -<li><a class="reference internal" href="#stopping-running-processes" id="id119">Stopping running processes</a><ul> -<li><a class="reference internal" href="#terminal-emulators" id="id120">Terminal emulators</a></li> +<li><a class="reference" href="#build-system" id="id112" name="id112">Build system</a><ul> +<li><a class="reference" href="#compile" id="id113" name="id113">Compile</a></li> +<li><a class="reference" href="#build" id="id114" name="id114">Build</a></li> +<li><a class="reference" href="#make-all" id="id115" name="id115">Make all</a></li> +<li><a class="reference" href="#make-custom-target" id="id116" name="id116">Make custom target</a></li> +<li><a class="reference" href="#make-object" id="id117" name="id117">Make object</a></li> +<li><a class="reference" href="#execute" id="id118" name="id118">Execute</a></li> +<li><a class="reference" href="#stopping-running-processes" id="id119" name="id119">Stopping running processes</a><ul> +<li><a class="reference" href="#terminal-emulators" id="id120" name="id120">Terminal emulators</a></li> </ul> </li> -<li><a class="reference internal" href="#set-includes-and-arguments" id="id121">Set Includes and Arguments</a><ul> -<li><a class="reference internal" href="#one-step-compilation" id="id122">One step compilation</a></li> +<li><a class="reference" href="#set-includes-and-arguments" id="id121" name="id121">Set Includes and Arguments</a><ul> +<li><a class="reference" href="#one-step-compilation" id="id122" name="id122">One step compilation</a></li> </ul> </li> -<li><a class="reference internal" href="#indicators" id="id123">Indicators</a></li> +<li><a class="reference" href="#indicators" id="id123" name="id123">Indicators</a></li> </ul> </li> -<li><a class="reference internal" href="#printing-support" id="id124">Printing support</a></li> -<li><a class="reference internal" href="#plugins" id="id125">Plugins</a></li> -<li><a class="reference internal" href="#keybindings" id="id126">Keybindings</a><ul> -<li><a class="reference internal" href="#switching-documents" id="id127">Switching documents</a></li> -<li><a class="reference internal" href="#configurable-keybindings" id="id128">Configurable keybindings</a></li> +<li><a class="reference" href="#printing-support" id="id124" name="id124">Printing support</a></li> +<li><a class="reference" href="#plugins" id="id125" name="id125">Plugins</a></li> +<li><a class="reference" href="#keybindings" id="id126" name="id126">Keybindings</a><ul> +<li><a class="reference" href="#switching-documents" id="id127" name="id127">Switching documents</a></li> +<li><a class="reference" href="#configurable-keybindings" id="id128" name="id128">Configurable keybindings</a></li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#configuration-files" id="id129">Configuration files</a><ul> -<li><a class="reference internal" href="#global-configuration-file" id="id130">Global configuration file</a></li> -<li><a class="reference internal" href="#filetype-definition-files" id="id131">Filetype definition files</a><ul> -<li><a class="reference internal" href="#format" id="id132">Format</a><ul> -<li><a class="reference internal" href="#styling-section" id="id133">[styling] Section</a></li> -<li><a class="reference internal" href="#keywords-section" id="id134">[keywords] Section</a></li> -<li><a class="reference internal" href="#settings-section" id="id135">[settings] Section</a></li> -<li><a class="reference internal" href="#build-settings-section" id="id136">[build_settings] Section</a></li> +<li><a class="reference" href="#configuration-files" id="id129" name="id129">Configuration files</a><ul> +<li><a class="reference" href="#global-configuration-file" id="id130" name="id130">Global configuration file</a></li> +<li><a class="reference" href="#filetype-definition-files" id="id131" name="id131">Filetype definition files</a><ul> +<li><a class="reference" href="#format" id="id132" name="id132">Format</a><ul> +<li><a class="reference" href="#styling-section" id="id133" name="id133">[styling] Section</a></li> +<li><a class="reference" href="#keywords-section" id="id134" name="id134">[keywords] Section</a></li> +<li><a class="reference" href="#settings-section" id="id135" name="id135">[settings] Section</a></li> +<li><a class="reference" href="#build-settings-section" id="id136" name="id136">[build_settings] Section</a></li> </ul> </li> -<li><a class="reference internal" href="#special-file-filetypes-common" id="id137">Special file filetypes.common</a></li> +<li><a class="reference" href="#special-file-filetypes-common" id="id137" name="id137">Special file filetypes.common</a></li> </ul> </li> -<li><a class="reference internal" href="#filetype-extensions" id="id138">Filetype extensions</a></li> -<li><a class="reference internal" href="#templates" id="id139">Templates</a><ul> -<li><a class="reference internal" href="#template-metadata" id="id140">Template metadata</a></li> -<li><a class="reference internal" href="#file-templates" id="id141">File templates</a><ul> -<li><a class="reference internal" href="#custom-file-templates" id="id142">Custom file templates</a></li> -<li><a class="reference internal" href="#filetype-templates" id="id143">Filetype templates</a></li> +<li><a class="reference" href="#filetype-extensions" id="id138" name="id138">Filetype extensions</a></li> +<li><a class="reference" href="#templates" id="id139" name="id139">Templates</a><ul> +<li><a class="reference" href="#template-metadata" id="id140" name="id140">Template metadata</a></li> +<li><a class="reference" href="#file-templates" id="id141" name="id141">File templates</a><ul> +<li><a class="reference" href="#custom-file-templates" id="id142" name="id142">Custom file templates</a></li> +<li><a class="reference" href="#filetype-templates" id="id143" name="id143">Filetype templates</a></li> </ul> </li> -<li><a class="reference internal" href="#customizing-templates" id="id144">Customizing templates</a><ul> -<li><a class="reference internal" href="#template-wildcards" id="id145">Template wildcards</a></li> +<li><a class="reference" href="#customizing-templates" id="id144" name="id144">Customizing templates</a><ul> +<li><a class="reference" href="#template-wildcards" id="id145" name="id145">Template wildcards</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference internal" href="#contributing-to-this-document" id="id146">Contributing to this document</a></li> -<li><a class="reference internal" href="#scintilla-keyboard-commands" id="id147">Scintilla keyboard commands</a><ul> -<li><a class="reference internal" href="#keyboard-commands" id="id148">Keyboard commands</a></li> +<li><a class="reference" href="#contributing-to-this-document" id="id146" name="id146">Contributing to this document</a></li> +<li><a class="reference" href="#scintilla-keyboard-commands" id="id147" name="id147">Scintilla keyboard commands</a><ul> +<li><a class="reference" href="#keyboard-commands" id="id148" name="id148">Keyboard commands</a></li> </ul> </li> -<li><a class="reference internal" href="#tips-and-tricks" id="id149">Tips and tricks</a><ul> -<li><a class="reference internal" href="#document-notebook" id="id150">Document notebook</a></li> -<li><a class="reference internal" href="#symbols" id="id151">Symbols</a></li> -<li><a class="reference internal" href="#gtk-related" id="id152">GTK-related</a></li> +<li><a class="reference" href="#tips-and-tricks" id="id149" name="id149">Tips and tricks</a><ul> +<li><a class="reference" href="#document-notebook" id="id150" name="id150">Document notebook</a></li> +<li><a class="reference" href="#symbols" id="id151" name="id151">Symbols</a></li> +<li><a class="reference" href="#gtk-related" id="id152" name="id152">GTK-related</a></li> </ul> </li> -<li><a class="reference internal" href="#hidden-preferences" id="id153">Hidden preferences</a></li> -<li><a class="reference internal" href="#compile-time-options" id="id154">Compile-time options</a><ul> -<li><a class="reference internal" href="#src-geany-h" id="id155">src/geany.h</a></li> -<li><a class="reference internal" href="#project-h" id="id156">project.h</a></li> -<li><a class="reference internal" href="#editor-h" id="id157">editor.h</a></li> -<li><a class="reference internal" href="#keyfile-c" id="id158">keyfile.c</a></li> +<li><a class="reference" href="#hidden-preferences" id="id153" name="id153">Hidden preferences</a></li> +<li><a class="reference" href="#compile-time-options" id="id154" name="id154">Compile-time options</a><ul> +<li><a class="reference" href="#src-geany-h" id="id155" name="id155">src/geany.h</a></li> +<li><a class="reference" href="#project-h" id="id156" name="id156">project.h</a></li> +<li><a class="reference" href="#editor-h" id="id157" name="id157">editor.h</a></li> +<li><a class="reference" href="#keyfile-c" id="id158" name="id158">keyfile.c</a></li> </ul> </li> -<li><a class="reference internal" href="#gnu-general-public-license" id="id159">GNU General Public License</a></li> -<li><a class="reference internal" href="#license-for-scintilla-and-scite" id="id160">License for Scintilla and SciTE</a></li> +<li><a class="reference" href="#gnu-general-public-license" id="id159" name="id159">GNU General Public License</a></li> +<li><a class="reference" href="#license-for-scintilla-and-scite" id="id160" name="id160">License for Scintilla and SciTE</a></li> </ul> </div> -<div class="section" id="introduction"> -<h1><a class="toc-backref" href="#id9">Introduction</a></h1> -<div class="section" id="about-geany"> -<h2><a class="toc-backref" href="#id10">About Geany</a></h2> +<div class="section"> +<h1><a class="toc-backref" href="#id9" id="introduction" name="introduction">Introduction</a></h1> +<div class="section"> +<h2><a class="toc-backref" href="#id10" id="about-geany" name="about-geany">About Geany</a></h2> <p>Geany is a small and lightweight Integrated Development Environment. It was developed to provide a small and fast IDE, which has only a few dependencies from other packages. Another goal was to be as independent @@ -413,50 +413,50 @@ <li>Plugin interface</li> </ul> </div> -<div class="section" id="where-to-get-it"> -<h2><a class="toc-backref" href="#id11">Where to get it</a></h2> -<p>You can obtain Geany from <a class="reference external" href="http://www.geany.org/">http://www.geany.org/</a> or perhaps also from +<div class="section"> +<h2><a class="toc-backref" href="#id11" id="where-to-get-it" name="where-to-get-it">Where to get it</a></h2> +<p>You can obtain Geany from <a class="reference" href="http://www.geany.org/">http://www.geany.org/</a> or perhaps also from your distributor. 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="#id12">License</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id12" 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"><span class="pre">scintilla/</span></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> +<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="#id13">About this document</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id13" 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="#id14">Installation</a></h1> -<div class="section" id="requirements"> -<h2><a class="toc-backref" href="#id15">Requirements</a></h2> +<div class="section"> +<h1><a class="toc-backref" href="#id14" id="installation" name="installation">Installation</a></h1> +<div class="section"> +<h2><a class="toc-backref" href="#id15" id="requirements" name="requirements">Requirements</a></h2> <p>You will need the GTK (>= 2.6.0) libraries and their dependencies (Pango, GLib and ATK). Your distro should provide packages for these, usually installed by default. For Windows, you can download an installer which bundles these libraries from the website.</p> </div> -<div class="section" id="binary-packages"> -<h2><a class="toc-backref" href="#id16">Binary packages</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id16" 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="#id17">Source compilation</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id17" id="source-compilation" name="source-compilation">Source compilation</a></h2> <p>For compiling Geany yourself, you will need the GTK (>= 2.6.0) libraries and header files. You will also need the Pango, GLib and ATK libraries and header files. All these files are available at -<a class="reference external" href="http://www.gtk.org">http://www.gtk.org</a>, but very often your distro will provide development +<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 compiler and the Make tool; a C++ compiler is also required (for the included Scintilla library). The @@ -470,8 +470,8 @@ <pre class="literal-block"> % make install </pre> -<div class="section" id="custom-installation"> -<h3><a class="toc-backref" href="#id18">Custom installation</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id18" 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"> @@ -480,18 +480,18 @@ <p>You may also want to read the INSTALL file for advanced installation options.</p> <ul class="simple"> -<li>See also <a class="reference 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"> -<h3><a class="toc-backref" href="#id19">Dynamic linking loader support</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id19" id="dynamic-linking-loader-support" name="dynamic-linking-loader-support">Dynamic linking loader support</a></h3> <p>In the case that your system lacks dynamic linking loader support, you probably want to pass the option <tt class="docutils literal"><span class="pre">--disable-vte</span></tt> to the <tt class="docutils literal"><span class="pre">configure</span></tt> script. This prevents compiling Geany with dynamic linking loader support to automatically load <tt class="docutils literal"><span class="pre">libvte.so.4</span></tt> if available.</p> </div> -<div class="section" id="build-problems"> -<h3><a class="toc-backref" href="#id20">Build problems</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id20" 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 @@ -499,10 +499,10 @@ </div> </div> </div> -<div class="section" id="usage"> -<h1><a class="toc-backref" href="#id21">Usage</a></h1> -<div class="section" id="getting-started"> -<h2><a class="toc-backref" href="#id22">Getting started</a></h2> +<div class="section"> +<h1><a class="toc-backref" href="#id21" id="usage" name="usage">Usage</a></h1> +<div class="section"> +<h2><a class="toc-backref" href="#id22" id="getting-started" name="getting-started">Getting started</a></h2> <p>You can start Geany in the following ways:</p> <ul> <li><p class="first">From the Desktop Environment menu:</p> @@ -518,8 +518,8 @@ </li> </ul> </div> -<div class="section" id="command-line-options"> -<h2><a class="toc-backref" href="#id23">Command line options</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id23" id="command-line-options" name="command-line-options">Command line options</a></h2> <table border="1" class="docutils"> <colgroup> <col width="13%" /> @@ -563,7 +563,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> @@ -647,13 +647,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="#id24">General</a></h2> -<div class="section" id="startup"> -<h3><a class="toc-backref" href="#id25">Startup</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id24" id="general" name="general">General</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id25" id="startup" name="startup">Startup</a></h3> <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-tab-in-preferences-dialog">General tab in preferences dialog</a>). If you specify some +(see <a class="reference" href="#general-tab-in-preferences-dialog">General tab in preferences dialog</a>). If you specify some files on the command line, only these files will be opened, but you can find the files from the last session in the file menu under the "Recent files" item. By default this contains the last 10 recently @@ -664,17 +664,17 @@ 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="#id26">Opening files from the command-line in a running instance</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id26" id="opening-files-from-the-command-line-in-a-running-instance" name="opening-files-from-the-command-line-in-a-running-instance">Opening files from the command-line in a running instance</a></h3> <p>Geany detects an already running instance of itself and opens files from the command-line in the already running instance. So, Geany can be used to view and edit files by opening them from other programs such as a file manager. 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> +line option -- see the section 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="#id27">Virtual terminal emulator widget (VTE)</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id27" id="virtual-terminal-emulator-widget-vte" name="virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a></h3> <p>If you have installed <tt class="docutils literal"><span class="pre">libvte.so</span></tt> in your system, it is loaded automatically by Geany, and you will have a terminal widget in the notebook at the bottom.</p> @@ -682,7 +682,7 @@ will not be loaded. So there is no need to install the package containing this file in order to run Geany. Additionally, you can disable the use of the terminal widget by command line option, for more information -see the section called <a class="reference 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) nearly as an usual terminal program like xterm. There is basic clipboard support. You can paste the contents of the clipboard by pressing the right mouse @@ -713,12 +713,12 @@ <p>Obviously, you have to adjust the paths and set X to the number of your <tt class="docutils literal"><span class="pre">libvte.so</span></tt>.</p> <p>You can also specify the filename of the VTE library to use on the command -line (see the section called <a class="reference 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="#id28">Defining own widget styles using .gtkrc-2.0</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id28" id="defining-own-widget-styles-using-gtkrc-2-0" name="defining-own-widget-styles-using-gtkrc-2-0">Defining own widget styles using .gtkrc-2.0</a></h3> <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 @@ -756,10 +756,10 @@ </pre> </div> </div> -<div class="section" id="documents"> -<h2><a class="toc-backref" href="#id29">Documents</a></h2> -<div class="section" id="switching-between-documents"> -<h3><a class="toc-backref" href="#id30">Switching between documents</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id29" id="documents" name="documents">Documents</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id30" id="switching-between-documents" name="switching-between-documents">Switching between documents</a></h3> <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 @@ -767,10 +767,10 @@ of whether or not editor tabs are visible).</p> </div> </div> -<div class="section" id="character-sets-and-unicode-byte-order-mark-bom"> -<h2><a class="toc-backref" href="#id31">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> -<div class="section" id="using-character-sets"> -<h3><a class="toc-backref" href="#id32">Using character sets</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id31" id="character-sets-and-unicode-byte-order-mark-bom" name="character-sets-and-unicode-byte-order-mark-bom">Character sets and Unicode Byte-Order-Mark (BOM)</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id32" id="using-character-sets" name="using-character-sets">Using character sets</a></h3> <p>Geany provides support for detecting and converting character sets. So you can open and save files in different character sets and even can convert a file from a character set to another one. To do this, @@ -815,8 +815,8 @@ </li> </ul> </div> -<div class="section" id="in-file-encoding-specification"> -<h3><a class="toc-backref" href="#id33">In-file encoding specification</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id33" id="in-file-encoding-specification" name="in-file-encoding-specification">In-file encoding specification</a></h3> <p>Geany detects meta tags of HTML files which contain charset information like:</p> <pre class="literal-block"> @@ -857,8 +857,8 @@ Anything after the first 512 bytes will not be recognised.</p> </div> </div> -<div class="section" id="special-encoding-none"> -<h3><a class="toc-backref" href="#id34">Special encoding "None"</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id34" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> <p>There is a special encoding "None" which is actually no real encoding. It is useful when you know that Geany cannot auto-detect the encoding of a file and it is not displayed correctly. Especially @@ -867,10 +867,10 @@ of the first NUL-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="#id35">Unicode Byte-Order-Mark (BOM)</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id35" id="unicode-byte-order-mark-bom" name="unicode-byte-order-mark-bom">Unicode Byte-Order-Mark (BOM)</a></h3> <p>Furthermore, Geany detects an 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 an unicode encoding. The Byte Order Mark helps to detect the encoding of a file, e.g. whether it is UTF-16LE or UTF-16BE and so on. On Unix-like systems @@ -888,10 +888,10 @@ </div> </div> </div> -<div class="section" id="editing"> -<h2><a class="toc-backref" href="#id36">Editing</a></h2> -<div class="section" id="folding"> -<h3><a class="toc-backref" href="#id37">Folding</a></h3> +<div class="section"> +<h2><a class="toc-backref" href="#id36" id="editing" name="editing">Editing</a></h2> +<div class="section"> +<h3><a class="toc-backref" href="#id37" id="folding" name="folding">Folding</a></h3> <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 @@ -914,8 +914,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"> -<h3><a class="toc-backref" href="#id38">Column mode editing</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id38" id="column-mode-editing" name="column-mode-editing">Column mode editing</a></h3> <p>There is basic support for column mode editing. To use it, create a rectangular selection by holding down the Control key while selecting some text. It is also possible to create a zero-column selection but @@ -924,18 +924,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="#id39">Drag and drop of text</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id39" id="drag-and-drop-of-text" name="drag-and-drop-of-text">Drag and drop of text</a></h3> <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="#id40">Indentation</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id40" 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-tab-in-preferences-dialog">Editor Features +or multiple spaces. The default indent mode is set in the <a class="reference" href="#editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a>. 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, this scans each file that is opened @@ -950,8 +950,8 @@ <dd>Indent with spaces.</dd> </dl> </div> -<div class="section" id="auto-indentation"> -<h3><a class="toc-backref" href="#id41">Auto-indentation</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id41" 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> @@ -971,8 +971,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="#id42">Bookmarks</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id42" 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> @@ -989,14 +989,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="#id43">Code Navigation History</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id43" 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> @@ -1008,8 +1008,8 @@ location". This makes it easier to navigate in e.g. foreign code and between different files.</p> </div> -<div class="section" id="send-text-through-definable-commands"> -<h3><a class="toc-backref" href="#id44">Send text through definable commands</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id44" id="send-text-through-definable-commands" name="send-text-through-definable-commands">Send text through definable commands</a></h3> <p>You can define several custom commands in Geany and send the current selection to one of these commands. The output of the command will be used to replace the current selection. So, it is possible to use text @@ -1025,18 +1025,18 @@ some command line options. To delete a command, just clear the text entry and press OK. It will be deleted automatically.</p> </div> -<div class="section" id="context-actions"> -<h3><a class="toc-backref" href="#id45">Context actions</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id45" id="context-actions" name="context-actions">Context actions</a></h3> <p>You can execute a specified command on the current word near the cursor position or an available selection and this word is passed as an argument to this command. It can be used for example to open some API documentation in a browser window or open any other external program. To do this, there is an menu entry in the popup menu of the editor widget and also a keyboard shortcut(see the section called -<a class="reference 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 additionally for each filetype (see "context_action_cmd" in the section called -<a class="reference internal" href="#format">Format</a>). At executing, the filetype specific command is used if +<a class="reference" href="#format">Format</a>). At executing, the filetype specific command is used if available otherwise the command specified in the preferences dialog is executed.</p> <p>The passed word can be referred with the wildcard "%s" everywhere @@ -1049,10 +1049,10 @@ <p>when executing the command, the %s is substituted by the word near the cursor position or by the current selection. If the cursor is at the word "echo", a browser window will open(assumed your browser is -called firefox) and it will open the address: <a class="reference 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="user-definable-snippets"> -<h3><a class="toc-backref" href="#id46">User-definable snippets</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id46" 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 by not typing often used strings and letting Geany do the work for you. @@ -1132,7 +1132,7 @@ with "Enrico Tröger". The key to start auto completion can be changed in the preferences dialog, by default it is TAB.</p> <p>Since Geany 0.15 you can also use most of the available templates wildcards -listed in <a class="reference 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] @@ -1147,14 +1147,14 @@ 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="#id47">Inserting unicode characters</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id47" id="inserting-unicode-characters" name="inserting-unicode-characters">Inserting unicode characters</a></h3> <p>With GTK 2.10 and above, you can hit Ctrl-Shift-u, then still holding Ctrl-Shift, type some hex digits representing the code point for the character you want, then let go of Ctrl-Shift and hit a key such as the right arrow.</p> <p>For this to work in Geany, you'll need to first unbind Ctrl-Shift-u -in the <a class="reference internal" href="#keybinding-tab-in-preferences-dialog">keybinding tab in preferences dialog</a>, then restart Geany. +in the <a class="reference" href="#keybinding-tab-in-preferences-dialog">keybinding tab in preferences dialog</a>, then restart Geany. Note that it works slightly differently from other GTK applications, in that you'll need to continue to hold down the Ctrl and Shift keys while typing the code point hex digits.</p> @@ -1163,8 +1163,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="#id48">Search, replace and go to</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id48" id="search-replace-and-go-to" name="search-replace-and-go-to">Search, replace and go to</a></h2> <p>This section describes search-related commands from the Search menu and the editor window's popup menu:</p> <ul class="simple"> @@ -1177,22 +1177,22 @@ <li>Go to line</li> </ul> <p>* These items are available from the editor window's popup menu, or by -using a keyboard shortcut (see the section called <a class="reference internal" href="#keybindings">Keybindings</a>).</p> -<div class="section" id="find"> -<h3><a class="toc-backref" href="#id49">Find</a></h3> +using a keyboard shortcut (see the section called <a class="reference" href="#keybindings">Keybindings</a>).</p> +<div class="section"> +<h3><a class="toc-backref" href="#id49" id="find" name="find">Find</a></h3> <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="#id50">Matching options</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id50" id="matching-options" name="matching-options">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> +<a class="reference" href="#regular-expressions">Regular expressions</a>.</p> <p>The Use escape sequences option will transform any escaped characters into their UTF-8 equivalent. For example, \t will be transformed into a tab character. Other recognised symbols are: \\, \n, \r, \uXXXX (Unicode chararacters).</p> </div> -<div class="section" id="find-all"> -<h4><a class="toc-backref" href="#id51">Find all</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id51" 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"> @@ -1208,8 +1208,8 @@ matching lines will be highlighted. Markers and highlighting 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="#id52">Change font in search dialog text fields</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id52" id="change-font-in-search-dialog-text-fields" name="change-font-in-search-dialog-text-fields">Change font in search dialog text fields</a></h4> <p>All search related dialogs use a Monospace for the text input fields to increase the readibility of input text. This is useful when you are typing e.g. regular expressions with spaces, periods and commas which @@ -1230,8 +1230,8 @@ for the search dialogs.</p> </div> </div> -<div class="section" id="find-usage"> -<h3><a class="toc-backref" href="#id53">Find usage</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id53" 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 Find dialog command.</p> <p>If there is a selection, then it is used as the search text; otherwise @@ -1240,8 +1240,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="#id54">Find in files</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id54" 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 @@ -1249,8 +1249,8 @@ <img alt="./images/find_in_files_dialog.png" src="./images/find_in_files_dialog.png" /> <p>The Extra options field is used to pass any additional arguments to the grep tool.</p> -<div class="section" id="filtering-out-version-control-files"> -<h4><a class="toc-backref" href="#id55">Filtering out version control files</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id55" id="filtering-out-version-control-files" name="filtering-out-version-control-files">Filtering out version control files</a></h4> <p>When using the <em>Recurse in subfolders</em> option with a directory that's under version control, you can set the <em>Extra options</em> field to use grep's <tt class="docutils literal"><span class="pre">--exclude</span></tt> flag to filter out filenames.</p> @@ -1261,18 +1261,18 @@ <p>Example: <tt class="docutils literal"><span class="pre">--exclude-dir=.*</span> <span class="pre">--exclude-dir=CVS</span></tt></p> </div> </div> -<div class="section" id="replace"> -<h3><a class="toc-backref" href="#id56">Replace</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id56" id="replace" name="replace">Replace</a></h3> <p>The Replace dialog is used for replacing text in one or more open documents.</p> <img alt="./images/replace_dialog.png" src="./images/replace_dialog.png" /> <p>The Replace dialog has the same options for matching text as the Find -dialog. See the section called <a class="reference internal" href="#matching-options">Matching options</a>.</p> +dialog. See the section called <a class="reference" href="#matching-options">Matching options</a>.</p> <p>The <em>Use regular expressions</em> option applies both to the search string and to the replacement text; for the latter back references can be -used -- see the entry for '\n' in <a class="reference internal" href="#regular-expressions">Regular expressions</a>.</p> -<div class="section" id="replace-all"> -<h4><a class="toc-backref" href="#id57">Replace all</a></h4> +used -- see the entry for '\n' in <a class="reference" href="#regular-expressions">Regular expressions</a>.</p> +<div class="section"> +<h4><a class="toc-backref" href="#id57" id="replace-all" name="replace-all">Replace all</a></h4> <p>To replace several matches, click on the <em>Replace All</em> expander. This will reveal several options:</p> <ul class="simple"> @@ -1286,8 +1286,8 @@ in the current selection of the current document.</p> </div> </div> -<div class="section" id="go-to-tag-definition"> -<h3><a class="toc-backref" href="#id58">Go to tag definition</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id58" id="go-to-tag-definition" name="go-to-tag-definition">Go to tag definition</a></h3> <p>If the current word is the name of a tag definition (like a function body) and the file containing the tag definition is open, this command will switch to that file and go to the corresponding line number. The @@ -1295,18 +1295,18 @@ or the word underneath the popup menu click position when the popup menu is used.</p> </div> -<div class="section" id="go-to-tag-declaration"> -<h3><a class="toc-backref" href="#id59">Go to tag declaration</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id59" id="go-to-tag-declaration" name="go-to-tag-declaration">Go to tag declaration</a></h3> <p>Like Go to tag definition, but for a forward declaration such as a function prototype or <tt class="docutils literal"><span class="pre">extern</span></tt> declaration instead of a function body.</p> </div> -<div class="section" id="go-to-line"> -<h3><a class="toc-backref" href="#id60">Go to line</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id60" id="go-to-line" name="go-to-line">Go to line</a></h3> <p>Go to a particular line number in the current file.</p> </div> -<div class="section" id="regular-expressions"> -<h3><a class="toc-backref" href="#id61">Regular expressions</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id61" 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> @@ -1378,15 +1378,15 @@ </tr> </tbody> </table> -<div class="section" id="partial-posix-compatibility"> -<h4><a class="toc-backref" href="#id62">Partial POSIX compatibility</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id62" id="partial-posix-compatibility" name="partial-posix-compatibility">Partial POSIX compatibility</a></h4> <p>Note that the POSIX '?' regular expression character for optional matching is not supported by the Find and Replace dialogs.</p> </div> </div> </div> -<div class="section" id="tags"> -<h2><a class="toc-backref" href="#id63">Tags</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id63" id="tags" name="tags">Tags</a></h2> <p>Geany has built-in functionality for generating tag information (aka "workspace tags") for supported filetypes when you open a file. You can also have Geany automatically load external tag files (aka "global @@ -1395,17 +1395,17 @@ <p>Geany uses its own tag file format, similar to what <tt class="docutils literal"><span class="pre">ctags</span></tt> uses (but is incompatible with ctags). You use Geany to generate global tags files, as described below.</p> -<div class="section" id="workspace-tags"> -<h3><a class="toc-backref" href="#id64">Workspace tags</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id64" id="workspace-tags" name="workspace-tags">Workspace tags</a></h3> <p>Tags for each document are parsed whenever a file is loaded or saved. These are shown in the Symbol list in the Sidebar. These tags are also used for autocompletion of symbols and calltips for all documents open in the current session that have the same filetype.</p> <p>The <em>Go to Tag</em> commands can be used with all workspace tags. See -<a class="reference internal" href="#go-to-tag-definition">Go to tag definition</a>.</p> +<a class="reference" href="#go-to-tag-definition">Go to tag definition</a>.</p> </div> -<div class="section" id="global-tags"> -<h3><a class="toc-backref" href="#id65">Global tags</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id65" id="global-tags" name="global-tags">Global tags</a></h3> <p>Global tags are used to provide autocompletion of symbols and calltips without having to open the corresponding source files. This is intended for library APIs, as the tags file only has to be updated when you upgrade @@ -1422,10 +1422,10 @@ name.lang_ext.tags </pre> <p><em>lang_ext</em> is one of the extensions set for the filetype associated -with the tags. See the section called <a class="reference internal" href="#filetype-extensions">Filetype extensions</a> for +with the tags. See the section called <a class="reference" href="#filetype-extensions">Filetype extensions</a> for more information.</p> -<div class="section" id="default-global-tags-files"> -<h4><a class="toc-backref" href="#id66">Default global tags files</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id66" id="default-global-tags-files" name="default-global-tags-files">Default global tags files</a></h4> <p>For some languages, a list of global tags is loaded when the corresponding filetype is first used. Currently these are for:</p> <ul class="simple"> @@ -1436,8 +1436,8 @@ <li>LaTeX</li> </ul> </div> -<div class="section" id="generating-a-global-tags-file"> -<h4><a class="toc-backref" href="#id67">Generating a global tags file</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id67" id="generating-a-global-tags-file" name="generating-a-global-tags-file">Generating a global tags file</a></h4> <p><em>Filetypes support:</em></p> <p>Currently this is not yet supported for Pascal, PHP and LaTeX filetypes.</p> @@ -1448,7 +1448,7 @@ </pre> <ul class="simple"> <li>Tag File should be in the format described earlier -- see the -section called <a class="reference internal" href="#global-tags">Global tags</a>.</li> +section called <a class="reference" href="#global-tags">Global tags</a>.</li> <li>File list is a list of filenames, each with a full path (unless you are generating C/C++ tags and have set the CFLAGS environment variable appropriately).</li> @@ -1484,8 +1484,8 @@ upgrading Geany.</p> </div> </div> -<div class="section" id="ignore-tags"> -<h3><a class="toc-backref" href="#id68">Ignore tags</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id68" id="ignore-tags" name="ignore-tags">Ignore tags</a></h3> <p>You can also ignore certain tags if they would lead to wrong parsing of the code. Simply create a file called "ignore.tags" in your Geany configuration directory (usually <tt class="docutils literal"><span class="pre">~/.geany/</span></tt>). Then list all tags @@ -1508,8 +1508,8 @@ Exuberant Ctags.</p> </div> </div> -<div class="section" id="preferences"> -<h2><a class="toc-backref" href="#id69">Preferences</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id69" id="preferences" name="preferences">Preferences</a></h2> <p>You may adjust Geany's settings using the Edit --> Preferences dialog. Any changes you make there can be applied by hitting either the Apply or the OK button. These settings will persist between Geany @@ -1520,17 +1520,17 @@ persist between Geany sessions. The settings under the Document menu, however, are only for the current document and revert to defaults when restarting Geany.</p> -<p>There are also some rarer <a class="reference internal" href="#hidden-preferences">Hidden preferences</a>.</p> +<p>There are also some rarer <a class="reference" href="#hidden-preferences">Hidden preferences</a>.</p> <div class="note"> <p class="first admonition-title">Note</p> <p class="last">In the paragraphs that follow, the text describing a dialog tab comes after the screenshot of that tab.</p> </div> -<div class="section" id="general-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id70">General tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id70" id="general-tab-in-preferences-dialog" name="general-tab-in-preferences-dialog">General tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_gen.png" src="./images/pref_dialog_gen.png" /> -<div class="section" id="id1"> -<h4><a class="toc-backref" href="#id71">Startup</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id71" id="id1" name="id1">Startup</a></h4> <dl class="docutils"> <dt>Load files from the last session</dt> <dd>On startup, load the same files you had open the last time you @@ -1541,8 +1541,8 @@ <dd>Allow plugins to be used in Geany.</dd> </dl> </div> -<div class="section" id="shutdown"> -<h4><a class="toc-backref" href="#id72">Shutdown</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id72" id="shutdown" name="shutdown">Shutdown</a></h4> <dl class="docutils"> <dt>Save window position and geometry</dt> <dd>Save the current position and size of the main window so next time @@ -1551,8 +1551,8 @@ <dd>Have a dialog pop up to confirm that you really want to quit Geany.</dd> </dl> </div> -<div class="section" id="projects"> -<h4><a class="toc-backref" href="#id73">Projects</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id73" id="projects" name="projects">Projects</a></h4> <dl class="docutils"> <dt>Use project-based session files</dt> <dd>Save your current session when closing projects. You will be able to @@ -1560,8 +1560,8 @@ you had open previously.</dd> </dl> </div> -<div class="section" id="miscellaneous"> -<h4><a class="toc-backref" href="#id74">Miscellaneous</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id74" id="miscellaneous" name="miscellaneous">Miscellaneous</a></h4> <dl class="docutils"> <dt>Beep on errors when compilation has finished</dt> <dd>Have the computer make a beeping sound when compilation of your program @@ -1578,26 +1578,26 @@ </dl> </div> </div> -<div class="section" id="interface-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id75">Interface tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id75" id="interface-tab-in-preferences-dialog" name="interface-tab-in-preferences-dialog">Interface tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_interface.png" src="./images/pref_dialog_interface.png" /> -<div class="section" id="sidebar"> -<h4><a class="toc-backref" href="#id76">Sidebar</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id76" id="sidebar" name="sidebar">Sidebar</a></h4> <dl class="docutils"> <dt>Show symbol list</dt> <dd>Show the list of functions, variables, and other information in the current document you are editing.</dd> <dt>Show documents list</dt> <dd>Show all the documents you have open currently. This can be used to -change between documents (see <a class="reference internal" href="#switching-between-documents">Switching between documents</a>) and +change between documents (see <a class="reference" href="#switching-between-documents">Switching between documents</a>) and to perform some common operations such as saving, closing and reloading.</dd> <dt>Show full path name in documents list</dt> <dd>Show the full directory path of the files you are editing in the <em>Documents</em> list.</dd> </dl> </div> -<div class="section" id="fonts"> -<h4><a class="toc-backref" href="#id77">Fonts</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id77" id="fonts" name="fonts">Fonts</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Change the font used to display documents.</dd> @@ -1607,8 +1607,8 @@ <dd>Change the font used for the message window area.</dd> </dl> </div> -<div class="section" id="editor-tabs"> -<h4><a class="toc-backref" href="#id78">Editor tabs</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id78" id="editor-tabs" name="editor-tabs">Editor tabs</a></h4> <dl class="docutils"> <dt>Show editor tabs</dt> <dd>Show a notebook tab for all documents so you can switch between them @@ -1621,8 +1621,8 @@ right of all existing tabs.</dd> </dl> </div> -<div class="section" id="tab-positions"> -<h4><a class="toc-backref" href="#id79">Tab positions</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id79" id="tab-positions" name="tab-positions">Tab positions</a></h4> <dl class="docutils"> <dt>Editor</dt> <dd>Set the positioning of the editor's notebook tabs to the right, @@ -1635,8 +1635,8 @@ right, left, top, or bottom of the message window.</dd> </dl> </div> -<div class="section" id="id2"> -<h4><a class="toc-backref" href="#id80">Miscellaneous</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id80" id="id2" name="id2">Miscellaneous</a></h4> <dl class="docutils"> <dt>Show status bar</dt> <dd>Show the status bar at the bottom of the main window. It gives information about @@ -1645,19 +1645,19 @@ </dl> </div> </div> -<div class="section" id="toolbar-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id81">Toolbar tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id81" id="toolbar-tab-in-preferences-dialog" name="toolbar-tab-in-preferences-dialog">Toolbar tab in preferences dialog</a></h3> <p>Affects the main toolbar underneath the menu bar.</p> <img alt="./images/pref_dialog_toolbar.png" src="./images/pref_dialog_toolbar.png" /> -<div class="section" id="toolbar"> -<h4><a class="toc-backref" href="#id82">Toolbar</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id82" id="toolbar" name="toolbar">Toolbar</a></h4> <dl class="docutils"> <dt>Show Toolbar</dt> <dd>Whether to show the toolbar.</dd> </dl> </div> -<div class="section" id="items"> -<h4><a class="toc-backref" href="#id83">Items</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id83" id="items" name="items">Items</a></h4> <dl class="docutils"> <dt>Show file operation buttons</dt> <dd>Show the buttons to open a new file, open an existing file, save a file, @@ -1686,8 +1686,8 @@ <dd>Show a button to quit geany.</dd> </dl> </div> -<div class="section" id="appearance"> -<h4><a class="toc-backref" href="#id84">Appearance</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id84" id="appearance" name="appearance">Appearance</a></h4> <dl class="docutils"> <dt>Icon Style</dt> <dd>Select the toolbar icon style to use - either icons and text, just @@ -1697,12 +1697,12 @@ </dl> </div> </div> -<div class="section" id="editor-features-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id85">Editor Features tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id85" id="editor-features-tab-in-preferences-dialog" name="editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_edit.png" src="./images/pref_dialog_edit.png" /> -<div class="section" id="indentation-group"> -<h4><a class="toc-backref" href="#id86">Indentation group</a></h4> -<p>See <a class="reference internal" href="#indentation">Indentation</a> for more information.</p> +<div class="section"> +<h4><a class="toc-backref" href="#id86" id="indentation-group" name="indentation-group">Indentation group</a></h4> +<p>See <a class="reference" href="#indentation">Indentation</a> for more information.</p> <dl class="docutils"> <dt>Type</dt> <dd>Whether to use tabs or spaces for indentation.</dd> @@ -1728,7 +1728,7 @@ unindent when pressing Shift-tab. Otherwise, the tab key will insert a tab character into the document (which can be different from indentation, depending on the indent type).</p> -<div class="note last"> +<div class="last note"> <p class="first admonition-title">Note</p> <p class="last">There are also separate configurable keybindings for indent & unindent, but this pref allows the tab key to have different @@ -1737,8 +1737,8 @@ </dd> </dl> </div> -<div class="section" id="features"> -<h4><a class="toc-backref" href="#id87">Features</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id87" id="features" name="features">Features</a></h4> <dl class="docutils"> <dt>Line wrapping</dt> <dd>Show long lines wrapped around to new display lines.</dd> @@ -1769,13 +1769,13 @@ </dl> </div> </div> -<div class="section" id="editor-completions-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id88">Editor Completions tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id88" id="editor-completions-tab-in-preferences-dialog" name="editor-completions-tab-in-preferences-dialog">Editor Completions tab in preferences dialog</a></h3> <dl class="docutils"> <dt>Snippet Completion</dt> <dd>Whether to replace special keywords after typing Tab into a pre-defined text snippet. -See <a class="reference internal" href="#user-definable-snippets">User-definable snippets</a>.</dd> +See <a class="reference" href="#user-definable-snippets">User-definable snippets</a>.</dd> <dt>XML tag autocompletion</dt> <dd>When you open an XML tag automatically generate its completion tag.</dd> <dt>Automatic continuation multi-line comments</dt> @@ -1805,12 +1805,12 @@ <dd>The maximum number of symbols to show in the autocompletion window.</dd> </dl> </div> -<div class="section" id="editor-display-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id89">Editor Display tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id89" id="editor-display-tab-in-preferences-dialog" name="editor-display-tab-in-preferences-dialog">Editor Display tab in preferences dialog</a></h3> <p>This is for visual elements displayed in the editor window.</p> <img alt="./images/pref_dialog_display.png" src="./images/pref_dialog_display.png" /> -<div class="section" id="display"> -<h4><a class="toc-backref" href="#id90">Display</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id90" id="display" name="display">Display</a></h4> <dl class="docutils"> <dt>Show indendation guides</dt> <dd>Show vertical lines to help show how much leading indentation there @@ -1826,8 +1826,8 @@ Otherwise you can scroll one more page even if there are no real lines.</dd> </dl> </div> -<div class="section" id="long-line-marker"> -<h4><a class="toc-backref" href="#id91">Long line marker</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id91" id="long-line-marker" name="long-line-marker">Long line marker</a></h4> <p>The long line marker helps to indicate overly-long lines, or as a hint to the user for when to break the line.</p> <dl class="docutils"> @@ -1852,11 +1852,11 @@ </dl> </div> </div> -<div class="section" id="files-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id92">Files tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id92" id="files-tab-in-preferences-dialog" name="files-tab-in-preferences-dialog">Files tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_files.png" src="./images/pref_dialog_files.png" /> -<div class="section" id="new-files"> -<h4><a class="toc-backref" href="#id93">New files</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id93" id="new-files" name="new-files">New files</a></h4> <dl class="docutils"> <dt>Default encoding (new files)</dt> <dd>The type of file encoding you wish to use when creating files.</dd> @@ -1872,8 +1872,8 @@ On Unix-like systems, LF is default and CR is used on MAC systems.</dd> </dl> </div> -<div class="section" id="saving-files"> -<h4><a class="toc-backref" href="#id94">Saving files</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id94" id="saving-files" name="saving-files">Saving files</a></h4> <p>Perform special formatting operations when a document is saved. These can each be undone with the Undo command as usual.</p> <dl class="docutils"> @@ -1883,16 +1883,16 @@ <dd>Remove the trailing spaces on each line of the document.</dd> <dt>Replace tabs by space</dt> <dd><p class="first">Replace all tabs in the document with the equivalent number of spaces.</p> -<div class="note last"> +<div class="last note"> <p class="first admonition-title">Note</p> <p class="last">It is better to use spaces to indent than use this preference - see -<a class="reference internal" href="#indentation">Indentation</a>.</p> +<a class="reference" href="#indentation">Indentation</a>.</p> </div> </dd> </dl> </div> -<div class="section" id="id3"> -<h4><a class="toc-backref" href="#id95">Miscellaneous</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id95" id="id3" name="id3">Miscellaneous</a></h4> <dl class="docutils"> <dt>Recent files list length</dt> <dd>The number of files to remember in the recently used files list.</dd> @@ -1902,11 +1902,11 @@ </dl> </div> </div> -<div class="section" id="tools-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id96">Tools tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id96" id="tools-tab-in-preferences-dialog" name="tools-tab-in-preferences-dialog">Tools tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_tools.png" src="./images/pref_dialog_tools.png" /> -<div class="section" id="tool-paths"> -<h4><a class="toc-backref" href="#id97">Tool paths</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id97" id="tool-paths" name="tool-paths">Tool paths</a></h4> <dl class="docutils"> <dt>Make</dt> <dd>The location of the make executable.</dd> @@ -1921,12 +1921,12 @@ <p class="first admonition-title">Note</p> <p class="last">For Windows users: at the time of writing it is recommended to use the grep.exe from the UnxUtils project -(<a class="reference external" href="http://sourceforge.net/projects/unxutils">http://sourceforge.net/projects/unxutils</a>). The grep.exe from the +(<a class="reference" href="http://sourceforge.net/projects/unxutils">http://sourceforge.net/projects/unxutils</a>). The grep.exe from the Mingw project for instance might not work with Geany at the moment.</p> </div> </div> -<div class="section" id="commands"> -<h4><a class="toc-backref" href="#id98">Commands</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id98" id="commands" name="commands">Commands</a></h4> <dl class="docutils"> <dt>Context action</dt> <dd>Set this to a command to execute on the current word. @@ -1935,8 +1935,8 @@ </dl> </div> </div> -<div class="section" id="template-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id99">Template tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id99" id="template-tab-in-preferences-dialog" name="template-tab-in-preferences-dialog">Template tab in preferences dialog</a></h3> <p>This data is used as metadata for various template text to insert into a document, such as the file header. You only need to set fields that you want to use in your template files.</p> @@ -1945,8 +1945,8 @@ <p class="last">For changes made here to take effect a restart of geany is required.</p> </div> <img alt="./images/pref_dialog_templ.png" src="./images/pref_dialog_templ.png" /> -<div class="section" id="template-data"> -<h4><a class="toc-backref" href="#id100">Template data</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id100" id="template-data" name="template-data">Template data</a></h4> <dl class="docutils"> <dt>Developer</dt> <dd>The name of the developer who will be creating files.</dd> @@ -1954,7 +1954,7 @@ <dd>The initials of the developer.</dd> <dt>Mail address</dt> <dd><p class="first">The email address of the developer.</p> -<div class="note last"> +<div class="last note"> <p class="first admonition-title">Note</p> <p class="last">You may wish to add anti-spam markup, e.g. <tt class="docutils literal"><span class="pre">name<at>site<dot>ext</span></tt>.</p> </div> @@ -1966,30 +1966,30 @@ <dt>Year</dt> <dd>Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function. For details please see -<a class="reference external" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +<a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> <dt>Date</dt> <dd>Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function. For details please see -<a class="reference external" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +<a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> <dt>Date & Time</dt> <dd>Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function. For details please see -<a class="reference external" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +<a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> </dl> </div> </div> -<div class="section" id="keybinding-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id101">Keybinding tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id101" id="keybinding-tab-in-preferences-dialog" name="keybinding-tab-in-preferences-dialog">Keybinding tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_keys.png" src="./images/pref_dialog_keys.png" /> <p>There are some handy commands in here that are not, by default, bound to a key combination, and may not be available as a menu item.</p> <div class="note"> <p class="first admonition-title">Note</p> -<p class="last">For more information see the section called <a class="reference internal" href="#keybindings">Keybindings</a>.</p> +<p class="last">For more information see the section called <a class="reference" href="#keybindings">Keybindings</a>.</p> </div> </div> -<div class="section" id="printing-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id102">Printing tab in preferences dialog</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id102" id="printing-tab-in-preferences-dialog" name="printing-tab-in-preferences-dialog">Printing tab in preferences dialog</a></h3> <img alt="./images/pref_dialog_printing.png" src="./images/pref_dialog_printing.png" /> <dl class="docutils"> <dt>Use external command for printing</dt> @@ -2007,15 +2007,15 @@ <dt>Date format</dt> <dd>How the date should be printed. You can use the same format specifiers as in the ANSI C function strftime(). For details please -see <a class="reference external" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> +see <a class="reference" href="http://man.cx/strftime">http://man.cx/strftime</a>.</dd> </dl> </div> -<div class="section" id="vte-tab-in-preferences-dialog"> -<h3><a class="toc-backref" href="#id103">VTE tab in preferences dialog</a></h3> -<p>See also: <a class="reference internal" href="#virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a>.</p> +<div class="section"> +<h3><a class="toc-backref" href="#id103" id="vte-tab-in-preferences-dialog" name="vte-tab-in-preferences-dialog">VTE tab in preferences dialog</a></h3> +<p>See also: <a class="reference" href="#virtual-terminal-emulator-widget-vte">Virtual terminal emulator widget (VTE)</a>.</p> <img alt="./images/pref_dialog_vte.png" src="./images/pref_dialog_vte.png" /> -<div class="section" id="terminal-widget"> -<h4><a class="toc-backref" href="#id104">Terminal widget</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id104" id="terminal-widget" name="terminal-widget">Terminal widget</a></h4> <dl class="docutils"> <dt>Terminal font</dt> <dd>Select the font that will be used in the terminal emulation control.</dd> @@ -2055,8 +2055,8 @@ </div> </div> </div> -<div class="section" id="project-management"> -<h2><a class="toc-backref" href="#id105">Project Management</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id105" id="project-management" name="project-management">Project Management</a></h2> <p>Project Management is optional in Geany. Currently it can be used for:</p> <ul class="simple"> <li>Storing and opening session files on a project basis.</li> @@ -2065,7 +2065,7 @@ </ul> <p>A list of session files can be stored and opened with the project when the <em>Use project-based session files</em> preference is enabled, -in the <em>Project</em> group of the <a class="reference internal" href="#preferences">Preferences</a> dialog.</p> +in the <em>Project</em> group of the <a class="reference" href="#preferences">Preferences</a> dialog.</p> <p>As long as a project is open, the Make and Run commands will use the project's settings, instead of the defaults. These will be used whichever document is currently displayed.</p> @@ -2073,8 +2073,8 @@ Geany is shutdown. When restarting Geany, the previously opened project file that was in use at the end of the last session will be reopened.</p> <p>Below are the commands used to create, modify, open and close projects.</p> -<div class="section" id="new-project"> -<h3><a class="toc-backref" href="#id106">New Project</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id106" id="new-project" name="new-project">New Project</a></h3> <p>To create a new project, fill in the <em>Name</em> field. By default this will setup a new project file <tt class="docutils literal"><span class="pre">~/projects/name.geany</span></tt>. Usually it's best to store all your project files in the same directory (they are @@ -2083,8 +2083,8 @@ can safely be set to any existing path -- it will not touch the file structure contained in it.</p> </div> -<div class="section" id="project-properties"> -<h3><a class="toc-backref" href="#id107">Project Properties</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id107" id="project-properties" name="project-properties">Project Properties</a></h3> <p>You can set an optional description for the project, but it is not used elsewhere by Geany.</p> <p>The <em>Base path</em> field is used as the directory to run the Make and Make @@ -2092,14 +2092,14 @@ specific <em>Run command</em>. The specified path can be an absolute path or relative to the project's file name.</p> -<div class="section" id="make-in-base-path"> -<h4><a class="toc-backref" href="#id108">Make in base path</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id108" id="make-in-base-path" name="make-in-base-path">Make in base path</a></h4> <p>This setting makes the <em>Build->Make</em> command use the project's base path. Uncheck this if you want to use the current file's directory instead.</p> </div> -<div class="section" id="run-command"> -<h4><a class="toc-backref" href="#id109">Run command</a></h4> +<div class="section"> +<h4><a class="toc-backref" href="#id109" id="run-command" name="run-command">Run command</a></h4> <p>The <em>Run command</em> overrides the default run command. You can set this to the executable or main script file for the project, and append any command-line arguments.</p> @@ -2108,26 +2108,26 @@ <li>%f -- complete filename without path</li> <li>%e -- filename without path and without extension</li> </ul> -<p>See <a class="reference internal" href="#build-settings-section">[build_settings] Section</a> for details.</p> +<p>See <a class="reference" href="#build-settings-section">[build_settings] Section</a> for details.</p> </div> </div> -<div class="section" id="open-project"> -<h3><a class="toc-backref" href="#id110">Open Project</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id110" id="open-project" name="open-project">Open Project</a></h3> <p>The Open command displays a standard file chooser, starting in <tt class="docutils literal"><span class="pre">~/projects</span></tt>. Choose a project file named with the <tt class="docutils literal"><span class="pre">.geany</span></tt> extension.</p> <p>When project session support is enabled, Geany will close the currently open files and open the session files associated with the project.</p> </div> -<div class="section" id="close-project"> -<h3><a class="toc-backref" href="#id111">Close Project</a></h3> +<div class="section"> +<h3><a class="toc-backref" href="#id111" id="close-project" name="close-project">Close Project</a></h3> <p>Project file settings are saved when the project is closed.</p> <p>When project session support is enabled, Geany will close the project session files and open any previously closed default session files.</p> </div> </div> -<div class="section" id="build-system"> -<h2><a class="toc-backref" href="#id112">Build system</a></h2> +<div class="section"> +<h2><a class="toc-backref" href="#id112" id="build-system" name="build-system">Build system</a></h2> <p>Geany has an integrated build system. Firstly this means that the current source file will be saved before it is processed. This is for convenience so that you don't need to keep saving small changes @@ -2142,8 +2142,8 @@ <div class="tip"> <p class="first admonition-title">Tip</p> @@ 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:[3018] trunk
by eht16＠users.sourceforge.net 28 Sep '08

28 Sep '08

Revision: 3018 http://geany.svn.sourceforge.net/geany/?rev=3018&view=rev Author: eht16 Date: 2008-09-28 16:32:49 +0000 (Sun, 28 Sep 2008) Log Message: ----------- Add new filetype 'Gettext translation file' (closes #2131985). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetype_extensions.conf trunk/scintilla/KeyWords.cxx trunk/scintilla/LexOthers.cxx trunk/scintilla/include/SciLexer.h trunk/scintilla/include/Scintilla.iface trunk/src/editor.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/highlighting.c trunk/src/plugindata.h trunk/src/templates.c Added Paths: ----------- trunk/data/filetypes.po Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-28 15:17:00 UTC (rev 3017) +++ trunk/ChangeLog 2008-09-28 16:32:49 UTC (rev 3018) @@ -3,6 +3,12 @@ * geany.glade, src/interface.c, src/notebook.c: Revert previous notebook focus changes as this disables the tab scroll arrows. + * scintilla/include/SciLexer.h, scintilla/include/Scintilla.iface, + scintilla/KeyWords.cxx, scintilla/LexOthers.cxx, src/templates.c, + src/highlighting.c, src/plugindata.h, src/filetypes.c, + src/filetypes.h, src/editor.c, data/filetype_extensions.conf, + data/filetypes.po: + Add new filetype 'Gettext translation file' (closes #2131985). 2008-09-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2008-09-28 15:17:00 UTC (rev 3017) +++ trunk/data/filetype_extensions.conf 2008-09-28 16:32:49 UTC (rev 3018) @@ -13,7 +13,7 @@ F77=*.f;*.for;*.ftn;*.f77; Fortran=*.f90;*.f95;*.f03; FreeBasic=*.bas;*.bi; -GLSL=*.glsl;*.frag;*.vert +GLSL=*.glsl;*.frag;*.vert; Haskell=*.hs;*.lhs; Haxe=*.hx; Java=*.java;*.jsp; @@ -40,4 +40,5 @@ LaTeX=*.tex;*.sty;*.idx;*.ltx; reStructuredText=*.rest;*.reST;*.rst; SQL=*.sql; +Po=*.po;*.pot; None=*; Added: trunk/data/filetypes.po =================================================================== --- trunk/data/filetypes.po (rev 0) +++ trunk/data/filetypes.po 2008-09-28 16:32:49 UTC (rev 3018) @@ -0,0 +1,45 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling] +# foreground;background;bold;italic +default=0x7f0000;0xffffff;false;false +comment=0x808080;0xffffff;false;false +msgid=0x00007f;0xffffff;true;false +msgid_text=0x00007f;0xffffff;false;false +msgstr=0x7f0000;0xffffff;true;false +msgstr_text=0x7f0000;0xffffff;false;false +msgctxt=0x007f00;0xffffff;true;false +msgctxt_text=0x007f00;0xffffff;false;false +fuzzy=0xffa500;0xffffff;true;false + +# the lexer don't support keywords + + +[settings] +# default extension used when saving files +#extension=po + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +comment_open=# +comment_close= + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler=msgfmt --check --check-accelerators=_ "%f" + Property changes on: trunk/data/filetypes.po ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/scintilla/KeyWords.cxx =================================================================== --- trunk/scintilla/KeyWords.cxx 2008-09-28 15:17:00 UTC (rev 3017) +++ trunk/scintilla/KeyWords.cxx 2008-09-28 16:32:49 UTC (rev 3018) @@ -167,6 +167,7 @@ LINK_LEXER(lmPerl); LINK_LEXER(lmPHP); LINK_LEXER(lmPHPSCRIPT); + LINK_LEXER(lmPo); LINK_LEXER(lmProps); LINK_LEXER(lmPython); LINK_LEXER(lmR); Modified: trunk/scintilla/LexOthers.cxx =================================================================== --- trunk/scintilla/LexOthers.cxx 2008-09-28 15:17:00 UTC (rev 3017) +++ trunk/scintilla/LexOthers.cxx 2008-09-28 16:32:49 UTC (rev 3018) @@ -24,6 +24,10 @@ using namespace Scintilla; #endif +static bool strstart(const char *haystack, const char *needle) { + return strncmp(haystack, needle, strlen(needle)) == 0; +} + static bool Is0To9(char ch) { return (ch >= '0') && (ch <= '9'); } @@ -582,7 +586,78 @@ } while (static_cast<int>(startPos) + length > curLineStart); } +static void ColourisePoLine( + char *lineBuffer, + unsigned int lengthLine, + unsigned int startLine, + unsigned int endPos, + Accessor &styler) { + unsigned int i = 0; + static unsigned int state = SCE_PO_DEFAULT; + unsigned int state_start = SCE_PO_DEFAULT; + + while ((i < lengthLine) && isspacechar(lineBuffer[i])) // Skip initial spaces + i++; + if (i < lengthLine) { + if (lineBuffer[i] == '#') { + // check if the comment contains any flags ("#, ") and + // then whether the flags contain "fuzzy" + if (strstart(lineBuffer, "#, ") && strstr(lineBuffer, "fuzzy")) + styler.ColourTo(endPos, SCE_PO_FUZZY); + else + styler.ColourTo(endPos, SCE_PO_COMMENT); + } else { + if (lineBuffer[0] == '"') { + // line continuation, use previous style + styler.ColourTo(endPos, state); + return; + // this implicitly also matches "msgid_plural" + } else if (strstart(lineBuffer, "msgid")) { + state_start = SCE_PO_MSGID; + state = SCE_PO_MSGID_TEXT; + } else if (strstart(lineBuffer, "msgstr")) { + state_start = SCE_PO_MSGSTR; + state = SCE_PO_MSGSTR_TEXT; + } else if (strstart(lineBuffer, "msgctxt")) { + state_start = SCE_PO_MSGCTXT; + state = SCE_PO_MSGCTXT_TEXT; + } + if (state_start != SCE_PO_DEFAULT) { + // find the next space + while ((i < lengthLine) && ! isspacechar(lineBuffer[i])) + i++; + styler.ColourTo(startLine + i - 1, state_start); + styler.ColourTo(startLine + i, SCE_PO_DEFAULT); + styler.ColourTo(endPos, state); + } + } + } else { + styler.ColourTo(endPos, SCE_PO_DEFAULT); + } +} + +static void ColourisePoDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) { + char lineBuffer[1024]; + styler.StartAt(startPos); + styler.StartSegment(startPos); + unsigned int linePos = 0; + unsigned int startLine = startPos; + for (unsigned int i = startPos; i < startPos + length; i++) { + lineBuffer[linePos++] = styler[i]; + if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) { + // End of line (or of line buffer) met, colourise it + lineBuffer[linePos] = '\0'; + ColourisePoLine(lineBuffer, linePos, startLine, i, styler); + linePos = 0; + startLine = i + 1; + } + } + if (linePos > 0) { // Last line does not have ending characters + ColourisePoLine(lineBuffer, linePos, startLine, startPos + length - 1, styler); + } +} + static void ColourisePropsLine( char *lineBuffer, unsigned int lengthLine, @@ -815,10 +890,6 @@ } } -static bool strstart(const char *haystack, const char *needle) { - return strncmp(haystack, needle, strlen(needle)) == 0; -} - static int RecogniseErrorListLine(const char *lineBuffer, unsigned int lengthLine, int &startValue) { if (lineBuffer[0] == '>') { // Command or return status @@ -1170,6 +1241,7 @@ LexerModule lmBatch(SCLEX_BATCH, ColouriseBatchDoc, "batch", 0, batchWordListDesc); LexerModule lmDiff(SCLEX_DIFF, ColouriseDiffDoc, "diff", FoldDiffDoc, emptyWordListDesc); +LexerModule lmPo(SCLEX_PO, ColourisePoDoc, "po", 0, emptyWordListDesc); LexerModule lmProps(SCLEX_PROPERTIES, ColourisePropsDoc, "props", FoldPropsDoc, emptyWordListDesc); LexerModule lmMake(SCLEX_MAKEFILE, ColouriseMakeDoc, "makefile", 0, emptyWordListDesc); LexerModule lmErrorList(SCLEX_ERRORLIST, ColouriseErrorListDoc, "errorlist", 0, emptyWordListDesc); Modified: trunk/scintilla/include/SciLexer.h =================================================================== --- trunk/scintilla/include/SciLexer.h 2008-09-28 15:17:00 UTC (rev 3017) +++ trunk/scintilla/include/SciLexer.h 2008-09-28 16:32:49 UTC (rev 3018) @@ -102,6 +102,7 @@ #define SCLEX_MAGIK 87 #define SCLEX_POWERSHELL 88 #define SCLEX_OMS 89 +#define SCLEX_PO 90 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -1234,6 +1235,15 @@ #define SCE_POWERSHELL_KEYWORD 8 #define SCE_POWERSHELL_CMDLET 9 #define SCE_POWERSHELL_ALIAS 10 +#define SCE_PO_DEFAULT 0 +#define SCE_PO_COMMENT 1 +#define SCE_PO_MSGID 2 +#define SCE_PO_MSGID_TEXT 3 +#define SCE_PO_MSGSTR 4 +#define SCE_PO_MSGSTR_TEXT 5 +#define SCE_PO_MSGCTXT 6 +#define SCE_PO_MSGCTXT_TEXT 7 +#define SCE_PO_FUZZY 8 #define SCLEX_ASP 29 #define SCLEX_PHP 30 /*--Autogenerated -- end of section automatically generated from Scintilla.iface*/ Modified: trunk/scintilla/include/Scintilla.iface =================================================================== --- trunk/scintilla/include/Scintilla.iface 2008-09-28 15:17:00 UTC (rev 3017) +++ trunk/scintilla/include/Scintilla.iface 2008-09-28 16:32:49 UTC (rev 3018) @@ -1997,6 +1997,7 @@ val SCLEX_R=86 val SCLEX_MAGIK=87 val SCLEX_POWERSHELL=88 +val SCLEX_PO=90 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -3294,6 +3295,17 @@ val SCE_POWERSHELL_KEYWORD=8 val SCE_POWERSHELL_CMDLET=9 val SCE_POWERSHELL_ALIAS=10 +# Lexical state for SCLEX_PO +lex Po=SCLEX_PO SCE_PO_ +val SCE_PO_DEFAULT=0 +val SCE_PO_COMMENT=1 +val SCE_PO_MSGID=2 +val SCE_PO_MSGID_TEXT=3 +val SCE_PO_MSGSTR=4 +val SCE_PO_MSGSTR_TEXT=5 +val SCE_PO_MSGCTXT=6 +val SCE_PO_MSGCTXT_TEXT=7 +val SCE_PO_FUZZY=8 # Events Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-09-28 15:17:00 UTC (rev 3017) +++ trunk/src/editor.c 2008-09-28 16:32:49 UTC (rev 3018) @@ -2793,6 +2793,9 @@ case SCLEX_PROPERTIES: return (style == SCE_PROPS_COMMENT); + case SCLEX_PO: + return (style == SCE_PO_COMMENT); + case SCLEX_LATEX: return (style == SCE_L_COMMENT); Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-09-28 15:17:00 UTC (rev 3017) +++ trunk/src/filetypes.c 2008-09-28 16:32:49 UTC (rev 3018) @@ -450,6 +450,17 @@ ft->comment_close = NULL; ft->group = GEANY_FILETYPE_GROUP_MISC; +#define PO + ft = filetypes[GEANY_FILETYPES_PO]; + ft->lang = -2; + ft->name = g_strdup("Po"); + ft->title = g_strdup(_("Gettext translation file")); + ft->extension = g_strdup("po"); + ft->pattern = utils_strv_new("*.po", "*.pot", NULL); + ft->comment_open = g_strdup("#"); + ft->comment_close = NULL; + ft->group = GEANY_FILETYPE_GROUP_MISC; + #define HAXE ft = filetypes[GEANY_FILETYPES_HAXE]; ft->lang = 27; Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2008-09-28 15:17:00 UTC (rev 3017) +++ trunk/src/filetypes.h 2008-09-28 16:32:49 UTC (rev 3018) @@ -78,6 +78,7 @@ GEANY_FILETYPES_LATEX, GEANY_FILETYPES_REST, GEANY_FILETYPES_SQL, + GEANY_FILETYPES_PO, GEANY_FILETYPES_NONE, /* must be last filetype */ GEANY_MAX_BUILT_IN_FILETYPES /* Use filetypes_array->len instead */ Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2008-09-28 15:17:00 UTC (rev 3017) +++ trunk/src/highlighting.c 2008-09-28 16:32:49 UTC (rev 3018) @@ -2027,6 +2027,47 @@ } +static void styleset_po_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) +{ + new_style_array(GEANY_FILETYPES_PO, 9); + get_keyfile_hex(config, config_home, "styling", "default", "0x7f0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PO].styling[0]); + get_keyfile_hex(config, config_home, "styling", "comment", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PO].styling[1]); + get_keyfile_hex(config, config_home, "styling", "msgid", "0x00007f", "0xffffff", "true", &style_sets[GEANY_FILETYPES_PO].styling[2]); + get_keyfile_hex(config, config_home, "styling", "msgid_text", "0x00007f", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PO].styling[3]); + get_keyfile_hex(config, config_home, "styling", "msgstr", "0x7f0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_PO].styling[4]); + get_keyfile_hex(config, config_home, "styling", "msgstr_text", "0x7f0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PO].styling[5]); + get_keyfile_hex(config, config_home, "styling", "msgctxt", "0x007f00", "0xffffff", "true", &style_sets[GEANY_FILETYPES_PO].styling[6]); + get_keyfile_hex(config, config_home, "styling", "msgctxt_text", "0x007f00", "0xffffff", "false", &style_sets[GEANY_FILETYPES_PO].styling[7]); + get_keyfile_hex(config, config_home, "styling", "fuzzy", "0xffa500", "0xffffff", "true", &style_sets[GEANY_FILETYPES_PO].styling[8]); + + style_sets[GEANY_FILETYPES_PO].keywords = NULL; + + get_keyfile_wordchars(config, config_home, + &style_sets[GEANY_FILETYPES_PO].wordchars); +} + + +static void styleset_po(ScintillaObject *sci) +{ + const filetype_id ft_id = GEANY_FILETYPES_PO; + + styleset_common(sci, 5, ft_id); + + apply_filetype_properties(sci, SCLEX_PO, ft_id); + + set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_PO, 0); + set_sci_style(sci, SCE_PO_DEFAULT, GEANY_FILETYPES_PO, 0); + set_sci_style(sci, SCE_PO_COMMENT, GEANY_FILETYPES_PO, 1); + set_sci_style(sci, SCE_PO_MSGID, GEANY_FILETYPES_PO, 2); + set_sci_style(sci, SCE_PO_MSGID_TEXT, GEANY_FILETYPES_PO, 3); + set_sci_style(sci, SCE_PO_MSGSTR, GEANY_FILETYPES_PO, 4); + set_sci_style(sci, SCE_PO_MSGSTR_TEXT, GEANY_FILETYPES_PO, 5); + set_sci_style(sci, SCE_PO_MSGCTXT, GEANY_FILETYPES_PO, 6); + set_sci_style(sci, SCE_PO_MSGCTXT_TEXT, GEANY_FILETYPES_PO, 7); + set_sci_style(sci, SCE_PO_FUZZY, GEANY_FILETYPES_PO, 8); +} + + static void styleset_conf_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { new_style_array(GEANY_FILETYPES_CONF, 6); @@ -3102,6 +3143,7 @@ init_styleset_case(GEANY_FILETYPES_PASCAL, pascal); init_styleset_case(GEANY_FILETYPES_PERL, perl); init_styleset_case(GEANY_FILETYPES_PHP, php); + init_styleset_case(GEANY_FILETYPES_PO, po); init_styleset_case(GEANY_FILETYPES_PYTHON, python); init_styleset_case(GEANY_FILETYPES_R, r); init_styleset_case(GEANY_FILETYPES_RUBY, ruby); @@ -3157,6 +3199,7 @@ styleset_case(GEANY_FILETYPES_PASCAL, pascal); styleset_case(GEANY_FILETYPES_PERL, perl); styleset_case(GEANY_FILETYPES_PHP, php); + styleset_case(GEANY_FILETYPES_PO, po); styleset_case(GEANY_FILETYPES_PYTHON, python); styleset_case(GEANY_FILETYPES_R, r); styleset_case(GEANY_FILETYPES_RUBY, ruby); Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-09-28 15:17:00 UTC (rev 3017) +++ trunk/src/plugindata.h 2008-09-28 16:32:49 UTC (rev 3018) @@ -41,7 +41,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 97, + GEANY_API_VERSION = 98, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2008-09-28 15:17:00 UTC (rev 3017) +++ trunk/src/templates.c 2008-09-28 16:32:49 UTC (rev 3018) @@ -534,6 +534,7 @@ case GEANY_FILETYPES_TCL: case GEANY_FILETYPES_OMS: case GEANY_FILETYPES_CONF: + case GEANY_FILETYPES_PO: { line_prefix = "#"; break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3016] trunk
by eht16＠users.sourceforge.net 27 Sep '08

27 Sep '08

Revision: 3016 http://geany.svn.sourceforge.net/geany/?rev=3016&view=rev Author: eht16 Date: 2008-09-27 14:07:14 +0000 (Sat, 27 Sep 2008) Log Message: ----------- Cleanup. Remove unnecessary checks and code. Modified Paths: -------------- trunk/ChangeLog trunk/autogen.sh Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-27 14:06:57 UTC (rev 3015) +++ trunk/ChangeLog 2008-09-27 14:07:14 UTC (rev 3016) @@ -7,6 +7,8 @@ dialog or updating its contents. * src/editor.c: Make 'Line Breaking' UTF-8 safe (to work with non-ASCII characters). + * autogen.sh: + Cleanup. Remove unnecessary checks and code. 2008-09-26 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/autogen.sh =================================================================== --- trunk/autogen.sh 2008-09-27 14:06:57 UTC (rev 3015) +++ trunk/autogen.sh 2008-09-27 14:07:14 UTC (rev 3016) @@ -6,154 +6,73 @@ DIE=0 -if [ -n "$GNOME2_DIR" ]; then - ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS" - LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH" - PATH="$GNOME2_DIR/bin:$PATH" - export PATH - export LD_LIBRARY_PATH -fi - (test -f $srcdir/configure.in) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level package directory" - exit 1 + echo "**Error**: Directory "\`$srcdir\'" does not look like the top-level package directory" + exit 1 } (autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`autoconf' installed." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 + echo + echo "**Error**: You must have \`autoconf' installed." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 } -(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && { - (intltoolize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`intltool' installed." - echo "You can get it from:" - echo " ftp://ftp.gnome.org/pub/GNOME/" - DIE=1 - } +(intltoolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`intltool' installed." + echo "You can get it from:" + echo " ftp://ftp.gnome.org/pub/GNOME/" + DIE=1 } -(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && { - (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`xml-i18n-toolize' installed." - echo "You can get it from:" - echo " ftp://ftp.gnome.org/pub/GNOME/" - DIE=1 - } +(glib-gettextize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`glib' installed." + echo "You can get it from: ftp://ftp.gtk.org/pub/gtk" + DIE=1 } -(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { - (libtool --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`libtool' installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - } -} - -(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.in >/dev/null) && { - (grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \ - (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`glib' installed." - echo "You can get it from: ftp://ftp.gtk.org/pub/gtk" - DIE=1 - } -} - (automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`automake' installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - NO_AUTOMAKE=yes + echo + echo "**Error**: You must have \`automake' installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" + DIE=1 + NO_AUTOMAKE=yes } # if no automake, don't bother testing for aclocal test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing \`aclocal'. The version of \`automake'" - echo "installed doesn't appear recent enough." - echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" - DIE=1 + echo + echo "**Error**: Missing \`aclocal'. The version of \`automake'" + echo "installed doesn't appear recent enough." + echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" + DIE=1 } if test "$DIE" -eq 1; then - exit 1 + exit 1 fi if test -z "$*"; then - echo "**Warning**: I am going to run \`configure' with no arguments." - echo "If you wish to pass any to it, please specify them on the" - echo \`$0\'" command line." - echo + echo "**Warning**: I am going to run \`configure' with no arguments." + echo "If you wish to pass any to it, please specify them on the" + echo \`$0\'" command line." + echo fi -case $CC in -xlc ) - am_opt=--include-deps;; -esac +echo "Processing configure.ac" -for coin in `find $srcdir -name configure.in -print` -do - dr=`dirname $coin` - if test -f $dr/NO-AUTO-GEN; then - echo skipping $dr -- flagged as no auto-gen - else - echo processing $dr - ( cd $dr +echo "no" | glib-gettextize --force --copy +intltoolize --copy --force --automake +libtoolize --copy --force || glibtoolize --copy --force +aclocal +autoheader +automake --add-missing --copy --gnu +autoconf - aclocalinclude="$ACLOCAL_FLAGS" +echo "Running $srcdir/configure $@ ..." +$srcdir/configure "$@" && echo "Now type 'make' to compile." || exit 1 - if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then - echo "Creating $dr/aclocal.m4 ..." - test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 - echo "Running glib-gettextize... Ignore non-fatal messages." - echo "no" | glib-gettextize --force --copy - echo "Making $dr/aclocal.m4 writable ..." - test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 - fi - if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then - echo "Running intltoolize..." - intltoolize --copy --force --automake - fi - if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then - echo "Running xml-i18n-toolize..." - xml-i18n-toolize --copy --force --automake - fi - if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then - if test -z "$NO_LIBTOOLIZE" ; then - echo "Running libtoolize..." - libtoolize --force --copy - fi - fi - echo "Running aclocal $aclocalinclude ..." - aclocal $aclocalinclude - if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then - echo "Running autoheader..." - autoheader - fi - echo "Running automake --gnu $am_opt ..." - automake --add-missing --copy --gnu $am_opt - echo "Running autoconf ..." - autoconf - ) - fi -done - -#conf_flags="--enable-maintainer-mode" - -if test x$NOCONFIGURE = x; then - echo Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile. || exit 1 -else - echo Skipping configure process. -fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3015] trunk/po/POTFILES.skip
by eht16＠users.sourceforge.net 27 Sep '08

27 Sep '08

Revision: 3015 http://geany.svn.sourceforge.net/geany/?rev=3015&view=rev Author: eht16 Date: 2008-09-27 14:06:57 +0000 (Sat, 27 Sep 2008) Log Message: ----------- Fix wrong filename. Modified Paths: -------------- trunk/po/POTFILES.skip Modified: trunk/po/POTFILES.skip =================================================================== --- trunk/po/POTFILES.skip 2008-09-27 14:06:43 UTC (rev 3014) +++ trunk/po/POTFILES.skip 2008-09-27 14:06:57 UTC (rev 3015) @@ -1,7 +1,7 @@ # List of source files containing translatable strings but should be ignored. # geany.desktop.in will be translated -geany.desktop.in.in +geany.desktop.in # generated src/interface.c will be translated geany.glade # no need to translate this file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3014] trunk
by eht16＠users.sourceforge.net 27 Sep '08

27 Sep '08

Revision: 3014 http://geany.svn.sourceforge.net/geany/?rev=3014&view=rev Author: eht16 Date: 2008-09-27 14:06:43 +0000 (Sat, 27 Sep 2008) Log Message: ----------- Make 'Line Breaking' UTF-8 safe (to work with non-ASCII characters). Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-27 14:06:22 UTC (rev 3013) +++ trunk/ChangeLog 2008-09-27 14:06:43 UTC (rev 3014) @@ -5,6 +5,8 @@ Enable wrapping of messages to avoid horizontal scrolling. Automatically scroll to the end of the messages when showing the dialog or updating its contents. + * src/editor.c: + Make 'Line Breaking' UTF-8 safe (to work with non-ASCII characters). 2008-09-26 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-09-27 14:06:22 UTC (rev 3013) +++ trunk/src/editor.c 2008-09-27 14:06:43 UTC (rev 3014) @@ -346,7 +346,7 @@ static void check_line_breaking(GeanyEditor *editor, gint pos, gchar c) { ScintillaObject *sci = editor->sci; - gint line, lstart; + gint line, lstart, col; if (!editor->line_breaking) return; @@ -355,9 +355,12 @@ pos--; /* Look for previous space, not the new one */ line = sci_get_current_line(sci); + lstart = sci_get_position_from_line(sci, line); - if (pos - lstart < editor_prefs.line_break_column) + /* use column instead of position which might be different with multibyte characters */ + col = sci_get_col_from_position(sci, pos); + if (col < editor_prefs.line_break_column) return; /* look for the last space before line_break_column */ @@ -368,20 +371,20 @@ c = sci_get_char_at(sci, --pos); if (c == GDK_space) { - gint col, len, diff; + gint diff, last_pos, last_col; const gchar *eol = editor_get_eol_char(editor); + /* remember the distance between the current column and the last column on the line + * (we use column position in case the previous line gets altered, such as removing + * trailing spaces or in case it contains multibyte characters) */ + last_pos = sci_get_line_end_position(sci, line); + last_col = sci_get_col_from_position(sci, last_pos); + diff = last_col - col; + /* break the line after the space */ sci_insert_text(sci, pos + 1, eol); line++; - /* remember distance from end of line (we use column position in case - * the previous line gets altered, such as removing trailing spaces). */ - pos = sci_get_current_position(sci); - len = sci_get_line_length(sci, line); - col = sci_get_col_from_position(sci, pos); - diff = len - col; - /* set position as if user had pressed return */ pos = sci_get_position_from_line(sci, line); sci_set_current_position(sci, pos, FALSE); @@ -389,9 +392,12 @@ on_new_line_added(editor); /* correct cursor position (might not be at line end) */ - pos = sci_get_position_from_line(sci, line); - pos += sci_get_line_length(sci, line) - diff; + last_pos = sci_get_line_end_position(sci, line); + last_col = sci_get_col_from_position(sci, last_pos); /* get last column on line */ + /* last column - distance is the desired column, then retrieve its document position */ + pos = SSM(sci, SCI_FINDCOLUMN, line, last_col - diff); sci_set_current_position(sci, pos, FALSE); + return; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3013] trunk
by eht16＠users.sourceforge.net 27 Sep '08

27 Sep '08

Revision: 3013 http://geany.svn.sourceforge.net/geany/?rev=3013&view=rev Author: eht16 Date: 2008-09-27 14:06:22 +0000 (Sat, 27 Sep 2008) Log Message: ----------- Make the debug messages window a little bigger. Enable wrapping of messages to avoid horizontal scrolling. Automatically scroll to the end of the messages when showing the dialog or updating its contents. Modified Paths: -------------- trunk/ChangeLog trunk/src/log.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-26 18:30:03 UTC (rev 3012) +++ trunk/ChangeLog 2008-09-27 14:06:22 UTC (rev 3013) @@ -1,3 +1,12 @@ +2008-09-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/log.c: + Make the debug messages window a little bigger. + Enable wrapping of messages to avoid horizontal scrolling. + Automatically scroll to the end of the messages when showing the + dialog or updating its contents. + + 2008-09-26 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * geany.glade, src/interface.c, src/notebook.c: Modified: trunk/src/log.c =================================================================== --- trunk/src/log.c 2008-09-26 18:30:03 UTC (rev 3012) +++ trunk/src/log.c 2008-09-27 14:06:22 UTC (rev 3013) @@ -50,7 +50,13 @@ { if (dialog_textbuffer != NULL) { + GtkTextMark *mark; + GtkTextView *textview = g_object_get_data(G_OBJECT(dialog_textbuffer), "textview"); + gtk_text_buffer_set_text(dialog_textbuffer, log_buffer->str, log_buffer->len); + /* scroll to the end of the messages as this might be most interesting */ + mark = gtk_text_buffer_get_insert(dialog_textbuffer); + gtk_text_view_scroll_to_mark(textview, mark, 0.0, FALSE, 0.0, 0.0); } } @@ -144,7 +150,7 @@ } -static void on_dialog_response(GtkWidget *dialog, gint response, gpointer user_data) +static void on_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) { if (response == DIALOG_RESPONSE_CLEAR) { @@ -158,7 +164,7 @@ } else { - gtk_widget_destroy(dialog); + gtk_widget_destroy(GTK_WIDGET(dialog)); dialog_textbuffer = NULL; } } @@ -176,24 +182,27 @@ gtk_box_set_spacing(GTK_BOX(vbox), 6); gtk_widget_set_name(dialog, "GeanyDialog"); - gtk_window_set_default_size(GTK_WINDOW(dialog), 450, 250); + gtk_window_set_default_size(GTK_WINDOW(dialog), 550, 300); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL); textview = gtk_text_view_new(); dialog_textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); + g_object_set_data(G_OBJECT(dialog_textbuffer), "textview", textview); gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE); gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview), FALSE); - gtk_text_buffer_set_text(dialog_textbuffer, log_buffer->str, log_buffer->len); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD_CHAR); swin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin), textview); + gtk_container_add(GTK_CONTAINER(swin), textview); gtk_box_pack_start(GTK_BOX(vbox), swin, TRUE, TRUE, 0); g_signal_connect(dialog, "response", G_CALLBACK(on_dialog_response), textview); gtk_widget_show_all(dialog); + + update_dialog(); /* set text after showing the window, to not scroll an unrealized textview */ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3010] trunk
by ntrel＠users.sourceforge.net 26 Sep '08

26 Sep '08

Revision: 3010 http://geany.svn.sourceforge.net/geany/?rev=3010&view=rev Author: ntrel Date: 2008-09-26 17:28:50 +0000 (Fri, 26 Sep 2008) Log Message: ----------- Use GeanyDocumentPrivate instead of using inheritance for non-public fields (this was unnecessary and meant using ugly casts). Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/document.h trunk/src/documentprivate.h trunk/src/editor.c trunk/src/notebook.c trunk/src/prefs.c trunk/src/symbols.c trunk/src/treeviews.c trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-26 16:49:52 UTC (rev 3009) +++ trunk/ChangeLog 2008-09-26 17:28:50 UTC (rev 3010) @@ -20,6 +20,11 @@ * HACKING: Update to mention separate is_comment_style() and is_string_style() functions. + * src/documentprivate.h, src/prefs.c, src/treeviews.c, src/notebook.c, + src/document.c, src/document.h, src/editor.c, src/symbols.c, + src/ui_utils.c: + Use GeanyDocumentPrivate instead of using inheritance for non-public + fields (this was unnecessary and meant using ugly casts). 2008-09-25 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-09-26 16:49:52 UTC (rev 3009) +++ trunk/src/document.c 2008-09-26 17:28:50 UTC (rev 3010) @@ -303,9 +303,9 @@ * The flag is_valid is set to TRUE in document_create(). */ static void init_doc_struct(GeanyDocument *new_doc) { - Document *full_doc = DOCUMENT(new_doc); + GeanyDocumentPrivate *priv; - memset(full_doc, 0, sizeof(Document)); + memset(new_doc, 0, sizeof(GeanyDocument)); new_doc->is_valid = FALSE; new_doc->has_tags = FALSE; @@ -321,12 +321,14 @@ new_doc->last_check = time(NULL); new_doc->real_path = NULL; - full_doc->tag_store = NULL; - full_doc->tag_tree = NULL; - full_doc->saved_encoding.encoding = NULL; - full_doc->saved_encoding.has_bom = FALSE; - full_doc->undo_actions = NULL; - full_doc->redo_actions = NULL; + new_doc->priv = g_new0(GeanyDocumentPrivate, 1); + priv = new_doc->priv; + priv->tag_store = NULL; + priv->tag_tree = NULL; + priv->saved_encoding.encoding = NULL; + priv->saved_encoding.has_bom = FALSE; + priv->undo_actions = NULL; + priv->redo_actions = NULL; } @@ -350,7 +352,7 @@ static void queue_colourise(GeanyDocument *doc) { /* Colourise the editor before it is next drawn */ - DOCUMENT(doc)->colourise_needed = TRUE; + doc->priv->colourise_needed = TRUE; /* If the editor doesn't need drawing (e.g. after saving the current * document), we need to force a redraw, so the expose event is triggered. @@ -379,7 +381,7 @@ new_idx = document_get_new_idx(); if (new_idx == -1) /* expand the array, no free places */ { - Document *new_doc = g_new0(Document, 1); + GeanyDocument *new_doc = g_new0(GeanyDocument, 1); new_idx = documents_array->len; g_ptr_array_add(documents_array, new_doc); @@ -403,7 +405,7 @@ GtkTreeSelection *sel; sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles)); - gtk_tree_selection_select_iter(sel, &DOCUMENT(this)->iter); + gtk_tree_selection_select_iter(sel, &this->priv->iter); } ui_document_buttons_update(); @@ -441,7 +443,6 @@ gboolean document_remove_page(guint page_num) { GeanyDocument *doc = document_get_from_page(page_num); - Document *fdoc = DOCUMENT(doc); if (doc == NULL) { @@ -469,7 +470,7 @@ navqueue_remove_file(doc->file_name); msgwin_status_add(_("File %s closed."), DOC_FILENAME(doc)); g_free(doc->encoding); - g_free(fdoc->saved_encoding.encoding); + g_free(doc->priv->saved_encoding.encoding); g_free(doc->file_name); g_free(doc->real_path); tm_workspace_remove_object(doc->tm_file, TRUE, TRUE); @@ -485,6 +486,8 @@ doc->has_bom = FALSE; doc->tm_file = NULL; document_undo_clear(doc); + g_free(doc->priv); + if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) == 0) { treeviews_update_tag_list(NULL, FALSE); @@ -501,11 +504,9 @@ /* used to keep a record of the unchanged document state encoding */ static void store_saved_encoding(GeanyDocument *doc) { - Document *fdoc = DOCUMENT(doc); - - g_free(fdoc->saved_encoding.encoding); - fdoc->saved_encoding.encoding = g_strdup(doc->encoding); - fdoc->saved_encoding.has_bom = doc->has_bom; + g_free(doc->priv->saved_encoding.encoding); + doc->priv->saved_encoding.encoding = g_strdup(doc->encoding); + doc->priv->saved_encoding.has_bom = doc->has_bom; } @@ -1535,9 +1536,8 @@ tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE); { - Document *fdoc = DOCUMENT(doc); - gtk_label_set_text(GTK_LABEL(fdoc->tab_label), base_name); - gtk_label_set_text(GTK_LABEL(fdoc->tabmenu_label), base_name); + gtk_label_set_text(GTK_LABEL(doc->priv->tab_label), base_name); + gtk_label_set_text(GTK_LABEL(doc->priv->tabmenu_label), base_name); } msgwin_status_add(_("File %s saved."), doc->file_name); ui_update_statusbar(doc, -1); @@ -2174,12 +2174,11 @@ /* Clears the Undo and Redo buffer (to be called when reloading or closing the document) */ void document_undo_clear(GeanyDocument *doc) { - Document *fdoc = DOCUMENT(doc); undo_action *a; - while (g_trash_stack_height(&fdoc->undo_actions) > 0) + while (g_trash_stack_height(&doc->priv->undo_actions) > 0) { - a = g_trash_stack_pop(&fdoc->undo_actions); + a = g_trash_stack_pop(&doc->priv->undo_actions); if (a != NULL) { switch (a->type) @@ -2191,11 +2190,11 @@ g_free(a); } } - fdoc->undo_actions = NULL; + doc->priv->undo_actions = NULL; - while (g_trash_stack_height(&fdoc->redo_actions) > 0) + while (g_trash_stack_height(&doc->priv->redo_actions) > 0) { - a = g_trash_stack_pop(&fdoc->redo_actions); + a = g_trash_stack_pop(&doc->priv->redo_actions); if (a != NULL) { switch (a->type) @@ -2207,7 +2206,7 @@ g_free(a); } } - fdoc->redo_actions = NULL; + doc->priv->redo_actions = NULL; if (! main_status.quitting && doc->editor != NULL) document_set_text_changed(doc, FALSE); @@ -2219,7 +2218,6 @@ void document_undo_add(GeanyDocument *doc, guint type, gpointer data) { - Document *fdoc = DOCUMENT(doc); undo_action *action; if (doc == NULL) @@ -2229,7 +2227,7 @@ action->type = type; action->data = data; - g_trash_stack_push(&fdoc->undo_actions, action); + g_trash_stack_push(&doc->priv->undo_actions, action); document_set_text_changed(doc, TRUE); ui_update_popup_reundo_items(doc); @@ -2241,12 +2239,10 @@ gboolean document_can_undo(GeanyDocument *doc) { - Document *fdoc = DOCUMENT(doc); - if (doc == NULL) return FALSE; - if (g_trash_stack_height(&fdoc->undo_actions) > 0 || sci_can_undo(doc->editor->sci)) + if (g_trash_stack_height(&doc->priv->undo_actions) > 0 || sci_can_undo(doc->editor->sci)) return TRUE; else return FALSE; @@ -2255,25 +2251,22 @@ static void update_changed_state(GeanyDocument *doc) { - Document *fdoc = DOCUMENT(doc); - doc->changed = (sci_is_modified(doc->editor->sci) || - doc->has_bom != fdoc->saved_encoding.has_bom || - ! utils_str_equal(doc->encoding, fdoc->saved_encoding.encoding)); + doc->has_bom != doc->priv->saved_encoding.has_bom || + ! utils_str_equal(doc->encoding, doc->priv->saved_encoding.encoding)); document_set_text_changed(doc, doc->changed); } void document_undo(GeanyDocument *doc) { - Document *fdoc = DOCUMENT(doc); undo_action *action; if (doc == NULL) return; - action = g_trash_stack_pop(&fdoc->undo_actions); + action = g_trash_stack_pop(&doc->priv->undo_actions); if (action == NULL) { @@ -2328,12 +2321,10 @@ gboolean document_can_redo(GeanyDocument *doc) { - Document *fdoc = DOCUMENT(doc); - if (doc == NULL) return FALSE; - if (g_trash_stack_height(&fdoc->redo_actions) > 0 || sci_can_redo(doc->editor->sci)) + if (g_trash_stack_height(&doc->priv->redo_actions) > 0 || sci_can_redo(doc->editor->sci)) return TRUE; else return FALSE; @@ -2342,13 +2333,12 @@ void document_redo(GeanyDocument *doc) { - Document *fdoc = DOCUMENT(doc); undo_action *action; if (doc == NULL) return; - action = g_trash_stack_pop(&fdoc->redo_actions); + action = g_trash_stack_pop(&doc->priv->redo_actions); if (action == NULL) { @@ -2402,7 +2392,6 @@ static void document_redo_add(GeanyDocument *doc, guint type, gpointer data) { - Document *fdoc = DOCUMENT(doc); undo_action *action; if (doc == NULL) @@ -2412,7 +2401,7 @@ action->type = type; action->data = data; - g_trash_stack_push(&fdoc->redo_actions, action); + g_trash_stack_push(&doc->priv->redo_actions, action); document_set_text_changed(doc, TRUE); ui_update_popup_reundo_items(doc); Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2008-09-26 16:49:52 UTC (rev 3009) +++ trunk/src/document.h 2008-09-26 17:28:50 UTC (rev 3010) @@ -105,6 +105,8 @@ * not be set elsewhere. * @see file_name. */ gchar *real_path; + + struct GeanyDocumentPrivate *priv; /* should be last, append fields before this item */ }; extern GPtrArray *documents_array; Modified: trunk/src/documentprivate.h =================================================================== --- trunk/src/documentprivate.h 2008-09-26 16:49:52 UTC (rev 3009) +++ trunk/src/documentprivate.h 2008-09-26 17:28:50 UTC (rev 3010) @@ -41,16 +41,13 @@ { gchar *encoding; gboolean has_bom; -} FileEncoding; +} +FileEncoding; -#define DOCUMENT(doc_ptr) ((Document*)doc_ptr) - -/* This type 'inherits' from GeanyDocument so Document* can be cast to GeanyDocument*. */ -typedef struct Document +/* Private GeanyDocument fields */ +typedef struct GeanyDocumentPrivate { - struct GeanyDocument public; /* must come first */ - /* GtkLabel shown in the notebook header. */ GtkWidget *tab_label; /* GtkLabel shown in the notebook right-click menu. */ @@ -69,6 +66,6 @@ FileEncoding saved_encoding; gboolean colourise_needed; } -Document; +GeanyDocumentPrivate; #endif Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-09-26 16:49:52 UTC (rev 3009) +++ trunk/src/editor.c 2008-09-26 17:28:50 UTC (rev 3010) @@ -3808,10 +3808,10 @@ { GeanyDocument *doc = user_data; - if (DOCUMENT(doc)->colourise_needed) + if (doc->priv->colourise_needed) { editor_colourise(doc->editor->sci); - DOCUMENT(doc)->colourise_needed = FALSE; + doc->priv->colourise_needed = FALSE; } return FALSE; /* propagate event */ } Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2008-09-26 16:49:52 UTC (rev 3009) +++ trunk/src/notebook.c 2008-09-26 17:28:50 UTC (rev 3010) @@ -443,7 +443,6 @@ GtkWidget *hbox, *ebox; gint tabnum; gchar *title; - Document *fdoc = DOCUMENT(this); GtkWidget *page; g_return_val_if_fail(this != NULL, -1); @@ -451,7 +450,7 @@ page = GTK_WIDGET(this->editor->sci); title = g_path_get_basename(DOC_FILENAME(this)); - fdoc->tab_label = gtk_label_new(title); + this->priv->tab_label = gtk_label_new(title); ebox = gtk_event_box_new(); GTK_WIDGET_SET_FLAGS(ebox, GTK_NO_WINDOW); @@ -459,7 +458,7 @@ hbox = gtk_hbox_new(FALSE, 2); GTK_WIDGET_UNSET_FLAGS(hbox, GTK_CAN_FOCUS); - gtk_container_add(GTK_CONTAINER(ebox), fdoc->tab_label); + gtk_container_add(GTK_CONTAINER(ebox), this->priv->tab_label); gtk_box_pack_start(GTK_BOX(hbox), ebox, FALSE, FALSE, 0); if (file_prefs.show_tab_cross) @@ -495,15 +494,15 @@ gtk_widget_show_all(hbox); - fdoc->tabmenu_label = gtk_label_new(title); - gtk_misc_set_alignment(GTK_MISC(fdoc->tabmenu_label), 0.0, 0); + this->priv->tabmenu_label = gtk_label_new(title); + gtk_misc_set_alignment(GTK_MISC(this->priv->tabmenu_label), 0.0, 0); if (file_prefs.tab_order_ltr) tabnum = gtk_notebook_append_page_menu(GTK_NOTEBOOK(main_widgets.notebook), page, - hbox, fdoc->tabmenu_label); + hbox, this->priv->tabmenu_label); else tabnum = gtk_notebook_insert_page_menu(GTK_NOTEBOOK(main_widgets.notebook), page, - hbox, fdoc->tabmenu_label, 0); + hbox, this->priv->tabmenu_label, 0); tab_count_changed(); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2008-09-26 16:49:52 UTC (rev 3009) +++ trunk/src/prefs.c 2008-09-26 17:28:50 UTC (rev 3010) @@ -1195,10 +1195,10 @@ interface_prefs.tagbar_font = g_strdup(fontbtn); for (i = 0; i < documents_array->len; i++) { - Document *fdoc = DOCUMENT(documents[i]); + GeanyDocument *doc = documents[i]; - if (documents[i]->is_valid && GTK_IS_WIDGET(fdoc->tag_tree)) - ui_widget_modify_font_from_string(fdoc->tag_tree, + if (documents[i]->is_valid && GTK_IS_WIDGET(doc->priv->tag_tree)) + ui_widget_modify_font_from_string(doc->priv->tag_tree, interface_prefs.tagbar_font); } if (GTK_IS_WIDGET(tv.default_tag_tree)) Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-09-26 16:49:52 UTC (rev 3009) +++ trunk/src/symbols.c 2008-09-26 17:28:50 UTC (rev 3010) @@ -569,8 +569,7 @@ static void init_tag_list(GeanyDocument *doc) { filetype_id ft_id = doc->file_type->id; - Document *fdoc = DOCUMENT(doc); - GtkTreeStore *tag_store = fdoc->tag_store; + GtkTreeStore *tag_store = doc->priv->tag_store; init_tag_iters(); @@ -849,12 +848,10 @@ GtkTreeIter iter; static gint prev_sort_mode = SYMBOLS_SORT_BY_NAME; filetype_id ft_id; - Document *fdoc; g_return_val_if_fail(doc != NULL, FALSE); ft_id = FILETYPE_ID(doc->file_type); - fdoc = DOCUMENT(doc); if (sort_mode == SYMBOLS_SORT_USE_PREVIOUS) sort_mode = prev_sort_mode; @@ -866,11 +863,11 @@ return FALSE; /* Make sure the model stays with us after the tree view unrefs it */ - g_object_ref(GTK_TREE_MODEL(fdoc->tag_store)); + g_object_ref(GTK_TREE_MODEL(doc->priv->tag_store)); /* Detach model from view */ - gtk_tree_view_set_model(GTK_TREE_VIEW(fdoc->tag_tree), NULL); + gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), NULL); /* Clear all contents */ - gtk_tree_store_clear(fdoc->tag_store); + gtk_tree_store_clear(doc->priv->tag_store); init_tag_list(doc); for (tmp = (GList*)tags; tmp; tmp = g_list_next(tmp)) @@ -953,10 +950,10 @@ if (parent) { - gtk_tree_model_get(GTK_TREE_MODEL(fdoc->tag_store), parent, + gtk_tree_model_get(GTK_TREE_MODEL(doc->priv->tag_store), parent, SYMBOLS_COLUMN_ICON, &icon, -1); - gtk_tree_store_append(fdoc->tag_store, &iter, parent); - gtk_tree_store_set(fdoc->tag_store, &iter, + gtk_tree_store_append(doc->priv->tag_store, &iter, parent); + gtk_tree_store_set(doc->priv->tag_store, &iter, SYMBOLS_COLUMN_ICON, icon, SYMBOLS_COLUMN_NAME, buf, SYMBOLS_COLUMN_LINE, symbol->line, -1); @@ -965,12 +962,12 @@ g_object_unref(icon); } } - hide_empty_rows(fdoc->tag_store); + hide_empty_rows(doc->priv->tag_store); /* Re-attach model to view */ - gtk_tree_view_set_model(GTK_TREE_VIEW(fdoc->tag_tree), - GTK_TREE_MODEL(fdoc->tag_store)); - g_object_unref(GTK_TREE_MODEL(fdoc->tag_store)); - gtk_tree_view_expand_all(GTK_TREE_VIEW(fdoc->tag_tree)); + gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), + GTK_TREE_MODEL(doc->priv->tag_store)); + g_object_unref(GTK_TREE_MODEL(doc->priv->tag_store)); + gtk_tree_view_expand_all(GTK_TREE_VIEW(doc->priv->tag_tree)); return TRUE; } Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2008-09-26 16:49:52 UTC (rev 3009) +++ trunk/src/treeviews.c 2008-09-26 17:28:50 UTC (rev 3010) @@ -154,8 +154,6 @@ /* update = rescan the tags for doc->filename */ void treeviews_update_tag_list(GeanyDocument *doc, gboolean update) { - Document *fdoc = DOCUMENT(doc); - if (gtk_bin_get_child(GTK_BIN(tag_window))) gtk_container_remove(GTK_CONTAINER(tag_window), gtk_bin_get_child(GTK_BIN(tag_window))); @@ -187,14 +185,14 @@ if (update) { /* updating the tag list in the left tag window */ - if (fdoc->tag_tree == NULL) + if (doc->priv->tag_tree == NULL) { - fdoc->tag_store = gtk_tree_store_new( + doc->priv->tag_store = gtk_tree_store_new( SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT); - fdoc->tag_tree = gtk_tree_view_new(); - prepare_taglist(fdoc->tag_tree, fdoc->tag_store); - gtk_widget_show(fdoc->tag_tree); - g_object_ref((gpointer)fdoc->tag_tree); /* to hold it after removing */ + doc->priv->tag_tree = gtk_tree_view_new(); + prepare_taglist(doc->priv->tag_tree, doc->priv->tag_store); + gtk_widget_show(doc->priv->tag_tree); + g_object_ref((gpointer)doc->priv->tag_tree); /* to hold it after removing */ } doc->has_tags = symbols_recreate_tag_list(doc, SYMBOLS_SORT_USE_PREVIOUS); @@ -202,7 +200,7 @@ if (doc->has_tags) { - gtk_container_add(GTK_CONTAINER(tag_window), fdoc->tag_tree); + gtk_container_add(GTK_CONTAINER(tag_window), doc->priv->tag_tree); } else { @@ -300,8 +298,7 @@ * This is called recursively in treeviews_openfiles_update_all(). */ void treeviews_openfiles_add(GeanyDocument *doc) { - Document *fdoc = DOCUMENT(doc); - GtkTreeIter *iter = &fdoc->iter; + GtkTreeIter *iter = &doc->priv->iter; gtk_list_store_append(store_openfiles, iter); treeviews_openfiles_update(doc); @@ -310,7 +307,6 @@ void treeviews_openfiles_update(GeanyDocument *doc) { - Document *fdoc = DOCUMENT(doc); gchar *basename; GdkColor *color = document_get_status_color(doc); @@ -318,7 +314,7 @@ basename = DOC_FILENAME(doc); else basename = g_path_get_basename(DOC_FILENAME(doc)); - gtk_list_store_set(store_openfiles, &fdoc->iter, + gtk_list_store_set(store_openfiles, &doc->priv->iter, #if GTK_CHECK_VERSION(2, 12, 0) 0, basename, 1, doc, 2, color, 3, DOC_FILENAME(doc), -1); #else @@ -348,20 +344,19 @@ void treeviews_remove_document(GeanyDocument *doc) { - Document *fdoc = DOCUMENT(doc); - GtkTreeIter *iter = &fdoc->iter; + GtkTreeIter *iter = &doc->priv->iter; gtk_list_store_remove(store_openfiles, iter); - if (GTK_IS_WIDGET(fdoc->tag_tree)) + if (GTK_IS_WIDGET(doc->priv->tag_tree)) { - gtk_widget_destroy(fdoc->tag_tree); - if (GTK_IS_TREE_VIEW(fdoc->tag_tree)) + gtk_widget_destroy(doc->priv->tag_tree); + if (GTK_IS_TREE_VIEW(doc->priv->tag_tree)) { /* Because it was ref'd in treeviews_update_tag_list, it needs unref'ing */ - g_object_unref((gpointer)fdoc->tag_tree); + g_object_unref((gpointer)doc->priv->tag_tree); } - fdoc->tag_tree = NULL; + doc->priv->tag_tree = NULL; } } Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2008-09-26 16:49:52 UTC (rev 3009) +++ trunk/src/ui_utils.c 2008-09-26 17:28:50 UTC (rev 3010) @@ -1242,13 +1242,12 @@ void ui_update_tab_status(GeanyDocument *doc) { GdkColor *color = document_get_status_color(doc); - Document *fdoc = DOCUMENT(doc); /* NULL color will reset to default */ - gtk_widget_modify_fg(fdoc->tab_label, GTK_STATE_NORMAL, color); - gtk_widget_modify_fg(fdoc->tab_label, GTK_STATE_ACTIVE, color); - gtk_widget_modify_fg(fdoc->tabmenu_label, GTK_STATE_NORMAL, color); - gtk_widget_modify_fg(fdoc->tabmenu_label, GTK_STATE_ACTIVE, color); + gtk_widget_modify_fg(doc->priv->tab_label, GTK_STATE_NORMAL, color); + gtk_widget_modify_fg(doc->priv->tab_label, GTK_STATE_ACTIVE, color); + gtk_widget_modify_fg(doc->priv->tabmenu_label, GTK_STATE_NORMAL, color); + gtk_widget_modify_fg(doc->priv->tabmenu_label, GTK_STATE_ACTIVE, color); treeviews_openfiles_update(doc); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3009] trunk/src/editor.c
by eht16＠users.sourceforge.net 26 Sep '08

26 Sep '08

Revision: 3009 http://geany.svn.sourceforge.net/geany/?rev=3009&view=rev Author: eht16 Date: 2008-09-26 16:49:52 +0000 (Fri, 26 Sep 2008) Log Message: ----------- Fix typo. Modified Paths: -------------- trunk/src/editor.c Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-09-26 16:49:36 UTC (rev 3008) +++ trunk/src/editor.c 2008-09-26 16:49:52 UTC (rev 3009) @@ -1052,7 +1052,7 @@ if (editor == NULL || editor->document->file_type == NULL) return; - sci = doc->editor->sci; + sci = editor->sci; doc = editor->document; if (! lexer_has_braces(sci)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2008