cvs: phpdoc-ja /reference/datetime/functions date.xml /reference/filesystem/functions file-get-contents.xml /reference/image/functions
imagecopyresampled.xml /reference/kadm5/functions kadm5-modify-principal.xml /reference/mysqli/functions mysqli-stmt-bind-result.xml /reference/pdf
configure.xml /reference/strings/functions htmlspecialchars.xml strlen.xml

takagi Sat Aug 5 21:48:23 2006 UTC Modified files: /phpdoc-ja/reference/strings/functions strlen.xml htmlspecialchars.xml /phpdoc-ja/reference/pdf configure.xml /phpdoc-ja/reference/mysqli/functions mysqli-stmt-bind-result.xml /phpdoc-ja/reference/kadm5/functions kadm5-modify-principal.xml /phpdoc-ja/reference/image/functions imagecopyresampled.xml /phpdoc-ja/reference/filesystem/functions file-get-contents.xml /phpdoc-ja/reference/datetime/functions date.xml Log: sync with en.

http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/strings/functions/strlen.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc-ja/reference/strings/functions/strlen.xml diff -u phpdoc-ja/reference/strings/functions/strlen.xml:1.4 phpdoc-ja/reference/strings/functions/strlen.xml:1.5 --- phpdoc-ja/reference/strings/functions/strlen.xml:1.4 Fri Apr 29 10:07:39 2005 +++ phpdoc-ja/reference/strings/functions/strlen.xml Sat Aug 5 21:48:23 2006 @@ -1,24 +1,54 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- splitted from ./ja/functions/strings.xml, last change in rev 1.1 --> -<!-- EN-Revision: 1.5 Maintainer: hirokawa Status: ready --> - <refentry id="function.strlen"> - <refnamediv> - <refname>strlen</refname> - <refpurpose>文字列の長さを得る</refpurpose> - </refnamediv> - <refsect1> - <title>説明</title> - <methodsynopsis> - <type>int</type><methodname>strlen</methodname> - <methodparam><type>string</type><parameter>string</parameter></methodparam> - </methodsynopsis> - <para> - 与えられた <parameter>string</parameter> の長さを返します。 - </para> - <para> - <example> - <title>A <function>strlen</function> の例</title> - <programlisting role="php"> +<!-- $Revision: 1.5 $ --> +<!-- EN-Revision: 1.7 Maintainer: hirokawa Status: ready --> +<refentry id="function.strlen"> + <refnamediv> + <refname>strlen</refname> + <refpurpose>文字列の長さを得る</refpurpose> + </refnamediv> + + <refsect1 role="description"> + &reftitle.description; + <methodsynopsis> + <type>int</type><methodname>strlen</methodname> + <methodparam><type>string</type><parameter>string</parameter></methodparam> + </methodsynopsis> + <para> + 与えられた <parameter>string</parameter> の長さを返します。 + </para> + </refsect1> + + <refsect1 role="parameters"> + &reftitle.parameters; + <para> + <variablelist> + <varlistentry> + <term><parameter>string</parameter></term> + <listitem> + <para> + 長さを調べる文字列。 + </para> + </listitem> + </varlistentry> + </variablelist> + </para> + </refsect1> + + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + 成功した場合に <parameter>string</parameter> の長さ、 + <parameter>string</parameter> が空の文字列だった場合に + <literal>0</literal> を返します。 + </para> + </refsect1> + + <refsect1 role="examples"> + &reftitle.examples; + <para> + <example> + <title><function>strlen</function> の例</title> + <programlisting role="php"> <![CDATA[ <?php $str = 'abcdef'; @@ -28,15 +58,21 @@ echo strlen($str); // 7 ?> ]]> - </programlisting> - </example> - </para> - <para> - <function>count</function> と <function>mb_strlen</function> - も参照してください。 - </para> - </refsect1> - </refentry> + </programlisting> + </example> + </para> + </refsect1> + + <refsect1 role="seealso"> + &reftitle.seealso; + <para> + <simplelist> + <member><function>count</function></member> + <member><function>mb_strlen</function></member> + </simplelist> + </para> + </refsect1> +</refentry> <!-- Keep this comment at the end of the file Local variables: http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/strings/functions/htmlspecialchars.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc-ja/reference/strings/functions/htmlspecialchars.xml diff -u phpdoc-ja/reference/strings/functions/htmlspecialchars.xml:1.6 phpdoc-ja/reference/strings/functions/htmlspecialchars.xml:1.7 --- phpdoc-ja/reference/strings/functions/htmlspecialchars.xml:1.6 Tue Feb 28 21:24:43 2006 +++ phpdoc-ja/reference/strings/functions/htmlspecialchars.xml Sat Aug 5 21:48:23 2006 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./ja/functions/strings.xml, last change in rev 1.1 --> -<!-- EN-Revision: 1.7 Maintainer: hirokawa Status: ready --> +<!-- EN-Revision: 1.8 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry id="function.htmlspecialchars"> <refnamediv> @@ -102,6 +102,7 @@ &reference.strings.charsets; <para> <function>get_html_translation_table</function>, + <function>htmlspecialchars_decode</function>, <function>strip_tags</function>, <function>htmlentities</function>, <function>nl2br</function> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/pdf/configure.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc-ja/reference/pdf/configure.xml diff -u phpdoc-ja/reference/pdf/configure.xml:1.5 phpdoc-ja/reference/pdf/configure.xml:1.6 --- phpdoc-ja/reference/pdf/configure.xml:1.5 Fri Mar 24 20:04:56 2006 +++ phpdoc-ja/reference/pdf/configure.xml Sat Aug 5 21:48:23 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> -<!-- EN-Revision: 1.4 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.6 $ --> +<!-- EN-Revision: 1.5 Maintainer: hirokawa Status: ready --> <section id="pdf.installation"> &reftitle.install; <para> @@ -15,11 +15,6 @@ のベースインストールディレクトリで、デフォルトは <filename>/usr/local</filename> です。 </para> - <para> - PHP 4.3.9 以降、この拡張モジュールは以下のコマンドで <ulink - url="&url.php.pear;">PEAR</ulink> からインストールする必要があります。 - <command>pear install pdflib</command> - </para> </section> <!-- Keep this comment at the end of the file http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/mysqli/functions/mysqli-stmt-bind-result.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/mysqli/functions/mysqli-stmt-bind-result.xml diff -u phpdoc-ja/reference/mysqli/functions/mysqli-stmt-bind-result.xml:1.1 phpdoc-ja/reference/mysqli/functions/mysqli-stmt-bind-result.xml:1.2 --- phpdoc-ja/reference/mysqli/functions/mysqli-stmt-bind-result.xml:1.1 Sun Sep 25 05:43:27 2005 +++ phpdoc-ja/reference/mysqli/functions/mysqli-stmt-bind-result.xml Sat Aug 5 21:48:23 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.7 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.8 Maintainer: takagi Status: ready --> <refentry id="function.mysqli-stmt-bind-result"> <refnamediv> <refname>mysqli_stmt_bind_result</refname> @@ -34,8 +34,10 @@ </para> <note> <para> - <function>mysqli_stmt_fetch</function> をコールする前に、すべての - カラムをバインドしておく必要があることに注意しましょう。カラムの型に + すべてのカラムを、<function>mysqli_stmt_execute</function> + をコールしてから <function>mysqli_stmt_fetch</function> + をコールするまでの間に + バインドしておく必要があることに注意しましょう。カラムの型に 応じて、バインド変数の型も対応する PHP の型に自動的に変換されます。 </para> <para> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/kadm5/functions/kadm5-modify-principal.xml?r1=1.1&r2=1.2&diff_format=u Index: phpdoc-ja/reference/kadm5/functions/kadm5-modify-principal.xml diff -u phpdoc-ja/reference/kadm5/functions/kadm5-modify-principal.xml:1.1 phpdoc-ja/reference/kadm5/functions/kadm5-modify-principal.xml:1.2 --- phpdoc-ja/reference/kadm5/functions/kadm5-modify-principal.xml:1.1 Sat Dec 31 03:42:00 2005 +++ phpdoc-ja/reference/kadm5/functions/kadm5-modify-principal.xml Sat Aug 5 21:48:23 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.1 $ --> -<!-- EN-Revision: 1.3 Maintainer: takagi Status: ready --> +<!-- $Revision: 1.2 $ --> +<!-- EN-Revision: 1.4 Maintainer: takagi Status: ready --> <refentry id="function.kadm5-modify-principal"> <refnamediv> <refname>kadm5_modify_principal</refname> @@ -49,7 +49,7 @@ KADM5_POLICY => "gonicus", KADM5_ATTRIBUTES => $attributes); -kadm5_modify_principal($handle, "burbach@GONICUS.LOCAL", "password", $options); +kadm5_modify_principal($handle, "burbach@GONICUS.LOCAL", $options); kadm5_destroy($handle); ?> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/image/functions/imagecopyresampled.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc-ja/reference/image/functions/imagecopyresampled.xml diff -u phpdoc-ja/reference/image/functions/imagecopyresampled.xml:1.6 phpdoc-ja/reference/image/functions/imagecopyresampled.xml:1.7 --- phpdoc-ja/reference/image/functions/imagecopyresampled.xml:1.6 Sat Jul 2 06:09:49 2005 +++ phpdoc-ja/reference/image/functions/imagecopyresampled.xml Sat Aug 5 21:48:23 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> -<!-- EN-Revision: 1.6 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.7 $ --> +<!-- EN-Revision: 1.7 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry id="function.imagecopyresampled"> <refnamediv> @@ -118,10 +118,12 @@ // 新規サイズを取得する list($width_orig, $height_orig) = getimagesize($filename); -if ($width && ($width_orig < $height_orig)) { - $width = ($height / $height_orig) * $width_orig; +$ratio_orig = $width_orig/$height_orig; + +if ($width/$height > $ratio_orig) { + $width = $height*$ratio_orig; } else { - $height = ($width / $width_orig) * $height_orig; + $height = $width/$ratio_orig; } // 再サンプル http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/filesystem/functions/file-get-contents.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc-ja/reference/filesystem/functions/file-get-contents.xml diff -u phpdoc-ja/reference/filesystem/functions/file-get-contents.xml:1.6 phpdoc-ja/reference/filesystem/functions/file-get-contents.xml:1.7 --- phpdoc-ja/reference/filesystem/functions/file-get-contents.xml:1.6 Thu Jul 21 17:55:01 2005 +++ phpdoc-ja/reference/filesystem/functions/file-get-contents.xml Sat Aug 5 21:48:23 2006 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- EN-Revision: 1.24 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka --> <refentry id="function.file-get-contents"> @@ -38,7 +38,8 @@ </note> <note> <para> - <parameter>context</parameter> parameter can be skipped by &null;. + <parameter>context</parameter> パラメータを省略するには、&null; + を指定します。 </para> </note> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc-ja/reference/datetime/functions/date.xml?r1=1.15&r2=1.16&diff_format=u Index: phpdoc-ja/reference/datetime/functions/date.xml diff -u phpdoc-ja/reference/datetime/functions/date.xml:1.15 phpdoc-ja/reference/datetime/functions/date.xml:1.16 --- phpdoc-ja/reference/datetime/functions/date.xml:1.15 Wed Jul 12 03:09:15 2006 +++ phpdoc-ja/reference/datetime/functions/date.xml Sat Aug 5 21:48:23 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.15 $ --> -<!-- EN-Revision: 1.29 Maintainer: hirokawa Status: ready --> +<!-- $Revision: 1.16 $ --> +<!-- EN-Revision: 1.30 Maintainer: hirokawa Status: ready --> <!-- CREDITS: shimooka,takagi --> <refentry id="function.date"> <refnamediv>