Menu
▾
▴
[clr-ci] SF.net SVN: colorer:[1940] trunk/schemes
|
From: <ct...@us...> - 2013-03-29 11:42:05
|
Revision: 1940
http://colorer.svn.sourceforge.net/colorer/?rev=1940&view=rev
Author: ctapmex
Date: 2013-03-29 11:41:58 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
Merged revision(s) 1934 from branches/lazyeugene:
+ constants in php and win32 c schemes
* less scheme - new functions, some improvements
........
Modified Paths:
--------------
trunk/schemes/hrc/hrc/CHANGELOG
trunk/schemes/hrc/hrc/base/c-win32.ent.hrc
trunk/schemes/hrc/hrc/inet/less.hrc
trunk/schemes/hrc/src/php/src/php.lst
Property Changed:
----------------
trunk/schemes/
trunk/schemes/hrc/hrc/
trunk/schemes/hrc/src/
Property changes on: trunk/schemes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/EFREMOV-BASE2/schemes:1029-1068,1071-1078,1080-1099,1101-1107,1110,1214,1251-1304
/branches/Efremov-hrc:1386-1399
/branches/lazyeugene:1813-1931
/trunk/schemes:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305
+ /branches/EFREMOV-BASE2/schemes:1029-1068,1071-1078,1080-1099,1101-1107,1110,1214,1251-1304
/branches/Efremov-hrc:1386-1399
/branches/lazyeugene:1813-1931,1934
/trunk/schemes:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305
Property changes on: trunk/schemes/hrc/hrc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/EFREMOV-BASE2/colorer/hrc:1029-1068,1071-1078,1080-1099,1105-1107,1110,1211,1214,1251-1304
/branches/EFREMOV-BASE2/hrc:1029-1030
/branches/Efremov-hrc/hrc/hrc:1386-1399
/branches/TECHTONIK-HRC-REF/colorer/hrc:909-1221,1223-1240
/branches/lazyeugene/hrc/hrc:1813-1931
/trunk/colorer/hrc:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1327
+ /branches/EFREMOV-BASE2/colorer/hrc:1029-1068,1071-1078,1080-1099,1105-1107,1110,1211,1214,1251-1304
/branches/EFREMOV-BASE2/hrc:1029-1030
/branches/Efremov-hrc/hrc/hrc:1386-1399
/branches/TECHTONIK-HRC-REF/colorer/hrc:909-1221,1223-1240
/branches/lazyeugene/hrc/hrc:1813-1931,1934
/trunk/colorer/hrc:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1327
Modified: trunk/schemes/hrc/hrc/CHANGELOG
===================================================================
--- trunk/schemes/hrc/hrc/CHANGELOG 2013-03-29 11:30:33 UTC (rev 1939)
+++ trunk/schemes/hrc/hrc/CHANGELOG 2013-03-29 11:41:58 UTC (rev 1940)
@@ -1,6 +1,9 @@
2013-03-29
Fixed:
- c# - point in a method name (Roman Kuzmin)
+ - less - new functions, some improvements
+ - php - constants
+ - c - win32 constants
2013-03-13
Fixed:
Modified: trunk/schemes/hrc/hrc/base/c-win32.ent.hrc
===================================================================
--- trunk/schemes/hrc/hrc/base/c-win32.ent.hrc 2013-03-29 11:30:33 UTC (rev 1939)
+++ trunk/schemes/hrc/hrc/base/c-win32.ent.hrc 2013-03-29 11:41:58 UTC (rev 1940)
@@ -91,6 +91,21 @@
<word name='CBN_SELENDCANCEL'/>
<word name='CBN_SELENDOK'/>
<word name='CBN_SETFOCUS'/>
+ <word name='CBR_110'/>
+ <word name='CBR_300'/>
+ <word name='CBR_600'/>
+ <word name='CBR_1200'/>
+ <word name='CBR_2400'/>
+ <word name='CBR_4800'/>
+ <word name='CBR_9600'/>
+ <word name='CBR_14400'/>
+ <word name='CBR_19200'/>
+ <word name='CBR_38400'/>
+ <word name='CBR_56000'/>
+ <word name='CBR_57600'/>
+ <word name='CBR_115200'/>
+ <word name='CBR_128000'/>
+ <word name='CBR_256000'/>
<word name='CDM_GETFILEPATH'/>
<word name='CDM_GETFOLDERIDLIST'/>
<word name='CDM_GETFOLDERPATH'/>
@@ -275,6 +290,8 @@
<word name='CPL_NEWINQUIRE'/>
<word name='CPL_SELECT'/>
<word name='CPL_STOP'/>
+ <word name='CREATE_NEW'/>
+ <word name='CREATE_ALWAYS'/>
<word name='DBT_CONFIGCHANGECANCELED'/>
<word name='DBT_CONFIGCHANGED'/>
<word name='DBT_DEVICEARRIVAL'/>
@@ -296,6 +313,9 @@
<word name='DM_GETDEFID'/>
<word name='DM_REPOSITION'/>
<word name='DM_SETDEFID'/>
+ <word name='DTR_CONTROL_DISABLE'/>
+ <word name='DTR_CONTROL_ENABLE'/>
+ <word name='DTR_CONTROL_HANDSHAKE'/>
<word name='EM_CANPASTE'/>
<word name='EM_CANUNDO'/>
<word name='EM_CHARFROMPOS'/>
@@ -392,6 +412,30 @@
<word name='EN_STOPNOUNDO'/>
<word name='EN_UPDATE'/>
<word name='EN_VSCROLL'/>
+ <word name='EV_RXCHAR'/>
+ <word name='EV_RXFLAG'/>
+ <word name='EV_TXEMPTY'/>
+ <word name='EV_CTS'/>
+ <word name='EV_DSR'/>
+ <word name='EV_RLSD'/>
+ <word name='EV_BREAK'/>
+ <word name='EV_ERR'/>
+ <word name='EV_RING'/>
+ <word name='EV_PERR'/>
+ <word name='EV_RX80FULL'/>
+ <word name='EV_EVENT1'/>
+ <word name='EV_EVENT2'/>
+ <word name='FILE_FLAG_WRITE_THROUGH'/>
+ <word name='FILE_FLAG_OVERLAPPED'/>
+ <word name='FILE_FLAG_NO_BUFFERING'/>
+ <word name='FILE_FLAG_RANDOM_ACCESS'/>
+ <word name='FILE_FLAG_SEQUENTIAL_SCAN'/>
+ <word name='FILE_FLAG_DELETE_ON_CLOSE'/>
+ <word name='FILE_FLAG_BACKUP_SEMANTICS'/>
+ <word name='FILE_FLAG_POSIX_SEMANTICS'/>
+ <word name='FILE_FLAG_OPEN_REPARSE_POINT'/>
+ <word name='FILE_FLAG_OPEN_NO_RECALL'/>
+ <word name='FILE_FLAG_FIRST_PIPE_INSTANCE'/>
<word name='FILEOKSTRING'/>
<word name='FINDMSGSTRING'/>
<word name='FM_GETDRIVEINFO'/>
@@ -417,6 +461,10 @@
<word name='FORMAT_MESSAGE_FROM_SYSTEM'/>
<word name='FORMAT_MESSAGE_ARGUMENT_ARRAY'/>
<word name='FORMAT_MESSAGE_MAX_WIDTH_MASK'/>
+ <word name='GENERIC_READ'/>
+ <word name='GENERIC_WRITE'/>
+ <word name='GENERIC_EXECUTE'/>
+ <word name='GENERIC_ALL'/>
<word name='HDM_DELETEITEM'/>
<word name='HDM_GETITEM'/>
<word name='HDM_GETITEMCOUNT'/>
@@ -738,6 +786,10 @@
<word name='LVN_ITEMCHANGING'/>
<word name='LVN_KEYDOWN'/>
<word name='LVN_SETDISPINFO'/>
+ <word name='MS_CTS_ON'/>
+ <word name='MS_DSR_ON'/>
+ <word name='MS_RING_ON'/>
+ <word name='MS_RLSD_ON'/>
<word name='NIM_ADD'/>
<word name='NIM_DELETE'/>
<word name='NIM_MODIFY'/>
@@ -751,6 +803,11 @@
<word name='NM_SETFOCUS'/>
<word name='OAFALSE'/>
<word name='OATRUE'/>
+ <word name='ONESTOPBIT'/>
+ <word name='ONE5STOPBITS'/>
+ <word name='TWOSTOPBITS'/>
+ <word name='OPEN_EXISTING'/>
+ <word name='OPEN_ALWAYS'/>
<word name='PBM_DELTAPOS'/>
<word name='PBM_SETPOS'/>
<word name='PBM_SETRANGE'/>
@@ -816,6 +873,10 @@
<word name='REG_QWORD'/>
<word name='REG_QWORD_LITTLE_ENDIAN'/>
<word name='REG_SZ'/>
+ <word name='RTS_CONTROL_DISABLE'/>
+ <word name='RTS_CONTROL_ENABLE'/>
+ <word name='RTS_CONTROL_HANDSHAKE'/>
+ <word name='RTS_CONTROL_TOGGLE'/>
<word name='S_OK'/>
<word name='SB_GETBORDERS'/>
<word name='SB_GETPARTS'/>
@@ -966,6 +1027,7 @@
<word name='TCN_KEYDOWN'/>
<word name='TCN_SELCHANGE'/>
<word name='TCN_SELCHANGING'/>
+ <word name='TRUNCATE_EXISTING'/>
<word name='TTM_ACTIVATE'/>
<word name='TTM_ADDTOOL'/>
<word name='TTM_DELTOOL'/>
@@ -2950,6 +3012,7 @@
<word name='ScrollWindow'/>
<word name='ScrollWindowEx'/>
<word name='SearchPath'/>
+ <word name='SecureZeroMemory'/>
<word name='SelectClipPath'/>
<word name='SelectClipRgn'/>
<word name='SelectObject'/>
@@ -3778,6 +3841,7 @@
<word name='LS_MSG_DIGEST'/>
<word name='LUID'/>
<word name='LUID_AND_ATTRIBUTES'/>
+ <word name='LUID_AND_ATTRIBUTES_ARRAY'/>
<word name='LV_COLUMN'/>
<word name='LV_DISPINFO'/>
<word name='LV_FINDINFO'/>
@@ -3860,6 +3924,7 @@
<word name='PANOSE'/>
<word name='PARAFORMAT'/>
<word name='PARTITION_INFORMATION'/>
+ <word name='PLUID_AND_ATTRIBUTES_ARRAY'/>
<word name='POINT'/>
<word name='POINTFX'/>
<word name='POINTL'/>
@@ -4045,6 +4110,7 @@
<word name='SID'/>
<word name='SID_AND_ATTRIBUTES'/>
<word name='SID_IDENTIFIER_AUTHORITY'/>
+ <word name='PSID_IDENTIFIER_AUTHORITY'/>
<word name='SINGLE_LIST_ENTRY'/>
<word name='SIZE'/>
<word name='SMALL_RECT'/>
Modified: trunk/schemes/hrc/hrc/inet/less.hrc
===================================================================
--- trunk/schemes/hrc/hrc/inet/less.hrc 2013-03-29 11:30:33 UTC (rev 1939)
+++ trunk/schemes/hrc/hrc/inet/less.hrc 2013-03-29 11:41:58 UTC (rev 1940)
@@ -34,13 +34,17 @@
<inherit scheme="css:Comment" />
</scheme>
- <scheme name="StringContent">
- <regexp match="/\\"/" region="SymbolStrong" />
+ <scheme name="EscapedVar">
<regexp match="/\@((\{))[a-zA-Z0-9_]+((\}))/" region="Variable"
region1="PairStart" region2="SymbolStrong"
region3="PairEnd" region4="SymbolStrong"
/>
</scheme>
+
+ <scheme name="StringContent">
+ <regexp match="/\\"/" region="SymbolStrong" />
+ <inherit scheme="EscapedVar" />
+ </scheme>
<scheme name="StringContentJS">
<inherit scheme="StringContent"/>
<inherit scheme="jScript:String"/>
@@ -65,16 +69,24 @@
<scheme name="LessFunctions">
<inherit scheme="css:CssFunctions" />
<keywords region="def:Keyword">
+ <word name="acos" />
<word name="alpha" />
+ <word name="asin" />
+ <word name="atan" />
<word name="ceil" />
<word name="color" />
+ <word name="cos" />
<word name="darken" />
<word name="desaturate" />
+ <word name="extract" />
<word name="fade" />
<word name="fadein" />
<word name="fadeout" />
<word name="floor" />
<word name="hsl" />
+ <word name="hsvhue" />
+ <word name="hsvsaturation" />
+ <word name="hsvvalue" />
<word name="hue" />
<word name="iscolor" />
<word name="isem" />
@@ -86,12 +98,19 @@
<word name="isurl" />
<word name="lighten" />
<word name="lightness" />
+ <word name="luma" />
<word name="mix" />
+ <word name="mod" />
<word name="percentage" />
+ <word name="pi" />
+ <word name="pow" />
<word name="round" />
<word name="saturate" />
<word name="saturation" />
+ <word name="sin" />
<word name="spin" />
+ <word name="sqrt" />
+ <word name="tan" />
</keywords>
</scheme>
@@ -143,6 +162,9 @@
<scheme name="MixingProperty">
<regexp match="/\.{3}[ \)]?=/" region="def:SymbolStrong" />
+ <keywords region="SymbolStrong">
+ <symb name=";"/>
+ </keywords>
<inherit scheme="Property"/>
</scheme>
@@ -197,6 +219,7 @@
<inherit scheme="VariableDef" />
<inherit scheme="Combinator" />
<inherit scheme="Mixing"/>
+ <inherit scheme="EscapedVar" />
<inherit scheme="css:RulesList">
<virtual scheme="css:TagNames" subst-scheme="html-css:cssTag"/>
<virtual scheme="css:AttrNames" subst-scheme="html-css:cssAttr"/>
Property changes on: trunk/schemes/hrc/src
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/EFREMOV-BASE2/colorer/src/hrc:1029-1068,1071-1078,1080-1099,1105-1107,1110,1211,1214,1251-1304
/branches/EFREMOV-BASE2/src/hrc:1029-1030
/branches/Efremov-hrc/hrc/src:1386-1399
/branches/TECHTONIK-HRC-REF/colorer/src/hrc:909-1221,1223-1240
/branches/lazyeugene/hrc/src:1813-1931
/trunk/colorer/src/hrc:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1327
+ /branches/EFREMOV-BASE2/colorer/src/hrc:1029-1068,1071-1078,1080-1099,1105-1107,1110,1211,1214,1251-1304
/branches/EFREMOV-BASE2/src/hrc:1029-1030
/branches/Efremov-hrc/hrc/src:1386-1399
/branches/TECHTONIK-HRC-REF/colorer/src/hrc:909-1221,1223-1240
/branches/lazyeugene/hrc/src:1813-1931,1934
/trunk/colorer/src/hrc:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1327
Modified: trunk/schemes/hrc/src/php/src/php.lst
===================================================================
--- trunk/schemes/hrc/src/php/src/php.lst 2013-03-29 11:30:33 UTC (rev 1939)
+++ trunk/schemes/hrc/src/php/src/php.lst 2013-03-29 11:41:58 UTC (rev 1940)
@@ -281,6 +281,9 @@
SORT_REGULAR (integer)
SORT_NUMERIC (integer)
SORT_STRING (integer)
+SORT_LOCALE_STRING (integer)
+SORT_NATURAL (integer)
+SORT_FLAG_CASE (integer)
INI_USER (integer)
INI_PERDIR (integer)
INI_SYSTEM (integer)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
