diff options
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/eolang/eolang.pl | 7 | ||||
-rw-r--r-- | Build/source/texk/texlive/linked_scripts/scripts.lst | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/eolang/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/eolang/eolang.pdf | bin | 1940589 -> 1940560 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/eolang.1 | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/eolang.man1.pdf | bin | 13127 -> 13127 bytes | |||
-rwxr-xr-x | Master/texmf-dist/scripts/eolang/eolang.pl | 7 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/eolang/eolang.dtx | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/eolang/eolang.sty | 28 |
9 files changed, 42 insertions, 33 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/eolang/eolang.pl b/Build/source/texk/texlive/linked_scripts/eolang/eolang.pl index 3ac32331a4a..48ba53dc5b8 100755 --- a/Build/source/texk/texlive/linked_scripts/eolang/eolang.pl +++ b/Build/source/texk/texlive/linked_scripts/eolang/eolang.pl @@ -21,7 +21,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -# 2024-01-11 0.18.0 +# 2024-02-14 0.18.1 package eolang; use warnings; @@ -45,6 +45,8 @@ sub savefile { open(my $f, '>', $path) or error('Cannot open file for writing: ' . $path); print $f $content; close($f); + my $size = -s $path; + info("File saved to '$path' ($size bytes)"); } # Print INFO message to the console. @@ -78,7 +80,7 @@ if (@ARGV+0 eq 0 or exists $args{'--help'} or exists $args{'-?'}) { " --tmpdir=path Temp directory with .tex files ('_eolang' by default)\n\n" . "If any issues, report to GitHub: https://github.com/yegor256/bibcop"); } elsif (exists $args{'--version'} or exists $args{'-v'}) { - info('0.18.0 2024-01-11'); + info('0.18.1 2024-02-14'); } else { my ($src, $target) = grep { not($_ =~ /^-.*$/) } @ARGV; if (not $src) { @@ -146,7 +148,6 @@ if (@ARGV+0 eq 0 or exists $args{'--help'} or exists $args{'-?'}) { } debug('Target: ' . $target); savefile($target, $tex); - info("New TeX file save to: ". $target); } # In order to finish it with success: diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst index f05c8c8687b..efa9be90b7c 100644 --- a/Build/source/texk/texlive/linked_scripts/scripts.lst +++ b/Build/source/texk/texlive/linked_scripts/scripts.lst @@ -179,7 +179,6 @@ texlive/fmtutil-sys.sh texlive/fmtutil-user.sh texlive/fmtutil.pl texlive/mktexlsr -texlive/mktexlsr.pl texlive/mktexmf texlive/mktexpk texlive/mktextfm diff --git a/Master/texmf-dist/doc/latex/eolang/README.md b/Master/texmf-dist/doc/latex/eolang/README.md index 47fa929241d..2214b74e382 100644 --- a/Master/texmf-dist/doc/latex/eolang/README.md +++ b/Master/texmf-dist/doc/latex/eolang/README.md @@ -22,7 +22,7 @@ x -> [ \end{document} ``` -Otherwise, you can download [`eolang.sty`](https://yegor256.github.io/eolang.sty) and add to your project. +Otherwise, you can download [`eolang.sty`](https://objectionary.github.io/eolang.sty/eolang.sty) and add to your project. If you want to contribute yourself, make a fork, then create a branch, then run `l3build ctan` in the root directory. diff --git a/Master/texmf-dist/doc/latex/eolang/eolang.pdf b/Master/texmf-dist/doc/latex/eolang/eolang.pdf Binary files differindex 23028cf96af..2bf8e39de4b 100644 --- a/Master/texmf-dist/doc/latex/eolang/eolang.pdf +++ b/Master/texmf-dist/doc/latex/eolang/eolang.pdf diff --git a/Master/texmf-dist/doc/man/man1/eolang.1 b/Master/texmf-dist/doc/man/man1/eolang.1 index bcac9db30d5..8ab1954d875 100644 --- a/Master/texmf-dist/doc/man/man1/eolang.1 +++ b/Master/texmf-dist/doc/man/man1/eolang.1 @@ -1,4 +1,4 @@ -.TH eolang 1 "2024-01-11" +.TH eolang 1 "2024-02-14" .SH NAME eolang \- Automated Editor of TeX Files that Use "eolang" Package .SH SYNOPSIS diff --git a/Master/texmf-dist/doc/man/man1/eolang.man1.pdf b/Master/texmf-dist/doc/man/man1/eolang.man1.pdf Binary files differindex 4f28e9b327d..092c3afd9f1 100644 --- a/Master/texmf-dist/doc/man/man1/eolang.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/eolang.man1.pdf diff --git a/Master/texmf-dist/scripts/eolang/eolang.pl b/Master/texmf-dist/scripts/eolang/eolang.pl index 3ac32331a4a..48ba53dc5b8 100755 --- a/Master/texmf-dist/scripts/eolang/eolang.pl +++ b/Master/texmf-dist/scripts/eolang/eolang.pl @@ -21,7 +21,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -# 2024-01-11 0.18.0 +# 2024-02-14 0.18.1 package eolang; use warnings; @@ -45,6 +45,8 @@ sub savefile { open(my $f, '>', $path) or error('Cannot open file for writing: ' . $path); print $f $content; close($f); + my $size = -s $path; + info("File saved to '$path' ($size bytes)"); } # Print INFO message to the console. @@ -78,7 +80,7 @@ if (@ARGV+0 eq 0 or exists $args{'--help'} or exists $args{'-?'}) { " --tmpdir=path Temp directory with .tex files ('_eolang' by default)\n\n" . "If any issues, report to GitHub: https://github.com/yegor256/bibcop"); } elsif (exists $args{'--version'} or exists $args{'-v'}) { - info('0.18.0 2024-01-11'); + info('0.18.1 2024-02-14'); } else { my ($src, $target) = grep { not($_ =~ /^-.*$/) } @ARGV; if (not $src) { @@ -146,7 +148,6 @@ if (@ARGV+0 eq 0 or exists $args{'--help'} or exists $args{'-?'}) { } debug('Target: ' . $target); savefile($target, $tex); - info("New TeX file save to: ". $target); } # In order to finish it with success: diff --git a/Master/texmf-dist/source/latex/eolang/eolang.dtx b/Master/texmf-dist/source/latex/eolang/eolang.dtx index 262c10f2ca1..97d558ccaaa 100644 --- a/Master/texmf-dist/source/latex/eolang/eolang.dtx +++ b/Master/texmf-dist/source/latex/eolang/eolang.dtx @@ -50,7 +50,7 @@ %<package>\NeedsTeXFormat{LaTeX2e} %<package>\ProvidesPackage{eolang} %<*package> -[2024-01-11 0.18.0 Formulas and Graphs for EO Programming Language] +[2024-02-14 0.18.1 Formulas and Graphs for EO Programming Language] %</package> %<*driver> \documentclass{ltxdoc} @@ -877,7 +877,7 @@ $macro = $ARGV[0]; open(my $fh, '<', $ARGV[1]); my $tex; { local $/; $tex = <$fh>; } -print "% This file is auto-generated by 0.18.0\n"; +print "% This file is auto-generated by 0.18.1\n"; print '% There are ', length($tex), ' chars in the input: ', $ARGV[1], "\n"; print '% ---', "\n"; @@ -1219,6 +1219,10 @@ sub fmt { $tex =~ s/\|([^\|]+)\|/\\textnormal{\\texttt{\1}}/g; return $tex; } +sub toem { + my ($cm) = @_; + return $cm * 2.8; +} sub vertex { my ($v) = @_; if (index($v, 'v0') == 0) { @@ -1315,7 +1319,7 @@ for (my $c = 0; $c < 0+@cmds; $c++) { $draw = $draw . " (<MF:${to}><B:break-v>)"; if (exists $opts{'break'}) { print tailor($draw, 'F') . ";\n"; - print ' \node[outer sep=.1cm,inner sep=0cm] ' . + print ' \node[outer sep=' . toem(0.1) . 'em,inner sep=0em] ' . 'at (break) (break-v) {$' . vertex($to) . '$};' . "\n"; print ' ' . tailor($draw, 'B'); @@ -1326,10 +1330,10 @@ for (my $c = 0; $c < 0+@cmds; $c++) { my ($from, $to) = split (/=+>/, $head); my $size = () = $head =~ /=/g; if ($from eq '') { - print '\node [phi-arrow, left=' . ($size * 0.6) . 'cm of ' . + print '\node [phi-arrow, left=' . toem($size * 0.6) . 'em of ' . $to . '.center]'; } elsif ($to eq '') { - print '\node [phi-arrow, right=' . ($size * 0.6) . 'cm of ' . + print '\node [phi-arrow, right=' . toem($size * 0.6) . 'em of ' . $from . '.center]'; } else { print '\node [phi-arrow] at ($(' . @@ -1340,7 +1344,7 @@ for (my $c = 0; $c < 0+@cmds; $c++) { my ($v, $marker) = split (/!+/, $head); my $size = () = $head =~ /!/g; print '\node [phi-marker, left=' . - ($size * 0.6) . 'cm of ' . + toem($size * 0.6) . 'em of ' . $v . '.center]{' . fmt($marker) . '}'; } elsif (index($head, '+') >= 0) { my ($v, $suffix) = split (/\+/, $head); @@ -1417,8 +1421,8 @@ for (my $c = 0; $c < 0+@cmds; $c++) { $loc = $loc . 'left'; } print ',' . $loc . '='; - print abs(num($down)) . 'cm and ' . - abs(num($right)) . 'cm of ' . $v . '.center'; + print toem(abs(num($down))) . 'em and ' . + toem(abs(num($right))) . 'em of ' . $v . '.center'; } if (exists $opts{'data'}) { print ',phi-data'; @@ -1521,17 +1525,17 @@ print '\endinput'; % \begin{macrocode} \newenvironment{phicture}% {\noindent\begin{tikzpicture}[ - ->,>=stealth',node distance=0,thick, + ->,>=stealth',node distance=0,line width=.08em, pics/parallel arrow/.style={ code={\draw[-latex,phi-rho] (##1) -- (-##1);}}]}% {\end{tikzpicture}} \tikzstyle{phi-arrow} = [fill=white!80!black, single arrow, - minimum height=0.5cm, minimum width=0.5cm, + minimum height=0.05em, minimum width=0.05em, single arrow head extend=2mm] \tikzstyle{phi-marker} = [inner sep=0pt, minimum height=1.4em, minimum width=1.4em, font={\small\color{white}\ttfamily}, fill=gray] -\tikzstyle{phi-thing} = [thick,inner sep=0pt,minimum height=2.4em, +\tikzstyle{phi-thing} = [inner sep=0pt,minimum height=2.4em, draw,font={\small}] \tikzstyle{phi-object} = [phi-thing,circle] \tikzstyle{phi-data} = [phi-thing,regular polygon, @@ -1593,7 +1597,7 @@ print '\endinput'; \tikzstyle{phi-pi} = [draw,dotted] \tikzstyle{phi-atom} = [phi-object,double] \tikzstyle{phi-box} = [xshift=-5pt,yshift=3pt,draw,fill=white, - rectangle,thin,minimum width=1.2em,anchor=north west, + rectangle,line width=.04em,minimum width=1.2em,anchor=north west, font={\scriptsize}] \tikzstyle{phi-attr} = [midway,sloped,inner sep=0pt, above=2pt,sloped/.append style={transform shape}, diff --git a/Master/texmf-dist/tex/latex/eolang/eolang.sty b/Master/texmf-dist/tex/latex/eolang/eolang.sty index ae8a572fa2d..81f70b3cf38 100644 --- a/Master/texmf-dist/tex/latex/eolang/eolang.sty +++ b/Master/texmf-dist/tex/latex/eolang/eolang.sty @@ -31,7 +31,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{eolang} -[2024-01-11 0.18.0 Formulas and Graphs for EO Programming Language] +[2024-02-14 0.18.1 Formulas and Graphs for EO Programming Language] @@ -148,7 +148,7 @@ $macro = $ARGV[0]; open(my $fh, '<', $ARGV[1]); my $tex; { local $/; $tex = <$fh>; } -print "% This file is auto-generated by 0.18.0\n"; +print "% This file is auto-generated by 0.18.1\n"; print '% There are ', length($tex), ' chars in the input: ', $ARGV[1], "\n"; print '% ---', "\n"; @@ -435,6 +435,10 @@ sub fmt { $tex =~ s/\|([^\|]+)\|/\\textnormal{\\texttt{\1}}/g; return $tex; } +sub toem { + my ($cm) = @_; + return $cm * 2.8; +} sub vertex { my ($v) = @_; if (index($v, 'v0') == 0) { @@ -531,7 +535,7 @@ for (my $c = 0; $c < 0+@cmds; $c++) { $draw = $draw . " (<MF:${to}><B:break-v>)"; if (exists $opts{'break'}) { print tailor($draw, 'F') . ";\n"; - print ' \node[outer sep=.1cm,inner sep=0cm] ' . + print ' \node[outer sep=' . toem(0.1) . 'em,inner sep=0em] ' . 'at (break) (break-v) {$' . vertex($to) . '$};' . "\n"; print ' ' . tailor($draw, 'B'); @@ -542,10 +546,10 @@ for (my $c = 0; $c < 0+@cmds; $c++) { my ($from, $to) = split (/=+>/, $head); my $size = () = $head =~ /=/g; if ($from eq '') { - print '\node [phi-arrow, left=' . ($size * 0.6) . 'cm of ' . + print '\node [phi-arrow, left=' . toem($size * 0.6) . 'em of ' . $to . '.center]'; } elsif ($to eq '') { - print '\node [phi-arrow, right=' . ($size * 0.6) . 'cm of ' . + print '\node [phi-arrow, right=' . toem($size * 0.6) . 'em of ' . $from . '.center]'; } else { print '\node [phi-arrow] at ($(' . @@ -556,7 +560,7 @@ for (my $c = 0; $c < 0+@cmds; $c++) { my ($v, $marker) = split (/!+/, $head); my $size = () = $head =~ /!/g; print '\node [phi-marker, left=' . - ($size * 0.6) . 'cm of ' . + toem($size * 0.6) . 'em of ' . $v . '.center]{' . fmt($marker) . '}'; } elsif (index($head, '+') >= 0) { my ($v, $suffix) = split (/\+/, $head); @@ -633,8 +637,8 @@ for (my $c = 0; $c < 0+@cmds; $c++) { $loc = $loc . 'left'; } print ',' . $loc . '='; - print abs(num($down)) . 'cm and ' . - abs(num($right)) . 'cm of ' . $v . '.center'; + print toem(abs(num($down))) . 'em and ' . + toem(abs(num($right))) . 'em of ' . $v . '.center'; } if (exists $opts{'data'}) { print ',phi-data'; @@ -721,17 +725,17 @@ print '\endinput'; \newenvironment{phicture}% {\noindent\begin{tikzpicture}[ - ->,>=stealth',node distance=0,thick, + ->,>=stealth',node distance=0,line width=.08em, pics/parallel arrow/.style={ code={\draw[-latex,phi-rho] (##1) -- (-##1);}}]}% {\end{tikzpicture}} \tikzstyle{phi-arrow} = [fill=white!80!black, single arrow, - minimum height=0.5cm, minimum width=0.5cm, + minimum height=0.05em, minimum width=0.05em, single arrow head extend=2mm] \tikzstyle{phi-marker} = [inner sep=0pt, minimum height=1.4em, minimum width=1.4em, font={\small\color{white}\ttfamily}, fill=gray] -\tikzstyle{phi-thing} = [thick,inner sep=0pt,minimum height=2.4em, +\tikzstyle{phi-thing} = [inner sep=0pt,minimum height=2.4em, draw,font={\small}] \tikzstyle{phi-object} = [phi-thing,circle] \tikzstyle{phi-data} = [phi-thing,regular polygon, @@ -793,7 +797,7 @@ print '\endinput'; \tikzstyle{phi-pi} = [draw,dotted] \tikzstyle{phi-atom} = [phi-object,double] \tikzstyle{phi-box} = [xshift=-5pt,yshift=3pt,draw,fill=white, - rectangle,thin,minimum width=1.2em,anchor=north west, + rectangle,line width=.04em,minimum width=1.2em,anchor=north west, font={\scriptsize}] \tikzstyle{phi-attr} = [midway,sloped,inner sep=0pt, above=2pt,sloped/.append style={transform shape}, |