Skip to content

Fixes regarding encoding and code-page handling #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rizonesoft merged 6 commits into from
Aug 6, 2017
Merged

Fixes regarding encoding and code-page handling #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
854f0a7
reverting: don't use current system codepage for encoding default (th…
RaiKoHoff Aug 3, 2017
67ff6f2
Refactoring/Fixes:
RaiKoHoff Aug 3, 2017
bc7c7f9
Issue #32: add VisualStudio's editor behaviour for Ctrl-C and Ctrl-X…
RaiKoHoff Aug 3, 2017
7647e03
refactoring encoding and code-page handling:
RaiKoHoff Aug 4, 2017
da07368
reverting, and fixing encoding / code-page issues:
RaiKoHoff Aug 5, 2017
74ec34d
integrate Scintillas DirectWrite technology:
RaiKoHoff Aug 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified distrib/Notepad3.ini
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion scintilla/doc/ScintillaDoc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2897,7 +2897,8 @@ <h2 id="StyleDefinition">Style definition</h2>
number used by the C and C++ lexer to display literal strings; it has the value 6). This
feature works differently on Windows and GTK+.<br />
The default character set is <code>SC_CHARSET_DEFAULT</code>.</p>
<p><code>SC_CHARSET_ANSI</code> and <code>SC_CHARSET_DEFAULT</code> specify European Windows code page 1252 unless the code page is set.</p>
<p><code>SC_CHARSET_ANSI</code> specifies European Windows code page 1252.</p>
<p><code>SC_CHARSET_DEFAULT</code> specifies the system-default code page unless the code page is set.</p>

<table class="standard" summary="Character Sets supported"><tbody>
<tr>
Expand Down
4 changes: 2 additions & 2 deletions scintilla/doc/ScintillaHistory.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
Expand Down Expand Up @@ -1028,7 +1028,7 @@ <h3>
C++11 range-based for loops used in SciTE so GCC 4.6 is now the minimum supported version.
</li>
<li>
SC_CHARSET_DEFAULT now means code page 1252 on Windows unless a code page is set.
(REVERTED in Notepad2-mod) SC_CHARSET_DEFAULT now means code page 1252 on Windows unless a code page is set.
This prevents unexpected behaviour and crashes on East Asian systems where default locales are commonly DBCS.
Projects which want to default to DBCS code pages in East Asian locales should set the code page and
character set explicitly.
Expand Down
3 changes: 2 additions & 1 deletion scintilla/win32/ScintillaWin.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,8 @@ UINT CodePageFromCharSet(DWORD characterSet, UINT documentCodePage) {
}
switch (characterSet) {
case SC_CHARSET_ANSI: return 1252;
case SC_CHARSET_DEFAULT: return documentCodePage ? documentCodePage : 1252;
//case SC_CHARSET_DEFAULT: return documentCodePage ? documentCodePage : 1252; // SCI orig
case SC_CHARSET_DEFAULT: return documentCodePage;
case SC_CHARSET_BALTIC: return 1257;
case SC_CHARSET_CHINESEBIG5: return 950;
case SC_CHARSET_EASTEUROPE: return 1250;
Expand Down
Loading