Commits September 2016

commits@lists.geany.org

1 participants
80 discussions

[geany/geany] c9d0bd: Inherit C lexer_properties in all filetypes inheriting C styles
by Colomban Wendling 06 Sep '16

06 Sep '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 06 Sep 2016 10:18:48 UTC Commit: c9d0bd7214b01a436ad9af99351a17accaf1eb92 https://github.com/geany/geany/commit/c9d0bd7214b01a436ad9af99351a17accaf1e… Log Message: ----------- Inherit C lexer_properties in all filetypes inheriting C styles `lexer.cpp.track.preprocessor` lexer properties affects which styles are used, and we don't set those, so no filetype inheriting C styles should set it to 1. Similarly, some properties like `styling.within.preprocessor` are mostly general settings rather than selecting syntax details, so they should probably match in all filetypes for consistency. So, inherit the C lexer_properties everywhere C styles are used, and only override specific properties in the inheriting filetype. Modified Paths: -------------- data/filedefs/filetypes.CUDA.conf data/filedefs/filetypes.Genie.conf data/filedefs/filetypes.Graphviz.conf data/filedefs/filetypes.JSON.conf data/filedefs/filetypes.Scala.conf data/filedefs/filetypes.actionscript data/filedefs/filetypes.cpp data/filedefs/filetypes.cs data/filedefs/filetypes.ferite data/filedefs/filetypes.glsl data/filedefs/filetypes.go data/filedefs/filetypes.haxe data/filedefs/filetypes.java data/filedefs/filetypes.javascript data/filedefs/filetypes.vala Modified: data/filedefs/filetypes.CUDA.conf 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -11,9 +11,7 @@ secondary=__device__ __global__ __shared__ __host__ __constant__ gridDim blockId # these are the Doxygen keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem -[lexer_properties] -styling.within.preprocessor=1 -lexer.cpp.track.preprocessor=0 +[lexer_properties=C] [settings] lexer_filetype=C Modified: data/filedefs/filetypes.Genie.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -8,7 +8,7 @@ primary=abstract and array as assert async bool break byte case cast char class # these are the Doxygen and Valadoc keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup inheritDoc interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem -[lexer_properties] +[lexer_properties=C] lexer.cpp.triplequoted.strings=1 [settings] Modified: data/filedefs/filetypes.Graphviz.conf 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -8,9 +8,9 @@ secondary=Damping K URL area arrowhead arrowsize arrowtail aspect bb bgcolor col # these are the Doxygen keywords docComment= -[lexer_properties] + +[lexer_properties=C] styling.within.preprocessor=0 -lexer.cpp.track.preprocessor=0 [settings] lexer_filetype=C Modified: data/filedefs/filetypes.JSON.conf 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,7 @@ [styling=C] +[lexer_properties=C] + [keywords] primary=true false null Modified: data/filedefs/filetypes.Scala.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -9,7 +9,7 @@ secondary=null super this AllRef Any AnyRef Array Attribute Elem Iterable List O # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union -[lexer_properties] +[lexer_properties=C] lexer.cpp.triplequoted.strings=1 [settings] Modified: data/filedefs/filetypes.actionscript 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -7,6 +7,8 @@ primary=arguments break case catch class const continue default do dynamic each secondary=decodeURI decodeURIcomponent encodeURI encodeURIcomponent escape isFinite isNaN isXMLName parseFloat parseInt trace unescape classes=ArgumentError Array Boolean Class Date DefinitionError Error EvalError Function int Math NameSpace Null Number Object QName RangeError ReferenceError RegExp SecurityError String SyntaxError TypeError uint URIError Vector VerifyError void XML XMLList +[lexer_properties=C] + [settings] # default extension used when saving files extension=as Modified: data/filedefs/filetypes.cpp 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -8,9 +8,7 @@ secondary= # these are the Doxygen keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem -[lexer_properties] -styling.within.preprocessor=1 -lexer.cpp.track.preprocessor=0 +[lexer_properties=C] [settings] lexer_filetype=C Modified: data/filedefs/filetypes.cs 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -8,9 +8,7 @@ # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union -[lexer_properties] -styling.within.preprocessor=1 -lexer.cpp.track.preprocessor=0 +[lexer_properties=C] [settings] lexer_filetype=C Modified: data/filedefs/filetypes.ferite 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -7,6 +7,8 @@ primary=false null self super true abstract alias and arguments attribute_missin types=boolean string number array object void XML Unix Sys String Stream Serialize RMI Posix Number Network Math FileSystem Console Array Regexp XSLT docComment=brief class declaration description end example extends function group implements modifies module namespace param protocol return return static type variable warning +[lexer_properties=C] + [settings] # default extension used when saving files extension=fe Modified: data/filedefs/filetypes.glsl 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -8,9 +8,7 @@ secondary= # these are some doxygen keywords (incomplete) docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return returns see since struct throw todo typedef var version warning union -[lexer_properties] -styling.within.preprocessor=1 -lexer.cpp.track.preprocessor=0 +[lexer_properties=C] [settings] lexer_filetype=C Modified: data/filedefs/filetypes.go 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -10,9 +10,8 @@ secondary=bool byte complex64 complex128 error float32 float64 int int8 int16 in # these are the Doxygen keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem -[lexer_properties] +[lexer_properties=C] lexer.cpp.backquoted.strings=1 -styling.within.preprocessor=1 lexer.cpp.allow.dollars=0 fold.preprocessor=0 Modified: data/filedefs/filetypes.haxe 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -7,7 +7,7 @@ primary=abstract break case catch class const continue trace do else enum extend secondary=Bool Dynamic Float Int null Void Enum String classes=Array ArrayAccess Class Date DateTools EReg Hash IntHash IntIter Iterable Iterator Lambda List Math Null Protected Reflect Std StringBuf StringTools Type UInt ValueType Xml XmlType -[lexer_properties] +[lexer_properties=C] # Haxe preprocessor has different directive than C, which the C lexer doesn't understand, so # we explicitly need not track the preprocessor at all. lexer.cpp.track.preprocessor=0 Modified: data/filedefs/filetypes.java 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -8,6 +8,7 @@ doccomment=author deprecated exception param return see serial serialData serialField since throws todo version typedefs= +[lexer_properties=C] [settings] # default extension used when saving files Modified: data/filedefs/filetypes.javascript 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -6,6 +6,8 @@ primary=break case catch class const continue default delete do each else extends false finally for function get if in Infinity instanceof let NaN new null return set static super switch this throw true try typeof undefined var void while with yield prototype secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError constructor prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt +[lexer_properties=C] + [settings] # default extension used when saving files extension=js Modified: data/filedefs/filetypes.vala 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -8,9 +8,7 @@ primary=abstract as async base bool break callback case catch char class const c # these are the Doxygen and Valadoc keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup inheritDoc interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem -[lexer_properties] -styling.within.preprocessor=1 -lexer.cpp.track.preprocessor=0 +[lexer_properties=C] lexer.cpp.triplequoted.strings=1 [settings] -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] bbdf56: Haxe: Do not track preprocessor for styling
by Colomban Wendling 06 Sep '16

06 Sep '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 06 Sep 2016 09:35:11 UTC Commit: bbdf56fc2e2c978de6a61c3be56dfeb5bc6963ef https://github.com/geany/geany/commit/bbdf56fc2e2c978de6a61c3be56dfeb5bc696… Log Message: ----------- Haxe: Do not track preprocessor for styling We don't set the styles for inactive preprocessor sections, so we should make sure they aren't used. Also, Haxe has different preprocessor directives than C does, which confuses LexCPP tracking anyway. Fixes #936. Modified Paths: -------------- data/filedefs/filetypes.haxe Modified: data/filedefs/filetypes.haxe 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -7,6 +7,10 @@ primary=abstract break case catch class const continue trace do else enum extend secondary=Bool Dynamic Float Int null Void Enum String classes=Array ArrayAccess Class Date DateTools EReg Hash IntHash IntIter Iterable Iterator Lambda List Math Null Protected Reflect Std StringBuf StringTools Type UInt ValueType Xml XmlType +[lexer_properties] +# Haxe preprocessor has different directive than C, which the C lexer doesn't understand, so +# we explicitly need not track the preprocessor at all. +lexer.cpp.track.preprocessor=0 [settings] # default extension used when saving files -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 09796e: Remove SciTE properties from filetype definitions
by Colomban Wendling 06 Sep '16

