svn: /phpdoc/ja/trunk/reference/tidy/ functions/tidy-access-count.xml functions/tidy-config-count.xml functions/tidy-error-count.xml functions/tidy-get-output.xml functions/tidy-warning-count.xml tidy/body.xml tidy/cleanrepair.xml tidy/construct.xml tidy/diagnose.xml tidy/errorbuffer.xml tidy/getconfig.xml tidy/gethtmlver.xml tidy/getopt.xml tidy/getoptdoc.xml tidy/getrelease.xml tidy/getstatus.xml tidy/head.xml tidy/html.xml tidy/isxhtml.xml tidy/isxml.xml tidy/parsefile.xml tidy/parsestring.xm

Modified: phpdoc/ja/trunk/reference/tidy/functions/tidy-access-count.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/functions/tidy-access-count.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/functions/tidy-access-count.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: shimooka Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: shimooka Status: ready -->
 <!-- CREDITS: hirokawa -->
 <refentry xml:id="function.tidy-access-count" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>tidy_access_count</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>tidy_access_count</function> は、
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -98,7 +98,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/functions/tidy-config-count.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/functions/tidy-config-count.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/functions/tidy-config-count.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: shimooka Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: shimooka Status: ready -->
+<!-- Credits: mumumu -->
 <refentry xml:id="function.tidy-config-count" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>tidy_config_count</refname>
@@ -10,10 +11,10 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>tidy_config_count</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
-   指定した Tidy オブジェクト <parameter>object</parameter>
+   指定した Tidy オブジェクト <parameter>tidy</parameter>
    の設定時に発生した Tidy エラーの数を返します。
   </para>
  </refsect1>
@@ -23,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -64,7 +65,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/functions/tidy-error-count.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/functions/tidy-error-count.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/functions/tidy-error-count.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: shimooka Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: shimooka Status: ready -->
 <refentry xml:id="function.tidy-error-count" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>tidy_error_count</refname>
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>tidy_error_count</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
    指定したドキュメントについて発生した Tidy エラーの数を返します。
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -83,7 +83,6 @@
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/functions/tidy-get-output.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/functions/tidy-get-output.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/functions/tidy-get-output.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: shimooka Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: shimooka Status: ready -->
 <refentry xml:id="function.tidy-get-output" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>tidy_get_output</refname>
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>tidy_get_output</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
    修正された HTML を文字列で返します。
@@ -21,7 +21,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -73,7 +73,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/functions/tidy-warning-count.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/functions/tidy-warning-count.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/functions/tidy-warning-count.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: shimooka Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: shimooka Status: ready -->
 <refentry xml:id="function.tidy-warning-count" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>tidy_warning_count</refname>
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>tidy_warning_count</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
    指定したドキュメントについて発生した Tidy
@@ -22,7 +22,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -69,7 +69,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/body.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/body.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/body.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="tidy.body" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,14 +11,14 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>tidyNode</type><methodname>tidy::body</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy::body</methodname>
+   <void/>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
-   <type>tidyNode</type><methodname>tidy_get_body</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy_get_body</methodname>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
    Tidy パースツリーの &lt;body&gt; タグから始まる <classname>tidyNode</classname>
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -95,7 +95,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/cleanrepair.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/cleanrepair.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/cleanrepair.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="tidy.cleanrepair" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,17 +11,17 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <type>bool</type><methodname>tidy::cleanRepair</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>bool</type><methodname>tidy_clean_repair</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
-   この関数は、与えられた Tidy オブジェクト <parameter>object</parameter>
+   この関数は、与えられた Tidy オブジェクト <parameter>tidy</parameter>
    を修正します。
   </para>
  </refsect1>
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -92,7 +92,6 @@
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/construct.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/construct.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/construct.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
-<refentry xml:id="tidy.construct" xmlns="http://docbook.org/ns/docbook"  xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="tidy.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>tidy::__construct</refname>
   <refpurpose>新しい <classname>tidy</classname> オブジェクトを作成する</refpurpose>
@@ -9,13 +9,13 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>tidy::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter></methodparam>
-  </methodsynopsis>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>filename</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>useIncludePath</parameter><initializer>&false;</initializer></methodparam>
+  </constructorsynopsis>
   <para>
    新しい <classname>tidy</classname> オブジェクトを作成します。
   </para>
@@ -65,7 +65,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>use_include_path</parameter></term>
+     <term><parameter>useIncludePath</parameter></term>
      <listitem>
       <para>
        <link linkend="ini.include-path">include_path</link> からファイルを探します。
@@ -83,6 +83,30 @@
   </para>
  </refsect1>

