Skip to content

Commit d3dab06

Browse files
author
cranko
committed
Release request commit created with Cranko.
+++ cranko-rc-info-v1 [[projects]] qnames = ["tectonic_xdv", "cargo"] bump_spec = "minor bump" [[projects]] qnames = ["tectonic_xetex_format", "cargo"] bump_spec = "force 0.1.0" [[projects]] qnames = ["tectonic_io_base", "cargo"] bump_spec = "minor bump" [[projects]] qnames = ["tectonic_geturl", "cargo"] bump_spec = "micro bump" [[projects]] qnames = ["tectonic_docmodel", "cargo"] bump_spec = "micro bump" [[projects]] qnames = ["tectonic_cfg_support", "cargo"] bump_spec = "micro bump" [[projects]] qnames = ["tectonic_bridge_harfbuzz", "cargo"] bump_spec = "micro bump" +++
2 parents 997278c + 09bfedc commit d3dab06

80 files changed

Lines changed: 11546 additions & 3895 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 6 additions & 1041 deletions
Large diffs are not rendered by default.

Cargo.lock

Lines changed: 614 additions & 365 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ members = [
3737
"crates/dep_support",
3838
"crates/docmodel",
3939
"crates/engine_bibtex",
40+
"crates/engine_spx2html",
4041
"crates/engine_xdvipdfmx",
4142
"crates/engine_xetex",
4243
"crates/errors",
@@ -45,6 +46,7 @@ members = [
4546
"crates/pdf_io",
4647
"crates/status_base",
4748
"crates/xdv",
49+
"crates/xetex_format",
4850
"crates/xetex_layout",
4951
]
5052

@@ -71,6 +73,7 @@ tectonic_bridge_core = { path = "crates/bridge_core", version = "0.0.0-dev.0" }
7173
tectonic_bundles = { path = "crates/bundles", version = "0.0.0-dev.0", default-features = false }
7274
tectonic_docmodel = { path = "crates/docmodel", version = "0.0.0-dev.0", optional = true }
7375
tectonic_engine_bibtex = { path = "crates/engine_bibtex", version = "0.0.0-dev.0" }
76+
tectonic_engine_spx2html = { path = "crates/engine_spx2html", version = "0.0.0-dev.0" }
7477
tectonic_engine_xdvipdfmx = { path = "crates/engine_xdvipdfmx", version = "0.0.0-dev.0" }
7578
tectonic_engine_xetex = { path = "crates/engine_xetex", version = "0.0.0-dev.0" }
7679
tectonic_errors = { path = "crates/errors", version = "0.0.0-dev.0" }
@@ -86,6 +89,9 @@ url = "^2.0"
8689
watchexec = "^1.15.3"
8790
zip = { version = "^0.5", default-features = false, features = ["deflate"] }
8891

92+
[patch.crates-io]
93+
pinot = { git = 'https://github.com/tectonic-typesetting/pinot', branch = 'basic-math' }
94+
8995
[features]
9096
default = ["geturl-reqwest", "serialization"]
9197

@@ -134,10 +140,11 @@ tectonic_bridge_icu = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
134140
tectonic_bundles = "207e6e796b1827330ee03a4c395fe6db059bddd9"
135141
tectonic_cfg_support = "thiscommit:aeRoo7oa"
136142
tectonic_dep_support = "5faf4205bdd3d31101b749fc32857dd746f9e5bc"
137-
tectonic_docmodel = "cd77b60d48b1ae3ef80d708e6858ea91cd9fa812"
143+
tectonic_docmodel = "thiscommit:2022-02-20:2SpEl4c"
138144
tectonic_engine_bibtex = "thiscommit:2021-01-17:KuhaeG1e"
145+
tectonic_engine_spx2html = "thiscommit:2021-10-29:96yOlD8"
139146
tectonic_engine_xdvipdfmx = "7dcbc52e58f9774b3d592919a9105377faeac509"
140-
tectonic_engine_xetex = "b7a4085fa67c831d4532da6661bddafd1f9c24ff"
147+
tectonic_engine_xetex = "thiscommit:2022-02-20:J4dXT3x"
141148
tectonic_errors = "317ae79ceaa2593fb56090e37bf1f5cc24213dd9"
142149
tectonic_geturl = "68c5fc525c5fead75913bd90380043761bde9f61"
143150
tectonic_io_base = "thiscommit:2021-06-13:XFjtSsZ"
Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,45 @@
1-
# See elsewhere for changelog
1+
# rc: micro bump
22

3-
This project’s release notes are curated from the Git history of its main
4-
branch. You can find them by looking at [the version of this file on the
5-
`release` branch][branch] or the [GitHub release history][gh-releases].
3+
- Update the vendored Harfbuzz to 3.0.0.
64

7-
[branch]: https://github.com/tectonic-typesetting/tectonic/blob/release/crates/bridge_harfbuzz/CHANGELOG.md
8-
[gh-releases]: https://github.com/tectonic-typesetting/tectonic/releases
5+
6+
# tectonic_bridge_harfbuzz 0.2.3 (2021-10-11)
7+
8+
- Update the vendored Harfbuzz source to
9+
- Fixes for Clippy 1.53.0
10+
11+
12+
# tectonic_bridge_harfbuzz 0.2.2 (2021-06-07)
13+
14+
- Still no code changes
15+
- 0.2.1 didn't publish to Crates.io because our package file was too big for it;
16+
we've eliminated some of the Harfbuzz support files that should fix this
17+
([#781], [@pkgw])
18+
19+
[#781]: https://github.com/tectonic-typesetting/tectonic/pull/781
20+
[@pkgw]: https://github.com/pkgw
21+
22+
23+
# tectonic_bridge_harfbuzz 0.2.1 (2021-06-07)
24+
25+
- No code changes
26+
- The 0.2.0 package didn't actually contain the vendored Harfbuzz source files,
27+
breaking `cargo` builds. We’ve modified the CI scripts to attempt to fix this
28+
([#777], [@pkgw])
29+
30+
[#777]: https://github.com/tectonic-typesetting/tectonic/pull/777
31+
[@pkgw]: https://github.com/pkgw
32+
33+
34+
# tectonic_bridge_harfbuzz 0.2.0 (2021-06-03)
35+
36+
- Update the vendored Harfbuzz to 2.8.1.
37+
- Fix up handling of how C/C++ header file paths are exported to dependent
38+
crates. This is a breaking change: we've moved from a single include directory
39+
to a list of them.
40+
41+
42+
# tectonic_bridge_harfbuzz 0.1.0 (2021-01-15)
43+
44+
Initial release of Harfbuzz "bridge" crate for Tectonic. Includes the ability to
45+
vendor Harfbuzz.

crates/bridge_harfbuzz/harfbuzz

Submodule harfbuzz updated 72 files

crates/cfg_support/CHANGELOG.md

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,25 @@
1-
# See elsewhere for changelog
1+
# rc: micro bump
22

3-
This project’s release notes are curated from the Git history of its main
4-
branch. You can find them by looking at [the version of this file on the
5-
`release` branch][branch] or the [GitHub release history][gh-releases].
3+
- Fix trailing semicolons in macro expressions
64

7-
[branch]: https://github.com/tectonic-typesetting/tectonic/blob/release/crates/cfg_support/CHANGELOG.md
8-
[gh-releases]: https://github.com/tectonic-typesetting/tectonic/releases
5+
# tectonic_cfg_support 0.1.3 (2021-06-03)
6+
7+
- No code changes, just issuing a new release to make Cranko happy.
8+
9+
# tectonic_cfg_support 0.1.2 (2021-01-16)
10+
11+
- No code changes, just updating metadata
12+
13+
# tectonic_cfg_support 0.1.1 (2020-10-21)
14+
15+
- No code changes; just issuing a new release to update deps and silence
16+
Cranko's change detection.
17+
18+
# tectonic_cfg_support 0.1.0 (2020-09-07)
19+
20+
- No code changes; new release to exercise Cranko release workflow and mollify
21+
Cargo versioning
22+
23+
# tectonic_cfg_support 0.0.3 (2020-09-07)
24+
25+
- No code changes; testing new Cranko-powered release workflow.

crates/cfg_support/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ macro_rules! target_cfg {
223223
{$($current)+}
224224
] [
225225
$($rest)*
226-
]);
226+
])
227227
};
228228

229229
// This rule comes next. It fires when the next un-parsed token is *not* a
@@ -242,7 +242,7 @@ macro_rules! target_cfg {
242242
)*
243243
] [
244244
$($rest)*
245-
] $($current)* $tok);
245+
] $($current)* $tok)
246246
};
247247

