Commits June 2010

commits@lists.geany.org

5 participants
98 discussions

SF.net SVN: geany:[5005] trunk
by eht16＠users.sourceforge.net 06 Jun '10

06 Jun '10

Revision: 5005 http://geany.svn.sourceforge.net/geany/?rev=5005&view=rev Author: eht16 Date: 2010-06-06 18:34:26 +0000 (Sun, 06 Jun 2010) Log Message: ----------- Update Scintilla to version 2.12. Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/scintilla/CellBuffer.cxx trunk/scintilla/CellBuffer.h trunk/scintilla/CharacterSet.h trunk/scintilla/ContractionState.cxx trunk/scintilla/Document.cxx trunk/scintilla/Document.h trunk/scintilla/DocumentAccessor.cxx trunk/scintilla/DocumentAccessor.h trunk/scintilla/Editor.cxx trunk/scintilla/Editor.h trunk/scintilla/ExternalLexer.cxx trunk/scintilla/ExternalLexer.h trunk/scintilla/LexBash.cxx trunk/scintilla/LexCPP.cxx trunk/scintilla/LexCSS.cxx trunk/scintilla/LexCaml.cxx trunk/scintilla/LexHTML.cxx trunk/scintilla/LexPerl.cxx trunk/scintilla/LexPython.cxx trunk/scintilla/LexVHDL.cxx trunk/scintilla/LexVerilog.cxx trunk/scintilla/LineMarker.cxx trunk/scintilla/LineMarker.h trunk/scintilla/Partitioning.h trunk/scintilla/PerLine.cxx trunk/scintilla/PerLine.h trunk/scintilla/PlatGTK.cxx trunk/scintilla/PropSet.cxx trunk/scintilla/SVector.h trunk/scintilla/ScintillaBase.h trunk/scintilla/ScintillaGTK.cxx trunk/scintilla/Selection.cxx trunk/scintilla/Selection.h trunk/scintilla/SplitVector.h trunk/scintilla/Style.h trunk/scintilla/UniConversion.cxx trunk/scintilla/UniConversion.h trunk/scintilla/ViewStyle.cxx trunk/scintilla/WindowAccessor.cxx trunk/scintilla/XPM.cxx trunk/scintilla/XPM.h trunk/scintilla/include/Platform.h trunk/scintilla/include/SciLexer.h trunk/scintilla/include/Scintilla.iface trunk/scintilla/include/WindowAccessor.h trunk/src/plugindata.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/ChangeLog 2010-06-06 18:34:26 UTC (rev 5005) @@ -8,6 +8,8 @@ * src/symbols.c: Fix crash when trying to sort NULL pointers as tags in the Symbols list (closes #3011986). + * NEWS, scintilla/*, scintilla/include/*, src/plugindata.h: + Update Scintilla to version 2.12. 2010-06-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/NEWS 2010-06-06 18:34:26 UTC (rev 5005) @@ -33,7 +33,7 @@ Arshinov). Editor: - * Update Scintilla to 2.11. + * Update Scintilla to 2.12. * Add preference and support for virtual spaces. * Add word part autocompletion for the current selected item when pressing keybinding (default Tab) - Enter still completes normally. Modified: trunk/scintilla/CellBuffer.cxx =================================================================== --- trunk/scintilla/CellBuffer.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/CellBuffer.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -44,9 +44,11 @@ starts.InsertText(line, delta); } -void LineVector::InsertLine(int line, int position) { +void LineVector::InsertLine(int line, int position, bool lineStart) { starts.InsertPartition(line, position); if (perLine) { + if ((line > 0) && lineStart) + line--; perLine->InsertLine(line); } } @@ -339,7 +341,7 @@ return substance.ValueAt(position); } -void CellBuffer::GetCharRange(char *buffer, int position, int lengthRetrieve) { +void CellBuffer::GetCharRange(char *buffer, int position, int lengthRetrieve) const { if (lengthRetrieve < 0) return; if (position < 0) @@ -355,7 +357,7 @@ } } -char CellBuffer::StyleAt(int position) { +char CellBuffer::StyleAt(int position) const { return style.ValueAt(position); } @@ -473,8 +475,8 @@ // Without undo -void CellBuffer::InsertLine(int line, int position) { - lv.InsertLine(line, position); +void CellBuffer::InsertLine(int line, int position, bool lineStart) { + lv.InsertLine(line, position, lineStart); } void CellBuffer::RemoveLine(int line) { @@ -490,27 +492,28 @@ style.InsertValue(position, insertLength, 0); int lineInsert = lv.LineFromPosition(position) + 1; + bool atLineStart = lv.LineStart(lineInsert-1) == position; // Point all the lines after the insertion point further along in the buffer lv.InsertText(lineInsert-1, insertLength); char chPrev = substance.ValueAt(position - 1); char chAfter = substance.ValueAt(position + insertLength); if (chPrev == '\r' && chAfter == '\n') { // Splitting up a crlf pair at position - InsertLine(lineInsert, position); + InsertLine(lineInsert, position, false); lineInsert++; } char ch = ' '; for (int i = 0; i < insertLength; i++) { ch = s[i]; if (ch == '\r') { - InsertLine(lineInsert, (position + i) + 1); + InsertLine(lineInsert, (position + i) + 1, atLineStart); lineInsert++; } else if (ch == '\n') { if (chPrev == '\r') { // Patch up what was end of line lv.SetLineStart(lineInsert - 1, (position + i) + 1); } else { - InsertLine(lineInsert, (position + i) + 1); + InsertLine(lineInsert, (position + i) + 1, atLineStart); lineInsert++; } } Modified: trunk/scintilla/CellBuffer.h =================================================================== --- trunk/scintilla/CellBuffer.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/CellBuffer.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -37,7 +37,7 @@ void SetPerLine(PerLine *pl); void InsertText(int line, int delta); - void InsertLine(int line, int position); + void InsertLine(int line, int position, bool lineStart); void SetLineStart(int line, int position); void RemoveLine(int line); int Lines() const { @@ -149,8 +149,8 @@ /// Retrieving positions outside the range of the buffer works and returns 0 char CharAt(int position) const; - void GetCharRange(char *buffer, int position, int lengthRetrieve); - char StyleAt(int position); + void GetCharRange(char *buffer, int position, int lengthRetrieve) const; + char StyleAt(int position) const; const char *BufferPointer(); int Length() const; @@ -159,7 +159,7 @@ int Lines() const; int LineStart(int line) const; int LineFromPosition(int pos) const { return lv.LineFromPosition(pos); } - void InsertLine(int line, int position); + void InsertLine(int line, int position, bool lineStart); void RemoveLine(int line); const char *InsertString(int position, const char *s, int insertLength, bool &startSequence); Modified: trunk/scintilla/CharacterSet.h =================================================================== --- trunk/scintilla/CharacterSet.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/CharacterSet.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -53,6 +53,7 @@ } bool Contains(int val) const { PLATFORM_ASSERT(val >= 0); + if (val < 0) return false; return (val < size) ? bset[val] : valueAfter; } }; Modified: trunk/scintilla/ContractionState.cxx =================================================================== --- trunk/scintilla/ContractionState.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/ContractionState.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -232,11 +232,11 @@ void ContractionState::Check() const { #ifdef CHECK_CORRECTNESS - for (int vline = 0;vline < LinesDisplayed(); vline++) { + for (int vline = 0; vline < LinesDisplayed(); vline++) { const int lineDoc = DocFromDisplay(vline); PLATFORM_ASSERT(GetVisible(lineDoc)); } - for (int lineDoc = 0;lineDoc < LinesInDoc(); lineDoc++) { + for (int lineDoc = 0; lineDoc < LinesInDoc(); lineDoc++) { const int displayThis = DisplayFromDoc(lineDoc); const int displayNext = DisplayFromDoc(lineDoc + 1); const int height = displayNext - displayThis; Modified: trunk/scintilla/Document.cxx =================================================================== --- trunk/scintilla/Document.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/Document.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -258,7 +258,7 @@ return prev; } -int Document::GetLevel(int line) { +int Document::GetLevel(int line) const { return static_cast<LineLevels *>(perLineData[ldLevels])->GetLevel(line); } @@ -1367,7 +1367,7 @@ return statePrevious; } -int Document::GetLineState(int line) { +int Document::GetLineState(int line) const { return static_cast<LineState *>(perLineData[ldState])->GetLineState(line); } Modified: trunk/scintilla/Document.h =================================================================== --- trunk/scintilla/Document.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/Document.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -32,10 +32,10 @@ Range(Position pos=0) : start(pos), end(pos) { - }; + } Range(Position start_, Position end_) : start(start_), end(end_) { - }; + } bool Valid() const { return (start != invalidPosition) && (end != invalidPosition); @@ -118,7 +118,7 @@ class CaseFolder { public: virtual ~CaseFolder() { - }; + } virtual size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) = 0; }; @@ -243,10 +243,10 @@ void DelCharBack(int pos); char CharAt(int position) { return cb.CharAt(position); } - void GetCharRange(char *buffer, int position, int lengthRetrieve) { + void GetCharRange(char *buffer, int position, int lengthRetrieve) const { cb.GetCharRange(buffer, position, lengthRetrieve); } - char StyleAt(int position) { return cb.StyleAt(position); } + char StyleAt(int position) const { return cb.StyleAt(position); } int GetMark(int line); int AddMark(int line, int markerNum); void AddMarkSet(int line, int valueSet); @@ -261,7 +261,7 @@ int VCHomePosition(int position) const; int SetLevel(int line, int level); - int GetLevel(int line); + int GetLevel(int line) const; void ClearLevels(); int GetLastChild(int lineParent, int level=-1); int GetFoldParent(int line); @@ -294,7 +294,7 @@ void DecorationFillRange(int position, int value, int fillLength); int SetLineState(int line, int state); - int GetLineState(int line); + int GetLineState(int line) const; int GetMaxLineState(); StyledText MarginStyledText(int line); Modified: trunk/scintilla/DocumentAccessor.cxx =================================================================== --- trunk/scintilla/DocumentAccessor.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/DocumentAccessor.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -187,7 +187,7 @@ indent += SC_FOLDLEVELBASE; // if completely empty line or the start of a comment... if ((ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') || - (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)) ) + (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos))) return indent | SC_FOLDLEVELWHITEFLAG; else return indent; Modified: trunk/scintilla/DocumentAccessor.h =================================================================== --- trunk/scintilla/DocumentAccessor.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/DocumentAccessor.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -38,9 +38,9 @@ void Fill(int position); public: - DocumentAccessor(Document *pdoc_, PropertyGet &props_, WindowID id_=0) : + DocumentAccessor(Document *pdoc_, PropertyGet &props_, WindowID id_=0) : Accessor(), pdoc(pdoc_), props(props_), id(id_), - lenDoc(-1), validLen(0), chFlags(0), chWhile(0), + lenDoc(-1), validLen(0), chFlags(0), chWhile(0), startSeg(0), startPosStyling(0), mask(127) { // Initialize the mask to be big enough for any lexer. } @@ -54,8 +54,8 @@ void Flush(); int GetLineState(int line); int SetLineState(int line, int state); - int GetPropertyInt(const char *key, int defaultValue=0) { - return props.GetInt(key, defaultValue); + int GetPropertyInt(const char *key, int defaultValue=0) { + return props.GetInt(key, defaultValue); } char *GetProperties() { return props.ToString(); @@ -63,7 +63,7 @@ WindowID GetWindow() { return id; } void StartAt(unsigned int start, char chMask=31); - void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }; + void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; } unsigned int GetStartSegment() { return startSeg; } void StartSegment(unsigned int pos); void ColourTo(unsigned int pos, int chAttr); Modified: trunk/scintilla/Editor.cxx =================================================================== --- trunk/scintilla/Editor.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/Editor.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -623,7 +623,7 @@ //wMain.InvalidateAll(); } -void Editor::RedrawSelMargin(int line) { +void Editor::RedrawSelMargin(int line, bool allAfter) { if (!AbandonPaint()) { if (vs.maskInLine) { Redraw(); @@ -634,7 +634,8 @@ int position = pdoc->LineStart(line); PRectangle rcLine = RectangleFromRange(position, position); rcSelMargin.top = rcLine.top; - rcSelMargin.bottom = rcLine.bottom; + if (!allAfter) + rcSelMargin.bottom = rcLine.bottom; } wMain.InvalidateRectangle(rcSelMargin); } @@ -849,6 +850,9 @@ } int Editor::MovePositionTo(SelectionPosition newPos, Selection::selTypes selt, bool ensureVisible) { + bool simpleCaret = (sel.Count() == 1) && sel.Empty(); + SelectionPosition spCaret = sel.Last(); + int delta = newPos.Position() - sel.MainCaret(); newPos = ClampPositionIntoDocument(newPos); newPos = MovePositionOutsideChar(newPos, delta); @@ -874,7 +878,14 @@ } ShowCaretAtCurrentPosition(); if (ensureVisible) { - EnsureCaretVisible(); + XYScrollPosition newXY = XYScrollToMakeVisible(true, true, true); + if (simpleCaret && (newXY.xOffset == xOffset)) { + // simple vertical scroll then invalidate + ScrollTo(newXY.topLine); + InvalidateSelection(SelectionRange(spCaret), true); + } else { + SetXYScroll(newXY); + } } return 0; } @@ -925,9 +936,11 @@ // Try to optimise small scrolls int linesToMove = topLine - topLineNew; SetTopLine(topLineNew); - ShowCaretAtCurrentPosition(); + // Optimize by styling the view as this will invalidate any needed area + // which could abort the initial paint if discovered later. + StyleToPositionInView(PositionAfterArea(GetClientRectangle())); +#ifndef UNDER_CE // Perform redraw rather than scroll if many lines would be redrawn anyway. -#ifndef UNDER_CE if ((abs(linesToMove) <= 10) && (paintState == notPainting)) { ScrollText(linesToMove); } else { @@ -1037,29 +1050,24 @@ 1 | 1 | 0 | 1 | No, kept out of UZ | moved by one position 1 | 1 | 1 | 1 | No, kept out of UZ | moved to put caret at 3UZ of the margin */ -void Editor::EnsureCaretVisible(bool useMargin, bool vert, bool horiz) { - //Platform::DebugPrintf("EnsureCaretVisible %d %s\n", xOffset, useMargin ? " margin" : " "); + +Editor::XYScrollPosition Editor::XYScrollToMakeVisible(const bool useMargin, const bool vert, const bool horiz) { PRectangle rcClient = GetTextRectangle(); - //int rcClientFullWidth = rcClient.Width(); - SelectionPosition posCaret = sel.RangeMain().caret; - if (posDrag.IsValid()) { - posCaret = posDrag; - } - Point pt = LocationFromPosition(posCaret); - Point ptBottomCaret = pt; - ptBottomCaret.y += vs.lineHeight - 1; - int lineCaret = DisplayFromPosition(posCaret.Position()); - bool bSlop, bStrict, bJump, bEven; + const SelectionPosition posCaret = posDrag.IsValid() ? posDrag : sel.RangeMain().caret; + const Point pt = LocationFromPosition(posCaret); + const Point ptBottomCaret(pt.x, pt.y + vs.lineHeight - 1); + const int lineCaret = DisplayFromPosition(posCaret.Position()); + XYScrollPosition newXY(xOffset, topLine); + // Vertical positioning if (vert && (pt.y < rcClient.top || ptBottomCaret.y > rcClient.bottom || (caretYPolicy & CARET_STRICT) != 0)) { - int linesOnScreen = LinesOnScreen(); - int halfScreen = Platform::Maximum(linesOnScreen - 1, 2) / 2; - int newTopLine = topLine; - bSlop = (caretYPolicy & CARET_SLOP) != 0; - bStrict = (caretYPolicy & CARET_STRICT) != 0; - bJump = (caretYPolicy & CARET_JUMPS) != 0; - bEven = (caretYPolicy & CARET_EVEN) != 0; + const int linesOnScreen = LinesOnScreen(); + const int halfScreen = Platform::Maximum(linesOnScreen - 1, 2) / 2; + const bool bSlop = (caretYPolicy & CARET_SLOP) != 0; + const bool bStrict = (caretYPolicy & CARET_STRICT) != 0; + const bool bJump = (caretYPolicy & CARET_JUMPS) != 0; + const bool bEven = (caretYPolicy & CARET_EVEN) != 0; // It should be possible to scroll the window to show the caret, // but this fails to remove the caret on GTK+ @@ -1092,10 +1100,10 @@ } if (lineCaret < topLine + yMarginT) { // Caret goes too high - newTopLine = lineCaret - yMoveT; + newXY.topLine = lineCaret - yMoveT; } else if (lineCaret > topLine + linesOnScreen - 1 - yMarginB) { // Caret goes too low - newTopLine = lineCaret - linesOnScreen + 1 + yMoveB; + newXY.topLine = lineCaret - linesOnScreen + 1 + yMoveB; } } else { // Not strict yMoveT = bJump ? caretYSlop * 3 : caretYSlop; @@ -1107,10 +1115,10 @@ } if (lineCaret < topLine) { // Caret goes too high - newTopLine = lineCaret - yMoveT; + newXY.topLine = lineCaret - yMoveT; } else if (lineCaret > topLine + linesOnScreen - 1) { // Caret goes too low - newTopLine = lineCaret - linesOnScreen + 1 + yMoveB; + newXY.topLine = lineCaret - linesOnScreen + 1 + yMoveB; } } } else { // No slop @@ -1118,41 +1126,35 @@ // Minimal move if (lineCaret < topLine) { // Caret goes too high - newTopLine = lineCaret; + newXY.topLine = lineCaret; } else if (lineCaret > topLine + linesOnScreen - 1) { // Caret goes too low if (bEven) { - newTopLine = lineCaret - linesOnScreen + 1; + newXY.topLine = lineCaret - linesOnScreen + 1; } else { - newTopLine = lineCaret; + newXY.topLine = lineCaret; } } } else { // Strict or going out of display if (bEven) { // Always center caret - newTopLine = lineCaret - halfScreen; + newXY.topLine = lineCaret - halfScreen; } else { // Always put caret on top of display - newTopLine = lineCaret; + newXY.topLine = lineCaret; } } } - newTopLine = Platform::Clamp(newTopLine, 0, MaxScrollPos()); - if (newTopLine != topLine) { - Redraw(); - SetTopLine(newTopLine); - SetVerticalScrollPos(); - } + newXY.topLine = Platform::Clamp(newXY.topLine, 0, MaxScrollPos()); } // Horizontal positioning if (horiz && (wrapState == eWrapNone)) { - int halfScreen = Platform::Maximum(rcClient.Width() - 4, 4) / 2; - int xOffsetNew = xOffset; - bSlop = (caretXPolicy & CARET_SLOP) != 0; - bStrict = (caretXPolicy & CARET_STRICT) != 0; - bJump = (caretXPolicy & CARET_JUMPS) != 0; - bEven = (caretXPolicy & CARET_EVEN) != 0; + const int halfScreen = Platform::Maximum(rcClient.Width() - 4, 4) / 2; + const bool bSlop = (caretXPolicy & CARET_SLOP) != 0; + const bool bStrict = (caretXPolicy & CARET_STRICT) != 0; + const bool bJump = (caretXPolicy & CARET_JUMPS) != 0; + const bool bEven = (caretXPolicy & CARET_EVEN) != 0; if (bSlop) { // A margin is defined int xMoveL, xMoveR; @@ -1181,18 +1183,18 @@ if (pt.x < rcClient.left + xMarginL) { // Caret is on the left of the display if (bJump && bEven) { - xOffsetNew -= xMoveL; + newXY.xOffset -= xMoveL; } else { // Move just enough to allow to display the caret - xOffsetNew -= (rcClient.left + xMarginL) - pt.x; + newXY.xOffset -= (rcClient.left + xMarginL) - pt.x; } } else if (pt.x >= rcClient.right - xMarginR) { // Caret is on the right of the display if (bJump && bEven) { - xOffsetNew += xMoveR; + newXY.xOffset += xMoveR; } else { // Move just enough to allow to display the caret - xOffsetNew += pt.x - (rcClient.right - xMarginR) + 1; + newXY.xOffset += pt.x - (rcClient.right - xMarginR) + 1; } } } else { // Not strict @@ -1205,10 +1207,10 @@ } if (pt.x < rcClient.left) { // Caret is on the left of the display - xOffsetNew -= xMoveL; + newXY.xOffset -= xMoveL; } else if (pt.x >= rcClient.right) { // Caret is on the right of the display - xOffsetNew += xMoveR; + newXY.xOffset += xMoveR; } } } else { // No slop @@ -1217,56 +1219,71 @@ // Strict or going out of display if (bEven) { // Center caret - xOffsetNew += pt.x - rcClient.left - halfScreen; + newXY.xOffset += pt.x - rcClient.left - halfScreen; } else { // Put caret on right - xOffsetNew += pt.x - rcClient.right + 1; + newXY.xOffset += pt.x - rcClient.right + 1; } } else { // Move just enough to allow to display the caret if (pt.x < rcClient.left) { // Caret is on the left of the display if (bEven) { - xOffsetNew -= rcClient.left - pt.x; + newXY.xOffset -= rcClient.left - pt.x; } else { - xOffsetNew += pt.x - rcClient.right + 1; + newXY.xOffset += pt.x - rcClient.right + 1; } } else if (pt.x >= rcClient.right) { // Caret is on the right of the display - xOffsetNew += pt.x - rcClient.right + 1; + newXY.xOffset += pt.x - rcClient.right + 1; } } } // In case of a jump (find result) largely out of display, adjust the offset to display the caret - if (pt.x + xOffset < rcClient.left + xOffsetNew) { - xOffsetNew = pt.x + xOffset - rcClient.left; - } else if (pt.x + xOffset >= rcClient.right + xOffsetNew) { - xOffsetNew = pt.x + xOffset - rcClient.right + 1; + if (pt.x + xOffset < rcClient.left + newXY.xOffset) { + newXY.xOffset = pt.x + xOffset - rcClient.left; + } else if (pt.x + xOffset >= rcClient.right + newXY.xOffset) { + newXY.xOffset = pt.x + xOffset - rcClient.right + 1; if (vs.caretStyle == CARETSTYLE_BLOCK) { // Ensure we can see a good portion of the block caret - xOffsetNew += vs.aveCharWidth; + newXY.xOffset += vs.aveCharWidth; } } - if (xOffsetNew < 0) { - xOffsetNew = 0; + if (newXY.xOffset < 0) { + newXY.xOffset = 0; } - if (xOffset != xOffsetNew) { - xOffset = xOffsetNew; - if (xOffsetNew > 0) { + } + + return newXY; +} + +void Editor::SetXYScroll(XYScrollPosition newXY) { + if ((newXY.topLine != topLine) || (newXY.xOffset != xOffset)) { + if (newXY.topLine != topLine) { + SetTopLine(newXY.topLine); + SetVerticalScrollPos(); + } + if (newXY.xOffset != xOffset) { + xOffset = newXY.xOffset; + if (newXY.xOffset > 0) { PRectangle rcText = GetTextRectangle(); if (horizontalScrollBarVisible && - rcText.Width() + xOffset > scrollWidth) { + rcText.Width() + xOffset > scrollWidth) { scrollWidth = xOffset + rcText.Width(); SetScrollBars(); } } SetHorizontalScrollPos(); - Redraw(); } + Redraw(); + UpdateSystemCaret(); } - UpdateSystemCaret(); } +void Editor::EnsureCaretVisible(bool useMargin, bool vert, bool horiz) { + SetXYScroll(XYScrollToMakeVisible(useMargin, vert, horiz)); +} + void Editor::ShowCaretAtCurrentPosition() { if (hasFocus) { caret.active = true; @@ -1850,7 +1867,7 @@ return true; if (GoodTrailByte(us[1]) && GoodTrailByte(us[2]) && GoodTrailByte(us[3])) { if (*us == 0xf4) { - // Chcek if encoding a value beyond the last Unicode character 10FFFF + // Check if encoding a value beyond the last Unicode character 10FFFF if (us[1] > 0x8f) { return true; } else if (us[1] == 0x8f) { @@ -3229,6 +3246,8 @@ //Platform::DebugPrintf("Paint:%1d (%3d,%3d) ... (%3d,%3d)\n", // paintingAllText, rcArea.left, rcArea.top, rcArea.right, rcArea.bottom); + StyleToPositionInView(PositionAfterArea(rcArea)); + pixmapLine->Release(); RefreshStyleData(); RefreshPixMaps(surfaceWindow); @@ -3241,13 +3260,6 @@ pixmapLine->SetPalette(&palette, !hasFocus); int screenLinePaintFirst = rcArea.top / vs.lineHeight; - // The area to be painted plus one extra line is styled. - // The extra line is to determine when a style change, such as starting a comment flows on to other lines. - int lineStyleLast = topLine + (rcArea.bottom - 1) / vs.lineHeight + 1; - //Platform::DebugPrintf("Paint lines = %d .. %d\n", topLine + screenLinePaintFirst, lineStyleLast); - int endPosPaint = pdoc->Length(); - if (lineStyleLast < cs.LinesDisplayed()) - endPosPaint = pdoc->LineStart(cs.DocFromDisplay(lineStyleLast) + 1); int xStart = vs.fixedColumnWidth - xOffset; int ypos = 0; @@ -3255,8 +3267,6 @@ ypos += screenLinePaintFirst * vs.lineHeight; int yposScreen = screenLinePaintFirst * vs.lineHeight; - // Ensure we are styled as far as we are painting. - pdoc->EnsureStyledTo(endPosPaint); bool paintAbandonedByStyling = paintState == paintAbandoned; if (needUpdateUI) { // Deselect palette by selecting a temporary palette @@ -3288,12 +3298,14 @@ } PLATFORM_ASSERT(pixmapSelPattern->Initialised()); - PaintSelMargin(surfaceWindow, rcArea); + if (paintState != paintAbandoned) { + PaintSelMargin(surfaceWindow, rcArea); - PRectangle rcRightMargin = rcClient; - rcRightMargin.left = rcRightMargin.right - vs.rightMarginWidth; - if (rcArea.Intersects(rcRightMargin)) { - surfaceWindow->FillRectangle(rcRightMargin, vs.styles[STYLE_DEFAULT].back.allocated); + PRectangle rcRightMargin = rcClient; + rcRightMargin.left = rcRightMargin.right - vs.rightMarginWidth; + if (rcArea.Intersects(rcRightMargin)) { + surfaceWindow->FillRectangle(rcRightMargin, vs.styles[STYLE_DEFAULT].back.allocated); + } } if (paintState == paintAbandoned) { @@ -4346,12 +4358,14 @@ // TODO: could invalidate from mh.startModification to end of screen //InvalidateRange(mh.position, mh.position + mh.length); if (paintState == notPainting && !CanDeferToLastStep(mh)) { + QueueStyling(pdoc->Length()); Redraw(); } } else { //Platform::DebugPrintf("** %x Line Changed %d .. %d\n", this, // mh.position, mh.position + mh.length); if (paintState == notPainting && mh.length && !CanEliminate(mh)) { + QueueStyling(mh.position + mh.length); InvalidateRange(mh.position, mh.position + mh.length); } } @@ -4365,7 +4379,7 @@ if ((paintState == notPainting) || !PaintContainsMargin()) { if (mh.modificationType & SC_MOD_CHANGEFOLD) { // Fold changes can affect the drawing of following lines so redraw whole margin - RedrawSelMargin(); + RedrawSelMargin(mh.line-1, true); } else { RedrawSelMargin(mh.line); } @@ -6199,6 +6213,48 @@ } } +int Editor::PositionAfterArea(PRectangle rcArea) { + // The start of the document line after the display line after the area + // This often means that the line after a modification is restyled which helps + // detect multiline comment additions and heals single line comments + int lineAfter = topLine + (rcArea.bottom - 1) / vs.lineHeight + 1; + if (lineAfter < cs.LinesDisplayed()) + return pdoc->LineStart(cs.DocFromDisplay(lineAfter) + 1); + else + return pdoc->Length(); +} + +// Style to a position within the view. If this causes a change at end of last line then +// affects later lines so style all the viewed text. +void Editor::StyleToPositionInView(Position pos) { + int endWindow = PositionAfterArea(GetClientRectangle()); + if (pos > endWindow) + pos = endWindow; + int styleAtEnd = pdoc->StyleAt(pos-1); + pdoc->EnsureStyledTo(pos); + if ((endWindow > pos) && (styleAtEnd != pdoc->StyleAt(pos-1))) { + // Style at end of line changed so is multi-line change like starting a comment + // so require rest of window to be styled. + pdoc->EnsureStyledTo(endWindow); + } +} + +void Editor::IdleStyling() { + // Style the line after the modification as this allows modifications that change just the + // line of the modification to heal instead of propagating to the rest of the window. + StyleToPositionInView(pdoc->LineStart(pdoc->LineFromPosition(styleNeeded.upTo) + 2)); + + if (needUpdateUI) { + NotifyUpdateUI(); + needUpdateUI = false; + } + styleNeeded.Reset(); +} + +void Editor::QueueStyling(int upTo) { + styleNeeded.NeedUpTo(upTo); +} + bool Editor::PaintContains(PRectangle rc) { if (rc.Empty()) { return true; Modified: trunk/scintilla/Editor.h =================================================================== --- trunk/scintilla/Editor.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/Editor.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -46,6 +46,26 @@ }; /** + * When platform has a way to generate an event before painting, + * accumulate needed styling range in StyleNeeded to avoid unnecessary work. + */ +class StyleNeeded { +public: + bool active; + Position upTo; + + StyleNeeded() : active(false), upTo(0) {} + void Reset() { + active = false; + upTo = 0; + } + void NeedUpTo(Position pos) { + if (upTo < pos) + upTo = pos; + } +}; + +/** * Hold a piece of text selected for copying or dragging. * The text is expected to hold a terminating '\0' and this is counted in len. */ @@ -197,7 +217,8 @@ enum { notPainting, painting, paintAbandoned } paintState; PRectangle rcPaint; bool paintingAllText; - + StyleNeeded styleNeeded; + int modEventMask; SelectionText drag; @@ -272,7 +293,7 @@ bool AbandonPaint(); void RedrawRect(PRectangle rc); void Redraw(); - void RedrawSelMargin(int line=-1); + void RedrawSelMargin(int line=-1, bool allAfter=false); PRectangle RectangleFromRange(int start, int end); void InvalidateRange(int start, int end); @@ -308,6 +329,14 @@ void HorizontalScrollTo(int xPos); void MoveCaretInsideView(bool ensureVisible=true); int DisplayFromPosition(int pos); + + struct XYScrollPosition { + int xOffset; + int topLine; + XYScrollPosition(int xOffset_, int topLine_) : xOffset(xOffset_), topLine(topLine_) {} + }; + XYScrollPosition XYScrollToMakeVisible(const bool useMargin, const bool vert, const bool horiz); + void SetXYScroll(XYScrollPosition newXY); void EnsureCaretVisible(bool useMargin=true, bool vert=true, bool horiz=true); void ShowCaretAtCurrentPosition(); void DropCaret(); @@ -460,6 +489,11 @@ virtual bool HaveMouseCapture() = 0; void SetFocusState(bool focusState); + int PositionAfterArea(PRectangle rcArea); + void StyleToPositionInView(Position pos); + void IdleStyling(); + virtual void QueueStyling(int upTo); + virtual bool PaintContains(PRectangle rc); bool PaintContainsMargin(); void CheckForChangeOutsidePaint(Range r); Modified: trunk/scintilla/ExternalLexer.cxx =================================================================== --- trunk/scintilla/ExternalLexer.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/ExternalLexer.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -40,7 +40,7 @@ while (val[dim]) dim++; char **wls = new char * [dim + 1]; - for (int i = 0;i < dim;i++) { + for (int i = 0; i < dim; i++) { std::string words; words = ""; for (int n = 0; n < val[i]->len; n++) { @@ -114,7 +114,7 @@ // //------------------------------------------ -LexerLibrary::LexerLibrary(const char* ModuleName) { +LexerLibrary::LexerLibrary(const char *ModuleName) { // Initialise some members... first = NULL; last = NULL; @@ -195,18 +195,15 @@ /// Return the single LexerManager instance... LexerManager *LexerManager::GetInstance() { - if(!theInstance) + if (!theInstance) theInstance = new LexerManager; return theInstance; } /// Delete any LexerManager instance... -void LexerManager::DeleteInstance() -{ - if(theInstance) { - delete theInstance; - theInstance = NULL; - } +void LexerManager::DeleteInstance() { + delete theInstance; + theInstance = NULL; } /// protected constructor - this is a singleton... @@ -219,13 +216,15 @@ Clear(); } -void LexerManager::Load(const char* path) -{ +void LexerManager::Load(const char *path) { LoadLexerLibrary(path); } -void LexerManager::LoadLexerLibrary(const char* module) -{ +void LexerManager::LoadLexerLibrary(const char *module) { + for (LexerLibrary *ll = first; ll; ll= ll->next) { + if (strcmp(ll->m_sModuleName.c_str(), module) == 0) + return; + } LexerLibrary *lib = new LexerLibrary(module); if (NULL != first) { last->next = lib; @@ -236,8 +235,7 @@ } } -void LexerManager::Clear() -{ +void LexerManager::Clear() { if (NULL != first) { LexerLibrary *cur = first; LexerLibrary *next; @@ -257,8 +255,7 @@ // //------------------------------------------ -LMMinder::~LMMinder() -{ +LMMinder::~LMMinder() { LexerManager::DeleteInstance(); } Modified: trunk/scintilla/ExternalLexer.h =================================================================== --- trunk/scintilla/ExternalLexer.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/ExternalLexer.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -23,7 +23,7 @@ char *words[], WindowID window, char *props); typedef void (EXT_LEXER_DECL *ExtFoldFunction)(unsigned int lexer, unsigned int startPos, int length, int initStyle, char *words[], WindowID window, char *props); -typedef void* (EXT_LEXER_DECL *GetLexerFunction)(unsigned int Index); +typedef void*(EXT_LEXER_DECL *GetLexerFunction)(unsigned int Index); typedef int (EXT_LEXER_DECL *GetLexerCountFn)(); typedef void (EXT_LEXER_DECL *GetLexerNameFn)(unsigned int Index, char *name, int buflength); @@ -37,12 +37,12 @@ int externalLanguage; char name[100]; public: - ExternalLexerModule(int language_, LexerFunction fnLexer_, - const char *languageName_=0, LexerFunction fnFolder_=0) : LexerModule(language_, fnLexer_, 0, fnFolder_){ + ExternalLexerModule(int language_, LexerFunction fnLexer_, + const char *languageName_=0, LexerFunction fnFolder_=0) : LexerModule(language_, fnLexer_, 0, fnFolder_) { strncpy(name, languageName_, sizeof(name)); name[sizeof(name)-1] = '\0'; languageName = name; - }; + } virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle, WordList *keywordlists[], Accessor &styler) const; virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle, @@ -64,10 +64,10 @@ LexerMinder *last; public: - LexerLibrary(const char* ModuleName); + LexerLibrary(const char *ModuleName); ~LexerLibrary(); void Release(); - + LexerLibrary *next; std::string m_sModuleName; }; @@ -76,18 +76,18 @@ class LexerManager { public: ~LexerManager(); - + static LexerManager *GetInstance(); static void DeleteInstance(); - - void Load(const char* path); + + void Load(const char *path); void Clear(); private: LexerManager(); static LexerManager *theInstance; - void LoadLexerLibrary(const char* module); + void LoadLexerLibrary(const char *module); LexerLibrary *first; LexerLibrary *last; }; Modified: trunk/scintilla/LexBash.cxx =================================================================== --- trunk/scintilla/LexBash.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/LexBash.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -248,14 +248,8 @@ sc.SetState(SCE_SH_DEFAULT); break; case SCE_SH_COMMENTLINE: - if (sc.ch == '\\' && (sc.chNext == '\r' || sc.chNext == '\n')) { - // comment continuation - sc.Forward(); - if (sc.ch == '\r' && sc.chNext == '\n') { - sc.Forward(); - } - } else if (sc.atLineEnd) { - sc.ForwardSetState(SCE_SH_DEFAULT); + if (sc.atLineEnd && sc.chPrev != '\\') { + sc.SetState(SCE_SH_DEFAULT); } break; case SCE_SH_HERE_DELIM: @@ -294,23 +288,14 @@ HereDoc.State = 1; } } else if (HereDoc.State == 1) { // collect the delimiter - if (HereDoc.Quoted) { // a quoted here-doc delimiter - if (sc.ch == HereDoc.Quote) { // closing quote => end of delimiter - sc.ForwardSetState(SCE_SH_DEFAULT); - } else { - if (sc.ch == '\\' && sc.chNext == HereDoc.Quote) { // escaped quote - sc.Forward(); - } - HereDoc.Append(sc.ch); - } - } else { // an unquoted here-doc delimiter - if (setHereDoc2.Contains(sc.ch)) { - HereDoc.Append(sc.ch); - } else if (sc.ch == '\\') { - // skip escape prefix - } else { - sc.SetState(SCE_SH_DEFAULT); - } + if (setHereDoc2.Contains(sc.ch) || sc.chPrev == '\\') { + HereDoc.Append(sc.ch); + } else if (HereDoc.Quoted && sc.ch == HereDoc.Quote) { // closing quote => end of delimiter + sc.ForwardSetState(SCE_SH_DEFAULT); + } else if (sc.ch == '\\') { + // skip escape prefix + } else { + sc.SetState(SCE_SH_DEFAULT); } if (HereDoc.DelimiterLength >= HERE_DELIM_MAX - 1) { // force blowup sc.SetState(SCE_SH_ERROR); Modified: trunk/scintilla/LexCPP.cxx =================================================================== --- trunk/scintilla/LexCPP.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/LexCPP.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -59,8 +59,8 @@ WordList &keywords4 = *keywordlists[3]; // property styling.within.preprocessor - // For C++ code, determines whether all preprocessor code is styled in the preprocessor style (0, the default) - // or only from the initial # to the end of the command word(1). + // For C++ code, determines whether all preprocessor code is styled in the preprocessor style (0, the default) + // or only from the initial # to the end of the command word(1). bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor") != 0; CharacterSet setOKBeforeRE(CharacterSet::setNone, "([{=,:;!%^&*|?~+-"); @@ -72,7 +72,7 @@ CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true); // property lexer.cpp.allow.dollars - // Set to 0 to disallow the '$' character in identifiers with the cpp lexer. + // Set to 0 to disallow the '$' character in identifiers with the cpp lexer. if (styler.GetPropertyInt("lexer.cpp.allow.dollars", 1) != 0) { setWordStart.Add('$'); setWord.Add('$'); @@ -379,20 +379,20 @@ WordList *[], Accessor &styler) { // property fold.comment - // This option enables folding multi-line comments and explicit fold points when using the C++ lexer. - // Explicit fold points allows adding extra folding by placing a //{ comment at the start and a //} - // at the end of a section that should fold. + // This option enables folding multi-line comments and explicit fold points when using the C++ lexer. + // Explicit fold points allows adding extra folding by placing a //{ comment at the start and a //} + // at the end of a section that should fold. bool foldComment = styler.GetPropertyInt("fold.comment") != 0; // property fold.preprocessor - // This option enables folding preprocessor directives when using the C++ lexer. - // Includes C#'s explicit #region and #endregion folding directives. + // This option enables folding preprocessor directives when using the C++ lexer. + // Includes C#'s explicit #region and #endregion folding directives. bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; - // property fold.at.else - // This option enables C++ folding on a "} else {" line of an if statement. + // property fold.at.else + // This option enables C++ folding on a "} else {" line of an if statement. bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0; unsigned int endPos = startPos + length; @@ -483,14 +483,14 @@ } } -static const char * const cppWordLists[] = { +static const char *const cppWordLists[] = { "Primary keywords and identifiers", "Secondary keywords and identifiers", "Documentation comment keywords", "Unused", "Global classes and typedefs", 0, - }; +}; static void ColouriseCppDocSensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) { Modified: trunk/scintilla/LexCSS.cxx =================================================================== --- trunk/scintilla/LexCSS.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/LexCSS.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -62,6 +62,7 @@ int lastState = -1; // before operator int lastStateC = -1; // before comment + int lastStateS = -1; // before single-quoted/double-quoted string int op = ' '; // last operator int opPrev = ' '; // last operator @@ -105,7 +106,7 @@ i--; if ((sc.currentPos - i) % 2 == 1) continue; - sc.ForwardSetState(SCE_CSS_VALUE); + sc.ForwardSetState(lastStateS); } if (sc.state == SCE_CSS_OPERATOR) { @@ -140,9 +141,9 @@ sc.SetState(SCE_CSS_TAG); break; case '{': - if (lastState == SCE_CSS_DIRECTIVE) + if (lastState == SCE_CSS_MEDIA) sc.SetState(SCE_CSS_DEFAULT); - else if (lastState == SCE_CSS_TAG) + else if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DIRECTIVE) sc.SetState(SCE_CSS_IDENTIFIER); break; case '}': @@ -219,7 +220,8 @@ sc.state == SCE_CSS_PSEUDOCLASS || sc.state == SCE_CSS_PSEUDOELEMENT || sc.state == SCE_CSS_EXTENDED_PSEUDOCLASS || sc.state == SCE_CSS_EXTENDED_PSEUDOELEMENT || sc.state == SCE_CSS_UNKNOWN_PSEUDOCLASS || - sc.state == SCE_CSS_IMPORTANT + sc.state == SCE_CSS_IMPORTANT || + sc.state == SCE_CSS_DIRECTIVE )) { char s[100]; sc.GetCurrentLowered(s, sizeof(s)); @@ -263,6 +265,10 @@ if (strcmp(s2, "important") != 0) sc.ChangeState(SCE_CSS_VALUE); break; + case SCE_CSS_DIRECTIVE: + if (op == '@' && strcmp(s2, "media") == 0) + sc.ChangeState(SCE_CSS_MEDIA); + break; } } @@ -280,12 +286,14 @@ lastStateC = sc.state; sc.SetState(SCE_CSS_COMMENT); sc.Forward(); - } else if (sc.state == SCE_CSS_VALUE && (sc.ch == '\"' || sc.ch == '\'')) { + } else if ((sc.state == SCE_CSS_VALUE || sc.state == SCE_CSS_ATTRIBUTE) + && (sc.ch == '\"' || sc.ch == '\'')) { + lastStateS = sc.state; sc.SetState((sc.ch == '\"' ? SCE_CSS_DOUBLESTRING : SCE_CSS_SINGLESTRING)); } else if (IsCssOperator(sc.ch) && (sc.state != SCE_CSS_ATTRIBUTE || sc.ch == ']') && (sc.state != SCE_CSS_VALUE || sc.ch == ';' || sc.ch == '}' || sc.ch == '!') - && (sc.state != SCE_CSS_DIRECTIVE || sc.ch == ';' || sc.ch == '{') + && ((sc.state != SCE_CSS_DIRECTIVE && sc.state != SCE_CSS_MEDIA) || sc.ch == ';' || sc.ch == '{') ) { if (sc.state != SCE_CSS_OPERATOR) lastState = sc.state; Modified: trunk/scintilla/LexCaml.cxx =================================================================== --- trunk/scintilla/LexCaml.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/LexCaml.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -430,13 +430,11 @@ static #endif /* BUILD_AS_EXTERNAL_LEXER */ void FoldCamlDoc( - unsigned int startPos, int length, - int initStyle, - WordList *keywordlists[], - Accessor &styler) + unsigned int, int, + int, + WordList *[], + Accessor &) { - // below useless evaluation(s) to supress "not used" warnings - startPos || length || initStyle || keywordlists[0] || styler.Length(); } static const char * const camlWordListDesc[] = { Modified: trunk/scintilla/LexHTML.cxx =================================================================== --- trunk/scintilla/LexHTML.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/LexHTML.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -587,8 +587,6 @@ styler.StartAt(startPos, static_cast<char>(STYLE_MAX)); char prevWord[200]; prevWord[0] = '\0'; - char nextWord[200]; - nextWord[0] = '\0'; char phpStringDelimiter[200]; // PHP is not limited in length, we are phpStringDelimiter[0] = '\0'; int StateToPrint = initStyle; @@ -644,6 +642,7 @@ if (inScriptType == eNonHtmlScript && state == SCE_H_COMMENT) { scriptLanguage = eScriptComment; } + script_type beforeLanguage = ScriptOfState(beforePreProc); // property fold.html // Folding is turned on or off for HTML and XML files with this option. @@ -683,7 +682,7 @@ const bool isMako = styler.GetPropertyInt("lexer.html.mako", 0) != 0; // property lexer.html.django - // Set to 1 to enable the django template language. + // Set to 1 to enable the django template language. const bool isDjango = styler.GetPropertyInt("lexer.html.django", 0) != 0; const CharacterSet setHTMLWord(CharacterSet::setAlphaNum, ".-_:!#", 0x80, true); @@ -950,7 +949,7 @@ } // handle the start Django template code - else if (isDjango && scriptLanguage == eScriptNone && (ch == '{' && (chNext == '%' || chNext == '{'))) { + else if (isDjango && scriptLanguage != eScriptPython && (ch == '{' && (chNext == '%' || chNext == '{'))) { if (chNext == '%') strcpy(djangoBlockType, "%"); else @@ -965,6 +964,7 @@ i += 1; visibleChars += 1; state = SCE_HP_START; + beforeLanguage = scriptLanguage; scriptLanguage = eScriptPython; styler.ColourTo(i, SCE_H_ASP); if (foldHTMLPreprocessor && chNext == '%') @@ -1074,8 +1074,8 @@ } // handle the end of Django template code - else if (isDjango && - ((inScriptType == eNonHtmlPreProc) || (inScriptType == eNonHtmlScriptPreProc)) && + else if (isDjango && + ((inScriptType == eNonHtmlPreProc) || (inScriptType == eNonHtmlScriptPreProc)) && (scriptLanguage != eScriptNone) && stateAllowsTermination(state) && isDjangoBlockEnd(ch, chNext, djangoBlockType)) { if (state == SCE_H_ASPAT) { @@ -1098,7 +1098,7 @@ if (foldHTMLPreprocessor) { levelCurrent--; } - scriptLanguage = eScriptNone; + scriptLanguage = beforeLanguage; continue; } Modified: trunk/scintilla/LexPerl.cxx =================================================================== --- trunk/scintilla/LexPerl.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/LexPerl.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -1243,7 +1243,7 @@ else if (styler.Match(i, "=head")) isPodHeading = true; } else if (style == SCE_PL_DATASECTION) { - if (ch == '=' && isalpha(chNext) && levelCurrent == SC_FOLDLEVELBASE) + if (ch == '=' && isascii(chNext) && isalpha(chNext) && levelCurrent == SC_FOLDLEVELBASE) levelCurrent++; else if (styler.Match(i, "=cut") && levelCurrent > SC_FOLDLEVELBASE) levelCurrent--; Modified: trunk/scintilla/LexPython.cxx =================================================================== --- trunk/scintilla/LexPython.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/LexPython.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -36,7 +36,7 @@ enum literalsAllowed { litNone=0, litU=1, litB=2}; static bool IsPyStringTypeChar(int ch, literalsAllowed allowed) { - return + return ((allowed & litB) && (ch == 'b' || ch == 'B')) || ((allowed & litU) && (ch == 'u' || ch == 'U')); } @@ -136,13 +136,13 @@ WordList &keywords2 = *keywordlists[1]; // property tab.timmy.whinge.level - // For Python code, checks whether indenting is consistent. - // The default, 0 turns off indentation checking, - // 1 checks whether each line is potentially inconsistent with the previous line, - // 2 checks whether any space characters occur before a tab character in the indentation, - // 3 checks whether any spaces are in the indentation, and + // For Python code, checks whether indenting is consistent. + // The default, 0 turns off indentation checking, + // 1 checks whether each line is potentially inconsistent with the previous line, + // 2 checks whether any space characters occur before a tab character in the indentation, + // 3 checks whether any spaces are in the indentation, and // 4 checks for any tab characters in the indentation. - // 1 is a good level to use. + // 1 is a good level to use. const int whingeLevel = styler.GetPropertyInt("tab.timmy.whinge.level"); // property lexer.python.literals.binary @@ -353,7 +353,7 @@ if (sc.ch == '0' && (sc.chNext == 'x' || sc.chNext == 'X')) { base_n_number = true; sc.SetState(SCE_P_NUMBER); - } else if (sc.ch == '0' && + } else if (sc.ch == '0' && (sc.chNext == 'o' || sc.chNext == 'O' || sc.chNext == 'b' || sc.chNext == 'B')) { if (base2or8Literals) { base_n_number = true; @@ -538,7 +538,7 @@ } // Set fold header on non-quote/non-comment line - if (!quote && !comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG) ) { + if (!quote && !comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG)) { if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) lev |= SC_FOLDLEVELHEADERFLAG; } @@ -558,7 +558,7 @@ //styler.SetLevel(lineCurrent, indentCurrent); } -static const char * const pythonWordListDesc[] = { +static const char *const pythonWordListDesc[] = { "Keywords", "Highlighted identifiers", 0 Modified: trunk/scintilla/LexVHDL.cxx =================================================================== --- trunk/scintilla/LexVHDL.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/LexVHDL.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -1,9 +1,9 @@ // Scintilla source code edit control /** @file LexVHDL.cxx ** Lexer for VHDL - ** Written by Phil Reid, + ** Written by Phil Reid, ** Based on: - ** - The Verilog Lexer by Avi Yegudin + ** - The Verilog Lexer by Avi Yegudin ** - The Fortran Lexer by Chuan-jian Shen ** - The C++ lexer by Neil Hodgson **/ @@ -126,7 +126,7 @@ sc.SetState(SCE_VHDL_IDENTIFIER); } else if (sc.Match('-', '-')) { sc.SetState(SCE_VHDL_COMMENT); - sc.Forward(); + sc.Forward(); } else if (sc.Match('-', '-')) { if (sc.Match("--!")) // Nice to have a different comment style sc.SetState(SCE_VHDL_COMMENTLINEBANG); @@ -161,7 +161,7 @@ static void FoldNoBoxVHDLDoc( unsigned int startPos, int length, - int initStyle, + int, Accessor &styler) { // Decided it would be smarter to have the lexer have all keywords included. Therefore I @@ -249,7 +249,6 @@ char chPrev = '\0'; char chNextNonBlank; int styleNext = styler.StyleAt(startPos); - int style = initStyle; //Platform::DebugPrintf("Line[%04d] Prev[%20s] ************************* Level[%x]\n", lineCurrent+1, prevWord, levelCurrent); /***************************************/ @@ -265,16 +264,16 @@ j ++ ; chNextNonBlank = styler.SafeGetCharAt(j); } - style = styleNext; + int style = styleNext; styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); - if (foldComment && atEOL && IsCommentLine(lineCurrent, styler)) + if (foldComment && atEOL && IsCommentLine(lineCurrent, styler)) { if(!IsCommentLine(lineCurrent-1, styler) && IsCommentLine(lineCurrent+1, styler)) { levelNext++; - } + } else if(IsCommentLine(lineCurrent-1, styler) && !IsCommentLine(lineCurrent+1, styler)) { levelNext--; @@ -380,7 +379,7 @@ ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "function") == 0)) || ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "procedure") == 0))) { - levelMinCurrentBegin = levelNext - 1; + levelMinCurrentBegin = levelNext - 1; } //Platform::DebugPrintf("Line[%04d] Prev[%20s] Cur[%20s] Level[%x]\n", lineCurrent+1, prevWord, s, levelCurrent); strcpy(prevWord, s); @@ -444,34 +443,34 @@ // Keyword: -// access after alias all architecture array assert attribute begin block body buffer bus case component -// configuration constant disconnect downto else elsif end entity exit file for function generate generic -// group guarded if impure in inertial inout is label library linkage literal loop map new next null of -// on open others out package port postponed procedure process pure range record register reject report -// return select severity shared signal subtype then to transport type unaffected units until use variable +// access after alias all architecture array assert attribute begin block body buffer bus case component +// configuration constant disconnect downto else elsif end entity exit file for function generate generic +// group guarded if impure in inertial inout is label library linkage literal loop map new next null of +// on open others out package port postponed procedure process pure range record register reject report +// return select severity shared signal subtype then to transport type unaffected units until use variable // wait when while with // // Operators: // abs and mod nand nor not or rem rol ror sla sll sra srl xnor xor // // Attributes: -// left right low high ascending image value pos val succ pred leftof rightof base range reverse_range -// length delayed stable quiet transaction event active last_event last_active last_value driving +// left right low high ascending image value pos val succ pred leftof rightof base range reverse_range +// length delayed stable quiet transaction event active last_event last_active last_value driving // driving_value simple_name path_name instance_name // // Std Functions: -// now readline read writeline write endfile resolved to_bit to_bitvector to_stdulogic to_stdlogicvector -// to_stdulogicvector to_x01 to_x01z to_UX01 rising_edge falling_edge is_x shift_left shift_right rotate_left +// now readline read writeline write endfile resolved to_bit to_bitvector to_stdulogic to_stdlogicvector +// to_stdulogicvector to_x01 to_x01z to_UX01 rising_edge falling_edge is_x shift_left shift_right rotate_left // rotate_right resize to_integer to_unsigned to_signed std_match to_01 // // Std Packages: -// std ieee work standard textio std_logic_1164 std_logic_arith std_logic_misc std_logic_signed -// std_logic_textio std_logic_unsigned numeric_bit numeric_std math_complex math_real vital_primitives +// std ieee work standard textio std_logic_1164 std_logic_arith std_logic_misc std_logic_signed +// std_logic_textio std_logic_unsigned numeric_bit numeric_std math_complex math_real vital_primitives // vital_timing // // Std Types: -// boolean bit character severity_level integer real time delay_length natural positive string bit_vector -// file_open_kind file_open_status line text side width std_ulogic std_ulogic_vector std_logic +// boolean bit character severity_level integer real time delay_length natural positive string bit_vector +// file_open_kind file_open_status line text side width std_ulogic std_ulogic_vector std_logic // std_logic_vector X01 X01Z UX01 UX01Z unsigned signed // Modified: trunk/scintilla/LexVerilog.cxx =================================================================== --- trunk/scintilla/LexVerilog.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/LexVerilog.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -150,6 +150,22 @@ return style == SCE_V_COMMENT; } +static bool IsCommentLine(int line, Accessor &styler) { + int pos = styler.LineStart(line); + int eolPos = styler.LineStart(line + 1) - 1; + for (int i = pos; i < eolPos; i++) { + char ch = styler[i]; + char chNext = styler.SafeGetCharAt(i + 1); + int style = styler.StyleAt(i); + if (ch == '/' && chNext == '/' && + (style == SCE_V_COMMENTLINE || style == SCE_V_COMMENTLINEBANG)) { + return true; + } else if (!IsASpaceOrTab(ch)) { + return false; + } + } + return false; +} // Store both the current line's fold level and the next lines in the // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". @@ -195,6 +211,15 @@ levelNext--; } } + if (foldComment && atEOL && IsCommentLine(lineCurrent, styler)) + { + if (!IsCommentLine(lineCurrent - 1, styler) + && IsCommentLine(lineCurrent + 1, styler)) + levelNext++; + else if (IsCommentLine(lineCurrent - 1, styler) + && !IsCommentLine(lineCurrent+1, styler)) + levelNext--; + } if (foldComment && (style == SCE_V_COMMENTLINE)) { if ((ch == '/') && (chNext == '/')) { char chNext2 = styler.SafeGetCharAt(i + 2); Modified: trunk/scintilla/LineMarker.cxx =================================================================== --- trunk/scintilla/LineMarker.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/LineMarker.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -31,7 +31,7 @@ markType = SC_MARK_PIXMAP; } -void LineMarker::SetXPM(const char * const *linesForm) { +void LineMarker::SetXPM(const char *const *linesForm) { delete pxpm; pxpm = new XPM(linesForm); markType = SC_MARK_PIXMAP; @@ -154,7 +154,7 @@ rcSmall.bottom = rc.bottom - 2; surface->RectangleDraw(rcSmall, fore.allocated, back.allocated); - } else if (markType == SC_MARK_EMPTY || markType == SC_MARK_BACKGROUND || + } else if (markType == SC_MARK_EMPTY || markType == SC_MARK_BACKGROUND || markType == SC_MARK_UNDERLINE || markType == SC_MARK_AVAILABLE) { // An invisible marker so don't draw anything Modified: trunk/scintilla/LineMarker.h =================================================================== --- trunk/scintilla/LineMarker.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/LineMarker.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -51,7 +51,7 @@ } void RefreshColourPalette(Palette &pal, bool want); void SetXPM(const char *textForm); - void SetXPM(const char * const *linesForm); + void SetXPM(const char *const *linesForm); void Draw(Surface *surface, PRectangle &rc, Font &fontForCharacter); }; Modified: trunk/scintilla/Partitioning.h =================================================================== --- trunk/scintilla/Partitioning.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/Partitioning.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -8,7 +8,7 @@ #ifndef PARTITIONING_H #define PARTITIONING_H -/// A split vector of integers with a method for adding a value to all elements +/// A split vector of integers with a method for adding a value to all elements /// in a range. /// Used by the Partitioning class. Modified: trunk/scintilla/PerLine.cxx =================================================================== --- trunk/scintilla/PerLine.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/PerLine.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -241,7 +241,7 @@ void LineLevels::InsertLine(int line) { if (levels.Length()) { int level = SC_FOLDLEVELBASE; - if ((line > 0) && (line < levels.Length())) { + if ((line > 0) && (line < levels.Length())) { level = levels[line-1] & ~SC_FOLDLEVELWHITEFLAG; } levels.InsertValue(line, 1, level); @@ -421,7 +421,7 @@ delete []annotations[line]; } annotations[line] = AllocateAnnotation(strlen(text), style); - AnnotationHeader *pah = reinterpret_cast<AnnotationHeader*>(annotations[line]); + AnnotationHeader *pah = reinterpret_cast<AnnotationHeader *>(annotations[line]); pah->style = static_cast<short>(style); pah->length = strlen(text); pah->lines = static_cast<short>(NumberLines(text)); Modified: trunk/scintilla/PerLine.h =================================================================== --- trunk/scintilla/PerLine.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/PerLine.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -11,7 +11,7 @@ #ifdef SCI_NAMESPACE namespace Scintilla { #endif - + /** * This holds the marker identifier and the marker type to display. * MarkerHandleNumbers are members of lists. Modified: trunk/scintilla/PlatGTK.cxx =================================================================== --- trunk/scintilla/PlatGTK.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/PlatGTK.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -347,7 +347,7 @@ d2 = strchr(d1 + 1, '-'); if (d2) d3 = strchr(d2 + 1, '-'); - if (d3) { + if (d3 && d2) { // foundary-fontface-isoxxx-x *d2 = '\0'; foundary[0] = '-'; @@ -667,11 +667,9 @@ // Required on OS X #ifdef SCI_NAMESPACE -class Scintilla::SurfaceImpl : public Surface -#else -class SurfaceImpl : public Surface +namespace Scintilla { #endif -{ +class SurfaceImpl : public Surface { encodingType et; GdkDrawable *drawable; GdkGC *gc; @@ -731,6 +729,9 @@ void SetUnicodeMode(bool unicodeMode_); void SetDBCSMode(int codePage); }; +#ifdef SCI_NAMESPACE +} +#endif const char *CharacterSetID(int characterSet) { switch (characterSet) { Modified: trunk/scintilla/PropSet.cxx =================================================================== --- trunk/scintilla/PropSet.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/PropSet.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -96,7 +96,7 @@ // for that, through a recursive function and a simple chain of pointers. struct VarChain { - VarChain(const char*var_=NULL, const VarChain *link_=NULL): var(var_), link(link_) {} + VarChain(const char *var_=NULL, const VarChain *link_=NULL): var(var_), link(link_) {} bool contains(const char *testVar) const { return (var && (0 == strcmp(var, testVar))) Modified: trunk/scintilla/SVector.h =================================================================== --- trunk/scintilla/SVector.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/SVector.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -19,19 +19,19 @@ */ class SVector { enum { allocSize = 4000 }; - + int *v; ///< The vector unsigned int size; ///< Number of elements allocated unsigned int len; ///< Number of elements used in vector - + /** Internally allocate more elements than the user wants * to avoid thrashing the memory allocator. */ void SizeTo(int newSize) { if (newSize < allocSize) newSize += allocSize; - else + else newSize = (newSize * 3) / 2; - int* newv = new int[newSize]; + int *newv = new int[newSize]; size = newSize; unsigned int i=0; for (; i<len; i++) { @@ -43,7 +43,7 @@ delete []v; v = newv; } - + public: SVector() { v = 0; @@ -60,7 +60,7 @@ size = 0; if (other.Length() > 0) { SizeTo(other.Length()); - for (int i=0;i<other.Length();i++) + for (int i=0; i<other.Length(); i++) v[i] = other.v[i]; len = other.Length(); } @@ -74,7 +74,7 @@ size = 0; if (other.Length() > 0) { SizeTo(other.Length()); - for (int i=0;i<other.Length();i++) + for (int i=0; i<other.Length(); i++) v[i] = other.v[i]; len = other.Length(); } Modified: trunk/scintilla/ScintillaBase.h =================================================================== --- trunk/scintilla/ScintillaBase.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/ScintillaBase.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -76,7 +76,7 @@ void AutoCompleteCharacterDeleted(); void AutoCompleteCompleted(); void AutoCompleteMoveToCurrentWord(); - static void AutoCompleteDoubleClick(void* p); + static void AutoCompleteDoubleClick(void *p); void CallTipClick(); void CallTipShow(Point pt, const char *defn); Modified: trunk/scintilla/ScintillaGTK.cxx =================================================================== --- trunk/scintilla/ScintillaGTK.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/ScintillaGTK.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -256,7 +256,9 @@ static void DragDataGet(GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint time); static gint TimeOut(ScintillaGTK *sciThis); - static gint IdleCallback(ScintillaGTK *sciThis); + static gboolean IdleCallback(ScintillaGTK *sciThis); + static gboolean StyleIdle(ScintillaGTK *sciThis); + virtual void QueueStyling(int upTo); static void PopUpCB(ScintillaGTK *sciThis, guint action, GtkWidget *widget); gint ExposeTextThis(GtkWidget *widget, GdkEventExpose *ose); @@ -701,7 +703,7 @@ } static char *ConvertText(int *lenResult, char *s, size_t len, const char *charSetDest, - const char *charSetSource, bool transliterations) { + const char *charSetSource, bool transliterations, bool silent=false) { // s is not const because of different versions of iconv disagreeing about const *lenResult = 0; char *destForm = 0; @@ -714,7 +716,9 @@ size_t outLeft = len*3+1; size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); if (conversions == ((size_t)(-1))) { -fprintf(stderr, "iconv %s->%s failed for %s\n", charSetSource, charSetDest, static_cast<char *>(s)); + if (!silent) + fprintf(stderr, "iconv %s->%s failed for %s\n", + charSetSource, charSetDest, static_cast<char *>(s)); delete []destForm; destForm = 0; } else { @@ -826,7 +830,7 @@ #ifdef SCI_LEXER case SCI_LOADLEXERLIBRARY: - LexerManager::GetInstance()->Load(reinterpret_cast<const char*>(wParam)); + LexerManager::GetInstance()->Load(reinterpret_cast<const char*>(lParam)); break; #endif case SCI_TARGETASUTF8: @@ -873,16 +877,17 @@ bool ScintillaGTK::SetIdle(bool on) { if (on) { // Start idler, if it's not running. - if (idler.state == false) { + if (!idler.state) { idler.state = true; - idler.idlerID = reinterpret_cast<IdlerID> - (gtk_idle_add((GtkFunction)IdleCallback, this)); + idler.idlerID = reinterpret_cast<IdlerID>( + g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, + reinterpret_cast<GSourceFunc>(IdleCallback), this, NULL)); } } else { // Stop idler, if it's running - if (idler.state == true) { + if (idler.state) { idler.state = false; - gtk_idle_remove(GPOINTER_TO_UINT(idler.idlerID)); + g_source_remove(GPOINTER_TO_UINT(idler.idlerID)); } } return true; @@ -1104,7 +1109,7 @@ if (mapped) { int mappedLength = strlen(mapped); const char *mappedBack = ConvertText(&mappedLength, mapped, - mappedLength, charSetBuffer, "UTF-8", false); + mappedLength, charSetBuffer, "UTF-8", false, true); if (mappedBack && (strlen(mappedBack) == 1) && (mappedBack[0] != sCharacter[0])) { pcf->SetTranslation(sCharacter[0], mappedBack[0]); } @@ -1612,6 +1617,7 @@ if (OwnPrimarySelection() && primary.s == NULL) CopySelectionRange(&primary); + sel.Clear(); SetSelection(pos, pos); atomSought = atomUTF8; gtk_selection_convert(GTK_WIDGET(PWidget(wMain)), GDK_SELECTION_PRIMARY, @@ -2308,8 +2314,8 @@ return 1; } -int ScintillaGTK::IdleCallback(ScintillaGTK *sciThis) { - // Idler will be automatically stoped, if there is nothing +gboolean ScintillaGTK::IdleCallback(ScintillaGTK *sciThis) { + // Idler will be automatically stopped, if there is nothing // to do while idle. bool ret = sciThis->Idle(); if (ret == false) { @@ -2321,6 +2327,22 @@ return ret; } +gboolean ScintillaGTK::StyleIdle(ScintillaGTK *sciThis) { + sciThis->IdleStyling(); + // Idler will be automatically stopped + return FALSE; +} + +void ScintillaGTK::QueueStyling(int upTo) { + Editor::QueueStyling(upTo); + if (!styleNeeded.active) { + // Only allow one style needed to be queued + styleNeeded.active = true; + g_idle_add_full(G_PRIORITY_HIGH_IDLE, + reinterpret_cast<GSourceFunc>(StyleIdle), this, NULL); + } +} + void ScintillaGTK::PopUpCB(ScintillaGTK *sciThis, guint action, GtkWidget *) { if (action) { sciThis->Command(action); Modified: trunk/scintilla/Selection.cxx =================================================================== --- trunk/scintilla/Selection.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/Selection.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -127,7 +127,7 @@ } else if (start <= startRange) { // Trim end end = startRange; - } else { // + } else { // PLATFORM_ASSERT(end >= endRange); // Trim start start = endRange; @@ -267,7 +267,7 @@ for (size_t i=0; i<ranges.size();) { if ((i != mainRange) && (ranges[i].Trim(range))) { // Trimmed to empty so remove - for (size_t j=i;j<ranges.size()-1;j++) { + for (size_t j=i; j<ranges.size()-1; j++) { ranges[j] = ranges[j+1]; if (j == mainRange-1) mainRange--; Modified: trunk/scintilla/Selection.h =================================================================== --- trunk/scintilla/Selection.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/Selection.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -57,7 +57,7 @@ }; // Ordered range to make drawing simpler -struct SelectionSegment { +struct SelectionSegment { SelectionPosition start; SelectionPosition end; SelectionSegment() { @@ -148,7 +148,7 @@ int MainAnchor() const; SelectionRange &Rectangular(); SelectionSegment Limits() const; - // This is for when you want to move the caret in response to a + // This is for when you want to move the caret in response to a // user direction command - for rectangular selections, use the range // that covers all selected text otherwise return the main selection. SelectionSegment LimitsForRectangularElseMain() const; Modified: trunk/scintilla/SplitVector.h =================================================================== --- trunk/scintilla/SplitVector.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/SplitVector.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -1,6 +1,6 @@ // Scintilla source code edit control /** @file SplitVector.h - ** Main data structure for holding arrays that handle insertions + ** Main data structure for holding arrays that handle insertions ** and deletions efficiently. **/ // Copyright 1998-2007 by Neil Hodgson <neilh(a)scintilla.org> @@ -97,7 +97,7 @@ /// Retrieve the character at a particular position. /// Retrieving positions outside the range of the buffer returns 0. - /// The assertions here are disabled since calling code can be + /// The assertions here are disabled since calling code can be /// simpler if out of range access works and returns 0. T ValueAt(int position) const { if (position < part1Length) { @@ -135,7 +135,7 @@ } } - T& operator[](int position) const { + T &operator[](int position) const { PLATFORM_ASSERT(position >= 0 && position < lengthBody); if (position < part1Length) { return body[position]; @@ -182,14 +182,14 @@ } } - /// Ensure at least length elements allocated, + /// Ensure at least length elements allocated, /// appending zero valued elements if needed. void EnsureLength(int wantedLength) { if (Length() < wantedLength) { InsertValue(Length(), wantedLength - Length(), 0); } } - + /// Insert text into the buffer from an array. void InsertFromArray(int positionToInsert, const T s[], int positionFrom, int insertLength) { PLATFORM_ASSERT((positionToInsert >= 0) && (positionToInsert <= lengthBody)); @@ -238,7 +238,7 @@ DeleteRange(0, lengthBody); } - T* BufferPointer() { + T *BufferPointer() { RoomFor(1); GapTo(lengthBody); body[lengthBody] = 0; Modified: trunk/scintilla/Style.h =================================================================== --- trunk/scintilla/Style.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/Style.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -54,7 +54,7 @@ void ClearTo(const Style &source); bool EquivalentFontTo(const Style *other) const; void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0, int extraFontFlag = 0); - bool IsProtected() const { return !(changeable && visible);}; + bool IsProtected() const { return !(changeable && visible);} }; #ifdef SCI_NAMESPACE Modified: trunk/scintilla/UniConversion.cxx =================================================================== --- trunk/scintilla/UniConversion.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/UniConversion.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -1,6 +1,6 @@ // Scintilla source code edit control /** @file UniConversion.cxx - ** Functions to handle UFT-8 and UCS-2 strings. + ** Functions to handle UTF-8 and UTF-16 strings. **/ // Copyright 1998-2001 by Neil Hodgson <neilh(a)scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. Modified: trunk/scintilla/UniConversion.h =================================================================== --- trunk/scintilla/UniConversion.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/UniConversion.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -1,6 +1,6 @@ // Scintilla source code edit control /** @file UniConversion.h - ** Functions to handle UFT-8 and UCS-2 strings. + ** Functions to handle UTF-8 and UTF-16 strings. **/ // Copyright 1998-2001 by Neil Hodgson <neilh(a)scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. Modified: trunk/scintilla/ViewStyle.cxx =================================================================== --- trunk/scintilla/ViewStyle.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/ViewStyle.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -41,7 +41,7 @@ } void FontNames::Clear() { - for (int i=0;i<max;i++) { + for (int i=0; i<max; i++) { delete []names[i]; } max = 0; @@ -50,7 +50,7 @@ const char *FontNames::Save(const char *name) { if (!name) return 0; - for (int i=0;i<max;i++) { + for (int i=0; i<max; i++) { if (strcmp(names[i], name) == 0) { return names[i]; } @@ -59,7 +59,7 @@ // Grow array int sizeNew = size * 2; char **namesNew = new char *[sizeNew]; - for (int j=0;j<max;j++) { + for (int j=0; j<max; j++) { namesNew[j] = names[j]; } delete []names; @@ -78,15 +78,15 @@ ViewStyle::ViewStyle(const ViewStyle &source) { Init(source.stylesSize); - for (unsigned int sty=0;sty<source.stylesSize;sty++) { + for (unsigned int sty=0; sty<source.stylesSize; sty++) { styles[sty] = source.styles[sty]; // Can't just copy fontname as its lifetime is relative to its owning ViewStyle styles[sty].fontName = fontNames.Save(source.styles[sty].fontName); } - for (int mrk=0;mrk<=MARKER_MAX;mrk++) { + for (int mrk=0; mrk<=MARKER_MAX; mrk++) { markers[mrk] = source.markers[mrk]; } - for (int ind=0;ind<=INDIC_MAX;ind++) { + for (int ind=0; ind<=INDIC_MAX; ind++) { indicators[ind] = source.indicators[ind]; } @@ -131,7 +131,7 @@ someStylesProtected = false; leftMarginWidth = source.leftMarginWidth; rightMarginWidth = source.rightMarginWidth; - for (int i=0;i < margins; i++) { + for (int i=0; i < margins; i++) { ms[i] = source.ms[i]; } symbolMargin = source.symbolMargin; @@ -257,14 +257,14 @@ void ViewStyle::RefreshColourPalette(Palette &pal, bool want) { unsigned int i; - for (i=0;i<stylesSize;i++) { + for (i=0; i<stylesSize; i++) { pal.WantFind(styles[i].fore, want); pal.WantFind(styles[i].back, want); } - for (i=0;i<(sizeof(indicators)/sizeof(indicators[0]));i++) { + for (i=0; i<(sizeof(indicators)/sizeof(indicators[0])); i++) { pal.WantFind(indicators[i].fore, want); } - for (i=0;i<(sizeof(markers)/sizeof(markers[0]));i++) { + for (i=0; i<(sizeof(markers)/sizeof(markers[0])); i++) { markers[i].RefreshColourPalette(pal, want); } pal.WantFind(selforeground, want); Modified: trunk/scintilla/WindowAccessor.cxx =================================================================== --- trunk/scintilla/WindowAccessor.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/WindowAccessor.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -7,7 +7,7 @@ #include <stdlib.h> #include <string.h> -#include <ctype.h> +#include <ctype.h> #include <stdio.h> #include "Platform.h" @@ -28,7 +28,7 @@ if (SC_CP_UTF8 == codePage) // For lexing, all characters >= 0x80 are treated the // same so none is considered a lead byte. - return false; + return false; else return Platform::IsDBCSLeadByte(codePage, ch); } @@ -75,10 +75,10 @@ return Platform::SendScintilla(id, SCI_GETFOLDLEVEL, line, 0); } -int WindowAccessor::Length() { - if (lenDoc == -1) +int WindowAccessor::Length() { + if (lenDoc == -1) lenDoc = Platform::SendScintilla(id, SCI_GETTEXTLENGTH, 0, 0); - return lenDoc; + return lenDoc; } int WindowAccessor::GetLineState(int line) { @@ -129,7 +129,7 @@ startPos = extremePosition; lenDoc = -1; if (validLen > 0) { - Platform::SendScintillaPointer(id, SCI_SETSTYLINGEX, validLen, + Platform::SendScintillaPointer(id, SCI_SETSTYLINGEX, validLen, styleBuf); validLen = 0; } @@ -138,12 +138,12 @@ int WindowAccessor::IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader) { int end = Length(); int spaceFlags = 0; - - // Determines the indentation level of the current line and also checks for consistent + + // Determines the indentation level of the current line and also checks for consistent // indentation compared to the previous line. - // Indentation is judged consistent when the indentation whitespace of each line lines + // Indentation is judged consistent when the indentation whitespace of each line lines // the same or the indentation of one line is a prefix of the other. - + int pos = LineStart(line); char ch = (*this)[pos]; int indent = 0; @@ -170,11 +170,11 @@ } ch = (*this)[++pos]; } - + *flags = spaceFlags; indent += SC_FOLDLEVELBASE; // if completely empty line or the start of a comment... - if (isspace(ch) || (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)) ) + if (isspace(ch) || (pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos))) return indent | SC_FOLDLEVELWHITEFLAG; else return indent; Modified: trunk/scintilla/XPM.cxx =================================================================== --- trunk/scintilla/XPM.cxx 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/XPM.cxx 2010-06-06 18:34:26 UTC (rev 5005) @@ -38,7 +38,7 @@ return i; } -ColourAllocated XPM::ColourFromCode(int ch) { +ColourAllocated XPM::ColourFromCode(int ch) const { return colourCodeTable[ch]->allocated; #ifdef SLOW for (int i=0; i<nColours; i++) { @@ -62,7 +62,7 @@ Init(textForm); } -XPM::XPM(const char * const *linesForm) : +XPM::XPM(const char *const *linesForm) : data(0), codes(0), colours(0), lines(0) { Init(linesForm); } @@ -88,7 +88,7 @@ } } -void XPM::Init(const char * const *linesForm) { +void XPM::Init(const char *const *linesForm) { Clear(); height = 1; width = 1; @@ -185,7 +185,7 @@ // Centre the pixmap int startY = rc.top + (rc.Height() - height) / 2; int startX = rc.left + (rc.Width() - width) / 2; - for (int y=0;y<height;y++) { + for (int y=0; y<height; y++) { int prevCode = 0; int xStartRun = 0; for (int x=0; x<width; x++) { Modified: trunk/scintilla/XPM.h =================================================================== --- trunk/scintilla/XPM.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/XPM.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -24,7 +24,7 @@ char codeTransparent; char *codes; ColourPair *colours; - ColourAllocated ColourFromCode(int ch); + ColourAllocated ColourFromCode(int ch) const; void FillRun(Surface *surface, int code, int startX, int y, int x); char **lines; ColourPair *colourCodeTable[256]; Modified: trunk/scintilla/include/Platform.h =================================================================== --- trunk/scintilla/include/Platform.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/include/Platform.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -314,8 +314,8 @@ Surface(const Surface &) {} Surface &operator=(const Surface &) { return *this; } public: - Surface() {}; - virtual ~Surface() {}; + Surface() {} + virtual ~Surface() {} static Surface *Allocate(); virtual void Init(WindowID wid)=0; @@ -474,7 +474,7 @@ */ class DynamicLibrary { public: - virtual ~DynamicLibrary() {}; + virtual ~DynamicLibrary() {} /// @return Pointer to function "name", or NULL on failure. virtual Function FindFunction(const char *name) = 0; Modified: trunk/scintilla/include/SciLexer.h =================================================================== --- trunk/scintilla/include/SciLexer.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/include/SciLexer.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -637,6 +637,7 @@ #define SCE_CSS_EXTENDED_IDENTIFIER 19 #define SCE_CSS_EXTENDED_PSEUDOCLASS 20 #define SCE_CSS_EXTENDED_PSEUDOELEMENT 21 +#define SCE_CSS_MEDIA 22 #define SCE_POV_DEFAULT 0 #define SCE_POV_COMMENT 1 #define SCE_POV_COMMENTLINE 2 @@ -1081,11 +1082,19 @@ #define SCE_FS_DATE 16 #define SCE_FS_STRINGEOL 17 #define SCE_FS_CONSTANT 18 -#define SCE_FS_ASM 19 -#define SCE_FS_LABEL 20 -#define SCE_FS_ERROR 21 -#define SCE_FS_HEXNUMBER 22 -#define SCE_FS_BINNUMBER 23 +#define SCE_FS_WORDOPERATOR 19 +#define SCE_FS_DISABLEDCODE 20 +#define SCE_FS_DEFAULT_C 21 +#define SCE_FS_COMMENTDOC_C 22 +#define SCE_FS_COMMENTLINEDOC_C 23 +#define SCE_FS_KEYWORD_C 24 +#define SCE_FS_KEYWORD2_C 25 +#define SCE_FS_NUMBER_C 26 +#define SCE_FS_STRING_C 27 +#define SCE_FS_PREPROCESSOR_C 28 +#define SCE_FS_OPERATOR_C 29 +#define SCE_FS_IDENTIFIER_C 30 +#define SCE_FS_STRINGEOL_C 31 #define SCE_CSOUND_DEFAULT 0 #define SCE_CSOUND_COMMENT 1 #define SCE_CSOUND_NUMBER 2 Modified: trunk/scintilla/include/Scintilla.iface =================================================================== --- trunk/scintilla/include/Scintilla.iface 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/include/Scintilla.iface 2010-06-06 18:34:26 UTC (rev 5005) @@ -2906,6 +2906,7 @@ val SCE_CSS_EXTENDED_IDENTIFIER=19 val SCE_CSS_EXTENDED_PSEUDOCLASS=20 val SCE_CSS_EXTENDED_PSEUDOELEMENT=21 +val SCE_CSS_MEDIA=22 # Lexical states for SCLEX_POV lex POV=SCLEX_POV SCE_POV_ val SCE_POV_DEFAULT=0 @@ -3388,7 +3389,7 @@ val SCE_ST_CHARACTER=15 val SCE_ST_SPEC_SEL=16 # Lexical states for SCLEX_FLAGSHIP (clipper) -lex FlagShip=SCLEX_FLAGSHIP SCE_B_ +lex FlagShip=SCLEX_FLAGSHIP SCE_FS_ val SCE_FS_DEFAULT=0 val SCE_FS_COMMENT=1 val SCE_FS_COMMENTLINE=2 @@ -3408,11 +3409,19 @@ val SCE_FS_DATE=16 val SCE_FS_STRINGEOL=17 val SCE_FS_CONSTANT=18 -val SCE_FS_ASM=19 -val SCE_FS_LABEL=20 -val SCE_FS_ERROR=21 -val SCE_FS_HEXNUMBER=22 -val SCE_FS_BINNUMBER=23 +val SCE_FS_WORDOPERATOR=19 +val SCE_FS_DISABLEDCODE=20 +val SCE_FS_DEFAULT_C=21 +val SCE_FS_COMMENTDOC_C=22 +val SCE_FS_COMMENTLINEDOC_C=23 +val SCE_FS_KEYWORD_C=24 +val SCE_FS_KEYWORD2_C=25 +val SCE_FS_NUMBER_C=26 +val SCE_FS_STRING_C=27 +val SCE_FS_PREPROCESSOR_C=28 +val SCE_FS_OPERATOR_C=29 +val SCE_FS_IDENTIFIER_C=30 +val SCE_FS_STRINGEOL_C=31 # Lexical states for SCLEX_CSOUND lex Csound=SCLEX_CSOUND SCE_CSOUND_ val SCE_CSOUND_DEFAULT=0 Modified: trunk/scintilla/include/WindowAccessor.h =================================================================== --- trunk/scintilla/include/WindowAccessor.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/scintilla/include/WindowAccessor.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -53,7 +53,7 @@ } void StartAt(unsigned int start, char chMask=31); - void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }; + void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; } unsigned int GetStartSegment() { return startSeg; } void StartSegment(unsigned int pos); void ColourTo(unsigned int pos, int chAttr); Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2010-06-06 18:02:49 UTC (rev 5004) +++ trunk/src/plugindata.h 2010-06-06 18:34:26 UTC (rev 5005) @@ -50,7 +50,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 188, + GEANY_API_VERSION = 189, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5004] trunk
by eht16＠users.sourceforge.net 06 Jun '10

