diff --git a/fpdf/FAQ.htm b/fpdf/FAQ.htm
index 6379a4b..d8a6d51 100644
--- 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
index b296def..72d38e1 100644
--- 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
index f0f3520..2340022 100644
--- 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
index bb1aaa1..0287399 100644
--- 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
index 128e59c..d92ed49 100644
--- 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
index 9bc3276..9769613 100644
--- 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
index 7d9ebe1..45e6808 100644
--- 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
index d675efb..279f7bb 100644
--- 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
index 8b69ba5..24f56d2 100644
--- 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
index 933eaba..081b237 100644
--- 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
index 95b02c6..bbc3643 100644
--- 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
index 4398bd8..085064e 100644
--- 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
index 5150072..01f06b6 100644
--- 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
index 2ae306b..ba8c6b4 100644
--- 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
index 38b4875..068ba92 100644
--- 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
index 86550a3..a5bc02b 100644
--- 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
index e1b387a..44177a9 100644
--- 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
index 984fc6a..14eaa58 100644
--- 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
index aad4775..f53a242 100644
--- 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
index 211032b..4c4750e 100644
--- 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
index e232b4e..172339c 100644
--- 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
index f3df2fb..cdca7c8 100644
--- 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
index 04dbe37..de02ddc 100644
--- 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
index 9f136ae..7669370 100644
--- 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
index 8992f93..b8d6e2b 100644
--- 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
index 95400be..6a60beb 100644
--- 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
index febc9ae..98e04d9 100644
--- 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
index 374134b..f6e96f3 100644
--- 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
index 8c0c6f2..64492cb 100644
--- 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
index ec506d9..81a4c74 100644
--- 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
index 1cf2ed8..95135f6 100644
--- 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
index e9deb56..a1cbc54 100644
--- 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
index fc5a093..e58cf5e 100644
--- 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
index 9e18343..2d4b641 100644
--- 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>
diff --git a/fpdf/doc/setfont.htm b/fpdf/doc/setfont.htm
index 072de22..137fa99 100644
--- a/fpdf/doc/setfont.htm
+++ b/fpdf/doc/setfont.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>SetFont</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
@@ -9,30 +9,17 @@
 <h1>SetFont</h1>
 <code>SetFont(<b>string</b> family [, <b>string</b> style [, <b>float</b> size]])</code>
 <h2>Description</h2>
-Sets the font used to print character strings. It is mandatory to call this method
-at least once before printing text or the resulting document would not be valid.
+Sets the font used to print character strings. It is mandatory to call this method at least once before printing text.
 <br>
-The font can be either a standard one or a font added via the AddFont() method. Standard fonts
+<br>
+The font can be either a standard one or a font added by the AddFont() method. Standard fonts
 use the Windows encoding cp1252 (Western Europe).
 <br>
-The method can be called before the first page is created and the font is kept from page
-to page.
 <br>
-If you just wish to change the current font size, it is simpler to call SetFontSize().
+The method can be called before the first page is created and the font is kept from page to page.
 <br>
 <br>
-<strong>Note:</strong> the font definition files must be accessible. They are searched successively in:
-<ul>
-<li>The directory defined 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> (if it exists)</li>
-</ul>
-Example using <code>FPDF_FONTPATH</code>:
-<div class="doc-source">
-<pre><code>define('FPDF_FONTPATH', '/home/www/font');
-require('fpdf.php');</code></pre>
-</div>
-If the file corresponding to the requested font is not found, the error "Could not include font
-definition file" is raised.
+If you just wish to change the current font size, it is simpler to call SetFontSize().
 <h2>Parameters</h2>
 <dl class="param">
 <dt><code>family</code></dt>
