diff --git a/docs/help/options.md b/docs/help/options.md index 0e1cc9f2..3a4b74fe 100644 --- a/docs/help/options.md +++ b/docs/help/options.md @@ -35,6 +35,8 @@ documents. ### XSLT Options that control how the the XSLT Output works. Set `Enable Scripts` to false if you don't trust the script code in your XSLT stylesheets. +Set the `Disable default XSLT` to true if you do not want a default XSLT transform +on documents that have no `https://github.com/microsoft/XmlNotepad/blob/master/src/Updates/Updates.xml 1.00:00:00 + + Add option to disable default XSLT stylesheet. + Fix single line text editor so it does not overlap the line below it. Fix XSLT Output browse button so it brings up the Save As File Dialog. diff --git a/src/Version/Version.cs b/src/Version/Version.cs index 765a4a1d..10b9b687 100644 --- a/src/Version/Version.cs +++ b/src/Version/Version.cs @@ -15,5 +15,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("2.8.0.48")] -[assembly: AssemblyFileVersion("2.8.0.48")] +[assembly: AssemblyVersion("2.8.0.49")] +[assembly: AssemblyFileVersion("2.8.0.49")] diff --git a/src/Version/Version.props b/src/Version/Version.props index bf42dd49..5d5b841d 100644 --- a/src/Version/Version.props +++ b/src/Version/Version.props @@ -1,7 +1,7 @@ - 48 - 2.8.0.48 + 49 + 2.8.0.49 diff --git a/src/XmlNotepad/DefaultSS.xslt b/src/XmlNotepad/DefaultSS.xslt index 802fbae0..6171d02f 100644 --- a/src/XmlNotepad/DefaultSS.xslt +++ b/src/XmlNotepad/DefaultSS.xslt @@ -91,7 +91,7 @@ -
+

Your XML document contains no xml-stylesheet processing instruction. To provide an XSLT transform, add the following to the top of your file and edit the href @@ -100,13 +100,15 @@ <?xml-stylesheet type="text/xsl" href="stylesheet.xsl"?>

- You can also enter the XSLT file name using the above text box, but this will not + You can also enter the XSLT file name using the above "XSLT Location:" text box, but this will not persist with your XML document.

- The following HTML is provided by the default XSLT transform which is designed - to pretty print your XML document. + You can specify a default output file name using the following in your XML documents:

+
+            <?xsl-output default="xslt_output" ?>
+          
diff --git a/src/XmlNotepad/StringResources.Designer.cs b/src/XmlNotepad/StringResources.Designer.cs index ddd65275..4c858f18 100644 --- a/src/XmlNotepad/StringResources.Designer.cs +++ b/src/XmlNotepad/StringResources.Designer.cs @@ -404,6 +404,24 @@ public class StringResources { } } + /// + /// Looks up a localized string similar to Disable default XSLT. + /// + public static string DisableDefaultXslt { + get { + return ResourceManager.GetString("DisableDefaultXslt", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Disable default XSLT that just colorizes your XML document in HTML.. + /// + public static string DisableDefaultXsltDescription { + get { + return ResourceManager.GetString("DisableDefaultXsltDescription", resourceCulture); + } + } + /// /// Looks up a localized string similar to Do you want to discard the changes you've made so far?. /// diff --git a/src/XmlNotepad/StringResources.resx b/src/XmlNotepad/StringResources.resx index 3038ab71..e103985d 100644 --- a/src/XmlNotepad/StringResources.resx +++ b/src/XmlNotepad/StringResources.resx @@ -1,6 +1,6 @@  - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Assembly Load Error Message box caption - + Could not load assembly '{0}' Reason: {1} Message box contents, arg0=filename, arg1 is Exception.Message. - + Open File Dialog Tooltip - + Do you want to remove it from recent files list? Message box message - + File not found Message box caption - + &Color picker... Button label - + yyyy-MM-dd Format for other date time data types - + yyyy-MM-ddTHH:mm:ss Format for XmlTypeCode.DateTime - + Do you want to discard the changes you've made so far? Message box contents - + Discard Changes Message box caption - + Attribute with the same name already exists Exception message - + Duplicate Error Message box caption - + Edit Error Message box caption - + Error launching '{0}' Message box prompt - + File Changed Message box caption - + The file you are editing has been changed on disk. Would you like to reload this file? Message box prompt - + Find Error Message box caption - + No more matching nodes Message box prompt - + Find Window title - + Replace Window title - + Insert Error Message box caption - + InternalError: ISite has not been provided, so model cannot be found Exception - + Error Launching Process Message box caption - + Loaded in {0} Status Text - + Load Error Message box caption - + Error loading: {0} {1} Would you like to open it using your text editor? Message box prompt, arg0=filename, arg1=error message - + Very Long Lines Message box caption - + The text in this node contains some very long lines which may make editing this string very slow. Would you like to reformat the text into multiple lines? Message box prompt - + XML Notepad Window title - + Move Error Message box caption - + Cannot edit name of node of type '{0}' Message box, arg0=node type enum - + Missing Name Message box caption - + You cannot edit the value of a node until you provide a node name. Message box prompt - + Cannot edit name of node, node not created yet! Exception message - + Internal Error: node is not a child Exception - + Paste Error Message box caption - + The target file is read only, would you like to overwrite '{0}'? Message box, arg0=file name - + Read Only File Message box caption - + Replace Complete Message box caption - + Replace Error Message box caption - + Cannot insert attributes at the root level Exception message - + Cannot have anything before the XML declaration Exception message - + Cannot have two top level elements Exception message - + Cannot insert text at the root level Exception message - + XML files (*.xml)|*.xml|XSL files (*.xsl)|*.xsl|XSD files (*.xsd)|*.xsd|All files (*.*)|*.* Save as dialog filter - + Save Changes Message box caption - + Do you want to save your changes? Message box prompt - + Save Error Message box caption - + Schema Error Message box caption - + Error loading schema '{0}' {1} Message box contents, arg0=filename, arg1=Exception.Message. - + System Exception of type {0} {1} Message Box, arg0=type name, arg1=message - + The specified text was not found Message box prompt - + HH:mm:ss Format for XmlTypeCode.Time - + Click here to execute XSLT transform Tooltip - + Error Transforming XML Message box caption - + Unexpected node type '{0}' Message box, arg0=node type enum - + &Browse... Button label - + XML Diff Error Message box caption - + Name Error Message box caption - + You must provide a non-empty name, are you sure you want to leave this name empty? Message Box - + XSLT files (*.xslt;*.xsl)|*.xslt;*.xsl|All files (*.*)|*.* - + Please enter location of XSLT stylesheet you want to use for transforming your XML document Tooltip - + Untrusted Script Code Message box caption - + This stylesheet contains untrusted script code. Do you want to enable execution of this script code? Message box prompt - + Edit Namespace Command label - + Files Identical Message box caption - + Files are identical according to XML Diff Message box prompt - + Add Command label - + Cut Command label - + Cut Command label - + Delete Command label - + Edit Name Command label - + Edit Command label - + Edit Value Command label - + Insert Command label - + Move Command label - + Nudge Command label - + Paste Command label - + File '{0}' does not exist. Do you need to create the file? MessageBox prompt - + Create New File MessageBox caption - + <tr><td></td><td title='{0}'><b> File in editor : {1}</b></td> <td title='{2}'><b> File to compare : {3}</b></td> </tr> - + Lose XInclude Information Message box caption - + You have expanded inline XIncludes, if you save this document you will lose the XInclude elements. Are you sure you want to do that? Message box prompt - + Save Errors Saveas dialog title - + The Dynamic Help tab contains some schema documentation Status bar message - + Dynamic Help Tab caption - + Error List Tab caption - + Saved Status bar message - + Update Available Message box caption - + Version {1} of {0} is now available. Message box prompt - + Change Error Message box caption - + Change node to {0} Command caption - + Nudge Error Message box caption - + Redo Error Message box caption - + Undo Error Message box caption - + Connect to {0} The format for the VS Credendtial dialog title. - + Connecting to {0} The format for the VS Credendtial dialog description. - + Attribute Property Grid property name - + Text color for attributes Property Grid description - + Auto format on save Property Grid property name - + Whether to format the XML when it is saved Property Grid description - + Background Property Grid property name - + Background color for XML notepad workspace Property Grid description - + CDATA Property Grid property name - + Color of CData nodes Property Grid description - + Colors Property Grid Category - + Comment Property Grid property name - + Text color for comments Property Grid description - + Element Property Grid property name - + Text color for elements Property Grid description - + Enable updates Property Grid property name - + Whether to check for updates periodically Property Grid description - + Analytics Property Grid category - + Allow analytics Property Grid property name - + Allow anonymous analytics to be collected Property Grid description - + Font Property Grid property name - + Fonts Property Grid Category - + Font to use in XML notepad workspace Property Grid description - + XSLT Property Grid Category - + + Disable default XSLT + Property Grid property name + + + Disable default XSLT that just colorizes your XML document in HTML. + Property Grid description + + Enable Scripts Property Grid property name - + Allow execution of script blocks in XSLT stylesheets. Property Grid description - + Web Browser Version Property Grid property name - + Select which version of Web Browser to use to render XSLT output. Property Grid description - + Formatting Options Property Grid Category - + Indent char Property Grid property name - + The indent character to use Property Grid description - + Indent level Property Grid property name - + Number of indent characters to use for one indent level Property Grid description - + New line character Property Grid description - + The character sequence to use for new lines. "\r" means 0xD and "\n" means 0xA. So "\r\n" gives you Windows style newlines. Property Grid description - + PI Property Grid property name - + Color of Processing Instruction nodes Property Grid description - + Text Property Grid property name - + Color of text nodes Property Grid description - + Updates Property Grid Category - + Update location Property Grid property name - + Location of special XML file containing update information Property Grid description - + This will reset all options to the built in defaults, are you sure you want to do that? Message box prompt - + Reset All Options Message box caption - + Language Options - + The language to select from XSD annotations - + Language - + A simple XML editor with XSD intellisense and XSLTpreview - + XmlNotepad - + Autoformat long lines instead of prompting Property Grid description - + Autoformat Long Lines Property Grid Property Name - + Long Lines Property Grid Category - + What is the maximum line length before prompting for reformatting? Property Grid description - + Maximum Line Length Property Grid property name - + What is the maximum length for the textbox Property Grid description - + Maximum Value Length Property Grid property name - + No byte order mark on save Property grid property name - + Do not write any byte order mark at the beginning of the file for UTF-8 (0xef 0xbb 0xbf) or UTF-16 (0xff ffe) Property Grid description - + XML files (*.xml)|*.xml|XSL files (*.xsl)|*.xsl|XSD files (*.xsd)|*.xsd|CSV files (*.csv)|*.csv|HTML files (*.htm;*.html)|*.htm;*.html|All files (*.*)|*.* Open file dialog filter. - + Avoid DTD validations Property Grid Description - + Ignore DTD Property Grid Property Name - + Please enter the filename for storing the the XSLT output Tooltip - + Ignore differences in the order of child elements - + Ignore child order - + Ignore differences in comments - + Ignore comments - + Ignore differences in DTD elements - + Ignore DTD - + Ignore differences in namespaces - + Ignore namespaces - + Ignore differences in processing instructions - + Ignore processing instructions - + Ignore differences in namespace prefixes - + Ignore prefixes - + Ignore differences in insignificant whitespace between elements - + Ignore whitespace - + Ignore differences in XML declarations - + Ignore XML declarations - + Samples folder not found - + Name Property Name - + Color Theme Property Window Category - + Select the default color theme and theme to edit Property Description - + Container background Property Name - + The background color for non text nodes Property description - + Editor background Property Name - + Background color for text editor control Property Description - + There is no file loaded to diff against. Message box prompt - + You selected the same file, please select a different file. Message box prompt - + Click here to open the installer web page. - + Click here to visit the update history. - + Up to date Button caption. - + You have the latest version: {0} - + Transformed in {0} ms and {2} loaded in {1} ms status text - + Editor Property grid category - + The text editor to use for View Source option Property grid description - + Default text editor Property grid name - - Please go to Windows Settings for 'Default Apps' and select 'Choose default apps by file type' add XML Notepad for each file type you want associated with it. - + + Please go to Windows Settings for 'Default Apps' and select 'Choose default apps by file type' add XML Notepad for each file type you want associated with it. + - + Error initializing WebView2 component. Please install WebView2 from https://developer.microsoft.com/en-us/microsoft-edge/webview2/ and check if you need to do a full reboot. {0} - + Invalid file name '{0}' - - Checking for updates... - + + Checking for updates... + diff --git a/src/XmlNotepad/XsltControl.cs b/src/XmlNotepad/XsltControl.cs index 6171fe15..e727115b 100644 --- a/src/XmlNotepad/XsltControl.cs +++ b/src/XmlNotepad/XsltControl.cs @@ -423,6 +423,11 @@ public string DisplayXsltResults(XmlDocument context, string xsltfilename, strin if (string.IsNullOrEmpty(xsltfilename)) { transform = GetDefaultStylesheet(); + if (this._settings.GetBoolean("DisableDefaultXslt")) + { + context = new XmlDocument(); + context.LoadXml("Default styling of your XML documents is disabled in your Options"); + } } else { diff --git a/src/XmlNotepadPackage/Package.appxmanifest b/src/XmlNotepadPackage/Package.appxmanifest index 8ff0757a..5627ff24 100644 --- a/src/XmlNotepadPackage/Package.appxmanifest +++ b/src/XmlNotepadPackage/Package.appxmanifest @@ -1,6 +1,6 @@  - + XML Notepad Microsoft Corporation diff --git a/src/XmlNotepadSetup/Product.wxs b/src/XmlNotepadSetup/Product.wxs index 93d0ba6c..d6218c21 100644 --- a/src/XmlNotepadSetup/Product.wxs +++ b/src/XmlNotepadSetup/Product.wxs @@ -1,6 +1,6 @@  - +