use "Isabelle DejaVu" fonts uniformly: Text Area, GUI elements, HTML output etc.;
authorwenzelm
Sat Nov 24 18:56:44 2018 +0100 (9 months ago)
changeset 69343395c4fb15ea2
parent 69342 fa981730b964
child 69344 f87fdd8d2baf
use "Isabelle DejaVu" fonts uniformly: Text Area, GUI elements, HTML output etc.;
Admin/components/components.sha1
Admin/components/main
NEWS
etc/isabelle.css
etc/symbols
lib/fonts/README
src/Doc/JEdit/JEdit.thy
src/Pure/Admin/build_fonts.scala
src/Pure/GUI/gui.scala
src/Pure/Thy/html.scala
src/Tools/VSCode/extension/README.md
src/Tools/jEdit/src/jEdit.props
     1.1 --- a/Admin/components/components.sha1	Sat Nov 24 16:41:18 2018 +0100
     1.2 +++ b/Admin/components/components.sha1	Sat Nov 24 18:56:44 2018 +0100
     1.3 @@ -70,6 +70,7 @@
     1.4  b70690c85c05d0ca5bc29287abd20142f6ddcfb0  isabelle_fonts-20171222.tar.gz
     1.5  c17c482e411bbaf992498041a3e1dea80336aaa6  isabelle_fonts-20171230.tar.gz
     1.6  3affbb306baff37c360319b21cbaa2cc96ebb282  isabelle_fonts-20180113.tar.gz
     1.7 +bee32019e5d7cf096ef2ea1d836c732e9a7628cc  isabelle_fonts-20181124.tar.gz
     1.8  0b2206f914336dec4923dd0479d8cee4b904f544  jdk-11+28.tar.gz
     1.9  71d19df63816e9be1c4c5eb44aea7a44cfadb319  jdk-11.tar.gz
    1.10  8d83e433c1419e0c0cc5fd1762903d11b4a5752c  jdk-6u31.tar.gz
     2.1 --- a/Admin/components/main	Sat Nov 24 16:41:18 2018 +0100
     2.2 +++ b/Admin/components/main	Sat Nov 24 18:56:44 2018 +0100
     2.3 @@ -4,7 +4,7 @@
     2.4  csdp-6.x
     2.5  cvc4-1.5-4
     2.6  e-2.0-2
     2.7 -isabelle_fonts-20180113
     2.8 +isabelle_fonts-20181124
     2.9  jdk-11+28
    2.10  jedit_build-20181026
    2.11  jfreechart-1.5.0
     3.1 --- a/NEWS	Sat Nov 24 16:41:18 2018 +0100
     3.2 +++ b/NEWS	Sat Nov 24 18:56:44 2018 +0100
     3.3 @@ -9,6 +9,18 @@
     3.4  
     3.5  *** General ***
     3.6  
     3.7 +* The font family "Isabelle DejaVu" is systematically derived from the
     3.8 +existing "DejaVu" collection, with variants "Sans Mono", "Sans", "Serif"
     3.9 +and styles "Normal", "Bold", "Italic/Oblique", "Bold-Italic/Oblique".
    3.10 +The DejaVu base fonts are retricted to well-defined Unicode ranges and
    3.11 +augmented by special Isabelle symbols, taken from the former
    3.12 +"IsabelleText" font (which is no longer provided separately). The line
    3.13 +metrics and overall rendering quality is closer to original DejaVu.
    3.14 +INCOMPATIBILITY with display configuration expecting the old
    3.15 +"IsabelleText" font: use e.g. "Isabelle DejaVu Sans Mono" instead.
    3.16 +
    3.17 +* The Isabelle fonts render "\<inverse>" properly as superscript "-1".
    3.18 +
    3.19  * Old-style inner comments (* ... *) within the term language are no
    3.20  longer supported (legacy feature in Isabelle2018).
    3.21  
    3.22 @@ -22,6 +34,14 @@
    3.23  
    3.24  *** Isabelle/jEdit Prover IDE ***
    3.25  
    3.26 +* Fonts for the text area, gutter, GUI elements etc. use the "Isabelle
    3.27 +DejaVu" collection by default, which provides uniform rendering quality
    3.28 +with the usual Isabelle symbols. For Java/Swing GUI elements this
    3.29 +requires the Metal look-and-feel: it is the default on Linux, but not
    3.30 +macOS nor Windows. Line spacing no longer needs to be adjusted:
    3.31 +properties for the old IsabelleText font had "Global Options / Text Area
    3.32 +/ Extra vertical line spacing (in pixels): -2", now it defaults to 0.
    3.33 +
    3.34  * Improved sub-pixel font rendering (especially on Linux), thanks to
    3.35  OpenJDK 11.
    3.36  
     4.1 --- a/etc/isabelle.css	Sat Nov 24 16:41:18 2018 +0100
     4.2 +++ b/etc/isabelle.css	Sat Nov 24 18:56:44 2018 +0100
     4.3 @@ -17,16 +17,16 @@
     4.4    direction: ltr; unicode-bidi: bidi-override;
     4.5    background-color: #FFFFFF;
     4.6    padding: 10px;
     4.7 -  font-family: IsabelleText;
     4.8 +  font-family: "Isabelle DejaVu Sans Mono", monospace;
     4.9    line-height: 147%;
    4.10  }
    4.11  
    4.12  .theories { background-color: #FFFFFF; padding: 10px; }
    4.13  .sessions { background-color: #FFFFFF; padding: 10px; }
    4.14 -.document { white-space: normal; font-family: sans-serif; }
    4.15 +.document { white-space: normal; font-family: "Isabelle DejaVu Serif", serif; }
    4.16  
    4.17  .name     { font-style: italic; }
    4.18 -.filename { font-family: fixed; }
    4.19 +.filename { font-family: "Isabelle DejaVu Sans Mono", monospace; }
    4.20  
    4.21  
    4.22  /* basic syntax markup */
     5.1 --- a/etc/symbols	Sat Nov 24 16:41:18 2018 +0100
     5.2 +++ b/etc/symbols	Sat Nov 24 18:56:44 2018 +0100
     5.3 @@ -358,36 +358,36 @@
     5.4  \<some>                 code: 0x0003f5
     5.5  \<hole>                 code: 0x002311
     5.6  \<newline>              code: 0x0023ce
     5.7 -\<comment>              code: 0x002015  group: document  argument: space_cartouche  font: IsabelleText
     5.8 -\<^cancel>              code: 0x002326  group: document  argument: cartouche  font: IsabelleText
     5.9 +\<comment>              code: 0x002015  group: document  argument: space_cartouche  font: Isabelle␣DejaVu␣Sans␣Mono
    5.10 +\<^cancel>              code: 0x002326  group: document  argument: cartouche  font: Isabelle␣DejaVu␣Sans␣Mono
    5.11  \<^latex>                               group: document  argument: cartouche
    5.12 -\<open>                 code: 0x002039  group: punctuation  font: IsabelleText  abbrev: <<
    5.13 -\<close>                code: 0x00203a  group: punctuation  font: IsabelleText  abbrev: >>
    5.14 -\<^here>                code: 0x002302  font: IsabelleText
    5.15 -\<^undefined>           code: 0x002756  font: IsabelleText
    5.16 -\<^noindent>            code: 0x0021e4  group: document  font: IsabelleText
    5.17 -\<^smallskip>           code: 0x002508  group: document  font: IsabelleText
    5.18 -\<^medskip>             code: 0x002509  group: document  font: IsabelleText
    5.19 -\<^bigskip>             code: 0x002501  group: document  font: IsabelleText
    5.20 -\<^item>                code: 0x0025aa  group: document  font: IsabelleText
    5.21 -\<^enum>                code: 0x0025b8  group: document  font: IsabelleText
    5.22 -\<^descr>               code: 0x0027a7  group: document  font: IsabelleText
    5.23 -\<^footnote>            code: 0x00204b  group: document  argument: cartouche  font: IsabelleText
    5.24 -\<^verbatim>            code: 0x0025a9  group: document  argument: cartouche  font: IsabelleText
    5.25 -\<^theory_text>         code: 0x002b1a  group: document  argument: cartouche  font: IsabelleText
    5.26 -\<^emph>                code: 0x002217  group: document  argument: cartouche  font: IsabelleText
    5.27 -\<^bold>                code: 0x002759  group: control  argument: cartouche  group: document  font: IsabelleText
    5.28 -\<^sub>                 code: 0x0021e9  group: control  font: IsabelleText
    5.29 -\<^sup>                 code: 0x0021e7  group: control  font: IsabelleText
    5.30 -\<^bsub>                code: 0x0021d8  group: control_block  font: IsabelleText  abbrev: =_(
    5.31 -\<^esub>                code: 0x0021d9  group: control_block  font: IsabelleText  abbrev: =_)
    5.32 -\<^bsup>                code: 0x0021d7  group: control_block  font: IsabelleText  abbrev: =^(
    5.33 -\<^esup>                code: 0x0021d6  group: control_block  font: IsabelleText  abbrev: =^)
    5.34 -\<^file>                code: 0x01F5CF  group: icon  argument: cartouche  font: IsabelleText
    5.35 -\<^dir>                 code: 0x01F5C0  group: icon  argument: cartouche  font: IsabelleText
    5.36 -\<^url>                 code: 0x01F310  group: icon  argument: cartouche  font: IsabelleText
    5.37 -\<^doc>                 code: 0x01F4D3  group: icon  argument: cartouche  font: IsabelleText
    5.38 -\<^action>              code: 0x00261b  group: icon  argument: cartouche  font: IsabelleText
    5.39 +\<open>                 code: 0x002039  group: punctuation  font: Isabelle␣DejaVu␣Sans␣Mono  abbrev: <<
    5.40 +\<close>                code: 0x00203a  group: punctuation  font: Isabelle␣DejaVu␣Sans␣Mono  abbrev: >>
    5.41 +\<^here>                code: 0x002302  font: Isabelle␣DejaVu␣Sans␣Mono
    5.42 +\<^undefined>           code: 0x002756  font: Isabelle␣DejaVu␣Sans␣Mono
    5.43 +\<^noindent>            code: 0x0021e4  group: document  font: Isabelle␣DejaVu␣Sans␣Mono
    5.44 +\<^smallskip>           code: 0x002508  group: document  font: Isabelle␣DejaVu␣Sans␣Mono
    5.45 +\<^medskip>             code: 0x002509  group: document  font: Isabelle␣DejaVu␣Sans␣Mono
    5.46 +\<^bigskip>             code: 0x002501  group: document  font: Isabelle␣DejaVu␣Sans␣Mono
    5.47 +\<^item>                code: 0x0025aa  group: document  font: Isabelle␣DejaVu␣Sans␣Mono
    5.48 +\<^enum>                code: 0x0025b8  group: document  font: Isabelle␣DejaVu␣Sans␣Mono
    5.49 +\<^descr>               code: 0x0027a7  group: document  font: Isabelle␣DejaVu␣Sans␣Mono
    5.50 +\<^footnote>            code: 0x00204b  group: document  argument: cartouche  font: Isabelle␣DejaVu␣Sans␣Mono
    5.51 +\<^verbatim>            code: 0x0025a9  group: document  argument: cartouche  font: Isabelle␣DejaVu␣Sans␣Mono
    5.52 +\<^theory_text>         code: 0x002b1a  group: document  argument: cartouche  font: Isabelle␣DejaVu␣Sans␣Mono
    5.53 +\<^emph>                code: 0x002217  group: document  argument: cartouche  font: Isabelle␣DejaVu␣Sans␣Mono
    5.54 +\<^bold>                code: 0x002759  group: control  argument: cartouche  group: document  font: Isabelle␣DejaVu␣Sans␣Mono
    5.55 +\<^sub>                 code: 0x0021e9  group: control  font: Isabelle␣DejaVu␣Sans␣Mono
    5.56 +\<^sup>                 code: 0x0021e7  group: control  font: Isabelle␣DejaVu␣Sans␣Mono
    5.57 +\<^bsub>                code: 0x0021d8  group: control_block  font: Isabelle␣DejaVu␣Sans␣Mono  abbrev: =_(
    5.58 +\<^esub>                code: 0x0021d9  group: control_block  font: Isabelle␣DejaVu␣Sans␣Mono  abbrev: =_)
    5.59 +\<^bsup>                code: 0x0021d7  group: control_block  font: Isabelle␣DejaVu␣Sans␣Mono  abbrev: =^(
    5.60 +\<^esup>                code: 0x0021d6  group: control_block  font: Isabelle␣DejaVu␣Sans␣Mono  abbrev: =^)
    5.61 +\<^file>                code: 0x01F5CF  group: icon  argument: cartouche  font: Isabelle␣DejaVu␣Sans␣Mono
    5.62 +\<^dir>                 code: 0x01F5C0  group: icon  argument: cartouche  font: Isabelle␣DejaVu␣Sans␣Mono
    5.63 +\<^url>                 code: 0x01F310  group: icon  argument: cartouche  font: Isabelle␣DejaVu␣Sans␣Mono
    5.64 +\<^doc>                 code: 0x01F4D3  group: icon  argument: cartouche  font: Isabelle␣DejaVu␣Sans␣Mono
    5.65 +\<^action>              code: 0x00261b  group: icon  argument: cartouche  font: Isabelle␣DejaVu␣Sans␣Mono
    5.66  \<^assert>
    5.67  \<^binding>             argument: cartouche
    5.68  \<^class>               argument: cartouche
     6.1 --- a/lib/fonts/README	Sat Nov 24 16:41:18 2018 +0100
     6.2 +++ b/lib/fonts/README	Sat Nov 24 18:56:44 2018 +0100
     6.3 @@ -1,13 +1,23 @@
     6.4 +Isabelle DejaVu fonts
     6.5 +=====================
     6.6 +
     6.7  The Isabelle fonts are subject to the same BSD-3-clause license as Isabelle.
     6.8  
     6.9 -The fonts have been assembled with FontForge
    6.10 -(http://fontforge.sourceforge.net), by composing glyphs from existing (free)
    6.11 -fonts: Bluesky TeX fonts (scaled 222%) and Bitstream Vera Mono, with some
    6.12 -additions from DejaVu Sans Mono and DejaVu Sans.
    6.13 +TTF files are produced automatically from the Deja Vu font family, with
    6.14 +special symbols from the IsabelleText font in $ISABELLE_HOME/lib/fonts:
    6.15 +
    6.16 +  isabelle build_fonts -d dejavu-fonts-ttf-2.37/ttf
    6.17  
    6.18 -Some additional symbols are from Symbola. See http://greekfonts.teilar.gr
    6.19 -"In lieu of a licence; fonts and documents in this site are free for any use;
    6.20 -George Douros".
    6.21 +The IsabelleText template has been assembled manually, by composing glyphs
    6.22 +from Bluesky TeX fonts (scaled 222%) with some additions from DejaVu Sans Mono
    6.23 +and DejaVu Sans. Some additional symbols are from Symbola, see
    6.24 +http://greekfonts.teilar.gr "In lieu of a licence; fonts and documents in this
    6.25 +site are free for any use; George Douros".
    6.26 +
    6.27 +
    6.28 +    Makarius
    6.29 +    23-Nov-2018
    6.30 +
    6.31  
    6.32  ----------------------------------------------------------------------------
    6.33  
     7.1 --- a/src/Doc/JEdit/JEdit.thy	Sat Nov 24 16:41:18 2018 +0100
     7.2 +++ b/src/Doc/JEdit/JEdit.thy	Sat Nov 24 18:56:44 2018 +0100
     7.3 @@ -525,21 +525,20 @@
     7.4  text \<open>Correct rendering via Unicode requires a font that contains glyphs for
     7.5    the corresponding codepoints. There are also various unusual symbols with
     7.6    particular purpose in Isabelle, e.g.\ control symbols and very long arrows.
     7.7 -  Isabelle/jEdit prefers its own application fonts \<^verbatim>\<open>IsabelleText\<close>, which
     7.8 -  ensures that standard collection of Isabelle symbols is actually shown on
     7.9 -  the screen (or printer) as expected.
    7.10 +  Isabelle/jEdit prefers its own font collection \<^verbatim>\<open>Isabelle DejaVu\<close>, which
    7.11 +  ensures that all standard Isabelle symbols are shown on the screen (or
    7.12 +  printer) as expected.
    7.13  
    7.14    Note that a Java/AWT/Swing application can load additional fonts only if
    7.15 -  they are not installed on the operating system already! Some outdated
    7.16 -  version of \<^verbatim>\<open>IsabelleText\<close> that happens to be provided by the operating
    7.17 -  system would prevent Isabelle/jEdit to use its bundled version. This could
    7.18 -  lead to missing glyphs (black rectangles), when the system version of
    7.19 -  \<^verbatim>\<open>IsabelleText\<close> is older than the application version. This problem can be
    7.20 -  avoided by refraining to ``install'' any version of \<^verbatim>\<open>IsabelleText\<close> in the
    7.21 -  first place, although it might be tempting to use the same font in other
    7.22 -  applications.
    7.23 +  they are not installed on the operating system already! Outdated versions of
    7.24 +  Isabelle fonts that happen to be provided by the operating system prevent
    7.25 +  Isabelle/jEdit to use its bundled version. This could lead to missing glyphs
    7.26 +  (black rectangles), when the system version of a font is older than the
    7.27 +  application version. This problem can be avoided by refraining to
    7.28 +  ``install'' any version of \<^verbatim>\<open>IsabelleText\<close> in the first place, although it
    7.29 +  might be tempting to use the same font in other applications.
    7.30  
    7.31 -  HTML pages generated by Isabelle refer to the same \<^verbatim>\<open>IsabelleText\<close> font as a
    7.32 +  HTML pages generated by Isabelle refer to the same Isabelle fonts as a
    7.33    server-side resource. Thus a web-browser can use that without requiring a
    7.34    locally installed copy.
    7.35  \<close>
    7.36 @@ -2141,7 +2140,7 @@
    7.37    \<^item> \<^bold>\<open>Problem:\<close> Mac OS X system fonts sometimes lead to character drop-outs in
    7.38    the main text area.
    7.39  
    7.40 -  \<^bold>\<open>Workaround:\<close> Use the default \<^verbatim>\<open>IsabelleText\<close> font.
    7.41 +  \<^bold>\<open>Workaround:\<close> Use the default \<^verbatim>\<open>Isabelle DejaVu\<close> fonts.
    7.42  
    7.43    \<^item> \<^bold>\<open>Problem:\<close> Some Linux/X11 input methods such as IBus tend to disrupt key
    7.44    event handling of Java/AWT/Swing.
     8.1 --- a/src/Pure/Admin/build_fonts.scala	Sat Nov 24 16:41:18 2018 +0100
     8.2 +++ b/src/Pure/Admin/build_fonts.scala	Sat Nov 24 18:56:44 2018 +0100
     8.3 @@ -1,7 +1,7 @@
     8.4  /*  Title:      Pure/Admin/build_fonts.scala
     8.5      Author:     Makarius
     8.6  
     8.7 -Build of Isabelle fonts: Deja Vu + special symbols.
     8.8 +Build of Isabelle fonts: DejaVu + special symbols.
     8.9  */
    8.10  
    8.11  package isabelle
    8.12 @@ -186,24 +186,6 @@
    8.13  
    8.14      val font_dirs = source_dirs ::: List(Path.explode("~~/lib/fonts"))
    8.15  
    8.16 -    for (isabelle_font <- Family.isabelle_text.fonts) {
    8.17 -      val isabelle_file = find_file(font_dirs, isabelle_font)
    8.18 -      val isabelle_names = Fontforge.font_names(isabelle_file)
    8.19 -
    8.20 -      val target_names = isabelle_names.update(version = target_version)
    8.21 -      val target_file = target_dir + target_names.ttf
    8.22 -
    8.23 -      progress.echo("Creating " + target_file.toString + " ...")
    8.24 -      Fontforge.execute(
    8.25 -        Fontforge.commands(
    8.26 -          Fontforge.open(isabelle_file),
    8.27 -          target_names.set,
    8.28 -          Fontforge.generate(target_file),
    8.29 -          Fontforge.close
    8.30 -        )
    8.31 -      ).check
    8.32 -    }
    8.33 -
    8.34      for { source <- sources; (source_font, index) <- source.fonts.zipWithIndex } {
    8.35        val isabelle_file = find_file(font_dirs, Family.isabelle_text.get(index))
    8.36  
    8.37 @@ -251,7 +233,7 @@
    8.38      -D DIR       target directory (default ".")
    8.39      -d DIR       additional source directory
    8.40  
    8.41 -  Construct Isabelle fonts from Deja Vu font families and Isabelle symbols.
    8.42 +  Construct Isabelle fonts from DejaVu font families and Isabelle symbols.
    8.43  """,
    8.44          "D:" -> (arg => target_dir = Path.explode(arg)),
    8.45          "d:" -> (arg => source_dirs = source_dirs ::: List(Path.explode(arg))))
     9.1 --- a/src/Pure/GUI/gui.scala	Sat Nov 24 16:41:18 2018 +0100
     9.2 +++ b/src/Pure/GUI/gui.scala	Sat Nov 24 18:56:44 2018 +0100
     9.3 @@ -236,7 +236,7 @@
     9.4      font.deriveFont(Map(TextAttribute.TRANSFORM -> new TransformAttribute(transform)))
     9.5    }
     9.6  
     9.7 -  def font(family: String = "IsabelleText", size: Int = 1, bold: Boolean = false): Font =
     9.8 +  def font(family: String = "Isabelle DejaVu Sans", size: Int = 1, bold: Boolean = false): Font =
     9.9      new Font(family, if (bold) Font.BOLD else Font.PLAIN, size)
    9.10  
    9.11    def install_fonts()
    10.1 --- a/src/Pure/Thy/html.scala	Sat Nov 24 16:41:18 2018 +0100
    10.2 +++ b/src/Pure/Thy/html.scala	Sat Nov 24 18:56:44 2018 +0100
    10.3 @@ -358,19 +358,31 @@
    10.4  
    10.5    def fonts_css(make_url: String => String = fonts_url()): String =
    10.6    {
    10.7 -    def font_face(name: String, ttf_name: String, bold: Boolean = false): String =
    10.8 +    def font_face(
    10.9 +        name: String, ttf_name: String, bold: Boolean = false, italic: Boolean = false): String =
   10.10        cat_lines(
   10.11          List(
   10.12            "@font-face {",
   10.13            "  font-family: '" + name + "';",
   10.14            "  src: url('" + make_url(ttf_name) + "') format('truetype');") :::
   10.15          (if (bold) List("  font-weight: bold;") else Nil) :::
   10.16 +        (if (italic) List("  font-style: italic;") else Nil) :::
   10.17          List("}"))
   10.18  
   10.19      List(
   10.20        "/* Isabelle fonts */",
   10.21 -      font_face("IsabelleText", "IsabelleText.ttf"),
   10.22 -      font_face("IsabelleText", "IsabelleTextBold.ttf", bold = true),
   10.23 +      font_face("Isabelle DejaVu Sans Mono", "IsabelleDejaVuSansMono.ttf"),
   10.24 +      font_face("Isabelle DejaVu Sans Mono", "IsabelleDejaVuSansMono-Bold.ttf", bold = true),
   10.25 +      font_face("Isabelle DejaVu Sans Mono", "IsabelleDejaVuSansMono-Oblique.ttf", italic = true),
   10.26 +      font_face("Isabelle DejaVu Sans Mono", "IsabelleDejaVuSansMono-BoldOblique.ttf", bold = true, italic = true),
   10.27 +      font_face("Isabelle DejaVu Sans", "IsabelleDejaVuSans.ttf"),
   10.28 +      font_face("Isabelle DejaVu Sans", "IsabelleDejaVuSans-Bold.ttf", bold = true),
   10.29 +      font_face("Isabelle DejaVu Sans", "IsabelleDejaVuSans-Oblique.ttf", italic = true),
   10.30 +      font_face("Isabelle DejaVu Sans", "IsabelleDejaVuSans-BoldOblique.ttf", bold = true, italic = true),
   10.31 +      font_face("Isabelle DejaVu Serif", "IsabelleDejaVuSerif.ttf"),
   10.32 +      font_face("Isabelle DejaVu Serif", "IsabelleDejaVuSerif-Bold.ttf", bold = true),
   10.33 +      font_face("Isabelle DejaVu Serif", "IsabelleDejaVuSerif-Oblique.ttf", italic = true),
   10.34 +      font_face("Isabelle DejaVu Serif", "IsabelleDejaVuSerif-BoldOblique.ttf", bold = true, italic = true),
   10.35        font_face("Vacuous", "Vacuous.ttf")).mkString("\n\n")
   10.36    }
   10.37  
    11.1 --- a/src/Tools/VSCode/extension/README.md	Sat Nov 24 16:41:18 2018 +0100
    11.2 +++ b/src/Tools/VSCode/extension/README.md	Sat Nov 24 18:56:44 2018 +0100
    11.3 @@ -161,7 +161,7 @@
    11.4  
    11.5  ## Known Limitations of Isabelle/VSCode
    11.6  
    11.7 -  * Lack of specific support for the `IsabelleText` fonts: these need to be
    11.8 +  * Lack of specific support for the Isabelle fonts: these need to be
    11.9    manually installed on the system and configured for VSCode (see also
   11.10    `$ISABELLE_FONTS` within the Isabelle environment).
   11.11  
    12.1 --- a/src/Tools/jEdit/src/jEdit.props	Sat Nov 24 16:41:18 2018 +0100
    12.2 +++ b/src/Tools/jEdit/src/jEdit.props	Sat Nov 24 18:56:44 2018 +0100
    12.3 @@ -12,7 +12,7 @@
    12.4  complete-word.shortcut=
    12.5  console.dock-position=floating
    12.6  console.encoding=UTF-8
    12.7 -console.font=IsabelleText
    12.8 +console.font=Isabelle DejaVu Sans Mono
    12.9  console.fontsize=14
   12.10  delete-line.shortcut=A+d
   12.11  delete.shortcut2=C+d
   12.12 @@ -183,6 +183,7 @@
   12.13  focus-buffer-switcher.shortcut2=A+CIRCUMFLEX
   12.14  foldPainter=Circle
   12.15  gatchan.highlight.overview=false
   12.16 +helpviewer.font=Isabelle DejaVu Serif
   12.17  home.shortcut=
   12.18  insert-newline-indent.shortcut=
   12.19  insert-newline.shortcut=
   12.20 @@ -251,6 +252,8 @@
   12.21  logo.icon.medium=32x32/apps/isabelle.gif
   12.22  lookAndFeel=javax.swing.plaf.metal.MetalLookAndFeel
   12.23  match-bracket.shortcut2=C+9
   12.24 +metal.primary.font=Isabelle DejaVu Sans
   12.25 +metal.secondary.font=Isabelle DejaVu Sans
   12.26  navigator.showOnToolbar=true
   12.27  next-bracket.shortcut2=C+e C+9
   12.28  options.shortcuts.deletekeymap.label=Delete
   12.29 @@ -258,12 +261,12 @@
   12.30  options.shortcuts.duplicatekeymap.label=Duplicate
   12.31  options.shortcuts.resetkeymap.dialog.title=Reset keymap
   12.32  options.shortcuts.resetkeymap.label=Reset
   12.33 -options.textarea.lineSpacing=-2
   12.34 +options.textarea.lineSpacing=0
   12.35  plugin-blacklist.MacOSX.jar=true
   12.36  plugin.MacOSXPlugin.altDispatcher=false
   12.37  plugin.MacOSXPlugin.disableOption=true
   12.38  prev-bracket.shortcut2=C+e C+8
   12.39 -print.font=IsabelleText
   12.40 +print.font=Isabelle DejaVu Sans Mono
   12.41  print.glyphVector=true
   12.42  recent-buffer.shortcut2=C+CIRCUMFLEX
   12.43  restore.remote=false
   12.44 @@ -300,9 +303,10 @@
   12.45  view.docking.framework=PIDE
   12.46  view.eolMarkers=false
   12.47  view.extendedState=0
   12.48 -view.font=IsabelleText
   12.49 +view.font=Isabelle DejaVu Sans Mono
   12.50  view.fontsize=18
   12.51  view.fracFontMetrics=false
   12.52 +view.gutter.font=Isabelle DejaVu Sans Mono
   12.53  view.gutter.fontsize=12
   12.54  view.gutter.lineNumbers=false
   12.55  view.gutter.selectionAreaWidth=18