06 Jun '10

Revision: 5004 http://geany.svn.sourceforge.net/geany/?rev=5004&view=rev Author: eht16 Date: 2010-06-06 18:02:49 +0000 (Sun, 06 Jun 2010) Log Message: ----------- Fix crash when trying to sort NULL pointers as tags in the Symbols list (closes #3011986). Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-06-06 17:21:52 UTC (rev 5003) +++ trunk/ChangeLog 2010-06-06 18:02:49 UTC (rev 5004) @@ -5,6 +5,9 @@ * src/sidebar.c: Fix reducing paths to project name in the Documents list (patch by Eugene Arshinov, thanks). + * src/symbols.c: + Fix crash when trying to sort NULL pointers as tags in the Symbols + list (closes #3011986). 2010-06-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2010-06-06 17:21:52 UTC (rev 5003) +++ trunk/src/symbols.c 2010-06-06 18:02:49 UTC (rev 5004) @@ -1251,6 +1251,12 @@ } else { + /* this is what g_strcmp0() does */ + if (! astr) + return -(astr != bstr); + if (! bstr) + return astr != bstr; + cmp = strcmp(astr, bstr); /* sort duplicate 'ScopeName::OverloadedTagName' items by line as well */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5003] trunk
by eht16＠users.sourceforge.net 06 Jun '10