+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>filename</parameter>, <parameter>config</parameter>,
+       <parameter>encoding</parameter>,
+       <parameter>useIncludePath</parameter> は、nullable になりました。
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -140,7 +164,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/diagnose.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/diagnose.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/diagnose.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="tidy.diagnose" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,17 +11,17 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <type>bool</type><methodname>tidy::diagnose</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>bool</type><methodname>tidy_diagnose</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
-   与えられた Tidy オブジェクト <parameter>object</parameter>
+   与えられた Tidy オブジェクト <parameter>tidy</parameter>
    に対して診断テストを実行し、
    エラーバッファにドキュメントについての情報を追加します。
   </para>
@@ -32,7 +32,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -102,7 +102,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/errorbuffer.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/errorbuffer.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/errorbuffer.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: shimooka Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: shimooka Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="tidy.props.errorbuffer" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,10 +11,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop; (プロパティ):</para>
-  <fieldsynopsis><modifier>public</modifier> <type>string</type><varname linkend="tidy.props.errorbuffer">tidy->errorBuffer</varname></fieldsynopsis>
+  <fieldsynopsis><modifier>public</modifier> <type>string</type><varname linkend="tidy.props.errorbuffer">tidy-&gt;errorBuffer</varname></fieldsynopsis>
   <para>&style.procedural;:</para>
-  <methodsynopsis role="procedural">
-   <type>string</type><methodname>tidy_get_error_buffer</methodname>
+  <methodsynopsis>
+   <type class="union"><type>string</type><type>false</type></type><methodname>tidy_get_error_buffer</methodname>
    <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -42,6 +42,7 @@
   &reftitle.returnvalues;
   <para>
    エラーバッファを文字列で返します。
+   バッファが空の場合は &false; を返します。
   </para>
  </refsect1>

@@ -83,7 +84,6 @@
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/getconfig.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/getconfig.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/getconfig.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="tidy.getconfig" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -11,17 +11,17 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <type>array</type><methodname>tidy::getConfig</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>array</type><methodname>tidy_get_config</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
-   与えられた Tidy オブジェクト <parameter>object</parameter>
+   与えられた Tidy オブジェクト <parameter>tidy</parameter>
    で使用されている設定オプションを配列で返します。
   </para>
  </refsect1>
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -175,7 +175,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/gethtmlver.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/gethtmlver.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/gethtmlver.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="tidy.gethtmlver" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,17 +11,17 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <type>int</type><methodname>tidy::getHtmlVer</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>int</type><methodname>tidy_get_html_ver</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
-   指定した Tidy オブジェクト <parameter>object</parameter>
+   指定した Tidy オブジェクト <parameter>tidy</parameter>
    で検出された HTML バージョンを返します。
   </para>
  </refsect1>
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -56,7 +56,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/getopt.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/getopt.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/getopt.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="tidy.getopt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -11,18 +11,18 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>tidy::getOpt</methodname>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>int</type><type>bool</type></type><methodname>tidy::getOpt</methodname>
    <methodparam><type>string</type><parameter>option</parameter></methodparam>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
-   <type>mixed</type><methodname>tidy_getopt</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>int</type><type>bool</type></type><methodname>tidy_getopt</methodname>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
    <methodparam><type>string</type><parameter>option</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Tidy オブジェクト <parameter>object</parameter>
+   Tidy オブジェクト <parameter>tidy</parameter>
    について指定した設定オプション <parameter>option</parameter>
    の値を返します。
   </para>
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -106,7 +106,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/getoptdoc.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/getoptdoc.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/getoptdoc.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="tidy.getoptdoc" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -13,15 +13,15 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>tidy::getOptDoc</methodname>
-   <methodparam><type>string</type><parameter>optname</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>tidy::getOptDoc</methodname>
+   <methodparam><type>string</type><parameter>option</parameter></methodparam>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
-   <type>string</type><methodname>tidy_get_opt_doc</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
-   <methodparam><type>string</type><parameter>optname</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>tidy_get_opt_doc</methodname>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
+   <methodparam><type>string</type><parameter>option</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>tidy_get_opt_doc</function> は、
@@ -40,7 +40,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -48,7 +48,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>optname</parameter></term>
+     <term><parameter>option</parameter></term>
      <listitem>
       <para>
        オプション名。
@@ -110,7 +110,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/getrelease.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/getrelease.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/getrelease.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="tidy.getrelease" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,12 +11,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <type>string</type><methodname>tidy::getRelease</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>string</type><methodname>tidy_get_release</methodname>
    <void/>
   </methodsynopsis>