06 Sep '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 06 Sep 2016 09:08:52 UTC Commit: 09796ef727aa430588ee12fa6c83223acd1794a2 https://github.com/geany/geany/commit/09796ef727aa430588ee12fa6c83223acd179… Log Message: ----------- Remove SciTE properties from filetype definitions Those are SciTE-specific things that Scintilla itself never used, and that were simply erroneously imported into Geany. Modified Paths: -------------- data/filedefs/filetypes.CUDA.conf data/filedefs/filetypes.Graphviz.conf data/filedefs/filetypes.c data/filedefs/filetypes.cpp data/filedefs/filetypes.cs data/filedefs/filetypes.glsl data/filedefs/filetypes.vala Modified: data/filedefs/filetypes.CUDA.conf 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -14,10 +14,6 @@ docComment=a addindex addtogroup anchor arg attention author authors b brief bug [lexer_properties] styling.within.preprocessor=1 lexer.cpp.track.preprocessor=0 -preprocessor.symbol.$(file.patterns.cpp)=# -preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef -preprocessor.middle.$(file.patterns.cpp)=else elif -preprocessor.end.$(file.patterns.cpp)=endif [settings] lexer_filetype=C Modified: data/filedefs/filetypes.Graphviz.conf 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -11,7 +11,6 @@ docComment= [lexer_properties] styling.within.preprocessor=0 lexer.cpp.track.preprocessor=0 -preprocessor.symbol.$(file.patterns.cpp)=# [settings] lexer_filetype=C Modified: data/filedefs/filetypes.c 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -41,10 +41,6 @@ docComment=a addindex addtogroup anchor arg attention author authors b brief bug [lexer_properties] styling.within.preprocessor=1 lexer.cpp.track.preprocessor=0 -preprocessor.symbol.$(file.patterns.cpp)=# -preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef -preprocessor.middle.$(file.patterns.cpp)=else elif -preprocessor.end.$(file.patterns.cpp)=endif [settings] # default extension used when saving files Modified: data/filedefs/filetypes.cpp 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -11,10 +11,6 @@ docComment=a addindex addtogroup anchor arg attention author authors b brief bug [lexer_properties] styling.within.preprocessor=1 lexer.cpp.track.preprocessor=0 -preprocessor.symbol.$(file.patterns.cpp)=# -preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef -preprocessor.middle.$(file.patterns.cpp)=else elif -preprocessor.end.$(file.patterns.cpp)=endif [settings] lexer_filetype=C Modified: data/filedefs/filetypes.cs 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -11,10 +11,6 @@ [lexer_properties] styling.within.preprocessor=1 lexer.cpp.track.preprocessor=0 -preprocessor.symbol.$(file.patterns.cpp)=# -preprocessor.start.$(file.patterns.cpp)=if -preprocessor.middle.$(file.patterns.cpp)=else elif -preprocessor.end.$(file.patterns.cpp)=endif [settings] lexer_filetype=C Modified: data/filedefs/filetypes.glsl 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -11,10 +11,6 @@ docComment=attention author brief bug class code date def enum example exception [lexer_properties] styling.within.preprocessor=1 lexer.cpp.track.preprocessor=0 -preprocessor.symbol.$(file.patterns.cpp)=# -preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef -preprocessor.middle.$(file.patterns.cpp)=else elif -preprocessor.end.$(file.patterns.cpp)=endif [settings] lexer_filetype=C Modified: data/filedefs/filetypes.vala 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -11,10 +11,6 @@ docComment=a addindex addtogroup anchor arg attention author authors b brief bug [lexer_properties] styling.within.preprocessor=1 lexer.cpp.track.preprocessor=0 -preprocessor.symbol.$(file.patterns.cpp)=# -preprocessor.start.$(file.patterns.cpp)=if -preprocessor.middle.$(file.patterns.cpp)=else elif -preprocessor.end.$(file.patterns.cpp)=endif lexer.cpp.triplequoted.strings=1 [settings] -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 18db45: Update Scintilla to version 3.6.7
by Colomban Wendling 05 Sep '16