06 Jun '10

Revision: 5003 http://geany.svn.sourceforge.net/geany/?rev=5003&view=rev Author: eht16 Date: 2010-06-06 17:21:52 +0000 (Sun, 06 Jun 2010) Log Message: ----------- Fix reducing paths to project name in the Documents list (patch by Eugene Arshinov, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/sidebar.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-06-06 17:14:35 UTC (rev 5002) +++ trunk/ChangeLog 2010-06-06 17:21:52 UTC (rev 5003) @@ -2,6 +2,9 @@ * tagmanager/tm_workspace.c: Fix two memory leaks (patch by Daniel Marjamaki, thanks). + * src/sidebar.c: + Fix reducing paths to project name in the Documents list + (patch by Eugene Arshinov, thanks). 2010-06-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/sidebar.c =================================================================== --- trunk/src/sidebar.c 2010-06-06 17:14:35 UTC (rev 5002) +++ trunk/src/sidebar.c 2010-06-06 17:21:52 UTC (rev 5003) @@ -359,20 +359,15 @@ gsize len = strlen(project_base_path); const gchar *rest; + if (project_base_path[len-1] == G_DIR_SEPARATOR) + project_base_path[len-1] = '\0'; + /* check whether the dir name matches or uses the project base path */ - if (!utils_str_equal(project_base_path, tmp_dirname)) - { - const gchar *sep = - (project_base_path[len-1] == G_DIR_SEPARATOR) ? NULL : G_DIR_SEPARATOR_S; - setptr(project_base_path, g_strconcat(project_base_path, sep, NULL)); - } if (g_str_has_prefix(tmp_dirname, project_base_path)) { rest = tmp_dirname + len; - dirname = g_strdup_printf("%s%s%s", - app->project->name, - (*rest != G_DIR_SEPARATOR && *rest != '\0') ? G_DIR_SEPARATOR_S : "", - rest); + if (*rest == G_DIR_SEPARATOR || *rest == '\0') + dirname = g_strdup_printf("%s%s", app->project->name, rest); } g_free(project_base_path); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5002] trunk
by eht16＠users.sourceforge.net 06 Jun '10

