From 6df0e687f82be61134c25157f36bbb841ca52dca Mon Sep 17 00:00:00 2001
From: Saki Takamachi <saki@php.net>
Date: Wed, 29 Jan 2025 14:53:18 +0900
Subject: [PATCH 1/2] Moved scale description from language-snippets to bcadd

---
 language-snippets.ent               | 13 -------------
 reference/bc/functions/bcadd.xml    | 12 +++++++++++-
 reference/bc/functions/bcdiv.xml    |  2 +-
 reference/bc/functions/bcpow.xml    |  4 ++--
 reference/bc/functions/bcpowmod.xml |  4 ++--
 reference/bc/functions/bcsqrt.xml   |  4 ++--
 6 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/language-snippets.ent b/language-snippets.ent
index 6b036e7e080a..dfa82d79d410 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -2265,19 +2265,6 @@ extensions in order to use these functions.</simpara>'>
 
 <!ENTITY sqlsafemode '<link xmlns="http://docbook.org/ns/docbook" linkend="ini.sql.safe-mode">SQL safe mode</link>'>
 
-<!-- BCMath Notes -->
-<!ENTITY bc.scale.description '<varlistentry xmlns="http://docbook.org/ns/docbook">
- <term><parameter>scale</parameter></term>
- <listitem>
-  <simpara>
-   This parameter is used to set the number of digits after the decimal place in the result.
-   If &null;, it will default to the default scale set with <function>bcscale</function>,
-   or fallback to the value of the
-   <link linkend="ini.bcmath.scale"><literal>bcmath.scale</literal></link> INI directive.
-  </simpara>
- </listitem>
-</varlistentry>'>
-
 <!-- CTYPE Notes -->
 <!ENTITY note.ctype.parameter.integer '<note xmlns="http://docbook.org/ns/docbook"><para>
 If an <type>int</type> between -128 and 255 inclusive is provided, it is interpreted as
diff --git a/reference/bc/functions/bcadd.xml b/reference/bc/functions/bcadd.xml
index 9956f93bf30c..db524db7c0a3 100644
--- a/reference/bc/functions/bcadd.xml
+++ b/reference/bc/functions/bcadd.xml
@@ -40,7 +40,17 @@
       </para>
      </listitem>
     </varlistentry>
-    &bc.scale.description;
+    <varlistentry>
+     <term><parameter>scale</parameter></term>
+     <listitem>
+      <simpara>
+       This parameter is used to set the number of digits after the decimal place in the result.
+       If &null;, it will default to the default scale set with <function>bcscale</function>,
+       or fallback to the value of the
+       <link linkend="ini.bcmath.scale"><literal>bcmath.scale</literal></link> INI directive.
+      </simpara>
+     </listitem>
+    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/bc/functions/bcdiv.xml b/reference/bc/functions/bcdiv.xml
index c5059150add5..48697c55df66 100644
--- a/reference/bc/functions/bcdiv.xml
+++ b/reference/bc/functions/bcdiv.xml
@@ -39,7 +39,7 @@
       </para>
      </listitem>
     </varlistentry>
-    &bc.scale.description;
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.bcadd')/db:refsect1[@role='parameters']/descendant::db:varlistentry[3])" />
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/bc/functions/bcpow.xml b/reference/bc/functions/bcpow.xml
index f8a7b1dd0286..a981f4cfb970 100644
--- a/reference/bc/functions/bcpow.xml
+++ b/reference/bc/functions/bcpow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.bcpow" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.bcpow" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
  <refnamediv>
   <refname>bcpow</refname>
   <refpurpose>Raise an arbitrary precision number to another</refpurpose>
@@ -42,7 +42,7 @@
       </para>
      </listitem>
     </varlistentry>
-    &bc.scale.description;
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.bcadd')/db:refsect1[@role='parameters']/descendant::db:varlistentry[3])" />
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/bc/functions/bcpowmod.xml b/reference/bc/functions/bcpowmod.xml
index deaa00d92ac3..8edf86d45aed 100644
--- a/reference/bc/functions/bcpowmod.xml
+++ b/reference/bc/functions/bcpowmod.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.bcpowmod" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.bcpowmod" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
  <refnamediv>
   <refname>bcpowmod</refname>
   <refpurpose>Raise an arbitrary precision number to another, reduced by a specified modulus</refpurpose>
@@ -51,7 +51,7 @@
       </para>
      </listitem>
     </varlistentry>
