diff --git a/paket.dependencies b/paket.dependencies index 9414626a..39c79408 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -20,6 +20,9 @@ nuget Unofficial.LibTessDotNet ~> 2.0.2 nuget FsPickler ~> 5.3.2 nuget FsPickler.Json ~> 5.3.2 +nuget Unofficial.Typography ~> 0.1.0 +nuget FuzzySharp ~> 2.0.2 + group CodeGenerator framework net8.0 storage: none diff --git a/paket.lock b/paket.lock index 3a24812b..1d76c669 100644 --- a/paket.lock +++ b/paket.lock @@ -20,6 +20,7 @@ NUGET FSharp.Core (>= 4.3.2) FsPickler (>= 5.3.2) Newtonsoft.Json (>= 10.0.1) + FuzzySharp (2.0.2) Microsoft.Bcl.AsyncInterfaces (8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0) Microsoft.NETCore.Platforms (7.0.4) @@ -90,7 +91,7 @@ NUGET System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0) System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net8.0) (< netcoreapp2.0)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (4.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.0)) (== netstandard2.0) + System.Numerics.Vectors (4.5) System.ObjectModel (4.3) System.Collections (>= 4.3) System.Diagnostics.Debug (>= 4.3) @@ -160,6 +161,8 @@ NUGET System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.0)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= wp8)) (== netstandard2.0) Unofficial.LibTessDotNet (2.0.2) + Unofficial.Typography (0.1) + System.Numerics.Vectors (>= 4.5) GROUP CodeGenerator STORAGE: NONE diff --git a/src/Aardvark.Base.Fonts/Aardvark.Base.Fonts.fsproj b/src/Aardvark.Base.Fonts/Aardvark.Base.Fonts.fsproj new file mode 100644 index 00000000..18eafd64 --- /dev/null +++ b/src/Aardvark.Base.Fonts/Aardvark.Base.Fonts.fsproj @@ -0,0 +1,31 @@ + + + + netstandard2.0 + Aardvark.Base.Fonts + Library + true + true + 3389;3390;3395 + + + ..\..\bin\Debug\ + + + ..\..\bin\Release + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Aardvark.Rendering.Text/BvhInternal.fs b/src/Aardvark.Base.Fonts/BvhInternal.fs similarity index 100% rename from src/Aardvark.Rendering.Text/BvhInternal.fs rename to src/Aardvark.Base.Fonts/BvhInternal.fs diff --git a/src/Aardvark.Rendering.Text/Font.fs b/src/Aardvark.Base.Fonts/Font.fs similarity index 100% rename from src/Aardvark.Rendering.Text/Font.fs rename to src/Aardvark.Base.Fonts/Font.fs diff --git a/src/Aardvark.Rendering.Text/FontResolver.fs b/src/Aardvark.Base.Fonts/FontResolver.fs similarity index 100% rename from src/Aardvark.Rendering.Text/FontResolver.fs rename to src/Aardvark.Base.Fonts/FontResolver.fs diff --git a/src/Aardvark.Rendering.Text/Path.fs b/src/Aardvark.Base.Fonts/Path.fs similarity index 100% rename from src/Aardvark.Rendering.Text/Path.fs rename to src/Aardvark.Base.Fonts/Path.fs diff --git a/src/Aardvark.Rendering.Text/PathSegment.fs b/src/Aardvark.Base.Fonts/PathSegment.fs similarity index 100% rename from src/Aardvark.Rendering.Text/PathSegment.fs rename to src/Aardvark.Base.Fonts/PathSegment.fs diff --git a/src/Aardvark.Rendering.Text/PathTessellator.fs b/src/Aardvark.Base.Fonts/PathTessellator.fs similarity index 100% rename from src/Aardvark.Rendering.Text/PathTessellator.fs rename to src/Aardvark.Base.Fonts/PathTessellator.fs diff --git a/src/Aardvark.Base.Fonts/paket.references b/src/Aardvark.Base.Fonts/paket.references new file mode 100644 index 00000000..9be8e9c1 --- /dev/null +++ b/src/Aardvark.Base.Fonts/paket.references @@ -0,0 +1,5 @@ +FSharp.Core +Aardvark.Build +Unofficial.LibTessDotNet +Unofficial.Typography +FuzzySharp \ No newline at end of file diff --git a/src/Aardvark.Base.Fonts/paket.template b/src/Aardvark.Base.Fonts/paket.template new file mode 100644 index 00000000..c7c61bf1 --- /dev/null +++ b/src/Aardvark.Base.Fonts/paket.template @@ -0,0 +1,11 @@ +type project +id Aardvark.Base.Fonts +authors Aardvark Platform Team +owners Aardvark Platform Team +projectUrl http://github.com/aardvark-platform +licenseUrl http://www.apache.org/licenses/LICENSE-2.0.txt +repositoryType git +repositoryUrl https://github.com/aardvark-platform/aardvark.base +description + Aardvark is an open-source platform for visual computing, real-time graphics and visualization. +include-pdbs true \ No newline at end of file diff --git a/src/Aardvark.sln b/src/Aardvark.sln index 60c0d8a6..247b0506 100644 --- a/src/Aardvark.sln +++ b/src/Aardvark.sln @@ -70,6 +70,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "._", "._", "{61D029CD-C474- ..\RELEASE_NOTES.md = ..\RELEASE_NOTES.md EndProjectSection EndProject +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Aardvark.Base.Fonts", "Aardvark.Base.Fonts\Aardvark.Base.Fonts.fsproj", "{C6C9C0AE-0900-4F21-86C6-2202E44A6013}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -168,6 +170,10 @@ Global {F278A2F7-52FF-40CD-B16D-4D82F7DFA8C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {F278A2F7-52FF-40CD-B16D-4D82F7DFA8C3}.Release|Any CPU.ActiveCfg = Release|Any CPU {F278A2F7-52FF-40CD-B16D-4D82F7DFA8C3}.Release|Any CPU.Build.0 = Release|Any CPU + {C6C9C0AE-0900-4F21-86C6-2202E44A6013}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6C9C0AE-0900-4F21-86C6-2202E44A6013}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C6C9C0AE-0900-4F21-86C6-2202E44A6013}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C6C9C0AE-0900-4F21-86C6-2202E44A6013}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -195,6 +201,7 @@ Global {06739A61-1B1C-4FC3-8DEF-926B10FACB28} = {C557CE9D-81EE-4EB3-AB94-B9F9CB2FA19A} {FBB17215-CDCE-4FFA-B10A-EA1B320C8638} = {C557CE9D-81EE-4EB3-AB94-B9F9CB2FA19A} {F278A2F7-52FF-40CD-B16D-4D82F7DFA8C3} = {A79411F9-60B3-46C8-8981-6905D9B9F74C} + {C6C9C0AE-0900-4F21-86C6-2202E44A6013} = {C557CE9D-81EE-4EB3-AB94-B9F9CB2FA19A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1537AED0-2BB3-4EC3-B2CB-06E22C23B002}