06 Jun '10

Revision: 5002 http://geany.svn.sourceforge.net/geany/?rev=5002&view=rev Author: eht16 Date: 2010-06-06 17:14:35 +0000 (Sun, 06 Jun 2010) Log Message: ----------- Fix two memory leaks (patch by Daniel Marjamaki, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/tm_workspace.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-06-05 12:16:42 UTC (rev 5001) +++ trunk/ChangeLog 2010-06-06 17:14:35 UTC (rev 5002) @@ -1,3 +1,9 @@ +2010-06-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * tagmanager/tm_workspace.c: + Fix two memory leaks (patch by Daniel Marjamaki, thanks). + + 2010-06-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * doc/geany.txt, doc/geany.html: @@ -14,7 +20,7 @@ Fix not closed FILE pointer on early exit (patch by Daniel Marjamaki, thanks). * doc/images/*.png: - Update images for Geany0.19. + Update images for Geany 0.19. * src/sidebar.c: Destroy the default symbol list treeview only once (fixes gtk_widget_destroy warning on exit). @@ -161,7 +167,7 @@ * src/support.h: Replace one non breaking space by normal space. Patch by - Daniel Marjamak. + Daniel Marjamaki. 2010-05-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2010-06-05 12:16:42 UTC (rev 5001) +++ trunk/tagmanager/tm_workspace.c 2010-06-06 17:14:35 UTC (rev 5002) @@ -284,7 +284,11 @@ #endif if (NULL == theWorkspace || NULL == (fp = g_fopen(temp_file, "w"))) + { + g_free(temp_file); + g_free(temp_file2); return FALSE; + } includes_files_hash = g_hash_table_new_full (tm_file_inode_hash, g_direct_equal, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5001] trunk/NEWS
by ntrel＠users.sourceforge.net 05 Jun '10