diff --git a/fpdf/doc/setfontsize.htm b/fpdf/doc/setfontsize.htm
index 70d002d..b70cf05 100644
--- a/fpdf/doc/setfontsize.htm
+++ b/fpdf/doc/setfontsize.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>SetFontSize</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/setkeywords.htm b/fpdf/doc/setkeywords.htm
index 4952cc6..8cd12f6 100644
--- a/fpdf/doc/setkeywords.htm
+++ b/fpdf/doc/setkeywords.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>SetKeywords</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/setleftmargin.htm b/fpdf/doc/setleftmargin.htm
index efa9c4e..4d732ac 100644
--- a/fpdf/doc/setleftmargin.htm
+++ b/fpdf/doc/setleftmargin.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>SetLeftMargin</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/setlinewidth.htm b/fpdf/doc/setlinewidth.htm
index b60b3b9..a22f2b9 100644
--- a/fpdf/doc/setlinewidth.htm
+++ b/fpdf/doc/setlinewidth.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>SetLineWidth</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/setlink.htm b/fpdf/doc/setlink.htm
index 6160dc8..0c56beb 100644
--- a/fpdf/doc/setlink.htm
+++ b/fpdf/doc/setlink.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>SetLink</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/setmargins.htm b/fpdf/doc/setmargins.htm
index 01e32f7..a9285fe 100644
--- a/fpdf/doc/setmargins.htm
+++ b/fpdf/doc/setmargins.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>SetMargins</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/setrightmargin.htm b/fpdf/doc/setrightmargin.htm
index b55941b..18b1433 100644
--- a/fpdf/doc/setrightmargin.htm
+++ b/fpdf/doc/setrightmargin.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>SetRightMargin</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/setsubject.htm b/fpdf/doc/setsubject.htm
index 5df7fd4..277f4fe 100644
--- a/fpdf/doc/setsubject.htm
+++ b/fpdf/doc/setsubject.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>SetSubject</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/settextcolor.htm b/fpdf/doc/settextcolor.htm
index 2db3b0d..c71e4f0 100644
--- a/fpdf/doc/settextcolor.htm
+++ b/fpdf/doc/settextcolor.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>SetTextColor</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/settitle.htm b/fpdf/doc/settitle.htm
index 75cb9aa..8ad67fb 100644
--- a/fpdf/doc/settitle.htm
+++ b/fpdf/doc/settitle.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>SetTitle</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/settopmargin.htm b/fpdf/doc/settopmargin.htm
index 5ea6ebc..7f4da03 100644
--- a/fpdf/doc/settopmargin.htm
+++ b/fpdf/doc/settopmargin.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>SetTopMargin</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/setx.htm b/fpdf/doc/setx.htm
index 39d3796..8326168 100644
--- a/fpdf/doc/setx.htm
+++ b/fpdf/doc/setx.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>SetX</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/setxy.htm b/fpdf/doc/setxy.htm
index 005acd4..59eb7d8 100644
--- a/fpdf/doc/setxy.htm
+++ b/fpdf/doc/setxy.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>SetXY</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/sety.htm b/fpdf/doc/sety.htm
index 7ee94ea..3d101a6 100644
--- a/fpdf/doc/sety.htm
+++ b/fpdf/doc/sety.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>SetY</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/text.htm b/fpdf/doc/text.htm
index 0ef6187..71e9e3c 100644
--- a/fpdf/doc/text.htm
+++ b/fpdf/doc/text.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>Text</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/doc/write.htm b/fpdf/doc/write.htm
index 42b1c99..5ffa4dc 100644
--- a/fpdf/doc/write.htm
+++ b/fpdf/doc/write.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>Write</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/fpdf.php b/fpdf/fpdf.php
index 2af3176..05b3f1b 100644
--- a/fpdf/fpdf.php
+++ b/fpdf/fpdf.php
@@ -2,14 +2,14 @@
 /*******************************************************************************
 * FPDF                                                                         *
 *                                                                              *
-* Version: 1.85                                                                *
-* Date:    2022-11-10                                                          *
+* Version: 1.86                                                                *
+* Date:    2023-06-25                                                          *
 * Author:  Olivier PLATHEY                                                     *
 *******************************************************************************/
 
 class FPDF
 {
-const VERSION = '1.85';
+const VERSION = '1.86';
 protected $page;               // current page number
 protected $n;                  // current object number
 protected $offsets;            // array of object offsets
@@ -36,7 +36,7 @@ class FPDF
 protected $x, $y;              // current position in user unit
 protected $lasth;              // height of last printed cell
 protected $LineWidth;          // line width in user unit
-protected $fontpath;           // path containing fonts
+protected $fontpath;           // directory containing fonts
 protected $CoreFonts;          // array of core font names
 protected $fonts;              // array of used fonts
 protected $FontFiles;          // array of font files
@@ -103,15 +103,9 @@ function __construct($orientation='P', $unit='mm', $size='A4')
 	$this->iconv = function_exists('iconv');
 	// Font path
 	if(defined('FPDF_FONTPATH'))
-	{
 		$this->fontpath = FPDF_FONTPATH;
-		if(substr($this->fontpath,-1)!='/' && substr($this->fontpath,-1)!='\\')
-			$this->fontpath .= '/';
-	}
-	elseif(is_dir(dirname(__FILE__).'/font'))
-		$this->fontpath = dirname(__FILE__).'/font/';
 	else
-		$this->fontpath = '';
+		$this->fontpath = dirname(__FILE__).'/font/';
 	// Core fonts
 	$this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', 'zapfdingbats');
 	// Scale factor
@@ -446,7 +440,7 @@ function Rect($x, $y, $w, $h, $style='')
 	$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
 }
 
