Skip to content

[UPGRADE] Upgrade Scintilla from v3.5.6 to v3.5.7.#333

Closed
chcg wants to merge 6 commits intonotepad-plus-plus:masterfrom
chcg:scintilla_3_5_7
Closed

[UPGRADE] Upgrade Scintilla from v3.5.6 to v3.5.7.#333
chcg wants to merge 6 commits intonotepad-plus-plus:masterfrom
chcg:scintilla_3_5_7

Conversation

@chcg
Copy link
Contributor

@chcg chcg commented Jun 25, 2015

Changes , see http://www.scintilla.org/ScintillaHistory.html

Release 3.5.7

Released 20 June 2015.
Added SCI_MULTIPLESELECTADDNEXT to add the next occurrence of the main selection within the target to the set of selections as main. If the current selection is empty then select word around caret. SCI_MULTIPLESELECTADDEACH adds each occurrence of the main selection within the target to the set of selections.
SciTE adds "Selection Add Next" and "Selection Add Each" commands to the Search menu.
Added SCI_ISRANGEWORD to determine if the parameters are at the start and end of a word.
Added SCI_TARGETWHOLEDOCUMENT to set the target to the whole document.
Verilog lexer recognises protected regions and the folder folds protected regions.
A performance problem with markers when deleting many lines was fixed. Bug #1733.
On Cocoa fix crash when ScintillaView destroyed if no autocompletion ever displayed. Bug #1728.
On Cocoa fix crash in drag and drop.
On GTK+ 3.4+, when there are both horizontal and vertical scrollbars, draw the lower-right corner so that it does not appear black when text selected. Bug #1611.
Fixed most calls deprecated in GTK+ 3.16. Does not fix style override calls as they are more complex.
SciTE on GTK+ 3.x uses a different technique for highlighting the search strip when there is no match which is more compatible with future and past versions and different themes.

@ariccio
Copy link
Contributor

ariccio commented Jun 26, 2015

Nice idea, but this won't be accepted?

@milipili milipili added the enhancement Proposed enhancements of existing features label Aug 22, 2015
@milipili milipili added this to the 6.x milestone Aug 22, 2015
@donho
Copy link
Member

donho commented Oct 15, 2015

@chcg There is an internal Scintilla update procedure ( https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/PowerEditor/scintilla.original.forUpdating/scintillaUpdatingWorkFlow.txt ), and I will take care of Scintilla updating procedure personally.
Thank you for your patch anyway.

@donho donho closed this Oct 15, 2015
@donho donho removed the enhancement Proposed enhancements of existing features label Oct 15, 2015
@chcg chcg mentioned this pull request Jan 16, 2016
Closed
@chcg chcg added the reject label Jan 2, 2021
@chcg chcg deleted the scintilla_3_5_7 branch January 2, 2021 09:42
Vitali7777777 added a commit to Vitali7777777/notepad-plus-plus that referenced this pull request May 23, 2024
@Vitali7777777
Create index.html
db573b0 
<!DOCTYPE html>
<html lang="ru">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>AUTO WORLD - Пригон автомобилей из Америки</title>
    <style>
        body {
            font-family: Arial, sans-serif;
            margin: 0;
            padding: 0;
            background-color: #f8f8f8;
            color: notepad-plus-plus#333;
        }
        header {
            background-color: notepad-plus-plus#333;
            color: #fff;
            padding: 20px;
            text-align: center;
        }
        main {
            padding: 20px;
        }
        h1, h2 {
            color: notepad-plus-plus#333;
        }
        .services, .contact {
            margin-bottom: 40px;
        }
        .contact-form {
            max-width: 600px;
            margin: 0 auto;
        }
        .contact-form label {
            display: block;
            margin-bottom: 10px;
        }
        .contact-form input, .contact-form textarea {
            width: 100%;
            padding: 10px;
            margin-bottom: 20px;
            border: 1px solid #ccc;
            border-radius: 5px;
        }
        .contact-form button {
            padding: 10px 20px;
            background-color: notepad-plus-plus#333;
            color: #fff;
            border: none;
            border-radius: 5px;
            cursor: pointer;
        }
        .contact-form button:hover {
            background-color: notepad-plus-plus#555;
        }
        footer {
            background-color: notepad-plus-plus#333;
            color: #fff;
            text-align: center;
            padding: 10px 0;
        }
    </style>
