|
From: <ct...@us...> - 2013-05-02 15:48:41
|
Revision: 1957
http://sourceforge.net/p/colorer/svn/1957
Author: ctapmex
Date: 2013-05-02 15:48:35 +0000 (Thu, 02 May 2013)
Log Message:
-----------
Merged from branches/lazyeugene:
+ xsl extension keywords
* twig was twice in proto.hrc
+ srt shceme
+ lua strings: added \[abfnrtv] modifiers and \ddd digit modifiers
Modified Paths:
--------------
trunk/schemes/hrc/changelog
trunk/schemes/hrc/hrc/CHANGELOG
trunk/schemes/hrc/hrc/base/lua.hrc
trunk/schemes/hrc/hrc/inet/twig.hrc
trunk/schemes/hrc/hrc/proto.hrc
trunk/schemes/hrc/hrc/proto.hrc.far
trunk/schemes/hrc/src/php/src/php.lst
trunk/schemes/hrc/src/php/src/php.pl
Added Paths:
-----------
trunk/schemes/hrc/hrc/misc/srt.hrc
Property Changed:
----------------
trunk/schemes/
trunk/schemes/hrc/hrc/
trunk/schemes/hrc/src/
trunk/schemes/hrc/test/
trunk/schemes/hrd/hrd/
Index: trunk/schemes
===================================================================
--- trunk/schemes 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes 2013-05-02 15:48:35 UTC (rev 1957)
Property changes on: trunk/schemes
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/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
+/branches/lazyeugene:1813-1850,1859-1931,1934-1956
/trunk/schemes:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305
\ No newline at end of property
Modified: trunk/schemes/hrc/changelog
===================================================================
--- trunk/schemes/hrc/changelog 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes/hrc/changelog 2013-05-02 15:48:35 UTC (rev 1957)
@@ -1,5 +1,9 @@
$Revision$
$Author$ $Date$
+ - слито с branches/lazyeugene
+
+#Revision: 1950
+ #Author: ctapmex Date: 2013-04-22 17:23:56 +0600 (Пн, 22 апр 2013)
- доработка D
#Revision: 1948
Index: trunk/schemes/hrc/hrc
===================================================================
--- trunk/schemes/hrc/hrc 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes/hrc/hrc 2013-05-02 15:48:35 UTC (rev 1957)
Property changes on: trunk/schemes/hrc/hrc
___________________________________________________________________
Modified: svn:mergeinfo
## -2,5 +2,5 ##
/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
+/branches/lazyeugene/hrc/hrc:1813-1856,1859-1931,1934-1956
/trunk/colorer/hrc:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1327
\ No newline at end of property
Modified: trunk/schemes/hrc/hrc/CHANGELOG
===================================================================
--- trunk/schemes/hrc/hrc/CHANGELOG 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes/hrc/hrc/CHANGELOG 2013-05-02 15:48:35 UTC (rev 1957)
@@ -1,3 +1,10 @@
+2013-05-02
+ New:
+ - srt scheme (Eugene Myronchuk)
+ Fixed:
+ - lua strings: added \[abfnrtv] modifiers and \ddd digit modifiers
+ - php: xsl extension keywords
+
2013-04-22
New:
- ASASM (ActionScript 3 assembler, RABCDAsm variant) from Vladimir Panteleev
Modified: trunk/schemes/hrc/hrc/base/lua.hrc
===================================================================
--- trunk/schemes/hrc/hrc/base/lua.hrc 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes/hrc/hrc/base/lua.hrc 2013-05-02 15:48:35 UTC (rev 1957)
@@ -52,11 +52,13 @@
<scheme name="CharDQuoted">
<!-- Double quoted string some special characters -->
- <regexp match='/\\[\\'"]/' region0="def:default"/>
+ <regexp match='/\\[\\'"abfnrtv\[\]]/' region0="def:SymbolStrong"/>
+ <regexp match='/\\\d{1,3}/' region0="def:SymbolStrong"/>
</scheme>
<scheme name="CharDQuotin">
<!-- Double quoted string inner string characters -->
- <regexp match='/\\\\[\\'"]/' region0="def:default"/>
+ <regexp match='/\\\\[\\'"abfnrtv\[\]]/' region0="def:SymbolStrong"/>
+ <regexp match='/\\\\\d{1,3}/' region0="def:SymbolStrong"/>
</scheme>
<scheme name="HexNumber">
Modified: trunk/schemes/hrc/hrc/inet/twig.hrc
===================================================================
--- trunk/schemes/hrc/hrc/inet/twig.hrc 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes/hrc/hrc/inet/twig.hrc 2013-05-02 15:48:35 UTC (rev 1957)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hrc PUBLIC "-//Cail Lomecb//DTD Colorer HRC take5//EN"
"http://colorer.sf.net/2003/hrc.dtd">
<hrc version="take5" xmlns="http://colorer.sf.net/2003/hrc"
Copied: trunk/schemes/hrc/hrc/misc/srt.hrc (from rev 1956, branches/lazyeugene/hrc/hrc/misc/srt.hrc)
===================================================================
--- trunk/schemes/hrc/hrc/misc/srt.hrc (rev 0)
+++ trunk/schemes/hrc/hrc/misc/srt.hrc 2013-05-02 15:48:35 UTC (rev 1957)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE hrc PUBLIC "-//Cail Lomecb//DTD Colorer HRC take5//EN"
+ "http://colorer.sf.net/2003/hrc.dtd">
+<hrc version="take5" xmlns="http://colorer.sf.net/2003/hrc"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://colorer.sf.net/2003/hrc http://colorer.sf.net/2003/hrc.xsd">
+
+
+ <type name="srt">
+ <annotation>
+ <contributors>
+ Eugene Myronchuk
+ </contributors>
+ <appinfo>
+ <prototype name="srt" group="other" description="SRT subs">
+ <location link="misc/srt.hrc"/>
+ <filename weight="10">/\.srt$/</filename>
+ </prototype>
+ </appinfo>
+ <documentation>
+ Script language for SRT subs
+ </documentation>
+ </annotation>
+
+ <import type="def"/>
+
+ <scheme name="srt">
+ <regexp match="/^\d+$/" region="def:Constant" />
+ <regexp match="/(\d+\s*:\s*\d{2}\s*:\s*\d{2}\s*,\s*\d+) \s+ (-->) \s+ (\d+\s*:\s*\d{2}\s*:\s*\d{2}\s*,\s*\d+)/x"
+ region1="def:Time"
+ region2="def:SymbolStrong"
+ region3="def:Time"
+ />
+ <inherit scheme="asp:html"/>
+ </scheme>
+ </type>
+
+</hrc>
Modified: trunk/schemes/hrc/hrc/proto.hrc
===================================================================
--- trunk/schemes/hrc/hrc/proto.hrc 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes/hrc/hrc/proto.hrc 2013-05-02 15:48:35 UTC (rev 1957)
@@ -924,6 +924,10 @@
<filename>/\.(ssa|ass)$/</filename>
<firstline weight='2'>/^(...)?\[Script Info\]/</firstline>
</prototype>
+ <prototype name="srt" group="other" description="SRT subs">
+ <location link="misc/srt.hrc"/>
+ <filename weight="10">/\.srt$/</filename>
+ </prototype>
<prototype name="cue" group="other" description="Cue sheet">
<location link="misc/cue.hrc"/>
<filename>/\.cue$/</filename>
Modified: trunk/schemes/hrc/hrc/proto.hrc.far
===================================================================
--- trunk/schemes/hrc/hrc/proto.hrc.far 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes/hrc/hrc/proto.hrc.far 2013-05-02 15:48:35 UTC (rev 1957)
@@ -927,6 +927,10 @@
<filename>/\.(ssa|ass)$/</filename>
<firstline weight='2'>/^(...)?\[Script Info\]/</firstline>
</prototype>
+ <prototype name="srt" group="other" description="SRT subs">
+ <location link="misc/srt.hrc"/>
+ <filename weight="10">/\.srt$/</filename>
+ </prototype>
<prototype name="cue" group="other" description="Cue sheet">
<location link="misc/cue.hrc"/>
<filename>/\.cue$/</filename>
Index: trunk/schemes/hrc/src
===================================================================
--- trunk/schemes/hrc/src 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes/hrc/src 2013-05-02 15:48:35 UTC (rev 1957)
Property changes on: trunk/schemes/hrc/src
___________________________________________________________________
Modified: svn:mergeinfo
## -2,5 +2,5 ##
/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
+/branches/lazyeugene/hrc/src:1813-1856,1859-1931,1934-1956
/trunk/colorer/src/hrc:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1327
\ No newline at end of property
Modified: trunk/schemes/hrc/src/php/src/php.lst
===================================================================
--- trunk/schemes/hrc/src/php/src/php.lst 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes/hrc/src/php/src/php.lst 2013-05-02 15:48:35 UTC (rev 1957)
@@ -5959,6 +5959,8 @@
chr -- Return a specific character
chunk_split -- Split a string into smaller chunks
convert_cyr_string -- Convert from one Cyrillic character set to another
+convert_uudecode -- Decode a uuencoded string
+convert_uuencode -- Uuencode a string
count_chars -- Return information about characters used in a string
crc32 -- Calculates the crc32 polynomial of a string
crypt -- One-way string encryption (hashing)
@@ -5967,11 +5969,14 @@
get_html_translation_table -- Returns the translation table used by htmlspecialchars() and htmlentities()
hebrev -- Convert logical Hebrew text to visual text
hebrevc -- Convert logical Hebrew text to visual text with newline conversion
+hex2bin -- Decodes a hexadecimally encoded binary string
html_entity_decode -- Convert all HTML entities to their applicable characters
htmlentities -- Convert all applicable characters to HTML entities
htmlspecialchars -- Convert special characters to HTML entities
+htmlspecialchars_decode -- Convert special HTML entities back to characters
implode -- Join array elements with a string
join -- Alias of implode()
+lcfirst -- Make a string s first character lowercase
levenshtein -- Calculate Levenshtein distance between two strings
localeconv -- Get numeric formatting information
ltrim -- Strip whitespace from the beginning of a string
@@ -5986,6 +5991,7 @@
parse_str -- Parses the string into variables
printf -- Output a formatted string
quoted_printable_decode -- Convert a quoted-printable string to an 8 bit string
+quoted_printable_encode -- Convert a 8 bit string to a quoted-printable string
quotemeta -- Quote meta characters
rtrim -- Strip whitespace from the end of a string
setlocale -- Set locale information
@@ -5995,6 +6001,7 @@
soundex -- Calculate the soundex key of a string
sprintf -- Return a formatted string
sscanf -- Parses input from a string according to a format
+str_getcsv -- Parse a CSV string into an array
str_ireplace -- Case-insensitive version of str_replace().
str_pad -- Pad a string to a certain length with another string
str_repeat -- Repeat a string
@@ -6018,6 +6025,7 @@
strnatcmp -- String comparisons using a "natural order" algorithm
strncasecmp -- Binary safe case-insensitive string comparison of the first n characters
strncmp -- Binary safe string comparison of the first n characters
+strpbrk -- Search a string for any of a set of characters
strpos -- Find position of first occurrence of a string
strrchr -- Find the last occurrence of a character in a string
strrev -- Reverse a string
@@ -6036,6 +6044,7 @@
trim -- Strip whitespace from the beginning and end of a string
ucfirst -- Make a string's first character uppercase
ucwords -- Uppercase the first character of each word in a string
+vfprintf -- Write a formatted string to a stream
vprintf -- Output a formatted string
vsprintf -- Return a formatted string
wordwrap -- Wraps a string to a given number of characters using a string break character.
@@ -6636,6 +6645,7 @@
wddx_packet_start -- Starts a new WDDX packet with structure inside it
wddx_serialize_value -- Serialize a single value into a WDDX packet
wddx_serialize_vars -- Serialize variables into a WDDX packet
+
<!-- CXVI. XML Parser Functions -->
utf8_decode -- Converts a string with ISO-8859-1 characters encoded with UTF-8 to single-byte ISO-8859-1.
utf8_encode -- encodes an ISO-8859-1 string to UTF-8
@@ -6717,26 +6727,59 @@
XDIFF_PATCH_NORMAL (integer)
XDIFF_PATCH_REVERSE (integer)
+ <!-- CXIX. XSL Functions -->
+XSLTProcessor::getParameter -- Get value of a parameter
+XsltProcessor::getSecurityPrefs -- Get security preferences
+XSLTProcessor::hasExsltSupport -- Determine if PHP has EXSLT support
+XSLTProcessor::importStylesheet -- Import stylesheet
+XSLTProcessor::registerPHPFunctions -- Enables the ability to use PHP functions as XSLT functions
+XSLTProcessor::removeParameter -- Remove parameter
+XSLTProcessor::setParameter -- Set value for a parameter
+XSLTProcessor::setProfiling -- Sets profiling output file
+XsltProcessor::setSecurityPrefs -- Set security preferences
+XSLTProcessor::transformToDoc -- Transform to a DOMDocument
+XSLTProcessor::transformToUri -- Transform to URI
+XSLTProcessor::transformToXML -- Transform to XML
+
+XSL_CLONE_AUTO (integer)
+XSL_CLONE_NEVER (integer)
+XSL_CLONE_ALWAYS (integer)
+LIBXSLT_VERSION (integer)
+LIBXSLT_DOTTED_VERSION (string)
+LIBEXSLT_VERSION (integer)
+LIBEXSLT_DOTTED_VERSION (string)
+XSL_SECPREF_READ_FILE (integer)
+XSL_SECPREF_WRITE_FILE (integer)
+XSL_SECPREF_CREATE_DIRECTORY (integer)
+XSL_SECPREF_READ_NETWORK (integer)
+XSL_SECPREF_WRITE_NETWORK (integer)
<!-- CXIX. XSLT Functions -->
-xslt_create -- Create a new XSLT processor
-xslt_errno -- Returns an error number
-xslt_error -- Returns an error string
-xslt_free -- Free XSLT processor
-xslt_process -- Perform an XSLT transformation
-xslt_set_base -- Set the base URI for all XSLT transformations
-xslt_set_encoding -- Set the encoding for the parsing of XML documents
-xslt_set_error_handler -- Set an error handler for a XSLT processor
-xslt_set_log -- Set the log file to write log messages to
-xslt_set_sax_handler -- Set SAX handlers for a XSLT processor
-xslt_set_sax_handlers -- Set the SAX handlers to be called when the XML document gets processed
-xslt_set_scheme_handler -- Set Scheme handlers for a XSLT processor
-xslt_set_scheme_handlers -- Set the scheme handlers for the XSLT processor
+xslt_backend_info -- Returns the information on the compilation settings of the backend [deprecated]
+xslt_backend_name -- Returns the name of the backend [deprecated]
+xslt_backend_version -- Returns the version number of Sablotron [deprecated]
+xslt_create -- Create a new XSLT processor [deprecated]
+xslt_errno -- Returns an error number [deprecated]
+xslt_error -- Returns an error string [deprecated]
+xslt_free -- Free XSLT processor [deprecated]
+xslt_getopt -- Get options on a given xsl processor [deprecated]
+xslt_process -- Perform an XSLT transformation [deprecated]
+xslt_set_base -- Set the base URI for all XSLT transformations [deprecated]
+xslt_set_encoding -- Set the encoding for the parsing of XML documents [deprecated]
+xslt_set_error_handler -- Set an error handler for a XSLT processor [deprecated]
+xslt_set_log -- Set the log file to write log messages to [deprecated]
+xslt_set_object -- Sets the object in which to resolve callback functions [deprecated]
+xslt_set_sax_handler -- Set SAX handlers for a XSLT processor [deprecated]
+xslt_set_sax_handlers -- Set the SAX handlers to be called when the XML document gets processed [deprecated]
+xslt_set_scheme_handler -- Set Scheme handlers for a XSLT processor [deprecated]
+xslt_set_scheme_handlers -- Set the scheme handlers for the XSLT processor [deprecated]
+xslt_setopt -- Set options on a given XSLT processor [deprecated]
XSLT_OPT_SILENT (integer)
XSLT_SABOPT_PARSE_PUBLIC_ENTITIES (integer)
XSLT_SABOPT_DISABLE_ADDING_META (integer)
XSLT_SABOPT_DISABLE_STRIPPING (integer)
XSLT_SABOPT_IGNORE_DOC_NOT_FOUND (integer)
+XSLT_SABOPT_FILES_TO_HANDLER (integer)
XSLT_ERR_UNSUPPORTED_SCHEME (integer)
<!-- CXX. YAZ Functions -->
Modified: trunk/schemes/hrc/src/php/src/php.pl
===================================================================
--- trunk/schemes/hrc/src/php/src/php.pl 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes/hrc/src/php/src/php.pl 2013-05-02 15:48:35 UTC (rev 1957)
@@ -111,15 +111,13 @@
{
my $call = ($dl eq '::') ? 'static' : 'dynamic';
print "<method class='$class' call='$call' name='$method' decs='$bar'";
- print " depr='on'" if $depr;
- print "/>\n";
}
else
{
print "<function name='$foo' decs='$bar'";
- print " depr='on'" if $depr;
- print "/>\n";
}
+ print " depr='on'" if $depr;
+ print "/>\n";
}
print <<XMLE;
Index: trunk/schemes/hrc/test
===================================================================
--- trunk/schemes/hrc/test 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes/hrc/test 2013-05-02 15:48:35 UTC (rev 1957)
Property changes on: trunk/schemes/hrc/test
___________________________________________________________________
Modified: svn:mergeinfo
## -2,5 +2,5 ##
/branches/EFREMOV-BASE2/src/test/hrc:1029-1030
/branches/Efremov-hrc/hrc/test:1386-1399
/branches/TECHTONIK-HRC-REF/colorer/src/test/hrc:909-1221,1223-1240
-/branches/lazyeugene/hrc/test:1813-1931
+/branches/lazyeugene/hrc/test:1813-1850,1859-1931,1935-1956
/trunk/colorer/src/test/hrc:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1327
\ No newline at end of property
Index: trunk/schemes/hrd/hrd
===================================================================
--- trunk/schemes/hrd/hrd 2013-05-02 15:34:24 UTC (rev 1956)
+++ trunk/schemes/hrd/hrd 2013-05-02 15:48:35 UTC (rev 1957)
Property changes on: trunk/schemes/hrd/hrd
___________________________________________________________________
Modified: svn:mergeinfo
## -2,5 +2,5 ##
/branches/EFREMOV-BASE2/hrd:1029-1030
/branches/Efremov-hrc/hrd/hrd:1386-1399
/branches/TECHTONIK-HRC-REF/colorer/hrd:909-1221,1223-1240
-/branches/lazyeugene/hrd/hrd:1907
+/branches/lazyeugene/hrd/hrd:1907,1935-1956
/trunk/colorer/hrd:1180,1190-1193,1196,1200,1217-1219,1240,1242-1305,1327
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|