cvs: phpdoc(REF_STRUCT_DEV) /en/reference/pcre constants.xml pattern.modifiers.xml pattern.syntax.xml reference.xml
| From: | Hannes Magnusson | Date: | Sat, 27 Oct 2007 15:36:13 +0000 |
| Subject: | cvs: phpdoc(REF_STRUCT_DEV) /en/reference/pcre constants.xml pattern.modifiers.xml pattern.syntax.xml reference.xml | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-289@lists.php.net to get a copy of this message | ||
bjori Sat Oct 27 15:36:13 2007 UTC
Modified files: (Branch: REF_STRUCT_DEV)
/phpdoc/en/reference/pcre constants.xml pattern.modifiers.xml
pattern.syntax.xml reference.xml
Log:
Upgrade markup
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pcre/constants.xml?r1=1.13&r2=1.13.2.1&diff_format=u Index: phpdoc/en/reference/pcre/constants.xml diff -u phpdoc/en/reference/pcre/constants.xml:1.13 phpdoc/en/reference/pcre/constants.xml:1.13.2.1 --- phpdoc/en/reference/pcre/constants.xml:1.13 Fri Jul 27 11:22:04 2007 +++ phpdoc/en/reference/pcre/constants.xml Sat Oct 27 15:36:13 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.13 $ --> -<section xml:id="pcre.constants" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.13.2.1 $ --> +<appendix xml:id="pcre.constants" xmlns="http://docbook.org/ns/docbook"> &reftitle.constants; &extension.constants; <table> @@ -113,7 +113,7 @@ </tbody> </tgroup> </table> -</section> +</appendix> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pcre/pattern.modifiers.xml?r1=1.12&r2=1.12.2.1&diff_format=u Index: phpdoc/en/reference/pcre/pattern.modifiers.xml diff -u phpdoc/en/reference/pcre/pattern.modifiers.xml:1.12 phpdoc/en/reference/pcre/pattern.modifiers.xml:1.12.2.1 --- phpdoc/en/reference/pcre/pattern.modifiers.xml:1.12 Wed Jun 20 22:25:10 2007 +++ phpdoc/en/reference/pcre/pattern.modifiers.xml Sat Oct 27 15:36:13 2007 @@ -1,14 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.12 $ --> +<!-- $Revision: 1.12.2.1 $ --> <!-- splitted from ./en/functions/pcre.xml, last change in rev 1.2 --> -<refentry xml:id="reference.pcre.pattern.modifiers" xmlns="http://docbook.org/ns/docbook"> - <refnamediv> - <refname>Pattern Modifiers</refname> - <refpurpose>Describes possible modifiers in regex - patterns</refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> +<article xml:id="reference.pcre.pattern.modifiers" xmlns="http://docbook.org/ns/docbook"> + <title>Pattern Modifiers</title> + <titleabbrev>Describes possible modifiers in regex patterns</titleabbrev> <para> The current possible PCRE modifiers are listed below. The names in parentheses refer to internal PCRE names for these modifiers. @@ -187,8 +182,7 @@ </variablelist> </blockquote> </para> - </refsect1> -</refentry> +</article> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pcre/pattern.syntax.xml?r1=1.15.2.2&r2=1.15.2.3&diff_format=u Index: phpdoc/en/reference/pcre/pattern.syntax.xml diff -u phpdoc/en/reference/pcre/pattern.syntax.xml:1.15.2.2 phpdoc/en/reference/pcre/pattern.syntax.xml:1.15.2.3 --- phpdoc/en/reference/pcre/pattern.syntax.xml:1.15.2.2 Wed Oct 3 11:41:13 2007 +++ phpdoc/en/reference/pcre/pattern.syntax.xml Sat Oct 27 15:36:13 2007 @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.15.2.2 $ --> +<!-- $Revision: 1.15.2.3 $ --> <!-- splitted from ./en/functions/pcre.xml, last change in rev 1.2 --> - <refentry xml:id="reference.pcre.pattern.syntax" xmlns="http://docbook.org/ns/docbook"> - <refnamediv> - <refname>Pattern Syntax</refname> - <refpurpose>Describes PCRE regex syntax</refpurpose> - </refnamediv> +<chapter xml:id="reference.pcre.pattern.syntax" xmlns="http://docbook.org/ns/docbook"> + <title>Pattern Syntax</title> + <titleabbrev>Describes PCRE regex syntax</titleabbrev> - <refsect1> + <section xml:id="pcre.pattern.syntax.description"> <title>Description</title> <simpara> The PCRE library is a set of functions that implement regular @@ -15,9 +13,9 @@ as Perl 5, with just a few differences (see below). The current implementation corresponds to Perl 5.005. </simpara> - </refsect1> + </section> - <refsect1> + <section xml:id="pcre.pattern.syntax.differences"> <title>Differences From Perl</title> <para> The differences described here are with respect to Perl 5.005. @@ -147,11 +145,11 @@ </listitem> </orderedlist> </para> - </refsect1> + </section> - <refsect1 xml:id="regexp.reference"> + <section xml:id="regexp.reference"> <title>Regular Expression Details</title> - <refsect2 xml:id="regexp.introduction"> + <section xml:id="regexp.introduction"> <title>Introduction</title> <para> The syntax and semantics of the regular expressions @@ -171,8 +169,8 @@ matches a portion of a subject string that is identical to itself. </para> - </refsect2> - <refsect2 xml:id="regexp.reference.meta"> + </section> + <section xml:id="regexp.reference.meta"> <title>Meta-characters</title> <para> The power of regular expressions comes from the @@ -271,9 +269,9 @@ The following sections describe the use of each of the meta-characters. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.backslash"> + <section xml:id="regexp.reference.backslash"> <title>Backslash</title> <para> The backslash character has several uses. Firstly, if it is @@ -609,9 +607,9 @@ the string. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.unicode"> + <section xml:id="regexp.reference.unicode"> <title>Unicode character properties</title> <para> Since PHP 4.4.0 and 5.1.0, three @@ -719,9 +717,9 @@ characters. That is why the traditional escape sequences such as <literal>\d</literal> and <literal>\w</literal> do not use Unicode properties in PCRE. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.circudollar"> + <section xml:id="regexp.reference.circudollar"> <title>Circumflex and dollar</title> <para> Outside a character class, in the default matching mode, the @@ -778,9 +776,9 @@ branches of a pattern start with \A is it always anchored, whether <link linkend="reference.pcre.pattern.modifiers">PCRE_MULTILINE</link> is set or not. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.dot"> + <section xml:id="regexp.reference.dot"> <title>Full stop</title> <para> Outside a character class, a dot in the pattern matches any @@ -798,9 +796,9 @@ in <emphasis>UTF-8 mode</emphasis> where full stop matches the whole character which can consist of multiple bytes. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.squarebrackets"> + <section xml:id="regexp.reference.squarebrackets"> <title>Square brackets</title> <para> An opening square bracket introduces a character class, @@ -888,9 +886,9 @@ start) and the terminating ] are non-special in character classes, but it does no harm if they are escaped. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.verticalbar"> + <section xml:id="regexp.reference.verticalbar"> <title>Vertical bar</title> <para> Vertical bar characters are used to separate alternative @@ -905,9 +903,9 @@ rest of the main pattern as well as the alternative in the subpattern. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.internal-options"> + <section xml:id="regexp.reference.internal-options"> <title>Internal option setting</title> <para> The settings of <link linkend="reference.pcre.pattern.modifiers">PCRE_CASELESS</link>, @@ -1004,9 +1002,9 @@ the pattern than any of the additional features it turns on, even when it is at top level. It is best put at the start. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.subpatterns"> + <section xml:id="regexp.reference.subpatterns"> <title>Subpatterns</title> <para> Subpatterns are delimited by parentheses (round brackets), @@ -1085,9 +1083,9 @@ contain the match indexed by the string alongside the match indexed by a number, then. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.repetition"> + <section xml:id="regexp.reference.repetition"> <title>Repetition</title> <para> Repetition is specified by quantifiers, which can follow any @@ -1261,9 +1259,9 @@ matches "aba" the value of the second captured substring is "b". </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.back-references"> + <section xml:id="regexp.reference.back-references"> <title>Back references</title> <para> Outside a character class, a backslash followed by a digit @@ -1331,9 +1329,9 @@ reference. This can be done using alternation, as in the example above, or by a quantifier with a minimum of zero. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.assertions"> + <section xml:id="regexp.reference.assertions"> <title>Assertions</title> <para> An assertion is a test on the characters following or @@ -1460,9 +1458,9 @@ Assertions count towards the maximum of 200 parenthesized subpatterns. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.onlyonce"> + <section xml:id="regexp.reference.onlyonce"> <title>Once-only subpatterns</title> <para> With both maximizing and minimizing repetition, failure of @@ -1576,9 +1574,9 @@ sequences of non-digits cannot be broken, and failure happens quickly. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.conditional"> + <section xml:id="regexp.reference.conditional"> <title>Conditional subpatterns</title> <para> It is possible to cause the matching process to obey a subpattern @@ -1650,9 +1648,9 @@ one of the two forms dd-aaa-dd or dd-dd-dd, where aaa are letters and dd are digits. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.comments"> + <section xml:id="regexp.reference.comments"> <title>Comments</title> <para> The sequence (?# marks the start of a comment which @@ -1665,9 +1663,9 @@ outside a character class introduces a comment that continues up to the next newline character in the pattern. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.recursive"> + <section xml:id="regexp.reference.recursive"> <title>Recursive patterns</title> <para> Consider the problem of matching a string in parentheses, @@ -1757,9 +1755,9 @@ processed by certain patterns. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.performances"> + <section xml:id="regexp.reference.performances"> <title>Performances</title> <para> Certain items that may appear in patterns are more efficient @@ -1831,9 +1829,9 @@ whereas the latter takes an appreciable time with strings longer than about 20 characters. </para> - </refsect2> - </refsect1> - </refentry> + </section> + </section> + </chapter> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pcre/reference.xml?r1=1.18.2.1&r2=1.18.2.2&diff_format=u Index: phpdoc/en/reference/pcre/reference.xml diff -u phpdoc/en/reference/pcre/reference.xml:1.18.2.1 phpdoc/en/reference/pcre/reference.xml:1.18.2.2 --- phpdoc/en/reference/pcre/reference.xml:1.18.2.1 Wed Oct 3 11:41:13 2007 +++ phpdoc/en/reference/pcre/reference.xml Sat Oct 27 15:36:13 2007 @@ -1,108 +1,122 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.18.2.1 $ --> +<!-- $Revision: 1.18.2.2 $ --> <!-- Purpose: basic.text --> <!-- Membership: bundled --> -<reference xml:id="ref.pcre" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> - <title>Regular Expression Functions (Perl-Compatible)</title> - <titleabbrev>PCRE</titleabbrev> - - <partintro> - <section xml:id="pcre.intro"> - &reftitle.intro; - <para> - The syntax for patterns used in these functions closely resembles - Perl. The expression should be enclosed in the delimiters, a - forward slash (/), for example. Any character can be used for - delimiter as long as it's not alphanumeric or backslash (\). If - the delimiter character has to be used in the expression itself, - it needs to be escaped by backslash. Since PHP 4.0.4, you can also use - Perl-style (), {}, [], and <> matching delimiters. - See <link linkend="reference.pcre.pattern.syntax">Pattern Syntax</link> - for detailed explanation. - </para> - <para> - The ending delimiter may be followed by various modifiers that - affect the matching. - See <link linkend="reference.pcre.pattern.modifiers">Pattern - Modifiers</link>. - </para> - <para> - PHP also supports regular expressions using a POSIX-extended syntax - using the <link linkend="ref.regex">POSIX-extended regex functions</link>. - </para> - <note> - <para> - This extension maintains a global per-thread cache of compiled regular - expressions (up to 4096). - </para> - </note> - <warning> - <para> - You should be aware of some limitations of PCRE. Read <link - xlink:href="&url.pcre.man;">&url.pcre.man;</link> for more info. - </para> - </warning> - </section> - - <section xml:id="pcre.requirements"> - &reftitle.required; - &no.requirement; - </section> - - &reference.pcre.configure; - &reference.pcre.ini; - - <section xml:id="pcre.resources"> - &reftitle.resources; - &no.resource; - </section> - - &reference.pcre.constants; - - <section xml:id="pcre.examples"> - &reftitle.examples; - <para> - <example> - <title>Examples of valid patterns</title> - <itemizedlist> - <listitem><simpara><literal>/<\/\w+>/</literal></simpara></listitem> - <listitem><simpara><literal>|(\d{3})-\d+|Sm</literal></simpara></listitem> - <listitem><simpara><literal>/^(?i)php[34]/</literal></simpara></listitem> - <listitem><simpara><literal>{^\s+(\s+)?$}</literal></simpara></listitem> - </itemizedlist> - </example> - </para> - <para> - <example> - <title>Examples of invalid patterns</title> - <itemizedlist> - <listitem> - <simpara> - <literal>/href='(.*)'</literal> - missing ending delimiter - </simpara> - </listitem> - <listitem> - <simpara> - <literal>/\w+\s*\w+/J</literal> - unknown modifier 'J' - </simpara> - </listitem> - <listitem> - <simpara> - <literal>1-\d3-\d3-\d4|</literal> - missing starting delimiter - </simpara> - </listitem> - </itemizedlist> - </example> - </para> - </section> - </partintro> - -&reference.pcre.pattern.modifiers; -&reference.pcre.pattern.syntax; -&reference.pcre.functions.entities; +<book xml:id="ref.pcre" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>Regular Expression Functions (Perl-Compatible)</title> + <titleabbrev>PCRE</titleabbrev> + + <preface xml:id="pcre.intro"> + &reftitle.intro; + <para> + The syntax for patterns used in these functions closely resembles + Perl. The expression should be enclosed in the delimiters, a + forward slash (/), for example. Any character can be used for + delimiter as long as it's not alphanumeric or backslash (\). If + the delimiter character has to be used in the expression itself, + it needs to be escaped by backslash. Since PHP 4.0.4, you can also use + Perl-style (), {}, [], and <> matching delimiters. + See <link linkend="reference.pcre.pattern.syntax">Pattern Syntax</link> + for detailed explanation. + </para> + <para> + The ending delimiter may be followed by various modifiers that + affect the matching. + See <link linkend="reference.pcre.pattern.modifiers">Pattern + Modifiers</link>. + </para> + <para> + PHP also supports regular expressions using a POSIX-extended syntax + using the <link linkend="ref.regex">POSIX-extended regex functions</link>. + </para> + <note> + <para> + This extension maintains a global per-thread cache of compiled regular + expressions (up to 4096). + </para> + </note> + <warning> + <para> + You should be aware of some limitations of PCRE. Read <link + xlink:href="&url.pcre.man;">&url.pcre.man;</link> for more info. + </para> + </warning> + </preface> + + <chapter xml:id="pcre.setup"> + <title>Installing/Configuring</title> + + <section xml:id="pcre.requirements"> + &reftitle.required; + &no.requirement; + </section> + + &reference.pcre.configure; + + &reference.pcre.ini; + + <section xml:id="pcre.resources"> + &reftitle.resources; + &no.resource; + </section> + + </chapter> + + &reference.pcre.constants; + + <appendix xml:id="pcre.examples"> + &reftitle.examples; + <para> + <example> + <title>Examples of valid patterns</title> + <itemizedlist> + <listitem><simpara><literal>/<\/\w+>/</literal></simpara></listitem> + <listitem><simpara><literal>|(\d{3})-\d+|Sm</literal></simpara></listitem> + <listitem><simpara><literal>/^(?i)php[34]/</literal></simpara></listitem> + <listitem><simpara><literal>{^\s+(\s+)?$}</literal></simpara></listitem> + </itemizedlist> + </example> + </para> + <para> + <example> + <title>Examples of invalid patterns</title> + <itemizedlist> + <listitem> + <simpara> + <literal>/href='(.*)'</literal> - missing ending delimiter + </simpara> + </listitem> + <listitem> + <simpara> + <literal>/\w+\s*\w+/J</literal> - unknown modifier 'J' + </simpara> + </listitem> + <listitem> + <simpara> + <literal>1-\d3-\d3-\d4|</literal> - missing starting delimiter + </simpara> + </listitem> + </itemizedlist> + </example> + </para> + </appendix> + + <part xml:id="pcre.pattern"> + <title>PCRE Patterns</title> + + &reference.pcre.pattern.modifiers; + &reference.pcre.pattern.syntax; + + </part> -</reference> + <reference xml:id="pcre.functions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>PCRE functions</title> + + &reference.pcre.functions.entities; + + </reference> +</book> <!-- Keep this comment at the end of the file Local variables:
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pcre/constants.xml?r1=1.13&r2=1.13.2.1&diff_format=u Index: phpdoc/en/reference/pcre/constants.xml diff -u phpdoc/en/reference/pcre/constants.xml:1.13 phpdoc/en/reference/pcre/constants.xml:1.13.2.1 --- phpdoc/en/reference/pcre/constants.xml:1.13 Fri Jul 27 11:22:04 2007 +++ phpdoc/en/reference/pcre/constants.xml Sat Oct 27 15:36:13 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.13 $ --> -<section xml:id="pcre.constants" xmlns="http://docbook.org/ns/docbook"> +<!-- $Revision: 1.13.2.1 $ --> +<appendix xml:id="pcre.constants" xmlns="http://docbook.org/ns/docbook"> &reftitle.constants; &extension.constants; <table> @@ -113,7 +113,7 @@ </tbody> </tgroup> </table> -</section> +</appendix> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pcre/pattern.modifiers.xml?r1=1.12&r2=1.12.2.1&diff_format=u Index: phpdoc/en/reference/pcre/pattern.modifiers.xml diff -u phpdoc/en/reference/pcre/pattern.modifiers.xml:1.12 phpdoc/en/reference/pcre/pattern.modifiers.xml:1.12.2.1 --- phpdoc/en/reference/pcre/pattern.modifiers.xml:1.12 Wed Jun 20 22:25:10 2007 +++ phpdoc/en/reference/pcre/pattern.modifiers.xml Sat Oct 27 15:36:13 2007 @@ -1,14 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.12 $ --> +<!-- $Revision: 1.12.2.1 $ --> <!-- splitted from ./en/functions/pcre.xml, last change in rev 1.2 --> -<refentry xml:id="reference.pcre.pattern.modifiers" xmlns="http://docbook.org/ns/docbook"> - <refnamediv> - <refname>Pattern Modifiers</refname> - <refpurpose>Describes possible modifiers in regex - patterns</refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> +<article xml:id="reference.pcre.pattern.modifiers" xmlns="http://docbook.org/ns/docbook"> + <title>Pattern Modifiers</title> + <titleabbrev>Describes possible modifiers in regex patterns</titleabbrev> <para> The current possible PCRE modifiers are listed below. The names in parentheses refer to internal PCRE names for these modifiers. @@ -187,8 +182,7 @@ </variablelist> </blockquote> </para> - </refsect1> -</refentry> +</article> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pcre/pattern.syntax.xml?r1=1.15.2.2&r2=1.15.2.3&diff_format=u Index: phpdoc/en/reference/pcre/pattern.syntax.xml diff -u phpdoc/en/reference/pcre/pattern.syntax.xml:1.15.2.2 phpdoc/en/reference/pcre/pattern.syntax.xml:1.15.2.3 --- phpdoc/en/reference/pcre/pattern.syntax.xml:1.15.2.2 Wed Oct 3 11:41:13 2007 +++ phpdoc/en/reference/pcre/pattern.syntax.xml Sat Oct 27 15:36:13 2007 @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.15.2.2 $ --> +<!-- $Revision: 1.15.2.3 $ --> <!-- splitted from ./en/functions/pcre.xml, last change in rev 1.2 --> - <refentry xml:id="reference.pcre.pattern.syntax" xmlns="http://docbook.org/ns/docbook"> - <refnamediv> - <refname>Pattern Syntax</refname> - <refpurpose>Describes PCRE regex syntax</refpurpose> - </refnamediv> +<chapter xml:id="reference.pcre.pattern.syntax" xmlns="http://docbook.org/ns/docbook"> + <title>Pattern Syntax</title> + <titleabbrev>Describes PCRE regex syntax</titleabbrev> - <refsect1> + <section xml:id="pcre.pattern.syntax.description"> <title>Description</title> <simpara> The PCRE library is a set of functions that implement regular @@ -15,9 +13,9 @@ as Perl 5, with just a few differences (see below). The current implementation corresponds to Perl 5.005. </simpara> - </refsect1> + </section> - <refsect1> + <section xml:id="pcre.pattern.syntax.differences"> <title>Differences From Perl</title> <para> The differences described here are with respect to Perl 5.005. @@ -147,11 +145,11 @@ </listitem> </orderedlist> </para> - </refsect1> + </section> - <refsect1 xml:id="regexp.reference"> + <section xml:id="regexp.reference"> <title>Regular Expression Details</title> - <refsect2 xml:id="regexp.introduction"> + <section xml:id="regexp.introduction"> <title>Introduction</title> <para> The syntax and semantics of the regular expressions @@ -171,8 +169,8 @@ matches a portion of a subject string that is identical to itself. </para> - </refsect2> - <refsect2 xml:id="regexp.reference.meta"> + </section> + <section xml:id="regexp.reference.meta"> <title>Meta-characters</title> <para> The power of regular expressions comes from the @@ -271,9 +269,9 @@ The following sections describe the use of each of the meta-characters. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.backslash"> + <section xml:id="regexp.reference.backslash"> <title>Backslash</title> <para> The backslash character has several uses. Firstly, if it is @@ -609,9 +607,9 @@ the string. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.unicode"> + <section xml:id="regexp.reference.unicode"> <title>Unicode character properties</title> <para> Since PHP 4.4.0 and 5.1.0, three @@ -719,9 +717,9 @@ characters. That is why the traditional escape sequences such as <literal>\d</literal> and <literal>\w</literal> do not use Unicode properties in PCRE. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.circudollar"> + <section xml:id="regexp.reference.circudollar"> <title>Circumflex and dollar</title> <para> Outside a character class, in the default matching mode, the @@ -778,9 +776,9 @@ branches of a pattern start with \A is it always anchored, whether <link linkend="reference.pcre.pattern.modifiers">PCRE_MULTILINE</link> is set or not. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.dot"> + <section xml:id="regexp.reference.dot"> <title>Full stop</title> <para> Outside a character class, a dot in the pattern matches any @@ -798,9 +796,9 @@ in <emphasis>UTF-8 mode</emphasis> where full stop matches the whole character which can consist of multiple bytes. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.squarebrackets"> + <section xml:id="regexp.reference.squarebrackets"> <title>Square brackets</title> <para> An opening square bracket introduces a character class, @@ -888,9 +886,9 @@ start) and the terminating ] are non-special in character classes, but it does no harm if they are escaped. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.verticalbar"> + <section xml:id="regexp.reference.verticalbar"> <title>Vertical bar</title> <para> Vertical bar characters are used to separate alternative @@ -905,9 +903,9 @@ rest of the main pattern as well as the alternative in the subpattern. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.internal-options"> + <section xml:id="regexp.reference.internal-options"> <title>Internal option setting</title> <para> The settings of <link linkend="reference.pcre.pattern.modifiers">PCRE_CASELESS</link>, @@ -1004,9 +1002,9 @@ the pattern than any of the additional features it turns on, even when it is at top level. It is best put at the start. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.subpatterns"> + <section xml:id="regexp.reference.subpatterns"> <title>Subpatterns</title> <para> Subpatterns are delimited by parentheses (round brackets), @@ -1085,9 +1083,9 @@ contain the match indexed by the string alongside the match indexed by a number, then. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.repetition"> + <section xml:id="regexp.reference.repetition"> <title>Repetition</title> <para> Repetition is specified by quantifiers, which can follow any @@ -1261,9 +1259,9 @@ matches "aba" the value of the second captured substring is "b". </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.back-references"> + <section xml:id="regexp.reference.back-references"> <title>Back references</title> <para> Outside a character class, a backslash followed by a digit @@ -1331,9 +1329,9 @@ reference. This can be done using alternation, as in the example above, or by a quantifier with a minimum of zero. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.assertions"> + <section xml:id="regexp.reference.assertions"> <title>Assertions</title> <para> An assertion is a test on the characters following or @@ -1460,9 +1458,9 @@ Assertions count towards the maximum of 200 parenthesized subpatterns. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.onlyonce"> + <section xml:id="regexp.reference.onlyonce"> <title>Once-only subpatterns</title> <para> With both maximizing and minimizing repetition, failure of @@ -1576,9 +1574,9 @@ sequences of non-digits cannot be broken, and failure happens quickly. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.conditional"> + <section xml:id="regexp.reference.conditional"> <title>Conditional subpatterns</title> <para> It is possible to cause the matching process to obey a subpattern @@ -1650,9 +1648,9 @@ one of the two forms dd-aaa-dd or dd-dd-dd, where aaa are letters and dd are digits. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.comments"> + <section xml:id="regexp.reference.comments"> <title>Comments</title> <para> The sequence (?# marks the start of a comment which @@ -1665,9 +1663,9 @@ outside a character class introduces a comment that continues up to the next newline character in the pattern. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.recursive"> + <section xml:id="regexp.reference.recursive"> <title>Recursive patterns</title> <para> Consider the problem of matching a string in parentheses, @@ -1757,9 +1755,9 @@ processed by certain patterns. </para> - </refsect2> + </section> - <refsect2 xml:id="regexp.reference.performances"> + <section xml:id="regexp.reference.performances"> <title>Performances</title> <para> Certain items that may appear in patterns are more efficient @@ -1831,9 +1829,9 @@ whereas the latter takes an appreciable time with strings longer than about 20 characters. </para> - </refsect2> - </refsect1> - </refentry> + </section> + </section> + </chapter> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pcre/reference.xml?r1=1.18.2.1&r2=1.18.2.2&diff_format=u Index: phpdoc/en/reference/pcre/reference.xml diff -u phpdoc/en/reference/pcre/reference.xml:1.18.2.1 phpdoc/en/reference/pcre/reference.xml:1.18.2.2 --- phpdoc/en/reference/pcre/reference.xml:1.18.2.1 Wed Oct 3 11:41:13 2007 +++ phpdoc/en/reference/pcre/reference.xml Sat Oct 27 15:36:13 2007 @@ -1,108 +1,122 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.18.2.1 $ --> +<!-- $Revision: 1.18.2.2 $ --> <!-- Purpose: basic.text --> <!-- Membership: bundled --> -<reference xml:id="ref.pcre" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> - <title>Regular Expression Functions (Perl-Compatible)</title> - <titleabbrev>PCRE</titleabbrev> - - <partintro> - <section xml:id="pcre.intro"> - &reftitle.intro; - <para> - The syntax for patterns used in these functions closely resembles - Perl. The expression should be enclosed in the delimiters, a - forward slash (/), for example. Any character can be used for - delimiter as long as it's not alphanumeric or backslash (\). If - the delimiter character has to be used in the expression itself, - it needs to be escaped by backslash. Since PHP 4.0.4, you can also use - Perl-style (), {}, [], and <> matching delimiters. - See <link linkend="reference.pcre.pattern.syntax">Pattern Syntax</link> - for detailed explanation. - </para> - <para> - The ending delimiter may be followed by various modifiers that - affect the matching. - See <link linkend="reference.pcre.pattern.modifiers">Pattern - Modifiers</link>. - </para> - <para> - PHP also supports regular expressions using a POSIX-extended syntax - using the <link linkend="ref.regex">POSIX-extended regex functions</link>. - </para> - <note> - <para> - This extension maintains a global per-thread cache of compiled regular - expressions (up to 4096). - </para> - </note> - <warning> - <para> - You should be aware of some limitations of PCRE. Read <link - xlink:href="&url.pcre.man;">&url.pcre.man;</link> for more info. - </para> - </warning> - </section> - - <section xml:id="pcre.requirements"> - &reftitle.required; - &no.requirement; - </section> - - &reference.pcre.configure; - &reference.pcre.ini; - - <section xml:id="pcre.resources"> - &reftitle.resources; - &no.resource; - </section> - - &reference.pcre.constants; - - <section xml:id="pcre.examples"> - &reftitle.examples; - <para> - <example> - <title>Examples of valid patterns</title> - <itemizedlist> - <listitem><simpara><literal>/<\/\w+>/</literal></simpara></listitem> - <listitem><simpara><literal>|(\d{3})-\d+|Sm</literal></simpara></listitem> - <listitem><simpara><literal>/^(?i)php[34]/</literal></simpara></listitem> - <listitem><simpara><literal>{^\s+(\s+)?$}</literal></simpara></listitem> - </itemizedlist> - </example> - </para> - <para> - <example> - <title>Examples of invalid patterns</title> - <itemizedlist> - <listitem> - <simpara> - <literal>/href='(.*)'</literal> - missing ending delimiter - </simpara> - </listitem> - <listitem> - <simpara> - <literal>/\w+\s*\w+/J</literal> - unknown modifier 'J' - </simpara> - </listitem> - <listitem> - <simpara> - <literal>1-\d3-\d3-\d4|</literal> - missing starting delimiter - </simpara> - </listitem> - </itemizedlist> - </example> - </para> - </section> - </partintro> - -&reference.pcre.pattern.modifiers; -&reference.pcre.pattern.syntax; -&reference.pcre.functions.entities; +<book xml:id="ref.pcre" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>Regular Expression Functions (Perl-Compatible)</title> + <titleabbrev>PCRE</titleabbrev> + + <preface xml:id="pcre.intro"> + &reftitle.intro; + <para> + The syntax for patterns used in these functions closely resembles + Perl. The expression should be enclosed in the delimiters, a + forward slash (/), for example. Any character can be used for + delimiter as long as it's not alphanumeric or backslash (\). If + the delimiter character has to be used in the expression itself, + it needs to be escaped by backslash. Since PHP 4.0.4, you can also use + Perl-style (), {}, [], and <> matching delimiters. + See <link linkend="reference.pcre.pattern.syntax">Pattern Syntax</link> + for detailed explanation. + </para> + <para> + The ending delimiter may be followed by various modifiers that + affect the matching. + See <link linkend="reference.pcre.pattern.modifiers">Pattern + Modifiers</link>. + </para> + <para> + PHP also supports regular expressions using a POSIX-extended syntax + using the <link linkend="ref.regex">POSIX-extended regex functions</link>. + </para> + <note> + <para> + This extension maintains a global per-thread cache of compiled regular + expressions (up to 4096). + </para> + </note> + <warning> + <para> + You should be aware of some limitations of PCRE. Read <link + xlink:href="&url.pcre.man;">&url.pcre.man;</link> for more info. + </para> + </warning> + </preface> + + <chapter xml:id="pcre.setup"> + <title>Installing/Configuring</title> + + <section xml:id="pcre.requirements"> + &reftitle.required; + &no.requirement; + </section> + + &reference.pcre.configure; + + &reference.pcre.ini; + + <section xml:id="pcre.resources"> + &reftitle.resources; + &no.resource; + </section> + + </chapter> + + &reference.pcre.constants; + + <appendix xml:id="pcre.examples"> + &reftitle.examples; + <para> + <example> + <title>Examples of valid patterns</title> + <itemizedlist> + <listitem><simpara><literal>/<\/\w+>/</literal></simpara></listitem> + <listitem><simpara><literal>|(\d{3})-\d+|Sm</literal></simpara></listitem> + <listitem><simpara><literal>/^(?i)php[34]/</literal></simpara></listitem> + <listitem><simpara><literal>{^\s+(\s+)?$}</literal></simpara></listitem> + </itemizedlist> + </example> + </para> + <para> + <example> + <title>Examples of invalid patterns</title> + <itemizedlist> + <listitem> + <simpara> + <literal>/href='(.*)'</literal> - missing ending delimiter + </simpara> + </listitem> + <listitem> + <simpara> + <literal>/\w+\s*\w+/J</literal> - unknown modifier 'J' + </simpara> + </listitem> + <listitem> + <simpara> + <literal>1-\d3-\d3-\d4|</literal> - missing starting delimiter + </simpara> + </listitem> + </itemizedlist> + </example> + </para> + </appendix> + + <part xml:id="pcre.pattern"> + <title>PCRE Patterns</title> + + &reference.pcre.pattern.modifiers; + &reference.pcre.pattern.syntax; + + </part> -</reference> + <reference xml:id="pcre.functions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>PCRE functions</title> + + &reference.pcre.functions.entities; + + </reference> +</book> <!-- Keep this comment at the end of the file Local variables: