Skip to content
Permalink
Browse files

Merge branch 'release/3.7.0-rc.2'

  • Loading branch information...
1024jp committed Feb 2, 2019
2 parents aa4fae9 + 0f91dd5 commit cfc1671ad1055b167b0dfc5f4f27050b1bc8203d
Showing with 606 additions and 514 deletions.
  1. +1 −1 .swiftlint.yml
  2. +24 −18 CHANGELOG.md
  3. +1 −1 Cartfile.resolved
  4. +2 −2 Carthage/Build/.Differ.version
  5. +1 −1 Carthage/Build/Mac/Differ.framework.dSYM/Contents/Info.plist
  6. BIN Carthage/Build/Mac/Differ.framework.dSYM/Contents/Resources/DWARF/Differ
  7. BIN Carthage/Build/Mac/Differ.framework/Versions/A/Differ
  8. +1 −1 Carthage/Build/Mac/Differ.framework/Versions/A/Headers/Differ-Swift.h
  9. BIN Carthage/Build/Mac/Differ.framework/Versions/A/Modules/Differ.swiftmodule/x86_64.swiftdoc
  10. BIN Carthage/Build/Mac/Differ.framework/Versions/A/Modules/Differ.swiftmodule/x86_64.swiftmodule
  11. +6 −6 Carthage/Build/Mac/Differ.framework/Versions/A/Resources/Info.plist
  12. +10 −3 CotEditor/CotEditor.help/Contents/Resources/Shared/sty/standard.css
  13. BIN CotEditor/CotEditor.help/Contents/Resources/en.lproj/CotEditor.helpindex
  14. +3 −4 CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/about_coloring_priority.html
  15. +6 −6 CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/about_script_name.html
  16. +2 −5 CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_complete.html
  17. +5 −5 ...elp/Contents/Resources/en.lproj/pgs/{howto_customize_font_color.html → howto_customize_font.html}
  18. +53 −0 CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_edit_multiple_points.html
  19. +8 −0 ...tents/Resources/en.lproj/pgs/{howto_rectangularSelection.html → howto_rectangular_selection.html}
  20. +14 −4 CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/overview.html
  21. +6 −3 CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html
  22. +1 −1 CotEditor/CotEditor.help/Contents/Resources/en.lproj/xpgs/xcustomize.html
  23. +3 −2 CotEditor/CotEditor.help/Contents/Resources/en.lproj/xpgs/xhowto.html
  24. BIN CotEditor/CotEditor.help/Contents/Resources/ja.lproj/CotEditor.helpindex
  25. +3 −4 CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/about_coloring_priority.html
  26. +10 −10 CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/about_script_name.html
  27. +2 −7 CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_complete.html
  28. +5 −5 ...elp/Contents/Resources/ja.lproj/pgs/{howto_customize_font_color.html → howto_customize_font.html}
  29. +1 −1 CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_customize_keybinding.html
  30. +1 −1 CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_customize_toolbar.html
  31. +51 −0 CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_edit_multiple_points.html
  32. +1 −1 CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_print.html
  33. +8 −0 ...tents/Resources/ja.lproj/pgs/{howto_rectangularSelection.html → howto_rectangular_selection.html}
  34. +14 −4 CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/overview.html
  35. +5 −2 CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html
  36. +1 −1 CotEditor/CotEditor.help/Contents/Resources/ja.lproj/xpgs/xcustomize.html
  37. +2 −1 CotEditor/CotEditor.help/Contents/Resources/ja.lproj/xpgs/xhowto.html
  38. +0 −6 CotEditor/CotEditor.xcodeproj/project.pbxproj
  39. +2 −2 CotEditor/Info-AppStore.plist
  40. +2 −2 CotEditor/Info.plist
  41. +2 −2 CotEditor/Sources/ATSTypesetter.swift
  42. +4 −4 CotEditor/Sources/AppearancePaneController.swift
  43. +19 −48 CotEditor/Sources/Collection+Diff.swift
  44. +2 −5 CotEditor/Sources/Collection+String.swift
  45. +2 −2 CotEditor/Sources/Collection.swift
  46. +1 −1 CotEditor/Sources/Document+ScriptingSupport.swift
  47. +3 −7 CotEditor/Sources/Document.swift
  48. +1 −0 CotEditor/Sources/DocumentToolbar.swift
  49. +4 −8 CotEditor/Sources/DocumentViewController.swift
  50. +36 −28 CotEditor/Sources/DocumentWindow.swift
  51. +17 −1 CotEditor/Sources/DocumentWindowController.swift
  52. +4 −4 CotEditor/Sources/EditorTextView+Commenting.swift
  53. +4 −4 CotEditor/Sources/EditorTextView+CursorMovement.swift
  54. +2 −2 CotEditor/Sources/EditorTextView+Indenting.swift
  55. +6 −6 CotEditor/Sources/EditorTextView+LineProcessing.swift
  56. +3 −3 CotEditor/Sources/EditorTextView+Transformation.swift
  57. +0 −41 CotEditor/Sources/EditorTextView+WindowUpdate.swift
  58. +29 −30 CotEditor/Sources/EditorTextView.swift
  59. +2 −3 CotEditor/Sources/FindPanelLayoutManager.swift
  60. +6 −8 CotEditor/Sources/IncompatibleCharacter.swift
  61. +2 −3 CotEditor/Sources/LayoutManager.swift
  62. +2 −2 CotEditor/Sources/LineNumberView.swift
  63. +7 −13 CotEditor/Sources/MultipleReplacement+TextView.swift
  64. +4 −4 CotEditor/Sources/MultipleReplacementListViewController.swift
  65. +26 −1 CotEditor/Sources/NSColor+NamedColors.swift
  66. +31 −1 CotEditor/Sources/NSString.swift
  67. +2 −2 CotEditor/Sources/NSTextView+BracePair.swift
  68. +4 −4 CotEditor/Sources/NSTextView+MultiCursor.swift
  69. +2 −2 CotEditor/Sources/NSTextView+Selection.swift
  70. +1 −6 CotEditor/Sources/NSTextView+TextReplacement.swift
  71. +2 −2 CotEditor/Sources/OrderedSet.swift
  72. +2 −2 CotEditor/Sources/RegexFindPanelTextView.swift
  73. +9 −13 CotEditor/Sources/RegularExpressionSyntaxType+Color.swift
  74. +36 −43 CotEditor/Sources/Shortcut.swift
  75. +3 −3 CotEditor/Sources/SplitViewController.swift
  76. +2 −24 CotEditor/Sources/String+Additions.swift
  77. +2 −2 CotEditor/Sources/String+Encoding.swift
  78. +2 −2 CotEditor/Sources/String+FuzzyRange.swift
  79. +3 −3 CotEditor/Sources/String+Indentation.swift
  80. +4 −8 CotEditor/Sources/StyledButton.swift
  81. +3 −3 CotEditor/Sources/SyntaxHighlightParseOperation.swift
  82. +2 −2 CotEditor/Sources/SyntaxParser.swift
  83. +9 −12 CotEditor/Sources/TextFind.swift
  84. +3 −3 CotEditor/Sources/TextFinder.swift
  85. +2 −2 CotEditor/Sources/Theme.swift
  86. +2 −2 CotEditor/Sources/TokenTextView.swift
  87. +7 −5 CotEditor/Sources/WindowPaneController.swift
  88. +1 −4 CotEditor/de.lproj/WindowPane.strings
  89. +2 −5 CotEditor/it.lproj/WindowPane.strings
  90. +1 −4 CotEditor/ja.lproj/WindowPane.strings
  91. +1 −4 CotEditor/pt.lproj/WindowPane.strings
  92. +1 −4 CotEditor/zh-Hans.lproj/WindowPane.strings
  93. +18 −1 Tests/StringCollectionTests.swift
  94. +6 −6 Tests/StringExtensionsTests.swift
@@ -24,7 +24,6 @@ opt_in_rules:
- joined_default_parameter
- last_where
- let_var_whitespace
- lower_acl_than_parent
- multiline_function_chains
- multiline_parameters
- multiline_parameters_brackets
@@ -42,6 +41,7 @@ opt_in_rules:
- static_operator
- toggle_bool
- untyped_error_in_catch
- unused_private_declaration
- vertical_parameter_alignment_on_call
- xct_specific_matcher
- yoda_condition
@@ -2,7 +2,26 @@
Change Log
==========================

3.7.0-rc (unreleased)
3.7.0-rc.2 (unreleased)
--------------------------

### Improvements

- [beta] Disable “Change Opacity” action while fullscreen mode.
- [beta] Move the position of the opacity control popover.
- [beta] Update help contents.
- [trivial] Improve toolbar color.
- [dev] Update Differ framework to 1.3.0.


### Fixes

- Fix an issue where closed windows remained on the memory.
- Fix an issue where selected ranges were set wrongly after updating document due to an external modification.



3.7.0-rc (331)
--------------------------

### New Features
@@ -28,11 +47,14 @@ Change Log

### Improvements

- [beta] Merge a part of changes in CotEditor 3.6.13.
- Restore more UI state on window restoration.


### Fixes

- Fix an issue where the last syntax style was not applied when an unsaved document was restored from the last session.
- Fix an issue where auto-completion could cancel suddenly under a restricted condition.
- Fix a possible issue where word counting could be stuck.
- [beta] Fix multi-cursor behavior with `→` and `←` when something is selected.


