Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8b318a1

Browse files
committed
Now that we have non-Latin1 SGML detection, restore Latin1 chars
This reverts the change in commit 641a5b7 that converted them to HTML entities. Reported-by: Peter Eisentraut Discussion: https://postgr.es/m/Z05ssoVheWI-rqax@momjian.us Backpatch-through: master
1 parent 7167e05 commit 8b318a1

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

doc/src/sgml/charset.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ CREATE COLLATION ignore_accents (provider = icu, locale = 'und-u-ks-level1-kc-tr
12251225
<programlisting>
12261226
-- ignore differences in accents and case
12271227
CREATE COLLATION ignore_accent_case (provider = icu, deterministic = false, locale = 'und-u-ks-level1');
1228-
SELECT '&Aring;' = 'A' COLLATE ignore_accent_case; -- true
1228+
SELECT 'Å' = 'A' COLLATE ignore_accent_case; -- true
12291229
SELECT 'z' = 'Z' COLLATE ignore_accent_case; -- true
12301230

12311231
-- upper case letters sort before lower case.
@@ -1282,7 +1282,7 @@ SELECT 'w;x*y-z' = 'wxyz' COLLATE num_ignore_punct; -- true
12821282
<entry><literal>'ab' = U&amp;'a\2063b'</literal></entry>
12831283
<entry><literal>'x-y' = 'x_y'</literal></entry>
12841284
<entry><literal>'g' = 'G'</literal></entry>
1285-
<entry><literal>'n' = '&ntilde;'</literal></entry>
1285+
<entry><literal>'n' = 'ñ'</literal></entry>
12861286
<entry><literal>'y' = 'z'</literal></entry>
12871287
</row>
12881288
</thead>
@@ -1346,7 +1346,7 @@ SELECT 'w;x*y-z' = 'wxyz' COLLATE num_ignore_punct; -- true
13461346

13471347
<para>
13481348
At every level, even with full normalization off, basic normalization is
1349-
performed. For example, <literal>'&aacute;'</literal> may be composed of the
1349+
performed. For example, <literal>'á'</literal> may be composed of the
13501350
code points <literal>U&amp;'\0061\0301'</literal> or the single code
13511351
point <literal>U&amp;'\00E1'</literal>, and those sequences will be
13521352
considered equal even at the <literal>identic</literal> level. To treat
@@ -1430,8 +1430,8 @@ SELECT 'x-y' = 'x_y' COLLATE level4; -- false
14301430
<entry><literal>false</literal></entry>
14311431
<entry>
14321432
Backwards comparison for the level 2 differences. For example,
1433-
locale <literal>und-u-kb</literal> sorts <literal>'&agrave;e'</literal>
1434-
before <literal>'a&eacute;'</literal>.
1433+
locale <literal>und-u-kb</literal> sorts <literal>'àe'</literal>
1434+
before <literal>''</literal>.
14351435
</entry>
14361436
</row>
14371437

doc/src/sgml/stylesheet-man.xsl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,12 @@
213213
<!-- Slight rephrasing to indicate that missing sections are found
214214
in the documentation. -->
215215
<l:context name="xref-number-and-title">
216-
<l:template name="chapter" text="Chapter %n, &quot;%t&quot;, in the documentation"/>
217-
<l:template name="sect1" text="Section %n, &quot;%t&quot;, in the documentation"/>
218-
<l:template name="sect2" text="Section %n, &quot;%t&quot;, in the documentation"/>
219-
<l:template name="sect3" text="Section %n, &quot;%t&quot;, in the documentation"/>
220-
<l:template name="sect4" text="Section %n, &quot;%t&quot;, in the documentation"/>
221-
<l:template name="sect5" text="Section %n, &quot;%t&quot;, in the documentation"/>
216+
<l:template name="chapter" text="Chapter %n, %t, in the documentation"/>
217+
<l:template name="sect1" text="Section %n, “%t”, in the documentation"/>
218+
<l:template name="sect2" text="Section %n, “%t”, in the documentation"/>
219+
<l:template name="sect3" text="Section %n, “%t”, in the documentation"/>
220+
<l:template name="sect4" text="Section %n, “%t”, in the documentation"/>
221+
<l:template name="sect5" text="Section %n, “%t”, in the documentation"/>
222222
</l:context>
223223
</l:l10n>
224224
</l:i18n>

0 commit comments

Comments
 (0)