Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes from Lakerfield/PdfSharp #1

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Changes from Lakerfield/PdfSharp #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
230ae24
Prevent race in constructor
nied Oct 9, 2016
8392455
Merge pull request #2 from nied/prevent-race-in-code128
Lakerfield Oct 10, 2016
bf310d4
Add Ean13 barcode implementation from Sven Rymenants
Lakerfield May 4, 2017
6dfda13
Update readme with ean13
Lakerfield May 4, 2017
11f2348
Update to v4.5.2 ivm first supported framework, removed xml docs
Lakerfield May 16, 2017
c24535a
Add build output
Lakerfield May 16, 2017
724ef2b
Update to .net v4.6.1
Lakerfield May 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions BuildLibs/Lakerfield.MigraDoc.1.32.4.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Lakerfield.MigraDoc</id>
<version>1.32.4</version>
<authors>Michael Lakerveld</authors>
<projectUrl>https://github.com/Lakerfield/PdfSharp</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Special MigraDoc build from Lakerfield</description>
<dependencies>
<dependency id="Lakerfield.PdfSharp" version="1.32.4" />
</dependencies>
</metadata>
<files>
<file src="MigraDoc.DocumentObjectModel-WPF.dll" target="lib\net452\MigraDoc.DocumentObjectModel-WPF.dll" />
<file src="MigraDoc.Rendering-WPF.dll" target="lib\net452\MigraDoc.Rendering-WPF.dll" />
<file src="MigraDoc.RtfRendering-WPF.dll" target="lib\net452\MigraDoc.RtfRendering-WPF.dll" />
</files>
</package>
15 changes: 15 additions & 0 deletions BuildLibs/Lakerfield.PdfSharp.1.32.4.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Lakerfield.PdfSharp</id>
<version>1.32.4</version>
<authors>Michael Lakerveld</authors>
<projectUrl>https://github.com/Lakerfield/PdfSharp</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Special PdfSharp build from Lakerfield</description>
</metadata>
<files>
<file src="PdfSharp-WPF.dll" target="lib\net452\PdfSharp-WPF.dll" />
<file src="PdfSharp.Charting-WPF.dll" target="lib\net452\PdfSharp.Charting-WPF.dll" />
</files>
</package>
Binary file modified BuildLibs/MigraDoc.DocumentObjectModel-WPF.dll
View file
Open in desktop
Binary file not shown.
Binary file modified BuildLibs/MigraDoc.Rendering-WPF.dll
View file
Open in desktop
Binary file not shown.
Binary file modified BuildLibs/MigraDoc.RtfRendering-WPF.dll
View file
Open in desktop
Binary file not shown.
Binary file modified BuildLibs/PdfSharp-WPF.dll
View file
Open in desktop
Binary file not shown.
Binary file modified BuildLibs/PdfSharp.Charting-WPF.dll
View file
Open in desktop
Binary file not shown.
12 changes: 8 additions & 4 deletions MigraDoc/code/MigraDoc.DocumentObjectModel/MigraDoc.DocumentObjectModel-WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
Expand Down Expand Up @@ -30,7 +30,7 @@
<SignAssembly>true</SignAssembly>
<OldToolsVersion>3.5</OldToolsVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -53,6 +53,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
Expand All @@ -62,7 +63,8 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DocumentationFile>bin\Debug\MigraDoc.DocumentObjectModel-WPF.xml</DocumentationFile>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Expand All @@ -75,6 +77,7 @@
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
Expand All @@ -97,6 +100,7 @@
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
Expand Down Expand Up @@ -625,4 +629,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>
6 changes: 5 additions & 1 deletion ...ode/MigraDoc.DocumentObjectModel/MigraDoc.DocumentObjectModel.Shapes/enums/BarcodeType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ public enum BarcodeType
/// <summary>
/// Barcode "Code 128"
/// </summary>
Barcode128
Barcode128,
/// <summary>
/// Barcode "EAN 13"
/// </summary>
BarcodeEan13,
}
}
2 changes: 1 addition & 1 deletion MigraDoc/code/MigraDoc.DocumentObjectModel/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions MigraDoc/code/MigraDoc.Rendering/MigraDoc.Rendering-WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
Expand Down Expand Up @@ -29,7 +29,7 @@
</UpgradeBackupLocation>
<SignAssembly>true</SignAssembly>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -53,6 +53,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
Expand All @@ -77,6 +78,7 @@
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
Expand All @@ -100,6 +102,7 @@
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore">
Expand All @@ -118,6 +121,7 @@
<Name>System.Drawing</Name>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml">
<Name>System.XML</Name>
</Reference>
Expand Down
3 changes: 3 additions & 0 deletions MigraDoc/code/MigraDoc.Rendering/MigraDoc.Rendering/BarcodeRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ internal override void Render()
case BarcodeType.Barcode39:
gfxBarcode = new Code3of9Standard();
break;
case BarcodeType.BarcodeEan13:
gfxBarcode = new Ean13();
break;
default:
break;
}
Expand Down
12 changes: 8 additions & 4 deletions MigraDoc/code/MigraDoc.RtfRendering/MigraDoc.RtfRendering-WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
Expand Down Expand Up @@ -29,7 +29,7 @@
</UpgradeBackupLocation>
<SignAssembly>true</SignAssembly>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand Down Expand Up @@ -63,7 +63,8 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DocumentationFile>bin\Debug\MigraDoc.RtfRendering-WPF.XML</DocumentationFile>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Expand All @@ -76,6 +77,7 @@
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
Expand All @@ -98,6 +100,7 @@
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
Expand All @@ -109,6 +112,7 @@
<Reference Include="System.Drawing">
<Name>System.Drawing</Name>
</Reference>
<Reference Include="System.Xaml" />
<Reference Include="System.Xml">
<Name>System.XML</Name>
</Reference>
Expand Down Expand Up @@ -307,4 +311,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>
12 changes: 8 additions & 4 deletions PDFsharp/code/PdfSharp.Charting/PdfSharp.Charting-WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
Expand Down Expand Up @@ -28,7 +28,7 @@
</UpgradeBackupLocation>
<SignAssembly>true</SignAssembly>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -52,6 +52,7 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
Expand All @@ -61,7 +62,8 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DocumentationFile>bin\Debug\PdfSharp.Charting-WPF.XML</DocumentationFile>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Expand All @@ -75,6 +77,7 @@
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
Expand All @@ -98,6 +101,7 @@
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore">
Expand Down Expand Up @@ -417,4 +421,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>
11 changes: 8 additions & 3 deletions PDFsharp/code/PdfSharp/PdfSharp-WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PdfSharp</RootNamespace>
<AssemblyName>PdfSharp-WPF</AssemblyName>
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>StrongnameKey.snk</AssemblyOriginatorKeyFile>
Expand Down Expand Up @@ -41,6 +41,7 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -51,8 +52,10 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DocumentationFile>bin\Debug\PdfSharp-WPF.XML</DocumentationFile>
<DocumentationFile>
</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -64,6 +67,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\Release\PdfSharp-WPF.xml</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore">
Expand Down Expand Up @@ -93,6 +97,7 @@
<Compile Include="PdfSharp.Drawing.BarCodes\CodeDataMatrix.cs" />
<Compile Include="PdfSharp.Drawing.BarCodes\CodeOmr.cs" />
<Compile Include="PdfSharp.Drawing.BarCodes\DataMatrixImage.cs" />
<Compile Include="PdfSharp.Drawing.BarCodes\Ean13.cs" />
<Compile Include="PdfSharp.Drawing.BarCodes\enums\AnchorType.cs" />
<Compile Include="PdfSharp.Drawing.BarCodes\enums\Code128Type.cs" />
<Compile Include="PdfSharp.Drawing.BarCodes\enums\CodeDirection.cs" />
Expand Down
3 changes: 3 additions & 0 deletions PDFsharp/code/PdfSharp/PdfSharp.Drawing.BarCodes/BarCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ public static BarCode FromType(CodeType type, string text, XSize size, CodeDirec
case CodeType.Code3of9Standard:
return new Code3of9Standard(text, size, direction);

case CodeType.Ean13:
return new Ean13(text, size, direction);

default:
#if !SILVERLIGHT
throw new InvalidEnumArgumentException("type", (int)type, typeof(CodeType));
Expand Down
Loading