From b73e4d11b5cfbd60cd23a6af429455d3f66112d3 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Sat, 22 May 2021 18:01:44 +0200 Subject: use fontsetup until selecting NewCM by font name is possible again --- ekdosis.dtx | 96 +++++++++++++++++++++----------------------- samples/Caesar_BG-6-13-1.tex | 9 +---- 2 files changed, 46 insertions(+), 59 deletions(-) diff --git a/ekdosis.dtx b/ekdosis.dtx index f30f4cd..381fdc8 100644 --- a/ekdosis.dtx +++ b/ekdosis.dtx @@ -61,7 +61,7 @@ along with this program. If not, see %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{ekdosis} %<*package> - [2021/05/15 v1.3-dev Typesetting TEI xml-compliant critical editions] + [2021/05/22 v1.3-dev Typesetting TEI xml-compliant critical editions] % %<*driver> \begin{filecontents}[noheader,overwrite]{bibdata.xml} @@ -525,30 +525,24 @@ along with this program. If not, see \usepackage{dox} \doxitem{Option}{option}{options} \usepackage{microtype} -\usepackage[no-math]{fontspec} +\usepackage{fontspec} +\usepackage[default]{fontsetup} +\setmathfont[range=up]{OldStandard-Regular.otf} +\setmathfont[range=bb]{OldStandard-Bold.otf} +\setmathfont[range=it]{OldStandard-Italic.otf} +\setmathfont[range=bbit]{OldStandard-BoldItalic.otf} \defaultfontfeatures{Renderer=Harfbuzz} \usepackage[latin.classic,greek.ancient,american]{babel} \babelfont{rm}{Old Standard} -\babelfont{sf}[ItalicFont=NewCMSans10-BookOblique, - BoldFont=NewCMSans10-Bold, - BoldItalicFont=NewCMSans10-BoldOblique] - {NewCMSans10-Book} -\babelfont{tt}[ItalicFont=NewCMMono10-BookItalic, - BoldFont=NewCMMono10-Bold, - BoldItalicFont=NewCMMono10-BoldOblique] - {NewCMMono10-Book} \babelfont[greek]{rm}[ Script=Greek, RawFeature={+ss05;+ss06} ]{Old Standard} -\babelfont[greek]{sf}[Script=Greek]{NewCMSans10-Book} -\babelfont[greek]{tt}[Script=Greek]{NewCMMono10-Book} \newfontfamily{\junicode}{Junicode}[ Ligatures=TeX, RawFeature={+hist}] \babeltags{ancientgreek = greek} \def\sg#1{\textancientgreek{#1}} -\usepackage[Old Standard]{mathfont} \usepackage[biblatex=true]{embrac} \usepackage{chifoot} \usepackage{arabluatex} @@ -574,7 +568,7 @@ along with this program. If not, see before=\smaller} \usepackage{manfnt} \usepackage{lettrine} -\newcommand\danger{\lettrine[loversize=-.5]{\textdbend}{\hskip6pt}} +\newcommand\ekdanger{\lettrine[loversize=-.5]{\textdbend}{\hskip6pt}} \usepackage{metalogox} \usepackage{hologo} \usepackage{xcolor} @@ -1133,7 +1127,7 @@ along with this program. If not, see % \meta{key}$=$\meta{value}. The description of the optional arguments % follows. % -% \danger The reader is invited to refer to the relevant sections of +% \ekdanger The reader is invited to refer to the relevant sections of % this documentation for more information on how to use them. % % \DescribeOption{layout}\phts\label{ref:layout-opt} @@ -1159,7 +1153,7 @@ along with this program. If not, see % \LaTeX{} standard textual divisions can be used and will be % translated into \texttt{TEI} numbered |
| elements. % -% \danger It must be noted that the two styles are mutually exclusive. +% \ekdanger It must be noted that the two styles are mutually exclusive. % \vskip\baselineskip % % \DescribeOption{poetry}\phts\label{ref:poetry-opt} @@ -1420,7 +1414,7 @@ along with this program. If not, see % \item The rendition to be used in the printed apparatus criticus. % \end{enumerate} % -% \danger As \pkg{ekdosis} can include and use \texttt{TEI +% \ekdanger As \pkg{ekdosis} can include and use \texttt{TEI % xml}-compliant lists of references,\footnote{See below % \vref{sec:references-cited-works}.} it is advisable to use % Bib\hologo{(La)TeX} labels in the first argument of @@ -1687,7 +1681,7 @@ yesterday. % \emph{reading}, which contains deviant readings rejected by the % editor. % -% \danger What follows refers to the notions of \enquote{witness}, +% \ekdanger What follows refers to the notions of \enquote{witness}, % \enquote{source} and \enquote{scholar} as defined above % \vpageref{sec:terminology}. % @@ -1749,7 +1743,7 @@ yesterday. % |nosep| must be used when for some reason no \cs{rdg} command % follows a \cs{lem} command that has just been used, as shown below % in \vref{lst:emend-coni-corr}, l.~7. -% \danger \DescribeMacro{\ekdsep} If |nosep| be used so as to insert +% \ekdanger \DescribeMacro{\ekdsep} If |nosep| be used so as to insert % an explanatory note after the lemma text with the \cs{note} command % described below \vpageref{ref:editorial-notes}, then \cs{ekdsep} can % be used\---for instance as value of the |post| optional argument of @@ -1850,7 +1844,7 @@ yesterday. % \DescribeOption{post} |post|$=$\meta{words}\\ % |post| inserts \meta{words} immediately after the note.\\ % -% \danger Under no circumstances is it permitted to insert this +% \ekdanger Under no circumstances is it permitted to insert this % command \cs{note} or \cs{note*} inside the argument of \cs{lem} or % \cs{rdg}. \cs{note}/\cs{note*} must go \emph{between} these % commands. As a general rule, within \cs{app}|{}| elements, notes are @@ -2001,7 +1995,7 @@ yesterday. % Because apparatus entries may nest recursively, the \cs{app} command % can be used to group similar readings. % -% \danger However, for nesting to work, the |alt| optional argument +% \ekdanger However, for nesting to work, the |alt| optional argument % must be used in every \cs{lem} and \cs{rdg} command involved in the % nesting. This rule applies to both parent and child commands, as % demonstrated in the following example:--- @@ -2071,7 +2065,7 @@ friend % % \fi % -% \danger It must be noted that from a technical standpoint, albeit +% \ekdanger It must be noted that from a technical standpoint, albeit % the nested lemmas are printed \emph{before} their parents in the % apparatus criticus, they are seen by \pkg{ekdosis} \emph{after} the % latter as the source file is compiled. As a result, notably when the @@ -2397,7 +2391,7 @@ friend % % \fi % -% \danger If modified, brackets can be adapted to languages that are +% \ekdanger If modified, brackets can be adapted to languages that are % written from right to left. To that effect, \pkg{ekdosis} provides a % boolean expression |al@rlmode| which is evaluated as |true| if the % writing direction be set from right to left and as |false| @@ -2634,7 +2628,7 @@ friend % environment\---for instance the leftmost one\---will have all other % associated paragraphs printed aligned. % -% \danger While the whole edition text and the whole translation can +% \ekdanger While the whole edition text and the whole translation can % be inserted in a single \env{edition}/\env{translation} environment % respectively, it is recommended to enter both texts paragraph by % paragraph as shown in the example above. Not only this method of @@ -2994,7 +2988,7 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+ % sections 7.3 to 7.6 on pp.~15--21 of the documentation of this % package.\footcite{paracol} % -% \danger It must be noted that all these commands are to be inserted +% \ekdanger It must be noted that all these commands are to be inserted % \emph{before} the \env{alignment} environments on which they are % supposed to operate. % @@ -3110,7 +3104,7 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+ % \env{alignment} environment, are printed in a single spanning block % at the bottom of the page. % -% \danger Regular footnotes are printed above the block of critical +% \ekdanger Regular footnotes are printed above the block of critical % notes. The respective places of these blocks can be interchanged by % just loading the \pkg{fnpos} package in the % preamble.\footcite{fnpos} @@ -3338,7 +3332,7 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+ % variant readings (the apparatus criticus \emph{stricto sensu}). The % former is always printed above the latter. % -% \danger The default single-layer apparatus criticus that is +% \ekdanger The default single-layer apparatus criticus that is % described above in \vref{sec:single-layer-app} is called |default| % internally. If any additional layer of notes be declared in the % preamble, this |default| layer must be included in the list of @@ -3535,7 +3529,7 @@ Some \app[type=rec2]{ % % \fi % -% \danger At any rate, |type=default| or |type=rec1|, depending on +% \ekdanger At any rate, |type=default| or |type=rec1|, depending on % what has been chosen, must be used should the editor wish to retain % that information in the \texttt{TEI xml} output file. % @@ -3547,14 +3541,14 @@ Some \app[type=rec2]{ % translators. The former set is called an \emph{apparatus fontium} % while the latter is called an \emph{apparatus testium}. % -% \danger From a technical standpoint, these notes are very different +% \ekdanger From a technical standpoint, these notes are very different % from the short editorial notes inserted between lemma texts and % variant readings that have been described above % \vpageref{ref:editorial-notes}. However, for the sake of consistency % with \texttt{TEI xml} encoding, \pkg{ekdosis} uses the same command % \cs{note} to insert both kinds of notes. % -% \danger One must also keep in mind that the notes that are described +% \ekdanger One must also keep in mind that the notes that are described % in this section refer either to a single word or to a span of % text. By consequence, as boundaries must always be set outside spans % of text, notes must be inserted immediately before the word or words @@ -3591,7 +3585,7 @@ Some \app[type=rec2]{ % \DescribeOption{labelb} |labelb|$=$\meta{label} % \hfill\tcboxverb{Mandatory}\\ % |labelb| is the unique label to serve as a reference for the point -% immediately preceding the lemma text. \danger |labelb| is used by +% immediately preceding the lemma text. \ekdanger |labelb| is used by % \pkg{ekdosis} to print the line numbers in the apparatus criticus % and to set the |left()| XPointer should \texttt{TEI} output be % required. Therefore, it must be specified. Otherwise, \pkg{ekdosis} @@ -3869,12 +3863,12 @@ argument of the % prose text.\footnote{See \vpageref{ref:verse-lineation} for % details.} % -% \danger For what is described in this section to operate, +% \ekdanger For what is described in this section to operate, % \pkg{ekdosis} must be loaded with the global option |poetry=verse| % as explained above \vpageref{ref:poetry-opt}. Simply loading the % \pkg{verse} package by means of \cs{usepackage} will have no effect. % -% \danger The foregoing does not apply if the \cls{memoir} class be +% \ekdanger The foregoing does not apply if the \cls{memoir} class be % used.\footcite{memoir} In this case, \pkg{ekdosis} automatically % uses the code provided by this class without the need to set % the global option |poetry=verse|. @@ -3941,7 +3935,7 @@ argument of the % \enquote{sonnet}, \enquote{quatrain}, \enquote{couplet} and the % like. % -% \danger Unlike the \texttt{TEI xml} element ||, \env{ekdverse} +% \ekdanger Unlike the \texttt{TEI xml} element ||, \env{ekdverse} % may not nest hiearchichally. Within this environment, % \env{ekdstanza} must be used instead to encode stanzas as described % \vpageref[below][below]{ref:ekdstanza}. @@ -4456,7 +4450,7 @@ substantiall fewell,} % % \section{Lineation Settings} % \label{sec:lineation} -% \danger \pkg{ekdosis} uses \pkg{lineno} internally for line +% \ekdanger \pkg{ekdosis} uses \pkg{lineno} internally for line % numbering.\footcite{lineno} But it must be noted that \pkg{ekdosis} % strictly prohibits the \enquote{pagewise} mode of operation that is % provided by \pkg{lineno}. As a result of this hinderance, all @@ -4558,7 +4552,7 @@ substantiall fewell,} % \DescribeMacro{\verselinenumfont} % \cs{verselinenumfont}\marg{commands} can be used to set the font % used for lines of verse. By default, the definition is -% |\normalfont\footnotesize|. \danger If the \cls{memoir} class be +% |\normalfont\footnotesize|. \ekdanger If the \cls{memoir} class be % loaded, this command is replaced with \cs{linenumberfont} described % above.\\ % \DescribeMacro{\vrightskip} The \pkg{verse} package prints the @@ -4592,7 +4586,7 @@ substantiall fewell,} % % \section{Languages} % \label{sec:languages} -% \danger \pkg{ekdosis} is fully compatible with \pkg{babel}. +% \ekdanger \pkg{ekdosis} is fully compatible with \pkg{babel}. % \enquote{Fully compatible} means that all features provided by % \pkg{babel}, including language switching commands, are supported by % \pkg{ekdosis}. \pkg{ekdosis} is also compatible with @@ -4616,7 +4610,7 @@ substantiall fewell,} % file, the reader is invited to refer to point \vref{it:lang-subopt} % and \vref{sec:teixml-output}. % -% \danger In some cases, it may be needed to apply in the apparatus +% \ekdanger In some cases, it may be needed to apply in the apparatus % criticus a language different from the one that is selected in the % edition text. To this end, \pkg{ekdosis} provides a set of % facilities which are described @@ -4632,7 +4626,7 @@ substantiall fewell,} % can be loaded concurrently with \pkg{polyglossia}, an easy way is to % use \pkg{babel} to print such languages. % -% \danger The reader is invited to refer to and become acquainted with +% \ekdanger The reader is invited to refer to and become acquainted with % the relevant parts of the documentation of the \pkg{babel} % package.\footcite{babel} % @@ -4944,7 +4938,7 @@ subtype="arabtex">'inna 'abI kAna mina % such as \cs{chapter} or \cs{section} only act as milestones, % contrary to \texttt{TEI} elements. % -% \danger It must be noted that the two styles described hereinafter +% \ekdanger It must be noted that the two styles described hereinafter % are mutually exclusive. \texttt{TEI xml} forbids that both be % combined within a single || element.\footnote{See % \url{https://tei-c.org/release/doc/tei-p5-doc/en/html/DS.html\#DSDIV}.} @@ -4957,12 +4951,12 @@ subtype="arabtex">'inna 'abI kAna mina % \pkg{ekdosis} can use the \LaTeX\ standard textual divisions, such % as \cs{book}, \cs{chapter}, \cs{section} and the like. % -% \danger However, to have these divisions properly translated into +% \ekdanger However, to have these divisions properly translated into % \texttt{TEI} numbered |
| elements, the |divs| general option % must be set to |latex| explicitly\---viz. |divs=latex|\---as % described above \vpageref{ref:divs-opt}. % -% \danger As the \env{alignment} environment that is provided by +% \ekdanger As the \env{alignment} environment that is provided by % \pkg{ekdosis} places all aligned texts within \texttt{TEI xml} % un-numbered |
| elements and \LaTeX\ textual divisions are % converted into numbered || elements, @@ -5050,7 +5044,7 @@ subtype="arabtex">'inna 'abI kAna mina % % \subsection{Using \texttt{TEI} Un-numbered Divisions} % \label{sec:ekddiv} -% \danger As already described \vpageref{ref:divs-opt}, the +% \ekdanger As already described \vpageref{ref:divs-opt}, the % un-numbered style of division is the one that is set by default. It % is congruous to the general option |divs=ekdosis|. % @@ -5329,7 +5323,7 @@ subtype="arabtex">'inna 'abI kAna mina % any other declared layer can be specified in the optional argument % of the command. % -% \danger Of course, \cs{addentries} must be issued before the +% \ekdanger Of course, \cs{addentries} must be issued before the % number of entries on a given page has reached the value set as % |maxentries|. % @@ -5622,11 +5616,11 @@ subtype="arabtex">'inna 'abI kAna mina % expected formatted siglum so that the error in the |.tex| source % file can be easily spotted and corrected. % -% \danger As the \meta{unique id} declared with \cs{DeclareShorthand} +% \ekdanger As the \meta{unique id} declared with \cs{DeclareShorthand} % is not to be exported in the \texttt{TEI xml} output file, % \pkg{ekdosis} checks neither its uniqueness nor its validness. % -% \danger It must be noted that \LaTeX\ labels that are provided in +% \ekdanger It must be noted that \LaTeX\ labels that are provided in % commands such as \cs{label}, \cs{cite} and the like must also be % unique in the document. As \LaTeX\ will issue warnings if duplicates % be found, \cs{ekdosis} does not check their uniqueness but will @@ -5918,7 +5912,7 @@ many mathematical writings and to the sense of % strings captured are inserted where each of them is expected in % the \texttt{TEI} element. % -% \danger If the entire string to be captured be enclosed in square or +% \ekdanger If the entire string to be captured be enclosed in square or % curly brackets, it is advisable to use |@b|\texttt{\emph{n}} (for % curly brackets) or |@s|\texttt{\emph{n}} (for square brackets) % instead of |#|\texttt{\emph{n}}, where \texttt{\emph{n}} is the @@ -5926,7 +5920,7 @@ many mathematical writings and to the sense of % brackets that may be found in the captured string from being % interpreted. % -% \danger Strings must be entered exactly as \pkg{ekdosis} will find +% \ekdanger Strings must be entered exactly as \pkg{ekdosis} will find % them as the |.tex| source file is compiled. Specifically, % \emph{control sequences}, namely the coded commands immediately % preceded by `\verb+\+' are always found followed by a space. For @@ -6227,7 +6221,7 @@ Sample text with a \textcolor{red}{word} in red. % % \fi % -% \danger As can be seen, the same string |Drak| is used as a label in +% \ekdanger As can be seen, the same string |Drak| is used as a label in % the Bib\hologo{(La)TeX} file (l.~1) and an |xml:id| in the % \texttt{TEI} file (l.~3). This same label must be used again in the % preamble of the |.tex| source file to declare Arnold Drakenborch as a @@ -7508,7 +7502,7 @@ Sample text with a \textcolor{red}{word} in red. % \end{macrocode} % \end{macro} % \begin{macro}{\teidirect} -% \changes{v1.3}{2021/05/15}{direct insertion of elements in the +% \changes{v1.3}{2021/05/22}{direct insertion of elements in the % \texttt{TEI xml} file} % \cs{teidirect}\oarg{xml attributes}\marg{xml element}\marg{code} % does nothing in \LaTeX. Its only use is to insert elements in the @@ -7862,7 +7856,7 @@ Sample text with a \textcolor{red}{word} in red. % \end{macrocode} % \end{macro} % \begin{macro}{\SetApparatusNoteLanguage} -% \changes{v1.3}{2021/05/15}{defines an alternate language to be +% \changes{v1.3}{2021/05/22}{defines an alternate language to be % applied in note apparatus entries} % \cs{SetApparatusNoteLang}\marg{languagename} can be used when % it is needed to apply in entries introduced by the \cs{note} command diff --git a/samples/Caesar_BG-6-13-1.tex b/samples/Caesar_BG-6-13-1.tex index 1be88de..538648b 100644 --- a/samples/Caesar_BG-6-13-1.tex +++ b/samples/Caesar_BG-6-13-1.tex @@ -1,15 +1,8 @@ \documentclass[12pt]{article} \usepackage{fontspec} +\usepackage[default]{fontsetup} \usepackage[latin.classic,french,english]{babel} \babelfont{rm}{Old Standard} -\babelfont{sf}[ItalicFont=NewCMSans10-BookOblique, - BoldFont=NewCMSans10-Bold, - BoldItalicFont=NewCMSans10-BoldOblique] - {NewCMSans10-Book} -\babelfont{tt}[ItalicFont=NewCMMono10-BookItalic, - BoldFont=NewCMMono10-Bold, - BoldItalicFont=NewCMMono10-BoldOblique] - {NewCMMono10-Book} \usepackage{nextpage} \usepackage{xltabular} -- cgit v1.2.3