05 Jun '10

Revision: 5001 http://geany.svn.sourceforge.net/geany/?rev=5001&view=rev Author: ntrel Date: 2010-06-05 12:16:42 +0000 (Sat, 05 Jun 2010) Log Message: ----------- Update for ntrel's changes. Modified Paths: -------------- trunk/NEWS Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2010-06-04 19:28:08 UTC (rev 5000) +++ trunk/NEWS 2010-06-05 12:16:42 UTC (rev 5001) @@ -1,6 +1,10 @@ Geany 0.19 (TBA) General: + * Build system reworked to be much more configurable (by Lex Trotman). + * Use POSIX system/GNU regex engine for find & replace. This alters + regex syntax - we now support '?' operator and match newlines. + * Support adding custom filetype files. * Add new command line option --list-documents to return a list of currently opened documents * Remove deprecated --debug flag. Please use --verbose/-v instead. @@ -11,53 +15,115 @@ * Allow '+<number>' and '-<number>' as values for Goto Line inputs to jump relative to the current line. * Add preference to add new document tabs beside the current one - (patch by Colomban Wendling, thanks). + (patch by Colomban Wendling). + * Enable type-ahead find for sidebar symbols and documents tabs + (patch by Thomas Martitz). + * Make Ctrl-click on any notebook tab switch to the last used + document. + * Add Edit->Commands menu. + * Add 'Edit->Plugin Preferences' menu item and keybinding. + * Add 'View->Editor->Color Schemes' menu (only shown if color + scheme files exist). + Prefs: + * Hide 'Tabs and Spaces: Hard tab width' preference - it should + always be 8. (Hidden setting kept in case users have modified it). + * Add sidebar position interface pref. + * Add project long line marker customisation (patch from Eugene + Arshinov). + Editor: - * Add new special template wildcard "{command:...}" to use the output - of a shell command in templates. * Update Scintilla to 2.11. * Add preference and support for virtual spaces. + * Add word part autocompletion for the current selected item when + pressing keybinding (default Tab) - Enter still completes normally. * Remove LaTeX autocompletion from Geany's core and move it to the geanyLaTeX plugin. Filetypes: + * New filetype: Txt2Tags (patch by Eric Forgeot). + * New filetype: Abc (patch by Eric Forgeot). + * New filetype: Verilog (patch from Kelvin Gardiner). + * New custom filetype: Genie. * Improvements in symbol parsing of PHP and Python files. * Add R tagmanager symbol parser (patch by Jon Senior). - * New filetype: Txt2Tags (patch by Eric Forgeot). - * New filetype: Abc (patch by Eric Forgeot). + * Update Perl tag parser from ctags - removes support for + buggy local/my/our but parses constant/format/labels. + * Parse more VHDL tags (patch from Kelvin Gardiner). + * Highlight D & Java types from a global tags file. + * Parse Python lambda functions (patch from Colomban Wendling). Keybindings: * Add keybindings to switch to the sidebar's Document and Symbol list as well as to the Message Window's current tab (patch by Eugene Arshinov). * Add 'Remove Markers' and 'Remove Error Indicators' keybindings. + * Make 'Reflow block/lines(s)' keybinding use line breaking column when + enabled (patch by Lex Trotman). + * Add 'Select to previous/next word part' keybindings. + * Add 'Switch to Messages' focus keybinding. + * Add 'Move line(s) up/down' keybindings. + * Make Switch to Editor keybinding reshow the document statistics line. + Templates: + * Move filetype template defaults into custom file template files. + * Read custom file templates from system as well as user dir. + * Add new special template wildcard "{command:...}" to use the output + of a shell command in templates. + * Support {ob}, {cb} and {pc} to escape wildcard strings with {, }, % + for snippets, fileheader and file templates. + * Add {project}, {description} template wildcards (#2954737). + * Reload templates when saving a document in the templates config dir. + + Configuration files: + * Support more filetypes.common folding icon styles: arrows, +/- and no + lines (#2935059). + * Support Scintilla lexer properties in [lexer_properties] filetypes.* + group. + * Add filetypes.xml asp.default.language property (Ross McKay). + Plugins: * Classbuilder: Add support for creating PHP classes (patch by Ondrej Donek). * HTMLchars: Make plugin remember whether replacement of special - characters was activated even after restart of Geany or - reloading of plugin. + characters was activated. Windows: * Support very long build commands. * Add a preference for choosing between GTK and native File Open/Save dialogs (only available on Windows). + Internationalisation: + * Added translations: ast. + * Updated translations: de, en_GB, es, fr, gl, ja, nl, pt, ru, sl, sv, + tr, vi, zh_CN. + API: + * Improve documentation contents page. + * Add Stash mini-library setting, pref & widget functions to API. + * Add plugin_configure_single() plugin symbol which is easier to + implement than plugin_configure(). * Add new plugin signals: "document-before-save", "document-filetype-set", "geany-startup-complete". * Add PLUGIN_SET_TRANSLATABLE_INFO macro to the plugin API so plugins' meta information can be translated already in the plugin manager dialog (patch by Colomban Wendling). - * Add editor_insert_text_block(). + * Use full function name for GeanyFunctions function pointers. This + avoids naming conflicts e.g. with C++'s 'new' keyword. + * GeanyKeyBinding label fields can now contain underscores, which won't + be displayed by Geany. This saves adding near-duplicate translation + strings. + * Add GeanyKeyGroup callback support. + * Add more Scintilla function wrappers, foreach_dir(), foreach_str(), + utils_get_file_list_full(), document_get_notebook_page(), + editor_insert_text_block(). + * Don't install unnecessary headers. + * Remove deprecated header pluginmacros.h - use geanyfunctions.h + instead. + * Deprecate documents_foreach(), use foreach_document() instead. + * Deprecate PLUGIN_KEY_GROUP() macro - use plugin_set_key_group() + instead. - Internationalisation: - * Added translations: ast - * Updated translations: de, en_GB, es, fr, gl, ja, nl, pt, ru, sl, sv, - tr, vi, zh_CN - Geany 0.18.1 (February 14, 2010) Build fixes: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5000] trunk/po
by frlan＠users.sourceforge.net 04 Jun '10

