🐛Added support for Apple II character sets, fixes #102

This commit is contained in:
2017-12-26 18:52:21 +00:00
parent 56198b1ee6
commit 41180352de
10 changed files with 17 additions and 24 deletions

View File

@@ -66,8 +66,7 @@ namespace DiscImageChef.Filesystems.AppleDOS
public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
Encoding encoding)
{
// TODO: Until Apple ][ encoding is implemented
Encoding = new LisaRoman();
Encoding = encoding ?? new Apple2();
information = "";
StringBuilder sb = new StringBuilder();

View File

@@ -50,8 +50,7 @@ namespace DiscImageChef.Filesystems.AppleDOS
{
device = imagePlugin;
start = partition.Start;
// TODO: Until Apple ][ encoding is implemented
Encoding = new LisaRoman();
Encoding = encoding ?? new Apple2();
if(device.Info.Sectors != 455 && device.Info.Sectors != 560)
{

View File

@@ -31,11 +31,11 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="Claunia.Encoding, Version=1.0.6569.33160, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\Claunia.Encoding.1.3.0\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="Claunia.Encoding">
<HintPath>..\packages\Claunia.Encoding.1.2.9.1\lib\portable40-net40+sl5+win8+wp8\Claunia.Encoding.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="IReadOnlyFilesystem.cs" />
@@ -215,9 +215,6 @@
</EmbeddedResource>
<EmbeddedResource Include="CPM\cpmdefs.xml" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ProjectExtensions>
<MonoDevelop>
<Properties>

View File

@@ -153,8 +153,7 @@ namespace DiscImageChef.Filesystems
public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
Encoding encoding)
{
// TODO: Until Apple ][ encoding is implemented
Encoding = new LisaRoman();
Encoding = encoding ?? new Apple2gs();
StringBuilder sbInformation = new StringBuilder();
// Blocks 0 and 1 are boot code

View File

@@ -32,9 +32,11 @@
using System;
using System.Text;
using Claunia.Encoding;
using DiscImageChef.CommonTypes;
using DiscImageChef.DiscImages;
using Schemas;
using Encoding = System.Text.Encoding;
namespace DiscImageChef.Filesystems.UCSDPascal
{
@@ -86,6 +88,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
Encoding encoding)
{
Encoding = encoding ?? new Apple2();
StringBuilder sbInformation = new StringBuilder();
information = "";

View File

@@ -46,8 +46,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding, bool debug)
{
device = imagePlugin;
// TODO: Until Apple ][ encoding is implemented
Encoding = new LisaRoman();
Encoding = encoding ?? new Apple2();
this.debug = debug;
if(device.Info.Sectors < 3) return Errno.InvalidArgument;

View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Claunia.Encoding" version="1.2.9.1" targetFramework="net40" />
<package id="Claunia.Encoding" version="1.3.0" targetFramework="net40" />
</packages>