Hello community,
here is the log from the commit of package texlive-specs-v for openSUSE:Factory checked in at 2020-05-29 21:19:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-v (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-v.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-v"
Fri May 29 21:19:21 2020 rev:44 rq:806932 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-v/texlive-specs-v.changes 2019-11-07 23:12:13.996252632 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-v.new.3606/texlive-specs-v.changes 2020-05-29 21:32:59.937867940 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink
+
+- Enhance spec file generator to find missing .so man page
+ links for better dependency resolution (bsc#1171682)
+
+-------------------------------------------------------------------
+Wed May 13 13:59:14 UTC 2020 - Dr. Werner Fink
+
+- Modify patch texdoc_cnf.dif to ignore tlpkg/texlive.tlpdb as
+ kpathsea uses the ls-R files as well
+
+-------------------------------------------------------------------
+Tue May 12 09:03:38 UTC 2020 - Dr. Werner Fink
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink
+
+- Add Requires to tex(epstopdf-base.sty) to fix package split
+ of texlive-epstopdf
+
+-------------------------------------------------------------------
+Mon May 4 09:00:25 UTC 2020 - Dr. Werner Fink
+
+- Skip *-dev packages from file dependendcy scanner as otherwise
+ we see doubling name space for some style files like amsmath.sty
+
+-------------------------------------------------------------------
+Mon Apr 27 06:52:15 UTC 2020 - Dr. Werner Fink
+
+- Add patch pythontex_p2top3.dif and a removes file to fully
+ switch pythontex packages of TeXLive to python3
+
+-------------------------------------------------------------------
+Mon Apr 20 10:29:02 UTC 2020 - Dr. Werner Fink
+
+- Update to TeXLive 2020
+ * Port patches
+ kpathsea_cnf.dif
+ latexpand_perl.dif
+ luaotfload_varfonts.dif
+ luatex_cnf.dif
+ musixtex_various.dif
+ * Delete patches not needed anymore as files have moved
+ tetex_scripts.dif
+ * Delete patche updmap-map_roboto.dif as fixed upstream
+ * Add new patches to catch moved files
+ texlive-scripts-extra_scripts.dif
+ texlive-scripts_scripts.dif
+ * Add new patch xetex_conf.dif to fit FHS location
+ * Remove TeXLive installer files breaking rpm database
+ texlive-scripts.removes
+
+-------------------------------------------------------------------
Old:
----
spanish-mx.doc.tar.xz
spanish-mx.tar.xz
New:
----
soulpos.doc.tar.xz
soulpos.tar.xz
soulutf8.doc.tar.xz
soulutf8.tar.xz
spacingtricks.doc.tar.xz
spacingtricks.tar.xz
step.doc.tar.xz
step.tar.xz
stringenc.doc.tar.xz
stringenc.tar.xz
subdocs.doc.tar.xz
subdocs.tar.xz
subtext.doc.tar.xz
subtext.tar.xz
swrule.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-v.spec ++++++
++++ 13511 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-v/texlive-specs-v.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-v.new.3606/texlive-specs-v.spec
++++++ siunitx.doc.tar.xz ++++++
Binary files old/doc/latex/siunitx/siunitx.pdf and new/doc/latex/siunitx/siunitx.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/siunitx.doc.tlpobj new/tlpkg/tlpobj/siunitx.doc.tlpobj
--- old/tlpkg/tlpobj/siunitx.doc.tlpobj 2019-02-28 04:05:35.000000000 +0100
+++ new/tlpkg/tlpobj/siunitx.doc.tlpobj 2020-02-26 01:55:05.000000000 +0100
@@ -1,8 +1,8 @@
name siunitx.doc
category Package
-revision 47746
+revision 53914
shortdesc doc files of siunitx
relocated 1
-docfiles size=151
+docfiles size=158
RELOC/doc/latex/siunitx/README.md
RELOC/doc/latex/siunitx/siunitx.pdf
++++++ siunitx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/siunitx/siunitx-abbreviations.cfg new/tex/latex/siunitx/siunitx-abbreviations.cfg
--- old/tex/latex/siunitx/siunitx-abbreviations.cfg 2018-03-12 22:49:57.000000000 +0100
+++ new/tex/latex/siunitx/siunitx-abbreviations.cfg 2020-01-15 22:49:08.000000000 +0100
@@ -104,7 +104,7 @@
\DeclareSIUnit \ns { \nano \second }
\DeclareSIUnit \us { \micro \second }
\DeclareSIUnit \ms { \milli \second }
-%% Copyright (C) 2008-2018 by
+%% Copyright (C) 2008-2020 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/siunitx/siunitx-binary.cfg new/tex/latex/siunitx/siunitx-binary.cfg
--- old/tex/latex/siunitx/siunitx-binary.cfg 2018-03-12 22:49:57.000000000 +0100
+++ new/tex/latex/siunitx/siunitx-binary.cfg 2020-01-15 22:49:08.000000000 +0100
@@ -25,7 +25,7 @@
\DeclareBinaryPrefix \yobi { Yi } { 80 }
\DeclareSIUnit \bit { bit }
\DeclareSIUnit \byte { B }
-%% Copyright (C) 2008-2018 by
+%% Copyright (C) 2008-2020 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/siunitx/siunitx-version-1.cfg new/tex/latex/siunitx/siunitx-version-1.cfg
--- old/tex/latex/siunitx/siunitx-version-1.cfg 2018-03-12 22:49:57.000000000 +0100
+++ new/tex/latex/siunitx/siunitx-version-1.cfg 2020-01-15 22:49:08.000000000 +0100
@@ -727,7 +727,7 @@
\DeclareSIUnit \yb { \yocto \barn }
\NewDocumentCommand \requiresiconfigs { m }
{ \keys_set:nn { siunitx } { version-1-compatibility } }
-%% Copyright (C) 2008-2018 by
+%% Copyright (C) 2008-2020 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/siunitx/siunitx.sty new/tex/latex/siunitx/siunitx.sty
--- old/tex/latex/siunitx/siunitx.sty 2018-05-18 23:09:37.000000000 +0200
+++ new/tex/latex/siunitx/siunitx.sty 2020-02-25 23:06:27.000000000 +0100
@@ -13,11 +13,11 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/09/11]
+\RequirePackage{expl3}[2020/01/12]
\RequirePackage{xparse}
-\ProvidesExplPackage {siunitx} {2018/05/17} {2.7s}
+\ProvidesExplPackage {siunitx} {2020/02/25} {2.8b}
{A comprehensive (SI) units package}
-\@ifpackagelater { expl3 } { 2015/11/15 }
+\@ifpackagelater { expl3 } { 2020/01/12 }
{ }
{
\PackageError { siunitx } { Support~package~expl3~too~old }
@@ -69,41 +69,7 @@
\bool_new:N \l__siunitx_error_bool
\AtBeginDocument {
\cs_if_free:cT { T@TS1 }
- {
- \DeclareFontEncoding { TS1 } { } { }
- \DeclareFontSubstitution { TS1 } { cmr } { m } { n }
- }
-}
-\DeclareTextSymbolDefault \c__siunitx_minus_tl { TS1 }
-\DeclareTextSymbol \c__siunitx_minus_tl { TS1 } { 61 }
-\AtBeginDocument {
- \@ifpackageloaded { fontspec }
- {
- \@ifpackageloaded { eulervm }
- { }
- {
- \int_const:Nn \c__siunitx_minus_int { 8722 }
- \tl_set:Nn \c__siunitx_minus_tl
- { \tex_char:D \c__siunitx_minus_int }
- }
- }
- { }
-}
-\DeclareTextSymbol \c__siunitx_mu_tl { TS1 } { 181 }
-\DeclareTextSymbolDefault \c__siunitx_mu_tl { TS1 }
-\AtBeginDocument {
- \@ifpackageloaded { fontspec }
- {
- \int_const:Nn \c__siunitx_mu_int { 181 }
- \tl_set:Nn \c__siunitx_mu_tl { \tex_char:D \c__siunitx_mu_int }
- }
- { }
-}
-\tl_new:N \g__siunitx_omega_tl
-\tl_gset:Nn \g__siunitx_omega_tl { \Omega }
-\AtBeginDocument {
- \cs_if_exist:NT \upOmega
- { \tl_set:Nn \g__siunitx_omega_tl { \upOmega } }
+ { \RequirePackage { textcomp } }
}
\cs_new_protected:Npn \__siunitx_tl_put_left_math:Nn #1#2
{ \tl_put_left:Nn #1 { \ensuremath {#2} } }
@@ -327,8 +293,8 @@
{
\tl_if_empty_p:f
{
- \token_get_prefix_spec:N #1
- \token_get_arg_spec:N #1
+ \cs_prefix_spec:N #1
+ \cs_argument_spec:N #1
}
}
{ \bool_not_p:n { \cs_if_exist_p:c { \cs_to_str:N #1 ~ } } }
@@ -354,7 +320,6 @@
\__siunitx_option_unchanged:Nnn \l__siunitx_qualifier_mode_tl
{ subscript } { brackets }
\keys_set:nn { siunitx } { mode = text }
- \tl_set:Nn \c__siunitx_minus_tl { \HCode { &\#x2212; } }
}
{ }
}
@@ -836,7 +801,7 @@
\cs_new_protected:Npn \__siunitx_print_text:
{
\tl_replace_all:Nnn \l__siunitx_print_arg_tl { - }
- { \c__siunitx_minus_tl }
+ { \textminus }
\__siunitx_print_text_aux:
\tl_replace_all:Nnn \l__siunitx_print_arg_tl { \mp }
{ \ensuremath { \mp } }
@@ -911,7 +876,7 @@
\cs_new_protected:Npn \__siunitx_print_text_super:n #1 {
\tl_set:Nn \l__siunitx_tmpa_tl {#1}
\tl_replace_all:Nnn \l__siunitx_tmpa_tl { - }
- { \c__siunitx_minus_tl }
+ { \textminus }
\tl_set:Nx \l__siunitx_tmpa_tl
{
\exp_not:N \ensuremath
@@ -2327,8 +2292,15 @@
{ \int_eval:n { \l__siunitx_tmpb_tl + 1 } }
\bool_if:NF \l__siunitx_round_half_up_bool
{
- \int_compare:nNnT
- { 0 \tl_tail:N \l__siunitx_tmpa_tl } = 0
+ \bool_lazy_and:nnT
+ {
+ \int_compare_p:nNn
+ { 0 \tl_head:N \l__siunitx_tmpa_tl } = 5
+ }
+ {
+ \int_compare_p:nNn
+ { 0 \tl_tail:N \l__siunitx_tmpa_tl } = 0
+ }
{
\int_if_odd:nT \l__siunitx_tmpb_tl
{
@@ -4063,9 +4035,15 @@
{ \__siunitx_number_output_single: }
}
\cs_new_protected:Npn \__siunitx_angle_print_astronomy_aux: {
- \prop_get:NnNT \l__siunitx_number_out_prop { mantissa-integer }
+ \prop_get:NnNF \l__siunitx_number_out_prop { mantissa-sign }
\l__siunitx_tmpa_tl
- { \__siunitx_print:nV { number } \l__siunitx_tmpa_tl }
+ { \tl_clear:N \l__siunitx_tmpa_tl }
+ \prop_get:NnNT \l__siunitx_number_out_prop { mantissa-integer }
+ \l__siunitx_tmpb_tl
+ {
+ \tl_put_right:NV \l__siunitx_tmpa_tl \l__siunitx_tmpb_tl
+ \__siunitx_print:nV { number } \l__siunitx_tmpa_tl
+ }
\hbox_set:Nn \l__siunitx_angle_marker_box
{
\__siunitx_print:nn { number } { { \l__siunitx_output_decimal_tl } }
@@ -4383,7 +4361,7 @@
\cs_new_protected:Npn \__siunitx_protect_symbols:N #1 {
\cs_if_exist:NT #1
{
- \tl_if_empty:fT { \token_get_prefix_spec:N #1 }
+ \tl_if_empty:fT { \cs_prefix_spec:N #1 }
{ \cs_set_protected:Npx #1 { \exp_not:V #1 } }
}
}
@@ -4926,7 +4904,10 @@
\exp_not:N \PrintSuperscript
{
\__siunitx_unit_format_power_aux:n
- { \exp_not:V \l__siunitx_tmpa_tl }
+ {
+ \exp_after:wN \__siunitx_unit_format_power:w
+ \l__siunitx_tmpa_tl . . \q_stop
+ }
}
}
}
@@ -4942,10 +4923,19 @@
{
\tl_set:Nn \l__siunitx_tmpa_tl {#2}
\tl_replace_all:Nnn \l__siunitx_tmpa_tl { - }
- { \text { \c__siunitx_minus_tl } }
+ { \text { \textminus } }
\__siunitx_print:nV {#1} \l__siunitx_tmpa_tl
}
}
+\cs_new:Npn \__siunitx_unit_format_power:w #1 . #2 . #3 \q_stop
+ {
+ \exp_not:n {#1}
+ \tl_if_blank:nF {#2}
+ {
+ \exp_not:V \l__siunitx_output_decimal_tl
+ \exp_not:n {#2}
+ }
+ }
\cs_new_protected:Npn \__siunitx_unit_format_power_brackets: {
\tl_set:Nx \l__siunitx_tmpb_tl
{ bracket- \int_use:N \l__siunitx_unit_int }
@@ -6856,46 +6846,51 @@
{
\bool_if:NT \l__siunitx_redefine_symbols_bool
{
- \@ifpackageloaded { textcomp }
+ \@ifpackageloaded { fourier }
{
- \__siunitx_option_unchanged:Nnn \l__siunitx_degree_math_tl
- { { } ^ { \circ } }
- { \text { \textdegree } }
- \__siunitx_option_unchanged:Nnn \l__siunitx_degree_text_tl
- { \ensuremath { { } ^ { \circ } } }
- { \textdegree }
- \@ifpackageloaded { mathptmx }
- { }
- {
- \__siunitx_option_unchanged:Nnn \l__siunitx_micro_text_tl
- { \c__siunitx_mu_tl }
- { \textmu }
- \@ifpackageloaded { fourier }
- { }
- {
- \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl
- { \ensuremath { \g__siunitx_omega_tl } }
- { \textohm }
- }
- }
- \str_if_eq:VnT \encodingdefault { OT1 }
- {
- \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_math_tl
- { \text { \AA } }
- { \text { \capitalring { A } } }
- \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_text_tl
- { \AA }
- { \capitalring { A } }
- }
+ \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl
+ { \textohm }
+ { \text { \ensuremath { \l__siunitx_ohm_math_tl } } }
+ }
+ { }
+ \@ifpackageloaded { mathptmx }
+ {
+ \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl
+ { \textohm }
+ { \text { \ensuremath { \l__siunitx_ohm_math_tl } } }
+ }
+ { }
+ \str_if_eq:VnT \encodingdefault { OT1 }
+ {
+ \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_math_tl
+ { \text { \AA } }
+ { \text { \capitalring { A } } }
+ \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_text_tl
+ { \AA }
+ { \capitalring { A } }
+ }
+ \@ifpackageloaded { unicode-math }
+ {
+ \exp_args:NNnx
+ \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl
+ { \text { \ensuremath { \Omega } } }
+ { \char_generate:nn { "03A9 } { 12 } }
}
{ }
\@ifpackageloaded { upgreek }
{
\__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl
- { \text { \ensuremath { \g__siunitx_omega_tl } } }
- { \Upomega }
+ { \text { \ensuremath { \Omega } } }
+ { \text { \ensuremath { \Upomega } } }
+ }
+ {
+ \cs_if_exist:NT \upOmega
+ {
+ \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl
+ { \text { \ensuremath { \Omega } } }
+ { \text { \ensuremath { \upOmega } } }
+ }
}
- { }
}
}
\keys_define:nn { siunitx } {
@@ -6911,10 +6906,10 @@
math-angstrom = \text { \AA },
math-arcminute = { } ^ { \prime },
math-arcsecond = { } ^ { \prime \prime },
- math-celsius = { } ^ { \circ } \kern - \scriptspace \__siunitx_unit_mathrm:n { C } ,
- math-degree = { } ^ { \circ },
- math-micro = \text { \c__siunitx_mu_tl },
- math-ohm = \text { \ensuremath { \g__siunitx_omega_tl } },
+ math-celsius = \text { \textdegree } \__siunitx_unit_mathrm:n { C } ,
+ math-degree = \text { \textdegree },
+ math-micro = \text { \textmu },
+ math-ohm = \text { \ensuremath { \Omega } },
}
\keys_define:nn { siunitx } {
text-angstrom .tl_set:N = \l__siunitx_angstrom_text_tl,
@@ -6929,11 +6924,10 @@
text-angstrom = \AA,
text-arcminute = \ensuremath { { } ^ { \prime } },
text-arcsecond = \ensuremath { { } ^ { \prime \prime } },
- text-celsius =
- \ensuremath { { } ^ { \circ } } \kern -\scriptspace C ,
- text-degree = \ensuremath { { } ^ { \circ } },
- text-micro = \c__siunitx_mu_tl ,
- text-ohm = \ensuremath { \g__siunitx_omega_tl },
+ text-celsius = \text { \textdegree } C,
+ text-degree = \text { \textdegree },
+ text-micro = \textmu ,
+ text-ohm = \textohm
}
\cs_new_protected:Npn \__siunitx_symbol_new:n #1
{
@@ -6942,7 +6936,7 @@
\use:c
{
l__siunitx_
- \str_fold_case:n {#1}
+ \str_foldcase:n {#1}
_
\mode_if_math:TF { math } { text }
_tl
@@ -6956,80 +6950,6 @@
\__siunitx_symbol_new:n { Degree }
\__siunitx_symbol_new:n { Micro }
\__siunitx_symbol_new:n { Ohm }
-\AtBeginDocument
- {
- \@ifpackageloaded { fontspec }
- {
- \int_const:Nn \c__siunitx_degree_int { 176 }
- \int_const:Nn \c__siunitx_micro_int { "000B5 }
- \int_const:Nn \c__siunitx_angstrom_int { "0212B }
- \int_const:Nn \c__siunitx_ohm_int { "003A9 }
- \sys_if_engine_xetex:T
- {
- \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_math_tl
- { \text { \AA } }
- { \tex_char:D \c__siunitx_angstrom_int }
- }
- \__siunitx_option_unchanged:Nnn \l__siunitx_celsius_math_tl
- { { } ^ { \circ } \kern - \scriptspace C }
- {
- \tex_char:D \c__siunitx_degree_int
- C
- }
- \__siunitx_option_unchanged:Nnn \l__siunitx_degree_math_tl
- { { } ^ { \circ } }
- { \tex_char:D \c__siunitx_degree_int }
- \__siunitx_option_unchanged:Nnn \l__siunitx_micro_math_tl
- { \text { \c__siunitx_mu_tl } }
- { \tex_char:D \c__siunitx_micro_int }
- \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl
- { \text { \ensuremath { \g__siunitx_omega_tl } } }
- { \tex_char:D \c__siunitx_ohm_int }
- \sys_if_engine_xetex:T
- {
- \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_text_tl
- { \AA }
- { \tex_char:D \c__siunitx_angstrom_int }
- }
- \__siunitx_option_unchanged:Nnn \l__siunitx_celsius_text_tl
- {
- \ensuremath
- { { } ^ { \circ } \kern - \scriptspace C }
- }
- {
- \tex_char:D \c__siunitx_degree_int
- C
- }
- \__siunitx_option_unchanged:Nnn \l__siunitx_degree_text_tl
- { \ensuremath { { } ^ { \circ } } }
- { \tex_char:D \c__siunitx_degree_int }
- \__siunitx_option_unchanged:Nnn \l__siunitx_micro_text_tl
- { \c__siunitx_mu_tl }
- { \tex_char:D \c__siunitx_micro_int }
- \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl
- { \ensuremath { \g__siunitx_omega_tl } }
- { \tex_char:D \c__siunitx_ohm_int }
- }
- { }
- \@ifpackageloaded { unicode-math }
- {
- \int_const:Nn \c__siunitx_arcminute_int { 8242 }
- \int_const:Nn \c__siunitx_arcsecond_int { 8243 }
- \__siunitx_option_unchanged:Nnn \l__siunitx_arcminute_math_tl
- { { } ^ { \prime } }
- { \ensuremath { \tex_char:D \c__siunitx_arcminute_int } }
- \__siunitx_option_unchanged:Nnn \l__siunitx_arcsecond_math_tl
- { { } ^ { \prime \prime } }
- { \ensuremath { \tex_char:D \c__siunitx_arcsecond_int } }
- \__siunitx_option_unchanged:Nnn \l__siunitx_arcminute_text_tl
- { \ensuremath { { } ^ { \prime } } }
- { \ensuremath { \tex_char:D \c__siunitx_arcminute_int } }
- \__siunitx_option_unchanged:Nnn \l__siunitx_arcsecond_text_tl
- { \ensuremath { { } ^ { \prime \prime } } }
- { \ensuremath { \tex_char:D \c__siunitx_arcsecond_int } }
- }
- { }
- }
\clist_new:N \l__siunitx_pgf_link_clist
\cs_new_protected:Npn \__siunitx_pgf_link: {
\clist_clear:N \l__siunitx_pgf_link_clist
@@ -7405,7 +7325,7 @@
\cs_set:Npn \SIUnitSymbolCelsius { \textcelsius }
\cs_set:Npn \SIUnitSymbolDegree { \textdegree }
\cs_set:Npn \SIUnitSymbolMicro { \textmu }
- \cs_set:Npn \SIUnitSymbolOhm { [ohm] }
+ \cs_set:Npn \SIUnitSymbolOhm { \textohm }
}
\DeclareExpandableDocumentCommand \numInBookmark { o m } {#2}
\DeclareExpandableDocumentCommand \numrangeInBookmark { o m m }
@@ -7711,7 +7631,7 @@
{ \__siunitx_unit_create_functions: }
{ \__siunitx_unit_create_empty_functions: }
}
-%% Copyright (C) 2008-2018 by
+%% Copyright (C) 2008-2020 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/siunitx.tlpobj new/tlpkg/tlpobj/siunitx.tlpobj
--- old/tlpkg/tlpobj/siunitx.tlpobj 2019-02-28 04:05:35.000000000 +0100
+++ new/tlpkg/tlpobj/siunitx.tlpobj 2020-02-26 01:55:05.000000000 +0100
@@ -1,6 +1,6 @@
name siunitx
category Package
-revision 47746
+revision 53914
shortdesc A comprehensive (SI) units package
relocated 1
longdesc Typesetting values with units requires care to ensure that the
@@ -23,7 +23,9 @@
longdesc handle all of the possible unit-related needs of LaTeX users.
longdesc The package relies on LaTeX 3 support from the l3kernel and
longdesc l3packages bundles.
-runfiles size=79
+depend l3kernel
+depend l3packages
+runfiles size=78
RELOC/tex/latex/siunitx/siunitx-abbreviations.cfg
RELOC/tex/latex/siunitx/siunitx-binary.cfg
RELOC/tex/latex/siunitx/siunitx-version-1.cfg
@@ -32,7 +34,6 @@
catalogue-contact-home https://www.texdev.net
catalogue-contact-repository https://github.com/josephwright/siunitx
catalogue-ctan /macros/latex/contrib/siunitx
-catalogue-date 2018-05-17 22:18:13 +0200
catalogue-license lppl1.3c
-catalogue-topics units scientific-docs
-catalogue-version 2.7s
+catalogue-topics units scientific-docs expl3
+catalogue-version 2.8b
++++++ skdoc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/skdoc/README new/doc/latex/skdoc/README
--- old/doc/latex/skdoc/README 2018-05-01 00:56:35.000000000 +0200
+++ new/doc/latex/skdoc/README 2019-09-29 23:14:38.000000000 +0200
@@ -1,6 +1,6 @@
%% skdoc documentation class
%%
-%% Copyright (C) 2012-2018 by Simon Sigurdhsson
+%% Copyright (C) 2012-2019 by Simon Sigurdhsson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,7 +17,7 @@
%% This work consists of the files skdoc.dtx
%% and the derived filebase skdoc.cls.
-This is version 1.5a of the skdoc document class. It is designed to
+This is version 1.5b of the skdoc document class. It is designed to
generate both documentation and derivative files using only LaTeX,
i.e. without using docstrip and ins/dtx files.
Binary files old/doc/latex/skdoc/skdoc.pdf and new/doc/latex/skdoc/skdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skdoc.doc.tlpobj new/tlpkg/tlpobj/skdoc.doc.tlpobj
--- old/tlpkg/tlpobj/skdoc.doc.tlpobj 2019-02-28 04:05:37.000000000 +0100
+++ new/tlpkg/tlpobj/skdoc.doc.tlpobj 2019-09-30 01:54:45.000000000 +0200
@@ -1,8 +1,8 @@
name skdoc.doc
category Package
-revision 47526
+revision 52211
shortdesc doc files of skdoc
relocated 1
-docfiles size=68
+docfiles size=73
RELOC/doc/latex/skdoc/README
RELOC/doc/latex/skdoc/skdoc.pdf
++++++ skdoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/skdoc/skdoc.cls new/tex/latex/skdoc/skdoc.cls
--- old/tex/latex/skdoc/skdoc.cls 2018-05-01 00:56:35.000000000 +0200
+++ new/tex/latex/skdoc/skdoc.cls 2019-09-29 23:14:38.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% skdoc documentation class
%%
-%% Copyright (C) 2012-2018 by Simon Sigurdhsson
+%% Copyright (C) 2012-2019 by Simon Sigurdhsson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@
%% and the derived filebase skdoc.cls.
\RequirePackage{expl3}
\ProvidesExplClass{skdoc}
- {2018/04/18}{1.5a}{skdoc documentation class}
+ {2019/09/29}{1.5b}{skdoc documentation class}
\PassOptionsToPackage{log-declarations=false}{xparse}
\LoadClass[ DIV7,
headings=big,
@@ -46,7 +46,7 @@
\RequirePackage[english=british]{csquotes}
\RequirePackage[font=small,labelfont=bf,textfont=it]{caption}
\RequirePackage{PTSerif,sourcecodepro}
- \RequirePackage[defaultsans,osfigures,scale=0.95]{opensans}
+ \RequirePackage[defaultsans,oldstyle,scale=0.95]{opensans}
\RequirePackage[babel]{microtype}
}
\msg_new:nnn{skdoc}{key-exists}{File~key~"#1"~already~declared!}
@@ -95,7 +95,7 @@
}
\prg_new_conditional:Nnn\__skdoc_if_shellescape:{T,F,TF}{
\if_cs_exist:N\pdf@shellescape
- \if_int_compare:w\pdf@shellescape=\c_one
+ \if_int_compare:w\pdf@shellescape=\c_one_int
\prg_return_true:
\else:
\prg_return_false:
@@ -352,7 +352,7 @@
\int_if_exist:cTF{skdoc@output@##1@line}{}{
\msg_critical:nnn{skdoc}{key-nexists}{##1}
}%
- \int_compare:nNnT{\int_use:c{skdoc@output@##1@line}}=\c_zero%
+ \int_compare:nNnT{\int_use:c{skdoc@output@##1@line}}=\c_zero_int%
{\int_gincr:c{skdoc@output@##1@line}}%
}
\__skdoc_if_print_code:T{
@@ -392,7 +392,7 @@
\begin{minipage}[c][1ex]{\textwidth}
\bool_if:nF{
\g__skdoc_in_example_bool &&
- !\int_compare_p:nNn{\clist_count:N\l__skdoc_keys}>\c_one
+ !\int_compare_p:nNn{\clist_count:N\l__skdoc_keys}>\c_one_int
}{
\makebox[4ex]{%
\leavevmode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skdoc.tlpobj new/tlpkg/tlpobj/skdoc.tlpobj
--- old/tlpkg/tlpobj/skdoc.tlpobj 2019-02-28 04:05:37.000000000 +0100
+++ new/tlpkg/tlpobj/skdoc.tlpobj 2019-09-30 01:54:45.000000000 +0200
@@ -1,6 +1,6 @@
name skdoc
category Package
-revision 47526
+revision 52211
shortdesc Documentation and extraction for packages and document classes
relocated 1
longdesc The class provides the functionality and implementation of
@@ -13,7 +13,7 @@
runfiles size=13
RELOC/tex/latex/skdoc/skdoc.cls
catalogue-ctan /macros/latex/contrib/skdoc
-catalogue-date 2019-01-12 10:17:10 +0100
+catalogue-date 2019-09-29 19:03:14 +0200
catalogue-license lppl1.3
catalogue-topics doc-supp class
-catalogue-version 1.5a
+catalogue-version 1.5b
++++++ skmath.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/skmath/README new/doc/latex/skmath/README
--- old/doc/latex/skmath/README 2018-12-30 23:14:46.000000000 +0100
+++ new/doc/latex/skmath/README 2019-10-16 22:56:14.000000000 +0200
@@ -17,7 +17,7 @@
%% This work consists of the file skmath.tex
%% and the derived file skmath.sty.
-This is version 0.5 of the skmath package, a package which provides
+This is version 0.5a of the skmath package, a package which provides
improved and new math commands for superior typesetting with lower effort.
The following files are enclosed.
Binary files old/doc/latex/skmath/skmath.pdf and new/doc/latex/skmath/skmath.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skmath.doc.tlpobj new/tlpkg/tlpobj/skmath.doc.tlpobj
--- old/tlpkg/tlpobj/skmath.doc.tlpobj 2019-02-28 04:05:38.000000000 +0100
+++ new/tlpkg/tlpobj/skmath.doc.tlpobj 2019-10-17 01:54:28.000000000 +0200
@@ -1,8 +1,8 @@
name skmath.doc
category Package
-revision 49550
+revision 52411
shortdesc doc files of skmath
relocated 1
-docfiles size=71
+docfiles size=76
RELOC/doc/latex/skmath/README
RELOC/doc/latex/skmath/skmath.pdf
++++++ skmath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/skmath/skmath.sty new/tex/latex/skmath/skmath.sty
--- old/tex/latex/skmath/skmath.sty 2018-12-30 23:14:46.000000000 +0100
+++ new/tex/latex/skmath/skmath.sty 2019-10-16 22:56:14.000000000 +0200
@@ -20,7 +20,7 @@
\RequirePackage{expl3,l3keys2e,xparse}
\ProvidesExplPackage{skmath}
- {2018/12/29}{0.5}{improved math commands}
+ {2019/10/15}{0.5a}{improved math commands}
\PassOptionsToPackage{intlimits,sumlimits,namelimits}{amsmath}
\RequirePackage{amssymb,mathtools,xfrac}
\msg_new:nnnn{skmath}{undefined-macro}{The~macro~`\token_to_str:N#1'~was~undefined!}
@@ -285,7 +285,7 @@
\RenewDocumentCommand\frac{mm}{\genfrac{}{}{}{}%
{\displaystyle #1}{\displaystyle #2}}
\prg_new_conditional:Npnn\__skmath_if_numerical:n#1{p,T,F,TF}{
- \str_case_x:nnTF{#1}{
+ \str_case_e:nnTF{#1}{
{0}{}
{1}{}
{2}{}
@@ -307,7 +307,7 @@
\clist_set:Nn\l_tmpa_clist{#1}
\clist_map_inline:Nn\l_tmpa_clist{
\seq_set_split:Nnn\l_tmpa_seq{^}{##1}
- \int_compare:nT{\seq_count:N\l_tmpa_seq<\c_two}{
+ \int_compare:nT{\seq_count:N\l_tmpa_seq<2}{
\seq_put_right:Nn\l_tmpa_seq{1}
}
\seq_get_right:NN\l_tmpa_seq\l_tmpb_tl
@@ -319,20 +319,20 @@
\tl_put_right:Nx\l_tmpa_tl{\tl_use:N\l_tmpb_tl}
}
}
- \int_compare:nT{\l_tmpa_int>\c_zero}{\int_use:N\l_tmpa_int}
+ \int_compare:nT{\l_tmpa_int>\c_zero_int}{\int_use:N\l_tmpa_int}
\bool_if:NF\l_tmpa_bool{
- \int_compare:nT{\l_tmpa_int>\c_zero}{+}
+ \int_compare:nT{\l_tmpa_int>\c_zero_int}{+}
\tl_use:N\l_tmpa_tl
}
}
\prg_new_conditional:Npnn\__skmath_pd_if_vars_sum_above_one:n#1{p,T,F,TF}{
\clist_set:Nn\l_tmpa_clist{#1}
- \int_compare:nTF{\clist_count:N\l_tmpa_clist>\c_one}{
+ \int_compare:nTF{\clist_count:N\l_tmpa_clist>\c_one_int}{
\prg_return_true:
}{
\clist_pop:NN\l_tmpa_clist\l_tmpa_tl
\seq_set_split:NnV\l_tmpa_seq{^}{\l_tmpa_tl}
- \int_compare:nTF{\seq_count:N\l_tmpa_seq<\c_two}{
+ \int_compare:nTF{\seq_count:N\l_tmpa_seq<2}{
\prg_return_false:
}{
\prg_return_true:
@@ -358,8 +358,8 @@
\clist_map_inline:Nn\l_tmpa_clist{
\seq_set_split:Nnn\l_tmpa_seq{^}{##1}
\seq_pop:NN\l_tmpa_seq\l_tmpa_tl
- \int_set:Nn\l_tmpa_int{\c_one}
- \int_compare:nT{\seq_count:N\l_tmpa_seq>\c_zero}{
+ \int_set:Nn\l_tmpa_int{\c_one_int}
+ \int_compare:nT{\seq_count:N\l_tmpa_seq>\c_zero_int}{
\seq_pop:NN\l_tmpa_seq\l_tmpb_tl
\int_set:Nn\l_tmpa_int{\tl_use:N\l_tmpb_tl}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skmath.tlpobj new/tlpkg/tlpobj/skmath.tlpobj
--- old/tlpkg/tlpobj/skmath.tlpobj 2019-02-28 04:05:38.000000000 +0100
+++ new/tlpkg/tlpobj/skmath.tlpobj 2019-10-17 01:54:29.000000000 +0200
@@ -1,6 +1,6 @@
name skmath
category Package
-revision 49550
+revision 52411
shortdesc Extensions to the maths command repertoir
relocated 1
longdesc The package provides a selection of new maths commands and
@@ -8,7 +8,7 @@
runfiles size=4
RELOC/tex/latex/skmath/skmath.sty
catalogue-ctan /macros/latex/contrib/skmath
-catalogue-date 2018-12-29 23:02:23 +0100
+catalogue-date 2019-10-16 10:24:58 +0200
catalogue-license lppl1.3
catalogue-topics maths
-catalogue-version 0.5
+catalogue-version 0.5a
++++++ skrapport.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/skrapport/README new/doc/latex/skrapport/README
--- old/doc/latex/skrapport/README 2018-12-30 00:01:12.000000000 +0100
+++ new/doc/latex/skrapport/README 2019-10-16 22:56:31.000000000 +0200
@@ -26,7 +26,7 @@
%% * skrapport-size11pt.clo
%% * skrapport-size12pt.clo
-This is version 0.12i of the skrapport document class, intended for simple
+This is version 0.12k of the skrapport document class, intended for simple
reports submitted by the author at Chalmers University of Technology.
The following files are enclosed.
Binary files old/doc/latex/skrapport/skrapport.pdf and new/doc/latex/skrapport/skrapport.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skrapport.doc.tlpobj new/tlpkg/tlpobj/skrapport.doc.tlpobj
--- old/tlpkg/tlpobj/skrapport.doc.tlpobj 2019-02-28 04:05:38.000000000 +0100
+++ new/tlpkg/tlpobj/skrapport.doc.tlpobj 2019-10-17 01:54:29.000000000 +0200
@@ -1,8 +1,8 @@
name skrapport.doc
category Package
-revision 49540
+revision 52412
shortdesc doc files of skrapport
relocated 1
-docfiles size=67
+docfiles size=72
RELOC/doc/latex/skrapport/README
RELOC/doc/latex/skrapport/skrapport.pdf
++++++ skrapport.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/skrapport/skrapport.cls new/tex/latex/skrapport/skrapport.cls
--- old/tex/latex/skrapport/skrapport.cls 2018-12-30 00:01:12.000000000 +0100
+++ new/tex/latex/skrapport/skrapport.cls 2019-10-16 22:56:31.000000000 +0200
@@ -29,7 +29,7 @@
\RequirePackage{expl3,l3keys2e,xparse,xstring,etoolbox}
\ProvidesExplClass{skrapport}%
- {2018/12/29}{0.12i}{stylish report document class}
+ {2019/10/15}{0.12k}{stylish report document class}
\msg_new:nnnn{skrapport}{option-deprecated}{Option~`#1'~deprecated!}
{Please~use~`#2'~instead.}
\msg_new:nnnn{skrapport}{option-no-effect}{Option~`#1'~deprecated!}
@@ -394,7 +394,7 @@
}
{skdoc}{
\RequirePackage{PTSerif}
- \RequirePackage[defaultsans,osfigures,scale=0.95]{opensans}
+ \RequirePackage[defaultsans,oldstyle,scale=0.95]{opensans}
}
{word}{
\bool_if:nF{\sys_if_engine_luatex_p: || \sys_if_engine_xetex_p:}{
@@ -836,7 +836,7 @@
{~\__skrapport_and_word:{}~}{,~}{~\__skrapport_and_word:{}~}
}
\cs_new:Nn\__skrapport_email_list:{
- \int_compare:nT{\clist_count:N\g__skrapport_author_clist>\c_zero}{
+ \int_compare:nT{\clist_count:N\g__skrapport_author_clist>\c_zero_int}{
\clist_use:Nnnn\g__skrapport_email_clist{\\}{\\}{\\}
}
}
@@ -1089,27 +1089,27 @@
#6
}
}
-\cs_generate_variant:Nn\__skrapport_pre_section:n{c}
-\cs_generate_variant:Nn\__skrapport_post_section:n{c}
-\cs_generate_variant:Nn\__skrapport_section_star:nnn{ccn}
-\cs_generate_variant:Nn\__skrapport_section_nostar:nnnnnn{nnccnn}
+\cs_generate_variant:Nn\__skrapport_pre_section:n{v}
+\cs_generate_variant:Nn\__skrapport_post_section:n{v}
+\cs_generate_variant:Nn\__skrapport_section_star:nnn{vvn}
+\cs_generate_variant:Nn\__skrapport_section_nostar:nnnnnn{nnvvnn}
\cs_set:Nn\__skrapport_generic_section:nnnnn{
- \__skrapport_pre_section:c{c__skrapport_#1_pre_skip}
+ \__skrapport_pre_section:v{c__skrapport_#1_pre_skip}
\IfBooleanTF#3{
- \__skrapport_section_star:ccn
+ \__skrapport_section_star:vvn
{c__skrapport_#1_indent_dim}
{__skrapport_#1_style:}
{#5}
}{
\IfNoValueTF{#4}{
- \__skrapport_section_nostar:nnccnn
+ \__skrapport_section_nostar:nnvvnn
{#1}{#2}
{c__skrapport_#1_indent_dim}
{__skrapport_#1_style:}
{#5}
{#5}
}{
- \__skrapport_section_nostar:nnccnn
+ \__skrapport_section_nostar:nnvvnn
{#1}{#2}
{c__skrapport_#1_indent_dim}
{__skrapport_#1_style:}
@@ -1117,7 +1117,7 @@
{#4}
}
}
- \__skrapport_post_section:c{c__skrapport_#1_post_skip}
+ \__skrapport_post_section:v{c__skrapport_#1_post_skip}
}
\skip_const:Nn\c__skrapport_section_pre_skip{-4ex~plus~1ex~minus~-1ex}
\skip_const:Nn\c__skrapport_section_post_skip{.5ex~plus~.5ex}
@@ -1235,7 +1235,7 @@
\DeclareDocumentCommand\em{}{\msg_error:nnnn{skrapport}{old-font-deprecated}{\em}{\emph}}
\cs_new:Nn\__skrapport_emphstyle:{
\itshape
- \dim_compare:nF{\fontdimen\c_one\font>\c_zero_dim}{\bfseries}
+ \dim_compare:nF{\fontdimen\c_one_int\font>\c_zero_dim}{\bfseries}
}
\DeclareDocumentCommand\emph{+m}{
\ifmmode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skrapport.tlpobj new/tlpkg/tlpobj/skrapport.tlpobj
--- old/tlpkg/tlpobj/skrapport.tlpobj 2019-02-28 04:05:38.000000000 +0100
+++ new/tlpkg/tlpobj/skrapport.tlpobj 2019-10-17 01:54:29.000000000 +0200
@@ -1,6 +1,6 @@
name skrapport
category Package
-revision 49540
+revision 52412
shortdesc 'Simple' class for reports, etc.
relocated 1
longdesc The class is intended for simple documents (e.g., reports
@@ -21,7 +21,7 @@
catalogue-contact-bugs https://github.com/urdh/skrapport/issues
catalogue-contact-repository https://github.com/urdh/skrapport
catalogue-ctan /macros/latex/contrib/skrapport
-catalogue-date 2018-12-29 22:01:02 +0100
+catalogue-date 2019-10-16 21:10:34 +0200
catalogue-license lppl1.3
catalogue-topics class
-catalogue-version 0.12i
+catalogue-version 0.12k
++++++ skull.tar.xz ++++++
Binary files old/fonts/tfm/public/skull/skull.tfm and new/fonts/tfm/public/skull/skull.tfm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skull.tlpobj new/tlpkg/tlpobj/skull.tlpobj
--- old/tlpkg/tlpobj/skull.tlpobj 2019-02-28 04:05:38.000000000 +0100
+++ new/tlpkg/tlpobj/skull.tlpobj 2019-08-20 01:53:48.000000000 +0200
@@ -1,13 +1,14 @@
name skull
category Package
-revision 25608
+revision 51907
shortdesc A font to draw a skull
relocated 1
longdesc The font (defined in Metafont) defines a single character, a
longdesc black solid skull. A package is supplied to make this character
longdesc available as a symbol in maths mode.
-runfiles size=2
+runfiles size=3
RELOC/fonts/source/public/skull/skull.mf
+ RELOC/fonts/tfm/public/skull/skull.tfm
RELOC/tex/latex/skull/skull.sty
catalogue-ctan /fonts/skull
catalogue-date 2016-06-24 19:18:15 +0200
++++++ snapshot.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/snapshot/README new/doc/latex/snapshot/README
--- old/doc/latex/snapshot/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/snapshot/README 2019-09-18 23:56:20.000000000 +0200
@@ -0,0 +1,17 @@
+README for snapshot 2019/09/17
+https://www.ams.org/arc/resources/snapshot-about.html
+tech-support@ams.org
+
+The snapshot package helps the owner of a LaTeX document
+obtain a list of the external dependencies of the document, in a
+form that can be embedded at the top of the document. To put it
+another way, it provides a snapshot of the current processing
+context of the document, insofar as it can be determined from
+inside LaTeX.
+
+Originally written by Michael J. Downes, the snapshot package
+is currently maintained by the American Mathematical Society.
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3c
+of this license or (at your option) any later version.
Binary files old/doc/latex/snapshot/snapshot.pdf and new/doc/latex/snapshot/snapshot.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/snapshot.doc.tlpobj new/tlpkg/tlpobj/snapshot.doc.tlpobj
--- old/tlpkg/tlpobj/snapshot.doc.tlpobj 2019-02-28 04:05:39.000000000 +0100
+++ new/tlpkg/tlpobj/snapshot.doc.tlpobj 2019-09-19 01:54:05.000000000 +0200
@@ -1,7 +1,8 @@
name snapshot.doc
category Package
-revision 15878
+revision 52115
shortdesc doc files of snapshot
relocated 1
-docfiles size=30
+docfiles size=49
+ RELOC/doc/latex/snapshot/README
RELOC/doc/latex/snapshot/snapshot.pdf
++++++ snapshot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/snapshot/snapshot.sty new/tex/latex/snapshot/snapshot.sty
--- old/tex/latex/snapshot/snapshot.sty 2006-01-13 01:07:16.000000000 +0100
+++ new/tex/latex/snapshot/snapshot.sty 2019-09-18 23:56:20.000000000 +0200
@@ -6,51 +6,70 @@
%%
%% snapshot.dtx
%%
-%%% ====================================================================
-%%% @LaTeX-doc-source-file{
-%%% filename = "snapshot.dtx",
-%%% version = "1.14",
-%%% date = "2002/03/05",
-%%% time = "15:29:00 EST",
-%%% checksum = "39090 807 3449 29761",
-%%% author = "American Mathematical Society",
-%%% copyright = "Copyright 2001 American Mathematical Society,
-%%% all rights reserved. Copying of this file is
-%%% authorized only if either:
-%%% (1) you make absolutely no changes to your copy,
-%%% including name; OR
-%%% (2) if you do make changes, you first rename it
-%%% to some other name.",
-%%% address = "American Mathematical Society,
-%%% Electronic Products and Services,
-%%% PO Box 6248,
-%%% Providence, RI 02940,
-%%% USA",
-%%% email = "tech-support@ams.org",
-%%% URL = "http://www.ams.org/",
-%%% supported = "yes",
-%%% keywords = "version, compatibility, dependencies, LaTeX",
-%%% abstract = "This package provides a way for a LaTeX
-%%% document to specify, for each external file
-%%% on which the document depends, which version
-%%% is required to guarantee output fidelity.",
-%%% docstring = "The checksum field above contains a CRC-16
-%%% checksum as the first value, followed by the
-%%% equivalent of the standard UNIX wc (word
-%%% count) utility output of lines, words, and
-%%% characters. This is produced by Robert
-%%% Solovay's checksum utility.",
-%%% }
-%%% ====================================================================
+%% Copyright 2001, 2004, 2006, 2007, 2010, 2012 American Mathematical Society.
+%%
+%% American Mathematical Society
+%% Technical Support
+%% Publications Technical Group
+%% 201 Charles Street
+%% Providence, RI 02904
+%% USA
+%% tel: (401) 455-4080
+%% (800) 321-4267 (USA and Canada only)
+%% fax: (401) 331-3842
+%% email: tech-support@ams.org
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is the American Mathematical
+%% Society.
+%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{snapshot}[2002/03/05 v1.14]
-\let\@xp\expandafter \let\@nx\noexpand
-\newcommand{\RequireVersions}[2][]{%
- \let\snap@check\snap@compare@versions
- \let\snap@selfcheck\snap@selfcheck@a
- \@ifnextchar *\snap@store@version\snap@store@error#2*{end}{}{}%
+\ProvidesPackage{snapshot}[2012/08/06 v2.13]
+\let\@xp=\expandafter \let\@nx=\noexpand
+\def\str@cmp#1#2\str@cmp#3{%
+ \if #1#3\else F\@car\fi \str@cmp#2\str@cmp
+}
+\def\string@equal#1#2{%
+ \str@cmp#1\relax\str@cmp#2{\relax\@gobbletwo}\@nil TT%
+}
+\newcommand{\RequireVersions}[2][]{}%
+\renewcommand{\RequireVersions}[1][]{%
+ \def\snap@check{\snap@compare@versions}%
+ \toks@{#1}\afterassignment\snap@storem
+ \let\@let@token=
+}
+\def\snap@storem{%
+ \ifx\@let@token\bgroup
+ \else
+ \PackageError{snapshot}{Expected a `\@charlb' character here}\@ehc
+ \@xp\@gobblefour
+ \fi
+ \futurelet\@let@token\snap@branch
}
\@onlypreamble\RequireVersions
+\let\snap@check\@gobble
+\def\snap@finish{\toks@\bgroup}
+\def\snap@branch{%
+ \ifx\@let@token\egroup
+ \@xp\snap@finish
+ \else\ifx\@let@token *%
+ \let\reserved@c\snap@store@version
+ \else\ifx\@let@token\@sptoken
+ \lowercase{\def\reserved@c} {\futurelet\@let@token\snap@branch}%
+ \else
+ \let\reserved@c\snap@store@error
+ \fi\fi\fi
+ \reserved@c
+}
\def\snap@store@error#1{%
\PackageError{snapshot}{Expected '*' here, not '#1'}\@ehc
}
@@ -59,34 +78,68 @@
\@xp\snap@store@b\csname snapx@#2\endcsname{#2}{#3}{#4}%
}
\@onlypreamble\snap@store@version
+\ifx\OmegaVersion\@@undefined
+\else
+ \edef\snapshotApplication{%
+ {Omega}\space\space\space
+ {0000/00/00 v\OmegaVersion}%
+ }%
+\fi
+\ifx\eTeXversion\@@undefined
+\else
+ \edef\snapshotApplication{%
+ {eTeX}\space\space\space\space
+ {0000/00/00 v\number\eTeXversion\eTeXrevision}%
+ }%
+\fi
+\ifx\pdftexversion\@@undefined
+\else
+ \edef\snapshotApplication{%
+ \ifx\eTeXversion\@@undefined
+ {pdfTeX}\space\space
+ \else
+ {pdfeTeX}\space
+ \fi
+ {0000/00/00 v0.\number\pdftexversion\pdftexrevision}%
+ }%
+\fi
+\@ifundefined{snapshotApplication}{%
+ \edef\snapshotApplication{%
+ {TeX}\space\space\space\space\space
+ {1990/03/25 v3.x}%
+ }%
+}{}
\def\@fmtextension{fmt}
\def\@tfmextension{tfm}
\edef\snapx@package{.\@pkgextension}
\edef\snapx@class{.\@clsextension}
\edef\snapx@format{.\@fmtextension}
\edef\snapx@tfm{.\@tfmextension}
-\long\def\snapx@application{}
-\let\snap@file=\@empty
+\long\def\snapx@ignore{}
+\let\snapx@application=\snapx@ignore
+\let\snapx@file=\@empty
\let\snapx@end\@@end
+\expandafter\let\csname snapx@-------\endcsname\snapx@end
\def\snap@store@b#1#2#3#4{%
\ifx#1\snapx@end
- \@xp\@gobblefour
+ \@xp\snap@finish
\else
\ifx#1\relax \let#1\@empty\fi
\def\@tempa##1 ##2 ##3\@nil{##1 ##2}%
\ifx#1\snapx@application
+ \@xp\xdef\csname rqv@#3#1\endcsname{\@tempa#4 v?.? ? \relax\@nil}%
\else
- \xdef\rqv@list{\rqv@list
- \ifx\@empty\rqv@list\else,\fi
- #3#1%
- }%
- \fi
- \@xp\xdef\csname rqv@#3#1\endcsname{\@tempa#4 v?.? ? \relax\@nil}%
- \ifx#1\snapx@format \snap@check{#3.fmt}%
- \else \snap@selfcheck{#3.sty}%
+ \xdef\rqv@list{\rqv@list{#3#1}}%
+ \@xp\xdef\csname rqv@#3#1\endcsname{\@tempa#4 v?.? ? \relax\@nil}%
+ \snap@intest{#3}{#1}%
+ \ifx#1\snapx@format \snap@check{#3.fmt}%
+ \else
+ \edef\@tempa{\@nx\string@equal{snapshot.sty}{#3#1}}%
+ \if\@tempa \snap@selfcheck \fi
+ \fi
\fi
\fi
- \@ifnextchar *\snap@store@version\snap@store@error
+ \futurelet\@let@token\snap@branch
}
\@onlypreamble\snap@store@b
\def\snap@write{\immediate\write\snap@out}
@@ -97,10 +150,8 @@
\DeclareOption{log}{%
\let\snap@write\typeout
}
-\let\snap@fake@b\relax
-\DeclareOption{test}{%
- \def\snap@fake@b{\endinput \futurelet\@let@token\snap@ignoline}%
-}
+\let\snap@intest=\@gobbletwo
+\DeclareOption{test}{\def\snap@intest{True}}
\DeclareOption{tfm}{%
\typeout{Option 'tfm' not implemented yet [1999/09/23]}%
}
@@ -108,17 +159,20 @@
\def\snap@mismatch{\snap@mismatch@warning}
\DeclareOption{error}{%
\def\snap@mismatch{\PackageError}%
+ \def\snap@selfcheck{\snap@selfcheck@a}%
\ifx\snap@select\@empty \let\snap@select\snap@select@all \fi
}
\DeclareOption{warning}{%
\def\snap@mismatch{\snap@mismatch@warning}%
+ \def\snap@selfcheck{\snap@selfcheck@a}%
\ifx\snap@select\@empty \let\snap@select\snap@select@all \fi
}
\def\snap@select@all#1#2 #3#4 #5\@nil{#1#2 #3#4}
\let\snap@select\@empty
-\DeclareOption{date}{%
- \def\snap@select#1#2 #3\@nil{#1#2}%
-}
+\def\snap@seldate#1#2 #3\@nil{#1#2}%
+\def\snap@selversion#1#2 #3{\snap@select@version #3}%
+\def\snap@selmajor#1#2 #3{\snap@select@major #3}%
+\DeclareOption{date}{\let\snap@select=\snap@seldate}
\def\snap@select@version#1{%
\ifodd 0#11 \@xp\snap@sva\@xp#1\else\@xp\snap@select@version\fi
}
@@ -127,13 +181,26 @@
\ifodd 0#11 \@xp\snap@svm\@xp#1\else\@xp\snap@select@major\fi
}
\def\snap@svm#1.#2\@nil{#1}
-\DeclareOption{version}{%
- \def\snap@select#1#2 #3{\snap@select@version #3}%
+\DeclareOption{version}{\let\snap@select\snap@selversion}
+\DeclareOption{major-version}{\let\snap@select\snap@selmajor}
+\def\snap@bbinfo{01}
+\DeclareOption{bbinfo}{\def\snap@bbinfo{00}}
+\let\snap@splitter=?
+\AtBeginDocument{%
+ \xdef\@filelist{\@filelist\snap@splitter}%
}
-\DeclareOption{major-version}{%
- \def\snap@select#1#2 #3{\snap@select@major #3}%
+\let\snap@selfcheck\@empty
+\let\snap@selfcheck@a\@empty
+\DeclareOption{self-warning}{%
+ \def\snap@selfcheck{%
+ \begingroup
+ \def\snap@mismatch{\snap@mismatch@warning}%
+ \snap@selfcheck@a
+ \endgroup
+ }
}
-\ProcessOptions\par
+\ExecuteOptions{warning}
+\ProcessOptions\relax
\edef\snap@restore@extensions{%
\def\@nx\@pkgextension{\@pkgextension}%
\def\@nx\@clsextension{\@clsextension}%
@@ -157,42 +224,29 @@
}%
\fi
\listfiles
-\def\@dofilelist{%
- \snap@restore@extensions
- \ifx\rqv@list\@empty
- \else \rqv@compare@lists
- \fi
- \ifx\snap@write\typeout
+\def\snap@doit#1{%
+ \begingroup
+ \ifx\delimiter#1\delimiter
\else
- \newwrite\snap@out
- \immediate\openout\snap@out=\jobname.dep \relax
- \fi
- \snap@write{\string\RequireVersions\@charlb}%
- \snap@write{\space\space *{application}{TeX}%
- \space\space\space\space\space{1990/03/25 v3.x}}%
- \@for\@currname:=\@filelist\do{%
- \filename@parse\@currname
+ \filename@parse{#1}%
+ \let\@tempd\@empty
\ifx\filename@ext\relax
- \def\@tempa{file}\def\@tempd{.tex}\def\filename@ext{tex}%
- \def\@tempb{~~~}%
+ \def\@tempa{file}\def\@tempb{~~~}%
\else\ifx\filename@ext\@pkgextension
- \def\@tempa{package}\let\@tempd\@empty
- \def\@tempb{}%
+ \def\@tempa{package}\let\@tempb\@empty
\else\ifx\filename@ext\@clsextension
- \def\@tempa{class}\let\@tempd\@empty
- \def\@tempb{~~}%
+ \def\@tempa{class}\def\@tempb{~~}%
\else\ifx\filename@ext\@fmtextension
- \def\@tempa{format}\let\@tempd\@empty
- \def\@tempb{~}%
+ \def\@tempa{format}\def\@tempb{~}%
\else\ifx\filename@ext\@tfmextension
- \def\@tempa{tfm}\let\@tempd\@empty
- \def\@tempb{~~~~}%
+ \def\@tempa{tfm}\def\@tempb{~~~~}%
\else
\def\@tempa{file}\edef\@tempd{.\filename@ext}%
\def\@tempb{~~~}%
\fi\fi\fi\fi\fi
\@xp\let\@xp\@tempe
- \csname ver@\filename@base.\filename@ext\endcsname
+ \csname ver@\filename@base %
+ \ifx\filename@ext\relax\else.\filename@ext\fi\endcsname
\ifx\@tempe\@empty \let\@tempe\relax \fi
\edef\@tempe{%
\ifx\@tempe\relax 0000/00/00 v0.0%
@@ -202,99 +256,161 @@
}%
\edef\@tempc{\filename@area\filename@base\@tempd}% full file name
\@xp\snap@pad\@tempc\space~~~~~~~~~~~~~~~~\@nil\@tempd
- \begingroup \let~\space
- \snap@write{\space\space *{\@tempa}\@tempb{\@tempc}\@tempd{\@tempe}}%
- \endgroup
+ \let~\space
+ \snap@write{\space\space *{\@tempa}\@tempb{\@tempc}\@tempd{\@tempe}}%
+ \fi
+ \aftergroup\snap@doit
+ \endgroup
+}%
+\def\snap@bracify#1#2,{%
+ \ifx\@empty#1\expandafter\@gobble\else {#1#2}\fi \snap@bracify
+}
+\def\snap@splitter@a{%
+ \iffalse{{\fi }}% close current file name, end definition
+ \xdef\specific@files{%
+ \iffalse}\fi
+ \specific@files
+ \expandafter\@gobble\string % discard one closing brace
+}
+\def\snap@fdcheck#1{%
+ \ifx\delimiter#1\@xp\@gobble
+ \else\snap@fda#1\@empty.fd\@empty ?\@nil
+ \fi
+ \snap@fdcheck
+}
+\def\snap@fda#1.fd\@empty#2#3\@nil{%
+ \if ?#2%
+ \xdef\specific@files{\specific@files {#1}}%
+ \else
+ \xdef\general@files{\general@files {#1.fd}}%
+ \fi
+}
+\let\general@files\@empty
+\let\specific@files\@empty
+\newcommand{\SpecialInput}[1]{%
+ \xdef\specific@files{\specific@files{#1}}%
+ \@@input#1\relax
+}
+\def\@dofilelist{%
+ \snap@restore@extensions
+ \xdef\general@files{\@xp\snap@bracify \@filelist \@empty,\@empty,}%
+ \let\snap@splitter\snap@splitter@a
+ \xdef\general@files{\general@files}%
+ \let\@tempa\specific@files \global\let\specific@files\@empty
+ \@xp\snap@fdcheck\@tempa{\delimiter}%
+ \ifx\rqv@list\@empty
+ \else \rqv@compare@lists
+ \fi
+ \ifx\snap@write\typeout
+ \else
+ \newwrite\snap@out
+ \immediate\openout\snap@out=\jobname.dep \relax
+ \fi
+ \snap@write{\string\RequireVersions\@charlb}%
+ \snap@write{\space\space *{application}%
+ \snapshotApplication
}%
+ \@xp\snap@doit\general@files{\delimiter\aftergroup\@gobble\@gobble}%
+ \ifx\specific@files\@empty
+ \else
+ \snap@specific
+ \fi
\snap@write{\@charrb}%
\ifx\snap@write\typeout
\else \immediate\closeout\snap@out
\typeout{Dependency list written on \jobname.dep.}%
\fi
}%
-\def\rqv@condense#1,{%
- \if ,#1,%
+\def\snap@specific{%
+ \snap@write{ \space *{-------}{Document-specific files:}{----}}%
+ \@xp\snap@doit\specific@files{\delimiter\aftergroup\@gobble\@gobble}%
+}
+\def\rqv@condense#1{%
+ \@xp\ifx\csname ver@#1\endcsname\N
\else
- \@xp\ifx\csname ver@#1\endcsname\N
- \else
- \edef\L{\L,#1}%
- \@xp\let\csname ver@#1\endcsname=\N
- \fi
+ \edef\L{\L{#1}}%
+ \@xp\let\csname ver@#1\endcsname=\N
\fi
\rqv@condense
}
-\def\rqv@compare@lists{%
- \begingroup
- \def\N{1}\let\L=\@gobble
- \@xp\rqv@condense \rqv@list,TeX,{,\relax\@xp\@gobbletwo\@xp},%
- \ifx\L\@gobble\let\L\@empty\fi
- \let\rqv@list=\L
- \let\L=\@gobble
- \@xp\rqv@condense \@filelist,{,\relax\@xp\@gobbletwo\@xp},%
- \ifx\L\@gobble\let\L\@empty\fi
- \@for\@currname:=\L\do{%
- \snap@mismatch{snapshot}{^^J%
- File \@currname\space loaded though not in
- \noexpand\RequireVersions list%
- }\@ehc
- }%
- \def\N{2}\let\L=\@gobble
- \@xp\rqv@condense\@filelist,TeX,{,\relax\@xp\@gobbletwo\@xp},%
- \let\L=\@gobble
- \@xp\rqv@condense\rqv@list,{,\relax\@xp\@gobbletwo\@xp},%
- \ifx\L\@gobble\let\L\@empty\fi
- \@for\@currname:=\L\do{%
- \snap@mismatch{snapshot}{^^J%
- File \@currname\space [\csname rqv@\@currname\endcsname]
- required but not loaded%
- }\@ehc
- }%
- \endgroup
+\def\rqv@condend{\endcsname ?\fi
+ \@xp\@xp\@xp\@gobbletwo\csname @xp\iftrue}
+\def\rqv@overloaded#1{%
+ \snap@mismatch{snapshot}{^^J%
+ File #1 loaded though not in \noexpand\RequireVersions list%
+ }\@ehc
}
-\begingroup \catcode\endlinechar=12\relax %
-\long\gdef\snap@ignoline#1
-{}\endgroup %
-\def\snap@fake@input#1#2#3#4{%
- \ifx#1\snapx@end
- \aftergroup\@@end \@xp\@gobblefour
- \else
- \ifx#1\snapx@format
- \else
- \message{^^J}%
- \@xp\snap@fake@b\@@input #3#1\relax
- \fi
- \fi
- \@ifnextchar *\snap@store@version\snap@store@error
+\def\rqv@notloaded#1{%
+ \snap@mismatch{snapshot}{^^J%
+ File #1 [\csname rqv@#1\endcsname] required but not loaded%
+ }\@ehc
}
-\newcommand{\rqvTest}[2][]{%
- \begingroup \catcode\endlinechar=12
- \catcode`\%=12 \catcode`\{=12 \catcode`\}=12\relax
- \let\snapx@application=\snapx@format \let\snapx@tfm=\snap@format
- \@ifnextchar *\snap@store@version\snap@store@error#2*{end}{}{}%
+\def\rqv@set#1{\@xp\let\csname ver@#1\endcsname\N \rqv@set}
+\def\rqv@test#1{\csname ver@#1\endcsname{#1}\rqv@test}
+\def\rqv@compare@lists{%
+ \begingroup
+ \def\N{1}\let\L\@empty
+ \@xp\rqv@condense\rqv@list\rqv@condend
+ \global\let\rqv@list=\L
+ \def\N{2}\let\L\@empty
+ \@xp\rqv@condense\general@files\rqv@condend
+ \global\let\general@files=\L
+ \def\T{\@firstoftwo{\endcsname\@empty\@gobbletwo}}%
+ \let\N\rqv@overloaded \@xp\rqv@set\general@files \T
+ \let\N\@gobble \@xp\rqv@set\rqv@list \T
+ \@xp\rqv@test\general@files{\endcsname\csname @gobbletwo}%
+ \let\N\rqv@notloaded \@xp\rqv@set\rqv@list \T
+ \let\N\@gobble \@xp\rqv@set\general@files \T
+ \@xp\rqv@test\rqv@list{\endcsname\csname @gobbletwo}%
\endgroup
}
-\@ifundefined{snap@fake@b}{}{%
- \let\snap@store@b\snap@fake@input
- \let\RequireVersions\rqvTest
-}
\AtBeginDocument{%
\@ifundefined{ver@amsgen}{}{%
\@xp\let\csname ver@amsgen.sty\@xp\endcsname
\csname ver@amsgen\endcsname
}%
}
-\let\snap@compare@versions\@gobble \let\snap@check\@gobble
-\let\snap@selfcheck\@gobble \let\snap@selfcheck@a\@gobble
-\ifx\snap@select\@empty \endinput \fi
-\begingroup \catcode`\.=11\relax
-\gdef\snap@selfcheck@b#1\rqv@snapshot.sty#2#3\@nil{T#2}
-\gdef\snap@selfcheck@a#1{%
- \if\@xp\snap@selfcheck@b\csname rqv@#1\endcsname T%
- \rqv@snapshot.sty F\@nil
- \snap@check{#1}%
+\def\ProvidesFile#1{%
+ \def\snap@checker{\snap@check{#1}}%
+ \begingroup
+ \aftergroup\snap@checker
+ \catcode`\ 10
+ \ifnum\endlinechar < 256
+ \ifnum \endlinechar>\m@ne
+ \catcode\endlinechar 10
+ \fi
+ \fi
+ \@makeother\/%
+ \@makeother\&%
+ \kernel@ifnextchar[{\snap@providesfile{#1}}{\snap@providesfile{#1}[]}%
+}
+\def\snap@graphic@test#1#2#3\@nil{r\if G#1#2\else X\fi}
+\def\snap@providesfile#1[#2]{%
+ \wlog{File: #1 #2}%
+ \if\snap@graphic@test#2@@\@nil
+ \snap@record@graphic#1\relax #2 (type ??)\@nil
+ \else
+ \expandafter\xdef\csname ver@#1\endcsname{#2}%
\fi
+ \endgroup
}
-\endgroup
+\def\snap@record@graphic#1\relax #2(type #3)#4\@nil{%
+ \expandafter\xdef\csname ver@#1\endcsname{%
+ Graphic%
+ \if\snap@bbinfo :bb=\Gin@llx/\Gin@lly/\Gin@urx/\Gin@ury\fi
+ \space v0.0%
+ }%
+}
+\def\@pr@videpackage [#1]{%
+ \expandafter\xdef\csname ver@\@currname.\@currext\endcsname{#1}%
+ \ifx\@currext\@clsextension
+ \typeout{Document Class: \@gtempa\space#1}%
+ \else
+ \wlog{Package: \@gtempa\space#1}%
+ \fi
+ \snap@check{\@currname.\@currext}%
+}
+\def\snap@selfcheck@a{\snap@check{snapshot.sty}}
\def\@nofmt#1.fmt.#2 {#1 }
\def\snap@mismatch@a#1#2#3{%
\snap@mismatch{snapshot}{^^J%
@@ -317,24 +433,82 @@
\fi
}%
\endgroup
+ \snap@test@abort
}
-\def\ProvidesFile#1{%
- \def\snap@checker{\snap@check{#1}}%
- \begingroup
- \aftergroup\snap@checker
- \catcode`\ 10\catcode\endlinechar 10 %
- \@makeother\/%
- \@makeother\&%
- \@ifnextchar[{\@providesfile{#1}}{\@providesfile{#1}[]}%
+\let\snap@test@abort=\@empty
+\ifx\snap@select\@empty
+ \let\snap@compare@versions\@gobble
+ \let\snap@check\@gobble
+\fi
+\providecommand{\controldates}[1]{}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifx\snap@intest\@gobbletwo \endinput \fi
+\def\restore@some@catcodes{}
+\def\save@some@catcodes{%
+ \edef\restore@some@catcodes{%
+ \catcode\number`\@=\number\catcode`\@
+ \catcode\number`\"=\number\catcode`\"
+ \catcode\number`\^=\number\catcode`\^
+ \catcode\number`\_=\number\catcode`\_
+ \relax
+ }%
}
-\def\@pr@videpackage[#1]{%
- \expandafter\xdef\csname ver@\@currname.\@currext\endcsname{#1}%
- \ifx\@currext\@clsextension
- \typeout{Document Class: \@gtempa\space#1}%
+\def\snap@intest#1#2{%
+ \message{^^J}%
+ \begingroup \edef\0{#1#2}\def\9{latex209.def}%
+ \ifx\0\9\global\@compatibilitytrue \fi
+ \ifx#2\snapx@format
+ \def\snap@test@abort{\endgroup}%
\else
- \wlog{Package: \@gtempa\space#1}%
+ \edef\N{%
+ \noexpand\snap@intest@b{#1#2}%
+ {#1}{\@xp\@gobble#2\@empty}%
+ {\csname rqv@#1#2\endcsname}}%
+ \expandafter\endgroup\N
\fi
- \snap@check{\@currname.\@currext}%
+}
+\def\snap@intest@b#1#2#3#4{%
+ \def\@currname{#2}\def\@currext{#3}%
+ \begingroup \lccode`\/=`\0\relax\lowercase{\endgroup
+ \ifnum\snap@seldate#4 00 0\@nil>\z@
+ }% matches \lowercase
+ \save@some@catcodes
+ \@@input #1 \relax
+ \restore@some@catcodes
+ \else
+ \snap@specialtest{#1}{#4}%
+ \fi
+}
+\def\snap@specialtest#1#2{%
+ \fake@input{#1}%
+}
+\def\fake@input#1{%
+ \begingroup
+ % Ensure that outer \foo or unmatched braces don't trip us up
+ \catcode`\\=12 \catcode`\{=12 \catcode`\}=12
+ \endinput
+ \def\G{\@car\endgroup}%
+ \expandafter\futurelet\expandafter\?\expandafter\G\@@input#1 \relax\@nil
+}
+\let\snap@test@abort=\endinput
+\let\snap@selfcheck=\@empty
+\def\snap@finish{%%
+ \endgroup \message{^^J}%
+ \def\X##1{##1,\X}%
+ \edef\@filelist{\@xp\X\rqv@list{\@gobbletwo}}%
+ \def\X##1,?{##1}\edef\@filelist{\@xp\X\@filelist ?}%
+ \@dofilelist
+ \@@end
+}%
+\def\snap@mismatch#1#2#3{}
+\renewcommand{\RequireVersions}[2][]{%
+ \begingroup
+ \makeatletter
+ \def\snap@check{\snap@compare@versions}%%
+ \let\snapx@tfm=\snap@ignore
+ \def\ProvidesLanguage##1{\ProvidesFile{##1.ldf}}%
+ \iffalse{\fi \futurelet\@let@token\snap@branch #2}%
+ \endgroup
}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/snapshot.tlpobj new/tlpkg/tlpobj/snapshot.tlpobj
--- old/tlpkg/tlpobj/snapshot.tlpobj 2019-02-28 04:05:39.000000000 +0100
+++ new/tlpkg/tlpobj/snapshot.tlpobj 2019-09-19 01:54:05.000000000 +0200
@@ -1,6 +1,6 @@
name snapshot
category Package
-revision 15878
+revision 52115
shortdesc List the external dependencies of a LaTeX document
relocated 1
longdesc The snapshot package helps the owner of a LaTeX document obtain
@@ -16,12 +16,12 @@
longdesc DVI file from it, on the fly; or for someone wanting to shield
longdesc a document during the final stages of its production cycle from
longdesc unexpected side effects of routine upgrades to the TeX system.
-runfiles size=3
+runfiles size=4
RELOC/tex/latex/snapshot/snapshot.sty
catalogue-also bundledoc
-catalogue-contact-home http://www.ams.org/publications/authors/tex/snapshot
+catalogue-contact-home https://www.ams.org/arc/resources/snapshot-about.html
catalogue-ctan /macros/latex/contrib/snapshot
-catalogue-date 2018-04-11 14:09:31 +0200
-catalogue-license lppl
+catalogue-date 2019-09-17 21:40:12 +0200
+catalogue-license lppl1.3c
catalogue-topics file-mgmt
-catalogue-version 1.14
+catalogue-version 2.13
++++++ songs.doc.tar.xz ++++++
++++ 26079 lines of diff (skipped)
++++++ songs.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/songs/songs.sty new/tex/latex/songs/songs.sty
--- old/tex/latex/songs/songs.sty 2017-06-10 23:36:05.000000000 +0200
+++ new/tex/latex/songs/songs.sty 2019-06-27 23:00:23.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017 by Kevin W. Hamlen
+%% Copyright (C) 2018 by Kevin W. Hamlen
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3a of this license
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{songs}
- [2017/06/05 v3.0 Songs package]
+ [2018/09/12 v3.1 Songs package]
\newif\ifSB@etex
\ifx\eTeXversion\undefined\else
\ifx\eTeXversion\relax\else
@@ -33,13 +33,15 @@
\fi
\fi
\newif\ifSB@pdf\SB@pdffalse
-\ifx\pdfoutput\undefined\else
- \ifx\pdfoutput\relax\else
- \ifnum\pdfoutput<\@ne\else
- \SB@pdftrue
+\IfFileExists{ifpdf.sty}{\RequirePackage{ifpdf}\ifpdf\SB@pdftrue\fi}{
+ \ifx\pdfoutput\undefined\else
+ \ifx\pdfoutput\relax\else
+ \ifnum\pdfoutput<\@ne\else
+ \SB@pdftrue
+ \fi
\fi
\fi
-\fi
+}
\newif\ifSB@preamble
\SB@preambletrue
\newif\ifSB@test
@@ -638,14 +640,10 @@
\SB@styppage%
\endgroup%
}
-\newcommand\SB@songlistbrk{}
-\def\SB@songlistbrk{brk}
-\newcommand\SB@songlistnc{}
-\def\SB@songlistnc{nextcol}
-\newcommand\SB@songlistcp{}
-\def\SB@songlistcp{sclearpage}
-\newcommand\SB@songlistcdp{}
-\def\SB@songlistcdp{scleardpage}
+\newcommand*\SB@songlistbrk{brk}
+\newcommand*\SB@songlistnc{nextcol}
+\newcommand*\SB@songlistcp{sclearpage}
+\newcommand*\SB@songlistcdp{scleardpage}
\newcommand\commitsongs{%
\ifpartiallist%
\ifnum\SB@numcols>\z@%
@@ -760,8 +758,7 @@
\newcommand\SB@lop[1]{\expandafter\SB@@lop\the#1\SB@@lop#1}
\newcommand\SB@@lop{}
\def\SB@@lop\\#1\\#2\SB@@lop#3#4{\global#3{\\#2}\global#4{#1}}
-\newcommand\SB@emptylist{}
-\def\SB@emptylist{\\}
+\newcommand*\SB@emptylist{\\}
\newcommand\SB@ifempty[3]{%
\edef\SB@temp{\the#1}%
\ifx\SB@temp\SB@emptylist#2\else#3\fi%
@@ -1355,12 +1352,9 @@
\newmarks\SB@nocmarkclass
}
\fi
-\newcommand\SB@cmark{}
-\def\SB@cmark{SB@cmark}
-\newcommand\SB@lastcmark{}
-\def\SB@lastcmark{SB@lastcmark}
-\newcommand\SB@nocmark{}
-\def\SB@nocmark{SB@nocmark}
+\newcommand*\SB@cmark{SB@cmark}
+\newcommand*\SB@lastcmark{SB@lastcmark}
+\newcommand*\SB@nocmark{SB@nocmark}
\newenvironment{chorus}{\beginchorus}{\SB@endchorus}
\newcommand\beginchorus{%
\ifSB@insong
@@ -2265,8 +2259,7 @@
}
\newcommand\SB@endcname{}
\let\SB@endcname\endgroup
-\newcommand\SB@nbsp{}
-\def\SB@nbsp{\nobreakspace{}}
+\newcommand*\SB@nbsp{\nobreakspace{}}
\newif\ifSB@firstchord\SB@firstchordtrue
\newcommand*\SB@@chord{}
\def\SB@@chord#1]{%
@@ -2758,7 +2751,9 @@
\sffamily\fontsize\@xpt\@xpt\selectfont#1%
}}
\newcommand\SB@onfret[1]{%
- \rlap{\hbox to\SB@fretwidth{\hfil\vrule\@height6\p@\hfil}}%
+ \kern.5\SB@fretwidth\kern-.2\p@%
+ \vrule\@height6\p@%
+ \kern-.2\p@\kern-.5\SB@fretwidth%
\hbox to\SB@fretwidth{\hfil#1\hfil}%
}
\newcommand\SB@atopfret[1]{%
@@ -2793,56 +2788,131 @@
\fontsize\@xpt\@xpt\selectfont\char14%
}%
}}
-\newcommand\SB@fretempty{\SB@onfret\relax}
-\newcommand\SB@frethit{\SB@onfret{%
- \hbox{%
+\newcommand\SB@do[1]{}
+\newcommand\SB@doify[2]{%
+ \SB@toks{}%
+ \edef#1{#2}%
+ \expandafter\SB@@doify#1\SB@@doify%
+ \edef#1{\the\SB@toks}%
+}
+\newcommand\SB@@doify[1]{%
+ \ifx#1\SB@@doify\else%
+ \SB@toks\expandafter{\the\SB@toks\SB@do{#1}}%
+ \expandafter\SB@@doify%
+ \fi%
+}
+\newcommand\SB@allbarres{}
+\newcommand\SB@dobarre{}
+\newcommand\SB@barreI{\noexpand\SB@barreI}
+\newcommand\SB@barreN{\noexpand\SB@barreN}
+\newcommand\SB@barreY{\noexpand\SB@barreY}
+\newcommand\SB@lowfret{%
+ \let\SB@dobarre\SB@@lowfret\SB@allbarres%
+ \SB@fretempty%
+}
+\newcommand\SB@@lowfret[3]{{%
+ \let\SB@barreI\SB@barreN%
+ \let\SB@barreY\SB@barreN%
+ \xdef#1{#1}%
+}}
+\newcommand\SB@bactivate[3]{{%
+ \let\SB@barreI\SB@barreY%
+ \xdef#1{#1}%
+}}
+\newcommand\SB@bbarre[1]{%
+ \xdef#1{\SB@barreI{\the\SB@cntii}#1}%
+}
+\newcommand\SB@ebarre[3]{%
+ \ifx#1\@empty%
+ \ifnum\SB@cnt=\@ne\SB@errebar#2#3\fi%
+ \else%
+ \expandafter\SB@@ebarre#1\SB@@ebarre#1%
+ \fi%
+}
+\newcommand\SB@@ebarre{}
+\def\SB@@ebarre#1#2#3\SB@@ebarre#4{{%
+ \gdef#4{#3}%
+ \let\SB@barreI\@gobble%
+ \let\SB@barreN\@gobble%
+ \let\SB@barreY\SB@barre%
+ #1{#2}%
+}}
+\newcommand\SB@barreson[3]{%
+ \def#2{\SB@bbarre#1}%
+ \def#3{\SB@ebarre#1#2#3}%
+}
+\newcommand\SB@barresoff[3]{\let#2\relax\let#3\relax}
+\newcommand\SB@fretempty{%
+ \advance\SB@cntii\@ne%
+ \SB@onfret\relax%
+}
+\newcommand\SB@fretdot{%
+ \advance\SB@cntii\@ne%
+ \let\SB@dobarre\SB@bactivate\SB@allbarres%
+ \SB@@fretdot%
+}
+\newcommand\SB@@fretdot{%
+ \SB@onfret{%
\fontencoding{OMS}\fontfamily{cmsy}%
\fontseries{m}\fontshape{n}%
\fontsize\@xiipt\@xiipt\selectfont\char15%
}%
+}
+\newcommand\SB@barre[1]{{%
+ \SB@dimen\SB@fretwidth%
+ \multiply\SB@dimen\SB@cntii%
+ \advance\SB@dimen-#1\SB@fretwidth%
+ \kern-\SB@dimen%
+ \SB@@fretdot%
+ \kern-.5\SB@fretwidth%
+ \advance\SB@dimen-\SB@fretwidth%
+ \raise.7pt\hbox{\vrule\@height4.6\p@\@width\SB@dimen}%
+ \kern-.5\SB@fretwidth%
+ \SB@@fretdot%
+}}
+\newcommand\SB@fretend{{%
+ \let\SB@barreI\@gobble%
+ \let\SB@barreN\@gobble%
+ \let\SB@barreY\SB@barre%
+ \def\SB@dobarre##1##2##3{##1\gdef##1{}}\SB@allbarres%
}}
+\newcommand*\SB@X{X}
+\newcommand*\SB@Z{0}
+\newcommand*\SB@O{O}
\newcommand\SB@finger[1]{%
- \SB@atopfret{\sffamily\fontsize\@vipt\@vipt\selectfont#1}%
+ \def\SB@temp{#1}%
+ \ifx\SB@temp\SB@X\SB@topempty\else%
+ \ifx\SB@temp\SB@Z\SB@topempty\else%
+ \ifx\SB@temp\SB@O\SB@topempty\else%
+ \SB@atopfret{\sffamily\fontsize\@vipt\@vipt\selectfont#1}%
+ \fi\fi\fi%
}
\newif\ifSB@gettabind\SB@gettabindfalse
\SB@newdimen\SB@tabindent
\newcommand\SB@targfret{}
\newcommand\SB@targstr{}
\newcommand\SB@targfing{}
-\newcommand\SB@csify[2]{%
- \SB@toks{}%
- \SB@cnt\z@%
- \SB@@csify#2\SB@@csify%
- \edef#1{\the\SB@toks}%
-}
-\newcommand\SB@@csify[1]{%
- \ifx#1\SB@@csify\else%
- \advance\SB@cnt\@ne%
- \SB@toks\expandafter{\the\SB@toks\csname#1\endcsname}%
- \expandafter\SB@@csify%
- \fi%
-}
-\newcommand\SB@gttop{%
- \let\X\SB@topX\let\0\SB@topO\let\O\0\let\1\SB@topempty%
- \let\2\1\let\3\1\let\4\1\let\5\1%
- \let\6\1\let\7\1\let\8\1\let\9\1%
-}
\newcommand\SB@gtinit{%
- \let\X\SB@fretempty\let\0\X\let\O\X\let\1\SB@frethit%
- \let\2\X\let\3\X\let\4\X\let\5\X%
- \let\6\X\let\7\X\let\8\X\let\9\X%
+ \def\SB@do##1{\csname##1\endcsname}%
+ \let\O\0%
+ \let\3\2\let\4\2\let\5\2\let\6\2%
+ \let\7\2\let\8\2\let\9\2%
}
\newcommand\SB@gtinc{%
+ \advance\SB@cnt\@ne%
\let\9\8\let\8\7\let\7\6\let\6\5\let\5\4%
- \let\4\3\let\3\2\let\2\1\let\1\0%
+ \let\4\3\let\3\2\let\2\1\let\1\SB@lowfret%
}
-\newcommand\SB@gtset[2]{%
- \let\X#1\let\0\X\let\O\X%
- \def\1{#21}\def\2{#22}\def\3{#23}%
- \def\4{#24}\def\5{#25}\def\6{#26}%
- \def\7{#27}\def\8{#28}\def\9{#29}%
+\newcommand\BarreDelims[2]{%
+ \expandafter\SB@bdelims\csname SB@bs@#1#2\expandafter\endcsname%
+ \csname#1\expandafter\endcsname\csname#2\endcsname%
+}
+\newcommand\SB@bdelims[3]{%
+ \newcommand*#1{}%
+ \SB@app\def\SB@allbarres{\SB@dobarre#1#2#3}%
}
-\newcommand\SB@gtmax[1]{\ifnum\SB@cnt<#1\SB@cnt#1\fi}
+\BarreDelims()
+\BarreDelims[]
\newcommand\gtab{\SB@begincname\SB@gtab}
\newcommand*\SB@gtab[1]{%
\SB@endcname%
@@ -2877,7 +2947,13 @@
\thinspace{\printchord{\transposehere{#1}\strut}}\thinspace%
}%
\setbox\SB@boxii\hbox{\SB@fretnum{\SB@targfret}}%
- \setbox\SB@boxiii\hbox{{\SB@gttop\SB@targstr}}%
+ \setbox\SB@boxiii\hbox{{%
+ \let\X\SB@topX\let\0\SB@topO%
+ \let\1\SB@topempty\let\2\1%
+ \SB@gtinit%
+ \let\SB@dobarre\SB@barresoff\SB@allbarres%
+ \SB@targstr%
+ }}%
\hsize\wd\SB@box%
\ifSB@gettabind%
\global\SB@tabindent\wd\SB@boxii%
@@ -2902,18 +2978,20 @@
\vtop{%
\SB@dimen\wd\SB@boxiii%
\box\SB@boxiii%
- \SB@cnt\minfrets%
- \SB@gtset\relax\SB@gtmax\SB@targstr%
+ \let\X\SB@fretempty\let\0\X%
+ \let\1\SB@fretdot\def\2{\SB@fretempty\global\SB@testtrue}%
\SB@gtinit%
+ \let\SB@dobarre\SB@barreson\SB@allbarres%
+ \SB@cnt\@ne%
\loop%
- \SB@fretbar\hbox{\SB@targstr}%
- \advance\SB@cnt\m@ne%
- \ifnum\SB@cnt>\z@\SB@gtinc\repeat%
+ \SB@testfalse%
+ \SB@fretbar\hbox{\SB@cntii\z@\SB@targstr\SB@fretend}%
+ \ifnum\SB@cnt<\minfrets\SB@testtrue\fi%
+ \ifSB@test\SB@gtinc\repeat%
\SB@fretbar%
\ifx\SB@targsfing\@empty\else%
\kern1.5\p@%
- \SB@gtset\SB@topempty\SB@finger%
- \hbox{\SB@targfing}%
+ \hbox{\let\SB@do\SB@finger\SB@targfing}%
\fi%
}%
\hfil%
@@ -2927,23 +3005,24 @@
\def\SB@tabargs#1:#2:#3:#4\SB@tabargs{%
\def\SB@temp{#4}%
\ifx\SB@temp\@empty%
- \SB@csify\SB@targstr{#1}%
+ \SB@doify\SB@targstr{#1}%
\else\ifx\SB@temp\SB@ctoken%
- \SB@csify\SB@targstr{#1}%
- \ifnum\SB@cnt>\@ne%
- \SB@cntii\SB@cnt%
- \SB@csify\SB@targfing{#2}%
- \SB@cnt\SB@cntii%
- \else%
+ \SB@@tabargs#1\SB@@tabargs%
+ \ifx\SB@temp\@empty%
\def\SB@targfret{#1}%
- \SB@csify\SB@targstr{#2}%
+ \SB@doify\SB@targstr{#2}%
+ \else%
+ \SB@doify\SB@targfing{#2}%
+ \SB@doify\SB@targstr{#1}%
\fi%
\else%
\def\SB@targfret{#1}%
- \SB@csify\SB@targfing{#3}%
- \SB@csify\SB@targstr{#2}%
+ \SB@doify\SB@targfing{#3}%
+ \SB@doify\SB@targstr{#2}%
\fi\fi%
}
+\newcommand\SB@@tabargs{}
+\def\SB@@tabargs#1#2\SB@@tabargs{\def\SB@temp{#2}}
\newcommand\songchapter{%
\let\SB@temp\@seccntformat%
\def\@seccntformat##1{}%
@@ -3670,10 +3749,10 @@
d \protect\endverse, or between \protect\beginchorus\space%
and \protect\endchorus.}%
}
-\newcommand\SB@errtab{%
- \SB@Error{Invalid argument to \protect\gtab\space macro. R%
- eplacing it with \protect\0.}{Valid arguments consist onl%
- y of: X, O, 0, 1, 2, 3, or 4.}%
+\newcommand\SB@errebar[2]{%
+ \SB@Error{Ignoring unbalanced \expandafter\@gobble\string#2 i%
+ n \protect\gtab}{Found no \expandafter\@gobble\string#1 to ma%
+ tch the \expandafter\@gobble\string#2.}%
}
\newcommand\SB@errnoidx[1]{%
\SB@Error{Unknown index identifier: #1}{This index identifie%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/songs.tlpobj new/tlpkg/tlpobj/songs.tlpobj
--- old/tlpkg/tlpobj/songs.tlpobj 2019-02-28 04:05:41.000000000 +0100
+++ new/tlpkg/tlpobj/songs.tlpobj 2019-06-28 01:53:53.000000000 +0200
@@ -1,6 +1,6 @@
name songs
category Package
-revision 44553
+revision 51494
shortdesc Produce song books for church or fellowship
relocated 1
longdesc The package provides a means of producing beautiful song books
@@ -17,7 +17,7 @@
catalogue-contact-home http://songs.sourceforge.net
catalogue-contact-repository https://sourceforge.net/projects/songs
catalogue-ctan /macros/latex/contrib/songs
-catalogue-date 2017-06-13 07:48:52 +0200
+catalogue-date 2019-06-26 22:33:40 +0200
catalogue-license gpl2
catalogue-topics music chords
-catalogue-version 3.0
+catalogue-version 3.1
++++++ sourcecodepro.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sourcecodepro/README.md new/doc/latex/sourcecodepro/README.md
--- old/doc/latex/sourcecodepro/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/sourcecodepro/README.md 2019-05-19 23:10:57.000000000 +0200
@@ -0,0 +1,30 @@
+Source Code Pro v2.7
+====================
+This package provides the Source Code Pro typeface as a LaTeX package.
+Full documentation and revision history in `sourcecodepro.pdf`.
+
+Options
+-------
+The following options can be used:
+
+* `oldstyle, osf`: use old style numbers.
+* `lining, nf, lf`: use lining numbers.
+* `black`: `\bfseries` is black.
+* `semibold`: `\bfseries` is semibold.
+* `bold`: `\bfseries` is bold.
+* `light`: `\mdseries` is light.
+* `extralight`: `\mdseries` is extra light.
+* `regular`: `\mdseries` is regular.
+* `scale, scaled`: set scaling for the font, eg: `scale=.5`
+* `ligatures`: change the ligatures used. eg: `ligatures=TeX`
+* `default`: Source Code Pro is set as default font family.
+* `nottdefault`: Source Code Pro is not set as monospaced family.
+* `type1, t1`: override detection and load the Type1 font family.
+* `opentype, otf`: override detection and load the OpenType font family.
+
+License
+-------
+Fonts are provided under the SIL Open Font License 1.1.
+LaTeX source is licensed under the LPPL.
+
+Enjoy!
Binary files old/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf and new/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf differ
Binary files old/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf and new/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf differ
Binary files old/doc/latex/sourcecodepro/sourcecodepro.pdf and new/doc/latex/sourcecodepro/sourcecodepro.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sourcecodepro/sourcecodepro.tex new/doc/latex/sourcecodepro/sourcecodepro.tex
--- old/doc/latex/sourcecodepro/sourcecodepro.tex 2016-04-18 23:49:56.000000000 +0200
+++ new/doc/latex/sourcecodepro/sourcecodepro.tex 2019-05-19 23:10:57.000000000 +0200
@@ -1,5 +1,5 @@
\documentclass[10pt,a4paper,english]{article}
-\usepackage{geometry,hologo,hyperref,babel,mdwlist,array,multicol}
+\usepackage{geometry,hologo,hyperref,babel,mdwlist,array,multicol,graphicx}
\usepackage[default,osf]{sourcesanspro}
\usepackage[scaled=.95]{sourcecodepro}
\hypersetup{
@@ -16,7 +16,7 @@
\Large Adobe's Source Code Pro typeface for \LaTeX
}
\author{Silke Hofstra, \href{mailto:tex@slxh.nl}{tex@slxh.nl}}
-\date{Documentation for sourcecodepro v2.6.\\ \today}
+\date{Documentation for sourcecodepro v2.7.\\ \today}
\begin{document}
\maketitle
@@ -37,6 +37,7 @@
\item \textbf{extralight}: \texttt{\textbackslash mdseries} is extra light.
\item \textbf{regular}: \texttt{\textbackslash mdseries} is regular.
\item \textbf{scale, scaled}: Change the scaling with a factor. For example: \texttt{scale=.5}
+ \item \textbf{ligatures}: Change the ligatures used. For example: \texttt{ligatures=TeX}
\item \textbf{default}: Source Code Pro is set as the default font family and as the monotype family.
\item \textbf{nottdefault}: Source Code Pro is not set as monospaced family.
\item \textbf{type1, t1}: Override automatic detection and use the Type 1 fonts.
@@ -64,30 +65,11 @@
\section{OpenType}
The OpenType fonts have many features, including old style numerals (\texttt{\oldstylenums{1 6 9}})
-%, ligatures (\texttt{fi fl})
and stylistic alternatives (\texttt{{\addfontfeature{Style=Alternate}a g}}).
\subsection{Features}
A complete list of available font features is available on page \pageref{sec:otfinfo}. More information on how to use font features can be found in the \href{http://mirror.ctan.org/macros/latex/contrib/fontspec/fontspec.pdf}{fontspec documentation}.
-\subsection{Files}
-\begin{itemize*}
- \item SourceCodePro-ExtraLight.otf
- \item SourceCodePro-ExtraLightIt.otf
- \item SourceCodePro-Light.otf
- \item SourceCodePro-LightIt.otf
- \item SourceCodePro-Regular.otf
- \item SourceCodePro-RegularIt.otf
- \item SourceCodePro-Medium.otf
- \item SourceCodePro-MediumIt.otf
- \item SourceCodePro-Semibold.otf
- \item SourceCodePro-SemiboldIt.otf
- \item SourceCodePro-Bold.otf
- \item SourceCodePro-BoldIt.otf
- \item SourceCodePro-Black.otf
- \item SourceCodePro-BlackIt.otf
-\end{itemize*}
-
\section{Type1}
The following Type1 font families are included:
\begin{itemize*}
@@ -97,6 +79,13 @@
With series ‘el’, ‘l’, ‘m’, ‘mb’, ‘sb’, ‘b’, ‘k’ and shapes ‘n’ and ‘i’.
\section{Version history}
+\subsection*{2.7}
+\begin{itemize*}
+ \item Make the ligatures for the OpenType fonts configurable with the \texttt{ligatures} option.
+ \item Update the fonts to Roman v2.030 and Italic v1.050.
+ \item Generate fonts without f-ligatures.
+\end{itemize*}
+
\subsection*{2.6}
\begin{itemize*}
\item Modified the \texttt{\textbackslash liningnums} to accomodate for the missing \texttt{lnum} feature.
@@ -197,6 +186,7 @@
cv14 & Character Variants 14 - typographic hyphen [-] \\
cv15 & Character Variants 15 - typographic asterisk [*] \\
cv16 & Character Variants 16 - slashed dollar sign [\$]\\
+ cv17 & Character Variants 17 - alternate numeral one [1] \\
dnom & Denominators \\
frac & Fractions \\
mark & Mark Positioning \\
@@ -213,6 +203,7 @@
ss04 & Stylistic Set 4 - serifed i \\
ss05 & Stylistic Set 5 - Sami \symbol{"014A}, cursive \symbol{"03C6} \\
ss06 & Stylistic Set 6 - slashed dollar sign [\$] \\
+ ss07 & Stylistic Set 7 - alternate numeral one [1] \\
subs & Subscript \\
sups & Superscript \\
zero & Slashed Zero
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sourcecodepro.doc.tlpobj new/tlpkg/tlpobj/sourcecodepro.doc.tlpobj
--- old/tlpkg/tlpobj/sourcecodepro.doc.tlpobj 2019-02-28 04:05:42.000000000 +0100
+++ new/tlpkg/tlpobj/sourcecodepro.doc.tlpobj 2020-03-24 02:03:39.000000000 +0100
@@ -1,10 +1,11 @@
name sourcecodepro.doc
category Package
-revision 40597
+revision 54512
shortdesc doc files of sourcecodepro
relocated 1
-docfiles size=229
+docfiles size=277
RELOC/doc/latex/sourcecodepro/LICENSE.txt
+ RELOC/doc/latex/sourcecodepro/README.md
RELOC/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf
RELOC/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.tex
RELOC/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf
++++++ sourcecodepro.tar.xz ++++++
++++ 9461 lines of diff (skipped)
++++++ sourcesanspro.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sourcesanspro.doc.tlpobj new/tlpkg/tlpobj/sourcesanspro.doc.tlpobj
--- old/tlpkg/tlpobj/sourcesanspro.doc.tlpobj 2019-02-28 04:05:44.000000000 +0100
+++ new/tlpkg/tlpobj/sourcesanspro.doc.tlpobj 2020-03-24 02:03:41.000000000 +0100
@@ -1,6 +1,6 @@
name sourcesanspro.doc
category Package
-revision 42852
+revision 54512
shortdesc doc files of sourcesanspro
relocated 1
docfiles size=228
++++++ sourcesanspro.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sourcesanspro.tlpobj new/tlpkg/tlpobj/sourcesanspro.tlpobj
--- old/tlpkg/tlpobj/sourcesanspro.tlpobj 2019-02-28 04:05:44.000000000 +0100
+++ new/tlpkg/tlpobj/sourcesanspro.tlpobj 2020-03-24 02:03:42.000000000 +0100
@@ -1,6 +1,6 @@
name sourcesanspro
category Package
-revision 42852
+revision 54512
shortdesc Use SourceSansPro with TeX(-alike) systems
relocated 1
longdesc The font is an open-source Sans-Serif development from Adobe.
@@ -1532,7 +1532,6 @@
RELOC/tex/latex/sourcesanspro/sourcesanspro-type1-autoinst.sty
RELOC/tex/latex/sourcesanspro/sourcesanspro.sty
catalogue-ctan /fonts/sourcesanspro
-catalogue-date 2017-01-03 15:01:48 +0100
-catalogue-license ofllppl1.3
+catalogue-license ofl lppl1.3
catalogue-topics font-sans font-type1 font-otf font-t1enc
catalogue-version 2.6
++++++ sourceserifpro.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sourceserifpro.doc.tlpobj new/tlpkg/tlpobj/sourceserifpro.doc.tlpobj
--- old/tlpkg/tlpobj/sourceserifpro.doc.tlpobj 2019-02-28 04:05:48.000000000 +0100
+++ new/tlpkg/tlpobj/sourceserifpro.doc.tlpobj 2020-03-24 02:03:45.000000000 +0100
@@ -1,6 +1,6 @@
name sourceserifpro.doc
category Package
-revision 49120
+revision 54512
shortdesc doc files of sourceserifpro
relocated 1
docfiles size=261
++++++ sourceserifpro.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sourceserifpro.tlpobj new/tlpkg/tlpobj/sourceserifpro.tlpobj
--- old/tlpkg/tlpobj/sourceserifpro.tlpobj 2019-02-28 04:05:49.000000000 +0100
+++ new/tlpkg/tlpobj/sourceserifpro.tlpobj 2020-03-24 02:03:46.000000000 +0100
@@ -1,6 +1,6 @@
name sourceserifpro
category Package
-revision 49120
+revision 54512
shortdesc Use SourceSerifPro with TeX(-alike) systems
relocated 1
longdesc This package provides Source Serif Pro for LaTeX. It includes
@@ -1056,7 +1056,6 @@
catalogue-contact-bugs https://github.com/silkeh/latex-sourceserifpro/issues
catalogue-contact-repository https://github.com/silkeh/latex-sourceserifpro
catalogue-ctan /fonts/sourceserifpro
-catalogue-date 2018-11-10 20:37:11 +0100
-catalogue-license ofllppl1.3
+catalogue-license ofl lppl1.3
catalogue-topics font font-serif font-type1 font-otf font-t1enc font-proportional
catalogue-version 1.4
++++++ spark-otf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/spark-otf/Changes new/doc/fonts/spark-otf/Changes
--- old/doc/fonts/spark-otf/Changes 2017-10-06 22:18:55.000000000 +0200
+++ new/doc/fonts/spark-otf/Changes 2019-05-05 20:03:57.000000000 +0200
@@ -1,3 +1,4 @@
+0.05 2019-04-13 - fix for new fontnames and more styles
0.04 2017-09-26 - fix for filenames
- added short form ! for marks
- added char sets for the documentation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/spark-otf/README.md new/doc/fonts/spark-otf/README.md
--- old/doc/fonts/spark-otf/README.md 2017-10-06 22:18:55.000000000 +0200
+++ new/doc/fonts/spark-otf/README.md 2019-05-05 20:03:57.000000000 +0200
@@ -1,16 +1,14 @@
# README #
Package spark-otf supports the free fonts from
"After the Flood" which are available from the
-website http://aftertheflood.co/projects/atf-spark
+website https://aftertheflood.com/projects/sparks/
+or from https://github.com/aftertheflood/spark
Following font files are supported:
-- Spark - Bar - Medium.otf
-- Spark - Bar - Narrow.otf
-- Spark - Bar - Thin.otf
-- Spark - Dot-line - Medium.otf
-- Spark - Dot - Medium.otf
-- Spark - Dot - Small.otf
+- Sparks-Bar-???.otf
+- Sparks-Dotline-???.otf
+- Sparks-Dot-???.otf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/spark-otf/spark-otf-doc.bib new/doc/fonts/spark-otf/spark-otf-doc.bib
--- old/doc/fonts/spark-otf/spark-otf-doc.bib 2017-10-06 22:18:55.000000000 +0200
+++ new/doc/fonts/spark-otf/spark-otf-doc.bib 2019-05-05 20:03:57.000000000 +0200
@@ -40,6 +40,6 @@
title = {AtF Spark},
subtitle = {Our new typeface for code-free sparklines},
Organisation = {After the flood},
-url = {http://aftertheflood.co/projects/atf-spark},
+url = {https://aftertheflood.com/projects/sparks/},
}
Binary files old/doc/fonts/spark-otf/spark-otf-doc.pdf and new/doc/fonts/spark-otf/spark-otf-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/spark-otf/spark-otf-doc.tex new/doc/fonts/spark-otf/spark-otf-doc.tex
--- old/doc/fonts/spark-otf/spark-otf-doc.tex 2017-10-06 22:18:55.000000000 +0200
+++ new/doc/fonts/spark-otf/spark-otf-doc.tex 2019-05-05 20:03:57.000000000 +0200
@@ -1,10 +1,10 @@
-%% $Id: spark-otf-doc.tex 584 2017-09-26 18:27:43Z herbert $
+%% $Id: spark-otf-doc.tex 1047 2019-04-12 17:22:07Z herbert $
%
\listfiles
\documentclass[fontsize=11pt,DIV=14,parskip=half-]{scrartcl}
\usepackage{fontspec}
\usepackage{graphicx}
-\usepackage{multido}
+\usepackage{multido,showexpl}
\usepackage[%usefilenames,
TT={Scale=0.88,FakeStretch=0.9},
SS={Scale=0.9},
@@ -56,27 +56,50 @@
the fonts will be found by the system.
\begin{verbatim}
--rw-r--r-- 1 voss voss 24708 Sep 15 11:20 Spark - Bar - Medium.otf
--rw-r--r-- 1 voss voss 24696 Sep 15 11:20 Spark - Bar - Narrow.otf
--rw-r--r-- 1 voss voss 24680 Sep 15 11:20 Spark - Bar - Thin.otf
--rw-r--r-- 1 voss voss 22140 Sep 15 11:20 Spark - Dot-line - Medium.otf
--rw-r--r-- 1 voss voss 24616 Sep 15 11:20 Spark - Dot - Medium.otf
--rw-r--r-- 1 voss voss 24580 Sep 15 11:20 Spark - Dot - Small.otf
-\end{verbatim}
+Sparks-Bar-Extranarrow.otf
+Sparks-Bar-Extrawide.otf
+Sparks-Bar-Medium.otf
+Sparks-Bar-Narrow.otf
+Sparks-Bar-Wide.otf
+Sparks-Dot-Extralarge.otf
+Sparks-Dot-Extrasmall.otf
+Sparks-Dot-Large.otf
+Sparks-Dot-Medium.otf
+Sparks-Dot-Small.otf
+Sparks-Dotline-Extrathick.otf
+Sparks-Dotline-Extrathin.otf
+Sparks-Dotline-Medium.otf
+Sparks-Dotline-Thick.otf
+Sparks-Dotline-Thin.otf
+\end{verbatim}
+%-rw-r--r-- 1 voss voss 24708 Sep 15 11:20 Spark - Bar - Medium.otf
+%-rw-r--r-- 1 voss voss 24696 Sep 15 11:20 Spark - Bar - Narrow.otf
+%-rw-r--r-- 1 voss voss 24680 Sep 15 11:20 Spark - Bar - Thin.otf
+%-rw-r--r-- 1 voss voss 22140 Sep 15 11:20 Spark - Dot-line - Medium.otf
+%-rw-r--r-- 1 voss voss 24616 Sep 15 11:20 Spark - Dot - Medium.otf
+%-rw-r--r-- 1 voss voss 24580 Sep 15 11:20 Spark - Dot - Small.otf
The package defines the following font macros (using symbol names):
\small
\begin{verbatim}
-\newfontface\sparkBarMedium{Spark-BarMedium}[RawFeature=+calt,\spark@DefaultFeatures]
-\newfontface\sparkBarNarrow{Spark-BarNarrow}[RawFeature=+calt,\spark@DefaultFeatures]
-\newfontface\sparkBarThin{Spark-BarThin}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarMedium{Spark-Bar-Medium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarNarrow{Spark-Bar-Narrow}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarExtranarrow{Spark-Bar-Extranarrow}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarWide{Spark-Bar-Wide}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarExtrawide{Spark-Bar-Extrawide}[RawFeature=+calt,\spark@DefaultFeatures]
%
-\newfontface\sparkDotLine{Spark-Dot-lineMedium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineMedium{Spark-Dotline-Medium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineThick{Spark-Dotline-Thick}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineExtrathick{Spark-Dotline-Extrathick}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineThin{Spark-Dotline-Thin}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineExtrathin{Spark-Dotline-Extrathin}[RawFeature=+calt,\spark@DefaultFeatures]
%
-\newfontface\sparkDotMedium{Spark-DotMedium}[RawFeature=+calt,\spark@DefaultFeatures]
-\newfontface\sparkDotSmall{Spark-DotSmall}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotMedium{Spark-Dot-Medium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotSmall{Spark-Dot-Small}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotExtralarge{Spark-Dot-Extralarge}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotExtrasmall{Spark-Dot-Extrasmall}[RawFeature=+calt,\spark@DefaultFeatures]
\end{verbatim}
\normalsize
@@ -86,12 +109,16 @@
\begin{verbatim}
\sparkBar[<Type>][<No>]{values}[<No>]
\sparkDot[<Type>][<No>]{values}[<No>]
+\sparkDotline[<Type>][<No>]{values}[<No>]
\sparkBar*[<Type>][<No>]{values}[<No>]
\sparkDot*[<Type>][<No>]{values}[<No>]
+\sparkDotline*[<Type>][<No>]{values}[<No>]
\sparkBar[<Type>]{!value,values,...,!value}
\sparkDot[<Type>]{!value,values,...,!value}
+\sparkDotline[<Type>]{!value,values,...,!value}
\sparkBar*[<Type>]{!value,values,...,!value}
\sparkDot*[<Type>]{!value,values,...,!value}
+\sparkDotline*[<Type>]{!value,values,...,!value}
\end{verbatim}
If \texttt{[<Type>]} is missing, \texttt{Medium} is assumed. The type is mandatory if you use
@@ -99,7 +126,7 @@
can be of any interval. They will be changed to the allowed interval:
\begin{itemize}
-\item for \cs{sparkDot[Line]}: $[0,9]$
+\item for \cs{sparkDotline}: $[0,9]$
\item for all other: $[0,100]$
\end{itemize}
@@ -113,195 +140,172 @@
\subsection{Bars}
+\typeout{Bar-Medium}%
\subsubsection{Bar-Medium}
-\footnotesize
-\begin{verbatim}
-Text \sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\hfill
- {\huge\sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}}\\
+\begin{LTXexample}[pos=t]
+Text \sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\\
Text \sparkBar[Medium]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\\
Text \sparkBar[Medium][14]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}[92] Text\\
-Text \sparkBar[Medium]{!14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,!92} Text
-\end{verbatim}
-
-\normalsize
-Text \sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\hfill
- {\huge\sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}}\\
-Text \sparkBar[Medium]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\\
-Text \sparkBar[Medium][14]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}[92] Text\\
-Text \sparkBar[Medium]{!14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,!92} Text
+Text \sparkBar{!14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,!92} Text
+\end{LTXexample}
\subsubsection{Bar-Narrow}
-\footnotesize
-\begin{verbatim}
+\begin{LTXexample}[pos=t]
Text \sparkBar[Narrow]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8} Text\\
-Text \sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\hfill
- {\huge\sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8}}\\
-Text \sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\hfill
- {\huge\sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8}}
-\end{verbatim}
+Text \sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\\
+Text \sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text
+\end{LTXexample}
-\normalsize
-Text \sparkBar[Narrow]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8} Text\\
-Text \sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\hfill
- {\huge\sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8}}\\
-Text \sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\hfill
- {\huge\sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8}}
-\subsubsection{Bar-Thin}
+\subsubsection{Bar-Extranarrow}
-\footnotesize
-\begin{verbatim}
-Text \sparkBar[Thin]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
-Text \sparkBar[Thin][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text\\
-Text \sparkBar[Thin]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
-Text \sparkBar[Thin]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,!22} Text
-\end{verbatim}
+\begin{LTXexample}[pos=t]
+Text \sparkBar[Extranarrow]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8} Text\\
+Text \sparkBar[Extranarrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\\
+Text \sparkBar[Extranarrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text
+\end{LTXexample}
-\normalsize
-Text \sparkBar[Thin]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
-Text \sparkBar[Thin][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text\\
-Text \sparkBar[Thin]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
-Text \sparkBar[Thin]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,!22} Text
+\subsubsection{Bar-Wide}
+\begin{LTXexample}[pos=t]
+Text \sparkBar[Wide]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Wide][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text\\
+Text \sparkBar[Wide]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Wide]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,!22} Text
+\end{LTXexample}
-\subsection{Dots}
-\subsubsection{Dot-Medium}
+\subsubsection{Bar-Extrawide}
-\footnotesize
-\begin{verbatim}
-Text \sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\hfill
- {\huge\sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}}\\
-Text \sparkDot[Medium]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\\
-Text \sparkDot[Medium]{!54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,!1} Text
-\end{verbatim}
+\begin{LTXexample}[pos=t]
+Text \sparkBar[Extrawide]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Extrawide][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text\\
+Text \sparkBar[Extrawide]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Extrawide]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,!22} Text
+\end{LTXexample}
-\normalsize
-Text \sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\hfill
- {\huge\sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}}\\
-Text \sparkDot[Medium]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\\
-Text \sparkDot[Medium]{!54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,!1} Text
+
+
+\subsection{Dots}
+
+\subsubsection{Dot-Medium -- the default}
+
+\begin{LTXexample}[pos=t]
+Text \sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\\
+Text \sparkDot[Medium][54]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}[1] Text\\
+Text \sparkDot{!54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,!1} Text
+\end{LTXexample}
\subsubsection{Dot-Small}
-\footnotesize
-\begin{verbatim}
+\begin{LTXexample}[pos=t]
Text \sparkDot[Small]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
Text \sparkDot[Small][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
Text \sparkDot[Small]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
-\end{verbatim}
+\end{LTXexample}
-\normalsize
-Text \sparkDot[Small]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
-Text \sparkDot[Small][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
-Text \sparkDot[Small]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\subsubsection{Dot-Extrasmall}
+\begin{LTXexample}[pos=t]
+Text \sparkDot[Extrasmall]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDot[Extrasmall][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDot[Extrasmall]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\subsection{Dot-Line}
+\subsubsection{Dot-Extralarge}
+\begin{LTXexample}[pos=t]
+Text \sparkDot[Extralarge]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDot[Extralarge][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDot[Extralarge]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\footnotesize
-\begin{verbatim}
-Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkDot[Line][9]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}[8] Text\hfill
- {\huge\sparkDot[Line]{!9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,!8}}
-\end{verbatim}
-\normalsize
-Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkDot[Line][9]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}[8] Text\hfill
- {\huge\sparkDot[Line]{!9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,!8}}
+\subsection{Dotline}
+\subsubsection{Dotline-Thin}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline[Thin]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Thin][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline[Thin]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\section{Examples for Lua\protect\LaTeX}
-The current version of \texttt{spark-otf} supports only star versions for Lua\LaTeX.
+\subsubsection{Dotline-Extrathin}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline[Extrathin]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Extrathin][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline[Extrathin]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\subsection{Bars}
-\footnotesize
-\begin{verbatim}
-Text \sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
-Text \sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176} Text\\
+\subsubsection{Dotline-Medium -- the default}
-\huge
-\sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
-\sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
-\sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}
-\end{verbatim}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Medium][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
+\subsubsection{Dotline-Thick}
-\normalsize\noindent
-Text \sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
-Text \sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176} Text\\
+\begin{LTXexample}[pos=t]
+Text \sparkDotline[Thick]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Thick][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline[Thick]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\huge
-\sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
-\sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
-\sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}
+\subsubsection{Dotline-Extrathick}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline[Extrathick]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Extrathick][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline[Extrathick]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\normalsize
-\subsection{Dots}
+\section{Examples for Lua\protect\LaTeX}
+The current version of \texttt{spark-otf} supports only star versions for Lua\LaTeX.
-\footnotesize
-\begin{verbatim}
-Text \sparkDot*[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
-Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88] Text\\
-Text \sparkDot*[Line][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176] Text
-\huge
-\sparkDot*[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
-\sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
-\sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88]\\
-\sparkDot*[Line][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176]
-\end{verbatim}
+\subsection{Bars}
-\normalsize
-Text \sparkDot*[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
-Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88] Text\\
-Text \sparkDot*[Line][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176] Text
+\begin{LTXexample}[pos=t]
+Text \sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
+Text \sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176} Text\\
+\end{LTXexample}
-\huge
-\sparkDot*[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
-\sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
-\sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88]\\
-\sparkDot*[Line][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176]
+
+\subsection{Dots}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
+Text \sparkDotline+{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
+Text \sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88] Text\\
+Text \sparkDotline*[Medium][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176] Text
+\end{LTXexample}
-\normalsize
\section{Using color}
It is possible to mark single or some values with a specific color, which must
be given in binary notation, e.g. \verb|ff0000| for red (R-G-B). The macro \verb|\setSparkColor|
\emph{should} include the (last) comma after the value:
-\begin{verbatim}
-Text \sparkBar{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,17,65,8,92} Text
- \sparkBar{!14,95,68,9,19,41,\setSparkColor{ff0000}{91,1,81,97,79,}45,96,76,17,65,8,!92} Text
-
-Text \sparkDot{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,17,65,8,92} Text
- \sparkDot{!14,95,68,9,19,41,\setSparkColor{ff0000}{91,1,81,97,79,}45,96,76,17,65,8,!92} Text
-\end{verbatim}
-
-\noindent
+\begin{LTXexample}[pos=t]
Text \sparkBar{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,17,65,8,92} Text
\sparkBar{!14,95,68,9,19,41,\setSparkColor{ff0000}{91,1,81,97,79,}45,96,76,17,65,8,!92} Text
@@ -309,9 +313,10 @@
\noindent
Text \sparkDot{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,17,65,8,92} Text
\sparkDot{!14,95,68,9,19,41,\setSparkColor{ff0000}{91,1,81,97,79,}45,96,76,17,65,8,!92} Text
+\end{LTXexample}
Coloring does \emph{not} work for the star version of the macro and \emph{not} for
-\verb|\sparkDot[Line]|.
+\verb|\sparkDotline|.
\section{The charsets}
@@ -353,6 +358,9 @@
\usebox\ZBox\\\fi}
}
+
+\iffalse
+
\subsection*{Spark-BarThin}
{\sparkBarThin
@@ -413,6 +421,8 @@
}
+\fi
+
\nocite{*}
\printbibliography
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/spark-otf.doc.tlpobj new/tlpkg/tlpobj/spark-otf.doc.tlpobj
--- old/tlpkg/tlpobj/spark-otf.doc.tlpobj 2019-02-28 04:05:53.000000000 +0100
+++ new/tlpkg/tlpobj/spark-otf.doc.tlpobj 2019-05-06 01:39:02.000000000 +0200
@@ -1,9 +1,9 @@
name spark-otf.doc
category Package
-revision 45483
+revision 51005
shortdesc doc files of spark-otf
relocated 1
-docfiles size=29
+docfiles size=33
RELOC/doc/fonts/spark-otf/Changes
RELOC/doc/fonts/spark-otf/README.md
RELOC/doc/fonts/spark-otf/spark-otf-doc.bib
++++++ spark-otf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/spark-otf/spark-otf.sty new/tex/latex/spark-otf/spark-otf.sty
--- old/tex/latex/spark-otf/spark-otf.sty 2017-09-28 01:01:58.000000000 +0200
+++ new/tex/latex/spark-otf/spark-otf.sty 2019-05-05 20:03:57.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: spark-otf.sty 582 2017-09-25 06:27:35Z herbert $
+%% $Id: spark-otf.sty 1047 2019-04-12 17:22:07Z herbert $
%%
%% This file is distributed under the terms of the LaTeX Project Public
%% License from CTAN archives in directory macros/latex/base/lppl.txt.
@@ -6,9 +6,9 @@
%%
% Copyright 2017 Herbert Voss hvoss@tug.org
%%
-\def\spark@version{0.04}
+\def\spark@version{0.05}
\ProvidesPackage{spark-otf}[%
- 2017/09/26 v. \spark@version~(Herbert Voss) Supports spark OpenType for lualatex/xelatex.]
+ 2019/04/12 v. \spark@version~(Herbert Voss) Supports spark OpenType for lualatex/xelatex.]
%
\RequirePackage{ifxetex,ifluatex,xkeyval}
%
@@ -24,7 +24,7 @@
\@latex@error{This package can only be used with "XeLaTeX" or "LuaLaTeX"!%
\MessageBreak "pdfLaTeX" or any other "TeX" version are _not_ possible!}%
\fi\fi
-\RequirePackage{fontspec,xparse}
+\RequirePackage{luaotfload,xparse}
\ifluatex\RequirePackage{luacode}\fi
@@ -35,26 +35,42 @@
\ifspark@usefilenames
\typeout {Using file names for the spark font}%
%----------------------------------------- file names ----------------------------
- \font\sparkBarMedium="file:Spark - Bar - Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
- \font\sparkBarNarrow="file:Spark - Bar - Narrow.otf:mode=node;+calt;\spark@DefaultFeatures"
- \font\sparkBarThin="file:Spark - Bar - Thin.otf:mode=node;+calt;\spark@DefaultFeatures"
-%
- \font\sparkDotLine="file:Spark - Dot-line - Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
-%
- \font\sparkDotMedium="file:Spark - Dot - Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
- \font\sparkDotSmall="file:Spark - Dot - Small.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarMedium ="file:Sparks-Bar-Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarNarrow ="file:Sparks-Bar-Narrow.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarExtranarrow="file:Sparks-Bar-Extranarrow.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarWide ="file:Sparks-Bar-Wide.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarExtrawide ="file:Sparks-Bar-Extrawide.otfmode=node;+calt;\spark@DefaultFeatures"
+%
+ \font\sparkDotlineMedium ="file:Sparks-Dotline-Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineThick ="file:Sparks-Dotline-Thick.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineExtrathick="file:Sparks-Dotline-Extrathick.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineThin ="file:Sparks-Dotline-Thin.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineExtrathin ="file:Sparks-Dotline-Extrathin.otf:mode=node;+calt;\spark@DefaultFeatures"
+%
+ \font\sparkDotMedium ="file:Sparks-Dot-Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotSmall ="file:Sparks-Dot-Small.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotExtralarge="file:Sparks-Dot-Extralarge.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotExtrasmall="file:Sparks-Dot-Extrasmall.otf:mode=node;+calt;\spark@DefaultFeatures"
%
\else
\typeout {Using symbolic names for the spark font}%
%----------------------------------------- symbolic names ----------------------------
- \newfontface\sparkBarMedium{Spark-BarMedium}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontface\sparkBarNarrow{Spark-BarNarrow}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontface\sparkBarThin{Spark-BarThin}[RawFeature=+calt,\spark@DefaultFeatures]
-%
- \newfontface\sparkDotLine{Spark-Dot-lineMedium}[RawFeature=+calt,\spark@DefaultFeatures]
-%
- \newfontface\sparkDotMedium{Spark-DotMedium}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontface\sparkDotSmall{Spark-DotSmall}[RawFeature=+calt,\spark@DefaultFeatures]
+ \font\sparkBarMedium = "name:Sparks Bar Medium:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarNarrow = "name:Sparks Bar Narrow:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarExtranarrow= "name:Sparks Bar Extra-narrow:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarWide = "name:Sparks Bar Wide:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarExtrawide = "name:Sparks Bar Extra-wide:mode=node;+calt;\spark@DefaultFeatures"
+%
+ \font\sparkDotlineMedium = "name:Sparks Dot-line Medium:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineThick = "name:Sparks Dot-line Thick:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineExtrathick= "name:Sparks Dot-line Extra-thick:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineThin = "name:Sparks Dot-line Thin:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineExtrathin = "name:Sparks Dot-line Extra-thin:mode=node;+calt;\spark@DefaultFeatures"
+%
+ \font\sparkDotMedium = "name:Sparks Dot Medium:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotSmall = "name:Sparks Dot Small:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotExtralarge= "name:Sparks Dot Extra-large:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotExtrasmall= "name:Sparks Dot Extra-small:mode=node;+calt;\spark@DefaultFeatures"
\fi
%
%
@@ -102,7 +118,7 @@
end
end
\end{luacode}
- \def\spark@line{Line}% 12 3 45
+% 12 3 45
\NewDocumentCommand\sparkBar{sO{Medium}O{}mO{}}{{%
\check@list@values{#4}%
\IfBooleanTF{#1}%
@@ -114,12 +130,17 @@
\NewDocumentCommand\sparkDot{sO{Medium}O{}mO{}}{{%
\check@list@values{#4}%
\IfBooleanTF{#1}%
- {\def\spark@arg{#2}%
- \ifx\spark@line\spark@arg \edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},9)}}%
- \else \edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},100)}}%
- \fi}%
+ {\edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},100)}}}%
+ {\let\spark@values@ii\spark@values@i}%
+ \@nameuse{sparkDot#2}#3\spark@mark@first\string{\spark@values@ii\string}\spark@mark@last#5%
+ }}
+% 12 3 45
+ \NewDocumentCommand\sparkDotline{sO{Medium}O{}mO{}}{{%
+ \check@list@values{#4}%
+ \IfBooleanTF{#1}%
+ {\edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},100)}}}%
{\let\spark@values@ii\spark@values@i}%
- \@nameuse{sparkDot#2}\spark@mark@first\string{\spark@values@ii\string}\spark@mark@last%
+ \@nameuse{sparkDotline#2}#3\spark@mark@first\string{\spark@values@ii\string}\spark@mark@last#5%
}}
\else %% XeLaTeX% 1 2 34
\NewDocumentCommand\sparkBar{O{Medium}O{}mO{}}{{%
@@ -129,7 +150,12 @@
\NewDocumentCommand\sparkDot{O{Medium}O{}mO{}}{{%
\check@list@values{#3}%
\@nameuse{sparkDot#1}\spark@mark@first\string{\spark@values@i\string}\spark@mark@last%
+ }}%
+ \NewDocumentCommand\sparkDotline{O{Medium}O{}mO{}}{{%
+ \check@list@values{#3}%
+ \@nameuse{sparkDotline#1}\spark@mark@first\string{\spark@values@i\string}\spark@mark@last%
}}
\fi
%%
\endinput
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/spark-otf.tlpobj new/tlpkg/tlpobj/spark-otf.tlpobj
--- old/tlpkg/tlpobj/spark-otf.tlpobj 2019-02-28 04:05:54.000000000 +0100
+++ new/tlpkg/tlpobj/spark-otf.tlpobj 2019-05-06 01:39:02.000000000 +0200
@@ -1,6 +1,6 @@
name spark-otf
category Package
-revision 45483
+revision 51005
shortdesc Support OpenType Spark fonts
relocated 1
longdesc The package supports the free fonts from "After the Flood"
@@ -11,7 +11,7 @@
runfiles size=2
RELOC/tex/latex/spark-otf/spark-otf.sty
catalogue-ctan /fonts/spark-otf
-catalogue-date 2017-10-08 09:13:25 +0200
+catalogue-date 2019-04-13 10:06:36 +0200
catalogue-license lppl1.3
catalogue-topics font-absent font-symbol font-otf font-use
-catalogue-version 0.04
+catalogue-version 0.05
++++++ srdp-mathematik.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/srdp-mathematik/README.txt new/doc/latex/srdp-mathematik/README.txt
--- old/doc/latex/srdp-mathematik/README.txt 2019-01-14 23:08:11.000000000 +0100
+++ new/doc/latex/srdp-mathematik/README.txt 2020-04-12 00:53:26.000000000 +0200
@@ -2,9 +2,9 @@
The
srdp-mathematik package
- v1.2
+ v1.6
- 2019/01/14
+ 2020/04/03
___________________________________
Maintainer: Christoph Weberndorfer
@@ -21,6 +21,8 @@
----------------------------------------------------------------------
-Dieses Paket bietet grundlegende Befehle für die vorgegebenen Formate der österreichischen, standardisierten Reife- und Diplomprüfung (sRDP) in Mathematik.
-Es bietet darüber hinaus die Möglichkeit, Antworten in die tex Datei zu implentieren und diese bei Bedarf in der pdf Datei anzuzeigen. Außerdem können die eingegeben Antwortmöglichkeiten variiert werden, um mehrere Gruppe für zum Beispiel Schularbeiten einfach zu erstellen.
+Dieses Paket bietet grundlegende Befehle für die vorgegebenen Formate der österreichischen, standardisierten
+Reife- und Diplomprüfung (sRDP) in Mathematik.
+Es bietet darüber hinaus die Möglichkeit, Antworten in die tex Datei zu implentieren und diese bei Bedarf in der pdf Datei anzuzeigen.
+Außerdem können die eingegeben Antwortmöglichkeiten variiert werden, um mehrere Gruppe für zum Beispiel Schularbeiten einfach zu erstellen.
Binary files old/doc/latex/srdp-mathematik/srdp-mathematik.pdf and new/doc/latex/srdp-mathematik/srdp-mathematik.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/srdp-mathematik/srdp-mathematik.tex new/doc/latex/srdp-mathematik/srdp-mathematik.tex
--- old/doc/latex/srdp-mathematik/srdp-mathematik.tex 2019-01-14 23:08:11.000000000 +0100
+++ new/doc/latex/srdp-mathematik/srdp-mathematik.tex 2020-04-12 00:53:26.000000000 +0200
@@ -8,7 +8,7 @@
\usepackage[T1]{fontenc}
\usepackage{eurosym}
\usepackage{setspace}
-\usepackage[latin1]{inputenc}
+\usepackage[utf8]{inputenc}
\usepackage{graphicx}
\usepackage[ngerman]{babel}
\usepackage{srdp-mathematik}
@@ -25,17 +25,17 @@
\newcommand{\Monat}{%
\ifcase\month
- Monat 0 \or Januar \or Februar \or M�rz \or April \or Mai \or Juni \or Juli%
+ Monat 0 \or Januar \or Februar \or März \or April \or Mai \or Juni \or Juli%
\or August \or September \or Oktober \or November \or Dezember
\fi}
-\setcounter{Antworten}{1} %0 = Angaben ohne L�sungen
- %1 = Angaben MIT L�sungen
+\setcounter{Antworten}{1} %0 = Angaben ohne Lösungen
+ %1 = Angaben MIT Lösungen
\pagestyle{plain} %PAGESTYLE: empty, plain, fancy
\onehalfspacing %Zeilenabstand
\setcounter{Zufall}{0}
-%\setcounter{secnumdepth}{1} % keine Nummerierung der �berschriften
+%\setcounter{secnumdepth}{1} % keine Nummerierung der Überschriften
%
%
%
@@ -53,10 +53,10 @@
\begin{center}
\vfill
-\Huge The \textit{srdp-mathematik} package \\[1cm]
+\Huge The \textit{srdp-mathematik} package v1.6\\[1cm]
+
+Documentation \\ [1cm]
-Documentation \\
-\vfill
\flushright
\textsc{\large Christoph Weberndorfer} \\[-0.5cm]
\textsc{\large \Monat~\the\year} \\
@@ -64,9 +64,8 @@
\centering
\normalsize
-Befehle und Unterst�tzung zur Erstellung von Beispielformaten im Rahmen der standardisierten schriftlichen Reifepr�fung (SRP) in Mathematik, gem�� den Vorlagen des Bundesinstituts f�r Bildungsforschung, Innovation \& Entwicklung des �sterreichischen Schulwesens (bifie).
-
-\vfill
+Befehle und Unterstützung zur Erstellung von Beispielformaten im Rahmen der standardisierten schriftlichen Reife und Diplomprüfung (sRDP) in Mathematik, gemäß den Vorlagen des Bundesministeriums für Bildung, Wissenschaft und Forschung (bmbwf).
+\vfill
\begingroup
\let\cleardoublepage\relax
@@ -79,40 +78,22 @@
\end{center}
-\vfill
-
-
-\flushleft
-
-Weitere Hilfe (\LaTeX-Grundlagen): \scriptsize
-\begin{verbatim}
-http://www.fernuni-hagen.de/imperia/md/content/zmi_2010/a026_latex_einf.pdf
-
-http://www.asc.tuwien.ac.at/compmath/2012/latex_total2011.pdf
-
-http://latex.tugraz.at/latex/warum
-\end{verbatim}
-
-
-
-
\end{titlepage}
\section{Allgemeine Befehle}
-
-Die \textit{allgemeinen Befehle} erleichtern das Erstellen von Tests, Schularbeiten Pr�fungen mithilfe einiger wichtigen Strukturen. Sie sollten stets verwendet werden, um die volle Funktionsf�higkeit dieses Pakets auszunutzen.
+Die \textit{allgemeinen Befehle} erleichtern das Erstellen von Tests, Schularbeiten Prüfungen mithilfe einiger wichtigen Strukturen. Sie sollten stets verwendet werden, um die volle Funktionsfähigkeit dieses Pakets auszunutzen.
\vspace{1cm}
\subsection{Beispielumgebungen}
-Jedes Beispiel sollte innerhalb einer Beispielumgebung gesetzt werden, welche bei der Formatierung und der Verarbeitung der Punkte unterst�tzt. Dabei werden zwei Beispiel-Typen unterschieden: \texttt{beispiel} und \texttt{langesbeispiel}.
+Jedes Beispiel sollte innerhalb einer Beispielumgebung gesetzt werden, welche bei der Formatierung und der Verarbeitung der Punkte unterstützt. Dabei werden zwei Beispiel-Typen unterschieden: \texttt{beispiel} und \texttt{langesbeispiel}.
\vspace{1cm}
\subsubsection{\texttt{beispiel}-Umbgebung}
-Die \texttt{beispiel}-Umgebung dient zur Erstellung eines Beispiels einer Schularbeit, einer Pr�fung, usw. Dabei sind praktisch alle Funktionen von \LaTeX, wie Text, Formeln oder Grafiken m�glich. Diese Umgebung erlaubt jedoch keinen Seitenumbruch! Die Beispiele werden automatisch nummeriert.
+Die \texttt{beispiel}-Umgebung dient zur Erstellung eines Beispiels einer Schularbeit, einer Prüfung, usw. Dabei sind praktisch alle Funktionen von \LaTeX, wie Text, Formeln oder Grafiken möglich. Diese Umgebung erlaubt jedoch keinen Seitenumbruch! Die Beispiele werden automatisch nummeriert.
\leer
@@ -122,7 +103,7 @@
In diesen Bereich kommt das Beispiel. Dabei kann ein beliebig langer Text
(ohne Seitenumbruch) geschrieben werden. Die Spalte mit den Punkten wird
-dabei immer frei gehalten. Aber auch mathematische Formeln sind m�glich:
+dabei immer frei gehalten. Aber auch mathematische Formeln sind möglich:
$\frac{x^2+x+5}{\sqrt{x^3}}$.
\end{beispiel}
@@ -135,17 +116,18 @@
\begin{beispiel}{6} %PUNKTE DES BEISPIELS
In diesen Bereich kommt das Beispiel. Dabei kann ein beliebig langer Text
(ohne Seitenumbruch) geschrieben werden. Die Spalte mit den Punkten wird dabei
-immer frei gehalten. Aber auch mathematische Formeln sind m�glich:
+immer frei gehalten. Aber auch mathematische Formeln sind möglich:
$\frac{x^2+x+5}{\sqrt{x^3}}$
\end{beispiel}
+
\vspace{1cm}
\subsubsection{\texttt{langesbeispiel}-Umbgebung}
-Die \texttt{langesbeispiel}-Umgebung dient ebenso zur Erstellung eines Beispiels, funktioniert analog, erlaubt aber im Gegensatz zur \texttt{beispiel}-Umgebung Seitenumbr�che. Auch lange Beispiele werden weiterf�hrend nummeriert.
+Die \texttt{langesbeispiel}-Umgebung dient ebenso zur Erstellung eines Beispiels, funktioniert analog, erlaubt aber im Gegensatz zur \texttt{beispiel}-Umgebung Seitenumbrüche. Auch lange Beispiele werden weiterführend nummeriert.
\leer
@@ -154,9 +136,9 @@
\begin{langesbeispiel} \item[8] %PUNKTE DES BEISPIELS
In diesen Bereich kommt das Beispiel und funktioniert praktisch analog zur
-beispiel-Umgebung. Ist das Beispiel jedoch l�nger als eine Seite (z.B bei
-Typ-2 Aufgaben), werden Seitenumbr�che automatisch gemacht. Auch hier sind
-mathematische Formeln m�glich:
+beispiel-Umgebung. Ist das Beispiel jedoch länger als eine Seite (z.B bei
+Typ-2 Aufgaben), werden Seitenumbrüche automatisch gemacht. Auch hier sind
+mathematische Formeln möglich:
$\frac{x^2+x+5}{\sqrt{x^3}}$.
\end{langesbeispiel}
@@ -168,14 +150,16 @@
\begin{langesbeispiel} \item[8] %PUNKTE DES BEISPIELS
-In diesen Bereich kommt das Beispiel und funktioniert praktisch analog zur beispiel-Umgebung. Ist das Beispiel jedoch l�nger als eine Seite (z.B bei Typ-2 Aufgaben), werden Seitenumbr�che automatisch gemacht. Auch hier sind mathematische Formeln m�glich:
+In diesen Bereich kommt das Beispiel und funktioniert praktisch analog zur beispiel-Umgebung. Ist das Beispiel jedoch länger als eine Seite (z.B bei Typ-2 Aufgaben), werden Seitenumbrüche automatisch gemacht. Auch hier sind mathematische Formeln möglich:
$\frac{x^2+x+5}{\sqrt{x^3}}$.
\end{langesbeispiel}
-\subsubsection{Notenschl�ssel}
-Werden f�r alle Beispiele die \texttt{beispiel}- oder die \texttt{langesbeispiel}-Umgebung verwendet, wird die Gesamtpunktezahl sowie der Notenschl�ssel automatisch berechnet. Die Werte in Klammer geben dabei den prozentualen Notenschl�ssel vor und k�nnen beliebig variiert werden:
+
+\subsubsection{Notenschlüssel}
+
+Werden für alle Beispiele die \texttt{beispiel}- oder die \texttt{langesbeispiel}-Umgebung verwendet, wird die Gesamtpunktezahl sowie der Notenschlüssel automatisch berechnet. Die Werte in Klammer geben dabei den prozentualen Notenschlüssel vor und können beliebig variiert werden:
\vspace{0.4cm}
@@ -192,9 +176,36 @@
\normalsize
-\subsection{L�sungseingabe -- Option: \texttt{[solution\_on/off]}}
+\subsubsection{Beurteilungsraster}
+
+Der Befehl \texttt{beurteilungsraster} entspricht der aktuellen Vorgabe der Beurteilung der standardisierten Reifeprüfung (Stand 2019). Dabei müssen die Punkte für Teil 1, Ausgleichspunkte und Teil 2 angegeben werden. Die in Klammer angegebenen Werte entsprechen der bei der Reifeprüfung verwendeten prozentuellen Notenverteilung, können jedoch jederzeit verändert werden. \leer
+
+
+\textsc{Eingabe:}
+\begin{verbatim}
+\beurteilungsraster{0.85}{0.68}{0.5}{1/3}{ % Prozentschluessel
+ T1={24}, % Punkte im Teil 1
+ AP={4}, % Ausgleichspunkte aus Teil 2
+ T2={20}, % Punkte im Teil 2
+ }
+
+\end{verbatim}
+\textsc{Ausgabe:}\leer
+
+siehe nächste Seite \newpage
-Es besteht die M�glichkeit, die L�sung in der erstellten \texttt{tex}-Datei zu implementieren und diese bei Bedarf in der \texttt{PDF}-Datei ein- bzw. auszublenden. Um diese Funktion nutzen zu k�nnen, muss die \texttt{solution\_on/off} Option im \texttt{srdp-mathematik}-Paket geladen werden. Diese kann durch hinzuf�gen durch "`\texttt{solution\_on}"' bzw. "`\texttt{solution\_off}"' aktiviert bzw. deaktiviert werden. Also:
+
+\beurteilungsraster{0.85}{0.68}{0.5}{1/3}{ % Prozentschluessel
+ T1={24}, % Punkte im Teil 1
+ AP={4}, % Ausgleichspunkte aus Teil 2
+ T2={20}, % Punkte im Teil 2
+ }
+
+\newpage
+
+\subsection{Lösungseingabe -- Option: \texttt{[solution\_on/off]}}
+
+Es besteht die Möglichkeit, die Lösung in der erstellten \texttt{tex}-Datei zu implementieren und diese bei Bedarf in der \texttt{PDF}-Datei ein- bzw. auszublenden. Um diese Funktion nutzen zu können, muss die \texttt{solution\_on/off} Option im \texttt{srdp-mathematik}-Paket geladen werden. Diese kann durch hinzufügen durch "`\texttt{solution\_on}"' bzw. "`\texttt{solution\_off}"' aktiviert bzw. deaktiviert werden. Also:
\begin{verbatim}
\usepackage[solution_on]{srdp-mathematik}
@@ -207,20 +218,20 @@
\end{verbatim}
-Die korrekte L�sungseingabe der vorformatierten Typ1-Aufgaben wird bei den entsprechenden Befehlen direkt erkl�rt. Unabh�ngig davon, gibt es die M�glichkeit mithilfe des \texttt{antwort}-Befehls, beliebige Abschnitte als \textit{Antwort} zu deklarieren.
+Die korrekte Lösungseingabe der vorformatierten Typ-1-Aufgaben wird bei den entsprechenden Befehlen direkt erklärt. Unabhängig davon, gibt es die Möglichkeit mithilfe des \texttt{antwort}-Befehls, beliebige Abschnitte als \textit{Antwort} zu deklarieren. (verwendeter counter: \texttt{Antworten=0, 1})
\subsubsection{\texttt{antwort}-Befehl}
-F�r offene Antworten kann der \texttt{\textbackslash antwort\{\}}-Befehl verwendet werden. Darin k�nnen Textpassagen, mathematische Formeln oder Grafiken angegeben werden, die ausschlie�lich bei aktivierter L�sung (\texttt{[solution\_on]}) und in \textcolor[rgb]{1,0,0}{rot} angegeben werden. \leer
+Für offene Antworten kann der \texttt{\textbackslash antwort\{\}}-Befehl verwendet werden. Darin können Textpassagen, mathematische Formeln oder Grafiken angegeben werden, die ausschließlich bei aktivierter Lösung (\texttt{[solution\_on]}) und in \textcolor[rgb]{1,0,0}{rot} angegeben werden. \leer
\subsubsection{Zusatz: Optionales Argument}
-Der \texttt{antwort}-Befehl erlaubt ein optionales Argument. Es k�nnen dadurch zus�tzliche Textpassagen angegeben werden, die \underline{ausschlie�lich} angezeigt werden, wenn die L�sungsanzeige deaktiviert (\texttt{[solution\_off])} ist. Das hei�t: \leer
+Der \texttt{antwort}-Befehl erlaubt ein optionales Argument. Es können dadurch zusätzliche Textpassagen angegeben werden, die \underline{ausschließlich} angezeigt werden, wenn die Lösungsanzeige deaktiviert (\texttt{[solution\_off])} ist. Das heißt: \leer
\textsc{Eingabe:}
\begin{verbatim}
-\antwort[Optionale Eingabe, die nur angezeigt wird, wenn 'solution_off' gew�hlt
+\antwort[Optionale Eingabe, die nur angezeigt wird, wenn 'solution_off' gewählt
wird.]
{Dies ist die notwendige Angabe und wird in rot angezeigt und nur wenn
'solution_on' eingestellt ist.}
@@ -230,7 +241,7 @@
\textsc{Ausgabe}, wenn \texttt{\textbackslash usepackage[solution\_off]\{srdp-mathematik\}} eingestellt ist: \\
\setcounter{Antworten}{0}
-\antwort[Optionale Eingabe, die nur angezeigt wird, wenn \texttt{'solution\_off'} gew�hlt wird.]
+\antwort[Optionale Eingabe, die nur angezeigt wird, wenn \texttt{'solution\_off'} gewählt wird.]
{Dies ist die notwendige Angabe und wird in rot angezeigt und nur wenn
\textttt{'solution\_on'} eingestellt ist.}
\leer
@@ -238,21 +249,31 @@
\textsc{Ausgabe}, wenn \texttt{\textbackslash usepackage[solution\_on]\{srdp-mathematik\}} eingestellt ist:\\
\setcounter{Antworten}{1}
-\antwort[Optionale Eingabe, die nur angezeigt wird, wenn \texttt{'solution\_off'} gew�hlt wird.]
+\antwort[Optionale Eingabe, die nur angezeigt wird, wenn \texttt{'solution\_off'} gewählt wird.]
{Dies ist die notwendige Eingabe und wird in rot angezeigt und nur wenn
\texttt{'solution\_on'} eingestellt ist.}
-\subsection{Erstellung von Gruppen}
-Das \texttt{srdp-mathematik}-Paket erm�glicht auch die automatische Erstellung von Gruppen f�r Schularbeiten, durch Vertauschung der Antwortm�glichkeiten aller Typ1-Aufgaben. Dazu muss im Preamble (Bereich vor \texttt{\textbackslash begin\{document\}}) folgender Befehl eingef�gt werden:\\
+\subsection{Erstellung von Gruppen -- Option: \texttt{[random=0,1,2,\ldots]}}
+Das \texttt{srdp-mathematik}-Paket ermöglicht auch die automatische Erstellung von Gruppen für Schularbeiten, durch Vertauschung der Antwortmöglichkeiten aller Typ-1-Aufgaben. Dazu kann die \texttt{random}-Option im \texttt{srdp-mathematik}-Paket eingebunden geladen werden. Also:
-\texttt{\textbackslash setcounter\{Zufall\}\{0\}} \leer
+\begin{verbatim}
+\usepackage[random=0]{srdp-mathematik}
+\end{verbatim}
-Die Zahl "`0"' bedeutet dabei, dass keine Vertauschung stattfindet und somit die Antwortm�glichkeiten in der Reihenfolge angezeigt werden, in der sie in der \texttt{tex}-Datei eingegeben wurden.
+oder
-Durch das Ersetzen der Zahl "`0"' durch die Zahlen $1, 2, 3, \ldots$ (und anschlie�endem Kompilieren) werden die Antwortm�glichkeiten bei \textbf{allen} Typ1-Formaten der Datei in einer zuf�lligen Reihenfolge vertauscht. Es k�nnen somit in kurzer Zeit mehrere Gruppen der selben Schularbeit erstellt werden. Die eingegebenen L�sungen werden gleicherma�en �bernommen. \leer
+\begin{verbatim}
+\usepackage[random=1]{srdp-mathematik}
+\end{verbatim}
+
+usw.
-Die Erstellung der Gruppen ist dabei reproduzierbar. Die Reihenfolge der Antwortm�glichkeiten einer Gruppe bleibt daher immer gleich. Mithilfe des Befehls \texttt{\textbackslash Gruppe} kann die Gruppennummer innerhalb der \texttt{PDF}-Datei (z.B. am Deckblatt) angezeigt werden.
+Die Zahl "`0"' bedeutet dabei, dass keine Vertauschung stattfindet und somit die Antwortmöglichkeiten in der Reihenfolge angezeigt werden, in der sie in der \texttt{tex}-Datei eingegeben wurden.
+
+Durch das Ersetzen der Zahl "`0"' durch die Zahlen $1, 2, 3, \ldots$ (und anschließendem Kompilieren) werden die Antwortmöglichkeiten bei \textbf{allen} Typ1-Formaten der Datei in einer zufälligen Reihenfolge vertauscht. Es können somit in kurzer Zeit mehrere Gruppen der selben Schularbeit erstellt werden. Die eingegebenen Lösungen werden gleichermaßen übernommen. \leer
+
+Die Erstellung der Gruppen ist dabei reproduzierbar. Die Reihenfolge der Antwortmöglichkeiten einer Gruppe bleibt daher immer gleich. Mithilfe des Befehls \texttt{\textbackslash Gruppe} kann die Gruppennummer innerhalb der \texttt{PDF}-Datei (z.B. am Deckblatt) angezeigt werden. (verwendeter counter: \texttt{Zufall=0, 1, 2, \ldots})
%Dieses Prinzip wird exemplarisch am Multiplechoice-Format gezeigt:\leer
%
@@ -339,85 +360,94 @@
%A4=0, % 4. Antwort
%A5=0, % 5. Antwort
%}
+
+\subsection{Informationseingabe -- Option: \texttt{[info\_on/off]}}
+Es ist darüber hinaus möglich zusätzliche Informationen (Erläuterungen, Hilfestellungen, \ldots) hinzuzufügen und einzublenden. Dazu kann die Option \texttt{info\_on/off} im \texttt{srdp-mathematik}-Paket eingebunden werden. Die Infos werden in \textcolor[rgb]{0,0,1}{blau} angegeben und nur dann angezeigt, wenn die Option \texttt{info\_on} gewählt wurde (verwendeter counter: \texttt{info=0,1}). Also:
+
+
+\begin{verbatim}
+\usepackage[info_on]{srdp-mathematik}
+\end{verbatim}
+
+oder
+
+\begin{verbatim}
+\usepackage[info_off]{srdp-mathematik}
+\end{verbatim}
+
-\subsubsection{Weitere allgemeine Befehle}
-Dar�ber hinaus gibt es noch weitere Befehle, die die Formatierung erleichtern.
+\subsection{Weitere allgemeine Befehle}
+Außerdem gibt es noch weitere Befehle, die die Formatierung erleichtern.
\subsubsection*{\texttt{\textbackslash leer} - Befehl}
Eine Leerzeile, etwa zwischen zwei Beispielen. \\
-(Nach dem Befehl \texttt{\textbackslash leer} muss in der \texttt{.tex}-Datei ein Leerzeile eingef�gt werden!)
+(Nach dem Befehl \texttt{\textbackslash leer} muss in der \texttt{.tex}-Datei ein Leerzeile eingefügt werden!)
\leer
\subsubsection*{\texttt{\textbackslash meinlr} - Befehl}
\begin{verbatim}
-\meinlr{Dieser Teil steht links. Wenn dieser Text l�nger sein sollte,
-geht er automatisch in der n�chsten Zeile weiter ohne auf die andere
-Seite �ber zu gehen.}{Dieser Teil steht rechts.}
+\meinlr{Dieser Teil steht links. Wenn dieser Text länger sein sollte,
+geht er automatisch in der nächsten Zeile weiter ohne auf die andere
+Seite über zu gehen.}{Dieser Teil steht rechts.}
\end{verbatim}
-Teilt die Seite in zwei gleich gro�e Seiten.
+Teilt die Seite in zwei gleich große Seiten.
\leer
\textsc{Ausgabe:}
-\meinlr{Dieser Teil steht links. Wenn dieser Text l�nger sein sollte,
-geht er automatisch in der n�chsten Zeile weiter ohne auf die andere
-Seite �ber zu gehen.}{Dieser Teil steht rechts.}
+\meinlr{Dieser Teil steht links. Wenn dieser Text länger sein sollte,
+geht er automatisch in der nächsten Zeile weiter ohne auf die andere
+Seite über zu gehen.}{Dieser Teil steht rechts.}
\subsubsection*{Zusatz: Variable Spaltenbreiten bei \texttt{\textbackslash meinlr}}
-Der Befehl \texttt{\textbackslash meinlr} erlaubt durch die optionale Eingabe eine Ab�nderung der beiden Spaltenbreiten. Durch die Eingabe zwischen ca. -0.3 und 0.3 kann die Spaltenmitte nach links oder rechts verschoben und somit die Spaltenbreite variiert werden.
+Der Befehl \texttt{\textbackslash meinlr} erlaubt durch die optionale Eingabe eine Abänderung der beiden Spaltenbreiten. Durch die Eingabe zwischen ca. -0.3 und 0.3 kann die Spaltenmitte nach links oder rechts verschoben und somit die Spaltenbreite variiert werden.
\textsc{Eingabe:}
\begin{verbatim}
\meinlr[-0.15]{Mit einem negativen Wert wird die linke Spalte verkleinert.}
-{Die rechte Spalte wird damit automatisch vergr��ert. Dadurch ist es m�glich,
+{Die rechte Spalte wird damit automatisch vergrößert. Dadurch ist es möglich,
die Spaltenbreiten nach Belieben zu variieren.}
\end{verbatim}
\textsc{Ausgabe:}
\meinlr[-0.15]{Mit einem negativen Wert wird die linke Spalte verkleinert.}
-{Die rechte Spalte wird damit automatisch vergr��ert. Dadurch ist es m�glich,
+{Die rechte Spalte wird damit automatisch vergrößert. Dadurch ist es möglich,
die Spaltenbreiten nach Belieben zu variieren.}
\leer
\subsubsection*{\texttt{\textbackslash meinlcr} - Befehl}
\begin{verbatim}
-\meinlcr{Text ganz links}{Text in der Mitte. Auch hier sind l�ngere Texte
-m�glich.}{Text auf der rechten Seite.}
+\meinlcr{Text ganz links}{Text in der Mitte. Auch hier sind längere Texte
+möglich.}{Text auf der rechten Seite.}
\end{verbatim}
-Teilt die Seite in drei gleich gro�e Teile
+Teilt die Seite in drei gleich große Teile
\leer
\textsc{Ausgabe:}
-\meinlcr{Text ganz links. Was passiert hier wenn dieser Teil l�nger ist?}{Text in der Mitte. Auch hier sind l�ngere Texte m�glich.}{Text auf der rechten Seite.}
+\meinlcr{Text ganz links. Was passiert hier wenn dieser Teil länger ist?}{Text in der Mitte. Auch hier sind längere Texte möglich.}{Text auf der rechten Seite.}
\leer
-
-\newpage
\section{Typ-1-Aufgaben}
-Das \texttt{srdp-mathematik}-Paket erm�glicht die Verwendung vorgefertigter Aufgabenformate, die bei der �sterreichischen, standardisierten Reifepr�fung Anwendung finden.
-
-
-
-
+Das \texttt{srdp-mathematik}-Paket ermöglicht die Verwendung vorgefertigter Aufgabenformate, die bei der österreichischen, standardisierten Reifeprüfung Anwendung finden.
\subsection{\texttt{multiplechoice}-Befehl}
-Dieser Befehl liefert eine vollst�ndige Formatierung f�r eine Multiplechoice-Aufgabe. Die Anzahl der Antwortm�glichkeiten kann dabei frei (max. 9) gew�hlt werden. Als Standard ist dabei das Format mit f�nf Antwortm�glichkeiten eingestellt. \leer
+Dieser Befehl liefert eine vollständige Formatierung für eine Multiplechoice-Aufgabe. Die Anzahl der Antwortmöglichkeiten kann dabei frei (max. 9) gewählt werden. Als Standard ist dabei das Format mit fünf Antwortmöglichkeiten eingestellt. \leer
-Die korrekten Antworten der Multiplechoice-Aufgabe werden dabei bei A1, A2, \ldots, A5 angegeben. Sollte beispielsweise die 1., die 4. und 5. Antwortm�glichkeit korrekt sein, muss je eine "`0"' durch 1, 4, und 5 ersetzt werden -- Die Reihenfolge dabei ist nicht relevant. Also: \\
+Die korrekten Antworten der Multiplechoice-Aufgabe werden dabei bei A1, A2, \ldots, A5 angegeben. Sollte beispielsweise die 1., die 4. und 5. Antwortmöglichkeit korrekt sein, muss je eine "`0"' durch 1, 4, und 5 ersetzt werden -- Die Reihenfolge dabei ist nicht relevant. Also: \\
\textsc{Eingabe:}
@@ -425,7 +455,7 @@
\multiplechoice[5]{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={Hier}, %1. Antwortmoeglichkeit
L2={werden}, %2. Antwortmoeglichkeit
- L3={die m�glichen}, %3. Antwortmoeglichkeit
+ L3={die möglichen}, %3. Antwortmoeglichkeit
L4={Antworten}, %4. Antwortmoeglichkeit
L5={eingetragen}, %5. Antwortmoeglichkeit
L6={}, %6. Antwortmoeglichkeit
@@ -450,7 +480,7 @@
\multiplechoice[5]{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={Hier}, %1. Antwortmoeglichkeit
L2={werden}, %2. Antwortmoeglichkeit
- L3={die m�glichen}, %3. Antwortmoeglichkeit
+ L3={die möglichen}, %3. Antwortmoeglichkeit
L4={Antworten}, %4. Antwortmoeglichkeit
L5={eingetragen}, %5. Antwortmoeglichkeit
L6={}, %6. Antwortmoeglichkeit
@@ -473,7 +503,7 @@
\multiplechoice[5]{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={Hier}, %1. Antwortmoeglichkeit
L2={werden}, %2. Antwortmoeglichkeit
- L3={die m�glichen}, %3. Antwortmoeglichkeit
+ L3={die möglichen}, %3. Antwortmoeglichkeit
L4={Antworten}, %4. Antwortmoeglichkeit
L5={eingetragen}, %5. Antwortmoeglichkeit
L6={}, %6. Antwortmoeglichkeit
@@ -492,9 +522,9 @@
\leer
-Die Zahl in eckigen Klammern gibt dabei die gew�nschte Anzahl von Antwortm�glichkeiten an. Somit sind beispielsweise drei oder sieben Antwortm�glichkeiten einstellbar. \leer
+Die Zahl in eckigen Klammern gibt dabei die gewünschte Anzahl von Antwortmöglichkeiten an. Somit sind beispielsweise drei oder sieben Antwortmöglichkeiten einstellbar. \leer
-Wichtig zu erw�hnen ist dabei, dass ausschlie�lich die Zahl in eckigen Klammern die Anzahl der Antwortm�glichkeiten angibt. Werden anschlie�end zu wenige oder zu viele Antwortm�glichkeiten angegeben, werden Leerzeilen erzeugt oder die Eingabe wird in der Ausgabe nicht ber�cksichtigt.
+Wichtig zu erwähnen ist dabei, dass ausschließlich die Zahl in eckigen Klammern die Anzahl der Antwortmöglichkeiten angibt. Werden anschließend zu wenige oder zu viele Antwortmöglichkeiten angegeben, werden Leerzeilen erzeugt oder die Eingabe wird in der Ausgabe nicht berücksichtigt.
\leer
@@ -528,8 +558,6 @@
A5=0, % 5. Antwort
}
-\newpage
-
\textsc{Eingabe:}
@@ -537,9 +565,9 @@
\multiplechoice[7]{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={Das Gleiche}, %1. Antwort
L2={passiert beim Eintragen von}, %2. Antwort
- L3={sieben M�glichkeiten.}, %3. Antwort
+ L3={sieben Möglichkeiten.}, %3. Antwort
L4={Dabei werden immer 7 Antworten}, %4. Antwort
- L5={angezeigt, unabh�ngig ob sie ausgef�llt}, %5. Antwort
+ L5={angezeigt, unabhängig ob sie ausgefüllt}, %5. Antwort
L6={sind oder nicht!}, %6. Antwort
L7={}, %7. Antwort
L8={}, %8. Antwort
@@ -560,9 +588,9 @@
\multiplechoice[7]{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={Das Gleiche}, %1. Antwort
L2={passiert beim Eintragen von}, %2. Antwort
- L3={sieben M�glichkeiten.}, %3. Antwort
+ L3={sieben Möglichkeiten.}, %3. Antwort
L4={Dabei werden immer 7 Antworten}, %4. Antwort
- L5={angezeigt, unabh�ngig ob sie ausgef�llt}, %5. Antwort
+ L5={angezeigt, unabhängig ob sie ausgefüllt}, %5. Antwort
L6={sind oder nicht!}, %6. Antwort
L7={}, %7. Antwort
L8={}, %8. Antwort
@@ -582,13 +610,16 @@
\leer
+
+
+
\textsc{Eingabe:}
\begin{verbatim}
\multiplechoice{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={In diesem}, %1. Antwort
L2={Fall wird der}, %2. Antwort
L3={Standard von}, %3. Antwort
- L4={f�nf Antwortm�glichkeiten}, %4. Antwort
+ L4={fünf Antwortmöglichkeiten}, %4. Antwort
L5={angenommen}, %5. Antwort
L6={}, %6. Antwort
L7={}, %7. Antwort
@@ -603,7 +634,7 @@
L1={In diesem}, %1. Antwort
L2={Fall wird der}, %2. Antwort
L3={Standard von}, %3. Antwort
- L4={f�nf Antwortm�glichkeiten}, %4. Antwort
+ L4={fünf Antwortmöglichkeiten}, %4. Antwort
L5={angenommen}, %5. Antwort
L6={}, %6. Antwort
L7={}, %7. Antwort
@@ -616,7 +647,7 @@
\subsubsection{Add-on: \texttt{langmultiplechoice}-Befehl}
-Der \texttt{langmultiplechoice}-Befehl ist analog zum \texttt{multiplechoice}-Befehl zu verwenden. Der Unterschied besteht darin, dass Antwortm�glichkeiten auf zwei Spalten aufgeteilt werden. Dies ist vor allem dann sinnvoll, wenn Geogebra-Grafiken importiert werden, um eine bessere Lesbarkeit zu erm�glichen.
+Der \texttt{langmultiplechoice}-Befehl ist analog zum \texttt{multiplechoice}-Befehl zu verwenden. Der Unterschied besteht darin, dass Antwortmöglichkeiten auf zwei Spalten aufgeteilt werden. Dies ist vor allem dann sinnvoll, wenn Geogebra-Grafiken importiert werden, um eine bessere Lesbarkeit zu ermöglichen.
\langmultiplechoice[6]{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={\resizebox{0.7\linewidth}{!}{\newrgbcolor{zzttqq}{0.6 0.2 0}
@@ -736,20 +767,20 @@
\newpage
\subsection{\texttt{lueckentext}-Befehl}
-Dieser Befehl dient zur Erstellung eines L�ckentexts, basierend auf dem standardisierten Format des BIFIE. Der einleitenden Satz: \textit{"`Erg�nze die Textl�cken im folgenden Satz durch Ankreuzen der jeweils richtigen Satzteile so, dass eine mathematisch korrekte Aussage entsteht!"'} wird als Standard angenommen und automatisch angegeben. Im Bereich \texttt{\textbackslash text=\{\}} wird der L�ckentext angegeben, wobei die L�cken immer mit \texttt{\textbackslash gap} eingef�gt werden und automatisch nummeriert werden. Analog zu den L�sungsangaben der Multiplechoice-Aufgabe, werden die korrekten Antworten bei A1, A2 oder A3 mit 1,2 oder 3 angegeben. (hier: L�sung links: 3 und rechts: 2)
+Dieser Befehl dient zur Erstellung eines Lückentexts, basierend auf dem standardisierten Format des BIFIE. Der einleitenden Satz: \textit{"`Ergänze die Textlücken im folgenden Satz durch Ankreuzen der jeweils richtigen Satzteile so, dass eine mathematisch korrekte Aussage entsteht!"'} wird als Standard angenommen und automatisch angegeben. Im Bereich \texttt{\textbackslash text=\{\}} wird der Lückentext angegeben, wobei die Lücken immer mit \texttt{\textbackslash gap} eingefügt werden und automatisch nummeriert werden. Analog zu den Lösungsangaben der Multiplechoice-Aufgabe, werden die korrekten Antworten bei A1, A2 oder A3 mit 1,2 oder 3 angegeben. (hier: Lösung links: 3 und rechts: 2)
\vspace{0.35cm}
\textsc{Eingabe:}
\begin{verbatim}
\lueckentext{
- text={Hier wird der Text geschrieben. Die L�cke eins hat dabei
-die \gap, die L�cke zwei hat die \gap.}, %Lueckentext Luecke=\gap
+ text={Hier wird der Text geschrieben. Die Lücke eins hat dabei
+die \gap, die Lücke zwei hat die \gap.}, %Lueckentext Luecke=\gap
L1={Hier schreibt}, %1.Moeglichkeit links
- L2={man die Antwortm�glichkeiten}, %2.Moeglichkeit links
- L3={f�r die erste L�cke}, %3.Moeglichkeit links
+ L2={man die Antwortmöglichkeiten}, %2.Moeglichkeit links
+ L3={für die erste Lücke}, %3.Moeglichkeit links
R1={und hier jene}, %1.Moeglichkeit rechts
- R2={f�r die M�glichkeiten}, %2.Moeglichkeit rechts
- R3={der zweiten L�cke. Theoretisch k�nnte dieser Text
+ R2={für die Möglichkeiten}, %2.Moeglichkeit rechts
+ R3={der zweiten Lücke. Theoretisch könnte dieser Text
auch zweizeilig sein.}, %3.Moeglichkeit rechts
%% LOESUNG: %%
A1=3, % Antwort links
@@ -759,14 +790,14 @@
\textsc{Ausgabe:}
\lueckentext{
- text={Hier wird der Text geschrieben. Die L�cke eins hat dabei
-die \gap, die L�cke zwei hat die \gap.}, %Lueckentext Luecke=\gap
+ text={Hier wird der Text geschrieben. Die Lücke eins hat dabei
+die \gap, die Lücke zwei hat die \gap.}, %Lueckentext Luecke=\gap
L1={Hier schreibt}, %1.Moeglichkeit links
- L2={man die Antwortm�glichkeiten}, %2.Moeglichkeit links
- L3={f�r die erste L�cke}, %3.Moeglichkeit links
+ L2={man die Antwortmöglichkeiten}, %2.Moeglichkeit links
+ L3={für die erste Lücke}, %3.Moeglichkeit links
R1={und hier jene}, %1.Moeglichkeit rechts
- R2={f�r die M�glichkeiten}, %2.Moeglichkeit rechts
- R3={der zweiten L�cke. Theoretisch k�nnte dieser Text
+ R2={für die Möglichkeiten}, %2.Moeglichkeit rechts
+ R3={der zweiten Lücke. Theoretisch könnte dieser Text
auch mehrzeilig sein.}, %3.Moeglichkeit rechts
%% LOESUNG: %%
A1=3, % Antwort links
@@ -776,19 +807,19 @@
\subsubsection{Zusatz: Variable Breiten der Boxen}
-Der \texttt{lueckentext}-Befehl erlaubt ein optionales Argument, um die Gr��en der beiden Boxen zu variieren. Dabei werden in den eckigen Klammern $[~]$ die Ver�nderung der linken Box (�nderung ca. zwischen -0.3 und 0.3) angegeben und die rechte Box wird automatisch angepasst. Will man etwa die linke Box vergr��ern, gilt:\leer
+Der \texttt{lueckentext}-Befehl erlaubt ein optionales Argument, um die Größen der beiden Boxen zu variieren. Dabei werden in den eckigen Klammern $[~]$ die Veränderung der linken Box (Änderung ca. zwischen -0.3 und 0.3) angegeben und die rechte Box wird automatisch angepasst. Will man etwa die linke Box vergrößern, gilt:\leer
\textsc{Eingabe:}
\begin{verbatim}
\lueckentext[0.25]{
- text={Hier wird der Text geschrieben. Die L�cke eins hat dabei
-die \gap, die L�cke zwei hat die \gap.}, %Lueckentext Luecke=\gap
- L1={In manchen F�llen sind die Antworten einer L�cke},
+ text={Hier wird der Text geschrieben. Die Lücke eins hat dabei
+die \gap, die Lücke zwei hat die \gap.}, %Lueckentext Luecke=\gap
+ L1={In manchen Fällen sind die Antworten einer Lücke},
%1.Moeglichkeit links
- L2={viel l�nger als die der zweite. In diesem Fall kann man},
+ L2={viel länger als die der zweite. In diesem Fall kann man},
%2.Moeglichkeit links
- L3={die Gr��en der Boxen manuell variieren. Die Eingabe ist optional. },
+ L3={die Größen der Boxen manuell variieren. Die Eingabe ist optional. },
%3.Moeglichkeit links
R1={Sehr}, %1.Moeglichkeit rechts
R2={kurze}, %2.Moeglichkeit rechts
@@ -804,11 +835,11 @@
\lueckentext[0.25]{
- text={Hier wird der Text geschrieben. Die L�cke eins hat dabei
-die \gap, die L�cke zwei hat die \gap.}, %Lueckentext Luecke=\gap
- L1={In manchen F�llen sind die Antworten einer L�cke}, %1.Moeglichkeit links
- L2={viel l�nger als die der zweite. In diesem Fall kann man}, %2.Moeglichkeit links
- L3={die Gr��en der Boxen manuell variieren. Die Eingabe ist optional. }, %3.Moeglichkeit links
+ text={Hier wird der Text geschrieben. Die Lücke eins hat dabei
+die \gap, die Lücke zwei hat die \gap.}, %Lueckentext Luecke=\gap
+ L1={In manchen Fällen sind die Antworten einer Lücke}, %1.Moeglichkeit links
+ L2={viel länger als die der zweite. In diesem Fall kann man}, %2.Moeglichkeit links
+ L3={die Größen der Boxen manuell variieren. Die Eingabe ist optional. }, %3.Moeglichkeit links
R1={Sehr}, %1.Moeglichkeit rechts
R2={kurze}, %2.Moeglichkeit rechts
R3={Antworten}, %3.Moeglichkeit rechts
@@ -819,17 +850,17 @@
\end{minipage}
-Analog funktioniert die Verkleinerung der linken Box. Dazu m�ssen Werte kleiner 0 angegeben
+Analog funktioniert die Verkleinerung der linken Box. Dazu müssen Werte kleiner 0 angegeben
werden.
-\subsubsection{\texttt{Zusatz}: Englischer L�ckentext}
-Der Befehl \texttt{englueckentext} ist analog zum \texttt{lueckentext}-Befehl zu verwenden. Jedoch wird der als Standard angenommene, einleitende Satz bei L�ckentextaufgaben in Englisch angezeigt.
+\subsubsection{\texttt{Zusatz}: Englischer Lückentext}
+Der Befehl \texttt{englueckentext} ist analog zum \texttt{lueckentext}-Befehl zu verwenden. Jedoch wird der als Standard angenommene, einleitende Satz bei Lückentextaufgaben in Englisch angezeigt.
\textsc{Eingabe:}
\begin{verbatim}
\englueckentext{
- text={Hier wird der Text einer englischen Aufgabe geschrieben. Die L�cken
- \gap und \gap k�nnen analog angegeben werden.}, %Lueckentext Luecke=\gap
+ text={Hier wird der Text einer englischen Aufgabe geschrieben. Die Lücken
+ \gap und \gap können analog angegeben werden.}, %Lueckentext Luecke=\gap
L1={Auch}, %1.Moeglichkeit links
L2={der}, %2.Moeglichkeit links
L3={Rest}, %3.Moeglichkeit links
@@ -844,7 +875,7 @@
\textsc{Ausgabe:}
\englueckentext{
- text={Hier wird der Text einer englischen Aufgabe geschrieben. Die L�cken \gap und \gap k�nnen analog angegeben werden.}, %Lueckentext Luecke=\gap
+ text={Hier wird der Text einer englischen Aufgabe geschrieben. Die Lücken \gap und \gap können analog angegeben werden.}, %Lueckentext Luecke=\gap
L1={Auch}, %1.Moeglichkeit links
L2={der}, %2.Moeglichkeit links
L3={Rest}, %3.Moeglichkeit links
@@ -857,8 +888,8 @@
}
\subsection{\texttt{zuordnen}-Befehl}
-Dieser Befehl dient zum Erstellen des Zuordnungsformats von vier aus sechs M�glichkeiten.
-Die korrekten Antworten k�nnen hier frei als Buchstaben eingegeben werden. (hier: F, C, A, D)
+Dieser Befehl dient zum Erstellen des Zuordnungsformats von vier aus sechs Möglichkeiten.
+Die korrekten Antworten können hier frei als Buchstaben eingegeben werden. (hier: F, C, A, D)
\leer
@@ -867,14 +898,14 @@
\zuordnen{
R1={Hier sind die vier}, % Response 1
R2={Antworten, zu}, % Response 2
- R3={denen die M�glichkeiten der rechten Box richtig}, % Response 3
+ R3={denen die Möglichkeiten der rechten Box richtig}, % Response 3
R4={zuzuordnen sind}, % Response 4
%% Moegliche Zuordnungen: %%
- A={Hier tr�gt}, %Moeglichkeit A
+ A={Hier trägt}, %Moeglichkeit A
B={man den Text}, %Moeglichkeit B
C={oder die Formeln}, %Moeglichkeit C
- D={f�r die sechs}, %Moeglichkeit D
- E={M�glichkeiten, die man zuordnen muss}, %Moeglichkeit E
+ D={für die sechs}, %Moeglichkeit D
+ E={Möglichkeiten, die man zuordnen muss}, %Moeglichkeit E
F={ein.}, %Moeglichkeit F
%% LOESUNG: %%
A1={F}, % 1. richtige Zuordnung
@@ -890,14 +921,14 @@
\zuordnen{
R1={Hier sind die vier}, % Response 1
R2={Antworten, zu}, % Response 2
- R3={denen die M�glichkeiten der rechten Box richtig}, % Response 3
+ R3={denen die Möglichkeiten der rechten Box richtig}, % Response 3
R4={zuzuordnen sind}, % Response 4
%% Moegliche Zuordnungen: %%
- A={Hier tr�gt}, %Moeglichkeit A
+ A={Hier trägt}, %Moeglichkeit A
B={man den Text}, %Moeglichkeit B
C={oder die Formeln}, %Moeglichkeit C
- D={f�r die sechs}, %Moeglichkeit D
- E={M�glichkeiten, die man zuordnen muss}, %Moeglichkeit E
+ D={für die sechs}, %Moeglichkeit D
+ E={Möglichkeiten, die man zuordnen muss}, %Moeglichkeit E
F={ein.}, %Moeglichkeit F
%% LOESUNG: %%
A1={F}, % 1. richtige Zuordnung
@@ -908,15 +939,15 @@
\subsubsection{Zusatz: Variable Breiten der Boxen}
-Der \texttt{zuordnen}-Befehl erlaubt ein optionales Argument, um die Gr��en der beiden Boxen zu variieren. Dabei werden in den eckigen Klammern $[~]$ die Ver�nderung der linken Box (�nderung ca. zwischen -0.3 und 0.3) angegeben und die rechte Box wird automatisch angepasst. Will man etwa die linke Box vergr��ern, gilt:
+Der \texttt{zuordnen}-Befehl erlaubt ein optionales Argument, um die Größen der beiden Boxen zu variieren. Dabei werden in den eckigen Klammern $[~]$ die Veränderung der linken Box (Änderung ca. zwischen -0.3 und 0.3) angegeben und die rechte Box wird automatisch angepasst. Will man etwa die linke Box vergrößern, gilt:
\textsc{Eingabe:}
\begin{small}
\begin{verbatim}
\zuordnen[0.25]{
-R1={Dabei wird die linke Box vergr��ert.}, % Response 1
+R1={Dabei wird die linke Box vergrößert.}, % Response 1
R2={Dies dient vor allem dazu,}, % Response 2
- R3={wenn eine Seite viel Text enth�lt, die andere hingegen}, % Response 3
+ R3={wenn eine Seite viel Text enthält, die andere hingegen}, % Response 3
R4={nur ganz wenig. Wird die [ ] nicht angegeben dann wird der Standardwert
0 angenommen.}, % Response 4
%% Moegliche Zuordnungen: %%
@@ -925,7 +956,7 @@
C={eher}, %Moeglichkeit C
D={kurze}, %Moeglichkeit D
E={Antworten}, %Moeglichkeit E
- F={m�glich}, %Moeglichkeit F
+ F={möglich}, %Moeglichkeit F
%% LOESUNG: %%
A1={}, % 1. richtige Zuordnung
A2={}, % 2. richtige Zuordnung
@@ -939,9 +970,9 @@
\textsc{Ausgabe:}
\zuordnen[0.25]{
- R1={Dabei wird die linke Box vergr��ert.}, % Response 1
+ R1={Dabei wird die linke Box vergrößert.}, % Response 1
R2={Dies dient vor allem dazu,}, % Response 2
- R3={wenn eine Seite viel Text enth�lt, die andere hingegen}, % Response 3
+ R3={wenn eine Seite viel Text enthält, die andere hingegen}, % Response 3
R4={nur ganz wenig. Wird die $[~]$ nicht angegeben dann wird der Standardwert 0 angenommen.}, % Response 4
%% Moegliche Zuordnungen: %%
A={Hier}, %Moeglichkeit A
@@ -949,7 +980,7 @@
C={eher}, %Moeglichkeit C
D={kurze}, %Moeglichkeit D
E={Antworten}, %Moeglichkeit E
- F={m�glich}, %Moeglichkeit F
+ F={möglich}, %Moeglichkeit F
%% LOESUNG: %%
A1={}, % 1. richtige Zuordnung
A2={}, % 2. richtige Zuordnung
@@ -958,32 +989,114 @@
}
\end{small}
-Analog funktioniert die Verkleinerung der linken Box. Dazu m�ssen Werte kleiner 0 angegeben werden.
+Analog funktioniert die Verkleinerung der linken Box. Dazu müssen Werte kleiner 0 angegeben werden.
+
+
+\section{Typ-2-Aufgaben}
+Um die Struktur der Teil-2-Aufgaben ähnlich jener bei der standardisierten Reifeprüfung einhalten zu können, beinhaltet das Paket einige Befehle, die die Erstellung von Typ-2-Aufagben erleichtern.
+
+\subsection{\texttt{aufgabenstellung}-Umgebung}
+Typ-2-Aufgaben sollten innerhalb einer Prüfung mithilfe der \texttt{langesbeispiel}-Umgebung eingegeben werden, um die volle Funktionalität (wie \texttt{notenschluessel}) des Pakets zu ermöglichen. Der einleitenden Aufgabentext kann dann eingegeben werden. Für die Eingabe der Aufgabenstellung kann dann die \texttt{aufgabenstellung}-Umgebung verwendet werden.\leer
+
+\subsubsection{\texttt{\textbackslash item} und \texttt{\textbackslash Subitem\{\}}}
+Innerhalb dieser Umgebung können dann mithilfe von \texttt{\textbackslash item} (nummeriert mit a), b) ,c), \ldots) und \texttt{\textbackslash Subitem\{\}} (nummeriert mit 1), 2), \ldots) die jeweiligen Items und Subitems der Aufgabe eingegeben werden. \leer
+
+\subsubsection{Ausgleichspunkte}
+Um die notwendigen Ausgleichspunkte in den Typ-2-Aufgaben zu markieren, können die Befehle \texttt{item} und \texttt{Subitem} durch \texttt{\textbackslash Aitem} und \texttt{\textbackslash ASubitem\{\}} ersetzt werden. Dabei wird vor den geschriebenen Text noch ein \fbox{A} eingefügt -- die Nummerierung wird aber wie gewohnt fortgesetzt.
+
+\subsection{\texttt{loesung}-Umgebung}
+Mithilfe der \texttt{loesung}-Umgebung kann die Lösungserwartung sowie der Lösungsschlüssel eingegeben werden. Analog zur Aufgabenstellung können \texttt{\textbackslash item} und \texttt{\textbackslash Subitem\{\}} verwendet werden. Die Eingabe innerhalb der \texttt{loesung}-Umgebung werden nur dann angezeigt, wenn die Lösungsanzeige aktiviert wurde. Die Nummerierung der Subitems kann man mit folgender Eingabe zurücksetzen: \texttt{\textbackslash setcounter{subitemcounter}{0}}.\leer
+
+Eine vollständige Typ-2-Aufgabe könnte also wie folgt aussehen:
+
+\textsc{Eingabe:}
+
+\begin{verbatim}
+\begin{langesbeispiel} \item[0] %PUNKTE DES BEISPIELS
+Hier steht der einleitende Text der Typ-2-Aufgabe.
+
+\begin{aufgabenstellung}
+\item Hier steht der Aufgabentext des ersten Items.
+
+\Subitem{Aufgabentext des ersten Unterpunkts} %Unterpunkt1
+\Subitem{Aufgabentext des zweiten Unterpunkts} %Unterpunkt2
+
+\end{aufgabenstellung}
+\begin{loesung}
+\item \subsection{Lösungserwartung:}
+
+\Subitem{Lösungserwartung des ersten Unterpunkts} %Lösung von Unterpunkt1
+\Subitem{Lösungserwartung des zweiten Unterpunkts} %%Lösung von Unterpunkt2
+
+\setcounter{subitemcounter}{0}
+\subsection{Lösungsschlüssel:}
+
+\Subitem{Lösungsschlüssel des ersten Unterpunkts} %Unterpunkt1
+\Subitem{Lösungsschlüssel des ersten Unterpunkts} %Unterpunkt2
+\end{loesung}
+
+\end{langesbeispiel}
+\end{verbatim}
+\newpage
+
+\textsc{Ausgabe:}
+\setcounter{Antworten}{1}
+\setcounter{secnumdepth}{-1}
+\setcounter{number}{0}
+\begin{langesbeispiel} \item[0] %PUNKTE DES BEISPIELS
+Hier steht der einleitende Text der Typ-2-Aufgabe.
+
+\addtocontents{toc}{\setcounter{tocdepth}{-10}}
+\begin{aufgabenstellung}
+\item Hier steht der Aufgabentext des ersten Items.
+
+\Subitem{Aufgabentext des ersten Unterpunkts} %Unterpunkt1
+\Subitem{Aufgabentext des zweiten Unterpunkts} %Unterpunkt2
+
+\end{aufgabenstellung}
+
+\begin{loesung}
+\item \subsection*{Lösungserwartung:}
+
+\Subitem{Lösungserwartung des ersten Unterpunkts} %Lösung von Unterpunkt1
+\Subitem{Lösungserwartung des zweiten Unterpunkts} %%Lösung von Unterpunkt2
+
+\setcounter{subitemcounter}{0}
+\subsection*{Lösungsschlüssel:}
+
+\Subitem{Lösungsschlüssel des ersten Unterpunkts} %Lösungschlüssel von Unterpunkt1
+\Subitem{Lösungsschlüssel des ersten Unterpunkts} %Lösungschlüssel von Unterpunkt2
+
+\end{loesung}
+
+\end{langesbeispiel}
+\addtocontents{toc}{\setcounter{tocdepth}{1}}
+
-\section{Einf�gen von GeoGebra-Grafiken}
+\section{Einfügen von GeoGebra-Grafiken}
-Folgende Schritte m�ssen befolgt werden, um Geogebra-Grafiken in \LaTeX-Dokumente einf�gen zu k�nnen.
+Folgende Schritte müssen befolgt werden, um Geogebra-Grafiken in \LaTeX-Dokumente einfügen zu können.
\leer
\begin{enumerate}
\item Grafik in Geogebra zeichnen
\item Datei $\rightarrow$ Export $\rightarrow$ Grafik-Ansicht als PSTricks\ldots
\item Parameter einstellen
- \item \fbox{Erzeuge PSTricks} dr�cken
+ \item \fbox{Erzeuge PSTricks} drücken
\item Gesamten Text, der zwischen \verb|\begin{document}| und \verb|\end{document}| steht, kopieren.
- \item Im \LaTeX-Dokument dort einf�gen, wo die Grafik integriert werden soll. (Dies ist auch innerhalb von den unterschiedlichen Formaten (wie \verb|\zuordnen| oder \verb|\multiplechoice| m�glich)
+ \item Im \LaTeX-Dokument dort einfügen, wo die Grafik integriert werden soll. (Dies ist auch innerhalb von den unterschiedlichen Formaten (wie \verb|\zuordnen| oder \verb|\multiplechoice| möglich)
- \item Die Gr��e der Grafik kann mithilfe des folgenden Befehls angepasst werden:
+ \item Die Größe der Grafik kann mithilfe des folgenden Befehls angepasst werden:
\begin{verbatim}
- \resizebox{0.5\linewidth}{!}{Hier wird der Text von Geogebra eingef�gt}
+ \resizebox{0.5\linewidth}{!}{Hier wird der Text von Geogebra eingefügt}
\end{verbatim}
- Der Faktor 0.5 gibt die Gr��e der Grafik an. Mit dem Wert 0.5 wird die Gr��e der Grafik somit halbiert.
+ Der Faktor 0.5 gibt die Größe der Grafik an. Mit dem Wert 0.5 wird die Größe der Grafik somit halbiert.
\end{enumerate}
@@ -1030,7 +1143,7 @@
\centering Kopie des PSTricks-Exports von Geogebra \\
- (Originalgr��e und mit \verb|\resizebox{0.5\linewidth}{!}{|\ldots\})
+ (Originalgröße und mit \verb|\resizebox{0.5\linewidth}{!}{|\ldots\})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/srdp-mathematik.doc.tlpobj new/tlpkg/tlpobj/srdp-mathematik.doc.tlpobj
--- old/tlpkg/tlpobj/srdp-mathematik.doc.tlpobj 2019-02-28 04:06:00.000000000 +0100
+++ new/tlpkg/tlpobj/srdp-mathematik.doc.tlpobj 2020-04-12 01:55:42.000000000 +0200
@@ -1,9 +1,9 @@
name srdp-mathematik.doc
category Package
-revision 49706
+revision 54685
shortdesc doc files of srdp-mathematik
relocated 1
-docfiles size=47
+docfiles size=53
RELOC/doc/latex/srdp-mathematik/README.txt
RELOC/doc/latex/srdp-mathematik/srdp-mathematik.pdf
RELOC/doc/latex/srdp-mathematik/srdp-mathematik.tex
++++++ srdp-mathematik.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/srdp-mathematik/srdp-mathematik.sty new/tex/latex/srdp-mathematik/srdp-mathematik.sty
--- old/tex/latex/srdp-mathematik/srdp-mathematik.sty 2019-01-14 23:08:11.000000000 +0100
+++ new/tex/latex/srdp-mathematik/srdp-mathematik.sty 2020-04-12 00:53:26.000000000 +0200
@@ -1,5 +1,16 @@
+% srdp-mathemathik.sty
+%
+% This package provides basic commands for the defined formats of the Austrian sRDP
+% (Standardisierte Reife- und Diplomprüfung) in mathematics.
+%
+% Author: Christoph Weberndorfer
+%
+% Released under the LaTeX Project Public License 1.3c
+%
+%
+
\NeedsTeXFormat{LaTeX2e}[1996/12/26]
-\ProvidesPackage{srdp-mathematik}[2019/01/14 v1.2 Standard-Schularbeitsformate]
+\ProvidesPackage{srdp-mathematik}[2020/04/03 v1.6 Standard-Schularbeitsformate]
\usepackage{color}
@@ -42,7 +53,8 @@
\renewcommand{\vec}[1]{\vv{#1}}
\usepackage{graphicx}
\usepackage{setspace}
-\usepackage{enumerate}
+%\usepackage{enumerate}
+\usepackage[inline, shortlabels]{enumitem}
\usepackage{xparse}
\usepackage{eurosym, xspace}
\renewcommand*\euro{\officialeuro\xspace}
@@ -73,9 +85,23 @@
%
%
\newcounter{Antworten}
+\newcounter{Zufall}
+\newcounter{info}
\newcounter{marker}
\DeclareOption{solution_on}{\setcounter{Antworten}{1}}
\DeclareOption{solution_off}{\setcounter{Antworten}{0}}
+\DeclareOption{info_on}{\setcounter{info}{1}}
+\DeclareOption{info_off}{\setcounter{info}{0}}
+\DeclareOption{random=0}{\setcounter{Zufall}{0}}
+\DeclareOption{random=1}{\setcounter{Zufall}{1}}
+\DeclareOption{random=2}{\setcounter{Zufall}{2}}
+\DeclareOption{random=3}{\setcounter{Zufall}{3}}
+\DeclareOption{random=4}{\setcounter{Zufall}{4}}
+\DeclareOption{random=5}{\setcounter{Zufall}{5}}
+\DeclareOption{random=6}{\setcounter{Zufall}{6}}
+\DeclareOption{random=7}{\setcounter{Zufall}{7}}
+\DeclareOption{random=8}{\setcounter{Zufall}{8}}
+\DeclareOption{random=9}{\setcounter{Zufall}{9}}
\AtBeginDocument{\@ifpackagewith{srdp-mathematik}{solution_on}{
\AddToShipoutPictureBG{%
@@ -93,6 +119,16 @@
\newcommand{\antwort}[2][]{\ifthenelse{\theAntworten=1}{\color[rgb]{1,0,0}#2\color[rgb]{0,0,0}}{#1}}
+\newcommand{\info}[2][]{\ifthenelse{\theinfo=1}{
+\color[rgb]{0,0,1}{#2}\color[rgb]{0,0,0}
+}{#1}}
+
+
+%\NewEnviron{antwort}[1][hallo]{\textcolor{red}{\BODY}}
+%\NewEnviron{antwort}[2][]{\ifthenelse{\theAntworten=1}{\color[rgb]{1,0,0}#1\color[rgb]{0,0,0}}{#2}}
+%\newenvironment{antwort}[2][]{\color[rgb]{1,0,0}{#1}}{\color[rgb]{0,0,0}}
+
+
\newcounter{A1}
\newcounter{A2}
@@ -196,7 +232,7 @@
\renewcommand{\labelenumii}{(\roman{enumii})}
\list
{}
- {%
+ {%
\rightmargin.12\textwidth
\def\makelabel##1{\stepcounter{number}%
\hss\llap{\thenumber.}%
@@ -205,13 +241,38 @@
\llap{\small\_\_\_/##1}}}}%
}
{\endlist}
+
\makeatother
+
+\newcommand{\typzwei}{}
+\newcounter{subitemcounter}
+\newcommand{\Subitem}[1]{\stepcounter{subitemcounter}\begin{enumerate}[\thesubitemcounter),leftmargin=*]\itemalt{#1}\end{enumerate}}
+\newcommand{\Aitem}{\item \fbox{A} }
+\newcommand{\ASubitem}[1]{\Subitem{\fbox{A} #1}}
+\NewEnviron{aufgabenstellung}[1]{\let\itemalt\item
+\renewcommand*{\item}{\setcounter{subitemcounter}{0}\itemalt}
+\subsubsection{Aufgabenstellung:}%
+\begin{enumerate}[a),leftmargin=0pt]
+\item \BODY
+\end{enumerate}%
+\let\item\itemalt}
+
+\NewEnviron{loesung}[1]{\let\itemalt\item
+\renewcommand*{\item}{\setcounter{subitemcounter}{0}\itemalt}
+\antwort{%%
+\begin{enumerate}[a),leftmargin=0pt]
+\item \BODY
+\end{enumerate}}%
+\let\item\itemalt}
+
%
%
%
%
%
%
+
+
%%%%%%%%%%%%%%%%%%%%%%%%% Vektorendefinition
\newcommand{\vek}[1]{\overrightarrow{#1}}%
@@ -235,6 +296,12 @@
%
%
+%%%%%%%%%%%%%%%%%%%% INTEGRAL BEFEHL
+%\newcommand{\dx}{\,\text{d}x}
+\newcommand{\dx}[1][x]{\,\text{d}#1}
+\newcommand{\dint}{\displaystyle\int}
+
+
%%%%%%%%%% HOMEWORK BEFEHL
\newcommand{\hw}[1]{
@@ -262,13 +329,13 @@
&b3+1 &c3+1 &d3+1 & e3+1\\
&b3-1 &c3-1 &d3-1 & e3-1\\
\end{spreadtab}
-\footnotesize
-\begin{center}\renewcommand{\arraystretch}{1}
+\footnotesize\renewcommand{\arraystretch}{1}
+\begin{center}
\begin{tabular}{|C{3cm}C{3cm}C{3cm}C{3cm}C{3cm}|} \hline
Erreichte Punkte & Prozent & Gesamt & \multicolumn{2}{c|}{Note} \\
&& \multirow{2}{*}{\thepunkte} && \\
&&&& \\ \hline \hline
-\scriptsize{Sehr Gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht Gen\"ugend} \\
+\scriptsize{Sehr gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht gen\"ugend} \\
\scriptsize{\thepunkte ~ - \ifdim\gut pt=\gutgenau pt \gut\else\gutpluseins\fi}& \scriptsize{\ifdim\gut pt=\gutgenau pt \gutminuseins\else\gut\fi ~ - \ifdim\befriedigend pt=\befriedigendgenau pt \befriedigend\else\befriedigendpluseins\fi} & \scriptsize{\ifdim\befriedigend pt=\befriedigendgenau pt \befriedigendminuseins\else\befriedigend\fi ~ - \ifdim\genuegend pt=\genuegendgenau pt \genuegend\else\genuegendpluseins\fi} & \scriptsize{\ifdim\genuegend pt=\genuegendgenau pt \genuegendminuseins\else\genuegend\fi ~ - \ifdim\nichtgenuegend pt=\nichtgenuegendgenau pt \nichtgenuegend\else\nichtgenuegendpluseins\fi} & \scriptsize{unter \ifdim\nichtgenuegend pt=\nichtgenuegendgenau pt \nichtgenuegend\else\nichtgenuegendpluseins\fi} \\ \hline
\end{tabular}
\end{center}\STautoround{}\normalsize}
@@ -285,13 +352,13 @@
&b3+1 &c3+1 &d3+1 &\\
&b3-1 &c3-1 &d3-1 &\\
\end{spreadtab}
-\footnotesize
-\begin{center}\renewcommand{\arraystretch}{1}
+\footnotesize\renewcommand{\arraystretch}{1}
+\begin{center}
\begin{tabular}{|C{3cm}C{3cm}C{3cm}C{3cm}C{3cm}|} \hline
Erreichte Punkte &Gesamt&\multicolumn{2}{c}{Note}& \\
&\multirow{2}{*}{\thepunkte} &&& \\
&&&& \\ \hline \hline
-\scriptsize{Sehr Gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht Gen\"ugend} \\
+\scriptsize{Sehr gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht gen\"ugend} \\
\scriptsize{\thepunkte ~ - \ifdim\gut pt=\gutgenau pt \gut\else\gutpluseins\fi}& \scriptsize{\ifdim\gut pt=\gutgenau pt \gutminuseins\else\gut\fi ~ - \ifdim\befriedigend pt=\befriedigendgenau pt \befriedigend\else\befriedigendpluseins\fi} & \scriptsize{\ifdim\befriedigend pt=\befriedigendgenau pt \befriedigendminuseins\else\befriedigend\fi ~ - \ifdim\genuegend pt=\genuegendgenau pt \genuegend\else\genuegendpluseins\fi} & \scriptsize{\ifdim\genuegend pt=\genuegendgenau pt \genuegendminuseins\else\genuegend\fi ~ - \nichtgenuegend} & \scriptsize{unter \nichtgenuegend} \\ \hline
\end{tabular}
\end{center}\STautoround{}\normalsize}
@@ -386,10 +453,48 @@
\SThiderow &\theteileins/3*2 & \theteileins+\theausgleichspkte+\theteilzwei \\
\end{spreadtab}
-Die Schularbeit besteht aus Teil 1 (Grundkompetenzen) und Teil 2 (vernetzte und erweiterte Grundkompetenzen). In Teil 1 und Teil 2 sind jeweils \jeroen@get{T1} Punkte zu erreichen. \jeroen@get{AP} Punkte aus Teil 2 k\"onnen zum Ausgleich fehlender Grundkompetenzpunkte aus Teil 1 herangezogen werden. Diese sind in der Angabe mit \fbox{\large A} gekennzeichnet.
-F\"ur eine positive Beurteilung gilt: mindestens \positiv~Punkte aus Teil 1, allenfalls unter Einbeziehung der \jeroen@get{AP} Ausgleichspunkte aus Teil 2 (d.h. Zwischensumme $\geq \positiv$)!
-\leer
+\small
+Die Schularbeit besteht aus Teil 1 (Grundkompetenzen) und Teil 2 (vernetzte und erweiterte Grundkompetenzen). In Teil 1 und Teil 2 sind jeweils \jeroen@get{T1} Punkte zu erreichen. \jeroen@get{AP} Punkte aus Teil 2 k\"onnen zum Ausgleich fehlender Grundkompetenzpunkte aus Teil 1 herangezogen werden. Diese sind in der Angabe mit \fbox{A} gekennzeichnet.
+
+\tiny
+\STautoround{0}
+\begin{spreadtab}[\STsavecell\brzweigrenze{f1} \STsavecell\gut{b2} \STsavecell\befriedigend{c2} \STsavecell{\genuegend}{d2} \STsavecell{\nichtgenuegend}{e2} \STsavecell\brzweibefriedigend{f2} \STsavecell{\gutminuseins}{b3} \STsavecell{\befriedigendminuseins}{c3} \STsavecell{\genuegendminuseins}{d3} \STsavecell\brzweigrenzeminuseins{e3} \STsavecell\brzweibefriedigendminuseins{f3}]{{tabular}{cccccc}}
+\SThidecol \gesamtpunkte & \SThidecol 1 &\SThidecol 2 & \SThidecol 3 &\SThidecol 4 & \SThidecol \gesamtpunkte*0.75\\ % \SThidecol
+&a1*#1 &a1*#2 &a1*#3 &a1*#4 & \gesamtpunkte*0.6\\
+& b2-1 &c2-1 &d2-1 & f1-1 & f2-1\\ %\SThiderow
+\end{spreadtab}
+\small
+
+\textbf{Zwei Beurteilungswege}
+
+\begin{enumerate}[1)]
+ \item Wenn mindestens \positiv~Punkte aus Teil 1, allenfalls unter Einbeziehung der Ausgleichspunkte aus \mbox{Teil 2} erreicht werden, gilt folgender Beurteilungsschlüssel:\vspace{0.3cm}
+
+\footnotesize
+\begin{tabular}{C{2.8cm}C{2.8cm}C{2.8cm}C{2.8cm}C{2.8cm}}
+\scriptsize{Sehr gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht gen\"ugend} \\
+\scriptsize{\gesamtpunkte ~-~ \gut} & \scriptsize{\gutminuseins,5 ~-~ \befriedigend} & \scriptsize{\befriedigendminuseins,5 ~-~ \genuegend} & \scriptsize{\genuegendminuseins,5 ~-~ \nichtgenuegend} & \scriptsize{unter \nichtgenuegend} \\
+\end{tabular}
+\STautoround{}\vspace{0.3cm}
+
+\small
+\item Wenn weniger als \positiv\ Punkte aus Teil 1, allenfalls unter Einbeziehung der Ausgleichspunkte aus \mbox{Teil 2} erreicht werden, dann kann auf diesem Weg ein \glqq Gen\"ugend\grqq\ oder \glqq Befriedigend\grqq\ erreicht werden: \vspace{0.3cm}
+
+\footnotesize
+\begin{tabular}{C{2.8cm}C{2.8cm}}
+\scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} \\
+\scriptsize{\brzweigrenzeminuseins,5 ~-~ \brzweibefriedigend} & \scriptsize{\brzweibefriedigendminuseins,5 ~-~\genuegend}\\
+\end{tabular}
+\STautoround{} \vspace{0.3cm}
+
+\small
+Ab \brzweigrenze\ erreichten Punkten gilt der unter 1) angeführte Beurteilungsschlüssel.
+
+Die Arbeit wird mit \glqq Nicht genügend\grqq\ beurteilt, wenn im Teil 1 unter Berücksichtigung der \jeroen@get{AP} Ausgleichspunkte aus Teil 2 weniger als \nichtgenuegend\ Punkte und insgesamt weniger als \genuegend\ Punkte erreicht wurden.
+
+\end{enumerate} \leer
+\vfil
\renewcommand{\arraystretch}{1.5}
\begin{center}
@@ -400,37 +505,19 @@
&Zwischensumme &\\ \hline
Teil 2: sonstige Punkte &\jeroen@get{T2} &\\ \hline
& $\Sigma=\gesamtpunkte$ & \\ \hline
+Beurteilungsweg & \fbox{1} oder \fbox{2} \\ \hline
\end{tabular}
\vspace{1cm}
Beurteilung: \rule{8cm}{0.4pt}
\end{center}
\renewcommand{\arraystretch}{1}
-
-\vfill
-
-\small
-\STautoround{0}
-\begin{spreadtab}[\STsavecell\gut{b2} \STsavecell\befriedigend{c2} \STsavecell{\genuegend}{d2} \STsavecell{\nichtgenuegend}{e2} \STsavecell{\gutminuseins}{b3} \STsavecell{\befriedigendminuseins}{c3} \STsavecell{\genuegendminuseins}{d3}]{{tabular}{ccccc}}
- \SThidecol \gesamtpunkte &\SThidecol 1 &\SThidecol 2 &\SThidecol 3 &\SThidecol 4 \\
- \SThiderow &a1*#1 &a1*#2 &a1*#3 &a1*#4 \\
- \SThiderow &b2-1 &c2-1 &d2-1 & \\
-\end{spreadtab}
-\footnotesize
-\begin{center}
-\begin{tabular}{C{3cm}C{3cm}C{3cm}C{3cm}C{3cm}}
-\scriptsize{Sehr Gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht Gen\"ugend} \\
-\scriptsize{\gesamtpunkte ~ - \gut} & \scriptsize{\gutminuseins ~ - \befriedigend} & \scriptsize{\befriedigendminuseins ~ - \genuegend} & \scriptsize{\genuegendminuseins ~ - \nichtgenuegend} & \scriptsize{unter \nichtgenuegend} \\
-\end{tabular}
-\end{center}
-\STautoround{}
\egroup
-
}
%%%%%%%%%%%%%%%%
-\newcounter{Zufall}
+
\makeatletter
\def\prunelist#1{%
\expandafter\edef\csname pgfmath@randomlist@#1\endcsname
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/srdp-mathematik.tlpobj new/tlpkg/tlpobj/srdp-mathematik.tlpobj
--- old/tlpkg/tlpobj/srdp-mathematik.tlpobj 2019-02-28 04:06:00.000000000 +0100
+++ new/tlpkg/tlpobj/srdp-mathematik.tlpobj 2020-04-12 01:55:42.000000000 +0200
@@ -1,6 +1,6 @@
name srdp-mathematik
category Package
-revision 49706
+revision 54685
shortdesc Typeset Austrian SRDP in mathematics
relocated 1
longdesc This package provides basic commands for the defined formats of
@@ -9,10 +9,9 @@
longdesc in the tex file which can optionally be displayed in the pdf
longdesc file, and it offers a way to vary the answers in order to
longdesc create different groups (e. g. for tests) easily.
-runfiles size=17
+runfiles size=18
RELOC/tex/latex/srdp-mathematik/srdp-mathematik.sty
catalogue-ctan /macros/latex/contrib/srdp-mathematik
-catalogue-date 2019-01-14 18:24:52 +0100
catalogue-license lppl1.3c
catalogue-topics exam maths
-catalogue-version 1.2
+catalogue-version 1.6
++++++ stackengine.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stackengine.doc.tlpobj new/tlpkg/tlpobj/stackengine.doc.tlpobj
--- old/tlpkg/tlpobj/stackengine.doc.tlpobj 2019-02-28 04:06:00.000000000 +0100
+++ new/tlpkg/tlpobj/stackengine.doc.tlpobj 2020-02-20 01:54:49.000000000 +0100
@@ -1,6 +1,6 @@
name stackengine.doc
category Package
-revision 43221
+revision 53843
shortdesc doc files of stackengine
relocated 1
docfiles size=102
++++++ stackengine.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stackengine.tlpobj new/tlpkg/tlpobj/stackengine.tlpobj
--- old/tlpkg/tlpobj/stackengine.tlpobj 2019-02-28 04:06:00.000000000 +0100
+++ new/tlpkg/tlpobj/stackengine.tlpobj 2020-02-20 01:54:49.000000000 +0100
@@ -1,16 +1,16 @@
name stackengine
category Package
-revision 43221
+revision 53843
shortdesc Highly customised stacking of objects, insets, baseline changes, etc
relocated 1
longdesc The package provides a versatile way to stack objects
longdesc vertically in a variety of customizable ways. A number of
longdesc useful macros are provided, all of which make use of the
longdesc stackengine core.
+depend listofitems
runfiles size=4
RELOC/tex/latex/stackengine/stackengine.sty
catalogue-ctan /macros/latex/contrib/stackengine
-catalogue-date 2017-02-13 14:03:10 +0100
catalogue-license lppl1.3
catalogue-topics macro-supp
catalogue-version 4.01
++++++ stage.doc.tar.xz ++++++
Binary files old/doc/latex/stage/stage-documentation.pdf and new/doc/latex/stage/stage-documentation.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/stage/stage-documentation.tex new/doc/latex/stage/stage-documentation.tex
--- old/doc/latex/stage/stage-documentation.tex 2017-04-28 23:17:39.000000000 +0200
+++ new/doc/latex/stage/stage-documentation.tex 2020-02-25 23:06:40.000000000 +0100
@@ -157,8 +157,6 @@
%%% The following items are optional. Uncomment to use.
% \address{}
-% \copyrightnotice{}
-% \draft{}
\begin{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stage.doc.tlpobj new/tlpkg/tlpobj/stage.doc.tlpobj
--- old/tlpkg/tlpobj/stage.doc.tlpobj 2019-02-28 04:06:00.000000000 +0100
+++ new/tlpkg/tlpobj/stage.doc.tlpobj 2020-02-26 01:55:05.000000000 +0100
@@ -1,6 +1,6 @@
name stage.doc
category Package
-revision 44100
+revision 53915
shortdesc doc files of stage
relocated 1
docfiles size=41
++++++ stage.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/stage/stage.cls new/tex/latex/stage/stage.cls
--- old/tex/latex/stage/stage.cls 2017-04-28 23:17:39.000000000 +0200
+++ new/tex/latex/stage/stage.cls 2020-02-25 23:06:40.000000000 +0100
@@ -1,6 +1,6 @@
%% stage.cls
%% Copyright 2005 Robert Jahrling
-%% Copyright 2017 Reuben Thomas
+%% Copyright 2017–2018 Reuben Thomas
%
% This is a LaTeX2e class called stage, providing a class
% for stage play Manuscript Format.
@@ -23,7 +23,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{stage}[2017/04/25 v1.00 Manuscript Format for stage plays]
+\ProvidesClass{stage}[2018/05/14 v1.01 Manuscript Format for stage plays]
% The class is based on the default book class
\LoadClass[12pt,oneside]{book}
\PassOptionsToClass{\CurrentOption}{book}
@@ -32,6 +32,7 @@
\RequirePackage{fancyhdr}
\RequirePackage{extramarks}
\RequirePackage{needspace}
+\RequirePackage{changepage}
% These three commands are required.
% The default font size is 12/14. It looks better than 12 solid.
% The textwidth and textheight represent one-inch margins all
@@ -71,13 +72,8 @@
\renewcommand{\headheight}{14pt}
%%%
-% No indentation. Double space between paragraphs.
-\parindent 0pt
-\parskip 0pt
-\newlength{\doublespacelength}
-\setlength{\doublespacelength}{1.6ex}
-% \doublespace leaves a line's worth of space between elements.
-\newcommand{\doublespace}{\vspace{\doublespacelength}}
+% No indentation; space between paragraphs.
+\usepackage{parskip}
% \introduce is used the first time we meet a character.
\newcommand{\introduce}[1]{\textsc{#1}}
% \address is used for the writer's address
@@ -89,28 +85,15 @@
% Counts scenes per act
\newcounter{scenecounter}[actcounter]
-% An environment for specifying margin changes
-\newenvironment{changemargin}[2]{%
- \begin{list}{}{%
- % Without the following critical setting, we could use
- % changepage’s adjustwidth environment
- \setlength{\partopsep}{0pt}%
- \setlength{\topsep}{0pt}%
- \setlength{\leftmargin}{#1}%
- \setlength{\rightmargin}{#2}%
- \setlength{\listparindent}{\parindent}%
- \setlength{\itemindent}{\parindent}%
- \setlength{\parsep}{\parskip}%
- }%
- \item[]}{\end{list}}
% \dialog sets the character's name above their speech
+\let\stageoldep=\everypar
+\newlength{\saveparskip}
\newcommand{\dialog}[2]{%
- \doublespace%
\needspace{2\baselineskip}%
- \begin{changemargin}{2.5in}{0in}\textsc{#1}\end{changemargin}%
+ {\begin{adjustwidth}{2.5in}{0in}\textsc{#1}\end{adjustwidth}\saveparskip=\parskip\parskip=0pt%
\extramarks{}{}%
- #2%
- \extramarks{\textsc{#1} (\continuedname)}{}
+ {\begin{adjustwidth}{0in}{0in}\def\everypar{\parskip=\saveparskip\stageoldep}#2\end{adjustwidth}}%
+ \extramarks{\textsc{#1} (\continuedname)}{}}
}
% \dialogue, for people who like that spelling better
@@ -121,40 +104,33 @@
% Start a new page for each Act except the first
\newcommand{\act}{%
\renewcommand{\thepage}{\Roman{actcounter}-\arabic{page}}%
- \begin{changemargin}{2.5in}{0in}
- \ifthenelse{\value{actcounter} > 1}{\newpage}{}
- \ifthenelse{\value{actcounter} = 1}{\doublespace}{}
- \stepcounter{actcounter}
- \textsc{\actname} \Roman{actcounter}
- \end{changemargin}
- \setcounter{page}{1}
+ \ifthenelse{\value{actcounter} > 1}{\newpage}{\vspace{\parskip}}
+ \stepcounter{actcounter}
+ \hspace*{2.5in}\textsc{\actname} \Roman{actcounter}%
+ \setcounter{page}{1}
}
% \scene creates a scene header, with arabic numerals
%
% Start a new page for each scene except the first
\newcommand{\scene}{%
- \begin{changemargin}{2.5in}{0in}
- \stepcounter{scenecounter}
- \ifthenelse{\value{scenecounter} > 1}{\newpage}{}
- \textsc{\scenename} \arabic{scenecounter}
- \ifthenelse{\value{scenecounter} = 1}{\doublespace}{}
- \end{changemargin}
+ \extramarks{}{}%
+ \stepcounter{scenecounter}
+ \ifthenelse{\value{scenecounter} > 1}{\newpage}{\vspace{\parskip}}
+ \hspace*{2.5in}\textsc{\scenename} \arabic{scenecounter}%
}
% \stage sets the stage directions farther in than the box
% containing the dialog, and parenthesizes them.
\newcommand{\stage}[1]{%
- \doublespace
- \begin{changemargin}{2in}{0in}
+ \begin{adjustwidth}{2in}{0in}
(#1)%
- \end{changemargin}
+ \end{adjustwidth}
}
% \charsd is like \paren in ScriptTeX, used for brief character
% stage directions. It's intended to set properly into a passage
% of dialog.
\newcommand{\charsd}[1]{%
- \begin{changemargin}{2in}{0in}%
- (#1)%
- \end{changemargin}}
+ {\def\everypar{\parskip=0pt\stageoldep}%
+ \stage{#1}\par\leavevmode}}
% Undocumented, for backwards compatibility
\newcommand{\initsd}[1]{\charsd{#1}}
@@ -167,9 +143,9 @@
% \opensd is opening stage directions, set differently from
% other stage directions; \opensd sets time and place.
\newcommand{\opensd}[1]{%
- \begin{changemargin}{2.5in}{0in}
+ \begin{adjustwidth}{2.5in}{0in}
(#1)%
- \end{changemargin}
+ \end{adjustwidth}
}
% \open is the same as \opensd
\newcommand{\open}[1]{\opensd{#1}}
@@ -181,9 +157,9 @@
\par
\center{\@author}
\vspace{5in}
- \begin{changemargin}{0in}{0in}
+ \begin{adjustwidth}{0in}{0in}
\ifthenelse{\not\isundefined{\@address}}{\@address}{}
- \end{changemargin}
+ \end{adjustwidth}
\end{titlepage}
\setcounter{page}{1}
}
@@ -193,21 +169,20 @@
\thispagestyle{empty}%
\center{\textsc{\castname}}%
\vspace{3ex}%
- \begin{changemargin}{0in}{0.5in}%
+ \begin{adjustwidth}{0in}{0.5in}%
}{%
- \end{changemargin}%
+ \end{adjustwidth}%
\setcounter{page}{0}%
\newpage%
}
% \addcharacter adds characters to the cast page.
\newcommand{\addcharacter}[2]{%
\begin{tabular}[2]{p{2in} p{4in}}
- \textsc{#1} & #2\\[\doublespacelength]
+ \textsc{#1} & #2\\[\parskip]
\end{tabular}
}
% Mark the end of the document.
\AtEndDocument{%
- \doublespace %
\hskip 2.5in %
\textsc{\theendname}%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stage.tlpobj new/tlpkg/tlpobj/stage.tlpobj
--- old/tlpkg/tlpobj/stage.tlpobj 2019-02-28 04:06:00.000000000 +0100
+++ new/tlpkg/tlpobj/stage.tlpobj 2020-02-26 01:55:05.000000000 +0100
@@ -1,6 +1,6 @@
name stage
category Package
-revision 44100
+revision 53915
shortdesc A LaTeX class for stage plays
relocated 1
longdesc Stage.cls is a LaTeX class for creating plays of any length in
@@ -12,7 +12,6 @@
catalogue-contact-home https://github.com/rrthomas/stage
catalogue-contact-repository https://github.com/rrthomas/stage
catalogue-ctan /macros/latex/contrib/stage
-catalogue-date 2017-04-27 23:31:51 +0200
catalogue-license lppl1.3
catalogue-topics drama-script
-catalogue-version 1.00
+catalogue-version 1.01
++++++ stanli.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stanli.doc.tlpobj new/tlpkg/tlpobj/stanli.doc.tlpobj
--- old/tlpkg/tlpobj/stanli.doc.tlpobj 2019-02-28 04:06:01.000000000 +0100
+++ new/tlpkg/tlpobj/stanli.doc.tlpobj 2020-03-24 02:03:50.000000000 +0100
@@ -1,6 +1,6 @@
name stanli.doc
category Package
-revision 42765
+revision 54512
shortdesc doc files of stanli
relocated 1
docfiles size=153
++++++ stanli.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stanli.tlpobj new/tlpkg/tlpobj/stanli.tlpobj
--- old/tlpkg/tlpobj/stanli.tlpobj 2019-02-28 04:06:01.000000000 +0100
+++ new/tlpkg/tlpobj/stanli.tlpobj 2020-03-24 02:03:50.000000000 +0100
@@ -1,6 +1,6 @@
name stanli
category Package
-revision 42765
+revision 54512
shortdesc TikZ Library for Structural Analysis
relocated 1
longdesc stanli is a STructural ANalysis LIbrary based on PGF/TikZ.
@@ -12,7 +12,6 @@
runfiles size=20
RELOC/tex/latex/stanli/stanli.sty
catalogue-ctan /graphics/pgf/contrib/stanli
-catalogue-date 2016-12-29 05:38:19 +0100
-catalogue-license gpllppl1.3
+catalogue-license gpl lppl1.3
catalogue-topics pgf-tikz engineering
catalogue-version 3.0
++++++ statistics.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/statistics/LICENSE new/doc/latex/statistics/LICENSE
--- old/doc/latex/statistics/LICENSE 2018-07-22 23:18:56.000000000 +0200
+++ new/doc/latex/statistics/LICENSE 2019-09-29 23:14:48.000000000 +0200
@@ -632,7 +632,7 @@
the "copyright" line and a pointer to where the full notice is found.
statistics
- Copyright (C) 2014-2018 Julien RIVAUD
+ Copyright (C) 2014-2019 Julien RIVAUD
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- statistics Copyright (C) 2014-2018 Julien RIVAUD
+ statistics Copyright (C) 2014-2019 Julien RIVAUD
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/statistics/README.md new/doc/latex/statistics/README.md
--- old/doc/latex/statistics/README.md 2018-07-22 23:18:56.000000000 +0200
+++ new/doc/latex/statistics/README.md 2019-09-29 23:14:48.000000000 +0200
@@ -14,7 +14,7 @@
Every part of the generated tables or graphics is customizable.
-(C) Copyright 2014-2018 RIVAUD Julien
+(C) Copyright 2014-2019 RIVAUD Julien
This package may be distributed and/or modified under the conditions of the
General Public License (GPL), either version 3 of this license or (at your
Binary files old/doc/latex/statistics/statistics.pdf and new/doc/latex/statistics/statistics.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/statistics.doc.tlpobj new/tlpkg/tlpobj/statistics.doc.tlpobj
--- old/tlpkg/tlpobj/statistics.doc.tlpobj 2019-02-28 04:06:02.000000000 +0100
+++ new/tlpkg/tlpobj/statistics.doc.tlpobj 2019-09-30 01:54:45.000000000 +0200
@@ -1,9 +1,9 @@
name statistics.doc
category Package
-revision 48252
+revision 52212
shortdesc doc files of statistics
relocated 1
-docfiles size=115
+docfiles size=117
RELOC/doc/latex/statistics/LICENSE
RELOC/doc/latex/statistics/README.md
RELOC/doc/latex/statistics/statistics.pdf
++++++ statistics.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/statistics/statistics.sty new/tex/latex/statistics/statistics.sty
--- old/tex/latex/statistics/statistics.sty 2018-07-22 23:18:56.000000000 +0200
+++ new/tex/latex/statistics/statistics.sty 2019-09-29 23:14:48.000000000 +0200
@@ -6,17 +6,17 @@
%%
%% statistics.dtx (with options: `package')
%%
-%% File: statistics.dtx (C) Copyright 2014-2018 RIVAUD Julien
+%% File: statistics.dtx (C) Copyright 2014-2019 RIVAUD Julien
%%
%% It may be distributed and/or modified under the conditions of the
%% General Public License (GPL), either version 3 of this
%% license or (at your option) any later version.
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\RequirePackage{expl3}[2016/01/19]
+\RequirePackage{expl3}[2018/06/19]
\def\ExplFileName{statistics}
\def\ExplFileDescription{Compute and typeset statistics table and graphics}
-\def\ExplFileDate{2018/07/21}
-\def\ExplFileVersion{2.0}
+\def\ExplFileDate{2019/09/29}
+\def\ExplFileVersion{2.2}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\RequirePackage{xparse}
@@ -155,6 +155,9 @@
}
}
+\int_new:N \l__statistics_table_maxcols_int
+\int_set:Nn \l__statistics_table_maxcols_int {0}
+
\__statistics_keys_define:nn { table } {
showonly .value_required:n = true,
showonly .code:n = \__statistics_setshow:n{#1},
@@ -175,9 +178,9 @@
},
showonly/shown .initial:n = #1,
- maxcols .int_set:N = \l__statistics_table_maxcols_int,
+ maxcols .clist_set:N = \l__statistics_table_maxcols_clist,
maxcols .value_required:n = true,
- maxcols .initial:n = 0,
+ maxcols .initial:n = ,
tablesep .tl_set:N = \l__statistics_table_sep_tl,
tablesep .value_required:n = true,
@@ -319,6 +322,9 @@
\bool_new:N \l__statistics_table_firstrow_bool
+\seq_new:N \l__statistics_store_values_seq
+\seq_new:N \l__statistics_store_counts_seq
+
\cs_generate_variant:Nn \keyval_parse:NNn { NNV }
\NewDocumentCommand \StatsTable { +O{} +m +O{} } {
\group_begin:
@@ -338,6 +344,12 @@
}{
\tl_set:Nn \l__statistics_data_tl { #2 }
}
+ \cs_set_nopar:Npn \getvalue {
+ \seq_item:Nn \l__statistics_store_values_seq
+ }
+ \cs_set_nopar:Npn \getcount {
+ \seq_item:Nn \l__statistics_store_count_seq
+ }
\fp_zero:N \l__statistics_total_fp
\keyval_parse:NNV
\__statistics_table_count:n
@@ -354,6 +366,9 @@
}
\cs_new_protected_nopar:Nn \__statistics_table_start: {
\int_zero:N \l__statistics_nbvals_int
+ \clist_pop:NNT \l__statistics_table_maxcols_clist \l_tmpa_tl {
+ \int_set:Nn \l__statistics_table_maxcols_int { \l_tmpa_tl }
+ }
\clist_map_inline:nn { values, counts, frequencies, icc, icf, dcc, dcf } {
\tl_set:cx { l__statistics_table_##1_tl } {
\exp_not:N \ensuremath { \exp_not:N \hbox {
@@ -420,6 +435,7 @@
\tl_put_right:Nn \l_tmpa_tl
{\__statistics_table_hidden_format:n}
}
+ \seq_put_right:Nn \l__statistics_store_values_seq { #1 }
\bool_if:NT \l__statistics_table_values_bool {
\tl_put_right:Nx \l__statistics_table_values_tl {
\exp_not:V \l_tmpa_tl {
@@ -429,6 +445,7 @@
}
}
}
+ \seq_put_right:Nx \l__statistics_store_counts_seq { \fp_eval:n {#2} }
\bool_if:NT \l__statistics_table_counts_bool {
\tl_put_right:Nx \l__statistics_table_counts_tl {
\exp_not:V \l_tmpa_tl {
@@ -757,7 +774,7 @@
counts/format = { \num{#1} },
counts/axis = { ticks~and~grid={
- many, int~about~strategy, integer~minor~steps,
+ many, int~about~strategy, integer~minor~steps*,
} },
comb/counts/label = \countname,
cumulative/counts/label = \ccountname,
@@ -771,7 +788,10 @@
histogram/y/axis = {ticks = none},
histogram/y/autostep = 1,
histogram/legend = { x=, y=0, w=\xstep },
- histogram/style = { semithick, black, fill=black, fill~opacity=0.1 },
+ histogram/style = {
+ every~path/.prefix~style=fill,
+ semithick, black, fill=black, fill~opacity=0.1
+ },
histogram/areas,
histogram/areas/style = { auto, font=\small },
@@ -886,6 +906,18 @@
}
},
integer~minor~steps/.default=50,
+integer~minor~steps*/.style={
+ compute~step/.append = {
+ \tl_set_eq:NN \l_tmpa_tl \tikz@lib@dv@step
+ \tl_if_eq:NNF \l_tmpa_tl \relax {
+ \fp_compare:nT { \l_tmpa_tl < 1 } {
+ \tl_set:Nx \tikz@lib@dv@step {1}
+ }
+ }
+ },
+ integer~minor~steps=#1,
+},
+integer~minor~steps*/.default=50,
}
\bool_new:N \l__statistics_graph_allranges_bool
@@ -920,7 +952,7 @@
\fp_gset:Nn \g__statistics_graph_xstep_fp
{ \tl_use:c {\l_tmpa_tl} }
}{
- \fp_gset:Nn \g__statistics_graph_xstep_fp { \c_one }
+ \fp_gset:Nn \g__statistics_graph_xstep_fp { \c_one_int }
}
\__statistics_setup:nn { graph } { #1, #3 }
\tl_if_single:nTF { #2 } {
@@ -1148,9 +1180,8 @@
\exp_not:n { , visualize~as~line = histogram,
histogram = } {
\exp_not:n { polygon, style = } {
- \exp_not:n { every~path/.append~style = } {
\exp_not:V \l__statistics_graph_options_histogram_tl
- } } }
+ } }
\exp_not:n { ] data [set = histogram, format = TeX~code] } {
\exp_not:V \l__statistics_graph_tikzdata_tl
}
@@ -1258,9 +1289,8 @@
\exp_not:n { , visualize~as~line = bar~graph,
bar~graph = } {
\exp_not:n { style = } {
- \exp_not:n { every~path/.append~style = } {
\exp_not:V \l__statistics_graph_options_comb_tl
- } } }
+ } }
\exp_not:n { ] data [set = bar~graph, format = TeX~code] } {
\exp_not:V \l__statistics_graph_tikzdata_tl
}
@@ -1368,9 +1398,8 @@
\exp_not:n { , visualize~as~line = cumulative,
cumulative = } {
\exp_not:n { style = } {
- \exp_not:n { every~path/.append~style = } {
\exp_not:V \l__statistics_graph_options_cumulative_tl
- } } }
+ } }
\exp_not:n { ] data [set = cumulative, format = TeX~code] } {
\exp_not:V \l__statistics_graph_tikzdata_tl
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/statistics.tlpobj new/tlpkg/tlpobj/statistics.tlpobj
--- old/tlpkg/tlpobj/statistics.tlpobj 2019-02-28 04:06:02.000000000 +0100
+++ new/tlpkg/tlpobj/statistics.tlpobj 2019-09-30 01:54:45.000000000 +0200
@@ -1,6 +1,6 @@
name statistics
category Package
-revision 48252
+revision 52212
shortdesc Compute and typeset statistics tables and graphics
relocated 1
longdesc The 'statistics' package can compute and typeset statistics
@@ -15,7 +15,7 @@
longdesc them. Similarly 'statistics' can draw only some parts of the
longdesc graphs. Every part of the generated tables or graphics is
longdesc customizable.
-runfiles size=14
+runfiles size=15
RELOC/tex/latex/statistics/statistics.sty
catalogue-contact-bugs https://gitlab.com/frnchfrgg-latex/statistics/issues
catalogue-contact-development https://gitlab.com/frnchfrgg-latex/statistics
@@ -23,7 +23,7 @@
catalogue-contact-repository https://gitlab.com/frnchfrgg-latex/statistics
catalogue-contact-support https://gitlab.com/frnchfrgg-latex/statistics/issues
catalogue-ctan /macros/latex/contrib/statistics
-catalogue-date 2018-07-23 05:27:45 +0200
+catalogue-date 2019-09-29 19:55:40 +0200
catalogue-license gpl3+
catalogue-topics maths statistics
-catalogue-version 2.0
+catalogue-version 2.2
++++++ stickstoo.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/stickstoo/README new/doc/fonts/stickstoo/README
--- old/doc/fonts/stickstoo/README 2018-05-29 00:25:34.000000000 +0200
+++ new/doc/fonts/stickstoo/README 2019-10-11 23:31:43.000000000 +0200
@@ -19,7 +19,13 @@
Files provided "as is", with no warranties.
-Current version: 1.031 2018-05-27
+Current version: 1.033 2019-10-10
+
+Changes in version 1.033
+Version 1.032 lacked some of the latest versions of fonts and tfm files. Corrected in 1.033.
+
+Changes in version 1.032
+Changed the math italic and math upright tfm and vf that allow these fonts to produce pdf files that conform to PDF/A-1b when used in conjunction with newtxmath. See the newtx documentation for details.
Changes in version 1.031
Corrected the ot1G fonts, the originals having found to be the cause of some subtle issues with the microcode package. I owe Ulrike Fischer my sincere gratitude for tracking down the true source of the problem.
Binary files old/doc/fonts/stickstoo/stickstoo-doc.pdf and new/doc/fonts/stickstoo/stickstoo-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/stickstoo/stickstoo-doc.tex new/doc/fonts/stickstoo/stickstoo-doc.tex
--- old/doc/fonts/stickstoo/stickstoo-doc.tex 2018-05-13 23:45:23.000000000 +0200
+++ new/doc/fonts/stickstoo/stickstoo-doc.tex 2019-10-10 22:43:56.000000000 +0200
@@ -5,10 +5,10 @@
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
%\pdfmapfile{+SticksTooText.map}
\pdfmapfile{=newtx.map}
-\usepackage{graphicx}
+\usepackage[a-1b]{pdfx}
%\usepackage{amssymb}% don't use with newtxmath
%SetFonts
-% libertine+newtxmath
+% stickstoo+newtxmath
\usepackage{stickstootext} % use sb in place of bold
\usepackage[T1]{fontenc}
\usepackage{textcomp}
@@ -100,6 +100,22 @@
Option {\tt varbb} causes \verb|\mathbb| to be let equal to \verb|\varmathbb|, effectively {\tt DSSerif}, and option {\tt vvarbb} causes \verb|\mathbb| to be let equal to \verb|\vvmathbb|, effectively STIX blackboard bold.
+\section{PDF/A Compliance}
+This pdf document was generated with
+
+was tested for compliance with {\tt PDFA-1b} a preamble containing the line
+\begin{verbatim}
+\usepackage[a-1b]{pdfx}
+\end{verbatim}
+It was tested for compliance with that standard using three different methods, with varying results, as is common.
+\begin{itemize}
+\item
+\textsf{Adobe Acrobat Pro DC} says it does comply with PDF/A-1b.
+\item The test site \url{https://www.pdf-online.com/osa/validate.aspx} affirms that also.
+\item The free test package \textsf{veraPDF} says that it does not, and shows a number of issues about widths of glyphs and non-existence of some used glyphs. I found this report unconvincing, as when I merely removed the hints from the type 1 fonts, it gave me the same errors, but relating to a different set of glyphs. A message from its developers said that the type 1 fonts would fail the conformance test if their disassembled code contained a subroutine call before the width specification {\tt hsbw}, and that is common for type 1 fonts constructed using {\tt cfftot1} from the well known \textsf{LCDF Type Tools}. When I changed to using \textsf{FontForge} to construct the type 1 fonts, \textsf{veraPDF} gave a different set of problem glyphs, not overlapping the previous set. Finally, I removed all hints and received yet another set of problem glyphs.
+\end{itemize}•
+
+
\section{Some math samples}
The following snippets mostly originated with the \TeX Book\ and were adapted for \LaTeX\ from Karl Berry's torture test for plain tex math fonts.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stickstoo.doc.tlpobj new/tlpkg/tlpobj/stickstoo.doc.tlpobj
--- old/tlpkg/tlpobj/stickstoo.doc.tlpobj 2019-02-28 04:06:09.000000000 +0100
+++ new/tlpkg/tlpobj/stickstoo.doc.tlpobj 2020-03-24 02:03:50.000000000 +0100
@@ -1,9 +1,9 @@
name stickstoo.doc
category Package
-revision 47858
+revision 54512
shortdesc doc files of stickstoo
relocated 1
-docfiles size=138
+docfiles size=156
RELOC/doc/fonts/stickstoo/OFL-FAQ.txt
RELOC/doc/fonts/stickstoo/OFL.txt
RELOC/doc/fonts/stickstoo/README
++++++ stickstoo.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/stickstoo/stickstooMath-Bold.afm new/fonts/afm/public/stickstoo/stickstooMath-Bold.afm
--- old/fonts/afm/public/stickstoo/stickstooMath-Bold.afm 2018-05-10 00:17:55.000000000 +0200
+++ new/fonts/afm/public/stickstoo/stickstooMath-Bold.afm 2019-10-11 23:31:43.000000000 +0200
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20170730
-Comment Creation Date: Thu May 3 18:45:17 2018
+Comment Generated by FontForge 20190801
+Comment Creation Date: Thu Oct 3 18:44:57 2019
FontName stickstooMath-Bold
FullName stickstoo Math Bold
FamilyName stickstooMath
@@ -14,8 +14,8 @@
UnderlineThickness 50
Version 001.000
EncodingScheme FontSpecific
-FontBBox -112 -269 1107 775
-StartCharMetrics 237
+FontBBox -112 -269 1107 826
+StartCharMetrics 241
C 0 ; WX 625 ; N u1D6AA ; B 35 0 604 657 ;
C 1 ; WX 702 ; N u1D6AB ; B 15 0 687 662 ;
C 2 ; WX 766 ; N u1D6AF ; B 44 -14 722 669 ;
@@ -140,7 +140,6 @@
C 131 ; WX 525 ; N uni019B.varital ; B -9 -12 517 705 ;
C 132 ; WX 504 ; N uni03F0 ; B 4 -12 521 479 ;
C 133 ; WX 591 ; N u1D4F5.up ; B 42 -15 511 716 ;
-C 134 ; WX 495 ; N NameMe.134 ; B 66 359 427 655 ;
C 136 ; WX 222 ; N uni0300 ; B 22 521 204 674 ;
C 137 ; WX 222 ; N uni0301 ; B 18 521 200 674 ;
C 138 ; WX 342 ; N uni0302 ; B 18 521 324 674 ;
@@ -253,5 +252,10 @@
C 245 ; WX 540 ; N u1D7DF ; B 24 0 511 662 ;
C 246 ; WX 540 ; N u1D7E0 ; B 28 -14 512 676 ;
C 247 ; WX 540 ; N u1D7E1 ; B 28 -12 512 676 ;
+C 248 ; WX 612 ; N uni2107 ; B 28 -15 574 692 ;
+C 249 ; WX 722 ; N uni212B ; B 6 0 717 826 ;
+C 250 ; WX 762 ; N uni2126 ; B 29 0 732 692 ;
+C 251 ; WX 762 ; N uni2127 ; B 29 -15 732 678 ;
+C 252 ; WX 594 ; N uni01B5 ; B 29 0 568 657 ;
EndCharMetrics
EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/stickstoo/stickstooMath-BoldItalic.afm new/fonts/afm/public/stickstoo/stickstooMath-BoldItalic.afm
--- old/fonts/afm/public/stickstoo/stickstooMath-BoldItalic.afm 2018-05-22 23:02:53.000000000 +0200
+++ new/fonts/afm/public/stickstoo/stickstooMath-BoldItalic.afm 2019-10-11 23:31:43.000000000 +0200
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20170730
-Comment Creation Date: Mon May 21 13:26:44 2018
+Comment Generated by FontForge 20190801
+Comment Creation Date: Fri Oct 4 15:30:13 2019
FontName stickstooMath-BoldItalic
FullName stickstoo Math Bold Italic
FamilyName stickstooMath
@@ -15,7 +15,7 @@
Version 001.000
EncodingScheme FontSpecific
FontBBox -146 -240 1101 775
-StartCharMetrics 119
+StartCharMetrics 117
C 0 ; WX 672 ; N u1D71E ; B -13 0 681 657 ;
C 1 ; WX 641 ; N u1D71F ; B -31 0 582 662 ;
C 2 ; WX 745 ; N u1D723 ; B 38 -14 707 669 ;
@@ -60,17 +60,16 @@
C 45 ; WX 555 ; N u1D753 ; B 30 -222 545 685 ;
C 46 ; WX 525 ; N u1D754 ; B 68 -240 500 481 ;
C 47 ; WX 910 ; N u1D755 ; B 15 -11 940 473 ;
-C 48 ; WX 531 ; N zero.OP ; B 28 -11 503 484 ;
-C 49 ; WX 424 ; N one.OP ; B 29 0 408 478 ;
-C 50 ; WX 465 ; N two.OP ; B 29 0 453 485 ;
-C 51 ; WX 470 ; N three.OP ; B 19 -171 449 485 ;
-C 52 ; WX 516 ; N four.OP ; B 22 -143 501 482 ;
-C 53 ; WX 465 ; N five.OP ; B 19 -171 437 473 ;
-C 54 ; WX 525 ; N six.OP ; B 37 -14 494 646 ;
-C 55 ; WX 487 ; N seven.OP ; B 32 -167 455 473 ;
-C 56 ; WX 513 ; N eight.OP ; B 32 -14 481 649 ;
-C 57 ; WX 525 ; N nine.OP ; B 31 -175 488 485 ;
-C 58 ; WX 607 ; N NameMe.58 ; B -12 -15 630 462 ;
+C 48 ; WX 495 ; N zero.oldstyle ; B 29 -11 466 484 ;
+C 49 ; WX 495 ; N one.oldstyle ; B 53 0 454 478 ;
+C 50 ; WX 495 ; N two.oldstyle ; B 36 0 459 485 ;
+C 51 ; WX 495 ; N three.oldstyle ; B 28 -171 459 485 ;
+C 52 ; WX 495 ; N four.oldstyle ; B 21 -143 471 482 ;
+C 53 ; WX 495 ; N five.oldstyle ; B 39 -171 453 473 ;
+C 54 ; WX 495 ; N six.oldstyle ; B 30 -14 467 646 ;
+C 55 ; WX 495 ; N seven.oldstyle ; B 37 -167 466 473 ;
+C 56 ; WX 495 ; N eight.oldstyle ; B 29 -14 464 649 ;
+C 57 ; WX 495 ; N nine.oldstyle ; B 29 -175 466 485 ;
C 65 ; WX 710 ; N u1D468 ; B -12 0 683 662 ;
C 66 ; WX 669 ; N u1D469 ; B -13 0 641 657 ;
C 67 ; WX 663 ; N u1D46A ; B 38 -12 669 669 ;
@@ -125,15 +124,14 @@
C 122 ; WX 350 ; N u1D48A.dotless ; B 52 -12 319 476 ;
C 123 ; WX 516 ; N u1D48B.dotless ; B 31 -222 500 476 ;
C 124 ; WX 637 ; N u1D489 ; B 52 -12 618 706 ;
-C 125 ; WX 637 ; N u1D489.var ; B 52 -12 618 706 ;
+C 125 ; WX 637 ; N uni210F ; B 52 -12 618 706 ;
C 126 ; WX 601 ; N u1D4F5 ; B 25 -15 524 716 ;
-C 127 ; WX 637 ; N u1D489.var2 ; B 52 -12 618 706 ;
+C 127 ; WX 637 ; N uni210F.alt ; B 52 -12 618 706 ;
C 128 ; WX 506 ; N uni019B ; B 15 -11 521 706 ;
C 129 ; WX 506 ; N uni019B.var ; B 15 -11 521 706 ;
-C 130 ; WX 573 ; N uni019B.ital ; B -8 -11 565 706 ;
-C 131 ; WX 573 ; N uni019B.varital ; B -8 -11 565 706 ;
+C 130 ; WX 573 ; N uni019B.bit ; B -8 -11 565 706 ;
+C 131 ; WX 573 ; N uni019B.alt ; B -8 -11 565 706 ;
C 132 ; WX 574 ; N uni03F0 ; B 30 -12 582 479 ;
C 133 ; WX 591 ; N u1D4F5.up ; B 42 -15 511 716 ;
-C 134 ; WX 495 ; N NameMe.134 ; B 66 359 427 655 ;
EndCharMetrics
EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/stickstoo/stickstooMath-Italic.afm new/fonts/afm/public/stickstoo/stickstooMath-Italic.afm
--- old/fonts/afm/public/stickstoo/stickstooMath-Italic.afm 2018-05-10 00:17:55.000000000 +0200
+++ new/fonts/afm/public/stickstoo/stickstooMath-Italic.afm 2019-10-11 23:31:43.000000000 +0200
@@ -1,13 +1,13 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20170730
-Comment Creation Date: Sat May 5 14:03:32 2018
+Comment Generated by FontForge 20190801
+Comment Creation Date: Fri Oct 4 14:38:55 2019
FontName stickstooMath-Italic
FullName stickstoo Math Italic
FamilyName stickstooMath
Weight Regular
Notice (Copyright (c) 2001-2016 by the STI Pub Companies, consisting of the American Chemical Society, the American Institute of Physics, the American Mathematical Society, the American Physical Society, Else)
Comment vier, Inc., and The Institute of Electrical and Electronic Engineers, Inc. Portions copyright (c) 1998-2003 by MicroPress, Inc. Portions copyright (c) 1990 by Elsevier, Inc. All rights reserved.
-Comment Copyright (c) 2018, Michael Sharpe
+Comment Copyright (c) 2018-2019, Michael Sharpe
ItalicAngle -11.5
IsFixedPitch false
UnderlinePosition -1005
@@ -15,7 +15,7 @@
Version 001.000
EncodingScheme FontSpecific
FontBBox -55 -235 987 764
-StartCharMetrics 117
+StartCharMetrics 116
C 0 ; WX 483 ; N u1D6E4 ; B -13 0 622 657 ;
C 1 ; WX 658 ; N u1D6E5 ; B 17 0 613 662 ;
C 2 ; WX 711 ; N u1D6E9 ; B 38 -12 673 669 ;
@@ -60,16 +60,16 @@
C 45 ; WX 587 ; N u1D719 ; B 34 -216 554 695 ;
C 46 ; WX 475 ; N u1D71A ; B 37 -235 434 481 ;
C 47 ; WX 865 ; N u1D71B ; B 31 -11 858 473 ;
-C 48 ; WX 496 ; N zero.OP ; B 40 -11 455 484 ;
-C 49 ; WX 370 ; N one.OP ; B 25 0 346 478 ;
-C 50 ; WX 446 ; N two.OP ; B 29 0 419 485 ;
-C 51 ; WX 429 ; N three.OP ; B 29 -171 400 485 ;
-C 52 ; WX 491 ; N four.OP ; B 20 -143 461 482 ;
-C 53 ; WX 435 ; N five.OP ; B 28 -171 399 473 ;
-C 54 ; WX 472 ; N six.OP ; B 40 -14 438 646 ;
-C 55 ; WX 452 ; N seven.OP ; B 30 -167 432 473 ;
-C 56 ; WX 463 ; N eight.OP ; B 33 -12 431 647 ;
-C 57 ; WX 473 ; N nine.OP ; B 35 -174 433 485 ;
+C 48 ; WX 495 ; N zero.oldstyle ; B 40 -11 455 484 ;
+C 49 ; WX 495 ; N one.oldstyle ; B 77 0 417 478 ;
+C 50 ; WX 495 ; N two.oldstyle ; B 49 0 449 485 ;
+C 51 ; WX 495 ; N three.oldstyle ; B 49 -171 432 485 ;
+C 52 ; WX 495 ; N four.oldstyle ; B 33 -143 462 482 ;
+C 53 ; WX 495 ; N five.oldstyle ; B 53 -171 434 473 ;
+C 54 ; WX 495 ; N six.oldstyle ; B 50 -14 456 646 ;
+C 55 ; WX 495 ; N seven.oldstyle ; B 49 -167 457 473 ;
+C 56 ; WX 495 ; N eight.oldstyle ; B 47 -12 452 647 ;
+C 57 ; WX 495 ; N nine.oldstyle ; B 45 -174 449 485 ;
C 65 ; WX 725 ; N u1D434 ; B -12 0 698 661 ;
C 66 ; WX 604 ; N u1D435 ; B -3 0 598 657 ;
C 67 ; WX 646 ; N u1D436 ; B 38 -11 652 670 ;
@@ -132,6 +132,5 @@
C 130 ; WX 525 ; N uni019B.ital ; B -9 -12 512 705 ;
C 131 ; WX 525 ; N uni019B.varital ; B -9 -12 517 705 ;
C 132 ; WX 596 ; N uni03F0 ; B 34 -12 551 479 ;
-C 134 ; WX 495 ; N NameMe.134 ; B 66 391 427 655 ;
EndCharMetrics
EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/stickstoo/stickstooMath-Regular.afm new/fonts/afm/public/stickstoo/stickstooMath-Regular.afm
--- old/fonts/afm/public/stickstoo/stickstooMath-Regular.afm 2018-05-10 00:17:55.000000000 +0200
+++ new/fonts/afm/public/stickstoo/stickstooMath-Regular.afm 2019-10-11 23:31:43.000000000 +0200
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20170730
-Comment Creation Date: Thu May 3 18:43:56 2018
+Comment Generated by FontForge 20190801
+Comment Creation Date: Fri Oct 4 17:12:57 2019
FontName stickstooMath-Regular
FullName stickstoo Math Regular
FamilyName stxickstooMath
@@ -14,12 +14,12 @@
UnderlineThickness 50
Version 001.000
EncodingScheme FontSpecific
-FontBBox -95 -236 1055 756
+FontBBox -95 -236 1055 826
CapHeight 655
XHeight 473
Ascender 704
Descender -214
-StartCharMetrics 195
+StartCharMetrics 200
C 0 ; WX 569 ; N Gamma ; B 32 0 539 657 ;
C 1 ; WX 667 ; N Delta ; B 28 0 629 662 ;
C 2 ; WX 738 ; N Theta ; B 50 -13 688 668 ;
@@ -32,6 +32,7 @@
C 9 ; WX 720 ; N Psi ; B 5 0 715 657 ;
C 10 ; WX 777 ; N Omega ; B 47 0 731 669 ;
C 11 ; WX 748 ; N uni2207 ; B 64 -13 683 678 ;
+C 15 ; WX 382 ; N uni03F6 ; B 28 -14 345 481 ;
C 16 ; WX 591 ; N alpha ; B 34 -14 558 478 ;
C 17 ; WX 530 ; N beta ; B 45 -217 490 716 ;
C 18 ; WX 406 ; N gamma ; B -9 -214 448 476 ;
@@ -84,18 +85,22 @@
C 65 ; WX 553 ; N u1D7DF ; B 24 0 523 678 ;
C 66 ; WX 553 ; N u1D7E0 ; B 28 -15 524 692 ;
C 67 ; WX 553 ; N u1D7E1 ; B 28 -13 524 692 ;
-C 122 ; WX 285 ; N dotlessi ; B 32 0 257 482 ;
-C 123 ; WX 263 ; N uni0237 ; B -95 -235 183 482 ;
+C 68 ; WX 612 ; N uni2107 ; B 28 -15 574 692 ;
+C 69 ; WX 722 ; N uni212B ; B 6 0 717 826 ;
+C 70 ; WX 594 ; N uni01B5 ; B 29 0 568 657 ;
+C 71 ; WX 762 ; N uni2126 ; B 29 0 732 692 ;
+C 72 ; WX 762 ; N uni2127 ; B 29 -15 732 678 ;
+C 122 ; WX 285 ; N u1D6A4.up ; B 32 0 257 482 ;
+C 123 ; WX 263 ; N u1D6A5.up ; B -95 -235 183 482 ;
C 124 ; WX 577 ; N h ; B 22 0 556 706 ;
-C 125 ; WX 577 ; N uni210F ; B 22 0 556 706 ;
+C 125 ; WX 599 ; N uni210F ; B 45 -10 549 706 ;
C 126 ; WX 493 ; N uni2113 ; B 32 -10 431 670 ;
-C 127 ; WX 577 ; N uni210F.var ; B 22 0 556 706 ;
+C 127 ; WX 599 ; N uni210F.alt ; B 47 -10 549 706 ;
C 128 ; WX 506 ; N uni019B ; B 15 -11 521 706 ;
C 129 ; WX 506 ; N uni019B.var ; B 15 -11 521 706 ;
C 130 ; WX 525 ; N uni019B.ital ; B -9 -12 512 705 ;
-C 131 ; WX 525 ; N uni019B.varital ; B -9 -12 517 705 ;
+C 131 ; WX 525 ; N uni019B.ital.alt ; B -9 -12 517 705 ;
C 132 ; WX 504 ; N uni03F0 ; B 4 -12 521 479 ;
-C 134 ; WX 495 ; N NameMe.134 ; B 66 391 427 655 ;
C 136 ; WX 226 ; N uni0300 ; B 32 521 194 674 ;
C 137 ; WX 227 ; N uni0301 ; B 32 521 195 674 ;
C 138 ; WX 346 ; N uni0302 ; B 32 521 314 674 ;
Binary files old/fonts/tfm/public/stickstoo/ntxstx2bmi.tfm and new/fonts/tfm/public/stickstoo/ntxstx2bmi.tfm differ
Binary files old/fonts/tfm/public/stickstoo/ntxstx2bmia.tfm and new/fonts/tfm/public/stickstoo/ntxstx2bmia.tfm differ
Binary files old/fonts/tfm/public/stickstoo/ntxstx2mi.tfm and new/fonts/tfm/public/stickstoo/ntxstx2mi.tfm differ
Binary files old/fonts/tfm/public/stickstoo/ntxstx2mia.tfm and new/fonts/tfm/public/stickstoo/ntxstx2mia.tfm differ
Binary files old/fonts/tfm/public/stickstoo/stickstooMath-Bold.tfm and new/fonts/tfm/public/stickstoo/stickstooMath-Bold.tfm differ
Binary files old/fonts/tfm/public/stickstoo/stickstooMath-BoldItalic.tfm and new/fonts/tfm/public/stickstoo/stickstooMath-BoldItalic.tfm differ
Binary files old/fonts/tfm/public/stickstoo/stickstooMath-Italic.tfm and new/fonts/tfm/public/stickstoo/stickstooMath-Italic.tfm differ
Binary files old/fonts/tfm/public/stickstoo/stickstooMath-Regular.tfm and new/fonts/tfm/public/stickstoo/stickstooMath-Regular.tfm differ
Binary files old/fonts/type1/public/stickstoo/stickstooMath-Bold.pfb and new/fonts/type1/public/stickstoo/stickstooMath-Bold.pfb differ
Binary files old/fonts/type1/public/stickstoo/stickstooMath-BoldItalic.pfb and new/fonts/type1/public/stickstoo/stickstooMath-BoldItalic.pfb differ
Binary files old/fonts/type1/public/stickstoo/stickstooMath-Italic.pfb and new/fonts/type1/public/stickstoo/stickstooMath-Italic.pfb differ
Binary files old/fonts/type1/public/stickstoo/stickstooMath-Regular.pfb and new/fonts/type1/public/stickstoo/stickstooMath-Regular.pfb differ
Binary files old/fonts/vf/public/stickstoo/ntxstx2bmi.vf and new/fonts/vf/public/stickstoo/ntxstx2bmi.vf differ
Binary files old/fonts/vf/public/stickstoo/ntxstx2bmia.vf and new/fonts/vf/public/stickstoo/ntxstx2bmia.vf differ
Binary files old/fonts/vf/public/stickstoo/ntxstx2mi.vf and new/fonts/vf/public/stickstoo/ntxstx2mi.vf differ
Binary files old/fonts/vf/public/stickstoo/ntxstx2mia.vf and new/fonts/vf/public/stickstoo/ntxstx2mia.vf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stickstoo.tlpobj new/tlpkg/tlpobj/stickstoo.tlpobj
--- old/tlpkg/tlpobj/stickstoo.tlpobj 2019-02-28 04:06:09.000000000 +0100
+++ new/tlpkg/tlpobj/stickstoo.tlpobj 2020-03-24 02:03:51.000000000 +0100
@@ -1,16 +1,16 @@
name stickstoo
category Package
-revision 47858
+revision 54512
shortdesc A reworking of STIX2
relocated 1
-longdesc SticksToo is a reworking of the STIX2 with support files
+longdesc SticksToo is a reworking of the STIX2 fonts with support files
longdesc focussing on enhancements of support for LaTeX users wishing to
longdesc be able to access more of its features. A companion addition to
longdesc the newtxmath package (version 1.55) provides a matching math
longdesc package using STIX2 letters (Roman and Greek) with newtxmath
longdesc symbols.
execute addMap SticksTooText.map
-runfiles size=6097
+runfiles size=6094
RELOC/fonts/afm/public/stickstoo/SticksTooText-Bold.afm
RELOC/fonts/afm/public/stickstoo/SticksTooText-BoldItalic.afm
RELOC/fonts/afm/public/stickstoo/SticksTooText-Italic.afm
@@ -577,7 +577,6 @@
RELOC/tex/latex/stickstoo/TS1SticksTooText-TOsF.fd
RELOC/tex/latex/stickstoo/stickstootext.sty
catalogue-ctan /fonts/stickstoo
-catalogue-date 2018-05-28 08:09:08 +0200
-catalogue-license ofllppl
-catalogue-topics font font-proportional font-maths font-type1 font-otf font-t1enc
-catalogue-version 1.031
+catalogue-license ofl lppl1.3
+catalogue-topics font font-body font-serif font-proportional font-maths font-type1 font-supp font-t1enc
+catalogue-version 1.033
++++++ stix.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stix.doc.tlpobj new/tlpkg/tlpobj/stix.doc.tlpobj
--- old/tlpkg/tlpobj/stix.doc.tlpobj 2019-02-28 04:06:19.000000000 +0100
+++ new/tlpkg/tlpobj/stix.doc.tlpobj 2020-03-24 02:04:00.000000000 +0100
@@ -1,6 +1,6 @@
name stix.doc
category Package
-revision 47652
+revision 54512
shortdesc doc files of stix
relocated 1
docfiles size=591
++++++ stix.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stix.tlpobj new/tlpkg/tlpobj/stix.tlpobj
--- old/tlpkg/tlpobj/stix.tlpobj 2019-02-28 04:06:19.000000000 +0100
+++ new/tlpkg/tlpobj/stix.tlpobj 2020-03-24 02:04:00.000000000 +0100
@@ -1,6 +1,6 @@
name stix
category Package
-revision 47652
+revision 54512
shortdesc OpenType Unicode maths fonts
relocated 1
longdesc The STIX fonts are a suite of unicode OpenType fonts containing
@@ -118,7 +118,6 @@
catalogue-also xits stix2-otf stix2-type1
catalogue-contact-home http://www.stixfonts.org/
catalogue-ctan /fonts/stix
-catalogue-date 2018-04-18 21:20:16 +0200
-catalogue-license ofllppl1.3
+catalogue-license ofl lppl1.3
catalogue-topics font font-serif font-otf font-type1 font-maths font-symbol-maths font-bbd
catalogue-version 1.1.3
++++++ stix2-otf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/stix2-otf/README.md new/doc/fonts/stix2-otf/README.md
--- old/doc/fonts/stix2-otf/README.md 2018-05-01 20:01:24.000000000 +0200
+++ new/doc/fonts/stix2-otf/README.md 2019-05-03 00:48:54.000000000 +0200
@@ -1,24 +1,184 @@
# stixfonts
OpenType Unicode fonts for Scientific, Technical, and Mathematical texts
-## Description
+## About the STIX fonts.
+
+See https://www.stixfonts.org/ for background on the the STIX Fonts project.
The Scientific and Technical Information eXchange (STIX) fonts are
-intended to satisfy the demanding needs of authors, publishers,
-printers, and others working in the scientific, medical, and technical
-fields. They combine a comprehensive Unicode-based collection of
-mathematical symbols and alphabets with a set of text faces suitable
-for professional publishing. The fonts are available royalty-free
-under the SIL Open Font License.
-
-See the [release notes](STIX_2.0.0_release_notes.txt) for a more
-detailed introduction to this version of the fonts.
-
-## Type 1 support
-
-The STIX Two fonts are a set of OpenType fonts and are meant to be
-used in that format. For the benefit of LaTeX users who are currently
-unable to use XeTeX or LuaTeX, we have also provided a set of TFM, VF,
-and Type 1 files in the CTAN package stix2-type1. Please note that
-while development of the OpenType fonts is ongoing, no further updates
-to the Type 1 versions are planned.
+intended to meet the demanding needs of authors, publishers, printers,
+and others in the scientific, medical, and technical fields. They
+combine a comprehensive Unicode-based collection of mathematical
+symbols and alphabets with a set of text faces suitable for
+professional publishing. They are available royalty-free under the
+SIL Open Font License, Version 1.1.
+
+Version 2 of the STIX fonts, now known as “STIX Two”, is a thorough
+revision of version 1 undertaken by the renowned type house [Tiro
+Typeworks](https://tiro.com). The STIX Two fonts consist of four text
+fonts (Regular, Italic, Bold, and Bold Italic) and one Math font.
+Together, they provide a uniform set of fonts that can be used
+throughout the production process, whether that be a traditional
+print-only process, an entirely electronic one, or a combination of
+the two.
+
+The [STIX project](https://www.stixfonts.org/) began through the joint
+efforts of
+the [American Mathematical Society](https://www.ams.org/) (AMS),
+the [American Institute of Physics](https://www.aip.org/) (AIP),
+the [American Physical Society](https://www.aps.org/) (APS),
+the [American Chemical Society](https://www.acs.org/) (ACS),
+the [Institute of Electrical and Electronic](https://www.ieee.org/) Engineers (IEEE),
+and [Elsevier](https://www.elsevier.com/).
+These companies are collectively known as the STI Pub companies.
+
+### A Fresh Take on Times Roman
+
+The original version of STIX was based on Times Roman, which has now
+been updated for the digital age.
+
+As is well known, Times Roman was originally intended for printing the
+*London Times*. What is not generally appreciated is that the
+production quality of the *Times* was atypically high: It was printed
+on unusually high-quality paper on presses that operated more slowly
+than most newspaper presses. This allowed for the design of a
+typeface that could exploit this level of care: serifs could be much
+finer and counters (enclosed areas such as that in the lowercase *e*)
+could be much smaller than in other newspaper typefaces. These
+features of the font have not always fared well in less exacting
+environments. At the same time, a notable quirk of the Times Roman
+family is that the bold font is, in many respects, strikingly
+dissimilar to the roman font.
+
+Tiro Typeworks explain their approach to updating the Times Roman
+basis of STIX as follows:
+
+> “Our principal goal in approaching STIX Two was to address several
+> inherent deficiencies in the Times New Roman model as well as expand
+> the typographic features. This process necessarily involved
+> diverging somewhat from Times as familiar to people who have only
+> known the common digital versions, while simultaneously restoring to
+> that typeface aspects of the size-appropriate design characteristics
+> that made it so successful in newspaper, book, and journal
+> publishing in it’s metal type incarnation. The essential
+> ‘Times-ness’ remains, but are with greater harmonisation of style
+> across the family.
+>
+> “Most digital versions of Times have been based on an optical size
+> model that appears too light and fine when scaled down to typical
+> text sizes. In the design of STIX Two, we went back to specimens of
+> size-specific designs from the metal era, and adapted proportions,
+> weights, and spacing of the 10pt and 12pt designs. The oft-noted
+> mismatch between the style of different weights of Times has been
+> resolved with a new bold design that matches the construction of the
+> regular weight.”
+
+### Font implementation decisions
+
+* The STIX fonts do not contain fixed-width or sans serif text faces.
+
+* The sans serif, fraktur, script, etc., alphabets in Plane 1
+ (U+1D400-U+1D4FF) are intended to be used only as technical symbols.
+
+* These fonts are designed to support left-to-right typesetting in
+ Latin-based scripts, with additional support for Greek and Cyrillic
+ text. Extensions to support other writing directions have been
+ considered, but are currently deemed to be outside the scope of the
+ STIX project.
+
+### Note to TeX users
+
+These fonts have been tested with both
+[XeTeX](http://xetex.sourceforge.net/)
+and
+[luaTeX](http://www.luatex.org/)
+with good results. For best results, XeTeX users will want to use
+version 0.99999 or later of XeTeX, which ships with
+[TeXLive 2018](https://www.tug.org/texlive/).
+This version fixes a number of bugs that were present in earlier
+versions. Our thanks go out to Jonathan Kew and Khaled Hosny for
+their generous help in identifying and fixing these bugs. LaTeX users
+should also make sure they have the latest version of the
+[amsmath package](https://ctan.org/pkg/amsmath).
+
+## Summary of OpenType Features and Scripts
+
+Further details these features can be found in the code charts.
+
+The four text fonts implement the following OpenType script tags:
+
+ Regular Bold Italic BoldItalic
+
+ DFLT DFLT DFLT DFLT Default
+
+ cyrl cyrl cyrl cyrl Cyrillic
+ cyrl.MKD cyrl.MKD Cyrillic/Macedonian
+ cyrl.SRB cyrl.SRB Cyrillic/Serbian
+
+ grek grek grek grek Greek
+
+ latn latn latn latn Latin
+ latn.ROM latn.ROM latn.ROM latn.ROM Latin/Romanian
+ latn.TRK latn.TRK latn.TRK latn.TRK Latin/Turkish
+
+and the following features
+
+ c2sc Small Capitals from Capitals
+ case Case-Sensitive Forms
+ ccmp Glyph Composition/Decomposition
+ dnom Denominators
+ frac Fractions
+ kern Kerning
+ liga Standard Ligatures -- latn only
+ locl Localized Forms -- latn.ROM and Italic/BoldItalic cyrl.MKD only
+ numr Numerators
+ onum Oldstyle Figures
+ pnum Proportional Figures
+ smcp Small Capitals
+ subs Subscript
+ sups Superscript
+
+All four text fonts also support the following Character Variants:
+
+ cv01 U+019B Lambda with horizontal, not slanted stroke -- latn only
+ cv02 U+0264 Rams horn with serifs -- latn only
+ cv03 U+2423 OPEN BOX curved instead of straight
+
+In addition, the Italic and BoldItalic faces support the following
+Stylistic Variants:
+
+ ss01 Replace two-story g by hooked g -- Italic/BoldItalic only
+ ss02 Upright parens, brackets, and braces -- Italic/BoldItalic only
+
+STIX Two Math implements the following font features:
+
+ ccmp Glyph Composition/Decomposition
+ dtls Dotless forms of i and j
+ flac Flattened accents
+ ssty Math Script style alternates
+
+and the following Character Variant (note the different meaning
+compared to the text fonts):
+
+ cv03 Replace U2205 EMPTY SET by an oblate form
+
+and the following Stylistic Sets (again, note that ss01 and ss02 have
+different meanings compared to the text fonts):
+
+ ss01 Stylistic Set 1 -- Math chancery to roundhand (\mathcal -> \mathscr)
+ ss02 Stylistic Set 2 -- Alternate italic forms: g, u, v, w, z
+ ss03 Stylistic Set 3 -- Horizontal crossbar variants
+ ss04 Stylistic Set 4 -- Minute, second and primes to long variants
+ ss05 Stylistic Set 5 -- Short arrow variants
+ ss06 Stylistic Set 6 -- Short/narrow variants
+ ss07 Stylistic Set 7 -- Alternate math symbols (product, summation, etc)
+ ss08 Stylistic Set 8 -- Upright integral variants; XITS compatible
+ ss09 Stylistic Set 9 -- Vertical slash variants; XITS compatible
+ ss10 Stylistic Set 10 -- Diagonal greater/lesser combination variants
+ ss11 Stylistic Set 11 -- Long slash not-equal combination variants
+ ss12 Stylistic Set 12 -- Low contrast (sans-like) variants
+ ss13 Stylistic Set 13 -- Horizontally flipped sine wave glyph
+ ss14 Stylistic Set 14 -- Tall variants
+ ss15 Stylistic Set 15 -- Slab serif symbol variants
+ ss16 Stylistic Set 16 -- Circled operator variants
+ ss20 Stylistic Set 20 -- Miscellaneous variants
Binary files old/doc/fonts/stix2-otf/STIX_2.0.0_glyph_sets.xlsx and new/doc/fonts/stix2-otf/STIX_2.0.0_glyph_sets.xlsx differ
Binary files old/doc/fonts/stix2-otf/STIX_2.0.0_license.pdf and new/doc/fonts/stix2-otf/STIX_2.0.0_license.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/stix2-otf/STIX_2.0.0_release_notes.txt new/doc/fonts/stix2-otf/STIX_2.0.0_release_notes.txt
--- old/doc/fonts/stix2-otf/STIX_2.0.0_release_notes.txt 2018-05-01 20:01:24.000000000 +0200
+++ new/doc/fonts/stix2-otf/STIX_2.0.0_release_notes.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,303 +0,0 @@
- STIX Font Release Documentation
- OpenType/WOFF/WOFF2
-
- Version 2.0.0
-
- 1 December 2016
- Updated 13 April 2018
-
-INTRODUCTION
-
-The Scientific and Technical Information eXchange (STIX) fonts are
-intended to satisfy the demanding needs of authors, publishers,
-printers, and others working in the scientific, medical, and technical
-fields. They combine a comprehensive Unicode-based collection of
-mathematical symbols and alphabets with a set of text faces suitable
-for professional publishing. The fonts are available royalty-free
-under the SIL Open Font License.
-
-Version 2.0.0 of the STIX fonts, now known as "STIX Two", is a
-thorough revision undertaken by the renowned type house Tiro
-Typeworks. The STIX Two fonts consist of four text fonts (Regular,
-Italic, Bold, and Bold Italic) and one Math font. Together, they
-provide a uniform set of fonts that can be used throughout the
-production process, whether that be a traditional print-only process,
-an entirely electronic one, or a combination of the two.
-
-The STIX project began through the joint efforts of American
-Mathematical Society (AMS), American Institute of Physics (AIP),
-American Physical Society (APS), American Chemical Society (ACS),
-Institute of Electrical and Electronic Engineers (IEEE), and Elsevier.
-These companies are collectively known as the STI Pub companies.
-
-A FRESH TAKE ON TIMES ROMAN
-
-The original version of STIX was based on Times Roman, which has now
-been updated for the digital age.
-
-As is well known, Times Roman was originally intended for printing the
-London Times. What is not generally appreciated is the fact that the
-Times was a very atypically produced newspaper: It was printed on very
-high quality paper run through presses that operated more slowly than
-most newspaper presses. This allowed for the design of a typeface
-that could benefit from this level of printing: serifs could be very
-fine (much finer than other newspaper typefaces) and small counters
-(enclosed areas) such as in the lowercase e could be much smaller than
-in other newspaper typefaces. Another anomaly is that the bold font
-for Times Roman is, in many respects, strikingly dissimilar to the
-roman font.
-
-Tiro Typeworks explain their approach to updating the Times Roman
-basis of STIX as follows:
-
- "Our principal goal in approaching STIX Two was to address several
- inherent deficiencies in the Times New Roman model as well as
- expand the typographic features. This process necessarily
- involved diverging somewhat from Times, given that many features
- of that typeface are either incompatible with current printing
- methods and electronic reading environments, and some others too
- esoteric to repeat. That said, the essential 'Times-ness'
- remains, we believe, and such changes won't distract readers and
- users in any negative way.
-
- "At the core of Times' problems was inappropriate digitization,
- using an optical size model too large to be scaled down to text
- sizes, with compensations appropriate to its original purpose and
- printing technique, but not for 21st century conditions. We have
- also re-thought somewhat overall proportions and spacing, with
- changes made in varying degrees to both the Roman and the Italic
- (and we have begun to harmonize the Bold, which has always been a
- major shortcoming with Times New Roman)."
-
-WHAT IS NEW IN THIS RELEASE?
-
-In addition to the overall visual redesign, STIX Two incorporates a
-number of significant improvements and additions. Special attention
-has been given to implementing accepted best practices for OpenType
-fonts, such as the use of font features to access variant glyph shapes
-that were previously only available via the Unicode Private Use Areas.
-
-The letterspacing and kerning of the text fonts have been
-significantly improved.
-
-True small capital variants (Latin, Cyrillic, and Greek), accessible
-via the OpenType font feature smcp, have been added for all text
-fonts.
-
-Text (lowercase or oldstyle) numerals, available via the font features
-pnum and onum, have been added, in addition to natural-spacing
-figures.
-
-Alphabetic superscripts and numeric sub- and superscripts, accessible
-via the subs and sups font features, have been added.
-
-Fractions are available via the frac feature, as well as numerators
-(numr) and denominators (dnom).
-
-The OpenType MATH table has been completely rewritten and extended.
-
-Additions have been made to these Unicode blocks:
- Latin-1 Supplement U+0080 - U+00FF
- Latin Extended-A U+0100 - U+017F
- Latin Extended Additional U+0180 - U+024F
- Cyrillic U+0400 - U+04FF
- Greek and Coptic U+0370 - U+03FF
- IPA blocks U+0250 - U+02AF
-
-Full details of included glyphs and supported font features are
-available in the included spreadsheet.
-
-BACKWARDS COMPATIBILITY
-
-Because of the scope of the changes, especially to the text fonts,
-STIX Two is not a drop-in replacement for earlier versions. While we
-understand and sympathize with the difficulties caused by the
-incompatibilities we have introduced, we nevertheless felt they were
-necessary to address some of the shortcomings of earlier versions of
-the fonts and to position us to respond to the needs of modern
-publishing.
-
-Earlier versions of the STIX fonts are deprecated and no longer
-supported. We urge all users of the STIX fonts to upgrade to the new
-versions as soon as possible.
-
-To enable the new and old versions of the fonts to coexist during the
-transition phase, the fonts have been renamed as follows:
-
- STIX 1.1.0 STIX 2.0.0
-
- STIX-Regular STIX Two Text
- STIX-Italic STIX Two Text Italic
- STIX-Bold STIX Two Text Bold
- STIX-BoldItalic STIX Two Text Bold Italic
-
- STIX Math Regular STIX Two Math
-
-The four text fonts contain glyphs from Unicode text blocks only. For
-example, all characters from the range U+2190 to U+3063 and U+E000 to
-U+E368 and all plane 1 characters have been removed from the text
-fonts and are now found only in STIX Two Math. Whenever possible,
-characters have been removed from the Private Use Area (U+E000-U+F8FF)
-and made available via font features instead.
-
-The STIX-General packaging of the fonts is no longer supported.
-
-WHAT IS PROVIDED IN THIS RELEASE?
-
-The contents of this distribution are as follows
-
- Fonts/
- OTF/
- STIX2Math.otf
- STIX2Text-BoldItalic.otf
- STIX2Text-Bold.otf
- STIX2Text-Italic.otf
- STIX2Text-Regular.otf
- WOFF/
- STIX2Math.woff
- STIX2Text-BoldItalic.woff
- STIX2Text-Bold.woff
- STIX2Text-Italic.woff
- STIX2Text-Regular.woff
- WOFF2/
- STIX2Math.woff2
- STIX2Text-BoldItalic.woff2
- STIX2Text-Bold.woff2
- STIX2Text-Italic.woff2
- STIX2Text-Regular.woff2
- docs/
- STIX_2.0.0_glyph_sets.xlsx
- STIX_2.0.0_license.pdf
- STIX_2.0.0_release_notes.txt
- STIX_2.0.0_stylistic_sets.pdf
-
-The font is distributed under the "SIL Open Font License, Version
-1.1", a copy of which is included in the License folder.
-
-Support for 8-bit, DVI-based TeX in the form of TFM files and Type 1
-fonts is available separately (see below).
-
-We also hope to provide a version of the WOFF fonts broken down into
-smaller, more web-download-friendly chunks.
-
-FONT IMPLEMENTATION DECISIONS
-
-The STIX fonts do not contain fixed-width or sans serif text faces.
-
-The sans serif, fraktur, script, etc., alphabets in Plane 1
-(U+1D400-U+1D4FF) are intended to be used only as technical symbols.
-
-These fonts are designed to support left-to-right typesetting in
-Latin-based scripts, with additional support for Greek and Cyrillic
-text. Extensions to support other writing directions have been
-considered, but are currently deemed to be outside the scope of the
-STIX project.
-
-The font contains:
-
-1. Kerning pairs for characters suitable for use with sizes 8pt
- through 12pt.
-
-2. Standard ligature support for those ligatures included in the font.
-
-NOTE TO TEX USERS
-
-If you use XeTeX or LuaTeX, the OTF files are all you need. The fonts
-have been tested with both XeTeX and luaTeX with good results. For
-best results, XeTeX users will want to upgrade to the latest
-development version from
-
- http://xetex.sourceforge.net/
-
-This version fixes a number of bugs that are present in the version
-shipped with TeX Live 2016. Our thanks go out to Jonathan Kew and
-Khaled Hosny for their generous help in identifying and fixing these
-bugs. LaTeX users should also make sure they have the latest version
-of the amsmath package available on CTAN.
-
-There are some known issues with kerning of second-order subscripts
-that we hope to address in a future release.
-
-For the convenience of users who are restricted to pdfTeX or DVI-based
-TeX, a separate implementation set of Type 1 PostScript fonts, TFM
-files, and virtual fonts is available from
-
- https://github.com/stipub/stixfonts/tree/master/STIXv2.0.0/Fonts/Type1
-
-Please note that although development work on the OpenType fonts is
-ongoing, no further updates are planned to the Type 1 fonts.
-
-FEEDBACK
-
-Please direct any questions or general comments to the STIX Fonts
-project. Bug reports and technical support issues should be reported
-through https://github.com/stipub/stixfonts.
-
-===========================================================================
-
- APPENDIX
-
- Summary of OpenType Features and Scripts
-
-Full details on all features can be found in the docs folder in
-STIX_2.0.0_stylistic_sets.pdf and STIX_2.0.0_glyph_sets.xlsx.
-
-The four text fonts support the following OpenType script tags:
-
- DFLT Default
- cyrl Cyrillic
- cyrl.MKD Cyrillic/Macedonian
- cyrl.SRB Cyrillic/Serbian
- grek Greek
- latn Latin
- latn.ROM Latin/Romanian
- latn.TRK Latin/Turkish
-
-and the following OpenType font features:
-
- c2sc Small Capitals From Capitals
- case Case-Sensitive Forms
- ccmp Glyph Composition/Decomposition
- cv01 Character Variants 1 -- lambda with horizontal crossbar (U+019B)
- cv02 Character Variants 2 -- serifed ramshorn (U+0264)
- dnom Denominators
- frac Fractions
- kern Kerning
- liga Standard Ligatures
- numr Numerators
- onum Oldstyle Figures
- pnum Proportional Figures
- smcp Small Capitals
- subs Subscript
- sups Superscript
-
-The Italic and BoldItalic fonts also support the following feature:
-
- ss01 Stylistic Set 1 -- alternate lowercase g
-
-The following font features are supported by STIX Two Math:
-
-Supported features:
-
- aalt Access All Alternates
- ccmp Glyph Composition/Decomposition
- cv01 Character Variants 1 -- lambda with horizontal crossbar (U+019B)
- cv02 Character Variants 2 -- serifed ramshorn (U+0264)
- kern Kerning
- ss01 Stylistic Set 1 -- Math chancery to roundhand (\mathcal -> \mathscr)
- ss02 Stylistic Set 2 -- Alternate italic forms: g, u, v, w, z
- ss03 Stylistic Set 3 -- Horizontal crossbar variants
- ss04 Stylistic Set 4 -- Minute, second and primes to long variants
- ss05 Stylistic Set 5 -- Short arrow variants
- ss06 Stylistic Set 6 -- Short/narrow variants
- ss07 Stylistic Set 7 -- Alternate math symbols (product, summation, etc)
- ss08 Stylistic Set 8 -- Upright integral variants; XITS compatible
- ss09 Stylistic Set 9 -- Vertical slash variants; XITS compatible
- ss10 Stylistic Set 10 -- Diagonal greater/lesser combination variants
- ss11 Stylistic Set 11 -- Long slash not-equal combination variants
- ss12 Stylistic Set 12 -- Low contrast (sans-like) variants
- ss13 Stylistic Set 13 -- Horizontally flipped sine wave glyph
- ss14 Stylistic Set 14 -- Tall variants
- ss15 Stylistic Set 15 -- Slab serif symbol variants
- ss16 Stylistic Set 16 -- Circled operator variants
- ss20 Stylistic Set 20 -- Miscellaneous variants
Binary files old/doc/fonts/stix2-otf/STIX_2.0.0_stylistic_sets.pdf and new/doc/fonts/stix2-otf/STIX_2.0.0_stylistic_sets.pdf differ
Binary files old/doc/fonts/stix2-otf/STIX_2.0.1_license.pdf and new/doc/fonts/stix2-otf/STIX_2.0.1_license.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/stix2-otf/STIX_2.0.1_release_notes.txt new/doc/fonts/stix2-otf/STIX_2.0.1_release_notes.txt
--- old/doc/fonts/stix2-otf/STIX_2.0.1_release_notes.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/stix2-otf/STIX_2.0.1_release_notes.txt 2019-05-03 00:48:54.000000000 +0200
@@ -0,0 +1,302 @@
+ STIX Font Release Documentation
+ OpenType/WOFF/WOFF2
+
+ https://www.stixfonts.org/
+
+ Version 2.0.1
+
+ 15 April 2019
+
+ WHAT IS PROVIDED IN THIS RELEASE?
+
+The contents of this distribution are
+
+ Fonts/
+ OTF/
+ STIX2Math.otf
+ STIX2Text-BoldItalic.otf
+ STIX2Text-Bold.otf
+ STIX2Text-Italic.otf
+ STIX2Text-Regular.otf
+ WOFF/
+ STIX2Math.woff
+ STIX2Text-BoldItalic.woff
+ STIX2Text-Bold.woff
+ STIX2Text-Italic.woff
+ STIX2Text-Regular.woff
+ WOFF2/
+ STIX2Math.woff2
+ STIX2Text-BoldItalic.woff2
+ STIX2Text-Bold.woff2
+ STIX2Text-Italic.woff2
+ STIX2Text-Regular.woff2
+ docs/
+ STIX_2.0.1_license.pdf
+ STIX_2.0.1_release_notes.txt
+ charts/
+ StixTwoBold.pdf
+ StixTwoBoldItalic.pdf
+ StixTwoItalic.pdf
+ StixTwoMath.pdf
+ StixTwoRegular.pdf
+
+The STIX font is distributed under the SIL Open Font License, Version
+1.1, a copy of which is included in the docs folder.
+
+FEEDBACK
+
+Please direct any questions or general comments to the STIX Fonts
+project. Bug reports and technical support issues should be submitted
+through
+
+ https://github.com/stipub/stixfonts
+
+where you can also find a list of known issues.
+
+
+ WHAT'S NEW IN 2.0.1?
+
+COMPATIBILITY BETWEEN 2.0.1 AND 2.0.0
+
+There have been numerous improvements to the design of individual
+glyphs and to the placement of various accents. Since these don't
+affect character metrics, they should not affect the layout of
+documents that used v2.0.0 of the fonts.
+
+Users upgrading existing documents from 2.0.0 to 2.0.1 should be aware
+of the following potential incompatibilities:
+
+* Character metrics for some glyphs, especially Mathematical
+ Alphanumeric Symbols and APL functional symbols, have changed.
+
+* Kerning between z and following punctuation has been improved.
+
+* In STIX2Math, Stylistic Set 7 (ss07) no longer includes U+2205
+
+* U+2202 PARTIAL DIFFERENTIAL and U+1D6DB MATHEMATICAL BOLD PARTIAL
+ DIFFERENTIAL are now upright by default.
+
+See below for further details.
+
+TEXT FONTS
+
+* Added U+2423 OPEN BOX to all faces.
+
+* Added Stylistic Set ss02 to select upright parentheses, brackets,
+ and braces in Italic and BoldItalic faces.
+
+* Harmonized design of smallcap U+02A9 LATIN SMALL LETTER FENG DIGRAPH
+ between Regular and Bold faces.
+
+* Improved design of extended Latin and IPA character glyphs.
+
+* Improved kerning of selected character pairs.
+
+* Improved design and placement of U+0307 COMBINING DOT ABOVE and
+ U+0308 COMBINING DIAERESIS.
+
+MATH FONTS
+
+* The following Mathematical Alphanumeric Symbols have been improved.
+ Note that in some case this has necessitated changes to the
+ character metrics.
+
+ U+1D504..1D537 Fraktur symbols
+ U+1D538..1D56B Double-struck symbols
+ U+1D56C..1D59F Bold Fraktur symbols
+ U+1D5A0..1D5D3 Sans-serif symbols [SSP]
+ U+1D5D4..1D607 Sans-serif bold symbols [SSP]
+ U+1D608..1D63B Sans-serif italic symbols [SSP]
+ U+1D63C..1D66F Sans-serif bold italic symbols [SSP]
+ U+1D670..1D6A3 Monospace symbols
+ U+1D756..1D78F Sans-serif bold Greek
+ U+1D790..1D7C9 Sans-serif bold italic Greek
+ U+1D7D8..1D7E1 Double-struck digits
+ U+1D7E2..1D7EB Sans-serif digits [SSP]
+ U+1D7EC..1D7F5 Sans-serif bold digits [SSP]
+ U+1D7F6..1D7FF Monospace digits
+
+ Note: The ranges marked "[SSP]" are derived from the Source Sans Pro
+ fonts, with proportions and weight modified to harmonize with the
+ STIX design.
+
+* Added support for Unicode Standard Mathematical Standardized Variants.
+
+* Removed variant form of U+2205 EMPTY SET from Stylistic Set 7 to
+ Character Variant 3. NOTE: For most users, the "variant" form will
+ be the preferred shape, but the default shape has been left as-is
+ for backwards compatibility.
+
+* Improved proportions of existing APL symbols and added an additional
+ 16 symbols (see below).
+
+* Corrected glyph for U+1D752 MATHEMATICAL BOLD ITALIC KAPPA SYMBOL.
+
+* Improved positioning of tilde math accent.
+
+* Added dotless variants of U+2148 DOUBLE-STRUCK ITALIC SMALL I and
+ U_2149 DOUBLE-STRUCK ITALIC SMALL J.
+
+* Made U+2202 PARTIAL DIFFERENTIAL and U+1D6DB MATHEMATICAL BOLD
+ PARTIAL DIFFERENTIAL upright rather than italic.
+
+* Revised and extended coverage of Enclosed Alphanumeric block
+ (U+2460-24FF).
+
+* U+20E1 COMBINING LEFT RIGHT ARROW ABOVE is now extensible.
+
+* Corrected vertical placement of U+00B1 PLUS-MINUS SIGN
+
+* The following delimiters now have a full set of 12 growing form
+ variants.
+
+ U+2308 LEFT CEILING
+ U+2309 RIGHT CEILING
+
+ U+230A LEFT FLOOR
+ U+230B RIGHT FLOOR
+
+ U+2772 LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT
+ U+2773 LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT
+
+ U+27E6 LEFT WHITE SQUARE BRACKET
+ U+27E7 MATHEMATICAL RIGHT WHITE SQUARE BRACKET
+
+ U+27E8 MATHEMATICAL LEFT ANGLE BRACKET
+ U+27E9 MATHEMATICAL RIGHT ANGLE BRACKET
+
+ U+27EA MATHEMATICAL LEFT DOUBLE ANGLE BRACKET
+ U+27EB MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
+
+ U+2983 WHITE CURLY BRACKET
+ U+2984 RIGHT WHITE CURLY BRACKET
+
+ U+2985 LEFT WHITE PARENTHESIS
+ U+2986 RIGHT WHITE PARENTHESIS
+
+* New characters
+
+ General Punctuation
+ U+2061 FUNCTION APPLICATION
+ U+2062 INVISIBLE TIMES
+ U+2063 INVISIBLE SEPARATOR
+ U+2064 INVISIBLE PLUS
+
+ Miscellaneous Technical
+ U+2338 APL FUNCTIONAL SYMBOL QUAD EQUAL
+ U+233A APL FUNCTIONAL SYMBOL QUAD DIAMOND
+ U+233E APL FUNCTIONAL SYMBOL CIRCLE JOT
+ U+2341 APL FUNCTIONAL SYMBOL QUAD SLASH
+ U+2342 APL FUNCTIONAL SYMBOL QUAD BACKSLASH
+ U+2347 APL FUNCTIONAL SYMBOL QUAD LEFTWARDS ARROW
+ U+2348 APL FUNCTIONAL SYMBOL QUAD RIGHTWARDS ARROW
+ U+2350 APL FUNCTIONAL SYMBOL QUAD UPWARDS ARROW
+ U+2357 APL FUNCTIONAL SYMBOL QUAD DOWNWARDS ARROW
+ U+2360 APL FUNCTIONAL SYMBOL QUAD COLON
+ U+2364 APL FUNCTIONAL SYMBOL JOT DIAERESIS
+ U+2365 APL FUNCTIONAL SYMBOL CIRCLE DIAERESIS
+ U+2366 APL FUNCTIONAL SYMBOL DOWN SHOE STILE
+ U+236D APL FUNCTIONAL SYMBOL STILE TILDE
+ U+2378 APL FUNCTIONAL SYMBOL IOTA UNDERBAR
+ U+2395 APL FUNCTIONAL SYMBOL QUAD
+ U+23B7 RADICAL SYMBOL BOTTOM
+ U+23B8 LEFT VERTICAL BOX LINE
+ U+23B9 RIGHT VERTICAL BOX LINE
+
+ Control Pictures
+ U+2422 BLANK SYMBOL
+
+ Enclosed Alphanumerics
+ U+2469..24B5
+ U+24EB..24FF
+
+ Dingbats
+ U+2776 DINGBAT NEGATIVE CIRCLED DIGIT ONE
+ U+2777 DINGBAT NEGATIVE CIRCLED DIGIT TWO
+ U+2778 DINGBAT NEGATIVE CIRCLED DIGIT THREE
+ U+2779 DINGBAT NEGATIVE CIRCLED DIGIT FOUR
+ U+277A DINGBAT NEGATIVE CIRCLED DIGIT FIVE
+ U+277B DINGBAT NEGATIVE CIRCLED DIGIT SIX
+ U+277C DINGBAT NEGATIVE CIRCLED DIGIT SEVEN
+ U+277D DINGBAT NEGATIVE CIRCLED DIGIT EIGHT
+ U+277E DINGBAT NEGATIVE CIRCLED DIGIT NINE
+ U+277F DINGBAT NEGATIVE CIRCLED NUMBER TEN
+
+ Arabic Mathematical Alphabetic Symbols
+ U+1EEF0 ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL
+ U+1EEF1 ARABIC MATHEMATICAL OPERATOR HAH WITH DAL
+
+ Note: These two characters were added for compatibility with
+ the LaTeX unicode-math package. There are no plans to include
+ further support for Arabic typesetting.
+
+
+ WHAT'S NEW IN 2.0.0?
+
+In addition to the overall visual redesign, STIX Two incorporates a
+number of significant improvements and additions. Special attention
+has been given to implementing accepted best practices for OpenType
+fonts, such as the use of font features to access variant glyph shapes
+that were previously only available via the Unicode Private Use Areas.
+
+The letterspacing and kerning of the text fonts have been
+significantly improved.
+
+True small capital variants (Latin, Cyrillic, and Greek), accessible
+via the OpenType font feature smcp, have been added for all text
+fonts.
+
+Text (lowercase or oldstyle) numerals, available via the font features
+pnum and onum, have been added, in addition to natural-spacing
+figures.
+
+Alphabetic superscripts and numeric sub- and superscripts, accessible
+via the subs and sups font features, have been added.
+
+Fractions are available via the frac feature, as well as numerators
+(numr) and denominators (dnom).
+
+The OpenType MATH table has been completely rewritten and extended.
+
+Additions have been made to these Unicode blocks:
+ Latin-1 Supplement U+0080 - U+00FF
+ Latin Extended-A U+0100 - U+017F
+ Latin Extended Additional U+0180 - U+024F
+ Cyrillic U+0400 - U+04FF
+ Greek and Coptic U+0370 - U+03FF
+ IPA blocks U+0250 - U+02AF
+
+BACKWARDS COMPATIBILITY
+
+Because of the scope of the changes, especially to the text fonts,
+STIX Two is not a drop-in replacement for earlier versions. While we
+understand and sympathize with the difficulties caused by the
+incompatibilities we have introduced, we nevertheless felt they were
+necessary to address some of the shortcomings of earlier versions of
+the fonts and to position us to respond to the needs of modern
+publishing.
+
+Earlier versions of the STIX fonts are deprecated and no longer
+supported. We urge all users of the STIX fonts to upgrade to the new
+versions as soon as possible.
+
+To enable the new and old versions of the fonts to coexist during the
+transition phase, the fonts have been renamed as follows:
+
+ STIX 1.1.0 STIX 2.0.0
+
+ STIX-Regular STIX Two Text
+ STIX-Italic STIX Two Text Italic
+ STIX-Bold STIX Two Text Bold
+ STIX-BoldItalic STIX Two Text Bold Italic
+
+ STIX Math Regular STIX Two Math
+
+The four text fonts contain glyphs from Unicode text blocks only. For
+example, all characters from the range U+2190 to U+3063 and U+E000 to
+U+E368 and all plane 1 characters have been removed from the text
+fonts and are now found only in STIX Two Math. Whenever possible,
+characters have been removed from the Private Use Area (U+E000-U+F8FF)
+and made available via font features instead.
+
+The STIX-General packaging of the fonts is no longer supported.
Binary files old/doc/fonts/stix2-otf/StixTwoBold.pdf and new/doc/fonts/stix2-otf/StixTwoBold.pdf differ
Binary files old/doc/fonts/stix2-otf/StixTwoBoldItalic.pdf and new/doc/fonts/stix2-otf/StixTwoBoldItalic.pdf differ
Binary files old/doc/fonts/stix2-otf/StixTwoItalic.pdf and new/doc/fonts/stix2-otf/StixTwoItalic.pdf differ
Binary files old/doc/fonts/stix2-otf/StixTwoMath.pdf and new/doc/fonts/stix2-otf/StixTwoMath.pdf differ
Binary files old/doc/fonts/stix2-otf/StixTwoRegular.pdf and new/doc/fonts/stix2-otf/StixTwoRegular.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stix2-otf.doc.tlpobj new/tlpkg/tlpobj/stix2-otf.doc.tlpobj
--- old/tlpkg/tlpobj/stix2-otf.doc.tlpobj 2019-02-28 04:06:20.000000000 +0100
+++ new/tlpkg/tlpobj/stix2-otf.doc.tlpobj 2020-03-04 23:53:48.000000000 +0100
@@ -1,11 +1,14 @@
name stix2-otf.doc
category Package
-revision 47549
+revision 54080
shortdesc doc files of stix2-otf
relocated 1
-docfiles size=177
+docfiles size=513
RELOC/doc/fonts/stix2-otf/README.md
- RELOC/doc/fonts/stix2-otf/STIX_2.0.0_glyph_sets.xlsx
- RELOC/doc/fonts/stix2-otf/STIX_2.0.0_license.pdf
- RELOC/doc/fonts/stix2-otf/STIX_2.0.0_release_notes.txt
- RELOC/doc/fonts/stix2-otf/STIX_2.0.0_stylistic_sets.pdf
+ RELOC/doc/fonts/stix2-otf/STIX_2.0.1_license.pdf
+ RELOC/doc/fonts/stix2-otf/STIX_2.0.1_release_notes.txt
+ RELOC/doc/fonts/stix2-otf/StixTwoBold.pdf
+ RELOC/doc/fonts/stix2-otf/StixTwoBoldItalic.pdf
+ RELOC/doc/fonts/stix2-otf/StixTwoItalic.pdf
+ RELOC/doc/fonts/stix2-otf/StixTwoMath.pdf
+ RELOC/doc/fonts/stix2-otf/StixTwoRegular.pdf
++++++ stix2-otf.tar.xz ++++++
Binary files old/fonts/opentype/public/stix2-otf/STIX2Math.otf and new/fonts/opentype/public/stix2-otf/STIX2Math.otf differ
Binary files old/fonts/opentype/public/stix2-otf/STIX2Text-Bold.otf and new/fonts/opentype/public/stix2-otf/STIX2Text-Bold.otf differ
Binary files old/fonts/opentype/public/stix2-otf/STIX2Text-BoldItalic.otf and new/fonts/opentype/public/stix2-otf/STIX2Text-BoldItalic.otf differ
Binary files old/fonts/opentype/public/stix2-otf/STIX2Text-Italic.otf and new/fonts/opentype/public/stix2-otf/STIX2Text-Italic.otf differ
Binary files old/fonts/opentype/public/stix2-otf/STIX2Text-Regular.otf and new/fonts/opentype/public/stix2-otf/STIX2Text-Regular.otf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stix2-otf.tlpobj new/tlpkg/tlpobj/stix2-otf.tlpobj
--- old/tlpkg/tlpobj/stix2-otf.tlpobj 2019-02-28 04:06:21.000000000 +0100
+++ new/tlpkg/tlpobj/stix2-otf.tlpobj 2020-03-04 23:53:49.000000000 +0100
@@ -1,6 +1,6 @@
name stix2-otf
category Package
-revision 47549
+revision 54080
shortdesc OpenType Unicode text and maths fonts
relocated 1
longdesc The Scientific and Technical Information eXchange (STIX) fonts
@@ -11,17 +11,17 @@
longdesc with a set of text faces suitable for professional publishing.
longdesc The fonts are available royalty-free under the SIL Open Font
longdesc License.
-runfiles size=586
+runfiles size=569
RELOC/fonts/opentype/public/stix2-otf/STIX2Math.otf
RELOC/fonts/opentype/public/stix2-otf/STIX2Text-Bold.otf
RELOC/fonts/opentype/public/stix2-otf/STIX2Text-BoldItalic.otf
RELOC/fonts/opentype/public/stix2-otf/STIX2Text-Italic.otf
RELOC/fonts/opentype/public/stix2-otf/STIX2Text-Regular.otf
+catalogue-also stickstoo
catalogue-contact-bugs https://github.com/stipub/stixfonts/issues
catalogue-contact-home http://www.stixfonts.org/
catalogue-contact-repository https://github.com/stipub/stixfonts
catalogue-ctan /fonts/stix2-otf
-catalogue-date 2018-05-02 06:34:24 +0200
catalogue-license ofl
catalogue-topics font font-otf font-maths font-symbol font-symbol-maths font-body font-collection font-nonroman font-serif
-catalogue-version 2.0.0
+catalogue-version 2.0.1
++++++ stix2-type1.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/stix2/README.md new/doc/latex/stix2/README.md
--- old/doc/latex/stix2/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/stix2/README.md 2019-05-03 00:38:58.000000000 +0200
@@ -0,0 +1,34 @@
+# stix2-type1, v2.0.0a
+Type 1 versions of STIX 2.0.0 for legacy TeX engines
+
+If you are using XeTeX or luaTeX, you do not need the files in this
+directory. See the stix2-otf package instead.
+
+The stix2 package provides support for versions of TeX that are
+limited to TFM files, Type 1 PostScript fonts, and 8-bit font
+encodings. Version 2.0.0 of the STIX fonts are being released in this
+format in hopes of easing the transition from legacy TeX engines to
+modern fully Unicode-compatible systems. The Type 1 versions are
+merely a repackaging of the original OpenType versions and should not
+be viewed as independent entities. Some glyphs that are traditionally
+available in TeX math fonts are not available in version 2.0.0 of STIX
+Two. In such cases, we have chosen to omit them from the stix2
+package rather than create incompatibilities between the OpenType and
+Type 1 versions.
+
+Note that while the OpenType versions of these fonts are under active
+development, **no further updates** are planned to the Type 1
+distribution; future efforts by the STI Pub companies will focus on
+improving the OpenType fonts. However, patches to the existing Type 1
+distribution are welcome and, pending review, will be incorporated
+into the distribution. Any such patches should be submitted through
+the github repo at
+
+ https://github.com/stipub/stixfonts
+
+# Changelog
+
+v2.0.0a fixes a problem in the TeX font metrics file for stix2-mathcal
+(https://github.com/stipub/stixfonts/issues/108). The only changes
+outside of this README file were to the files stix2-mathcal.tfm and
+stix2-mathcal.pl.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stix2-type1.doc.tlpobj new/tlpkg/tlpobj/stix2-type1.doc.tlpobj
--- old/tlpkg/tlpobj/stix2-type1.doc.tlpobj 2019-02-28 04:06:21.000000000 +0100
+++ new/tlpkg/tlpobj/stix2-type1.doc.tlpobj 2020-03-24 02:04:02.000000000 +0100
@@ -1,7 +1,8 @@
name stix2-type1.doc
category Package
-revision 47554
+revision 54512
shortdesc doc files of stix2-type1
relocated 1
-docfiles size=327
+docfiles size=328
+ RELOC/doc/latex/stix2/README.md
RELOC/doc/latex/stix2/stix2.pdf
++++++ stix2-type1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/stix2/stix2-mathcal.pl new/fonts/source/public/stix2/stix2-mathcal.pl
--- old/fonts/source/public/stix2/stix2-mathcal.pl 2018-05-01 20:22:55.000000000 +0200
+++ new/fonts/source/public/stix2/stix2-mathcal.pl 2019-05-03 00:38:58.000000000 +0200
@@ -94,55 +94,55 @@
(STOP)
)
(CHARACTER O 0 (comment uni222B.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 1 (comment uni222C.sm)
- (CHARWD R 0.889)
+ (CHARWD R 0.789)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 2 (comment uni222D.sm)
- (CHARWD R 1.222)
+ (CHARWD R 1.122)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 3 (comment uni222E.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 4 (comment uni222F.sm)
- (CHARWD R 0.889)
+ (CHARWD R 0.789)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 5 (comment uni2230.sm)
- (CHARWD R 1.222)
+ (CHARWD R 1.122)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 6 (comment uni2231.sm)
- (CHARWD R 0.562)
+ (CHARWD R 0.462)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 7 (comment uni2232.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 10 (comment uni2233.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
@@ -151,160 +151,159 @@
(CHARWD R 0.611)
(CHARHT R 0.727)
(CHARDP R 0.226)
- (CHARIC R 0.102)
)
(CHARACTER O 12 (comment uni2A0C.sm)
- (CHARWD R 1.555)
+ (CHARWD R 1.455)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 13 (comment uni2A0D.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 14 (comment uni2A0E.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 15 (comment uni2A0F.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 16 (comment uni2A10.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 17 (comment uni2A11.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 20 (comment uni2A12.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 21 (comment uni2A13.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 22 (comment uni2A14.sm)
- (CHARWD R 0.578)
+ (CHARWD R 0.478)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 23 (comment uni2A15.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.716)
(CHARDP R 0.022)
(CHARIC R 0.1)
)
(CHARACTER O 24 (comment uni2A16.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 25 (comment uni2A17.sm)
- (CHARWD R 0.627)
+ (CHARWD R 0.527)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 26 (comment uni2A18.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 27 (comment uni2A19.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 30 (comment uni2A1A.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 31 (comment uni2A1B.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.829)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 32 (comment uni2A1C.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.107)
(CHARIC R 0.1)
)
(CHARACTER O 33 (comment uni222B.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 34 (comment uni222C.upsm)
- (CHARWD R 0.808)
+ (CHARWD R 0.728)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 35 (comment uni222D.upsm)
- (CHARWD R 1.13)
+ (CHARWD R 1.05)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 36 (comment uni222E.upsm)
- (CHARWD R 0.496)
+ (CHARWD R 0.416)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 37 (comment uni222F.upsm)
- (CHARWD R 0.818)
+ (CHARWD R 0.738)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 40 (comment uni2230.upsm)
- (CHARWD R 1.141)
+ (CHARWD R 1.061)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 41 (comment uni2231.upsm)
- (CHARWD R 0.556)
+ (CHARWD R 0.476)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 42 (comment uni2232.upsm)
- (CHARWD R 0.516)
+ (CHARWD R 0.436)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 43 (comment uni2233.upsm)
- (CHARWD R 0.536)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
@@ -315,103 +314,103 @@
(CHARDP R 0.226)
)
(CHARACTER O 45 (comment uni2A0C.upsm)
- (CHARWD R 1.472)
+ (CHARWD R 1.392)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 46 (comment uni2A0D.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 47 (comment uni2A0E.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 50 (comment uni2A0F.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 51 (comment uni2A10.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 52 (comment uni2A11.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 53 (comment uni2A12.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 54 (comment uni2A13.upsm)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
)
(CHARACTER O 55 (comment uni2A14.upsm)
- (CHARWD R 0.563)
+ (CHARWD R 0.483)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 56 (comment uni2A15.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 57 (comment uni2A16.upsm)
- (CHARWD R 0.461)
+ (CHARWD R 0.381)
(CHARHT R 0.727)
(CHARDP R 0.018)
- (CHARIC R 0.115)
+ (CHARIC R 0.08)
)
(CHARACTER O 60 (comment uni2A17.upsm)
- (CHARWD R 0.647)
+ (CHARWD R 0.567)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 61 (comment uni2A18.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 62 (comment uni2A19.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 63 (comment uni2A1A.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 64 (comment uni2A1B.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.829)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 65 (comment uni2A1C.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.115)
(CHARIC R 0.08)
@@ -807,63 +806,63 @@
(CHARDP R 0.16)
)
(CHARACTER O 224 (comment uni222B)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 312)
)
(CHARACTER O 225 (comment uni222C)
- (CHARWD R 1.016)
+ (CHARWD R 0.786)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 313)
)
(CHARACTER O 226 (comment uni222D)
- (CHARWD R 1.348)
+ (CHARWD R 1.118)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 314)
)
(CHARACTER O 227 (comment uni222E)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 315)
)
(CHARACTER O 230 (comment uni222F)
- (CHARWD R 1.016)
+ (CHARWD R 0.786)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 316)
)
(CHARACTER O 231 (comment uni2230)
- (CHARWD R 1.348)
+ (CHARWD R 1.118)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 317)
)
(CHARACTER O 232 (comment uni2231)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.728)
(CHARDP R 0.225)
(CHARIC R 0.23)
(NEXTLARGER O 320)
)
(CHARACTER O 233 (comment uni2232)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.728)
(CHARDP R 0.225)
(CHARIC R 0.23)
(NEXTLARGER O 321)
)
(CHARACTER O 234 (comment uni2233)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
@@ -876,182 +875,182 @@
(NEXTLARGER O 323)
)
(CHARACTER O 236 (comment uni2A0C)
- (CHARWD R 1.68)
+ (CHARWD R 1.45)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 324)
)
(CHARACTER O 237 (comment uni2A0D)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 325)
)
(CHARACTER O 240 (comment uni2A0E)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 326)
)
(CHARACTER O 241 (comment uni2A0F)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 327)
)
(CHARACTER O 242 (comment uni2A10)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 330)
)
(CHARACTER O 243 (comment uni2A11)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 331)
)
(CHARACTER O 244 (comment uni2A12)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 332)
)
(CHARACTER O 245 (comment uni2A13)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 333)
)
(CHARACTER O 246 (comment uni2A14)
- (CHARWD R 0.711)
+ (CHARWD R 0.481)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 334)
)
(CHARACTER O 247 (comment uni2A15)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 335)
)
(CHARACTER O 250 (comment uni2A16)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 336)
)
(CHARACTER O 251 (comment uni2A17)
- (CHARWD R 0.864)
+ (CHARWD R 0.634)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 337)
)
(CHARACTER O 252 (comment uni2A18)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 340)
)
(CHARACTER O 253 (comment uni2A19)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 341)
)
(CHARACTER O 254 (comment uni2A1A)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 342)
)
(CHARACTER O 255 (comment uni2A1B)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.849)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 343)
)
(CHARACTER O 256 (comment uni2A1C)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.347)
(CHARIC R 0.23)
(NEXTLARGER O 344)
)
(CHARACTER O 257 (comment uni222B.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 345)
)
(CHARACTER O 260 (comment uni222C.up)
- (CHARWD R 0.83)
+ (CHARWD R 0.75)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 346)
)
(CHARACTER O 261 (comment uni222D.up)
- (CHARWD R 1.149)
+ (CHARWD R 1.069)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 347)
)
(CHARACTER O 262 (comment uni222E.up)
- (CHARWD R 0.513)
+ (CHARWD R 0.433)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 350)
)
(CHARACTER O 263 (comment uni222F.up)
- (CHARWD R 0.837)
+ (CHARWD R 0.757)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 351)
)
(CHARACTER O 264 (comment uni2230.up)
- (CHARWD R 1.206)
+ (CHARWD R 1.126)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 352)
)
(CHARACTER O 265 (comment uni2231.up)
- (CHARWD R 0.545)
+ (CHARWD R 0.465)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 353)
)
(CHARACTER O 266 (comment uni2232.up)
- (CHARWD R 0.602)
+ (CHARWD R -0.198)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.8)
(NEXTLARGER O 354)
)
(CHARACTER O 267 (comment uni2233.up)
- (CHARWD R 0.596)
+ (CHARWD R 0.516)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
@@ -1064,174 +1063,174 @@
(NEXTLARGER O 356)
)
(CHARACTER O 271 (comment uni2A0C.up)
- (CHARWD R 1.491)
+ (CHARWD R 1.411)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 357)
)
(CHARACTER O 272 (comment uni2A0D.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 360)
)
(CHARACTER O 273 (comment uni2A0E.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 361)
)
(CHARACTER O 274 (comment uni2A0F.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 362)
)
(CHARACTER O 275 (comment uni2A10.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 363)
)
(CHARACTER O 276 (comment uni2A11.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
- (CHARIC R 0.11)
+ (CHARIC R 0.08)
(NEXTLARGER O 364)
)
(CHARACTER O 277 (comment uni2A12.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 365)
)
(CHARACTER O 300 (comment uni2A13.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 366)
)
(CHARACTER O 301 (comment uni2A14.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
- (CHARIC R 0.167)
+ (CHARIC R 0.08)
(NEXTLARGER O 367)
)
(CHARACTER O 302 (comment uni2A15.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 370)
)
(CHARACTER O 303 (comment uni2A16.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 371)
)
(CHARACTER O 304 (comment uni2A17.up)
- (CHARWD R 0.865)
+ (CHARWD R 0.785)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 372)
)
(CHARACTER O 305 (comment uni2A18.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 373)
)
(CHARACTER O 306 (comment uni2A19.up)
- (CHARWD R 0.545)
+ (CHARWD R 0.465)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 374)
)
(CHARACTER O 307 (comment uni2A1A.up)
- (CHARWD R 0.576)
+ (CHARWD R 0.496)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 375)
)
(CHARACTER O 310 (comment uni2A1B.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.848)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 376)
)
(CHARACTER O 311 (comment uni2A1C.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.346)
(CHARIC R 0.08)
(NEXTLARGER O 377)
)
(CHARACTER O 312 (comment uni222B.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 313 (comment uni222C.dsp)
- (CHARWD R 1.489)
+ (CHARWD R 0.949)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 314 (comment uni222D.dsp)
- (CHARWD R 1.946)
+ (CHARWD R 1.406)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 315 (comment uni222E.dsp)
- (CHARWD R 1.007)
+ (CHARWD R 0.467)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 316 (comment uni222F.dsp)
- (CHARWD R 1.45)
+ (CHARWD R 0.91)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 317 (comment uni2230.dsp)
- (CHARWD R 1.907)
+ (CHARWD R 1.367)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 320 (comment uni2231.dsp)
- (CHARWD R 0.989)
+ (CHARWD R 0.449)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.54)
)
(CHARACTER O 321 (comment uni2232.dsp)
- (CHARWD R 1.102)
+ (CHARWD R 0.562)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 322 (comment uni2233.dsp)
- (CHARWD R 1.159)
+ (CHARWD R 0.619)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
@@ -1242,157 +1241,157 @@
(CHARDP R 0.802)
)
(CHARACTER O 324 (comment uni2A0C.dsp)
- (CHARWD R 2.363)
+ (CHARWD R 1.823)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 325 (comment uni2A0D.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 326 (comment uni2A0E.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 327 (comment uni2A0F.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 330 (comment uni2A10.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 331 (comment uni2A11.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 332 (comment uni2A12.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 333 (comment uni2A13.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 334 (comment uni2A14.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
- (CHARIC R 0.104)
+ (CHARIC R 0.54)
)
(CHARACTER O 335 (comment uni2A15.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 336 (comment uni2A16.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 337 (comment uni2A17.dsp)
- (CHARWD R 1.1)
+ (CHARWD R 0.56)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 340 (comment uni2A18.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 341 (comment uni2A19.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 342 (comment uni2A1A.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 343 (comment uni2A1B.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.582)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 344 (comment uni2A1C.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 1.068)
(CHARIC R 0.54)
)
(CHARACTER O 345 (comment uni222B.updsp)
- (CHARWD R 0.632)
+ (CHARWD R 0.552)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 346 (comment uni222C.updsp)
- (CHARWD R 0.999)
+ (CHARWD R 0.919)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 347 (comment uni222D.updsp)
- (CHARWD R 1.366)
+ (CHARWD R 1.286)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 350 (comment uni222E.updsp)
- (CHARWD R 1.009)
+ (CHARWD R 0.929)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 351 (comment uni222F.updsp)
- (CHARWD R 1.374)
+ (CHARWD R 1.294)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 352 (comment uni2230.updsp)
- (CHARWD R 1.793)
+ (CHARWD R 1.713)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 353 (comment uni2231.updsp)
- (CHARWD R 0.834)
+ (CHARWD R 0.754)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 354 (comment uni2232.updsp)
- (CHARWD R 1.102)
+ (CHARWD R 1.022)
(CHARHT R 1.42)
(CHARDP R 0.926)
(CHARIC R 0.08)
)
(CHARACTER O 355 (comment uni2233.updsp)
- (CHARWD R 1.159)
+ (CHARWD R 1.079)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
@@ -1403,103 +1402,103 @@
(CHARDP R 0.803)
)
(CHARACTER O 357 (comment uni2A0C.updsp)
- (CHARWD R 1.713)
+ (CHARWD R 1.633)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 360 (comment uni2A0D.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 361 (comment uni2A0E.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 362 (comment uni2A0F.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 363 (comment uni2A10.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 364 (comment uni2A11.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
- (CHARIC R 0.16)
+ (CHARIC R 0.08)
)
(CHARACTER O 365 (comment uni2A12.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 366 (comment uni2A13.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 367 (comment uni2A14.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
- (CHARIC R 0.237)
+ (CHARIC R 0.08)
)
(CHARACTER O 370 (comment uni2A15.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 371 (comment uni2A16.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 372 (comment uni2A17.updsp)
- (CHARWD R 1.1)
+ (CHARWD R 1.02)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 373 (comment uni2A18.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 374 (comment uni2A19.updsp)
- (CHARWD R 0.844)
+ (CHARWD R 0.764)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 375 (comment uni2A1A.updsp)
- (CHARWD R 0.844)
+ (CHARWD R 0.764)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 376 (comment uni2A1B.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.588)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 377 (comment uni2A1C.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 1.068)
(CHARIC R 0.08)
Binary files old/fonts/tfm/public/stix2/stix2-mathcal.tfm and new/fonts/tfm/public/stix2/stix2-mathcal.tfm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stix2-type1.tlpobj new/tlpkg/tlpobj/stix2-type1.tlpobj
--- old/tlpkg/tlpobj/stix2-type1.tlpobj 2019-02-28 04:06:22.000000000 +0100
+++ new/tlpkg/tlpobj/stix2-type1.tlpobj 2020-03-24 02:04:02.000000000 +0100
@@ -1,6 +1,6 @@
name stix2-type1
category Package
-revision 47554
+revision 54512
shortdesc Type1 versions of the STIX Two OpenType fonts
relocated 1
longdesc The stix2 package provides minimal support for using the STIX
@@ -142,11 +142,11 @@
RELOC/tex/latex/stix2/stix2.sty
RELOC/tex/latex/stix2/t1stix2.fd
RELOC/tex/latex/stix2/ts1stix2.fd
+catalogue-also stickstoo
catalogue-contact-bugs https://github.com/stipub/stixfonts/issues
catalogue-contact-development https://github.com/stipub/stixfonts
catalogue-contact-home http://www.stixfonts.org/
catalogue-ctan /fonts/stix2-type1
-catalogue-date 2018-05-02 06:34:24 +0200
-catalogue-license ofllppl1.3
+catalogue-license ofl lppl1.3
catalogue-topics font font-type1 font-maths font-symbol-maths font-bbd font-body font-collection font-nonroman font-otf font-serif font-symbol font-supp font-supp-maths font-supp-symbol
-catalogue-version 2.0.0
+catalogue-version 2.0.0a
++++++ subfiles.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/subfiles/README new/doc/latex/subfiles/README
--- old/doc/latex/subfiles/README 2018-07-31 22:54:49.000000000 +0200
+++ new/doc/latex/subfiles/README 2020-02-14 23:34:36.000000000 +0100
@@ -1,7 +1,15 @@
subfiles - class and package for multi-file projects in LaTeX
-Author: Federico Garcia
+Author: Federico Garcia, Gernot Salzer
This material is subject to the LaTeX Project Public License. See
-http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
-for the details of that license.
+https://ctan.org/license/lppl for the details of that license.
+
+Installation:
+Run 'latex subfiles.ins' to generate the files
+subfiles.cls
+subfiles.sty
+and put them somewhere on the search path of TeX.
+
+Documentation:
+Run 'pdflatex subfiles.dtx' twice to generate subfiles.pdf.
Binary files old/doc/latex/subfiles/subfiles.pdf and new/doc/latex/subfiles/subfiles.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subfiles.doc.tlpobj new/tlpkg/tlpobj/subfiles.doc.tlpobj
--- old/tlpkg/tlpobj/subfiles.doc.tlpobj 2019-02-28 04:06:28.000000000 +0100
+++ new/tlpkg/tlpobj/subfiles.doc.tlpobj 2020-02-15 01:54:15.000000000 +0100
@@ -1,8 +1,8 @@
name subfiles.doc
category Package
-revision 48323
+revision 53782
shortdesc doc files of subfiles
relocated 1
-docfiles size=58
+docfiles size=60
RELOC/doc/latex/subfiles/README
RELOC/doc/latex/subfiles/subfiles.pdf
++++++ subfiles.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/subfiles/subfiles.cls new/tex/latex/subfiles/subfiles.cls
--- old/tex/latex/subfiles/subfiles.cls 2018-07-31 22:54:49.000000000 +0200
+++ new/tex/latex/subfiles/subfiles.cls 2020-02-14 23:34:36.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2002, 2012 Federico Garcia; 2018 Gernot Salzer
+%% Copyright 2002, 2012 Federico Garcia; 2018, 2019 Gernot Salzer
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,20 +26,33 @@
%% and the derived files subfiles.sty and subfiles.pdf
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{subfiles}[2018/07/31 Federico Garcia, Gernot Salzer]
+\ProvidesClass{subfiles}[2020/02/14 v1.6 Multi-file projects (class)]
\DeclareOption*{\typeout{Preamble taken from file `\CurrentOption'}%
\let\preamble@file\CurrentOption}
\ProcessOptions
-\let\old@documentclass@subfiles\documentclass
+\let\@classoptionslist\relax
+\let\subfiles@documentclass\documentclass
\let\documentclass\LoadClass\relax
-\input{\preamble@file}
+\RequirePackage{verbatim}
+\let\subfiles@comment\comment
+\let\subfiles@endcomment\endcomment
+\RequirePackage{import}
+\def\subfiles@split#1{%
+ \let\subfiles@filename@simple\filename@simple
+ \def\filename@simple##1.\\{\edef\filename@base{##1}}%
+ \filename@parse{#1}%
+ \let\filename@simple\subfiles@filename@simple
+}
+\subfiles@split{\preamble@file}
+\subimport{\filename@area}{\filename@base}
{\catcode`\@=11
-\global\let\document\old@document@subfiles
-\global\let\enddocument\old@enddocument@subfiles
-\global\let\documentclass\old@documentclass@subfiles
-\global\let\old@document@subfiles\undefined
-\global\let\old@enddocument@subfiles\undefined
-\global\let\old@documentclass@subfiles\undefined}
+\global\let\document\subfiles@document
+\global\let\enddocument\subfiles@enddocument
+\global\let\documentclass\subfiles@documentclass
+\global\let\subfiles@document\undefined
+\global\let\subfiles@enddocument\undefined
+\global\let\subfiles@documentclass\undefined
+}
\endinput
%%
%% End of file `subfiles.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/subfiles/subfiles.sty new/tex/latex/subfiles/subfiles.sty
--- old/tex/latex/subfiles/subfiles.sty 2018-07-31 22:54:49.000000000 +0200
+++ new/tex/latex/subfiles/subfiles.sty 2020-02-14 23:34:36.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2002, 2012 Federico Garcia; 2018 Gernot Salzer
+%% Copyright 2002, 2012 Federico Garcia; 2018, 2019 Gernot Salzer
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,21 +26,70 @@
%% and the derived files subfiles.sty and subfiles.pdf
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{subfiles}[2018/07/31 Federico Garcia, Gernot Salzer]
+\ProvidesPackage{subfiles}[2020/02/14 v1.6 Multi-file projects (package)]
\DeclareOption*{\PackageWarning{\CurrentOption ignored}}
\ProcessOptions
-\RequirePackage{verbatim}
-\newcommand{\skip@preamble}{%
- \let\document\relax\let\enddocument\relax%
- \newenvironment{document}{}{}%
- \renewcommand{\documentclass}[2][subfiles]{}}
-\newcommand\subfile[1]{\begingroup\skip@preamble\input{#1}\endgroup}
\@ifclassloaded{subfiles}{%
- \let\old@document@subfiles\document
- \let\old@enddocument@subfiles\enddocument
- \let\document\comment
- \let\enddocument\endcomment
-}{}
+ \let\subfiles@document\document
+ \let\subfiles@enddocument\enddocument
+ \let\document\subfiles@comment
+ \let\enddocument\subfiles@endcomment
+}{% subfiles class not loaded, we typeset the main document
+ \RequirePackage{import}
+ \def\subfiles@split#1{%
+ \let\subfiles@filename@simple\filename@simple
+ \def\filename@simple##1.\\{\edef\filename@base{##1}}%
+ \filename@parse{#1}%
+ \let\filename@simple\subfiles@filename@simple
+ }
+}
+\newcommand\subfile{%
+ \let\subfiles@loadfile\subimport
+ \subfiles@subfile
+}
+\newcommand\subfileinclude{%
+ \let\subfiles@loadfile\subincludefrom
+ \subfiles@subfile
+}
+\newcommand\subfiles@subfile[1]{%
+ \begingroup
+ \let\subfiles@documentclass\documentclass
+ \let\subfiles@document\document
+ \let\subfiles@enddocument\enddocument
+ \renewcommand\documentclass[2][subfiles]{%
+ \let\documentclass\subfiles@documentclass
+ \ignorespaces
+ }%
+ \renewenvironment{document}{%
+ \let\document\subfiles@document
+ \ignorespaces
+ }{%
+ \let\enddocument\subfiles@enddocument
+ \@ignoretrue
+ }%
+ \subfiles@split{#1}%
+ \subfiles@loadfile{\filename@area}{\filename@base}%
+ \endgroup
+}
+\def\subfiles@addimportpath#1{%
+ \def\subfiles@filelist{}%
+ \def\subfiles@sep{}%
+ \@for\subfiles@filename:=#1\do{%
+ \edef\subfiles@filelist{%
+ \subfiles@filelist
+ \subfiles@sep
+ \import@path
+ \subfiles@filename
+ }%
+ \def\subfiles@sep{,}%
+ }
+}
+\let\subfiles@bibliography\bibliography
+\renewcommand\bibliography[1]{%
+ \subfiles@addimportpath{#1}%
+ \expandafter\subfiles@bibliography\expandafter{\subfiles@filelist}%
+}
+\def\subfix#1{\import@path#1}
\endinput
%%
%% End of file `subfiles.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subfiles.tlpobj new/tlpkg/tlpobj/subfiles.tlpobj
--- old/tlpkg/tlpobj/subfiles.tlpobj 2019-02-28 04:06:28.000000000 +0100
+++ new/tlpkg/tlpobj/subfiles.tlpobj 2020-02-15 01:54:15.000000000 +0100
@@ -1,6 +1,6 @@
name subfiles
category Package
-revision 48323
+revision 53782
shortdesc Individual typesetting of subfiles of a "main" document
relocated 1
longdesc Using subfiles the user can handle multi-file projects more
@@ -11,8 +11,10 @@
RELOC/tex/latex/subfiles/subfiles.cls
RELOC/tex/latex/subfiles/subfiles.sty
catalogue-also combine standalone
+catalogue-contact-bugs https://github.com/gsalzer/subfiles/issues
+catalogue-contact-repository https://github.com/gsalzer/subfiles
+catalogue-contact-support https://tex.stackexchange.com/
catalogue-ctan /macros/latex/contrib/subfiles
-catalogue-date 2018-07-31 17:12:00 +0200
catalogue-license lppl1.3
-catalogue-topics subdocs
-catalogue-version 1.2
+catalogue-topics subdocs class
+catalogue-version 1.6
++++++ suftesi.doc.tar.xz ++++++
Binary files old/doc/latex/suftesi/suftesi.pdf and new/doc/latex/suftesi/suftesi.pdf differ
Binary files old/doc/latex/suftesi/templates.zip and new/doc/latex/suftesi/templates.zip differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/suftesi.doc.tlpobj new/tlpkg/tlpobj/suftesi.doc.tlpobj
--- old/tlpkg/tlpobj/suftesi.doc.tlpobj 2019-02-28 04:06:29.000000000 +0100
+++ new/tlpkg/tlpobj/suftesi.doc.tlpobj 2020-02-26 01:55:05.000000000 +0100
@@ -1,8 +1,9 @@
name suftesi.doc
category Package
-revision 49138
+revision 53903
shortdesc doc files of suftesi
relocated 1
-docfiles size=270
+docfiles size=354
RELOC/doc/latex/suftesi/README
RELOC/doc/latex/suftesi/suftesi.pdf
+ RELOC/doc/latex/suftesi/templates.zip
++++++ suftesi.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/suftesi/suftesi.cls new/tex/latex/suftesi/suftesi.cls
--- old/tex/latex/suftesi/suftesi.cls 2018-11-12 23:10:37.000000000 +0100
+++ new/tex/latex/suftesi/suftesi.cls 2020-02-25 02:22:11.000000000 +0100
@@ -6,7 +6,7 @@
%%
%% suftesi.dtx (with options: `class')
%%
-%% Copyright 2009-2018 by Ivan Valbusa
+%% Copyright 2009-2020 by Ivan Valbusa
%%
%% This program is provided under the terms of the
%% LaTeX Project Public License distributed from CTAN
@@ -19,17 +19,10 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{suftesi}
- [2018/11/09 v2.9.1 A class for typesetting theses, books and articles]
+ [2020/02/24 v2.9.8 A class for typesetting theses, books and articles]
+
+
-\ClassWarningNoLine{suftesi}{%
- ******************************************\MessageBreak
- * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
- * WITH PACKAGES AND/OR COMMANDS WHICH\MessageBreak
- * MAY CHANGE THE LAYOUT OF THE DOCUMENT.\MessageBreak
- * SEE DOCUMENTATION FOR DETAILS.\MessageBreak
- * ANYWAY, DON'T WORRY!\MessageBreak
- * THIS IS A HARMLESS MESSAGE :-)\MessageBreak
- ******************************************}
\RequirePackage{xkeyval}
\newif\ifsuftesi@compatibility
\newif\ifsuftesi@nofont
@@ -76,6 +69,9 @@
\newif\ifsuftesi@twocolumnlot
\newif\ifsuftesi@reverseauthortitle
\newif\ifsuftesi@collection
+\newif\ifsuftesi@toccompactsec
+\newif\ifsuftesi@toccompactsubsec
+\newif\ifsuftesi@toccompactsubsubsec
\DeclareOption{a4paper}{%
\ClassWarningNoLine{suftesi}{Option 'a4paper' not available}{}}
\DeclareOption{a5paper}{%
@@ -92,16 +88,22 @@
\ProcessOptions
\relax
\LoadClass{book}
+\RequirePackage{fontsize}
+\DeclareOptionX{parindent}{\setlength{\parindent}{#1}}
+\ExecuteOptionsX{parindent=\baselineskip}
+\ProcessOptionsX*\relax
\define@choicekey{}{structure}[\val\nr]
{book,article,collection}[book]{%
\ifcase\nr\relax
-\disable@keys{}{secnumstyle}
+\def\SUF@chapswitch{\thechapter.}
\or
\suftesi@articletrue
\@titlepagefalse
+\def\SUF@chapswitch{}
\or
\suftesi@collectiontrue
\setkeys{}{headerstyle=authortitleinner}
+\def\SUF@chapswitch{}
\fi}
\define@choicekey{}{documentstructure}[\val\nr]
{book,article,collection}[book]{%
@@ -120,11 +122,12 @@
{standard,standardaureo,periodical,compact,compactaureo,supercompact,
supercompactaureo,periodicalaureo}[standard]{%
\ifcase\nr\relax
+ \DeclareRobustCommand{\SUF@partsize}{\Large}
\DeclareRobustCommand{\SUF@chaptersize}{\Large}
\DeclareRobustCommand{\SUF@sectionsize}{\large}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize}
- \geometry{%
+ \geometry{
heightrounded,
a4paper,
includeheadfoot=true,
@@ -134,11 +137,12 @@
marginparwidth= 30mm,
marginparsep= 12pt}
\or
+ \DeclareRobustCommand{\SUF@partsize}{\Large}
\DeclareRobustCommand{\SUF@chaptersize}{\Large}
\DeclareRobustCommand{\SUF@sectionsize}{\large}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize}
- \geometry{%
+ \geometry{
heightrounded,
a4paper,
includeheadfoot=true,
@@ -149,6 +153,7 @@
marginparsep= 12pt}
\or
\suftesi@periodicaltrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -165,6 +170,7 @@
marginparsep= 10pt}
\or
\suftesi@compacttrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -181,6 +187,7 @@
marginparsep= 9pt}
\or
\suftesi@compactaureotrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -197,6 +204,7 @@
marginparsep= 9pt}
\or
\suftesi@supercompacttrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -213,6 +221,7 @@
marginparsep= 8pt}
\or
\suftesi@supercompactaureotrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -229,11 +238,12 @@
marginparsep= 7pt}
\or
\suftesi@periodicalaureotrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize}
- \geometry{%
+ \geometry{
heightrounded,
includeheadfoot=true,
textwidth= 120mm,
@@ -432,81 +442,141 @@
\ifcase\nr\relax
\def\SUF@thepart{\arabic{part}}
\def\SUF@dotpart{}
- \def\SUF@toclabelnum{}
\or
\def\SUF@thepart{\textsc{\roman{part}}}
\def\SUF@dotpart{}
- \def\SUF@toclabelnum{\scshape\@roman}
\or
\def\SUF@thepart{\Roman{part}}
\def\SUF@dotpart{}
- \def\SUF@toclabelnum{\@Roman}
\or
\def\SUF@thepart{\arabic{part}}
\def\SUF@dotpart{.}
- \def\SUF@toclabelnum{}
\or
\def\SUF@thepart{\textsc{\roman{part}}}
\def\SUF@dotpart{.}
- \def\SUF@toclabelnum{\scshape\@roman}
\or
\def\SUF@thepart{\Roman{part}}
\def\SUF@dotpart{.}
- \def\SUF@toclabelnum{\@Roman}
\fi}
\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF@thechapter{\arabic{chapter}}
+ \def\SUF@HEAD@thechapter{\arabic{chapter}}
\def\SUF@dotchap{}
- \def\SUF@toclabelnum{}
+ \def\SUF@CHAP@thecontentslabel{\thecontentslabel}
\or
\def\SUF@thechapter{\textsc{\roman{chapter}}}
+ \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}}
\def\SUF@dotchap{}
- \def\SUF@toclabelnum{\scshape\@roman}
+ \def\SUF@CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF@thechapter{\Roman{chapter}}
+ \def\SUF@HEAD@thechapter{\Roman{chapter}}
\def\SUF@dotchap{}
- \def\SUF@toclabelnum{\@Roman}
+ \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
\or
\def\SUF@thechapter{\arabic{chapter}}
+ \def\SUF@HEAD@thechapter{\arabic{chapter}}
\def\SUF@dotchap{.}
- \def\SUF@toclabelnum{}
+ \def\SUF@CHAP@thecontentslabel{\thecontentslabel}
\or
\def\SUF@thechapter{\textsc{\roman{chapter}}}
+ \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}}
\def\SUF@dotchap{.}
- \def\SUF@toclabelnum{\scshape\@roman}
+ \def\SUF@CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF@thechapter{\Roman{chapter}}
+ \def\SUF@HEAD@thechapter{\Roman{chapter}}
\def\SUF@dotchap{.}
- \def\SUF@toclabelnum{\@Roman}
+ \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
\define@choicekey{}{secnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
- \def\SUF@thesection{\arabic{section}}
+ \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
+ \def\SUF@HEAD@thesection{\arabic{section}}
\def\SUF@dotsec{}
- \def\SUF@toclabelnum{}
+ \def\SUF@SEC@thecontentslabel{\thecontentslabel}
\or
- \def\SUF@thesection{\textsc{\roman{section}}}
+ \def\SUF@thesection{\textsc{\SUF@chapswitch\roman{section}}}
+ \def\SUF@HEAD@thesection{\textsc{\roman{section}}}
\def\SUF@dotsec{}
- \def\SUF@toclabelnum{\scshape\@roman}
+ \def\SUF@SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
- \def\SUF@thesection{\Roman{section}}
+ \def\SUF@thesection{\SUF@chapswitch\Roman{section}}
+ \def\SUF@HEAD@thesection{\Roman{section}}
\def\SUF@dotsec{}
- \def\SUF@toclabelnum{\@Roman}
+ \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
\or
- \def\SUF@thesection{\arabic{section}}
+ \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
+ \def\SUF@HEAD@thesection{\arabic{section}}
\def\SUF@dotsec{.}
- \def\SUF@toclabelnum{}
+ \def\SUF@SEC@thecontentslabel{\thecontentslabel}
\or
- \def\SUF@thesection{\textsc{\roman{section}}}
+ \def\SUF@thesection{\SUF@chapswitch\textsc{\roman{section}}}
+ \def\SUF@HEAD@thesection{\textsc{\roman{section}}}
\def\SUF@dotsec{.}
- \def\SUF@toclabelnum{\scshape\@roman}
+ \def\SUF@SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
- \def\SUF@thesection{\Roman{section}}
+ \def\SUF@thesection{\SUF@chapswitch\Roman{section}}
+ \def\SUF@HEAD@thesection{\Roman{section}}
\def\SUF@dotsec{.}
- \def\SUF@toclabelnum{\@Roman}
+ \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\fi}
+\define@choicekey{}{subsecnumstyle}[\val\nr]
+{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+\ifcase\nr\relax
+\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+\def\SUF@dotsubsec{}
+\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+\def\SUF@dotsubsec{}
+\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+\def\SUF@dotsubsec{}
+\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+\def\SUF@dotsubsec{.}
+\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+\def\SUF@dotsubsec{.}
+\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+\def\SUF@dotsubsec{.}
+\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\fi}
+\define@choicekey{}{subsubsecnumstyle}[\val\nr]
+{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+\ifcase\nr\relax
+\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+\def\SUF@dotsubsubsec{}
+\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+\def\SUF@dotsubsubsec{}
+\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+\def\SUF@dotsubsubsec{}
+\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+\def\SUF@dotsubsubsec{.}
+\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+\def\SUF@dotsubsubsec{.}
+\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+\def\SUF@dotsubsubsec{.}
+\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
\define@choicekey{}{smallcapsstyle}[\val\nr]
{low,upper}[low]{%
@@ -517,6 +587,26 @@
\def\suftesi@MakeTextLowercase{\relax}
\def\suftesi@MakeTextTOCLowercase{\relax}
\fi}
+\newcommand{\partfont}[1]{\def\SUF@PART@StyleSwitch{#1}}
+\newcommand{\chapfont}[1]{\def\SUF@CHAP@StyleSwitch{#1}}
+\newcommand{\secfont}[1]{\def\SUF@SEC@StyleSwitch{#1}}
+\newcommand{\subsecfont}[1]{\def\SUF@SUBSEC@StyleSwitch{#1}}
+\newcommand{\subsubsecfont}[1]{\def\SUF@SUBSUBSEC@StyleSwitch{#1}}
+\newcommand{\chapnumfont}[1]{\def\SUF@thechapter{#1}}
+\newcommand{\secnumfont}[1]{\def\SUF@thesection{#1}}
+\newcommand{\subsecnumfont}[1]{\def\SUF@thesubsection{#1}}
+\newcommand{\subsubsecnumfont}[1]{\def\SUF@thesubsubsection{#1}}
+\newcommand{\titlefont}[1]{\def\SUF@titlefont@Switch{#1}}
+\newcommand{\authorfont}[1]{\def\SUF@authorfont@Switch{#1}}
+\newcommand{\tocchapfont}[1]{\def\SUF@tocCHAP@font{#1}}
+\newcommand{\tocsecfont}[1]{\def\SUF@tocSEC@font{#1}}
+\newcommand{\tocsubsecfont}[1]{\def\SUF@tocSUBSEC@font{#1}}
+\newcommand{\tocsubsubsecfont}[1]{\def\SUF@tocSUBSUBSEC@font{#1}}
+\newcommand{\tocpartnumfont}[1]{\def\SUF@PART@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocchapnumfont}[1]{\def\SUF@CHAP@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsecnumfont}[1]{\def\SUF@SEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsecnumfont}[1]{\def\SUF@SUBSEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsubsecnumfont}[1]{\def\SUF@SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
\define@choicekey{}{headerstyle}[\val\nr]
{inner,center,plain,authortitleinner,
authortitlecenter}[inner]{%
@@ -620,18 +710,16 @@
\relax
\fi}
\RequirePackage{caption}
+\captionsetup{labelsep=period,font=small,textformat=period}
\define@choicekey{}{captionstyle}[\val\nr]
{standard,sanserif,italic,smallcaps}[standard]{%
\ifcase\nr\relax
- \captionsetup{labelsep=period,font=small}
\or
- \captionsetup{labelsep=period,font=small}
\captionsetup{font+=sf}
\or
- \captionsetup{labelsep=period,font=small}
\captionsetup{font+=it}
\or
- \captionsetup{labelsep=period,font=small,labelfont=sc}
+ \captionsetup{labelfont=sc}
\fi
}
\define@choicekey{}{marginpar}[\val\nr]
@@ -656,6 +744,30 @@
\or
\suftesi@pagelefttoctrue
\fi}
+\define@choicekey{}{compacttoc}[\val\nr]{%
+sec,subsec,subsubsec}[sec]{%
+\ifcase\nr\relax
+\suftesi@toccompactsectrue
+\suftesi@toccompactsubsectrue
+\suftesi@toccompactsubsubsectrue
+\def\suf@sscorrect{\hskip.5em}
+\def\suf@ssscorrect{\hskip.5em}
+ \def\suf@ctocdotsec{.}
+ \def\suf@ctocdotssec{}
+ \def\suf@ctocdotsssec{}
+\or
+\suftesi@toccompactsubsectrue
+\suftesi@toccompactsubsubsectrue
+\def\suf@sscorrect{\relax}
+\def\suf@ssscorrect{\hskip.5em}
+ \def\suf@ctocdotssec{.}
+ \def\suf@ctocdotsssec{}
+\or
+\suftesi@toccompactsubsubsectrue
+\def\suf@sscorrect{\relax}
+\def\suf@ssscorrect{\relax}
+ \def\suf@ctocdotsssec{.}
+\fi}
\define@choicekey{}{twocolcontents}[\val\nr]{%
toc,lof,lot,toclof,toclot,loflot,all}[all]{%
\ifcase\nr\relax
@@ -724,13 +836,6 @@
\or
\suftesi@greekfonttrue\suftesi@cbgreektrue
\fi}
-\define@choicekey{}{parindent}[\val\nr]
- {compact,wide}[compact]{%
-\ifcase\nr\relax
-\setlength\parindent{1em}
-\or
-\setlength\parindent{1.5em}
-\fi}
\define@choicekey{}{partpage}[\val\nr]{true,false}[true]{%
\ifcase\nr\relax
\suftesi@partpagetrue
@@ -963,7 +1068,7 @@
subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle,parindent}
+quotesize,footnotestyle,liststyle,captionstyle}
\or
\suftesi@periodicalaureotrue
\suftesi@FSPLtrue
@@ -981,7 +1086,7 @@
subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle,parindent}
+quotesize,footnotestyle,liststyle,captionstyle}
\or
\suftesi@periodicalaureotrue
\suftesi@FSPLtrue
@@ -1000,7 +1105,7 @@
subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle,parindent}
+quotesize,footnotestyle,liststyle,captionstyle}
\fi}
\define@choicekey{}{papertitlestyle}[\val\nr]{%
left,center,right}[left]{%
@@ -1025,7 +1130,6 @@
\or
\def\SUF@titlefont@Switch{\expandafter\SUF@titlesmallcaps}
\fi}
-
\define@choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF@authorfont@Switch{\relax}
@@ -1035,9 +1139,9 @@
\def\SUF@authorfont@Switch{\expandafter\SUF@titlesmallcaps}
\fi}
\ExecuteOptionsX<>{
+ structure=book,
captionstyle=standard,
marginpar=true,
- parindent=compact,
tocstyle=standard,
defaultfont=cochineal,
mathfont=minimal,
@@ -1059,9 +1163,11 @@
subsecfont=roman,
subsubsecfont=roman,
headerfont=roman,
- secnumstyle=arabic,
partnumstyle=Roman,
chapnumstyle=arabic,
+ secnumstyle=arabic,
+ subsecnumstyle=arabic,
+ subsubsecnumstyle=arabic,
smallcapsstyle=low,
titlefont=italic,
authorfont=roman,
@@ -1069,8 +1175,6 @@
tocauthorfont=roman,
revauthortitle=false,
papertitlestyle=left,
- authorfont=roman,
- titlefont=italic,
tocchapfont=roman,
tocsecfont=roman,
tocsubsecfont=roman,
@@ -1087,12 +1191,12 @@
\XKV@useoption{legalpaper}\XKV@useoption{executivepaper}
\XKV@useoption{landscape}
\def\XKV@classoptionslist{}
-\RequirePackage{color}
- \definecolor{sufred}{rgb}{0.5,0,0}
- \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
\RequirePackage{multicol}
\RequirePackage{emptypage}
\RequirePackage{microtype}
+\RequirePackage{color}
+\definecolor{sufred}{rgb}{0.5,0,0}
+\definecolor{sufgray}{rgb}{0.5,0.5,0.5}
\RequirePackage{iftex}
\ifLuaTeX
\RequirePackage{luatex85}
@@ -1390,63 +1494,61 @@
{\SUF@CHAP@StyleSwitch}
\fi
\ifsuftesi@numparchap
- \setlength{\SUF@ADJnumparchap}{-2.5\baselineskip}
+ \setlength{\SUF@ADJnumparchap}{-6ex}
\else
\setlength{\SUF@ADJnumparchap}{0pt}
\fi}
\def\SUF@default@SECTIONS{
\ifsuftesi@numparsec
\titleformat{\section}[display]
- {\SUF@sectionsize\SUF@lr@SECSwitch}
- {\ifsuftesi@article\SUF@thesection
- \else\thesection\fi\SUF@dotsec}
- {0ex}
- {\SUF@SEC@StyleSwitch}
-\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
+{\SUF@sectionsize\SUF@lr@SECSwitch}
+{\SUF@thesection\SUF@dotsec}
+{0ex}
+{\SUF@SEC@StyleSwitch}
+\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\section}[hang]
- {\SUF@sectionsize\SUF@lr@SECSwitch}
- {\ifsuftesi@article\SUF@thesection
- \else\thesection\fi\SUF@dotsec}
- {1em}
- {\SUF@SEC@StyleSwitch}
-\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
+{\SUF@sectionsize\SUF@lr@SECSwitch}
+{\SUF@thesection\SUF@dotsec}
+{1em}
+{\SUF@SEC@StyleSwitch}
+\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi@numparsubsec
\titleformat{\subsection}[display]
- {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
- {\textnormal\thesubsection}
- {0ex}
- {\SUF@SUBSEC@StyleSwitch}
+{\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+{\textnormal\SUF@thesubsection\SUF@dotsubsec}
+{0ex}
+{\SUF@SUBSEC@StyleSwitch}
\titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\subsection}[hang]
- {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
- {\textnormal\thesubsection}
- {1em}
- {\SUF@SUBSEC@StyleSwitch}
+{\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+{\textnormal\SUF@thesubsection\SUF@dotsubsec}
+{1em}
+{\SUF@SUBSEC@StyleSwitch}
\titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi@numparsubsubsec
\titleformat{\subsubsection}[display]
- {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
- {\textnormal\thesubsubsection}
- {0ex}
- {\SUF@SUBSUBSEC@StyleSwitch}
+{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
+{0ex}
+{\SUF@SUBSUBSEC@StyleSwitch}
\titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\subsubsection}[hang]
- {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
- {\textnormal\thesubsubsection}
- {1em}
- {\SUF@SUBSUBSEC@StyleSwitch}
+{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
+{1em}
+{\SUF@SUBSUBSEC@StyleSwitch}
\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi
}
\SUF@default@CHAPTER
\SUF@default@SECTIONS
\ifsuftesi@periodical
- \titlespacing*{\chapter}{0em}{0\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi@periodicalaureo
@@ -1470,7 +1572,7 @@
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else%standard/standardaureo
\titlespacing*{\chapter}{0em}{%
- \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
+ \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
\fi
\fi
@@ -1504,13 +1606,13 @@
\fi
\ifsuftesi@numparpart
\titleformat{\part}[display]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{2ex}
{\SUF@PART@StyleSwitch}
\else
\titleformat{\part}[hang]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{1em}
{\SUF@PART@StyleSwitch}
@@ -1518,13 +1620,13 @@
\else
\ifsuftesi@numparpart
\titleformat{\part}[display]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{2ex}
{\SUF@PART@StyleSwitch}
\else
\titleformat{\part}[hang]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{1em}
{\SUF@PART@StyleSwitch}
@@ -1545,7 +1647,7 @@
{}
[{.}\hspace*{1em}]
\titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
-\ifsuftesi@article
+\ifsuftesi@article
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\refname]{%
@@ -1577,7 +1679,7 @@
\subsection{#1}}}%
{\relax}%
}%
-\else
+\else
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\bibname]{%
@@ -1691,7 +1793,6 @@
\def\isbn#1{\gdef\@issn{#1}}
\def\@issn{\@latex@warning@no@line{%
No \noexpand\isbn given}}
-
\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
\edef\title{\noexpand\@dblarg
\expandafter\noexpand\csname\string\title\endcsname}
@@ -1936,7 +2037,6 @@
\protect\ClassWarningNoLine{suftesi}{%
No \string\author\space given\MessageBreak%
See the class documentation for explanation}}
-
\newcommand*\l@title[2]{%
\ifnum \c@tocdepth >\m@ne
\addpenalty{-\@highpenalty}%
@@ -2123,49 +2223,79 @@
\columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
-\newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}}
- \appendicesname{Appendici}
- \newcommand{\appendixpage}{\SUF@appendixpage}
-\def\SUF@appendixpage{%
- \@mainmattertrue
- \titlecontents{part}
- [0em]
- {\addvspace{3ex}}
- {}
- {}
- {}
- [\addvspace{1ex}]
-\let\contentspage\relax
- \cleardoublepage
- \thispagestyle{empty}
- \addcontentsline{toc}{part}{\SUF@appendices}
- \begingroup
- \centering
- \null\vfil
- {\LARGE\SUF@appendices\par}
- \vfil
- \endgroup
- \cleardoublepage
-\titlecontents{part}
- [0em]
- {\addvspace{3ex}\partname~}
- {\makebox[\SUF@label@part][l]{%
- \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
- {}
- {}
- [\addvspace{1ex}]
+\RequirePackage{appendix}
+\renewcommand{\appendixpagename}{Appendici}
+\renewcommand{\appendixtocname}{Appendici}
+\renewcommand{\appendixname}{Appendice}
+\noappendicestocpagenum
+\def\appendicesname{%
+ \ClassError{suftesi}%
+ {Command \noexpand\appendicesname undefined\MessageBreak
+ Redefine the \noexpand\appendixpagename command instead.
+ See the 'appendix' package documentation.\MessageBreak
+ \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}
+{Command \noexpand\appendicesname undefined\MessageBreak
+ Redefine the \noexpand\appendixpagename command instead.
+ See the 'appendix' package documentation.\MessageBreak
+ \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}}
+\renewcommand{\@chap@pppage}{%
+\clear@ppage
+\thispagestyle{plain}%
+\if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
+\null\vfil
+\markboth{}{}%
+{\centering
+\interlinepenalty \@M
+\normalfont
+\SUF@chaptersize
+ \SUF@CHAP@StyleSwitch\expandafter\appendixpagename\par}%
+\if@dotoc@pp
+\addappheadtotoc
+\fi
+\vfil\newpage
+\if@twoside
+\if@openright
+\null
+\thispagestyle{empty}%
+\newpage
+\fi
+\fi
+\if@tempswa
+\twocolumn
+\fi
+}
+\renewcommand{\@sec@pppage}{%
+\par
+\addvspace{4ex}%
+\@afterindentfalse
+{\parindent \z@ \raggedright
+\interlinepenalty \@M
+\normalfont
+\SUF@chaptersize
+ \SUF@CHAP@StyleSwitch\expandafter\appendixpagename%
+\markboth{}{}\par}%
+\if@dotoc@pp
+\addappheadtotoc
+\fi
+\nobreak
+\vskip 3ex
+\@afterheading
}
\ifsuftesi@article
\renewcommand\appendix{\par
\setcounter{section}{0}%
\setcounter{subsection}{0}%
- \gdef\SUF@thesection{\@Alph\c@section}}
+ \gdef\SUF@thesection{\@Alph\c@section}%
+ \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
+ \renewcommand{\thesection}{\@Alph\c@section}}
\else
\renewcommand\appendix{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
\gdef\@chapapp{\appendixname}%
- \gdef\SUF@thechapter{\@Alph\c@chapter}}
+ \gdef\SUF@thechapter{\@Alph\c@chapter}%
+ \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
+ \renewcommand{\thechapter}{\@Alph\c@chapter}}
\fi
\RequirePackage{fancyhdr}
\newcommand{\versionstring}[1]{\def\version@string{#1}}
@@ -2176,9 +2306,9 @@
\renewcommand{\footnoterule}{}
\def\SUF@versionstring{\texttt{\version@string{} \today}}
\renewcommand{\chaptermark}[1]{%
- \markboth{\chaptertitlename\ \SUF@thechapter}{#1}}
+ \markboth{\chaptertitlename\ \protect\SUF@HEAD@thechapter}{#1}}
\ifsuftesi@article
- \renewcommand{\sectionmark}[1]{\markright{\SUF@thesection.\ #1}}
+ \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
\else
\renewcommand{\sectionmark}[1]{}
\fi
@@ -2234,7 +2364,7 @@
{\list{}{\leftmargin \parindent
\SUF@quote@style}%
\item\relax%
- \SUF@quotation@size}%\ignorespaces?
+ \SUF@quotation@size}% \ignorespaces?
{\endlist}
\renewenvironment{verse}
{\let\\\@centercr
@@ -2409,6 +2539,8 @@
\addtolength{\csname SUF@tocindent@#1\endcsname}{#2}%
}
}
+\newcommand{\adjtoclabelsep}{\hskip.2em plus 1pt minus 1pt}
+\newcommand{\adjtocpagesep}{\hskip.5em plus 2pt minus 1pt}
\newcommand{\toclabelspace}{%
\ClassError{suftesi}
{\MessageBreak
@@ -2451,7 +2583,7 @@
[0em]
{\addvspace{3ex}\partname\hspace*{.5em}}
{\makebox[\SUF@label@part][l]{%
- \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
+ \thecontentslabel}\hspace*{1em}}
{}
{}
[\addvspace{1ex}]
@@ -2514,48 +2646,64 @@
\makebox[1em][l]{\thecontentspage}%
\hskip\SUF@addto@tochang@chap%
\makebox[\SUF@label@chap][l]{%
- \SUF@toclabelnum\thecontentslabel}\hspace*{1em}%
+ \SUF@CHAP@thecontentslabel}\hspace*{1em}%
\SUF@tocCHAP@font}
{\hskip-\SUF@tochang@chap%
\makebox[1em][l]{\thecontentspage}%
\hskip\SUF@addto@tochang@chap\SUF@tocCHAP@font}
{}
[\addvspace{1ex}]
+\ifsuftesi@toccompactsec
+\titlecontents*{section}[\SUF@tochang@chap]{}{%
+\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{,
+\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+\else
\titlecontents{section}
[\SUF@tochang@sec]
{}
{\hskip-\SUF@tochang@sec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
- \makebox[\SUF@label@sec][l]{%
- \ifsuftesi@article\SUF@toclabelnum%
- \else\fi\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}%
\SUF@tocSEC@font}
{\hskip-\SUF@tochang@sec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
\SUF@tocSEC@font}
{}
+\fi
+\ifsuftesi@toccompactsubsec
+\titlecontents*{subsection}[\SUF@tochang@sec]{\suf@sscorrect}{%
+\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{,
+\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+\else
\titlecontents{subsection}
[\SUF@tochang@subsec]
{}
{\hskip-\SUF@tochang@subsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
- \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@thecontentslabel}\hspace*{1em}%
\SUF@tocSUBSEC@font}
{\hskip-\SUF@tochang@subsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
\SUF@tocSUBSEC@font}
{}
+\fi
+\ifsuftesi@toccompactsubsubsec
+\titlecontents*{subsubsection}[\SUF@tochang@subsec]{\suf@ssscorrect}{%
+\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{,
+\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+\else
\titlecontents{subsubsection}
[\SUF@tochang@subsubsec]
{}
{\hskip-\SUF@tochang@subsubsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
- \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@thecontentslabel}\hspace*{1em}%
\SUF@tocSUBSUBSEC@font}
{\hskip-\SUF@tochang@subsubsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
\SUF@tocSUBSUBSEC@font}
{}
+\fi
\titlecontents{paragraph}
[\SUF@tochang@par]
{}
@@ -2638,43 +2786,59 @@
[\SUF@tocindent@chap]
{\addvspace{2ex}}
{\hskip-\SUF@tocindent@chap%
- \makebox[\SUF@label@chap][l]{\SUF@toclabelnum\thecontentslabel}%
+ \makebox[\SUF@label@chap][l]{\SUF@CHAP@thecontentslabel}%
\hspace*{1em}%
\SUF@tocCHAP@font}
{\hskip-\SUF@tocindent@chap%
\SUF@tocCHAP@font}
{\SUF@chaptitlerule\contentspage}
[\addvspace{1ex}]
+\ifsuftesi@toccompactsec
+\titlecontents*{section}[\SUF@tocindent@chap]{}{%
+\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{,
+\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+\else
\titlecontents{section}
[\SUF@tocindent@sec]
{}
{\hskip-\dimexpr(\SUF@label@sec+1em)%
- \makebox[\SUF@label@sec][l]{%
- \ifsuftesi@article\SUF@toclabelnum%
- \else\fi\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}%
\SUF@tocSEC@font}
{\hskip-\dimexpr(\SUF@label@sec+1em)%
\SUF@tocSEC@font}
{\ifsuftesi@article\SUF@chaptitlerule%
\else\SUF@titlerule\fi\contentspage}
+\fi
+\ifsuftesi@toccompactsubsec
+\titlecontents*{subsection}[\SUF@tocindent@sec]{\suf@sscorrect}{%
+\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{,
+\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+\else
\titlecontents{subsection}
[\SUF@tocindent@subsec]
{}
{\hskip-\dimexpr(\SUF@label@subsec+1em)%
- \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@thecontentslabel}\hspace*{1em}%
\SUF@tocSUBSEC@font}
{\hskip-\dimexpr(\SUF@label@subsec+1em)%
\SUF@tocSUBSEC@font}
{\SUF@titlerule\contentspage}
+\fi
+\ifsuftesi@toccompactsubsubsec
+\titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\suf@ssscorrect}{%
+\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{,
+\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+\else
\titlecontents{subsubsection}
[\SUF@tocindent@subsubsec]
{}
{\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
- \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@thecontentslabel}\hspace*{1em}%
\SUF@tocSUBSUBSEC@font}
{\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
\SUF@tocSUBSUBSEC@font}
{\SUF@titlerule\contentspage}
+\fi
\titlecontents{paragraph}
[\SUF@tocindent@par]
{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/suftesi.tlpobj new/tlpkg/tlpobj/suftesi.tlpobj
--- old/tlpkg/tlpobj/suftesi.tlpobj 2019-02-28 04:06:30.000000000 +0100
+++ new/tlpkg/tlpobj/suftesi.tlpobj 2020-02-26 01:55:06.000000000 +0100
@@ -1,14 +1,13 @@
name suftesi
category Package
-revision 49138
+revision 53903
shortdesc A document class for typesetting theses, books and articles
relocated 1
longdesc The class can be used to typeset any kind of book (originally
longdesc designed for use in the humanities).
-runfiles size=21
+runfiles size=23
RELOC/tex/latex/suftesi/suftesi.cls
catalogue-ctan /macros/latex/contrib/suftesi
-catalogue-date 2018-11-12 12:44:06 +0100
catalogue-license lppl1.3
catalogue-topics book-pub class dissertation
-catalogue-version 2.9.1
+catalogue-version 2.9.8
++++++ superiors.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/superiors/README new/doc/fonts/superiors/README
--- old/doc/fonts/superiors/README 2015-03-02 23:00:03.000000000 +0100
+++ new/doc/fonts/superiors/README 2019-08-19 22:57:34.000000000 +0200
@@ -1,11 +1,14 @@
This small package provides a means of adding to or modifying the superior figures used for footnote and endnote markers in any font collection.
-Current version: 1.05
+Current version: 1.06
This material is subject to the LaTeX Project Public License. See
http://www.ctan.org/license/lppl1.3
for the details of that license.
+Changes in 1.06
+Added more abbreviations and added a check for KOMA, with which it is incompatibe.
+
Changes in 1.05
1. Added option to allow the tfm containing the superior figures to be specified by an abbreviation.
2. Modified code so that options supspaced and raised actually do what they are claimed to do.
Binary files old/doc/fonts/superiors/superiors-doc.pdf and new/doc/fonts/superiors/superiors-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/superiors/superiors-doc.tex new/doc/fonts/superiors/superiors-doc.tex
--- old/doc/fonts/superiors/superiors-doc.tex 2015-03-02 23:00:03.000000000 +0100
+++ new/doc/fonts/superiors/superiors-doc.tex 2019-08-19 22:57:34.000000000 +0200
@@ -9,7 +9,7 @@
\usepackage[TS1,T1]{fontenc}
\usepackage{textcomp}
\usepackage[scaled=.85]{beramono}
-\usepackage[libertine,cmbraces]{newtxmath}
+\usepackage[libertine]{newtxmath}
\makeatletter
\def\libertine@figurestyle{OsF}
\makeatother
@@ -27,10 +27,19 @@
\section{Briefly}
The default behavior of footnote and endnote markers in \LaTeX\ is to print the number as if it were a mathematical superscript. In most cases, this means the size is about 70\% of the normal lining figure and the top is somewhat above the tops of capital letters. In many cases, the superscript figure is simply reduced in all dimensions by about 70\%, making them appear rather slight, though overly tall. (The \textsf{libertine} package used for preparing this document has a custom footnote illustrated below.)
-As an alternative, one may use superior figures---small figures, usually 50\% to 60\% of the height of lining figures, like \textsu{1234567890}. Commonly, they are designed so that the tops of the numbers are aligned with the tops of the capital letters in the font, though sometimes a little higher, corresponding to the ascender height. PostScript fonts have for a long time mostly contained just a small subset $\{1,2,3\}$ of the possible superior digits, and most OpenType fonts in the Adobe portfolio, other than the most popular and the most recent, contain the same small subset. Moreover, the \textsf{TS1} encoding includes slots for only those three superior figures. Even the recent STIX collection contains just the basic three.
+As an alternative, one may use superior figures---small figures, usually 50\% to 60\% of the height of lining figures, like \textsu{1234567890}. Commonly, they are designed so that the tops of the numbers are aligned with the tops of the capital letters in the font, though sometimes a little higher, corresponding to the ascender height. PostScript fonts have for a long time mostly contained just a small subset $\{1,2,3\}$ of the possible superior digits, and most OpenType fonts in the Adobe portfolio, other than the most popular and the most recent, contain the same small subset. Moreover, the \textsf{TS1} encoding includes slots for only those three superior figures. Even the recent STIX collection contains just the basic three, at least in its original distribution.
-This package allows you to add a full set of superior figures to a font family that lacks one. It uses two predefined collections---the default is {\tt ntxsups-Regular-t1}, drawn from TeX Gyre Termes, while the second, {\tt libertinesups}, is taken from Libertine-Legacy. (The standard \textsf{libertine} package provides no access to these glyphs other than through footnote markers.) In addition, you may specify any \TeX\ tfm whose figure slots contain superior figures. The package also allows you to scale the size of the imported figures, to take into account your general font scaling, and to specify an amount by which to raise the imported, rescaled figures. You may also specify a spacing to apply before the footnote marker, using the option {\tt supspaced}. The package should be loaded after your Roman text font package\footnote{The {\tt newtxtext} package uses the {\tt ntxsups-*} superiors contained in the newtx package by default for footnote markers.}.
+This package allows you to add a full set of superior figures to a font family that lacks one. It uses two predefined collections---the default is {\tt ntxsups-Regular-t1}, drawn from TeX Gyre Termes, while the second, {\tt libertinesups}, is taken from Libertine-Legacy. (The standard \textsf{libertine} package provides no access to these glyphs other than through footnote markers.) In addition, you may specify any \TeX\ tfm whose figure slots contain superior figures. The package also allows you to scale the size of the imported figures, to take into account your general font scaling, and to specify an amount by which to raise the imported, rescaled figures. You may also specify a spacing to apply before the footnote marker, using the option {\tt supspaced}. The package should be loaded \textbf{after} your Roman text font package\footnote{The {\tt newtxtext} package uses the {\tt ntxsups-*} superiors contained in the newtx package by default for footnote markers.} so that it overwrites any existing definitions of \verb|\sustyle| (a switch to turn on superior letters and figures, usually employed within braces to limit its effect, \verb|\textsu| (a macro that applies the \verb|\sustyle| switch to its argument) and the footnote style macros.
+
+\textsc{Important Notes:} \\
+\begin{itemize}
+\item
+\verb|\sustyle| is a simple text switch---the value of the parameter {\tt raised} is ignored;
+\item \verb|\textsu| is a macro that reads the value of {\tt raised} and, if it is non-zero, created an \verb|\hbox| from its argument and raises it by the specified amount. In the latter case, the argument must be short as line breaks will not happen. If on the other hand {\tt raised} has a zero value, \verb|\textsu| acts like \verb|\sustyle|, permitting line breaks to occur.
+\item This package is not compatible with KOMA classes or packages and will stop loading if one is detected, leaving only a line in the log file.
+
+\end{itemize}
\textsc{Sample Invocations:}
@@ -104,6 +113,10 @@
Baskervaldx
garamondx
XCharter
+baskervillef
+cochineal
+stickstoo
+fbb
Adobe Bembo Std
Adobe Caslon Pro
Adobe Warnock Pro
@@ -121,16 +134,20 @@
You may, as of version 1.05, refer to a font to use for superior figures by using an abbreviated form. The following abbreviations are known to {\tt superiors} and may be activated by setting the option {\tt supsfam} to one of:
\begin{verbatim}
-newtx ---ntxsups-Regular-ot1,%
-newtxtext ---ntxsups-Regular-ot1,%
-newpx ---zplsups-Regular-ot1,%
-newpxtext ---zplsups-Regular-ot1,%
+newtx ---ntxsups-Regular-t1,%
+newtxtext ---ntxsups-Regular-t1,%
+newpx ---zplsups-Regular-t1,%
+newpxtext ---zplsups-Regular-t1,%
libertine ---libertinesups,%
garamondx ---NewG8-sups,%
zgm ---NewG8-sups,%
erewhon ---Erewhon-Regular-sup-t1,%
xcharter ---XCharter-Roman-sup-t1,%
baskervaldx ---Baskervaldx-Reg-sup-t1
+baskervillef ---BaskervilleF-Regular-sup-t1
+cochineal ---Cochineal-Roman-sup-t1
+stickstoo ---SticksToo-Regular-sup-t1
+fbb ---fbb-Regular-sup-t1
\end{verbatim}
For example, loading {\tt superiors} with the line
\begin{verbatim}
@@ -138,7 +155,7 @@
\end{verbatim}
has the same effect as
\begin{verbatim}
-\usepackage[supstfm=zplsups-Regular-ot1]{superiors}
+\usepackage[supstfm=zplsups-Regular-t1]{superiors}
\end{verbatim}
but may be easier to remember.
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/superiors.doc.tlpobj new/tlpkg/tlpobj/superiors.doc.tlpobj
--- old/tlpkg/tlpobj/superiors.doc.tlpobj 2019-02-28 04:06:30.000000000 +0100
+++ new/tlpkg/tlpobj/superiors.doc.tlpobj 2019-08-20 01:53:48.000000000 +0200
@@ -1,9 +1,9 @@
name superiors.doc
category Package
-revision 36422
+revision 51909
shortdesc doc files of superiors
relocated 1
-docfiles size=89
+docfiles size=93
RELOC/doc/fonts/superiors/README
RELOC/doc/fonts/superiors/libfoot0-crop.pdf
RELOC/doc/fonts/superiors/libfoot1-crop.pdf
++++++ superiors.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/superiors/superiors.sty new/tex/latex/superiors/superiors.sty
--- old/tex/latex/superiors/superiors.sty 2015-03-02 23:00:03.000000000 +0100
+++ new/tex/latex/superiors/superiors.sty 2019-08-19 22:57:34.000000000 +0200
@@ -1,14 +1,26 @@
\NeedsTeXFormat{LaTeX2e}
-\def\superiorsVersion{1.05}
-\def\superiorsDate{2015/03/01}
+\def\superiorsVersion{1.06}
+\def\superiorsDate{2019/08/18}
\ProvidesPackage{superiors}[\superiorsDate\space-\space\superiorsVersion
superiors (License LPPL) Michael Sharpe]
+\newif\ifsuperiors@KOMA
+\@ifundefined{KOMAClassName}{}{\superiors@KOMAtrue}
+\@ifundefined{ver@scrextend.sty}{}{\superiors@KOMAtrue}
+\ifsuperiors@KOMA
+ \message{Cannot load superiors with any KOMA class or package.^^J}
+ \endinput
+\fi
\RequirePackage{xkeyval}
\RequirePackage{pgffor}
-
+% Ensure that T1 is loaded, but don't change existing default encoding
+\def\t@one{T1}
+\ifx\encodingdefault\t@one\else%
+ \usepackage[T1,\encodingdefault]{fontenc}
+\fi
\def\sups@tfm{ntxsups-Regular-t1}
\let\sups@fam\@empty
\newdimen\superiors@scale
+\newdimen\superiors@raise
\def\superiors@raised{\z@}
\def\superiors@spaced{.04em}
\def\superiors@scaledval{1.0}
@@ -27,22 +39,32 @@
\ProcessOptions*
+\setlength{\superiors@raise}{\superiors@raised}
\setlength{\superiors@scale}{\superiors@scaledval\p@}
\superiors@scale=\superiors@supscale\superiors@scale %
\def\superiors@scaled{s*[\strip@pt\superiors@scale]}
\let\superiors@makefnmark\@makefnmark
\ifx\sups@fam\@empty\else%
-\foreach\x/\y in {newtx/ntxsups-Regular-ot1,%
-newtxtext/ntxsups-Regular-ot1,%
-newpx/zplsups-Regular-ot1,%
-newpxtext/zplsups-Regular-ot1,%
+\foreach\x/\y in {newtx/ntxsups-Regular-t1,%
+newtxtext/ntxsups-Regular-t1,%
+newpx/zplsups-Regular-t1,%
+newpxtext/zplsups-Regular-t1,%
libertine/libertinesups,%
garamondx/NewG8-sups,%
zgm/NewG8-sups,%
erewhon/Erewhon-Regular-sup-t1,%
xcharter/XCharter-Roman-sup-t1,%
-baskervaldx/Baskervaldx-Reg-sup-t1}
+baskervaldx/Baskervaldx-Reg-sup-t1,%
+baskervillef/BaskervilleF-Regular-sup-t1,%
+Baskervillef/BaskervilleF-Regular-sup-t1,%
+cochineal/Cochineal-Roman-sup-t1,%
+Cochineal/Cochineal-Reoman-sup-t1,%
+cochineal/Cochineal-Regular-sup-t1,%
+stickstoo/SticksToo-Regular-sup-t1,%
+stickstootext/SticksToo-Regular-sup-t1,%
+SticksToo/SticksToo-Regular-sup-t1,%
+fbb/fbb-Regular-sup-t1}
{\ifx\x\sups@fam\xdef\sups@tfm{\y}\breakforeach\fi}
\fi
@@ -54,8 +76,12 @@
\not@math@alphabet\sustyle\relax
\usefont{U}{zsups}{m}{n}}
-\def\textsu#1{\raisebox{\superiors@raised}{\hbox{{\sustyle#1}}}}
-
+\ifdim\superiors@raise=\z@
+ \DeclareRobustCommand{\textsu}[1]{{\sustyle#1}}
+\else
+ \DeclareRobustCommand{\textsu}[1]{%
+ \raisebox{\superiors@raised}{\hbox{{\sustyle#1}}}}
+\fi
%\def\@makefnmark{\hbox{\textsu{\hspace*{\superiors@spaced}\@thefnmark}}}
\def\f@@tn@te{footnote}
\def\@makefnmark{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/superiors.tlpobj new/tlpkg/tlpobj/superiors.tlpobj
--- old/tlpkg/tlpobj/superiors.tlpobj 2019-02-28 04:06:30.000000000 +0100
+++ new/tlpkg/tlpobj/superiors.tlpobj 2019-08-20 01:53:48.000000000 +0200
@@ -1,6 +1,6 @@
name superiors
category Package
-revision 36422
+revision 51909
shortdesc Attach superior figures to a font family
relocated 1
longdesc The package allows the attachment of an arbitrary superior
@@ -16,7 +16,7 @@
RELOC/fonts/type1/public/superiors/libertinesups.pfb
RELOC/tex/latex/superiors/superiors.sty
catalogue-ctan /fonts/superiors
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-08-19 15:57:06 +0200
catalogue-license lppl
catalogue-topics font font-symbol font-type1 font-supp
-catalogue-version 1.05
+catalogue-version 1.06
++++++ supertabular.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/supertabular/CATALOG new/doc/latex/supertabular/CATALOG
--- old/doc/latex/supertabular/CATALOG 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/supertabular/CATALOG 2020-02-03 23:32:05.000000000 +0100
@@ -1,7 +1,7 @@
Name: supertabular (also called supertab)
-Problems-To: texniek@braams.cistron.nl
+Problems-To: texniek@braams.xs4all.nl
Author: J.L. Braams and T. Jurriens
-Version: 4.1d
+Version: 4.1g
Description:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/supertabular/ChangeLog new/doc/latex/supertabular/ChangeLog
--- old/doc/latex/supertabular/ChangeLog 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/supertabular/ChangeLog 2020-02-03 23:32:05.000000000 +0100
@@ -1,59 +1,105 @@
-2001-08-21 Johannes Braams (texniek at braams.cistron.nl)
+2020-02-02 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * supertabular.dtx: Replaced the way the height of normal tabular
+ lines is calculated by basing it on the height and depth of
+ \strutbox. This also ment being able to take the \extrarowheight
+ from the array package into account.
+ Also the height of the first and subsequent heads was not taken
+ into account in the calculation of the available pageheigt. This
+ meant that especially the first part of the table could become too
+ high and hence be forced onto the next page (which is, by
+ consequence) not entirely filled).
+ Finally, if a caption preceeds the table, the entire height of the
+ caption and the white space around it may not yet be accounted in
+ \pagesofar. Therefore we substract a little extra from
+ \ST@pageleft.
+
+2020-01-26 Johannes Braams <texniek at braams.xs4all.nl>
+ * supertabular.dtx: Updated the copyright year and rearranged the
+ text around the examples in order to get the first table to split
+ accross a page boundary again.
+
+2019-01-18 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * supertabular.dtx: The linenumber in the tracing information, that
+ is reported from within \\, is off by one when the optional
+ argument is missing. Therefore the input linenumber is now saved
+ before TeX starts scanning. Problem reported by Frank Mittelbach.
+
+2019-01-16 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * supertabular.dtx: The option "pageshow" didn't work as it set a
+ too low value in \c@tracingst. Problem reported by Frank
+ Mittelbach.
+
+2019-01-12 Johannes Braams <texniek at braams.xs4all.nl>
+ * supertabular.dtx : The definition for the first table head was
+ different from the definition of the regular table heads.
+ This problem was reported by FMi as it produced an extra table in
+ an example.
+ The same was true for the table tail and the last table tail,
+ applied the same fix.
+ FMi also reported that a first table head, once set would appear on
+ all subsequent supertabulars. The internal macro's now `undefine'
+ themselves although this couteracts the change that was introduced
+ on 08-08-1999.
+
+2001-08-21 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : The macro \ST@next needs to be defined when
\ST@skippage was called. Therefore I moved the default definition
to earlier in the code; just before the \if clause after which it
is called; possibly defined by \ST@newpage. This problem was
- reported by Andrew Dorrell (dorrell@research.canon.com.au).
+ reported by Andrew Dorrell .
-1999-08-08 Johannes Braams (texniek at braams.cistron.nl)
+1999-08-08 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : No longer re-initialize the internal variable
\@table@first@head and \@table@last@tail. This made it impossible
to have more than one supertabular in the same document with the
exact same appearance of the heads and tail without repeatedly
redeclaring the firsthead and/or lasttail. Reported by Christian
- Matuszewski (matuszew at informatik.uni-halle.de).
+ Matuszewski .
-Fri Nov 7 20:27:27 1997 Johannes Braams (texniek at braams.cistron.nl)
+Fri Nov 7 20:27:27 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : For standard LaTeX we need to change
\@@startpbox not \@startpbox. Found by Peter R Wilson
- (Peter.Wilson@PSS.Boeing.com)
+
-Wed Oct 8 22:35:40 1997 Johannes Braams (texniek at braams.cistron.nl)
+Wed Oct 8 22:35:40 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Running the documentation revealed a loop;
inside the table tail and head \\ was reset to \@tabularcr instead
of to \@@tabularcr (now: \org@tabularcr). First found by Thomas
- Esser (te at informatik.uni-hannover.de)
+ Esser
-Sat Sep 27 21:35:29 1997 Johannes Braams (texniek at braams.cistron.nl)
+Sat Sep 27 21:35:29 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Added the mpsupertabular and mpsupertabular*
- environments provided by Axel Kielhorn (A.Kielhorn at tu-bs.de);
+ environments provided by Axel Kielhorn ;
added \noindent in front of all the starts of tabulars and
minipages as it seems senseles to have a paragraph indent in front
of a large tabularl; fixed a few documentation bugs.
The calculation of the available height still missed the case
where TeX has already begun the second column.
-Thu Sep 18 00:31:55 1997 Johannes Braams (texniek at braams.cistron.nl)
+Thu Sep 18 00:31:55 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : The \tablehead and \tabletail commands reset
the command \\; they used \cr for it. That should have been
\@tabularcr to properly deal with it's optional argument.
- Found by Axel Kielhorn (A.Kielhorn at tu-bs.de)
+ Found by Axel Kielhorn
-Wed Sep 17 23:59:13 1997 Johannes Braams (texniek at braams.cistron.nl)
+Wed Sep 17 23:59:13 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : In two column mode the parameters that
determine how much space is left on the page were not correctly
initialised when TeX hasn't yet filled up the first column
completely.
- Found by Jeffrey Spielberg (jspielberg at infinet-software.com)
+ Found by Jeffrey Spielberg
-Tue May 20 23:46:08 1997 Johannes Braams (texniek at braams.cistron.nl)
+Tue May 20 23:46:08 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : \shrinkheight didn't shrink the available
height for a part of the tabular (as documented); it just *set* it
@@ -61,43 +107,43 @@
\setSTheight for the former functionality
At the end of a supertabular \@table@first@head and
\@table@last@tail are undefined; this shoud be done globally.
- Found by Axel Kielhorn (A.Kielhorn at tu-bs.de)
+ Found by Axel Kielhorn
-Sat Apr 12 23:37:33 1997 Johannes Braams (texniek at braams.cistron.nl)
+Sat Apr 12 23:37:33 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : Added \ST@stretchht and \ST@prevht to improve
decision process. \estimate@lineht now also computes the
difference between a normal line height and when \arraystretch is
in effect.
-Thu Apr 10 23:33:07 1997 Johannes Braams (texniek at braams.cistron.nl)
+Thu Apr 10 23:33:07 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Had to repaire some documentation errors.
- (found by Thomas Esser (te at informatik.uni-hannover.de))
+ (found by Thomas Esser )
-Wed Apr 9 00:29:36 1997 Johannes Braams (texniek at braams.cistron.nl)
+Wed Apr 9 00:29:36 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : Only the first part of a supertabular can be
moved to the next page. Therefore we need to change the definition
of \ST@skippage in the middle of processing the supertabular data.
-Thu Mar 6 21:56:18 1997 Johannes Braams (texniek at braams.cistron.nl)
+Thu Mar 6 21:56:18 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : Using a tabular environment in the cells of a
supertabular gives `interesting' results when the algorithm
decides to split the supertabular down the middle of an inner
tabular. A number of changes were necessary to make this work.
- Found by Axel Kielhorn (i0080108 at ws.rz.tu-bs.de)
+ Found by Axel Kielhorn
-Thu Feb 20 23:29:18 1997 Johannes Braams (texniek at braams.cistron.nl)
+Thu Feb 20 23:29:18 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Renamed \tableformat into \ST@tableformat
because the KOPMA-packages also use \tableformat and therefore
clashed with babel.
- Found by Axel Kielhorn (i0080108 at ws.rz.tu-bs.de)
+ Found by Axel Kielhorn
-Tue Feb 4 23:50:50 1997 Johannes Braams (texniek at braams.cistron.nl)
+Tue Feb 4 23:50:50 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx (section{The Implementation}): Removed the use
of the page height correction for p-columns; the current algorithm
@@ -109,7 +155,7 @@
page on a calculated minimum height of the table. The minimum is
the head, the tail and 1 line of tabular data.
-Thu Nov 28 20:38:53 1996 Johannes Braams (texniek at braams.cistron.nl)
+Thu Nov 28 20:38:53 1996 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Started a cleanup of the code, made source
file a full fledged .dtx file
@@ -122,12 +168,12 @@
% jurriens at fwn.rug.nl P.O Box 800, 9700 AV Groningen
%
% revised by: Johannes Braams
-% texniek at braams.cistron.nl TeXniek (NL)
+% texniek at braams.xs4all.nl TeXniek (NL)
% \def\fileversion{3.7c}
% \def\filename{supertabular sty}
% \def\filedate{1995/10/16}
%
-% \changes{v3.7c}{1995/10/16}{No space after the argument of
+% \changes{v3.7c}{1995/10/16}{No space after the argument of
% supertabular led to a `mysterious' error because of the space
% delemiting the argument}
% \changes{v3.7b}{1994/05/16}{Rewrote the page break deciding
@@ -195,7 +241,7 @@
% Reintroduced the version numbering
%
% revised by: Gabriele Kruljac
-% kruljac at ds0mpi11 Max-Planck-Institute Stuttgart
+% kruljac@ds0mpi11 Max-Planck-Institute Stuttgart
%
%
% 06.06.89 Correction: now care is taken of probably existing onecolumn
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/supertabular/MANIFEST new/doc/latex/supertabular/MANIFEST
--- old/doc/latex/supertabular/MANIFEST 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/supertabular/MANIFEST 2020-02-03 23:32:05.000000000 +0100
@@ -1,8 +1,9 @@
-README - A short introduction
-MANIFEST - A list of files
-CATALOG - An entry for the macro catalog
+README - A short introduction
+MANIFEST - A list of files
+CATALOG - An entry for the macro catalog
+Changelog - An overview of the changes to the package
supertabular.dtx - The documented version of the code, including a couple
of examples of how to use it. Needs supertabular.sty
to be available (run latex supertabular.ins first).
-supertabular.dtx - The `printed version� of supertabular.dtx
+supertabular.pdf - The `printed version' of supertabular.dtx
supertabular.ins - A docstrip file to produce the stripped code
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/supertabular/README new/doc/latex/supertabular/README
--- old/doc/latex/supertabular/README 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/supertabular/README 2020-02-03 23:32:05.000000000 +0100
@@ -13,7 +13,7 @@
Supertabular can be used with LaTeX2e as a package.
-Copyright (C) 2004 Johannes L. Braams texniek at braams.cistron.nl
+Copyright (C) 1989 - 2020 Johannes L. Braams texniek at braams.xs4all.nl
This program can be redistributed and/or modified under the terms
of the LaTeX Project Public License Distributed from CTAN
Binary files old/doc/latex/supertabular/supertabular.pdf and new/doc/latex/supertabular/supertabular.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/supertabular.doc.tlpobj new/tlpkg/tlpobj/supertabular.doc.tlpobj
--- old/tlpkg/tlpobj/supertabular.doc.tlpobj 2019-02-28 04:06:30.000000000 +0100
+++ new/tlpkg/tlpobj/supertabular.doc.tlpobj 2020-02-04 01:55:20.000000000 +0100
@@ -1,9 +1,9 @@
name supertabular.doc
category Package
-revision 15878
+revision 53658
shortdesc doc files of supertabular
relocated 1
-docfiles size=45
+docfiles size=70
RELOC/doc/latex/supertabular/CATALOG
RELOC/doc/latex/supertabular/ChangeLog
RELOC/doc/latex/supertabular/MANIFEST
++++++ supertabular.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/supertabular/supertabular.sty new/tex/latex/supertabular/supertabular.sty
--- old/tex/latex/supertabular/supertabular.sty 2006-01-13 01:08:12.000000000 +0100
+++ new/tex/latex/supertabular/supertabular.sty 2020-02-03 23:32:05.000000000 +0100
@@ -5,18 +5,18 @@
%% The original source files were:
%%
%% supertabular.dtx (with options: `package')
-%% Copyright (C) 1989-2004 Johannes Braams. All rights reserved.
+%% Copyright (C) 1989-2020 Johannes Braams. All rights reserved.
%%
%% This file was generated from file(s) of the supertabular package.
%% -----------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status "maintained".
%%
@@ -35,7 +35,7 @@
%% Sourcefile `supertabular.dtx'.
%%
%% Copyright (C) 1988 by Theo Jurriens
-%% Copyright (C) 1990-2004 by Johannes Braams texniek at braams.cistron.nl
+%% Copyright (C) 1990-2020 by Johannes Braams texniek at braams.xs4all.nl
%% Kersengaarde 33
%% 2723 BP Zoetermeer NL
%% all rights reserved.
@@ -43,10 +43,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{supertabular}
- [2004/02/20 v4.1e the supertabular environment]
+ [2020/02/02 v4.1g the supertabular environment]
\newcount\c@tracingst
\DeclareOption{errorshow}{\c@tracingst\z@}
-\DeclareOption{pageshow}{\c@tracingst\tw@}
+\DeclareOption{pageshow}{\c@tracingst\thr@@}
\DeclareOption{debugshow}{\c@tracingst5\relax}
\ProcessOptions
\newif\if@topcaption \@topcaptiontrue
@@ -63,6 +63,7 @@
\newskip\ST@rightskip
\newskip\ST@leftskip
\newskip\ST@parfillskip
+\def\ST@captionroom{\z@}
\long\def\ST@caption#1[#2]#3{\par%
\addcontentsline{\csname ext@#1\endcsname}{#1}%
{\protect\numberline{%
@@ -72,7 +73,7 @@
\normalsize
\if@topcaption \vskip -10\p@ \fi
\@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
- \if@topcaption \vskip 10\p@ \fi
+ \if@topcaption \vskip 10\p@ \gdef\ST@captionroom{20\p@}\fi
\endgroup}
\newcommand\tablehead[1]{%
\gdef\@tablehead{%
@@ -82,7 +83,16 @@
#1%
\noalign{\global\let\\=\@savcr}}}
\tablehead{}
-\newcommand\tablefirsthead[1]{\gdef\@table@first@head{#1}}
+\newcommand\tablefirsthead[1]{%
+ \gdef\@table@first@head{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org@tabularcr}%
+ #1%
+ \noalign{%
+ \global\let\\=\@savcr
+ \global\let\@table@first@head\undefined
+ }}}
\newcommand\tabletail[1]{%
\gdef\@tabletail{%
\noalign{%
@@ -91,7 +101,16 @@
#1%
\noalign{\global\let\\=\@savcr}}}
\tabletail{}
-\newcommand\tablelasttail[1]{\gdef\@table@last@tail{#1}}
+\newcommand\tablelasttail[1]{%
+ \gdef\@table@last@tail{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org@tabularcr}%
+ #1%
+ \noalign{%
+ \global\let\\=\@savcr
+ \global\let\@table@last@tail\undefined
+ }}}
\newcommand\sttraceon{\c@tracingst5\relax}
\newcommand\sttraceoff{\c@tracingst\z@}
\newcommand\ST@trace[2]{%
@@ -101,6 +120,19 @@
{Package supertabular: #2}%
\fi
}
+\newcommand\ST@save@lineno{%
+ \expandafter\gdef\expandafter\ST@LineNo\expandafter{%
+ \the\inputlineno}}
+\newcommand\ST@trace@cr[2]{%
+ \ifnum\c@tracingst>#1\relax
+ \begingroup
+ \edef\on@line{ on input line \ST@LineNo}%
+ \GenericWarning
+ {(supertabular)\@spaces\@spaces}
+ {Package supertabular: #2}%
+ \endgroup
+ \fi
+ }
\newdimen\ST@pageleft
\newcommand*\shrinkheight[1]{%
\noalign{\global\advance\ST@pageleft-#1\relax}}
@@ -111,13 +143,13 @@
\newdimen\ST@pagesofar
\newdimen\ST@pboxht
\newdimen\ST@lineht
-\newdimen\ST@stretchht
\newdimen\ST@prevht
\newdimen\ST@toadd
\newdimen\ST@dimen
\newbox\ST@pbox
\def\ST@tabularcr{%
{\ifnum0=`}\fi
+ \ST@save@lineno
\@ifstar{\ST@xtabularcr}{\ST@xtabularcr}}
\def\ST@xtabularcr{%
\@ifnextchar[%]
@@ -159,6 +191,15 @@
\fi
\ST@dimen=\z@
\unvbox\ST@pbox\egroup\hfil}
+\def\ST@compute@lineht{%
+ \ST@lineht=\ht\strutbox
+ \ifx\extrarowheight\undefined\else
+ \advance \ST@lineht by \extrarowheight
+ \fi
+ \ST@lineht = \arraystretch\ST@lineht
+ \advance\ST@lineht \arraystretch\dp\strutbox
+ \ST@trace\tw@{Normal Line height: \the\ST@lineht}%
+ }
\def\estimate@lineht{%
\ST@lineht=\arraystretch \baslineskp
\global\advance\ST@lineht by 1\p@
@@ -166,7 +207,7 @@
\ifdim\ST@stretchht<\z@\ST@stretchht\z@\fi
\ST@trace\tw@{Average line height: \the\ST@lineht}%
\ST@trace\tw@{Stretched line height: \the\ST@stretchht}%
- }
+}
\def\@calfirstpageht{%
\ST@trace\tw@{Calculating height of tabular on first page}%
\global\ST@pagesofar\pagetotal
@@ -211,6 +252,7 @@
\global\ST@pagesofar\z@
\fi
\fi
+ \if@topcaption\advance\ST@pageleft-\ST@captionroom\fi
\ST@trace\tw@{Available height: \the\ST@pageleft}%
\ifx\@@tablehead\@empty
\ST@headht=\z@
@@ -242,12 +284,14 @@
\ST@trace\tw@{starting new page}%
\newpage\@calnextpageht
\fi
+ \advance\ST@pageleft-\ST@headht
}
\def\@calnextpageht{%
\ST@trace\tw@{Calculating height of tabular on next page}%
\global\ST@pageleft\@colroom
\global\ST@pagesofar=\z@
\ST@trace\tw@{Maximum height of tabular: \the\ST@pageleft}%
+ \advance\ST@pageleft-\ST@headht
}
\def\x@supertabular{%
\let\org@tabular\tabular
@@ -281,7 +325,7 @@
\let\@@tablehead=\@table@first@head
\fi
\let\ST@skippage\ST@skipfirstpart
- \estimate@lineht
+ \ST@compute@lineht
\@calfirstpageht
\noindent
}
@@ -413,16 +457,15 @@
\global\advance\ST@pageleft -\ST@lineht
\global\ST@prevht\ST@lineht
\else
- \ST@trace\thr@@{Added par box with height \the\ST@pboxht}%
+ \ST@trace@cr\thr@@{Added par box with height \the\ST@pboxht}%
\global\advance\ST@pageleft -\ST@pboxht
\global\advance\ST@pageleft -0.1\ST@pboxht
- \global\advance\ST@pageleft -\ST@stretchht
\global\ST@prevht\ST@pboxht
\global\ST@pboxht\z@
\fi
\global\advance\ST@pageleft -\ST@toadd
\global\ST@toadd=\z@
- \ST@trace\thr@@{Space left for tabular: \the\ST@pageleft}%
+ \ST@trace@cr\thr@@{Space left for tabular: \the\ST@pageleft}%
}
\noalign{\global\let\ST@next\@empty}%
\ifnum\ST@pageleft<\z@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/supertabular.tlpobj new/tlpkg/tlpobj/supertabular.tlpobj
--- old/tlpkg/tlpobj/supertabular.tlpobj 2019-02-28 04:06:30.000000000 +0100
+++ new/tlpkg/tlpobj/supertabular.tlpobj 2020-02-04 01:55:20.000000000 +0100
@@ -1,6 +1,6 @@
name supertabular
category Package
-revision 15878
+revision 53658
shortdesc A multi-page tables package
relocated 1
longdesc The package was a predecessor of longtable; the newer package
@@ -11,7 +11,6 @@
RELOC/tex/latex/supertabular/supertabular.sty
catalogue-also xtab
catalogue-ctan /macros/latex/contrib/supertabular
-catalogue-date 2017-08-05 18:49:19 +0200
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics table table-long
-catalogue-version 4.1e
+catalogue-version 4.1g
++++++ svg.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/svg/LICENSE.md new/doc/latex/svg/LICENSE.md
--- old/doc/latex/svg/LICENSE.md 2017-03-28 22:37:19.000000000 +0200
+++ new/doc/latex/svg/LICENSE.md 2020-01-13 22:24:53.000000000 +0100
@@ -1,8 +1,8 @@
- svg and svg-extract -- Include and extract SVG pictures in LaTeX documents
+ svg and svg-extract – Handling SVG pictures in LaTeX documents
----------------------------------------------------------------------------
- Copyright (C) Philip Ilten , 2012-2016
+ Copyright (C) Philip Ilten , 2012-2016<br>
Copyright (C) Falk Hanisch , 2017-
----------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/svg/README.md new/doc/latex/svg/README.md
--- old/doc/latex/svg/README.md 2018-11-13 23:48:18.000000000 +0100
+++ new/doc/latex/svg/README.md 2020-01-13 22:24:53.000000000 +0100
@@ -1,15 +1,15 @@
- svg and svg-extract -- Include and extract SVG pictures in LaTeX documents
+ svg and svg-extract – Handling SVG pictures in LaTeX documents
----------------------------------------------------------------------------
- Copyright (C) Philip Ilten , 2012-2016
+ Copyright (C) Philip Ilten , 2012-2016<br>
Copyright (C) Falk Hanisch , 2017-
- svg 2018/11/12 v2.02b
+ **svg 2020/01/13 v2.02e**
----------------------------------------------------------------------------
- This material is subject to the LaTeX Project Public License version 1.3c
+ This material is subject to the LaTeX Project Public License version 1.3c
or later. See http://www.latex-project.org/lppl.txt for details.
----------------------------------------------------------------------------
@@ -18,31 +18,48 @@
Summary
-------
-The **svg** package is intended for the automated integration of SVG graphics
-into LaTeX documents. Therefor the capabilities provided by ***Inkscape***---or
-more precisely its command line tool---are used to export the text within a SVG
-graphic to a separate file, which is then rendered by LaTeX. For this purpose
-the two commands `\includesvg` and `\includeinkscape` are provided which are
-very similar to the `\includegraphics` command of the **graphicx** package.
-
-In addition, the package **svg-extract** allows the extraction of these
-graphics into independent files in different graphic formats, exactly as
-it is rendered within the LaTeX document using either ***ImageMagick*** or
-***Ghostscript***
+The **svg** package provides an user‑interface for automated integration
+of SVG graphics created with ***Inkscape*** into LaTeX documents.
+Therefor the capabilities provided by ***Inkscape***—and its command line
+tool—are used to export the text within a SVG graphic to a separate
+file, which is then rendered by LaTeX. The two commands `\includesvg` and
+`\includeinkscape` are provided as central user‑interface, which are very
+similar to the `\includegraphics` command of the **graphicx** package.
+
+In addition, the package **svg-extract** extends the user‑interface of
+package **svg** in order to support the extraction of these graphics into
+independent files in different graphic formats, exactly as they are rendered
+within the LaTeX document. For the creation of these graphics in the
+well‑known formats PDF, EPS and PS, LaTeX and possibly conversion
+tools shipped with the most LaTeX distributions are used. If the graphics are
+required in other file formats, either ***ImageMagick*** or ***Ghostscript***
+can be invoked.
Versions
--------
+**v2.02e** (2020/01/13)
++ fixes for new version of package **scrbase**
+
+**v2.02d** (2019/10/22)
++ fix bugs with current kernel (2019/10/01) regarding file name parsing, see
+ https://github.com/mrpiggi/svg/issues/16
++ use `\filemoddate` with XeLaTeX, see https://github.com/mrpiggi/svg/issues/12
+
+**v2.02c** (2019/10/10)
++ fix bugs with current kernel (2019/10/01) regarding file name parsing
+
**v2.02b** (2018/11/12)
-+ fix bug for package **tikzscale** which changes `includgraphics` globally
++ fix bug for package **tikzscale** which changes the definition of
+ `\includegraphics`
**v2.02a** (2018/10/17)
+ fix bug for package **polyglossia** which fakes **babel** poorly
**v2.02** (2018/09/08)
-+ distortion of included and extracted graphics supported with options `distort`
- (or `keepaspectratio`) and `extractdistort` as well as rotation for
++ distortion of included and extracted graphics supported with options `distort`
+ (or `keepaspectratio`) and `extractdistort` as well as rotation for
extractions (`extractangle`)
+ fixed errors with active double qoutes from **babel** in path arguments
+ multiple dots within file names possible
@@ -69,8 +86,8 @@
+ **svg-extract**: enhanced support for ***ImageMagick***
+ **svg-extract**: support for ***Ghostscript*** added
+ package **subfig** not required anymore
-+ support of subfigures stopped due to the huge number of packages which deal
- with this topic and the large variety of implementing this functionality;
++ support of subfigures stopped due to the huge number of packages which deal
+ with this topic and the large variety of implementing this functionality;
naming exported graphics after their consecutive numbering can't be ensured
for all variants of subfigures, so it's neglected
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/svg/root.C new/doc/latex/svg/root.C
--- old/doc/latex/svg/root.C 2017-03-27 23:47:01.000000000 +0200
+++ new/doc/latex/svg/root.C 2020-01-13 22:24:53.000000000 +0100
@@ -17,9 +17,9 @@
// Draw additional text.
TText *t = new TText(); t->SetTextAlign(31);
t->DrawText(0.7, 0.9, "\\larger[2]$z(x,y) = \\frac{1}{\\sigma_x\\sigma_y"
- "\\sqrt{4\\pi^2}}\\exp\\left(- \\left(\\frac{(x-\\mu_x)^2}"
- "{2\\sigma_x^2} + \\frac{(y-\\mu_y)^2}{2\\sigma_y^2} \\right)"
- "\\right)$");
+ "\\sqrt{4\\pi^2}}\\exp\\left(- \\left(\\frac{(x-\\mu_x)^2}"
+ "{2\\sigma_x^2} + \\frac{(y-\\mu_y)^2}{2\\sigma_y^2} \\right)"
+ "\\right)$");
// Print the plot.
gPad->Print("root.svg");
Binary files old/doc/latex/svg/svg.pdf and new/doc/latex/svg/svg.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/svg.doc.tlpobj new/tlpkg/tlpobj/svg.doc.tlpobj
--- old/tlpkg/tlpobj/svg.doc.tlpobj 2019-02-28 04:06:31.000000000 +0100
+++ new/tlpkg/tlpobj/svg.doc.tlpobj 2020-01-14 01:55:08.000000000 +0100
@@ -1,9 +1,9 @@
name svg.doc
category Package
-revision 49148
+revision 53389
shortdesc doc files of svg
relocated 1
-docfiles size=434
+docfiles size=435
RELOC/doc/latex/svg/LICENSE.md
RELOC/doc/latex/svg/README.md
RELOC/doc/latex/svg/root.C
++++++ svg.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/svg/svg-extract.sty new/tex/latex/svg/svg-extract.sty
--- old/tex/latex/svg/svg-extract.sty 2018-11-13 23:48:18.000000000 +0100
+++ new/tex/latex/svg/svg-extract.sty 2020-01-13 22:24:53.000000000 +0100
@@ -31,9 +31,9 @@
%% svg-example.svg, svg-preamble.tex and root.C (with derived file root.svg).
%%
%%
-\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}[2019-10-01]
\ProvidesPackage{svg-extract}[%
- 2018/11/12 v2.02b\space%
+ 2020/01/13 v2.02e\space%
(extract independent graphics from SVG pictures)%
]
\RequirePackage{svg}[2017/03/27]
@@ -407,7 +407,7 @@
\renewcommand*\svgx@param@width{\z@}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx@param@width{\svg@param@width}%
\FamilyKeyStateProcessed%
}{%
@@ -427,7 +427,7 @@
\renewcommand*\svgx@param@height{\z@}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx@param@height{\svg@param@height}%
\FamilyKeyStateProcessed%
}{%
@@ -447,7 +447,7 @@
\@svgx@param@distortfalse%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\if@svgx@param@distort{\if@svg@param@distort}%
\FamilyKeyStateProcessed%
}{%
@@ -474,11 +474,11 @@
\renewcommand*\svgx@param@scale{1}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx@param@scale{\svg@param@scale}%
\FamilyKeyStateProcessed%
}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\ifdim\dimexpr#1\p@\relax>\z@\relax%
\renewcommand*\svgx@param@scale{#1}%
\FamilyKeyStateProcessed%
@@ -492,7 +492,7 @@
\svg@ifvalueisrelax{#1}{%
\let\svgx@param@pretex\relax%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx@param@pretex{\svg@param@pretex}%
}{%
\renewcommand*\svgx@param@pretex{#1}%
@@ -505,7 +505,7 @@
\svg@ifvalueisrelax{#1}{%
\let\svgx@param@apptex\relax%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx@param@apptex{\svg@param@apptex}%
}{%
\renewcommand*\svgx@param@apptex{#1}%
@@ -563,7 +563,7 @@
\newcommand*\svgx@onlywindows[1]{}
\AfterPackage*{ifplatform}{\renewcommand*\svgx@onlywindows[1]{\ifwindows#1\fi}}
\newcommand*\svgx@ifkeyandval[3]{%
- \def\svg@tempa##1=##2=##3\@nil{\ifstr{##3}{=}{#2}{#3}}%
+ \def\svg@tempa##1=##2=##3\@nil{\Ifstr{##3}{=}{#2}{#3}}%
\svg@tempa#1==\@nil%
}
\newcommand*\svgx@cnv@get@dpi[1]{%
@@ -571,9 +571,9 @@
\def\svg@tempa##1dpi##2x##3dpi##4\@nil{%
\edef\svg@tempa{##1}%
\@svg@tempswafalse%
- \ifnumber{##1}{%
+ \Ifnumber{##1}{%
\IfArgIsEmpty{##3}{\@svg@tempswatrue}{%
- \ifnumber{##3}{\edef\svg@tempa{##1x##3}}{}%
+ \Ifnumber{##3}{\edef\svg@tempa{##1x##3}}{}%
}%
}{}%
\if@svg@tempswa\else%
@@ -581,13 +581,13 @@
\fi%
}%
\def\svg@tempb##1x##2x##3\@nil{%
- \ifstr{##3}{x}{%
+ \Ifstr{##3}{x}{%
\@svg@tempswatrue%
\IfArgIsEmpty{##1}{\@svg@tempswafalse}{%
- \ifnumber{##1}{}{\@svg@tempswafalse}%
+ \Ifnumber{##1}{}{\@svg@tempswafalse}%
}%
\IfArgIsEmpty{##2}{\@svg@tempswafalse}{%
- \ifnumber{##2}{}{\@svg@tempswafalse}%
+ \Ifnumber{##2}{}{\@svg@tempswafalse}%
}%
\if@svg@tempswa%
\edef\svg@tempa{##1x##2}%
@@ -727,11 +727,11 @@
\renewcommand*\svgx@param@angle{0}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx@param@angle{\svg@param@angle}%
\FamilyKeyStateProcessed%
}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\renewcommand*\svgx@param@angle{#1}%
\FamilyKeyStateProcessed%
}{}%
@@ -913,7 +913,7 @@
\fi%
\let\svg@tempa\@empty%
\if@svg@ink@latex%
- \ifstr{\svg@ink@format}{pdf}{%
+ \Ifstr{\svg@ink@format}{pdf}{%
\ifnum\value{svg@param@lastpage}>\z@\relax%
\edef\svg@tempa{lastpage=\the\value{svg@param@lastpage}}%
\else%
@@ -952,7 +952,7 @@
}%
\immediate\closeout\svgx@stream@out%
\endgroup%
- \ifstr{\svgx@format\svgx@cnv@format}{}{%
+ \Ifstr{\svgx@format\svgx@cnv@format}{}{%
\PackageWarning{svg-extract}{%
Both keys `extractformat' and `convertformat' are\MessageBreak%
empty, so nothing to do so far%
@@ -1102,13 +1102,13 @@
\def\svg@tempa##1{%
\def\svg@tempa####1##1####2##1####3\@nil{%
\IfArgIsEmpty{####3}{}{%
- \ifstr{#2}{till}{%
+ \Ifstr{#2}{till}{%
\IfArgIsEmpty{####1}{}{%
\immediate\write\svgx@stream@out{####1}%
}%
\@svgx@preamble@writefalse%
}{%
- \ifstr{#2}{from}{%
+ \Ifstr{#2}{from}{%
\IfArgIsEmpty{####2}{%
\def\svgx@read@line{}%
}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/svg/svg.sty new/tex/latex/svg/svg.sty
--- old/tex/latex/svg/svg.sty 2018-11-13 23:48:18.000000000 +0100
+++ new/tex/latex/svg/svg.sty 2020-01-13 22:24:53.000000000 +0100
@@ -31,15 +31,13 @@
%% svg-example.svg, svg-preamble.tex and root.C (with derived file root.svg).
%%
%%
-\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}[2019-10-01]
\ProvidesPackage{svg}[%
- 2018/11/12 v2.02b\space%
+ 2020/01/13 v2.02e\space%
(include SVG pictures)%
]
-\RequirePackage{scrbase}[2016/06/14]
-\RequirePackage{ifpdf}[2016/05/14]
-\RequirePackage{ifluatex}[2016/05/16]
-\RequirePackage{ifxetex}[2010/09/12]
+\RequirePackage{iftex}[2019/11/07]
+\RequirePackage{scrbase}[2019/12/23]
\RequirePackage{pdftexcmds}[2016/05/21]
\RequirePackage{shellesc}[2016/06/07]
\RequirePackage{trimspaces}[2009/09/17]
@@ -124,7 +122,7 @@
\fi%
\else% dpi
\def\svg@tempa##1dpi##2\@nil{%
- \ifstr{##2}{dpi}{\FamilyOptions{SVG}{inkscapedpi=##1}}{}%
+ \Ifstr{##2}{dpi}{\FamilyOptions{SVG}{inkscapedpi=##1}}{}%
}%
\lowercase{\expandafter\svg@tempa\svg@tempb dpi\@nil}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed\else%
@@ -217,7 +215,7 @@
}{%
\def\svg@tempa##1dpi##2\@nil{\def\svg@tempa{##1}}%
\lowercase{\svg@tempa#1dpi\@nil}%
- \ifnumber{\svg@tempa}{%
+ \Ifnumber{\svg@tempa}{%
\edef\svg@ink@dpi{\svg@tempa}%
\FamilyKeyStateProcessed%
}{}%
@@ -333,7 +331,7 @@
\renewcommand*\svg@param@scale{1}%
\FamilyKeyStateProcessed%
}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\ifdim\dimexpr#1\p@\relax>\z@\relax%
\renewcommand*\svg@param@scale{#1}%
\FamilyKeyStateProcessed%
@@ -611,6 +609,10 @@
\svg@set@input@path[{#3}]%
\@svg@tempswafalse%
\expandafter\IfFileExists\expandafter{\svg@tempa}{%
+ \expandafter\svg@quotes@check\expandafter{\svg@tempa}%
+ \if@svg@quotes@found\else%
+ \svg@quotes@remove{\@filef@und}%
+ \fi%
\@svg@tempswatrue%
\edef\@filef@und{\expandafter\trim@spaces\expandafter{\@filef@und}}%
\svg@filename@parse[{#1}]{\@filef@und}%
@@ -665,7 +667,8 @@
}
\newcommand*\svg@extension@parse[1]{%
\IfArgIsEmpty{#1}{}{%
- \ifstr{#1}{\filename@ext}{}{%
+ \@expandtwoargs\Ifstr%
+ {\detokenize\expandafter{\filename@ext}}{\detokenize\expandafter{#1}}{}{%
\begingroup%
\edef\svg@tempa{%
\def\noexpand\svg@tempa{}%
@@ -691,7 +694,7 @@
\def\svg@extension@@parse#1.#2\@nil#3\@nil{%
\edef\svg@tempa{\svg@tempa.#1}%
\IfArgIsEmpty{#2}{}{%
- \ifstr{#2}{#3.}{%
+ \Ifstr{\detokenize{#2}}{\detokenize{#3.}}{%
\edef\svg@tempb{#3}%
}{%
\svg@extension@@parse#2\@nil#3\@nil%
@@ -711,9 +714,9 @@
}%
}{%
\edef\filename@ext{#1}%
- \ifstr{\filename@area}{./}{\let\filename@area\@empty}{}%
+ \Ifstr{\filename@area}{./}{\let\filename@area\@empty}{}%
\edef\svg@tempb{#3}%
- \ifstr{\svg@tempb}{./}{\let\svg@tempb\@empty}{}%
+ \Ifstr{\svg@tempb}{./}{\let\svg@tempb\@empty}{}%
\ifx\svg@tempb\@empty%
\svg@set@input@path%
\else%
@@ -744,25 +747,42 @@
}{\svg@tempa}%
\endgroup%
}
+\newcommand*\svg@iffilenewer[2]{\@gobbletwo}
\ifx\pdf@filemoddate\@undefined
- \newcommand*\svg@iffilenewer[2]{\@gobbletwo}
+ \ifx\filemoddate\@undefined\else
+ \ifx\strcmp\@undefined\else
+ \renewcommand*\svg@iffilenewer[2]{%
+ \begingroup%
+ \edef\svg@tempa{\filemoddate{#1}}%
+ \edef\svg@tempb{\filemoddate{#2}}%
+ \ifnum\strcmp{\svg@tempa}{\svg@tempb}>\z@\relax%
+ \aftergroup\@firstoftwo%
+ \else%
+ \aftergroup\@secondoftwo%
+ \fi%
+ \endgroup%
+ }%
+ \fi
+ \fi
\else
- \newcommand*\svg@iffilenewer[2]{%
- \begingroup%
- \edef\svg@tempa{\pdf@filemoddate{#1}}%
- \edef\svg@tempb{\pdf@filemoddate{#2}}%
- \ifnum\pdf@strcmp{\svg@tempa}{\svg@tempb}>\z@\relax%
- \aftergroup\@firstoftwo%
- \else%
- \aftergroup\@secondoftwo%
- \fi%
- \endgroup%
- }
+ \ifx\pdf@strcmp\@undefined\else
+ \renewcommand*\svg@iffilenewer[2]{%
+ \begingroup%
+ \edef\svg@tempa{\pdf@filemoddate{#1}}%
+ \edef\svg@tempb{\pdf@filemoddate{#2}}%
+ \ifnum\pdf@strcmp{\svg@tempa}{\svg@tempb}>\z@\relax%
+ \aftergroup\@firstoftwo%
+ \else%
+ \aftergroup\@secondoftwo%
+ \fi%
+ \endgroup%
+ }%
+ \fi
\fi
\newcommand*\svg@local@param@set[1]{%
\svg@local@param@use%
\FamilyOptions{SVG}{#1}%
- \ifstr{\svg@ink@format}{png}{\FamilyOptions{SVG}{inkscapelatex=false}}{}%
+ \Ifstr{\svg@ink@format}{png}{\FamilyOptions{SVG}{inkscapelatex=false}}{}%
\@svg@tempswafalse%
\ifdim\svg@param@width>\z@\relax\ifdim\svg@param@height>\z@\relax%
\@svg@tempswatrue%
@@ -830,7 +850,7 @@
\newcommand*\svg@param@angle{0}
\svg@local@param@def{%
\DefineFamilyKey[.param]{SVG}{angle}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\renewcommand*\svg@param@angle{#1}%
\FamilyKeyStateProcessed%
}{}%
@@ -854,7 +874,7 @@
}%
\def\svg@tempb##1_tex##2\@nil{%
\IfArgIsEmpty{##1}{}{\def\filename@ext{##1}}%
- \ifstr{##2}{_tex}{\@svg@tempswatrue}{\@svg@tempswafalse}%
+ \Ifstr{##2}{_tex}{\@svg@tempswatrue}{\@svg@tempswafalse}%
}%
\@svg@tempswafalse%
\@tfor\svg@tempa:={pdf}{eps}{ps}{png}\do{%
@@ -959,7 +979,7 @@
\if@svg@ink@run%
\ifnum\pdf@shellescape=\@ne\relax%
\ifx\svg@ink@dpi\relax%
- \ifstr{\svg@ink@format}{png}{%
+ \Ifstr{\svg@ink@format}{png}{%
\FamilyOptions{SVG}{inkscapedpi=300}%
}{}%
\fi%
@@ -1010,7 +1030,7 @@
--export-\svg@ink@format="#2.\svg@ink@format"\space%
}
\newcommand*\svg@get@lastpage[1]{%
- \ifstr{\svg@ink@format}{pdf}{%
+ \Ifstr{\svg@ink@format}{pdf}{%
\begingroup%
\@tempcnta=\m@ne\relax%
\ifx\XeTeXpdfpagecount\@undefined%
@@ -1081,7 +1101,17 @@
}%
\svg@tempa%
\svg@remove@leadingchar.\svg@tempa%
- \edef\svg@tempa{{\svg@tempa}.\svg@tempb}%
+ \begingroup%
+ \expandafter\filename@parse\expandafter{\svg@tempa}%
+ \edef\svg@tempa{%
+ \endgroup%
+ \ifx\filename@ext\relax%
+ \edef\noexpand\svg@tempa{\svg@tempa.\svg@tempb}%
+ \else%
+ \edef\noexpand\svg@tempa{{\svg@tempa}.\svg@tempb}%
+ \fi%
+ }%
+ \svg@tempa%
\edef\svg@tempb{#2}%
\if@svg@ink@latex%
\svg@patches{\svg@tempa}%
@@ -1214,8 +1244,8 @@
\begingroup%
\svg@quotes@remove[{#1}]{\svg@tempa}%
\@svg@tempswatrue%
- \ifstr{\svg@tempa}{}{\@svg@tempswafalse}{%
- \ifstr{\svg@tempa}{./}{\@svg@tempswafalse}{%
+ \Ifstr{\svg@tempa}{}{\@svg@tempswafalse}{%
+ \Ifstr{\svg@tempa}{./}{\@svg@tempswafalse}{%
}}%
\if@svg@tempswa%
\ShellEscape{\svg@shell@@mkdir{\svg@tempa}}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/svg.tlpobj new/tlpkg/tlpobj/svg.tlpobj
--- old/tlpkg/tlpobj/svg.tlpobj 2019-02-28 04:06:31.000000000 +0100
+++ new/tlpkg/tlpobj/svg.tlpobj 2020-01-14 01:55:09.000000000 +0100
@@ -1,6 +1,6 @@
name svg
category Package
-revision 49148
+revision 53389
shortdesc Include and extract SVG pictures in LaTeX documents
relocated 1
longdesc This bundle contains the two packages svg and svg-extract. The
@@ -20,10 +20,8 @@
RELOC/tex/latex/svg/svg.sty
catalogue-also svg-inkscape
catalogue-contact-bugs https://github.com/mrpiggi/svg/issues
-catalogue-contact-home https://github.com/mrpiggi/svg
catalogue-contact-repository https://github.com/mrpiggi/svg
catalogue-ctan /graphics/svg
-catalogue-date 2018-11-13 10:20:49 +0100
catalogue-license lppl1.3c
-catalogue-topics graphics-incl graphics-import
-catalogue-version 2.02b
+catalogue-topics graphics graphics-incl graphics-import
+catalogue-version 2.02e
++++++ synctex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/synctex.man1.pdf and new/texmf-dist/doc/man/man1/synctex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man5/synctex.man5.pdf and new/texmf-dist/doc/man/man5/synctex.man5.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/synctex.doc.tlpobj new/tlpkg/tlpobj/synctex.doc.tlpobj
--- old/tlpkg/tlpobj/synctex.doc.tlpobj 2019-03-27 02:26:39.000000000 +0100
+++ new/tlpkg/tlpobj/synctex.doc.tlpobj 2020-03-04 23:53:51.000000000 +0100
@@ -1,6 +1,6 @@
name synctex.doc
category TLCore
-revision 50602
+revision 54074
shortdesc doc files of synctex
docfiles size=17
texmf-dist/doc/man/man1/synctex.1
++++++ systeme.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/systeme/README new/doc/generic/systeme/README
--- old/doc/generic/systeme/README 2019-01-14 00:30:37.000000000 +0100
+++ new/doc/generic/systeme/README 2020-04-13 23:39:04.000000000 +0200
@@ -1,9 +1,9 @@
L'extension
systeme
- v0.32
+ v0.33
- 13 janvier 2019
+ 13 avril 2020
Author : Christian Tellechea
Email : unbonpetit@netc.fr (CT)
Binary files old/doc/generic/systeme/systeme_fr.pdf and new/doc/generic/systeme/systeme_fr.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/systeme/systeme_fr.tex new/doc/generic/systeme/systeme_fr.tex
--- old/doc/generic/systeme/systeme_fr.tex 2019-01-14 00:30:37.000000000 +0100
+++ new/doc/generic/systeme/systeme_fr.tex 2020-04-13 23:39:04.000000000 +0200
@@ -1,14 +1,10 @@
-% Documentation de systeme
+% !TeX TS-program = xelatex
\documentclass[10pt,french]{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
\usepackage[a4paper,margin=3cm,head=12pt,headsep=7mm,footskip=7mm]{geometry}
\usepackage[bottom]{footmisc}
-\usepackage{libertine,amsmath,fancybox,enumitem,systeme,xcolor,amssymb,array,longtable,fancyhdr}
-\renewcommand*\oldstylenums[1]{{\fontfamily{fxlj}\selectfont #1}}
-\usepackage[scaled=0.8]{luximono}
-\usepackage[libertine]{newtxmath}%
-\usepackage[protrusion=true,expansion,final,babel=true]{microtype}
+
+\usepackage{amsmath,fancybox,enumitem,systeme,xcolor,amssymb,array,longtable,fancyhdr,libertinus-otf}
+\setsansfont[Scale=0.8]{Luxi Mono}
\fancypagestyle{plain}{%
\fancyhead[L]{\small L'extension \bfseries systeme}
\fancyhead[C]{}
@@ -290,6 +286,18 @@
\exemple{Coefficients décimaux}/\systeme[][:]{1,5x-0,45y=0,7:x-0,8y=1,4}/
Pour qui veut utiliser la virgule régulièrement dans les coefficients, on peut changer définitivement le séparateur par défaut pour n'importe quel autre caractère que l'on placera dans l'argument de la commande \verb-\syseqsep- et écrire par exemple \og\verb/\syseqsep{:}/\fg{} pour choisir \og\verb-:-\fg.
+\subsection{Alignement des termes}
+Par défaut, les termes dans le membre de gauche sont alignes à droite, tandis que le terme du membre de droite est aligné à gauche. On peut changer ces consignes d'alignement avec la macro \verb|\sysalign{x,y}| où \verb|x| représente la consigne d'alignement des termes du membre de gauche et \verb|y| celle du terme du membre de droite. Ces consignes doivent être «\verb|c|» pour «centré», «\verb|r|» pour alignement à droite (right) ou «\verb|l|» pour gauche (left).
+\exemple{Alignement des termes}|\systeme{3x-y=-12,x+4y=3}
+ \quad(par défaut, droite/gauche)\par
+\sysalign{l,l}\systeme{3x-y=-12,x+4y=3}
+ \quad(alignement gauche/gauche)\par
+\sysalign{r,r}\systeme{3x-y=-12,x+4y=3}
+ \quad(alignement droite/droite)\par
+\sysalign{l,r}\systeme{3x-y=-12,x+4y=3}
+ \quad(alignement gauche/droite)\par
+\sysalign{c,c}\systeme{3x-y=-12,x+4y=3}
+ \quad(alignement centré/centré)|
\subsection{Espacement des lignes}\label{espacement.vertical}
On peut faire varier l'espacement entre les lignes avec la commande \verb-\syslineskipcoeff- dont l'argument est un nombre qui viendra multiplier la valeur de \verb-\baselinskip-. Par défaut, l'argument vaut \verb-1.25-.
@@ -297,6 +305,12 @@
\syslineskipcoeff{1.75}\quad
\systeme{x+2y-z=0,2x-y+z=1,x-3y+2z=1}/
+\subsection{Espaces autour des signes}
+Il est possible d'ajouter une espace avant et après tous les signes \verb|+| et \verb|-| séparant les termes du membre de gauche à l'aide de la macro \verb|\syssignspace{dim}| où \verb|dim| est la dimension du \emph{ressort} que l'on souhaite insérer. La macro \verb|\syseqspace{dim}| exécute la même action, mais pour le signe \verb|=|.
+\exemple{Espaces autour des signes}/\systeme{3x-y=-12,x+4y=3} puis
+\syssignspace{3pt}\syseqspace{10pt}
+\systeme{3x-y=-12,x+4y=3}/
+
\subsection{Colonne supplémentaire}
Lorsqu'une équation comporte le signe \og\verb-@-\fg{}, tout ce qui se trouve à droite de ce caractère sera mis dans une colonne supplémentaire au fer à gauche qui se trouvera à droite du système, en dernière position.
\exemple{Colonne supplémentaire}/\systeme{x+y=125@L_1,
@@ -387,6 +401,9 @@
\verb-\systeme{}-&compose un système d'équations ou d'inéquations\\
\verb-\sysdelim<delim gauche><delim droit>-&modifie les délimiteurs extensibles placées à gauche et à droite du système\\
\verb-\syseqsep{}-&définit le séparateur par défaut des équations\\
+\verb-\sysalign{x,y}-&définit l'alignement des termes dans les 2 membres\\
+\verb-\syssignspace{dim}-&définit l'espace ajoutée autour des signes dans le membre de gauche\\
+\verb-\syseqspace{dim}-&définit l'espace ajoutée autour du signe \verb-=-\\
\verb-\syslineskipcoeff{<coeff>}-&définit le coefficient multiplicateur de \verb-\baselinskip- pour modifier l'espacement vertical des équations\\
\verb-\+- et \verb|\-|&remplace "+" et "-" lorsqu'on veut éviter d'indiquer un nouveau terme\\
\verb-\sysequivsign{<signe>}{<substitution>}-&définit ce par quoi un \verb-<signe>- d'égalité doit être remplacé à l'affichage\\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/systeme.doc.tlpobj new/tlpkg/tlpobj/systeme.doc.tlpobj
--- old/tlpkg/tlpobj/systeme.doc.tlpobj 2019-02-28 04:06:36.000000000 +0100
+++ new/tlpkg/tlpobj/systeme.doc.tlpobj 2020-04-15 01:54:54.000000000 +0200
@@ -1,9 +1,9 @@
name systeme.doc
category Package
-revision 49690
+revision 54724
shortdesc doc files of systeme
relocated 1
-docfiles size=118
+docfiles size=27
RELOC/doc/generic/systeme/README
RELOC/doc/generic/systeme/systeme_fr.pdf
RELOC/doc/generic/systeme/systeme_fr.tex
++++++ systeme.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/systeme/systeme.tex new/tex/generic/systeme/systeme.tex
--- old/tex/generic/systeme/systeme.tex 2019-01-14 00:30:37.000000000 +0100
+++ new/tex/generic/systeme/systeme.tex 2020-04-13 23:39:04.000000000 +0200
@@ -4,9 +4,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
\def\SYSname {systeme} %
-\def\SYSver {0.32} %
+\def\SYSver {0.33} %
% %
-\def\SYSdate {2019/01/13} %
+\def\SYSdate {2020/04/13} %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -58,6 +58,7 @@
\long\def\SYS_execarg#1{#1}
\long\def\SYS_gobtwoargs#1#2{}
\def\SYS_addtotok#1#2{#1\expandafter{\the#1#2}}
+\def\SYS_xaddtotok#1#2{\SYS_expaddtotok#1{\expanded{#2}}}
\def\SYS_expaddtotok#1#2{\xs_exparg{\SYS_addtotok#1}{#2}}
\def\SYS_addtotab{\SYS_addtotok\SYS_systemecode}
\def\SYS_cslet#1{\expandafter\let\csname#1\endcsname}
@@ -155,6 +156,28 @@
\sysequivsign{<=}\leq
\sysequivsign{>=}\geq
+\def\syssignspace#1{\edef\SYS_signspace{\ifdim#1=0pt \else\hskip\dimexpr#1\relax\fi}}
+\def\syseqspace#1{\edef\SYS_eqspace{\ifdim#1=0pt \else\hskip\dimexpr#1\relax\fi}}
+\syssignspace{0pt}
+\syseqspace{0pt}
+
+\def\SYS_firsttonil#1#2\_nil{#1}
+\def\SYS_firstletter#1#2{\string#1\expandafter\SYS_firsttonil\detokenize{#2.}\_nil}
+\def\sysalign#1{%
+ \xs_ifempty{#1}{\sysalign_i r}{\sysalign_i#1},l,\_nil
+}
+\def\sysalign_i#1,#2,#3\_nil{%
+ \let\SYS_leftright\hfil
+ \if\SYS_firstletter c{#1}\let\SYS_leftleft\hfil \else
+ \if\SYS_firstletter l{#1}\let\SYS_leftleft\empty\else
+ \let\SYS_leftleft\hfil \let\SYS_leftright\empty\fi\fi
+ \let\SYS_rightleft\hfil
+ \if\SYS_firstletter c{#2}\let\SYS_rightright\hfil \else
+ \if\SYS_firstletter r{#2}\let\SYS_rightright\empty \else
+ \let\SYS_rightleft\empty \let\SYS_rightright\hfil\fi\fi
+}
+\sysalign{r,l}
+
% #1 est l'�quation courante. La macro la s�pare en 2 membres -> \SYS_leftmember et \SYS_rightmember
% le signe de s�paration entre les 2 membres se trouve dans \SYS_currenteqsign
\def\SYS_splitinmembers#1{%
@@ -238,7 +261,7 @@
\fi
}
{\ifcsname SYS_term_\detokenize\expandafter{\SYS_letterfound}_\SYS_eqnumber\endcsname
- \errmessage{Package systeme Error: l'inconnue "\detokenize\expandafter{\SYS_letterfound}" a deja ete trouvee dans l'�quation !}%
+ \errmessage{Package systeme Error: l'inconnue "\detokenize\expandafter{\SYS_letterfound}" a deja ete trouvee dans l'equation !}%
\fi
\ifSYS_sortvariable
\SYS_insletter\SYS_letterfound% l'ins�rer si besoin dans la liste ordonn�e des variables
@@ -606,15 +629,16 @@
\SYS_makesyspreamble_i1%
}
+
\def\SYS_makesyspreamble_i#1{%
\xs_ifnum{#1<\SYS_preamblenum\relax}% tant qu'il reste des variables
- {\SYS_addtotok\SYS_systempreamble{\hfil$##$&\hfil$##$&}% une colonne pour le terme et une pour le signe
+ {\SYS_xaddtotok\SYS_systempreamble{\SYS_leftleft$##$\SYS_leftright&\hfil\SYS_signspace$##$\SYS_signspace\hfil&}% une colonne pour le terme et une pour le signe
\xs_exparg\SYS_makesyspreamble_i{\number\numexpr#1+1}%
}
{\ifSYS_constterm
- \SYS_addtotok\SYS_systempreamble{\hfil$##$&\hfil$##$&}% une colonne pour le terme constant et son signe
+ \SYS_xaddtotok\SYS_systempreamble{\SYS_leftleft$##$\SYS_leftright&\hfil\SYS_signspace$##$\SYS_signspace\hfil&}% une colonne pour le terme constant et son signe
\fi
- \SYS_addtotok\SYS_systempreamble{\hfil$##$&$##$&$##$\hfil\null}% ajouter 1 colonne pour le signe = et une pour le terme de droite
+ \SYS_xaddtotok\SYS_systempreamble{\SYS_leftleft$##$\SYS_leftright&\hfil\SYS_eqspace$##$\SYS_eqspace\hfil&\SYS_rightleft$##$\SYS_rightright\null}% ajouter 1 colonne pour le signe = et une pour le terme de droite
\ifSYS_extracol
\SYS_addtotok\SYS_systempreamble{&\SYS_extracolstart##\SYS_extracolend\hfil\null}% la colonne suppl�mentaire (pas de mode math)
\fi
@@ -686,4 +710,12 @@
les noms des termes.
- Correction d'un bug : si version �toil�e et terme constant dans
membre de gauche, d�faut d'alignement.
- - Nettoyage du code.
\ No newline at end of file
+ - Nettoyage du code.
+----------------------------------------------------------------------
+v0.33 13/04/2020
+ - possibilit� de choisir un espacement avant et apr�s les signes
+ + et - avec \syssignspace{<skip>}. De m�me pour = avec
+ \syseqspace{<skip>}
+ - possibilit� de choisir l'alignement des colonnes des termes �
+ gauche du signe = et celle � droite avec \sysalign{x,y} o�
+ x et y sont "c", "r", ou "l"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/systeme.tlpobj new/tlpkg/tlpobj/systeme.tlpobj
--- old/tlpkg/tlpobj/systeme.tlpobj 2019-02-28 04:06:36.000000000 +0100
+++ new/tlpkg/tlpobj/systeme.tlpobj 2020-04-15 01:54:54.000000000 +0200
@@ -1,6 +1,6 @@
name systeme
category Package
-revision 49690
+revision 54724
shortdesc Format systems of equations
relocated 1
longdesc The package allows you to enter systems of equations or
@@ -16,7 +16,6 @@
catalogue-contact-bugs https://framagit.org/unbonpetit/systeme/issues
catalogue-contact-repository https://framagit.org/unbonpetit/systeme/tree/master
catalogue-ctan /macros/generic/systeme
-catalogue-date 2019-01-13 21:13:02 +0100
catalogue-license lppl1.3c
catalogue-topics maths maths-syseqn simplified
-catalogue-version 0.32
+catalogue-version 0.33