04 Jun '10

Revision: 5000 http://geany.svn.sourceforge.net/geany/?rev=5000&view=rev Author: frlan Date: 2010-06-04 19:28:08 +0000 (Fri, 04 Jun 2010) Log Message: ----------- Update of Swedisch translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/sv.po Property Changed: ---------------- trunk/po/sv.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2010-06-04 16:47:57 UTC (rev 4999) +++ trunk/po/ChangeLog 2010-06-04 19:28:08 UTC (rev 5000) @@ -1,3 +1,8 @@ +2010-06-04 Frank Lanitz <frank(a)frank.uvena.de> + + * sv.po: Update of Swedish translation. Thanks to Tony Mattsson. + + 2010-06-03 Frank Lanitz <frank(a)frank.uvena.de> * de.po: Minor update of German translation. Modified: trunk/po/sv.po =================================================================== --- trunk/po/sv.po 2010-06-04 16:47:57 UTC (rev 4999) +++ trunk/po/sv.po 2010-06-04 19:28:08 UTC (rev 5000) @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: Geany 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-23 10:05+0200\n" -"PO-Revision-Date: 2010-03-11 10:27+0100\n" +"POT-Creation-Date: 2010-06-04 21:24+0200\n" +"PO-Revision-Date: 2010-06-04 11:29+0100\n" "Last-Translator: Tony Mattsson <superxorn(a)gmail.com>\n" "Language-Team: Swedish <geany-i18n(a)uvena.de>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,68 +32,68 @@ msgid "Integrated Development Environment" msgstr "Integrerad utvecklingsmiljö" -#: ../src/about.c:145 +#: ../src/about.c:146 msgid "About Geany" msgstr "Om Geany" -#: ../src/about.c:195 +#: ../src/about.c:196 msgid "A fast and lightweight IDE" msgstr "Ett snabbt och lättviktigt IDE" -#: ../src/about.c:216 +#: ../src/about.c:217 #, c-format msgid "(built on or after %s)" msgstr "(byggd på eller efter %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:247 +#: ../src/about.c:248 msgid "Info" msgstr "Info" -#: ../src/about.c:263 +#: ../src/about.c:264 msgid "Developers" msgstr "Utvecklare" -#: ../src/about.c:272 +#: ../src/about.c:273 msgid "maintainer" msgstr "ansvarig" -#: ../src/about.c:280 +#: ../src/about.c:281 msgid "developer" msgstr "utvecklare" -#: ../src/about.c:288 +#: ../src/about.c:289 msgid "translation maintainer" msgstr "ansvarig för översättningar" -#: ../src/about.c:297 +#: ../src/about.c:298 msgid "Translators" msgstr "Översättare" -#: ../src/about.c:317 +#: ../src/about.c:318 msgid "Previous Translators" msgstr "Tidigare översättare" -#: ../src/about.c:338 +#: ../src/about.c:339 msgid "Contributors" msgstr "Medarbetare " -#: ../src/about.c:348 +#: ../src/about.c:349 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" "Några av de många bidragsgivarna (för en komplett lista, läs filen %s):" -#: ../src/about.c:374 +#: ../src/about.c:375 msgid "Credits" msgstr "Tack till ..." -#: ../src/about.c:388 +#: ../src/about.c:389 msgid "License" msgstr "Licens" -#: ../src/about.c:397 +#: ../src/about.c:398 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -146,159 +147,160 @@ "Kunde ej hitta terminalen \"%s\" (kontrollera sökvägen till terminalen i " "Inställningar)" -#: ../src/build.c:1081 +#: ../src/build.c:1083 msgid "Compilation failed." msgstr "Kompileringen misslyckades." -#: ../src/build.c:1095 +#: ../src/build.c:1097 msgid "Compilation finished successfully." msgstr "Kompileringen lyckades." -#: ../src/build.c:1252 +#: ../src/build.c:1254 msgid "Custom Text" msgstr "Användardefinierad text" -#: ../src/build.c:1253 +#: ../src/build.c:1255 msgid "Enter custom text here, all entered text is appended to the command." msgstr "Skriv in användardefinierad text här, allt text läggs till kommandot" -#: ../src/build.c:1331 +#: ../src/build.c:1333 msgid "_Next Error" msgstr "Nästa fel" -#: ../src/build.c:1333 +#: ../src/build.c:1335 msgid "_Previous Error" msgstr "Föregående fel" -#: ../src/build.c:1343 +#: ../src/build.c:1345 msgid "_Set Build Commands" msgstr "Ange _kommandon för att bygga" -#: ../src/build.c:1623 ../src/toolbar.c:373 +#: ../src/build.c:1625 ../src/toolbar.c:373 msgid "Build the current file" msgstr "Kompilera aktuell fil" -#: ../src/build.c:1637 +#: ../src/build.c:1639 msgid "Build the current file with Make and the default target" msgstr "Bygger filen med Make-verktyget och förinställt mål" -#: ../src/build.c:1639 +#: ../src/build.c:1641 msgid "Build the current file with Make and the specified target" msgstr "Bygger filen med Make-verktyget och ett specificerat mål" -#: ../src/build.c:1641 +#: ../src/build.c:1643 msgid "Compile the current file with Make" msgstr "Kompilera aktuell fil med Make" -#: ../src/build.c:1668 +#: ../src/build.c:1670 #, c-format msgid "Process could not be stopped (%s)." msgstr "Processen kunde inte stoppas (%s)" -#: ../src/build.c:1685 ../src/build.c:1697 +#: ../src/build.c:1687 ../src/build.c:1699 msgid "No more build errors." msgstr "Inga fler byggfel." -#: ../src/build.c:1778 +#: ../src/build.c:1780 msgid "Set menu item label" -msgstr "" +msgstr "Ange rubrik för meny" -#: ../src/build.c:1788 +#: ../src/build.c:1790 msgid "Item" msgstr "Element" -#: ../src/build.c:1789 ../src/symbols.c:650 +#: ../src/build.c:1791 ../src/symbols.c:650 msgid "Label" msgstr "Etikett" -#: ../src/build.c:1790 ../src/symbols.c:645 +#: ../src/build.c:1792 ../src/symbols.c:645 msgid "Command" msgstr "Kommando" -#: ../src/build.c:1791 +#: ../src/build.c:1793 msgid "Working directory" msgstr "Arbetsmapp" -#: ../src/build.c:1792 +#: ../src/build.c:1794 msgid "Clear" msgstr "Rensa" -#: ../src/build.c:1831 +#: ../src/build.c:1833 msgid "Click to set menu item label" -msgstr "" +msgstr "Klicka för att ange menyrubrik" -#: ../src/build.c:1904 ../src/build.c:1906 -#, fuzzy, c-format +#: ../src/build.c:1906 ../src/build.c:1908 +#, c-format msgid "%s Commands" msgstr "%s kommandon" -#: ../src/build.c:1906 +#: ../src/build.c:1908 msgid "No Filetype" msgstr "Ingen filtyp" -#: ../src/build.c:1914 ../src/build.c:1949 -#, fuzzy +#: ../src/build.c:1916 ../src/build.c:1951 msgid "Error Regular Expression:" msgstr "Fel på \"Regular Expression\"" -#: ../src/build.c:1942 -#, fuzzy +#: ../src/build.c:1944 msgid "Non-Filetype Commands" msgstr "Icke-filtypskommandon" -#: ../src/build.c:1972 +#: ../src/build.c:1974 msgid "Note: Item 2 opens a dialog and appends the response to the command." msgstr "" +"Not: Element 2 öppnar ett fönster och lägger till svaret till kommandot" -#: ../src/build.c:1981 +#: ../src/build.c:1983 msgid "Execute Commands" msgstr "Exekvera kommando" -#: ../src/build.c:1992 +#: ../src/build.c:1994 #, c-format msgid "" "%d, %e, %f, %p are substituted in command and directory fields, see manual " "for details." msgstr "" +"%d, %e, %f, %p byts ut i kommando- och sökvägsfält, se i instruktionsboken " +"för ytterligare information." -#: ../src/build.c:2177 +#: ../src/build.c:2179 msgid "Set Build Commands" msgstr "Ange kommandon för att bygga" -#: ../src/build.c:2399 +#: ../src/build.c:2401 msgid "_Compile" msgstr "Kompilera" #. build the code -#: ../src/build.c:2406 ../src/build.c:2669 ../src/interface.c:1075 +#: ../src/build.c:2408 ../src/build.c:2671 ../src/interface.c:1075 msgid "_Build" msgstr "Bygg" -#: ../src/build.c:2413 ../src/build.c:2443 ../src/build.c:2636 +#: ../src/build.c:2415 ../src/build.c:2445 ../src/build.c:2638 msgid "_Execute" msgstr "_Exekvera" #. build the code with make custom -#: ../src/build.c:2458 ../src/build.c:2634 ../src/build.c:2689 +#: ../src/build.c:2460 ../src/build.c:2636 ../src/build.c:2691 msgid "Make Custom _Target" msgstr "Kör Make med valbara parametrar" #. build the code with make object -#: ../src/build.c:2460 ../src/build.c:2635 ../src/build.c:2697 +#: ../src/build.c:2462 ../src/build.c:2637 ../src/build.c:2699 msgid "Make _Object" msgstr "Kör Make Object" -#: ../src/build.c:2462 ../src/build.c:2633 +#: ../src/build.c:2464 ../src/build.c:2635 msgid "_Make" msgstr "_Make" #. build the code with make all -#: ../src/build.c:2681 +#: ../src/build.c:2683 msgid "_Make All" msgstr "Kör Make all" #. arguments -#: ../src/build.c:2709 +#: ../src/build.c:2711 msgid "_Set Build Menu Commands" msgstr "Ange kommandon för byggmenyn" @@ -307,11 +309,11 @@ msgstr "Vill du verkligen avsluta?" #: ../src/callbacks.c:228 -#, fuzzy, c-format +#, c-format msgid "%d file saved." msgid_plural "%d files saved." -msgstr[0] "Fil %s sparad." -msgstr[1] "Fil %s sparad." +msgstr[0] "%d fil sparad." +msgstr[1] "%d filer sparade." #: ../src/callbacks.c:488 ../src/document.c:2895 ../src/interface.c:352 #: ../src/sidebar.c:618 @@ -777,12 +779,12 @@ #: ../src/document.c:2915 msgid "Close _without saving" -msgstr "" +msgstr "Stäng utan att spara" #: ../src/document.c:2919 -#, fuzzy, c-format +#, c-format msgid "File \"%s\" was not found on disk! Try to resave the file?" -msgstr "Filen \"%s\" kunde ej hittas." +msgstr "Filen \"%s\" kunde ej hittas! Spara igen?" #: ../src/editor.c:4425 msgid "Enter Tab Width" @@ -795,7 +797,7 @@ #: ../src/editor.c:4577 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" -msgstr "" +msgstr "Varning: icke-standard hård-tabb bredd: %d !=8!" #: ../src/encodings.c:76 msgid "Celtic" @@ -997,9 +999,8 @@ msgstr "Diverse språk" #: ../src/filetypes.c:830 -#, fuzzy msgid "_Custom Filetypes" -msgstr "Ingen filtyp" +msgstr "Anpassade filtyper" #: ../src/filetypes.c:1403 ../src/win32.c:105 msgid "All Source" @@ -1027,13 +1028,12 @@ msgstr "Kunde inte hitta fil '%s'." #: ../src/highlighting.c:3398 -#, fuzzy msgid "_Color Schemes" -msgstr "Färgväljare" +msgstr "Färger" #: ../src/highlighting.c:3405 msgid "_Default" -msgstr "" +msgstr "Förvald" #: ../src/interface.c:295 msgid "_File" @@ -1086,16 +1086,14 @@ msgstr "Format" #: ../src/interface.c:487 ../src/keybindings.c:372 -#, fuzzy msgid "_Reflow Lines/Block" msgstr "Gör om flöde för rader/block" #: ../src/interface.c:491 msgid "T_oggle Case of Selection" -msgstr "Ändra mellan gemener och versaler" +msgstr "Växla mellan gemener och versaler" #: ../src/interface.c:495 ../src/keybindings.c:277 -#, fuzzy msgid "_Transpose Current Line" msgstr "Förflytta raden" @@ -1109,7 +1107,7 @@ #: ../src/interface.c:512 msgid "_Toggle Line Commentation" -msgstr "Stäng av / på radkommentarer" +msgstr "Aktivera / avaktivera radkommentarer" #: ../src/interface.c:521 msgid "_Increase Indent" @@ -1120,7 +1118,6 @@ msgstr "Minska indrag" #: ../src/interface.c:537 ../src/keybindings.c:361 -#, fuzzy msgid "_Smart Line Indent" msgstr "Smart radindrag" @@ -1129,52 +1126,42 @@ msgstr "Skicka markering till" #: ../src/interface.c:556 ../src/interface.c:2035 -#, fuzzy msgid "_Commands" -msgstr "Kommando" +msgstr "Kommandon" #: ../src/interface.c:563 ../src/keybindings.c:318 -#, fuzzy msgid "_Cut Current Line(s)" msgstr "Klipp ut rad(er)" #: ../src/interface.c:571 ../src/keybindings.c:315 -#, fuzzy msgid "_Copy Current Line(s)" msgstr "Kopiera rad(er)" #: ../src/interface.c:579 ../src/keybindings.c:270 -#, fuzzy msgid "_Delete Current Line(s)" msgstr "Radera rad(er)" #: ../src/interface.c:583 ../src/keybindings.c:267 -#, fuzzy msgid "_Duplicate Line or Selection" msgstr "Gör en kopia av raden eller markeringen" #: ../src/interface.c:592 ../src/keybindings.c:328 -#, fuzzy msgid "_Select Current Line(s)" msgstr "Välj rad(er)" #: ../src/interface.c:596 ../src/keybindings.c:331 -#, fuzzy msgid "_Select Current Paragraph" msgstr "Välj paragraf" #: ../src/interface.c:605 ../src/keybindings.c:381 -#, fuzzy msgid "_Insert Alternative White Space" msgstr "Infoga alternativt tomt tecken" #: ../src/interface.c:614 ../src/keybindings.c:437 -#, fuzzy msgid "_Go to Next Marker" msgstr "Gå till nästa markör" #: ../src/interface.c:618 ../src/keybindings.c:440 -#, fuzzy msgid "_Go to Previous Marker" msgstr "Gå till föregående markör" @@ -1223,9 +1210,8 @@ msgstr "Inställningar" #: ../src/interface.c:712 ../src/keybindings.c:390 -#, fuzzy msgid "P_lugin Preferences" -msgstr "Inställningar" +msgstr "Inställningar för insticksmoduler" #: ../src/interface.c:720 msgid "_Search" @@ -1493,9 +1479,8 @@ msgstr "Klotterplank" #: ../src/interface.c:1887 -#, fuzzy msgid "_Toolbar Preferences" -msgstr "Inställningar" +msgstr "Inställningar för verktygsfält" #: ../src/interface.c:1900 msgid "_Hide Toolbar" @@ -1642,7 +1627,7 @@ #: ../src/interface.c:2881 msgid "Suppress status messages in the status bar" -msgstr "Undertryck statusmeddelanden i statusfältet" +msgstr "Ignorera statusmeddelanden i statusfältet" #: ../src/interface.c:2884 msgid "" @@ -1665,13 +1650,14 @@ #: ../src/interface.c:2891 msgid "Use Windows File Open/Save dialogs" -msgstr "" +msgstr "Använd Windows gränssnitt för att öppna / spara filer" #: ../src/interface.c:2894 msgid "" "Defines whether to use the native Windows File Open/Save dialogs or whether " "to use the GTK default dialogs" msgstr "" +"Specificerar om Windows eller GTK skall användas vid öppna / spara filer" #: ../src/interface.c:2896 ../src/interface.c:3275 ../src/interface.c:4230 msgid "<b>Miscellaneous</b>" @@ -1769,14 +1755,12 @@ msgstr "Stäng av / på listan med öppna filer" #: ../src/interface.c:3014 -#, fuzzy msgid "Show sidebar" msgstr "Visa sidofält" #: ../src/interface.c:3022 -#, fuzzy msgid "Position:" -msgstr "Beskrivning:" +msgstr "Position:" #: ../src/interface.c:3026 ../src/interface.c:3149 ../src/interface.c:3210 #: ../src/interface.c:3228 ../src/interface.c:3246 @@ -1849,15 +1833,16 @@ msgstr "Fil-tabbar kommer att placeras till höger om anteckningsboken" #: ../src/interface.c:3164 -#, fuzzy msgid "Next to current" -msgstr "Spara fil" +msgstr "Nästa till aktuell" #: ../src/interface.c:3169 msgid "" "Whether to place file tabs next to the current tab rather than at the edges " "of the notebook" msgstr "" +"Huruvida nya fil-flikar skall placeras bredvid aktuell flik eller vid kanten " +"av anteckningarna" #: ../src/interface.c:3171 msgid "Double-clicking hides all additional widgets" @@ -1918,7 +1903,7 @@ #: ../src/interface.c:3360 msgid "System _Default" -msgstr "" +msgstr "Grundinställningar" #: ../src/interface.c:3368 msgid "Images _and Text" @@ -1933,13 +1918,12 @@ msgstr "Endast text" #: ../src/interface.c:3392 -#, fuzzy msgid "<b>Icon Style</b>" -msgstr "<b>Teckensnitt</b>" +msgstr "<b>Ikonstil</b>" #: ../src/interface.c:3413 msgid "S_ystem Default" -msgstr "" +msgstr "Grundinställningar" #: ../src/interface.c:3421 msgid "_Small Icons" @@ -1954,9 +1938,8 @@ msgstr "Stora ikoner" #: ../src/interface.c:3445 -#, fuzzy msgid "<b>Icon Size</b>" -msgstr "<b>Storlek:</b>" +msgstr "<b>Ikonstorlek</b>" #: ../src/interface.c:3450 msgid "<b>Toolbar</b>" @@ -2056,7 +2039,7 @@ #: ../src/interface.c:3535 msgid "Comment toggle marker:" -msgstr "Stäng av / på kommentarmarkör:" +msgstr "Stäng av / sätt på kommentarmarkör:" #: ../src/interface.c:3542 msgid "" @@ -2284,9 +2267,8 @@ msgstr "Invertera syntaxfärgningen" #: ../src/interface.c:3858 -#, fuzzy msgid "Invert all colors, by default using white text on a black background" -msgstr "Använd vit text på svart bakgrund" +msgstr "Intervera alla färger" #: ../src/interface.c:3860 msgid "Show indentation guides" @@ -2347,14 +2329,12 @@ msgstr "<b>Visa</b>" #: ../src/interface.c:3911 ../src/interface.c:5302 -#, fuzzy msgid "Column:" -msgstr "Företag:" +msgstr "Kolumn:" #: ../src/interface.c:3918 -#, fuzzy msgid "Color:" -msgstr "Färg" +msgstr "Färg:" #: ../src/interface.c:3937 msgid "Sets the color of the long line marker" @@ -2400,9 +2380,8 @@ "bör ske. Detta är lämpligt for proportionella teckensnitt." #: ../src/interface.c:3970 -#, fuzzy msgid "Enabled" -msgstr "Sätt på" +msgstr "Aktiverad" #: ../src/interface.c:3976 ../src/interface.c:5342 msgid "<b>Long line marker</b>" @@ -2414,31 +2393,29 @@ #: ../src/interface.c:3998 msgid "Do not show virtual spaces" -msgstr "" +msgstr "Visa inte virtuella ytor" #: ../src/interface.c:4002 msgid "Only for rectangular selections" -msgstr "" +msgstr "Endast för rektangulära markeringar" #: ../src/interface.c:4005 msgid "" "Only show virtual spaces beyond the end of lines when drawing a rectangular " "selection" -msgstr "" +msgstr "Visa endast virtuella ytor efter radslut vid rektangulär markering" #: ../src/interface.c:4009 msgid "Always" -msgstr "" +msgstr "Alltid" #: ../src/interface.c:4012 -#, fuzzy msgid "Always show virtual spaces beyond the end of lines" -msgstr "Tar bort överflödiga mellanslag och tab-tecken i slutet av filen" +msgstr "Visa alltid virtuella mellanslag och tab-tecken i slutet av rader" #: ../src/interface.c:4016 -#, fuzzy msgid "<b>Virtual spaces</b>" -msgstr "<b>Sökvägar till verktyg</b>" +msgstr "<b>Virtuella ytor</b>" #: ../src/interface.c:4021 msgid "Display" @@ -2469,30 +2446,26 @@ msgstr "Anger förvald kodning för nyskapade filer." #: ../src/interface.c:4113 -#, fuzzy msgid "Use fixed encoding when opening non-Unicode files" -msgstr "Använd fast kodning när filer öppnas" +msgstr "Använd fast kodning när icke-unicode filer öppnas" #: ../src/interface.c:4116 -#, fuzzy msgid "" "This option disables the automatic detection of the file encoding when " "opening non-Unicode files and opens the file with the specified encoding " "(usually not needed)" msgstr "" -"Detta tillval väljer bort automatisk igenkänning av kodning när nya filer " -"öppnas, och använder i stället en specificerad kodning (behövs vanligen " -"inte)." +"Detta tillval väljer bort automatisk igenkänning av kodning när nya icke-" +"unicode filer öppnas, och använder i stället en specificerad kodning (behövs " +"vanligen inte)" #: ../src/interface.c:4122 -#, fuzzy msgid "Default encoding (existing non-Unicode files):" -msgstr "Förvald teckenkodning (existerande filer):" +msgstr "Förvald teckenkodning (existerande icke-unicode filer):" #: ../src/interface.c:4130 -#, fuzzy msgid "Sets the default encoding for opening existing non-Unicode files" -msgstr "Anger förvald teckenkodning för nyöppnade filer:" +msgstr "Anger förvald teckenkodning vid öppning av icke-Unicode filer" #: ../src/interface.c:4136 msgid "<b>Encodings</b>" @@ -2771,9 +2744,8 @@ msgstr "Använd GTKs utskriftshantering" #: ../src/interface.c:4712 -#, fuzzy msgid "<b>Printing</b>" -msgstr "<b>Kodning:</b>" +msgstr "<b>Utskrift</b>" #: ../src/interface.c:4717 ../src/prefs.c:1541 msgid "Printing" @@ -2784,20 +2756,18 @@ msgstr "Projektegenskaper" #: ../src/interface.c:5295 -#, fuzzy msgid "Display:" -msgstr "Visa" +msgstr "Visa:" #: ../src/interface.c:5317 -#, fuzzy msgid "Custom" -msgstr "Användardefinierad text" +msgstr "Användardefinierad" #: ../src/interface.c:5325 msgid "Use global settings" -msgstr "" +msgstr "Använd globala inställningar" -#: ../src/keybindings.c:227 ../src/plugins.c:1171 +#: ../src/keybindings.c:227 ../src/plugins.c:1174 msgid "File" msgstr "Arkiv" @@ -2843,7 +2813,7 @@ #: ../src/keybindings.c:253 msgid "Re-open last closed tab" -msgstr "" +msgstr "Öppna senast stängta tab igen" #: ../src/keybindings.c:255 ../src/project.c:519 msgid "Project" @@ -2906,19 +2876,16 @@ msgstr "Visa macrolistan" #: ../src/keybindings.c:300 -#, fuzzy msgid "Word part completion" -msgstr "Komplettera textfragment" +msgstr "Komplettera ordfragment" #: ../src/keybindings.c:302 -#, fuzzy msgid "Move line(s) up" -msgstr "Kommentera rad(er)" +msgstr "Flytta rad(er) uppåt" #: ../src/keybindings.c:304 -#, fuzzy msgid "Move line(s) down" -msgstr "Kommentera rad(er)" +msgstr "Flytta rad(er) nedåt" #: ../src/keybindings.c:306 msgid "Clipboard" @@ -2949,14 +2916,12 @@ msgstr "Välj ord" #: ../src/keybindings.c:334 -#, fuzzy msgid "Select to previous word part" -msgstr "Gå till föregående orddel" +msgstr "Välj till föregående orddel" #: ../src/keybindings.c:336 -#, fuzzy msgid "Select to next word part" -msgstr "Gå till nästa orddel" +msgstr "Välj till nästa orddel" #: ../src/keybindings.c:338 msgid "Format" @@ -3147,9 +3112,8 @@ msgstr "Förminska" #: ../src/keybindings.c:473 -#, fuzzy msgid "Zoom Reset" -msgstr "Förminska" +msgstr "Återställ förstoring" #: ../src/keybindings.c:475 msgid "Focus" @@ -3180,24 +3144,20 @@ msgstr "Växla till kompilatorn" #: ../src/keybindings.c:490 -#, fuzzy msgid "Switch to Messages" -msgstr "Växla till sidofältet" +msgstr "Växla till Meddelanden" #: ../src/keybindings.c:492 -#, fuzzy msgid "Switch to Message Window" -msgstr "Visa meddelandefönster" +msgstr "Växla till meddelandefönster" #: ../src/keybindings.c:494 -#, fuzzy msgid "Switch to Sidebar Document List" -msgstr "Växla till dokumentet" +msgstr "Växla till dokumentlistan i sidofältet" #: ../src/keybindings.c:496 -#, fuzzy msgid "Switch to Sidebar Symbol List" -msgstr "Växla till sidofältet" +msgstr "Växla till symbollistan i sidofältet" #: ../src/keybindings.c:498 msgid "Notebook tab" @@ -3264,12 +3224,10 @@ msgstr "Ladda om symbollistan" #: ../src/keybindings.c:534 -#, fuzzy msgid "Remove Markers" msgstr "Ta bort markeringar" #: ../src/keybindings.c:536 -#, fuzzy msgid "Remove Error Indicators" msgstr "Ta bort felindikatorer" @@ -3343,7 +3301,6 @@ msgstr "Debugmeddelanden" #: ../src/log.c:183 -#, fuzzy msgid "Cl_ear" msgstr "Rensa" @@ -3378,11 +3335,11 @@ #: ../src/main.c:129 msgid "" "Use this socket filename for communication with a running Geany instance" -msgstr "" +msgstr "Använd detta socket-filnamn vid kommunikation med en Geany instans" #: ../src/main.c:130 msgid "Return a list of open documents in a running Geany instance" -msgstr "" +msgstr "Returnera en lista med öppna dokument i en Geany-instans" #: ../src/main.c:132 msgid "Set initial line number for the first opened file" @@ -3471,17 +3428,17 @@ "konfigureringsmapp.\n" "Starta Geany ändå?" -#: ../src/main.c:1031 +#: ../src/main.c:1044 #, c-format msgid "This is Geany %s." msgstr "Detta är Geany %s." -#: ../src/main.c:1033 +#: ../src/main.c:1046 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigureringsmappen kunde inte skapas (%s)" -#: ../src/main.c:1244 +#: ../src/main.c:1257 msgid "Configuration files reloaded." msgstr "Konfigurationsfilerna laddades om." @@ -3489,23 +3446,22 @@ msgid "Status messages" msgstr "Statusmeddelanden" -#: ../src/msgwindow.c:524 -#, fuzzy +#: ../src/msgwindow.c:542 msgid "C_opy" msgstr "Kopiera" -#: ../src/msgwindow.c:533 +#: ../src/msgwindow.c:551 msgid "Copy _All" msgstr "Kopiera alla" -#: ../src/msgwindow.c:563 +#: ../src/msgwindow.c:581 msgid "_Hide Message Window" msgstr "Dölj meddelandefönster" -#: ../src/msgwindow.c:619 -#, fuzzy, c-format +#: ../src/msgwindow.c:637 +#, c-format msgid "Could not find file '%s' - trying the current document path." -msgstr "Ta bort alla felindikatorer i hela dokumentet" +msgstr "Kunde inte hitta filen '%s' - försöker med sökvägen för dokument." #: ../src/plugins.c:464 #, c-format @@ -3516,11 +3472,11 @@ "Tillägget \"%s\" är inte binärt kompatibel med denna version av Geany. Var " "god, kompilera om modulen." -#: ../src/plugins.c:906 +#: ../src/plugins.c:909 msgid "_Plugin Manager" msgstr "Tilläggshanteraren" -#: ../src/plugins.c:1083 +#: ../src/plugins.c:1086 #, c-format msgid "" "Plugin: %s %s\n" @@ -3531,33 +3487,33 @@ "Beskrivning: %s\n" "Utvecklare: %s" -#: ../src/plugins.c:1159 +#: ../src/plugins.c:1162 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1165 +#: ../src/plugins.c:1168 msgid "Plugin" msgstr "Tillägg" -#: ../src/plugins.c:1189 +#: ../src/plugins.c:1192 msgid "No plugins available." msgstr "Inga tillägg är tillgängliga" -#: ../src/plugins.c:1269 +#: ../src/plugins.c:1272 msgid "Plugins" msgstr "Tillägg" -#: ../src/plugins.c:1289 +#: ../src/plugins.c:1292 msgid "Choose which plugins should be loaded at startup:" msgstr "Ange vilka insticksmoduler som skall laddas vid start:" -#: ../src/plugins.c:1301 +#: ../src/plugins.c:1304 msgid "<b>Plugin details:</b>" msgstr "<b>Plugin egenskaper:</b>" #: ../src/pluginutils.c:207 msgid "Configure Plugins" -msgstr "" +msgstr "Inställningar för insticksmoduler" #: ../src/prefs.c:165 msgid "Grab Key" @@ -3586,7 +3542,7 @@ #: ../src/prefs.c:1408 msgid "_Allow" -msgstr "" +msgstr "Tillåt" #: ../src/prefs.c:1410 msgid "_Override" @@ -3690,12 +3646,12 @@ #: ../src/printing.c:781 #, c-format msgid "Did not send document %s to the printing subsystem." -msgstr "" +msgstr "Kunde inte skicka dokumentet %s till skrivaren." #: ../src/printing.c:783 #, c-format msgid "Document %s was sent to the printing subsystem." -msgstr "" +msgstr "Dokumentet %s skickades till utskriftssystemet." #: ../src/printing.c:835 #, c-format @@ -3789,9 +3745,8 @@ msgstr "Beskrivning:" #: ../src/project.c:481 -#, fuzzy msgid "Set the Build non-filetype working directories to use base path:" -msgstr "Ange arbetsmappar för icke-filtyper för bygg-fliken:" +msgstr "Ange arbetsmappar för icke-filtyper:" #: ../src/project.c:484 msgid "Set" @@ -4024,9 +3979,9 @@ msgstr[1] "Hittat %d träffar för \"%s\"" #: ../src/search.c:1177 -#, fuzzy, c-format +#, c-format msgid "Replaced %u matches in %u documents." -msgstr "Ersätt text i detta dokument" +msgstr "Ersatt %u träffar i %u dokument." #: ../src/search.c:1368 msgid "Invalid directory for find in files." @@ -4072,9 +4027,9 @@ msgstr "Inga träffar hittade." #: ../src/search.c:1661 -#, fuzzy, c-format +#, c-format msgid "Bad regex: %s" -msgstr "Felaktig rexex för filtypen %s: %s" +msgstr "Felaktig rexex: %s" #. TODO maybe this message needs a rewording #: ../src/socket.c:227 @@ -4083,6 +4038,9 @@ "another user.\n" "This is a fatal error and Geany will now quit." msgstr "" +"Geany försökte koppla till en Unix domain socket för en annan instans som " +"körs av en annan användare.\n" +"Detta är ett allvarligt fel, och Geany kommer nu att avslutas." #: ../src/symbols.c:611 ../src/symbols.c:651 ../src/symbols.c:718 msgid "Chapter" @@ -4240,37 +4198,32 @@ msgstr "Inporterade" #: ../src/symbols.c:760 -#, fuzzy msgid "Entities" -msgstr "namnlös" +msgstr "Enhet" #: ../src/symbols.c:761 -#, fuzzy msgid "Architectures" -msgstr "Strukturer" +msgstr "Arkitekturer" #: ../src/symbols.c:763 -#, fuzzy msgid "Functions / Procedures" -msgstr "Procedurer" +msgstr "Funktioner / Procedurer" #: ../src/symbols.c:764 -#, fuzzy msgid "Variables / Signals" -msgstr "Variabler" +msgstr "Variabler / Signaler" #: ../src/symbols.c:765 msgid "Processes / Components" -msgstr "" +msgstr "Procedurer / Komponenter" #: ../src/symbols.c:773 msgid "Events" -msgstr "" +msgstr "Händelser" #: ../src/symbols.c:775 -#, fuzzy msgid "Functions / Tasks" -msgstr "Funktioner" +msgstr "Funktioner / Uppgifter" #: ../src/symbols.c:788 ../src/symbols.c:875 msgid "Members" @@ -4373,7 +4326,7 @@ #: ../src/templates.c:278 msgid "Old" -msgstr "" +msgstr "Gammal" #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" #: ../src/toolbar.c:56 @@ -4478,23 +4431,20 @@ msgstr "Skapa ny fil" #: ../src/toolbar.c:358 -#, fuzzy msgid "Create a new file from a template" -msgstr "Skapa ny fil" +msgstr "Skapa ny fil från mall" #: ../src/toolbar.c:365 msgid "Open an existing file" msgstr "Öppna existerande fil" #: ../src/toolbar.c:366 -#, fuzzy msgid "Open a recent file" -msgstr "Öppna vald fil" +msgstr "Öppna nyligen öppnade filer" #: ../src/toolbar.c:374 -#, fuzzy msgid "Choose more build actions" -msgstr "Inga fler byggfel." +msgstr "Visa fler val för bygg" #: ../src/toolbar.c:389 msgid "Goto" @@ -4611,9 +4561,9 @@ #. Status bar statistics: col = column, sel = selection. #: ../src/ui_utils.c:194 -#, fuzzy, c-format +#, c-format msgid "line: %d / %d\t col: %d\t sel: %d\t " -msgstr "rad: %d\t kolumn: %d\t märkning: %d\t " +msgstr "rad: %d / kolumn: %d\t märkning: %d\t " #. RO = read-only #: ../src/ui_utils.c:200 @@ -4743,7 +4693,7 @@ #: ../src/vte.c:736 msgid "Font:" -msgstr "" +msgstr "Typsnitt:" #: ../src/vte.c:746 msgid "Sets the font for the terminal widget" @@ -4887,14 +4837,12 @@ msgstr "Skapa klass" #: ../plugins/classbuilder.c:384 -#, fuzzy msgid "Namespace" -msgstr "Namespaces" +msgstr "Namnrymd" #: ../plugins/classbuilder.c:393 -#, fuzzy msgid "Namespace:" -msgstr "Namespaces" +msgstr "Namnrymd:" #: ../plugins/classbuilder.c:402 msgid "Class" @@ -4921,9 +4869,8 @@ msgstr "Basklass:" #: ../plugins/classbuilder.c:463 -#, fuzzy msgid "Base source:" -msgstr "Haskell källkodsfil" +msgstr "Base källkodsfil" #: ../plugins/classbuilder.c:465 msgid "Base header:" @@ -4939,7 +4886,7 @@ #: ../plugins/classbuilder.c:498 msgid "Implements:" -msgstr "" +msgstr "Implementering:" #: ../plugins/classbuilder.c:505 msgid "Options" @@ -4955,12 +4902,11 @@ #: ../plugins/classbuilder.c:526 msgid "Is abstract" -msgstr "" +msgstr "Är abstract" #: ../plugins/classbuilder.c:529 -#, fuzzy msgid "Is singleton" -msgstr "Singletons" +msgstr "Är singleton" #: ../plugins/classbuilder.c:540 msgid "GTK+ constructor type" @@ -4979,9 +4925,8 @@ msgstr "GTK+ klass" #: ../plugins/classbuilder.c:1052 -#, fuzzy msgid "_PHP Class" -msgstr "C++ klass" +msgstr "PHP klass" #: ../plugins/htmlchars.c:38 msgid "HTML Characters" @@ -5193,7 +5138,7 @@ #: ../plugins/filebrowser.c:890 msgid "Filter your files with usual wildcards" -msgstr "" +msgstr "Filtrera dina filer med de vanliga jokertecknen" #: ../plugins/filebrowser.c:1107 msgid "Focus File List" @@ -5368,7 +5313,7 @@ #: ../plugins/splitwindow.c:384 msgid "_Vertically" -msgstr "Vertikal" +msgstr "Vertikalt" #: ../plugins/splitwindow.c:400 msgid "Split Horizontally" @@ -6030,5 +5975,5 @@ #~ "line: %d\t col: %d\t sel: %d\t %s %s mode: %s encoding: %s " #~ "%s filetype: %s scope: %s" #~ msgstr "" -#~ "rad: %d\t kolumn: %d\t vald: %d\t %s %s mode: %s kodning: %" -#~ "s %s filtyp: %s scope: %s" +#~ "rad: %d\t kolumn: %d\t vald: %d\t %s %s mode: %s kodning: " +#~ "%s %s filtyp: %s scope: %s" Property changes on: trunk/po/sv.po ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4999] trunk/NEWS
by ntrel＠users.sourceforge.net 04 Jun '10

