summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/generic/texdimens/README.md168
-rw-r--r--macros/generic/texdimens/texdimens.sty2
-rw-r--r--macros/generic/texdimens/texdimens.tex49
-rw-r--r--macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdfbin40813 -> 40812 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdfbin201045 -> 201045 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalnotes.pdfbin199196 -> 199196 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-sidenotes.pdfbin295847 -> 295847 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-tabular.pdfbin284803 -> 284803 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdfbin200373 -> 200373 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses.pdfbin200204 -> 200204 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-antilabe.pdfbin209856 -> 209856 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-cross_referencing.pdfbin199197 -> 199199 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdfbin202702 -> 202702 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-glossaries.pdfbin284462 -> 284462 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-indexing.pdfbin283598 -> 283598 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdfbin277764 -> 277764 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdfbin293260 -> 293260 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-linespacing.pdfbin288423 -> 288423 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdfbin290106 -> 290106 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-notes-width.pdfbin205925 -> 205925 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdfbin211562 -> 211562 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-performances.pdfbin286175 -> 286175 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdfbin31498 -> 31496 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdfbin309311 -> 309311 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin287548 -> 287548 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdfbin199051 -> 199051 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdfbin23428 -> 23424 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdfbin174535 -> 174535 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin32047 -> 32047 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin288679 -> 288679 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin199948 -> 199948 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin199183 -> 199183 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdfbin177026 -> 177026 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin199590 -> 199590 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin198522 -> 198522 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin198573 -> 198573 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin198707 -> 198707 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin213256 -> 213256 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin211867 -> 211867 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdfbin204143 -> 204143 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin297127 -> 297127 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin203251 -> 203251 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin224508 -> 224508 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdfbin249192 -> 249192 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin203970 -> 203970 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin199821 -> 199821 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin301523 -> 301523 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin206311 -> 206311 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdfbin195383 -> 195383 bytes
-rw-r--r--macros/latex/contrib/reledmac/migration.pdfbin368877 -> 368877 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledmac.dtx29
-rw-r--r--macros/latex/contrib/reledmac/reledmac.pdfbin2063704 -> 2064422 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledpar.pdfbin1006705 -> 1006705 bytes
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md12
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin1516213 -> 1516492 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-print.dtx8
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin638362 -> 638362 bytes
-rw-r--r--macros/latex/contrib/univie-ling/README14
-rw-r--r--macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx2
-rw-r--r--macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx2
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdfbin111387 -> 116016 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdfbin149271 -> 155796 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdfbin144249 -> 151605 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdfbin173916 -> 173919 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex3
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex3
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdfbin242469 -> 248395 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdfbin454894 -> 455929 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex14
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdfbin449280 -> 450528 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex16
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdfbin452989 -> 455739 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex31
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdfbin340662 -> 340706 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex3
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls50
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls55
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls120
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls2
80 files changed, 503 insertions, 82 deletions
diff --git a/macros/generic/texdimens/README.md b/macros/generic/texdimens/README.md
index d574ae2ae6..ecd8631193 100644
--- a/macros/generic/texdimens/README.md
+++ b/macros/generic/texdimens/README.md
@@ -10,7 +10,7 @@ LPPL 1.3c. See file LICENSE.md.
Development: https://github.com/jfbu/texdimens
-Release: `0.9 2021/07/21`
+Release: `0.99 2021/11/02`
## Aim of this package
@@ -21,11 +21,6 @@ The aim of this package is to address the issue of expressing dimensions
(or dimension expressions evaluated by `\dimexpr`) in the various TeX
units, to the extent possible.
-The descriptions that follow do not explain the details of the exact
-internal TeX procedures of parsing dimensional input, they only describe
-in a faithful manner the exact outcome of those internal procedures.
-The reader is supposed to be familiar with TeX basics.
-
This project requires the e-TeX extensions `\dimexpr` and `\numexpr`.
The notation `<dim. expr.>` in the macro descriptions refers to a
*dimensional expression* as accepted by `\dimexpr`. The syntax has some
@@ -37,7 +32,7 @@ Notice that this is WIP and inaccuracies may exist even relative to
descriptions of TeX handlings due to limited time available for the
project.
-## TeX points and scaled points
+## Quick review of basics: TeX points and scaled points
TeX dimensions are represented internally by a signed integer which is
in absolute value at most `0x3FFFFFFF`, i.e. `1073741823`. The
@@ -51,10 +46,10 @@ If `\foo` is a dimen register:
- inside `\numexpr`, `\foo` is replaced by `N`,
- `\the\foo` produces a decimal `D` (with at most five places) followed
-with `pt` (catcode 12 tokens) and this output `Dpt` can serve as input
-in a dimen assignment to produce the same dimension as `\foo`. One can
-also use the catcode 11 characters `pt` for this. Digits and decimal
-mark must have their standard catcode 12.
+ with `pt` (catcode 12 tokens) and this output `Dpt` can serve as input
+ in a dimen assignment to produce the same dimension as `\foo`. One can
+ also use the catcode 11 characters `pt` for this. Digits and decimal
+ mark must have their standard catcode 12.
When TeX encounters a dimen denotation of the type `Dpt` it will
compute `N` in a way equivalent to `N = round(65536 D)` where ties are
@@ -72,15 +67,30 @@ TeX understands on input further units: `bp`, `cm`, `mm`, `in`, `pc`,
`em`, and PDFTeX adds the `px` dimension unit. Japanese engines also
add specific units.
-`ex`, `em`, `px` and other engine-dependent units, are all currently
-excluded from consideration in this project and the rest of this
-documentation is only for the `bp`, `cm`, `mm`, `in`, `pc`, `cc`, `nc`, `dd`
-and `nd` units. When we say "unit" we mean one of those or the `pt` (the
-`sp` is a special case and will be included or not tacitly in the "unit"
-denomination depending on the case).
-
-TeX associates to each such unit `uu` a fraction `phi` which is a conversion
-factor. It is always `>1`:
+The `ex`, `em`, and `px` units are handled somewhat differently by (pdf)TeX than
+`bp`, `cm`, `mm`, `in`, `pc`, `cc`, `nc`, `dd` and `nd` units. For the former
+(let's use the generic notation `uu`), the exact same dimensions are obtained
+from an input `D uu` where `D` is some decimal or from `D <dimen>` where `<dimen>`
+stands for some dimension register which records `1uu` or `\dimexpr1uu\relax`. In
+contrast, among the latter, i.e. the core TeX units, this is false except for the
+`pc` unit.
+
+The explanation is as follows (in this discussion `sp` is kept aside).
+
+TeX associates (explicitly for the core units, implicitly for the units corresponding
+to internal dimensions) to each unit `uu` a fraction `phi` which is a conversion
+factor. For the internal dimensions `ex`, `em`, `px` or in the case of multiplying
+a dimension by a decimal, this `phi` is morally `f/65536` where `f` is the integer
+such that `1 uu=f sp`. For core units however, the hard-coded ratio `n/d` never has a
+denominator `d` whici is a power of `2`, except for the `pc` whose associated ratio
+factor is `12/1` (and arguably for the `sp` for which morally `phi` is `1/65536` but
+we keep it separate from the general discussion).
+
+As a result the value of `1 uu` as `f sp` is at best irrelevant
+or at worst misleading regarding the way TeX parses `D uu`. Notice for example
+that `1.00375` is the exact value of the `phi` factor for the `bp` unit but
+that `1.00375pt>1bp` ...
+Here is a table with the hard-coded conversion factors:
uu phi reduced real approximation 1uu in sp= x=[65536phi]/65536 \the<1uu>
(Python output) [65536phi] (real approximation)
@@ -96,26 +106,28 @@ factor. It is always `>1`:
in 7227/100 same 72.27 4736286 72.26998901367188 72.26999pt
When TeX parses an assignment `U uu` with a decimal `U` and a unit `uu`,
-among those listed above, it first handles `U` as with the `pt` unit.
+be it a core unit, or a unit corresponding to an internal dimension,
+it first handles `U` as with the `pt` unit.
This means that it computes `N = round(65536*U)`. It then multiplies
this `N` by the conversion factor `phi` and truncates towards zero the
mathematically exact result to obtain an integer `T`:
`T=trunc(N*phi)`. The assignment `Uuu` is concluded by defining the
value of the dimension to be `Tsp`.
-Attention that although the mnemotic is `phi=1uu/1pt`, this formula
-definitely does not apply with numerator and denominator interpreted as
-TeX dimensions. See the above table. Also, the last column looks like
-`round(.,5)` is applied to the previous one, but `\the\dimexpr1dd\relax`
-is an exception (in the table `[x]` is the integer part, aka for
-non-negative values, the `\trunc()` function). Notice also that
-`1.00375` is the exact value of the `phi` factor for the `bp` unit but
-`1.00375pt>1bp` (`65782>65781`).
-
-As `phi>1` (and is not exceedingly close to `1`), the increasing
-sequence `0<=trunc(phi)<=trunc(2phi)<=...` is *strictly increasing* and
-**it has jumps**: not all TeX dimensions can be obtained from an
-assignment not using the `pt` unit.
+Regarding the core units, we always have `phi>1`.
+The increasing
+sequence `0<=trunc(phi)<=trunc(2phi)<=...` is thus *strictly increasing*
+and, as `phi` is never astronomically close to `1`,
+**it always has jumps**: not all TeX dimensions can be obtained from an
+assignment using a core unit distinct from the `pt` (and `sp` of course,
+but we already said it was kept out of the discussion here).
+
+On the other hand when `phi<1`, then the sequence `trunc(N phi)` is not
+strictly increasing, already because `trunc(phi)=0` and besides here
+`phi=f/65536`, so the `65536` integers `0..65535` are mapped to `f`
+integers `0..(f-1)` inducing non one-to-oneness. But
+all integers in the `0..(2**30-1)` range will be attained for some input,
+so there is surjectivity.
The "worst" unit is the largest i.e. the `in` whose conversion factor is
`72.27`. The simplest unit to understand is the `pc` as it corresponds
@@ -127,14 +139,13 @@ available with another unit. For example, and perhaps surprisingly,
there is no decimal `D` which would achieve `1in==Dcm`: the "step"
between attainable dimensions is `72--73sp` for the `in` and `28--29sp`
for the `cm`, and as `1in` differs internally from `2.54cm` by only
-`12sp` (see below the `xintsession` verbatim) it is impossible to adjust
-either the `in` side or the `cm` side to obtain equality. See in the
-[Extras?] section the closest dimension attainable both via `in` and via
-`cm`.
+`12sp` it is impossible to adjust
+either the `in` side or the `cm` side to obtain equality.
In particular `1in==2.54cm` is **false** in TeX, but it is true that
-`100in==254cm`... It is also false that `10in==25.4cm` but it is true that
-`10in==254mm`... It is false though that `1in==25.4mm`!
+`100in==254cm`... (it is already true that `50in==127cm`). It is also
+false that `10in==25.4cm` but it is true that `10in==254mm`... It is
+false though that `1in==25.4mm`!
>>> (\dimexpr1in, \dimexpr2.54cm);
@_1 4736286, 4736274
@@ -149,7 +160,7 @@ In particular `1in==2.54cm` is **false** in TeX, but it is true that
@_5 47362867, 47362867
`\maxdimen` can be expressed only with `pt`, `bp`, and `nd`. For the
-other units the maximal attainable dimensions in `sp` unit are given in
+other core units the maximal attainable dimensions in `sp` unit are given in
the middle column of the next table.
maximal allowed the corresponding minimal TeX dimen denotation
@@ -170,23 +181,49 @@ Perhaps for these various peculiarities with dimensional units, TeX does
not provide an output facility for them similar to what `\the` achieves for
the `pt`.
-## Macros of this package
+## Macros of this package (summary)
-The macros defined by the package are expandable, and will expand
-completely in an `\edef`, or in a `\dimexpr...\relax` construct.
-As they parse their inputs via `\dimexpr` they can be nested (with
-the suitable dimension unit added as postfix to nested macro).
+This package provides expandable (most are f-expandable, see the code)
+macros (they can be nested as they parse their inputs via `\dimexpr`):
-Apart from the `\texdimen<uu>up` in case of a negative input, they will
-even expand completely under f-expansion.
+- `\texdimenpt`,
+- `\texdimenUU`, `\texdimenUUup` and
+ `\texdimenUUdown` with `UU` standing for one of `bp`, `cm`, `mm`, `in`,
+ `pc`, `cc`, `nc`, `dd` and `nd`,
+- `\texdimenbothincm` (and relatives not listed here, see below),
+- and `\texdimenwithunit`, added at `0.99`.
+
+For example `\texdimenbp` takes on input some dimension or dimension
+expression and produces on output a decimal `D` such that `D bp` is
+guaranteed to be the same dimension as the input, if that one admits any
+representation as `E bp`; else it will be either the closest match from
+above or from below. The `\texdimenbpup` and `\texdimenbpdown` allow to
+choose the direction of approximation.
+
+`\texdimenwithunit{<dimen1>}{<dimen2>}` produces a decimal `D` such
+that `D \dimexpr dimen2\relax` is represented internally the same as
+`dimen1` if at all possible, else is a closest match, but one does not
+know if from below or above. If `dimen2<1pt` all TeX dimensions `dimen1`
+are attainable. If `dimen2>1pt` not all `dimen1` are attainable.
Negative dimensions behave as if replaced by their absolute value, then
at last step the sign (if result is not zero) is applied (so "down" means
"towards zero", and "up" means "away from zero").
+Do not confuse `\texdimenwithunit{dim}{1bp}` with
+`\texdimenbp{dim}`. The former produces a decimal `D` such that
+`D\dimexpr 1bp\relax` is represented internally as is `dim` if at all
+possible, whereas the latter produces a decimal `D` such that `D bp` is
+the one aiming at being the same as `dim`. Using `D\dimexpr 1bp\relax`
+implies a conversion factor equal to `65781/65536`, whereas `D bp`
+involves the `803/800` conversion factor.
+
+
+## Macros of this package (full list)
+
1. For input `X` equal to (or sufficiently close to) `\maxdimen` and
those units `uu` for which `\maxdimen` is not exactly representable
- (i.e. all units except `pt`, `bp` and `nd`), the output `D` of the
+ (i.e. all core units except `pt`, `bp` and `nd`), the output `D` of the
"up" macros `\texdimen<uu>up{X}`, if used as `Duu` in a dimension
assignment or expression, will (naturally) trigger a "Dimension too
large" error.
@@ -198,6 +235,12 @@ at last step the sign (if result is not zero) is applied (so "down" means
3. Again for the `dd`, `nc` and `in` units, both the "down" and "up" macros
will trigger "Dimension too large" during their execution if used
with an input equal to (or sufficiently close to) `\maxdimen`.
+4. With `\texdimenwithunit{dimen1}{dimen2}` and if `\maxdimen`
+ is not representable exactly by `dimen2` used as a base dimension,
+ (which may happen only if `dimen2>1pt`) it might
+ be that the decimal `D` produced from `\maxdimen` or nearby dimensions
+ will trigger "Dimension too large" if an attempt to use `D <dimen2>` is
+ made.
`\texdimenpt{<dim. expr.>}`
@@ -407,20 +450,20 @@ at last step the sign (if result is not zero) is applied (so "down" means
> represents the dimension exactly if possible. If not possible it
> will be smallest representable dimension larger than the original one.
-`\texdimenbothcmin{<dim. expr.>}` (new with `0.9dev`)
+`\texdimenbothcmin{<dim. expr.>}`
> Produces a decimal (with up to five decimal places) `D` such that `Din`
> is the largest dimension smaller than the original one and
> exactly representable both in the `in` and `cm` units.
-`\texdimenbothincm{<dim. expr.>}` (new with `0.9dev`)
+`\texdimenbothincm{<dim. expr.>}`
> Produces a decimal (with up to five decimal places) `D` such that `Dcm`
> is the largest dimension smaller than the original one and
> exactly representable both in the `in` and `cm` units. It thus represents
> the same dimension as `\texdimenbothcmin{<dim. expr.>}in`.
-`\texdimenbothcminpt{<dim. expr.>}` (new with `0.9dev`)
+`\texdimenbothcminpt{<dim. expr.>}`
> Produces a decimal (with up to five decimal places) `D` such that `Dpt`
> is the largest dimension smaller than the original one and
@@ -428,20 +471,26 @@ at last step the sign (if result is not zero) is applied (so "down" means
> the same dimension as the one provided by `\texdimenbothcmin` and
> `\texdimenbothincm`.
-`\texdimenbothincmpt{<dim. expr.>}` (new with `0.9dev`)
+`\texdimenbothincmpt{<dim. expr.>}`
> Same as `\texdimenbothcminpt`.
-`\texdimenbothcminsp{<dim. expr.>}` (new with `0.9dev`)
+`\texdimenbothcminsp{<dim. expr.>}`
> Produces an integer (explicit digit tokens) `N` such that `Nsp`
> is the largest dimension smaller than the original one and
> exactly representable both in the `in` and `cm` units.
-`\texdimenbothincmsp{<dim. expr.>}` (new with `0.9dev`)
+`\texdimenbothincmsp{<dim. expr.>}`
> Same as `\texdimenbothcminsp`.
+`\texdimenwithunit{<dim. expr. 1>}{<dim expr. 2>}`
+
+> Produces a decimal `D` such that `D\dimexpr <dim expr. 2>\relax` is
+> considered by TeX the same as `<dim. expr. 1>` if at all possible.
+> If not possible it will be a closest match either from above or below.
+
## Extras?
@@ -457,7 +506,7 @@ as input with the corresponding unit will be beyond `\maxdimen` if the
latter is not attainable, i.e. for all units except `bp`, and `nd`
(and `pt` but there is no "up" macro for it).
-According to a reference on the web by an anonymous contributor the
+The
dimensions representable with both `in` and `cm` units have the shape
`trunc(3613.5*k)sp` for some integer `k`. The largest one smaller
than a given dimension will thus differ from it by at most about `0.055pt`,
@@ -476,6 +525,13 @@ For the `1in` for example it would be `4737298sp`, i.e. `1.00021in` which
differs from TeX's `1in` by `+1012sp` and is obtained also as `2.54054cm`
and `72.28543pt`.
+## Acknowledgements
+
+Thanks to Denis Bitouzé for raising an issue on the LaTeX3 tracker which
+gave the initial motivation for this package.
+
+Thanks to Ruixi Zhang for reviving the topic about handling also
+the `ex` and `em` cases, which led to `\texdimenwithunit`.
<!--
-->
diff --git a/macros/generic/texdimens/texdimens.sty b/macros/generic/texdimens/texdimens.sty
index 8467e69a6f..1b41c47d68 100644
--- a/macros/generic/texdimens/texdimens.sty
+++ b/macros/generic/texdimens/texdimens.sty
@@ -1,5 +1,5 @@
% This is file texdimens.tex, part of texdimens package, which
% is distributed under the LPPL 1.3c. Copyright (c) 2021 Jean-François Burnol
-\ProvidesPackage{texdimens}[2021/07/21 v0.9 conversion of TeX dimensions to decimals (JFB)]
+\ProvidesPackage{texdimens}[2021/11/02 v0.99 conversion of TeX dimensions to decimals (JFB)]
\@@input texdimens.tex\relax
\endinput \ No newline at end of file
diff --git a/macros/generic/texdimens/texdimens.tex b/macros/generic/texdimens/texdimens.tex
index 8103bef1cd..d8bf99e0bc 100644
--- a/macros/generic/texdimens/texdimens.tex
+++ b/macros/generic/texdimens/texdimens.tex
@@ -1,6 +1,6 @@
% This is file texdimens.tex, part of texdimens package, which
% is distributed under the LPPL 1.3c. Copyright (c) 2021 Jean-François Burnol
-% 2021/07/21 v0.9
+% 2021/11/02 v0.99
% All macros from 0.9delta release have changed names: \texdimen prefix
% has replaced \texdimin.
\edef\texdimensendinput{\endlinechar\the\endlinechar\catcode`\noexpand _=\the\catcode`\_\relax\noexpand\endinput}%
@@ -10,6 +10,12 @@
% Mathematics ("down" and "up" macros)
% ===========
%
+% In the entire discussion here, "uu" stands for some core unit,
+% or some unit corresponding to a dimension > 1pt. For the case
+% of a unit corresponding to a dimension < 1pt, i.e. to
+% \texdimenwithunit macro added at 0.99, refer to the
+% comments of issue #2 on the tracker site.
+%
% Is T sp attainable from unit "uu"?.
% If not, what is largest dimension < Tsp which is attainable?
% Here we suppose T>0.
@@ -325,7 +331,7 @@
% there is ample room for 7227k+1 using \numexpr.
%
% But this step, as well as initial step to get kmax will require to separate
-% hangdling of negative input from positive one.
+% handling of negative input from positive one.
%
% Alternative
% -----------
@@ -368,4 +374,43 @@
\def\texdimenbothsp_neg#1#2-#3;{#1-\numexpr(((2*#3-3612)/7227)*7227+1)/2-1\relax\relax}%
%
\let\texdimenbothcminsp\texdimenbothincmsp
+% (\texdimenwithunit, added at 0.99)
+% Mathematics
+% ===========
+%
+% <comments to be added> (see discussion #2)
+%
+% Implementation
+% ==============
+%
+% <comments to be added> (see discussion #2)
+% #2 is unit, assumed positive. We will need to branch whether
+% #2 is <1pt or >1pt.
+% pre-multiplication of #1 by 2 here
+\def\texdimenwithunit#1#2{\expandafter\texdimenwithunit_
+ \the\numexpr\dimexpr#2\expandafter;\the\numexpr2*\dimexpr#1;}%
+\def\texdimenwithunit_#1;#2{\ifnum#1>65535
+ \expandafter\texdimenwithunit_A\else\expandafter\texdimenwithunit_B\fi
+ #2#1;%
+}%
+% unit>=1pt, handle this as for bp
+\def\texdimenwithunit_A#1#2;#3;{\expandafter\texdimenstrippt
+ \the\dimexpr\numexpr(#1#3+\if-#1-\fi1)*32768/#2sp\relax
+}%
+% unit<1pt
+% if dim1<0, simply negate result for dim1>0 as it can not be 0.0
+\def\texdimenwithunit_B#1{\if-#1\expandafter\texdimenwithunit_Bneg\fi\texdimenwithunit_Ba#1}%
+\def\texdimenwithunit_Ba#1#2;#3;{\expandafter\texdimenwithunit_Bb\the\numexpr#1#3+1;#2;}%
+\def\texdimenwithunit_Bb#1;#2;{\expandafter\texdimenwithunit_Bc\the\numexpr(#1-#2)/(2*#2);#1;#2;}%
+% not adding f-expandability slight overhead here
+% oh well, let's do \the\numexpr..+0.ddddd which does the trick and allows
+% recycling strippt here with no need of another utility
+% (thinking about it it means we could do this for unit >1pt as this method
+% works even for \the\dimexpr producing 1pt or more... (as TeX outputs 1.0pt, not 1pt
+% so the dot remains to stop the \numexpr scan)
+\def\texdimenwithunit_Bc#1;#2;#3;{\the\numexpr#1+\expandafter\texdimenstrippt
+ \the\dimexpr\numexpr(#2-#1*2*#3)*32768/#3sp\relax}%
+% definitly not caring about f-expandability here
+\def\texdimenwithunit_Bneg\texdimenwithunit_Ba-#1;#2;%
+ {-\expandafter\texdimenwithunit_Bb\the\numexpr#2+1;#1;}%
\texdimensendinput
diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
index b92b60e47b..ac81f1244b 100644
--- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
index 4766e38d38..1c27a15fb5 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
index f669ce30c9..9d518bf0eb 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
index fe9826bcf5..4ab0e81ca9 100644
--- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
index abb3976b59..2eef17f864 100644
--- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
index ac76fd9f8b..e915eec0ac 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf
index 8a975fac9f..80f79e5faf 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
index e295f0204d..437a76d767 100644
--- a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
index 55fb7476ee..083daf183c 100644
--- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
index 81a3764006..11452f7fe6 100644
--- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
index 4f21057ba8..d537e33993 100644
--- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
index 99ce6fe10b..101dc1dc01 100644
--- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
index 2a1b3ebdf4..fff138ef30 100644
--- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
index 56789481bf..a1f158edad 100644
--- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
index bf49a6826b..bda461167c 100644
--- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
index 274f719ce6..f48f393c6f 100644
--- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
index 028329e06b..24a3360652 100644
--- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
index d4ac5f3c64..9d7dd0d291 100644
--- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf
index 482b1ed01b..8a2e7b80f8 100644
--- a/macros/latex/contrib/reledmac/examples/2-performances.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
index 5ae176bc27..fbf973b071 100644
--- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
index 3d7988bcde..f3918f390f 100644
--- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
index 0fa1eda97d..6acdf77eca 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
index 784b4f5e91..cd52cce08a 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
index 5a2396d8fa..4249605dad 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
index a5ac937d4b..2d696d17f8 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
index 297ddc4672..a70b8c1ab2 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
index 222c139845..2776b2e757 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
index 04a751bd9e..ab06401ba7 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
index 957720ca6f..fd7ec93d6c 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
index 3338e9124c..d7e1015109 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
index 67756d6ad9..0fa157c478 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
index d292d76db0..f8ac927068 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
index b378e9dec8..569af736b2 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
index 497ecc61f5..b0ab8eadc0 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
index bb47c504a1..1513bf993a 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
index 70aa4ce555..d2e296556d 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
index 612f63e28b..46c962e509 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
index a901f4b4d6..c352f2fe80 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
index 4e610657b4..7307550374 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
index 9195e3c8a4..a8332eb40a 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
index 3232142908..1d1bc1103e 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
index 8d323b82b5..a7e45281a0 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
index 7b169a2f9c..63fc6fb5ae 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
index 95ee47081d..3d38bbc50e 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
index b8eb7dabec..d8a06425c2 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
index 205c3bc2f9..2444d467dc 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf
index 6363914c61..31cc703837 100644
--- a/macros/latex/contrib/reledmac/migration.pdf
+++ b/macros/latex/contrib/reledmac/migration.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx
index 996dc98008..9009f1a2ae 100644
--- a/macros/latex/contrib/reledmac/reledmac.dtx
+++ b/macros/latex/contrib/reledmac/reledmac.dtx
@@ -587,6 +587,8 @@
% \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xnopagenumberifcurrent} hook.}
% \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xbeforepagenumber} hook.}
% \changes{v2.38.1}{2021/09/27}{Fix incompatibility between \protect\parpackage's option \protect\option{continuousnumberingwithcolumns} and lineation by page.}
+% \changes{v2.38.2}{2021/11/03}{Fix bug when using \protect\cs{applabel} in conjunction with \protect\package{hyperref} package.}
+% \changes{v2.38.2}{2021/11/03}{Fix some trouble in indentation in stanza, when switching to some language with \protect\package{polyglossia}.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4476,7 +4478,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2021/09/27 v2.38.1 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2021/11/03 v2.38.2 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -8318,6 +8320,18 @@
\showlemma{#1}%
}%
% \end{macrocode}
+% If using \package{hyperref} package, we put the final hypertarget for \cs{applabel}.
+% \begin{macrocode}
+ \ifdef{\hypertarget}%
+ {%
+ \def\do##1{\Hy@raisedlink{\hypertarget{##1:end}{}}}%
+ \ifcsdef{applabel@thisedtext@\the\@edtext@level}{%
+ \dolistcsloop{applabel@thisedtext@\the\@edtext@level}%
+ \global\cslet{applabel@thisedtext@\the\@edtext@level}{\empty}%
+ }{}%
+ }%
+ {}%
+% \end{macrocode}
%
% Finally, we add any insertions that are
% associated with the \emph{end} of
@@ -9039,7 +9053,9 @@
\global\setbox\raw@text=\vbox\bgroup%
\if@nobreak%
\if@afterindent\else%
- \noindent%
+ \unless\ifinstanza%
+ \noindent%
+ \fi%
\global\@afterindenttrue%
\fi%
\fi%
@@ -16951,6 +16967,15 @@
% \begin{macrocode}
\@esphack%
% \end{macrocode}
+% If using \package{hyperref}, store the label in a list for the current edtext, to call later an hypertarget for the end of the lemma.
+% \begin{macrocode}
+ \ifdef{\hypertarget}%
+ {%
+ \ifcsundef{applabel@thisedtext@\the\@edtext@level}{\global\cslet{applabel@thisedtext@\the\@edtext@level}{\relax}}{}%
+ \listcsgadd{applabel@thisedtext@\the\@edtext@level}{#1}%
+ }%
+ {}%
+% \end{macrocode}
% Warning if \protect\cs{applabel} is called outside of \protect\cs{edtext}.
% \begin{macrocode}
\else%
diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf
index a0bae5136c..e484cbdcd3 100644
--- a/macros/latex/contrib/reledmac/reledmac.pdf
+++ b/macros/latex/contrib/reledmac/reledmac.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf
index 01117f6c19..df842ae7ec 100644
--- a/macros/latex/contrib/reledmac/reledpar.pdf
+++ b/macros/latex/contrib/reledmac/reledpar.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 4db74bbc00..3aebf9976f 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,15 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.0.35]
+
+### Changed
+- Delay loading of `color` package to `begindocument` hook
+
+### Fixed
+- Text mode replacement of `\mathrm` in super/subscripts (see issue
+ [#556](https://github.com/josephwright/siunitx/issues/556))
+
## [v3.0.34]
### Fixed
@@ -1613,7 +1622,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.34...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.35...HEAD
+[v3.0.35]: https://github.com/josephwright/siunitx/compare/v3.0.34...v3.0.35
[v3.0.34]: https://github.com/josephwright/siunitx/compare/v3.0.33...v3.0.34
[v3.0.33]: https://github.com/josephwright/siunitx/compare/v3.0.32...v3.0.33
[v3.0.32]: https://github.com/josephwright/siunitx/compare/v3.0.31...v3.0.32
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 5ea13cc569..64dae8774b 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.pdf
+++ b/macros/latex/contrib/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx
index 4f107b5cbb..5bcc08f65b 100644
--- a/macros/latex/contrib/siunitx/siunitx-print.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-print.dtx
@@ -313,9 +313,10 @@
% \end{macrocode}
% \end{macro}
%
-% Color support is always required.
+% Color support is always required; to avoid a potential clash we delay to
+% the start of the document.
% \begin{macrocode}
-\RequirePackage { color }
+\AtBeginDocument { \RequirePackage { color } }
% \end{macrocode}
%
% \begin{macro}{\tl_replace_all:NVn}
@@ -816,7 +817,8 @@
{ \@@_text_replace:Nnnnn #1 }
{
\tl_set:Nn \l_@@_tmp_tl {#1}
- \@@_replace_font:N \l_@@_tmp_tl
+ \tl_if_empty:NF \l_siunitx_unit_font_tl
+ { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n }
\cs_set:Npn \mathord ##1 {##1}
\cs_set:Npn \pm { \exp_not:N \textpm }
\tl_map_inline:nn
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index cdf49b261c..6fd0040427 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/siunitx/siunitx.dtx
@@ -121,7 +121,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2021-10-26} {3.0.34}
+\ProvidesExplPackage {siunitx} {2021-11-03} {3.0.35}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index d1dadd2e95..bb59f34127 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README
index b11a83f845..1c366d3da1 100644
--- a/macros/latex/contrib/univie-ling/README
+++ b/macros/latex/contrib/univie-ling/README
@@ -80,6 +80,20 @@ also have a look at the example files.
== CHANGES ==
+V. 1.16 (2021-11-03):
+ - univie-ling-paper:
+ * Adjust font size and margins to dept. standards.
+ * Add option "draftmark".
+ * Fix grouping in \maketitle
+ - univie-ling-thesis:
+ * Add \makedeclaration (for BA theses)
+ * Adjust font size and margins of BA thesis to dept. standards.
+ * Add option "draftmark".
+ * Fix grouping in \maketitle
+ - univie-ling-expose:
+ * Add option "draftmark".
+ * Fix grouping in \maketitle
+
V. 1.15 (2021-10-19)
- univie-ling.bbx:
* Output url date only if url is given (not with DOI).
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
index 80f31592f5..7b378e5c1e 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
@@ -36,7 +36,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.bbx}[2021/10/13 v1.15dev biblatex bibliography style]
+\ProvidesFile{univie-ling.bbx}[2021/11/03 v1.16 biblatex bibliography style]
% Load base style (authoryear)
\RequireBibliographyStyle{authoryear}
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
index 6939d0adaa..a6c94afa82 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
@@ -34,7 +34,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.cbx}[2021/09/01 v1.14 biblatex citation style]
+\ProvidesFile{univie-ling.cbx}[2021/11/03 v1.16 biblatex citation style]
\RequireCitationStyle{authoryear}
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
index 4177418424..f5bb410014 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
index 497435e7ff..2d6e8e8b44 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
index bd4dfe4715..87a9785ff2 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
index c1de8f5eb8..9569ba5659 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex
index ec96559ba7..7b01c0a88f 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex
@@ -40,6 +40,9 @@
% Die Titelseite
\maketitle
+% Selbständigkeitserklärung (für BA-Arbeiten)
+% \makedeclaration
+
\tableofcontents
\chapter{Ein paar Tipps}\label{cha:hinweise}
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex
index 4fea4ea8b4..0be7edb600 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex
@@ -40,6 +40,9 @@
% The title page
\maketitle
+% Declaration of good practice (BA theses)
+% \makedeclaration
+
\tableofcontents
\chapter{General hints}\label{cha:hints}
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
index 7963775007..5e0dc5db2c 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
index b905cb673e..0f5a089f73 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
index a563962d7e..69dcc75dce 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.15, 2021/10/19}
+\date{Version 1.16, 2021/11/03}
\maketitle
@@ -126,6 +126,7 @@ The following package is required for an optional feature (not used by default):
\begin{itemize}
\setlength\itemsep{0pt}
\item \textsf{biblatex-apa}: APA style for \textsf{biblatex}.
+ \item \textsf{draftwatermark}: Create a draft mark.
\item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX).
\item \textsf{polyglossia}: Multi-language and script support.
\end{itemize}
@@ -197,6 +198,12 @@ option (e.\,g., \joption{all=false,microtype=true} will switch off all packages
of the class (concerning verbose cross references) are omitted.
\end{description}
+
+\subsection{Draft mode}\label{draft}
+
+The option \joption{draftmark=true|false|firstpage} allows you to mark your document as a draft, which is indicated by a watermark (including the current date). This might be useful when sharing preliminary versions with your supervisor.
+With \joption{draftmark=true}, this mark is printed on top of each page. With \joption{draftmark=firstpage}, the draft mark appears on the title page only.
+
\subsection{Further options}
The class builds on \textsf{scrartcl} (KOMA article), which provides many more options to tweak the appearance of your document. You can use
@@ -319,6 +326,11 @@ Templates are provided as well:
\section{Release History}
\begin{description}
+ \item 2021/11/03 (v.\,1.16)
+ \begin{itemize}
+ \item Add option \joption{draftmark}. See sec.~\ref{draft}.
+ \item Fix grouping in \jcsmacro{maketitle}.
+ \end{itemize}
\item 2021/10/19 (v.\,1.15) No change to this class.
\item 2021/09/01 (v.\,1.14) No change to this class.
\item 2020/11/11 (v.\,1.13) No change to this class.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
index 324d3672f6..d663dae870 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
index 6af218292c..94c1edb891 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.15, 2021/10/19}
+\date{Version 1.16, 2021/11/03}
\maketitle
@@ -118,8 +118,9 @@ The following packages are required for specific features and loaded by default.
The following package is required for an optional feature (not used by default):
\begin{itemize}
\setlength\itemsep{0pt}
- \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX).
\item \textsf{biblatex-apa}: APA style for \textsf{biblatex}.
+ \item \textsf{draftwatermark}: Create a draft mark.
+ \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX).
\item \textsf{polyglossia}: Multi-language and script support.
\end{itemize}
@@ -211,6 +212,11 @@ option (e.\,g., \joption{all=false,microtype=true} will switch off all packages
of the class (concerning verbose cross references) are omitted.
\end{description}
+\subsection{Draft mode}\label{draft}
+
+The option \joption{draftmark=true|false|firstpage} allows you to mark your document as a draft, which is indicated by a watermark (including the current date). This might be useful when sharing preliminary versions with your supervisor.
+With \joption{draftmark=true}, this mark is printed on top of each page. With \joption{draftmark=firstpage}, the draft mark appears on the title page only.
+
\subsection{Further options}
The class builds on \textsf{scrartcl} (KOMA article), which provides many more options to tweak the appearance of your document. You can use
@@ -343,6 +349,12 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2021/11/03 (v.\,1.16)
+ \begin{itemize}
+ \item Adjust font size and margins to dept. standards.
+ \item Add option \joption{draftmark}. See sec.~\ref{draft}.
+ \item Fix grouping in \jcsmacro{maketitle}.
+ \end{itemize}
\item 2021/10/19 (v.\,1.15) No change to this class.
\item 2021/09/01 (v.\,1.14) Do not overwrite \jmacro{texttype} set by user with default value.
\item 2020/11/11 (v.\,1.13) No change to this class.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
index aa5b23ee90..76ef6f22f5 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
index 247ac26797..94e29acbc0 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.15, 2021/10/19}
+\date{Version 1.16, 2021/11/03}
\maketitle
@@ -122,6 +122,7 @@ The following package is required for an optional feature (not used by default):
\begin{itemize}
\setlength\itemsep{0pt}
\item \textsf{biblatex-apa}: APA style for \textsf{biblatex}.
+ \item \textsf{draftwatermark}: Create a draft mark.
\item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX).
\item \textsf{polyglossia}: Multi-language and script support.
\item \textsf{pdfa}: Create PDF/A compliant files.
@@ -215,6 +216,12 @@ option (e.\,g., \joption{all=false,microtype=true} will switch off all packages
of the class (concerning verbose cross references) are omitted.
\end{description}
+
+\subsection{Draft mode}\label{draft}
+
+The option \joption{draftmark=true|false|firstpage} allows you to mark your document as a draft, which is indicated by a watermark (including the current date). This might be useful when sharing preliminary versions with your supervisor.
+With \joption{draftmark=true}, this mark is printed on top of each page. With \joption{draftmark=firstpage}, the draft mark appears on the title page only.
+
\subsection{Further options}
\begin{description}
@@ -258,6 +265,18 @@ the following data in the preamble.
The suitable degree (\emph{Angestrebter akademischer Grad}) is automatically set by the \jcsmacro{thesistype} command, but you can override it with the optional command \jcsmacro{degree\{<custom degree>\}}.
Note that female forms of degrees, where appropriate, are used if you use the class option \joption{fdegree=true} (see sec.~\ref{coptions}).
+
+\section{Declaration}\label{decl}
+
+It is possible to automatically generate a page with a declaration where you declare and sign that you follow research ethics\slash anti-plagiarism rules
+(\emph{Selbst\"andigkeitserkl\"arung}) by means of the command
+
+\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={makedeclaration}]
+ \makedeclaration
+\end{lstlisting}
+%
+Such a declaration is needed for BA theses.
+
\section{Semantic markup}\label{markup}
The class defines some basic semantic markup common in linguistics:
@@ -367,11 +386,19 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2021/11/03 (v.\,1.16)
+ \begin{itemize}
+ \item Add \jcsmacro{makedeclaration} (for BA theses). See sec.~\ref{decl}.
+ \item Adjust font size and margins of BA thesis to dept. standards.
+ \item Add option \joption{draftmark}. See sec.~\ref{draft}.
+ \item Fix grouping in \jcsmacro{maketitle}.
+ \end{itemize}
\item 2021/10/19 (v.\,1.15) No change to this class.
\item 2021/09/01 (v.\,1.14) No change to this class.
\item 2020/11/11 (v.\,1.13) No change to this class.
\item 2020/06/25 (v.\,1.12) No change to this class.
- \item 2020/05/05 (v.\,1.11)\begin{itemize}
+ \item 2020/05/05 (v.\,1.11)
+ \begin{itemize}
\item New option \joption{polyglossia}.
\item New option \joption{pdfa}.
\end{itemize}
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
index 9a63ce24f0..ab3e009ac4 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
index fabc1db69c..9380a29f8c 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.15, 2021/10/19}
+\date{Version 1.16, 2021/11/03}
\maketitle
@@ -232,6 +232,7 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m
\raggedright
\begin{itemize}
+ \item 2021/11/03 (v.\,1.16) No change to this class.
\item 2021/10/19 (v.\,1.15) Allow for slanted/bold IPA.
\item 2021/09/01 (v.\,1.14) Update editorial board.
\item 2020/11/11 (v.\,1.13)
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
index 83353bfbe3..da8d92a1bf 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
@@ -31,13 +31,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-expose}[2021/10/19 v1.15 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2021/11/03 v1.16 Univie Linguistic Exposes (JSp)]
\RequirePackage{xkeyval}
\newif\ifbiblatex\biblatextrue
\newif\ifapa\apafalse
\newif\ifcaptionp\captionptrue
+\newif\ifdraftmark\draftmarkfalse
+\newif\ifdraftmarkfp\draftmarkfpfalse
\newif\ifrefsp\refsptrue
\newif\ifcovington\covingtontrue
\newif\ifmicrotype\microtypetrue
@@ -132,6 +134,24 @@
}
\DeclareOptionX{covington}[true]{\setkeys{uvt}{covington=#1}}
+% draftmark=<true|false>
+% Print draftmark
+\define@choicekey*+{uvt}{draftmark}[\val\nr]{true,false,firstpage}{%
+ \ifcase\nr\relax% true:
+ \draftmarktrue
+ \draftmarkfpfalse
+ \or% false:
+ \draftmarkfalse
+ \draftmarkfpfalse
+ \or% firstpage:
+ \draftmarktrue
+ \draftmarkfptrue
+ \fi
+}{%
+ \ClassWarning{univie-ling-paper}{unknown draft value}%
+}
+\DeclareOptionX{draftmark}[true]{\setkeys{uvt}{draftmark=#1}}
+
% microtype=<true|false>
% Load microtype
\define@boolkey+{uvt}{microtype}[true]{%
@@ -200,6 +220,8 @@
%% ============================================================
\RequirePackage{translations}
+\DeclareTranslation{German}{draft}{ENTWURF}
+\DeclareTranslation{English}{draft}{DRAFT}
\DeclareTranslation{German}{section}{Abschnitt}
\DeclareTranslation{English}{section}{section}
\DeclareTranslation{German}{footnote}{Anm.}
@@ -432,7 +454,7 @@
\end{flushright}
\vspace{2\baselineskip}
\begin{center}
- \bgroup\usekomafont{thesistype}{\GetTranslation{expo}}\egroup
+ {\usekomafont{thesistype}\GetTranslation{expo}}
\end{center}
\vspace{2\baselineskip}
\begin{center}
@@ -713,4 +735,28 @@
\fi
+
+%% =============================================================
+%% DRAFT:
+%% =============================================================
+
+\ifdraftmark
+
+\ifdraftmarkfp
+ \RequirePackage[firstpageonly]{draftwatermark}
+\else
+ \RequirePackage{draftwatermark}
+\fi
+
+\DraftwatermarkOptions{%
+ angle=0,
+ vpos=10pt,
+ anchor=ct,
+ fontsize=14pt,
+ text={\GetTranslation{draft} (\today)}
+}
+
+\fi
+
+
%% Finis.
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
index 7deb27f764..3c06667d6e 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
@@ -31,13 +31,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-paper}[2021/10/19 v1.15 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2021/11/03 v1.16 Univie Linguistic Papers (JSp)]
\RequirePackage{xkeyval}
\newif\ifbiblatex\biblatextrue
\newif\ifapa\apafalse
\newif\ifcaptionp\captionptrue
+\newif\ifdraftmark\draftmarkfalse
+\newif\ifdraftmarkfp\draftmarkfpfalse
\newif\ifrefsp\refsptrue
\newif\ifcovington\covingtontrue
\newif\ifmicrotype\microtypetrue
@@ -107,6 +109,24 @@
}
\DeclareOptionX{caption}[true]{\setkeys{uvt}{caption=#1}}
+% draftmark=<true|false>
+% Print draftmark
+\define@choicekey*+{uvt}{draftmark}[\val\nr]{true,false,firstpage}{%
+ \ifcase\nr\relax% true:
+ \draftmarktrue
+ \draftmarkfpfalse
+ \or% false:
+ \draftmarkfalse
+ \draftmarkfpfalse
+ \or% firstpage:
+ \draftmarktrue
+ \draftmarkfptrue
+ \fi
+}{%
+ \ClassWarning{univie-ling-paper}{unknown draft value}%
+}
+\DeclareOptionX{draftmark}[true]{\setkeys{uvt}{draftmark=#1}}
+
% ref=<true|false>
% Load varioref and prettyref
\define@boolkey+{uvt}{ref}[true]{%
@@ -186,6 +206,8 @@
\LoadClass[%
a4paper,
+ fontsize=12pt,
+ BCOR=0mm,
captions=tableheading,
listof=totoc,
numbers=noenddot,
@@ -199,6 +221,8 @@
%% ============================================================
\RequirePackage{translations}
+\DeclareTranslation{German}{draft}{ENTWURF}
+\DeclareTranslation{English}{draft}{DRAFT}
\DeclareTranslation{German}{subm}{Abgegeben am}
\DeclareTranslation{English}{subm}{Submission date:}
\DeclareTranslation{German}{submto}{bei}
@@ -387,6 +411,10 @@ This includes all drawings, sketches, graphics and internet sources.}
\RequirePackage{scrlayer-scrpage}
\pagestyle{scrplain}
+% Margins
+\RequirePackage{geometry}
+\geometry{tmargin=3cm, bmargin=3cm, lmargin=3cm, rmargin=3cm, footskip=1.5cm}
+
% No widows and orphans
% No overfull lines
\tolerance 1414
@@ -472,7 +500,7 @@ This includes all drawings, sketches, graphics and internet sources.}
\end{flushright}
\vspace{2\baselineskip}
\begin{center}
- \bgroup\usekomafont{texttype}{\MakeUppercase{\@texttype}\par}\egroup
+ {\usekomafont{texttype}\MakeUppercase{\@texttype}\par}
\end{center}
\vspace{2\baselineskip}
\begin{center}
@@ -816,4 +844,27 @@ This includes all drawings, sketches, graphics and internet sources.}
\fi
+
+%% =============================================================
+%% DRAFT:
+%% =============================================================
+
+\ifdraftmark
+
+\ifdraftmarkfp
+ \RequirePackage[firstpageonly]{draftwatermark}
+\else
+ \RequirePackage{draftwatermark}
+\fi
+
+\DraftwatermarkOptions{%
+ angle=0,
+ vpos=10pt,
+ anchor=ct,
+ fontsize=14pt,
+ text={\GetTranslation{draft} (\today)}
+}
+
+\fi
+
%% Finis.
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
index 5449db234a..ce9906f50d 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
@@ -31,16 +31,19 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-thesis}[2021/10/19 v1.15 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2021/11/03 v1.16 Univie Linguistic Theses (JSp)]
\RequirePackage{xkeyval}
\newif\ifbiblatex\biblatextrue
\newif\ifapa\apafalse
\newif\ifcaptionp\captionptrue
+\newif\ifdraftmark\draftmarkfalse
+\newif\ifdraftmarkfp\draftmarkfpfalse
\newif\ifrefsp\refsptrue
\newif\ifcovington\covingtontrue
\newif\ifmicrotype\microtypetrue
+\newif\ifmultiauthors\multiauthorsfalse
\newif\ifpolyglossia\polyglossiafalse
\newif\ifpsfonts\psfontstrue
\newif\ifotffonts\otffontsfalse
@@ -160,6 +163,24 @@
}
\DeclareOptionX{fdegree}[true]{\setkeys{uvt}{fdegree=#1}}
+% draftmark=<true|false>
+% Print draftmark
+\define@choicekey*+{uvt}{draftmark}[\val\nr]{true,false,firstpage}{%
+ \ifcase\nr\relax% true:
+ \draftmarktrue
+ \draftmarkfpfalse
+ \or% false:
+ \draftmarkfalse
+ \draftmarkfpfalse
+ \or% firstpage:
+ \draftmarktrue
+ \draftmarkfptrue
+ \fi
+}{%
+ \ClassWarning{univie-ling-paper}{unknown draft value}%
+}
+\DeclareOptionX{draftmark}[true]{\setkeys{uvt}{draftmark=#1}}
+
% polyglossia=<true|false>
% Load polyglossia
\define@boolkey+{uvt}{polyglossia}[true]{%
@@ -227,6 +248,8 @@
%% ============================================================
\RequirePackage{translations}
+\DeclareTranslation{German}{draft}{ENTWURF}
+\DeclareTranslation{English}{draft}{DRAFT}
\DeclareTranslation{German}{section}{Abschnitt}
\DeclareTranslation{English}{section}{section}
\DeclareTranslation{German}{footnote}{Anm.}
@@ -235,7 +258,26 @@
\DeclareTranslation{English}{footnote}{example}
\DeclareTranslation{German}{stkz}{Studienkennzahl}
\DeclareTranslation{English}{stkz}{Studienkennzahl}
-
+\DeclareTranslation{German}{erkl}{Erkl\"arung}
+\DeclareTranslation{English}{erkl}{Declaration}
+\DeclareTranslation{German}{selbst1s}{Hiermit versichere ich, dass ich die vorliegende Arbeit selbst\"andig verfasst
+und keine anderen als die angegebenen Hilfsmittel benutzt habe.}
+\DeclareTranslation{German}{selbst1p}{Hiermit versichern wir, dass wir die vorliegende Arbeit selbst\"andig verfasst
+und keine anderen als die angegebenen Hilfsmittel benutzt haben.}
+\DeclareTranslation{German}{selbst2}{Die Stellen der Arbeit, die anderen Quellen im Wortlaut oder dem Sinn nach entnommen wurden, sind durch Herkunftsangaben kenntlich gemacht.
+Dies gilt auch f\"ur Zeichnungen, Skizzen, bildliche Darstellungen sowie f\"ur Quellen aus dem Internet.}
+\DeclareTranslation{German}{selbst3s}{Ich versichere ferner, dass ich die vorliegende Arbeit weder ganz noch in Teilen bereits als
+Pr\"ufungsleistung vorgelegt habe.}
+\DeclareTranslation{German}{selbst3p}{Wir versichern ferner, dass wir die vorliegende Arbeit weder ganz noch in Teilen bereits als
+Pr\"ufungsleistung vorgelegt haben.}
+\DeclareTranslation{English}{selbst1s}{I hereby declare that this paper is entirely my own work and that I used no source material or aids other than those stipulated.}
+\DeclareTranslation{English}{selbst1p}{We hereby declare that this paper is entirely our own work and that we used no source material or aids other than those stipulated.}
+\DeclareTranslation{English}{selbst2}{No part of it has been copied from any work produced by any other person or copied from any other source without reference to the source.
+This includes all drawings, sketches, graphics and internet sources.}
+\DeclareTranslation{English}{selbst3s}{Furthermore, I declare that this paper has not been submitted as an examination already, neither as a whole nor in parts.}
+\DeclareTranslation{English}{selbst3p}{Furthermore, we declare that this paper has not been submitted as an examination already, neither as a whole nor in parts.}
+\DeclareTranslation{German}{wien}{Wien}
+\DeclareTranslation{English}{wien}{Vienna}
%% ============================================================
%% FONTS AND EMPHASIZING:
@@ -309,6 +351,11 @@
\else
\def\@degree{\csuse{degree@#1}}
\fi
+ \Ifstr{#1}{bachelor}{%
+ \KOMAoptions{fontsize=12pt}%
+ \RequirePackage{geometry}
+ \geometry{tmargin=3cm, bmargin=3cm, lmargin=3cm, rmargin=3cm, footskip=1.5cm}
+ }
}%
}
@@ -451,6 +498,7 @@
\else
\def\and{%
\end{tabular}%
+ \global\multiauthorstrue%
\hskip 1em \@plus.17fil%
\begin{tabular}[t]{c}%
}%
@@ -501,7 +549,7 @@
\end{flushright}
\vspace{2\baselineskip}
\begin{center}
- \bgroup\usekomafont{thesistype}{\MakeUppercase{\@thesistype\,/\,\hskip\z@skip\mbox{\@thesistype@en}}\par}\egroup
+ {\usekomafont{thesistype}\MakeUppercase{\@thesistype\,/\,\hskip\z@skip\mbox{\@thesistype@en}}\par}
\end{center}
\vspace{2\baselineskip}
\begin{center}
@@ -588,6 +636,48 @@
\restoregeometry
}%
+\newcommand\makedeclaration{%
+\def\and{%
+ \end{tabular}%
+ \hskip 1em \@plus.17fil%
+ \begin{tabular}[t]{c}%
+ \hline
+ }%
+\clearpage
+\thispagestyle{plain}%
+\section*{\GetTranslation{erkl}}
+
+\ifmultiauthors
+\GetTranslation{selbst1p}
+\else
+\GetTranslation{selbst1s}
+\fi
+
+\GetTranslation{selbst2}
+
+\ifmultiauthors
+\GetTranslation{selbst3p}
+\else
+\GetTranslation{selbst3s}
+\fi
+
+\bigskip
+\bgroup
+\raggedleft
+\GetTranslation{wien}, \today
+
+\vspace{15mm}
+
+\begin{tabular}[t]{c}
+ \hline
+ \@author
+\end{tabular}\par
+\egroup
+\clearpage
+\global\let\and\relax
+}
+
+
%% =============================================================
%% FOOTNOTES:
@@ -794,4 +884,28 @@
\fi
+
+%% =============================================================
+%% DRAFT:
+%% =============================================================
+
+\ifdraftmark
+
+\ifdraftmarkfp
+ \RequirePackage[firstpageonly]{draftwatermark}
+\else
+ \RequirePackage{draftwatermark}
+\fi
+
+\DraftwatermarkOptions{%
+ angle=0,
+ vpos=10pt,
+ anchor=ct,
+ fontsize=14pt,
+ text={\GetTranslation{draft} (\today)}
+}
+
+\fi
+
+
%% Finis.
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
index 5b789ac810..e95c3507f5 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
@@ -32,7 +32,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-wlg}[2021/10/19 v1.15 WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2021/11/03 v1.16 WLG journal layout (JSp)]
%% ============================================================