@@ -33,7 +33,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/getstatus.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/getstatus.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/getstatus.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="tidy.getstatus" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,17 +11,17 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <type>int</type><methodname>tidy::getStatus</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>int</type><methodname>tidy_get_status</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
-   指定した Tidy オブジェクト <parameter>object</parameter>
+   指定した Tidy オブジェクト <parameter>tidy</parameter>
    のステータスを返します。
   </para>
  </refsect1>
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -77,7 +77,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/head.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/head.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/head.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="tidy.head" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,14 +11,14 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>tidyNode</type><methodname>tidy::head</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy::head</methodname>
+   <void/>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
-   <type>tidyNode</type><methodname>tidy_get_head</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy_get_head</methodname>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
    Tidy パースツリーの &lt;head&gt; タグから始まる
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -95,7 +95,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/html.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/html.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/html.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="tidy.html" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,14 +11,14 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>tidyNode</type><methodname>tidy::html</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy::html</methodname>
+   <void/>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
-   <type>tidyNode</type><methodname>tidy_get_html</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy_get_html</methodname>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
    この関数は Tidy パースツリーの &lt;html&gt; タグから始まる
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -99,7 +99,6 @@
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/isxhtml.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/isxhtml.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/isxhtml.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="tidy.isxhtml" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,14 +11,14 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <type>bool</type><methodname>tidy::isXhtml</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>bool</type><methodname>tidy_is_xhtml</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
    ドキュメントが XHTML ドキュメントであるかどうかを調べます。
@@ -30,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -44,7 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   指定した Tidy オブジェクト <parameter>object</parameter>
+   指定した Tidy オブジェクト <parameter>tidy</parameter>
    が XHTML ドキュメントの場合、この関数は &true; を返します。
    その他の場合は &false; を返します。
   </para>
@@ -57,7 +57,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/isxml.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/isxml.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/isxml.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="tidy.isxml" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,14 +11,14 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <type>bool</type><methodname>tidy::isXml</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>bool</type><methodname>tidy_is_xml</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
    ドキュメントが一般的な XML ドキュメント (非 HTML/XHTML) かどうかを調べます。
@@ -30,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -44,7 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   指定した Tidy オブジェクト <parameter>object</parameter>
+   指定した Tidy オブジェクト <parameter>tidy</parameter>
    が一般的な XML ドキュメント (非 HTML/XHTML) の場合、
    この関数は &true; を返します。
    その他の場合は &false; を返します。
@@ -58,7 +58,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/parsefile.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/parsefile.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/parsefile.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
-<!-- CREDITS: shimooka -->
-<refentry xml:id="tidy.parsefile" xmlns="http://docbook.org/ns/docbook"  xmlns:xlink="http://www.w3.org/1999/xlink">
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
+<!-- CREDITS: shimooka,mumumu -->
+<refentry xml:id="tidy.parsefile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>tidy::parseFile</refname>
   <refname>tidy_parse_file</refname>
@@ -14,17 +14,17 @@
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>tidy::parseFile</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter><initializer>&false;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>useIncludePath</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>&style.procedural;</para>
   <methodsynopsis>
-   <type>tidy</type><methodname>tidy_parse_file</methodname>
+   <type class="union"><type>tidy</type><type>false</type></type><methodname>tidy_parse_file</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter><initializer>&false;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>useIncludePath</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
    与えられたファイルをパースします。
@@ -75,7 +75,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>use_include_path</parameter></term>
+     <term><parameter>useIncludePath</parameter></term>
      <listitem>
       <para>
        <link linkend="ini.include-path">include_path</link> からファイルを探します。
@@ -89,10 +89,36 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.success;
+   <methodname>tidy::parseFile</methodname> は成功時に &true; を返します。
+   <function>tidy_parse_file</function> は、成功時に新しい
+   <classname>tidy</classname> インスタンスを返します。
+   これらのメソッド、関数は、ともに失敗時に &false; を返します。
   </para>
  </refsect1>

+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>config</parameter> と <parameter>encoding</parameter> は、
+       nullable になりました。
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -127,7 +153,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/parsestring.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/parsestring.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/parsestring.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka -->
-<refentry xml:id="tidy.parsestring" xmlns="http://docbook.org/ns/docbook"  xmlns:xlink="http://www.w3.org/1999/xlink">
+<refentry xml:id="tidy.parsestring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>tidy::parseString</refname>
   <refname>tidy_parse_string</refname>
@@ -13,16 +13,16 @@
   <para>&style.oop;</para>
   <methodsynopsis>
    <modifier>public</modifier> <type>bool</type><methodname>tidy::parseString</methodname>
-   <methodparam><type>string</type><parameter>input</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>&style.procedural;</para>
   <methodsynopsis>
