Merge pull request #29 from tectonic-typesetting/api-struct

Switch to a callback-API approach

Author: pkgw

build.rs

@@ -154,6 +154,7 @@ fn main() {
     let mut cppcfg = gcc::Config::new();
 
     ccfg.file("tectonic/bibtex.c")
+        .file("tectonic/core-bridge.c")
         .file("tectonic/dpx-agl.c")
         .file("tectonic/dpx-bmpimage.c")
         .file("tectonic/dpx-cff.c")

src/engines/bibtex.rs

@@ -7,7 +7,7 @@ use std::ffi::{CStr, CString};
 use errors::{ErrorKind, Result};
 use io::IoStack;
 use status::StatusBackend;
-use super::{assign_global_state, c_api, IoEventBackend, ExecutionState};
+use super::{IoEventBackend, ExecutionState, TectonicBridgeApi};
 use super::tex::TexResult;
 
 
@@ -25,25 +25,24 @@ impl BibtexEngine {
                     status: &mut StatusBackend, aux: &str) -> Result<TexResult> {
         let caux = CString::new(aux)?;
 
-        let mut state = ExecutionState::new(io, events, status);
+        let /*mut*/ state = ExecutionState::new(io, events, status);
+        let bridge = TectonicBridgeApi::new(&state);
 
         unsafe {
-            assign_global_state (&mut state, || {
-                match c_api::bibtex_simple_main(caux.as_ptr()) {
-                    0 => Ok(TexResult::Spotless),
-                    1 => Ok(TexResult::Warnings),
-                    2 => Ok(TexResult::Errors),
-                    3 => {
-                        Err(ErrorKind::Msg("unspecified fatal bibtex error".into()).into())
-                    },
-                    99 => {
-                        let ptr = c_api::tt_get_error_message();
-                        let msg = CStr::from_ptr(ptr).to_string_lossy().into_owned();
-                        Err(ErrorKind::Msg(msg).into())
-                    },
-                    x => Err(ErrorKind::Msg(format!("internal error: unexpected 'history' value {}", x)).into())
-                }
-            })
+            match super::bibtex_simple_main(&bridge, caux.as_ptr()) {
+                0 => Ok(TexResult::Spotless),
+                1 => Ok(TexResult::Warnings),
+                2 => Ok(TexResult::Errors),
+                3 => {
+                    Err(ErrorKind::Msg("unspecified fatal bibtex error".into()).into())
+                },
+                99 => {
+                    let ptr = super::tt_get_error_message();
+                    let msg = CStr::from_ptr(ptr).to_string_lossy().into_owned();
+                    Err(ErrorKind::Msg(msg).into())
+                },
+                x => Err(ErrorKind::Msg(format!("internal error: unexpected 'history' value {}", x)).into())
+            }
         }
     }
 }