-    &bc.scale.description;
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.bcadd')/db:refsect1[@role='parameters']/descendant::db:varlistentry[3])" />
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/bc/functions/bcsqrt.xml b/reference/bc/functions/bcsqrt.xml
index 905f2b932f50..f7e91575f2ef 100644
--- a/reference/bc/functions/bcsqrt.xml
+++ b/reference/bc/functions/bcsqrt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="function.bcsqrt" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.bcsqrt" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
  <refnamediv>
   <refname>bcsqrt</refname>
   <refpurpose>Get the square root of an arbitrary precision number</refpurpose>
@@ -30,7 +30,7 @@
       </para>
      </listitem>
     </varlistentry>
-    &bc.scale.description;
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.bcadd')/db:refsect1[@role='parameters']/descendant::db:varlistentry[3])" />
    </variablelist>
   </para>
  </refsect1>

From 7afc468be1100a759cecbe5c3ba34b1369d4b223 Mon Sep 17 00:00:00 2001
From: Saki Takamachi <saki@php.net>
Date: Wed, 29 Jan 2025 20:30:59 +0900
Subject: [PATCH 2/2] using xml:id

---
 reference/bc/functions/bcadd.xml    | 2 +-
 reference/bc/functions/bcdiv.xml    | 2 +-
 reference/bc/functions/bcpow.xml    | 2 +-
 reference/bc/functions/bcpowmod.xml | 2 +-
 reference/bc/functions/bcsqrt.xml   | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/reference/bc/functions/bcadd.xml b/reference/bc/functions/bcadd.xml
index db524db7c0a3..b5976428ed2a 100644
--- a/reference/bc/functions/bcadd.xml
+++ b/reference/bc/functions/bcadd.xml
@@ -40,7 +40,7 @@
       </para>
      </listitem>
     </varlistentry>
-    <varlistentry>
+    <varlistentry xml:id="function.bcadd..parameters.scale">
      <term><parameter>scale</parameter></term>
      <listitem>
       <simpara>
diff --git a/reference/bc/functions/bcdiv.xml b/reference/bc/functions/bcdiv.xml
index 48697c55df66..75d2aa1488f5 100644
--- a/reference/bc/functions/bcdiv.xml
+++ b/reference/bc/functions/bcdiv.xml
@@ -39,7 +39,7 @@
       </para>
      </listitem>
     </varlistentry>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.bcadd')/db:refsect1[@role='parameters']/descendant::db:varlistentry[3])" />
+    <xi:include xpointer="function.bcadd..parameters.scale" />
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/bc/functions/bcpow.xml b/reference/bc/functions/bcpow.xml
index a981f4cfb970..31b324334d60 100644
--- a/reference/bc/functions/bcpow.xml
+++ b/reference/bc/functions/bcpow.xml
@@ -42,7 +42,7 @@
       </para>
      </listitem>
     </varlistentry>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.bcadd')/db:refsect1[@role='parameters']/descendant::db:varlistentry[3])" />
+    <xi:include xpointer="function.bcadd..parameters.scale" />
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/bc/functions/bcpowmod.xml b/reference/bc/functions/bcpowmod.xml
index 8edf86d45aed..5a66b0f9af88 100644
--- a/reference/bc/functions/bcpowmod.xml
+++ b/reference/bc/functions/bcpowmod.xml
@@ -51,7 +51,7 @@
       </para>
      </listitem>
     </varlistentry>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.bcadd')/db:refsect1[@role='parameters']/descendant::db:varlistentry[3])" />
+    <xi:include xpointer="function.bcadd..parameters.scale" />
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/bc/functions/bcsqrt.xml b/reference/bc/functions/bcsqrt.xml
index f7e91575f2ef..654e69d0c612 100644
--- a/reference/bc/functions/bcsqrt.xml
+++ b/reference/bc/functions/bcsqrt.xml
@@ -30,7 +30,7 @@
       </para>
      </listitem>
     </varlistentry>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.bcadd')/db:refsect1[@role='parameters']/descendant::db:varlistentry[3])" />
+    <xi:include xpointer="function.bcadd..parameters.scale" />
    </variablelist>
   </para>
  </refsect1>
@@ -41,7 +41,7 @@
    Returns the square root as a well-formed BCMath numeric string.
   </para>
  </refsect1>
- 
+
  <refsect1 role="errors">
   &reftitle.errors;
   <para>