From 1c093b1fc22ad9ab06144a1e1d0809c01760ab34 Mon Sep 17 00:00:00 2001 From: Alexey-t Date: Tue, 10 Jan 2017 18:24:42 +0300 Subject: [PATCH] mac files; cmt in def.json --- .../Contents/Resources/data/lexlib/HTML.cuda-lexmap | 2 +- .../Contents/Resources/data/lexlib/HTML.lcf | 6 +++--- .../Resources/data/themes/cobalt.cuda-theme-ui | 6 +++--- app/cudatext.app/Contents/Resources/readme/history.txt | 5 +++++ .../Contents/Resources/settings_default/default.json | 10 +++++----- app/settings_default/default.json | 8 ++++---- setup/cuda_ver.sh | 2 +- setup/debfiles/control | 2 +- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/app/cudatext.app/Contents/Resources/data/lexlib/HTML.cuda-lexmap b/app/cudatext.app/Contents/Resources/data/lexlib/HTML.cuda-lexmap index 448096500b1..70a3a3c5f53 100644 --- a/app/cudatext.app/Contents/Resources/data/lexlib/HTML.cuda-lexmap +++ b/app/cudatext.app/Contents/Resources/data/lexlib/HTML.cuda-lexmap @@ -9,7 +9,7 @@ str1= styles_cmt=Comment -styles_str=Tag string +styles_str=Text,Tag string [map] Text=Id diff --git a/app/cudatext.app/Contents/Resources/data/lexlib/HTML.lcf b/app/cudatext.app/Contents/Resources/data/lexlib/HTML.lcf index 16fbc03797b..3ae9ea24b52 100644 --- a/app/cudatext.app/Contents/Resources/data/lexlib/HTML.lcf +++ b/app/cudatext.app/Contents/Resources/data/lexlib/HTML.lcf @@ -220,7 +220,7 @@ object SyntAnal13: TLibSyntAnalyzer DisplayName = 'Text escaped' StyleName = 'Text escaped' TokenType = 9 - Expression = '&\w+;' + Expression = '&[a-z]+;' ColumnFrom = 0 ColumnTo = 0 end @@ -228,7 +228,7 @@ object SyntAnal13: TLibSyntAnalyzer DisplayName = 'Text' StyleName = 'Text' TokenType = 9 - Expression = '[^<>&\{\}]*' + Expression = '[^<>&\{\}\[\]/\\=\x20]+' ColumnFrom = 0 ColumnTo = 0 end> @@ -646,7 +646,7 @@ object SyntAnal13: TLibSyntAnalyzer ' ' ' ' ' ' - '

Text &1020;

' + '

Text  

' ' ' '') TokenTypeNames.Strings = ( diff --git a/app/cudatext.app/Contents/Resources/data/themes/cobalt.cuda-theme-ui b/app/cudatext.app/Contents/Resources/data/themes/cobalt.cuda-theme-ui index 705ddb3a6cc..d80ee637da6 100644 --- a/app/cudatext.app/Contents/Resources/data/themes/cobalt.cuda-theme-ui +++ b/app/cudatext.app/Contents/Resources/data/themes/cobalt.cuda-theme-ui @@ -16,8 +16,8 @@ "EdUnprintHexFont" : "#808080", "EdMinimapBorder" : "#002240", "EdMinimapSelBg" : "#DCE9E9", - "EdMicromapBg" : "#E0E0E0", - "EdMicromapViewBg" : "#C0C0C0", + "EdMicromapBg" : "#002240", + "EdMicromapViewBg" : "#505050", "EdStateChanged" : "#00458D", "EdStateAdded" : "#006060", "EdStateSaved" : "#505050", @@ -101,4 +101,4 @@ "SplitGroups" : "#00274A", "ExportHtmlBg" : "#F8F8F2", "ExportHtmlNumbers" : "#A0A0A4" -} +} \ No newline at end of file diff --git a/app/cudatext.app/Contents/Resources/readme/history.txt b/app/cudatext.app/Contents/Resources/readme/history.txt index 75c4525bb07..8990a5cb033 100644 --- a/app/cudatext.app/Contents/Resources/readme/history.txt +++ b/app/cudatext.app/Contents/Resources/readme/history.txt @@ -4,6 +4,11 @@ * changed +1.6.2 ++ session contains state (visible/size) of side/bottom panels ++ micromap shows selections (e.g. after "Find/ Select all") ++ micromap shows spell-check errs + 1.6.1 - fixed toolbar API + new dialog "Addon installed" diff --git a/app/cudatext.app/Contents/Resources/settings_default/default.json b/app/cudatext.app/Contents/Resources/settings_default/default.json index 8558d9fb1c5..e945cd45d46 100644 --- a/app/cudatext.app/Contents/Resources/settings_default/default.json +++ b/app/cudatext.app/Contents/Resources/settings_default/default.json @@ -164,19 +164,19 @@ //Ruler numbers indent from top, pixels "ruler_text_indent": 0, - //Show ST3-like minimap at the right edge + //Show minimap "minimap_show": false, - //If false: show selection area only on mouse-over + //Show selection area always. If false: show selection area only on mouse-over. "minimap_sel_always": false, - //Show 1pixel frame around selection area + //Show 1-pixel border around selection area "minimap_sel_border": false, //Minimap width: 0: autosize, >0: fixed width in chars "minimap_char_width": 0, - //Minimap placed at left side + //Place minimap to the left side "minimap_at_left": false, //Show micromap: small vertical bar at the right edge - "micromap_show": true, + "micromap_show": false, //Micromap width, pixels "micromap_width": 12, diff --git a/app/settings_default/default.json b/app/settings_default/default.json index 79019adc3d8..e945cd45d46 100644 --- a/app/settings_default/default.json +++ b/app/settings_default/default.json @@ -164,15 +164,15 @@ //Ruler numbers indent from top, pixels "ruler_text_indent": 0, - //Show ST3-like minimap at the right edge + //Show minimap "minimap_show": false, - //If false: show selection area only on mouse-over + //Show selection area always. If false: show selection area only on mouse-over. "minimap_sel_always": false, - //Show 1pixel frame around selection area + //Show 1-pixel border around selection area "minimap_sel_border": false, //Minimap width: 0: autosize, >0: fixed width in chars "minimap_char_width": 0, - //Minimap placed at left side + //Place minimap to the left side "minimap_at_left": false, //Show micromap: small vertical bar at the right edge diff --git a/setup/cuda_ver.sh b/setup/cuda_ver.sh index 9befee3bf68..d19b11c0bce 100755 --- a/setup/cuda_ver.sh +++ b/setup/cuda_ver.sh @@ -1,2 +1,2 @@ #!/bin/sh -cuda_ver=1.6.1.1 +cuda_ver=1.6.2.0 diff --git a/setup/debfiles/control b/setup/debfiles/control index 86ef6b1a5be..88b67c3c6b9 100644 --- a/setup/debfiles/control +++ b/setup/debfiles/control @@ -1,5 +1,5 @@ Package: cudatext -Version: 1.6.1.1-1 +Version: 1.6.2.0-1 Section: editors Priority: optional Architecture: amd64