| author | wenzelm |
| Sat, 22 Apr 2023 21:00:24 +0200 | |
| changeset 77908 | a6bd716a6124 |
| parent 77368 | 7c57d9586f4c |
| child 78601 | 604a7377725c |
| 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 |
| 74839 | 14 |
import scala.collection.immutable.TreeMap |
| 71601 | 15 |
import scala.util.matching.Regex |
| 67172 | 16 |
|
17 |
||
| 75393 | 18 |
object Latex {
|
|
74826
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
19 |
/* output name for LaTeX macros */ |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
20 |
|
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
21 |
private val output_name_map: Map[Char, String] = |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
22 |
Map('_' -> "UNDERSCORE",
|
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
23 |
'\'' -> "PRIME", |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
24 |
'0' -> "ZERO", |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
25 |
'1' -> "ONE", |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
26 |
'2' -> "TWO", |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
27 |
'3' -> "THREE", |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
28 |
'4' -> "FOUR", |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
29 |
'5' -> "FIVE", |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
30 |
'6' -> "SIX", |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
31 |
'7' -> "SEVEN", |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
32 |
'8' -> "EIGHT", |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
33 |
'9' -> "NINE") |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
34 |
|
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
35 |
def output_name(name: String): String = |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
36 |
if (name.exists(output_name_map.keySet)) {
|
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
37 |
val res = new StringBuilder |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
38 |
for (c <- name) {
|
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
39 |
output_name_map.get(c) match {
|
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
40 |
case None => res += c |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
41 |
case Some(s) => res ++= s |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
42 |
} |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
43 |
} |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
44 |
res.toString |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
45 |
} |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
46 |
else name |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
47 |
|
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
48 |
|
| 74786 | 49 |
/* index entries */ |
50 |
||
| 75393 | 51 |
def index_escape(str: String): String = {
|
| 74786 | 52 |
val special1 = "!\"@|" |
53 |
val special2 = "\\{}#"
|
|
54 |
if (str.exists(c => special1.contains(c) || special2.contains(c))) {
|
|
55 |
val res = new StringBuilder |
|
56 |
for (c <- str) {
|
|
57 |
if (special1.contains(c)) {
|
|
58 |
res ++= "\\char" |
|
59 |
res ++= Value.Int(c) |
|
60 |
} |
|
61 |
else {
|
|
62 |
if (special2.contains(c)) { res += '"'}
|
|
63 |
res += c |
|
64 |
} |
|
65 |
} |
|
66 |
res.toString |
|
67 |
} |
|
68 |
else str |
|
69 |
} |
|
70 |
||
| 75393 | 71 |
object Index_Item {
|
| 74786 | 72 |
sealed case class Value(text: Text, like: String) |
73 |
def unapply(tree: XML.Tree): Option[Value] = |
|
74 |
tree match {
|
|
75 |
case XML.Wrapped_Elem(Markup.Latex_Index_Item(_), text, like) => |
|
76 |
Some(Value(text, XML.content(like))) |
|
77 |
case _ => None |
|
78 |
} |
|
79 |
} |
|
80 |
||
| 75393 | 81 |
object Index_Entry {
|
| 74786 | 82 |
sealed case class Value(items: List[Index_Item.Value], kind: String) |
83 |
def unapply(tree: XML.Tree): Option[Value] = |
|
84 |
tree match {
|
|
85 |
case XML.Elem(Markup.Latex_Index_Entry(kind), body) => |
|
86 |
val items = body.map(Index_Item.unapply) |
|
87 |
if (items.forall(_.isDefined)) Some(Value(items.map(_.get), kind)) else None |
|
88 |
case _ => None |
|
89 |
} |
|
90 |
} |
|
91 |
||
92 |
||
| 74839 | 93 |
/* tags */ |
94 |
||
| 75393 | 95 |
object Tags {
|
96 |
object Op extends Enumeration {
|
|
| 74839 | 97 |
val fold, drop, keep = Value |
98 |
} |
|
99 |
||
100 |
val standard = "document,theory,proof,ML,visible,-invisible,important,unimportant" |
|
101 |
||
| 77218 | 102 |
private def explode(spec: String): List[String] = space_explode(',', spec)
|
| 74839 | 103 |
|
104 |
def apply(spec: String): Tags = |
|
105 |
new Tags(spec, |
|
106 |
(explode(standard) ::: explode(spec)).foldLeft(TreeMap.empty[String, Op.Value]) {
|
|
107 |
case (m, tag) => |
|
108 |
tag.toList match {
|
|
109 |
case '/' :: cs => m + (cs.mkString -> Op.fold) |
|
110 |
case '-' :: cs => m + (cs.mkString -> Op.drop) |
|
111 |
case '+' :: cs => m + (cs.mkString -> Op.keep) |
|
112 |
case cs => m + (cs.mkString -> Op.keep) |
|
113 |
} |
|
114 |
}) |
|
115 |
||
116 |
val empty: Tags = apply("")
|
|
117 |
} |
|
118 |
||
| 75393 | 119 |
class Tags private(spec: String, map: TreeMap[String, Tags.Op.Value]) {
|
| 74839 | 120 |
override def toString: String = spec |
121 |
||
122 |
def get(name: String): Option[Tags.Op.Value] = map.get(name) |
|
123 |
||
| 75393 | 124 |
def sty(comment_latex: Boolean): File.Content = {
|
| 74839 | 125 |
val path = Path.explode("isabelletags.sty")
|
|
74840
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
126 |
val comment = |
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
127 |
if (comment_latex) """\usepackage{comment}"""
|
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
128 |
else """%plain TeX version of comment package -- much faster! |
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
129 |
\let\isafmtname\fmtname\def\fmtname{plain}
|
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
130 |
\usepackage{comment}
|
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
131 |
\let\fmtname\isafmtname""" |
| 74839 | 132 |
val tags = |
133 |
(for ((name, op) <- map.iterator) |
|
134 |
yield "\\isa" + op + "tag{" + name + "}").toList
|
|
| 75824 | 135 |
File.content(path, comment + """ |
| 74839 | 136 |
|
137 |
\newcommand{\isakeeptag}[1]%
|
|
138 |
{\includecomment{isadelim#1}\includecomment{isatag#1}\csarg\def{isafold#1}{}}
|
|
139 |
\newcommand{\isadroptag}[1]%
|
|
140 |
{\excludecomment{isadelim#1}\excludecomment{isatag#1}\csarg\def{isafold#1}{}}
|
|
141 |
\newcommand{\isafoldtag}[1]%
|
|
142 |
{\includecomment{isadelim#1}\excludecomment{isatag#1}\csarg\def{isafold#1}{\isafold{#1}}}
|
|
143 |
||
| 77216 | 144 |
""" + terminate_lines(tags)) |
| 74839 | 145 |
} |
146 |
} |
|
147 |
||
148 |
||
|
73780
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
149 |
/* output text and positions */ |
|
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
150 |
|
|
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
151 |
type Text = XML.Body |
|
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
152 |
|
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
153 |
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
|
154 |
|
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
155 |
def init_position(file_pos: String): List[String] = |
|
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
156 |
if (file_pos.isEmpty) Nil |
|
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
157 |
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
|
158 |
|
|
77000
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
159 |
def append_position(path: Path, file_pos: String): Unit = {
|
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
160 |
val pos = init_position(file_pos).mkString |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
161 |
if (pos.nonEmpty) {
|
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
162 |
val sep = if (File.read(path).endsWith("\n")) "" else "\n"
|
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
163 |
File.append(path, sep + pos) |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
164 |
} |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
165 |
} |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
166 |
|
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
167 |
def copy_file(src: Path, dst: Path): Unit = {
|
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
168 |
Isabelle_System.copy_file(src, dst) |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
169 |
if (src.is_latex) {
|
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
170 |
val target = if (dst.is_dir) dst + src.base else dst |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
171 |
val file_pos = File.symbolic_path(src) |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
172 |
append_position(target, file_pos) |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
173 |
} |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
174 |
} |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
175 |
|
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
176 |
def copy_file_base(base_dir: Path, src: Path, target_dir: Path): Unit = {
|
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
177 |
Isabelle_System.copy_file_base(base_dir, src, target_dir) |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
178 |
if (src.is_latex) {
|
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
179 |
val file_pos = File.symbolic_path(base_dir + src) |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
180 |
append_position(target_dir + src, file_pos) |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
181 |
} |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
182 |
} |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
183 |
|
|
76450
107d8203fbd7
clarified signature: allow to change options in instances of Document_Build.Engine;
wenzelm
parents:
75824
diff
changeset
|
184 |
class Output(val options: Options) {
|
| 76826 | 185 |
def latex_output(latex_text: Text): String = make(latex_text) |
| 74786 | 186 |
|
|
74838
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
187 |
def latex_macro0(name: String, optional_argument: String = ""): Text = |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
188 |
XML.string("\\" + name + optional_argument)
|
| 74790 | 189 |
|
|
74838
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
190 |
def latex_macro(name: String, body: Text, optional_argument: String = ""): Text = |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
191 |
XML.enclose("\\" + name + optional_argument + "{", "}", body)
|
| 74790 | 192 |
|
|
74838
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
193 |
def latex_environment(name: String, body: Text, optional_argument: String = ""): Text = |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
194 |
XML.enclose( |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
195 |
"%\n\\begin{" + name + "}" + optional_argument + "%\n",
|
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
196 |
"%\n\\end{" + name + "}", body)
|
| 74823 | 197 |
|
|
74838
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
198 |
def latex_heading(kind: String, body: Text, optional_argument: String = ""): Text = |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
199 |
XML.enclose( |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
200 |
"%\n\\" + options.string("document_heading_prefix") + kind + optional_argument + "{",
|
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
201 |
"%\n}\n", body) |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
202 |
|
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
203 |
def latex_body(kind: String, body: Text, optional_argument: String = ""): Text = |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
204 |
latex_environment("isamarkup" + kind, body, optional_argument)
|
| 74823 | 205 |
|
| 75393 | 206 |
def latex_tag(name: String, body: Text, delim: Boolean = false): Text = {
|
|
74826
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
207 |
val s = output_name(name) |
|
74840
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
208 |
val kind = if (delim) "delim" else "tag" |
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
209 |
val end = if (delim) "" else "{\\isafold" + s + "}%\n"
|
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
210 |
if (options.bool("document_comment_latex")) {
|
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
211 |
XML.enclose( |
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
212 |
"%\n\\begin{isa" + kind + s + "}\n",
|
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
213 |
"%\n\\end{isa" + kind + s + "}\n" + end, body)
|
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
214 |
} |
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
215 |
else {
|
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
216 |
XML.enclose( |
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
217 |
"%\n\\isa" + kind + s + "\n", |
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
218 |
"%\n\\endisa" + kind + s + "\n" + end, body) |
|
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
219 |
} |
|
74826
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
220 |
} |
|
0e4d8aa61ad7
more symbolic latex_output via XML (using YXML within text);
wenzelm
parents:
74824
diff
changeset
|
221 |
|
| 77016 | 222 |
def cite(inner: Bibtex.Cite.Inner): Text = {
|
223 |
val body = |
|
224 |
latex_macro0(inner.kind) ::: |
|
225 |
(if (inner.location.isEmpty) Nil |
|
226 |
else XML.string("[") ::: inner.location ::: XML.string("]")) :::
|
|
| 77024 | 227 |
XML.string("{" + inner.citations + "}")
|
| 77016 | 228 |
|
229 |
if (inner.pos.isEmpty) body |
|
230 |
else List(XML.Elem(Markup.Latex_Output(inner.pos), body)) |
|
|
76956
e47fb5cfef41
clarified Latex markup: optional cite "location" consists of nested document text;
wenzelm
parents:
76955
diff
changeset
|
231 |
} |
|
e47fb5cfef41
clarified Latex markup: optional cite "location" consists of nested document text;
wenzelm
parents:
76955
diff
changeset
|
232 |
|
| 75393 | 233 |
def index_item(item: Index_Item.Value): String = {
|
| 77368 | 234 |
val like = if_proper(item.like, index_escape(item.like) + "@") |
| 74786 | 235 |
val text = index_escape(latex_output(item.text)) |
236 |
like + text |
|
237 |
} |
|
238 |
||
| 75393 | 239 |
def index_entry(entry: Index_Entry.Value): Text = {
|
| 74786 | 240 |
val items = entry.items.map(index_item).mkString("!")
|
| 77368 | 241 |
val kind = if_proper(entry.kind, "|" + index_escape(entry.kind)) |
| 74786 | 242 |
latex_macro("index", XML.string(items + kind))
|
243 |
} |
|
244 |
||
245 |
||
246 |
/* standard output of text with per-line positions */ |
|
|
74784
d2522bb4db1b
symbolic latex_output via XML, interpreted in Isabelle/Scala;
wenzelm
parents:
74783
diff
changeset
|
247 |
|
|
74838
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
248 |
def unknown_elem(elem: XML.Elem, pos: Position.T): XML.Body = |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
249 |
error("Unknown latex markup element " + quote(elem.name) + Position.here(pos) +
|
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
250 |
":\n" + XML.string_of_tree(elem)) |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
251 |
|
| 77005 | 252 |
def make( |
253 |
latex_text: Text, |
|
254 |
file_pos: String = "", |
|
255 |
line_pos: Properties.T => Option[Int] = Position.Line.unapply |
|
256 |
): String = {
|
|
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
257 |
var line = 1 |
|
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
258 |
val result = new mutable.ListBuffer[String] |
|
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
259 |
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
|
260 |
|
|
74838
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
261 |
val file_position = if (file_pos.isEmpty) Position.none else Position.File(file_pos) |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
262 |
|
| 75393 | 263 |
def traverse(xml: XML.Body): Unit = {
|
|
74838
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
264 |
xml.foreach {
|
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
265 |
case XML.Text(s) => |
| 77007 | 266 |
line += Library.count_newlines(s) |
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
267 |
result += s |
|
74838
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
268 |
case elem @ XML.Elem(markup, body) => |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
269 |
val a = Markup.Optional_Argument.get(markup.properties) |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
270 |
traverse {
|
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
271 |
markup match {
|
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
272 |
case Markup.Document_Latex(props) => |
| 77005 | 273 |
if (positions.nonEmpty) {
|
274 |
for (l <- line_pos(props)) {
|
|
275 |
val s = position(Value.Int(line), Value.Int(l)) |
|
276 |
if (positions.last != s) positions += s |
|
277 |
} |
|
|
74838
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
278 |
} |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
279 |
body |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
280 |
case Markup.Latex_Output(_) => XML.string(latex_output(body)) |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
281 |
case Markup.Latex_Macro0(name) if body.isEmpty => latex_macro0(name, a) |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
282 |
case Markup.Latex_Macro(name) => latex_macro(name, body, a) |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
283 |
case Markup.Latex_Environment(name) => latex_environment(name, body, a) |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
284 |
case Markup.Latex_Heading(kind) => latex_heading(kind, body, a) |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
285 |
case Markup.Latex_Body(kind) => latex_body(kind, body, a) |
|
74840
4faf0ec33cbf
option document_comment_latex supports e.g. Dagstuhl LIPIcs;
wenzelm
parents:
74839
diff
changeset
|
286 |
case Markup.Latex_Delim(name) => latex_tag(name, body, delim = true) |
|
74838
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
287 |
case Markup.Latex_Tag(name) => latex_tag(name, body) |
| 76955 | 288 |
case Markup.Latex_Cite(_) => |
289 |
elem match {
|
|
| 77016 | 290 |
case Bibtex.Cite(inner) => cite(inner) |
| 76955 | 291 |
case _ => unknown_elem(elem, file_position) |
292 |
} |
|
|
74838
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
293 |
case Markup.Latex_Index_Entry(_) => |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
294 |
elem match {
|
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
295 |
case Index_Entry(entry) => index_entry(entry) |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
296 |
case _ => unknown_elem(elem, file_position) |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
297 |
} |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
298 |
case _ => unknown_elem(elem, file_position) |
|
4c8d9479f916
more uniform treatment of optional_argument for Latex elements;
wenzelm
parents:
74836
diff
changeset
|
299 |
} |
| 74783 | 300 |
} |
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
301 |
} |
|
73780
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
302 |
} |
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
303 |
traverse(latex_text) |
|
73780
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
304 |
|
|
74777
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
305 |
result ++= positions |
|
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
306 |
result.mkString |
|
2fd0c33fe440
clarified signature: Latex.Output as parameter to Document_Build.Engine;
wenzelm
parents:
74748
diff
changeset
|
307 |
} |
|
73780
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
308 |
} |
|
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
309 |
|
|
466fae6bf22e
compose Latex text as XML, output exported YXML in Isabelle/Scala;
wenzelm
parents:
73736
diff
changeset
|
310 |
|
| 67173 | 311 |
/* generated .tex file */ |
312 |
||
| 67184 | 313 |
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
|
314 |
private val Line_Pattern = """^*%:%(\d+)=(\d+)%:%$""".r |
| 67173 | 315 |
|
| 75393 | 316 |
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
|
317 |
val positions = |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
318 |
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
|
319 |
takeWhile(_ != "\\endinput").reverse |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
320 |
|
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
321 |
val source_file = |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
322 |
positions match {
|
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
323 |
case File_Pattern(file) :: _ => Some(file) |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
324 |
case _ => None |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
325 |
} |
| 67173 | 326 |
|
|
67194
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
327 |
val source_lines = |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
328 |
if (source_file.isEmpty) Nil |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
329 |
else |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
330 |
positions.flatMap(line => |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
331 |
line match {
|
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
332 |
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
|
333 |
case _ => None |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
334 |
}) |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
335 |
|
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
336 |
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
|
337 |
} |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
338 |
|
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
339 |
final class Tex_File private[Latex]( |
| 75393 | 340 |
tex_file: Path, |
341 |
source_file: Option[String], |
|
342 |
source_lines: List[(Int, Int)] |
|
343 |
) {
|
|
| 67173 | 344 |
override def toString: String = tex_file.toString |
345 |
||
|
67194
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
346 |
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
|
347 |
source_file match {
|
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
348 |
case None => None |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
349 |
case Some(file) => |
|
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
350 |
val source_line = |
| 73359 | 351 |
source_lines.iterator.takeWhile({ case (m, _) => m <= l }).
|
352 |
foldLeft(0) { case (_, (_, n)) => n }
|
|
|
67194
1c0a6a957114
positions as postlude: avoid intrusion of odd %-forms into main tex source;
wenzelm
parents:
67190
diff
changeset
|
353 |
if (source_line == 0) None else Some(Position.Line_File(source_line, file)) |
| 67173 | 354 |
} |
355 |
||
356 |
def position(line: Int): Position.T = |
|
|
77000
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
357 |
source_position(line) getOrElse |
|
ffc0774e0efe
clarified file positions: retain original source path;
wenzelm
parents:
76962
diff
changeset
|
358 |
Position.Line_File(line, source_file.getOrElse(tex_file.implode)) |
| 67173 | 359 |
} |
360 |
||
361 |
||
362 |
/* latex log */ |
|
363 |
||
| 75393 | 364 |
def latex_errors(dir: Path, root_name: String): List[String] = {
|
| 77035 | 365 |
val root_log_path = dir + Path.explode(root_name).log |
| 73782 | 366 |
if (root_log_path.is_file) {
|
367 |
for { (msg, pos) <- filter_errors(dir, File.read(root_log_path)) }
|
|
368 |
yield "Latex error" + Position.here(pos) + ":\n" + Library.indent_lines(2, msg) |
|
369 |
} |
|
370 |
else Nil |
|
371 |
} |
|
372 |
||
| 75393 | 373 |
def filter_errors(dir: Path, root_log: String): List[(String, Position.T)] = {
|
| 67173 | 374 |
val seen_files = Synchronized(Map.empty[JFile, Tex_File]) |
375 |
||
376 |
def check_tex_file(path: Path): Option[Tex_File] = |
|
377 |
seen_files.change_result(seen => |
|
378 |
seen.get(path.file) match {
|
|
379 |
case None => |
|
380 |
if (path.is_file) {
|
|
381 |
val tex_file = read_tex_file(path) |
|
382 |
(Some(tex_file), seen + (path.file -> tex_file)) |
|
383 |
} |
|
384 |
else (None, seen) |
|
385 |
case some => (some, seen) |
|
386 |
}) |
|
387 |
||
388 |
def tex_file_position(path: Path, line: Int): Position.T = |
|
389 |
check_tex_file(path) match {
|
|
390 |
case Some(tex_file) => tex_file.position(line) |
|
391 |
case None => Position.Line_File(line, path.implode) |
|
392 |
} |
|
393 |
||
| 75393 | 394 |
object File_Line_Error {
|
| 71601 | 395 |
val Pattern: Regex = """^(.*?\.\w\w\w):(\d+): (.*)$""".r |
| 67173 | 396 |
def unapply(line: String): Option[(Path, Int, String)] = |
| 67172 | 397 |
line match {
|
398 |
case Pattern(file, Value.Int(line), message) => |
|
399 |
val path = File.standard_path(file) |
|
400 |
if (Path.is_wellformed(path)) {
|
|
| 67183 | 401 |
val file = (dir + Path.explode(path)).canonical |
| 67423 | 402 |
val msg = Library.perhaps_unprefix("LaTeX Error: ", message)
|
403 |
if (file.is_file) Some((file, line, msg)) else None |
|
| 67172 | 404 |
} |
405 |
else None |
|
406 |
case _ => None |
|
407 |
} |
|
408 |
} |
|
409 |
||
|
67418
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
410 |
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
|
411 |
val More_Error = |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
412 |
List( |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
413 |
"<argument>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
414 |
"<template>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
415 |
"<recently read>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
416 |
"<to be read again>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
417 |
"<inserted text>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
418 |
"<output>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
419 |
"<everypar>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
420 |
"<everymath>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
421 |
"<everydisplay>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
422 |
"<everyhbox>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
423 |
"<everyvbox>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
424 |
"<everyjob>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
425 |
"<everycr>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
426 |
"<mark>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
427 |
"<everyeof>", |
|
eb29f4868d14
more error information according to @<Print type of token list@> in pdfweb.tex;
wenzelm
parents:
67194
diff
changeset
|
428 |
"<write>").mkString("^(?:", "|", ") (.*)$").r
|
| 67172 | 429 |
|
|
73474
4e12a6caefb3
turn LaTeX warning into error, for the sake of isabelle.sty/bbbfont;
wenzelm
parents:
73359
diff
changeset
|
430 |
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
|
431 |
val Bad_File = """^! LaTeX Error: (File `.*' not found\.)$""".r |
| 67482 | 432 |
|
| 67423 | 433 |
val error_ignore = |
434 |
Set( |
|
435 |
"See the LaTeX manual or LaTeX Companion for explanation.", |
|
436 |
"Type H <return> for immediate help.") |
|
437 |
||
| 75393 | 438 |
def error_suffix1(lines: List[String]): Option[String] = {
|
| 71784 | 439 |
val lines1 = |
440 |
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
|
441 |
lines1.zipWithIndex.collectFirst({
|
| 67423 | 442 |
case (Line_Error(msg), i) => |
443 |
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
|
444 |
} |
|
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
445 |
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
|
446 |
lines match {
|
|
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
447 |
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
|
448 |
case _ => None |
|
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
449 |
} |
|
5a6ed2e679fb
more general error suffixes, e.g. for messages that are broken over several lines;
wenzelm
parents:
67417
diff
changeset
|
450 |
|
| 75393 | 451 |
@tailrec def filter( |
452 |
lines: List[String], |
|
453 |
result: List[(String, Position.T)] |
|
454 |
) : List[(String, Position.T)] = {
|
|
| 67172 | 455 |
lines match {
|
| 67173 | 456 |
case File_Line_Error((file, line, msg1)) :: rest1 => |
| 67183 | 457 |
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
|
458 |
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
|
459 |
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
|
460 |
case Bad_Font(msg) :: rest => |
|
4e12a6caefb3
turn LaTeX warning into error, for the sake of isabelle.sty/bbbfont;
wenzelm
parents:
73359
diff
changeset
|
461 |
filter(rest, (msg, Position.none) :: result) |
|
67483
aae933ca6fbd
tuned message: same error may occur in different contexts;
wenzelm
parents:
67482
diff
changeset
|
462 |
case Bad_File(msg) :: rest => |
| 67482 | 463 |
filter(rest, (msg, Position.none) :: result) |
| 67172 | 464 |
case _ :: rest => filter(rest, result) |
465 |
case Nil => result.reverse |
|
466 |
} |
|
| 67173 | 467 |
} |
| 67172 | 468 |
|
| 67174 | 469 |
filter(Line.logical_lines(root_log), Nil) |
| 67173 | 470 |
} |
| 67172 | 471 |
} |