SF.net SVN: geany:[5402] trunk

[ntrel at users.sourceforge.net]

Revision: 5402
          http://geany.svn.sourceforge.net/geany/?rev=5402&view=rev
Author:   ntrel
Date:     2010-11-11 17:58:21 +0000 (Thu, 11 Nov 2010)

Log Message:
-----------
Enable XML tag autoindentation for PHP, Docbook and add docs for
this setting (patch by Eugene Arshinov, thanks).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/data/filetypes.docbook
    trunk/data/filetypes.html
    trunk/data/filetypes.php
    trunk/data/filetypes.xml
    trunk/doc/geany.html
    trunk/doc/geany.txt

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-11-11 17:50:51 UTC (rev 5401)
+++ trunk/ChangeLog	2010-11-11 17:58:21 UTC (rev 5402)
@@ -13,6 +13,10 @@
  * src/editor.c:
    Fix wrong snippet indentation when original cursor line has
    non-indentation whitespace (patch by david, thanks).
+ * doc/geany.txt, doc/geany.html, data/filetypes.php,
+   data/filetypes.docbook, data/filetypes.xml, data/filetypes.html:
+   Enable XML tag autoindentation for PHP, Docbook and add docs for
+   this setting (patch by Eugene Arshinov, thanks).
 
 
 2010-11-10  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/data/filetypes.docbook
===================================================================
--- trunk/data/filetypes.docbook	2010-11-11 17:50:51 UTC (rev 5401)
+++ trunk/data/filetypes.docbook	2010-11-11 17:58:21 UTC (rev 5402)
@@ -61,3 +61,7 @@
 
 # context action command (please see Geany's main documentation for details)
 context_action_cmd=
+
+# if this setting is set to true, a new line after a line ending with an
+# unclosed tag will be automatically indented
+xml_indent_tags=true

Modified: trunk/data/filetypes.html
===================================================================
--- trunk/data/filetypes.html	2010-11-11 17:50:51 UTC (rev 5401)
+++ trunk/data/filetypes.html	2010-11-11 17:58:21 UTC (rev 5402)
@@ -32,7 +32,7 @@
 # context action command (please see Geany's main documentation for details)
 context_action_cmd=
 
-# If this setting is set to true, a new line after a line ending with an
+# if this setting is set to true, a new line after a line ending with an
 # unclosed tag will be automatically indented
 xml_indent_tags=true
 

Modified: trunk/data/filetypes.php
===================================================================
--- trunk/data/filetypes.php	2010-11-11 17:50:51 UTC (rev 5401)
+++ trunk/data/filetypes.php	2010-11-11 17:58:21 UTC (rev 5402)
@@ -28,6 +28,10 @@
 # context action command (please see Geany's main documentation for details)
 context_action_cmd=
 
+# if this setting is set to true, a new line after a line ending with an
+# unclosed tag will be automatically indented
+xml_indent_tags=true
+
 [build_settings]
 # %f will be replaced by the complete filename
 # %e will be replaced by the filename without extension

Modified: trunk/data/filetypes.xml
===================================================================
--- trunk/data/filetypes.xml	2010-11-11 17:50:51 UTC (rev 5401)
+++ trunk/data/filetypes.xml	2010-11-11 17:58:21 UTC (rev 5402)
@@ -103,6 +103,6 @@
 # context action command (please see Geany's main documentation for details)
 context_action_cmd=
 
-# If this setting is set to true, a new line after a line ending with an
+# if this setting is set to true, a new line after a line ending with an
 # unclosed tag will be automatically indented
-xml_indent_tags=true
\ No newline at end of file
+xml_indent_tags=true

Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html	2010-11-11 17:50:51 UTC (rev 5401)
+++ trunk/doc/geany.html	2010-11-11 17:58:21 UTC (rev 5402)
@@ -4444,6 +4444,17 @@
 </tbody>
 </table>
 </dd>
+<dt>xml_indent_tags</dt>
+<dd><p class="first">If this setting is set to <em>true</em>, a new line after a line ending with an
+unclosed XML/HTML tag will be automatically indented. This only applies
+to filetypes for which the HTML or XML lexer is used. Such filetypes have
+this setting in their system configuration files.</p>
+<div class="last note">
+<p class="first admonition-title">Note</p>
+<p class="last">This setting will not work if the <em>XML/HTML tag
+autocompletion</em> pref is set.</p>
+</div>
+</dd>
 </dl>
 </div>
 <div class="section">
@@ -6346,7 +6357,7 @@
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-11-08 18:13 UTC.
+Generated on: 2010-11-11 17:52 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-11-11 17:50:51 UTC (rev 5401)
+++ trunk/doc/geany.txt	2010-11-11 17:58:21 UTC (rev 5402)
@@ -3731,7 +3731,17 @@
     1       Sort tags by appearance (line number)
     =====   =====================================
 
+xml_indent_tags
+    If this setting is set to *true*, a new line after a line ending with an
+    unclosed XML/HTML tag will be automatically indented. This only applies
+    to filetypes for which the HTML or XML lexer is used. Such filetypes have
+    this setting in their system configuration files.
 
+    .. note::
+        This setting will not work if the *XML/HTML tag
+        autocompletion* pref is set.
+
+
 [build_settings] Section
 ````````````````````````
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.