Revision: 3913 http://geany.svn.sourceforge.net/geany/?rev=3913&view=rev Author: eht16 Date: 2009-07-04 09:21:44 +0000 (Sat, 04 Jul 2009)
Log Message: ----------- Add second argument to the 'line_wrap_indent' styling setting to control the new Scintilla indentation mode for wrapped lines.
Modified Paths: -------------- trunk/ChangeLog trunk/TODO trunk/data/filetypes.common trunk/doc/geany.html trunk/doc/geany.txt trunk/src/highlighting.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-04 09:20:28 UTC (rev 3912) +++ trunk/ChangeLog 2009-07-04 09:21:44 UTC (rev 3913) @@ -12,6 +12,10 @@ * src/document.c, src/editor.c, src/sciwrappers.c, src/sciwrappers.h, src/search.c: Use the new Scintilla struct names prefixed with 'Sci_'. + * TODO, data/filetypes.common, doc/geany.html, doc/geany.txt, + src/highlighting.c: + Add second argument to the 'line_wrap_indent' styling setting to + control the new Scintilla indentation mode for wrapped lines.
2009-06-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-07-04 09:20:28 UTC (rev 3912) +++ trunk/TODO 2009-07-04 09:21:44 UTC (rev 3913) @@ -16,7 +16,6 @@ o (support for adding plugin filetypes - SCI_LOADLEXERLIBRARY?) o (selectable menu of arguments to use for Make, from Make Custom) o (DBUS) - o (indent wrapped lines - SCI_SETWRAPINDENTMODE) o (sci macro support) o (better search & replace regex support e.g. multiline - use SCI_GETCHARACTERPOINTER and GNU regex?)
Modified: trunk/data/filetypes.common =================================================================== --- trunk/data/filetypes.common 2009-07-04 09:20:28 UTC (rev 3912) +++ trunk/data/filetypes.common 2009-07-04 09:21:44 UTC (rev 3913) @@ -78,9 +78,15 @@ # 1 - Visual flag at end of subline drawn near text, 2 - Visual flag at begin of subline drawn near text line_wrap_visuals=3;0;false;false
-# sets the size of indentation of sublines for wrapped lines in terms of the width of a space, -# only first argument is interpreted -line_wrap_indent=0;0;false;false +# only first and second argument is interpreted +# first argument: sets the size of indentation of sublines for wrapped lines in terms of +# the width of a space, only used when the second argument is 0 +# second argument: wrapped sublines can be indented to the position of their first subline or +# one more indent level, possible values: +# 0 - Wrapped sublines aligned to left of window plus amount set by the first argument +# 1 - Wrapped sublines are aligned to first subline indent (use the same indentation) +# 2 - Wrapped sublines are aligned to first subline indent plus one more level of indentation +line_wrap_indent=0;1;false;false
[settings] # which characters should be skipped when moving (or included when deleting) to word boundaries
Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2009-07-04 09:20:28 UTC (rev 3912) +++ trunk/doc/geany.html 2009-07-04 09:21:44 UTC (rev 3913) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2009-06-29" /> +<meta name="date" content="$Date$" /> <style type="text/css">
/* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2009-06-29</td></tr> +<td>$Date$</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.18</td></tr> </tbody> @@ -3650,10 +3650,17 @@ <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">line_wrap_visuals=3;0;false;false</span></tt></p> </dd> <dt>line_wrap_indent</dt> -<dd><p class="first">Sets the size of indentation of sublines for wrapped lines in terms -of the width of a space.</p> -<p>Only first argument is interpreted.</p> -<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">line_wrap_indent=0;0;false;false</span></tt></p> +<dd><p class="first">First argument: sets the size of indentation of sublines for wrapped lines +in terms of the width of a space, only used when the second argument is <tt class="docutils literal"><span class="pre">0</span></tt>.</p> +<p>Second argument: wrapped sublines can be indented to the position of their +first subline or one more indent level. Possible values:</p> +<ul class="simple"> +<li>0 - Wrapped sublines aligned to left of window plus amount set by the first argument</li> +<li>1 - Wrapped sublines are aligned to first subline indent (use the same indentation)</li> +<li>2 - Wrapped sublines are aligned to first subline indent plus one more level of indentation</li> +</ul> +<p>Only first and second argument is interpreted.</p> +<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">line_wrap_indent=0;1;false;false</span></tt></p> </dd> <dt>translucency</dt> <dd><p class="first">Translucency for the current line (first argument) and the selection @@ -4952,7 +4959,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2009-06-30 18:30 UTC. +Generated on: 2009-07-04 09:13 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2009-07-04 09:20:28 UTC (rev 3912) +++ trunk/doc/geany.txt 2009-07-04 09:21:44 UTC (rev 3913) @@ -3276,13 +3276,20 @@ *Example:* ``line_wrap_visuals=3;0;false;false``
line_wrap_indent - Sets the size of indentation of sublines for wrapped lines in terms - of the width of a space. + First argument: sets the size of indentation of sublines for wrapped lines + in terms of the width of a space, only used when the second argument is ``0``.
- Only first argument is interpreted. + Second argument: wrapped sublines can be indented to the position of their + first subline or one more indent level. Possible values:
- *Example:* ``line_wrap_indent=0;0;false;false`` + * 0 - Wrapped sublines aligned to left of window plus amount set by the first argument + * 1 - Wrapped sublines are aligned to first subline indent (use the same indentation) + * 2 - Wrapped sublines are aligned to first subline indent plus one more level of indentation
+ Only first and second argument is interpreted. + + *Example:* ``line_wrap_indent=0;1;false;false`` + translucency Translucency for the current line (first argument) and the selection (second argument). Values between 0 and 256 are accepted.
Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-07-04 09:20:28 UTC (rev 3912) +++ trunk/src/highlighting.c 2009-07-04 09:21:44 UTC (rev 3913) @@ -576,6 +576,7 @@ get_keyfile_int(config, config_home, "styling", "line_wrap_indent", 0, 0, &tmp_style); common_style_set.styling[GCS_LINE_WRAP_INDENT].foreground = tmp_style.foreground; + common_style_set.styling[GCS_LINE_WRAP_INDENT].background = tmp_style.background; get_keyfile_int(config, config_home, "styling", "translucency", 256, 256, &tmp_style); common_style_set.styling[GCS_TRANSLUCENCY].foreground = tmp_style.foreground; @@ -620,6 +621,7 @@ SSM(sci, SCI_SETWRAPVISUALFLAGSLOCATION, common_style_set.styling[GCS_LINE_WRAP_VISUALS].background, 0); SSM(sci, SCI_SETWRAPSTARTINDENT, common_style_set.styling[GCS_LINE_WRAP_INDENT].foreground, 0); + SSM(sci, SCI_SETWRAPINDENTMODE, common_style_set.styling[GCS_LINE_WRAP_INDENT].background, 0);
/* Error indicator */ SSM(sci, SCI_INDICSETSTYLE, GEANY_INDICATOR_ERROR, INDIC_SQUIGGLE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.