</head>
<body>
    <header>
        <h1>AUTO WORLD</h1>
        <p>Пригон автомобилей из Америки под заказ</p>
    </header>
    <main>
        <section class="about">
            <h2>О нас</h2>
            <p>Компания "AUTO WORLD" специализируется на пригонке автомобилей из Америки под заказ. Мы помогаем вам найти идеальное авто по вашим требованиям и доставляем его прямо к вам. Наша цель - предоставить клиентам качественные автомобили по доступным ценам.</p>
        </section>
        <section class="services">
            <h2>Наши услуги</h2>
            <ul>
                <li>Поиск автомобилей в Америке</li>
                <li>Проверка состояния автомобиля</li>
                <li>Организация доставки и растаможка</li>
                <li>Консультации по выбору автомобиля</li>
            </ul>
        </section>
        <section class="contact">
            <h2>Связаться с нами</h2>
            <form class="contact-form">
                <label for="name">Ваше имя:</label>
                <input type="text" id="name" name="name" required>
                
                <label for="email">Ваш email:</label>
                <input type="email" id="email" name="email" required>
                
                <label for="message">Сообщение:</label>
                <textarea id="message" name="message" rows="5" required></textarea>
                
                <button type="submit">Отправить</button>
            </form>
        </section>
    </main>
    <footer>
        <p>&copy; 2024 AUTO WORLD. Все права защищены.</p>
    </footer>
</body>
</html>
@Vitali7777777 Vitali7777777 mentioned this pull request May 23, 2024
Closed
zabuzajuzo321-ship-it added a commit to zabuzajuzo321-ship-it/notepad-plus-plus that referenced this pull request Sep 9, 2025
@zabuzajuzo321-ship-it
Create N2.html
3c0f581 
<!DOCTYPE html>
<html lang="ka">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>თელავის მეორე სკოლა</title>
    <style>
        * {
            margin: 0;
            padding: 0;
            box-sizing: border-box;
            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
        }
        
        body {
            background-color: #f5f5f5;
            color: notepad-plus-plus#333;
            line-height: 1.6;
        }
        
        header {
            background-color: #1a5276;
            color: white;
            padding: 1rem;
            text-align: center;
            box-shadow: 0 2px 5px rgba(0,0,0,0.1);
        }
        
        .container {
            max-width: 1200px;
            margin: 0 auto;
            padding: 20px;
        }
        
        .page {
            display: none;
            background: white;
            padding: 20px;
            border-radius: 8px;
            box-shadow: 0 0 10px rgba(0,0,0,0.1);
            margin-top: 20px;
        }
        
        .active {
            display: block;
        }
        
        h1, h2, h3 {
            color: #1a5276;
            margin-bottom: 15px;
        }
        
        .form-group {
            margin-bottom: 15px;
        }
        
        label {
            display: block;
            margin-bottom: 5px;
            font-weight: bold;
        }
        
        input[type="text"],
        input[type="tel"] {
            width: 100%;
            padding: 10px;
            border: 1px solid #ddd;
            border-radius: 4px;
            font-size: 16px;
        }
        
        button {
            background-color: #1a5276;
            color: white;
            border: none;
            padding: 10px 20px;
            border-radius: 4px;
            cursor: pointer;
            font-size: 16px;
            margin-top: 10px;
        }
        
        button:hover {
            background-color: #154360;
        }
        
        .class-buttons {
            display: flex;
            flex-wrap: wrap;
            gap: 10px;
            margin-bottom: 20px;
        }
        
        .class-btn {
            background-color: #7d3c98;
            padding: 10px 15px;
        }
        
        .class-btn:hover {
            background-color: #6c3483;
        }
        
        table {
            width: 100%;
            border-collapse: collapse;
            margin-top: 20px;
        }
        
        th, td {
            border: 1px solid #ddd;
            padding: 12px;
            text-align: left;
        }
        
        th {
            background-color: #f2f2f2;
        }
        
        tr:nth-child(even) {
            background-color: #f9f9f9;
        }
        
        .students-list {
            margin-bottom: 20px;
            padding: 15px;
            background-color: #eafaf1;
            border-radius: 4px;
        }
        
        .nav-buttons {
            display: flex;
            justify-content: space-between;
            margin-top: 20px;
        }
        
        footer {
            text-align: center;
            padding: 20px;
            margin-top: 20px;
            background-color: #1a5276;
            color: white;
        }
        
        @media (max-width: 768px) {
            .class-buttons {
                flex-direction: column;
            }
            
            table {
                font-size: 14px;
            }
        }
    </style>
