add dune rules for copying fonts

hazelgrove · Aug 31, 2024 · 0f7a4e1 · 0f7a4e1
1 parent fe4496a
commit 0f7a4e1
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 46 deletions.
diff --git a/...b/www/fonts/SourceCodePro-Black.otf.woff2 → src/web/fonts/SourceCodePro-Black.otf.woff2 b/...b/www/fonts/SourceCodePro-Black.otf.woff2 → src/web/fonts/SourceCodePro-Black.otf.woff2
diff --git a/...eb/www/fonts/SourceCodePro-Bold.otf.woff2 → src/web/fonts/SourceCodePro-Bold.otf.woff2 b/...eb/www/fonts/SourceCodePro-Bold.otf.woff2 → src/web/fonts/SourceCodePro-Bold.otf.woff2
diff --git a/...www/fonts/SourceCodePro-Regular.otf.woff2 → ...web/fonts/SourceCodePro-Regular.otf.woff2 b/...www/fonts/SourceCodePro-Regular.otf.woff2 → ...web/fonts/SourceCodePro-Regular.otf.woff2
diff --git a/src/web/style.css b/src/web/style.css
@@ -1,61 +1,25 @@
-@font-face {
-  font-family: 'Fira Code';
-  font-style: normal;
-  font-weight: normal;
-  src: url('fonts/FiraCode-Regular.woff2') format('woff2');
-}
-
-@font-face {
-  font-family: 'Fira Code';
-  font-style: normal;
-  font-weight: bold;
-  src: url('fonts/FiraCode-Bold.woff2') format('woff2');
-}
-
-@font-face {
-  font-family: 'Karla';
-  font-style: normal;
-  font-weight: normal;
-  src: url(https://fonts.gstatic.com/s/karla/v14/qkBIXvYC6trAT55ZBi1ueQVIjQTD-JqaE0lK.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-@font-face {
-  font-family: 'Helvetica Neue';
-  font-style: normal;
-  font-weight: normal;
-  src: url('fonts/HelveticaNeue-Regular.woff2') format('woff2');
-}
-
-@font-face {
-  font-family: 'Helvetica Neue';
-  font-style: normal;
-  font-weight: bold;
-  src: url('fonts/HelveticaNeue-Bold.woff2') format('woff2');
-}
-
 @font-face{
   font-family: 'Source Code Pro';
   font-weight: normal;
   font-style: normal;
   font-stretch: normal;
-  src: url('fonts/SourceCodePro-Regular.otf.woff2') format('woff2');
+  src: url('SourceCodePro-Regular.otf.woff2') format('woff2');
 }
 
 @font-face{
   font-family: 'Source Code Pro';
   font-weight: bold;
   font-style: normal;
   font-stretch: normal;
-  src: url('fonts/SourceCodePro-Bold.otf.woff2') format('woff2');
+  src: url('SourceCodePro-Bold.otf.woff2') format('woff2');
 }
 
 @font-face{
   font-family: 'Source Code Pro';
   font-weight: 900;
   font-style: normal;
   font-stretch: normal;
-  src: url('fonts/SourceCodePro-Black.otf.woff2') format('woff2');
+  src: url('SourceCodePro-Black.otf.woff2') format('woff2');
 }
 
 :root {

diff --git a/src/web/view/Code.re b/src/web/view/Code.re
@@ -43,14 +43,14 @@ let cursor = (~font, z: Zipper.t) =>
   };
 
 let view = (~font: Model.Font.t, ~zipper: Zipper.t): Node.t => {
-  print_endline("--- Code.view ---");
-  print_endline("z = " ++ Zipper.show(zipper));
+  // print_endline("--- Code.view ---");
+  // print_endline("z = " ++ Zipper.show(zipper));
   let c = Zipper.zip(~save_cursor=true, zipper);
-  print_endline("c = " ++ Cell.show(c));
-  let t = Layout.Tree.of_cell(c);
-  print_endline("t = " ++ Layout.Tree.show(t));
-  let b = Layout.Tree.flatten(t);
-  print_endline("b = " ++ Layout.Block.show(b));
+  // print_endline("c = " ++ Cell.show(c));
+  // let t = Layout.Tree.of_cell(c);
+  // print_endline("t = " ++ Layout.Tree.show(t));
+  // let b = Layout.Tree.flatten(t);
+  // print_endline("b = " ++ Layout.Block.show(b));
   div(
     ~attrs=[Attr.class_("code"), Attr.id("under-the-rail")],
     [view_text(c), ...cursor(~font, zipper)] @ carets(~font, c),

diff --git a/src/web/www/dune b/src/web/www/dune
@@ -10,3 +10,14 @@
 
 (rule
  (copy ../style.css style.css))
+
+(rule
+ (copy ../fonts/SourceCodePro-Black.otf.woff2 SourceCodePro-Black.otf.woff2))
+
+(rule
+ (copy ../fonts/SourceCodePro-Bold.otf.woff2 SourceCodePro-Bold.otf.woff2))
+
+(rule
+ (copy
+  ../fonts/SourceCodePro-Regular.otf.woff2
+  SourceCodePro-Regular.otf.woff2))
diff --git a/src/web/www/fonts/FiraCode-Bold.woff2 b/src/web/www/fonts/FiraCode-Bold.woff2
diff --git a/src/web/www/fonts/FiraCode-Regular.woff2 b/src/web/www/fonts/FiraCode-Regular.woff2
diff --git a/src/web/www/fonts/HelveticaNeue-Bold.woff2 b/src/web/www/fonts/HelveticaNeue-Bold.woff2
diff --git a/src/web/www/fonts/HelveticaNeue-Regular.woff2 b/src/web/www/fonts/HelveticaNeue-Regular.woff2