04 Jun '10

Revision: 4999 http://geany.svn.sourceforge.net/geany/?rev=4999&view=rev Author: ntrel Date: 2010-06-04 16:47:57 +0000 (Fri, 04 Jun 2010) Log Message: ----------- Minor edits, rewording. Modified Paths: -------------- trunk/NEWS Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2010-06-04 16:34:15 UTC (rev 4998) +++ trunk/NEWS 2010-06-04 16:47:57 UTC (rev 4999) @@ -8,7 +8,7 @@ Interface: * Add option 'System Default' for toolbar icon style and size to use the GTK default value. - * Allow '+<number' and '-<number>' as values for Goto Line inputs + * Allow '+<number>' and '-<number>' as values for Goto Line inputs to jump relative to the current line. * Add preference to add new document tabs beside the current one (patch by Colomban Wendling, thanks). @@ -18,8 +18,8 @@ of a shell command in templates. * Update Scintilla to 2.11. * Add preference and support for virtual spaces. - * Remove editor_auto_latex() from Geany core and move it to geanyLaTeX - plugin. + * Remove LaTeX autocompletion from Geany's core and move it to the + geanyLaTeX plugin. Filetypes: * Improvements in symbol parsing of PHP and Python files. @@ -50,16 +50,14 @@ * Add PLUGIN_SET_TRANSLATABLE_INFO macro to the plugin API so plugins' meta information can be translated already in the plugin manager dialog (patch by Colomban Wendling). - * Add editor_insert_text_block() + * Add editor_insert_text_block(). - Internationalisation: * Added translations: ast * Updated translations: de, en_GB, es, fr, gl, ja, nl, pt, ru, sl, sv, tr, vi, zh_CN - Geany 0.18.1 (February 14, 2010) Build fixes: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4998] trunk
by ntrel＠users.sourceforge.net 04 Jun '10

