Merge pull request #1016 from pkgw/pedia-features

New spx2html features for Tectonopedia

Author: pkgw

Cargo.lock

@@ -143,7 +143,7 @@ tectonic_cfg_support = "thiscommit:aeRoo7oa"
 tectonic_dep_support = "5faf4205bdd3d31101b749fc32857dd746f9e5bc"
 tectonic_docmodel = "a88a0418a9c3c559d023d9b1da9b03fce3a469e5"
 tectonic_engine_bibtex = "thiscommit:2021-01-17:KuhaeG1e"
-tectonic_engine_spx2html = "thiscommit:2022-03-02:IQWAncv"
+tectonic_engine_spx2html = "thiscommit:2022-11-22:vicemXu"
 tectonic_engine_xdvipdfmx = "8a003834b1f6d967d33cc07de4cc025af14560da"
 tectonic_engine_xetex = "c135e6a4a5a2e8c2dc4edcbcfd93f7d466ff8f88"
 tectonic_errors = "317ae79ceaa2593fb56090e37bf1f5cc24213dd9"

Cargo.toml

@@ -714,11 +714,12 @@ pub struct SecuritySettings {
 
 /// Different high-level security stances that can be adopted when creating
 /// [`SecuritySettings`].
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub enum SecurityStance {
     /// Ensure that all known-insecure features are disabled.
     ///
     /// Use this stance if you are processing untrusted input.
+    #[default]
     DisableInsecures,
 
     /// Request to allow the use of known-insecure features.
@@ -730,13 +731,6 @@ pub enum SecurityStance {
     MaybeAllowInsecures,
 }
 
-impl Default for SecurityStance {
-    fn default() -> Self {
-        // Obvi, the default is secure!!!
-        SecurityStance::DisableInsecures
-    }
-}
-
 impl SecuritySettings {
     /// Create a new security configuration.
     ///

crates/bridge_core/src/lib.rs

@@ -14,21 +14,16 @@ use std::{
 };
 
 /// Supported depedency-finding backends.
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
 pub enum Backend {
     /// pkg-config
+    #[default]
     PkgConfig,
 
     /// vcpkg
     Vcpkg,
 }
 
-impl Default for Backend {
-    fn default() -> Self {
-        Backend::PkgConfig
-    }
-}
-
 /// Dep-finding configuration.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Configuration {

crates/dep_support/src/lib.rs

@@ -22,13 +22,15 @@ byteorder = "^1.4"
 html-escape = "^0.2"
 percent-encoding = "^2.1"
 pinot = "^0.1.4"
+serde = { version = "^1.0", features = ["derive"] }
 tectonic_bridge_core = { path = "../bridge_core", version = "0.0.0-dev.0" }
 tectonic_errors = { path = "../errors", version = "0.0.0-dev.0" }
 tectonic_io_base = { path = "../io_base", version = "0.0.0-dev.0" }
 tectonic_status_base = { path = "../status_base", version = "0.0.0-dev.0" }
 tectonic_xdv = { path = "../xdv", version = "0.0.0-dev.0" }
 tempfile = "^3.1"
 tera = "^1.13"
+serde_json = "^1.0"
 
 [package.metadata.internal_dep_versions]
 tectonic_bridge_core = "4e16bf963700aae59772a6fb223981ceaa9b5f57"