From 488df3e68e5489fbcba6bd0d7ac862327a01211c Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Sat, 21 Sep 2019 18:49:03 -0700 Subject: [PATCH] Minor fixes HTML output should have had double quotes around internal anchors. (Chrome and Edge didn't complain, but the w3c validator wasn't happy.) Made the text areas in the load-time problem report dialogs scrollable. Updated the manual. --- SourceGen/Exporter.cs | 4 ++-- SourceGen/RuntimeData/Help/settings.html | 9 ++++++--- SourceGen/WpfGui/DataFileLoadIssue.xaml | 3 ++- SourceGen/WpfGui/ProjectLoadIssues.xaml | 3 ++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/SourceGen/Exporter.cs b/SourceGen/Exporter.cs index bdaca67..0558f95 100644 --- a/SourceGen/Exporter.cs +++ b/SourceGen/Exporter.cs @@ -699,7 +699,7 @@ namespace SourceGen { return null; } - string linkified = "" + + string linkified = "" + sym.Label + ""; return TextUtil.EscapeHTML(operand).Replace(sym.Label, linkified); } @@ -720,7 +720,7 @@ namespace SourceGen { sb.Append("\r\n"); } sb.Append(" "); - sb.Append(""); sb.Append(""); sb.Append("\r\n"); diff --git a/SourceGen/RuntimeData/Help/settings.html b/SourceGen/RuntimeData/Help/settings.html index 9d2ac03..6e5571b 100644 --- a/SourceGen/RuntimeData/Help/settings.html +++ b/SourceGen/RuntimeData/Help/settings.html @@ -109,9 +109,12 @@ executable.

with all configuration files and libraries
  • Merlin 32: Merlin32.exe -

    The "column widths" section allows you to specify the width of the -label, opcode, operand, and comment fields. If the width is less than 1, -or isn't a valid number, 1 will be used.

    +

    The "column widths" section allows you to specify the minimum +width of the label, opcode, operand, and comment fields. If the width +is less than 1, or isn't a valid number, 1 will be used. These are +not hard stops: if the contents of a field are too wide, the contents +of the next column will be pushed over. (The comment field width is +not currently being used, but may be used to fold lines in the future.)

    When "show cycle counts" is checked, every instruction line will have an end-of-line comment that indicates the number of cycles required for diff --git a/SourceGen/WpfGui/DataFileLoadIssue.xaml b/SourceGen/WpfGui/DataFileLoadIssue.xaml index 63a252e..015d86b 100644 --- a/SourceGen/WpfGui/DataFileLoadIssue.xaml +++ b/SourceGen/WpfGui/DataFileLoadIssue.xaml @@ -29,7 +29,8 @@ limitations under the License. - +

    • " + + sb.Append("" + sym.Label + "" + mFormatter.FormatHexValue(sym.Value, 2) + "