</head>
<body>
    <header>
        <h1>თელავის მეორე სკოლა</h1>
    </header>
    
    <div class="container">
        <!-- რეგისტრაციის გვერდი -->
        <div id="registration-page" class="page active">
            <h2>მოსწავლის რეგისტრაცია</h2>
            <form id="registration-form">
                <div class="form-group">
                    <label for="firstName">სახელი</label>
                    <input type="text" id="firstName" required>
                </div>
                
                <div class="form-group">
                    <label for="lastName">გვარი</label>
                    <input type="text" id="lastName" required>
                </div>
                
                <div class="form-group">
                    <label for="phone">ტელეფონის ნომერი</label>
                    <input type="tel" id="phone" required>
                </div>
                
                <button type="submit">რეგისტრაცია</button>
            </form>
            
            <div class="nav-buttons">
                <button onclick="showPage('schedule-page')">გაკვეთილების ცხრილის ნახვა</button>
            </div>
        </div>
        
        <!-- გაკვეთილების გვერდი -->
        <div id="schedule-page" class="page">
            <h2>გაკვეთილების ცხრილი</h2>
            
            <div class="class-buttons">
                <button class="class-btn" onclick="showClass(11)">11 კლასი</button>
                <button class="class-btn" onclick="showClass(10)">10 კლასი</button>
                <button class="class-btn" onclick="showClass(9)">9 კლასი</button>
                <button class="class-btn" onclick="showClass(8)">8 კლასი</button>
            </div>
            
            <div id="class-info">
                <p>გთხოვთ, აირჩიოთ კლასი ზემოთ მოცემული ღილაკებიდან.</p>
            </div>
            
            <div class="nav-buttons">
                <button onclick="showPage('registration-page')">რეგისტრაციის გვერდზე დაბრუნება</button>
            </div>
        </div>
    </div>
    
    <footer>
        <p>თელავის მეორე სკოლა © 2023. ყველა უფლება დაცულია.</p>
    </footer>

    <script>
        // გვერდების ჩვენება/დამალვა
        function showPage(pageId) {
            document.querySelectorAll('.page').forEach(page => {
                page.classList.remove('active');
            });
            document.getElementById(pageId).classList.add('active');
        }
        
        // რეგისტრაციის ფორმის დამუშავება
        document.getElementById('registration-form').addEventListener('submit', function(e) {
            e.preventDefault();
            
            const firstName = document.getElementById('firstName').value;
            const lastName = document.getElementById('lastName').value;
            const phone = document.getElementById('phone').value;
            
            alert(`მადლობა, ${firstName} ${lastName}! თქვენი რეგისტრაცია წარმატებით დასრულდა.`);
            
            // ფორმის გასუფთავება
            this.reset();
        });
        
        // კლასის მონაცემების ჩვენება
        function showClass(grade) {
            const classInfo = document.getElementById('class-info');
            
            // მოსწავლეების სია
            let students = '';
            if (grade === 11) {
                students = 'საბა ბუღაძე, ირაკლი გრიშიკაშვილი, გიორგი ჯოხარიძე';
            } else {
                students = 'კლასის მოსწავლეების სია მზადებულია...';
            }
            
            // გაკვეთილების ცხრილი
            let schedule = '';
            if (grade === 11) {
                schedule = `
                <table>
                    <thead>
                        <tr>
                            <th>დრო</th>
                            <th>ორშაბათი</th>
                            <th>სამშაბათი</th>
                            <th>ოთხშაბათი</th>
                            <th>ხუთშაბათი</th>
                            <th>პარასკევი</th>
                        </tr>
                    </thead>
                    <tbody>
                        <tr>
                            <td>10:00-10:45</td>
                            <td>ქართული</td>
                            <td>მათემატიკა</td>
                            <td>ისტორია</td>
                            <td>ქიმია</td>
                            <td>ბიოლოგია</td>
                        </tr>
                        <tr>
                            <td>11:00-11:45</td>
                            <td>მათემატიკა</td>
                            <td>ისტორია</td>
                            <td>ქიმია</td>
                            <td>ბიოლოგია</td>
                            <td>სპორტი</td>
                        </tr>
                        <tr>
                            <td>12:00-12:45</td>
                            <td>ისტორია</td>
                            <td>ქიმია</td>
                            <td>ბიოლოგია</td>
                            <td>სპორტი</td>
                            <td>ქართული</td>
                        </tr>
                        <tr>
                            <td>13:00-13:45</td>
                            <td>ქიმია</td>
                            <td>ბიოლოგია</td>
                            <td>სპორტი</td>
                            <td>ქართული</td>
                            <td>მათემატიკა</td>
                        </tr>
                    </tbody>
                </table>
                `;
            } else {
                schedule = `<p>${grade} კლასის გაკვეთილების ცხრილი მზადებულია...</p>`;
            }
            
            // HTML კონტენტის განახლება
            classInfo.innerHTML = `
                <div class="students-list">
                    <h3>${grade} კლასის მოსწავლეები:</h3>
                    <p>${students}</p>
                </div>
                <h3>${grade} კლასის გაკვეთილების ცხრილი:</h3>
                ${schedule}
            `;
        }
    </script>
