Reorganize modules

Instead of separating functionality into layout and library, everything lives in the library now. This way, related things live side by side and there are no duplicate file names in the two directories.

1 files changed, 0 insertions, 44 deletions

diff --git a/src/layout/image.rs b/src/layout/image.rs
deleted file mode 100644
index b410895b..00000000
--- a/src/layout/image.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use super::*;
-use crate::image::ImageId;
-
-/// An image node.
-#[derive(Debug, Hash)]
-pub struct ImageNode {
-    /// The id of the image file.
-    pub id: ImageId,
-    /// The fixed width, if any.
-    pub width: Option<Linear>,
-    /// The fixed height, if any.
-    pub height: Option<Linear>,
-}
-
-impl InlineLevel for ImageNode {
-    fn layout(&self, ctx: &mut LayoutContext, space: Length, base: Size) -> Frame {
-        let img = ctx.images.get(self.id);
-        let pixel_size = Spec::new(img.width() as f64, img.height() as f64);
-        let pixel_ratio = pixel_size.x / pixel_size.y;
-
-        let width = self.width.map(|w| w.resolve(base.w));
-        let height = self.height.map(|w| w.resolve(base.h));
-
-        let size = match (width, height) {
-            (Some(width), Some(height)) => Size::new(width, height),
-            (Some(width), None) => Size::new(width, width / pixel_ratio),
-            (None, Some(height)) => Size::new(height * pixel_ratio, height),
-            (None, None) => {
-                if space.is_finite() {
-                    // Fit to width.
-                    Size::new(space, space / pixel_ratio)
-                } else {
-                    // Unbounded width, we have to make up something,
-                    // so it is 1pt per pixel.
-                    pixel_size.map(Length::pt).to_size()
-                }
-            }
-        };
-
-        let mut frame = Frame::new(size, size.h);
-        frame.push(Point::zero(), Element::Image(self.id, size));
-        frame
-    }
-}