[DOC-CVS] [doc-base] master: Remove acronyms entity file from doc-base (#325)
[email protected] (Jordi Kroon via GitHub) Tue, 28 Jul 2026 14:28:36 +0000
| Newsgroups | php.doc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: Jordi Kroon (jordikroon)
Committer: GitHub (web-flow)
Pusher: jordikroon
Date: 2026-07-28T16:28:34+02:00
Commit: https://github.com/php/doc-base/commit/10c52bc037eb2b996075d804b9e20d9216326a81
Raw diff: https://github.com/php/doc-base/commit/10c52bc037eb2b996075d804b9e20d9216326a81.diff
Remove acronyms entity file from doc-base (#325)
* Remove acronyms entity file from doc-base
* update acronym file and prefix
* remove acronyms from global.ent
Changed paths:
D entities/acronyms.xml
M entities/global.ent
M scripts/qa/check-acronyms.php
Diff:
diff --git a/entities/acronyms.xml b/entities/acronyms.xml
deleted file mode 100644
index 260299052a..0000000000
--- a/entities/acronyms.xml
+++ /dev/null
@@ -1,596 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- All Acronyms should be listed in Alphabetical order -->
-<!-- To use them, use the <acronym> tag -->
-<section xml:id="acronyms">
- <title>Acronyms</title>
- <variablelist>
- <varlistentry>
- <term>AKA</term>
- <listitem>
- <simpara>Also Known As</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>API</term>
- <listitem>
- <simpara>Application Programming Interface</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>ASCII</term>
- <listitem>
- <simpara>American Standard Code for Information Interchange</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>BMP</term>
- <listitem>
- <simpara>Bitmap</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>CA</term>
- <listitem>
- <simpara>Certificate Authority</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>CGI</term>
- <listitem>
- <simpara>Common Gateway Interface</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>CLI</term>
- <listitem>
- <simpara>Command Line Interpreter/Interface</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>CSPRNG</term>
- <listitem>
- <simpara>Cryptographically Secure PseudoRandom Number Generator</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>CSR</term>
- <listitem>
- <simpara>Certificate Signing Request</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>CSS</term>
- <listitem>
- <simpara>Cascading Style Sheets</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>CSV</term>
- <listitem>
- <simpara>Comma Separated Value</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>cURL</term>
- <listitem>
- <simpara>Client URL Library</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>CVS</term>
- <listitem>
- <simpara>Concurrent Versions System</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>DER</term>
- <listitem>
- <simpara>Distinguished Encoding Rules</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>DLL</term>
- <listitem>
- <simpara>Dynamic Link Library</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>DNF</term>
- <listitem>
- <simpara>Disjunctive Normal Form</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>DNS</term>
- <listitem>
- <simpara>Domain Name System</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>DOM</term>
- <listitem>
- <simpara>Document Object Model</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>DSSSL</term>
- <listitem>
- <simpara>Document Style Semantics and Specification Language</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>EOF</term>
- <listitem>
- <simpara>End Of File</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>EXIF</term>
- <listitem>
- <simpara>Exchangeable Image File </simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>FAQ</term>
- <listitem>
- <simpara>Frequently Asked Questions</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>FPM</term>
- <listitem>
- <simpara>FastCGI Process Manager</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>FTP</term>
- <listitem>
- <simpara>File Transfer Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>FTPS</term>
- <listitem>
- <simpara>File Transfer Protocol SSL/Secure</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>GD</term>
- <listitem>
- <simpara>Graphics Draw</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>GIF</term>
- <listitem>
- <simpara>Graphic Interchange Format</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>GLE</term>
- <listitem>
- <simpara>getLastError</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>GMP</term>
- <listitem>
- <simpara>GNU Multiple Precision</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>HIS</term>
- <listitem>
- <simpara>Hyperwave Information Server</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>HKDF</term>
- <listitem>
- <simpara>HMAC Key Definition Function</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>HMAC</term>
- <listitem>
- <simpara>Hash-based Message Authentication Code</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>HTML</term>
- <listitem>
- <simpara>Hyper Text Markup Language</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>HTTP</term>
- <listitem>
- <simpara>Hypertext Transfer Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>HTTPS</term>
- <listitem>
- <simpara>Hypertext Transfer Protocol Secure</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>HSTS</term>
- <listitem>
- <simpara>HTTP Strict Transport Security</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>IDE</term>
- <listitem>
- <simpara>Integrated Development Environment</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>IFD</term>
- <listitem>
- <simpara>Image File Directory</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>IFF</term>
- <listitem>
- <simpara>Interchange File Format</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>IMAP</term>
- <listitem>
- <simpara>Internet Message Access Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>IP</term>
- <listitem>
- <simpara>Internet Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>IPv4</term>
- <listitem>
- <simpara>Internet Protocol version 4</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>IPv6</term>
- <listitem>
- <simpara>Internet Protocol version 6</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>JB2</term>
- <listitem>
- <simpara>Joint Bilevel Image Experts Group</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>JP2</term>
- <listitem>
- <simpara>JPEG-2000</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>JPC</term>
- <listitem>
- <simpara>Japan Picture</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>JPEG</term>
- <listitem>
- <simpara>Joint Photographic Experts Group</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>JSON</term>
- <listitem>
- <simpara>JavaScript Object Notation</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>LDAP</term>
- <listitem>
- <simpara>Lightweight Directory Access Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>LFS</term>
- <listitem>
- <simpara>Large File Support</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>MIME</term>
- <listitem>
- <simpara>Multipurpose Internet Mail Extensions</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>MP</term>
- <listitem>
- <simpara>Multiple Precision</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>MSDN</term>
- <listitem>
- <simpara>Microsoft Developer Network</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>NNTP</term>
- <listitem>
- <simpara>Network News Transfer Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>PBKDF2</term>
- <listitem>
- <simpara>Password-Based Key Derivation Function 2</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>PDF</term>
- <listitem>
- <simpara>Portable Document Format</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>PDO</term>
- <listitem>
- <simpara>PHP Data Objects</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>PECL</term>
- <listitem>
- <simpara>PHP Extension and Application Repository</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>PEM</term>
- <listitem>
- <simpara>Privacy-Enhanced Mail</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Phar</term>
- <listitem>
- <simpara>PHP archive</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>PHP</term>
- <listitem>
- <simpara>PHP: Hypertext Preprocessor</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>PKCS</term>
- <listitem>
- <simpara>Public Key Cryptography Standards</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>PNG</term>
- <listitem>
- <simpara>Portable Network Graphics</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>POP3</term>
- <listitem>
- <simpara>Post Office Protocol version 3</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>POSIX</term>
- <listitem>
- <simpara>Portable Operating System Interface</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>PSD</term>
- <listitem>
- <simpara>Photoshop Document</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>QoS</term>
- <listitem>
- <simpara>Quality of Service</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>RGB</term>
- <listitem>
- <simpara>Red-Green-Blue</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>RTSP</term>
- <listitem>
- <simpara>Real-Time Streaming Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>SAPI</term>
- <listitem>
- <simpara>Server Application Programming Interface</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>SASL</term>
- <listitem>
- <simpara>Simple Authentication and Security Layer</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>SFTP</term>
- <listitem>
- <simpara>SSH/Secure File Transfer Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>SMTP</term>
- <listitem>
- <simpara>Simple Mail Transfer Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>SNMP</term>
- <listitem>
- <simpara>Simple Network Management Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>SPL</term>
- <listitem>
- <simpara>Standard PHP Library</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>SSH</term>
- <listitem>
- <simpara>Secure Shell Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>SSL</term>
- <listitem>
- <simpara>Secure Sockets Layer</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>SWF</term>
- <listitem>
- <simpara>Shockwave Flash</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>TCP</term>
- <listitem>
- <simpara>Transmission Control Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>TIFF</term>
- <listitem>
- <simpara>Tagged Image File Format</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>TLS</term>
- <listitem>
- <simpara>Transport Layer Security</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>TNS</term>
- <listitem>
- <simpara>Transparent Network Substrate</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>UDF</term>
- <listitem>
- <simpara>User Defined Functions</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>UDP</term>
- <listitem>
- <simpara>User Datagram Protocol</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Unicode</term>
- <listitem>
- <simpara>Unique, Universal, and Uniform character enCoding</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>URI</term>
- <listitem>
- <simpara>Uniform Resource Identifier</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>URL</term>
- <listitem>
- <simpara>Uniform Resource Locator</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>WBMP</term>
- <listitem>
- <simpara>Wireless Bitmap</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>WSDL</term>
- <listitem>
- <simpara>Web Services Description Language</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>XBM</term>
- <listitem>
- <simpara>X Bitmap</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>XML</term>
- <listitem>
- <simpara>eXtensible Markup Language</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>XPath</term>
- <listitem>
- <simpara>XML Path Language</simpara>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>XSLT</term>
- <listitem>
- <simpara>eXtensible Stylesheet Language Transformations</simpara>
- </listitem>
- </varlistentry>
- <!--
- <varlistentry>
- <term></term>
- <listitem>
- <simpara></simpara>
- </listitem>
- </varlistentry>
- -->
- </variablelist>
-</section>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/entities/global.ent b/entities/global.ent
index 3d8e0c6db3..3ca270066a 100644
--- a/entities/global.ent
+++ b/entities/global.ent
@@ -699,46 +699,3 @@
<!ENTITY user-ini '<filename xmlns="http://docbook.org/ns/docbook">.user.ini</filename>'>
<!ENTITY httpd.conf '<filename xmlns="http://docbook.org/ns/docbook">httpd.conf</filename>'>
<!ENTITY htaccess '<filename xmlns="http://docbook.org/ns/docbook">.htaccess</filename>'>
-
-<!-- Acronyms -->
-<!ENTITY api '<acronym xmlns="http://docbook.org/ns/docbook">API</acronym>'>
-<!ENTITY ascii '<acronym xmlns="http://docbook.org/ns/docbook">ASCII</acronym>'>
-<!ENTITY ca '<acronym xmlns="http://docbook.org/ns/docbook">CA</acronym>'>
-<!ENTITY cgi '<acronym xmlns="http://docbook.org/ns/docbook">CGI</acronym>'>
-<!ENTITY cli '<acronym xmlns="http://docbook.org/ns/docbook">CLI</acronym>'>
-<!ENTITY cli.sapi '<acronym xmlns="http://docbook.org/ns/docbook">CLI</acronym> <acronym xmlns="http://docbook.org/ns/docbook">SAPI</acronym>'>
-<!ENTITY curl '<acronym xmlns="http://docbook.org/ns/docbook">cURL</acronym>'>
-<!ENTITY der '<acronym xmlns="http://docbook.org/ns/docbook">DER</acronym>'>
-<!ENTITY dns '<acronym xmlns="http://docbook.org/ns/docbook">DNS</acronym>'>
-<!ENTITY dom '<acronym xmlns="http://docbook.org/ns/docbook">DOM</acronym>'>
-<!ENTITY fpm '<acronym xmlns="http://docbook.org/ns/docbook">FPM</acronym>'>
-<!ENTITY ftp '<acronym xmlns="http://docbook.org/ns/docbook">FTP</acronym>'>
-<!ENTITY ftps '<acronym xmlns="http://docbook.org/ns/docbook">FTPS</acronym>'>
-<!ENTITY hmac '<acronym xmlns="http://docbook.org/ns/docbook">HMAC</acronym>'>
-<!ENTITY html '<acronym xmlns="http://docbook.org/ns/docbook">HTML</acronym>'>
-<!ENTITY http '<acronym xmlns="http://docbook.org/ns/docbook">HTTP</acronym>'>
-<!ENTITY https '<acronym xmlns="http://docbook.org/ns/docbook">HTTPS</acronym>'>
-<!ENTITY hsts '<acronym xmlns="http://docbook.org/ns/docbook">HSTS</acronym>'>
-<!ENTITY ip '<acronym xmlns="http://docbook.org/ns/docbook">IP</acronym>'>
-<!ENTITY ipv4 '<acronym xmlns="http://docbook.org/ns/docbook">IPv4</acronym>'>
-<!ENTITY ipv6 '<acronym xmlns="http://docbook.org/ns/docbook">IPv6</acronym>'>
-<!ENTITY json '<acronym xmlns="http://docbook.org/ns/docbook">JSON</acronym>'>
-<!ENTITY ldap '<acronym xmlns="http://docbook.org/ns/docbook">LDAP</acronym>'>
-<!ENTITY pdo '<acronym xmlns="http://docbook.org/ns/docbook">PDO</acronym>'>
-<!ENTITY pem '<acronym xmlns="http://docbook.org/ns/docbook">PEM</acronym>'>
-<!ENTITY phar '<acronym xmlns="http://docbook.org/ns/docbook">Phar</acronym>'>
-<!ENTITY php '<acronym xmlns="http://docbook.org/ns/docbook">PHP</acronym>'>
-<!ENTITY pop3 '<acronym xmlns="http://docbook.org/ns/docbook">POP3</acronym>'>
-<!ENTITY rtsp '<acronym xmlns="http://docbook.org/ns/docbook">RTSP</acronym>'>
-<!ENTITY sapi '<acronym xmlns="http://docbook.org/ns/docbook">SAPI</acronym>'>
-<!ENTITY sftp '<acronym xmlns="http://docbook.org/ns/docbook">SFTP</acronym>'>
-<!ENTITY smtp '<acronym xmlns="http://docbook.org/ns/docbook">SMTP</acronym>'>
-<!ENTITY spl '<acronym xmlns="http://docbook.org/ns/docbook">SPL</acronym>'>
-<!ENTITY ssh '<acronym xmlns="http://docbook.org/ns/docbook">SSH</acronym>'>
-<!ENTITY ssl '<acronym xmlns="http://docbook.org/ns/docbook">SSL</acronym>'>
-<!ENTITY tcp '<acronym xmlns="http://docbook.org/ns/docbook">TCP</acronym>'>
-<!ENTITY tls '<acronym xmlns="http://docbook.org/ns/docbook">TLS</acronym>'>
-<!ENTITY udp '<acronym xmlns="http://docbook.org/ns/docbook">UDP</acronym>'>
-<!ENTITY uri '<acronym xmlns="http://docbook.org/ns/docbook">URI</acronym>'>
-<!ENTITY url '<acronym xmlns="http://docbook.org/ns/docbook">URL</acronym>'>
-<!ENTITY xml '<acronym xmlns="http://docbook.org/ns/docbook">XML</acronym>'>
diff --git a/scripts/qa/check-acronyms.php b/scripts/qa/check-acronyms.php
index b41086e548..1b98aa46ce 100755
--- a/scripts/qa/check-acronyms.php
+++ b/scripts/qa/check-acronyms.php
@@ -27,16 +27,27 @@
define('M_VERBOSE', 3); // display complete informations about every acronyms
if ($_SERVER['argc'] == 2 &&
- in_array($_SERVER['argv'][1], array('--help', '-help', '-h', '-?'))
- ||
- $_SERVER['argc'] < 2) {
+ in_array($_SERVER['argv'][1], array('--help', '-help', '-h', '-?'))
+ ||
+ $_SERVER['argc'] < 3) {
echo "Display acronyms statistics\n\n";
- echo "Usage: {$_SERVER['argv'][0]} [-v] <reference path>\n";
- echo "Usage: {$_SERVER['argv'][0]} -i <acronym> [acronym...]\n";
+ echo "Usage: {$_SERVER['argv'][0]} <acronyms file> [-v] <reference path>\n";
+ echo "Usage: {$_SERVER['argv'][0]} <acronyms file> -i <acronym> [acronym...]\n";
echo " --help, -help, -h, -? - to get this help\n";
echo " -v - verbose\n";
-
+ echo "\n";
+ echo "The acronyms file usually is doc-en/entities/entities.acronyms.ent\n";
+
+ exit(1);
+
+}
+
+$acronyms_file = $_SERVER['argv'][1];
+
+if (!is_file($acronyms_file)) {
+
+ echo "ERROR: Acronyms file not found: $acronyms_file\n";
exit(1);
}
@@ -44,26 +55,26 @@
$requested_acronyms = array();
// select mode
-if ($_SERVER['argv'][1] !== '-i') {
+if ($_SERVER['argv'][2] !== '-i') {
+
+ if ($_SERVER['argv'][2] === '-v' && isset($_SERVER['argv'][3])) {
- if ($_SERVER['argv'][1] === '-v' && isset($_SERVER['argv'][2])) {
-
$mode = M_VERBOSE;
- $start_path = $_SERVER['argv'][2];
-
+ $start_path = $_SERVER['argv'][3];
+
} else {
-
+
$mode = M_GLOBAL;
- $start_path = $_SERVER['argv'][1];
-
+ $start_path = $_SERVER['argv'][2];
+
}
-} else if (isset($_SERVER['argv'][2])) {
+} else if (isset($_SERVER['argv'][3])) {
$mode = M_SPECIFIC;
- $start_path = 'en/';
+ $start_path = dirname(dirname($acronyms_file));
- $requested_acronyms = array_slice($_SERVER['argv'], 2);
+ $requested_acronyms = array_slice($_SERVER['argv'], 3);
} else {
@@ -88,24 +99,26 @@
// complete with information about definition
-$content = file_get_contents('entities/acronyms.xml');
+$content = file_get_contents($acronyms_file);
-if (preg_match_all('#<term>(.+?)</term>\s+<listitem>\s+<simpara>(.+?)</simpara#', $content, $matches)) {
+if (preg_match_all('#<entity name="acronym\.expansion\.([^"]+)">(.*?)</entity>#s', $content, $matches)) {
foreach($matches[1] as $id => $acronym) {
-
+
+ $description = trim(preg_replace('#\s+#', ' ', $matches[2][$id]));
+
if (!isset($acronyms_infos[$acronym])) {
$acronyms_infos[$acronym] = array('defined' => true,
- 'description' => $matches[2][$id],
+ 'description' => $description,
'locations' => array());
-
+
} else {
$acronyms_infos[$acronym]['defined'] = true;
- $acronyms_infos[$acronym]['description'] = $matches[2][$id];
+ $acronyms_infos[$acronym]['description'] = $description;
}
-
+
}
-
+
}
@@ -144,7 +157,7 @@
$total_uNd = $total_used-$total_UNNd;
echo "Found $total_occs occurrences of $total_used acronyms in $start_path\n";
- echo " $total_defined acronyms are defined in acronyms.ent\n";
+ echo " $total_defined acronyms are defined in " . basename($acronyms_file) . "\n";
echo " $total_uNd (".round(100*$total_uNd/$total_used)."%) acronyms used are defined\n";
if ($total_UNNd) {