</body>
</html>
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 25, 2026
@chcg
* Update to Scintilla 5.6.0 & Lexilla 5.4.7
88ddc16 
Scintilla Release 5.6.0 (https://www.scintilla.org/scintilla560.zip)

    Released 25 February 2026.
    Fix crash when window is too narrow to show any text.

Release 5.5.9

    Released 25 February 2026.
    Add option to disable drag/drop editing. Feature notepad-plus-plus#184.
    Allow Euro '€' in code page 936 for 0x80. Feature notepad-plus-plus#1575.
    Fix SCI_SETSELECTIONNSTART and SCI_SETSELECTIONNEND to behave more sensibly. Bug notepad-plus-plus#2488.
    Fix lexing after undo at end of document. Bug notepad-plus-plus#2491.
    When a line end is not selected, change the colour of the rectangle that indicates the line end is selected to white space background instead of previous character's background except for EOL filled style.
    On Qt, add const to ScintillaDocument and ScintillaEdit methods. Bug notepad-plus-plus#2494.
    On Qt, prevent crash when using ScintillaDocument object. Bug notepad-plus-plus#2495.

Lexilla Release 5.4.7 (https://www.scintilla.org/lexilla547.zip)

 Release 5.4.7

    Released 25 February 2026.
    Test a single lexer or multiple directories by specifying as command line arguments to TestLexers. Pull request notepad-plus-plus#344.
    Lexer added for escape sequences "escseq". Pull request notepad-plus-plus#336.
    Errorlist: Fix reset escape sequence to set style SCE_ERR_DEFAULT (0) instead of SCE_ERR_ES_BLACK. Issue notepad-plus-plus#333.
    Makefile: Recognize comments in more situations. Issue notepad-plus-plus#40.
    Perl: Handle 'method' the same as 'sub' for special cases. Issue notepad-plus-plus#342, Pull request notepad-plus-plus#343.
    Progress: Add SCE_ABL_ANNOTATION and SCE_ABL_TYPEDANNOTATION styles. Pull request notepad-plus-plus#346.
donho pushed a commit that referenced this pull request Feb 27, 2026
@chcg @donho
Update to Scintilla 5.6.0 & Lexilla 5.4.7
832fb59 
Release 5.6.0 (https://www.scintilla.org/scintilla560.zip)

    Released 25 February 2026.
    Fix crash when window is too narrow to show any text.

Release 5.5.9

    Released 25 February 2026.
    Add option to disable drag/drop editing. Feature #184.
    Allow Euro '€' in code page 936 for 0x80. Feature #1575.
    Fix SCI_SETSELECTIONNSTART and SCI_SETSELECTIONNEND to behave more sensibly. Bug #2488.
    Fix lexing after undo at end of document. Bug #2491.
    When a line end is not selected, change the colour of the rectangle that indicates the line end is selected to white space background instead of previous character's background except for EOL filled style.
    On Qt, add const to ScintillaDocument and ScintillaEdit methods. Bug #2494.
    On Qt, prevent crash when using ScintillaDocument object. Bug #2495.

Lexilla Release 5.4.7 (https://www.scintilla.org/lexilla547.zip)

 Release 5.4.7

    Released 25 February 2026.
    Test a single lexer or multiple directories by specifying as command line arguments to TestLexers. Pull request #344.
    Lexer added for escape sequences "escseq". Pull request #336.
    Errorlist: Fix reset escape sequence to set style SCE_ERR_DEFAULT (0) instead of SCE_ERR_ES_BLACK. Issue #333.
    Makefile: Recognize comments in more situations. Issue #40.
    Perl: Handle 'method' the same as 'sub' for special cases. Issue #342, Pull request #343.
    Progress: Add SCE_ABL_ANNOTATION and SCE_ABL_TYPEDANNOTATION styles. Pull request #346.

Close #17562
@mpheath mpheath mentioned this pull request Mar 26, 2026
Open
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

reject

Projects

None yet

Milestone

6.x

Development

Successfully merging this pull request may close these issues.

4 participants

@chcg @ariccio @donho @milipili