5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-31 07:26:09 +00:00
Code Issues Projects Releases Wiki Activity

Correctif encodage pdf release

Browse source
This commit is contained in:
Yan Maniez 2019-07-29 18:16:42 +02:00
parent 28049fdd3e
commit d5f630464a
4 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
View file

@ -15,7 +15,7 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix> <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix> <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<ReleaseVersion>1.32</ReleaseVersion> <ReleaseVersion>1.38</ReleaseVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -32,6 +32,7 @@
<EnableLLVM>false</EnableLLVM> <EnableLLVM>false</EnableLLVM>
<BundleAssemblies>false</BundleAssemblies> <BundleAssemblies>false</BundleAssemblies>
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot> <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
<MandroidI18n>West</MandroidI18n>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>false</DebugSymbols> <DebugSymbols>false</DebugSymbols>
@ -55,6 +56,7 @@
<AndroidCreatePackagePerAbi>true</AndroidCreatePackagePerAbi> <AndroidCreatePackagePerAbi>true</AndroidCreatePackagePerAbi>
<AndroidDexTool>d8</AndroidDexTool> <AndroidDexTool>d8</AndroidDexTool>
<AndroidLinkTool>r8</AndroidLinkTool> <AndroidLinkTool>r8</AndroidLinkTool>
<MandroidI18n>West</MandroidI18n>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Mono.Android" /> <Reference Include="Mono.Android" />

2
AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nioux.aidedejeu" android:installLocation="preferExternal" android:versionCode="37" android:versionName="1.37"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nioux.aidedejeu" android:installLocation="preferExternal" android:versionCode="38" android:versionName="1.38">
<uses-sdk android:targetSdkVersion="28" /> <uses-sdk android:targetSdkVersion="28" />
<application android:label="Beta Haches &amp; Dés"> <application android:label="Beta Haches &amp; Dés">
<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.nioux.aidedejeu.fileprovider" android:exported="false" android:grantUriPermissions="true"> <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.nioux.aidedejeu.fileprovider" android:exported="false" android:grantUriPermissions="true">

4
AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
View file

@ -85,8 +85,8 @@
<UseVSHostingProcess>false</UseVSHostingProcess> <UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit> <Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain> <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
<Optimize>true</Optimize> <Optimize>false</Optimize>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath> <OutputPath>bin\x86\Release\</OutputPath>

30
AideDeJeu/AideDeJeu/Pdf/PdfService.cs
View file

@ -95,15 +95,32 @@ namespace AideDeJeu.Pdf
//PdfStamper stamper = null; //PdfStamper stamper = null;
//stamper = new PdfStamper(reader, stream); //stamper = new PdfStamper(reader, stream);
foreach (var md in mds) try
{ {
var expandedMd = await ExpandMarkdownAsync(md); foreach (var md in mds)
var parsed = Markdig.Markdown.Parse(expandedMd, pipeline); {
Render(parsed.AsEnumerable(), document, writer); var expandedMd = await ExpandMarkdownAsync(md);
var parsed = Markdig.Markdown.Parse(expandedMd, pipeline);
Render(parsed.AsEnumerable(), document, writer);
}
}
catch(Exception ex)
{
Debug.WriteLine(ex);
}
finally
{
try
{
document?.Close();
}
catch
{
}
writer.Close();
} }
document.Close();
writer.Close();
//stamper.Close(); //stamper.Close();
//reader.Close(); //reader.Close();
} }
@ -243,7 +260,6 @@ namespace AideDeJeu.Pdf
//} //}
var phrases = Render(blocks); var phrases = Render(blocks);
ColumnText ct = new ColumnText(writer.DirectContent); ColumnText ct = new ColumnText(writer.DirectContent);
int column = 0; int column = 0;