From e31a7fd33b76cd1337cd5b3b5e9284c6c8867040 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Mon, 24 Jun 2024 00:42:56 +0200 Subject: [PATCH] More bugfixes --- src/makepdf.rs | 2 +- src/makepdf_structs.rs | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/makepdf.rs b/src/makepdf.rs index edd9529..39f9a98 100644 --- a/src/makepdf.rs +++ b/src/makepdf.rs @@ -207,7 +207,7 @@ fn checkline( a } LineType::MissingReferencePrs => &LineType::MissingReference(orginal_line.to_string()), - // LineType::Warning(_) => todo!(), + LineType::WarningPrs => &LineType::Warning(orginal_line.to_string()), LineType::PdfTexVersion(_) => &LineType::PdfTexVersion(orginal_line.to_string()), // LineType::Context(_) => todo!(), LineType::BoxFullnessPrs => &LineType::BoxFullness(orginal_line.to_string()), diff --git a/src/makepdf_structs.rs b/src/makepdf_structs.rs index 43713cf..72bac4b 100644 --- a/src/makepdf_structs.rs +++ b/src/makepdf_structs.rs @@ -168,6 +168,10 @@ impl BuildInfo { .push(started.elapsed().checked_sub(*a).unwrap()); } } +// [7] [8] +// [UKNW] LaTeX Warning: There were undefined references. +// [UKNW] (./Ravenous_build.gls [29] [30] (/usr/share/texmf/tex/latex/lm/ot1lmr.fd) (/usr/share/texmf/tex/latex/lm/omllmm.fd) (/usr/share/texmf/tex/latex/lm/omslmsy.fd) (/usr/share/texmf/tex/latex/lm/omxlmex.fd) (/usr/share/texlive/texmf-dist/tex/latex/amsfonts/umsa.fd) (/usr/share/texlive/texmf-dist/tex/latex/microtype/mt-msa.cfg) (/usr/share/texlive/texmf-dist/tex/latex/amsfonts/umsb.fd) (/usr/share/texlive/texmf-dist/tex/latex/microtype/mt-msb.cfg) [31] [32] +// [UKNW] LaTeX Warning: There were undefined references. /// The line encountered // #[allow(unused)] @@ -210,8 +214,10 @@ pub(crate) enum LineType { MissingReference(String), /// Generic Latex Warning - // TODO: Just use a Prs like the others - #[regex(r"(LaTex |Warning:)+[^\n]+", |lex| lex.slice()[14..].to_string())] + #[regex("LaTeX Warning:")] + WarningPrs, + + /// Reparsed Warning Warning(String), // /// Runaway argument @@ -224,6 +230,7 @@ pub(crate) enum LineType { /// Context, mosty for boxes // TODO: False positives / Reparsing Context("10") )) [107] (./Ecoles/Protecteur.tex // TODO: uncaught: [UKNW] [3] [4] (./Chapters/Intro.tex (/usr/share/texmf/tex/latex/lm/ot1lmr.fd) (/usr/share/texmf/tex/latex/lm/omllmm.fd) (/usr/share/texmf/tex/latex/lm/omslmsy.fd) (/usr/share/texmf/tex/latex/lm/omxlmex.fd) (/usr/share/texlive/texmf-dist/tex/latex/amsfonts/umsa.fd) (/usr/share/texlive/texmf-dist/tex/latex/microtype/mt-msa.cfg) (/usr/share/texlive/texmf-dist/tex/latex/amsfonts/umsb.fd) (/usr/share/texlive/texmf-dist/tex/latex/microtype/mt-msb.cfg) (/usr/share/texmf/tex/latex/lm/ts1lmr.fd)) [5 <./Images//Ico/LogoNoush.jpg>] [6] + #[regex(r"\[\d+\]", |lex| lex.slice()[1..lex.slice().len()-1].to_string())] #[regex(r"\[\d[^\]]+", |lex| lex.slice()[1..lex.slice().len()-1].to_string())] Context(String), @@ -254,7 +261,7 @@ pub(crate) enum LineType { // #[regex(r"[\) ]*\(\./[A-z/]+\.tex", |lex| lex.slice().split("(").nth(1).unwrap_or("").to_string())] // #[regex(r"[\) ]*(\[[0-9]+\] )?\(\./[A-z/-_]+\.tex", |lex| lex.slice().split("(").nth(1).unwrap_or("").to_string())] // #[regex(r"[\) 0-9\[\]]*\(\./[A-z/-_]+\.tex", |lex| lex.slice().split("(").nth(1).unwrap_or("").to_string())] - #[regex(r"\(\./[A-z/_-]+\.tex", |lex| lex.slice().split("(").nth(1).unwrap_or("").to_string())] + #[regex(r"\(\./[A-z/_-]+\.(gls|tex)", |lex| lex.slice().split("(").nth(1).unwrap_or("").to_string())] EnteringDocument(String), /// Info on the loading of a library @@ -326,7 +333,6 @@ impl LineType { LineType::EndSequence => VerboseLevel::Misc, LineType::MPSConverter => VerboseLevel::Misc, LineType::Chapter(_) => VerboseLevel::Context, - LineType::Warning(_) => VerboseLevel::Warning, LineType::MissingReference(_) => VerboseLevel::Warning, LineType::PdfTexVersion(_) => VerboseLevel::Misc, LineType::Context(_) => VerboseLevel::Misc, @@ -348,6 +354,8 @@ impl LineType { LineType::PackageWarning(_) => VerboseLevel::Warning, LineType::LowPackageWarning(_) => VerboseLevel::Box, LineType::BoxFullness(_) => VerboseLevel::Box, + LineType::Warning(_) => VerboseLevel::Warning, + LineType::WarningPrs => VerboseLevel::Critical, LineType::MissingReferencePrs => VerboseLevel::Critical, LineType::BoxFullnessPrs => VerboseLevel::Critical, LineType::PackageWarningPrs(_) => VerboseLevel::Critical,