chore: pdf refactoring

Author: Xiphoseer

crates/sdo-pdf/src/font.rs

@@ -320,28 +320,27 @@ impl Fonts {
 
 pub const FONTS: [&str; 8] = ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"];
 
-pub fn font_dict<'a>(
-    font_info: &'a Fonts,
-    print: &DocumentFontCacheInfo,
-) -> (DictResource<Font<'static>>, [Option<&'a FontInfo>; 8]) {
-    let mut infos = [None; 8];
-    let mut dict = DictResource::new();
-    for (cset, info) in print
-        .chsets
-        .iter()
-        .map(FontCacheInfo::index)
-        .enumerate()
-        .filter_map(|(cset, fc_index)| {
-            fc_index
-                .and_then(|fc_index| font_info.get(fc_index))
-                .map(|info| (cset, info))
-        })
-    {
-        dict.insert(
-            FONTS[cset].to_owned(),
-            Resource::global(font_info.index(info)),
-        );
-        infos[cset] = Some(info);
+impl Fonts {
+    pub fn font_dict<'a>(
+        &'a self,
+        print: &DocumentFontCacheInfo,
+    ) -> (DictResource<Font<'static>>, [Option<&'a FontInfo>; 8]) {
+        let mut infos = [None; 8];
+        let mut dict = DictResource::new();
+        for (cset, info) in print
+            .chsets
+            .iter()
+            .map(FontCacheInfo::index)
+            .enumerate()
+            .filter_map(|(cset, fc_index)| {
+                fc_index
+                    .and_then(|fc_index| self.get(fc_index))
+                    .map(|info| (cset, info))
+            })
+        {
+            dict.insert(FONTS[cset].to_owned(), Resource::global(self.index(info)));
+            infos[cset] = Some(info);
+        }
+        (dict, infos)
     }
-    (dict, infos)
 }

crates/sdo-pdf/src/sdoc/mod.rs

@@ -1,6 +1,6 @@
 use pdf_create::{
     common::{MediaBox, ProcSet, Rectangle},
-    high::{DictResource, Font, GlobalResource, Page, Res, Resource, Resources, XObject},
+    high::{DictResource, Font, GlobalResource, Handle, Page, Res, Resource, Resources, XObject},
 };
 use signum::{
     chsets::cache::DocumentFontCacheInfo,
@@ -16,7 +16,10 @@ mod text;
 use contents::Contents;
 use text::TextContents;
 
-use crate::{font::FontInfo, image::image_for_site};
+use crate::{
+    font::{FontInfo, Fonts},
+    image::image_for_site,
+};
 
 /// Write the text for a PDF page
 fn write_pdf_page_text(
@@ -141,3 +144,31 @@ pub fn generate_pdf_page<GC: GenerationContext>(
         contents,
     })
 }
+
+pub fn generate_pdf_pages<GC: GenerationContext>(
+    gc: &GC,
+    hnd: &mut Handle,
+    overrides: &Overrides,
+    font_info: &Fonts,
+) -> Result<(), crate::Error> {
+    let res = &mut hnd.res;
+    let pages = &mut hnd.pages;
+
+    let (fonts, infos) = font_info.font_dict(gc.fonts());
+    let font_dict = res.push_font_dict(fonts);
+    for page in gc.text_pages() {
+        let page_info = gc.page_at(page.index as usize).unwrap();
+
+        let page = generate_pdf_page(
+            gc,
+            overrides,
+            &infos,
+            font_dict.clone(),
+            page,
+            page_info,
+            res,
+        )?;
+        pages.push(page);
+    }
+    Ok(())
+}

crates/sdo-web/src/lib.rs