@@ -103,22 +125,6 @@ Change Log



3.6.13 (unreleased)
--------------------------

### Improvements

- Restore more UI state on window restoration.


### Fixes

- Fix an issue where the last syntax style was not applied when an unsaved document was restored from the last session.
- Fix an issue where auto-completion could cancel suddenly under a restricted condition.
- Fix a possible issue where word counting could stuck.



3.6.12 (311)
--------------------------

@@ -1,4 +1,4 @@
github "1024jp/WFColorCode" "2.3.0"
github "coteditor/YAML.framework" "3271df33f182c0c77fece29f8bfe76fcda1a3ca0"
github "sparkle-project/Sparkle" "2e1596c673ad24dbb890bb447a10e2bba552cb0e"
github "tonyarnold/Differ" "1.2.3"
github "tonyarnold/Differ" "1.3.0"

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more.

Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more.

@@ -6,7 +6,7 @@
CotEditor
https://coteditor.com
© 2006-2018 CotEditor Project
© 2006-2019 CotEditor Project
*/


@@ -15,7 +15,7 @@ html {
font: 10pt/1.5 -apple-system, -apple-system-font, 'Helvetica Neue', sans-serif;
}
body {
color: hsla(0, 0%, 0%, 0.7);
color: hsla(0, 0%, 0%, 0.8);
margin: 1em auto;
padding: 0 1em;
max-width: 7in;
@@ -35,6 +35,13 @@ b {
font-weight: bold;
}

kbd {
padding: 0 0.2em;
border-radius: 0.2em;
border: 1px solid hsla(0, 0%, 0%, .2);
box-shadow: 0 1px 0 hsla(0, 0%, 0%, .05);
}

hr {
opacity: 0.33;
}
@@ -59,7 +66,7 @@ body > h1 {
font-family: -apple-system-font, 'Helvetica Neue', 'Hiragino Sans w2', sans-serif;
font-size: 1.71rem;
line-height: 1.0;
font-weight: 300;
font-weight: 400;
margin: 0 0 1.5em;
}
body > h1::before {
Binary file not shown.
@@ -17,10 +17,9 @@

<h1>Syntax coloring order</h1>

<ul>
<li>When performing syntax coloring, CotEditor colors the code elements in the following order: 1)Keywords, 2)Commands, 3)Types, 4)Attributes, 5)Variables, 6)Values, 7)Numbers, 8)Strings, 9)Characters, 10)Comments</li>
<li>When your document contains an item to be colored which matches multiple categories (e.g. Keywords AND Commands), the color of the latter in the order will overwrite the former's.</li>
</ul>
<p>CotEditor colors the code elements in the following order: 1) keywords, 2) commands, 3) types, 4) attributes, 5) variables, 6) values, 7) numbers, 8) strings, 9) characters, 10) comments</p>

<p>When your document contains an item to be colored which matches multiple categories (e.g. keywords and commands), the color of the latter in the order will overwrite the former's.</p>

