Skip to content

Commit

Permalink
Balthisar Tidy version 4.2.0:
Browse files Browse the repository at this point in the history
  - Dropped support for macOS 10.10 and 10.11, mostly due to App Transport
    Security issues with the Validator.
  - New icons for Balthisar Tidy for Work and Balthisar Tidy.
  - Update Fragaria to latest, which offers a better experience for selecting
    colors in Balthisar Tidy for Work.
  - Fixed a startup crash that occurred due to bad preferences.
  - Update some strings for latest HTML Tidy version.
  - Help book updated with new assets to account for the stated changes.
  - Xcode 11 project format.
  - Build settings cleanup.
  - Remove deprecated AppleDoc target.
  - Readme tweaks.
  - Scheme updates.
  - Helpbooks are now built out of source from the Help Project directly, and
    are no longer resources. This eliminates a lot of redundancy (primarily
    images) from the source control system.
  - HTML Tidy is now built out of source and is brought in via a Git submodule.
  - Validator JAR is now built out of source, and is brought in via a Git
    submodule.
  - The JRE is now built, and is built out of source, so avoid Git size
    inflation.
- Updated to newest Nu Validator.
  • Loading branch information
balthisar committed Oct 27, 2019
1 parent d1d55fd commit 80c380b
Show file tree
Hide file tree
Showing 1,399 changed files with 4,043 additions and 114,417 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@ Documentation/html
# Help Build System built content.
Contents\ \(build\)

# Auto-gen'd header file.
# Auto-gen'd header files.
HTMLTidy/xcode-version.h
JSDNuVFramework/xcode-version.h
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "HTMLTidy/tidy-html5"]
path = HTMLTidy/tidy-html5
url = https://github.com/htacg/tidy-html5.git
[submodule "JSDNuVFramework/validator"]
path = JSDNuVFramework/validator
url = https://github.com/validator/validator.git
2 changes: 1 addition & 1 deletion Balthisar Common/Classes/NSImage+Tinted.m
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ - (NSImage *)tintedWithColor:(NSColor *)tint
[image lockFocus];
[tint set];
NSRect imageRect = {NSZeroPoint, [image size]};
NSRectFillUsingOperation(imageRect, NSCompositeSourceAtop);
NSRectFillUsingOperation(imageRect, NSCompositingOperationSourceAtop);
[image unlockFocus];
}
return image;
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,31 @@
*
*/

#undef FRAGARIA_PRIVATE
#import "FragariaMacros.h"
#import "FragariaUtilities.h"

#import "MGSBreakpointDelegate.h"
#import "MGSDragOperationDelegate.h"
#import "MGSFragariaTextViewDelegate.h"
#import "SMLSyntaxColouringDelegate.h"
#import "SMLAutoCompleteDelegate.h"
#import "SMLSyntaxDefinition.h"
#import "MGSAutoCompleteDelegate.h"

#import "MGSFragariaView.h"
#import "MGSFragariaView+Definitions.h"
#import "SMLSyntaxError.h"
#import "SMLTextView.h"
#import "SMLTextView+MGSTextActions.h"
#import "SMLTextView+MGSDragging.h"
#import "MGSSyntaxError.h"
#import "MGSTextView.h"
#import "MGSTextView+MGSTextActions.h"
#import "MGSTextView+MGSDragging.h"

#import "MGSSyntaxController.h"
#import "MGSParserFactory.h"
#import "MGSSyntaxParserClient.h"
#import "MGSSyntaxAwareEditor.h"
#import "MGSSyntaxParser.h"
#import "MGSClassicFragariaParserFactory.h"

#import "MGSColourScheme.h"
#import "MGSMutableColourScheme.h"
#import "MGSMutableColourSchemeFromPlistTransformer.h"

#import "NSTextStorage+Fragaria.h"
#import "MGSMutableSubstring.h"

#import "MGSUserDefaultsDelegate.h"
#import "MGSUserDefaultsControllerProtocol.h"
#import "MGSUserDefaultsController.h"
#import "MGSHybridUserDefaultsController.h"
#import "MGSPrefsViewController.h"
#import "MGSPrefsColourPropertiesViewController.h"
#import "MGSPrefsEditorPropertiesViewController.h"
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//
// Header.h
// Fragaria
//
// Created by Daniele Cattaneo on 28/10/2018.
//

#ifndef FragariaMacros_h
#define FragariaMacros_h


#define FRAGARIA_DEPRECATED __attribute__((deprecated))
#define FRAGARIA_DEPRECATED_MSG(m) __attribute__((deprecated(m)))

#ifndef FRAGARIA_PRIVATE
#define FRAGARIA_PUB_UNAVAIL __attribute__((deprecated))
#define FRAGARIA_PUB_UNAVAIL_MSG(m) __attribute__((deprecated(m)))
#else
#define FRAGARIA_PUB_UNAVAIL
#define FRAGARIA_PUB_UNAVAIL_MSG(m)
#endif


