Fonts

AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj

@@ -64,6 +64,21 @@
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\LinLibertine_R.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_RB.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_RBI.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_RI.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_RZ.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_RZI.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_aBL.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_aBS.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_aDRS.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_aRL.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_aS.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_aSI.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_aSZI.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_aZL.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_DR.ttf" />
+    <AndroidAsset Include="Assets\LinLibertine_I.ttf" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
   </ItemGroup>

AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj

@@ -103,6 +103,21 @@
     </AppxManifest>
     <None Include="AideDeJeu.UWP_TemporaryKey.pfx" />
     <Content Include="Assets\Fonts\LinLibertine_R.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_RB.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_RBI.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_RI.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_RZ.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_RZI.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_aBL.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_aBS.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_aDRS.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_aRL.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_aS.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_aSI.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_aSZI.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_aZL.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_DR.ttf" />
+    <Content Include="Assets\Fonts\LinLibertine_I.ttf" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Properties\Default.rd.xml" />

AideDeJeu/AideDeJeu/App.xaml

@@ -65,6 +65,26 @@
             <Color x:Key="monstertan">#FDF1DC</Color>
             <Color x:Key="monstertandark">#F0DBB5</Color>
 
+            <Style TargetType="ContentPage">
+                <Setter Property="BackgroundColor" Value="{StaticResource bgtan}" />
+            </Style>
+
+            <OnPlatform x:Key="LinuxLibertineCapitals" x:TypeArguments="x:String">
+                <On Platform="iOS" Value="Linux Libertine Capitals" />
+                <On Platform="Android" Value="LinLibertine_aS.ttf#Linux Libertine Capitals" />
+                <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/LinLibertine_aS.ttf#Linux Libertine Capitals" />
+            </OnPlatform>
+
+            <OnPlatform x:Key="LinuxLibertine" x:TypeArguments="x:String">
+                <On Platform="iOS" Value="Linux Libertine" />
+                <On Platform="Android" Value="LinLibertine_R.ttf#Linux Libertine" />
+                <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/LinLibertine_R.ttf#Linux Libertine" />
+            </OnPlatform>
+
+            <Style TargetType="Label">
+                <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertine}" />
+            </Style>
+
             <Style TargetType="Label"  x:Key="section">
                 <Setter Property="FontSize" Value="Large" />
                 <Setter Property="TextColor" Value="{StaticResource titlered}" />
@@ -78,21 +98,10 @@
             <Style TargetType="Label" x:Key="subsubsection">
                 <Setter Property="FontSize" Value="Small" />
                 <Setter Property="TextColor" Value="{StaticResource titlered}" />
+                <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" />
             </Style>
 
-            <Style TargetType="ContentPage">
-                <Setter Property="BackgroundColor" Value="{StaticResource bgtan}" />
-            </Style>
 
-            <OnPlatform x:Key="LibertineR" x:TypeArguments="x:String">
-                <On Platform="iOS" Value="Lobster-Regular" />
-                <On Platform="Android" Value="LinLibertine_R.ttf#Linux Libertine" />
-                <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/LinLibertine_R.ttf#Linux Libertine" />
-            </OnPlatform>
-            <Style TargetType="Label">
-                <Setter Property="FontFamily" Value="{DynamicResource LibertineR}" />
-            </Style>
-            
             <Style TargetType="NavigationPage">
                 <Setter Property="BarBackgroundColor" Value="{StaticResource Primary}" />
                 <Setter Property="BarTextColor" Value="White" />