-function AddFont($family, $style='', $file='')
+function AddFont($family, $style='', $file='', $dir='')
 {
 	// Add a TrueType, OpenType or Type1 font
 	$family = strtolower($family);
@@ -458,11 +452,18 @@ function AddFont($family, $style='', $file='')
 	$fontkey = $family.$style;
 	if(isset($this->fonts[$fontkey]))
 		return;
-	$info = $this->_loadfont($file);
+	if(strpos($file,'/')!==false || strpos($file,"\\")!==false)
+		$this->Error('Incorrect font definition file name: '.$file);
+	if($dir=='')
+		$dir = $this->fontpath;
+	if(substr($dir,-1)!='/' && substr($dir,-1)!='\\')
+		$dir .= '/';
+	$info = $this->_loadfont($dir.$file);
 	$info['i'] = count($this->fonts)+1;
 	if(!empty($info['file']))
 	{
 		// Embedded font
+		$info['file'] = $dir.$info['file'];
 		if($info['type']=='TrueType')
 			$this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);
 		else
@@ -1130,14 +1131,12 @@ protected function _endpage()
 	$this->state = 1;
 }
 
-protected function _loadfont($font)
+protected function _loadfont($path)
 {
-	// Load a font definition file from the font directory
-	if(strpos($font,'/')!==false || strpos($font,"\\")!==false)
-		$this->Error('Incorrect font definition file name: '.$font);
-	include($this->fontpath.$font);
+	// Load a font definition file
+	include($path);
 	if(!isset($name))
-		$this->Error('Could not include font definition file');
+		$this->Error('Could not include font definition file: '.$path);
 	if(isset($enc))
 		$enc = strtolower($enc);
 	if(!isset($subsetted))
@@ -1609,7 +1608,7 @@ protected function _putfonts()
 		// Font file embedding
 		$this->_newobj();
 		$this->FontFiles[$file]['n'] = $this->n;
-		$font = file_get_contents($this->fontpath.$file,true);
+		$font = file_get_contents($file);
 		if(!$font)
 			$this->Error('Font file not found: '.$file);
 		$compressed = (substr($file,-2)=='.z');
@@ -1857,7 +1856,7 @@ protected function _putresources()
 
 protected function _putinfo()
 {
-	$date = @date('YmdHisO', $this->CreationDate);
+	$date = @date('YmdHisO',$this->CreationDate);
 	$this->metadata['CreationDate'] = 'D:'.substr($date,0,-2)."'".substr($date,-2)."'";
 	foreach($this->metadata as $key=>$value)
 		$this->_put('/'.$key.' '.$this->_textstring($value));
@@ -1898,6 +1897,7 @@ protected function _puttrailer()
 
 protected function _enddoc()
 {
+	$this->CreationDate = time();
 	$this->_putheader();
 	$this->_putpages();
 	$this->_putresources();
@@ -1929,7 +1929,6 @@ protected function _enddoc()
 	$this->_put($offset);
 	$this->_put('%%EOF');
 	$this->state = 3;
-	$this->CreationDate = time();
 }
 }
 ?>
diff --git a/fpdf/tutorial/index.htm b/fpdf/tutorial/index.htm
index d1f8fb6..adf679b 100644
--- a/fpdf/tutorial/index.htm
+++ b/fpdf/tutorial/index.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>Tutorials</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
diff --git a/fpdf/tutorial/makefont.php b/fpdf/tutorial/makefont.php
index 7a09201..fa7dcb7 100644
--- a/fpdf/tutorial/makefont.php
+++ b/fpdf/tutorial/makefont.php
@@ -2,5 +2,5 @@
 // Generation of font definition file for tutorial 7
 require('../makefont/makefont.php');
 
-MakeFont('calligra.ttf','cp1252');
+MakeFont('CevicheOne-Regular.ttf', 'cp1252');
 ?>
diff --git a/fpdf/tutorial/tuto1.htm b/fpdf/tutorial/tuto1.htm
index 0b95c93..b1a9f58 100644
--- a/fpdf/tutorial/tuto1.htm
+++ b/fpdf/tutorial/tuto1.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>Minimal example</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
@@ -19,7 +19,7 @@ <h1>Minimal example</h1>
 </span>$pdf<span class="kw">-&gt;</span>Output<span class="kw">();
 </span>?&gt;</code></pre>
 </div>
-<p class='demo'><a href='tuto1.php' target='_blank' class='demo'>[Demo]</a></p>
+<p class='demo'><a href='tuto1.php' target='_blank' class='demo'>[Run]</a></p>
 After including the library file, we create an FPDF object.
 The <a href='../doc/__construct.htm'>constructor</a> is used here with the default values: pages are in A4 portrait and
 the unit of measure is millimeter. It could have been specified explicitly with:
diff --git a/fpdf/tutorial/tuto2.htm b/fpdf/tutorial/tuto2.htm
index c402cf4..b3c0590 100644
--- a/fpdf/tutorial/tuto2.htm
+++ b/fpdf/tutorial/tuto2.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, footer, page break and image</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
@@ -51,7 +51,7 @@ <h1>Header, footer, page break and image</h1>
 </span>$pdf<span class="kw">-&gt;</span>Output<span class="kw">();
 </span>?&gt;</code></pre>
 </div>
-<p class='demo'><a href='tuto2.php' target='_blank' class='demo'>[Demo]</a></p>
+<p class='demo'><a href='tuto2.php' target='_blank' class='demo'>[Run]</a></p>
 This example makes use of the <a href='../doc/header.htm'>Header()</a> and <a href='../doc/footer.htm'>Footer()</a> methods to process page headers and
 footers. They are called automatically. They already exist in the FPDF class but do nothing,
 therefore we have to extend the class and override them.
diff --git a/fpdf/tutorial/tuto3.htm b/fpdf/tutorial/tuto3.htm
index 5d8363f..391ca5c 100644
--- a/fpdf/tutorial/tuto3.htm
+++ b/fpdf/tutorial/tuto3.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 breaks and colors</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
@@ -92,7 +92,7 @@ <h1>Line breaks and colors</h1>
 </span>$pdf<span class="kw">-&gt;</span>Output<span class="kw">();
 </span>?&gt;</code></pre>
 </div>
-<p class='demo'><a href='tuto3.php' target='_blank' class='demo'>[Demo]</a></p>
+<p class='demo'><a href='tuto3.php' target='_blank' class='demo'>[Run]</a></p>
 The <a href='../doc/getstringwidth.htm'>GetStringWidth()</a> method allows to determine the length of a string in the current font,
 which is used here to calculate the position and the width of the frame surrounding the title.
 Then colors are set (via <a href='../doc/setdrawcolor.htm'>SetDrawColor()</a>, <a href='../doc/setfillcolor.htm'>SetFillColor()</a> and <a href='../doc/settextcolor.htm'>SetTextColor()</a>) and the
diff --git a/fpdf/tutorial/tuto4.htm b/fpdf/tutorial/tuto4.htm
index 05ccde2..36665d8 100644
--- a/fpdf/tutorial/tuto4.htm
+++ b/fpdf/tutorial/tuto4.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>Multi-columns</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
@@ -120,7 +120,7 @@ <h1>Multi-columns</h1>
 </span>$pdf<span class="kw">-&gt;</span>Output<span class="kw">();
 </span>?&gt;</code></pre>
 </div>
-<p class='demo'><a href='tuto4.php' target='_blank' class='demo'>[Demo]</a></p>
+<p class='demo'><a href='tuto4.php' target='_blank' class='demo'>[Run]</a></p>
 The key method used is <a href='../doc/acceptpagebreak.htm'>AcceptPageBreak()</a>. It allows to accept or not an automatic page
 break. By refusing it and altering the margin and current position, the desired column layout
 is achieved.
diff --git a/fpdf/tutorial/tuto5.htm b/fpdf/tutorial/tuto5.htm
index f90102b..e4567ee 100644
--- a/fpdf/tutorial/tuto5.htm
+++ b/fpdf/tutorial/tuto5.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>Tables</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
@@ -112,7 +112,7 @@ <h1>Tables</h1>
 </span>$pdf<span class="kw">-&gt;</span>Output<span class="kw">();
 </span>?&gt;</code></pre>
 </div>
-<p class='demo'><a href='tuto5.php' target='_blank' class='demo'>[Demo]</a></p>
+<p class='demo'><a href='tuto5.php' target='_blank' class='demo'>[Run]</a></p>
 A table being just a collection of cells, it's natural to build one from them. The first
 example is achieved in the most basic way possible: simple framed cells, all of the same size
 and left aligned. The result is rudimentary but very quick to obtain.
diff --git a/fpdf/tutorial/tuto6.htm b/fpdf/tutorial/tuto6.htm
index 602a119..cba890a 100644
--- a/fpdf/tutorial/tuto6.htm
+++ b/fpdf/tutorial/tuto6.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>Links and flowing text</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
@@ -124,7 +124,7 @@ <h1>Links and flowing text</h1>
 </span>$pdf<span class="kw">-&gt;</span>Output<span class="kw">();
 </span>?&gt;</code></pre>
 </div>
-<p class='demo'><a href='tuto6.php' target='_blank' class='demo'>[Demo]</a></p>
+<p class='demo'><a href='tuto6.php' target='_blank' class='demo'>[Run]</a></p>
 The new method to print text is <a href='../doc/write.htm'>Write()</a>. It's very close to <a href='../doc/multicell.htm'>MultiCell()</a>; the differences are:
 <ul>
 <li>The end of line is at the right margin and the next line begins at the left one</li>
diff --git a/fpdf/tutorial/tuto7.htm b/fpdf/tutorial/tuto7.htm
index 6cd3534..8074295 100644
--- a/fpdf/tutorial/tuto7.htm
+++ b/fpdf/tutorial/tuto7.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>Adding new fonts and encodings</title>
 <link type="text/css" rel="stylesheet" href="../fpdf.css">
 </head>
@@ -172,11 +172,11 @@ <h2>Example</h2>
 </span>$pdf <span class="kw">= new </span>FPDF<span class="kw">();
 </span>$pdf<span class="kw">-&gt;</span>AddFont<span class="kw">(</span><span class="str">'CevicheOne'</span><span class="kw">,</span><span class="str">''</span><span class="kw">,</span><span class="str">'CevicheOne-Regular.php'</span><span class="kw">);
 </span>$pdf<span class="kw">-&gt;</span>AddPage<span class="kw">();
-</span>$pdf<span class="kw">-&gt;</span>SetFont<span class="kw">(</span><span class="str">'CevicheOne'</span><span class="kw">,</span><span class="str">''</span><span class="kw">,</span>35<span class="kw">);
+</span>$pdf<span class="kw">-&gt;</span>SetFont<span class="kw">(</span><span class="str">'CevicheOne'</span><span class="kw">,</span><span class="str">''</span><span class="kw">,</span>45<span class="kw">);
 </span>$pdf<span class="kw">-&gt;</span>Write<span class="kw">(</span>10<span class="kw">,</span><span class="str">'Enjoy new fonts with FPDF!'</span><span class="kw">);
 </span>$pdf<span class="kw">-&gt;</span>Output<span class="kw">();
 </span>?&gt;</code></pre>
 </div>
-<p class='demo'><a href='tuto7.php' target='_blank' class='demo'>[Demo]</a></p>
+<p class='demo'><a href='tuto7.php' target='_blank' class='demo'>[Run]</a></p>
 </body>
 </html>
diff --git a/fpdf/tutorial/tuto7.php b/fpdf/tutorial/tuto7.php
index d25e0f8..d6e3fa9 100644
--- a/fpdf/tutorial/tuto7.php
+++ b/fpdf/tutorial/tuto7.php
@@ -1,11 +1,10 @@
 <?php
-define('FPDF_FONTPATH','.');
 require('../fpdf.php');
 
 $pdf = new FPDF();
-$pdf->AddFont('CevicheOne','','CevicheOne-Regular.php');
+$pdf->AddFont('CevicheOne','','CevicheOne-Regular.php','.');
 $pdf->AddPage();
 $pdf->SetFont('CevicheOne','',45);
-$pdf->Cell(0,10,'Enjoy new fonts with FPDF!');
+$pdf->Write(10,'Enjoy new fonts with FPDF!');
 $pdf->Output();
 ?>
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 41d4d05..c7afcca 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -69,7 +69,7 @@ public function assertPdfAreEquals (string $expected, string $actual) : void {
 			$diff = [];
 			foreach ($differences as $oid => $obj) {
 				$keys = (is_a($obj->get_value(), PDFValue::class) ? $obj->get_keys() : false) ?: ['OID_' . $obj->get_oid()];
-				$diff = array_merge($diff, array_diff($keys, ['Producer', 'CreationDate']));
+				$diff = array_merge($diff, array_diff($keys, ['Producer', 'CreationDate', 'Title', 'O', 'U']));
 			}
 
 			$this->assertEquals([], $diff, 'The PDFs contents have differences.');