04 Jun '10

Revision: 4998 http://geany.svn.sourceforge.net/geany/?rev=4998&view=rev Author: ntrel Date: 2010-06-04 16:34:15 +0000 (Fri, 04 Jun 2010) Log Message: ----------- Minor fixes. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-06-04 16:29:46 UTC (rev 4997) +++ trunk/ChangeLog 2010-06-04 16:34:15 UTC (rev 4998) @@ -1,8 +1,8 @@ 2010-06-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * doc/geany.txt, doc/geany.html: - Build section: minor rewording, formatting fixes; some sentences - moved. + Build section: minor rewording, formatting fixes; move some + sentences. 2010-06-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2010-06-04 16:29:46 UTC (rev 4997) +++ trunk/doc/geany.html 2010-06-04 16:34:15 UTC (rev 4998) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2010-05-22" /> +<meta name="date" content="2010-06-04" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2010-05-22</td></tr> +<td>2010-06-04</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.19</td></tr> </tbody> @@ -2012,7 +2012,7 @@ </dd> <dt>Use Windows File Open/Save dialogs</dt> <dd>Defines whether to use the native Windows File Open/Save dialogs or -whether to use the GTK default dialogs</dd> +whether to use the GTK default dialogs.</dd> <dt>Auto-focus widgets (focus follows mouse)</dt> <dd>Give the focus automatically to widgets below the mouse cursor. This works for the main editor widget, the scribble, the toolbar search field @@ -2096,7 +2096,7 @@ right of all existing tabs.</dd> <dt>Next to current</dt> <dd>Whether to place file tabs next to the current tab -rather than at the edges of the notebook</dd> +rather than at the edges of the notebook.</dd> <dt>Double-clicking hides all additional widgets</dt> <dd>Whether to call the View->Toggle All Additional Widgets command when double-clicking on a notebook tab.</dd> @@ -6109,7 +6109,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2010-06-04 16:21 UTC. +Generated on: 2010-06-04 16:33 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2010-06-04 16:29:46 UTC (rev 4997) +++ trunk/doc/geany.txt 2010-06-04 16:34:15 UTC (rev 4998) @@ -1673,7 +1673,7 @@ Use Windows File Open/Save dialogs Defines whether to use the native Windows File Open/Save dialogs or - whether to use the GTK default dialogs + whether to use the GTK default dialogs. Auto-focus widgets (focus follows mouse) Give the focus automatically to widgets below the mouse cursor. @@ -1766,7 +1766,7 @@ Next to current Whether to place file tabs next to the current tab - rather than at the edges of the notebook + rather than at the edges of the notebook. Double-clicking hides all additional widgets Whether to call the View->Toggle All Additional Widgets command This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4997] trunk
by ntrel＠users.sourceforge.net 04 Jun '10

04 Jun '10

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

03 Jun '10

Revision: 4996 http://geany.svn.sourceforge.net/geany/?rev=4996&view=rev Author: frlan Date: 2010-06-03 21:40:47 +0000 (Thu, 03 Jun 2010) Log Message: ----------- frlan's changes for 0.19 Modified Paths: -------------- trunk/NEWS trunk/po/ChangeLog Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2010-06-03 21:13:09 UTC (rev 4995) +++ trunk/NEWS 2010-06-03 21:40:47 UTC (rev 4996) @@ -3,8 +3,8 @@ General: * Add new command line option --list-documents to return a list of currently opened documents + * Remove deprecated --debug flag. Please use --verbose/-v instead. - Interface: * Add option 'System Default' for toolbar icon style and size to use the GTK default value. @@ -18,6 +18,8 @@ of a shell command in templates. * Update Scintilla to 2.11. * Add preference and support for virtual spaces. + * Remove editor_auto_latex() from Geany core and move it to geanyLaTeX + plugin. Filetypes: * Improvements in symbol parsing of PHP and Python files. @@ -33,6 +35,9 @@ Plugins: * Classbuilder: Add support for creating PHP classes (patch by Ondrej Donek). + * HTMLchars: Make plugin remember whether replacement of special + characters was activated even after restart of Geany or + reloading of plugin. Windows: * Support very long build commands. @@ -45,8 +50,16 @@ * Add PLUGIN_SET_TRANSLATABLE_INFO macro to the plugin API so plugins' meta information can be translated already in the plugin manager dialog (patch by Colomban Wendling). + * Add editor_insert_text_block() + Internationalisation: + * Added translations: ast + * Updated translations: de, en_GB, es, fr, gl, ja, nl, pt, ru, sl, sv, + tr, vi, zh_CN + + + Geany 0.18.1 (February 14, 2010) Build fixes: Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2010-06-03 21:13:09 UTC (rev 4995) +++ trunk/po/ChangeLog 2010-06-03 21:40:47 UTC (rev 4996) @@ -275,8 +275,8 @@ * *.po, geany.pot: Regenerate message catalog template. Remove a fuzzy mark from all translations. + * New release: Geany 0.18 "Kaine". - 2009-08-13 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * fi.po: Update of Finnish translation. Thanks to Jari Rahkonen and This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2010