05 Sep '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 05 Sep 2016 20:31:52 UTC Commit: 18db459632b62aa95bc3699a9e38c914d1220e79 https://github.com/geany/geany/commit/18db459632b62aa95bc3699a9e38c914d1220… Log Message: ----------- Update Scintilla to version 3.6.7 Fixes #1143. Modified Paths: -------------- scintilla/gtk/ScintillaGTK.cxx scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/lexers/LexAbaqus.cxx scintilla/lexers/LexCPP.cxx scintilla/lexers/LexHTML.cxx scintilla/src/CharClassify.cxx scintilla/src/CharClassify.h scintilla/src/Document.cxx scintilla/src/Document.h scintilla/src/Editor.cxx scintilla/src/Editor.h scintilla/src/ScintillaBase.cxx scintilla/src/XPM.cxx scintilla/version.txt Modified: scintilla/gtk/ScintillaGTK.cxx 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1747,7 +1747,7 @@ void ScintillaGTK::Resize(int width, int height) { minVScrollBarHeight = minimum.height; verticalScrollBarWidth = requisition.width; gtk_widget_get_preferred_size(PWidget(scrollbarh), &minimum, &requisition); - minHScrollBarWidth = minimum.height; + minHScrollBarWidth = minimum.width; horizontalScrollBarHeight = requisition.height; #else minVScrollBarHeight = minHScrollBarWidth = 1; Modified: scintilla/include/Scintilla.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -895,6 +895,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCVS_NONE 0 #define SCVS_RECTANGULARSELECTION 1 #define SCVS_USERACCESSIBLE 2 +#define SCVS_NOWRAPLINESTART 4 #define SCI_SETVIRTUALSPACEOPTIONS 2596 #define SCI_GETVIRTUALSPACEOPTIONS 2597 #define SCI_SETRECTANGULARSELECTIONMODIFIER 2598 Modified: scintilla/include/Scintilla.iface 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -2331,6 +2331,7 @@ enu VirtualSpace=SCVS_ val SCVS_NONE=0 val SCVS_RECTANGULARSELECTION=1 val SCVS_USERACCESSIBLE=2 +val SCVS_NOWRAPLINESTART=4 set void SetVirtualSpaceOptions=2596(int virtualSpaceOptions,) get int GetVirtualSpaceOptions=2597(,) Modified: scintilla/lexers/LexAbaqus.cxx 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -581,14 +581,14 @@ WordList *[], Accessor &styler) { for ( Sci_Position ll = beginData; ll < beginComment; ll++ ) SafeSetLevel(ll, datLevel, styler) ; - if ( prvKeyLineTp == 5 ) { - level += 1 ; - } + if ( prvKeyLineTp == 5 ) { + level += 1 ; + } - if ( prvKeyLineTp == 6 ) { - level -= 1 ; - } - for ( Sci_Position m = beginComment; m <= endLine; m++ ) + if ( prvKeyLineTp == 6 ) { + level -= 1 ; + } + for ( Sci_Position m = beginComment; m <= endLine; m++ ) SafeSetLevel(m, level, styler) ; } Modified: scintilla/lexers/LexCPP.cxx 17 lines changed, 14 insertions(+), 3 deletions(-) =================================================================== @@ -229,7 +229,7 @@ struct PPDefinition { std::string value; bool isUndef; std::string arguments; - PPDefinition(Sci_Position line_, const std::string &key_, const std::string &value_, bool isUndef_ = false, std::string arguments_="") : + PPDefinition(Sci_Position line_, const std::string &key_, const std::string &value_, bool isUndef_ = false, const std::string &arguments_="") : line(line_), key(key_), value(value_), isUndef(isUndef_), arguments(arguments_) { } }; @@ -320,6 +320,7 @@ struct OptionsCPP { std::string foldExplicitEnd; bool foldExplicitAnywhere; bool foldPreprocessor; + bool foldPreprocessorAtElse; bool foldCompact; bool foldAtElse; OptionsCPP() { @@ -341,6 +342,7 @@ struct OptionsCPP { foldExplicitEnd = ""; foldExplicitAnywhere = false; foldPreprocessor = false; + foldPreprocessorAtElse = false; foldCompact = false; foldAtElse = false; } @@ -411,6 +413,9 @@ struct OptionSetCPP : public OptionSet<OptionsCPP> { DefineProperty("fold.cpp.explicit.anywhere", &OptionsCPP::foldExplicitAnywhere, "Set this property to 1 to enable explicit fold points anywhere, not just in line comments."); + + DefineProperty("fold.cpp.preprocessor.at.else", &OptionsCPP::foldPreprocessorAtElse, + "This option enables folding on a preprocessor #else or #endif line of an #if statement."); DefineProperty("fold.preprocessor", &OptionsCPP::foldPreprocessor, "This option enables folding preprocessor directives when using the C++ lexer. " @@ -1349,13 +1354,17 @@ void SCI_METHOD LexerCPP::Fold(Sci_PositionU startPos, Sci_Position length, int } else if (styler.Match(j, "end")) { levelNext--; } + + if (options.foldPreprocessorAtElse && (styler.Match(j, "else") || styler.Match(j, "elif"))) { + levelMinCurrent--; + } } } if (options.foldSyntaxBased && (style == SCE_C_OPERATOR)) { if (ch == '{' || ch == '[' || ch == '(') { // Measure the minimum before a '{' to allow // folding on "} else {" - if (levelMinCurrent > levelNext) { + if (options.foldAtElse && levelMinCurrent > levelNext) { levelMinCurrent = levelNext; } levelNext++; @@ -1367,7 +1376,9 @@ void SCI_METHOD LexerCPP::Fold(Sci_PositionU startPos, Sci_Position length, int visibleChars++; if (atEOL || (i == endPos-1)) { int levelUse = levelCurrent; - if (options.foldSyntaxBased && options.foldAtElse) { + if ((options.foldSyntaxBased && options.foldAtElse) || + (options.foldPreprocessor && options.foldPreprocessorAtElse) + ) { levelUse = levelMinCurrent; } int lev = levelUse | levelNext << 16; Modified: scintilla/lexers/LexHTML.cxx 13 lines changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -610,6 +610,17 @@ static void ColouriseHyperTextDoc(Sci_PositionU startPos, Sci_Position length, i } styler.StartAt(startPos); + /* Nothing handles getting out of these, so we need not start in any of them. + * As we're at line start and they can't span lines, we'll re-detect them anyway */ + switch (state) { + case SCE_H_QUESTION: + case SCE_H_XMLSTART: + case SCE_H_XMLEND: + case SCE_H_ASP: + state = SCE_H_DEFAULT; + break; + } + Sci_Position lineCurrent = styler.GetLine(startPos); int lineState; if (lineCurrent > 0) { @@ -898,7 +909,7 @@ static void ColouriseHyperTextDoc(Sci_PositionU startPos, Sci_Position length, i ///////////////////////////////////// // handle the start of PHP pre-processor = Non-HTML else if ((state != SCE_H_ASPAT) && - !isPHPStringState(state) && + !isStringState(state) && (state != SCE_HPHP_COMMENT) && (state != SCE_HPHP_COMMENTLINE) && (ch == '<') && Modified: scintilla/src/CharClassify.cxx 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,7 @@ void CharClassify::SetCharClasses(const unsigned char *chars, cc newCharClass) { } } -int CharClassify::GetCharsOfClass(cc characterClass, unsigned char *buffer) { +int CharClassify::GetCharsOfClass(cc characterClass, unsigned char *buffer) const { // Get characters belonging to the given char class; return the number // of characters (if the buffer is NULL, don't write to it). int count = 0; Modified: scintilla/src/CharClassify.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -19,7 +19,7 @@ class CharClassify { enum cc { ccSpace, ccNewLine, ccWord, ccPunctuation }; void SetDefaultCharClasses(bool includeWordClass); void SetCharClasses(const unsigned char *chars, cc newCharClass); - int GetCharsOfClass(cc charClass, unsigned char *buffer); + int GetCharsOfClass(cc charClass, unsigned char *buffer) const; cc GetClass(unsigned char ch) const { return static_cast<cc>(charClass[ch]);} bool IsWord(unsigned char ch) const { return static_cast<cc>(charClass[ch]) == ccWord;} Modified: scintilla/src/Document.cxx 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1823,7 +1823,7 @@ void Document::SetCharClasses(const unsigned char *chars, CharClassify::cc newCh charClass.SetCharClasses(chars, newCharClass); } -int Document::GetCharsOfClass(CharClassify::cc characterClass, unsigned char *buffer) { +int Document::GetCharsOfClass(CharClassify::cc characterClass, unsigned char *buffer) const { return charClass.GetCharsOfClass(characterClass, buffer); } Modified: scintilla/src/Document.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -401,7 +401,7 @@ class Document : PerLine, public IDocumentWithLineEnd, public ILoader { void SetDefaultCharClasses(bool includeWordClass); void SetCharClasses(const unsigned char *chars, CharClassify::cc newCharClass); - int GetCharsOfClass(CharClassify::cc characterClass, unsigned char *buffer); + int GetCharsOfClass(CharClassify::cc characterClass, unsigned char *buffer) const; void SCI_METHOD StartStyling(Sci_Position position, char mask); bool SCI_METHOD SetStyleFor(Sci_Position length, char style); bool SCI_METHOD SetStyles(Sci_Position length, const char *styles); Modified: scintilla/src/Editor.cxx 47 lines changed, 30 insertions(+), 17 deletions(-) =================================================================== @@ -1837,15 +1837,26 @@ void Editor::ChangeSize() { } } -int Editor::InsertSpace(int position, unsigned int spaces) { - if (spaces > 0) { - std::string spaceText(spaces, ' '); - const int lengthInserted = pdoc->InsertString(position, spaceText.c_str(), spaces); - position += lengthInserted; +int Editor::RealizeVirtualSpace(int position, unsigned int virtualSpace) { + if (virtualSpace > 0) { + const int line = pdoc->LineFromPosition(position); + const int indent = pdoc->GetLineIndentPosition(line); + if (indent == position) { + return pdoc->SetLineIndentation(line, pdoc->GetLineIndentation(line) + virtualSpace); + } else { + std::string spaceText(virtualSpace, ' '); + const int lengthInserted = pdoc->InsertString(position, spaceText.c_str(), virtualSpace); + position += lengthInserted; + } } return position; } +SelectionPosition Editor::RealizeVirtualSpace(const SelectionPosition &position) { + // Return the new position with no virtual space + return SelectionPosition(RealizeVirtualSpace(position.Position(), position.VirtualSpace())); +} + void Editor::AddChar(char ch) { char s[2]; s[0] = ch; @@ -1901,7 +1912,7 @@ void Editor::AddCharUTF(const char *s, unsigned int len, bool treatAsDBCS) { } } } - positionInsert = InsertSpace(positionInsert, currentSel->caret.VirtualSpace()); + positionInsert = RealizeVirtualSpace(positionInsert, currentSel->caret.VirtualSpace()); const int lengthInserted = pdoc->InsertString(positionInsert, s, len); if (lengthInserted > 0) { currentSel->caret.SetPosition(positionInsert + lengthInserted); @@ -1975,7 +1986,7 @@ void Editor::ClearBeforeTentativeStart() { sel.Range(r).MinimizeVirtualSpace(); } } - InsertSpace(positionInsert, sel.Range(r).caret.VirtualSpace()); + RealizeVirtualSpace(positionInsert, sel.Range(r).caret.VirtualSpace()); sel.Range(r).ClearVirtualSpace(); } } @@ -1984,7 +1995,7 @@ void Editor::ClearBeforeTentativeStart() { void Editor::InsertPaste(const char *text, int len) { if (multiPasteMode == SC_MULTIPASTE_ONCE) { SelectionPosition selStart = sel.Start(); - selStart = SelectionPosition(InsertSpace(selStart.Position(), selStart.VirtualSpace())); + selStart = RealizeVirtualSpace(selStart); const int lengthInserted = pdoc->InsertString(selStart.Position(), text, len); if (lengthInserted > 0) { SetEmptySelection(selStart.Position() + lengthInserted); @@ -2004,7 +2015,7 @@ void Editor::InsertPaste(const char *text, int len) { sel.Range(r).MinimizeVirtualSpace(); } } - positionInsert = InsertSpace(positionInsert, sel.Range(r).caret.VirtualSpace()); + positionInsert = RealizeVirtualSpace(positionInsert, sel.Range(r).caret.VirtualSpace()); const int lengthInserted = pdoc->InsertString(positionInsert, text, len); if (lengthInserted > 0) { sel.Range(r).caret.SetPosition(positionInsert + lengthInserted); @@ -2126,8 +2137,7 @@ void Editor::PasteRectangular(SelectionPosition pos, const char *ptr, int len) { sel.RangeMain() = SelectionRange(pos); int line = pdoc->LineFromPosition(sel.MainCaret()); UndoGroup ug(pdoc); - sel.RangeMain().caret = SelectionPosition( - InsertSpace(sel.RangeMain().caret.Position(), sel.RangeMain().caret.VirtualSpace())); + sel.RangeMain().caret = RealizeVirtualSpace(sel.RangeMain().caret); int xInsert = XFromPosition(sel.RangeMain().caret); bool prevCr = false; while ((len > 0) && IsEOLChar(ptr[len-1])) @@ -2179,9 +2189,9 @@ void Editor::Clear() { if (!RangeContainsProtected(sel.Range(r).caret.Position(), sel.Range(r).caret.Position() + 1)) { if (sel.Range(r).Start().VirtualSpace()) { if (sel.Range(r).anchor < sel.Range(r).caret) - sel.Range(r) = SelectionRange(InsertSpace(sel.Range(r).anchor.Position(), sel.Range(r).anchor.VirtualSpace())); + sel.Range(r) = SelectionRange(RealizeVirtualSpace(sel.Range(r).anchor.Position(), sel.Range(r).anchor.VirtualSpace())); else - sel.Range(r) = SelectionRange(InsertSpace(sel.Range(r).caret.Position(), sel.Range(r).caret.VirtualSpace())); + sel.Range(r) = SelectionRange(RealizeVirtualSpace(sel.Range(r).caret.Position(), sel.Range(r).caret.VirtualSpace())); } if ((sel.Count() == 1) || !pdoc->IsPositionInLineEnd(sel.Range(r).caret.Position())) { pdoc->DelChar(sel.Range(r).caret.Position()); @@ -3283,7 +3293,7 @@ int Editor::HorizontalMove(unsigned int iMessage) { case SCI_CHARLEFTRECTEXTEND: if (pdoc->IsLineEndPosition(spCaret.Position()) && spCaret.VirtualSpace()) { spCaret.SetVirtualSpace(spCaret.VirtualSpace() - 1); - } else { + } else if ((virtualSpaceOptions & SCVS_NOWRAPLINESTART) == 0 || pdoc->GetColumn(spCaret.Position()) > 0) { spCaret = SelectionPosition(spCaret.Position() - 1); } break; @@ -3328,7 +3338,7 @@ int Editor::HorizontalMove(unsigned int iMessage) { case SCI_CHARLEFTEXTEND: if (spCaret.VirtualSpace()) { spCaret.SetVirtualSpace(spCaret.VirtualSpace() - 1); - } else { + } else if ((virtualSpaceOptions & SCVS_NOWRAPLINESTART) == 0 || pdoc->GetColumn(spCaret.Position()) > 0) { spCaret = SelectionPosition(spCaret.Position() - 1); } break; @@ -3504,7 +3514,7 @@ int Editor::DelWordOrLine(unsigned int iMessage) { } else { // Delete to the right so first realise the virtual space. sel.Range(r) = SelectionRange( - InsertSpace(sel.Range(r).caret.Position(), sel.Range(r).caret.VirtualSpace())); + RealizeVirtualSpace(sel.Range(r).caret)); } Range rangeDelete; @@ -4208,7 +4218,7 @@ void Editor::DropAt(SelectionPosition position, const char *value, size_t length SetEmptySelection(position); } else { position = MovePositionOutsideChar(position, sel.MainCaret() - position.Position()); - position = SelectionPosition(InsertSpace(position.Position(), position.VirtualSpace())); + position = RealizeVirtualSpace(position); const int lengthInserted = pdoc->InsertString( position.Position(), convertedText.c_str(), static_cast<int>(convertedText.length())); if (lengthInserted > 0) { @@ -5293,6 +5303,9 @@ void Editor::FoldExpand(int line, int action, int level) { if (action == SC_FOLDACTION_TOGGLE) { expanding = !cs.GetExpanded(line); } + // Ensure child lines lexed and fold information extracted before + // flipping the state. + pdoc->GetLastChild(line, LevelNumber(level)); SetFoldExpanded(line, expanding); if (expanding && (cs.HiddenLines() == 0)) // Nothing to do Modified: scintilla/src/Editor.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -390,7 +390,8 @@ class Editor : public EditModel, public DocWatcher { void ChangeSize(); void FilterSelections(); - int InsertSpace(int position, unsigned int spaces); + int RealizeVirtualSpace(int position, unsigned int virtualSpace); + SelectionPosition RealizeVirtualSpace(const SelectionPosition &position); void AddChar(char ch); virtual void AddCharUTF(const char *s, unsigned int len, bool treatAsDBCS=false); void ClearBeforeTentativeStart(); Modified: scintilla/src/ScintillaBase.cxx 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -218,7 +218,7 @@ void ScintillaBase::AutoCompleteInsert(Position startPos, int removeLen, const c if (!RangeContainsProtected(sel.Range(r).Start().Position(), sel.Range(r).End().Position())) { int positionInsert = sel.Range(r).Start().Position(); - positionInsert = InsertSpace(positionInsert, sel.Range(r).caret.VirtualSpace()); + positionInsert = RealizeVirtualSpace(positionInsert, sel.Range(r).caret.VirtualSpace()); if (positionInsert - removeLen >= 0) { positionInsert -= removeLen; pdoc->DeleteChars(positionInsert, removeLen); Modified: scintilla/src/XPM.cxx 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -22,13 +22,13 @@ using namespace Scintilla; static const char *NextField(const char *s) { // In case there are leading spaces in the string - while (*s && *s == ' ') { + while (*s == ' ') { s++; } while (*s && *s != ' ') { s++; } - while (*s && *s == ' ') { + while (*s == ' ') { s++; } return s; Modified: scintilla/version.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -366 +367 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b7688b: Update of Swedish translation
by Frank Lanitz 05 Sep '16

05 Sep '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 05 Sep 2016 09:13:26 UTC Commit: b7688b04b26deee0a23a965e11574489605fb1cf https://github.com/geany/geany/commit/b7688b04b26deee0a23a965e11574489605fb… Log Message: ----------- Update of Swedish translation Modified Paths: -------------- NEWS po/sv.po Modified: NEWS 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ Geany 1.29 (unreleased) Internationalization - * Updated translations: ca, pt_BR + * Updated translations: ca, pt_BR, sv Geany 1.28 (July 10, 2016) Modified: po/sv.po 148 lines changed, 66 insertions(+), 82 deletions(-) =================================================================== @@ -1,14 +1,14 @@ # Swedish translations for geany package. -# Copyright (C) 2007 - 2015 THE geany'S COPYRIGHT HOLDER +# Copyright (C) 2007 - 2016 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. # -# Tony Mattsson <superxorn(a)gmail.com>, 2007 - 2015 +# Tony Mattsson <superxorn(a)gmail.com>, 2007 - 2016 msgid "" msgstr "" "Project-Id-Version: Geany 1.28\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-06-27 18:56+0200\n" -"PO-Revision-Date: 2015-08-05 09:27+0100\n" +"PO-Revision-Date: 2016-09-02 14:13+0200\n" "Last-Translator: Tony Mattsson <superxorn(a)gmail.com>\n" "Language-Team: Swedish <geany-i18n(a)uvena.de>\n" "Language: sv\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Poedit 1.8.8\n" #: ../geany.desktop.in.h:1 ../data/geany.glade.h:342 msgid "Geany" @@ -32,9 +32,8 @@ msgid "A fast and lightweight IDE using GTK+" msgstr "Ett snabbt och lättviktigt IDE som använder GTK+" #: ../geany.desktop.in.h:4 -#, fuzzy msgid "Text;Editor;" -msgstr "Editor" +msgstr "Text;Editor;" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" @@ -117,9 +116,8 @@ msgid "Find _Document Usage" msgstr "Visa dokumentets användning" #: ../data/geany.glade.h:21 -#, fuzzy msgid "Go to Symbol Defini_tion" -msgstr "Gå till Tagg-definition" +msgstr "Gå till symboldefinition" #: ../data/geany.glade.h:22 msgid "Conte_xt Action" @@ -409,21 +407,19 @@ msgstr "Stäng av / på symbollistan" #: ../data/geany.glade.h:79 msgid "Default symbol sorting mode" -msgstr "" +msgstr "Grundläggande symbolsorteringsläge" #: ../data/geany.glade.h:80 -#, fuzzy msgid "Default sorting mode:" -msgstr "Förvald kodning (nya filer):" +msgstr "Förvalt sorteringsläge:" #: ../data/geany.glade.h:81 ../src/stash.c:1170 msgid "Name" msgstr "Namn" #: ../data/geany.glade.h:82 -#, fuzzy msgid "Appearance" -msgstr "Utseende" +msgstr "Utseende" #: ../data/geany.glade.h:83 msgid "Show documents list" @@ -1579,7 +1575,6 @@ msgid "Follow path of the current file" msgstr "Följ den aktiva filens sökväg" #: ../data/geany.glade.h:332 -#, fuzzy msgid "Whether to execute \"cd $path\" when you switch between opened files" msgstr "" "Huruvida \\\"cd $path\\\" skall exekveras när du växlar mellan öppna filer" @@ -1819,9 +1814,8 @@ msgid "_Mark All" msgstr "Markera allt" #: ../data/geany.glade.h:390 -#, fuzzy msgid "Go to Symbol Decl_aration" -msgstr "Gå till Tagg-deklaration" +msgstr "Gå till symboldeklaration" #: ../data/geany.glade.h:391 msgid "_View" @@ -2053,9 +2047,8 @@ msgid "_Word Count" msgstr "Räkna ord" #: ../data/geany.glade.h:448 -#, fuzzy msgid "Load Ta_gs File..." -msgstr "Ladda taggar..." +msgstr "Ladda taggfil..." #: ../data/geany.glade.h:449 msgid "_Help" @@ -2228,7 +2221,6 @@ msgid "Other:" msgstr "Annat:" #: ../src/about.c:48 -#, fuzzy msgid "" "Copyright (c) 2005-2016\n" "Colomban Wendling\n" @@ -2238,7 +2230,7 @@ msgid "" "Frank Lanitz\n" "All rights reserved." msgstr "" -"Copyright (c) 2005-2014\n" +"Copyright (c) 2005-2016\n" "Colomban Wendling\n" "Nick Treleaven\n" "Matthew Brush\n" @@ -2354,12 +2346,13 @@ msgstr "" "(tryck Ctrl+C eller RETUR-tangenten för att rensa)." #: ../src/build.c:907 -#, fuzzy, c-format +#, c-format msgid "" "Cannot execute build command \"%s\": %s. Check the Terminal setting in " "Preferences" msgstr "" -"Kan inte exekvera grep-verktyget '%s'; kontrollera sökvägen i Inställningar." +"Kan inte exekvera bygg-komandot \"%s\": %s. Kontrollera inställningarna för " +"kommandotolken." #: ../src/build.c:1016 msgid "Compilation failed." @@ -2537,19 +2530,17 @@ msgstr "Kunde inte öppna filen %s (filen kunde ej hittas)" #: ../src/callbacks.c:1468 msgid "Check the path setting in Filetype configuration." -msgstr "" +msgstr "Kontrollera inställningarna för sökvägar i filtypskonfigurationen." #: ../src/callbacks.c:1473 -#, fuzzy msgid "Check the path setting in Preferences." -msgstr "" -"Kan inte exekvera grep-verktyget '%s'; kontrollera sökvägen i Inställningar." +msgstr "Kontrollera inställningarna för sökvägar i inställningarna." #. G_SHELL_ERROR is parsing error, it may be caused by %s word with quotes #: ../src/callbacks.c:1486 -#, fuzzy, c-format +#, c-format msgid "Cannot execute context action command \"%s\": %s. %s" -msgstr "Kunde inte exekvera konfigurerat externt kommando '%s' (%s)." +msgstr "Kunde inte exekvera kontextmeny kommando \"%s\": %s. %s" #: ../src/dialogs.c:161 ../src/document.c:2294 ../src/document.c:2359 #: ../src/document.c:2367 @@ -2798,7 +2789,7 @@ msgstr ", skrivskyddad" #: ../src/document.c:1613 msgid "Discard history" -msgstr "" +msgstr "Töm historia" #: ../src/document.c:1614 msgid "" @@ -2807,11 +2798,14 @@ msgid "" "will not be displayed again but Your choice can be changed in the various " "preferences." msgstr "" +"Bufferns föregående status har lagrats, och om du ångrar tar du fram " +"statusen igen. Du kan avaktivera detta genom att tömma histora vid " +"omladdning. Detta meddelande komer inte att visas igen, men dit val kan " +"sparas i inställningarna." #: ../src/document.c:1618 -#, fuzzy msgid "The file has been reloaded." -msgstr "Dokumentet har stängts." +msgstr "Filen har laddats om." #: ../src/document.c:1648 msgid "Any unsaved changes will be lost." @@ -3433,45 +3427,39 @@ msgstr "Minska indrag med ett blanksteg" #: ../src/keybindings.c:475 msgid "Send to Custom Command 1" -msgstr "Definiera användarkommando 1" +msgstr "Skicka till användarkommando 1" #: ../src/keybindings.c:477 msgid "Send to Custom Command 2" -msgstr "Definiera användarkommando 2" +msgstr "Skicka till användarkommando 2" #: ../src/keybindings.c:479 msgid "Send to Custom Command 3" -msgstr "Definiera användarkommando 3" +msgstr "Skicka till användarkommando 3" #: ../src/keybindings.c:481 -#, fuzzy msgid "Send to Custom Command 4" -msgstr "Definiera användarkommando 1" +msgstr "Skicka till användarkommando 4" #: ../src/keybindings.c:483 -#, fuzzy msgid "Send to Custom Command 5" -msgstr "Definiera användarkommando 1" +msgstr "Skicka till användarkommando 5" #: ../src/keybindings.c:485 -#, fuzzy msgid "Send to Custom Command 6" -msgstr "Definiera användarkommando 1" +msgstr "Skicka till användarkommando 6" #: ../src/keybindings.c:487 -#, fuzzy msgid "Send to Custom Command 7" -msgstr "Definiera användarkommando 1" +msgstr "Skicka till användarkommando 7" #: ../src/keybindings.c:489 -#, fuzzy msgid "Send to Custom Command 8" -msgstr "Definiera användarkommando 1" +msgstr "Skicka till användarkommando 8" #: ../src/keybindings.c:491 -#, fuzzy msgid "Send to Custom Command 9" -msgstr "Definiera användarkommando 1" +msgstr "Skicka till användarkommando 9" #: ../src/keybindings.c:499 msgid "Join lines" @@ -3542,14 +3530,12 @@ msgid "Toggle marker" msgstr "Stäng av / på markör" #: ../src/keybindings.c:575 -#, fuzzy msgid "Go to Symbol Definition" -msgstr "Gå till Tagg-definition" +msgstr "Gå till symboldefinition" #: ../src/keybindings.c:578 -#, fuzzy msgid "Go to Symbol Declaration" -msgstr "Gå till Tagg-deklaration" +msgstr "Gå till symboldeklaration" #: ../src/keybindings.c:580 msgid "Go to Start of Line" @@ -3782,9 +3768,8 @@ msgid "Generate global tags file (see documentation)" msgstr "Generera globala tagg-filer (se dokumentationen)" #: ../src/libmain.c:122 -#, fuzzy msgid "Don't preprocess C/C++ files when generating tags file" -msgstr "Förbehandla inte C/C++ filer vid tag-generering" +msgstr "Förbehandla inte C/C++ filer vid generering av tagg-filen" #: ../src/libmain.c:124 msgid "Don't open files in a running instance, force opening a new instance" @@ -3949,9 +3934,8 @@ msgid "Switch to Document" msgstr "Växla till dokumentet" #: ../src/notebook.c:451 -#, fuzzy msgid "Open in New _Window" -msgstr "Öppna i Geany" +msgstr "Öppna i nytt fönster" #: ../src/plugins.c:224 #, c-format @@ -3972,6 +3956,8 @@ msgid "" "Other plugins depend on this. Disable them first to allow deactivation.</" "i>\n" msgstr "" +"\n" +"Andra insticksmoduler är beroende av det här. Avaktivera dem först.\n" #. Four allocations is less than ideal but meh #: ../src/plugins.c:1610 @@ -4141,12 +4127,13 @@ msgstr "" "%s" #: ../src/printing.c:615 -#, fuzzy, c-format +#, c-format msgid "" "Cannot execute print command \"%s\": %s. Check the path setting in " "Preferences." msgstr "" -"Kan inte exekvera grep-verktyget '%s'; kontrollera sökvägen i Inställningar." +"Kan inte exekvera utskriftskommando\"%s\": %s. Kontrollera sökvägen i " +"Inställningar." #: ../src/printing.c:622 #, c-format @@ -4490,11 +4477,12 @@ msgid "%s %s -- %s (in directory: %s)" msgstr "%s %s -- %s (i sökväg: %s)" #: ../src/search.c:1719 -#, fuzzy, c-format +#, c-format msgid "" "Cannot execute grep tool \"%s\": %s. Check the path setting in Preferences." msgstr "" -"Kan inte exekvera grep-verktyget '%s'; kontrollera sökvägen i Inställningar." +"Kan inte exekvera grep-verktyget \"%s\": %s. Kontrollera sökvägen i " +"Inställningar." #: ../src/search.c:1759 #, c-format @@ -4533,9 +4521,8 @@ msgstr "" "Detta är ett allvarligt fel, och Geany kommer nu att avslutas." #: ../src/spawn.c:94 ../src/spawn.c:144 ../src/spawn.c:188 -#, fuzzy msgid "Text ended before matching quote was found" -msgstr "Texten tog slut innan matchning kunde hittas för %c. (Texten var '%s')" +msgstr "Texten tog slut innan matchande citeringstecken hittades" #. TL note: from glib #: ../src/spawn.c:130 @@ -4548,19 +4535,16 @@ msgstr "" "Ett Windows-program inom citattecken måste hålla sig helt inom citat-tecknen." #: ../src/spawn.c:258 -#, fuzzy msgid "Program not found" -msgstr "Programet '%s' kunde ej hittas" +msgstr "Programet kunde ej hittas" #: ../src/spawn.c:672 -#, fuzzy msgid "Failed to change to the working directory" -msgstr "Processen misslyckades, ingen arbetsmapp är angiven" +msgstr "Byte av arbetsmapp misslyckades" #: ../src/spawn.c:677 -#, fuzzy msgid "Unknown error executing child process" -msgstr "okänt fel vid startandet av en process för %s" +msgstr "Okänt fel vid exekvering av underprocess" #: ../src/stash.c:1177 msgid "Value" @@ -4877,17 +4861,17 @@ msgid "Unknown filetype extension for \"%s\".\n" msgstr "Okänd filändelse för filen \"%s\".\n" #: ../src/symbols.c:1612 -#, fuzzy, c-format +#, c-format msgid "Failed to create tags file, perhaps because no symbols were found.\n" -msgstr "Misslyckades med att skapa tagg-fil.\n" +msgstr "Kunde inte skapa en taggfil, kanske därför inga symboler hittades.\n" #: ../src/symbols.c:1619 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s -g <Tags File> <File list>\n" "\n" msgstr "" -"Användning: %s -g <Tagg Fil> <Fillista>\n" +"Användning: %s -g <Taggfil> <Fillista>\n" "\n" #: ../src/symbols.c:1620 @@ -4902,14 +4886,12 @@ msgstr "" "gtk/gtk.h\n" #: ../src/symbols.c:1634 -#, fuzzy msgid "Load Tags File" -msgstr "Ladda taggar" +msgstr "Ladda taggfil" #: ../src/symbols.c:1641 -#, fuzzy msgid "Geany tags file (*.*.tags)" -msgstr "Geany tagg-filer (*.tags)" +msgstr "Geany taggfiler (*.*.tags)" #. For translators: the first wildcard is the filetype, the second the filename #: ../src/symbols.c:1661 @@ -4924,15 +4906,15 @@ msgstr "Kunde inte ladda tagg-filen '%s'." #. For translators: it's the filename and line number of a symbol in the goto-symbol popup menu #: ../src/symbols.c:1899 -#, fuzzy, c-format +#, c-format msgid "%s: %lu" -msgstr "Visa" +msgstr "%s: %lu" #. For translators: it's the filename and line number of a symbol in the goto-symbol popup menu #: ../src/symbols.c:1902 #, c-format msgid "%s: %lu" -msgstr "" +msgstr "%s: %lu" #: ../src/symbols.c:2111 #, c-format @@ -4963,6 +4945,8 @@ msgid "" "Cannot execute command \"%s\" from the template: %s. Check the path in the " "template." msgstr "" +"Kan inte köra kommandot \"%s\" från mallen: %s. Kontrollera sökvägen i " +"mallen." #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" #: ../src/toolbar.c:58 @@ -5138,12 +5122,13 @@ msgid "The executed custom command exited with an unsuccessful exit code." msgstr "Det exekverade kommandot returnerade en felkod." #: ../src/tools.c:242 -#, fuzzy, c-format +#, c-format msgid "" "Cannot execute custom command \"%s\": %s. Check the path setting in Custom " "Commands." msgstr "" -"Kan inte exekvera grep-verktyget '%s'; kontrollera sökvägen i Inställningar." +"Kan inte köra användarkommandot \"%s\": %s. Kontrollera inställningen för " +"sökvägar under användarkommandon." #: ../src/tools.c:357 ../src/tools.c:626 msgid "Set Custom Commands" @@ -5192,9 +5177,8 @@ msgid "Characters:" msgstr "Tecken:" #: ../src/sidebar.c:178 -#, fuzzy msgid "No symbols found" -msgstr "Inga taggar hittade" +msgstr "Inga symboler hittade" #: ../src/sidebar.c:602 msgid "Show S_ymbol List" @@ -5435,7 +5419,7 @@ msgstr "Exekverbara filer" #: ../src/win32.c:802 #, c-format msgid "Failed to open URI \"%s\": %s" -msgstr "" +msgstr "Kunde inte öppna URI \"%s\": %s" #: ../plugins/classbuilder.c:36 msgid "Class Builder" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d51dac: Little update of NEWS for recent translation updates
by Frank Lanitz 04 Sep '16

04 Sep '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 04 Sep 2016 15:36:50 UTC Commit: d51daca2840fadf633d014e5a321368fe177d29f https://github.com/geany/geany/commit/d51daca2840fadf633d014e5a321368fe177d… Log Message: ----------- Little update of NEWS for recent translation updates Modified Paths: -------------- NEWS Modified: NEWS 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,8 @@ Geany 1.29 (unreleased) + Internationalization + * Updated translations: ca, pt_BR + Geany 1.28 (July 10, 2016) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 39eb8a: Update Catalan translation (#1206)
by Robert Antoni Buj Gelonch 04 Sep '16

04 Sep '16

Branch: refs/heads/master Author: Robert Antoni Buj Gelonch <rbuj(a)users.noreply.github.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 04 Sep 2016 11:06:08 UTC Commit: 39eb8ac66f666ac5a97bb1d17a38013b7557cc12 https://github.com/geany/geany/commit/39eb8ac66f666ac5a97bb1d17a38013b7557c… Log Message: ----------- Update Catalan translation (#1206) Modified Paths: -------------- po/ca.po Modified: po/ca.po 2219 lines changed, 1053 insertions(+), 1166 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7ccee5: i18n: Fixed incorrect word in pt_BR (#1202)
by Marcelo Camargo 02 Sep '16

02 Sep '16

Branch: refs/heads/master Author: Marcelo Camargo <marcelocamargo(a)linuxmail.org> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Fri, 02 Sep 2016 12:50:45 UTC Commit: 7ccee5287afb660f1085f68f1045f33eff12e390 https://github.com/geany/geany/commit/7ccee5287afb660f1085f68f1045f33eff12e… Log Message: ----------- i18n: Fixed incorrect word in pt_BR (#1202) * Changed gender of noun IDE * Fixed incorrect word in pt_BR Modified Paths: -------------- po/pt_BR.po Modified: po/pt_BR.po 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -30,7 +30,7 @@ msgstr "Ambiente de Desenvolvimento Integrado" #: ../geany.desktop.in.h:3 msgid "A fast and lightweight IDE using GTK+" -msgstr "Um IDE rápido e leve usando GTK+" +msgstr "Uma IDE rápido e leve usando GTK+" #: ../geany.desktop.in.h:4 #, fuzzy @@ -812,7 +812,7 @@ msgstr "Tipo:" #: ../data/geany.glade.h:163 msgid "Tab key indents" -msgstr "Endentações da tecla Tab" +msgstr "Indentações da tecla Tab" #: ../data/geany.glade.h:164 msgid "" @@ -2279,7 +2279,7 @@ msgstr "Sobre o Geany" #: ../src/about.c:212 msgid "A fast and lightweight IDE" -msgstr "Um IDE rápido e leve" +msgstr "Uma IDE rápido e leve" #: ../src/about.c:234 #, c-format @@ -7016,7 +7016,7 @@ msgstr "Topo e Base" #~ msgstr "Atalhos de teclado" #~ msgid " - A fast and lightweight IDE" -#~ msgstr "- Um IDE rápido e leve" +#~ msgstr "- Uma IDE rápido e leve" #~ msgid "Function" #~ msgstr "Função" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7b2b96: Add plugin API functions to get/set document data
by Matthew Brush 02 Sep '16

02 Sep '16

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 02 Sep 2016 02:46:20 UTC Commit: 7b2b9609e473bdc591010a68794df46dac52e1be https://github.com/geany/geany/commit/7b2b9609e473bdc591010a68794df46dac52e… Log Message: ----------- Add plugin API functions to get/set document data TODO: add doc-comment annotations for GObject-Introspection Modified Paths: -------------- src/plugins.c src/pluginutils.c src/pluginutils.h Modified: src/plugins.c 39 lines changed, 39 insertions(+), 0 deletions(-) =================================================================== @@ -31,6 +31,7 @@ #include "app.h" #include "dialogs.h" +#include "documentprivate.h" #include "encodings.h" #include "geanyobject.h" #include "geanywraplabel.h" @@ -59,6 +60,14 @@ #include <string.h> +typedef struct +{ + gchar *prefix; + GeanyDocument *document; +} +ForEachDocData; + + GList *active_plugin_list = NULL; /* list of only actually loaded plugins, always valid */ @@ -850,6 +859,35 @@ static gboolean is_active_plugin(Plugin *plugin) } +static void remove_each_doc_data(GQuark key_id, gpointer data, gpointer user_data) +{ + const ForEachDocData *doc_data = user_data; + const gchar *key = g_quark_to_string(key_id); + if (g_str_has_prefix(key, doc_data->prefix)) + g_datalist_remove_data(&doc_data->document->priv->data, key); +} + + +static void remove_doc_data(Plugin *plugin) +{ + ForEachDocData data; + + data.prefix = g_strdup_printf("geany/plugins/%s/", plugin->public.info->name); + + for (guint i = 0; i < documents_array->len; i++) + { + GeanyDocument *doc = documents_array->pdata[i]; + if (DOC_VALID(doc)) + { + data.document = doc; + g_datalist_foreach(&doc->priv->data, remove_each_doc_data, &data); + } + } + + g_free(data.prefix); +} + + /* Clean up anything used by an active plugin */ static void plugin_cleanup(Plugin *plugin) @@ -859,6 +897,7 @@ plugin_cleanup(Plugin *plugin) /* With geany_register_plugin cleanup is mandatory */ plugin->cbs.cleanup(&plugin->public, plugin->cb_data); + remove_doc_data(plugin); remove_callbacks(plugin); remove_sources(plugin); Modified: src/pluginutils.c 153 lines changed, 153 insertions(+), 0 deletions(-) =================================================================== @@ -44,6 +44,14 @@ #include "utils.h" +typedef struct +{ + gpointer data; + GDestroyNotify free_func; +} +PluginDocDataProxy; + + /** Inserts a toolbar item before the Quit button, or after the previous plugin toolbar item. * A separator is added on the first call to this function, and will be shown when @a item is * shown; hidden when @a item is hidden. @@ -599,4 +607,149 @@ void geany_plugin_set_data(GeanyPlugin *plugin, gpointer pdata, GDestroyNotify f } +static void plugin_doc_data_proxy_free(gpointer pdata) +{ + PluginDocDataProxy *prox = pdata; + if (prox != NULL) + { + if (prox->free_func) + prox->free_func(prox->data); + g_slice_free(PluginDocDataProxy, prox); + } +} + + +/** + * Retrieve plugin-specific data attached to a document. + * + * @param plugin The plugin who attached the data. + * @param doc The document which the data was attached to. + * @param key The key name of the attached data. + * + * @return The attached data pointer or `NULL` if the key is not found + * for the given plugin. + * + * @since 1.29 (Plugin API 228) + * @see plugin_set_document_data plugin_set_document_data_full + */ +GEANY_API_SYMBOL +gpointer plugin_get_document_data(struct GeanyPlugin *plugin, + struct GeanyDocument *doc, const gchar *key) +{ + gchar *real_key; + PluginDocDataProxy *data; + + g_return_val_if_fail(plugin != NULL, NULL); + g_return_val_if_fail(doc != NULL, NULL); + g_return_val_if_fail(key != NULL && *key != '\0', NULL); + + real_key = g_strdup_printf("geany/plugins/%s/%s", plugin->info->name, key); + data = document_get_data(doc, real_key); + g_free(real_key); + + return (data != NULL) ? data->data : NULL; +} + + +/** + * Attach plugin-specific data to a document. + * + * @param plugin The plugin attaching data to the document. + * @param doc The document to attach the data to. + * @param key The key name for the data. + * @param data The pointer to attach to the document. + * + * @since 1.29 (Plugin API 228) + * @see plugin_get_document_data plugin_set_document_data_full + */ +GEANY_API_SYMBOL +void plugin_set_document_data(struct GeanyPlugin *plugin, struct GeanyDocument *doc, + const gchar *key, gpointer data) +{ + plugin_set_document_data_full(plugin, doc, key, data, NULL); +} + + +/** + * Attach plugin-specific data and a free function to a document. + * + * This is useful for plugins who want to keep some additional data with + * the document and even have it auto-released appropriately (see below). + * + * This is a simple example showing how a plugin might use this to + * attach a string to each document and print it when the document is + * saved: + * + * @code + * void on_document_open(GObject *unused, GeanyDocument *doc, GeanyPlugin *plugin) + * { + * plugin_set_document_data_full(plugin, doc, "my-data", + * g_strdup("some-data"), g_free); + * } + * + * void on_document_save(GObject *unused, GeanyDocument *doc, GeanyPlugin *plugin) + * { + * const gchar *some_data = plugin_get_document_data(plugin, doc, "my-data"); + * g_print("my-data: %s", some_data); + * } + * + * gboolean plugin_init(GeanyPlugin *plugin, gpointer unused) + * { + * plugin_signal_connect(plugin, NULL, "document-open", TRUE, + * G_CALLBACK(on_document_open), plugin); + * plugin_signal_connect(plugin, NULL, "document-new", TRUE, + * G_CALLBACK(on_document_open), plugin); + * plugin_signal_connect(plugin, NULL, "document-save", TRUE, + * G_CALLBACK(on_document_save), plugin); + * return TRUE; + * } + * + * void geany_load_module(GeanyPlugin *plugin) + * { + * // ... + * plugin->funcs->init = plugin_init; + * // ... + * } + * @endcode + * + * The @a free_func can be used to tie the lifetime of the data to that + * of the @a doc and/or the @a plugin. The @a free_func will be called + * in any of the following cases: + * + * - When a document is closed. + * - When the plugin is unloaded. + * - When the document data is set again using the same key. + * + * @param plugin The plugin attaching data to the document. + * @param doc The document to attach the data to. + * @param key The key name for the data. + * @param data The pointer to attach to the document. + * @param free_func The function to call with data when removed. + * + * @since 1.29 (Plugin API 228) + * @see plugin_get_document_data plugin_set_document_data + */ +GEANY_API_SYMBOL +void plugin_set_document_data_full(struct GeanyPlugin *plugin, + struct GeanyDocument *doc, const gchar *key, gpointer data, + GDestroyNotify free_func) +{ + PluginDocDataProxy *prox; + + g_return_if_fail(plugin != NULL); + g_return_if_fail(doc != NULL); + g_return_if_fail(key != NULL); + + prox = g_slice_new(PluginDocDataProxy); + if (prox != NULL) + { + gchar *real_key = g_strdup_printf("geany/plugins/%s/%s", plugin->info->name, key); + prox->data = data; + prox->free_func = free_func; + document_set_data_full(doc, real_key, prox, plugin_doc_data_proxy_free); + g_free(real_key); + } +} + + #endif Modified: src/pluginutils.h 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -33,6 +33,7 @@ G_BEGIN_DECLS /* avoid including plugindata.h otherwise this redefines the GEANY() macro */ struct GeanyPlugin; +struct GeanyDocument; void plugin_add_toolbar_item(struct GeanyPlugin *plugin, GtkToolItem *item); @@ -62,6 +63,16 @@ void plugin_show_configure(struct GeanyPlugin *plugin); void plugin_builder_connect_signals(struct GeanyPlugin *plugin, GtkBuilder *builder, gpointer user_data); +gpointer plugin_get_document_data(struct GeanyPlugin *plugin, + struct GeanyDocument *doc, const gchar *key); + +void plugin_set_document_data(struct GeanyPlugin *plugin, struct GeanyDocument *doc, + const gchar *key, gpointer data); + +void plugin_set_document_data_full(struct GeanyPlugin *plugin, + struct GeanyDocument *doc, const gchar *key, gpointer data, + GDestroyNotify free_func); + G_END_DECLS #endif /* HAVE_PLUGINS */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ce6c0f: Add support for Keyed Data Lists for documents
by Matthew Brush 01 Sep '16

01 Sep '16

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Thu, 01 Sep 2016 04:02:24 UTC Commit: ce6c0fad9481549c62c308a42ccfe774bacf3b55 https://github.com/geany/geany/commit/ce6c0fad9481549c62c308a42ccfe774bacf3… Log Message: ----------- Add support for Keyed Data Lists for documents Modified Paths: -------------- src/document.c src/document.h src/documentprivate.h Modified: src/document.c 23 lines changed, 23 insertions(+), 0 deletions(-) =================================================================== @@ -657,6 +657,8 @@ static GeanyDocument *document_create(const gchar *utf8_filename) doc->priv->last_check = time(NULL); #endif + g_datalist_init(&doc->priv->data); + sidebar_openfiles_add(doc); /* sets doc->iter */ notebook_new_tab(doc); @@ -712,6 +714,8 @@ static gboolean remove_page(guint page_num) if (! main_status.closing_all && doc->real_path != NULL) ui_add_recent_document(doc); + g_datalist_clear(&doc->priv->data); + doc->is_valid = FALSE; doc->id = 0; @@ -3839,3 +3843,22 @@ GEANY_API_SYMBOL GType document_get_type (void); G_DEFINE_BOXED_TYPE(GeanyDocument, document, copy_, free_); + + +gpointer document_get_data(const GeanyDocument *doc, const gchar *key) +{ + return g_datalist_get_data(&doc->priv->data, key); +} + + +void document_set_data(GeanyDocument *doc, const gchar *key, gpointer data) +{ + g_datalist_set_data(&doc->priv->data, key, data); +} + + +void document_set_data_full(GeanyDocument *doc, const gchar *key, + gpointer data, GDestroyNotify free_func) +{ + g_datalist_set_data_full(&doc->priv->data, key, data, free_func); +} Modified: src/document.h 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -316,6 +316,13 @@ void document_grab_focus(GeanyDocument *doc); GeanyDocument *document_clone(GeanyDocument *old_doc); +gpointer document_get_data(const GeanyDocument *doc, const gchar *key); + +void document_set_data(GeanyDocument *doc, const gchar *key, gpointer data); + +void document_set_data_full(GeanyDocument *doc, const gchar *key, + gpointer data, GDestroyNotify free_func); + #endif /* GEANY_PRIVATE */ G_END_DECLS Modified: src/documentprivate.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -111,6 +111,8 @@ typedef struct GeanyDocumentPrivate gint protected; /* Save pointer to info bars allowing to cancel them programatically (to avoid multiple ones) */ GtkWidget *info_bars[NUM_MSG_TYPES]; + /* Keyed Data List to attach arbitrary data to the document */ + GData *data; } GeanyDocumentPrivate; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2016