summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README2
-rw-r--r--config.h.cmake8
-rw-r--r--kate/data/diff.xml6
-rw-r--r--kate/data/markdown.xml130
-rw-r--r--kate/data/update-files.xml4
-rw-r--r--kate/part/kateviewinternal.cpp59
-rw-r--r--tdecore/tdeversion.h2
7 files changed, 141 insertions, 70 deletions
diff --git a/README b/README
index cff674fcd..dd0dc5d58 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ In this file:
About tdelibs
-------------
-This is version R14.0.13 [DEVELOPMENT] of the Trinity Desktop Environment (TDE) libraries.
+This is version R14.0.13 of the Trinity Desktop Environment (TDE) libraries.
This package includes libraries that are central to the development and
execution of a KDE program, as well as internationalization files for these
diff --git a/config.h.cmake b/config.h.cmake
index 426bac193..068a25024 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1144,6 +1144,7 @@ __END_DECLS
#endif
#ifdef __cplusplus
extern "C"
+{
#endif
#if !defined(HAVE_VSNPRINTF_PROTO)
int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
@@ -1152,7 +1153,7 @@ int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
int snprintf(char *str, size_t n, char const *fmt, ...);
#endif
#ifdef __cplusplus
-extern "C"
+}
#endif
#endif
@@ -1213,7 +1214,10 @@ extern "C"
#define HAVE_SETEUID_FAKE
#ifdef __cplusplus
extern "C"
+{
#endif
int seteuid(INT32_BASETYPE euid); /* defined in fakes.c */
+#ifdef __cplusplus
+}
+#endif
#endif
-
diff --git a/kate/data/diff.xml b/kate/data/diff.xml
index b681b4270..62fdceb1e 100644
--- a/kate/data/diff.xml
+++ b/kate/data/diff.xml
@@ -15,7 +15,7 @@
2008-02-13: 1.11 Eduardo Robles Elvira <edulix AT gmail DOT com>
Fixed folding.
-->
-<language name="Diff" version="1.12" kateversion="2.4" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch">
+<language name="Diff" version="1.13" kateversion="2.4" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch">
<highlighting>
@@ -108,8 +108,8 @@
<itemData name="Normal Text" defStyleNum="dsNormal"/>
<itemData name="File" defStyleNum="dsKeyword"/>
<itemData name="Header" defStyleNum="dsDataType"/>
- <itemData name="Removed line" defStyleNum="dsString" color="#FF0000"/>
- <itemData name="Added line" defStyleNum="dsOthers" color="#0000FF"/>
+ <itemData name="Removed line" defStyleNum="dsString" backgroundColor="#ffeef0"/>
+ <itemData name="Added line" defStyleNum="dsOthers" backgroundColor="#e6ffed"/>
<itemData name="Changed line (old)" defStyleNum="dsString" color="#FF0000"/>
<itemData name="Changed line (new)" defStyleNum="dsOthers" color="#0000FF"/>
</itemDatas>
diff --git a/kate/data/markdown.xml b/kate/data/markdown.xml
index 7d99d02ed..177b904da 100644
--- a/kate/data/markdown.xml
+++ b/kate/data/markdown.xml
@@ -4,7 +4,7 @@
Copyright 2008 Darrin Yeager. http://www.dyeager.org/
Dual-Licensed under both GPL and BSD licenses.
-
+
Extended 2009 Claes Holmerson. http://github.com/claes/kate-markdown/
-->
@@ -25,19 +25,31 @@
<!ENTITY reflinkregex '\[[^\]\^]+\]\s*\[[^\]]*\]\s*(\s+\"[^\"]*\"){0,1}'>
<!ENTITY reflinktargetregex '\[[^\]\^]+\]\:\s+[^\s]+(\s+\"[^\"]*\"){0,1}'>
<!ENTITY footnoteregex "\[\^[^\]]+\]">
+ <!ENTITY preregex "^\s*```\s*">
+ <!ENTITY pretilderegex "^\s*~~~\s*">
+ <!ENTITY preendregex "^\s*```\s*$">
+ <!ENTITY pretildeendregex "^\s*~~~\s*$">
+ <!ENTITY presingleline '```[^`]+```'>
+ <!ENTITY idlinkregex '\[[^\]\^]+\]\s*\(#[^\(]*\)'>
<!ENTITY inlinelinkregex '\[[^\]\^]+\]\s*\([^\(]*\)'>
<!ENTITY inlineimageregex '\!\[[^\]\^]+\]\([^\(]*\)'>
<!ENTITY refimageregex '\!\[[^\]\^]+\]\[[^\[]*\]'>
<!ENTITY autolinkregex '&lt;(https?|ftp):[^\"&gt;\s]+&gt;'>
<!ENTITY mailtolinkregex '&lt;(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)&gt;'>
- <!ENTITY rulerregex '^\s*([\*\-_]){3,}\s*$'>
+ <!ENTITY rulerregex '^ {,3}([\*\-_]\s*){3,}\s*$'>
<!-- two spaces at end of line generates linebreak -->
- <!ENTITY linebreakregex " $">
- <!ENTITY strikeoutregex "[~]{2}[^~].*[^~][~]{2}"> <!-- pandoc style -->
+ <!ENTITY linebreakregex "( |\\)$">
+ <!ENTITY strikeoutregex "~~[^~\s].*[^~\s]~~">
+ <!ENTITY prediffregex "^(```|~~~)\s{0,}diff">
+ <!ENTITY difflineremoveregex "^-[^-].*$">
+ <!ENTITY difflineaddregex "^\+[^\+].*$">
+ <!ENTITY diffheader1regex "^-{3} .*$">
+ <!ENTITY diffheader2regex "^(\+{3} .*|^@@.*)$">
+ <!ENTITY diffheaderdiffregex "^diff .*$">
]>
-
-<language name="Markdown" version="1.3" section="Markup"
- extensions="*.text;*.md;*.mmd;*.mdwn" priority="15"
+
+<language name="Markdown" version="1.4" section="Markup"
+ extensions="*.md;*.mmd;*.mdwn"
author="Darrin Yeager, Claes Holmerson"
license="GPL,BSD" >
<highlighting>
@@ -50,13 +62,14 @@
<RegExpr attribute="h3" String="^###\s.*[#]?$" />
<RegExpr attribute="h4" String="^####\s.*[#]?$" />
<RegExpr attribute="h5" String="^#####\s.*[#]?$" />
+ <RegExpr attribute="h6" String="^######\s.*[#]?$" />
<RegExpr attribute="strongemphasis" String="&strongemphasisregex;" />
<RegExpr attribute="strong" String="&strongregex;" />
<RegExpr attribute="emphasis" String="&emphasisregex;" />
<RegExpr attribute="ruler" String="&rulerregex;" />
+ <RegExpr context="bullet" String="^ {,3}[\*\+\-]\s" />
+ <RegExpr context="numlist" String="^ {,3}[\d]+\.\s" />
<RegExpr attribute="code" String="^([\s]{4,}|\t+).*$" />
- <RegExpr context="bullet" String="^[\*\+\-]\s" />
- <RegExpr context="numlist" String="^[\d]+\.\s" />
<RegExpr attribute="meta" String="^(Title|Author|Date|Copyright|Revision|CSS|LaTeX\ XSLT|Categories|Tags|BaseName|Excerpt):(.*)+$" />
<IncludeRules context="inc" />
</context>
@@ -64,30 +77,56 @@
<context attribute="blockquote" lineEndContext="#pop" name="blockquote">
<RegExpr attribute="bq-strong" String="&strongregex;" />
<RegExpr attribute="bq-emphasis" String="&emphasisregex;" />
+ <RegExpr attribute="bq-strongemphasis" String="&strongemphasisregex;" />
<IncludeRules context="inc" />
</context>
<context attribute="bullet" lineEndContext="#pop" name="bullet" >
<RegExpr attribute="bl-strong" String="&strongregex;" />
<RegExpr attribute="bl-emphasis" String="&emphasisregex;" />
+ <RegExpr attribute="bl-strongemphasis" String="&strongemphasisregex;" />
<IncludeRules context="inc" />
</context>
-
+
<context attribute="numlist" lineEndContext="#pop" name="numlist" >
<RegExpr attribute="nl-strong" String="&strongregex;" />
<RegExpr attribute="nl-emphasis" String="&emphasisregex;" />
+ <RegExpr attribute="nl-strongemphasis" String="&strongemphasisregex;" />
<IncludeRules context="inc" />
</context>
-
+
<context attribute="comment" lineEndContext="#stay" name="comment" >
<RegExpr String="--&gt;" attribute="comment" context="#pop" endRegion="comment"/>
</context>
+ <context attribute="prediff" lineEndContext="#stay" name="prediff" >
+ <RegExpr String="&preendregex;" attribute="prediff" context="#pop" endRegion="prediff"/>
+ <RegExpr attribute="difflineremove" String="&difflineremoveregex;" />
+ <RegExpr attribute="difflineadd" String="&difflineaddregex;" />
+ <RegExpr attribute="diffheader1" String="&diffheader1regex;" />
+ <RegExpr attribute="diffheader2" String="&diffheader2regex;" />
+ <RegExpr attribute="diffheaderdiff" String="&diffheaderdiffregex;" />
+ </context>
+
+ <context attribute="code" lineEndContext="#stay" name="pre" >
+ <RegExpr String="&preendregex;" attribute="code" context="#pop" endRegion="pre"/>
+ </context>
+
+ <context attribute="code" lineEndContext="#stay" name="pretilde" >
+ <RegExpr String="&pretildeendregex;" attribute="code" context="#pop" endRegion="pretilde"/>
+ </context>
+
<context attribute="common" name="inc" lineEndContext="#stay" >
- <RegExpr attribute="code" String="`[^`]+`" />
<RegExpr context="comment" String="&lt;!--" beginRegion="comment" />
+ <RegExpr context="prediff" String="&prediffregex;" beginRegion="prediff" />
+ <RegExpr attribute="code" minimal="true" String="&presingleline;"/>
+ <RegExpr attribute="code" context="pre" String="&preregex;" beginRegion="pre" />
+ <RegExpr attribute="code" context="pretilde" String="&pretilderegex;" beginRegion="pretilde" />
+ <RegExpr attribute="code" String="``.*``" />
+ <RegExpr attribute="code" String="`[^`]*`" />
<RegExpr attribute="reflink" String="&reflinkregex;" />
<RegExpr attribute="footnote" String="&footnoteregex;" />
+ <RegExpr attribute="idlink" String="&idlinkregex;"/>
<RegExpr attribute="inlinelink" String="&inlinelinkregex;"/>
<RegExpr attribute="reflinktarget" String="&reflinktargetregex;"/>
<RegExpr attribute="inlineimage" String="&inlineimageregex;"/>
@@ -104,43 +143,54 @@
<itemData name="common" defStyleNum="dsNormal" />
<itemData name="emphasis" defStyleNum="dsNormal" italic="true" />
<itemData name="strong" defStyleNum="dsNormal" bold="true" />
+ <itemData name="diffheader1" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#800000" bold="true" />
+ <itemData name="diffheader2" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#800000" />
+ <itemData name="diffheaderdiff" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#000000" bold="true" />
+ <itemData name="difflineremove" defStyleNum="dsString" backgroundColor="#ffeef0" />
+ <itemData name="difflineadd" defStyleNum="dsOthers" backgroundColor="#e6ffed" />
<itemData name="strongemphasis" defStyleNum="dsNormal" italic="true" bold="true"/>
- <itemData name="ruler" defStyleNum="dsNormal" bold="true" />
- <itemData name="strikeout" defStyleNum="dsNormal" strikeOut="true" />
- <itemData name="linebreak" defStyleNum="dsNormal" underline="true" color="#999999"/>
+ <itemData name="ruler" defStyleNum="dsNormal" color="#e200e2" bold="true" />
+ <itemData name="strikeout" defStyleNum="dsNormal" strikeOut="true" backgroundColor="#fafaaf" />
+ <itemData name="linebreak" defStyleNum="dsNormal" backgroundColor="#F8E0FF" />
<itemData name="h1" defStyleNum="dsFunction" bold="true" />
<itemData name="h2" defStyleNum="dsFunction" bold="true" />
<itemData name="h3" defStyleNum="dsFunction" bold="true" />
<itemData name="h4" defStyleNum="dsFunction" bold="true" />
<itemData name="h5" defStyleNum="dsFunction" bold="true" />
- <itemData name="blockquote" defStyleNum="dsDataType" />
- <itemData name="bq-emphasis" defStyleNum="dsDataType" italic="true" />
- <itemData name="bq-strong" defStyleNum="dsDataType" bold="true" />
- <itemData name="bullet" defStyleNum="dsFloat" />
- <itemData name="bl-emphasis" defStyleNum="dsFloat" italic="true" />
- <itemData name="bl-strong" defStyleNum="dsFloat" bold="true" />
- <itemData name="numlist" defStyleNum="dsFloat" />
- <itemData name="nl-emphasis" defStyleNum="dsFloat" italic="true" />
- <itemData name="nl-strong" defStyleNum="dsFloat" bold="true" />
- <itemData name="comment" defStyleNum="dsComment" />
- <itemData name="code" defStyleNum="dsBaseN" />
- <itemData name="reflink" defStyleNum="dsOthers" underline="true" />
- <itemData name="inlinelink" defStyleNum="dsOthers" underline="true" />
+ <itemData name="h6" defStyleNum="dsFunction" bold="true" />
+ <itemData name="blockquote" defStyleNum="dsNormal" color="black" />
+ <itemData name="bq-emphasis" defStyleNum="dsNormal" color="black" italic="true" />
+ <itemData name="bq-strong" defStyleNum="dsNormal" color="black" bold="true" />
+ <itemData name="bq-strongemphasis" defStyleNum="dsNormal" color="black" italic="true" bold="true" />
+ <itemData name="bullet" defStyleNum="dsNormal" color="#b700b7" />
+ <itemData name="bl-emphasis" defStyleNum="dsNormal" color="#b700b7" italic="true" />
+ <itemData name="bl-strong" defStyleNum="dsNormal" color="#b700b7" bold="true" />
+ <itemData name="bl-strongemphasis" defStyleNum="dsNormal" color="#b700b7" bold="true" italic="true" />
+ <itemData name="numlist" defStyleNum="dsNormal" color="#b700b7" />
+ <itemData name="nl-emphasis" defStyleNum="dsNormal" color="#b700b7" italic="true" />
+ <itemData name="nl-strong" defStyleNum="dsNormal" color="#b700b7" bold="true" />
+ <itemData name="nl-strongemphasis" defStyleNum="dsNormal" color="#b700b7" bold="true" italic="true" />
+ <itemData name="comment" defStyleNum="dsComment" />
+ <itemData name="pre" defStyleNum="dsNormal" backgroundColor="#eeeeee" />
+ <itemData name="prediff" defStyleNum="dsNormal" backgroundColor="#eeeeee" />
+ <itemData name="code" defStyleNum="dsNormal" color="darkcyan" backgroundColor="#eeeeee" />
+ <itemData name="reflink" defStyleNum="dsOthers" color="blue" />
+ <itemData name="idlink" defStyleNum="dsOthers" color="blue" italic="true" />
+ <itemData name="inlinelink" defStyleNum="dsOthers" color="blue" />
<itemData name="autolink" defStyleNum="dsOthers" underline="true" />
<itemData name="mailtolink" defStyleNum="dsOthers" underline="true" />
<itemData name="footnote" defStyleNum="dsOthers" italic="true" />
- <itemData name="meta" defStyleNum="dsComment" />
- <itemData name="reflinktarget" defStyleNum="dsOthers" italic="false" bold="false" />
- <itemData name="inlineimage" defStyleNum="dsAlert" italic="false" bold="false" />
- <itemData name="refimage" defStyleNum="dsAlert" italic="false" bold="false" />
+ <itemData name="meta" defStyleNum="dsComment" />
+ <itemData name="reflinktarget" defStyleNum="dsOthers" />
+ <itemData name="inlineimage" defStyleNum="dsNormal" backgroundColor="#fff8f8" color="blue" />
+ <itemData name="refimage" defStyleNum="dsNormal" backgroundColor="#fff8f8" color="blue" />
</itemDatas>
+ </highlighting>
- </highlighting>
-
- <general>
- <comments>
- <comment name="multiLine" start="&lt;!--" end="--&gt;" region="comment" />
- </comments>
- </general>
+ <general>
+ <comments>
+ <comment name="multiLine" start="&lt;!--" end="--&gt;" region="comment" />
+ </comments>
+ </general>
- </language>
+</language>
diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml
index 004f7dab2..12924302b 100644
--- a/kate/data/update-files.xml
+++ b/kate/data/update-files.xml
@@ -52,7 +52,7 @@
<Definition name="Debian Changelog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debianchangelog.xml" version="6"/>
<Definition name="Debian Control" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debiancontrol.xml" version="0.84"/>
<Definition name=".desktop" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/desktop.xml" version="2-1"/>
-<Definition name="Diff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/diff.xml" version="1.12"/>
+<Definition name="Diff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/diff.xml" version="1.13"/>
<Definition name="Django HTML Template" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/djangotemplate.xml" version="3"/>
<Definition name="Dockerfile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dockerfile.xml" version="1.1"/>
<Definition name="MS-DOS Batch" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dosbat.xml" version="0.30"/>
@@ -136,7 +136,7 @@
<Definition name="Makefile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/makefile.xml" version="2.1"/>
<Definition name="Mako" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mako.xml" version="1.0"/>
<Definition name="Troff Mandoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mandoc.xml" version="2"/>
-<Definition name="Markdown" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/markdown.xml" version="1.3"/>
+<Definition name="Markdown" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/markdown.xml" version="1.4"/>
<Definition name="Mason" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mason.xml" version="4"/>
<Definition name="Mathematica" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mathematica.xml" version="8.1"/>
<Definition name="Matlab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/matlab.xml" version="2-2"/>
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index c536974e6..5acb93bc8 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -3263,27 +3263,44 @@ void KateViewInternal::clear()
void KateViewInternal::wheelEvent(TQWheelEvent* e)
{
- if (m_lineScroll->minValue() != m_lineScroll->maxValue() && e->orientation() != Qt::Horizontal) {
- // React to this as a vertical event
- if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) {
- if (e->delta() > 0)
- scrollPrevPage();
- else
- scrollNextPage();
- } else {
- scrollViewLines(-((e->delta() / 120) * TQApplication::wheelScrollLines()));
- // maybe a menu was opened or a bubbled window title is on us -> we shall erase it
- update();
- leftBorder->update();
- }
-
- } else if (columnScrollingPossible()) {
- TQWheelEvent copy = *e;
- TQApplication::sendEvent(m_columnScroll, &copy);
-
- } else {
- e->ignore();
- }
+ if (e->state() & ControlButton)
+ {
+ if (e->delta() > 0)
+ {
+ slotIncFontSizes();
+ }
+ else
+ {
+ slotDecFontSizes();
+ }
+ }
+ else
+ {
+ if (m_lineScroll->minValue() != m_lineScroll->maxValue() && e->orientation() != Qt::Horizontal)
+ {
+ // React to this as a vertical event
+ if ( e->state() & ShiftButton )
+ {
+ if (e->delta() > 0)
+ scrollPrevPage();
+ else
+ scrollNextPage();
+ }
+ else
+ {
+ scrollViewLines(-((e->delta() / 120) * TQApplication::wheelScrollLines()));
+ // maybe a menu was opened or a bubbled window title is on us -> we shall erase it
+ update();
+ leftBorder->update();
+ }
+ } else if (columnScrollingPossible()) {
+ TQWheelEvent copy = *e;
+ TQApplication::sendEvent(m_columnScroll, &copy);
+
+ } else {
+ e->ignore();
+ }
+ }
}
void KateViewInternal::startDragScroll()
diff --git a/tdecore/tdeversion.h b/tdecore/tdeversion.h
index 6f838dd93..b4da7f368 100644
--- a/tdecore/tdeversion.h
+++ b/tdecore/tdeversion.h
@@ -32,7 +32,7 @@
A new FEATURE REVISION level always resets the BUG AND SECURITY PATCHLEVEL.
A new ABI version resets both the FEATURE REVISION and BUG AND SECURITY PATCH LEVEL.
*/
-#define TDE_VERSION_STRING "R14.0.13 [DEVELOPMENT]"
+#define TDE_VERSION_STRING "R14.0.13"
#define TDE_VERSION_MAJOR 14
#define TDE_VERSION_MINOR 0
#define TDE_VERSION_RELEASE 13
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-25 11:22:56 +0000