@@ -18,8 +18,10 @@ use signum::{
     docs::{
         container::parse_sdoc0001_container,
         four_cc,
-        hcim::{parse_image, Hcim},
-        header, DocumentInfo, SDoc,
+        hcim::{parse_image, Hcim, ImageSite},
+        header, pbuf,
+        tebu::PageText,
+        DocumentInfo, GenerationContext, SDoc,
     },
     raster::{self, render_doc_page, render_editor_text},
     util::FourCC,
@@ -105,6 +107,24 @@ pub struct ActiveDocument {
     pd: FontKind,
 }
 
+impl GenerationContext for ActiveDocument {
+    fn image_sites(&self) -> &[ImageSite] {
+        self.sdoc.image_sites()
+    }
+
+    fn document_info(&self) -> &DocumentInfo {
+        &self.di
+    }
+
+    fn text_pages(&self) -> &[PageText] {
+        &self.sdoc.tebu.pages
+    }
+
+    fn page_at(&self, index: usize) -> Option<&pbuf::Page> {
+        self.sdoc.pbuf.page_at(index)
+    }
+}
+
 #[wasm_bindgen]
 pub struct Handle {
     document: Document,

crates/signum/src/docs/mod.rs

@@ -10,6 +10,7 @@ use nom::{
     number::complete::{be_u16, be_u32, le_u32},
     Finish, IResult,
 };
+use tebu::PageText;
 
 use crate::{
     chsets::cache::DocumentFontCacheInfo,
@@ -241,4 +242,15 @@ pub trait GenerationContext {
     fn image_sites(&self) -> &[ImageSite];
     /// Get the document information
     fn document_info(&self) -> &DocumentInfo;
+
+    /// Get the text pages
+    fn text_pages(&self) -> &[PageText];
+
+    /// Get a specific page buffer page
+    fn page_at(&self, index: usize) -> Option<&pbuf::Page>;
+
+    /// Get the document font-cache info
+    fn fonts(&self) -> &DocumentFontCacheInfo {
+        &self.document_info().fonts
+    }
 }

crates/signum/src/docs/pbuf.rs

@@ -47,6 +47,11 @@ impl PBuf<'_> {
             pages,
         }
     }
+
+    /// Get a specific page
+    pub fn page_at(&self, index: usize) -> Option<&Page> {
+        self.pages[index].as_ref().map(|(p, _)| p)
+    }
 }
 
 #[derive(Debug, Serialize)]

src/cli/sdoc/pdf.rs

@@ -6,15 +6,10 @@ use pdf_create::{
     common::{OutputIntent, OutputIntentSubtype, PdfString},
     high::Handle,
 };
-use sdo_pdf::{
-    font::{font_dict, Fonts},
-    prepare_info,
-    sdoc::generate_pdf_page,
-    MetaInfo,
-};
+use sdo_pdf::{font::Fonts, prepare_info, sdoc::generate_pdf_pages, MetaInfo};
 use signum::{
     chsets::{cache::ChsetCache, FontKind, UseTableVec},
-    docs::{hcim::ImageSite, GenerationContext, Overrides},
+    docs::{hcim::ImageSite, pbuf, tebu::PageText, GenerationContext, Overrides},
 };
 
 use super::{Document, DocumentInfo};
@@ -37,6 +32,19 @@ pub fn prepare_meta(hnd: &mut Handle, meta: &MetaInfo) -> eyre::Result<()> {
 struct GenCtx<'a> {
     di: &'a DocumentInfo,
     image_sites: &'a [ImageSite],
+    text_pages: &'a [PageText],
+    pages: &'a [Option<pbuf::Page>],
+}
+
+impl<'a> GenCtx<'a> {
+    fn new(doc: &'a Document<'_>, di: &'a DocumentInfo) -> Self {
+        Self {
+            di,
+            image_sites: &doc.sites[..],
+            text_pages: &doc.tebu[..],
+            pages: &doc.pages[..],
+        }
+    }
 }
 
 impl GenerationContext for GenCtx<'_> {
@@ -47,6 +55,14 @@ impl GenerationContext for GenCtx<'_> {
     fn document_info(&self) -> &DocumentInfo {
         self.di
     }
+
+    fn text_pages(&self) -> &[PageText] {
+        self.text_pages
+    }
+
+    fn page_at(&self, index: usize) -> Option<&pbuf::Page> {
+        self.pages[index].as_ref()
+    }
 }
 
 pub fn prepare_document(
@@ -56,30 +72,9 @@ pub fn prepare_document(
     overrides: &Overrides,
     font_info: &Fonts,
 ) -> eyre::Result<()> {
-    let gc = GenCtx {
-        di,
-        image_sites: &doc.sites[..],
-    };
-
-    let (fonts, infos) = font_dict(font_info, &di.fonts);
+    let gc = GenCtx::new(doc, di);
 
-    let font_dict = hnd.res.push_font_dict(fonts);
-
-    for page in &doc.tebu {
-        let page_info = doc.pages[page.index as usize].as_ref().unwrap();
-        let res = &mut hnd.res;
-
-        let page = generate_pdf_page(
-            &gc,
-            overrides,
-            &infos,
-            font_dict.clone(),
-            page,
-            page_info,
-            res,
-        )?;
-        hnd.pages.push(page);
-    }
+    generate_pdf_pages(&gc, hnd, overrides, font_info)?;
 
     Ok(())
 }