Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: freeze-exception
Please unblock gtksourceview2 for squeeze. gtksourceview2 (2.10.4-1) unstable; urgency=low . * New upstream bugfix and documentation release. The upstream changes are only bug fixes and translation updates: Release 2.10.4 gtk-doc comments should be spellchecked Bug 618820 - Add new javascript keywords Added documentation for drawing leading/text/trailing whitespaces Added documentation for the ::move-lines signal Enabling silent_rules compilation. Fix trailing/leading space determination Added new C++0x types Add C++0x keywords. Fixes bug #618132. Updated Latvian translation. Updated Thai translation. The diff for C files and language files is attached. Cheers, -- .''`. Josselin Mouette : :' : `. `' “If you behave this way because you are blackmailed by someone, `- […] I will see what I can do for you.” -- Jörg Schilling
--- gtksourceview-2.10.3/gtksourceview/gtksourceview.c 2010-05-28 19:30:08.000000000 +0000
+++ gtksourceview-2.10.4/gtksourceview/gtksourceview.c 2010-06-20 21:05:16.000000000 +0000
@@ -542,6 +542,22 @@
GTK_TYPE_TEXT_ITER,
GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+ /**
+ * GtkSourceView::move-lines:
+ * @view: the #GtkSourceView which received the signal
+ * @copy: %TRUE if the line should be copied,
+ * %FALSE if it should be moved
+ * @count: the number of lines to move over.
+ *
+ * The ::move-lines signal is a keybinding which gets emitted
+ * when the user initiates moving a line. The default binding key
+ * is Alt+Up/Down arrow. And moves the currently selected lines,
+ * or the current line by @count. For the moment, only
+ * @count of -1 or 1 is valid.
+ *
+ * Since: 2.10
+ *
+ */
signals [MOVE_LINES] =
g_signal_new ("move-lines",
G_TYPE_FROM_CLASS (klass),
@@ -2480,7 +2496,9 @@
{
gunichar ch = gtk_text_iter_get_char (&start);
- if (!g_unichar_isspace (ch) ||
+ /* NOTE: ch can be 0 when iter is at the end
+ of the buffer */
+ if (!(g_unichar_isspace (ch) || ch == 0) ||
gtk_text_iter_starts_line (&start) ||
!gtk_text_iter_backward_char (&start))
{
@@ -2496,6 +2514,7 @@
GtkTextIter *leading,
GtkTextIter *trailing)
{
+ gint flags = 0;
gint location = view->priv->draw_spaces & (GTK_SOURCE_DRAW_SPACES_LEADING |
GTK_SOURCE_DRAW_SPACES_TEXT |
GTK_SOURCE_DRAW_SPACES_TRAILING);
@@ -2506,20 +2525,25 @@
return TRUE;
}
- /* If leading > trailing we are in an empty line so we paint also
- for leading spaces */
if (gtk_text_iter_compare (iter, trailing) >= 0)
{
- return location & (GTK_SOURCE_DRAW_SPACES_TRAILING |
- GTK_SOURCE_DRAW_SPACES_LEADING);
+ flags |= GTK_SOURCE_DRAW_SPACES_TRAILING;
}
if (gtk_text_iter_compare (iter, leading) < 0)
{
- return location & GTK_SOURCE_DRAW_SPACES_LEADING;
+ flags |= GTK_SOURCE_DRAW_SPACES_LEADING;
}
- return location & GTK_SOURCE_DRAW_SPACES_TEXT;
+ if (flags == 0)
+ {
+ /* Neither leading nor trailing, must be in text */
+ return location & GTK_SOURCE_DRAW_SPACES_TEXT;
+ }
+ else
+ {
+ return location & flags;
+ }
}
static void
draw_tabs_and_spaces (GtkSourceView *view,
--- gtksourceview-2.10.3/gtksourceview/gtksourceview.h 2010-05-28 19:30:08.000000000 +0000
+++ gtksourceview-2.10.4/gtksourceview/gtksourceview.h 2010-06-20 21:05:16.000000000 +0000
@@ -108,9 +108,15 @@
* @GTK_SOURCE_DRAW_SPACES_TAB: whether the tab character should be drawn.
* @GTK_SOURCE_DRAW_SPACES_NEWLINE: whether the line breaks should be drawn.
* @GTK_SOURCE_DRAW_SPACES_NBSP: whether the non-breaking whitespaces should be drawn.
+ * @GTK_SOURCE_DRAW_SPACES_LEADING: whether leading whitespaces should be drawn.
+ * @GTK_SOURCE_DRAW_SPACES_TEXT: whether whitespaces inside text should be drawn.
+ * @GTK_SOURCE_DRAW_SPACES_TRAILING: whether trailing whitespaces should be drawn.
* @GTK_SOURCE_DRAW_SPACES_ALL: wheter all kind of spaces should be drawn.
*
- * GtkSourceDrawSpacesFlags determine what kind of spaces whould be drawn.
+ * GtkSourceDrawSpacesFlags determine what kind of spaces whould be drawn. If none
+ * of GTK_SOURCE_DRAW_SPACES_LEADING, GTK_SOURCE_DRAW_SPACES_TEXT or
+ * GTK_SOURCE_DRAW_SPACES_TRAILING is specified, whitespaces at any position in
+ * the line will be drawn (i.e. it has the same effect as specifying all of them).
*/
typedef enum
{
--- gtksourceview-2.10.3/gtksourceview/gtksourceview-typebuiltins.h 2010-05-28 19:32:02.000000000 +0000
+++ gtksourceview-2.10.4/gtksourceview/gtksourceview-typebuiltins.h 2010-06-20 21:09:58.000000000 +0000
@@ -1,5 +1,5 @@
-
+/* Generated data (by glib-mkenums) */
#ifndef __GTKSOURCEVIEW_TYPEBUILTINS_H__
#define __GTKSOURCEVIEW_TYPEBUILTINS_H__ 1
@@ -40,5 +40,5 @@
#endif /* __GTKSOURCEVIEW_TYPEBUILTINS_H__ */
-
+/* Generated data ends here */
--- gtksourceview-2.10.3/gtksourceview/language-specs/cpp.lang 2010-05-28 19:30:08.000000000 +0000
+++ gtksourceview-2.10.4/gtksourceview/language-specs/cpp.lang 2010-06-20 21:05:16.000000000 +0000
@@ -47,7 +47,9 @@
<keyword>bitor</keyword>
<keyword>catch</keyword>
<keyword>compl</keyword>
+ <keyword>constexpr</keyword>
<keyword>const_cast</keyword>
+ <keyword>decltype</keyword>
<keyword>delete</keyword>
<keyword>dynamic_cast</keyword>
<keyword>false</keyword>
@@ -55,6 +57,7 @@
<keyword>new</keyword>
<keyword>not</keyword>
<keyword>not_eq</keyword>
+ <keyword>nullptr</keyword>
<keyword>operator</keyword>
<keyword>or</keyword>
<keyword>or_eq</keyword>
@@ -62,6 +65,7 @@
<keyword>protected</keyword>
<keyword>public</keyword>
<keyword>reinterpret_cast</keyword>
+ <keyword>static_assert</keyword>
<keyword>static_cast</keyword>
<keyword>this</keyword>
<keyword>throw</keyword>
@@ -81,10 +85,13 @@
<context id="types" style-ref="type">
<keyword>bool</keyword>
+ <keyword>char16_t</keyword>
+ <keyword>char32_t</keyword>
<keyword>explicit</keyword>
<keyword>export</keyword>
<keyword>inline</keyword>
<keyword>mutable</keyword>
+ <keyword>nullptr_t</keyword>
<keyword>wchar_t</keyword>
</context>
--- gtksourceview-2.10.3/gtksourceview/language-specs/gtk-doc.lang 2010-05-28 19:30:08.000000000 +0000
+++ gtksourceview-2.10.4/gtksourceview/language-specs/gtk-doc.lang 2010-06-20 21:05:16.000000000 +0000
@@ -69,7 +69,7 @@
</include>
</context>
- <context id="inline-docs-section" style-ref="inline-docs-section">
+ <context id="inline-docs-section" style-ref="inline-docs-section" class-disabled="no-spell-check">
<start>/\*\*(?!\S)</start>
<end>\*/</end>
<include>
--- gtksourceview-2.10.3/gtksourceview/language-specs/javascript.lang 2010-05-28 19:30:08.000000000 +0000
+++ gtksourceview-2.10.4/gtksourceview/language-specs/javascript.lang 2010-06-20 21:05:16.000000000 +0000
@@ -33,19 +33,19 @@
</metadata>
<styles>
- <style id="comment" _name="Comment" map-to="def:comment"/>
- <style id="error" _name="Error" map-to="def:error"/>
- <style id="string" _name="String" map-to="def:string"/>
- <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
- <style id="undefined-value" _name="Undefined Value" map-to="def:special-constant"/>
- <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
- <style id="keyword" _name="Keyword" map-to="def:keyword"/>
- <style id="object" _name="Object"/> <!--map-to="def:others"-->
- <style id="type" _name="Data Type" map-to="def:type"/>
- <style id="function" _name="Function" map-to="def:function"/>
- <style id="properties" _name="Properties" map-to="def:statement"/>
- <style id="constructors" _name="Constructors" map-to="def:type"/>
- <style id="future-words" _name="Future Reserved Keywords" map-to="def:error"/>
+ <style id="comment" _name="Comment" map-to="def:comment"/>
+ <style id="error" _name="Error" map-to="def:error"/>
+ <style id="string" _name="String" map-to="def:string"/>
+ <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
+ <style id="undefined-value" _name="Undefined Value" map-to="def:special-constant"/>
+ <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
+ <style id="keyword" _name="Keyword" map-to="def:keyword"/>
+ <style id="object" _name="Object"/> <!--map-to="def:others"-->
+ <style id="type" _name="Data Type" map-to="def:type"/>
+ <style id="function" _name="Function" map-to="def:function"/>
+ <style id="properties" _name="Properties" map-to="def:statement"/>
+ <style id="constructors" _name="Constructors" map-to="def:type"/>
+ <style id="future-words" _name="Future Reserved Keywords" map-to="def:error"/>
</styles>
<definitions>
@@ -113,31 +113,34 @@
<!-- Keywords -->
<context id="keywords" style-ref="keyword">
- <keyword>const</keyword>
- <keyword>function</keyword>
- <keyword>this</keyword>
- <keyword>var</keyword>
<keyword>break</keyword>
<keyword>case</keyword>
+ <keyword>catch</keyword>
+ <keyword>const</keyword>
<keyword>continue</keyword>
<keyword>default</keyword>
+ <keyword>delete</keyword>
<keyword>do</keyword>
<keyword>else</keyword>
+ <keyword>export</keyword>
+ <keyword>finally</keyword>
<keyword>for</keyword>
+ <keyword>function</keyword>
<keyword>if</keyword>
+ <keyword>import</keyword>
+ <keyword>instanceof</keyword>
<keyword>in</keyword>
+ <keyword>let</keyword>
+ <keyword>new</keyword>
<keyword>return</keyword>
<keyword>switch</keyword>
- <keyword>while</keyword>
- <keyword>with</keyword>
- <keyword>try</keyword>
- <keyword>catch</keyword>
- <keyword>finally</keyword>
- <keyword>delete</keyword>
- <keyword>instanceof</keyword>
- <keyword>new</keyword>
+ <keyword>this</keyword>
<keyword>throw</keyword>
+ <keyword>try</keyword>
<keyword>typeof</keyword>
+ <keyword>while</keyword>
+ <keyword>with</keyword>
+ <keyword>var</keyword>
<keyword>void</keyword>
</context>
@@ -148,148 +151,147 @@
<context id="types" style-ref="type">
<keyword>Infinity</keyword>
- <keyword>NaN</keyword>
<keyword>Math</keyword>
+ <keyword>NaN</keyword>
<keyword>NEGATIVE_INFINITY</keyword>
<keyword>POSITIVE_INFINITY</keyword>
</context>
<context id="functions" style-ref="function">
- <keyword>eval</keyword>
- <keyword>parseInt</keyword>
- <keyword>parseFloat</keyword>
- <keyword>isNaN</keyword>
- <keyword>isFinite</keyword>
- <keyword>encodeURI</keyword>
- <keyword>decodeURI</keyword>
- <keyword>encodeURIComponent</keyword>
- <keyword>decodeURIComponent</keyword>
- <keyword>toString</keyword>
- <keyword>toLocaleString</keyword>
- <keyword>valueOf</keyword>
- <keyword>hasOwnProperty</keyword>
- <keyword>isPrototypeOf</keyword>
- <keyword>propertyIsEnumerable</keyword>
- <keyword>apply</keyword>
- <keyword>call</keyword>
- <keyword>concat</keyword>
- <keyword>join</keyword>
- <keyword>pop</keyword>
- <keyword>push</keyword>
- <keyword>reverse</keyword>
- <keyword>shift</keyword>
- <keyword>slice</keyword>
- <keyword>sort</keyword>
- <keyword>unshift</keyword>
- <keyword>fromCharCode</keyword>
- <keyword>charAt</keyword>
- <keyword>charCodeAt</keyword>
- <keyword>indexOf</keyword>
- <keyword>lastIndexOf</keyword>
- <keyword>localeCompare</keyword>
- <keyword>match</keyword>
- <keyword>exec</keyword>
- <keyword>replace</keyword>
- <keyword>search</keyword>
- <keyword>split</keyword>
- <keyword>substr</keyword>
- <keyword>substring</keyword>
- <keyword>toLowerCase</keyword>
- <keyword>toLocaleLowerCase</keyword>
- <keyword>toUpperCase</keyword>
- <keyword>toLocaleUpperCase</keyword>
- <keyword>toFixed</keyword>
- <keyword>toExponential</keyword>
- <keyword>toPrecision</keyword>
<keyword>abs</keyword>
<keyword>acos</keyword>
+ <keyword>apply</keyword>
<keyword>asin</keyword>
- <keyword>atan</keyword>
<keyword>atan2</keyword>
+ <keyword>atan</keyword>
+ <keyword>call</keyword>
<keyword>ceil</keyword>
+ <keyword>charAt</keyword>
+ <keyword>charCodeAt</keyword>
+ <keyword>concat</keyword>
<keyword>cos</keyword>
+ <keyword>decodeURIComponent</keyword>
+ <keyword>decodeURI</keyword>
+ <keyword>encodeURIComponent</keyword>
+ <keyword>encodeURI</keyword>
+ <keyword>escape</keyword>
+ <keyword>eval</keyword>
+ <keyword>exec</keyword>
<keyword>exp</keyword>
<keyword>floor</keyword>
+ <keyword>fromCharCode</keyword>
+ <keyword>getDate</keyword>
+ <keyword>getDay</keyword>
+ <keyword>getFullYear</keyword>
+ <keyword>getHours</keyword>
+ <keyword>getMilliseconds</keyword>
+ <keyword>getMinutes</keyword>
+ <keyword>getMonth</keyword>
+ <keyword>getSeconds</keyword>
+ <keyword>getTime</keyword>
+ <keyword>getTimezoneOffset</keyword>
+ <keyword>getUTCDate</keyword>
+ <keyword>getUTCDay</keyword>
+ <keyword>getUTCFullYear</keyword>
+ <keyword>getUTCHours</keyword>
+ <keyword>getUTCMilliseconds</keyword>
+ <keyword>getUTCMinutes</keyword>
+ <keyword>getUTCMonth</keyword>
+ <keyword>getUTCSeconds</keyword>
+ <keyword>getYear</keyword>
+ <keyword>hasOwnProperty</keyword>
+ <keyword>indexOf</keyword>
+ <keyword>isFinite</keyword>
+ <keyword>isNaN</keyword>
+ <keyword>isPrototypeOf</keyword>
+ <keyword>join</keyword>
+ <keyword>lastIndexOf</keyword>
+ <keyword>localeCompare</keyword>
<keyword>log</keyword>
+ <keyword>match</keyword>
<keyword>max</keyword>
<keyword>min</keyword>
+ <keyword>parseFloat</keyword>
+ <keyword>parseInt</keyword>
+ <keyword>parse</keyword>
+ <keyword>pop</keyword>
<keyword>pow</keyword>
+ <keyword>propertyIsEnumerable</keyword>
+ <keyword>push</keyword>
<keyword>random</keyword>
+ <keyword>replace</keyword>
+ <keyword>reverse</keyword>
<keyword>round</keyword>
+ <keyword>search</keyword>
+ <keyword>setDate</keyword>
+ <keyword>setFullYear</keyword>
+ <keyword>setHours</keyword>
+ <keyword>setMilliseconds</keyword>
+ <keyword>setMinutes</keyword>
+ <keyword>setMonth</keyword>
+ <keyword>setSeconds</keyword>
+ <keyword>setTime</keyword>
+ <keyword>setUTCDate</keyword>
+ <keyword>setUTCFullYear</keyword>
+ <keyword>setUTCHours</keyword>
+ <keyword>setUTCMilliseconds</keyword>
+ <keyword>setUTCMinutes</keyword>
+ <keyword>setUTCMonth</keyword>
+ <keyword>setUTCSeconds</keyword>
+ <keyword>setYear</keyword>
+ <keyword>shift</keyword>
<keyword>sin</keyword>
+ <keyword>slice</keyword>
+ <keyword>sort</keyword>
+ <keyword>split</keyword>
<keyword>sqrt</keyword>
+ <keyword>substring</keyword>
+ <keyword>substr</keyword>
<keyword>tan</keyword>
- <keyword>parse</keyword>
- <keyword>UTC</keyword>
<keyword>toDateString</keyword>
- <keyword>toTimeString</keyword>
- <keyword>toLocaleString</keyword>
+ <keyword>toExponential</keyword>
+ <keyword>toFixed</keyword>
+ <keyword>toGMTString</keyword>
<keyword>toLocaleDateString</keyword>
+ <keyword>toLocaleLowerCase</keyword>
+ <keyword>toLocaleString</keyword>
<keyword>toLocaleTimeString</keyword>
- <keyword>getTime</keyword>
- <keyword>getFullYear</keyword>
- <keyword>getUTCFullYear</keyword>
- <keyword>getMonth</keyword>
- <keyword>getUTCMonth</keyword>
- <keyword>getDate</keyword>
- <keyword>getUTCDate</keyword>
- <keyword>getDay</keyword>
- <keyword>getUTCDay</keyword>
- <keyword>getHours</keyword>
- <keyword>getUTCHours</keyword>
- <keyword>getMinutes</keyword>
- <keyword>getUTCMinutes</keyword>
- <keyword>getSeconds</keyword>
- <keyword>getUTCSeconds</keyword>
- <keyword>getMilliseconds</keyword>
- <keyword>getUTCMilliseconds</keyword>
- <keyword>getTimezoneOffset</keyword>
- <keyword>setTime</keyword>
- <keyword>setMilliseconds</keyword>
- <keyword>setUTCMilliseconds</keyword>
- <keyword>setSeconds</keyword>
- <keyword>setUTCSeconds</keyword>
- <keyword>setMinutes</keyword>
- <keyword>setUTCMinutes</keyword>
- <keyword>setHours</keyword>
- <keyword>setUTCHours</keyword>
- <keyword>setDate</keyword>
- <keyword>setUTCDate</keyword>
- <keyword>setMonth</keyword>
- <keyword>setUTCMonth</keyword>
- <keyword>setFullYear</keyword>
- <keyword>setUTCFullYear</keyword>
+ <keyword>toLocaleUpperCase</keyword>
+ <keyword>toLowerCase</keyword>
+ <keyword>toPrecision</keyword>
+ <keyword>toString</keyword>
+ <keyword>toTimeString</keyword>
+ <keyword>toUpperCase</keyword>
<keyword>toUTCString</keyword>
- <keyword>escape</keyword>
<keyword>unescape</keyword>
- <keyword>getYear</keyword>
- <keyword>setYear</keyword>
- <keyword>toGMTString</keyword>
+ <keyword>unshift</keyword>
+ <keyword>UTC</keyword>
+ <keyword>valueOf</keyword>
</context>
<context id="properties" style-ref="properties">
- <keyword>length</keyword>
- <keyword>lastIndex</keyword>
<keyword>global</keyword>
<keyword>ignoreCase</keyword>
+ <keyword>lastIndex</keyword>
+ <keyword>length</keyword>
+ <keyword>message</keyword>
<keyword>multiline</keyword>
- <keyword>source</keyword>
<keyword>name</keyword>
- <keyword>message</keyword>
+ <keyword>source</keyword>
</context>
<context id="constructors" style-ref="constructors">
- <keyword>Object</keyword>
- <keyword>Function</keyword>
<keyword>Array</keyword>
- <keyword>String</keyword>
<keyword>Boolean</keyword>
- <keyword>Number</keyword>
<keyword>Date</keyword>
- <keyword>RegExp</keyword>
<keyword>Error</keyword>
<keyword>EvalError</keyword>
+ <keyword>Function</keyword>
+ <keyword>Number</keyword>
+ <keyword>Object</keyword>
<keyword>RangeError</keyword>
+ <keyword>RegExp</keyword>
+ <keyword>String</keyword>
<keyword>SyntaxError</keyword>
<keyword>TypeError</keyword>
<keyword>URIError</keyword>
@@ -304,15 +306,13 @@
<keyword>debugger</keyword>
<keyword>double</keyword>
<keyword>enum</keyword>
- <keyword>export</keyword>
<keyword>extends</keyword>
<keyword>final</keyword>
<keyword>float</keyword>
<keyword>goto</keyword>
<keyword>implements</keyword>
- <keyword>import</keyword>
- <keyword>int</keyword>
<keyword>interface</keyword>
+ <keyword>int</keyword>
<keyword>long</keyword>
<keyword>native</keyword>
<keyword>package</keyword>
signature.asc
Description: This is a digitally signed message part