248248
// This rule fires when there are no more tokens to parse in this list. We
@@ -260,7 +260,7 @@ macro_rules! target_cfg {
260260
{$($grouped)+}
261261
)*
262262
{$($current)+}
263-
);
263+
)
264264
};
265265

266266
// Finally, these are the "toplevel" syntaxes for specific tests that can

crates/docmodel/CHANGELOG.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1-
# See elsewhere for changelog
1+
# rc: micro bump
22

3-
This project’s release notes are curated from the Git history of its main
4-
branch. You can find them by looking at [the version of this file on the
5-
`release` branch][branch] or the [GitHub release history][gh-releases].
3+
- Define HTML options for build output (#865, @pkgw)
4+
- Fixes for newer versions of Clippy
65

7-
[branch]: https://github.com/tectonic-typesetting/tectonic/blob/release/crates/docmodel/CHANGELOG.md
8-
[gh-releases]: https://github.com/tectonic-typesetting/tectonic/releases
6+
7+
# tectonic_docmodel 0.1.1 (2021-10-11)
8+
9+
- Fix the error message given when a "V2" command is run outside of a Tectonic
10+
document workspace (#813, @ralismark)
11+
- Fixes for Clippy >=1.53.0 (@pkgw)
12+
13+
14+
# tectonic_docmodel 0.1.0 (2021-06-15)
15+
16+
This crate isolates the file formats used by the Tectonic “document model”,
17+
primarily `Tectonic.toml`. This makes it possible to interact with these data
18+
formats without needing to link in with the full Tectonic dependency stack.

crates/docmodel/src/document.rs

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ impl Document {
117117
let outputs = self
118118
.outputs
119119
.values()
120-
.map(|r| syntax::OutputProfile::from_runtime(r))
120+
.map(syntax::OutputProfile::from_runtime)
121121
.collect();
122122

123123
let doc = syntax::Document {
@@ -178,10 +178,18 @@ impl Document {
178178

179179
let mut p = self.build_dir.clone();
180180
p.push(&profile.name);
181-
p.push(&profile.name);
182-
p.set_extension(match profile.target_type {
183-
BuildTargetType::Pdf => "pdf",
184-
});
181+
182+
match profile.target_type {
183+
BuildTargetType::Pdf => {
184+
p.push(&profile.name);
185+
p.set_extension("pdf");
186+
}
187+
188+
BuildTargetType::Html => {
189+
p.push("index.html");
190+
}
191+
}
192+
185193
p
186194
}
187195
}
@@ -218,6 +226,9 @@ pub struct OutputProfile {
218226
/// The output target type of a document build.
219227
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
220228
pub enum BuildTargetType {
229+
/// Output a tree of HTML files
230+
Html,
231+
221232
/// Output to the Portable Document Format (PDF).
222233
Pdf,
223234
}
@@ -394,18 +405,21 @@ mod syntax {
394405

395406
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
396407
pub enum BuildTargetType {
408+
Html,
397409
Pdf,
398410
}
399411

400412
impl BuildTargetType {
401413
pub fn from_runtime(rt: &super::BuildTargetType) -> Self {
402414
match rt {
415+
super::BuildTargetType::Html => BuildTargetType::Html,
403416
super::BuildTargetType::Pdf => BuildTargetType::Pdf,
404417
}
405418
}
406419

407420
pub fn to_runtime(self) -> super::BuildTargetType {
408421
match self {
422+
BuildTargetType::Html => super::BuildTargetType::Html,
409423
BuildTargetType::Pdf => super::BuildTargetType::Pdf,
410424
}
411425
}
@@ -417,6 +431,7 @@ mod syntax {
417431
S: Serializer,
418432
{
419433
serializer.serialize_str(match *self {
434+
BuildTargetType::Html => "html",
420435
BuildTargetType::Pdf => "pdf",
421436
})
422437
}
@@ -428,8 +443,14 @@ mod syntax {
428443
{
429444
let s = String::deserialize(deserializer)?;
430445
Ok(match s.as_str() {
446+
"html" => BuildTargetType::Html,
431447
"pdf" => BuildTargetType::Pdf,
432-
other => return Err(<D as Deserializer>::Error::unknown_variant(other, &["pdf"])),
448+
other => {
449+
return Err(<D as Deserializer>::Error::unknown_variant(
450+
other,
451+
&["html", "pdf"],
452+
))
453+
}
433454
})
434455
}
435456
}

crates/docmodel/src/workspace.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ use crate::document::Document;
2929
#[derive(Debug)]
3030
pub struct Workspace {
3131
/// The root directory of the workspace.
32+
#[allow(dead_code)] // We expect to use this eventually.
3233
root_dir: PathBuf,
3334

3435
/// This workspace's document. In the future, there might be more than one.

0 commit comments

Comments
 (0)