-   <type>tidy</type><methodname>tidy_parse_string</methodname>
-   <methodparam><type>string</type><parameter>input</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
+   <type class="union"><type>tidy</type><type>false</type></type><methodname>tidy_parse_string</methodname>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    文字列にストアされたドキュメントをパースします。
@@ -34,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>input</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        パースするデータ。
@@ -78,9 +78,33 @@
   &reftitle.returnvalues;
   <para>
    新しい <classname>tidy</classname> インスタンスを返します。
+   <function>tidy_parse_srting</function> は、成功時に新しい <classname>tidy</classname> インスタンスを返します。
+   これらのメソッド、関数は、失敗時に &false; を返します。
   </para>
  </refsect1>

+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>config</parameter> と <parameter>encoding</parameter> は、nullable になりました。
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -149,7 +173,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/repairfile.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/repairfile.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/repairfile.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="tidy.repairfile" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,20 +11,20 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>tidy::repairFile</methodname>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>tidy::repairFile</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter><initializer>&false;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>useIncludePath</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
-   <type>string</type><methodname>tidy_repair_file</methodname>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>tidy_repair_file</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter><initializer>&false;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>useIncludePath</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>

   <para>
@@ -74,7 +74,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>use_include_path</parameter></term>
+     <term><parameter>useIncludePath</parameter></term>
      <listitem>
       <para>
        <link linkend="ini.include-path">include_path</link> からファイルを探します。
@@ -124,7 +124,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/repairstring.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/repairstring.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/repairstring.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
-<!-- CREDITS: shimooka -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
+<!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="tidy.repairstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>tidy::repairString</refname>
@@ -11,18 +11,18 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>tidy::repairString</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>tidy::repairString</methodname>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
-   <type>string</type><methodname>tidy_repair_string</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>config</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>tidy_repair_string</methodname>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>config</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    与えられた文字列を修正します。
@@ -34,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>data</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        修正するデータ。
@@ -78,9 +78,46 @@
   &reftitle.returnvalues;
   <para>
    修正した文字列を返します。
+   &return.falseforfailure;
   </para>
  </refsect1>

+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <methodname>tidy::repairString</methodname> は、静的メソッドになりました。
+      </entry>
+     </row>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>config</parameter> と <parameter>encoding</parameter> は、
+       nullable になりました。
+      </entry>
+     </row>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       この関数は、
+       <parameter>useIncludePath</parameter> を引数として受け入れなくなりました。
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -138,7 +175,6 @@
   </simplelist>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy/root.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy/root.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy/root.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="tidy.root" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,14 +11,14 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>tidyNode</type><methodname>tidy::root</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy::root</methodname>
+   <void/>
   </methodsynopsis>
   <para>&style.procedural;</para>
-  <methodsynopsis>
-   <type>tidyNode</type><methodname>tidy_get_root</methodname>
-   <methodparam><type>tidy</type><parameter>object</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidy_get_root</methodname>
+   <methodparam><type>tidy</type><parameter>tidy</parameter></methodparam>
   </methodsynopsis>
   <para>
    Tidy パースツリーのルートを表す <classname>tidyNode</classname> を返します。
@@ -30,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>object</parameter></term>
+     <term><parameter>tidy</parameter></term>
      <listitem>
       <para>
        &tidy.object;
@@ -100,7 +100,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/tidy/tidy.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidy.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidy.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 322012 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351752 Maintainer: takagi Status: ready -->
 <phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.tidy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title><classname>tidy</classname> クラス</title>
  <titleabbrev>tidy</titleabbrev>
@@ -34,6 +34,9 @@
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.tidy')/db:refentry/db:refsect1[@role='description']/descendant::db:fieldsynopsis[1])" />

     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.tidy')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback />
+    </xi:include>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.tidy')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')][1])" />

    </classsynopsis>

Modified: phpdoc/ja/trunk/reference/tidy/tidynode/getparent.xml
===================================================================
--- phpdoc/ja/trunk/reference/tidy/tidynode/getparent.xml	2020-11-30 02:10:40 UTC (rev 351766)
+++ phpdoc/ja/trunk/reference/tidy/tidynode/getparent.xml	2020-11-30 02:25:53 UTC (rev 351767)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345872 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351754 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="tidynode.getparent" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,7 +11,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>tidyNode</type><methodname>tidyNode::getParent</methodname>
+   <modifier>public</modifier> <type class="union"><type>tidyNode</type><type>null</type></type><methodname>tidyNode::getParent</methodname>
    <void/>
   </methodsynopsis>
   <para>
@@ -72,7 +72,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml