diff options
| author | Norbert Preining <norbert@preining.info> | 2022-07-20 03:00:57 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2022-07-20 03:00:57 +0000 |
| commit | 2773132ea593028dafe764f7560fd94ecb827d3d (patch) | |
| tree | 1ec66117c0fd26fa54a99c69602512a8f96bb9af /fonts | |
| parent | 8ff4930a7a6c0dcfef1066c5537747570c7967b3 (diff) | |
CTAN sync 202207200300
Diffstat (limited to 'fonts')
41 files changed, 570 insertions, 55 deletions
diff --git a/fonts/feyn/README b/fonts/feyn/README index 4477b02799..6c8044502a 100644 --- a/fonts/feyn/README +++ b/fonts/feyn/README @@ -2,7 +2,7 @@ Feyn: a Metafont for Feynman diagrams ------------------------------------- -Version 0.4.1. +Version 0.4.2. This package is intended to produce relatively simple Feynman diagrams, for example within equations. @@ -59,4 +59,4 @@ see the file LICENCE for details. Norman Gray -http://nxg.me.uk +https://nxg.me.uk diff --git a/fonts/feyn/VERSION b/fonts/feyn/VERSION index 9b1b241646..526394f33e 100644 --- a/fonts/feyn/VERSION +++ b/fonts/feyn/VERSION @@ -1 +1 @@ -feyn-0.4.1 +feyn-0.4.2 diff --git a/fonts/feyn/exercise-font.pdf b/fonts/feyn/exercise-font.pdf Binary files differindex 0ef358242a..68ab27ff61 100644 --- a/fonts/feyn/exercise-font.pdf +++ b/fonts/feyn/exercise-font.pdf diff --git a/fonts/feyn/feyn.dtx b/fonts/feyn/feyn.dtx index cb371f9019..73827d2672 100644 --- a/fonts/feyn/feyn.dtx +++ b/fonts/feyn/feyn.dtx @@ -5,17 +5,17 @@ %% It is distributed under the terms of the 2-clause BSD Licence; %% see the file LICENCE for details. % -%<+package|driver>%% VCS Info: Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +%<+package|driver>%% VCS Info: Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 %<+package>\NeedsTeXFormat{LaTeX2e} -%<+package>\ProvidesPackage{feyn}[2017/11/03 0.4.1] -%<+package>\typeout{Package: `feyn' 0.4.1 <2017/11/03>} +%<+package>\ProvidesPackage{feyn}[2022/07/18 0.4.2] +%<+package>\typeout{Package: `feyn' 0.4.2 <2022/07/18>} % %<*driver> \documentclass{ltxdoc} \usepackage{feyn} \title{The feyn font} -\author{Norman Gray\\(\texttt{norman@astro.gla.ac.uk})} -\date{Version 0.4.1, 2017 November 03} +\author{Norman Gray\\(\texttt{https://nxg.me.uk})} +\date{Version 0.4.2, 2022 July 18} \newcommand\Lopt[1]{\textsf {#1}} \newcommand\file[1]{\texttt {#1}} \newcommand\Lcount[1]{\textsl {\small#1}} diff --git a/fonts/feyn/feyn.html b/fonts/feyn/feyn.html index 64d26c31cd..14e432b81b 100644 --- a/fonts/feyn/feyn.html +++ b/fonts/feyn/feyn.html @@ -2,16 +2,20 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Feyn font</title> -<link href="http://nxg.me.uk" rev="author"/> +<link href="https://nxg.me.uk" rev="author"/> <link type="text/css" rel="stylesheet" href="style.css"/> +<base href='.' /> </head> <body> <h1>Feyn font</h1> <div class="abstract"> <p>A package of fonts for displaying Feynman diagrams.</p> -<p>Version 0.4.1, 2017 November 03.</p> -<p>Persistent URL: <code style='font-size: larger;'>http://purl.org/nxg/dist/feyn</code></p> +<p>Version 0.4.2, 2022 July 18.</p> +<ul> +<li>Canonical URL: <code style='font-size: larger;'>https://purl.org/nxg/dist/feyn</code></li> +<li><a href='https://heptapod.host/nxg/feyn'>Repository</a></li> +</ul> </div> @@ -55,6 +59,11 @@ It is distributed under the terms of the <a href='LICENCE'>2-clause BSD Licence< <dl> <!-- @RELEASENOTES@ --> +<dt><span class='attention'>Version 0.4.2, 2022 July 18</span></dt> +<dd> +<p>No code changes, but updates to URLs, including the repository location.</p> +</dd> + <dt><span class='attention'>Version 0.4.1, 2017 November 3</span></dt> <dd><p>The package is now licensed under the terms of the 2-clause BSD licence.</p> <p>The only other changes from v0.4b2 are mild documentation adjustments @@ -116,9 +125,9 @@ section of the manual</a>.</p> <ol> <li>Download either -<a href="feyn-0.4.1.tar.gz" >feyn-0.4.1.tar.gz</a> +<a href="feyn-0.4.2.tar.gz" >feyn-0.4.2.tar.gz</a> or -<a href="feyn-0.4.1.zip" >feyn-0.4.1.zip</a> +<a href="feyn-0.4.2.zip" >feyn-0.4.2.zip</a> and unpack it.</li> <li>Run LaTeX on the file <code>feyn.ins</code> – this will unpack the @@ -154,8 +163,8 @@ generate the font files as a side-effect).</li> <div class="signature"> -<a href="http://nxg.me.uk" >Norman Gray</a><br/> -2017 November 03 +<a href="https://nxg.me.uk" >Norman Gray</a><br/> +2022 July 18 </div> </body> diff --git a/fonts/feyn/feyn.mf b/fonts/feyn/feyn.mf index 60a64f4d01..9c5247356f 100644 --- a/fonts/feyn/feyn.mf +++ b/fonts/feyn/feyn.mf @@ -1,9 +1,9 @@ -% This is the metafont for the feynfont font, release 0.4.1, 2017 November 03 +% This is the metafont for the feynfont font, release 0.4.2, 2022 July 18 % % Copyright 1991, 1994, 2001, 2002, 2005, 2008-10, Norman Gray. % See the file LICENCE for licence details. % -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 % % % diff --git a/fonts/feyn/feyn.pdf b/fonts/feyn/feyn.pdf Binary files differindex adc1240b72..467ca16f8f 100644 --- a/fonts/feyn/feyn.pdf +++ b/fonts/feyn/feyn.pdf diff --git a/fonts/feyn/feyn10.mf b/fonts/feyn/feyn10.mf index 46b81eb048..05aaea3ecf 100644 --- a/fonts/feyn/feyn10.mf +++ b/fonts/feyn/feyn10.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 10pt display size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 10pt display size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYN"; font_size 10pt#; diff --git a/fonts/feyn/feyn11.mf b/fonts/feyn/feyn11.mf index 14a593cd5a..32bfa5df31 100644 --- a/fonts/feyn/feyn11.mf +++ b/fonts/feyn/feyn11.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 11pt display size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 11pt display size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYN"; font_size 11pt#; diff --git a/fonts/feyn/feyn12.mf b/fonts/feyn/feyn12.mf index eb8ea8864e..7739aa7d22 100644 --- a/fonts/feyn/feyn12.mf +++ b/fonts/feyn/feyn12.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 12pt display size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 12pt display size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYN"; font_size 12pt#; diff --git a/fonts/feyn/feyn18.mf b/fonts/feyn/feyn18.mf index 360e822304..14be743168 100644 --- a/fonts/feyn/feyn18.mf +++ b/fonts/feyn/feyn18.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 18pt display size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 18pt display size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYN"; font_size 18pt#; diff --git a/fonts/feyn/feyn24.mf b/fonts/feyn/feyn24.mf index fae595c974..3d502bcbe5 100644 --- a/fonts/feyn/feyn24.mf +++ b/fonts/feyn/feyn24.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 24pt display size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 24pt display size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYN"; font_size 24pt#; diff --git a/fonts/feyn/feynmac.mf b/fonts/feyn/feynmac.mf index c99ac3a888..70467a06de 100644 --- a/fonts/feyn/feynmac.mf +++ b/fonts/feyn/feynmac.mf @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Macros to support feyn.mf -% Release 0.4.1, 2017 November 03 +% Release 0.4.2, 2022 July 18 def looselink = ..tension 0.75.. enddef; diff --git a/fonts/feyn/feyntext10.mf b/fonts/feyn/feyntext10.mf index 08a0db7b79..3240e538c0 100644 --- a/fonts/feyn/feyntext10.mf +++ b/fonts/feyn/feyntext10.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 10pt text size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 10pt text size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYN"; font_size 10pt#; diff --git a/fonts/feyn/feyntext11.mf b/fonts/feyn/feyntext11.mf index 7280b4f633..c8c35ffb50 100644 --- a/fonts/feyn/feyntext11.mf +++ b/fonts/feyn/feyntext11.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 11pt text size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 11pt text size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYN"; font_size 11pt#; diff --git a/fonts/feyn/feyntext12.mf b/fonts/feyn/feyntext12.mf index 1abf5cbe87..c07b38bc88 100644 --- a/fonts/feyn/feyntext12.mf +++ b/fonts/feyn/feyntext12.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 12pt text size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 12pt text size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYN"; font_size 12pt#; diff --git a/fonts/feyn/feyntext18.mf b/fonts/feyn/feyntext18.mf index 5798fe7c92..d522ccf908 100644 --- a/fonts/feyn/feyntext18.mf +++ b/fonts/feyn/feyntext18.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 18pt text size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 18pt text size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYN"; font_size 18pt#; diff --git a/fonts/feyn/feyntext24.mf b/fonts/feyn/feyntext24.mf index 9933f42804..a23769fb46 100644 --- a/fonts/feyn/feyntext24.mf +++ b/fonts/feyn/feyntext24.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 24pt text size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 24pt text size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYN"; font_size 24pt#; diff --git a/fonts/feyn/feynx10.mf b/fonts/feyn/feynx10.mf index 2cfbe3d94d..ce869ade76 100644 --- a/fonts/feyn/feynx10.mf +++ b/fonts/feyn/feynx10.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 10pt extended size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 10pt extended size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYNX"; font_size 10pt#; diff --git a/fonts/feyn/feynx11.mf b/fonts/feyn/feynx11.mf index 4e789fea9d..efb348ee7c 100644 --- a/fonts/feyn/feynx11.mf +++ b/fonts/feyn/feynx11.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 11pt extended size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 11pt extended size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYNX"; font_size 11pt#; diff --git a/fonts/feyn/feynx12.mf b/fonts/feyn/feynx12.mf index ff77747b94..28adc32dce 100644 --- a/fonts/feyn/feynx12.mf +++ b/fonts/feyn/feynx12.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 12pt extended size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 12pt extended size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYNX"; font_size 12pt#; diff --git a/fonts/feyn/feynx18.mf b/fonts/feyn/feynx18.mf index ae282a3d22..46dac86221 100644 --- a/fonts/feyn/feynx18.mf +++ b/fonts/feyn/feynx18.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 18pt extended size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 18pt extended size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYNX"; font_size 18pt#; diff --git a/fonts/feyn/feynx24.mf b/fonts/feyn/feynx24.mf index 4279e99113..d912aeb1d5 100644 --- a/fonts/feyn/feynx24.mf +++ b/fonts/feyn/feynx24.mf @@ -1,7 +1,7 @@ -% Feynman diagram font, 24pt extended size, release 0.4.1, 2017 November 03. +% Feynman diagram font, 24pt extended size, release 0.4.2, 2022 July 18. % % This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray. -% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0 +% Mercurial revision 3e70c259dcfe, 2022-07-18 22:14 +0100, tag 0.4.2 + 0 font_identifier "FEYNX"; font_size 24pt#; diff --git a/fonts/feyn/overheads.pdf b/fonts/feyn/overheads.pdf Binary files differindex bd3a412975..043120ae05 100644 --- a/fonts/feyn/overheads.pdf +++ b/fonts/feyn/overheads.pdf diff --git a/fonts/feyn/overheads.tex b/fonts/feyn/overheads.tex index fb4823391a..46aee60713 100644 --- a/fonts/feyn/overheads.tex +++ b/fonts/feyn/overheads.tex @@ -6,7 +6,7 @@ \title{Feynman diagrams} \author{Norman Gray\\University of Glasgow} -\date{v0.4.1, 2017 November 03} +\date{v0.4.2, 2022 July 18} %\parindent0pt diff --git a/fonts/feyn/release-notes.html b/fonts/feyn/release-notes.html index 3b0a380f72..e2442f1baa 100644 --- a/fonts/feyn/release-notes.html +++ b/fonts/feyn/release-notes.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>The Feyn font – release notes</title> -<link href="http://nxg.me.uk" rev="author"/> +<link href="https://nxg.me.uk" rev="author"/> <link type="text/css" rel="stylesheet" href="style.css"/> <style type='text/css'> dd ul { padding: 0pt; margin: 0pt; } @@ -14,6 +14,11 @@ dd ul { padding: 0pt; margin: 0pt; } <dl> <!-- @CURRENT@ --> +<dt><span class='attention'>Version 0.4.2, 2022 July 18</span></dt> +<dd> +<p>No code changes, but updates to URLs, including the repository location.</p> +</dd> + <dt><span class='attention'>Version 0.4.1, 2017 November 3</span></dt> <dd><p>The package is now licensed under the terms of the 2-clause BSD licence.</p> <p>The only other changes from v0.4b2 are mild documentation adjustments diff --git a/fonts/feyn/sample-massive.png b/fonts/feyn/sample-massive.png Binary files differindex 815d432cb7..9040f52773 100644 --- a/fonts/feyn/sample-massive.png +++ b/fonts/feyn/sample-massive.png diff --git a/fonts/feyn/sample-phi4.png b/fonts/feyn/sample-phi4.png Binary files differindex 713ea241bd..70fcc9e8cc 100644 --- a/fonts/feyn/sample-phi4.png +++ b/fonts/feyn/sample-phi4.png diff --git a/fonts/feyn/sample-two-loop-annotated.png b/fonts/feyn/sample-two-loop-annotated.png Binary files differindex 1ec01333fd..69f423e01c 100644 --- a/fonts/feyn/sample-two-loop-annotated.png +++ b/fonts/feyn/sample-two-loop-annotated.png diff --git a/fonts/feyn/sample-two-loop.png b/fonts/feyn/sample-two-loop.png Binary files differindex b84b3d875e..ce741ce697 100644 --- a/fonts/feyn/sample-two-loop.png +++ b/fonts/feyn/sample-two-loop.png diff --git a/fonts/feyn/sample-vertex.png b/fonts/feyn/sample-vertex.png Binary files differindex 3fd6f6af6c..a07801a275 100644 --- a/fonts/feyn/sample-vertex.png +++ b/fonts/feyn/sample-vertex.png diff --git a/fonts/feyn/style.css b/fonts/feyn/style.css index f0a3150cca..f1c150d234 100644 --- a/fonts/feyn/style.css +++ b/fonts/feyn/style.css @@ -1,3 +1,5 @@ +/* Installed from repo: 2022-07-12T17:44:22+01:00, Hg:4e5b8a899d61 */ + body { color: #333; background: white; @@ -53,15 +55,32 @@ body { } */ -div.topsidebar { +/* The class='topsidebar' is formatting, typically div or ul, + for auxiliary stuff, placed at the top of the right-hand column. + The element with this class should go just _after_ the <h1> heading. */ +.topsidebar { float: right; width: 50%; /* ...of the body width (ie, 50% x 50% of screen) */ font-size: smaller; + line-height: 140%; /* ...of the font size*/ margin-left: 1em; padding-left: 1em; border-left: solid thin #AAA; } +/* +I have in the past styled `.topsidebar li` like this, +but I think this is too much detail for this location: +I should restrict the styling here to the location and general appearance of the sidebar +and I should leave such details to more local stylesheets +(and in any case I think it's only my blog that actually uses this class) +.topsidebar li { + list-style-type: none; + text-align: right; + line-height: 150%; +} +*/ + /* On wider screens, move the sidebar out to the right hand side */ /* This uses CSS3 media queries: http://www.w3.org/TR/css3-mediaqueries/ */ @media screen and (min-width: 700pt) and (max-width: 850pt) { @@ -70,7 +89,7 @@ div.topsidebar { width: 350pt; /* 50% of 700pt */ margin-right: auto; } - div.topsidebar { + .topsidebar { position: absolute; /* I feel this size should be 595pt (350 + 210 + 0.05*700), but that's clearly not right -- I don't think I understand what the -5% @@ -81,6 +100,7 @@ div.topsidebar { padding-left: 0pt; border: none; } + /* .topsidebar li { text-align: center; } */ } /* On still-wider screens, expand the left-margin, keeping the sidebar attached to the right-hand edge. When the screen is 850pt wide (expanding from the @media case above), @@ -91,7 +111,7 @@ div.topsidebar { width: 350pt; margin-left: auto; /* ...takes up the slack */ } - div.topsidebar { + .topsidebar { position: absolute; width: 290pt; /* same 290pt as above */ left: auto; @@ -99,6 +119,7 @@ div.topsidebar { padding-left: 0pt; border: none; } + /* .topsidebar li { text-align: center; } */ } @@ -201,8 +222,8 @@ div.signature { margin-right: -5%; margin-top: 4ex; text-align: right; - border: solid thin #666; - padding: 0.3em; + border-top: solid thin #666; + padding-top: 0.3em; clear: both; } diff --git a/fonts/yfonts-otf/README.md b/fonts/yfonts-otf/README.md new file mode 100644 index 0000000000..000b145d77 --- /dev/null +++ b/fonts/yfonts-otf/README.md @@ -0,0 +1,46 @@ +yfonts-otf package +================== + +## Description + +This bundle provides OpenType versions of the Old German fonts `yfrak’, +`ygoth’ and `yswab’ designed by Yannis Haralambous in Metafont (1990). + +## Contents + +* yfrak.otf, ygoth.otf, yswab.otf: the three OpenType fonts +* oldgerm-otf.sty LaTeX style file defining the three font families +* yfonts-otf.pdf Documentation in PDF format +* yfonts-otf.ltx LaTeX source of yfonts-otf.pdf +* Erlkonig.pdf Example: Goethe's poem typeset with these fonts +* Erlkonig.ltx LaTeX source of Erlkonig.pdf +* README.md (this file) + +## Installation + +This package is meant to be installed automatically by TeXLive, MikTeX, etc. +Otherwise, the package can be installed under TEXMFHOME or TEXMFLOCAL, f.i. +yfonts-otf in directory texmf-local/fonts/opentype/public/yfonts-otf/ +and oldgerm-otf.sty in directory texmf-local/tex/latex/yfonts-otf/. +Documentation files and their sources can go to directory +texmf-local/doc/fonts/public/yfonts-otf/ + +Don't forget to rebuild the file database (mktexlsr or so) if you install +under TEXMFLOCAL. + +## License + +* The three fonts are licensed under the SIL Open Font License, +Version 1.1. This license is available with a FAQ at: +http://scripts.sil.org/OFL +* The other files are distributed under the terms of the LaTeX Project +Public License from CTAN archives in directory macros/latex/base/lppl.txt. +Either version 1.3 or, at your option, any later version. + +## Changes + +* First public version: 0.30 + +--- +Copyright 2022- Daniel Flipo +E-mail: daniel (dot) flipo (at) free (dot) fr diff --git a/fonts/yfonts-otf/doc/Erlkonig.ltx b/fonts/yfonts-otf/doc/Erlkonig.ltx new file mode 100644 index 0000000000..1aacc668c3 --- /dev/null +++ b/fonts/yfonts-otf/doc/Erlkonig.ltx @@ -0,0 +1,122 @@ +\documentclass[12pt,a4paper,german]{article} + +\usepackage[top=40mm,left=40mm,right=40mm]{geometry} +\usepackage{oldgerm-otf} +\usepackage{babel} + +\usepackage{lettrine} +\renewcommand{\LettrineTextFont}{\relax} +\renewcommand{\LettrineFontHook}{\fontspec{Yinit.otf}} +\renewcommand{\DefaultLoversize}{0.25} +\renewcommand{\DefaultLhang}{0.2} +\setlength{\DefaultFindent}{0.1em} + +\begin{document} +\pagestyle{empty} + +\frakfamily\Large +\centerline{\Huge Erlkönig} + +\vspace{2\baselineskip} +\lettrine{W}{er} reitet so spät durch Nacht und Wind?\\ +Es ist der Vater mit seinem Kind;\\ +Er hat den Knaben wohl in dem Arm,\\ +Er faßt ihn sicher, er hält ihn warm. + +\vspace{\baselineskip} +\lettrine{M}{ein} Sohn, was birgst du so bang dein Gesicht? --\\ +Siehst, Vater, du den Erlk"onig nicht?\\ +Den Erlenkönig mit Kron und Schweif? --\\ +Mein Sohn, es ist ein Nebelstreif. -- + +\vspace{\baselineskip} +\lettrine{D}{u} liebes Kind, komm, geh mit mir!\\ +Gar schöne Spiele spiel ich mit dir;\\ +Manch bunte Blumen sind an dem Strand,\\ +Meine Mutter hat manch gülden Gewand.%'' + +\vspace{\baselineskip} +\lettrine{M}{ein} Vater, mein Vater, und hörest du nicht,\\ +Was Erlenkönig mir leise verspricht? --\\ +Sei ruhig, bleibe ruhig, mein Kind;\\ +In dürren Blättern säuselt der Wind. -- + +\vspace{\baselineskip} +\begin{flushright} + \Large Johann Wolfgang von Goethe +\end{flushright} + +\newpage +\swabfamily\Large +\centerline{\Huge Erlkönig} + +\vspace{2\baselineskip} +\lettrine{W}{er} reitet so spät durch Nacht und Wind?\\ +Es ist der Vater mit seinem Kind;\\ +Er hat den Knaben wohl in dem Arm,\\ +Er faßt ihn sicher, er hält ihn warm. + +\vspace{\baselineskip} +\lettrine{M}{ein} Sohn, was birgst du so bang dein Gesicht? --\\ +Siehst, Vater, du den Erlk"onig nicht?\\ +Den Erlenkönig mit Kron und Schweif? --\\ +Mein Sohn, es ist ein Nebelstreif. -- + +\vspace{\baselineskip} +\lettrine{D}{u} liebes Kind, komm, geh mit mir!\\ +Gar schöne Spiele spiel ich mit dir;\\ +Manch bunte Blumen sind an dem Strand,\\ +Meine Mutter hat manch gülden Gewand.%'' + +\vspace{\baselineskip} +\lettrine{M}{ein} Vater, mein Vater, und hörest du nicht,\\ +Was Erlenkönig mir leise verspricht? --\\ +Sei ruhig, bleibe ruhig, mein Kind;\\ +In dürren Blättern säuselt der Wind. -- + +\vspace{\baselineskip} +\begin{flushright} + \Large Johann Wolfgang von Goethe +\end{flushright} + +\newpage +\gothfamily\Large +\centerline{\Huge Erlkönig} + +\vspace{2\baselineskip} +\lettrine{W}{er} reitet so spät durch Nacht und Wind?\\ +Es ist der Vater mit seinem Kind;\\ +Er hat den Knaben wohl in dem Arm,\\ +Er faßt ihn sicher, er hält ihn warm. + +\vspace{\baselineskip} +\lettrine{M}{ein} Sohn, was birgst du so bang dein Gesicht? --\\ +Siehst, Vater, du den Erlk"onig nicht?\\ +Den Erlenkönig mit Kron und Schweif? --\\ +Mein Sohn, es ist ein Nebelstreif. -- + +\vspace{\baselineskip} +\lettrine{D}{u} liebes Kind, komm, geh mit mir!\\ +Gar schöne Spiele spiel ich mit dir;\\ +Manch bunte Blumen sind an dem Strand,\\ +Meine Mutter hat manch gülden Gewand.%'' + +\vspace{\baselineskip} +\lettrine{M}{ein} Vater, mein Vater, und hörest du nicht,\\ +Was Erlenkönig mir leise verspricht? --\\ +Sei ruhig, bleibe ruhig, mein Kind;\\ +In dürren Blättern säuselt der Wind. -- + +\vspace{\baselineskip} +\begin{flushright} + \Large Johann Wolfgang von Goethe +\end{flushright} + +\end{document} + +%%% Local Variables: +%%% mode: latex +%%% TeX-engine: luatex +%%% TeX-master: t +%%% coding: utf-8 +%%% End: diff --git a/fonts/yfonts-otf/doc/Erlkonig.pdf b/fonts/yfonts-otf/doc/Erlkonig.pdf Binary files differnew file mode 100644 index 0000000000..bd64dee2e5 --- /dev/null +++ b/fonts/yfonts-otf/doc/Erlkonig.pdf diff --git a/fonts/yfonts-otf/doc/yfonts-otf.ltx b/fonts/yfonts-otf/doc/yfonts-otf.ltx new file mode 100644 index 0000000000..09513741ad --- /dev/null +++ b/fonts/yfonts-otf/doc/yfonts-otf.ltx @@ -0,0 +1,223 @@ +\RequirePackage{pdfmanagement-testphase} +\DeclareDocumentMetadata{pdfstandard=A-2b, lang=en-GB} +\documentclass[paper=a4]{scrartcl} +% Packages +\usepackage{graphics, array} +\usepackage[dvipsnames]{xcolor} +\usepackage[hypcap=false]{caption} +\usepackage{shortvrb} +\usepackage{oldgerm-otf} +\usepackage{fourier-otf} +\usepackage[german,british]{babel} +\babeltags{de=german} +\usepackage[english]{varioref} +\usepackage{realscripts} +\usepackage{microtype} +\usepackage{hyperref} +\hypersetup{pdftitle={yfonts-otf User’s Guide}, + pdfauthor={Daniel FLIPO}, + colorlinks + } +\newcommand*{\hlabel}[1]{\phantomsection\label{#1}} +% +\MakeShortVerb{\|} + +%verbatim : modifier \verbatim@font +\def\ColorVerb{\color{MidnightBlue}} +\makeatletter +\let\verbatim@fontORI\verbatim@font +\def\verbatim@font{\ColorVerb\verbatim@fontORI} +\makeatother + +\newcommand*{\pkg}[1]{\texttt{\ColorVerb #1}} +\newcommand*{\opt}[1]{\texttt{\ColorVerb #1}} +\newcommand*{\file}[1]{\texttt{\ColorVerb #1}} +\newcommand*{\cmd}[1]{\texttt{\ColorVerb \textbackslash #1}} +\newcommand*{\family}[1]{\textit{#1}} +\newcommand*{\MF}{\textsf{Metafont}} +\def\xx{\kern0pt} + +\title{OpenType version of yfonts for Old German} +\author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} +\newcommand*{\version}{0.30} + +\begin{document} +\maketitle +\thispagestyle{empty} + +\begin{abstract} + This bundle provides OpenType versions of the Old German fonts \family{yfrak}, + \family{ygoth} and \family{yswab} designed by Yannis Haralambous in \MF{} + (1990). + + A style file \file{oldgerm-otf.sty} is included to load these fonts easily; + it is meant as a replacement for LuaLaTeX and XeLaTeX of + \file{oldgerm.sty}. + + A Type\,1 version of these fonts has been provided by Thorsten Bronger (2002). + + The \family{yinit} font (initials) is already available as in OpenType format, + thanks to Élie Roux. + + Please beware of the \emph{experimental} status of the current + version~(\version). + + All three fonts are covered by OFL licence, style file and documentation + are under LPPL-1.3 licence. +\end{abstract} + +\section{Usage} + +\pkg{oldgerm-otf.sty} loads \pkg{fontspec} and mimics what the +\pkg{oldgerm} package does for the Type\,1 version: it defines three font +families |\frakfamily|, |\gothfamily| and |\swabfamily| and the corresponding +font commands with arguments |\textgoth{}|, |\textfrak{}|, and |\textswab{}|. + +All three families are loaded with all ligatures activated, an |s| prints +a long~\textfrak{s} (initial and middle form), the final +round~{\frakfamily{s\hspace{1sp}}} can be coded |s:|% +\footnote{See section~\ref{sec:long-s} for details.}. +Coding |"a|, |"e|, |"o|, |"u|, |"s|, produces \textfrak{ä, ë, ö, ü, ß,} as +expected. Nowadays, most keyboards give access to the Unicode characters |ä|, +|ë|, |ö|, |ü| and |ß|, so typing them directly is another possibility. + +In the \family{yfrak} family, the command |\etc| prints {\etc} +a variant of the \textfrak{usw} abbreviation while |\Jvar| prints {\Jvar} +a variant of \textfrak{J} (suggestion of Daniel Sanders, mentioned by Yannis). + +The OpenType feature |Alternate=0| turns \textfrak{ä, ë, ö, ü} into +{\frakfamily\addfontfeature{Alternate=0} ä, ë, ö, ü}. +It works for the \family{yfrak} and \family{yswab} families but not for +\family{ygoth} (variant not available in the original version). + +Those variants {\frakfamily\addfontfeature{Alternate=0} ä, ë, ö, ü}, can +also be accessed by coding |*a|, |*e|, |*o|, |*u| (as in \pkg{oldgerm}) +without activating the |Alternate=0| feature. +\addfontfeature{RawFeature=-salt} % back to default. + +Used with the \family{ygoth} family, the |Alternate=1| feature provides +variants for the long~s and the derived ligatures: +{\gothfamily s\xx, ss\xx, ssi, st} are turned into +{\gothfamily\addfontfeature{Alternate=1} s\xx, ss\xx, ssi, st}. + +These features can be added locally anywhere in the document body, f.i.:\\ +|\frakfamily\addfontfeature{Alternate=0}|\\ +or using \pkg{oldgerm-otf.sty}’s options |oldumlaut| and +|gothvarlongs|, f.i.:\\ +|\usepackage[oldumlaut]{oldgerm-otf}|\\ +which applies globally to both \family{yfrak} and \family{yswab} families. + +\section{Coding the long/round s} +\label{sec:long-s} + +As stated in \cite{YH}, the initial and middle |s| should be long +({\frakfamily s\kern1pt}) while the final form should be round +({\frakfamily s\hspace{1sp}}). The OpenType |calt| feature can deal with +this kind of requirement. + +\pkg{oldgerm-otf.sty} enables the |calt| feature by default, so that an |s| +followed by a punctuation mark or a space \emph{character} is automatically +printed as a round one ({\frakfamily s\hspace{1sp}} instead of +{\frakfamily \kern1pt s\kern2pt}). +The problem is that TeX turns spaces into \emph{glues} which are ignored +by the |calt| feature. + +Conclusion: the |calt| feature works fine for the final |s| +\emph{only if} it is followed by a punctuation mark (point, comma, +semicolon, etc.). This is true for LuaTeX and XeTeX. + +For LuaTeX a workaround has been added in \pkg{oldgerm-otf.sty}. A null space +character (U+200B) is added automatically after every |s| followed by +a \emph{glue} or a \emph{penalty} (unbreakable spaces) or +a \emph{discretionary} (compound words), thus enabling the |calt| feature to +deal also with TeX spaces and compound words. +With LuaTeX, the |s| should always be printed out properly, the |s:| coding +should no longer be required% +\footnote{I am not sure about compound words: is checking + \emph{discretionaries} correct?}. + +Please note that the possibility of coding |s:| to get the round +{\frakfamily s\hspace{1sp}} has been kept for compatibility, this implies that +{\frakfamily aus::} has to be coded |aus::| with a double colon, the first one +being swallowed by the ligature |s:| which prints {\frakfamily s\hspace{1sp}}. + +With XeTeX, the |s:| coding is still required inside compound words +and before spaces f.i. |das: Aus:land|. + +\newpage +\section{List of optional ligatures} + +Some ligatures may be deactivated if necessary with the command\\ +|\addfontfeature{RawFeature=-|\textit{\ColorVerb ligname}|}| + +\vspace{\baselineskip} +|\frakfamily| : \let\ffam\frakfamily +\begin{tabular}{>\rmfamily l|l| l} + \hline + Name & Default ($+$) & Optional ($-$) \\ + \hline + liga & \ffam ff &\ffam\addfontfeature{RawFeature=-liga} ff \\ + dlig & \ffam ch, ck &\ffam\addfontfeature{RawFeature=-dlig} ch, ck \\ + hlig & \ffam sf, ss\xx, st &\ffam\addfontfeature{RawFeature=-hlig} sf, ss\xx, st\\ + \hline +\end{tabular} + +\vspace{.5\baselineskip} +|\swabfamily| : \let\ffam\swabfamily +\begin{tabular}{>\rmfamily l|l| l} + \hline + Name & Default ($+$) & Optional ($-$) \\ + \hline + liga & \ffam ff &\ffam\addfontfeature{RawFeature=-liga} ff \\ + dlig & \ffam ch, ck &\ffam\addfontfeature{RawFeature=-dlig} ch, ck \\ + hlig & \ffam sf, ss\xx, st &\ffam\addfontfeature{RawFeature=-hlig} sf, ss\xx, st \\ + \hline +\end{tabular} + +\vspace{.5\baselineskip} +|\gothfamily| : \let\ffam\gothfamily +\begin{tabular}{>\rmfamily l|l| l} + \hline + Name & Default ($+$) & Optional ($-$) \\ + \hline + liga & \ffam ff, ffi, ffl, fi, fl, ij + &\ffam\addfontfeature{RawFeature=-liga} ff, ffi, ffl, fi, fl, ij \\ + dlig & \ffam ch, ck, ct, qz, tz + &\ffam\addfontfeature{RawFeature=-dlig} ch, ck, ct, qz, tz \\ + hlig & \ffam sf, ss\xx, st, ssi + &\ffam\addfontfeature{RawFeature=-hlig} sf, ss\xx, st, ssi \\ + alig & \ffam ba, be, bo, da, de, do, ha, he, ho, ho, + &\ffam\addfontfeature{RawFeature=-alig} + ba, be, bo, da, de, do, ha, he, ho, \\ + &\ffam ll, pa, pe, po, pp, qq, va, ve, vu + &\ffam\addfontfeature{RawFeature=-alig} + ll, pa, pe, po, pp, qq, va, ve, vu\\ + \hline +\end{tabular} + +\section{Samples} + +A practical usage of these fonts can be found in file \file{Erlkonig.ltx} to +be compiled with \pkg{lualatex}. +It shows the beginning of Goethe’s Erlkönig poem typeset with each of them. + +\begin{thebibliography}{99} +\bibitem{YH} Typesetting Old German: Fraktur, Schwabacher, Gotish and + Initials, \\ \textit{Yannis Haralambous}, + \href{https://www.tug.org/TUGboat/tb12-1/tb31hara.pdf}% + {TUGboat 12\#1 (1991), pages 129–138}. + +\bibitem{OG} The \pkg{oldgerm} package for use with \LaTeXe, + \textit{Frank Mittelbach}, (2020). +\end{thebibliography} + +\vspace{3\baselineskip} +\centerline{\Huge\decotwo} +\end{document} + +%%% Local Variables: +%%% mode: latex +%%% TeX-engine: luatex +%%% TeX-master: t +%%% coding: utf-8 +%%% End: diff --git a/fonts/yfonts-otf/doc/yfonts-otf.pdf b/fonts/yfonts-otf/doc/yfonts-otf.pdf Binary files differnew file mode 100644 index 0000000000..af2fc0a1b3 --- /dev/null +++ b/fonts/yfonts-otf/doc/yfonts-otf.pdf diff --git a/fonts/yfonts-otf/fonts/yfrak.otf b/fonts/yfonts-otf/fonts/yfrak.otf Binary files differnew file mode 100644 index 0000000000..afb7cd6b6e --- /dev/null +++ b/fonts/yfonts-otf/fonts/yfrak.otf diff --git a/fonts/yfonts-otf/fonts/ygoth.otf b/fonts/yfonts-otf/fonts/ygoth.otf Binary files differnew file mode 100644 index 0000000000..83f9c23bf0 --- /dev/null +++ b/fonts/yfonts-otf/fonts/ygoth.otf diff --git a/fonts/yfonts-otf/fonts/yswab.otf b/fonts/yfonts-otf/fonts/yswab.otf Binary files differnew file mode 100644 index 0000000000..fd802c643f --- /dev/null +++ b/fonts/yfonts-otf/fonts/yswab.otf diff --git a/fonts/yfonts-otf/tex/oldgerm-otf.sty b/fonts/yfonts-otf/tex/oldgerm-otf.sty new file mode 100644 index 0000000000..e58caaeb90 --- /dev/null +++ b/fonts/yfonts-otf/tex/oldgerm-otf.sty @@ -0,0 +1,89 @@ +\NeedsTeXFormat{LaTeX2e}[2019-01-01] +\def\fileversion{0.30} +\def\filedate{2022-07-18} +\ProvidesPackage{oldgerm-otf}[\filedate\space\fileversion] +\RequirePackage{iftex}[2019-10-24] +\newif\ifOGotf@oldumlaut +\newif\ifOGotf@gothlongs +\DeclareOption{oldumlaut}{\OGotf@oldumlauttrue} +\DeclareOption{gothvarlongs}{\OGotf@gothlongstrue} +\ProcessOptions +\iftutex + \RequirePackage{fontspec} + \ifOGotf@gothlongs + \newfontfamily\gothfamily{ygoth.otf}% + [Alternate=1, RawFeature=+hist;+rlig;+liga;+dlig;+hlig;+alig;+calt] + \else + \newfontfamily\gothfamily{ygoth.otf}% + [RawFeature=+hist;+rlig;+liga;+dlig;+hlig;+alig;+calt] + \fi + \ifOGotf@oldumlaut + \newfontfamily\swabfamily{yswab.otf}% + [Alternate=0, RawFeature=+hist;+rlig;+liga;+dlig;+hlig;+calt] + \newfontfamily\frakfamily{yfrak.otf}% + [Alternate=0, RawFeature=+hist;+rlig;+liga;+dlig;+hlig;+calt] + \else + \newfontfamily\swabfamily{yswab.otf}% + [RawFeature=+hist;+rlig;+liga;+dlig;+hlig;+calt] + \newfontfamily\frakfamily{yfrak.otf}% + [RawFeature=+hist;+rlig;+liga;+dlig;+hlig;+calt] + \fi + \DeclareTextFontCommand{\textgoth}{\gothfamily} + \DeclareTextFontCommand{\textswab}{\swabfamily} + \DeclareTextFontCommand{\textfrak}{\frakfamily} + \DeclareTextCommand{\Jvar}{TU}{\textfrak{\char"E960}} + \DeclareTextCommand{\etc}{TU}{\textfrak{\char"E961}} + \ifluatex + % This function adds character U+200B (zero width space) when an "s" + % is followed by a TeX space (glue or penalty or a disc) + % so that it is not turned into a long "s" by the "calt" feature. + \directlua{% + function add_eow_char (head) + local eow = 0x200B + local GLUE = node.id("glue") + local GLYPH = node.id("glyph") + local PENALTY = node.id("penalty") + local DISC = node.id("disc") + local Longs = + {[string.byte("s")] = true} + local new_node = node.new + local copy_node = node.copy + local insert_node_after = node.insert_after + % Perserve TeX's kerning + head = node.kerning(head) + % wordbd is the zero width node to add + local wordbd = new_node(GLYPH) + for item in node.traverse_id(GLYPH, head) do + if Longs[item.char] then + local fid = item.font + % Check if char U+200B is available in the current font: + % code borrowed from file "luaotfload-auxiliary.lua". + local fontdata = fonts.hashes.identifiers[fid] + if fontdata and fontdata.characters[eow] then + local nxt = item.next + if not nxt or nxt.id == GLUE or nxt.id == PENALTY + or nxt.id == DISC then + wordbd.font = fid + wordbd.char = eow + wordbd.attr = item.attr + insert_node_after(head,item,copy_node(wordbd)) + end + end + end + end + end + } + % Register in callback "kerning". + \AtBeginDocument{% + \directlua{ + luatexbase.add_to_callback("kerning", add_eow_char, + "add_end_of_word_boundary"); + }% + } + \fi +\else + \PackageWarning{oldgerm-otf}% + {This package requires LuaTeX or XeTeX engines. + With other engines, consider using `oldgerm.sty', reported} +\fi +\endinput |
