author | wenzelm |
Mon, 15 Nov 2021 11:38:14 +0100 | |
changeset 74789 | a5c23da73fca |
parent 74786 | 543f932f64b8 |
child 74790 | 3ce6fb9db485 |
permissions | -rw-r--r-- |
67172 | 1 |
/* Title: Pure/Thy/latex.scala |
2 |
Author: Makarius |
|
3 |
||
4 |
Support for LaTeX. |
|
5 |
*/ |
|
6 |
||
7 |
package isabelle |
|
8 |
||
9 |
||
67173 | 10 |
import java.io.{File => JFile} |
11 |
||
67172 | 12 |
import scala.annotation.tailrec |
74748 | 13 |
import scala.collection.mutable |
71601 | 14 |
import scala.util.matching.Regex |
67172 | 15 |
|
16 |
||
17 |
object Latex |
|
18 |
{ |
|
74786 | 19 |
/* index entries */ |
20 |
||
21 |
def index_escape(str: String): String = |
|
22 |
{ |
|
23 |
val special1 = "!\"@|" |
|
24 |
val special2 = "\\{}#" |
|
25 |
if (str.exists(c => special1.contains(c) || special2.contains(c))) { |
|
26 |
val res = new StringBuilder |
|
27 |
for (c <- str) { |
|
28 |
if (special1.contains(c)) { |
|
29 |
res ++= "\\char" |
|
30 |
res ++= Value.Int(c) |
|
31 |
} |
|
32 |
else { |
|
33 |
if (special2.contains(c)) { res += '"'} |
|
34 |
res += c |
|
35 |
} |
|
36 |
} |
|
37 |
res.toString |
|
38 |
} |
|
39 |
else str |
|
40 |
} |
|
41 |
||
42 |
object Index_Item |
|
43 |
{ |
|
44 |
sealed case class Value(text: Text, like: String) |
|
45 |
def unapply(tree: XML.Tree): Option[Value] = |
|
46 |
tree match { |
|
47 |
case XML.Wrapped_Elem(Markup.Latex_Index_Item(_), text, like) => |
|
48 |
Some(Value(text, XML.content(like))) |
|
49 |
case _ => None |
|
50 |
} |
|
51 |
} |
|
52 |
||
53 |
object Index_Entry |
|
54 |
{ |
|
55 |
sealed case class Value(items: List[Index_Item.Value], kind: String) |
|
56 |
def unapply(tree: XML.Tree): Option[Value] = |
|
57 |
tree match { |
|
58 |
case XML.Elem(Markup.Latex_Index_Entry(kind), body) => |
|
59 |
val items = body.map(Index_Item.unapply) |
|
60 |
if (items.forall(_.isDefined)) Some(Value(items.map(_.get), kind)) else None |
|
61 |
case _ => None |
|
62 |
} |
|
63 |
} |
|
64 |
||
65 |
||
73780
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
66 |
/* output text and positions */ |
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
67 |
|
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
68 |
type Text = XML.Body |
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
69 |
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
70 |
def position(a: String, b: String): String = "%:%" + a + "=" + b + "%:%\n" |
73780
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
71 |
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
72 |
def init_position(file_pos: String): List[String] = |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
73 |
if (file_pos.isEmpty) Nil |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
74 |
else List("\\endinput\n", position(Markup.FILE, file_pos)) |
73780
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
75 |
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
76 |
class Output |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
77 |
{ |
74786 | 78 |
def latex_output(latex_text: Text): String = apply(latex_text) |
79 |
||
74789 | 80 |
def latex_macro(name: String, body: Text): Text = |
81 |
XML.enclose("\\" + name + "{", "}", body) |
|
74786 | 82 |
|
83 |
def index_item(item: Index_Item.Value): String = |
|
84 |
{ |
|
85 |
val like = if (item.like.isEmpty) "" else index_escape(item.like) + "@" |
|
86 |
val text = index_escape(latex_output(item.text)) |
|
87 |
like + text |
|
88 |
} |
|
89 |
||
90 |
def index_entry(entry: Index_Entry.Value): Text = |
|
91 |
{ |
|
92 |
val items = entry.items.map(index_item).mkString("!") |
|
93 |
val kind = if (entry.kind.isEmpty) "" else "|" + index_escape(entry.kind) |
|
94 |
latex_macro("index", XML.string(items + kind)) |
|
95 |
} |
|
96 |
||
97 |
||
98 |
/* standard output of text with per-line positions */ |
|
74784
d2522bb4db1b
symbolic latex_output via XML, interpreted in Isabelle/Scala;
wenzelm
parents:
74783
diff
changeset
|
99 |
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
100 |
def apply(latex_text: Text, file_pos: String = ""): String = |
73780
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
101 |
{ |
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
102 |
var line = 1 |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
103 |
val result = new mutable.ListBuffer[String] |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
104 |
val positions = new mutable.ListBuffer[String] ++= init_position(file_pos) |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
105 |
|
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
106 |
def traverse(body: XML.Body): Unit = |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
107 |
{ |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
108 |
body.foreach { |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
109 |
case XML.Text(s) => |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
110 |
line += s.count(_ == '\n') |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
111 |
result += s |
74783 | 112 |
case XML.Elem(Markup.Document_Latex(props), body) => |
113 |
for { l <- Position.Line.unapply(props) if positions.nonEmpty } { |
|
114 |
val s = position(Value.Int(line), Value.Int(l)) |
|
115 |
if (positions.last != s) positions += s |
|
116 |
} |
|
117 |
traverse(body) |
|
74786 | 118 |
case XML.Elem(Markup.Latex_Output(_), body) => |
119 |
traverse(XML.string(latex_output(body))) |
|
120 |
case Index_Entry(entry) => |
|
121 |
traverse(index_entry(entry)) |
|
74783 | 122 |
case _: XML.Elem => |
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
123 |
} |
73780
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
124 |
} |
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
125 |
traverse(latex_text) |
73780
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
126 |
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
127 |
result ++= positions |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
128 |
result.mkString |
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
129 |
} |
73780
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
130 |
} |
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
131 |
|
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
132 |
|
67173 | 133 |
/* generated .tex file */ |
134 |
||
67184 | 135 |
private val File_Pattern = """^%:%file=(.+)%:%$""".r |
67194
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
136 |
private val Line_Pattern = """^*%:%(\d+)=(\d+)%:%$""".r |
67173 | 137 |
|
138 |
def read_tex_file(tex_file: Path): Tex_File = |
|
67194
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
139 |
{ |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
140 |
val positions = |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
141 |
Line.logical_lines(File.read(tex_file)).reverse. |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
142 |
takeWhile(_ != "\\endinput").reverse |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
143 |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
144 |
val source_file = |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
145 |
positions match { |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
146 |
case File_Pattern(file) :: _ => Some(file) |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
147 |
case _ => None |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
148 |
} |
67173 | 149 |
|
67194
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
150 |
val source_lines = |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
151 |
if (source_file.isEmpty) Nil |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
152 |
else |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
153 |
positions.flatMap(line => |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
154 |
line match { |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
155 |
case Line_Pattern(Value.Int(line), Value.Int(source_line)) => Some(line -> source_line) |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
156 |
case _ => None |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
157 |
}) |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
158 |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
159 |
new Tex_File(tex_file, source_file, source_lines) |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
160 |
} |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
161 |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
162 |
final class Tex_File private[Latex]( |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
163 |
tex_file: Path, source_file: Option[String], source_lines: List[(Int, Int)]) |
67173 | 164 |
{ |
165 |
override def toString: String = tex_file.toString |
|
166 |
||
67194
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
167 |
def source_position(l: Int): Option[Position.T] = |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
168 |
source_file match { |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
169 |
case None => None |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
170 |
case Some(file) => |
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
171 |
val source_line = |
73359 | 172 |
source_lines.iterator.takeWhile({ case (m, _) => m <= l }). |
173 |
foldLeft(0) { case (_, (_, n)) => n } |
|
67194
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
174 |
if (source_line == 0) None else Some(Position.Line_File(source_line, file)) |
67173 | 175 |
} |
176 |
||
177 |
def position(line: Int): Position.T = |
|
67188
bc7a6455e12a
simplified positions -- line is also human-readable in generated .tex file;
wenzelm
parents:
67184
diff
changeset
|
178 |
source_position(line) getOrElse Position.Line_File(line, tex_file.implode) |
67173 | 179 |
} |
180 |
||
181 |
||
182 |
/* latex log */ |
|
183 |
||
73782 | 184 |
def latex_errors(dir: Path, root_name: String): List[String] = |
185 |
{ |
|
186 |
val root_log_path = dir + Path.explode(root_name).ext("log") |
|
187 |
if (root_log_path.is_file) { |
|
188 |
for { (msg, pos) <- filter_errors(dir, File.read(root_log_path)) } |
|
189 |
yield "Latex error" + Position.here(pos) + ":\n" + Library.indent_lines(2, msg) |
|
190 |
} |
|
191 |
else Nil |
|
192 |
} |
|
193 |
||
67173 | 194 |
def filter_errors(dir: Path, root_log: String): List[(String, Position.T)] = |
67172 | 195 |
{ |
67173 | 196 |
val seen_files = Synchronized(Map.empty[JFile, Tex_File]) |
197 |
||
198 |
def check_tex_file(path: Path): Option[Tex_File] = |
|
199 |
seen_files.change_result(seen => |
|
200 |
seen.get(path.file) match { |
|
201 |
case None => |
|
202 |
if (path.is_file) { |
|
203 |
val tex_file = read_tex_file(path) |
|
204 |
(Some(tex_file), seen + (path.file -> tex_file)) |
|
205 |
} |
|
206 |
else (None, seen) |
|
207 |
case some => (some, seen) |
|
208 |
}) |
|
209 |
||
210 |
def tex_file_position(path: Path, line: Int): Position.T = |
|
211 |
check_tex_file(path) match { |
|
212 |
case Some(tex_file) => tex_file.position(line) |
|
213 |
case None => Position.Line_File(line, path.implode) |
|
214 |
} |
|
215 |
||
67172 | 216 |
object File_Line_Error |
217 |
{ |
|
71601 | 218 |
val Pattern: Regex = """^(.*?\.\w\w\w):(\d+): (.*)$""".r |
67173 | 219 |
def unapply(line: String): Option[(Path, Int, String)] = |
67172 | 220 |
line match { |
221 |
case Pattern(file, Value.Int(line), message) => |
|
222 |
val path = File.standard_path(file) |
|
223 |
if (Path.is_wellformed(path)) { |
|
67183 | 224 |
val file = (dir + Path.explode(path)).canonical |
67423 | 225 |
val msg = Library.perhaps_unprefix("LaTeX Error: ", message) |
226 |
if (file.is_file) Some((file, line, msg)) else None |
|
67172 | 227 |
} |
228 |
else None |
|
229 |
case _ => None |
|
230 |
} |
|
231 |
} |
|
232 |
||
67418
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
233 |
val Line_Error = """^l\.\d+ (.*)$""".r |
67196
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
234 |
val More_Error = |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
235 |
List( |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
236 |
"<argument>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
237 |
"<template>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
238 |
"<recently read>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
239 |
"<to be read again>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
240 |
"<inserted text>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
241 |
"<output>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
242 |
"<everypar>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
243 |
"<everymath>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
244 |
"<everydisplay>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
245 |
"<everyhbox>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
246 |
"<everyvbox>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
247 |
"<everyjob>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
248 |
"<everycr>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
249 |
"<mark>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
250 |
"<everyeof>", |
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
251 |
"<write>").mkString("^(?:", "|", ") (.*)$").r |
67172 | 252 |
|
73474
4e12a6caefb3
turn LaTeX warning into error, for the sake of isabelle.sty/bbbfont;
wenzelm
parents:
73359
diff
changeset
|
253 |
val Bad_Font = """^LaTeX Font Warning: (Font .*\btxmia\b.* undefined).*$""".r |
67483
aae933ca6fbd
tuned message: same error may occur in different contexts;
wenzelm
parents:
67482
diff
changeset
|
254 |
val Bad_File = """^! LaTeX Error: (File `.*' not found\.)$""".r |
67482 | 255 |
|
67423 | 256 |
val error_ignore = |
257 |
Set( |
|
258 |
"See the LaTeX manual or LaTeX Companion for explanation.", |
|
259 |
"Type H <return> for immediate help.") |
|
260 |
||
67418
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
261 |
def error_suffix1(lines: List[String]): Option[String] = |
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
262 |
{ |
71784 | 263 |
val lines1 = |
264 |
lines.take(20).takeWhile({ case File_Line_Error((_, _, _)) => false case _ => true }) |
|
67418
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
265 |
lines1.zipWithIndex.collectFirst({ |
67423 | 266 |
case (Line_Error(msg), i) => |
267 |
cat_lines(lines1.take(i).filterNot(error_ignore) ::: List(msg)) }) |
|
67418
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
268 |
} |
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
269 |
def error_suffix2(lines: List[String]): Option[String] = |
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
270 |
lines match { |
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
271 |
case More_Error(msg) :: _ => Some(msg) |
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
272 |
case _ => None |
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
273 |
} |
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
274 |
|
67173 | 275 |
@tailrec def filter(lines: List[String], result: List[(String, Position.T)]) |
276 |
: List[(String, Position.T)] = |
|
277 |
{ |
|
67172 | 278 |
lines match { |
67173 | 279 |
case File_Line_Error((file, line, msg1)) :: rest1 => |
67183 | 280 |
val pos = tex_file_position(file, line) |
67418
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
281 |
val msg2 = error_suffix1(rest1) orElse error_suffix2(rest1) getOrElse "" |
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
282 |
filter(rest1, (Exn.cat_message(msg1, msg2), pos) :: result) |
73474
4e12a6caefb3
turn LaTeX warning into error, for the sake of isabelle.sty/bbbfont;
wenzelm
parents:
73359
diff
changeset
|
283 |
case Bad_Font(msg) :: rest => |
4e12a6caefb3
turn LaTeX warning into error, for the sake of isabelle.sty/bbbfont;
wenzelm
parents:
73359
diff
changeset
|
284 |
filter(rest, (msg, Position.none) :: result) |
67483
aae933ca6fbd
tuned message: same error may occur in different contexts;
wenzelm
parents:
67482
diff
changeset
|
285 |
case Bad_File(msg) :: rest => |
67482 | 286 |
filter(rest, (msg, Position.none) :: result) |
67172 | 287 |
case _ :: rest => filter(rest, result) |
288 |
case Nil => result.reverse |
|
289 |
} |
|
67173 | 290 |
} |
67172 | 291 |
|
67174 | 292 |
filter(Line.logical_lines(root_log), Nil) |
67173 | 293 |
} |
67172 | 294 |
} |