SOURCES: kdelibs-branch.diff - updated
arekm
arekm at pld-linux.org
Mon Apr 3 17:08:55 CEST 2006
Author: arekm Date: Mon Apr 3 15:08:55 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.25 -> 1.26)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.25 SOURCES/kdelibs-branch.diff:1.26
--- SOURCES/kdelibs-branch.diff:1.25 Sat Feb 11 15:22:47 2006
+++ SOURCES/kdelibs-branch.diff Mon Apr 3 17:08:49 2006
@@ -1,4930 +1,3278 @@
-Index: kate/part/katehighlight.h
+Index: kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
===================================================================
---- kate/part/katehighlight.h (.../tags/KDE/3.5.1/kdelibs) (revision 508291)
-+++ kate/part/katehighlight.h (.../branches/KDE/3.5/kdelibs) (revision 508291)
-@@ -39,6 +39,7 @@
- #include <qstringlist.h>
- #include <qguardedptr.h>
- #include <qdatetime.h>
-+#include <qpopupmenu.h>
-
- class KateHlContext;
- class KateHlItem;
-@@ -51,8 +52,6 @@
- class KateSyntaxModeListItem;
- class KateSyntaxContextData;
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../tags/KDE/3.5.2/kdelibs) (revision 526003)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 526003)
+@@ -83,7 +83,7 @@
+ Comment[cy]=Alluogi offer data fel theawrws a cywirydd sillafu (os maent wedi'u gosod)
+ Comment[da]=AktivÊr datavÌrktøjer som begrebsordbog og stavekontrol (hvis installeret)
+ Comment[de]=Aktivierung von Dienstprogrammen wie Thesaurus und RechtschreibprĂźfung (falls installiert)
+-Comment[el]=ΕνξĎÎłÎżĎ€ÎżÎŻÎˇĎƒÎˇ ÎľĎγιΝξΚών δξδοΟÎνων ĎŒĎ€Ď‰Ď‚ Îż Î¸ÎˇĎƒÎąĎ
ĎĎŒĎ‚ ÎťÎΞξων κιΚ Îż ÎżĎθογĎÎąĎ†ÎšÎşĎŒĎ‚ ÎΝξγχος (ξΏν ξίνιΚ ÎľÎłÎşÎąĎ„ÎľĎƒĎ„ÎˇÎźÎνι)
++Comment[el]=ΕνξĎÎłÎżĎ€ÎżÎŻÎˇĎƒÎˇ ÎľĎγιΝξΚών δξδοΟÎνων ĎŒĎ€Ď‰Ď‚ Îż Î¸ÎˇĎƒÎąĎ
ĎĎŒĎ‚ ÎťÎΞξων κιΚ Îż ÎżĎθογĎÎąĎ†ÎšÎşĎŒĎ‚ ÎΝξγχος (ιν ξίνιΚ ÎľÎłÎşÎąĎ„ÎľĎƒĎ„ÎˇÎźÎνι)
+ Comment[eo]=EnĹaltu datumiloj kiel "thesaurus" kaj literumado (se instalita)
+ Comment[es]=Activa herramientas como el thesaurus y el corrector ortogrĂĄfico (si instalados)
+ Comment[et]=Andmete tÜÜriistad, näiteks thesaurus ja þigekirja kontroll
+Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop
+===================================================================
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../tags/KDE/3.5.2/kdelibs) (revision 526003)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (revision 526003)
+@@ -20,7 +20,7 @@
+ Name[fa]=Ů
ŘŞŘľŮ„â€ŒÚŠŮ†Ů†ŘŻŮ‡â€ŒŰŒ ŮžŘąŮˆŮ†ŘŻŮ‡â€ŒŰŒ ŮˆŘąŮˆŘŻ KTextEditor
+ Name[fi]=KTextEditorin 'Lisää tiedosto'-laajennus
+ Name[fr]=Module externe du fichier d'insertion de KTextEditor
+-Name[fy]=KTextEditor-plugin foar it ynfoegjen fan triemen
++Name[fy]=KTextEditor-plugin foar it ynfoegjen fan triemmen
+ Name[ga]=BreiseĂĄn KTextEditor chun comhad a ionsĂĄ
+ Name[gl]=Plugin de InserzĂłn de Arquivo de KTextEditor
+ Name[he]=תוץף הוץפת קוב׼ ל֞KTextEditor
+Index: kate/part/katedocument.cpp
+===================================================================
+--- kate/part/katedocument.cpp (.../tags/KDE/3.5.2/kdelibs) (revision 526003)
++++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision 526003)
+@@ -699,6 +699,10 @@
+
+ bool replacetabs = ( config()->configFlags() & KateDocumentConfig::cfReplaceTabsDyn && ! m_isInUndo );
+ uint tw = config()->tabWidth();
++ uint insertPosExpanded = insertPos;
++ KateTextLine::Ptr l = m_buffer->line( line );
++ if (l != 0)
++ insertPosExpanded = l->cursorX( insertPos, tw );
--class QPopupMenu;
+ for (uint pos = 0; pos < len; pos++)
+ {
+@@ -706,28 +710,30 @@
+
+ if (ch == '\n')
+ {
++ editInsertText (line, insertPos, buf);
++
+ if ( !blockwise )
+ {
+- editInsertText (line, insertPos, buf);
+ editWrapLine (line, insertPos + buf.length());
++ insertPos = insertPosExpanded = 0;
+ }
+ else
+ {
+- editInsertText (line, col, buf);
-
- // some typedefs
- typedef QPtrList<KateAttribute> KateAttributeList;
- typedef QValueList<KateHlIncludeRule*> KateHlIncludeRules;
-Index: kate/part/kateview.cpp
-===================================================================
---- kate/part/kateview.cpp (.../tags/KDE/3.5.1/kdelibs) (revision 508291)
-+++ kate/part/kateview.cpp (.../branches/KDE/3.5/kdelibs) (revision 508291)
-@@ -1771,7 +1771,7 @@
+ if ( line == lastLine() )
+- editWrapLine (line, col + buf.length());
++ editWrapLine (line, insertPos + buf.length());
+ }
- void KateView::exportAsHTML ()
- {
-- KURL url = KFileDialog::getSaveURL(QString::null,"text/html",0,i18n("Export File as HTML"));
-+ KURL url = KFileDialog::getSaveURL(m_doc->docName(),"text/html",0,i18n("Export File as HTML"));
+ line++;
+- insertPos = 0;
+ buf.truncate(0);
++ l = m_buffer->line( line );
++ if (l)
++ insertPosExpanded = l->cursorX( insertPos, tw );
+ }
+ else
+ {
+ if ( replacetabs && ch == '\t' )
+ {
+- uint tr = tw - ( ((blockwise?col:insertPos)+buf.length())%tw ); //###
++ uint tr = tw - ( insertPosExpanded+buf.length() )%tw;
+ for ( uint i=0; i < tr; i++ )
+ buf += ' ';
+ }
+@@ -736,10 +742,7 @@
+ }
+ }
- if ( url.isEmpty() )
- return;
-Index: kate/part/kateautoindent.cpp
-===================================================================
---- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.1/kdelibs) (revision 508291)
-+++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 508291)
-@@ -1054,7 +1054,7 @@
-
- QRegExp KatePythonIndent::endWithColon = QRegExp( "^[^#]*:\\s*(#.*)?$" );
- QRegExp KatePythonIndent::stopStmt = QRegExp( "^\\s*(break|continue|raise|return|pass)\\b.*" );
--QRegExp KatePythonIndent::blockBegin = QRegExp( "^\\s*(def|if|elif|else|for|while|try)\\b.*" );
-+QRegExp KatePythonIndent::blockBegin = QRegExp( "^\\s*(class|def|if|elif|else|for|while|try)\\b.*" );
-
- KatePythonIndent::KatePythonIndent (KateDocument *doc)
- : KateNormalIndent (doc)
-@@ -1857,8 +1857,9 @@
- KateTextLine::Ptr indentLine = doc->plainKateTextLine(indentCursor.line());
-
- QString whitespaceToKeyword = initialWhitespace( keywordLine, keywordPos, false );
-- if( blockKeyword )
-- ; // FIXME: we could add the open brace and subsequent newline here since they're definitely needed.
-+ if( blockKeyword ) {
-+ // FIXME: we could add the open brace and subsequent newline here since they're definitely needed.
-+ }
-
- // If the line starts with an open brace, don't indent...
- int first = indentLine->firstChar();
-Index: kate/part/katespell.cpp
-===================================================================
---- kate/part/katespell.cpp (.../tags/KDE/3.5.1/kdelibs) (revision 508291)
-+++ kate/part/katespell.cpp (.../branches/KDE/3.5/kdelibs) (revision 508291)
-@@ -105,8 +105,8 @@
- else if ( mt == "text/html" || mt == "text/xml" )
- type = KSpell::HTML;
-
-- m_kspell = new KSpell( 0, i18n("Spellcheck"),
-- this, SLOT(ready(KSpell *)), 0, true, false, type );
-+ m_kspell = new KSpell( m_view, i18n("Spellcheck"),
-+ this, SLOT(ready(KSpell *)), 0, true, true, type );
-
- connect( m_kspell, SIGNAL(death()),
- this, SLOT(spellCleanDone()) );
-Index: kate/data/pascal.xml
-===================================================================
---- kate/data/pascal.xml (.../tags/KDE/3.5.1/kdelibs) (revision 508291)
-+++ kate/data/pascal.xml (.../branches/KDE/3.5/kdelibs) (revision 508291)
-@@ -61,6 +61,7 @@
- <item> true </item>
+- if ( !blockwise )
+- editInsertText (line, insertPos, buf);
+- else
+- editInsertText (line, col, buf);
++ editInsertText (line, insertPos, buf);
+
+ editEnd ();
+ emit textInserted(line,insertPos);
+@@ -3097,29 +3100,7 @@
+ if (pos < 0 || pos >= (int)colX)
+ {
+ // only spaces on left side of cursor
+- // search a line with less spaces
+- int y = line;
+- while (--y >= 0)
+- {
+- // this is save, y <= line, and line was already success
+- textLine = m_buffer->plainLine(y);
+-
+- pos = textLine->firstChar();
+-
+- if (pos >= 0)
+- {
+- pos = textLine->cursorX(pos, config()->tabWidth());
+- if (pos < (int)colX)
+- {
+- replaceWithOptimizedSpace(line, col, pos, config()->configFlags());
+- break;
+- }
+- }
+- }
+- if (y < 0) {
+- // FIXME: what shoud we do in this case?
+- removeText(line, 0, line, col+complement);
+- }
++ indent( view, line, -1);
+ }
+ else
+ removeText(line, col-1, line, col+complement);
+Index: kate/data/progress.xml
+===================================================================
+--- kate/data/progress.xml (.../tags/KDE/3.5.2/kdelibs) (revision 526003)
++++ kate/data/progress.xml (.../branches/KDE/3.5/kdelibs) (revision 526003)
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="progress" version="1.08" kateversion="2.4" section="Database" extensions="*.p;*.w;*.i" author="Rares Stanciulescu (rstanciu at operamail.com)" license="GPL">
++<language name="progress" version="1.09" kateversion="2.4" section="Database" extensions="*.p;*.w;*.i;*.cls" author="Rares Stanciulescu (rstanciu at operamail.com)" license="GPL">
+
+ <highlighting>
+
+@@ -31,20 +31,11 @@
+ <item> TEMP-TABLE </item>
+ <item> BUFFER </item>
+ <item> STREAM </item>
++ <item> SAX-WRITER </item>
+ <item> MEMPTR </item>
+ </list>
+
+ <list name="operators">
+- <item> + </item>
+- <item> - </item>
+- <item> * </item>
+- <item> / </item>
+- <item> = </item>
+- <item> < </item>
+- <item> > </item>
+- <item> <= </item>
+- <item> >= </item>
+- <item> <> </item>
+ <item> AND </item>
+ <item> OR </item>
+ <item> NOT </item>
+@@ -82,6 +73,8 @@
+
+ <list name="phrases">
+ <item> AS </item>
++ <item> WORD-INDEX </item>
++ <item> LIKE </item>
+ <item> ALERT-BOX </item>
+ <item> AT </item>
+ <item> COLOR </item>
+@@ -148,9 +141,17 @@
+ <item> NO-ECHO </item>
+ <item> NO-MAP </item>
+ <item> PRIVATE </item>
++ <item> PUBLIC </item>
++ <item> PROTECTED </item>
+ </list>
+
+ <list name="functions">
++ <item> output-content-type </item>
++ <item> get-value </item>
++ <item> get-cgi </item>
++ <item> get-field </item>
++ <item> html-encode </item>
++ <item> url-encode </item>
+ <item> ABSOLUTE </item>
+ <item> ACCUM </item>
+ <item> ADD-INTERVAL </item>
+@@ -577,6 +578,7 @@
+ <item> DEFAULT-WINDOW </item>
+ <item> ERROR-STATUS </item>
+ <item> FILE-INFO </item>
++ <item> FIELD </item>
+ <item> FOCUS </item>
+ <item> FONT-TABLE </item>
+ <item> LAST-EVENT </item>
+@@ -611,7 +613,6 @@
+ <item> HONORPROKEYS </item>
+ <item> HONORRETURNKEY </item>
+ <item> LEFT </item>
+- <item> NAME </item>
+ <item> TOP </item>
+ <item> WIDTH </item>
+ <item> TAG </item>
+@@ -934,7 +935,6 @@
+ <item> MULTIPLE </item>
+ <item> MULTITASKING-INTERVAL </item>
+ <item> MUST-UNDERSTAND </item>
+- <item> NAME </item>
+ <item> NAMESPACE-PREFIX </item>
+ <item> NAMESPACE-URI </item>
+ <item> NEEDS-APPSERVER-PROMPT </item>
+@@ -1163,6 +1163,22 @@
+ <item> XML-SUPPRESS-NAMESPACE-PROCESSING </item>
+ <item> Y </item>
+ <item> YEAR-OFFSET </item>
++ <item> WRITE-XMLSCHEMA </item>
++ <item> WRITE-XML </item>
++ <item> READ-XML </item>
++ <item> NESTED </item>
++ <item> XML-DATA-TYPE </item>
++ <item> XML-NODE-TYPE </item>
++ <item> FORMATTED </item>
++ <item> SET-OUTPUT-DESTINATION </item>
++ <item> START-DOCUMENT </item>
++ <item> START-ELEMENT </item>
++ <item> WRITE-CHARACTERS </item>
++ <item> END-ELEMENT </item>
++ <item> END-DOCUMENT </item>
++ <item> WRITE-DATA-ELEMENT </item>
++ <item> INSERT-ATTRIBUTE </item>
++
+ </list>
+
+ <list name="methods">
+@@ -1489,7 +1505,7 @@
+ <DetectChar attribute="Comment" context="Identifier" char='"'/>
+ <DetectChar attribute="String" context="#stay" char='"'/>
+ <DetectChar attribute="String" context="#stay" char="'"/>
+- <AnyChar attribute="Symbol" context="#stay" String="{}[]()~:"/>
++ <AnyChar attribute="Symbol" context="#stay" String="+-*=/\?~{}[]():."/>
+
+ <StringDetect attribute="Region Marker" context="#stay"
+ String="PROCEDURE" insensitive="TRUE"
+@@ -1504,7 +1520,27 @@
+ <StringDetect attribute="Region Marker" context="#stay"
+ String="END FUNCTION" insensitive="TRUE"
+ endRegion="F1" firstNonSpace="TRUE"/>
++
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="CLASS" insensitive="TRUE"
++ beginRegion="C1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="END CLASS" insensitive="TRUE"
++ endRegion="C1" firstNonSpace="TRUE"/>
+
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="METHOD" insensitive="TRUE"
++ beginRegion="M1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="END METHOD" insensitive="TRUE"
++ endRegion="M1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="CONSTRUCTOR" insensitive="TRUE"
++ beginRegion="CN1" firstNonSpace="TRUE"/>
++ <StringDetect attribute="Region Marker" context="#stay"
++ String="END CONSTRUCTOR" insensitive="TRUE"
++ endRegion="CN1" firstNonSpace="TRUE"/>
++
+ <StringDetect attribute="Function" context="#stay"
+ String="DO:" insensitive="TRUE"
+ beginRegion="L1" firstNonSpace="FALSE"/>
+@@ -1521,6 +1557,7 @@
+ String="END" insensitive="TRUE"
+ endRegion="L1" firstNonSpace="TRUE"/>
+
++
+ </context>
+ <context name="String" attribute="String" lineEndContext="#stay">
+ <LineContinue attribute="String" context="#pop"/>
+Index: kate/data/lua.xml
+===================================================================
+--- kate/data/lua.xml (.../tags/KDE/3.5.2/kdelibs) (revision 526003)
++++ kate/data/lua.xml (.../branches/KDE/3.5/kdelibs) (revision 526003)
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="Lua" version="0.22" kateversion="2.3" section="Scripts" extensions="*.lua" mimetype="text/x-lua">
++<language name="Lua" version="0.23" kateversion="2.3" section="Scripts" extensions="*.lua" mimetype="text/x-lua">
+ <highlighting>
+ <list name="keywords">
+ <item> and </item>
+@@ -19,7 +19,7 @@
+ <item> else </item>
+ <item> or </item>
+ <item> while </item>
+- <item> elsif </item>
++ <item> elseif </item>
+ <item> in </item>
+ <item> repeat </item>
</list>
- <list name="ISO/Delphi Extended">
-+ <item> abstract </item>
- <item> as </item>
- <item> bindable </item>
- <item> constructor </item>
-@@ -78,6 +79,7 @@
- <item> on </item>
- <item> only </item>
- <item> otherwise </item>
-+ <item> override </item>
+Index: kate/data/ada.xml
+===================================================================
+--- kate/data/ada.xml (.../tags/KDE/3.5.2/kdelibs) (revision 526003)
++++ kate/data/ada.xml (.../branches/KDE/3.5/kdelibs) (revision 526003)
+@@ -73,14 +73,16 @@
+ <context attribute="Normal Text" lineEndContext="#stay" name="Default">
+ <RegExpr attribute="Keyword" context="#stay" String="if " insensitive="TRUE" beginRegion="Region1" firstNonSpace="true"/>
+ <StringDetect attribute="Keyword" context="#stay" String="end if" insensitive="TRUE" endRegion="Region1"/>
+- <RegExpr attribute="Keyword" context="#stay" String="case " insensitive="TRUE" beginRegion="Region2" firstNonSpace="true"/>
+- <StringDetect attribute="Keyword" context="#stay" String="end case" insensitive="TRUE" endRegion="Region2"/>
+ <RegExpr attribute="Keyword" context="#stay" String="\sloop\s+" insensitive="TRUE" beginRegion="Region3"/>
+ <RegExpr attribute="Keyword" context="#stay" String="\sloop$" insensitive="TRUE" beginRegion="Region3"/>
+ <StringDetect attribute="Keyword" context="#stay" String="end loop;" insensitive="TRUE" endRegion="Region3"/>
+ <RegExpr attribute="Keyword" context="#stay" String="\sselect\s+" insensitive="TRUE" beginRegion="Region4"/>
+ <RegExpr attribute="Keyword" context="#stay" String="\sselect$" insensitive="TRUE" beginRegion="Region4"/>
+ <StringDetect attribute="Keyword" context="#stay" String="end select;" insensitive="TRUE" endRegion="Region4"/>
++ <RegExpr attribute="Keyword" context="#stay" String="\b(begin|case|record)\b" insensitive="true" beginRegion="Region5"/>
++ <RegExpr attribute="Keyword" context="#stay" String="\bend(?=((\{[^}]*(\}|$)|\(\*.*(\*\)|$))*)([.;\s]|$)|//|$)" insensitive="true" endRegion="Region5"/>
++ <StringDetect attribute="Region Marker" context="Region Marker" String="-- BEGIN" beginRegion="RegionMarker" firstNonSpace="true" />
++ <StringDetect attribute="Region Marker" context="Region Marker" String="-- END" endRegion="RegionMarker" firstNonSpace="true" />
+ <keyword attribute="Keyword" context="#stay" String="keywords"/>
+ <Float attribute="Float" context="#stay"/>
+ <Int attribute="Decimal" context="#stay"/>
+@@ -88,6 +90,7 @@
+ <DetectChar attribute="String" context="String" char="""/>
+ <Detect2Chars attribute="Comment" context="Comment" char="-" char1="-"/>
+ </context>
++ <context attribute="Region Marker" lineEndContext="#pop" name="Region Marker"/>
+ <context attribute="String" lineEndContext="#pop" name="String">
+ <DetectChar attribute="String" context="#pop" char="""/>
+ </context>
+@@ -102,6 +105,7 @@
+ <itemData name="Char" defStyleNum="dsChar" />
+ <itemData name="String" defStyleNum="dsString" />
+ <itemData name="Comment" defStyleNum="dsComment" />
++ <itemData name="Region Marker" defStyleNum="dsRegionMarker" />
+ </itemDatas>
+ </highlighting>
+ <general>
+Index: kate/data/ruby.xml
+===================================================================
+--- kate/data/ruby.xml (.../tags/KDE/3.5.2/kdelibs) (revision 526003)
++++ kate/data/ruby.xml (.../branches/KDE/3.5/kdelibs) (revision 526003)
+@@ -34,7 +34,7 @@
+ -->
+
+ <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
+-<language name="Ruby" version="1.17" kateversion="2.4" section="Scripts" extensions="*.rb;*.rxml" mimetype="application/x-ruby" author="Stefan Lang (langstefan at gmx.at), Sebastian Vuorinen (sebastian.vuorinen at helsinki.fi)" license="LGPL">
++<language name="Ruby" version="1.17" kateversion="2.4" section="Scripts" extensions="*.rb;*.rjs;*.rxml" mimetype="application/x-ruby" author="Stefan Lang (langstefan at gmx.at), Sebastian Vuorinen (sebastian.vuorinen at helsinki.fi)" license="LGPL">
+
+ <highlighting>
+
+Index: kate/data/logtalk.xml
+===================================================================
+--- kate/data/logtalk.xml (.../tags/KDE/3.5.2/kdelibs) (revision 526003)
++++ kate/data/logtalk.xml (.../branches/KDE/3.5/kdelibs) (revision 526003)
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+
+-<language name="Logtalk" version="1.40" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura at logtalk.org)" license="Artistic License 2.0">
++<language name="Logtalk" version="1.51" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura at logtalk.org)" license="Artistic License 2.0">
+
+ <highlighting>
+
+@@ -17,11 +17,11 @@
+ <!-- Reflection -->
+ <RegExpr String = "\b(current_predicate|predicate_property)(?=[(])" attribute = "Built-in" context = "#stay" />
+ <!-- DCGs -->
+- <RegExpr String = "\b(expand_term|phrase)(?=[(])" attribute = "Built-in" context = "#stay" />
++ <RegExpr String = "\b(expand_term|term_expansion|phrase)(?=[(])" attribute = "Built-in" context = "#stay" />
+ <!-- Entity -->
+ <RegExpr String = "\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])" attribute = "Built-in" context = "#stay" />
+ <RegExpr String = "\b(object|protocol|category)_property(?=[(])" attribute = "Built-in" context = "#stay" />
+- <!-- Event handlers -->
++ <!-- Entity relations -->
+ <RegExpr String = "\bextends_(object|protocol)(?=[(])" attribute = "Built-in" context = "#stay" />
+ <RegExpr String = "\bimplements_protocol(?=[(])" attribute = "Built-in" context = "#stay" />
+ <RegExpr String = "\b(instantiates|specializes)_class(?=[(])" attribute = "Built-in" context = "#stay" />
+@@ -48,7 +48,7 @@
+ <RegExpr String = "\b(rem|mod|abs|sign)(?=[(])" attribute = "Built-in" context = "#stay" />
+ <RegExpr String = "\bfloat(_(integer|fractional)_part)?(?=[(])" attribute = "Built-in" context = "#stay" />
+ <RegExpr String = "\b(floor|truncate|round|ceiling)(?=[(])" attribute = "Built-in" context = "#stay" />
+- <!-- Other arithemtic functors -->
++ <!-- Other arithmetic functors -->
+ <RegExpr String = "\b(cos|atan|exp|log|s(in|qrt))(?=[(])" attribute = "Built-in" context = "#stay" />
+ <!-- Term testing -->
+ <RegExpr String = "\b(var|atom(ic)?|integer|float|compound|n(onvar|umber))(?=[(])" attribute = "Built-in" context = "#stay" />
+@@ -149,15 +149,16 @@
+ <!-- Entity directives -->
+ <RegExpr String = "\b(category|object|protocol)(?=[(])" attribute = "Directive" context = "entityrelations" beginRegion = "Entity"/>
+ <RegExpr String = "\bend_(category|object|protocol)[.]" attribute = "Directive" context = "#pop" endRegion = "Entity" />
++ <RegExpr String = "\bmodule(?=[(])" attribute = "Directive" context = "#pop"/>
+ <!-- Predicate scope directives -->
+ <RegExpr String = "\bp(ublic|r(otected|ivate))(?=[(])" attribute = "Directive" context = "#pop" />
+ <!-- Other directives -->
+- <RegExpr String = "\bencoding(?=[(])" attribute = "Directive" context = "#pop" />
++ <RegExpr String = "\be(ncoding|xport)(?=[(])" attribute = "Directive" context = "#pop" />
+ <RegExpr String = "\bin(fo|itialization)(?=[(])" attribute = "Directive" context = "#pop" />
+ <RegExpr String = "\bdynamic[.]" attribute = "Directive" context = "#pop" />
+- <RegExpr String = "\b(alias|d(ynamic|iscontiguous)|m(etapredicate|ode|ultifile))(?=[(])" attribute = "Directive" context = "#pop" />
++ <RegExpr String = "\b(alias|d(ynamic|iscontiguous)|meta_predicate|m(etapredicate|ode|ultifile))(?=[(])" attribute = "Directive" context = "#pop" />
+ <RegExpr String = "\bop(?=[(])" attribute = "Directive" context = "#pop" />
+- <RegExpr String = "\b(calls|uses)(?=[(])" attribute = "Directive" context = "#pop" />
++ <RegExpr String = "\b(calls|use(s|_module))(?=[(])" attribute = "Directive" context = "#pop" />
+ </context>
+
+ <context name = "entityrelations" attribute = "Normal" lineEndContext = "#stay" >
+Index: kate/data/php.xml
+===================================================================
+--- kate/data/php.xml (.../tags/KDE/3.5.2/kdelibs) (revision 526003)
++++ kate/data/php.xml (.../branches/KDE/3.5/kdelibs) (revision 526003)
+@@ -1,6 +1,12 @@
+ <?xml version="1.0" encoding="UTF-8"?>
++<!--
++ Changes: version 1.25 -> 1.26
++ Date: 26/01/2006
++ Change author: Nicola Gigante
++ Added alternative syntax control structures and named logical operators (and or xor)
++-->
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="PHP/PHP" version="1.25" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
++<language name="PHP/PHP" version="1.26" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
+ <highlighting>
+ <list name="control structures">
+ <item>as</item>
+@@ -21,6 +27,11 @@
+ <item>include</item>
+ <item>require_once</item>
+ <item>include_once</item>
++ <item>endif</item>
++ <item>endwhile</item>
++ <item>endfor</item>
++ <item>endforeach</item>
++ <item>endswitch</item>
+ </list>
+ <list name="keywords">
+ <item> abstract </item>
+@@ -42,6 +53,9 @@
+ <item> public </item>
+ <item> throw </item>
+ <item> try </item>
++ <item> and </item>
++ <item> or </item>
++ <item> xor </item>
+ <item> var </item>
+ <item> __FILE__ </item>
+ <item> __LINE__ </item>
+Index: kate/data/cpp.xml
+===================================================================
+--- kate/data/cpp.xml (.../tags/KDE/3.5.2/kdelibs) (revision 526003)
++++ kate/data/cpp.xml (.../branches/KDE/3.5/kdelibs) (revision 526003)
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="C++" version="1.34" kateversion="2.4" section="Sources" extensions="*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
++<language name="C++" version="1.36" kateversion="2.4" section="Sources" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
+ <highlighting>
+ <list name="keywords">
+ <item> asm </item>
+@@ -31,6 +31,7 @@
<item> private </item>
- <item> property </item>
<item> protected </item>
-@@ -89,6 +91,7 @@
- <item> shr </item>
- <item> threadvar </item>
- <item> try </item>
-+ <item> virtual </item>
+ <item> public </item>
++ <item> qobject_cast </item>
+ <item> reinterpret_cast </item>
+ <item> return </item>
+ <item> sizeof </item>
+@@ -79,6 +80,33 @@
+ <item> Q_OVERRIDE </item>
+ <item> Q_PROPERTY </item>
+ <item> Q_SETS </item>
++ <item> Q_SIGNALS </item>
++ <item> Q_SLOTS </item>
++ <item> Q_FOREACH </item>
++ <item> Q_DECLARE_FLAGS </item>
++ <item> Q_INIT_RESOURCE </item>
++ <item> Q_CLEANUP_RESOURCE </item>
++ <item> Q_GLOBAL_STATIC </item>
++ <item> Q_GLOBAL_STATIC_WITH_ARGS </item>
++ <item> Q_DECLARE_TYPEINFO </item>
++ <item> Q_DECLARE_SHARED </item>
++ <item> Q_DECLARE_FLAGS </item>
++ <item> Q_DECLARE_OPERATORS_FOR_FLAGS </item>
++ <item> Q_FOREVER </item>
++ <item> Q_DECLARE_PRIVATE </item>
++ <item> Q_DECLARE_PUBLIC </item>
++ <item> Q_D </item>
++ <item> Q_Q </item>
++ <item> Q_DISABLE_COPY </item>
++ <item> Q_INTERFACES </item>
++ <item> Q_FLAGS </item>
++ <item> Q_SCRIPTABLE </item>
++ <item> Q_INVOKABLE </item>
++ <item> Q_GADGET </item>
++ <item> Q_ARG </item>
++ <item> Q_RETURN_ARG </item>
++ <item> Q_ASSERT </item>
++ <item> Q_ASSERT_X </item>
+ <item> TRUE </item>
+ <item> FALSE </item>
+ <item> connect </item>
+@@ -87,6 +115,7 @@
+ <item> signals </item>
+ <item> slots </item>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.25&r2=1.26&f=u
More information about the pld-cvs-commit
mailing list