# HG changeset patch # User wenzelm # Date 1456603453 -3600 # Node ID 31fa592761da3fae04e8fc6955797bf1a0c139ca # Parent 2c01beb70cfbb499dbc0af56c8072c99ec6a5a89 symbol interpretation for \; diff -r 2c01beb70cfb -r 31fa592761da Admin/components/components.sha1 --- a/Admin/components/components.sha1 Sat Feb 27 20:42:13 2016 +0100 +++ b/Admin/components/components.sha1 Sat Feb 27 21:04:13 2016 +0100 @@ -42,6 +42,7 @@ 2730e1475c7d655655882e75743e0b451725a274 isabelle_fonts-20151231.tar.gz 1f004a6bf20088a7e8f1b3d4153aa85de6fc1091 isabelle_fonts-20160101.tar.gz 379d51ef3b71452dac34ba905def3daa8b590f2e isabelle_fonts-20160102.tar.gz +878536aab1eaf1a52da560c20bb41ab942971fa3 isabelle_fonts-20160227.tar.gz 8d83e433c1419e0c0cc5fd1762903d11b4a5752c jdk-6u31.tar.gz 38d2d2a91c66714c18430e136e7e5191af3996e6 jdk-7u11.tar.gz d765bc4ad2f34d494429b2a8c1563c49db224944 jdk-7u13.tar.gz diff -r 2c01beb70cfb -r 31fa592761da Admin/components/main --- a/Admin/components/main Sat Feb 27 20:42:13 2016 +0100 +++ b/Admin/components/main Sat Feb 27 21:04:13 2016 +0100 @@ -4,7 +4,7 @@ cvc4-1.5pre-3 e-1.8 Haskabelle-2015 -isabelle_fonts-20160102 +isabelle_fonts-20160227 jdk-8u72 jedit_build-20151124 jfreechart-1.0.14-1 diff -r 2c01beb70cfb -r 31fa592761da NEWS --- a/NEWS Sat Feb 27 20:42:13 2016 +0100 +++ b/NEWS Sat Feb 27 21:04:13 2016 +0100 @@ -7,6 +7,11 @@ New in this Isabelle version ---------------------------- +*** General *** + +* New symbol \, e.g. for temporal operator. + + *** Isar *** * Command '\' is an alias for 'sorry', with different diff -r 2c01beb70cfb -r 31fa592761da etc/symbols --- a/etc/symbols Sat Feb 27 20:42:13 2016 +0100 +++ b/etc/symbols Sat Feb 27 21:04:13 2016 +0100 @@ -220,6 +220,7 @@ \ code: 0x002203 group: logic abbrev: ? abbrev: EX \ code: 0x002204 group: logic abbrev: ~? \ code: 0x0000ac group: logic abbrev: ~ +\ code: 0x0025cb group: logic \ code: 0x0025a1 group: logic \ code: 0x0025c7 group: logic \ code: 0x0022c4 group: operator diff -r 2c01beb70cfb -r 31fa592761da lib/fonts/IsabelleText.sfd --- a/lib/fonts/IsabelleText.sfd Sat Feb 27 20:42:13 2016 +0100 +++ b/lib/fonts/IsabelleText.sfd Sat Feb 27 21:04:13 2016 +0100 @@ -19,7 +19,7 @@ OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1050361371 -ModificationTime: 1451762222 +ModificationTime: 1456601690 PfmFamily: 17 TTFWeight: 400 TTFWidth: 5 @@ -2241,11 +2241,11 @@ DisplaySize: -96 AntiAlias: 1 FitToEm: 1 -WinInfo: 8604 18 16 +WinInfo: 9504 18 16 BeginPrivate: 0 EndPrivate TeXData: 1 0 0 631296 315648 210432 572416 -1048576 210432 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 1114189 1403 +BeginChars: 1114189 1404 StartChar: u10000 Encoding: 65536 65536 0 @@ -62426,5 +62426,52 @@ 3176.65 270.26 3176.65 270.26 3103.39 270.26 c 2,50,-1 EndSplineSet EndChar + +StartChar: circle +Encoding: 9675 9675 1403 +Width: 1724 +VWidth: 2220 +Flags: W +HStem: -184 55<672.735 1052.17> 1239 55<672.828 1052.27> +VStem: 124 56<362.596 745.19> 1545 56<364.81 747.404> +LayerCount: 2 +Fore +SplineSet +1601 555 m 0,0,1 + 1601 406 1601 406 1542.5 269.5 c 128,-1,2 + 1484 133 1484 133 1385.5 33.5 c 128,-1,3 + 1287 -66 1287 -66 1149.5 -125 c 128,-1,4 + 1012 -184 1012 -184 861 -184 c 0,5,6 + 713 -184 713 -184 577 -126 c 128,-1,7 + 441 -68 441 -68 341.5 30.5 c 128,-1,8 + 242 129 242 129 183 266.5 c 128,-1,9 + 124 404 124 404 124 555 c 0,10,11 + 124 704 124 704 182.5 840.5 c 128,-1,12 + 241 977 241 977 339.5 1076.5 c 128,-1,13 + 438 1176 438 1176 575.5 1235 c 128,-1,14 + 713 1294 713 1294 864 1294 c 0,15,16 + 1012 1294 1012 1294 1148 1236 c 128,-1,17 + 1284 1178 1284 1178 1383 1079.5 c 128,-1,18 + 1482 981 1482 981 1541.5 843.5 c 128,-1,19 + 1601 706 1601 706 1601 555 c 0,0,1 +864 -129 m 0,20,21 + 1001 -129 1001 -129 1126.5 -75 c 128,-1,22 + 1252 -21 1252 -21 1344 70.5 c 128,-1,23 + 1436 162 1436 162 1490.5 288.5 c 128,-1,24 + 1545 415 1545 415 1545 555 c 0,25,26 + 1545 693 1545 693 1491 819.5 c 128,-1,27 + 1437 946 1437 946 1346 1038 c 128,-1,28 + 1255 1130 1255 1130 1128 1184.5 c 128,-1,29 + 1001 1239 1001 1239 861 1239 c 0,30,31 + 724 1239 724 1239 598.5 1185 c 128,-1,32 + 473 1131 473 1131 381 1039.5 c 128,-1,33 + 289 948 289 948 234.5 821.5 c 128,-1,34 + 180 695 180 695 180 555 c 0,35,36 + 180 417 180 417 234 290.5 c 128,-1,37 + 288 164 288 164 379 72 c 128,-1,38 + 470 -20 470 -20 597 -74.5 c 128,-1,39 + 724 -129 724 -129 864 -129 c 0,20,21 +EndSplineSet +EndChar EndChars EndSplineFont diff -r 2c01beb70cfb -r 31fa592761da lib/fonts/IsabelleTextBold.sfd --- a/lib/fonts/IsabelleTextBold.sfd Sat Feb 27 20:42:13 2016 +0100 +++ b/lib/fonts/IsabelleTextBold.sfd Sat Feb 27 21:04:13 2016 +0100 @@ -20,7 +20,7 @@ OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1050374980 -ModificationTime: 1451762294 +ModificationTime: 1456601640 PfmFamily: 17 TTFWeight: 700 TTFWidth: 5 @@ -1678,10 +1678,10 @@ DisplaySize: -96 AntiAlias: 1 FitToEm: 1 -WinInfo: 8589 21 15 +WinInfo: 9513 21 15 BeginPrivate: 0 EndPrivate -BeginChars: 1114115 1395 +BeginChars: 1114115 1396 StartChar: .notdef Encoding: 1114112 -1 0 @@ -68806,5 +68806,51 @@ 1527.71 468.866 1527.71 468.866 1456.29 435.035 c 2,67,-1 EndSplineSet EndChar + +StartChar: circle +Encoding: 9675 9675 1395 +Width: 1724 +Flags: W +HStem: -235 157<631.134 1093.26> 1188 157<631.737 1093.87> +VStem: 73 158<325.375 786.478> 1494 158<323.522 784.955> +LayerCount: 2 +Fore +SplineSet +1589.5 250 m 128,-1,1 + 1527 104 1527 104 1421.5 -2.5 c 128,-1,2 + 1316 -109 1316 -109 1169 -172 c 128,-1,3 + 1022 -235 1022 -235 861 -235 c 0,4,5 + 703 -235 703 -235 557.5 -173 c 128,-1,6 + 412 -111 412 -111 305.5 -5.5 c 128,-1,7 + 199 100 199 100 136 247 c 128,-1,8 + 73 394 73 394 73 555 c 0,9,10 + 73 714 73 714 135.5 860 c 128,-1,11 + 198 1006 198 1006 303.5 1112.5 c 128,-1,12 + 409 1219 409 1219 556 1282 c 128,-1,13 + 703 1345 703 1345 864 1345 c 0,14,15 + 1022 1345 1022 1345 1167.5 1283 c 128,-1,16 + 1313 1221 1313 1221 1419 1115.5 c 128,-1,17 + 1525 1010 1525 1010 1588.5 863.5 c 128,-1,18 + 1652 717 1652 717 1652 555 c 0,19,0 + 1652 396 1652 396 1589.5 250 c 128,-1,1 +864 -78 m 0,20,21 + 990 -78 990 -78 1106.5 -28 c 128,-1,22 + 1223 22 1223 22 1308 106.5 c 128,-1,23 + 1393 191 1393 191 1443.5 308.5 c 128,-1,24 + 1494 426 1494 426 1494 555 c 0,25,26 + 1494 683 1494 683 1444 800 c 128,-1,27 + 1394 917 1394 917 1310 1002 c 128,-1,28 + 1226 1087 1226 1087 1108.5 1137.5 c 128,-1,29 + 991 1188 991 1188 861 1188 c 0,30,31 + 735 1188 735 1188 618.5 1138 c 128,-1,32 + 502 1088 502 1088 417 1003.5 c 128,-1,33 + 332 919 332 919 281.5 801.5 c 128,-1,34 + 231 684 231 684 231 555 c 0,35,36 + 231 427 231 427 281 310 c 128,-1,37 + 331 193 331 193 415 108 c 128,-1,38 + 499 23 499 23 616.5 -27.5 c 128,-1,39 + 734 -78 734 -78 864 -78 c 0,20,21 +EndSplineSet +EndChar EndChars EndSplineFont diff -r 2c01beb70cfb -r 31fa592761da lib/texinputs/isabellesym.sty --- a/lib/texinputs/isabellesym.sty Sat Feb 27 20:42:13 2016 +0100 +++ b/lib/texinputs/isabellesym.sty Sat Feb 27 21:04:13 2016 +0100 @@ -222,6 +222,7 @@ \newcommand{\isasymexists}{\isamath{\exists\,}} \newcommand{\isasymnot}{\isamath{\neg}} \newcommand{\isasymnexists}{\isamath{\nexists\,}} %requires amssymb +\newcommand{\isasymcircle}{\isamath{\ocircle}} %requires wasysym \newcommand{\isasymbox}{\isamath{\Box}} %requires amssymb \newcommand{\isasymdiamond}{\isamath{\Diamond}} %requires amssymb \newcommand{\isasymdiamondop}{\isamath{\diamond}}