From f385fa454ee3d165f431d1a11e72d5d630bd5289 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 23 Nov 2007 20:06:01 +0000 Subject: update ibycus-babel (very old change from 2005) git-svn-id: svn://tug.org/texlive/trunk@5571 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ibycus-babel/README | 121 +++- .../doc/latex/ibycus-babel/ibycus-babel.pdf | Bin 85898 -> 66492 bytes .../texmf-dist/doc/latex/ibycus-babel/install.txt | 91 --- .../source/latex/ibycus-babel/ibycus-babel.dtx | 252 +++++--- .../source/latex/ibycus-babel/ibycus-babel.ins | 3 +- .../texmf-dist/tex/latex/ibycus-babel/ibycus.ldf | 36 +- .../texmf-dist/tex/latex/ibycus-babel/lgienc.def | 30 + Master/texmf-dist/tex/latex/ibycus-babel/lgifib.fd | 44 ++ Master/texmf-dist/tex/latex/ibycus-babel/ufib.fd | 44 -- Master/texmf/tex/generic/config/language.iby.dat | 2 +- Master/texmf/tex/generic/hyphen/ibyhyph.tex | 681 ++++++++++++++++++++- 11 files changed, 1055 insertions(+), 249 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/ibycus-babel/install.txt create mode 100644 Master/texmf-dist/tex/latex/ibycus-babel/lgienc.def create mode 100644 Master/texmf-dist/tex/latex/ibycus-babel/lgifib.fd delete mode 100644 Master/texmf-dist/tex/latex/ibycus-babel/ufib.fd (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/ibycus-babel/README b/Master/texmf-dist/doc/latex/ibycus-babel/README index 47c6a189cdb..4dec904dc78 100644 --- a/Master/texmf-dist/doc/latex/ibycus-babel/README +++ b/Master/texmf-dist/doc/latex/ibycus-babel/README @@ -1,11 +1,116 @@ +============================================================ + The Ibycus-Babel interface + version 3.0 as of 2005-11-23 +============================================================ + Peter Heslin p.j.heslin(at)dur.ac.uk + Walter Schmidt w-a-schmidt(at)gmx.net + + +Overview +-------- This package provides a way of integrating the Ibycus font -for polytonic Greek into the standard Babel language -framework for LaTeX. It provides for automatic hyphenation -of Greek in the Ibycus encoding. +for polytonic Greek and other fonts with the same encoding +into the standard Babel language framework for LaTeX. It +provides for automatic hyphenation of Greek in the Ibycus +encoding. + + +What's new in version 3.0 ? +--------------------------- +Use of alternative typefaces with Ibycus encoding is +supported. +The hyphenation patterns (file ibyhyph.tex) were corrected +to fix a bug regarding the use of "lunate sigmas". +The macro code includes a workaround to avoid the bug +babel/3796. + + +Requirements +------------ +1) You must have installed the Ibycus fonts. (The related +macros are, however, not needed.) + +2) LaTeX must be based upon an eTeX program, rather than on +`ordinary' TeX. + + +Installing the hyphenation patterns +----------------------------------- +The file ibyhyph.tex provides the hyphenation patterns for +the Greek language with the particular encoding of the +Ibycus fonts. + +Store the file in a directory where LaTeX will find it. To +make LaTeX actually use it, edit the configuration file for +the hyphenation patterns. Most likely, the file has the +name "language.dat" in your TeX system. Add the following +line to this file: + +ibycus ibyhyph + +Thus, you establish a relation between the language name +"ibycus" and the file name "ibyhyph.tex". Update the +filename database (if applicable) and create a new LaTeX +format file, which will use the additional hyphenation +patterns. If you do not know how to do this, check the +documentation of your TeX distribution, or consult the FAQ +at http://www.tex.ac.uk/cgi-bin/texfaq2html?label=formatstymy + +ibyhyph.tex was generated from a set of Greek hyphenation +patterns for LGR encoding, using the Perl script ibyhyph.pl +and adding further patches affecting the processing of the +"lunate sigma". The script ibyhph.pl is part of the +distribution for reference puposes only; it is not needed by +the TeX system. + +| Since the pattern file has changed with version 3.0, +| you must update this file and re-make the LaTeX format, +| even if you have installed a previous release of the +| Ibycus-Babel interface already. + + +Installing the macro files +-------------------------- +Store the documented source file ibycus-babel.dtx, the +related installation script ibycus-babel.ins and the file +ibyhyph.pl in an appropriate directory of your TeX system, +e.g., in texmf/source/latex/ibycus-babel. + +In this directory, run the installation script +ibycus-babel.ins through LaTeX: + + latex ibycus-babel.ins + +Doing so will create the following files: + + ibycus.ldf + lgifib.fd + lgienc.def + +Move them to a directory, where LaTeX can find them, e.g., +texmf/tex/latex/ibycus-babel. + +| If you have installed the previous version 1.5, remove +| ibycus.ldf from the directory texmf/tex/generic/babel, +| where it used to be installed automatically. + +Finally, update the filename database (if applicable). + + +Documentation +------------- +Use of the Ibycus-babel interface is described in the +document ibycus-babel.pdf. Store it in an appropriate +directory of your TeX system. + + +Testing +------- +Compile the file ibycus-babel-test.tex. Examine the printed +result, and check the list of possible hyphenation points in +the log file. You can see if these match those given in the +comments in the source of ibycus-babel-test.tex, near the +end of the file. -You must obtain and install the Ibycus font separately. See -the file install.txt for further details on installing this -package. -Peter Heslin -Walter Schmidt +-- finis diff --git a/Master/texmf-dist/doc/latex/ibycus-babel/ibycus-babel.pdf b/Master/texmf-dist/doc/latex/ibycus-babel/ibycus-babel.pdf index 0399d4cfe29..872c894524e 100644 Binary files a/Master/texmf-dist/doc/latex/ibycus-babel/ibycus-babel.pdf and b/Master/texmf-dist/doc/latex/ibycus-babel/ibycus-babel.pdf differ diff --git a/Master/texmf-dist/doc/latex/ibycus-babel/install.txt b/Master/texmf-dist/doc/latex/ibycus-babel/install.txt deleted file mode 100644 index 72296562c88..00000000000 --- a/Master/texmf-dist/doc/latex/ibycus-babel/install.txt +++ /dev/null @@ -1,91 +0,0 @@ -============================================================ - Installing the Ibycus-Babel interface - version 2.4 as of 2004-11-19 -============================================================ - Peter Heslin p.j.heslin(at)dur.ac.uk - Walter Schmidt w-a-schmidt(at)gmx.net - - - -Requirements ------------- -1) You must have installed the Ibycus fonts, (The related -macros are, however, not needed.) - -2) LaTeX must be based upon an eTeX program, rather than on -`ordinary' TeX. - - -Hyphenation patterns --------------------- -The file ibyhyph.tex provides the hyphenation patterns for -the Greek language with the particular encoding of the -Ibycus fonts. - -Store the file in a directory where LaTeX will find it. To -make LaTeX actually use it, edit the configuration file for -the hyphenation patterns. Most likely, the file has the -name "language.dat" in your TeX system. Add the following -line to this file: - -ibycus ibyhyph - -Thus, you establish a relation between the language name -"ibycus" and the file name "ibyhyph.tex". Update the -filename database (if applicable) and create a new LaTeX -format file, which will use the additional hyphenation -patterns. If you do not know how to do this, check the -documentation of your TeX distribution, or consult the FAQ -at http://www.tex.ac.uk/cgi-bin/texfaq2html?label=formatstymy - -ibyhyph.tex was generated from a set of Greek hyphenation -patterns for LGR encoding through the Perl script -ibyhyph.pl, which is also part of the distribution. - -| We recommend to update the hyphenation file and re-make -| the LaTeX format, even if you have installed release 1.5 -| of the Ibycus-Babel interface already. Rationale: The -| pattern file has been improved so as to auto-detect eTeX. - - -Macro files ------------ -Store the documented source file ibycus-latex.dtx, the -related installation script ibycus-latex.ins and the Perl -script ibyhyph.pl in an appropriate directory of your TeX -system, e.g., in texmf/source/latex/ibycus-babel. - -In this directory, run the installation script -ibycus-latex.ins through LaTeX: - - latex ibycus-babel.ins - -Doing so will create the files ibycus.ldf and ufib.fd. - -Move the files ibycus.ldf and ufib.fd to a directory, where -LaTeX can find them, e.g., texmf/tex/latex/ibycus-babel. - -| If you have installed the previous version 1.5, remove the -| ibycus.ldf from the directory texmf/tex/generic/babel, -| where it used to be installed automatically. - -Finally, update the filename database (if applicable). - - -Documentation -------------- -Use of the Ibycus-babel interface is described in the -document ibycus-babel.pdf. Store it in an appropriate -directory of your TeX system. - - -Testing -------- -Compile the file ibycus-babel-test.tex. Examine the printed -result, and check the list of possible hyphenation points in -the log file. You can see if these match those given in the -comments in the source of ibycus-babel-test.tex, near the -end of the file. - - --- finis diff --git a/Master/texmf-dist/source/latex/ibycus-babel/ibycus-babel.dtx b/Master/texmf-dist/source/latex/ibycus-babel/ibycus-babel.dtx index f9049e35198..e3d9face85b 100644 --- a/Master/texmf-dist/source/latex/ibycus-babel/ibycus-babel.dtx +++ b/Master/texmf-dist/source/latex/ibycus-babel/ibycus-babel.dtx @@ -1,8 +1,8 @@ -% \CheckSum{180} +% \CheckSum{202} % \iffalse % % file `ibycus.dtx'. -% Copyright (c) 2004 Peter Heslin, Walter Schmidt +% Copyright (c) 2004, 2005 Peter Heslin, Walter Schmidt % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -19,18 +19,20 @@ % This work consists of the files % ibycus-babel.dtx, ibycus-babel.ins, ibyhyph.pl, % and the derived files -% ibycus.ldf and ufib.fd +% ibycus.ldf, lgienc.def and lgifib.fd. % %<*driver> \ProvidesFile{ibycus-babel.dtx} % % %\ProvidesLanguage{ibycus} -%\ProvidesFile{ufib.fd}% - [2004/11/19 v2.4 (PH/WaS)] +%\ProvidesFile{lgifib.fd}% +%\ProvidesFile{lgienc.def}% + [2005/11/23 v3.0 (PH/WaS)] % %<*driver> \documentclass{ltxdoc} +\usepackage{hyperref} \usepackage{url} \OnlyDescription \begin{document} @@ -41,7 +43,7 @@ % \fi % % \GetFileInfo{ibycus-babel.dtx} -% \title{Typesetting ancient Greek\\ using the Ibycus fonts with the Babel system} +% \title{Typesetting ancient Greek\\ using Ibycus-encoded fonts with the Babel system} % \author{Peter Heslin\thanks{\texttt{p.j.heslin@dur.ac.uk}} \and Walter Schmidt\thanks{\texttt{w-a-schmidt@gmx.net}}} % \date{\fileversion{} -- \filedate} % \makeatletter @@ -53,19 +55,20 @@ % \sloppy % % \section{Overview} -% The present document describes a new interface for the Ibycus fonts +% The present document describes a new interface for Greek fonts with +% the so-called `Ibycus' encoding, % to use them in conjunction with the Babel system for multilanguage typesetting. % It constitutes an alternative to the well-known macro packages -% |ibycus4.sty| and |psibycus.sty|, which are distributed together with the -% fonts. The main advantage over these packages is that automatic +% |ibycus4.sty| and |psibycus.sty|, which are distributed together with +% Pierre A. MacKay's original Ibycus fonts. +% The main advantage over these packages is that automatic % hyphenation is provided for the Greek language. Notice, however, that % a \TeX\ program with the so-called \eTeX\ extensions is required. -% % The implementation is available for \LaTeXe\ only; there are no % corresponding macro files for plain~\TeX\ or \LaTeX~2.09. % % -% \section{{\boldmath Why \eTeX?}} +% \section{\texorpdfstring{{\boldmath Why \eTeX?}}{Why \eTeX?}} % With `ordinary' \TeX, % hyphenation of Greek words will not work properly, if the end of a mixed Greek % and Latin-alphabet paragraph does not coincide with the end of the @@ -83,8 +86,8 @@ % All up-to-date \LaTeX\ systems are now built upon an \eTeX\ typesetting % engine, rather than on the classical \TeX\ program. % -% \section{Usage} -% The Ibycus fonts are assigned a (pseudo-)language named |ibycus|, +% \section{Basic usage} +% The Greek fonts are assigned a (pseudo-)language named |ibycus|, % which can be used (almost) like any other language supported by % Babel. To enable the use of this language in your document, specify % it as an option to the Babel package just as you would do for any @@ -100,9 +103,8 @@ % And, of course, do not use it together with the packages |ibycus4| % or |psibycus|. % -% The language |ibycus| should be selected only locally. Either use -% the |ibycus| environment -% to typeset larger passages of Greek text: +% The language |ibycus| should be selected only \emph{locally}. +% Either use the |ibycus| environment to typeset larger passages of Greek text: % \begin{verse} % |\begin{ibycus} | \\ % | (Hrodo'tou Qouri'ou i(stori'hs a)po'decis h('de, | \\ @@ -113,7 +115,7 @@ % or use the command |\ibygr|, which is more appropriate for % short pieces of Greek within Latin-written text: % \begin{verse} -% |blah blah \ibygr{a)rxai=a gra'mmata} blah...| +% |... Latin, \ibygr{a)rxai=a gra'mmata} and Latin again| % \end{verse} % In fact, the environment |ibycus| is nothing but an abbreviation for % Babel's |otherlanguage| environment with the option |ibycus|, and @@ -124,7 +126,12 @@ % notation is described in the documentation that comes with the Ibycus % fonts. % -% The typeface Ibycus and the related input notation can also be +% Notice a particular difference between |ibycus| and other languages +% of the Babel system: Switching to the language |ibycus| selects +% both a particular font encoding (|LGI|) and a particular font family (by default |fib|), +% regardless of the font family that was active before. +% +% Greek fonts and the related input notation can also be % selected without changing the hyphenation tables; to do so, use the % declaration |\ibycustext| or the text-generating command % |\textibycus{...}|. These macros exist more or less only as a @@ -135,16 +142,11 @@ % Greek text (without, however, changing the hyphenation table), use % the declaration |\latintext| or the text-generating macro % |\textlatin{...}|. When Babel is loaded with the option |ibycus|, -% these commands not only switch back to the default latin text font -% encoding as usual; they also select the default roman font family -% (just like |\rmfamily| or |\textrm|). -% -% Notice a particular difference between |ibycus| and other languages -% of the Babel system: Switching to the language |ibycus| selects -% both a particular font encoding (|U|) and a particular font family (|fib|), -% regardless of the font family that was active before. +% these commands not only switch back to the default Latin font +% encoding as usual; they also select the default font family of the +% document. % -% The Ibycus typeface provides a few traditional text-editor symbols +% Ibycus-encoded fonts provide a few traditional text-editor symbols % for critical editions: % % \begin{center} @@ -163,14 +165,36 @@ % However, this macro belongs to the \LaTeX\ kernel and should not be redefined, % so the name |\sdagger| is now used for the Ibycus-specific symbol. % -% \section{Scaling the Ibycus fonts} -% The Ibycus typeface was primarily designed to go with Computer Modern; -% yet it can be used with other Latin typefaces, too. In this case it -% may sometimes be useful to typeset the Ibycus fonts a little bit larger -% or smaller, to make them blend better with the Latin typeface. -% This can be accomplished through the macro |\setgreekfontsize|. For instance, -% |\setgreekfontsize{1.05}| will enlarge the Ibycus fonts by 5\%, as compared -% with their nominal size. The command can be issued in the preamble only. +% +% \section{Using alternative typefaces} +% \label{sec:typefaces} +% By default, Pierre A. MacKay's original Ibycus font family is used to typeset +% the Greek passages. +% From version 3.0 on the Ibucus-Babel interface supports also other font families +% with the same encoding. +% +% To select the Greek font family manually, issue the command +% \begin{verse} +% |\renewcommand{\ibycusdefault}|\marg{family} +% \end{verse} +% after loading of Babel---provided, of course, that the indicated font family is +% indeed available with the Ibycus encoding LGI. +% Macro packages to support alternative font familes in general may already include +% this action; see the related documentation. +% +% If you intend to write a class or package which is to change the font family +% used by the Ibycus-Babel interface, or if you want to implement a font family +% with Ibycus encoding, see the documentation of the source code, +% particularly the last section. +% +% +% \section{Scaling the Greek fonts} +% It may sometimes be useful to typeset the Greek fonts a little bit larger +% % or smaller (as compared with their `natural' size), to make them blend better +% with the typeface used for Latin. +% This can be accomplished through the macro |\setgreekfontscale|. For instance, +% |\setgreekfontscale{1.05}| will enlarge the Greek fonts by 5\%. +% The command can be issued in the preamble only. % % % \section{The hyphenation patterns} @@ -179,7 +203,9 @@ % Dimitrios Filippou's \path{GRAhyph4.tex}, which can be found in the % CTAN directory \path{language/hyphenation/elhyphen}. This is an % improved set of hyphenation patterns for ancient Greek with LGR encoding; -% Babel does not currently use it by default. +% Babel does not currently use it by default. With version~3 of the +% Ibycus-Babel interface, additional manual patches were applied to the +% patterns, in order to fix a bug regarding the use of `lunate sigmas'. % % Dimitrios Filippou's improved hyphenation patterns discover far more % hyphenation points than the default Babel patterns, and are more @@ -199,7 +225,7 @@ % % Filippou's patterns also include legal hyphenation points % immediately before the last letter of a word. However, the -% Ibycus-Babel interface suppreses them, since they are not only ugly +% Ibycus-Babel interface suppresses them, since they are not only ugly % but also of little practical use. % % Please contact Peter Heslin if you come across any words that @@ -210,28 +236,31 @@ % % \section{Problems and deficiencies} % \begin{itemize} -% \item After a sequence such as +% \item Globally changing the language to |ibycus|, i.e., a sequence such as % \begin{verse} % |\selectlanguage{ibycus}| \\ % \textit{Greek text\dots} \\ % |\selectlanguage{|\textit{anything}|}| \\ % \end{verse} -% the font family is changed to the default roman typeface, -% just as after |\rmfamily|. This can be avoided by selecting +% may have unwanted effects, for instance on the font selection. +% This can be avoided by selecting % the language |ibycus| only within a group or environment, % or by using the commands |\ibygr| or |\foreignlanguage|. -% \item The command |\setgreekfontscale| has no effect +% \item The behavior of the existing commands \cmd{\textlatin} +% and \cmd{\latintext} is altered: +% They will switch to the the default font family of the document, +% rather than leaving the current font family untouched. +% \item The command \cmd{\setgreekfontscale} has no effect % when the Ibycus fonts are already in use; % this situation is, however, rather unlikely in the preamble. % \end{itemize} % % -% \section{Changes since version 1.5} -% The names of several commands and environments have been changed: -% +% \section{Incompatible changes over version 1.5} +% The names of several commands and environments have changed: % \begin{center} % \begin{tabular}{ll} -% Version 1.5: & Version 2.4 \\ \hline +% Version 1.5: & Version 2.4 and later \\ \hline % \cmd{\gk} & \cmd{\ibygr} \\ % \texttt{greek} (environment) & \texttt{ibycus} \\ % \cmd{\ibylatintext} & \cmd{\latintext} \\ @@ -276,6 +305,26 @@ \adddialect\l@ibycus0\fi % \end{macrocode} % +% We are going to load the file providing the definition of the LGI encoding, +% see section \ref{sec:lgienc}. +% The error handling has been adopted from Babel's (LGR) Greek module, +% in order to ensure consistent behavior: +% \begin{macrocode} +\InputIfFileExists{lgienc.def}{% + \message{Loading the definitions for the Greek font encoding LGI}}{% + \errhelp{I can't find the lgienc.def file for the Greek fonts}% + \errmessage{Since I do not know what the LGI encoding means^^J + I can't typeset Greek.^^J + I stop here, while you get a suitable lgienc.def file}\@@end + } +% \end{macrocode} +% +% The font family to be used for Greek passages is initialized to |fib|, +% unless it has been defined already by a preceding package: +% \begin{macrocode} +\providecommand{\ibycusdefault}{fib} +% \end{macrocode} +% % We declare a command |\ibygr| and an environment |ibycus| to make % entering of Greek text easier, as compared with Babel's macros: % \begin{macrocode} @@ -290,27 +339,27 @@ % does not really make sure that the fonts have not yet been loaded. % \begin{macrocode} \newcommand*{\setgreekfontscale}[1]{% - \def\fib@scale{#1}} + \def\ibycus@scale{#1}} \@onlypreamble\setgreekfontscale % \end{macrocode} -% The macro |\fib@scale|, which is defined here, will be evaluated -% in the file \texttt{ufib.fd}, see below. +% The macro |\ibycus@scale|, which is defined here, will be evaluated +% in the font definition files of LGI-encoded fonts; see \path{lgifib.fd} below. % % All text-editor symbols of the old package |ibycus4| are provided. % However, |\dagger| is named |\sdagger| now. % \begin{macrocode} \newcommand{\braceleft}{% - {\fontencoding{U}\fontfamily{fib}\selectfont\char'333}} + {\fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont\char'333}} \newcommand{\braceright}{% - {\fontencoding{U}\fontfamily{fib}\selectfont\char'337}} + {\fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont\char'337}} \newcommand{\bracketleftbt}{% - {\fontencoding{U}\fontfamily{fib}\selectfont\char'363}} + {\fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont\char'363}} \newcommand{\bracketrightbt}{% - {\fontencoding{U}\fontfamily{fib}\selectfont\char'367}} + {\fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont\char'367}} \newcommand{\sdagger}{% - {\fontencoding{U}\fontfamily{fib}\selectfont\char'375}} + {\fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont\char'375}} \newcommand{\dbldagger}{% - {\fontencoding{U}\fontfamily{fib}\selectfont\char'376}} + {\fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont\char'376}} % \end{macrocode} % % Finally, the code to integrate the pseudo-language Ibycus into Babel. @@ -320,25 +369,30 @@ \def\captionsibycus{} \def\dateibycus{} % \end{macrocode} -% |\latintext| needs to be changed slightly, as compared with the -% default definition from the Babel kernel. The macro -% must not only switch back to the default Latin font encoding; -% it must also switch back to an appropriate font \emph{family}, since the family -% is always changed to |fib| within the Greek passages. +% +% \cmd{\latintext} needs to be extended, as compared with the default definition +% provided by the Babel kernel. The macro must not only switch to the default +% Latin font \emph{encoding}; in addition to that, it must also switch to an appropriate +% font \emph{family}, because the family is always changed to |\ibycusdefault| +% within the Greek passages. While v2.0 would select |\rmdefault|, +% this has been changed to |\familydefault| now. +% Since |\latintext| is a protected command, we extend actually the +% `unprotected' command \verb*|\latintext |: % \begin{macrocode} -\DeclareRobustCommand{\latintext}{% - \fontencoding{\latinencoding}\fontfamily{\rmdefault}\selectfont - \def\encodingdefault{\latinencoding}} +\expandafter\let\expandafter\iby@latintext\csname latintext \endcsname +\@namedef{latintext }{\fontfamily{\familydefault}\iby@latintext} % \end{macrocode} -% Should we save and restore the actual family name, -% instead of simply forcing |\rmdefault|? +% +% \cmd{\ibycustext} is modelled after Babel's original \cmd{\greektext}. +% However, we do not alter \cmd{\encodingdefault} any longer, since +% doing so has turned out to be wrong. (See the \LaTeX\ bug babel/3796.) +% As long as |ibycus| is never used as the default language +% of a document, there is no need to touch \cmd{\encodingdefault} at all. % \begin{macrocode} \DeclareRobustCommand{\ibycustext}{% - \fontencoding{U}\fontfamily{fib}\selectfont - \def\encodingdefault{U}} + \fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont} \DeclareRobustCommand{\textibycus}[1]{\leavevmode{\ibycustext #1}} \addto\extrasibycus{\ibycustext} -\addto\noextrasibycus{\latintext} \addto\extrasibycus{% \babel@savevariable{\lccode`\(}\lccode`\(=`\(% \babel@savevariable{\lccode`\)}\lccode`\)=`\)% @@ -347,16 +401,41 @@ \babel@savevariable{\lccode`\`}\lccode`\`=`\`% \babel@savevariable{\lccode`\'}\lccode`\'=`\'% \babel@savevariable{\lccode`\+}\lccode`\+=`\+} +% \end{macrocode} +% At the end of a Greek passage, we are going to issue the new command \cmd{\noibycustext}. +% In contrast to \cmd{\latintext}, it does not alter |\encodingdefault|. +% \begin{macrocode} +\DeclareRobustCommand{\noibycustext}{% + \fontencoding{\latinencoding}\fontfamily{\familydefault}\selectfont} +\addto\noextrasibycus{\noibycustext} \ldf@finish{ibycus} % % \end{macrocode} +% Should we save and restore the actual family name, +% instead of simply forcing |\familydefault|? +% +% \subsection{The encoding definition file \texttt{lgienc.def}} +% \label{sec:lgienc} +% From v3.0 on, the Ibycus-encoded fonts are assigned the encoding LGI, even though +% there are currently no encoding-specific commands declared. Rationale: +% Future alternative font families with Ibycus encoding are using U already for other +% purposes such as non-alphabetic symbols. As usual, the encoding is declared in an +% external file. +% \begin{macrocode} +%<*lgienc> +\DeclareFontEncoding{LGI}{}{} +\DeclareFontSubstitution{LGI}{fib}{m}{n} +\DeclareErrorFont{LGI}{fib}{m}{n}{10} +% +% \end{macrocode} % -% \subsection{The \texttt{.fd} file} +% +% \subsection{The font definition file \texttt{lgifib.fd}} % We provide a correct \texttt{fd} file of our own for the Ibycus font family, % instead of relying on the weird file from the Ibycus4 collection, % and we use only those fonts, that exist also in Postscript format. % \begin{macrocode} -%<*ufib> +%<*lgifib> \ifx\aliasfont\@undefined\else\ifx\aliasfont\relax\else % \end{macrocode} % This piece of code is executed with V\TeX\ only. @@ -368,21 +447,36 @@ \endgroup \fi\fi % \end{macrocode} +% Now let's evaluate \cmd{\ibycus@scale} to determine the optional +% scaling parameter \cmd{\ibycus@@scale}, which will be applied in the +% font shape declarations: % \begin{macrocode} -\expandafter\ifx\csname fib@scale\endcsname\relax - \let\fib@@scale\@empty +\expandafter\ifx\csname ibycus@scale\endcsname\relax + \let\ibycus@@scale\@empty \else - \edef\fib@@scale{s*[\csname fib@scale\endcsname]}% + \edef\ibycus@@scale{s*[\csname ibycus@scale\endcsname]}% \fi -\DeclareFontFamily{U}{fib}{} -\DeclareFontShape{U}{fib}{m}{n}{<-> \fib@@scale fibr84}{} -\DeclareFontShape{U}{fib}{m}{sl}{<-> \fib@@scale fibo84}{} -\DeclareFontShape{U}{fib}{b}{n}{<-> \fib@@scale fibb84}{} -\DeclareFontShape{U}{fib}{m}{it}{<-> ssub * fib/m/sl}{} -\DeclareFontShape{U}{fib}{bx}{n}{<-> ssub * fib/b/n}{} -% +\DeclareFontFamily{LGI}{fib}{} +\DeclareFontShape{LGI}{fib}{m}{n}{<-> \ibycus@@scale fibr84}{} +\DeclareFontShape{LGI}{fib}{m}{sl}{<-> \ibycus@@scale fibo84}{} +\DeclareFontShape{LGI}{fib}{b}{n}{<-> \ibycus@@scale fibb84}{} +\DeclareFontShape{LGI}{fib}{m}{it}{<-> ssub * fib/m/sl}{} +\DeclareFontShape{LGI}{fib}{bx}{n}{<-> ssub * fib/b/n}{} +% % \end{macrocode} % +% +% +% \subsection{Notes for class and package writers} +% To change the font family used for Greek passages, redefine the +% macro \cmd{\ibycusdefault} accordingly. Macro packages should use |\def| rather +% than |\renewcommand|; thus, they can be loaded before as well as after +% \path{ibycus.ldf}. +% +% To make the command \cmd{\setgreekfontscale} work, font definition files for +% LGI-encoded font families must evaluate the macro \cmd{\ibycus@scale} +% in the same way as the above \path{lgifib.fd}. +% % \Finale % % \iffalse diff --git a/Master/texmf-dist/source/latex/ibycus-babel/ibycus-babel.ins b/Master/texmf-dist/source/latex/ibycus-babel/ibycus-babel.ins index 7c44023af54..a146790579c 100644 --- a/Master/texmf-dist/source/latex/ibycus-babel/ibycus-babel.ins +++ b/Master/texmf-dist/source/latex/ibycus-babel/ibycus-babel.ins @@ -4,7 +4,8 @@ \generate{% \file{ibycus.ldf}{\from{ibycus-babel.dtx}{ibycus}} - \file{ufib.fd}{\from{ibycus-babel.dtx}{ufib}} + \file{lgifib.fd}{\from{ibycus-babel.dtx}{lgifib}} + \file{lgienc.def}{\from{ibycus-babel.dtx}{lgienc}} } \endbatchfile diff --git a/Master/texmf-dist/tex/latex/ibycus-babel/ibycus.ldf b/Master/texmf-dist/tex/latex/ibycus-babel/ibycus.ldf index 7ce39b504ba..b16718e2517 100644 --- a/Master/texmf-dist/tex/latex/ibycus-babel/ibycus.ldf +++ b/Master/texmf-dist/tex/latex/ibycus-babel/ibycus.ldf @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesLanguage{ibycus} - [2004/11/19 v2.4 (PH/WaS)] + [2005/11/23 v3.0 (PH/WaS)] \ifx\eTeXversion\@undefined \PackageError{ibycus-babel}{% The TeX engine used by LaTeX \MessageBreak @@ -34,36 +34,41 @@ \ifx\undefined\l@ibycus \@nopatterns{Ibycus} \adddialect\l@ibycus0\fi +\InputIfFileExists{lgienc.def}{% + \message{Loading the definitions for the Greek font encoding LGI}}{% + \errhelp{I can't find the lgienc.def file for the Greek fonts}% + \errmessage{Since I do not know what the LGI encoding means^^J + I can't typeset Greek.^^J + I stop here, while you get a suitable lgienc.def file}\@@end + } +\providecommand{\ibycusdefault}{fib} \DeclareRobustCommand{\ibygr}[1]{\foreignlanguage{ibycus}{#1}} \newenvironment{ibycus}% {\begin{otherlanguage}{ibycus}}{\end{otherlanguage}}% \newcommand*{\setgreekfontscale}[1]{% - \def\fib@scale{#1}} + \def\ibycus@scale{#1}} \@onlypreamble\setgreekfontscale \newcommand{\braceleft}{% - {\fontencoding{U}\fontfamily{fib}\selectfont\char'333}} + {\fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont\char'333}} \newcommand{\braceright}{% - {\fontencoding{U}\fontfamily{fib}\selectfont\char'337}} + {\fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont\char'337}} \newcommand{\bracketleftbt}{% - {\fontencoding{U}\fontfamily{fib}\selectfont\char'363}} + {\fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont\char'363}} \newcommand{\bracketrightbt}{% - {\fontencoding{U}\fontfamily{fib}\selectfont\char'367}} + {\fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont\char'367}} \newcommand{\sdagger}{% - {\fontencoding{U}\fontfamily{fib}\selectfont\char'375}} + {\fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont\char'375}} \newcommand{\dbldagger}{% - {\fontencoding{U}\fontfamily{fib}\selectfont\char'376}} + {\fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont\char'376}} \providehyphenmins{ibycus}{\@ne\tw@} \def\captionsibycus{} \def\dateibycus{} -\DeclareRobustCommand{\latintext}{% - \fontencoding{\latinencoding}\fontfamily{\rmdefault}\selectfont - \def\encodingdefault{\latinencoding}} +\expandafter\let\expandafter\iby@latintext\csname latintext \endcsname +\@namedef{latintext }{\fontfamily{\familydefault}\iby@latintext} \DeclareRobustCommand{\ibycustext}{% - \fontencoding{U}\fontfamily{fib}\selectfont - \def\encodingdefault{U}} + \fontencoding{LGI}\fontfamily{\ibycusdefault}\selectfont} \DeclareRobustCommand{\textibycus}[1]{\leavevmode{\ibycustext #1}} \addto\extrasibycus{\ibycustext} -\addto\noextrasibycus{\latintext} \addto\extrasibycus{% \babel@savevariable{\lccode`\(}\lccode`\(=`\(% \babel@savevariable{\lccode`\)}\lccode`\)=`\)% @@ -72,6 +77,9 @@ \babel@savevariable{\lccode`\`}\lccode`\`=`\`% \babel@savevariable{\lccode`\'}\lccode`\'=`\'% \babel@savevariable{\lccode`\+}\lccode`\+=`\+} +\DeclareRobustCommand{\noibycustext}{% + \fontencoding{\latinencoding}\fontfamily{\familydefault}\selectfont} +\addto\noextrasibycus{\noibycustext} \ldf@finish{ibycus} \endinput %% diff --git a/Master/texmf-dist/tex/latex/ibycus-babel/lgienc.def b/Master/texmf-dist/tex/latex/ibycus-babel/lgienc.def new file mode 100644 index 00000000000..66701815ddf --- /dev/null +++ b/Master/texmf-dist/tex/latex/ibycus-babel/lgienc.def @@ -0,0 +1,30 @@ +%% +%% This is file `lgienc.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ibycus-babel.dtx (with options: `lgienc') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from lgienc.def. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file ibycus-babel.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +\ProvidesFile{lgienc.def}% + [2005/11/23 v3.0 (PH/WaS)] +\DeclareFontEncoding{LGI}{}{} +\DeclareFontSubstitution{LGI}{fib}{m}{n} +\DeclareErrorFont{LGI}{fib}{m}{n}{10} +\endinput +%% +%% End of file `lgienc.def'. diff --git a/Master/texmf-dist/tex/latex/ibycus-babel/lgifib.fd b/Master/texmf-dist/tex/latex/ibycus-babel/lgifib.fd new file mode 100644 index 00000000000..481308f5fcd --- /dev/null +++ b/Master/texmf-dist/tex/latex/ibycus-babel/lgifib.fd @@ -0,0 +1,44 @@ +%% +%% This is file `lgifib.fd', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ibycus-babel.dtx (with options: `lgifib') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from lgifib.fd. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file ibycus-babel.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +\ProvidesFile{lgifib.fd}% + [2005/11/23 v3.0 (PH/WaS)] +\ifx\aliasfont\@undefined\else\ifx\aliasfont\relax\else + \begingroup + \catcode32=10 % + \aliasfont fibo84 = fibr84 slant 167 % + \endgroup +\fi\fi +\expandafter\ifx\csname ibycus@scale\endcsname\relax + \let\ibycus@@scale\@empty +\else + \edef\ibycus@@scale{s*[\csname ibycus@scale\endcsname]}% +\fi +\DeclareFontFamily{LGI}{fib}{} +\DeclareFontShape{LGI}{fib}{m}{n}{<-> \ibycus@@scale fibr84}{} +\DeclareFontShape{LGI}{fib}{m}{sl}{<-> \ibycus@@scale fibo84}{} +\DeclareFontShape{LGI}{fib}{b}{n}{<-> \ibycus@@scale fibb84}{} +\DeclareFontShape{LGI}{fib}{m}{it}{<-> ssub * fib/m/sl}{} +\DeclareFontShape{LGI}{fib}{bx}{n}{<-> ssub * fib/b/n}{} +\endinput +%% +%% End of file `lgifib.fd'. diff --git a/Master/texmf-dist/tex/latex/ibycus-babel/ufib.fd b/Master/texmf-dist/tex/latex/ibycus-babel/ufib.fd deleted file mode 100644 index e261e6b2529..00000000000 --- a/Master/texmf-dist/tex/latex/ibycus-babel/ufib.fd +++ /dev/null @@ -1,44 +0,0 @@ -%% -%% This is file `ufib.fd', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% ibycus-babel.dtx (with options: `ufib') -%% -%% IMPORTANT NOTICE: -%% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from ufib.fd. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file ibycus-babel.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) -\ProvidesFile{ufib.fd}% - [2004/11/19 v2.4 (PH/WaS)] -\ifx\aliasfont\@undefined\else\ifx\aliasfont\relax\else - \begingroup - \catcode32=10 % - \aliasfont fibo84 = fibr84 slant 167 % - \endgroup -\fi\fi -\expandafter\ifx\csname fib@scale\endcsname\relax - \let\fib@@scale\@empty -\else - \edef\fib@@scale{s*[\csname fib@scale\endcsname]}% -\fi -\DeclareFontFamily{U}{fib}{} -\DeclareFontShape{U}{fib}{m}{n}{<-> \fib@@scale fibr84}{} -\DeclareFontShape{U}{fib}{m}{sl}{<-> \fib@@scale fibo84}{} -\DeclareFontShape{U}{fib}{b}{n}{<-> \fib@@scale fibb84}{} -\DeclareFontShape{U}{fib}{m}{it}{<-> ssub * fib/m/sl}{} -\DeclareFontShape{U}{fib}{bx}{n}{<-> ssub * fib/b/n}{} -\endinput -%% -%% End of file `ufib.fd'. diff --git a/Master/texmf/tex/generic/config/language.iby.dat b/Master/texmf/tex/generic/config/language.iby.dat index 2682868bfb4..ce844a1644f 100644 --- a/Master/texmf/tex/generic/config/language.iby.dat +++ b/Master/texmf/tex/generic/config/language.iby.dat @@ -1 +1 @@ -ibycus ibyhyph.tex +ibycus ibyhyph.tex diff --git a/Master/texmf/tex/generic/hyphen/ibyhyph.tex b/Master/texmf/tex/generic/hyphen/ibyhyph.tex index 970e642f1ea..e3954805543 100644 --- a/Master/texmf/tex/generic/hyphen/ibyhyph.tex +++ b/Master/texmf/tex/generic/hyphen/ibyhyph.tex @@ -1,12 +1,14 @@ -\message{Greek hyphenation patterns for Ibycus 4} +\message{Greek hyphenation patterns for Ibycus encoding, v3.0} % This file was mechanically translated from a set of patterns % for the standard greek encoding using the perl script ibyhyph.pl +% and adding fixes wrt/ the use of lunate sigma. \begingroup \ifx\eTeXversion\undefined\message{not using eTeX}\else\savinghyphcodes=1\fi \lccode`(=`( \lccode`)=`) \lccode``=`` \lccode `'=`' \lccode`==`= \lccode`+=`+ \lccode `|=`| \patterns{% +2+ %%%% vowels a1 a2'1 a2`1 a2=1 a2)1 a2)2'1 a2)2`1 a2)2=1 a2(1 a2(2'1 a2(2`1 a2(2=1 a2+1 a2+2'1 a2+2`1 e1 e2'1 e2`1 e2=1 e2)1 e2)2'1 e2)2`1 e2)2=1 e2(1 e2(2'1 e2(2`1 e2(2=1 e2+1 e2+2'1 e2+2`1 @@ -161,6 +163,7 @@ o3ui= 4p. 4r. 4s. +4c+. 4j. 4t. 4f. @@ -181,6 +184,7 @@ o3ui= 4p'. 4r'. 4s'. +4c+'. 4t'. 4f'. 4x'. @@ -199,6 +203,7 @@ o3ui= .p4 .r4 .s4 +.c+4 .t4 .f4 .x4 @@ -217,6 +222,7 @@ o3ui= 2r1r r2)1r2( 2s1s +2c+1c+ 2t1t 2f1f 2x1x @@ -229,6 +235,7 @@ r2)1r2( 2b1c 2b1p 2b1s +2b1c+ 2b1t 2b1f 2b1x @@ -241,6 +248,7 @@ r2)1r2( 2g1c 2g1p 2g1s +2g1c+ 2g1t 2g1f 2g1x @@ -255,6 +263,7 @@ r2)1r2( 2d1c 2d1p 2d1s +2d1c+ 2d1t 2d1f 2d1x @@ -272,6 +281,7 @@ r2)1r2( 2z1p 2z1r 2z1s +2z1c+ 2z1t 2z1f 2z1x @@ -285,6 +295,7 @@ r2)1r2( 2q1c 2q1p 2q1s +2q1c+ 2q1t 2q1f 2q1x @@ -298,6 +309,7 @@ r2)1r2( 2k1c 2k1p 2k1s +2k1c+ 2k1f 2k1x 2k1y @@ -314,6 +326,7 @@ r2)1r2( 2l1p 2l1r 2l1s +2l1c+ 2l1t 2l1f 2l1x @@ -330,6 +343,7 @@ r2)1r2( 2m1p 2m1r 2m1s +2m1c+ 2m1t 2m1f 2m1x @@ -347,7 +361,10 @@ r2)1r2( 2n1p 2n1r 2n1s +2n1c+ 2nj. +2ns. +2nc+. 2n1t 2n1f 2n1x @@ -365,6 +382,7 @@ r2)1r2( 2c1p 2c1r 2c1s +2c1c+ 2c1t 2c1f 2c1x @@ -378,6 +396,7 @@ r2)1r2( 2p1k 2p1c 2p1s +2p1c+ 2p1f 2p1x 2p1y @@ -394,6 +413,7 @@ r2)1r2( 2r1c 2r1p 2r1s +2r1c+ 2r1t 2r1f 2r1x @@ -401,12 +421,19 @@ r2)1r2( % % 2s1g % Liddell-Scott lexicon: sg'alh = sk'ala 2s1d +2c+1d 2s1z +2c+1z 2s1l +2c+1l 2s1n +2c+1n 2s1c +2c+1c 2s1r +2c+1r 2s1y +2c+1y % 2t1b 2t1g @@ -417,6 +444,7 @@ r2)1r2( 2t1c 2t1p 2t1s +2t1c+ 2t1f 2t1x 2t1y @@ -429,6 +457,7 @@ r2)1r2( 2f1c 2f1p 2f1s +2f1c+ 2f1t 2f1x 2f1y @@ -441,6 +470,7 @@ r2)1r2( 2x1c 2x1p 2x1s +2x1c+ 2x1t 2x1f 2x1y @@ -458,6 +488,7 @@ r2)1r2( 2y1p 2y1r 2y1s +2y1c+ 2y1t 2y1f 2y1x @@ -500,15 +531,25 @@ r2)1r2( 4pt'. % 4sb'. +4c+b'. 4sg'. +4c+g'. 4sd'. +4c+d'. 4sq'. +4c+q'. 4sk'. +4c+k'. 4sm'. +4c+m'. 4sp'. +4c+p'. 4st'. +4c+t'. 4sf'. +4c+f'. 4sx'. +4c+x'. % 4fq'. 4fl'. @@ -530,32 +571,46 @@ a)gw2n1ar a)die'2c1 a)die2c1 a)du2s1w' +a)du2c+1w' a)du2s1w +a)du2c+1w a(lo'2s1 +a(lo'2c+1 a(lo2s1 +a(lo2c+1 a)mpali'2n1 a)mpali2n1 a)mfi'2s1b +a)mfi'2c+1b a)mfi2s1b +a)mfi2c+1b % >hmfe2s1b % (>a'or. to~u >amfisbht~w) ??? % >hmfi2s1b a)mfi'2s1w +a)mfi'2c+1w a)mfi2s1w' +a)mfi2c+1w' a)2n1agh'j. -a)2n1agh`j. a)2n1agh's. +a)2n1agh'c+. +a)2n1agh`j. a)2n1agh`s. +a)2n1agh`c+. a)2n1ago a)2n1agei=. a)2n1agh=. a)2n1age'j. -a)2n1age`j. a)2n1age's. +a)2n1age'c+. +a)2n1age`j. a)2n1age`s. +a)2n1age`c+. a)2n1agei=j. a)2n1agei=s. +a)2n1agei=c+. a)2n1agw=n. a)2n1age'si +a)2n1age'c+i a)2n1agh= a)2n1a'gku a)2n1agku' @@ -586,11 +641,17 @@ a)'2n1aim a)2n1ai'm a)2n1aim a)2n1ai'sq +a)2n1ai'c+q a)2n1aisq +a)2n1aic+q a)2n1aisi +a)2n1aic+i a)2n1aisi' +a)2n1aic+i' a)2n1ai'sx +a)2n1ai'c+x a)2n1aisx +a)2n1aic+x a)2n1ai't a)2n1ait a)2n1a'kan @@ -601,6 +662,7 @@ a)2n1alg a)2n1ald a)3n2alda a)3n2aldh'sk +a)3n2aldh'c+k a)2n1a'leip a)2n1alei'p a)2n1aleif @@ -613,7 +675,9 @@ a)2n1alq a)2n1a'lip a)2n1ali'p a)2n1a'list +a)2n1a'lic+t a)2n1ali'st +a)2n1ali'c+t a)2n1alk a)'2n1alk a)2n1a'lk @@ -642,6 +706,7 @@ a)2n1amp a)2n1a'mp a)2n1amf a)namfi2s1 +a)namfi2c+1 a)2n1ana'gk a)2n1anagk a)'2n1and @@ -649,10 +714,13 @@ a)2n1a'nd a)2n1anq a)3n2anqe' a)4n3anqe'j. -a)4n3anqe`j. a)4n3anqe's. +a)4n3anqe'c+. +a)4n3anqe`j. a)4n3anqe`s. +a)4n3anqe`c+. a)4n3anqe'si +a)4n3anqe'c+i a)2n1a'nio a)2n1ani'o a)2n1ani'w @@ -704,7 +772,9 @@ a)2n1apon a)2n1apo'p a)2n1apop a)2n1apo's +a)2n1apo'c+ a)2n1apos +a)2n1apoc+ a)2n1apo'te a)2n1apote a)2n1apo'tm @@ -726,24 +796,38 @@ a)4n3arrag a)3n2art a)3n2aru't a)2n1a'skh +a)2n1a'c+kh a)2n1askh' +a)2n1ac+kh' a)'2n1aspi +a)'2n1ac+pi a)2n1aspi' +a)2n1ac+pi' a)2n1a'ssat +a)2n1a'c+c+at a)2n1assa't +a)2n1ac+c+a't a)2n1a'stei +a)2n1a'c+tei a)2n1astei' +a)2n1ac+tei' a)3n2astei'b +a)3n2ac+tei'b a)3n2a'steir +a)3n2a'c+teir a)3n2astei'r +a)3n2ac+tei'r a)3n2a'steix +a)3n2a'c+teix a)3n2astei'x +a)3n2ac+tei'x a)2n1atei`. a)2n1atei'. a)2n1ati`. a)2n1ati'. a)'2n1atoj. a)'2n1atos. +a)'2n1atoc+. a)2n1a'tou. a)2n1a'tw a)'2n1aton. @@ -751,6 +835,7 @@ a)'2n1ate a)'2n1atoi. a)2n1a'toij. a)2n1a'tois. +a)2n1a'toic+. a)2n1a'tt a)2n1att a)2n1au'g @@ -785,7 +870,9 @@ a)2n1a'fr a)2n1axu'r a)2n1axur a)ndro'2s1a +a)ndro'2c+1a a)ndro2s1a +a)ndro2c+1a a)2n1e'gg a)2n1egg a)2n1e'gert @@ -796,9 +883,13 @@ a)2n1egx a)2n1eda' a)2n1eda a)2n1e'des +a)2n1e'dec+ a)2n1ede's +a)2n1ede'c+ a)2n1e'dras +a)2n1e'drac+ a)2n1edra's +a)2n1edra'c+ a)2n1ee'r a)2n1eer a)2n1eqe'l @@ -817,19 +908,28 @@ a)2n1eilei' a)2n1eilei a)2n1ei'ma a)2n1ei'2s1ak +a)2n1ei'2c+1ak a)2n1ei2s1a'k +a)2n1ei2c+1a'k a)2n1ei'2s1o +a)2n1ei'2c+1o a)2n1ei2s1o' +a)2n1ei2c+1o' a)2n1ei2s1for +a)2n1ei2c+1for a)2n1ei'2s1for +a)2n1ei'2c+1for a)2n1ei2s1fo'r +a)2n1ei2c+1fo'r a)2n1e'k a)2n1ek a)3n2e'ka a)3n2eka'j. -a)3n2eka`j. a)3n2eka's. +a)3n2eka'c+. +a)3n2eka`j. a)3n2eka`s. +a)3n2eka`c+. a)3n2ekt a)4n3e'2k1tit a)4n3e2k1ti't @@ -854,12 +954,15 @@ a)2n1elkh` a)2n1elko a)2n1elkh= a)2n1elke'j. -a)2n1elke`j. a)2n1elke's. +a)2n1elke'c+. +a)2n1elke`j. a)2n1elke`s. +a)2n1elke`c+. a)2n1elke a)2n1elkw= a)2n1elke's +a)2n1elke'c+ a)'2n1elkt a)2n1e'lkt a)2n1e'lkw @@ -883,6 +986,7 @@ a)3n2e'nei a)3n2enh' a)3n2e'ntej. a)3n2e'ntes. +a)3n2e'ntec+. a)2n1e2c1 a)3n2e3c2i'ka a)3n2e3c2ika' @@ -892,23 +996,32 @@ a)2n1ep a)3n2epn a)3n2ept a)2n1erast +a)2n1erac+t a)2n1e'rast +a)2n1e'rac+t a)2n1era'st +a)2n1era'c+t a)2n1erg a)'2n1erg a)2n1e'rg a)2n1e'reik a)2n1erei'k a)2n1e'reis +a)2n1e'reic+ a)2n1erei's +a)2n1erei'c+ a)2n1ereu'nht a)2n1ereunh't a)2n1eri' a)2n1eri a)2n1eruqri'ast +a)2n1eruqri'ac+t a)2n1eruqria'st +a)2n1eruqria'c+t a)2n1e'sti +a)2n1e'c+ti a)2n1esti' +a)2n1ec+ti' a)2n1e'tai a)2n1etai' a)2n1e'toi @@ -946,7 +1059,9 @@ a)2n1hgem a)2n1h'd a)2n1hd a)2n1h'kes +a)2n1h'kec+ a)2n1hke's +a)2n1hke'c+ a)2n1h'ko a)2n1hko' a)2n1hko @@ -954,6 +1069,7 @@ a)2n1hla'k a)2n1hlak a)2n1h'latoj. a)2n1h'latos. +a)2n1h'latoc+. a)2n1hla'tou a)2n1hla'tw a)2n1h'laton. @@ -1005,7 +1121,9 @@ a)2n1hri' a)2n1h'rot a)2n1hro't a)2n1h'ss +a)2n1h'c+c+ a)2n1hss +a)2n1hc+c+ a)2n1h'tt a)2n1htt a)2n1h'fa @@ -1019,6 +1137,7 @@ a)2n1i'dia a)2n1idit a)'2n1idroj a)'2n1idros +a)'2n1idroc+ a)2n1i'drou a)2n1i'drw a)'2n1idron @@ -1041,23 +1160,37 @@ a)3n2ikh' a)2n1i'l a)2n1il a)2n1i'mast +a)2n1i'mac+t a)2n1ima'st +a)2n1ima'c+t a)2n1i'ou a)2n1iou' a)'2n1ipp a)2n1i'pp a)2n1is +a)2n1ic+ a)'2n1is +a)'2n1ic+ a)2n1i's +a)2n1i'c+ a)3n2isa=t +a)3n2ic+a=t a)3n2isa't +a)3n2ic+a't a)3n2i'st +a)3n2i'c+t a)3n2ist +a)3n2ic+t a)4n3istorh +a)4n3ic+torh a)4n3isto'rh +a)4n3ic+to'rh a)4n3istorh' +a)4n3ic+torh' a)3n2i'sx +a)3n2i'c+x a)4n3i'sxu +a)4n3i'c+xu a)'2n1ix a)2n1i'x a)2n1ixneu't @@ -1081,7 +1214,9 @@ a)2n1oin a)'2n1oin a)2n1oi'n a)'2n1oistr +a)'2n1oic+tr a)2n1oi'str +a)2n1oi'c+tr a)2n1o'l a)2n1ol a)'2n1ol @@ -1110,8 +1245,10 @@ a)2n2o'moin. a)3n2o'mwn. a)3n2o'moij. a)3n2o'mois. +a)3n2o'moic+. a)3n2o'mouj. a)3n2o'mous. +a)3n2o'mouc+. a)2n1o'n a)2n1on a)'2n1op @@ -1126,16 +1263,25 @@ a)3n2orma' a)3n2ort a)3n2oru' a)2n1o'si +a)2n1o'c+i a)2n1osi' +a)2n1oc+i' a)2n1osi +a)2n1oc+i a)'2n1osm +a)'2n1oc+m a)2n1o'sm +a)2n1o'c+m a)2n1o'sfr +a)2n1o'c+fr a)2n1osfr +a)2n1oc+fr a)2n1ou'a a)2n1oua' a)2n1ou'si +a)2n1ou'c+i a)2n1ousi' +a)2n1ouc+i' a)2n1ou't a)2n1out a)2n1ofq @@ -1147,23 +1293,33 @@ a)2n1oy a)'2n1oy a)2n1o'y a)nta2n1is +a)nta2n1ic+ a)nta2n1i's +a)nta2n1i'c+ a)ntei2s1 +a)ntei2c+1 a)nte2k1 a)nte2n1 a)nte2c1 a)ntidu2s1 +a)ntidu2c+1 a)ntipare2k1 a)ntipare2c1 a)ntipro2s1 +a)ntipro2c+1 a)ntipros3k2u +a)ntiproc+3k2u a)ntisu'2n1 +a)ntic+u'2n1 a)ntisu2n1 +a)ntic+u2n1 a)2n1u' a)2n1u a)3n2um a)3n2u's +a)3n2u'c+ a)3n2us +a)3n2uc+ a)2n1upe'2r1 a)2n1upe2r1 %>a2n1'wd % >an-'wdhc %%% wrong??? comes from >'anw + 'i3s2asje %% duplicate pattern ???? % ei)'3s2asqai +ei)'3c+2ac+qai ei)3s2a'men +ei)3c+2a'men ei)3s2ame'n +ei)3c+2ame'n % e)2k1l e)3k2lh'qh @@ -1428,6 +1790,7 @@ e)3k2la'z e)3k2la'g e)3k2la'o e)3k2la's +e)3k2la'c+ e)3k2lai' e)3k2lau' e)3k2lei' @@ -1448,14 +1811,21 @@ e)3k2li'n e)3k2lin e)3k2lu' e)4k3lu'sew +e)4k3lu'c+ew e)4k3lu'sei +e)4k3lu'c+ei e)4k3lu'seoi +e)4k3lu'c+eoi e)4k3lu'sesi +e)4k3lu'c+ec+i e)3k2lo'm e)3k2klw's +e)3k2klw'c+ e)'2k1lei e)'3k2leis +e)'3k2leic+ e)'2k1lus +e)'2k1luc+ e)2k1m e)'2k1m e)2k1n @@ -1463,7 +1833,9 @@ e)'2k1n e)'3k2nai e)3k2nai' e)'3k2nhs +e)'3k2nhc+ e)3k2nh's +e)3k2nh'c+ e)3k2nu e)2k1r e)'2k1r @@ -1508,6 +1880,7 @@ e)3k2ru'y e)3k2ru'b e)3k2ru'f e)3k2rus +e)3k2ruc+ e)'3k2rwz e)3k2rw'z e)'3k2rwc @@ -1518,6 +1891,7 @@ e)2k1ta'mn e)2k1tan e)2k1tar e)2k1ta's +e)2k1ta'c+ e)2k1te e)2k1te' e)3k2tei'n @@ -1528,14 +1902,18 @@ e)2k1ti' e)'3k2tiz e)3k2ti'z e)'3k2tisa +e)'3k2tic+a e)3k2ti'sa +e)3k2ti'c+a e)2k1to' e)2k1to e)'2k1to e)3k2to'j. -e)3k2to`j. e)3k2to's. +e)3k2to'c+. +e)3k2to`j. e)3k2to`s. +e)3k2to`c+. e)2k1tr e)'2k1tupo e)2k1tu'pou. @@ -1546,22 +1924,32 @@ e)2ktu'poi. e)2k1tu'pwn. e)2k1tu'poij. e)2k1tu'pois. +e)2k1tu'poic+. e)2k1tu'pouj. e)2k1tu'pous. +e)2k1tu'pouc+. e)'2k1tupa. e)2k1tu e(llh'2s1p +e(llh'2c+1p e(llh2s1p +e(llh2c+1p e)2n1 e)'2n1 e)3n2a'kij +e)3n2a'kis +e)3n2a'kic+ e)3n2akis +e)3n2akic+ e)3n2ako's +e)3n2ako'c+ e)3n2akos +e)3n2akoc+ e)'3n2ara. e)3n2a'rwn. e)3n2a'roij. e)3n2a'rois. +e)3n2a'roic+. e)3n2arhf e)4n3arar e)3n2a'ree @@ -1573,12 +1961,17 @@ e)3n2ari'w e)3n2ari'a e)3n2aria' e)'3n2ass +e)'3n2ac+c+ e)3n2a'ss +e)3n2a'c+c+ e)3n2a'sq +e)3n2a'c+q e)3n2asq +e)3n2ac+q e)'3n2at e)3n2a't e)ndu2s1t +e)ndu2c+1t e)3n2e'gk e)3n2egk e)'3n2eik @@ -1588,6 +1981,7 @@ e)3n2ei'k e)'3n2eim e)3n2ei'm e)3n2eme'ss +e)3n2eme'c+c+ e)3n2emh'q e)3n2enh' e)3n2eo' @@ -1600,11 +1994,15 @@ e)3n2ea= e)3n2e'pei e)'3n2erqe e)'3n2eus +e)'3n2euc+ e)3n2eu's +e)3n2eu'c+ e)3n2e'xq e)3n2exq e)'3n2hs +e)'3n2hc+ e)3n2h's +e)3n2h'c+ e)3n2hh' e)3n2hh` e)'3n2hn. @@ -1618,7 +2016,9 @@ e)3n2i e)'3n2i e)4n3iau' e)5n4iau's +e)5n4iau'c+ e)5n4iaus +e)5n4iauc+ e)4n3idr e)4n3i'dr e)4n3i'z @@ -1631,35 +2031,49 @@ e)4n3i'pp e)4n3i'pt e)4n3i'y e)4n3i'ss +e)4n3i'c+c+ e)4n3i'st +e)4n3i'c+t e)4n3ist +e)4n3ic+t e)4n3isx +e)4n3ic+x e)4n3i'sx +e)4n3i'c+x e)'3n2oj. e)'3n2os. +e)'3n2oc+. e)'3n2ou. e)'3n2on. e)'3n2w e)'3n2oi. e)'3n2oij. e)'3n2ois. +e)'3n2oic+. e)'3n2hj. e)'3n2hs. +e)'3n2hc+. e)'3n2h|. e)'3n2h. e)'3n2osi +e)'3n2oc+i e)3n2o'se +e)3n2o'c+e e)3n2ua'l e)3n2ual e)'3n2uc e)3n2uc e)3n2u'c e)3n2u's +e)3n2u'c+ e)3n2us +e)3n2uc+ e)3n2uw' e)3n2uw` e)3n2uo'o e)3n2uou=j +e)3n2uou=s +e)3n2uou=c+ e)2c1 e)'2c1 e)3c2h'r @@ -1668,106 +2082,180 @@ e)3c2u2n1 e)3c2ur e)3c2u'r e)'3c2us +e)'3c2uc+ e)'3c2w. e(2c1h'retm e(2c1hre'tm e)pei'2s1 +e)pei'2c+1 e)pei2s1 +e)pei2c+1 e)pei'3s2aton. +e)pei'3c+2aton. e)pei3s2a'thn. +e)pei3c+2a'thn. e)pei'3s2amen. +e)pei'3c+2amen. e)pei'3s2ate +e)pei'3c+2ate e)pei3s2a'mhn. +e)pei3c+2a'mhn. e)pei'3s2w. +e)pei'3c+2w. e)pei'3s2ato +e)pei'3c+2ato e)pei'3s2asqon. +e)pei'3c+2ac+qon. e)pei3s2a'meqa. +e)pei3c+2a'meqa. e)pei'3s2asqe. +e)pei'3c+2ac+qe. e)pei'3s2anto. +e)pei'3c+2anto. e)pei'3s2q +e)pei'3c+2q e)pei3s2q +e)pei3c+2q e)pe2k1tei' e)pe'2k1tei e)pe2k1tr e)pe'2k1tr e)pe2c1 e)pe2s1b +e)pe2c+1b e)pipro'2s1q +e)pipro'2c+1q e)pipro2s1q +e)pipro2c+1q e)pisu2n1 +e)pic+u2n1 e)2s1 +e)2c+1 e)3s2a'w +e)3c+2a'w e)3s2hm +e)3c+2hm e)3s2q +e)3c+2q e)4s3qe's +e)4c+3qe'c+ e)3s2ig +e)3c+2ig e)3s2k +e)3c+2k e)4s3ka' +e)4c+3ka' e)4s3ka +e)4c+3ka % e)3s2me`n. +e)3c+2me`n. e)3s2me'n. +e)3c+2me'n. e)3s2t +e)3c+2t e)3s2o'meqa +e)3c+2o'meqa e)3s2oi'mhn +e)3c+2oi'mhn e)3s2o'm +e)3c+2o'm e)3s2om +e)3c+2om e)3s2ou= +e)3c+2ou= e)3s2ou' +e)3c+2ou' % e)3s2u +e)3c+2u e)3s2u' +e)3c+2u' e)su'2n1 +e)c+u'2n1 e)su2n1 +e)c+u2n1 e)3s2x +e)3c+2x e)4s3xe' +e)4c+3xe' e)3s2w' +e)3c+2w' e)3s2w +e)3c+2w e)'2s1op +e)'2c+1op eu)e2c1 eu)e3c2i' eu)e3c2i eu)pro'2s1 +eu)pro'2c+1 eu)pro2s1 +eu)pro2c+1 eu)su'2n1 +eu)c+u'2n1 eu)su2n1 +eu)c+u2n1 eu)cu'2n1 eu)cu2n1 e)w2s1f +e)w2c+1f h)'2n1oy. h)'2n1op h)2n1o'p .qemi2s1kr +.qemi2c+1kr .qeo'2s1d +.qeo'2c+1d .qeo2s1d +.qeo2c+1d .qeoi2s1exqr +.qeoi2c+1exqr .qh2r1agr .quo2s1k +.quo2c+1k .kaqupe2r1 .kalw2s1or +.kalw2c+1or .kalw2s1o'r +.kalw2c+1o'r .ka2n1ei'j. -.ka2n1ei`j. .ka2n1ei's. +.ka2n1ei'c+. +.ka2n1ei`j. .ka2n1ei`s. +.ka2n1ei`c+. .ka2n1en .ka2n1e'n .katadu2s1wp +.katadu2c+1wp .katedu2s1w'p +.katedu2c+1w'p .katei2s1 +.katei2c+1 .kate2n1ai' .kate2n1h' .kate2c1a2n1i' .kate2c1a2n1e's +.kate2c1a2n1e'c+ .kera2s1f +.kera2c+1f .kra'2s1p +.kra'2c+1p .kra2s1p +.kra2c+1p .kuno'2s1a +.kuno'2c+1a .kuno'2s1b +.kuno'2c+1b .kuno2s1b +.kuno2c+1b .kuno'2s1o +.kuno'2c+1o .kuno2s1o +.kuno2c+1o .kuno2s1f +.kuno2c+1f .mela2n1a'g .mela2n1ag .mela2n1a'e @@ -1782,9 +2270,13 @@ h)2n1o'p .mela2n1o'mm .mela2n1omm .mela'2n1oss +.mela'2n1oc+c+ .mela2n1o'ss +.mela2n1o'c+c+ .mela'2n1ost +.mela'2n1oc+t .mela2n1o'st +.mela2n1o'c+t .mela'2n1our .mela2n1ou'r .mela2n1our @@ -1794,11 +2286,17 @@ h)2n1o'p .mete2c1e' .mete2c1e .mogi2s1 +.mogi2c+1 .mogo2s1t +.mogo2c+1t .mu2s1p +.mu2c+1p .mu2s1ep +.mu2c+1ep .new'2s1oik +.new'2c+1oik .new2s1oi'k +.new2c+1oi'k .nou2n1e .cu2n1ag .cu2n1e @@ -1812,40 +2310,70 @@ h)2n1o'p oi(o2n1ei'. oi(o2n1ei`. oi(o'2s1 +oi(o'2c+1 oi)2s1pw't +oi)2c+1pw't oi)2s1pwt +oi)2c+1pwt o(lo2n1e'n. o(lo2n1e`n. o(pw2s1 +o(pw2c+1 o('2s1ge. +o('2c+1ge. o(so2n1w=n. +o(c+o2n1w=n. o('2s1per. +o('2c+1per. o('2s1tij +o('2s1tis +o('2s1tic+ +o('2c+1tij oi(=2s1tisi +oi(=2c+1tic+i ou('2s1tinaj +ou('2s1tinas +ou('2s1tinac+ +ou('2c+1tinaj h(=2s1tinoj +h(=2s1tinos +h(=2s1tinoc+ +h(=2c+1tinoj ai(=2s1tisi +ai(=2c+1tic+i a('2s1tinaj +a('2s1tinas +a('2s1tinac+ +a('2c+1tinaj o(2s1ti2s1ou=n. +o(2c+1ti2c+1ou=n. h(ti2s1ou=n. +h(ti2c+1ou=n. o(poiou2s1tina2s1ou=n. +o(poiou2c+1tina2c+1ou=n. ou)deno'2s1w +ou)deno'2c+1w ou)deno2s1w' +ou)deno2c+1w' .pali2n1 .pali'2n1 .pa2n1 .pa'2n1 .pa3n2o'j. -.pa3n2o`j. .pa3n2o's. +.pa3n2o'c+. +.pa3n2o`j. .pa3n2o`s. +.pa3n2o`c+. .pa3n2i'. .pa3n2i`. .pa'na. .pa3n2w=n. .pa3n2ik .pa3n2i'sd +.pa3n2i'c+d .pa3n2isd +.pa3n2ic+d .pa3n2ou=. .pa3n2w=|. .pa3n2o'. @@ -1858,13 +2386,19 @@ ou)deno2s1w' .pa3n2oi`. .pa3n2oi=j. .pa3n2oi=s. +.pa3n2oi=c+. .pa3n2ou'j. -.pa3n2ou`j. .pa3n2ou's. +.pa3n2ou'c+. +.pa3n2ou`j. .pa3n2ou`s. +.pa3n2ou`c+. .para2n1i'sx +.para2n1i'c+x .parei'2s1 +.parei'2c+1 .parei2s1 +.parei2c+1 .pare2k1l .pare2k1tr .pare2n1ei= @@ -1874,68 +2408,115 @@ ou)deno2s1w' pare'3c2w. pare'3c2eij. pare'3c2eis. +pare'3c2eic+. pare'3c2ei. pare'3c2eton. pare3c2e'thn. pare'3c2omen. pare'3c2ete. pare'3c2ousi. +pare'3c2ouc+i. pare'3c2omai pare'3c2h| pare'3c2etai. pare'3c2esqon. +pare'3c2ec+qon. pare3c2o'meqa. pare'3c2esqe. +pare'3c2ec+qe. pare'3c2ontai. .pleo2n1e' .pleo2n1e .proei2s1 +.proei2c+1 .proe2k1 .proe2n1 .proe2c1 .proe'2c1 .pro2s1 +.pro2c+1 .pro3s2a'b +.pro3c+2a'b .pro3s2ab +.pro3c+2ab .prosei2s1 +.proc+ei2c+1 .pro3s2ei' +.pro3c+2ei' .pro3s2e'sei +.pro3c+2e'c+ei .pro3s2esei' +.pro3c+2ec+ei' .prose2n1 +.proc+e2n1 .prose2c1 +.proc+e2c1 .pro'3s2qi +.pro'3c+2qi .pro3s2qi' +.pro3c+2qi' .pro4s3qig +.pro4c+3qig .pro'3s2kop +.pro'3c+2kop .pro3s2ko'p +.pro3c+2ko'p .pro3s2tas +.pro3c+2tac+ .pro3s2ta't +.pro3c+2ta't .pro3s2tat +.pro3c+2tat .pro3s2tau +.pro3c+2tau .pro3s2tei' +.pro3c+2tei' .pro3s2ten +.pro3c+2ten .pro3s2te'n +.pro3c+2te'n .pro3s2tern +.pro3c+2tern .pro'3s2tern +.pro'3c+2tern .pro3s2te'rn +.pro3c+2te'rn .pro3s2th's +.pro3c+2th'c+ .pro3s2to'm +.pro3c+2to'm .pro3s2tom +.pro3c+2tom .pro'3s2tw| +.pro'3c+2tw| .pro3s2tw'| +.pro3c+2tw'| .pro3s2ug +.pro3c+2ug .pro3s2um +.pro3c+2um .pro3s2u2n1 +.pro3c+2u2n1 .pro'3s2fagm +.pro'3c+2fagm .pro3s2fa'gm +.pro3c+2fa'gm .pro3s2fa'z +.pro3c+2fa'z .pro3s2fa'tt +.pro3c+2fa'tt .pro'3s2xhm +.pro'3c+2xhm .pro3s2xh'm +.pro3c+2xh'm .pro'3s2w. +.pro'3c+2w. .pro'3s2wqen. +.pro'3c+2wqen. .pro3s2w't +.pro3c+2w't .pro3s2wt +.pro3c+2wt .prou+pe2c1 .pu2r1a'g .pu2r1ag @@ -1952,33 +2533,61 @@ pare'3c2ontai. .pu2r1hne'm .pu2r1wp .sela2s1fo' +.c+ela2c+1fo' .sela2s1fo +.c+ela2c+1fo .sumparei2s1 +.c+umparei2c+1 .su2n1 +.c+u2n1 .su'2n1 +.c+u'2n1 .sundie'2c1 +.c+undie'2c1 .sundie2c1 +.c+undie2c1 .sundu2s1 +.c+undu2c+1 .sune2c1 +.c+une2c1 .tessare2s1k +.tec+c+are2c+1k .trei2s1k +.trei2c+1k .tri2s1 +.tri2c+1 .tri3s2mo' +.tri3c+2mo' .tri3s2mo +.tri3c+2mo .tri3s2mw= +.tri3c+2mw= .tri3s2p +.tri3c+2p .tri'3s2t +.tri'3c+2t .tri3s2t +.tri3c+2t .tri3s2w' +.tri3c+2w' .tri3s2w +.tri3c+2w u(o2s1k +u(o2c+1k u(pei'2s1 +u(pei'2c+1 u(pei2s1 +u(pei2c+1 u(pei'3s2aj u(pei'3s2as +u(pei'3s2ac+ +u(pei'3c+2aj u(pei'3s2an +u(pei'3c+2an u(pei3s2a'n +u(pei3c+2a'n u(pei3s2a's +u(pei3c+2a'c+ u(pe2k1lam u(pe2k1lh'y u(pe2k1t @@ -1989,14 +2598,17 @@ u(pe'2r1 u(pe'3r2a. u(pe'3r2hj. u(pe'3r2hs. +u(pe'3r2hc+. u(pe'3r2a|. u(pe'3r2an. u(pe'3r2ai. u(pe3r2w=n. u(pe'3r2aij. u(pe'3r2ais. +u(pe'3r2aic+. u(pe'3r2aj. u(pe'3r2as. +u(pe'3r2ac+. u(pe3r2eq u(pe3r2e'q u(pe3r2ei' @@ -2014,6 +2626,7 @@ u(pe3r2w= u(pe3r2e'e u(pe3r2ei=j. u(pe3r2ei=s. +u(pe3r2ei=c+. u(pe3r2ei=. u(pe3r2e'o u(pe3r2ou= @@ -2021,11 +2634,17 @@ u(pe3r2ei=t u(pe3r2w' u(pe3r2w u('2s1tr +u('2c+1tr u(2s1tr +u(2c+1tr .fae2s1f +.fae2c+1f .fw2s1f +.fw2c+1f .xari2s1andr +.xari2c+1andr .xari2s1a'ndr +.xari2c+1a'ndr .xei2r1a'g .xei2r1ag .xei2r1ap @@ -2036,52 +2655,92 @@ u(2s1tr .xei2r1an .xh2n1nal w(2s1a2n1ei'. +w(2c+1a2n1ei'. w(2s1a2n1ei`. +w(2c+1a2n1ei`. w(2s1au'twj. w(2s1au'tws. +w(2s1au'twc+. +w(2c+1au'twj. w(2s1ei'. +w(2c+1ei'. w(2s1ei`. +w(2c+1ei`. w('2s1per. +w('2c+1per. w(2s1pe2r1ei'. +w(2c+1pe2r1ei'. w(2s1pe2r1ei`. +w(2c+1pe2r1ei`. w('2s1te +w('2c+1te %%%% %%%% i2s1xi'lioi. +i2c+1xi'lioi. i2s1xili'wn. +i2c+1xili'wn. i2s1xili'oij. i2s1xili'ois. +i2s1xili'oic+. +i2c+1xili'oij. i2s1xili'ouj. i2s1xili'ous. +i2s1xili'ouc+. +i2c+1xili'ouj. i2s1xi'liai. +i2c+1xi'liai. i2s1xili'aij. i2s1xili'ais. +i2s1xili'aic+. +i2c+1xili'aij. i2s1xili'aj. i2s1xili'as. +i2s1xili'ac+. +i2c+1xili'aj. i2s1xi'lia. +i2c+1xi'lia. % i2s1mu'rioi. +i2c+1mu'rioi. i2s1muri'wn. +i2c+1muri'wn. i2s1muri'oij. i2s1muri'ois. +i2s1muri'oic+. +i2c+1muri'oij. i2s1muri'ouj. i2s1muri'ous. +i2s1muri'ouc+. +i2c+1muri'ouj. i2s1mu'riai. +i2c+1mu'riai. i2s1muri'aij. i2s1muri'ais. +i2s1muri'aic+. +i2c+1muri'aij. i2s1muri'aj. i2s1muri'as. +i2s1muri'ac+. +i2c+1muri'aj. i2s1mu'ria. +i2c+1mu'ria. % i2s1xiliost +i2c+1xilioc+t % i2s1muriost +i2c+1murioc+t % i2s1xilia'kij. i2s1xilia'kis. +i2s1xilia'kic+. +i2c+1xilia'kij. % i2s1muria'kij. i2s1muria'kis. +i2s1muria'kic+. +i2c+1muria'kij. } \endgroup \endinput -- cgit v1.2.3