#endif /* FragariaMacros_h */
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//
// FragariaUtilities.h
// Fragaria
//
// Created by Daniele Cattaneo on 07/07/2019.
//

#import <Foundation/Foundation.h>

NS_ASSUME_NONNULL_BEGIN

@class MGSColourScheme;
@class MGSSyntaxParser;


/** Colors an attributed string with the specified parser and color scheme.
* @param str The attributed string to modify.
* @param parser The parser to use.
* @param scheme The color scheme. If nil, the default color scheme will
* be used.
* @warning Existing attributes are not guaranteed to be retained. On return,
* all font attributes will be based on the font attribute of the first
* character of the string. */
void MGSHighlightAttributedString(NSMutableAttributedString *str, MGSSyntaxParser *parser, MGSColourScheme * __nullable scheme);


NS_ASSUME_NONNULL_END
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// SMLAutoCompleteDelegate.h
// MGSAutoCompleteDelegate.h
// Fragaria
//
// Created by Viktor Lidholt on 4/12/13.
Expand All @@ -10,10 +10,10 @@


/**
* The SMLAutoCompleteDelegate defines an interface for allowing a delegate to
* The MGSAutoCompleteDelegate defines an interface for allowing a delegate to
* return a list of suitable autocomplete choices.
**/
@protocol SMLAutoCompleteDelegate <NSObject>
@protocol MGSAutoCompleteDelegate <NSObject>

- (NSArray<NSString *> *) completions; ///< A dictionary of words that can be used for autocompletion.

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
//
// MGSClassicFragariaParserFactory.h
// Fragaria
//
// Created by Daniele Cattaneo on 27/12/2018.
//

#import <Foundation/Foundation.h>
#import "FragariaMacros.h"
#import "MGSParserFactory.h"

NS_ASSUME_NONNULL_BEGIN


/** A parser factory class used to load classic Fragaria syntax definition files.
*
* An instance of this class is already loaded automatically by MGSSyntaxController
* in order to load the syntax definitions placed in the default locations.
* If desired, additional syntax definitions can be loaded from custom
* locations by creating another instance of this class and registering it via
* MGSSyntaxController.
*
* This parser factory class is also capable of loading localized user-facing syntax
* group names from "SyntaxGroupNames.strings" files.
*
* ## Default locations for syntax definition files and syntax group name files
*
* - Syntax definitions from:
* - The "Resources/Syntax Definitions" directory in the Fragaria framework bundle
* - The "Resources/Syntax Definitions" directory in the current application bundle
* - The "Syntax Definitions" directory inside the "Application Support" directory of
* the current application.
* - Syntax group name files from:
* - The Resources directory of the Fragaria framework bundle (the built-in syntax
* group names)
* - The Resources directory of the current application bundle
* - The "Syntax Definitions" directory inside the "Application Support" directory of
* the current application.
*
* Note that only the "SyntaxGroupNames.strings" files inside a bundle can also be
* located in a .lproj subdirectory in order to provide localized names. */

@interface MGSClassicFragariaParserFactory : NSObject <MGSParserFactory>


/** Returns a parser factory by loading the syntax definitions from
* the default locations.
* @warning Never register a new parser factory initialized through this
* method, as MGSSyntaxController already does this automatically. */
- (instancetype)init FRAGARIA_PUB_UNAVAIL_MSG("Don't invoke this, MGSSyntaxController already does it for you!");

/** Returns a parser factory which loads syntax definitions from the
* "Resources/Syntax Definitions" directory in the specified bundle and
* syntax group names from a localized resource named "SyntaxGroupNames.strings".
* @param bundles The bundle where to search for syntax definitions and group names.
* @note All built-in syntax group names are loaded as well, but the names loaded
* from the specified bundles always take precedence. */
- (instancetype)initWithSyntaxDefinitionsInBundles:(NSArray <NSBundle *> *)bundles;

/** Returns a parser factory which loads syntax definitions from the
* specified directories and syntax group names from strings files named
* "SyntaxGroupNames.strings" and located in the same directories.
* @param searchPaths An array of directories where to search syntax definition
* files and syntax group name files.
* @note All built-in syntax group names are loaded as well, but the names loaded
* from the specified paths always take precedence. */
- (instancetype)initWithSyntaxDefinitionDirectories:(NSArray <NSURL *> *)searchPaths;

/** Returns a parser factory which loads the specified syntax definition
* files and the specified syntax group name files.
* @param f An array of syntax definition file URLs.
* @param strf An array of syntax group name strings file URLs.
* @note When using this method, the default syntax group names are not loaded.
* In general, prefer using the other initializers when possible. */
- (instancetype)initWithSyntaxDefinitionFiles:(NSArray <NSURL *> *)f syntaxGroupNameFiles:(NSArray <NSURL *> *)strf NS_DESIGNATED_INITIALIZER;


@end


NS_ASSUME_NONNULL_END
Loading

0 comments on commit 80c380b

Please sign in to comment.