Explorar o código

Update for #file which now also does UTF8 without a BOM since it uses TTextFileReader.

Martijn Laan hai 1 ano
pai
achega
5e40da0fcd
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 2 2
      Projects/ISPP/Help/ispp.xml
  2. 1 1
      whatsnew.htm

+ 2 - 2
Projects/ISPP/Help/ispp.xml

@@ -237,7 +237,7 @@
 					</define>
 					</define>
 				</syntax>
 				</syntax>
 				<description>
 				<description>
-					<para>Includes the &translation; of the specified file. If an Unicode file is used, it must be UTF-8 encoded with a BOM.</para>
+					<para>Includes the &translation; of the specified file. If an Unicode file is used, it must be UTF-8 (with or without a BOM) encoded</para>
 					<para>If the filename is enclosed in quotes, ISPP first searches for the file in the directory where current file resides, then in the directory where the file that included current file resides, and so on. If the file is not found, it is searched on current include path, set via &pragma;, then on the path specified by INCLUDE environment variable.</para>
 					<para>If the filename is enclosed in quotes, ISPP first searches for the file in the directory where current file resides, then in the directory where the file that included current file resides, and so on. If the file is not found, it is searched on current include path, set via &pragma;, then on the path specified by INCLUDE environment variable.</para>
 					<para>If filename is an expression or specified in angle brackets, it is searched on current include path only.</para>
 					<para>If filename is an expression or specified in angle brackets, it is searched on current include path only.</para>
           <para>The filename may be prefixed by "compiler:", in which case it looks for the file in the Compiler directory.</para>
           <para>The filename may be prefixed by "compiler:", in which case it looks for the file in the Compiler directory.</para>
@@ -263,7 +263,7 @@
 					</define>
 					</define>
 				</syntax>
 				</syntax>
 				<description>
 				<description>
-					<para>Replaces the directive with the name of a temporary file containing the &translation; of the specified file. Upon end of compilation, the temporary file is automatically deleted. If an Unicode file is used, it must be UTF-8 encoded with a BOM.</para>
+					<para>Replaces the directive with the name of a temporary file containing the &translation; of the specified file. Upon end of compilation, the temporary file is automatically deleted. If an Unicode file is used, it must be UTF-8 (with or without a BOM) encoded.</para>
 					<para>Including a file using this directive creates a new independent instance of the preprocessor, passing it options currently in effect and all declared identifiers. If the included file modifies options in some way, they are not propagated back.</para>
 					<para>Including a file using this directive creates a new independent instance of the preprocessor, passing it options currently in effect and all declared identifiers. If the included file modifies options in some way, they are not propagated back.</para>
 					<para>When using this directive in Inno Setup's Source parameter of the [Files] section, specify a DestName parameter too, else the file with not be installed with the original name.</para>
 					<para>When using this directive in Inno Setup's Source parameter of the [Files] section, specify a DestName parameter too, else the file with not be installed with the original name.</para>
 					<para>This directive can only be used <link href="directives">inline</link>.</para>
 					<para>This directive can only be used <link href="directives">inline</link>.</para>

+ 1 - 1
whatsnew.htm

@@ -31,7 +31,7 @@ For conditions of distribution and use, see <a href="https://jrsoftware.org/file
 <p><a name="6.3.0"></a><span class="ver">6.3.0-dev </span><span class="date">(?)</span></p>
 <p><a name="6.3.0"></a><span class="ver">6.3.0-dev </span><span class="date">(?)</span></p>
 <p><span class="head2">Support for UTF-8 encoded files improved</span></p>
 <p><span class="head2">Support for UTF-8 encoded files improved</span></p>
 <ul>
 <ul>
-  <li>Added support for UTF-8 encoded .iss script files and .isl messages files without an UTF-8 preamble (also called BOM), and also for <tt>LicenseFile</tt>, <tt>InfoBeforeFile</tt>, and <tt>InfoAfterFile</tt>.</li>
+  <li>Added support for UTF-8 encoded files without an UTF-8 preamble (also called BOM) for .iss script files, .isl messages files, <tt>LicenseFile</tt>, <tt>InfoBeforeFile</tt>,  <tt>InfoAfterFile</tt>, and ISPP's <tt>#file</tt>.</li>
   <li>Compiler IDE changes:
   <li>Compiler IDE changes:
   <ul>
   <ul>
   <li>Added new <i>UTF-8 without BOM</i> menu item to the <i>Save Encoding</i> submenu of the <i>File</i> menu.</li>
   <li>Added new <i>UTF-8 without BOM</i> menu item to the <i>Save Encoding</i> submenu of the <i>File</i> menu.</li>