1.1 --- a/doc-src/isac/msteger/bakk-presentation.tex Wed Jun 22 19:58:58 2011 +0200
1.2 +++ b/doc-src/isac/msteger/bakk-presentation.tex Wed Jun 22 23:23:20 2011 +0200
1.3 @@ -125,143 +125,23 @@
1.4 \end{frame}
1.5
1.6 \subsection[Integration]{Isabelles Filestruktur im \"Ubergangsstadium}
1.7 -<<<<<<< local
1.8 -<<<<<<< local
1.9 -<<<<<<< local
1.10 -=======
1.11 ->>>>>>> other
1.12 -=======
1.13 ->>>>>>> other
1.14
1.15 -<<<<<<< local
1.16 -<<<<<<< local
1.17 -=======
1.18 ->>>>>>> other
1.19 -=======
1.20 ->>>>>>> other
1.21 -=======
1.22 ->>>>>>> other
1.23
1.24 -<<<<<<< local
1.25 -<<<<<<< local
1.26 -<<<<<<< local
1.27 -=======
1.28 ->>>>>>> other
1.29 -=======
1.30 ->>>>>>> other
1.31 -%\begin{frame}\frametitle{Isabelle Files: *.jar}
1.32 -%{\footnotesize
1.33 -%----- for ``isabelle jedit \&''; contained in Isabelle\_bundle}\\
1.34 -%{\tiny
1.35 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jedit.jar\\
1.36 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/LatestVersion.jar\\
1.37 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/SideKick.jar\\
1.38 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/Console.jar\\
1.39 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/Pure.jar \alert{$\;\;\;\;\;\;\;\;\;\;\;\Longleftarrow$ entry to SML}\\
1.40 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/Isac.jar\\
1.41 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/scala-compiler.jar\\
1.42 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/Isabelle-jEdit.jar\\
1.43 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/cobra.jar\\
1.44 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/js.jar\\
1.45 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/Hyperlinks.jar\\
1.46 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/scala-swing.jar\\
1.47 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/scala-library.jar\\
1.48 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/QuickNotepad.jar\\
1.49 -%./contrib/jedit-4.3.2\_Isabelle-6d736d983d5c/jars/ErrorList.jar\\
1.50 -%
1.51 -%{\footnotesize
1.52 -%----- scala system; contained in Isabelle\_bundle}\\
1.53 -%./contrib/scala-2.8.1.final/misc/sbaz/scala-bazaars.jar\\
1.54 -%./contrib/scala-2.8.1.final/misc/sbaz/sbaz-tests.jar\\
1.55 -%./contrib/scala-2.8.1.final/misc/scala-devel/plugins/continuations.jar\\
1.56 -%./contrib/scala-2.8.1.final/lib/scala-compiler.jar\\
1.57 -%./contrib/scala-2.8.1.final/lib/scalap.jar\\
1.58 -%./contrib/scala-2.8.1.final/lib/scala-swing.jar\\
1.59 -%./contrib/scala-2.8.1.final/lib/scala-library.jar\\
1.60 -%./contrib/scala-2.8.1.final/lib/jline.jar\\
1.61 -%./contrib/scala-2.8.1.final/lib/scala-dbc.jar\\
1.62 -%./contrib/scala-2.8.1.final/src/scala-library-src.jar\\
1.63 -%./contrib/scala-2.8.1.final/src/scala-swing-src.jar\\
1.64 -%./contrib/scala-2.8.1.final/src/scala-compiler-src.jar\\
1.65 -%./contrib/scala-2.8.1.final/src/scala-dbc-src.jar\\
1.66 -%./contrib/scala-2.8.1.final/src/sbaz-src.jar\\
1.67 -%}
1.68 -%\end{frame}
1.69 -%
1.70 -%\begin{frame}\frametitle{Isabelle Files: *.scala}
1.71 -%{\tiny
1.72 -%./src/Pure/General/xml.scala\\
1.73 -%./src/Pure/General/linear\_set.scala\\
1.74 -<<<<<<< local
1.75 -<<<<<<< local
1.76 -=======
1.77 ->>>>>>> other
1.78 -=======
1.79 \begin{frame}\frametitle{Isabelle Files: *.scala}
1.80 {\tiny
1.81 \textbf{\$ find -name ``*.scala''}\\
1.82 ./src/Pure/General/xml.scala\\
1.83 ./src/Pure/General/linear\_set.scala\\
1.84 ->>>>>>> other
1.85 -<<<<<<< local
1.86 -=======
1.87 ->>>>>>> other
1.88 -=======
1.89 ->>>>>>> other
1.90 -%./src/Pure/General/symbol.scala\\
1.91 -%./src/Pure/General/exn.scala\\
1.92 -%./src/Pure/General/position.scala\\
1.93 -%./src/Pure/General/scan.scala\\
1.94 -%./src/Pure/General/xml\_data.scala\\
1.95 -%./src/Pure/General/yxml.scala\\
1.96 -%./src/Pure/General/markup.scala\\
1.97 -<<<<<<< local
1.98 -<<<<<<< local
1.99 -=======
1.100 ->>>>>>> other
1.101 -<<<<<<< local
1.102 -=======
1.103 +
1.104 +./src/Pure/General/symbol.scala\\
1.105 +./src/Pure/General/exn.scala\\
1.106 +./src/Pure/General/position.scala\\
1.107 +./src/Pure/General/scan.scala\\
1.108 +./src/Pure/General/xml\_data.scala\\
1.109 +./src/Pure/General/yxml.scala\\
1.110 +./src/Pure/General/markup.scala\\
1.111 :\\
1.112 ->>>>>>> other
1.113 -<<<<<<< local
1.114 -=======
1.115 ->>>>>>> other
1.116 -=======
1.117 ->>>>>>> other
1.118 -%./src/Pure/General/sha1.scala\\
1.119 -<<<<<<< local
1.120 -<<<<<<< local
1.121 -<<<<<<< local
1.122 -=======
1.123 ->>>>>>> other
1.124 -=======
1.125 ->>>>>>> other
1.126 -%./src/Pure/General/timing.scala\\
1.127 -%./src/Pure/General/pretty.scala\\
1.128 -%.\\
1.129 -%./src/Pure/Concurrent/volatile.scala\\
1.130 -%./src/Pure/Concurrent/future.scala\\
1.131 -%./src/Pure/Concurrent/simple\_thread.scala\\
1.132 -%.\\
1.133 -%./src/Pure/Thy/html.scala\\
1.134 -%./src/Pure/Thy/completion.scala\\
1.135 -%./src/Pure/Thy/thy\_header.scala\\
1.136 -%./src/Pure/Thy/thy\_syntax.scala\\
1.137 -%./src/Pure/Isac/isac.scala\\
1.138 -%./src/Pure/library.scala\\
1.139 -%.\\
1.140 -%./src/Pure/Isar/keyword.scala\\
1.141 -%./src/Pure/Isar/outer\_syntax.scala\\
1.142 -%./src/Pure/Isar/token.scala\\
1.143 -%./src/Pure/Isar/parse.scala\\
1.144 -%.\\
1.145 -%./src/Pure/System/gui\_setup.scala\\
1.146 -%./src/Pure/System/isabelle\_system.scala\\
1.147 -<<<<<<< local
1.148 -<<<<<<< local
1.149 -=======
1.150 ->>>>>>> other
1.151 -=======
1.152 +./src/Pure/General/sha1.scala\\
1.153 ./src/Pure/General/timing.scala\\
1.154 ./src/Pure/General/pretty.scala\\
1.155 .\\
1.156 @@ -283,43 +163,35 @@
1.157 .\\
1.158 ./src/Pure/System/gui\_setup.scala\\
1.159 ./src/Pure/System/isabelle\_system.scala\\
1.160 ->>>>>>> other
1.161 -<<<<<<< local
1.162 -=======
1.163 ->>>>>>> other
1.164 -=======
1.165 ->>>>>>> other
1.166 -%./src/Pure/System/swing\_thread.scala\\
1.167 -%./src/Pure/System/download.scala\\
1.168 -%./src/Pure/System/session\_manager.scala\\
1.169 -%./src/Pure/System/standard\_system.scala\\
1.170 -%./src/Pure/System/isabelle\_syntax.scala\\
1.171 -%./src/Pure/System/session.scala\\
1.172 -%./src/Pure/System/platform.scala\\
1.173 -%./src/Pure/System/cygwin.scala\\
1.174 -<<<<<<< local
1.175 -<<<<<<< local
1.176 -<<<<<<< local
1.177 -=======
1.178 ->>>>>>> other
1.179 -=======
1.180 ->>>>>>> other
1.181 -%./src/Pure/System/event\_bus.scala\\
1.182 -%./src/Pure/System/isabelle\_process.scala\\
1.183 -%.\\
1.184 -%./src/Pure/PIDE/document.scala\\
1.185 -%./src/Pure/PIDE/markup\_tree.scala\\
1.186 -%./src/Pure/PIDE/text.scala\\
1.187 -%./src/Pure/PIDE/command.scala\\
1.188 -%./src/Pure/PIDE/isar\_document.scala
1.189 -%}
1.190 -%\end{frame}
1.191 -<<<<<<< local
1.192 -<<<<<<< local
1.193 -=======
1.194 ->>>>>>> other
1.195 -=======
1.196 -:\\
1.197 +./src/Pure/General/timing.scala\\
1.198 +./src/Pure/General/pretty.scala\\
1.199 +.\\
1.200 +./src/Pure/Concurrent/volatile.scala\\
1.201 +./src/Pure/Concurrent/future.scala\\
1.202 +./src/Pure/Concurrent/simple\_thread.scala\\
1.203 +.\\
1.204 +./src/Pure/Thy/html.scala\\
1.205 +./src/Pure/Thy/completion.scala\\
1.206 +./src/Pure/Thy/thy\_header.scala\\
1.207 +./src/Pure/Thy/thy\_syntax.scala\\
1.208 +./src/Pure/Isac/isac.scala\\
1.209 +./src/Pure/library.scala\\
1.210 +.\\
1.211 +./src/Pure/Isar/keyword.scala\\
1.212 +./src/Pure/Isar/outer\_syntax.scala\\
1.213 +./src/Pure/Isar/token.scala\\
1.214 +./src/Pure/Isar/parse.scala\\
1.215 +.\\
1.216 +./src/Pure/System/gui\_setup.scala\\
1.217 +./src/Pure/System/isabelle\_system.scala\\
1.218 +./src/Pure/System/swing\_thread.scala\\
1.219 +./src/Pure/System/download.scala\\
1.220 +./src/Pure/System/session\_manager.scala\\
1.221 +./src/Pure/System/standard\_system.scala\\
1.222 +./src/Pure/System/isabelle\_syntax.scala\\
1.223 +./src/Pure/System/session.scala\\
1.224 +./src/Pure/System/platform.scala\\
1.225 +./src/Pure/System/cygwin.scala\\
1.226 ./src/Pure/System/event\_bus.scala\\
1.227 ./src/Pure/System/isabelle\_process.scala\\
1.228 .\\
1.229 @@ -330,35 +202,8 @@
1.230 ./src/Pure/PIDE/isar\_document.scala
1.231 }
1.232 \end{frame}
1.233 ->>>>>>> other
1.234 -<<<<<<< local
1.235 -=======
1.236 ->>>>>>> other
1.237 -=======
1.238 ->>>>>>> other
1.239
1.240 -\begin{frame}\frametitle{*.scala --- *.ML}
1.241 -{\footnotesize
1.242 -isabisac\$ ls -l src/Pure/System/\\
1.243 --rw-r--r-- 1 msteger root 3987 2011-03-14 17:09 cygwin.scala\\
1.244 --rw-r--r-- 1 msteger root 1486 2011-03-14 17:09 download.scala\\
1.245 --rw-r--r-- 1 msteger root 1296 2011-03-14 17:09 event\_bus.scala\\
1.246 --rw-r--r-- 1 msteger root 1830 2011-03-14 17:09 gui\_setup.scala\\
1.247 --rw-r--r-- 1 msteger root 5722 2011-03-14 17:09 \alert{isabelle\_process}.\textbf{ML}\\
1.248 --rw-r--r-- 1 msteger root 1059 2011-03-14 17:09 \alert{isabelle\_process}.\textbf{scala}\\
1.249 --rw-r--r-- 1 msteger root 1659 2011-03-14 17:09 isabelle\_syntax.scala\\
1.250 --rw-r--r-- 1 msteger root 2087 2011-03-14 17:09 \alert{isabelle\_system}.\textbf{ML}\\
1.251 --rw-r--r-- 1 msteger root 1168 2011-03-14 17:09 \alert{isabelle\_system}.\textbf{scala}\\
1.252 --rw-r--r-- 1 msteger root 5935 2011-03-14 17:09 isar.ML\\
1.253 --rw-r--r-- 1 msteger root 1989 2011-03-14 17:09 platform.scala\\
1.254 --rw-r--r-- 1 msteger root 1427 2011-03-14 17:09 session\_manager.scala\\
1.255 --rw-r--r-- 1 msteger root 3833 2011-03-14 17:09 \alert{session}.\textbf{ML}\\
1.256 --rw-r--r-- 1 msteger root 9172 2011-03-14 17:09 \alert{session}.\textbf{scala}\\
1.257 --rw-r--r-- 1 msteger root 9086 2011-03-14 17:09 standard\_system.scala\\
1.258 --rw-r--r-- 1 msteger root 1643 2011-03-14 17:09 swing\_thread.scala\\
1.259
1.260 -}
1.261 -\end{frame}
1.262
1.263 \subsection[jEdit]{Das Frontend: jEdit und ``plugins''}
1.264 \begin{frame}\frametitle{Das Frontend: \\jEdit und ``plugins''}