</body>
</html>
@@ -38,22 +38,22 @@ <h1>File naming rules for CotEditor scripts</h1>
<table>
<caption>example 2.</caption>
<tr><th>File name</th><td>Insert String<strong>.@e</strong>.scpt</td></tr>
<tr><th>Appearance in the menu</th><td>Insert String (Command-E)</td></tr>
<tr><th>Appearance in the menu</th><td>Insert String (<kbd>Command</kbd>-<kbd>E</kbd>)</td></tr>
</table>
<table>
<caption>example 3.</caption>
<tr><th>File name</th><td>03)Insert Date<strong>.@&#x007E;Y</strong>.scpt</td></tr>
<tr><th>Appearance in the menu</th><td>Insert Date (Option-Shift-Command-Y)</td></tr>
<tr><th>Appearance in the menu</th><td>Insert Date (<kbd>Option</kbd>-<kbd>Shift</kbd>-<kbd>Command</kbd>-<kbd>Y</kbd>)</td></tr>
</table>
<dl style="margin-top: 1em;">
<dt>Modifier-key notations</dt>
<dd>
<table>
<tr><th>Notation</th><th>Equivalent key</th></tr>
<tr><td>^</td><td>Control</td></tr>
<tr><td>$</td><td>Shift</td></tr>
<tr><td>&#x007E;</td><td>Option</td></tr>
<tr><td>@</td><td>Command</td></tr>
<tr><td>^</td><td><kbd>Control</kbd></td></tr>
<tr><td>$</td><td><kbd>Shift</kbd></td></tr>
<tr><td>&#x007E;</td><td><kbd>Option</kbd></td></tr>
<tr><td>@</td><td><kbd>Command</kbd></td></tr>
</table>
</dd></dl>
</dd>
@@ -20,14 +20,11 @@ <h1>How to complete words</h1>
<p>To complete words, follow the instruction below:</p>
<ol>
<li>Type the first few letters of a word.</li>
<li>Select “Complete” action in “Edit” menu, or press:<ul>
<li>Opt + Esc <small>(on macOS Sierra and later)</small></li>
<li>F5 or ESC <small>(on OS X El Capitan an earlier)</small></li>
</ul></li>
<li>Select “Complete” action in “Edit” menu, or press <kbd>Option</kbd>-<kbd>Esc</kbd></li>
<li>Choose the word you want to input from the pop-up list.</li>
</ol>
<ul>
<li>To close the list, press ESC.</li>
<li>To close the list, press <kbd>Esc</kbd>.</li>
<li>Under the Completion List section in the Edit preferences pane, you can change the range of possible completions that appear in the list. For example, the list can include only the words in your document, or the words specified by your syntax style additionally.</li>
</ul>

@@ -2,11 +2,11 @@

<head>
<meta charset="UTF-8"/>
<meta name="keywords" content="font, color, character, font type, font color, font size, customize"/>
<meta name="keywords" content="font, character, font type, font size, customize"/>
<link rel="start" href="../CotEditorHelp.html"/>
<link rel="index" href="../xpgs/xall.html"/>
<link rel="stylesheet" href="../../Shared/sty/standard.css"/>
<title>Changing font type and color</title>
<title>Changing font type</title>
</head>

<body>
@@ -17,13 +17,13 @@

<h1>Changing font type and color</h1>

<p>You can change your document's font type and color.</p>
<p>You can change your document's font type.</p>
<ol>
<li>Choose Format &gt; Font &gt; Show Fonts.</li>
<li>Select the font and color of your choice using the Font panel.</li>
<li>Select the font of your choice using the Font panel.</li>
</ol>
<ul>
<li>These changes apply only to the window currently active. To change the default font for all new documents, choose CotEditor &gt; Preferences &gt; Format. To change the default text color, choose CotEditor &gt; Preferences &gt; View.</li>
<li>These changes apply only to the window currently active. To change the default font for all new documents, choose CotEditor &gt; Preferences &gt; Appearance.</li>
</ul>


@@ -0,0 +1,53 @@
<html lang="en">

<head>
<meta charset="UTF-8"/>
<meta name="keywords" content="multi cursor, multi insersion, multiple cursors, rectangular selection"/>
<link rel="start" href="../CotEditorHelp.html"/>
<link rel="index" href="../xpgs/xall.html"/>
<link rel="stylesheet" href="../../Shared/sty/standard.css"/>
<title>Editing multiple points</title>
</head>

<body>
<nav><ul>
<li><a href="../CotEditorHelp.html">CotEditor Help</a></li>
</ul></nav>


