Skip to content

Commit

Permalink
Merge pull request #331 from JasonLautzenheiser/encoding-issues
Browse files Browse the repository at this point in the history
exporting accented characters fixed
  • Loading branch information
JasonLautzenheiser authored Apr 14, 2017
2 parents 48020d4 + 50b231b commit 5eb6304
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Export/HugoExporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ internal class HugoExporter : CodeExporter
};

protected override IEnumerable<string> ReservedWords => new[] {"Room", "Actor", "Thing", "Object", "Door", "Chair", "Heavy", "Fixture", "OpenableContainer", "Food", "GameMainDef", "if", "else", "me"};
protected override Encoding Encoding => Encoding.ASCII;
// protected override Encoding Encoding => Encoding.ASCII;

protected override void ExportHeader(TextWriter writer, string title, string author, string description, string history)
{
Expand Down
2 changes: 1 addition & 1 deletion Export/Inform6Exporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ internal class Inform6Exporter : CodeExporter

protected override IEnumerable<string> ReservedWords => new[] {"Constant", "Story", "Headline", "Include", "Object", "with", "has", "hasnt", "not", "and", "or", "n_to", "s_to", "e_to", "w_to", "nw_to", "ne_to", "sw_to", "se_to", "u_to", "d_to", "in_to", "out_to", "before", "after", "if", "else", "print", "player", "location", "description"};

protected override Encoding Encoding => Encoding.ASCII;
// protected override Encoding Encoding => Encoding.ASCII;

protected override void ExportHeader(TextWriter writer, string title, string author, string description, string history)
{
Expand Down
2 changes: 1 addition & 1 deletion Export/TadsExporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ internal class TadsExporter : CodeExporter
};

protected override IEnumerable<string> ReservedWords => new[] {"Room", "Actor", "Thing", "Object", "Door", "Chair", "Heavy", "Fixture", "OpenableContainer", "Food", "GameMainDef", "if", "else", "me"};
protected override Encoding Encoding => Encoding.ASCII;
// protected override Encoding Encoding => Encoding.ASCII;

protected override void ExportHeader(TextWriter writer, string title, string author, string description, string history)
{
Expand Down
2 changes: 2 additions & 0 deletions Revisions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Change Log
-------------
- if the default hand drawn option was not checked in the appsettings, then you could never make a room with hand drawn edges. This should be corrected.
- Hugo support for exporting Doors...thanks to Andrew Schultz and Hugo Labrande
- Accented characters where not being exported properly to Hugo, I6 and TADS (#330 & #329 - Thanks to Hugo Labrande for the report).
- Tooltip issue when opening a new map when one was already loaded (#327)

1.5.9.7
-------------
Expand Down
2 changes: 2 additions & 0 deletions UI/Controls/Canvas.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2835,6 +2835,7 @@ private void reset()
mNewRoomObjectsPosition = CompassPoint.South;
requestRecomputeSmartSegments();
StopAutomapping();
roomTooltip.SetSuperTooltip(this,null);
}

public void CopySelectedElements()
Expand Down Expand Up @@ -3550,5 +3551,6 @@ public void RemoveRoom(Room mOtherRoom)
{
Project.Current.Elements.Remove(mOtherRoom);
}

}
}

0 comments on commit 5eb6304

Please sign in to comment.