Merge pull request #1309 from ghost/embed-print-fonts

src/entities/names.rs

@@ -143,6 +143,7 @@ pub fn dxf_name(e: &EntityType) -> &'static str {
         EntityType::MLine(_) => "MLINE",
         EntityType::RasterImage(_) => "RASTERIMAGE",
         EntityType::Wipeout(_) => "WIPEOUT",
+        EntityType::Ole2Frame(_) => "OLE2FRAME",
         EntityType::Underlay(_) => "UNDERLAY",
         EntityType::AttributeDefinition(_) => "ATTDEF",
         EntityType::AttributeEntity(_) => "ATTRIB",

src/entities/text_support.rs

@@ -39,6 +39,12 @@ pub fn resolve_text_style(style_name: &str, document: &CadDocument) -> ResolvedT
                         .map(std::path::Path::new)
                         .and_then(|p| p.parent());
                     crate::io::resolve_image_file(file, base)
+                        // Fonts fetched from the community repository live in
+                        // the per-user fonts folder — search it last.
+                        .or_else(|| {
+                        crate::io::font_repo::local_font_file(file)
+                            .map(|path| path.to_string_lossy().into_owned())
+                    })
                 })
                 .flatten();
             if let Some(p) = shx_path {