vl-convert-python 2.0.0rc5__tar.gz → 2.0.0rc6__tar.gz

{vl_convert_python-2.0.0rc5 → vl_convert_python-2.0.0rc6}/Cargo.lock

@@ -10853,7 +10853,7 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "vl-convert"
-version = "2.0.0-rc5"
+version = "2.0.0-rc6"
 dependencies = [
  "assert_cmd",
  "bytes",
@@ -10882,7 +10882,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-canvas2d"
-version = "2.0.0-rc5"
+version = "2.0.0-rc6"
 dependencies = [
  "cosmic-text",
  "csscolorparser",
@@ -10901,7 +10901,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-canvas2d-deno"
-version = "2.0.0-rc5"
+version = "2.0.0-rc6"
 dependencies = [
  "csscolorparser",
  "deno_core",
@@ -10917,7 +10917,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-google-fonts"
-version = "2.0.0-rc5"
+version = "2.0.0-rc6"
 dependencies = [
  "backon",
  "dashmap 6.2.1",
@@ -10936,7 +10936,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-python"
-version = "2.0.0-rc5"
+version = "2.0.0-rc6"
 dependencies = [
  "futures",
  "lazy_static",
@@ -10950,7 +10950,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-rs"
-version = "2.0.0-rc5"
+version = "2.0.0-rc6"
 dependencies = [
  "arc-swap",
  "backon",
@@ -11004,7 +11004,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-server"
-version = "2.0.0-rc5"
+version = "2.0.0-rc6"
 dependencies = [
  "arc-swap",
  "axum",

{vl_convert_python-2.0.0rc5 → vl_convert_python-2.0.0rc6}/Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"  # Needed for proper wgpu compilation
 members = ["vl-convert-rs", "vl-convert-python", "vl-convert-canvas2d", "vl-convert-canvas2d-deno", "vl-convert-google-fonts"]
 
 [workspace.package]
-version = "2.0.0-rc5"
+version = "2.0.0-rc6"
 edition = "2021"
 license = "BSD-3-Clause"
 repository = "https://github.com/vega/vl-convert"
@@ -23,11 +23,11 @@ backon = { version = "1", default-features = false, features = ["tokio-sleep", "
 clap = { version = "4.5", features = ["derive", "env"] }
 
 # Internal packages are released in lockstep.
-vl-convert-canvas2d = { path = "vl-convert-canvas2d", version = "=2.0.0-rc5" }
-vl-convert-canvas2d-deno = { path = "vl-convert-canvas2d-deno", version = "=2.0.0-rc5" }
-vl-convert-google-fonts = { path = "vl-convert-google-fonts", version = "=2.0.0-rc5" }
-vl-convert-rs = { path = "vl-convert-rs", version = "=2.0.0-rc5" }
-vl-convert-server = { path = "vl-convert-server", version = "=2.0.0-rc5" }
+vl-convert-canvas2d = { path = "vl-convert-canvas2d", version = "=2.0.0-rc6" }
+vl-convert-canvas2d-deno = { path = "vl-convert-canvas2d-deno", version = "=2.0.0-rc6" }
+vl-convert-google-fonts = { path = "vl-convert-google-fonts", version = "=2.0.0-rc6" }
+vl-convert-rs = { path = "vl-convert-rs", version = "=2.0.0-rc6" }
+vl-convert-server = { path = "vl-convert-server", version = "=2.0.0-rc6" }
 
 # Deno dependencies - versions correspond to Deno v2.9.6
 deno_runtime = "0.266.0"

{vl_convert_python-2.0.0rc5 → vl_convert_python-2.0.0rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vl-convert-python
-Version: 2.0.0rc5
+Version: 2.0.0rc6
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Dist: pytest>=8.3,<9 ; extra == 'test'

{vl_convert_python-2.0.0rc5 → vl_convert_python-2.0.0rc6}/vl-convert-python/src/conversions.rs

@@ -16,6 +16,17 @@ use vl_convert_rs::converter::{
 };
 use vl_convert_rs::module_loader::import_map::VlVersion;
 
+fn validate_pdf_scale(scale: Option<f64>) -> PyResult<()> {
+    if let Some(scale) = scale {
+        if scale != 1.0 {
+            return Err(PyValueError::new_err(
+                "The scale argument must be 1 for PDF output.",
+            ));
+        }
+    }
+    Ok(())
+}
+
 /// Convert a Vega-Lite spec to a Vega spec using a particular
 /// version of the Vega-Lite JavaScript library.
 ///
@@ -830,6 +841,11 @@ pub fn vegalite_to_jpeg(
 ///
 /// Args:
 ///     vg_spec (str | dict): Vega JSON specification string or dict
+///     scale (float):
+///         .. deprecated:: 2.0.0
+///            Retained only for backward compatibility with vl-convert 1.x.
+///            The parameter has no effect on PDF output. The only non-None
+///            value accepted is 1.0. Any other numeric value raises ValueError.
 ///     format_locale (str | dict): d3-format locale name or dictionary
 ///     time_format_locale (str | dict): d3-time-format locale name or dictionary
 ///     vega_plugin (str): Per-request Vega plugin (inline ESM string or URL)
@@ -844,6 +860,7 @@ pub fn vegalite_to_jpeg(
 #[pyo3(signature = (
     vg_spec,
     *,
+    scale=None,
     format_locale=None,
     time_format_locale=None,
     vega_plugin=None,
@@ -855,6 +872,7 @@ pub fn vegalite_to_jpeg(
 ))]
 pub fn vega_to_pdf(
     vg_spec: Py<PyAny>,
+    scale: Option<f64>,
     format_locale: Option<Py<PyAny>>,
     time_format_locale: Option<Py<PyAny>>,
     vega_plugin: Option<String>,
@@ -864,6 +882,7 @@ pub fn vega_to_pdf(
     width: Option<f32>,
     height: Option<f32>,
 ) -> PyResult<Py<PyAny>> {
+    validate_pdf_scale(scale)?;
     let vg_spec = parse_json_spec(vg_spec)?;
     let format_locale = parse_option_format_locale(format_locale)?;
     let time_format_locale = parse_option_time_format_locale(time_format_locale)?;
@@ -903,6 +922,11 @@ pub fn vega_to_pdf(
 ///     vl_spec (str | dict): Vega-Lite JSON specification string or dict
 ///     vl_version (str): Vega-Lite library version string (e.g. 'v5.15')
 ///         (default to latest)
+///     scale (float):
+///         .. deprecated:: 2.0.0
+///            Retained only for backward compatibility with vl-convert 1.x.
+///            The parameter has no effect on PDF output. The only non-None
+///            value accepted is 1.0. Any other numeric value raises ValueError.
 ///     config (dict | None): Chart configuration object to apply during conversion
 ///     theme (str | None): Named theme (e.g. "dark") to apply during conversion
 ///     format_locale (str | dict): d3-format locale name or dictionary
@@ -919,6 +943,7 @@ pub fn vega_to_pdf(
     vl_spec,
     *,
     vl_version=None,
+    scale=None,
     config=None,
     theme=None,
     format_locale=None,
@@ -932,6 +957,7 @@ pub fn vega_to_pdf(
 pub fn vegalite_to_pdf(
     vl_spec: Py<PyAny>,
     vl_version: Option<&str>,
+    scale: Option<f64>,
     config: Option<Py<PyAny>>,
     theme: Option<String>,
     format_locale: Option<Py<PyAny>>,
@@ -942,6 +968,7 @@ pub fn vegalite_to_pdf(
     width: Option<f32>,
     height: Option<f32>,
 ) -> PyResult<Py<PyAny>> {
+    validate_pdf_scale(scale)?;
     let vl_version = if let Some(vl_version) = vl_version {
         VlVersion::from_str(vl_version)?
     } else {
@@ -1238,11 +1265,17 @@ pub fn svg_to_jpeg(svg: &str, scale: Option<f32>, quality: Option<u8>) -> PyResu
 ///
 /// Args:
 ///     svg (str): SVG image string
+///     scale (float):
+///         .. deprecated:: 2.0.0
+///            Retained only for backward compatibility with vl-convert 1.x.
+///            The parameter has no effect on PDF output. The only non-None
+///            value accepted is 1.0. Any other numeric value raises ValueError.
 /// Returns:
 ///     bytes: PDF document data
 #[pyfunction]
-#[pyo3(signature = (svg))]
-pub fn svg_to_pdf(svg: &str) -> PyResult<Py<PyAny>> {
+#[pyo3(signature = (svg, *, scale=None))]
+pub fn svg_to_pdf(svg: &str, scale: Option<f64>) -> PyResult<Py<PyAny>> {
+    validate_pdf_scale(scale)?;
     let svg = svg.to_string();
     let pdf_data = run_converter_future(move |converter| async move {
         converter
@@ -1908,6 +1941,7 @@ pub fn vegalite_to_jpeg_asyncio<'py>(
 #[pyo3(signature = (
     vg_spec,
     *,
+    scale=None,
     format_locale=None,
     time_format_locale=None,
     vega_plugin=None,
@@ -1920,6 +1954,7 @@ pub fn vegalite_to_jpeg_asyncio<'py>(
 pub fn vega_to_pdf_asyncio<'py>(
     py: Python<'py>,
     vg_spec: Py<PyAny>,
+    scale: Option<f64>,
     format_locale: Option<Py<PyAny>>,
     time_format_locale: Option<Py<PyAny>>,
     vega_plugin: Option<String>,
@@ -1929,6 +1964,7 @@ pub fn vega_to_pdf_asyncio<'py>(
     width: Option<f32>,
     height: Option<f32>,
 ) -> PyResult<Bound<'py, PyAny>> {
+    validate_pdf_scale(scale)?;
     let vg_spec = parse_json_spec(vg_spec)?;
     let format_locale = parse_option_format_locale(format_locale)?;
     let time_format_locale = parse_option_time_format_locale(time_format_locale)?;
@@ -1965,6 +2001,7 @@ pub fn vega_to_pdf_asyncio<'py>(
     vl_spec,
     *,
     vl_version=None,
+    scale=None,
     config=None,
     theme=None,
     format_locale=None,
@@ -1979,6 +2016,7 @@ pub fn vegalite_to_pdf_asyncio<'py>(
     py: Python<'py>,
     vl_spec: Py<PyAny>,
     vl_version: Option<&str>,
+    scale: Option<f64>,
     config: Option<Py<PyAny>>,
     theme: Option<String>,
     format_locale: Option<Py<PyAny>>,
@@ -1989,6 +2027,7 @@ pub fn vegalite_to_pdf_asyncio<'py>(
     width: Option<f32>,
     height: Option<f32>,
 ) -> PyResult<Bound<'py, PyAny>> {
+    validate_pdf_scale(scale)?;
     let vl_version = if let Some(vl_version) = vl_version {
         VlVersion::from_str(vl_version)?
     } else {
@@ -2281,8 +2320,13 @@ pub fn svg_to_jpeg_asyncio<'py>(
 
 #[doc = async_variant_doc!("svg_to_pdf")]
 #[pyfunction(name = "svg_to_pdf")]
-#[pyo3(signature = (svg))]
-pub fn svg_to_pdf_asyncio<'py>(py: Python<'py>, svg: &str) -> PyResult<Bound<'py, PyAny>> {
+#[pyo3(signature = (svg, *, scale=None))]
+pub fn svg_to_pdf_asyncio<'py>(
+    py: Python<'py>,
+    svg: &str,
+    scale: Option<f64>,
+) -> PyResult<Bound<'py, PyAny>> {
+    validate_pdf_scale(scale)?;
     let svg = svg.to_string();
     run_converter_future_async(
         py,

{vl_convert_python-2.0.0rc5 → vl_convert_python-2.0.0rc6}/vl-convert-python/tests/test_asyncio.py

@@ -1,4 +1,5 @@
 import asyncio
+import sys
 
 import pytest
 import vl_convert as vlc
@@ -93,16 +94,35 @@ def test_asyncio_smoke_and_sync_parity_shapes():
     run(scenario())
 
 
-def test_asyncio_pdf_rejects_scale_keyword():
+@pytest.mark.skipif(
+    sys.platform.startswith("win"), reason="PDF tests not supported on windows"
+)
+def test_asyncio_pdf_accepts_scale_one():
     async def scenario():
         vega = await vlca.vegalite_to_vega(SIMPLE_VL_SPEC, vl_version="v5_16")
         svg = await vlca.vegalite_to_svg(SIMPLE_VL_SPEC, vl_version="v5_16")
 
-        with pytest.raises(TypeError):
+        assert (await vlca.vega_to_pdf(vega, scale=1)).startswith(b"%PDF")
+        assert (
+            await vlca.vegalite_to_pdf(
+                SIMPLE_VL_SPEC, vl_version="v5_16", scale=1
+            )
+        ).startswith(b"%PDF")
+        assert (await vlca.svg_to_pdf(svg, scale=1)).startswith(b"%PDF")
+
+    run(scenario())
+
+
+def test_asyncio_pdf_rejects_scale_other_than_one():
+    async def scenario():
+        vega = await vlca.vegalite_to_vega(SIMPLE_VL_SPEC, vl_version="v5_16")
+        svg = await vlca.vegalite_to_svg(SIMPLE_VL_SPEC, vl_version="v5_16")
+
+        with pytest.raises(ValueError, match="scale argument must be 1"):
             await vlca.vega_to_pdf(vega, scale=2)
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError, match="scale argument must be 1"):
             await vlca.vegalite_to_pdf(SIMPLE_VL_SPEC, vl_version="v5_16", scale=2)
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError, match="scale argument must be 1"):
             await vlca.svg_to_pdf(svg, scale=2)
 
     run(scenario())

{vl_convert_python-2.0.0rc5 → vl_convert_python-2.0.0rc6}/vl-convert-python/tests/test_specs.py

@@ -262,8 +262,11 @@ def test_png(name, scale, as_dict):
     check_png(png, expected_png, tol=tol, name=f"png_vegalite_{name}")
 
 
-def test_png_google_fonts():
-    vlc.configure(google_fonts=[{"family": "Bangers"}, {"family": "Lugrasimo"}])
+def test_configured_google_fonts():
+    vlc.configure(
+        google_fonts=[{"family": "Bangers"}, {"family": "Lugrasimo"}],
+        missing_fonts="error",
+    )
 
     vl_version = "v5_8"
     vl_spec = load_vl_spec("google_fonts")
@@ -276,6 +279,13 @@ def test_png_google_fonts():
     png = vlc.vegalite_to_png(vl_spec, vl_version=vl_version, scale=2)
     check_png(png, expected_png, name="png_vegalite_google_fonts")
 
+    html = vlc.vegalite_to_html(vl_spec, vl_version=vl_version, bundle=False)
+
+    assert (
+        '<link rel="stylesheet" '
+        'href="https://fonts.googleapis.com/css2?family=Bangers:' in html
+    )
+
 
 @pytest.mark.parametrize(
     "name,scale,theme", [("circle_binned", 1.0, "dark"), ("stacked_bar_h", 2.0, "vox")]
@@ -365,18 +375,46 @@ def test_pdf(name, tol, as_dict):
     check_png(png, expected_png, tol=tol, name=f"pdf_vegalite_{name}")
 
 
-def test_pdf_rejects_scale_keyword():
+@pytest.mark.skipif(
+    sys.platform.startswith("win"), reason="PDF tests not supported on windows"
+)
+def test_pdf_accepts_scale_one():
     vl_version = "v5_8"
     vl_spec = load_vl_spec("circle_binned")
     vg_spec = vlc.vegalite_to_vega(vl_spec, vl_version=vl_version)
     svg = vlc.vegalite_to_svg(vl_spec, vl_version=vl_version)
 
-    with pytest.raises(TypeError):
-        vlc.vega_to_pdf(vg_spec, scale=2)
-    with pytest.raises(TypeError):
-        vlc.vegalite_to_pdf(vl_spec, vl_version=vl_version, scale=2)
-    with pytest.raises(TypeError):
-        vlc.svg_to_pdf(svg, scale=2)
+    assert vlc.vega_to_pdf(vg_spec, scale=1).startswith(b"%PDF")
+    assert vlc.vegalite_to_pdf(
+        vl_spec, vl_version=vl_version, scale=1
+    ).startswith(b"%PDF")
+    assert vlc.svg_to_pdf(svg, scale=1).startswith(b"%PDF")
+
+
+@pytest.mark.parametrize("scale", [0, 2, 1.0000000000000002, float("nan")])
+def test_pdf_rejects_scale_other_than_one(scale):
+    vl_version = "v5_8"
+    vl_spec = load_vl_spec("circle_binned")
+    vg_spec = vlc.vegalite_to_vega(vl_spec, vl_version=vl_version)
+    svg = vlc.vegalite_to_svg(vl_spec, vl_version=vl_version)
+
+    with pytest.raises(ValueError, match="scale argument must be 1"):
+        vlc.vega_to_pdf(vg_spec, scale=scale)
+    with pytest.raises(ValueError, match="scale argument must be 1"):
+        vlc.vegalite_to_pdf(vl_spec, vl_version=vl_version, scale=scale)
+    with pytest.raises(ValueError, match="scale argument must be 1"):
+        vlc.svg_to_pdf(svg, scale=scale)
+
+
+@pytest.mark.parametrize(
+    "function_name", ["vega_to_pdf", "vegalite_to_pdf", "svg_to_pdf"]
+)
+def test_pdf_scale_deprecation_in_docstring(function_name):
+    docstring = getattr(vlc, function_name).__doc__
+    normalized_docstring = " ".join(docstring.split())
+    assert ".. deprecated:: 2.0.0" in docstring
+    assert "Retained only for backward compatibility with vl-convert 1.x" in docstring
+    assert "The only non-None value accepted is 1.0" in normalized_docstring
 
 
 @pytest.mark.skipif(sys.platform.startswith("win"), reason="Font mismatch on windows")

{vl_convert_python-2.0.0rc5 → vl_convert_python-2.0.0rc6}/vl-convert-python/vl_convert.pyi

@@ -637,7 +637,7 @@ def svg_to_jpeg(
     """
     ...
 
-def svg_to_pdf(svg: str) -> bytes:
+def svg_to_pdf(svg: str, *, scale: float | None = None) -> bytes:
     """
     Convert an SVG image string to PDF document data.
 
@@ -645,6 +645,11 @@ def svg_to_pdf(svg: str) -> bytes:
     ----------
     svg
         SVG image string
+    scale
+        .. deprecated:: 2.0.0
+           Retained only for backward compatibility with vl-convert 1.x.
+           The parameter has no effect on PDF output. The only non-None value
+           accepted is 1.0. Any other numeric value raises ``ValueError``.
 
     Returns
     -------
@@ -775,6 +780,7 @@ def vega_to_jpeg(
 def vega_to_pdf(
     vg_spec: VlSpec,
     *,
+    scale: float | None = None,
     format_locale: FormatLocale | None = None,
     time_format_locale: TimeFormatLocale | None = None,
     vega_plugin: str | None = None,
@@ -791,6 +797,11 @@ def vega_to_pdf(
     ----------
     vg_spec
         Vega JSON specification string or dict
+    scale
+        .. deprecated:: 2.0.0
+           Retained only for backward compatibility with vl-convert 1.x.
+           The parameter has no effect on PDF output. The only non-None value
+           accepted is 1.0. Any other numeric value raises ``ValueError``.
     format_locale
         d3-format locale name or dictionary
     time_format_locale
@@ -1173,6 +1184,7 @@ def vegalite_to_pdf(
     vl_spec: VlSpec,
     *,
     vl_version: str | None = None,
+    scale: float | None = None,
     config: dict[str, Any] | None = None,
     theme: VegaThemes | None = None,
     format_locale: FormatLocale | None = None,
@@ -1193,6 +1205,11 @@ def vegalite_to_pdf(
     vl_version
         Vega-Lite library version string (e.g. 'v5.15')
         (default to latest)
+    scale
+        .. deprecated:: 2.0.0
+           Retained only for backward compatibility with vl-convert 1.x.
+           The parameter has no effect on PDF output. The only non-None value
+           accepted is 1.0. Any other numeric value raises ``ValueError``.
     config
         Chart configuration object to apply during conversion
     theme
@@ -1558,7 +1575,7 @@ if TYPE_CHECKING:
         ) -> bytes:
             """Async version of ``svg_to_jpeg``. See sync function for full documentation."""
             ...
-        async def svg_to_pdf(self, svg: str) -> bytes:
+        async def svg_to_pdf(self, svg: str, *, scale: float | None = None) -> bytes:
             """Async version of ``svg_to_pdf``. See sync function for full documentation."""
             ...
         async def svg_to_png(
@@ -1604,6 +1621,7 @@ if TYPE_CHECKING:
             self,
             vg_spec: VlSpec,
             *,
+            scale: float | None = None,
             format_locale: FormatLocale | None = None,
             time_format_locale: TimeFormatLocale | None = None,
             vega_plugin: str | None = None,
@@ -1738,6 +1756,7 @@ if TYPE_CHECKING:
             vl_spec: VlSpec,
             *,
             vl_version: str | None = None,
+            scale: float | None = None,
             config: dict[str, Any] | None = None,
             theme: VegaThemes | None = None,
             format_locale: FormatLocale | None = None,

{vl_convert_python-2.0.0rc5 → vl_convert_python-2.0.0rc6}/vl-convert-rs/src/converter/fonts.rs

@@ -135,6 +135,7 @@ pub(crate) fn google_font_request_key(request: &GoogleFontRequest) -> String {
 /// `fontdb` are requested.
 pub(crate) async fn classify_and_request_fonts(
     font_strings: HashSet<String>,
+    explicit_google_families: &HashSet<String>,
     auto_google_fonts: bool,
     missing_fonts: MissingFontsPolicy,
     prefer_cdn: bool,
@@ -143,13 +144,14 @@ pub(crate) async fn classify_and_request_fonts(
         return Ok(FontRequestAnalysis::default());
     }
 
-    let available = available_font_families()?;
+    let mut available = available_font_families()?;
 
     let font_string_vec: Vec<String> = font_strings.into_iter().collect();
 
     let mut google_fonts = GoogleFontUsage::default();
     let google_fonts_set: HashSet<String> = if auto_google_fonts {
-        let candidates = auto_google_probe_candidates(&font_string_vec, &available, prefer_cdn);
+        let mut candidates = auto_google_probe_candidates(&font_string_vec, &available, prefer_cdn);
+        candidates.retain(|family| !is_available(family, explicit_google_families));
         let catalog = google_font_catalog_matches(candidates.iter(), missing_fonts).await?;
         google_fonts.add_assign(&catalog.google_fonts);
         catalog.matches
@@ -157,6 +159,11 @@ pub(crate) async fn classify_and_request_fonts(
         HashSet::new()
     };
 
+    // Configured and per-call Google Fonts are resolved by the render overlay.
+    // Treat them as available during preflight so strict missing-font handling
+    // reports only families that no configured operation will provide.
+    available.extend(explicit_google_families.iter().cloned());
+
     // Classify each font string by its first entry
     let statuses = resolve_first_fonts(&font_string_vec, &available, |family| {
         auto_google_fonts && google_fonts_set.contains(family)
@@ -221,6 +228,7 @@ pub(crate) async fn classify_and_request_fonts(
 /// fonts via [`classify_and_request_fonts`].
 pub(crate) async fn preprocess_fonts(
     vega_spec: &serde_json::Value,
+    explicit_google_families: &HashSet<String>,
     auto_google_fonts: bool,
     missing_fonts: MissingFontsPolicy,
 ) -> Result<FontRequestAnalysis, AnyError> {
@@ -229,7 +237,14 @@ pub(crate) async fn preprocess_fonts(
     }
 
     let font_strings = extract_fonts_from_vega(vega_spec);
-    classify_and_request_fonts(font_strings, auto_google_fonts, missing_fonts, false).await
+    classify_and_request_fonts(
+        font_strings,
+        explicit_google_families,
+        auto_google_fonts,
+        missing_fonts,
+        false,
+    )
+    .await
 }
 
 /// Return all font family names currently available in fontdb.
@@ -271,14 +286,14 @@ pub(crate) fn auto_google_probe_candidates(
 
 /// Collect font family names from the rendered scenegraph that should be
 /// probed against Google Fonts. Excludes families already identified as
-/// explicit per-call Google Font requests.
+/// configured or per-call Google Font requests.
 pub(crate) fn scenegraph_google_probe_candidates(
     families: &BTreeSet<String>,
     explicit_google_families: &HashSet<String>,
 ) -> BTreeSet<String> {
     families
         .iter()
-        .filter(|family| !explicit_google_families.contains(*family))
+        .filter(|family| !is_available(family, explicit_google_families))
         .cloned()
         .collect()
 }
@@ -405,9 +420,9 @@ pub(crate) fn classify_as_google_font(family: &str) -> Option<ClassifiedFont> {
 /// Classify font families extracted from the scenegraph into Google Fonts
 /// or Local sources.
 ///
-/// `explicit_google_families` are families provided by per-call
-/// `GoogleFontRequest` entries -- they are classified as Google immediately
-/// without catalog probing and are excluded from missing-font reporting.
+/// `explicit_google_families` are families provided by configured or per-call
+/// `GoogleFontRequest` entries. They are classified as Google immediately,
+/// without catalog probing, and are excluded from missing-font reporting.
 ///
 /// Fonts that exist in the Google Fonts catalog are sourced from Google for
 /// portability (CDN links work on any machine). Remaining fonts are classified
@@ -444,8 +459,8 @@ pub(crate) async fn classify_scenegraph_fonts(
     let mut classified_fonts: Vec<ClassifiedFont> = Vec::new();
     let mut unavailable: Vec<String> = Vec::new();
     for family in families {
-        // Explicit per-call requests win immediately
-        if explicit_google_families.contains(family) {
+        // Explicit configured or per-call requests win immediately.
+        if is_available(family, explicit_google_families) {
             if let Some(font) = classify_as_google_font(family) {
                 classified_fonts.push(font);
             }
@@ -511,7 +526,7 @@ mod tests {
             "Bravo".to_string(),
             "Charlie".to_string(),
         ]);
-        let explicit = HashSet::from(["Bravo".to_string()]);
+        let explicit = HashSet::from(["bravo".to_string()]);
 
         let candidates = scenegraph_google_probe_candidates(&families, &explicit);
 
@@ -521,6 +536,24 @@ mod tests {
         );
     }
 
+    #[tokio::test]
+    async fn test_explicit_google_font_satisfies_strict_preflight() {
+        let font_strings = HashSet::from(["VLC Explicit Test Font".to_string()]);
+        let explicit = HashSet::from(["vlc explicit test font".to_string()]);
+
+        let result = classify_and_request_fonts(
+            font_strings,
+            &explicit,
+            false,
+            MissingFontsPolicy::Error,
+            false,
+        )
+        .await
+        .unwrap();
+
+        assert!(result.requests.is_empty());
+    }
+
     #[tokio::test]
     async fn test_classify_scenegraph_fonts_uses_case_insensitive_local_match() {
         let available = available_font_families().unwrap();