<h1>Editing multiple points</h1>

<p>In the multi-cursor editing, the same text can be input at multiple desired points at once.</p>

<p>You can add your insertion points (cursors / selections) by the following ways:</p>
<ul>
<li>To add an insertion point at the desired location, click or drag the point while pressing <kbd>Command</kbd>.</li>
<li>To add insertion points at the same column in multiple continuous lines, drag the area while pressing <kbd>Option</kbd> (rectangular selection).</li>
<li>To add an insertion point just above or below the current insertion point, press <kbd>Control</kbd>-<kbd>Shift</kbd>-<kbd>↑</kbd> or <kbd>Control</kbd>-<kbd>Shift</kbd>-<kbd>↓</kbd>.</li>
</ul>


<p>To remove one of the multiple insertion points:</p>
<ul>
<li><kbd>Command</kbd>-click the insertion point to remove.</li>
</ul>


<p>To end the multi-cursor editing mode:</p>
<ul>
<li>Click or drag somewhere in the editor without modifier keys by setting a single insertion point at the location.</li>
<li>Press <kbd>Esc</kbd> key and all insertion points except the top one are discarded.</li>
</ul>

<p>The multi-curor editing currently doesn't support the text input that requires user selection after input, such as Japanese. In such cases, multi-cursor editing finishes automatically when typed and text is input only at a single point.</p>


<section id="cf">
<h2>See also</h2>
<ul>
<li><a href="../pgs/howto_rectangular_selection.html">Selecting rectangular area</a></li>
</ul>
</section>

</body>
</html>
@@ -19,5 +19,13 @@ <h1>Selecting rectangular area</h1>

<p>You can select rectangular area in your document. To do so, drag and select text while holding down the <kbd>Option</kbd> key.</p>


<section id="cf">
<h2>See also</h2>
<ul>
<li><a href="../pgs/howto_edit_multiple_points.html">Editing multiple points</a></li>
</ul>
</section>

</body>
</html>
@@ -67,26 +67,36 @@ <h2>Scripting</h2>
<section class="topic">
<h2>Other features</h2>
<dl>
<dt><a href="../pgs/howto_edit_multiple_points.html">Multi-cursor editing</a></dt>
<dd>Using multi-cursors, you can input the same text at multiple locations at once.</dd>

<dt>Comment-out/Uncomment</dt>
<dd>CotEditor can comment-out/uncomment selected text with corresponded comment delimiters.</dd>

<dt><a href="../pgs/howto_filedrop.html">File Drop</a></dt>
<dd>File Drop lets you insert a specified string when you drop a file onto your document window. For example, you can insert the IMG tag into your HTML document by dropping an image file on it.</dd>

<dt><a href="../pgs/howto_customize_keybinding.html">Key bindings</a></dt>
<dd>CotEditor's original key bindings are fully customizable.</dd>
<dt><a href="../pgs/about_applescript.html">AppleScript compatible</a></dt>
<dd>AppleScript can automate your workflow. You can call your scripts via the Script menu.</dd>

<dt>Line numbers</dt>
<dd>CotEditor can display line numbers. This is useful such as when you develop and debug programs.</dd>
<dt>Window transparency</dt>
<dd>You can change a window's transparency. When you have many documents opened, this will help you find the one you need.</dd>

<dt>semi-transparent Editor</dt>
<dd>You can change a editor's transparency. When you have many windows opened, this will help you find the one you need.</dd>

<dt>Line spacing</dt>
<dd>You can set space between lines as you see fit.</dd>

<dt><a href="../pgs/howto_show_glyph_info.html">Character inspector</a></dt>
<dd>You can get your character's information like unicode character name or unicode code quickly.</dd>

<dt><a href="../pgs/howto_inspect_usedchar.html">Incompatible characters</a></dt>
<dd>There are some characters you cannot save with a particular encoding. This feature enables you to check if those characters are included in your document.</dd>

<dt><a href="../pgs/howto_split.html">Split view</a></dt>
<dd>You can split a single window into multiple panes to view different parts of your document at the same time.</dd>

<dt>Vertical orientation</dt>
<dd>CotEditor can layout text vertically.</dd>
</dl>

0 comments on commit cfc1671

Please sign in to comment.
You can’t perform that action at this time.