summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/dijkstra/README4
-rw-r--r--macros/latex/contrib/dijkstra/dijkstra-fr.pdfbin370577 -> 369070 bytes
-rw-r--r--macros/latex/contrib/dijkstra/dijkstra-fr.tex32
-rw-r--r--macros/latex/contrib/dijkstra/dijkstra.sty336
-rw-r--r--macros/latex/contrib/fontsetup/README2
-rw-r--r--macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdfbin747596 -> 805088 bytes
-rw-r--r--macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex20
-rw-r--r--macros/latex/contrib/fontsetup/doc/fspsample-gfsdidot.pdfbin38823 -> 31214 bytes
-rw-r--r--macros/latex/contrib/fontsetup/doc/fspsample-newdefault.pdfbin0 -> 44488 bytes
-rw-r--r--macros/latex/contrib/fontsetup/doc/fspsample.pdfbin0 -> 30402 bytes
-rw-r--r--macros/latex/contrib/fontsetup/doc/fspsample.tex27
-rw-r--r--macros/latex/contrib/fontsetup/fontsetup.sty8
-rw-r--r--macros/latex/contrib/fontsetup/fspdefault.sty150
-rw-r--r--macros/latex/contrib/fontsetup/fspgfsdidotot.sty2
-rw-r--r--macros/latex/contrib/fontsetup/fspolddefault.sty (renamed from macros/latex/contrib/fontsetup/fspdefaultfontsot.sty)0
-rw-r--r--macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdfbin40837 -> 40842 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdfbin177475 -> 175600 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex11
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalnotes.pdfbin121597 -> 119720 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalnotes.tex17
-rw-r--r--macros/latex/contrib/reledmac/examples/1-sidenotes.pdfbin145283 -> 145283 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-sidenotes.tex12
-rw-r--r--macros/latex/contrib/reledmac/examples/1-tabular.pdfbin189792 -> 187373 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-tabular.tex7
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdfbin123178 -> 121150 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.tex3
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses.pdfbin123463 -> 121318 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses.tex7
-rw-r--r--macros/latex/contrib/reledmac/examples/2-antilabe.pdfbin130290 -> 128416 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-antilabe.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/2-cross_referencing.pdfbin122256 -> 120386 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-cross_referencing.tex5
-rw-r--r--macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdfbin126016 -> 123574 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-footnote_spacing.tex3
-rw-r--r--macros/latex/contrib/reledmac/examples/2-glossaries.pdfbin18323 -> 132844 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-glossaries.tex21
-rw-r--r--macros/latex/contrib/reledmac/examples/2-indexing.pdfbin187631 -> 185822 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-indexing.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdfbin124324 -> 122378 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-lemma_disambigution.tex7
-rw-r--r--macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdfbin144492 -> 142433 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/2-linespacing.pdfbin138405 -> 136296 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-linespacing.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdfbin158108 -> 156021 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/2-notes-width.pdfbin129005 -> 126635 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-notes-width.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdfbin140523 -> 131284 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/2-performances.pdfbin135414 -> 133738 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-performances.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdfbin31749 -> 31756 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdfbin215012 -> 212782 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.tex33
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin190222 -> 188331 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.tex5
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdfbin175170 -> 173338 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdfbin24474 -> 24475 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdfbin93475 -> 93085 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_mwe.tex7
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin37801 -> 37801 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin138222 -> 135907 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.tex45
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin190161 -> 190089 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin189362 -> 189289 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdfbin168099 -> 168067 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin189915 -> 189852 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin188836 -> 188770 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin188745 -> 188677 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin188865 -> 188808 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin189690 -> 187768 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin134815 -> 132837 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.tex33
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdfbin190204 -> 173906 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.tex17
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin201833 -> 199864 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.tex7
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin123601 -> 123230 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.tex3
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin215182 -> 144326 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdfbin239560 -> 226079 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.tex3
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin125082 -> 124679 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.tex17
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin123151 -> 120874 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin263410 -> 260966 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex5
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin183782 -> 180904 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.tex3
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdfbin118947 -> 116963 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.tex1
-rw-r--r--macros/latex/contrib/reledmac/examples/makefile8
-rw-r--r--macros/latex/contrib/reledmac/migration.pdfbin356983 -> 356983 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledmac.dtx90
-rw-r--r--macros/latex/contrib/reledmac/reledmac.pdfbin1998713 -> 2003149 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledpar.pdfbin987055 -> 987044 bytes
-rw-r--r--macros/latex/contrib/xfakebold/Changes1
-rw-r--r--macros/latex/contrib/xfakebold/README3
-rw-r--r--macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdfbin96190 -> 98301 bytes
-rw-r--r--macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex48
-rw-r--r--macros/latex/contrib/xfakebold/latex/xfakebold.sty42
113 files changed, 692 insertions, 372 deletions
diff --git a/macros/latex/contrib/dijkstra/README b/macros/latex/contrib/dijkstra/README
index c619266cd5..f49d8f82cf 100644
--- a/macros/latex/contrib/dijkstra/README
+++ b/macros/latex/contrib/dijkstra/README
@@ -3,9 +3,9 @@ ___________________________________
L'extension
dijkstra
- v0.11
+ v0.12
- 9 sptembre 2017
+ 25 juin 2020
___________________________________
Authors : Christian Tellechea
diff --git a/macros/latex/contrib/dijkstra/dijkstra-fr.pdf b/macros/latex/contrib/dijkstra/dijkstra-fr.pdf
index c30674325d..84308d0026 100644
--- a/macros/latex/contrib/dijkstra/dijkstra-fr.pdf
+++ b/macros/latex/contrib/dijkstra/dijkstra-fr.pdf
Binary files differ
diff --git a/macros/latex/contrib/dijkstra/dijkstra-fr.tex b/macros/latex/contrib/dijkstra/dijkstra-fr.tex
index 1fc90dc173..ec76559db9 100644
--- a/macros/latex/contrib/dijkstra/dijkstra-fr.tex
+++ b/macros/latex/contrib/dijkstra/dijkstra-fr.tex
@@ -5,7 +5,7 @@
\documentclass[french,a4paper,10pt]{article}
\usepackage[latin1]{inputenc}
\usepackage[T1]{fontenc}
-\usepackage[margin=2cm]{geometry}
+\usepackage[margin=1cm]{geometry}
\usepackage[bottom]{footmisc}
\usepackage{libertine,boites,tikz,enumitem,MnSymbol,babel,xspace,listings,dijkstra}
\usetikzlibrary{arrows.meta}
@@ -62,7 +62,7 @@
\exemple@@
}
-\newcommand\exemple@@[2][37]{%
+\newcommand\exemple@@[2][30]{%
\xdef\@hparta{0.#1\linewidth}\xdef\@hpartb{0.\number\numexpr95-#1\relax\linewidth}%
\def\@tempa##1#2{\exemple@@@{##1}}%
\@tempa
@@ -84,7 +84,7 @@
\kern.5ex\relax
\leavevmode$\vcenter{\hsize=\@hparta\relax
\ttfamily\small\the@code\par}$%
- \hfill
+ \hfill\vrule\hfill
$\vcenter{\hsize=\@hpartb\relax
\newlinechar`\^^M\everyeof{\noexpand}\scantokens{#1}\par}$%
\endbreakbox
@@ -169,7 +169,7 @@ Dans le graphe \emph{non orienté} suivant, quel est le plus court chemin pour al
\end{center}
\paragraph{Lire le graphe}
-Pour trouver le plus court chemin pour aller de A à F, il faut d'abord lire le graphe. Comme il est fréquent que les graphes sont peu peuplés, j'ai pris le parti de définir un graphe par une liste d'adjacence. Ainsi, la macro \verb|\readgraph|, qui va lire le graphe, admet comme argument obligatoire une liste d'adjacence :
+Pour trouver le plus court chemin pour aller de A à F, il faut d'abord lire le graphe. Comme il est fréquent que les graphes soient peu peuplés, j'ai pris le parti de définir un graphe par une liste d'adjacence. Ainsi, la macro \verb|\readgraph|, qui va lire le graphe, admet comme argument obligatoire une liste d'adjacence :
\code/\readgraph{
A [B=7, D=15],
@@ -179,7 +179,7 @@ Pour trouver le plus court chemin pour aller de A à F, il faut d'abord lire le g
E [F=14]
}/
-Les espaces sont ignorés de part et d'autre des noms des sommets, des crochets (ouvrants et fermants), des signes «\verb/=/» et des virgules. Ainsi, ce n'est que dans les noms des sommets que les espaces ne sont pas ignorés : par exemple, le sommet «\verb*|A 1|» est distinct du sommet «\verb*|A1|».
+Les espaces sont ignorés de part et d'autre des noms des sommets, des crochets (ouvrants et fermants), des signes «\verb/=/» et des virgules. Ainsi, ce n'est que dans les noms des sommets que les espaces ne sont pas ignorés : par exemple, le sommet «\verb|A 1|» est distinct du sommet «\verb*|A1|».
\paragraph{Conditions sur les distances}
Les distances entre sommets \emph{doivent} être positives, c'est une limitation intrinsèque à l'algorithme de Dijkstra pour qu'il fonctionne sans erreur. La méthode de programmation utilisée dans cette extension exige de plus que ces distances soient des nombres \emph{entiers}.\medbreak
@@ -195,7 +195,7 @@ F [B=16, C=3, E=14]/
Par conséquent, la liste d'adjacence entrée par l'utilisateur ne doit pas contenir d'incohérence. Si l'on spécifie la distance entre un sommet A et un sommet B par \verb|A[B=<x>,...]| on peut s'économiser la peine de spécifier cette même distance entre B et A puisque c'est fait par l'extension \DIJK automatiquement. En revanche, une erreur sera émise si dans la liste d'adjacence, on trouve \verb|A[B=<x>,...]| puis \verb|B[A=<y>,...]| où \verb-<y>- et \verb-<x>- sont différents.
\paragraph{Lancer l'algorithme}
-Une fois que le graphe est lu par la macro \verb|\readgraph|, on peut lancer l'algorithme avec la macro \verb|\dijkstra{<A>}{<B>}| où \verb-<A>- et \verb-<B>- sont deux sommets du graphe. La distance minimale entre ces deux sommets est stockée dans la macro \verb|\dijkdist| et le chemin correspondant dans \verb|\dijkpath|.
+Une fois que le graphe est lu par la macro \verb|\readgraph|, on lance l'algorithme avec \verb|\dijkstra{<A>}{<B>}| où \verb-<A>- et \verb-<B>- sont deux sommets du graphe. La distance minimale entre ces deux sommets est stockée dans la macro \verb|\dijkdist| et le chemin correspondant dans \verb|\dijkpath|.
\exemple|\readgraph{
A [B=7, D=15],
@@ -207,9 +207,9 @@ Tableau : \dijkstra{A}{F}\par
Distance A-F = \dijkdist\par
Chemin = \dijkpath|
-Dans le tableau, les colonnes sont disposées dans le \emph{même ordre} que celui des sommets dans la liste d'adjacence lue par \verb|readgraph|.
+Dans le tableau, les colonnes sont disposées dans le \emph{même ordre} que celui des sommets dans la liste d'adjacence lue par \verb|\readgraph|.
-\section{Graphe non orienté}
+\section{Graphe orienté}
Pour spécifier à \verb|\readgraph| que la liste d'adjacence est celle d'un graphe \emph{orienté}, la macro doit être suivie d'une étoile.
\begin{center}
@@ -266,11 +266,13 @@ On peut également régler des \verb|<paramètres>| pour toutes les exécutions de l
\begin{center}
\verb|\setdijk{<paramètres>}|
\end{center}
-mais aussi modifier des \verb|<paramètres>| \emph{par défaut} avec
+mais aussi modifier des \verb|<paramètres>| \emph{par défaut} avec
\begin{center}
\verb|\setdijkdefault{<paramètres>}|
\end{center}
+Pour réinitialiser toutes les \verb|<clés>| à leur \verb|<valeur>| par défaut, il faut exécuter la macro \verb|\initdijk|.\medbreak
+
Voici toutes les \verb|<clés>|, leur \verb|<valeur>| par défaut et leur description.
\cleval{show-tab}{booléen}
@@ -362,7 +364,9 @@ ce qui a pour effet de mettre le sommet de provenance en indice de la distance.
Tableau : \dijkstra{A}{F}|
\paragraph{Mise en évidence du sommet fixé}
-Le premier sommet fixé est celui de départ et sa distance est toujours 0. La macro \verb|\highlightfistnode| prend comme argument la distance (qui est 0) et le traite pour effectuer sa mise en forme. Sa définition par défaut, qui compose cette distance en gras, est :
+Le premier sommet fixé est celui de départ et sa distance est toujours 0.
+
+La macro \verb|\highlightfistnode| prend comme argument la distance (qui est 0) et le traite pour effectuer sa mise en forme. Sa définition par défaut, qui compose cette distance en gras, est :
\code|\newcommand*\highlightfirstnode[1]{$\mathbf{#1}$}|
@@ -393,14 +397,6 @@ Pour obtenir d'autre effets, on peut redéfinir ces macros. L'exemple donné n'est
E [F=14]}
Tableau : \dijkstra{A}{F}|
-\section{Historique des versions}
-Merci d'envoyer \emph{via} email tout bug, dysfonctionnement, erreur ou demande de fonctionnalité à \verb|unbonpetit@netc.fr|
-
-\paragraph{v0.1\quad 06/09/2017} Première version.
-\paragraph{v0.2\quad 10/09/2017} Retrait d'un \verb|\show| dans le code, laissé par oubli après les phases de débogage.
-
-Nettoyage du code.
-
\section{Code}
Le code ci-dessous est l'exact verbatim du fichier \verb|dijkstra.sty| :
diff --git a/macros/latex/contrib/dijkstra/dijkstra.sty b/macros/latex/contrib/dijkstra/dijkstra.sty
index a1e8872804..b8c673449e 100644
--- a/macros/latex/contrib/dijkstra/dijkstra.sty
+++ b/macros/latex/contrib/dijkstra/dijkstra.sty
@@ -4,15 +4,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
\def\dijkname {dijkstra} %
-\def\dijkver {0.11} %
+\def\dijkver {0.12} %
% %
-\def\dijkdate {2017/09/09} %
+\def\dijkdate {2020/06/25} %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% --------------------------------------------------------------------
% This work 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
%
@@ -24,11 +24,10 @@
% This work has the LPPL maintenance status `maintained'.
%
% The Current Maintainer of this work is Christian Tellechea
-% Copyright : Christian Tellechea 2017
+% Copyright : Christian Tellechea 2017-2020
% email: unbonpetit@netc.fr
% Commentaires, suggestions et signalement de bugs bienvenus !
% Comments, bug reports and suggestions are welcome.
-% Copyright: Christian Tellechea 2017
% --------------------------------------------------------------------
% L'extension dijkstra est composée des 4 fichiers suivants :
% - code : dijkstra.sty
@@ -36,6 +35,8 @@
% - fichier lisezmoi : README
% --------------------------------------------------------------------
%
+\csname dijkloadonce\endcsname
+\let\dijkloadonce\endinput
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{dijkstra}[\dijkdate\space v\dijkver\space Dijkstra Algorithm (CT)]
\RequirePackage{simplekv}
@@ -59,6 +60,15 @@
\def\dijk_swapargs#1#2#3{#1{#3}{#2}}
\def\dijk_ifstar#1#2{\def\dijk_ifstar_i{\skv_ifx{*\dijk_nxttok}{\skv_first{#1}}{#2}}\futurelet\dijk_nxttok\dijk_ifstar_i}
\def\dijk_ifopt#1#2{\def\dijk_ifopt_i{\skv_ifx{[\dijk_nxttok}{#1}{#2}}\futurelet\dijk_nxttok\dijk_ifopt_i}
+\def\dijk_stripsp#1%
+{%
+ \long\def\dijk_stripsp##1{\expanded{\dijk_stripsp_i\_marksp##1\__nil\_marksp#1\_marksp\_nil}}%
+ \long\def\dijk_stripsp_i##1\_marksp#1##2\_marksp##3\_nil{\dijk_stripsp_ii##3##1##2\__nil#1\__nil\_nil}%
+ \long\def\dijk_stripsp_ii##1#1\__nil##2\_nil{\dijk_stripsp_iii##1##2\_nil}%
+ \long\def\dijk_stripsp_iii##1##2\__nil##3\_nil{\unexpanded{##2}}%
+}
+\dijk_stripsp{ }
+
\def\dijk_foreach#1\in#2#3%
{%
@@ -73,11 +83,12 @@
{%
\def#1{#2}%
\skv_ifx{\dijk_quark#1}
- {}
- {%
- \skv_ifx{#1\empty}{}{\csname dijk_loopcode_\number\dijk_nest\endcsname}%
- \dijk_foreach_i#1%
- }%
+ {%
+ }
+ {%
+ \skv_ifx{#1\empty}{}{\csname dijk_loopcode_\number\dijk_nest\endcsname}%
+ \dijk_foreach_i#1%
+ }%
}%
\def\dijk_ifinst#1#2%
@@ -99,24 +110,29 @@
\expandafter\readgraph_b\dijk_graph,\dijk_quark[],%
}
-\def\dijk_sanitizegraph#1[#2],%
+\def\dijk_sanitizegraph#1,%
+{%
+ \expandafter\expandafter\expandafter\dijk_sanitizegraph_i\dijk_stripsp{#1},% bugfix 0.12
+}
+
+\def\dijk_sanitizegraph_i#1[#2],%
{%
\skv_ifx{\dijk_quark#1}
- {%
- \dijk_removelastcommainmacro\dijk_graph
- }
- {%
- \skv_eearg{\def\dijk_childnodes}{\skv_removeextremespaces{#1}[}%
- \dijk_foreach\dijk_temp\in{#2}{\expandafter\dijk_sanitizegraph_i\dijk_temp\_nil}%
- \dijk_removelastcommainmacro\dijk_childnodes
- \dijk_eaddtomacro\dijk_graph{\dijk_childnodes],}%
- \dijk_sanitizegraph
- }%
+ {%
+ \dijk_removelastcommainmacro\dijk_graph
+ }
+ {%
+ \skv_eearg{\def\dijk_childnodes}{\dijk_stripsp{#1}[}%
+ \dijk_foreach\dijk_temp\in{#2}{\expandafter\dijk_sanitizegraph_ii\dijk_temp\_nil}%
+ \dijk_removelastcommainmacro\dijk_childnodes
+ \dijk_eaddtomacro\dijk_graph{\dijk_childnodes],}%
+ \dijk_sanitizegraph
+ }%
}
-\def\dijk_sanitizegraph_i#1=#2\_nil
+\def\dijk_sanitizegraph_ii#1=#2\_nil
{%
- \dijk_eeaddtomacro\dijk_childnodes{\skv_removeextremespaces{#1}=}%
+ \dijk_eeaddtomacro\dijk_childnodes{\dijk_stripsp{#1}=}%
\dijk_eaddtomacro\dijk_childnodes{\the\numexpr#2\relax,}%
}
@@ -133,54 +149,55 @@
\def\readgraph_b#1#2[#3]#4,%
{%
\skv_ifx{\dijk_quark#1}
- {%
- \skv_exparg{\dijk_foreach\dijk_tempnodename\in}{\dijk_initlistofnodes}
- {% pour chaque sommet
- \skv_eearg{\dijk_foreach\dijk_tempnodechild\in}{\csname dijknode\dijk_tempnodename\endcsname}
- {% pour chaque enfant
- \expandafter\readgraph_c\dijk_tempnodechild\_nil\dijk_currentnodechildname\dijk_currentnodechilddist% capturer nom et distance de l'enfant
- \dijk_exptwoargs\dijk_ifinst\dijk_initlistofnodes{\dijk_currentnodechildname,}% si l'enfant n'est pas dans la liste des sommets
- {}%
- {%
- \dijk_eaddtomacro\dijk_initlistofnodes{\dijk_currentnodechildname,}% l'y mettre
- \dijk_cscmd\let{dijknode\dijk_currentnodechildname}\empty% et initialiser la liste de ses enfants
- }%
- \unless\ifdijk_oriented% si graphe non orienté, ajouter les distances inverses
- \skv_exparg{\skv_eearg\dijk_ifinst{\csname dijknode\dijk_currentnodechildname\endcsname}}{\dijk_tempnodename=}% si le parent est dans déjà un des enfants de l'enfant
- {%
- \expandafter\def\expandafter\readgraph_d\expandafter########\expandafter1\dijk_tempnodename=########2,########3\_nil{%
- \unless\ifnum########2=\dijk_currentnodechilddist\relax% si distance différente : erreur, c'est pas normal
- \errmessage{Distance "\dijk_tempnodename=########2" incorrecte dans \dijk_currentnodechildname{} comprise comme "\dijk_tempnodename=\dijk_currentnodechilddist"}%
- \dijk_cscmd\edef{dijknode\dijk_currentnodechildname}{########1\dijk_tempnodename=\dijk_currentnodechilddist,########3}%
- \fi
- }%
- \expandafter\expandafter\expandafter\readgraph_d\csname dijknode\dijk_currentnodechildname\endcsname\_nil
- }%
- {% sinon, l'y mettre
- \dijk_cscmd\edef{dijknode\dijk_currentnodechildname}{\dijk_tempnodename=\dijk_currentnodechilddist,\csname dijknode\dijk_currentnodechildname\endcsname}%
- }%
- \fi
- }%
+ {%
+ \skv_exparg{\dijk_foreach\dijk_tempnodename\in}{\dijk_initlistofnodes}
+ {% pour chaque sommet
+ \skv_eearg{\dijk_foreach\dijk_tempnodechild\in}{\csname dijknode\dijk_tempnodename\endcsname}
+ {% pour chaque enfant
+ \expandafter\readgraph_c\dijk_tempnodechild\_nil\dijk_currentnodechildname\dijk_currentnodechilddist% capturer nom et distance de l'enfant
+ \dijk_exptwoargs\dijk_ifinst\dijk_initlistofnodes{\dijk_currentnodechildname,}% si l'enfant n'est pas dans la liste des sommets
+ {%
}%
- \dijk_cnt0
- \skv_exparg{\dijk_foreach\dijk_tempnodename\in}{\dijk_initlistofnodes}
- {% pour chaque sommet, construire la liste de ses enfants
- \advance\dijk_cnt1
- \dijk_cscmd\let{listofchilds_\dijk_tempnodename}\empty
- \skv_eearg{\dijk_foreach\dijk_tempnodechild\in}{\csname dijknode\dijk_tempnodename\endcsname}
- {%
- \expandafter\readgraph_c\dijk_tempnodechild\_nil\dijk_currentnodechildname\dijk_currentnodechilddist
- \expandafter\dijk_eaddtomacro\csname listofchilds_\dijk_tempnodename\endcsname{\dijk_currentnodechildname,}%
- }%
+ {%
+ \dijk_eaddtomacro\dijk_initlistofnodes{\dijk_currentnodechildname,}% l'y mettre
+ \dijk_cscmd\let{dijknode\dijk_currentnodechildname}\empty% et initialiser la liste de ses enfants
}%
- \edef\dijk_numberofnodes{\the\dijk_cnt}%
+ \unless\ifdijk_oriented% si graphe non orienté, ajouter les distances inverses
+ \skv_exparg{\skv_eearg\dijk_ifinst{\csname dijknode\dijk_currentnodechildname\endcsname}}{\dijk_tempnodename=}% si le parent est dans déjà un des enfants de l'enfant
+ {%
+ \expandafter\def\expandafter\readgraph_d\expandafter########\expandafter1\dijk_tempnodename=########2,########3\_nil{%
+ \unless\ifnum########2=\dijk_currentnodechilddist\relax% si distance différente : erreur, c'est pas normal
+ \errmessage{Distance "\dijk_tempnodename=########2" incorrecte dans \dijk_currentnodechildname{} comprise comme "\dijk_tempnodename=\dijk_currentnodechilddist"}%
+ \dijk_cscmd\edef{dijknode\dijk_currentnodechildname}{########1\dijk_tempnodename=\dijk_currentnodechilddist,########3}%
+ \fi
+ }%
+ \expandafter\expandafter\expandafter\readgraph_d\csname dijknode\dijk_currentnodechildname\endcsname\_nil
+ }%
+ {% sinon, l'y mettre
+ \dijk_cscmd\edef{dijknode\dijk_currentnodechildname}{\dijk_tempnodename=\dijk_currentnodechilddist,\csname dijknode\dijk_currentnodechildname\endcsname}%
+ }%
+ \fi
+ }%
}%
- {%
- \def\dijk_currentnodename{#1}%
- \dijk_eaddtomacro\dijk_initlistofnodes{\dijk_currentnodename,}%
- \dijk_cscmd\def{dijknode\dijk_currentnodename}{#3,}%
- \readgraph_b
+ \dijk_cnt0
+ \skv_exparg{\dijk_foreach\dijk_tempnodename\in}{\dijk_initlistofnodes}
+ {% pour chaque sommet, construire la liste de ses enfants
+ \advance\dijk_cnt1
+ \dijk_cscmd\let{listofchilds_\dijk_tempnodename}\empty
+ \skv_eearg{\dijk_foreach\dijk_tempnodechild\in}{\csname dijknode\dijk_tempnodename\endcsname}
+ {%
+ \expandafter\readgraph_c\dijk_tempnodechild\_nil\dijk_currentnodechildname\dijk_currentnodechilddist
+ \expandafter\dijk_eaddtomacro\csname listofchilds_\dijk_tempnodename\endcsname{\dijk_currentnodechildname,}%
+ }%
}%
+ \edef\dijk_numberofnodes{\the\dijk_cnt}%
+ }%
+ {%
+ \def\dijk_currentnodename{#1}%
+ \dijk_eaddtomacro\dijk_initlistofnodes{\dijk_currentnodename,}%
+ \dijk_cscmd\def{dijknode\dijk_currentnodename}{#3,}%
+ \readgraph_b
+ }%
}%
\def\readgraph_c#1=#2\_nil#3#4%
@@ -197,9 +214,12 @@
\def\dijk_removenode#1%
{% enlève le sommet #1 de la liste des sommets non vus
\skv_exparg{\dijk_ifinst}{\expandafter,\dijk_nodestoexplore}{,#1,}
- {\def\dijk_removenode_i##1,#1,##2\_nil{\skv_exparg{\def\dijk_nodestoexplore}{\dijk_gobarg##1,##2}}%
- \expandafter\dijk_removenode_i\expandafter,\dijk_nodestoexplore\_nil}
- {}%
+ {%
+ \def\dijk_removenode_i##1,#1,##2\_nil{\skv_exparg{\def\dijk_nodestoexplore}{\dijk_gobarg##1,##2}}%
+ \expandafter\dijk_removenode_i\expandafter,\dijk_nodestoexplore\_nil
+ }
+ {%
+ }%
}
\def\dijkstra
@@ -213,70 +233,68 @@
\let\dijk_listofnodes\dijk_initlistofnodes
\let\dijk_nodestoexplore\dijk_initlistofnodes
\dijk_cnt0
- \skv_eearg{\def\dijk_currentnode}{\skv_removeextremespaces{#2}}%
- \skv_eearg{\def\dijk_endnode}{\skv_removeextremespaces{#3}}%
- \edef\dijk_tab{%
- \unexpanded\expandafter\expandafter\expandafter{\useKV[\dijkname]{pre-tab}}%
- \noexpand
- \begin{tabular}[\useKV[\dijkname]{v-position}]{%
- *{\dijk_numberofnodes}{|c}|%
+ \skv_eearg{\def\dijk_currentnode}{\dijk_stripsp{#2}}%
+ \skv_eearg{\def\dijk_endnode}{\dijk_stripsp{#3}}%
+ \edef\dijk_tab
+ {%
+ \noexpand\dijk_pre_tab
+ \noexpand\begin{tabular}[\dijk_v_position]{%
+ *{\dijk_numberofnodes}{|\dijk_col_type}|%
\ifboolKV[\dijkname]{show-lastcol}
- {\unexpanded\expandafter\expandafter\expandafter{\useKV[\dijkname]{lastcol-type}}}
+ {\noexpand\dijk_last_col_type}
{}%
}%
\noexpand\hline
- }%
+ }%
\def\dijk_autoamp{\def\dijk_autoamp{\dijk_addtomacro\dijk_tab&}}%
\skv_exparg{\dijk_foreach\dijk_tempnodename\in}\dijk_listofnodes
- {% pour tous le sommets du graphe
- \dijk_autoamp% ajouter "&", sauf la première fois
- \dijk_cscmd\let{dist_\dijk_tempnodename}\dijk_maxint% toutes les distances à +inf
- \dijk_cscmd\let{prev_\dijk_tempnodename}\dijk_quark% tous les prédecesseurs à <quark>
- \dijk_eaddtomacro\dijk_tab{\dijk_tempnodename}% peupler 1re ligne du tableau
- }%
+ {% pour tous le sommets du graphe
+ \dijk_autoamp% ajouter "&", sauf la première fois
+ \dijk_cscmd\let{dist_\dijk_tempnodename}\dijk_maxint% toutes les distances à +inf
+ \dijk_cscmd\let{prev_\dijk_tempnodename}\dijk_quark% tous les prédecesseurs à <quark>
+ \dijk_eaddtomacro\dijk_tab{\dijk_tempnodename}% peupler 1re ligne du tableau
+ }%
\ifboolKV[\dijkname]{show-lastcol}
- {\dijk_eaddtomacro\dijk_tab{\expandafter&\unexpanded\expandafter\expandafter\expandafter{\useKV[\dijkname]{lastcol-label}}}}
+ {\dijk_eaddtomacro\dijk_tab{\expandafter&\dijk_lastcol_label}}
{}%
\dijk_addtomacro\dijk_tab{\\\hline}%
\dijk_cscmd\def{dist_\dijk_currentnode}{0}% distance sommet de départ = 0
\dijk_whilenotempty\dijk_nodestoexplore
+ {%
+ \dijk_findmindist\dijk_currentnode% retourne \dijk_currentnode : le sommet enfant ayant la distance la plus faible
+ \skv_ifx{\dijk_quark\dijk_currentnode}
+ {% si le sommet n'est pas trouvé (graphe non connexe)
+ \global\let\dijkdist\dijk_infinity_code
+ \let\dijk_nodestoexplore\empty% sortir de la boucle
+ }
{%
- \dijk_findmindist\dijk_currentnode% retourne \dijk_currentnode : le sommet enfant ayant la distance la plus faible
- \skv_ifx{\dijk_quark\dijk_currentnode}
- {% si le sommet n'est pas trouvé (graphe non connexe)
- \skv_eearg{\gdef\dijkdist}{\useKV[\dijkname]{infinity-code}}%
- \let\dijk_nodestoexplore\empty% sortir de la boucle
- }
+ \xdef\dijkdist{\csname dist_\dijk_currentnode\endcsname}%
+ \unless\ifx\dijk_nodestoexplore\empty
+ \dijk_addstep
+ \fi
+ \skv_ifx{\dijk_currentnode\dijk_endnode}
+ {% si le sommet de sortie est atteint
+ \let\dijk_nodestoexplore\empty% sortir de la boucle
+ }
+ {% sinon
+ \skv_exparg\dijk_removenode\dijk_currentnode% enlever ce sommet du graphe à explorer
+ \skv_eearg{\dijk_foreach\dijk_temp\in}{\csname listofchilds_\dijk_currentnode\endcsname}
{%
- \xdef\dijkdist{\csname dist_\dijk_currentnode\endcsname}%
- \unless\ifx\dijk_nodestoexplore\empty
- \dijk_addstep
- \fi
- \skv_ifx{\dijk_currentnode\dijk_endnode}
- {% si le sommet de sortie est atteint
- \let\dijk_nodestoexplore\empty% sortir de la boucle
- }
- {% sinon
- \skv_exparg\dijk_removenode\dijk_currentnode% enlever ce sommet du graphe à explorer
- \skv_eearg{\dijk_foreach\dijk_temp\in}{\csname listofchilds_\dijk_currentnode\endcsname}
- {%
- \dijk_exptwoargs\dijk_ifinst\dijk_nodestoexplore{\dijk_temp,}
- {%
- \dijk_exptwoargs\dijk_updatedist\dijk_currentnode\dijk_temp
- }%
- {}%
- }%
- \advance\dijk_cnt1
- }%
+ \dijk_exptwoargs\dijk_ifinst\dijk_nodestoexplore{\dijk_temp,}
+ {\dijk_exptwoargs\dijk_updatedist\dijk_currentnode\dijk_temp}%
+ {}%
}%
+ \advance\dijk_cnt1
+ }%
}%
+ }%
\ifboolKV[\dijkname]{h-rules}
{}
{\dijk_addtomacro\dijk_tab\hline}%
\dijk_addtomacro\dijk_tab{\end{tabular}}%
- \dijk_eeaddtomacro\dijk_tab{\useKV[\dijkname]{post-tab}}%
+ \dijk_eaddtomacro\dijk_tab{\dijk_post_tab}%
\skv_ifx{\dijk_quark\dijk_currentnode}
- {\skv_eearg{\gdef\dijkpath}{\useKV[\dijkname]{nopath-string}}}
+ {\global\let\dijkpath\dijk_nopath_string}
{\skv_exparg\dijk_createpath\dijk_currentnode}% calculer le chemin sauf s'il est impossible à trouver
\ifboolKV[\dijkname]{show-tab}\dijk_tab{}% afficher le tableau
\endgroup
@@ -291,10 +309,12 @@
{% #1=sommet en cours
\skv_eearg{\def\dijk_temp}{\csname prev_#1\endcsname}%
\skv_ifx{\dijk_quark\dijk_temp}
- {}
- {\xdef\dijkpath{\dijk_temp\useKV[\dijkname]{path-sep}\dijkpath}%
+ {%
+ }
+ {%
+ \xdef\dijkpath{\dijk_temp\dijk_path_sep\dijkpath}%
\skv_exparg\dijk_createpathi\dijk_temp
- }%
+ }%
}
\def\dijk_findmindist#1%
@@ -302,12 +322,12 @@
\let\dijk_mindist\dijk_maxint
\let#1\dijk_quark
\skv_exparg{\dijk_foreach\dijk_currentnodechildname\in}\dijk_nodestoexplore
- {%
- \ifnum\csname dist_\dijk_currentnodechildname\endcsname<\dijk_mindist\relax
- \expandafter\let\expandafter\dijk_mindist\csname dist_\dijk_currentnodechildname\endcsname
- \let#1\dijk_currentnodechildname
- \fi
- }%
+ {%
+ \ifnum\csname dist_\dijk_currentnodechildname\endcsname<\dijk_mindist\relax
+ \expandafter\let\expandafter\dijk_mindist\csname dist_\dijk_currentnodechildname\endcsname
+ \let#1\dijk_currentnodechildname
+ \fi
+ }%
}
\def\dijk_whilenotempty#1#2%
@@ -329,35 +349,35 @@
{%
\def\dijk_autoamp{\def\dijk_autoamp{\dijk_addtomacro\dijk_tab&}}%
\skv_exparg{\dijk_foreach\dijk_temp\in}\dijk_listofnodes
+ {%
+ \dijk_autoamp
+ \dijk_exptwoargs\dijk_ifinst\dijk_nodestoexplore\dijk_temp
{%
- \dijk_autoamp
- \dijk_exptwoargs\dijk_ifinst\dijk_nodestoexplore\dijk_temp
- {%
- \ifnum\csname dist_\dijk_temp\endcsname=\dijk_maxint\relax
- \dijk_eeaddtomacro\dijk_tab{\useKV[\dijkname]{infinity-code}}%
- \else
- \skv_ifx{\dijk_temp\dijk_currentnode}% si c'est le sommet fixé, le mettre en valeur
- {%
- \skv_ifcsname{distwithprev_\dijk_temp}
- {%
- \dijk_eeaddtomacro\dijk_tab{\expandafter\expandafter\expandafter\dijk_highlightnode
- \csname distwithprev_\dijk_temp\endcsname}% forme \dijk_highlightnode\formatnodewithprev{<dist>}{<sommet>}
- }
- {%
- \dijk_eeaddtomacro\dijk_tab{\expandafter\expandafter\expandafter
- \highlightfirstnode\expandafter\expandafter\expandafter
- {\csname dist_\dijk_temp\endcsname}}% forme \highlightfirstnode{0}
- }%
- }
- {% sinon, afficher normalement (forme \formatnodewithprev{<dist>}{<sommet>})
- \dijk_eeaddtomacro\dijk_tab{\csname dist\ifcsname distwithprev_\dijk_temp\endcsname withprev\fi _\dijk_temp\endcsname}%
- }%
- \fi
- }%
+ \ifnum\csname dist_\dijk_temp\endcsname=\dijk_maxint\relax
+ \dijk_eaddtomacro\dijk_tab{\dijk_infinity_code}%
+ \else
+ \skv_ifx{\dijk_temp\dijk_currentnode}% si c'est le sommet fixé, le mettre en valeur
{%
- \dijk_eeaddtomacro\dijk_tab{\useKV[\dijkname]{norevisit-code}}% sommet déjà fixé
+ \skv_ifcsname{distwithprev_\dijk_temp}
+ {%
+ \dijk_eeaddtomacro\dijk_tab{\expandafter\expandafter\expandafter\dijk_highlightnode
+ \csname distwithprev_\dijk_temp\endcsname}% forme \dijk_highlightnode\formatnodewithprev{<dist>}{<sommet>}
+ }
+ {%
+ \dijk_eeaddtomacro\dijk_tab{\expandafter\expandafter\expandafter
+ \highlightfirstnode\expandafter\expandafter\expandafter
+ {\csname dist_\dijk_temp\endcsname}}% forme \highlightfirstnode{0}
+ }%
+ }
+ {% sinon, afficher normalement (forme \formatnodewithprev{<dist>}{<sommet>})
+ \dijk_eeaddtomacro\dijk_tab{\csname dist\ifcsname distwithprev_\dijk_temp\endcsname withprev\fi _\dijk_temp\endcsname}%
}%
+ \fi
+ }%
+ {%
+ \dijk_eaddtomacro\dijk_tab{\dijk_no_revisit_code}% sommet déjà fixé
}%
+ }%
\ifboolKV[\dijkname]{show-lastcol}
{\dijk_eaddtomacro\dijk_tab{\expandafter&\detokenize\expandafter{\dijk_currentnode}}}% ajout du sommet fixé
{}%
@@ -369,9 +389,22 @@
\def\dijk_highlightnode\formatnodewithprev{\highlightnode}
+\defKV[\dijkname]{%
+ v-position = \def\dijk_v_position {#1},
+ pre-tab = \def\dijk_pre_tab {#1},
+ post-tab = \def\dijk_post_tab {#1},
+ col-type = \def\dijk_col_type {#1},
+ infinity-code = \def\dijk_infinity_code {#1},
+ norevisit-code = \def\dijk_no_revisit_code{#1},
+ lastcol-type = \def\dijk_last_col_type {#1},
+ lastcol-label = \def\dijk_lastcol_label {#1},
+ nopath-string = \def\dijk_nopath_string {#1},
+ path-sep = \def\dijk_path_sep {#1}
+}
+
\dijk_restorecatcode
-\expandafter\let\expandafter\initdijk\csname skv_[\dijkname]\endcsname
+\def\initdijk{\restoreKV[\dijkname]}
% Macros permettant de modifier les <valeurs> des <clés>
\def\setdijk#{\setKV[\dijkname]}
@@ -421,4 +454,9 @@ Versions :
| 0.11 | 09/09/2017 | - retrait d'un \show, laissé par oubli après les |
| | | phases de débogage |
| | | - petit nettoyage du code |
+|---------+------------+------------------------------------------------------|
+| 0.12 | 25/06/2020 | - bugfix : le package est rendu compatible avec la |
+| | | version 0.2 de simplekv |
+| | | - bugfix : mauvaise gestion est espaces dans la macro|
+| | | \dijk_sanitizegraph |
|---------+------------+------------------------------------------------------| \ No newline at end of file
diff --git a/macros/latex/contrib/fontsetup/README b/macros/latex/contrib/fontsetup/README
index 94e8c2ac2e..7688728890 100644
--- a/macros/latex/contrib/fontsetup/README
+++ b/macros/latex/contrib/fontsetup/README
@@ -1,5 +1,5 @@
The fontsetup package
- (Version 1.003, GPL3)
+ (Version 1.004, GPL3)
This simple package makes it trivial to switch quickly between
different quality fonts supporting Mathematics.
diff --git a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf
index 5526b3bbc9..b9ac41d8b6 100644
--- a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf
+++ b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex
index 285d2ee225..595db34e5e 100644
--- a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex
+++ b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex
@@ -9,8 +9,8 @@
\textit{by}\\[1ex]
{\large Antonis Tsolomitis}\\
University of the Aegean\\ Department of Mathematics\\[1ex]
- \textsc{24} May \textsc{2020}\\[1ex]
- Version 1.003, \textsc{gpl3}
+ \textsc{24} June \textsc{2020}\\[1ex]
+ Version 1.004, \textsc{gpl3}
\end{center}
This package is a simple wrapper-type package that makes the setup of fonts easy and
@@ -30,7 +30,8 @@ University of the Aegean\\ Department of Mathematics\\[1ex]
\item[cambria] Loads the Cambria fonts of Microsoft. These must be already installed
as a system font (in \verb|C:\Windows\Fonts| in MS-Windows, in \verb|/home/user/.fonts/| in Linux
or elsewhere by the system administratior).
- \item[default] Loads the NewComputerModern fonts, which is an assembly of cm fonts plus
+ \item[default] Loads the NewComputerModern fonts (in Book weight),
+ which is an assembly of cm fonts plus
more fonts to support Greek (cbgreek) and Cyrillic languages. It also provides
\begin{itemize}
\item commands to access prosgegrammeni instead of ypogegrammeni for capitals and small
@@ -42,7 +43,7 @@ University of the Aegean\\ Department of Mathematics\\[1ex]
\item commands to access Sans Greek (upright and oblique) in math mode although these are
not included in the unicode standard. The commands follow the unicode-math.sty notation, so
to get $\msansLambda$ and $\mitsanspi$ you write \verb|$\msansLambda$| and \verb|$\mitsanspi$|.
- \end{itemize}
+ \end{itemize}
\item[ebgaramond] Loads the EB-Garamond fonts with Garamond-Math.
\item[fira] Loads the Fira family, a sans-serif font.
\item[gfsartemisia] Loads the GFSArtemisia, a font family designed to be used
@@ -53,7 +54,7 @@ University of the Aegean\\ Department of Mathematics\\[1ex]
letters are substituted from GFSDidotClassic to provide a better match. Notice that
the Bold versions of the Greek fonts are faked using fontspec mechanism as
the Greek part does not have bold versions.
- \item[gfsdidot] Loads the GFSDidot fonts. Stix2 is the Mathematics font, but latin
+ \item[gfsdidot] Loads the GFSDidot fonts. NewCMMath-Book is the Mathematics font, but latin
and greek letters are substituted from GFSdidot to provide a better match.
\item[gfsneohellenic] Loads the GFSNeohellenic family with GFSNeohellenic-Math.
\item[kerkis] Loads the kerkis font family and texgyrebonum-math.
@@ -73,6 +74,7 @@ University of the Aegean\\ Department of Mathematics\\[1ex]
from MS-Garamond.
\item[neoeuler] Loads the Concrete fonts with the Euler for Mathematics.
Needs euler.otf to be instaled in the TeX installation.
+ \item[olddefault] Loads the NewComputerModern fonts (in Regular weight),
\item[palatino] Loads the Linotype Palatino Fonts available from some versions of Windows.
Thefonts must be system installed (in \verb|C:\Windows\Fonts| in MS-Windows,
in \verb|/home/user/.fonts/| in Linux or elsewhere by the system administratior). The supplied
@@ -150,6 +152,12 @@ Cambria Fonts must be installed as system fonts\\[1cm]
\begin{center}
{\Large ComputerModern fonts: option \verb|default|}\\[1cm]
+\includegraphics[scale=1.2]{fspsample-newdefault.pdf}
+\end{center}
+\newpage
+
+\begin{center}
+{\Large ComputerModern fonts (Book weight): option \verb|olddefault|}\\[1cm]
\includegraphics[scale=1.2]{fspsample-cmr.pdf}
\end{center}
@@ -184,7 +192,7 @@ Cambria Fonts must be installed as system fonts\\[1cm]
\newpage
\begin{center}
-{\Large GFSDidot and Stix2Math: option \verb|gfsdidot|}\\[1cm]
+{\Large GFSDidot and NewCMMath-Book: option \verb|gfsdidot|}\\[1cm]
\includegraphics[scale=1.2]{fspsample-gfsdidot.pdf}
\end{center}
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-gfsdidot.pdf b/macros/latex/contrib/fontsetup/doc/fspsample-gfsdidot.pdf
index 0a9f49edc2..852ae5eb95 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-gfsdidot.pdf
+++ b/macros/latex/contrib/fontsetup/doc/fspsample-gfsdidot.pdf
Binary files differ
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-newdefault.pdf b/macros/latex/contrib/fontsetup/doc/fspsample-newdefault.pdf
new file mode 100644
index 0000000000..a856f5b7c4
--- /dev/null
+++ b/macros/latex/contrib/fontsetup/doc/fspsample-newdefault.pdf
Binary files differ
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample.pdf b/macros/latex/contrib/fontsetup/doc/fspsample.pdf
new file mode 100644
index 0000000000..4fe1dc44ea
--- /dev/null
+++ b/macros/latex/contrib/fontsetup/doc/fspsample.pdf
Binary files differ
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample.tex b/macros/latex/contrib/fontsetup/doc/fspsample.tex
index b978369854..5a8f9f0463 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample.tex
+++ b/macros/latex/contrib/fontsetup/doc/fspsample.tex
@@ -1,3 +1,6 @@
+%% after xelatex run
+%% pdfcrop fspsample.pdf output.pdf
+%% to crop it
\documentclass{article}
\pagestyle{empty}
\usepackage{xgreek,graphicx}
@@ -24,7 +27,7 @@
%\usepackage[minion]{fontsetup}
%\usepackage[neoeuler]{fontsetup}
%\usepackage[libertinus]{fontsetup}
-
+%\usepackage[olddefault]{fontsetup}
@@ -38,21 +41,21 @@
%Let $g$ be an
Assume that $g$ is an
in\-te\-grable func\-tion defined on the measurable set $E$ and hat
- $(f_n)_{n\in\mathbb N}$ is a sequence of mea\-sur\-able function so that
- $|f_n|\leq g$. If $f$ is a function so that $f_n\to f$ almost everywhere
+ $(\,f_n)_{n\in\mathbb N}$ is a sequence of mea\-sur\-able function so that
+ $|\,f_n|\leq g$. If $f$ is a function so that $f_n\to f$ almost everywhere
then $$\lim_{n\to\infty}\int f_n=\int f.$$
\end{theorem}
\textit{Proof}: The function $g-f_n$ is non-negative and thus from Fatou lemma
-we have that $\int(g-f)\leq\liminf\int(g-f_n)$. Since $|f|\leq g$ and
-$|f_n|\leq g$ the functions $f$ and $f_n$ are integrable and we have
-$$\int g-\int f\leq \int g-\limsup\int f_n,$$ so
-$$\int f\geq \limsup \int f_n.$$
+we have that $\int(g-f\,)\leq\liminf\int(g-f_n)$. Since $|\,f\,|\leq g$ and
+$|\,f_n|\leq g$ the functions $f$ and $f_n$ are integrable and we have
+$$\int g-\int f\,\leq \int g-\limsup\int f_n,$$ so
+$$\int f\,\geq \limsup \int f_n.$$
\par
\begin{theoremg}[ΚυÏιαÏχημένης σÏγκλισης του Lebesgue]
Έστω ότι
η $g$ είναι μια ολοκληÏώσιμη συνάÏτηση οÏισμένη στο μετÏήσιμο σÏνολο
-$E$ και η $(f_n)_{n\in\mathbb N}$ είναι μια ακολουθία μετÏήσιμων συναÏτήσεων ώστε
-$|f_n| ≤ g$. Υποθέτουμε ότι υπάÏχει μια συνάÏτηση $f$
+$E$ και η $(\,f_n)_{n\in\mathbb N}$ είναι μια ακολουθία μετÏήσιμων συναÏτήσεων ώστε
+$|\,f_n| ≤ g$. Υποθέτουμε ότι υπάÏχει μια συνάÏτηση $f$
ώστε η $(f_n)_{n\in\mathbb N}$ να
τείνει στην $f$ σχεδόν παντοÏ. Τότε
$$\lim \int f_n =\int f.$$
@@ -60,10 +63,10 @@ $$\lim \int f_n =\int f.$$
\textit{Απόδειξη}: Η συνάÏτηση $g − f_n$ είναι μη αÏνητική και άÏα από
το Λήμμα του Fatou ισχÏει
$\int (f-g) ≤ \liminf \int (g-f_n)$. Επειδή
-$|f| ≤ g$ και $|f_n| ≤g$ οι $f$ και $f_n$ είναι ολοκληÏώσιμες, έχουμε
-$$\int g −\int f ≤ \int g − \limsup\int f_n,$$
+$|\,f\,| ≤ g$ και $|\,f_n| ≤g$ οι $f$ και $f_n$ είναι ολοκληÏώσιμες, έχουμε
+$$\int g −\int f\, ≤ \int g − \limsup\int f_n,$$
άÏα
-$$\int f\geq \limsup \int f_n.$$
+$$\int f\,\geq \limsup \int f_n.$$
diff --git a/macros/latex/contrib/fontsetup/fontsetup.sty b/macros/latex/contrib/fontsetup/fontsetup.sty
index 783c3f1d3d..32ed9bc0d4 100644
--- a/macros/latex/contrib/fontsetup/fontsetup.sty
+++ b/macros/latex/contrib/fontsetup/fontsetup.sty
@@ -2,7 +2,7 @@
\ProvidesPackage{fontsetup}[2019/12/20 Easy font setup by Antonis Tsolomitis]
\typeout{fontsetup: Easy font setup by Antonis Tsolomitis}
-\chardef\fontsetupdefault=0 % TODO fork cm-unicode or complete lm fonts
+\chardef\fontsetupdefault=0 %
\chardef\fontsetupgfsartemisia=1
\chardef\fontsetupgfsdidot=2
\chardef\fontsetupgfsdidotclassic=3
@@ -20,6 +20,7 @@
\chardef\fontsetupminion=15 % Install MinionPro and provided fspMinionGreekSmallCaps as a system font.
\chardef\fontsetupneoeuler=16
\chardef\fontsetuplibertinus=17
+\chardef\fontsetupolddefault=18 % old (thin) CMR
\chardef\fontsetupfont\fontsetupdefault
\DeclareOption{default}{\chardef\fontsetupfont\fontsetupdefault}
@@ -40,6 +41,7 @@
\DeclareOption{minion}{\chardef\fontsetupfont\fontsetupminion}
\DeclareOption{neoeuler}{\chardef\fontsetupfont\fontsetupneoeuler}
\DeclareOption{libertinus}{\chardef\fontsetupfont\fontsetuplibertinus}
+\DeclareOption{olddefault}{\chardef\fontsetupfont\fontsetupolddefault}
\DeclareOption*{\PackageWarning{fontsetup}{Unknown ‘\CurrentOption’}}
\ProcessOptions
@@ -59,7 +61,7 @@
\ifthenelse{\boolean{TeXUnicode}}{%
%The user runs unicode engine
\ifcase\fontsetupfont
- \RequirePackage{fspdefaultfontsot}
+ \RequirePackage{fspdefault}
\or
\RequirePackage{fspgfsartemisiaot}
\or
@@ -95,6 +97,8 @@
\RequirePackage{fspneoeulerot}
\or
\RequirePackage{libertinus-otf}
+\or
+ \RequirePackage{fspolddefault}
\fi
}{%the user runs 8bit engine
\relax}
diff --git a/macros/latex/contrib/fontsetup/fspdefault.sty b/macros/latex/contrib/fontsetup/fspdefault.sty
new file mode 100644
index 0000000000..97b9082246
--- /dev/null
+++ b/macros/latex/contrib/fontsetup/fspdefault.sty
@@ -0,0 +1,150 @@
+%% (C) Antonis Tsolomitis, GPL3.
+\RequirePackage{fontspec}
+\RequirePackage{unicode-math}
+\setmainfont[%
+ItalicFont=NewCM10-BookItalic.otf,%
+BoldFont=NewCM10-Bold.otf,%
+BoldItalicFont=NewCM10-BoldItalic.otf,%
+SlantedFont=NewCM10-Book.otf,%
+SlantedFeatures={FakeSlant=0.25},
+BoldSlantedFont=NewCM10-Bold.otf,%
+BoldSlantedFeatures={FakeSlant=0.25},
+SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Book.otf}
+
+\setsansfont[%
+ItalicFont=NewCMSans10-BookOblique.otf,%
+BoldFont=NewCMSans10-Bold.otf,%
+BoldItalicFont=NewCMSans10-BoldOblique.otf,%
+SlantedFont=NewCMSans10-BookOblique.otf,%
+BoldSlantedFont=NewCMSans10-BoldOblique.otf,%
+SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Book.otf}
+
+\setmonofont[%
+ItalicFont=NewCMMono10-BookItalic.otf,%
+BoldFont=NewCMMono10-Bold.otf,%
+BoldItalicFont=NewCMMono10-BoldOblique.otf,%
+SlantedFont=NewCMMono10-Book.otf,%
+SlantedFeatures={FakeSlant=0.25},
+BoldSlantedFont=NewCMMono10-Bold.otf,%
+BoldSlantedFeatures={FakeSlant=0.25},
+SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf}
+
+\setmathfont{NewCMMath-Book.otf}
+
+\newcommand{\tttextsc}[1]{{\ttscshape#1}}
+%
+\newcommand{\prosgegrammeni}{\addfontfeature{StylisticSet=1}}
+\newcommand{\textprosgegrammeni}[1]{{\prosgegrammeni#1}}
+%
+\newfontfamily{\ivbce}[StylisticSet=2]{NewCMSans10-Book.otf}
+\newcommand{\textivbce}[1]{{\ivbce#1}}
+%
+\newfontfamily{\ivbcealt}[StylisticSet=3]{NewCMSans10-Book.otf}
+\newcommand{\textivbcealt}[1]{{\ivbcealt#1}}
+%
+\newfontfamily{\vibce}[StylisticSet=4]{NewCMSans10-Book.otf}
+\newcommand{\textvibce}[1]{{\vibce#1}}
+%
+%% math (upright) sans Greek
+\newcommand{\msansAlpha}{\char"E000}
+\newcommand{\msansBeta}{\char"E001}
+\newcommand{\msansGamma}{\char"E002}
+\newcommand{\msansDelta}{\char"E003}
+\newcommand{\msansEpsilon}{\char"E004}
+\newcommand{\msansZeta}{\char"E005}
+\newcommand{\msansEta}{\char"E006}
+\newcommand{\msansTheta}{\char"E007}
+\newcommand{\msansIota}{\char"E008}
+\newcommand{\msansKappa}{\char"E009}
+\newcommand{\msansLambda}{\char"E00A}
+\newcommand{\msansMu}{\char"E00B}
+\newcommand{\msansNu}{\char"E00C}
+\newcommand{\msansXi}{\char"E00D}
+\newcommand{\msansOmicron}{\char"E00E}
+\newcommand{\msansPi}{\char"E00F}
+\newcommand{\msansRho}{\char"E010}
+\newcommand{\msansSigma}{\char"E011}
+\newcommand{\msansTau}{\char"E012}
+\newcommand{\msansUpsilon}{\char"E013}
+\newcommand{\msansPhi}{\char"E014}
+\newcommand{\msansChi}{\char"E015}
+\newcommand{\msansPsi}{\char"E016}
+\newcommand{\msansOmega}{\char"E017}
+\newcommand{\msansalpha}{\char"E018}
+\newcommand{\msansbeta}{\char"E019}
+\newcommand{\msansgamma}{\char"E01A}
+\newcommand{\msansdelta}{\char"E01B}
+\newcommand{\msansepsilon}{\char"E01C}
+\newcommand{\msanszeta}{\char"E01D}
+\newcommand{\msanseta}{\char"E01E}
+\newcommand{\msanstheta}{\char"E01F}
+\newcommand{\msansiota}{\char"E020}
+\newcommand{\msanskappa}{\char"E021}
+\newcommand{\msanslambda}{\char"E022}
+\newcommand{\msansmu}{\char"E023}
+\newcommand{\msansnu}{\char"E024}
+\newcommand{\msansxi}{\char"E025}
+\newcommand{\msansomicron}{\char"E026}
+\newcommand{\msanspi}{\char"E027}
+\newcommand{\msansrho}{\char"E028}
+\newcommand{\msansvarsigma}{\char"E029}
+\newcommand{\msanssigma}{\char"E02A}
+\newcommand{\msanstau}{\char"E02B}
+\newcommand{\msansupsilon}{\char"E02C}
+\newcommand{\msansphi}{\char"E02D}
+\newcommand{\msanschi}{\char"E02E}
+\newcommand{\msanspsi}{\char"E02F}
+\newcommand{\msansomega}{\char"E030}
+\newcommand{\msansvarepsilon}{\char"E031}
+% math italic sans Greek
+\newcommand{\mitsansAlpha}{\char"E041}
+\newcommand{\mitsansBeta}{\char"E042}
+\newcommand{\mitsansGamma}{\char"E043}
+\newcommand{\mitsansDelta}{\char"E044}
+\newcommand{\mitsansEpsilon}{\char"E045}
+\newcommand{\mitsansZeta}{\char"E046}
+\newcommand{\mitsansEta}{\char"E047}
+\newcommand{\mitsansTheta}{\char"E048}
+\newcommand{\mitsansIota}{\char"E049}
+\newcommand{\mitsansKappa}{\char"E04A}
+\newcommand{\mitsansLambda}{\char"E04B}
+\newcommand{\mitsansMu}{\char"E04C}
+\newcommand{\mitsansNu}{\char"E04D}
+\newcommand{\mitsansXi}{\char"E04E}
+\newcommand{\mitsansOmicron}{\char"E04F}
+\newcommand{\mitsansPi}{\char"E050}
+\newcommand{\mitsansRho}{\char"E051}
+\newcommand{\mitsansSigma}{\char"E052}
+\newcommand{\mitsansTau}{\char"E053}
+\newcommand{\mitsansUpsilon}{\char"E054}
+\newcommand{\mitsansPhi}{\char"E055}
+\newcommand{\mitsansChi}{\char"E056}
+\newcommand{\mitsansPsi}{\char"E057}
+\newcommand{\mitsansOmega}{\char"E058}
+\newcommand{\mitsansalpha}{\char"E059}
+\newcommand{\mitsansbeta}{\char"E05A}
+\newcommand{\mitsansgamma}{\char"E05B}
+\newcommand{\mitsansdelta}{\char"E05C}
+\newcommand{\mitsansepsilon}{\char"E05D}
+\newcommand{\mitsanszeta}{\char"E05E}
+\newcommand{\mitsanseta}{\char"E05F}
+\newcommand{\mitsanstheta}{\char"E060}
+\newcommand{\mitsansiota}{\char"E061}
+\newcommand{\mitsanskappa}{\char"E062}
+\newcommand{\mitsanslambda}{\char"E063}
+\newcommand{\mitsansmu}{\char"E064}
+\newcommand{\mitsansnu}{\char"E065}
+\newcommand{\mitsansxi}{\char"E066}
+\newcommand{\mitsansomicron}{\char"E067}
+\newcommand{\mitsanspi}{\char"E068}
+\newcommand{\mitsansrho}{\char"E069}
+\newcommand{\mitsansvarsigma}{\char"E06A}
+\newcommand{\mitsanssigma}{\char"E06B}
+\newcommand{\mitsanstau}{\char"E06C}
+\newcommand{\mitsansupsilon}{\char"E06D}
+\newcommand{\mitsansphi}{\char"E06E}
+\newcommand{\mitsanschi}{\char"E06F}
+\newcommand{\mitsanspsi}{\char"E070}
+\newcommand{\mitsansomega}{\char"E071}
+\newcommand{\mitsansvarepsilon}{\char"E072}
+
diff --git a/macros/latex/contrib/fontsetup/fspgfsdidotot.sty b/macros/latex/contrib/fontsetup/fspgfsdidotot.sty
index 6de2cfd736..f8c312c02c 100644
--- a/macros/latex/contrib/fontsetup/fspgfsdidotot.sty
+++ b/macros/latex/contrib/fontsetup/fspgfsdidotot.sty
@@ -14,7 +14,7 @@
\RequirePackage{unicode-math}
%\setmathfont{XITSMath-Regular.otf}
-\setmathfont{STIX2Math.otf}
+\setmathfont{NewCMMath-Book.otf}
\setmathfont[range=\mathup/{num,latin,Latin,greek,Greek}]{GFSDidot.otf}
\setmathfont[range=\mathbfup/{num,latin,Latin,greek,Greek}]{GFSDidotBold.otf}
\setmathfont[range=\mathit/{greek,Greek}]{GFSOlga.otf}
diff --git a/macros/latex/contrib/fontsetup/fspdefaultfontsot.sty b/macros/latex/contrib/fontsetup/fspolddefault.sty
index 3b08994260..3b08994260 100644
--- a/macros/latex/contrib/fontsetup/fspdefaultfontsot.sty
+++ b/macros/latex/contrib/fontsetup/fspolddefault.sty
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 a455f02b69..b10da75d71 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 e8df52f42a..dccd97e9b1 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-criticalendnotes.tex b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex
index 453b1ce5e4..50d60769d6 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex
+++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -14,13 +15,13 @@
\title{Critical endnotes}
\maketitle
\begin{abstract}
-This file provides examples of critical endnote usage with reledmac.
+This file provides examples of critical endnote usage with reledmac.
A critical note is associated with a lemma by marking it with \verb+\edtext+ and referenced by the line and page numbers of the lemma.
When a critical note refers to a long lemma, we can use \verb+\lemma+ to produce an abbreviated form.
-Here we use two series of critical notes.
+Here we use two series of critical notes.
\begin{itemize}
-\item Each note of series A has its own paragraph.
+\item Each note of series A has its own paragraph.
\item The notes of series B are arranged in the same paragraph.
\end{itemize}
\end{abstract}
@@ -36,11 +37,11 @@ Here we use two series of critical notes.
\edtext{ipsum}{
\Aendnote{Another critical note}
\Bendnote{Other critical note in series B}}
- dolor sit amet, consectetur adipiscing elit.
+ dolor sit amet, consectetur adipiscing elit.
\edtext{Fusce sed dolor libero. Aenean rutrum vestibulum lacus ut pretium. Fusce et auctor lectus. Ut et commodo quam, quis gravida orci. Nullam at risus elementum, suscipit enim a, pellentesque mi}
{\lemma{Fusce\ldots mi}
\Aendnote{Critical note pertaining to a long lemma}
- \Bendnote{omit}}.
+ \Bendnote{omit}}.
Morbi \edtext{commodo}{\Bendnote{quommodo}}, ligula vel consectetur accumsan, massa metus egestas velit, eu fringilla leo ante in turpis. \edtext{Vivamus}{\Bendnote{Vivit}} ut tellus sollicitudin, facilisis ipsum sit amet, tincidunt odio. Maecenas tincidunt dolor sed ante blandit tincidunt. Etiam vulputate ultricies facilisis.
\pend
\endnumbering
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
index 6622f3b071..fb18651f4f 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-criticalnotes.tex b/macros/latex/contrib/reledmac/examples/1-criticalnotes.tex
index 022b09ef12..87c618c83d 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.tex
+++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -16,15 +17,15 @@
\title{Critical notes}
\maketitle
\begin{abstract}
-This file provides examples of critical notes with reledmac.
+This file provides examples of critical notes with reledmac.
A critical note is associated to a lemma, marked by \verb+\edtext+, and referenced by the line numbers of the lemma.
If a critical notes refers to a long lemma, we can use \verb+lemma+ to obtain an abbreviated form.
-Here we use four series of critical notes.
+Here we use four series of critical notes.
\begin{itemize}
-\item Each note of series A has its own paragraph.
-\item Each note of series B has its own paragraph, but there are arranged in two columns.
-\item Each note of series C has its own paragraph, but there are arranged in three columns.
+\item Each note of series A has its own paragraph.
+\item Each note of series B has its own paragraph, but there are arranged in two columns.
+\item Each note of series C has its own paragraph, but there are arranged in three columns.
\item The notes of series D are arranged in the same paragraph.
\end{itemize}
\end{abstract}
@@ -42,16 +43,16 @@ Here we use four series of critical notes.
\Bfootnote{Other critical note in series B}
\Cfootnote{Other critical note in series C}
\Dfootnote{ipsam}}
- dolor sit amet, consectetur adipiscing elit.
+ dolor sit amet, consectetur adipiscing elit.
\edtext{Fusce sed dolor libero. Aenean rutrum vestibulum lacus ut pretium. Fusce et auctor lectus. Ut et commodo quam, quis gravida orci. Nullam at risus elementum, suscipit enim a, pellentesque mi}
{\lemma{Fusce\ldots mi}
\Afootnote{A long critical note}
\Bfootnote{Again B}
\Cfootnote{Again C}
- \Dfootnote{omit}}.
+ \Dfootnote{omit}}.
Morbi commodo, ligula vel consectetur accumsan, massa metus egestas velit, eu fringilla leo ante in turpis. Vivamus ut tellus sollicitudin, facilisis ipsum sit amet, tincidunt odio. Maecenas tincidunt dolor sed ante blandit tincidunt. Etiam vulputate ultricies facilisis.
\pend
\endnumbering
-\end{document} \ No newline at end of file
+\end{document}
diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
index c94c752b38..a6888ed131 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-sidenotes.tex b/macros/latex/contrib/reledmac/examples/1-sidenotes.tex
index 63745c3229..dbb711f6b0 100644
--- a/macros/latex/contrib/reledmac/examples/1-sidenotes.tex
+++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.tex
@@ -20,13 +20,13 @@
\title{Side notes}
\maketitle
\begin{abstract}
-This file provides examples of side notes with reledmac.
+This file provides examples of side notes with reledmac.
We use:
\begin{itemize}
- \item \verb+\ledleftnote+ (left notes);
- \item \verb+\ledrightnote+ (right notes);
- \item \verb+\ledinnernote+ (inner notes);
- \item \verb+\ledouternote+ (outer notes);
+ \item \verb+\ledleftnote+ (left notes);
+ \item \verb+\ledrightnote+ (right notes);
+ \item \verb+\ledinnernote+ (inner notes);
+ \item \verb+\ledouternote+ (outer notes);
\item \verb+\ledsidenote+ (configurable notes).
\end{itemize}
@@ -50,4 +50,4 @@ Donec sollicitudin molestie malesuada. Praesent sapien massa, convallis a pellen
\endnumbering
-\end{document} \ No newline at end of file
+\end{document}
diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
index 9e51fa7d6f..65f433667a 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-tabular.tex b/macros/latex/contrib/reledmac/examples/1-tabular.tex
index 315be5701a..a14573d3fe 100644
--- a/macros/latex/contrib/reledmac/examples/1-tabular.tex
+++ b/macros/latex/contrib/reledmac/examples/1-tabular.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -30,7 +31,7 @@ linea secunda & linea secunda\footnoteA{familiar footnote A.} \\
linea tertia & linea \edtext{tertia}{\Afootnote{critical note A}} \\
linea quarta & linea \edtext{quarta}{\Bfootnote{critical note B}} \\
linea quinta & linea quinta\footnoteB{familiar footnote B.} \\
-linea sexta & linea sexta
+linea sexta & linea sexta
\end{edtabularl}
\pend
@@ -41,7 +42,7 @@ linea secunda & linea secunda\footnoteA{familiar footnote A.} \\
linea tertia & linea \edtext{tertia}{\Afootnote{critical note A}} \\
linea quarta & linea \edtext{quarta}{\Bfootnote{critical note B}} \\
linea quinta & linea quinta\footnoteB{familiar footnote B.} \\
-linea sexta & linea sexta
+linea sexta & linea sexta
\end{edtabularc}
\pend
@@ -54,7 +55,7 @@ linea secunda & linea secunda\footnoteA{familiar footnote A.} \\
linea tertia & linea \edtext{tertia}{\Afootnote{critical note A}} \\
linea quarta & linea \edtext{quarta}{\Bfootnote{critical note B}} \\
linea quinta & linea quinta\footnoteB{familiar footnote B.} \\
-linea sexta & linea sexta
+linea sexta & linea sexta
\end{edtabularr}
\pend
diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
index db9155dd01..a93554b608 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-doublenumbering.tex b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.tex
index a82fe5c39e..bb00b713b3 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.tex
+++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -21,7 +22,7 @@
\maketitle
\begin{abstract}
-This file provides an example of typesetting verse with reledmac using a double line numbering system.
+This file provides an example of typesetting verse with reledmac using a double line numbering system.
The new edition adds a starting line of verse not present in the previous one, so we need to make an addition within the margin and textsuperscript the numbering from the older edition. In the centre, we split what was in the first edition one line of verse into two.
diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf
index eb1a288840..a1aa153d96 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/1-verses.tex b/macros/latex/contrib/reledmac/examples/1-verses.tex
index 3b76a18b86..6f553f6185 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses.tex
+++ b/macros/latex/contrib/reledmac/examples/1-verses.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -8,6 +9,8 @@
\usepackage[series={A,B},nofamiliar,noend,noeledsec,noledgroup]{reledmac}
\sethangingsymbol{[\,}
+\setcounter{stanzaindentsrepetition}{2}
+\setstanzaindents{8,0,1}
\begin{document}
\begin{english}
@@ -17,7 +20,7 @@
\maketitle
\begin{abstract}
-This file provides an example of typesetting verse with reledmac.
+This file provides an example of typesetting verse with reledmac.
The odd numbered verses are not indented, the even ones are. When a verse is too long for a line, the continuation is printed after a long indentation and a left bracket is inserted (\verb+\sethangingsymbol+).
Two levels of critical footnotes are used.
@@ -27,8 +30,6 @@ We also have an example of notes overlapping two lines of verse, using \verb+xxr
\end{english}
\beginnumbering
-\setcounter{stanzaindentsrepetition}{2}
-\setstanzaindents{8,0,1}
\stanza
\edlabel{begin:1}\edtext{Lorem}{\lemma{Lorem\ldots nisis}\xxref{begin:1}{end:1}\Afootnote{A note on two verses}} ipsum dolor sit amet, consectetur adipisicing elit,&
sed do eiusmod tempor incididunt ut labore et dolore&
diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
index fd2696e900..b7bd76aa9f 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-antilabe.tex b/macros/latex/contrib/reledmac/examples/2-antilabe.tex
index 072642d93c..010f4df032 100644
--- a/macros/latex/contrib/reledmac/examples/2-antilabe.tex
+++ b/macros/latex/contrib/reledmac/examples/2-antilabe.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage[english]{babel}
\babeltags{english = english}
diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
index e37f9a0949..854fce7062 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-cross_referencing.tex b/macros/latex/contrib/reledmac/examples/2-cross_referencing.tex
index 95e48567c0..95760b0438 100644
--- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.tex
+++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -19,7 +20,7 @@
\maketitle
\begin{abstract}
This file provides a MWE of cross-referencing with reledmac, with reference to line number.
-The \verb+\edlabel+, \verb+\edpageref+ and \verb+\lineref+ commands are used.
+The \verb+\edlabel+, \verb+\edpageref+ and \verb+\lineref+ commands are used.
We also use \verb+\applabel+, \verb+\appref+ and \verb+\setapprefprefixsingle+
and also \verb+\edlabelS+, \verb+\edlabelE+, \verb+\SEref+ and \verb+\setSErefprefixsingle+.
@@ -36,7 +37,7 @@ Read the variant in \appref{variant}.
\beginnumbering
\pstart
-\edlabelS{passage}Pellentesque non orci dui. Donec a libero eu nisl sollicitudin lobortis eget nec lacus. Nulla pellentesque, neque ut tincidunt vestibulum, ante mi varius purus, nec cursus neque orci ut orci. \edtext{Donec bibendum ligula bibendum nisl aliquet auctor.\edlabelE{passage}
+\edlabelS{passage}Pellentesque non orci dui. Donec a libero eu nisl sollicitudin lobortis eget nec lacus. Nulla pellentesque, neque ut tincidunt vestibulum, ante mi varius purus, nec cursus neque orci ut orci. \edtext{Donec bibendum ligula bibendum nisl aliquet auctor.\edlabelE{passage}
Nam luctus lorem mauris, ac venenatis felis posuere non. Quisque ultricies ante magna, facilisis pellentesque nibh placerat at}{\applabel{variant}\Afootnote{omit}}. Aliquam sit amet ante varius, vestibulum augue condimentum, scelerisque turpis. Proin at nibh vulputate, tincidunt tellus vel, vehicula libero. Praesent venenatis, turpis nec feugiat sodales, risus sapien tempus odio, at vehicula ipsum nisl a nisl. Nunc pretium elit tellus, \edlabel{ultrices}ultrices facilisis odio interdum non. Donec et condimentum quam, id ullamcorper nisl.
\pend
diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
index b72a8a1c23..c377bab626 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-footnote_spacing.tex b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.tex
index 4486d43ee4..4ecc27ff98 100644
--- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.tex
+++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -36,7 +37,7 @@
\begin{abstract}
This file sets spaces around footnote rules, to have a uniform \SI{3}{\milli\meter} before and after. There are three levels of paragraphed notes. Before the first series of notes, we have \SI{0.5}{\centi\meter}.
-We use \verb+\Xbeforenotes+ and \verb+\Xafterrule+. There is a subtlety: the footnote rule of reledmac is the standard \LaTeX footnote rule: \verb+\footnoterule+, which automatically removes \SI{3}{pt} before and adds \SI{2.6}{pt} after. So we have to compensate by defining two lengths, \verb+before+ and \verb+\after+, which are passed to the respective commands.
+We use \verb+\Xbeforenotes+ and \verb+\Xafterrule+. There is a subtlety: the footnote rule of reledmac is the standard \LaTeX footnote rule: \verb+\footnoterule+, which automatically removes \SI{3}{pt} before and adds \SI{2.6}{pt} after. So we have to compensate by defining two lengths, \verb+before+ and \verb+\after+, which are passed to the respective commands.
\end{abstract}
\end{english}
diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
index b04d7d1dfe..623ad12cd6 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-glossaries.tex b/macros/latex/contrib/reledmac/examples/2-glossaries.tex
index f4a6aa83a4..28e88cc1ea 100644
--- a/macros/latex/contrib/reledmac/examples/2-glossaries.tex
+++ b/macros/latex/contrib/reledmac/examples/2-glossaries.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage{amsmath}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
@@ -11,8 +12,8 @@
\usepackage{glossaries}
\glsSetCompositor{-}
\makeglossaries
-\newglossaryentry{monistero}{name={monistero},description={monastero}}
-\newglossaryentry{magicien}{name={magicien},description={sorcier}}
+\newglossaryentry{monistero}{name={monistero},description={monastero}}
+\newglossaryentry{magicien}{name={magicien},description={sorcier}}
\begin{document}
@@ -31,14 +32,14 @@ Note the use of \verb+\glsSetCompositor+ in the preamble.
\beginnumbering
\pstart
-In queste nostre contrade fu, ed è ancora, un \edgls{monistero} di donne assai famoso di santità
-(il quale io non nomerò per non diminuire in parte alcuna la fama sua), nel quale, non ha gran
-tempo, non essendovi allora più che otto donne con una badessa, e tutte giovani, era un buono
-omicciuolo d'un loro bellissimo giardino ortolano, il quale, non contentandosi del salario, fatta la
-ragion sua col castaldo delle donne, a Lamporecchio, là ond'egli era, se ne tornò. Quivi, tra gli
-altri che lietamente il raccolsono, fu un giovane lavoratore forte e robusto e, secondo uom di villa,
-con bella persona e con viso assai piacevole, il cui nome era Masetto; e
-domandollo dove tanto tempo stato fosse. Il buono uomo, che Nuto avea nome,
+In queste nostre contrade fu, ed è ancora, un \edgls{monistero} di donne assai famoso di santità
+(il quale io non nomerò per non diminuire in parte alcuna la fama sua), nel quale, non ha gran
+tempo, non essendovi allora più che otto donne con una badessa, e tutte giovani, era un buono
+omicciuolo d'un loro bellissimo giardino ortolano, il quale, non contentandosi del salario, fatta la
+ragion sua col castaldo delle donne, a Lamporecchio, là ond'egli era, se ne tornò. Quivi, tra gli
+altri che lietamente il raccolsono, fu un giovane lavoratore forte e robusto e, secondo uom di villa,
+con bella persona e con viso assai piacevole, il cui nome era Masetto; e
+domandollo dove tanto tempo stato fosse. Il buono uomo, che Nuto avea nome,
gliele disse. Il quale Masetto domandò, di che egli il monistero servisse. \edgls{magicien}
\pend
\endnumbering
diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
index 156ce6f418..1d4a3cacaa 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-indexing.tex b/macros/latex/contrib/reledmac/examples/2-indexing.tex
index 18fc098ae2..744bb3000a 100644
--- a/macros/latex/contrib/reledmac/examples/2-indexing.tex
+++ b/macros/latex/contrib/reledmac/examples/2-indexing.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
index 74fadc626e..9bd04a64d7 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-lemma_disambigution.tex b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.tex
index 57e1fe1bef..02f01b03c9 100644
--- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.tex
+++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -18,12 +19,12 @@
\linenumincrement{1}
\begin{abstract}
-This file provides an example of lemma's disambuigation.
+This file provides an example of lemma's disambuigation.
-All word which can potentially be twice (or more) in a same line is marked by an \verb+\sameword+. \emph{reledmac} print the word rank only if the word is effectively printed twice (or more) time in the same line.
+All word which can potentially be twice (or more) in a same line is marked by an \verb+\sameword+. \emph{reledmac} print the word rank only if the word is effectively printed twice (or more) time in the same line.
For use with \verb+\lemma+, please read the handbook.
-
+
\end{abstract}
\end{english}
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 948bf6e431..7aaf529add 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-line_numbers_in_header.tex b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.tex
index 98998f8063..eece2093c2 100644
--- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.tex
+++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
index a0c3915c7c..761a03ff4a 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-linespacing.tex b/macros/latex/contrib/reledmac/examples/2-linespacing.tex
index 4b8ba121bb..22f97c05b8 100644
--- a/macros/latex/contrib/reledmac/examples/2-linespacing.tex
+++ b/macros/latex/contrib/reledmac/examples/2-linespacing.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
index 2901c197c0..6a191eb00e 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-manuscript-apparatus.tex b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.tex
index 45303b4146..35a3c66cca 100644
--- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.tex
+++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
index 7a2c3e3878..36151a373f 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-notes-width.tex b/macros/latex/contrib/reledmac/examples/2-notes-width.tex
index 432ffcb41e..f991f60f8e 100644
--- a/macros/latex/contrib/reledmac/examples/2-notes-width.tex
+++ b/macros/latex/contrib/reledmac/examples/2-notes-width.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 9a937132fe..916c773fc7 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-one_series_per_pstart.tex b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.tex
index 9d9f29ac4e..2ebc3f617c 100644
--- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.tex
+++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf
index 9dda3fbff9..76bb2a2435 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-performances.tex b/macros/latex/contrib/reledmac/examples/2-performances.tex
index df97e36960..9304801d8b 100644
--- a/macros/latex/contrib/reledmac/examples/2-performances.tex
+++ b/macros/latex/contrib/reledmac/examples/2-performances.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 b46c17606a..744ba3fd42 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 c814b5094e..d50d0a92ea 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-subdivision-number-in-header.tex b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.tex
index 33f18419f2..1107bb9327 100644
--- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.tex
+++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.tex
@@ -1,4 +1,5 @@
\documentclass[twoside]{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -32,11 +33,11 @@
\title{Subdivision number inside the header}
\maketitle
\begin{abstract}
- This file shows how to use the \verb+\doinsidethislinehook+
+ This file shows how to use the \verb+\doinsidethislinehook+
command to use \verb+\markboth+ to add verse (sentence) numbers inside the headers.
-
+
We can't call \verb+\markboth+ directly inside the \verb+pstart+…\verb+\pend+, because it creates trouble with vertical spacing.
-
+
We show two examples: the first one add directly the verse number inside the source code, while the second use a counter to determine it automatically.
To understand this example, you must be familiar with \LaTeX\ marking mechanism (\verb+\markboth+) and the \emph{fancyhdr} package.
@@ -64,10 +65,10 @@
\beginnumbering
\pstart
-\versenumber{1} Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-\versenumber{2} Morbi nec augue elit.
-\versenumber{3} Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Quisque cursus eros a erat placerat, et tempus neque volutpat.
-\versenumber{4} Morbi ultrices at magna et cursus.
+\versenumber{1} Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+\versenumber{2} Morbi nec augue elit.
+\versenumber{3} Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Quisque cursus eros a erat placerat, et tempus neque volutpat.
+\versenumber{4} Morbi ultrices at magna et cursus.
\versenumber{5} Sed vel purus luctus, euismod erat in, fermentum orci.
\versenumber{6} Vivamus ac rutrum sapien, id ultricies augue.
\versenumber{7} Fusce sed rutrum lorem, ut auctor urna.
@@ -78,10 +79,10 @@
\versenumber{12} Pellentesque lorem elit, scelerisque id vulputate vel, faucibus a eros.
\versenumber{13} Nunc nec orci ullamcorper, sollicitudin magna id, maximus quam.
\versenumber{14} Pellentesque nec mauris purus.
-\versenumber{15} Duis suscipit nunc vitae faucibus posuere.
+\versenumber{15} Duis suscipit nunc vitae faucibus posuere.
\versenumber{16} Integer mattis varius cursus.
\versenumber{17} Proin risus diam, imperdiet sit amet sem sed, dapibus sodales quam.
-\versenumber{18} Pellentesque bibendum sapien eu nisl efficitur placerat.
+\versenumber{18} Pellentesque bibendum sapien eu nisl efficitur placerat.
\versenumber{19} Aenean dignissim ante ac erat pharetra, non pellentesque ante sodales.
\versenumber{20} Nunc lorem nunc, elementum in accumsan id, blandit ac elit.
\versenumber{21} In rhoncus augue ex, quis tristique ex laoreet non.
@@ -167,7 +168,7 @@
\item use \verb+\doinsidelinehook+ to call correctly \verb+\markboth+.
\end{itemize}
- The main problem is that, because of \emph{reledmac} mechanism, the lines are typeset after the \verb+\pend+,
+ The main problem is that, because of \emph{reledmac} mechanism, the lines are typeset after the \verb+\pend+,
at a time when the \verb+verse+ counter is already set to its maximal value.
Consequently, with the hack, the \verb+\markboth+ macro won't have set the marker to the correct value.
@@ -189,10 +190,10 @@
\beginnumbering
\pstart
-\autoversenumber Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-\autoversenumber Morbi nec augue elit.
-\autoversenumber Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Quisque cursus eros a erat placerat, et tempus neque volutpat.
-\autoversenumber Morbi ultrices at magna et cursus.
+\autoversenumber Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+\autoversenumber Morbi nec augue elit.
+\autoversenumber Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Quisque cursus eros a erat placerat, et tempus neque volutpat.
+\autoversenumber Morbi ultrices at magna et cursus.
\autoversenumber Sed vel purus luctus, euismod erat in, fermentum orci.
\autoversenumber Vivamus ac rutrum sapien, id ultricies augue.
\autoversenumber Fusce sed rutrum lorem, ut auctor urna.
@@ -203,10 +204,10 @@
\autoversenumber Pellentesque lorem elit, scelerisque id vulputate vel, faucibus a eros.
\autoversenumber Nunc nec orci ullamcorper, sollicitudin magna id, maximus quam.
\autoversenumber Pellentesque nec mauris purus.
-\autoversenumber Duis suscipit nunc vitae faucibus posuere.
+\autoversenumber Duis suscipit nunc vitae faucibus posuere.
\autoversenumber Integer mattis varius cursus.
\autoversenumber Proin risus diam, imperdiet sit amet sem sed, dapibus sodales quam.
-\autoversenumber Pellentesque bibendum sapien eu nisl efficitur placerat.
+\autoversenumber Pellentesque bibendum sapien eu nisl efficitur placerat.
\autoversenumber Aenean dignissim ante ac erat pharetra, non pellentesque ante sodales.
\autoversenumber Nunc lorem nunc, elementum in accumsan id, blandit ac elit.
\autoversenumber In rhoncus augue ex, quis tristique ex laoreet non.
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 a4da8707b6..a7ba16cabf 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_in_line_numbering_with_notes.tex b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.tex
index 1636c83570..47bde481da 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.tex
+++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.tex
@@ -1,4 +1,5 @@
\documentclass{book}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -15,9 +16,9 @@
{\let\newpage\relax\maketitle}
{\small
-This file provides examples of using sectioning command with reledmac. The section titles are in the line numbering, and have critical and side notes.
+This file provides examples of using sectioning command with reledmac. The section titles are in the line numbering, and have critical and side notes.
-We use the \verb+\reledxxx+ commands, each of them in their own \verb+\pstart…\pend+ group.
+We use the \verb+\reledxxx+ commands, each of them in their own \verb+\pstart…\pend+ group.
Page breaks are manually added before chapter with \verb+\beforeeledchapter+.
}
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 64497606d1..081a30ffce 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/2-titles_not_in_line_numbering.tex b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.tex
index c611a1db65..6b2ea241b2 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.tex
+++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 58079bf055..401717d26e 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 de0dace02c..06c982fb04 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_mwe.tex b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.tex
index 9ff5c5bea3..c23e165432 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.tex
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -15,7 +16,7 @@
\maketitle
\begin{abstract}
-This file provides two minimal examples of typesetting parallel texts with reledmac plus reledpar.
+This file provides two minimal examples of typesetting parallel texts with reledmac plus reledpar.
The first minimal example is parallel typesetting in columns, the second one is parallel typesetting in pages.
\end{abstract}
@@ -43,7 +44,7 @@ The first minimal example is parallel typesetting in columns, the second one is
\endnumbering
\end{Rightside}
-\end{pairs}
+\end{pairs}
\Columns
\begin{pages}
@@ -68,7 +69,7 @@ The first minimal example is parallel typesetting in columns, the second one is
\endnumbering
\end{Rightside}
-\end{pages}
+\end{pages}
\Pages
\end{document}
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 bd88290c8e..fd03df4386 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 4eb6ff7bf2..0258b56ddb 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_same_page_number_in_both_side.tex b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.tex
index ecafd78af8..3b8f4bc113 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.tex
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.tex
@@ -1,4 +1,5 @@
\documentclass[a5paper,11pt]{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -19,11 +20,11 @@
Before \verb+\Pages+, the pages are normally numbered.
When parallel pages are typeset, the number is the same on left and right side.
After that, page number continues in the normal way.
-
+
\end{abstract}
\newpage
A new normal page
-\newpage
+\newpage
A new normal page, again
\begin{pages}
@@ -35,51 +36,51 @@ A new normal page, again
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
-
+
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
-
+
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
@@ -142,51 +143,51 @@ A new normal page, again
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
-
+
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
\pstart
Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph. Other left side paragraph.
\pend
-
-
+
+
\pstart
Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph. Left side paragraph.
\pend
@@ -242,7 +243,7 @@ A new normal page, again
\endnumbering
\end{Rightside}
-\end{pages}
+\end{pages}
\Pages
And now, we continue with normal pages.
@@ -250,5 +251,5 @@ And now, we continue with normal pages.
\newpage
And again a new page.
-
+
\end{document}
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 86c10d3ab9..bc2ed01370 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-nomax.tex b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.tex
index 2027f93147..18cec8fa87 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.tex
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.tex
@@ -1,4 +1,5 @@
\documentclass[a5paper,11pt]{article}
+\usepackage[T1]{fontenc}
\usepackage{lmodern}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 a3a80b84c0..72a5f352fb 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_advancedshifted.tex b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.tex
index 082f07388b..fa4af2b5dd 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.tex
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.tex
@@ -1,4 +1,5 @@
\documentclass[a5paper,11pt]{article}
+\usepackage[T1]{fontenc}
\usepackage{lmodern}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 c7d767e7a9..cf2de2b4b3 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_default.tex b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.tex
index 48dcbaf518..83f00331f2 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.tex
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.tex
@@ -1,4 +1,5 @@
\documentclass[a5paper,11pt]{article}
+\usepackage[T1]{fontenc}
\usepackage{lmodern}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 1d7926bc1a..6a19592d4e 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-shifted.tex b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.tex
index 0cda55ce96..8d27617c89 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.tex
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.tex
@@ -1,4 +1,5 @@
\documentclass[a5paper,11pt]{article}
+\usepackage[T1]{fontenc}
\usepackage{lmodern}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 50bd4b1f86..1f3ec24494 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_nomax.tex b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.tex
index 3418a1ca03..6c3009e3ab 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.tex
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.tex
@@ -1,4 +1,5 @@
\documentclass[a5paper,11pt]{article}
+\usepackage[T1]{fontenc}
\usepackage{lmodern}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 6a6edd1055..3ec42aa6ab 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_nosync.tex b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.tex
index 8bf92117a3..bb5db39c85 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.tex
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.tex
@@ -1,4 +1,5 @@
\documentclass[a5paper,11pt]{article}
+\usepackage[T1]{fontenc}
\usepackage{lmodern}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 33e41a3cc4..f0caef7ce7 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/3-reledpar_sync_setting_shifted.tex b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.tex
index 46ff22ee87..f7535f1799 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.tex
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.tex
@@ -1,4 +1,5 @@
\documentclass[a5paper,11pt]{article}
+\usepackage[T1]{fontenc}
\usepackage{lmodern}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 11c9d25bdf..212f9151d9 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-continuous-numbering.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex
index 47dd7ab60a..8ca3aa3aed 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 b1aa502a66..ab84f8e685 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_column_mix_with_not_column.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.tex
index 0e69a18612..724c382f5a 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -25,7 +26,7 @@ In this example, we use the \verb+widthliketwocolumns+ option and the \verb+\Xno
\end{english}
\begin{pairs}\sloppy
-\begin{Leftside}
+\begin{Leftside}
\beginnumbering
\pstart
\edtext{Lorem}{\Afootnote{lorim}} ipsum\footnoteA{Cras fermentum eleifend sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem.}\footnoteB{Cras fermentum eleifend sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem.} \edtext{Lorem}{\Afootnote{lorim}} dolor sit amet, consectetur adipiscing elit. Sed \edtext{Lorem}{\Afootnote{lorim}} egestas, dolor sed malesuada ultrices, nulla orci \edtext{Lorem}{\Afootnote{lorim}} suscipit massa, a feugiat neque dolor eu augue. \edtext{Lorem}{\Afootnote{lorim}} Lorem ipsum dolor sit amet, consectetur adipiscing \edtext{Lorem}{\Afootnote{lorim}} elit. Pellentesque bibendum \edtext{Lorem}{\Bfootnote{?}} tellus ornare orci luctus, fermentum auctor lacus vehicula. Nunc ex leo, iaculis in \edtext{Lorem}{\Bfootnote{?}} convallis \edtext{Lorem}{\Bfootnote{?}} luctus, accumsan nec ligula. Praesent molestie, mauris vitae mattis commodo, tellus magna \edtext{Lorem}{\Bfootnote{?}} eleifend nunc, eu tempor purus neque quis neque. Morbi volutpat, tellus ac hendrerit fermentum, purus sem placerat mauris, a tristique nisi dolor et mi. Ut aliquam porttitor diam, ut \edtext{Lorem}{\Bfootnote{?}} feugiat arcu congue ullamcorper. Nam malesuada, ante sed fermentum blandit, nisi magna sollicitudin eros, vel accumsan magna lorem ut leo. Cras fermentum eleifend sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem. Etiam ipsum mi, aliquam suscipit mattis id, pretium iaculis enim. Quisque vestibulum tincidunt sem, a egestas nulla \edtext{Lorem}{\Afootnote{lorim}} luctus eget\footnoteB{Cras fermentum eleifend sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem.}. Proin sodales aliquet felis. \edtext{Lorem}{\Afootnote{lorim}} Vestibulum ante ipsum primis in faucibus orci luctus et \edtext{Lorem}{\Bfootnote{?}} ultrices posuere cubilia Curae;
@@ -39,29 +40,29 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed
\pend
\end{Leftside}
-\begin{Rightside}
+\begin{Rightside}
\beginnumbering
-
+
\pstart
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed malesuada ultrices, nulla orci suscipit massa, a feugiat neque dolor eu augue. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque bibendum tellus ornare orci luctus, fermentum auctor lacus vehicula. Nunc ex leo, iaculis in convallis luctus, accumsan nec ligula. Praesent molestie, mauris vitae mattis commodo, tellus magna eleifend nunc, eu tempor purus neque quis neque. Morbi volutpat, tellus ac hendrerit fermentum, purus sem placerat mauris, a tristique nisi dolor et mi. Ut aliquam porttitor diam, ut feugiat arcu congue ullamcorper. Nam malesuada, ante sed fermentum blandit, nisi magna sollicitudin eros, vel accumsan magna lorem ut leo. Cras fermentum eleifend sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem. Etiam ipsum mi, aliquam suscipit mattis id, pretium iaculis enim. Quisque vestibulum tincidunt sem, a egestas nulla luctus eget. Proin sodales aliquet felis. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;
\pend
-
-
+
+
\pstart
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed malesuada ultrices, nulla orci suscipit massa, a feugiat neque dolor eu augue. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque bibendum tellus ornare orci luctus, fermentum auctor lacus vehicula. Nunc ex leo, iaculis in convallis luctus, accumsan nec ligula. Praesent molestie, mauris vitae mattis commodo, tellus magna eleifend nunc, eu tempor purus neque quis neque. Morbi volutpat, tellus ac hendrerit fermentum, purus sem placerat mauris, a tristique nisi dolor et mi. Ut aliquam porttitor diam, ut feugiat arcu congue ullamcorper. Nam malesuada, ante sed fermentum blandit, nisi magna sollicitudin eros, vel accumsan magna lorem ut leo. Cras fermentum eleifend sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem. Etiam ipsum mi, aliquam suscipit mattis id, pretium iaculis enim. Quisque vestibulum tincidunt sem, a egestas nulla luctus eget. Proin sodales aliquet felis. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;
-
+
\pend
-
+
\pausenumbering
\end{Rightside}
\end{pairs}
\Columns
\resumenumbering
-
-
+
+
\pstart
@@ -71,9 +72,9 @@ Lorem \edtext{ipsum}{\Afootnote{Donec sagittis nibh in volutpat tincidunt. Fusce
\pausenumbering
\begin{pairs}\sloppy
-\begin{Leftside}
+\begin{Leftside}
\resumenumbering
-
+
\pstart
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed malesuada ultrices, nulla orci suscipit massa, a feugiat neque dolor eu augue. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque bibendum tellus ornare orci luctus, fermentum auctor lacus vehicula. Nunc ex leo, iaculis in convallis luctus, accumsan nec ligula. Praesent molestie, mauris vitae mattis commodo, tellus magna eleifend nunc, eu tempor purus neque quis neque. Morbi volutpat, tellus ac hendrerit fermentum, purus sem placerat mauris, a tristique nisi dolor et mi. Ut aliquam porttitor diam, ut feugiat arcu congue ullamcorper. Nam malesuada, ante sed fermentum blandit, nisi magna sollicitudin eros, vel accumsan magna lorem ut leo. Cras fermentum eleifend sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem. Etiam ipsum mi, aliquam suscipit mattis id, pretium iaculis enim. Quisque vestibulum tincidunt sem, a egestas nulla luctus eget. Proin sodales aliquet felis. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;
@@ -83,22 +84,22 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed
\end{Leftside}
-\begin{Rightside}
+\begin{Rightside}
\resumenumbering
-
-
+
+
\pstart
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed malesuada ultrices, nulla orci suscipit massa, a feugiat neque dolor eu augue. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque bibendum tellus ornare orci luctus, fermentum auctor lacus vehicula. Nunc ex leo, iaculis in convallis luctus, accumsan nec ligula. Praesent molestie, mauris vitae mattis commodo, tellus magna eleifend nunc, eu tempor purus neque quis neque. Morbi volutpat, tellus ac hendrerit fermentum, purus sem placerat mauris, a tristique nisi dolor et mi. Ut aliquam porttitor diam, ut feugiat arcu congue ullamcorper. Nam malesuada, ante sed fermentum blandit, nisi magna sollicitudin eros, vel accumsan magna lorem ut leo. Cras fermentum eleifend\footnoteB{xb} sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem. Etiam ipsum mi, aliquam suscipit mattis id, pretium iaculis enim. Quisque vestibulum tincidunt sem, a egestas nulla luctus eget. Proin sodales aliquet felis. Vestibulum ante ipsum primis in faucibus\footnoteB{Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed malesuada ultrices, nulla orci suscipit massa, a feugiat neque dolor eu augue.} orci\footnoteA{Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed malesuada ultrices, nulla orci suscipit massa, a feugiat neque dolor eu augue.} luctus et ultrices posuere cubilia Curae;
\pend
-
+
\endnumbering
\end{Rightside}
\end{pairs}
\Columns
\beginnumbering
-
+
\pstart
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 ddcadd07e6..98dcd6ea33 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_alignment.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.tex
index 71d7837c03..5fbceecf00 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -36,7 +37,7 @@ We also provide one last example, showing how we can manipulate space between co
\begin{Leftside}
\beginnumbering
\pstart
-Left side left side left side left side left side left side left side left side left side left side
+Left side left side left side left side left side left side left side left side left side left side
\pend
\endnumbering
\end{Leftside}
@@ -44,7 +45,7 @@ Left side left side left side left side left side left side left side left side
\begin{Rightside}
\beginnumbering
\pstart
-Right side right side right side right side right side right side right side right side right side right side
+Right side right side right side right side right side right side right side right side right side right side
\pend
\endnumbering
\end{Rightside}
@@ -59,7 +60,7 @@ Right side right side right side right side right side right side right side rig
\begin{Leftside}
\beginnumbering
\pstart
-Left side left side left side left side left side left side left side left side left side left side
+Left side left side left side left side left side left side left side left side left side left side
\pend
\endnumbering
\end{Leftside}
@@ -67,7 +68,7 @@ Left side left side left side left side left side left side left side left side
\begin{Rightside}
\beginnumbering
\pstart
-Right side right side right side right side right side right side right side right side right side right side
+Right side right side right side right side right side right side right side right side right side right side
\pend
\endnumbering
\end{Rightside}
@@ -82,7 +83,7 @@ Right side right side right side right side right side right side right side rig
\begin{Leftside}
\beginnumbering
\pstart
-Left side left side left side left side left side left side left side left side left side left side
+Left side left side left side left side left side left side left side left side left side left side
\pend
\endnumbering
\end{Leftside}
@@ -90,7 +91,7 @@ Left side left side left side left side left side left side left side left side
\begin{Rightside}
\beginnumbering
\pstart
-Right side right side right side right side right side right side right side right side right side right side
+Right side right side right side right side right side right side right side right side right side right side
\pend
\endnumbering
\end{Rightside}
@@ -111,7 +112,7 @@ Now, we set the spaces between columns, to have all the line occupied.
\begin{Leftside}
\beginnumbering
\pstart
-Left side left side left side left side left side left side left side left side left side left side
+Left side left side left side left side left side left side left side left side left side left side
\pend
\endnumbering
\end{Leftside}
@@ -119,7 +120,7 @@ Left side left side left side left side left side left side left side left side
\begin{Rightside}
\beginnumbering
\pstart
-Right side right side right side right side right side right side right side right side right side right side
+Right side right side right side right side right side right side right side right side right side right side
\pend
\endnumbering
\end{Rightside}
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 7396d80f4e..769841f922 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_columns_titles_in_line_numbering_with_notes.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.tex
index b9980162af..4c51acafdc 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.tex
@@ -1,4 +1,5 @@
\documentclass{book}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -21,10 +22,10 @@
{\small
This file provides examples of using sectioning commands with reledpar. The section titles are in the line numbering, and have critical notes.
-The left and right sides are put in columns. We use \verb+\eledsectnotoc{L}+ to say we want the right titles be added to the table of contents, and not the left titles.
-We also use \verb+\eledsectmark{R}+ to use the right side to add \LaTeX\ marks for headers.
+The left and right sides are put in columns. We use \verb+\eledsectnotoc{L}+ to say we want the right titles be added to the table of contents, and not the left titles.
+We also use \verb+\eledsectmark{R}+ to use the right side to add \LaTeX\ marks for headers.
-We use the \verb+\reledxxx+ commands, each of them in their own \verb+\pstart…\pend+ group.
+We use the \verb+\reledxxx+ commands, each of them in their own \verb+\pstart…\pend+ group.
Page clearings are manually added before chapter with \verb+\beforeeledchapter+.
}
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 79fd745086..462bdbaf31 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_inside-outside-columns.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.tex
index 03d1c95cee..655fb75ee4 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -172,7 +173,7 @@ This file shows an example of the \verb+movecolumnspositiononrightpage+ option i
\endnumbering
\end{Rightside}
-\end{pairs}
+\end{pairs}
\Columns
\end{document}
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 032fb8157b..9462e80ff9 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_one_series_per_pstart.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.tex
index e790357e15..4b0bd8fb7c 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 28eb9e6993..c12b0ba298 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_long_notes.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.tex
index 5b1a652153..2e564da881 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -43,7 +44,7 @@ With \verb+\maxhXnotes+, we have set the maximum height of critical notes to \ve
\autopar
\edtext{Tous}{\Afootnote{\Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page. \Atest Afootnote is for both left and right page.}}
-les
+les
\edtext{rois}{\Bfootnote {\Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side. \Btest xxx Bfootnote is only for left side.
}} de la Grèce qui descendaient de Minos, fils de Jupiter, vinrent en Crète pour y recueillir la riche succession de Crétéus. Ce prince, fils de Minos, avait réglé par son testament qu'il serait fait un partage égal de tout ce qu'il possédait d'or, d'argent et de troupeaux, entre les enfants de ses filles ; et il laissait son empire à Idoménée, fils de Deucalion, son frère et à Mérion , fils de Molus, son neveu, qui devaient gouverner chacun sa part avec un pouvoir indépendant. Entre les princes présents au partage, on distinguait Palamède, fils de Clymène et de Nauplius, et Oeax, appelés Crétéides, avec Ménélas, fils d'Aerope et de Plisthène, qu'Anaxibie, sa soeur, épouse de Nestor, et Agamemnon, son frère aîné, avaient chargé de les représenter dans l'assemblée des héritiers. On connaissait moins ces derniers comme fils de Plisthène, mort à la fleur de son âge et sans avoir rien fait de mémorable, que comme petits-fils d'Atrée. Ce prince, en effet, touché de compassion pour la faiblesse de leur âge, les avait recueillis au-près de lui, et s'était chargé de leur donner une éducation conforme à leur naissance. Ils se conduisirent tous dans cette occasion avec la grandeur et la générosité qu'on devait attendre de personnes de leur rang.
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 634078e5da..985eac0641 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_notes_leftpage.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.tex
index ba2194207c..11db297ffc 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.tex
@@ -1,4 +1,5 @@
\documentclass[twoside]{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -28,13 +29,13 @@ The notes of series \verb+A+ are called on the left side with \verb+footnoteAnom
\beginnumbering
\autopar
- Lorem\footnoteAnomk{A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side.} ipsum dolor sit amet, consectetur adipiscing elit. Vivamus id erat imperdiet, sollicitudin tortor a, rhoncus ipsum. Aliquam at maximus nibh. Ut sed risus porttitor, eleifend tortor non, commodo nisl. Praesent eu ullamcorper est. Phasellus at eros eget ex feugiat scelerisque.
-
- Vivamus et luctus justo. In aliquet, metus malesuada vestibulum ullamcorper, est sapien facilisis arcu, ac efficitur mi metus ac velit. Sed sagittis laoreet justo at iaculis.
+ Lorem\footnoteAnomk{A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side. A note called in right side, but printed in left side.} ipsum dolor sit amet, consectetur adipiscing elit. Vivamus id erat imperdiet, sollicitudin tortor a, rhoncus ipsum. Aliquam at maximus nibh. Ut sed risus porttitor, eleifend tortor non, commodo nisl. Praesent eu ullamcorper est. Phasellus at eros eget ex feugiat scelerisque.
- Aliquam\footnoteAnomk{An other note called in right side, but printed in left side. An other note called in right side, but printed in left side. An other note called in right side, but printed in left side. An other note called in right side, but printed in left side. An other note called in right side, but printed in left side. An other note called in right side, but printed in left side. An other note called in right side, but printed in left side.} eu erat id tellus bibendum semper eu eget nulla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nunc arcu, iaculis sit amet laoreet ut, finibus at nibh.
+ Vivamus et luctus justo. In aliquet, metus malesuada vestibulum ullamcorper, est sapien facilisis arcu, ac efficitur mi metus ac velit. Sed sagittis laoreet justo at iaculis.
- Curabitur non lacus eget tellus consectetur dignissim. Nullam a tempus enim. Donec ut pulvinar magna, in accumsan velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec lacinia scelerisque urna, sagittis fermentum est ultricies semper.
+ Aliquam\footnoteAnomk{An other note called in right side, but printed in left side. An other note called in right side, but printed in left side. An other note called in right side, but printed in left side. An other note called in right side, but printed in left side. An other note called in right side, but printed in left side. An other note called in right side, but printed in left side. An other note called in right side, but printed in left side.} eu erat id tellus bibendum semper eu eget nulla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nunc arcu, iaculis sit amet laoreet ut, finibus at nibh.
+
+ Curabitur non lacus eget tellus consectetur dignissim. Nullam a tempus enim. Donec ut pulvinar magna, in accumsan velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec lacinia scelerisque urna, sagittis fermentum est ultricies semper.
Aenean condimentum, leo vitae convallis porta, neque felis rhoncus metus, in iaculis nulla ligula vitae quam. Fusce at vehicula purus, id sollicitudin dolor. Maecenas scelerisque non est non luctus. Aliquam erat volutpat. Praesent eu placerat urna. Donec fermentum mauris sit amet nulla semper lacinia. Donec eu ipsum ultricies, placerat odio id, ultrices urna. Cras id sapien ut nisi auctor elementum vel id tellus.
@@ -45,15 +46,15 @@ The notes of series \verb+A+ are called on the left side with \verb+footnoteAnom
\beginnumbering
\autopar
Lorem\footnoteAmk ipsum dolor sit amet, consectetur adipiscing elit. Vivamus id erat imperdiet, sollicitudin tortor a, rhoncus ipsum. Aliquam at maximus nibh. Ut sed risus porttitor, eleifend tortor non, commodo nisl. Praesent eu ullamcorper est. Phasellus at eros eget ex feugiat scelerisque. Proin pellentesque lorem eu risus convallis consectetur ac molestie turpis. Maecenas blandit iaculis orci, et mattis dolor luctus vel. Praesent placerat varius tellus, nec convallis purus volutpat at. Vivamus sit amet est interdum, condimentum sem ultricies, posuere sapien. Maecenas vitae sapien diam. Donec et risus non nunc laoreet tincidunt. Pellentesque vehicula pellentesque sagittis. Morbi elementum tempus nunc, eu sodales erat convallis et. Maecenas condimentum pretium faucibus. Nam in ante nunc. Etiam lobortis, arcu a imperdiet interdum, felis erat mattis nunc, id posuere purus nisl a nibh.
-
+
Vivamus et luctus justo. In aliquet, metus malesuada vestibulum ullamcorper, est sapien facilisis arcu, ac efficitur mi metus ac velit. Sed sagittis laoreet justo at iaculis. Morbi scelerisque nec quam eu efficitur. Integer nec massa ut lectus viverra ornare sed id libero. Praesent fermentum suscipit ante ut aliquam. Sed facilisis rutrum sapien vel blandit. Ut eget ex ut massa consequat sodales. Vestibulum venenatis in quam a molestie.
Aliquam\footnoteAmk eu erat id tellus bibendum semper eu eget nulla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nunc arcu, iaculis sit amet laoreet ut, finibus at nibh. Aliquam vel nisl a sem pulvinar efficitur. Quisque dignissim, metus at consectetur ultrices, metus nunc ultrices quam, at ultrices dolor massa vitae urna. Nullam semper nisi dui, vel commodo mi lobortis sit amet. In non mattis orci. Integer aliquam dapibus convallis. Suspendisse sodales tincidunt ante quis laoreet. Etiam sodales mauris nulla, vitae mattis est consequat sit amet. Nam blandit rhoncus nisi. Sed accumsan, nibh non venenatis aliquam, dolor quam sodales turpis, nec aliquam nunc arcu quis urna.
Curabitur non lacus eget tellus consectetur dignissim. Nullam a tempus enim. Donec ut pulvinar magna, in accumsan velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec lacinia scelerisque urna, sagittis fermentum est ultricies semper. Phasellus non augue ligula. Donec aliquet bibendum elit, quis tempor risus pulvinar id. Curabitur a cursus enim. Integer sit amet accumsan urna. Nam viverra at tortor ac gravida. In hac habitasse platea dictumst. Morbi imperdiet eleifend risus id consequat. Proin blandit mi a elit vehicula, a semper quam lacinia. Pellentesque at iaculis diam, quis condimentum justo. Nulla laoreet ut mauris sed tempor.
- Aenean condimentum, leo vitae convallis porta, neque felis rhoncus metus, in iaculis nulla ligula vitae quam. Fusce at vehicula purus, id sollicitudin dolor. Maecenas scelerisque non est non luctus. Aliquam erat volutpat. Praesent eu placerat urna. Donec fermentum mauris sit amet nulla semper lacinia.
-
+ Aenean condimentum, leo vitae convallis porta, neque felis rhoncus metus, in iaculis nulla ligula vitae quam. Fusce at vehicula purus, id sollicitudin dolor. Maecenas scelerisque non est non luctus. Aliquam erat volutpat. Praesent eu placerat urna. Donec fermentum mauris sit amet nulla semper lacinia.
+
\endnumbering
\end{Rightside}
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 70a0055bd8..d3e31ef72b 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_paragraph_separator_between.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.tex
index b2710eef97..f08e22aaa6 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
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 e256f4e26a..00d215c393 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_pages_titles_in_line_numbering_with_notes.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex
index c15f64b59c..32fb84f5d8 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex
@@ -1,4 +1,5 @@
\documentclass{book}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -18,9 +19,9 @@
{\small
This file provides examples for using the sectioning command with reledpar. The section titles are in the line numbering, and have critical notes.
-The left and right sides are put in parallel pages. Following the standard behavior of reledpar, only the left titles are put to the table of contents.
+The left and right sides are put in parallel pages. Following the standard behavior of reledpar, only the left titles are put to the table of contents.
-We use the \verb+\reledxxx+ commands, each of them in their own \verb+\pstart…\pend+ group.
+We use the \verb+\reledxxx+ commands, each of them in their own \verb+\pstart…\pend+ group.
Page breaks are manually added before chapter with \verb+\beforeeledchapter+.
}
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 288d9b2570..c412099075 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_titles_not_in_line_numbering.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.tex
index 6c56d6b45c..7968c34cf7 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
@@ -17,7 +18,7 @@
\begin{abstract}
This file provides example of section titles set in parallel. The titles are not in numbered line. Following the standard configuration of reledpar, only the left titles are add to the table of contents.
-We use the optional arguments of \verb+\pstart+.
+We use the optional arguments of \verb+\pstart+.
\end{abstract}
\end{english}
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 7f00d90088..222dc9efd6 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/examples/4-reledpar_verse_text_between.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.tex
index c2f49bc6d7..34d19d7ea8 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.tex
@@ -1,4 +1,5 @@
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage[osf,p]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
diff --git a/macros/latex/contrib/reledmac/examples/makefile b/macros/latex/contrib/reledmac/examples/makefile
index ccdb5569d2..6ab0cfccf3 100644
--- a/macros/latex/contrib/reledmac/examples/makefile
+++ b/macros/latex/contrib/reledmac/examples/makefile
@@ -11,11 +11,11 @@ PDF:$(OBJ)
latexmk $<
2-glossaries.pdf: 2-glossaries.tex
- xelatex 2-glossaries
- xelatex 2-glossaries
- xelatex 2-glossaries
+ pdflatex 2-glossaries
+ pdflatex 2-glossaries
+ pdflatex 2-glossaries
makeglossaries 2-glossaries
- xelatex 2-glossaries
+ pdflatex 2-glossaries
3-reledpar_pages_different_languages_lualatex.pdf: 3-reledpar_pages_different_languages_lualatex.tex
latexmk --lualatex $<
diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf
index 3dc388eeee..e711378aeb 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 dd3c42a428..c5bb0685d8 100644
--- a/macros/latex/contrib/reledmac/reledmac.dtx
+++ b/macros/latex/contrib/reledmac/reledmac.dtx
@@ -556,6 +556,8 @@
% \changes{v2.33.0}{2020/05/31}{Add antilabe feature.}
% \changes{v2.33.0}{2020/05/31}{Add \protect\cs{Xinnotemark} and \protect\cs{innotemarkX} hooks.}
% \changes{v2.33.1}{2020/06/06}{Fix a spacing bug when the argument of \protect\cs{antilabe} contains more than one word.}
+% \changes{v2.34.0}{2020/06/24}{Add \protect\cs{Xpstartonlyfirst} and \protect\cs{Xstanzaonlyfirst}.}
+% \changes{v2.34.0}{2020/06/24}{Add \protect\cs{Xpstartseparator}.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -2446,6 +2448,10 @@
% \DescribeMacro{\Xonlypstart}
% In combination with \protect\cs{Xpstart}, you can use \protect\cs{Xonlypstart}\oarg{s} if you want to print only the pstart number in the footnote, and not the line and subline number.
%
+% \DescribeMacro{Xpstartonlyfirst} You can use \cs{Xpstartonlyfirst}\oarg{s} to print the pstart number only the first time it appears in the apparatus.
+% \DescribeMacro{\Xpstartseparator}
+% When using \cs{Xpstart}, you can use \cs{Xpstartseparator}\oarg{s}\marg{text} to print \meta{text} after the pstart number.
+% Default value is empty.
% \subsubsection{Printing stanza number}
%
% \DescribeMacro{\Xstanza}\label{Xstanza}
@@ -2454,10 +2460,10 @@
% Of course the stanza number is printed only when you use \cs{numberstanza}
%
% \DescribeMacro{\Xstanzaseparator}
-%
% When using \cs{Xstanza}, you can use \cs{Xstanzaseparator}\oarg{s}\marg{text} to print \meta{text} after the stanza number.
% Default value is empty.
%
+% \DescribeMacro{Xstanzaonlyfirst} You can use \cs{Xstanzaonlyfirst}\oarg{s} to print the stanza number only the first time it appears in the apparatus.
% \subsubsection{Separator between line and subline numbers}\label{Xsublinesep}
% \DescribeMacro{\Xsublinesep}
% \cs{Xsublinesep}\oarg{s}\marg{txt} changes the separator between line and subline in footnotes.
@@ -4392,7 +4398,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/06/06 v2.33.1 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/06/24 v2.34.0 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -12015,22 +12021,76 @@
% The previous \protect\cs{boxlinefootnote} calls it.
% \begin{macrocode}
\newcommand{\printlinefootnotenumbers}[2]{%
+ \get@pstartcounter%
\ifboolexpr{%
(togl{Xpstart@#2} and bool{numberpstart})%
- or togl{Xpstarteverytime@#2}}%
- {\printpstart}{}%
- \iftoggle{Xstanza@#2}{%
- \ifnumberstanza%
- \printstanza%
- \csuse{Xstanzaseparator@#2}%
- \fi%
+ or togl{Xpstarteverytime@#2}%
+ and not (%
+ togl{Xpstartonlyfirst@#2}%
+ and test {\ifnumequal{\csuse{Xprevpstart@#2}}{\current@pstart}}%
+ )%
+ }%
+ {%
+ \printpstart%
+ \csuse{Xpstartseparator@#2}%
+ }{}%
+ \global\cslet{Xprevpstart@#2}{\current@pstart}%
+ \get@stanzacounter%
+ \ifboolexpr{%
+ togl{Xstanza@#2}%
+ and bool {numberstanza}%
+ and not (%
+ togl{Xpstartonlyfirst@#2}%
+ and test {\ifnumequal{\csuse{Xprevstanza@#2}}{\current@stanza}}%
+ )%
+ }{%
+ \printstanza%
+ \csuse{Xstanzaseparator@#2}%
}{}%
+ \global\cslet{Xprevstanza@#2}{\current@stanza}%
\iftoggle{Xonlypstart@#2}{}{%
\csuse{Xtxtbeforenumber@#2}%
\printlines#1|\ifledRcol@\@Rlineflag\fi|}%
}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\get@pstartcounter}
+% A single macro to get the current pstart counter.
+% \begin{macrocode}
+\newcommand{\get@pstartcounter}[0]{%
+ \ifboolexpr{bool{l@dprintingpages} or bool{l@dprintingcolumns}}%
+ {%
+ \ifledRcol%
+ \global\numdef\current@pstart{\the\c@pstartR}%
+ \else%
+ \global\numdef\current@pstart{\the\c@pstartL}%
+ \fi%
+ }%
+ {%
+ \global\numdef\current@pstart{\the\c@pstart}%
+ }%
+}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\get@stanzacounter}
+% The same to get the current stanza counter.
+% \begin{macrocode}
+\newcommand{\get@stanzacounter}[0]{%
+ \ifboolexpr{bool{l@dprintingpages} or bool{l@dprintingcolumns}}%
+ {%
+ \ifledRcol%
+ \global\numdef\current@stanza{\the\c@stanzaR}%
+ \else%
+ \global\numdef\current@stanza{\the\c@stanzaL}%
+ \fi%
+ }%
+ {%
+ \global\numdef\current@stanza{\the\c@stanza}%
+ }%
+}%
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\printXbeforenumber}
% This macro prints a space (before the line number) in footnote.
% It is called by \protect\cs{printlinefootnotearea}.
@@ -14683,8 +14743,16 @@
\newtoggle{Xtwolinesonlyinsamepage@#1}%
\newtoggle{Xonlypstart@#1}%
\newtoggle{Xpstarteverytime@#1}%
+
\newtoggle{Xpstart@#1}%
+ \newtoggle{Xpstartonlyfirst@#1}%
+ \csdef{Xprevpstart@#1}{0}%Not a hook, but a tool for the hook Xpstartonlyfirst
+ \csgdef{Xpstartseparator@#1}{}%
+
\newtoggle{Xstanza@#1}%
+ \newtoggle{Xstanzaonlyfirst@#1}%
+ \csdef{Xprevstanza@#1}{0}%Not a hook, but a tool for the hook Xstanzaonlyfirst
+
\csgdef{Xstanzaseparator@#1}{}%
\csgdef{Xsymlinenum@#1}{}%
@@ -15451,10 +15519,14 @@
\newhooktoggle@series{Xgroupbyline}%
\newhooktoggle@series{Xgroupbylineseparetwolines}%
\newhooktoggle@series{Xnonumber}
+
\newhooktoggle@series{Xpstart}
+ \newhooktoggle@series{Xpstartonlyfirst}%
\newhooktoggle@series{Xpstarteverytime}%
+ \newhookcommand@series{Xpstartseparator}%
\newhooktoggle@series{Xstanza}%
+ \newhooktoggle@series{Xstanzaonlyfirst}%
\newhookcommand@series{Xstanzaseparator}%
\newhooktoggle@series{Xonlypstart}
diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf
index b8980e47cc..d257666811 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 c3494a4208..63b5af32b6 100644
--- a/macros/latex/contrib/reledmac/reledpar.pdf
+++ b/macros/latex/contrib/reledmac/reledpar.pdf
Binary files differ
diff --git a/macros/latex/contrib/xfakebold/Changes b/macros/latex/contrib/xfakebold/Changes
index 54671b5a7b..498c9e66fe 100644
--- a/macros/latex/contrib/xfakebold/Changes
+++ b/macros/latex/contrib/xfakebold/Changes
@@ -1,5 +1,6 @@
xfakebold.sty ----------------
+v 0.08 2020-06-24 use colorstack to allow a page break
v 0.07 2020-06-22 fix bug for pdflatex (thanks to Scott Pakin)
v 0.06 2019-12-29 support for xetex and ptex with (x)dvipdfmx
v 0.05 2019-09-21 fix pdflatex
diff --git a/macros/latex/contrib/xfakebold/README b/macros/latex/contrib/xfakebold/README
index 86cf330d38..c4fd11bbf5 100644
--- a/macros/latex/contrib/xfakebold/README
+++ b/macros/latex/contrib/xfakebold/README
@@ -1,6 +1,7 @@
This package allows to use bold characters in text and math mode.
It works only with vectorfonts which are created by outlines.
-
+It makes no real sense for XeLaTeX, because you can use the option
+AutoFakeBold from package fontspec.
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf
index 54db165a54..8195a0f488 100644
--- a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf
+++ b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex
index c7ac5d15d3..b60ab25316 100644
--- a/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex
+++ b/macros/latex/contrib/xfakebold/doc/xfakebold-doc.tex
@@ -1,8 +1,8 @@
-% $Id: xfakebold-doc.tex 9 2020-06-22 07:46:03Z herbert $
+% $Id: xfakebold-doc.tex 11 2020-06-24 06:56:41Z herbert $
\listfiles
\documentclass[english]{article}
\usepackage{dejavu-otf}
-\usepackage{xfp}
+\usepackage{xfp,dtk-logos}
\ExplSyntaxOn
\let\PI\c_pi_fp
\ExplSyntaxOff
@@ -12,7 +12,7 @@
\usepackage{babel}
\usepackage[a4paper,tmargin=1cm,bmargin=1.5cm,includeheadfoot]{geometry}
\usepackage{listings}
-\title{\texttt{xfakebold}, v. 0.07\\ using bold characters with\\ \texttt{pdflatex}, \texttt{lualatex} or \texttt{xelatex}}
+\title{\texttt{xfakebold}, v. 0.08\\ using bold characters with\\ \texttt{pdflatex}, \texttt{lualatex} or \texttt{xelatex}}
\author{Herbert Voß}
\lstset{basicstyle=\ttfamily\small,language={[LaTeX]TeX},frame=lrtb}
@@ -25,39 +25,50 @@
\vspace{1cm}
\begin{abstract}
The package fakes a vector font with outline characters by the text render of PDF.
-It writes directly into the pdf output with \verb|\pdfliteral| (pdflatex ) or \verb|\pdfextension| \verb|literal|
-(lualatex) or \verb|\special| (xelatex). The package defines two macros which can be used in text and in math mode. However, for the text
+It writes directly into the pdf output with \verb|\pdfliteral| and uses the colorstack package \texttt{pdfrender} to allow
+boldness with a pagebreak inside the bold part.
+%(pdflatex ) or \verb|\pdfextension| \verb|literal|
+%(lualatex) or \verb|\special| (xelatex).
+The package defines two macros which can be used in text and in math mode. However, for the text
mode one should use the bold version of the text font which should be available in most cases. This is different to the
math mode where only some free math fonts provide a bold version.
\end{abstract}
\vfill
-\small Thanks to: Scott Pakin, Will Robertson; Yusuke Terada;
+\small Thanks to: Heiko Oberdiek; Scott Pakin, Will Robertson; Yusuke Terada;
%\meaning\setBold
%\meaning\unsetBold
\newpage
+\section{\TeX-engines}
+With \XeLaTeX\ you do not really need this package, because you can use the optional argument \texttt{AutoFakeBold} from
+package \texttt{fontspec} or \texttt{unicode-math} which does the same internally. For Lua\TeX\ the option \texttt{AutoFakeBold} is only supported
+by \texttt{unicode-math} for math typesetting. For pdf\LaTeX\ this package can be used for text and math.
+
+
\section{How does it work?}
PDF knows different text render modes for outline fonts.
+\bigskip
\ifxetex\else% Only for the test run with xelatex
-\def\OFF{\pdfextension literal direct { 0 Tr 0 w }\relax}
+\def\OFF{\pdfrender{TextRenderingMode=Fill,LineWidth=0}}
\def\Verb|#1|{\texttt{\{#1\}}}
-\makebox[3cm][l]{Mode 0 \Verb| 0 Tr 0 w |} \tabular{l}\pdfextension literal direct { 0 Tr 0 w }\scalebox{10}{OTTO} OTTO\OFF\endtabular
+\makebox[3cm][l]{Mode 0 \Verb| 0 Tr 0 w |} \tabular{l}\pdfrender{TextRenderingMode=Fill}\scalebox{10}{OTTO} OTTO\OFF\endtabular
-\makebox[3cm][l]{Mode 1 \Verb| 1 Tr 0 w |} \tabular{l}\pdfextension literal direct { 1 Tr 0 w }\scalebox{10}{OTTO} OTTO\OFF\endtabular
+\makebox[3cm][l]{Mode 1 \Verb| 1 Tr 0 w |} \tabular{l}\pdfrender{TextRenderingMode=Stroke,LineWidth=0}\scalebox{10}{OTTO} OTTO\OFF\endtabular
-\makebox[3cm][l]{Mode 1 \Verb| 1 Tr 0.3 w |} \tabular{l}\pdfextension literal direct { 1 Tr 0.3 w }\scalebox{10}{OTTO} OTTO\OFF\endtabular
+\makebox[3cm][l]{Mode 1 \Verb| 1 Tr 0.3 w |} \tabular{l}\pdfrender{TextRenderingMode=Stroke,LineWidth=0.3}\scalebox{10}{OTTO} OTTO\OFF\endtabular
-\makebox[3cm][l]{Mode 2 \Verb| 2 Tr 0 w |} \tabular{l}\pdfextension literal direct { 2 Tr 0 w }\scalebox{10}{OTTO} OTTO\OFF\endtabular
+\makebox[3cm][l]{Mode 2 \Verb| 2 Tr 0 w |} \tabular{l}\pdfrender{TextRenderingMode=FillStroke,LineWidth=0}\scalebox{10}{OTTO} OTTO\OFF\endtabular
-\makebox[3cm][l]{Mode 2 \Verb| 2 Tr 0.3 w |} \tabular{l}\pdfextension literal direct { 2 Tr 0.3 w }\scalebox{10}{OTTO} OTTO\OFF\endtabular
+\makebox[3cm][l]{Mode 2 \Verb| 2 Tr 0.3 w |} \tabular{l}\pdfrender{TextRenderingMode=FillStroke,LineWidth=0.3}\scalebox{10}{OTTO} OTTO\OFF\endtabular
\fi
+\bigskip
In mode 0 the character is filled but without drawing its outline which can be seen when printing in mode 1, where
the linewidth of the outline is the smallest one which the system allows. Setting the linewidth to 0.3\,bp, which is
nearly the same as 0.3\,pt, the linewidth of the outline increases. In mode 2 the character is printed with filling \emph{and}
@@ -101,7 +112,7 @@ the L3-syntax we define a new variable:
\subsection{Default setting}
\begin{lstlisting}
\documentclass{article}
-\usepackage{xfakebold}
+\usepackage{xfakebold,xfp}
\begin{document}
An example:
$\pi^{\pi}=\fpeval{\PI^\PI}$ and
@@ -140,6 +151,7 @@ $\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
\begin{lstlisting}
\documentclass{article}
\usepackage[bold=1]{xfakebold}
+\usepackage{xfp}
\begin{document}
An example:
$\pi^{\pi}=\fpeval{\PI^\PI}$ and
@@ -163,14 +175,14 @@ $\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
\ifxetex\special{pdf:literal direct 2 Tr 1 w }%
-\else\pdfextension literal direct { 2 Tr 1 w }\relax\fi
+\else\pdfrender{TextRenderingMode=FillStroke,LineWidth=1}\fi
\noindent
An example:
$\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
\ifxetex\special{pdf:literal direct 0 Tr 0 w }%
-\else\pdfextension literal direct { 0 Tr 0 w }\relax\fi
+\else\pdfrender{TextRenderingMode=Fill,LineWidth=0}\fi
\noindent
An example:
$\pi^{\pi}=\fpeval{\PI^\PI}$ and
@@ -180,7 +192,7 @@ $\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
\begin{lstlisting}
\documentclass{article}
-\usepackage{xfakebold}
+\usepackage{xfakebold,xfp}
\begin{document}
\setBold[0.01]\noindent
An example:
@@ -198,7 +210,7 @@ $\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
\unsetBold
-\setBold\noindent% Using the deafult value
+\setBold\noindent% Using the default value
An example:
$\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
@@ -222,7 +234,7 @@ $\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
\unsetBold
-\setBold\noindent% Using the deafult value
+\setBold\noindent% Using the default value
An example:
$\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
diff --git a/macros/latex/contrib/xfakebold/latex/xfakebold.sty b/macros/latex/contrib/xfakebold/latex/xfakebold.sty
index 0e0d5d4068..b4c2dff90f 100644
--- a/macros/latex/contrib/xfakebold/latex/xfakebold.sty
+++ b/macros/latex/contrib/xfakebold/latex/xfakebold.sty
@@ -1,4 +1,4 @@
-% $Id: xfakebold.sty 9 2020-06-22 07:46:03Z herbert $
+% $Id: xfakebold.sty 11 2020-06-24 06:56:41Z herbert $
%%
%% This is file `xfakebold.sty',
%%
@@ -14,8 +14,9 @@
%%
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{xfakebold}[2020/06/22 v0.07 using bold characters]
+\ProvidesPackage{xfakebold}[2020/06/24 v0.08 using bold characters]
\RequirePackage{xkeyval}
+\RequirePackage{pdfrender}
\@ifpackagelater{iftex}{2019/10/24}{%
\RequirePackage{ifxetex,ifluatex,ifpdf}
@@ -23,14 +24,14 @@
\RequirePackage{iftex}
}
-\def\fkbld@bold{0.3 }%
+\def\fkbld@bold{0.3}%
\def\fkbld@checkboldness#1{%
\ifdim#1pt > \z@
- \def\fkbld@bold{#1 }%
+ \def\fkbld@bold{#1}%
\else
\PackageWarning{fakebold}{The value must be greater than 0. Will choose 0.3 instead!}%
- \def\fkbld@bold{0.3 }%
+ \def\fkbld@bold{0.3}%
\fi
}
@@ -39,32 +40,26 @@
\ProcessOptionsX*
\newcommand\setBold[1][]{%
- \begingroup
\if$#1$\else
\fkbld@checkboldness{#1}%
\fi
\ifxetex
- \special{pdf:literal direct 2 Tr \fkbld@bold w }\relax
+ \special{pdf:literal direct 2 Tr \fkbld@bold\space w }\relax
\else
\ifluatex
- \pdfextension literal direct { 2 Tr \fkbld@bold w }\relax
+ \pdfrender{TextRenderingMode=FillStroke,LineWidth=\fkbld@bold}%
\else
\ifpdftex
- \ifnum\pdfoutput=\@ne
- \pdfliteral direct { 2 Tr \fkbld@bold w }\relax
- \else
- \special{pdf:literal direct 2 Tr \fkbld@bold w }\relax
- \fi
+ \pdfrender{TextRenderingMode=FillStroke,LineWidth=\fkbld@bold}%
\else
\ifpdf
- \PackageWarning{fakebold}{!Unsupported engine! fakebold is disabled.}
+ \PackageWarning{fakebold}{!Unsupported engine! fakebold is disabled.}%
\else
- \special{pdf:literal direct 2 Tr \fkbld@bold w }\relax
- \fi
+ \pdfrender{TextRenderingMode=FillStroke,LineWidth=\fkbld@bold}%
+ \fi
\fi
\fi
\fi
- \endgroup
\ignorespaces
}
\newcommand\unsetBold{%
@@ -72,19 +67,18 @@
\special{pdf:literal direct 0 Tr 0 w }\relax
\else
\ifluatex
- \pdfextension literal direct { 0 Tr 0 w }\relax
+ \pdfrender{TextRenderingMode=Fill,LineWidth=0}%
\else
\ifpdftex
\ifnum\pdfoutput=\@ne
- \pdfliteral direct { 0 Tr 0 w }\relax
+ \pdfrender{TextRenderingMode=Fill,LineWidth=0}%
\else
- \special{pdf:literal direct 0 Tr 0 w }\relax
+ \pdfrender{TextRenderingMode=Fill,LineWidth=0}%
\fi
\else
- \ifpdf
- \else
- \special{pdf:literal direct 0 Tr 0 w }\relax
- \fi
+ \ifpdf\else
+ \pdfrender{TextRenderingMode=Fill,LineWidth=0}%
+ \fi
\fi
\fi
\fi