funkpower/catena
1
0
Fork 0
mirror of https://git.pumpin.online/funkpower/catena.git synced 2026-10-23 11:17:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

0.2.1 — the holder goes between the symbol and the year

Browse Source 
'(c) Alfredo Ferrarin 2004' was read as a title. The notice pattern
wanted the year to follow the symbol directly, and a copyright line puts
the holder's name in between, which is the ordinary way to set one.
This commit is contained in:
funkpower
2026-09-21 11:19:54 -04:00
parent 3b1fbb73ce
commit 9227b31343
3 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+26 -26
View File
@@ -101,7 +101,7 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
[[package]] [[package]]
name = "avplan" name = "avplan"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -126,7 +126,7 @@ checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
[[package]] [[package]]
name = "bibclean" name = "bibclean"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -143,7 +143,7 @@ dependencies = [
[[package]] [[package]]
name = "bibfetch" name = "bibfetch"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -196,7 +196,7 @@ dependencies = [
[[package]] [[package]]
name = "bookmeta" name = "bookmeta"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -210,7 +210,7 @@ dependencies = [
[[package]] [[package]]
name = "booksniff" name = "booksniff"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -250,7 +250,7 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
[[package]] [[package]]
name = "catena" name = "catena"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"bibclean", "bibclean",
"bibfetch", "bibfetch",
@@ -277,7 +277,7 @@ dependencies = [
[[package]] [[package]]
name = "catena-cli" name = "catena-cli"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"clap", "clap",
"clap_mangen", "clap_mangen",
@@ -312,7 +312,7 @@ checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600"
[[package]] [[package]]
name = "chunkmd" name = "chunkmd"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -334,7 +334,7 @@ dependencies = [
[[package]] [[package]]
name = "citefind" name = "citefind"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"chunkmd", "chunkmd",
@@ -399,7 +399,7 @@ dependencies = [
[[package]] [[package]]
name = "colophon" name = "colophon"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"bibclean", "bibclean",
"catena-cli", "catena-cli",
@@ -448,7 +448,7 @@ dependencies = [
[[package]] [[package]]
name = "corpus-core" name = "corpus-core"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"schemars", "schemars",
"serde", "serde",
@@ -492,7 +492,7 @@ dependencies = [
[[package]] [[package]]
name = "cuekit" name = "cuekit"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"corpus-core", "corpus-core",
"regex", "regex",
@@ -504,7 +504,7 @@ dependencies = [
[[package]] [[package]]
name = "cuenorm" name = "cuenorm"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -514,7 +514,7 @@ dependencies = [
[[package]] [[package]]
name = "cuepack" name = "cuepack"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -525,7 +525,7 @@ dependencies = [
[[package]] [[package]]
name = "cueseg" name = "cueseg"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -612,7 +612,7 @@ dependencies = [
[[package]] [[package]]
name = "emb" name = "emb"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -876,7 +876,7 @@ dependencies = [
[[package]] [[package]]
name = "idnorm" name = "idnorm"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"bibclean", "bibclean",
"catena-cli", "catena-cli",
@@ -942,7 +942,7 @@ dependencies = [
[[package]] [[package]]
name = "langid" name = "langid"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -1022,7 +1022,7 @@ dependencies = [
[[package]] [[package]]
name = "mdscrub" name = "mdscrub"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -1034,7 +1034,7 @@ dependencies = [
[[package]] [[package]]
name = "mdsplit" name = "mdsplit"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -1113,7 +1113,7 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
[[package]] [[package]]
name = "pdfgutter" name = "pdfgutter"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -1126,7 +1126,7 @@ dependencies = [
[[package]] [[package]]
name = "pdftriage" name = "pdftriage"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -1370,7 +1370,7 @@ checksum = "323c417e1d9665a65b263ec744ba09030cfb277e9daa0b018a4ab62e57bc8189"
[[package]] [[package]]
name = "rrf" name = "rrf"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -1517,7 +1517,7 @@ dependencies = [
[[package]] [[package]]
name = "seriesof" name = "seriesof"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
@@ -1634,7 +1634,7 @@ checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
[[package]] [[package]]
name = "textkit" name = "textkit"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"regex", "regex",
"tiktoken-rs", "tiktoken-rs",
@@ -1724,7 +1724,7 @@ checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee"
[[package]] [[package]]
name = "tocfind" name = "tocfind"
version = "0.2.0" version = "0.2.1"
dependencies = [ dependencies = [
"catena-cli", "catena-cli",
"clap", "clap",
Cargo.toml
+27 -27
View File
@@ -3,39 +3,39 @@ resolver = "3"
members = ["crates/*"] members = ["crates/*"]
[workspace.package] [workspace.package]
version = "0.2.0" version = "0.2.1"
edition = "2024" edition = "2024"
rust-version = "1.85" rust-version = "1.85"
license = "MPL-2.0" license = "MPL-2.0"
repository = "https://git.pumpin.online/funkpower/catena" repository = "https://git.pumpin.online/funkpower/catena"
[workspace.dependencies] [workspace.dependencies]
catena-cli = { path = "crates/catena-cli", version = "0.2.0" } catena-cli = { path = "crates/catena-cli", version = "0.2.1" }
corpus-core = { path = "crates/corpus-core", version = "0.2.0" } corpus-core = { path = "crates/corpus-core", version = "0.2.1" }
cuekit = { path = "crates/cuekit", version = "0.2.0" } cuekit = { path = "crates/cuekit", version = "0.2.1" }
textkit = { path = "crates/textkit", version = "0.2.0" } textkit = { path = "crates/textkit", version = "0.2.1" }
chunkmd = { path = "crates/chunkmd", version = "0.2.0" } chunkmd = { path = "crates/chunkmd", version = "0.2.1" }
mdscrub = { path = "crates/mdscrub", version = "0.2.0" } mdscrub = { path = "crates/mdscrub", version = "0.2.1" }
mdsplit = { path = "crates/mdsplit", version = "0.2.0" } mdsplit = { path = "crates/mdsplit", version = "0.2.1" }
pdftriage = { path = "crates/pdftriage", version = "0.2.0" } pdftriage = { path = "crates/pdftriage", version = "0.2.1" }
cuenorm = { path = "crates/cuenorm", version = "0.2.0" } cuenorm = { path = "crates/cuenorm", version = "0.2.1" }
cueseg = { path = "crates/cueseg", version = "0.2.0" } cueseg = { path = "crates/cueseg", version = "0.2.1" }
rrf = { path = "crates/rrf", version = "0.2.0" } rrf = { path = "crates/rrf", version = "0.2.1" }
cuepack = { path = "crates/cuepack", version = "0.2.0" } cuepack = { path = "crates/cuepack", version = "0.2.1" }
bibclean = { path = "crates/bibclean", version = "0.2.0" } bibclean = { path = "crates/bibclean", version = "0.2.1" }
avplan = { path = "crates/avplan", version = "0.2.0" } avplan = { path = "crates/avplan", version = "0.2.1" }
pdfgutter = { path = "crates/pdfgutter", version = "0.2.0" } pdfgutter = { path = "crates/pdfgutter", version = "0.2.1" }
catena = { path = "crates/bindings", version = "0.2.0" } catena = { path = "crates/bindings", version = "0.2.1" }
seriesof = { path = "crates/seriesof", version = "0.2.0" } seriesof = { path = "crates/seriesof", version = "0.2.1" }
idnorm = { path = "crates/idnorm", version = "0.2.0" } idnorm = { path = "crates/idnorm", version = "0.2.1" }
bibfetch = { path = "crates/bibfetch", version = "0.2.0" } bibfetch = { path = "crates/bibfetch", version = "0.2.1" }
bookmeta = { path = "crates/bookmeta", version = "0.2.0" } bookmeta = { path = "crates/bookmeta", version = "0.2.1" }
langid = { path = "crates/langid", version = "0.2.0" } langid = { path = "crates/langid", version = "0.2.1" }
tocfind = { path = "crates/tocfind", version = "0.2.0" } tocfind = { path = "crates/tocfind", version = "0.2.1" }
booksniff = { path = "crates/booksniff", version = "0.2.0" } booksniff = { path = "crates/booksniff", version = "0.2.1" }
citefind = { path = "crates/citefind", version = "0.2.0" } citefind = { path = "crates/citefind", version = "0.2.1" }
colophon = { path = "crates/colophon", version = "0.2.0" } colophon = { path = "crates/colophon", version = "0.2.1" }
emb = { path = "crates/emb", version = "0.2.0" } emb = { path = "crates/emb", version = "0.2.1" }
clap = { version = "4", features = ["derive"] } clap = { version = "4", features = ["derive"] }
clap_mangen = "0.3" clap_mangen = "0.3"
crates/colophon/src/title.rs
+5 -1
View File
@@ -36,7 +36,9 @@ static BARE_DATE: LazyLock<Regex> =
LazyLock::new(|| Regex::new(r"(?i)^\d{1,4}\s*(bc|ad|bce|ce)?\.?$").expect("a valid pattern")); LazyLock::new(|| Regex::new(r"(?i)^\d{1,4}\s*(bc|ad|bce|ce)?\.?$").expect("a valid pattern"));
/// `Copyright © 2013 by`, `\u{a9} 2013 Richard Swinburne`, `Copyright 1971 by`. /// `Copyright © 2013 by`, `\u{a9} 2013 Richard Swinburne`, `Copyright 1971 by`.
static COPYRIGHT_NOTICE: LazyLock<Regex> = LazyLock::new(|| { static COPYRIGHT_NOTICE: LazyLock<Regex> = LazyLock::new(|| {
Regex::new(r"(?i)(\u{a9}|\(c\)|copyright)\s*(\u{a9}|\(c\))?\s*(1[0-9]|20)\d{2}") // The year need not follow the symbol directly: "(c) Alfredo Ferrarin
// 2004" puts the holder between them, and was read as a title.
Regex::new(r"(?i)(\u{a9}|\(c\)|copyright)[^\n]{0,60}?(1[0-9]|20)\d{2}")
.expect("a valid pattern") .expect("a valid pattern")
}); });
/// `Edited by`, with whoever it was set on the line beneath. /// `Edited by`, with whoever it was set on the line beneath.
@@ -413,6 +415,8 @@ mod furniture_tests {
"12 INDEX", "12 INDEX",
"Translated from the French by Willard R. Trask", "Translated from the French by Willard R. Trask",
"Copyright © 2013 by Barry Davies, BEM", "Copyright © 2013 by Barry Davies, BEM",
"© Alfredo Ferrarin 2004",
"\u{a9} Cambridge University Press 2011",
"[PART ONE:", "[PART ONE:",
"Piper Verlag GmbH, Munich<span style=\"font-size\">", "Piper Verlag GmbH, Munich<span style=\"font-size\">",
"Vol. 11. HENRY JAMES, JR.", "Vol. 11. HENRY JAMES, JR.",