Merge pull request #29 from erikn69/patch-7

v1.86 (2023-06-25)
fawno · Jun 27, 2023 · 3a5b417 · 3a5b417
2 parents 7642515 + 836637d
commit 3a5b417
Show file tree

Hide file tree

Showing 63 changed files with 123 additions and 121 deletions.
diff --git a/fpdf/FAQ.htm b/fpdf/FAQ.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>FAQ</title>
 <link type="text/css" rel="stylesheet" href="fpdf.css">
 <style type="text/css">
@@ -15,7 +15,7 @@ <h1>FAQ</h1>
 <ul>
 <li><b>1.</b> <a href='#q1'>What's exactly the license of FPDF? Are there any usage restrictions?</a></li>
 <li><b>2.</b> <a href='#q2'>I get the following error when I try to generate a PDF: Some data has already been output, can't send PDF file</a></li>
-<li><b>3.</b> <a href='#q3'>Accented letters are replaced with some strange characters like é.</a></li>
+<li><b>3.</b> <a href='#q3'>Accented letters are replaced by some strange characters like Ã©.</a></li>
 <li><b>4.</b> <a href='#q4'>I try to display the Euro symbol but it doesn't work.</a></li>
 <li><b>5.</b> <a href='#q5'>I try to display a variable in the Header method but nothing prints.</a></li>
 <li><b>6.</b> <a href='#q6'>I have defined the Header and Footer methods in my PDF class but nothing shows.</a></li>
@@ -59,7 +59,7 @@ <h1>FAQ</h1>
 </li>
 
 <li id='q3'>
-<p><b>3.</b> <span class='question'>Accented letters are replaced with some strange characters like é.</span></p>
+<p><b>3.</b> <span class='question'>Accented letters are replaced by some strange characters like Ã©.</span></p>
 Don't use UTF-8 with the standard fonts; they expect text encoded in windows-1252.
 You can perform a conversion with iconv:
 <div class="doc-source">

diff --git a/fpdf/changelog.htm b/fpdf/changelog.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Changelog</title>
 <link type="text/css" rel="stylesheet" href="fpdf.css">
 <style type="text/css">
@@ -11,6 +11,11 @@
 <body>
 <h1>Changelog</h1>
 <dl>
+<dt><strong>v1.86</strong> (2023-06-25)</dt>
+<dd>
+- Added a parameter to AddFont() to specify the directory where to load the font definition file.<br>
+- Fixed a bug related to the PDF creation date.<br>
+</dd>
 <dt><strong>v1.85</strong> (2022-11-10)</dt>
 <dd>
 - Removed deprecation notices on PHP 8.2.<br>

diff --git a/fpdf/doc/__construct.htm b/fpdf/doc/__construct.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>__construct</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/acceptpagebreak.htm b/fpdf/doc/acceptpagebreak.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>AcceptPageBreak</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/addfont.htm b/fpdf/doc/addfont.htm
@@ -1,19 +1,25 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>AddFont</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
 <body>
 <h1>AddFont</h1>
-<code>AddFont(<b>string</b> family [, <b>string</b> style [, <b>string</b> file]])</code>
+<code>AddFont(<b>string</b> family [, <b>string</b> style [, <b>string</b> file [, <b>string</b> dir]]])</code>
 <h2>Description</h2>
 Imports a TrueType, OpenType or Type1 font and makes it available. It is necessary to generate a font
 definition file first with the MakeFont utility.
 <br>
-The definition file (and the font file itself when embedding) must be present in the font directory.
-If it is not found, the error "Could not include font definition file" is raised.
+<br>
+The definition file (and the font file itself in case of embedding) must be present in:
+<ul>
+<li>The directory indicated by the 4th parameter (if that parameter is set)</li>
+<li>The directory indicated by the <code>FPDF_FONTPATH</code> constant (if that constant is defined)</li>
+<li>The <code>font</code> directory located in the same directory as <code>fpdf.php</code></li>
+</ul>
+If the file is not found, the error "Could not include font definition file" is raised.
 <h2>Parameters</h2>
 <dl class="param">
 <dt><code>family</code></dt>
@@ -34,9 +40,15 @@ <h2>Parameters</h2>
 </dd>
 <dt><code>file</code></dt>
 <dd>
-The font definition file.
+The name of the font definition file.
+<br>
+By default, it is built from the family and style, in lower case with no space.
+</dd>
+<dt><code>dir</code></dt>
+<dd>
+The directory where to load the definition file.
 <br>
-By default, the name is built from the family and style, in lower case with no space.
+If not specified, the default directory will be used.
 </dd>
 </dl>
 <h2>Example</h2>

diff --git a/fpdf/doc/addlink.htm b/fpdf/doc/addlink.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>AddLink</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/addpage.htm b/fpdf/doc/addpage.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>AddPage</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/aliasnbpages.htm b/fpdf/doc/aliasnbpages.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>AliasNbPages</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/cell.htm b/fpdf/doc/cell.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Cell</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/close.htm b/fpdf/doc/close.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Close</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/error.htm b/fpdf/doc/error.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Error</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/footer.htm b/fpdf/doc/footer.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Footer</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/getpageheight.htm b/fpdf/doc/getpageheight.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GetPageHeight</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/getpagewidth.htm b/fpdf/doc/getpagewidth.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GetPageWidth</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/getstringwidth.htm b/fpdf/doc/getstringwidth.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GetStringWidth</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/getx.htm b/fpdf/doc/getx.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GetX</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/gety.htm b/fpdf/doc/gety.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GetY</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/header.htm b/fpdf/doc/header.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Header</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/image.htm b/fpdf/doc/image.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Image</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/index.htm b/fpdf/doc/index.htm
@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>FPDF 1.85 Reference Manual</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
 <body>
-<h1>FPDF 1.85 Reference Manual</h1>
+<h1>Documentation</h1>
 <a href="__construct.htm">__construct</a> - constructor<br>
 <a href="acceptpagebreak.htm">AcceptPageBreak</a> - accept or not automatic page break<br>
 <a href="addfont.htm">AddFont</a> - add a new font<br>

diff --git a/fpdf/doc/line.htm b/fpdf/doc/line.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Line</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/link.htm b/fpdf/doc/link.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Link</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/ln.htm b/fpdf/doc/ln.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Ln</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/multicell.htm b/fpdf/doc/multicell.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>MultiCell</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/output.htm b/fpdf/doc/output.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Output</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/pageno.htm b/fpdf/doc/pageno.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>PageNo</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/rect.htm b/fpdf/doc/rect.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Rect</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/setauthor.htm b/fpdf/doc/setauthor.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>SetAuthor</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/setautopagebreak.htm b/fpdf/doc/setautopagebreak.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>SetAutoPageBreak</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/setcompression.htm b/fpdf/doc/setcompression.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>SetCompression</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/setcreator.htm b/fpdf/doc/setcreator.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>SetCreator</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/setdisplaymode.htm b/fpdf/doc/setdisplaymode.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>SetDisplayMode</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/setdrawcolor.htm b/fpdf/doc/setdrawcolor.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>SetDrawColor</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>

diff --git a/fpdf/doc/setfillcolor.htm b/fpdf/doc/setfillcolor.htm
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>SetFillColor</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>