diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex/RELEASE | 32 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex/biblatex.pdf | bin | 1396472 -> 1332876 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/biblatex/biblatex.tex | 279 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex.def | 37 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex.sty | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex1.sty | 63 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/biblatex2.sty | 144 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/blx-dm.def | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx | 255 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx | 404 |
11 files changed, 997 insertions, 234 deletions
diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst index 4e67edf8f78..9a7ec2fd1a9 100644 --- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst +++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst @@ -173,7 +173,7 @@ STRINGS { ctrl.alphaothers templist tempstrga tempstrgb resvstrga last.name last.hash last.year last.extra } FUNCTION {initialize} { - "$Revision: 2.3 $" + "$Revision: 2.4 $" #12 entry.max$ substring$ #-3 entry.max$ substring$ "Biblatex version: " swap$ * top$ diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE index f52473f346b..6dd58f4bd92 100644 --- a/Master/texmf-dist/doc/latex/biblatex/RELEASE +++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE @@ -1,3 +1,35 @@ +RELEASE NOTES FOR VERSION 2.4 + +* Biber version 1.4 is required for biblatex 2.4 + +* New macro \DeclareStyleSourcemap for style authors who want to define source mappings which + are not changed by users using \DeclareSourcemap. Style maps so defined are run after user + mappings and before driver default mappings. + +* New RELATEDOPTIONS field giving more control over the exact options for related entry processing + +* INCOMPATIBLE CHANGE - \DeclareLabelname, \DeclareLabelTitle and \DeclareLabelyear now have + a different syntax in order to prepare for future multi-script support. The change is minor - + just wrap all fields in \field{} and don't use any commas to separate fields. For example, the + default definition of \DeclareLabelname was: + + \DeclareLabelname{% + shortauthor, + author, + shorteditor, + editor, + translator} + + and is now: + + \DeclareLabelname{% + \field{shortauthor} + \field{author} + \field{shorteditor} + \field{editor} + \field{translator} + } + RELEASE NOTES FOR VERSION 2.3 * Biber version 1.3 is required for biblatex 2.3 diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf Binary files differindex 09a4396084a..81d6f6f4f09 100644 --- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf +++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex index 2837a13be10..e30fecbbfd7 100644 --- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex +++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex @@ -42,8 +42,8 @@ url={\biblatexhome}, author={Philipp Lehman (with Audrey Boruvka, Philip Kime and Joseph Wright)}, email={}, - revision={2.3}, - date={11/2012}} + revision={2.4}, + date={2012-11-28}} \hypersetup{% pdftitle={The \biblatex Package}, @@ -315,6 +315,7 @@ compatibility matrix for the recent versions. \toprule Biber version & \biblatex\ version\\ \midrule +1.4 & 2.4\\ 1.3 & 2.3\\ 1.2 & 2.1, 2.2\\ 1.1 & 2.1\\ @@ -1096,6 +1097,8 @@ The gender of the author or the gender of the editor, if there is no author. The \multicolumn{1}{@{}H}{Region/Dialect} & \multicolumn{1}{@{}H}{Babel Identifiers} \\ \cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule{3-3} +Catalan & Andorra, Balearic islands, Catalonia, Valencia, Roussillon & \opt{catalan} \\ +Czech & Czech Republic & \opt{czech} \\ Danish & Denmark & \opt{danish} \\ Dutch & Netherlands & \opt{dutch} \\ English & USA & \opt{american}, \opt{USenglish}, \opt{english} \\ @@ -1157,6 +1160,10 @@ A special field used to modify the sorting order of the bibliography. This field Citation keys of other entries which have a relationship to this entry. The relationship is specified by the \bibfield{relatedtype} field. Please refer to \secref{use:rel} for further details. +\fielditem{relatedoptions}{comma"=separated values\BiberOnlyMark} + +Per"=type options to set for a related entry. Note that this does not set the options on the related entry itself, only the \opt{dataonly} clone which is used as a datasource for the parent entry. + \fielditem{relatedtype}{identifier\BiberOnlyMark} An identifier which specified the type of relationship for the keys listed in the \bibfield{related} field. The identifier is a localized bibliography string printed @@ -1896,6 +1903,24 @@ The following options must be used as \sty{biblatex} is loaded, \ie in the optio \begin{optionlist} +\optitem[biber]{backend}{\opt{bibtex}, \opt{bibtex8}, \opt{bibtexu}, \opt{biber}} + +Specifies the database backend. The following backends are supported: + +\begin{valuelist} + +\item[biber] \biber, the default backend of \sty{biblatex}, supports Ascii, 8-bit encodings, \utf, on-the-fly reencoding, locale"=specific sorting, and many other features. Locale"=specific sorting, case"=sensitive sorting, and upper\slash lowercase precedence are controlled by the options \opt{sortlocale}, \opt{sortcase}, and \opt{sortupper}, respectively. + +\item[bibtex] Legacy \bibtex. Traditional \bibtex supports Ascii encoding only. Sorting is always case"=insensitive. + +\item[bibtex8] \bin{bibtex8}, the 8-bit implementation of \bibtex, supports Ascii and 8-bit encodings such as Latin~1. Depending on the \file{csf} file, case"=sensitive sorting may be supported. + +\item[bibtexu] \bin{bibtexu} is a Unicode-enabled implementation of \bibtex which supports \utf. Note that \bin{bibtexu} is not actively supported by \sty{biblatex} and has not been tested as backend in any way. \biber is the recommended backend. + +\end{valuelist} + +See \secref{bib:cav:enc} for further instructions concerning the encoding of \file{bib} files. This option is only available at load-time as internally, the code chooses completely different paths depending on the backend. This means that you can't set the backend with, for example, \cmd{ExecuteBibliographyOptions} in the preamble. + \valitem[numeric]{style}{file} Loads the bibliography style \path{file.bbx} and the citation style \path{file.cbx}. See \secref{use:xbx} for an overview of the standard styles. @@ -2030,6 +2055,8 @@ This option controls multilingual support. When set to \opt{auto}, \sty{biblatex \multicolumn{1}{@{}H}{Region/Dialect} & \multicolumn{1}{@{}H}{Identifier} \\ \cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule{3-3} +Catalan & Andorra, Balearic islands, Catalonia, Valencia, Roussillon & catalan \\ +Czech & Czech Republic & czech \\ Danish & Denmark & danish \\ Dutch & Netherlands & dutch \\ English & USA & american \\ @@ -2047,8 +2074,8 @@ German (new) Greek & Greece & greek \\ Italian & Italy & italian \\ Norwegian & Norway & norwegian \\ -Portuguese& Brazil & brazilian \\ - & Portugal & portuguese \\ +Portuguese& Brazil & brazilian \\ + & Portugal & portuguese \\ Russian & Russia & russian \\ Spanish & Spain & spanish \\ Swedish & Sweden & swedish \\ @@ -2286,24 +2313,6 @@ Path selector for arXiv links. If hyperlink support is enabled, this option cont See \secref{use:use:epr} for details on support for arXiv and electronic publishing information. -\optitem[biber]{backend}{\opt{bibtex}, \opt{bibtex8}, \opt{bibtexu}, \opt{biber}} - -Specifies the database backend. The following backends are supported: - -\begin{valuelist} - -\item[biber] \biber, the default backend of \sty{biblatex}, supports Ascii, 8-bit encodings, \utf, on-the-fly reencoding, locale"=specific sorting, and many other features. Locale"=specific sorting, case"=sensitive sorting, and upper\slash lowercase precedence are controlled by the options \opt{sortlocale}, \opt{sortcase}, and \opt{sortupper}, respectively. - -\item[bibtex] Legacy \bibtex. Traditional \bibtex supports Ascii encoding only. Sorting is always case"=insensitive. - -\item[bibtex8] \bin{bibtex8}, the 8-bit implementation of \bibtex, supports Ascii and 8-bit encodings such as Latin~1. Depending on the \file{csf} file, case"=sensitive sorting may be supported. - -\item[bibtexu] \bin{bibtexu} is a Unicode-enabled implementation of \bibtex which supports \utf. Note that \bin{bibtexu} is not actively supported by \sty{biblatex} and has not been tested as backend in any way. \biber is the recommended backend. - -\end{valuelist} - -See \secref{bib:cav:enc} for further instructions concerning the encoding of \file{bib} files. This option is only available at load-time as internally, the code chooses completely different paths depending on the backend. This means that you can't set the backend with, for example, \cmd{ExecuteBibliographyOptions} in the preamble. - \optitem[auto]{texencoding}{\opt{auto}, \prm{encoding}} Specifies the encoding of the \file{tex} file. This option affects the data transferred from the backend to \sty{biblatex}. When using \biber, this corresponds to \biber's |--bblencoding| option. The following choices are available: @@ -2651,9 +2660,33 @@ If this option is enabled, \sty{biblatex} will not assign any labels to the entr \boolitem[false]{dataonly} -Setting this option is equivalent to \opt{skipbib}, \opt{skiplos}, and \opt{skiplab}. It is not required for normal operation. Use it with care. +Setting this option is equivalent to \kvopt{uniquename}{false}, \kvopt{uniquelist}{false, }\opt{skipbib}, \opt{skiplos}, and \opt{skiplab}. It is not required for normal operation. Use it with care. \BiberOnlyMark With \biber, this option is also settable on a per-type basis. +\valitem{labelnamefield}{fieldname} + +Specifies the field to consider first when looking for a \bibfield{labelname} candidate. It is essentially prepended to the search list created by \cmd{DeclareLabelname} for just this entry. + +\choitem[original]{labelnameform}{original,translated,romanised,uniform} + +Specifies the script variant for the field specified with \opt{labelnamefield}, if the datasource you are using supports this. + +\choitem[none]{labelnamelang}{<language specifier>} + +Specifies the \sty{babel} language variant for the field specified with \opt{labelnamefield} if the datasource you are using supports this. The default, if no \prm{lang} option is set, this means to use the field variant in the datasource which has no explicit language defined. + +\valitem{labeltitlefield}{fieldname} + +Specifies the field to consider first when looking for a \bibfield{labeltitle} candidate. It is essentially prepended to the search list created by \cmd{DeclareLabeltitle} for just this entry. + +\choitem[original]{labeltitleform}{original,translated,romanised,uniform} + +Specifies the script variant for the field specified with \opt{labeltitlefield}, if the datasource you are using supports this. + +\choitem[none]{labeltitlelang}{<language specifier>} + +Specifies the \sty{babel} language variant for the field specified with \opt{labeltitlefield} if the datasource you are using supports this. The default, if no \prm{lang} option is set, this means to use the field variant in the datasource which has no explicit language defined. + \end{optionlist} \subsubsection{Legacy Options} @@ -2829,7 +2862,7 @@ This style prints all bibliographic data in tabular format. It is intended for d \subsection{Related Entries} \label{use:rel} -Almost all bibliography styles require authors to specify certain types of relationship between entries such as Reprint of, Reprinted in etc. It is impossible to provide data fields to cover all of these relationships and so \sty{biblatex} provides a general mechanism for this using the entry fields \bibfield{related}, \bibfield{relatedtype} and \bibfield{relatedstring}. A related entry does not need to be cited and does not appear in the bibliography itself (unless of course it is also cited itself independently). The \bibfield{relatedtype} field should specify a localization string which will be printed before the information from the related entries is printed, for example Orig. Pub. as. The \bibfield{relatedstring} field can be used to override the string determined via \bibfield{relatedtype}. Some examples: +Almost all bibliography styles require authors to specify certain types of relationship between entries such as Reprint of, Reprinted in etc. It is impossible to provide data fields to cover all of these relationships and so \sty{biblatex} provides a general mechanism for this using the entry fields \bibfield{related}, \bibfield{relatedtype} and \bibfield{relatedstring}. A related entry does not need to be cited and does not appear in the bibliography itself (unless of course it is also cited itself independently) as a clone is taken of the related entry to be used as a data source. The \bibfield{relatedtype} field should specify a localization string which will be printed before the information from the related entries is printed, for example Orig. Pub. as. The \bibfield{relatedstring} field can be used to override the string determined via \bibfield{relatedtype}. Some examples: \begin{lstlisting}[style=bibtex]{} @Book{key1, @@ -2897,6 +2930,8 @@ Multiple relations to the same entry are also possible: % Note the the order of the keys in lists of multiple related entries is important. The data from multiple related entries is printed in the order of the keys listed in this field. See \secref{aut:ctm:rel} for a more details on the mechanisms behind this feature. You can turn this feature off using the package option \opt{related} from \secref{use:opt:pre:gen}. +You can use the \bibfield{relatedoptions} to set options on the related entry data clone. This is useful if you need to override the \opt{dataonly} option which is set by default on all related entry clones. For example, if you will expose some of the names in the related clone in your document, you may want to have them disambiguated from names in other entries but normally this won't happen as related clones have the per"=entry \opt{dataonly} option set and this in turn sets \kvopt{uniquename}{false} and \kvopt{uniquelist}{false}. In such a case, you can set \bibfield{relatedoptions} to just \opt{skiplab, skipbib, skiplos}. + \subsection{Sorting Options} \label{use:srt} @@ -5697,6 +5732,26 @@ Data commands like \cmd{printfield} normally use the data of the entry currently This command is intended for use in bibliography drivers handling \bibtype{set} entries. It will loop over all members of the set, as indicated by the \bibfield{entryset} field, and execute the appropriate driver for the respective set member. This is similar to executing the \cmd{usedriver} command from \secref{aut:aux:msc} for each set member. The \prm{precode} is arbitrary code to be executed prior to processing each item in the set. The \prm{postcode} is arbitrary code to be executed immediately after processing each item. Both arguments are mandatory in terms of the syntax but may be left empty. See \secref{aut:cav:set} for usage examples. +\cmditem{DeclareFieldInputHandler}{field}{code} + +This command can be used to define a data input handler for \prm{field} when it is read from the \file{.bbl}. Within the \prm{code}, the macro \cmd{NewValue} contains the value of the field. For example, to ignore the \bibfield{volumes} field when it appears, you could do + +\begin{lstlisting}[style=latex]{} +\DeclareFieldInputHandler{volumes}{\def\NewValue{}} +\end{lstlisting} +% +Generally, you would want to use \cmd{DeclareSourcemap} (see \secref{aut:ctm:map}) to remove and modify fields but this alternative method may be useful in some circumstances when the emphasis is on appearance rather than data since the \prm{code} can be arbitraty \tex. + +\cmditem{DeclareListInputHandler}{list}{code} + +As \cmd{DeclareFieldInputHandler} but for lists. Within the \prm{code}, the macro \cmd{NewValue} +contains the value of the list and \cmd{NewCount} contains the number of items in the list. + +\cmditem{DeclareNameInputHandler}{name}{code} + +As \cmd{DeclareFieldInputHandler} but for names. Within the \prm{code}, the macro \cmd{NewValue} +contains the value of the name, \cmd{NewCount} contains the number of individual names in the name and \cmd{NewOption} contains any per-name options passed in the \file{.bbl}. + \end{ltxsyntax} \subsubsection{Formatting Directives} @@ -5789,11 +5844,12 @@ The related entries feature comprises the following components: \item Formats to format the localization string and related data \end{itemize} % -The special fields are \bibfield{related}, \bibfield{relatedtype} and \bibfield{relatedstring}: +The special fields are \bibfield{related}, \bibfield{relatedtype}, \bibfield{relatedstring} and \bibfield{relatedoptions}: \begin{keymarglist} \item[related] A comma"=separated list of keys of entries which are related to this entry in some way. Note the the order of the keys is important. The data from multiple related entries is printed in the order of the keys listed in this field. \item[relatedtype] The type of relationship. This serves three purposes. If the value of this field resolves to a localization string identifier, then the resulting localized string is printed before the data from the related entries. Secondly, if there is a macro called \texttt{related:\prm{relatedtype}}, this is used to format the data from the related entries. If no such macro exists, then the macro \texttt{related:default} is used. Lastly, if there is a format named \texttt{related:\prm{relatedtype}}, then it is used to format both the localized string and related entry data. If there is no related type specific format, the \texttt{related} format is used. \item[relatedstring] If an entry contains this field, then if value of the field resolves to a localization string identifier, the localization key value specified is printed before data from the related entries. If the field does not specify a localization key, its value is printed literally. If both \bibfield{relatedtype} and \bibfield{relatedstring} are present in an entry, \bibfield{relatedstring} is used for the pre-data string (but \bibfield{relatedtype} is still used to determine the macro and format to use when printing the data). +\item[relatedoptions] A list of per"=entry options to set on the related entry (actually on the clone of the related entry which is used as a data source---the actual related entry is not modified because it might be cited directly itself). \end{keymarglist} The related entry feature is enabled by default by the package option \opt{related} from \secref{use:opt:pre:gen}. The related information entry data from the related entries is included via a \cmd{usebibmacro\{related\}} call. Standard styles call this macro towards the end of each driver. Style authors should ensure the existence of (or take note of existing) localization strings which are useful as values for the \bibfield{relatedtype} field, such as \texttt{translationof} or perhaps \texttt{translatedas}. A plural variant can be identified with the localization key \prm{relatedtype}\texttt{s}. This key's corresponding string is printed whenever more than one entry is specified in \bibfield{related}. Bibliography macros and formatting directives for printing entries related by \prm{relatedtype} should be defined using the name \texttt{related:\prm{relatedtype}}. The file \path{biblatex.def} contains macros and formats for some common relation types which can be used as templates. In particular, the \cmd{entrydata*} command is essential in such macros in order to make the data of the related entries available. Examples of entries using this feature can be found in the \sty{biblatex} distribution examples file \path{biblatex-examples.bib}. There are some specific formatting macros for this feature which control delimiters and separators in related entry information, see \secref{aut:fmt:fmt}. @@ -5917,11 +5973,24 @@ For all boolean \cmd{step} options, the short form \opt{option} is equivalent to \end{ltxsyntax} +\noindent With \bibtex\ and RIS datasources, you may specify the +pseudo-field \bibfield{entrykey} for \texttt{fieldsource} +which is the citation key of the entry. Naturally, this <field> cannot +be changed (used as \texttt{fieldset}, \texttt{fieldtarget} or changed using \texttt{replace}). + \begin{ltxsyntax} -\cmditem{DeclareDefaultSourcemap}[datatype=driver]{specification}|\BiberOnlyMark| +\cmditem{DeclareStyleSourcemap}{specification}|\BiberOnlyMark| -This command sets the driver default source mappings for the specified \prm{driver}. Such mappings are conceptually separate from user mappings defined with \cmd{DeclareSourcemap} and consist of mappings which are part of the driver setup. Users should not normally need to change these. User mappings defined with \cmd{DeclareSourcemap} are applied before the driver defaults. These defaults are described in Appendix \secref{apx:maps}. The \prm{specification} is identical to that for \cmd{DeclareSourcemap} but without the \cmd{maps} elements: the \prm{specification} is just a list of \cmd{map} elements since each \cmd{DeclareDefaultSourcemap} only applies to one datatype driver. See the default definitions in Appendix \secref{apx:maps} for examples. +This command sets the source mappings used by a style. Such mappings are conceptually separate from user mappings defined with \cmd{DeclareSourcemap} and are applied directly after user maps. The syntax is identical to \cmd{DeclareSourcemap}. This command is provided for style authors so that any maps defined for the style no not interfere with user maps or the default driver maps defined with \cmd{DeclareDriverSourcemap}. + +\end{ltxsyntax} + +\begin{ltxsyntax} + +\cmditem{DeclareDriverSourcemap}[datatype=driver]{specification}|\BiberOnlyMark| + +This command sets the driver default source mappings for the specified \prm{driver}. Such mappings are conceptually separate from user mappings defined with \cmd{DeclareSourcemap} and style mapping defined with \cmd{DeclareStyleSourcemap}. They consist of mappings which are part of the driver setup. Users should not normally need to change these. Driver default mapping are applied after user mappings (\cmd{DeclareSourcemap}) and style mappings (\cmd{DeclareStyleSourcemap}). These defaults are described in Appendix \secref{apx:maps}. The \prm{specification} is identical to that for \cmd{DeclareSourcemap} but without the \cmd{maps} elements: the \prm{specification} is just a list of \cmd{map} elements since each \cmd{DeclareDriverSourcemap} only applies to one datatype driver. See the default definitions in Appendix \secref{apx:maps} for examples. \end{ltxsyntax} @@ -5934,13 +6003,14 @@ Here are some data source mapping examples: \perdatasource{<<example1.bib>>} \perdatasource{<<example2.bib>>} \step[fieldset=<<keywords>>, fieldvalue={<<keyw1, keyw2>>}] + \step[fieldsource=<<entrykey>>] + \step[fieldset=<<note>>, origfieldval] } } } \end{lstlisting} % -This would add a \bibfield{keywords} field with value <keyw1, keyw2> -to all entries which are found in either the +This would add a \bibfield{keywords} field with value <keyw1, keyw2> and set the \bibfield{note} field to the entry key to all entries which are found in either the \texttt{examples1.bib} or \texttt{examples2.bib} files. % \begin{lstlisting}[style=latex]{} @@ -6033,7 +6103,7 @@ field to <pubmedid> and also sets the \bibfield{userd} field to the string \map{ \step[fieldsource=<<series>>, match=\regexp{<<\A\d*(.+)>>}, - replace=\regexp{<<\L$1}>>] + replace=\regexp{<<\L$1>>}] } } } @@ -6167,7 +6237,7 @@ This example demonstrates the sequential nature of the step processing and the \ \step[fieldset=<<autourl>>, fieldvalue={<<"+author:>>}, append] \step[fieldsource=<<author>>, match=\regexp{<<\A([^,]+)\s*,>>}] \step[fieldset=<<autourl>>, fieldvalue={<<$1>>}, append] - \step[fieldset=<autourl>>, fieldvalue={<<&as_ylo=>>}, append] + \step[fieldset=<<autourl>>, fieldvalue={<<&as_ylo=>>}, append] \step[fieldsource=<<year>>] \step[fieldset=<<autourl>>, origfieldval, append] \step[fieldset=<<autourl>>, fieldvalue={<<&as_yhi=>>}, append] @@ -6476,6 +6546,14 @@ Only use this \cmd{field} specification if it is a name list field with \texttt{ By default, for name list fields, the number of names considered when building the label obeys the \cnt{maxalphanames}\slash \cnt{minalphanames} truncation. This option can be used to override this with an explicit upper limit of how many names to consider. This is useful if you have some very long name lists which might result in a very long label. +\choitem[original]{form}{original,translated,romanised,uniform} + +Specifies the script variant of a field, if the datasource you are using supports this. + +\choitem[none]{lang}{<language specifier>} + +Specifies the \sty{babel} language variant of a field if the datasource you are using supports this. The default, if no \prm{lang} option is set, this means to use the field variant in the datasource which has no explicit language defined. + \end{optionlist*} \cmditem{literal}{characters} @@ -6502,6 +6580,18 @@ Here are some examples. The default global \sty{biblatex} alphabetic label templ } \end{lstlisting} % +Here is an example using form and script variants. We use as the label the left three characters of the <romanised> form of the \bibfield{labelname} field as a preference. If this doesn't exist, we use the <translated> form in the <french> language. If this does not exist, we use the default \bibfield{labelname} from the datasource which has no form or lang specifications. + +\begin{lstlisting}[style=latex]{} +\DeclareLabelalphaTemplate{ + \labelelement{ + \field[strwidth=3,strside=left,form=romanised]{<<labelname>>} + \field[strwidth=3,strside=left,form=translated,lang=french]{<<labelname>>} + \field[strwidth=3,strside=left]{<<labelname>>} + } +} +\end{lstlisting} +% To get an idea of how the label automatic disambiguation works, consider the following author lists: \begin{lstlisting}{} @@ -6704,6 +6794,14 @@ Performs a substring match on the \texttt{left} or \texttt{right} side of the fi The number of characters to match. +\choitem[original]{form}{original,translated,romanised,uniform} + +Specifies the script variant of a field, if the datasource you are using supports this. + +\choitem[none]{lang}{<language specifier>} + +Specifies the \sty{babel} language variant of a field if the datasource you are using supports this. The default, if no \prm{lang} option is set, this means to use the field variant in the datasource which has no explicit language defined. + \end{optionlist*} \cmditem{literal}{string} @@ -6757,6 +6855,18 @@ Here are some examples of sorting schemes. In the first example, we define a sim } \end{lstlisting} % +Here is an example of specifying particular field scripts and language variants. Here we are sorting on variants of the \bibfield{author} field. First choice is the <translated> form in the <english> language. If this does not exist, then we look for a <romanised> form and if this does not exist, we use the default form. + +\begin{lstlisting}[style=latex]{} +\DeclareSortingScheme{sample}{ + \sort{ + \field[form=translated, lang=english]{<<author>>} + \field[form=romanised]{<<author>>} + \field{<<author>>} + } +} +\end{lstlisting} +% In the next example, we define the same scheme in a more elaborate way, considering special fields such as \bibfield{presort}, \bibfield{sortkey}, \bibfield{sortname}, etc. Since the \bibfield{sortkey} field specifies the master sort key, it needs to override all other elements except for \bibfield{presort}. This is indicated by the \opt{final} option. If the \bibfield{sortkey} field is available, processing will stop at this point. If not, the sorting routine continues with the next \cmd{sort} directive. This setup corresponds to the default definition of the \texttt{nty} scheme: \begin{lstlisting}[style=latex]{} @@ -6919,33 +7029,93 @@ Some of the automatically generated fields from \secref{aut:bbx:fld:lab} may be \cmditem{DeclareLabelname}[entrytype, \dots]{specification}|\BiberOnlyMark| -Defines the fields to consider when generating the \bibfield{labelname} field (see \secref{aut:bbx:fld:lab}). The \prm{specification} is a comma"=separated list of fields. The fields are checked in the order listed and the first field which is available will be used as \bibfield{labelname}. This is the default definition: +Defines the fields to consider when generating the \bibfield{labelname} field (see \secref{aut:bbx:fld:lab}). The \prm{specification} is an ordered list of \cmd{field} commands. The fields are checked in the order listed and the first field which is available will be used as \bibfield{labelname}. This is the default definition: \begin{lstlisting}[style=latex]{} -\DeclareLabelname{shortauthor,author,shorteditor,editor,translator} +\DeclareLabelname{% + \field{shortauthor} + \field{author} + \field{shorteditor} + \field{editor} + \field{translator} +} \end{lstlisting} % -The \bibfield{labelname} field may be customized globally or on a per-type basis. If the optional \prm{entrytype} argument is given, the specification applies to the respective entry type. If not, it is applied globally. The \prm{entrytype} argument may be a comma"=separated list of values. This command may only be used in the preamble. +The \bibfield{labelname} field may be customized globally or on a per-type basis. If the optional \prm{entrytype} argument is given, the specification applies to the respective entry type. If not, it is applied globally. The \prm{entrytype} argument may be a comma"=separated list of values. This command may only be used in the preamble. \cmd{field} may take the following options: + +\begin{optionlist*} + +\choitem[original]{form}{original,translated,romanised,uniform} + +Specifies the script variant of a field, if the datasource you are using supports this. + +\choitem[none]{lang}{<language specifier>} + +Specifies the \sty{babel} language variant of a field if the datasource you are using supports this. The default, if no \prm{lang} option is set, this means to use the field variant in the datasource which has no explicit language defined. + +\end{optionlist*} +% +For example, the following specification for selecting \bibfield{labelname} first looks for an english translation variant of the \bibfield{AUTHOR} field, then a romainsed variant and if neither of these can be found, the default field with no form or lang specifications. +\begin{lstlisting}[style=latex]{} +\DeclareLabelname{% + \field[form=translated,lang=english]{author} + \field[form=romanised]{author} + \field{author} +} +\end{lstlisting} +% +See \secref{use:opt:bib:ded} for options to override this on a per-entry basis. \cmditem{DeclareLabelyear}[entrytype, \dots]{specification}|\BiberOnlyMark| -Defines the date components to consider when generating the \bibfield{labelyear} field (see \secref{aut:bbx:fld:lab}). The \prm{specification} is a comma"=separated list of date components. The items are checked in the order listed and the first item which is available will be used as \bibfield{labelyear}. Note that the items are date components, not date fields. This is the default definition: +Defines the date components to consider when generating the \bibfield{labelyear} field (see \secref{aut:bbx:fld:lab}). The \prm{specification} is an ordered list of \cmd{field} commands. The items are checked in the order listed and the first item which is available will be used as \bibfield{labelyear}. Note that the items are date components, not date fields. This is the default definition: \begin{lstlisting}[style=latex]{} -\DeclareLabelyear{year,eventyear,origyear,urlyear} +\DeclareLabelyear{% + \field{year} + \field{eventyear} + \field{origyear} + \field{urlyear} +} \end{lstlisting} % The \bibfield{labelyear} field may be customized globally or on a per-type basis. If the optional \prm{entrytype} argument is given, the specification applies to the respective entry type. If not, it is applied globally. The \prm{entrytype} argument may be a comma"=separated list of values. This command may only be used in the preamble. See also \secref{aut:bbx:fld:dat}. \cmditem{DeclareLabeltitle}[entrytype, \dots]{specification}|\BiberOnlyMark| -Defines the fields to consider when generating the \bibfield{labeltitle} field (see \secref{aut:bbx:fld:lab}). The \prm{specification} is a comma"=separated list of fields. The fields are checked in the order listed and the first field which is available will be used as \bibfield{labeltitle}. This is the default definition: +Defines the fields to consider when generating the \bibfield{labeltitle} field (see \secref{aut:bbx:fld:lab}). The \prm{specification} is an ordered list of \cmd{field} commands. The fields are checked in the order listed and the first field which is available will be used as \bibfield{labeltitle}. This is the default definition: \begin{lstlisting}[style=latex]{} -\DeclareLabeltitle{shorttitle,title} +\DeclareLabeltitle{% + \field{shorttitle} + \field{title} +} \end{lstlisting} % -The \bibfield{labeltitle} field may be customized globally or on a per-type basis. If the optional \prm{entrytype} argument is given, the specification applies to the respective entry type. If not, it is applied globally. The \prm{entrytype} argument may be a comma"=separated list of values. This command may only be used in the preamble. +The \bibfield{labeltitle} field may be customized globally or on a per-type basis. If the optional \prm{entrytype} argument is given, the specification applies to the respective entry type. If not, it is applied globally. The \prm{entrytype} argument may be a comma"=separated list of values. This command may only be used in the preamble. \cmd{field} may take the following options: + +\begin{optionlist*} + +\choitem[original]{form}{original,translated,romanised,uniform} + +Specifies the script variant of a field, if the datasource you are using supports this. + +\choitem[none]{lang}{<language specifier>} + +Specifies the \sty{babel} language variant of a field if the datasource you are using supports this. The default, if no \prm{lang} option is set, this means to use the field variant in the datasource which has no explicit language defined. + +\end{optionlist*} +% +For example, the following specification for selecting \bibfield{labeltitle} first looks for an english translation variant of the \bibfield{TITLE} field, then a romainsed variant and if neither of these can be found, the default field with no form or lang specifications. +\begin{lstlisting}[style=latex]{} +\DeclareLabelname{% + \field[form=translated,lang=english]{title} + \field[form=romanised]{title} + \field{title} +} +\end{lstlisting} +% +See \secref{use:opt:bib:ded} for options to override this on a per-entry basis. \end{ltxsyntax} @@ -8637,7 +8807,9 @@ Other expressions frequently used in citations: \begin{keymarglist} \item[langamerican] The language <American> or <American English>. \item[langbrazilian] The language <Brazilian> or <Brazilian Portuguese>. +\item[langcatalan] The language <Catalan>. \item[langcroatian] The language <Croatian>. +\item[langczech] The language <Czech>. \item[langdanish] The language <Danish>. \item[langdutch] The language <Dutch>. \item[langenglish] The language <English>. @@ -8659,6 +8831,8 @@ The following strings are intended for use in phrases like <translated from [the \begin{keymarglist} \item[fromamerican] The expression <from [the] American> or <from [the] American English>. \item[frombrazilian] The expression <from [the] Brazilian> or <from [the] Brazilian Portuguese>. +\item[fromcatalan] The expression <from [the] Catalan>. +\item[fromczech] The expression <from [the] Czech>. \item[fromcroatian] The expression <from [the] Croatian>. \item[fromdanish] The expression <from [the] Danish>. \item[fromdutch] The expression <from [the] Dutch>. @@ -8923,7 +9097,7 @@ This section corresponds to \secref{use:fmt:len} in the user part of the manual. \lenitem{bibhang} -The hanging indentation of the bibliography. Bibliography styles should incorporate this length in the definition of the bibliography environment, if applicable. +The hanging indentation of the bibliography, if applicable. This length is initialized to \cmd{parindent} at load-time. If \cmd{parindent} is zero length for some reason, \cmd{bibhang} will default to \texttt{1em}. \lenitem{biblabelsep} @@ -9925,7 +10099,7 @@ These are the driver default source mappings. For drivers other than \opt{bibtex The \opt{bibtex} driver is of course the most comprehensive and mature of the \biblatex/\biber supported data formats. These source mapping defaults are how the aliases from sections \secref{bib:typ:als} and \secref{bib:fld:als} are implemented. \begin{lstlisting}[style=latex]{} -\DeclareDefaultSourcemap[datatype=bibtex]{ +\DeclareDriverSourcemap[datatype=bibtex]{ \map{ \step[typesource=conference, typetarget=inproceedings] \step[typesource=electronic, typetarget=online] @@ -9961,7 +10135,7 @@ The \opt{bibtex} driver is of course the most comprehensive and mature of the \b The \opt{endnotexml} driver for \biber uses the following mappings. This format is quite messy and not well suited to robust typesetting of bibliographic data. It is presented largely as an example of \biber's modular datasource abilities and also of how to map foreign data models into the \biblatex data model. Mappings from such messy and relatively simple data models are inevitably fragile and are of limited use. \begin{lstlisting}[style=latex]{} -\DeclareDefaultSourcemap[datatype=endnotexml]{ +\DeclareDriverSourcemap[datatype=endnotexml]{ \map{ \step[typesource={Aggregated Database}, typetarget=misc] \step[typesource={Ancient Text}, typetarget=misc] @@ -10091,7 +10265,7 @@ The \opt{endnotexml} driver for \biber uses the following mappings. This format The \opt{ris} driver reflects the fact that \opt{ris} itself is a very simple and stable format. It is in fact so simple, it's hardly of any use for most \biblatex users. Again, here more as a proof of concept example. \begin{lstlisting}[style=latex]{} -\DeclareDefaultSourcemap[datatype=ris]{ +\DeclareDriverSourcemap[datatype=ris]{ \map{ \step[typesource=ART, typetarget=artwork] \step[typesource=BILL, typetarget=jurisdiction] @@ -10157,7 +10331,7 @@ The \opt{ris} driver reflects the fact that \opt{ris} itself is a very simple an The \opt{zoterordfxml} driver reads the Zotero\footnote{\url{www.zotero.org}} XML representation of its RDF format. From the \biblatex point of view, it suffers from a lack of the notion of a citation key and so is of limited use. The format may include a citation key in the future at which point the \biber driver and these default mappings will be updated. As with \opt{endnotexml}, the format is somewhat messy with, in particular, a very limited way of dealing with related entries which makes the driver setup rather ugly. As can be seen below, it is possible to map into a field prefixed with BIBERCUSTOM which is not a real field in the data model but can be detected in the \biber driver itself and used to process a source field which does not map naturally to any \biblatex data model field as it needs special treatment. This is messy but is due largely due to messy source data models. \begin{lstlisting}[style=latex]{} -\DeclareDefaultSourcemap[datatype=zoterordfxml]{ +\DeclareDriverSourcemap[datatype=zoterordfxml]{ \map{ \step[typesource=conferencePaper, typetarget=inproceedings] \step[typesource=bookSection, typetarget=inbook] @@ -10297,8 +10471,9 @@ Please refer to \secref{bib:cav:ref, aut:ctm:ref} for explanation. options\par presort\par related\par - relatedtype\par + relatedoptions\par relatedstring\par + relatedtype\par shorthand\par shorthandintro\par sortkey & @@ -10531,8 +10706,14 @@ idemtracker &\+&\+&\_&\_\\ indexing &\+&\+&\+&\+\\ isbn &\+&\+&\_&\_\\ % style labelalpha &\+&\+&\+&\_\\ +labelnamefield &\_&\_&\_&\+\\ +labelnameform &\_&\_&\_&\+\\ +labelnamelang &\_&\_&\_&\+\\ labelnumber &\+&\+&\+&\_\\ labeltitle &\+&\+&\+&\_\\ +labeltitlefield &\_&\_&\_&\+\\ +labeltitleform &\_&\_&\_&\+\\ +labeltitlelang &\_&\_&\_&\+\\ labeltitleyear &\+&\+&\+&\_\\ labelyear &\+&\+&\+&\_\\ language &\+&\+&\_&\_\\ @@ -10594,6 +10775,14 @@ This revision history is a list of changes relevant to users of this package. Ch \begin{changelog} +\begin{release}{2.4}{2012-11-28} +\item Added \bibfield{relatedoptions} field\see{aut:ctm:rel}\BiberOnlyMark +\item Added \cmd{DeclareStyleSourcemap}\see{aut:ctm:map}\BiberOnlyMark +\item Renamed \cmd{DeclareDefaultSourcemap} to \cmd{DeclareDriverSourcemap}\see{aut:ctm:map}\BiberOnlyMark +\item Added Czech localisation +\item Documented \cmd{DeclareFieldInputHandler}, \cmd{DeclareListInputHandler} and \cmd{DeclareNameInputHandler}. +\end{release} + \begin{release}{2.3}{2012-11-01} \item Better detection of situations which require a \biber\ or \LaTeX\ re-run \item New append mode for \cmd{DeclareSourcemap} so that fields can be combined\see{aut:ctm:map}\BiberOnlyMark diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def index 055f73791cd..f408c11c066 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def @@ -165,7 +165,8 @@ % Some length registers which may be used to fine-tune the % (high-level) layout of the bibliography. -\setlength{\bibhang}{\parindent} +% Default \bibhang to 1em if \parindent is 0 for some reason +\setlength{\bibhang}{\ifnumequal{\parindent}{0}{1em}{\parindent}} \setlength{\biblabelsep}{2\labelsep} \setlength{\bibitemsep}{\itemsep} \setlength{\bibnamesep}{0pt} @@ -952,7 +953,7 @@ % Driver sourcemaps % ------------------------------------------------------------------ -\DeclareDefaultSourcemap[datatype=bibtex]{ +\DeclareDriverSourcemap[datatype=bibtex]{ \map{ \step[typesource=conference, typetarget=inproceedings] \step[typesource=electronic, typetarget=online] @@ -982,7 +983,7 @@ } } -\DeclareDefaultSourcemap[datatype=endnotexml]{ +\DeclareDriverSourcemap[datatype=endnotexml]{ \map{ \step[typesource={Aggregated Database}, typetarget=misc] \step[typesource={Ancient Text}, typetarget=misc] @@ -1105,7 +1106,7 @@ \step[fieldsource={titles/tertiary-title}, fieldtarget={titles/series}] } } -\DeclareDefaultSourcemap[datatype=ris]{ +\DeclareDriverSourcemap[datatype=ris]{ \map{ \step[typesource=ART, typetarget=artwork] \step[typesource=BILL, typetarget=jurisdiction] @@ -1164,7 +1165,7 @@ \step[fieldsource=L1, fieldtarget=file] } } -\DeclareDefaultSourcemap[datatype=zoterordfxml]{ +\DeclareDriverSourcemap[datatype=zoterordfxml]{ \map{ \step[typesource=conferencePaper, typetarget=inproceedings] \step[typesource=bookSection, typetarget=inbook] @@ -1270,21 +1271,24 @@ % ------------------------------------------------------------------ \DeclareLabelname{% - shortauthor, - author, - shorteditor, - editor, - translator} + \field{shortauthor} + \field{author} + \field{shorteditor} + \field{editor} + \field{translator} +} \DeclareLabelyear{% - year, - eventyear, - origyear, - urlyear} + \field{year} + \field{eventyear} + \field{origyear} + \field{urlyear} +} \DeclareLabeltitle{% - shorttitle, - title} + \field{shorttitle} + \field{title} +} % ------------------------------------------------------------------ % LABELALPHA TEMPLATE @@ -1622,6 +1626,7 @@ \noinherit{options} \noinherit{presort} \noinherit{related} + \noinherit{relatedoptions} \noinherit{relatedstring} \noinherit{relatedtype} \noinherit{shorthand} diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty index fe3d920786c..981eea02a56 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty @@ -3,8 +3,8 @@ %% % Set up the version strings here, so they are the same for both branches -\def\abx@date{2012/10/29} -\def\abx@version{2.3} +\def\abx@date{2012/11/27} +\def\abx@version{2.4} \def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/JW/AB)} \def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/JW/AB)} \def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/JW/AB)} @@ -12,7 +12,7 @@ % This is not updated by build script as the controlfile version % does not necessarily change with the package version. % This is used when writing the .bcf -\def\blx@bcfversion{2.1} +\def\blx@bcfversion{2.2} % This is not updated by build script as the bbl version % does not necessarily change with the package version. % This is used when checking the .bbl @@ -77,7 +77,7 @@ \fi {% % A few things not defined by v1 so has to be handled if using v1 - \protected\long\def\DeclareDefaultSourcemap[#1]#2{}% + \protected\long\def\DeclareDriverSourcemap[#1]#2{}% \protected\long\def\DeclareLabelalphaTemplate#1{}% \protected\long\def\DeclareLabeltitle#1{}% \protected\long\def\abx@dointernalfields{}% diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty index ef59ba0505b..fc4a1ba33ec 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty @@ -3146,8 +3146,7 @@ \blx@initunit} \protected\def\blx@finentry@usedrv{% - \unspace\blx@initunit -} + \blx@setunit\relax} \protected\def\blx@finentry@inset{% \blx@setunit\entrysetpunct @@ -4396,6 +4395,7 @@ \do{december}% \do{langamerican}% \do{langbrazilian}% + \do{langcatalan}% \do{langcroatian}% \do{langdanish}% \do{langdutch}% @@ -4413,6 +4413,7 @@ \do{langswedish}% \do{fromamerican}% \do{frombrazilian}% + \do{fromcatalan}% \do{fromcroatian}% \do{fromdanish}% \do{fromdutch}% @@ -9358,31 +9359,49 @@ % [<type,type,...>]{<field,field,...>} \newrobustcmd*{\DeclareLabelname}[2][]{% - \blx@defmvalue{labelnamespec}{#1}{#2}} + \begingroup + \let\blx@tempa\@empty + \def\blx@tempb{labelnamespec}% + \let\field\blx@ordered@field + \ifblank{#1} + {\global\cslet{blx@bcf@labelnamespec}\@empty} + {\def\blx@tempa{#1}% + \do{\global\cslet{blx@bcf@labelnamespec@##1}\@empty}% + \docsvlist{#1}}% + #2% + \endgroup} \@onlypreamble\DeclareLabelname \newrobustcmd*{\DeclareLabelyear}[2][]{% - \blx@defmvalue{labelyearspec}{#1}{#2}} -\@onlypreamble\Declarelabelyear - -\def\blx@defmvalue#1#2#3{% - \ifblank{#2} - {\expandafter\blx@defmvalue@ii\csname blx@bcf@#1\endcsname{#3}} - {\forcsvlist{\blx@defmvalue@i{#1}{#3}}{#2}}} - -\def\blx@defmvalue@i#1#2#3{% - \blx@addtypeopt{#3}% - \expandafter\blx@defmvalue@ii\csname blx@bcf@#1@#3\endcsname{#2}} - -\def\blx@defmvalue@ii#1#2{% \begingroup - \global\let#1\@empty - \blx@tempcnta\z@ - \def\do##1{% - \advance\blx@tempcnta\@ne - \xappto#1{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{##1}}}% - \docsvlist{#2}% + \let\blx@tempa\@empty + \def\blx@tempb{labelyearspec}% + \let\field\blx@ordered@field + \ifblank{#1} + {\global\cslet{blx@bcf@labelyearspec}\@empty} + {\def\blx@tempa{#1}% + \do{\global\cslet{blx@bcf@labelyearspec@##1}\@empty}% + \docsvlist{#1}}% + #2% \endgroup} +\@onlypreamble\DeclareLabelyear + +\newcommand*{\blx@ordered@field}[2][]{% + \let\blx@tempc\@empty + \ifblank{#1} + {} + {\setkeys{blx@ordered@field}{#1}}% + \advance\blx@tempcnta\@ne + \ifdefempty{\blx@tempa} + {\csxappto{blx@bcf@\blx@tempb}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}} + {\def\do{\blx@addtypeopt{##1}% + \csxappto{blx@bcf@\blx@tempb @##1}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}% + \docsvlist{\blx@tempa}}} + +\define@key{blx@ordered@field}{form}{% + \appto\blx@tempc{ form="#1"}} +\define@key{blx@ordered@field}{lang}{% + \appto\blx@tempc{ lang="#1"}} % experimental diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty index 841261f358a..378a7caf98f 100644 --- a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty +++ b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty @@ -20,6 +20,7 @@ \RequirePackage{logreq} \RequirePackage{ifthen} \RequirePackage{url} +%\RequirePackage{trace} \@ifpackagelater{etoolbox}{2010/11/29} {} @@ -2967,8 +2968,7 @@ \blx@initunit} \protected\def\blx@finentry@usedrv{% - \unspace\blx@initunit -} + \blx@setunit\relax} \protected\def\blx@finentry@inset{% \blx@setunit\entrysetpunct @@ -4214,6 +4214,7 @@ \do{december}% \do{langamerican}% \do{langbrazilian}% + \do{langcatalan}% \do{langcroatian}% \do{langdanish}% \do{langdutch}% @@ -4231,6 +4232,7 @@ \do{langswedish}% \do{fromamerican}% \do{frombrazilian}% + \do{fromcatalan}% \do{fromcroatian}% \do{fromdanish}% \do{fromdutch}% @@ -5045,7 +5047,7 @@ {\expandonce\NewValue}}}} -% {<name>}{<itemcount>}{<value>} +% {<name>}{<itemcount>}{<nameoptions>}{<value>} \protected\def\blx@bbl@namedef#1#2#3#4{% \def\NewCount{#2}% @@ -8613,8 +8615,9 @@ ~~~~<bcf:option type="#1">\blx@nl #2% ~~~~</bcf:option>\blx@nl} -\xdef\blx@xml@ordered#1#2{% - ~~~~~~<bcf:value order="#1">#2</bcf:value>\blx@nl} +\xdef\blx@xml@ordered#1#2#3{% + ~~~~~~<bcf:value order="#1"#2% + >#3</bcf:value>\blx@nl} \xdef\blx@xml@sourcemap#1{% ~~<bcf:sourcemap>\blx@nl @@ -8852,6 +8855,7 @@ \blx@xml@comment{SOURCEMAP}% \blx@xml@sourcemap{% \ifcsdef{blx@biber@sourcemap@user}{\csuse{blx@biber@sourcemap@user}}{}% + \ifcsdef{blx@biber@sourcemap@user}{\csuse{blx@biber@sourcemap@style}}{}% \ifcsdef{blx@biber@sourcemap@defaults@bibtex}{\csuse{blx@biber@sourcemap@defaults@bibtex}}{}% \ifcsdef{blx@biber@sourcemap@defaults@biblatexml}{\csuse{blx@biber@sourcemap@defaults@biblatexml}}{}% \ifcsdef{blx@biber@sourcemap@defaults@endnotexml}{\csuse{blx@biber@sourcemap@defaults@endnotexml}}{}% @@ -8977,14 +8981,25 @@ \newrobustcmd*{\DeclareSourcemap}[1]{% \booltrue{sourcemap}% \begingroup - \let\maps\blx@sourcemap@maps + \let\maps\blx@usersourcemap@maps \let\blx@tempa\@empty #1% \csxdef{blx@biber@sourcemap@user}{\blx@tempa}% \endgroup} \@onlypreamble\DeclareSourcemap -\newrobustcmd*{\DeclareDefaultSourcemap}[2][]{% +\newrobustcmd*{\DeclareStyleSourcemap}[1]{% + \booltrue{sourcemap}% + \begingroup + \let\maps\blx@stylesourcemap@maps + \let\blx@tempa\@empty + #1% + \csxdef{blx@biber@sourcemap@style}{\blx@tempa}% + \endgroup} + +\@onlypreamble\DeclareStyleSourcemap + +\newrobustcmd*{\DeclareDriverSourcemap}[2][]{% \booltrue{sourcemap}% \begingroup \let\blx@tempa\@empty @@ -8994,21 +9009,32 @@ \let\map\blx@sourcemap@map #2% \ifblank{#1} - {\setkeys{blx@sourcemap@maps}{datatype=bibtex, defaults=true}} - {\setkeys{blx@sourcemap@maps}{#1, defaults=true}}% + {\setkeys{blx@sourcemap@maps}{datatype=bibtex, level=driver}} + {\setkeys{blx@sourcemap@maps}{#1, level=driver}}% \eappto\blx@tempa{% \blx@xml@sourcemap@maps{\blx@tempb}{\blx@tempc}}% \csxdef{blx@biber@sourcemap@defaults@\blx@tempd}{\blx@tempa}% \endgroup} -\@onlypreamble\DeclareDefaultSourcemap +\@onlypreamble\DeclareDriverSourcemap -\newcommand*{\blx@sourcemap@maps}[2][]{% +\newcommand*{\blx@usersourcemap@maps}[2][]{% \let\blx@tempb\@empty \let\blx@tempc\@empty \let\map\blx@sourcemap@map \ifblank{#1} - {} - {\setkeys{blx@sourcemap@maps}{#1}}% + {\setkeys{blx@sourcemap@maps}{level=user}} + {\setkeys{blx@sourcemap@maps}{#1, level=user}}% + #2% + \eappto\blx@tempa{% + \blx@xml@sourcemap@maps{\blx@tempb}{\blx@tempc}}} + +\newcommand*{\blx@stylesourcemap@maps}[2][]{% + \let\blx@tempb\@empty + \let\blx@tempc\@empty + \let\map\blx@sourcemap@map + \ifblank{#1} + {\setkeys{blx@sourcemap@maps}{level=style}} + {\setkeys{blx@sourcemap@maps}{#1, level=style}}% #2% \eappto\blx@tempa{% \blx@xml@sourcemap@maps{\blx@tempb}{\blx@tempc}}} @@ -9020,10 +9046,8 @@ \ifstrequal{#1}{true} {\appto\blx@tempb{ map\string_overwrite="1"}} {}} -\define@key{blx@sourcemap@maps}{defaults}[true]{% true|false - \ifstrequal{#1}{true} - {\appto\blx@tempb{ driver\string_defaults="1"}} - {}} +\define@key{blx@sourcemap@maps}{level}{% user|style|driver + \appto\blx@tempb{ level="#1"}} \newcommand*{\blx@sourcemap@map}[2][]{% \let\blx@tempd\@empty @@ -9126,7 +9150,7 @@ \global\cslet{blx@biber@labelalphatemplate@#2}\blx@tempa}% \endgroup} -\newcommand{\blx@latem@element}[1]{% +\newcommand*{\blx@latem@element}[1]{% \advance\blx@tempcnta\@ne \let\blx@tempb\@empty #1% @@ -9148,6 +9172,8 @@ % script form - original | translated | romanised | uniform \define@key{blx@latem@field}{form}{% \appto\blx@tempc{ form="#1"}} +\define@key{blx@latem@field}{lang}{% + \appto\blx@tempc{ lang="#1"}} \define@key{blx@latem@field}{uppercase}[true]{% true|false \ifstrequal{#1}{true} {\appto\blx@tempc{ uppercase="1"}} @@ -9219,7 +9245,7 @@ % {<source>}{<target>}{<options>} -\newcommand{\blx@inherit@except}[3]{% +\newcommand*{\blx@inherit@except}[3]{% \let\blx@tempc\@empty \ifblank{#3} {} @@ -9257,7 +9283,7 @@ % [<options>]{<source>}{<target>} -\newcommand{\blx@inherit@field}[3][]{% +\newcommand*{\blx@inherit@field}[3][]{% \let\blx@tempc\@empty \ifblank{#1} {} @@ -9265,7 +9291,7 @@ \eappto\blx@tempb{% \blx@xml@inherit@field{#2}{#3}{\blx@tempc}}} -\newcommand{\blx@inherit@block}[1]{% +\newcommand*{\blx@inherit@block}[1]{% \eappto\blx@tempb{\blx@xml@inherit@block{#1}}} \define@key{blx@inherit@field}{override}[true]{% true|false @@ -9294,7 +9320,7 @@ \endgroup} \@onlypreamble\DeclareSortingScheme -\newcommand{\blx@sortdef@sort}[2][]{% +\newcommand*{\blx@sortdef@sort}[2][]{% \advance\blx@tempcnta\@ne \blx@tempcntb\z@ \let\blx@tempb\@empty @@ -9336,6 +9362,8 @@ % script form - original | translated | romanised | uniform \define@key{blx@sortdef@field}{form}{% \appto\blx@tempd{ form="#1"}} +\define@key{blx@sortdef@field}{lang}{% + \appto\blx@tempd{ lang="#1"}} \define@key{blx@sortdef@field}{padside}{% left|right \ifstrequal{#1}{right} {\eappto\blx@tempd{ pad\string_side="right"}} @@ -9395,35 +9423,63 @@ % [<type,type,...>]{<field,field,...>} \newrobustcmd*{\DeclareLabelname}[2][]{% - \blx@defmvalue{labelnamespec}{#1}{#2}} + \begingroup + \let\blx@tempa\@empty + \def\blx@tempb{labelnamespec}% + \let\field\blx@ordered@field + \ifblank{#1} + {\global\cslet{blx@bcf@labelnamespec}\@empty} + {\def\blx@tempa{#1}% + \def\do##1{\global\cslet{blx@bcf@labelnamespec@##1}\@empty}% + \expandafter\docsvlist\expandafter{#1}}% + #2% + \endgroup} \@onlypreamble\DeclareLabelname \newrobustcmd*{\DeclareLabeltitle}[2][]{% - \blx@defmvalue{labeltitlespec}{#1}{#2}} + \begingroup + \let\blx@tempa\@empty + \def\blx@tempb{labeltitlespec}% + \let\field\blx@ordered@field + \ifblank{#1} + {\global\cslet{blx@bcf@labeltitlespec}\@empty} + {\def\blx@tempa{#1}% + \def\do##1{\global\cslet{blx@bcf@labeltitlespec@##1}\@empty}% + \expandafter\docsvlist\expandafter{#1}}% + #2% + \endgroup} \@onlypreamble\DeclareLabeltitle \newrobustcmd*{\DeclareLabelyear}[2][]{% - \blx@defmvalue{labelyearspec}{#1}{#2}} + \begingroup + \let\blx@tempa\@empty + \def\blx@tempb{labelyearspec}% + \let\field\blx@ordered@field + \ifblank{#1} + {\global\cslet{blx@bcf@labelyearspec}\@empty} + {\def\blx@tempa{#1}% + \def\do##1{\global\cslet{blx@bcf@labelyearspec@##1}\@empty}% + \expandafter\docsvlist\expandafter{#1}}% + #2% + \endgroup} \@onlypreamble\DeclareLabelyear -\def\blx@defmvalue#1#2#3{% - \ifblank{#2} - {\expandafter\blx@defmvalue@ii\csname blx@bcf@#1\endcsname{#3}} - {\forcsvlist{\blx@defmvalue@i{#1}{#3}}{#2}}} - -\def\blx@defmvalue@i#1#2#3{% - \blx@addtypeopt{#3}% - \expandafter\blx@defmvalue@ii\csname blx@bcf@#1@#3\endcsname{#2}} +\newcommand*{\blx@ordered@field}[2][]{% + \let\blx@tempc\@empty + \ifblank{#1} + {} + {\setkeys{blx@ordered@field}{#1}}% + \advance\blx@tempcnta\@ne + \ifdefempty{\blx@tempa} + {\csxappto{blx@bcf@\blx@tempb}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}} + {\def\do##1{\blx@addtypeopt{##1}% + \csxappto{blx@bcf@\blx@tempb @##1}{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{\blx@tempc}{#2}}}% + \expandafter\docsvlist\expandafter{\blx@tempa}}} -\def\blx@defmvalue@ii#1#2{% - \begingroup - \global\let#1\@empty - \blx@tempcnta\z@ - \def\do##1{% - \advance\blx@tempcnta\@ne - \xappto#1{\noexpand\blx@xml@ordered{\the\blx@tempcnta}{##1}}}% - \docsvlist{#2}% - \endgroup} +\define@key{blx@ordered@field}{form}{% + \appto\blx@tempc{ form="#1"}} +\define@key{blx@ordered@field}{lang}{% + \appto\blx@tempc{ lang="#1"}} %% Package options @@ -9444,8 +9500,8 @@ {\ifdef\blx@opts@type {\ifinlist{#1}{\blx@opts@type} {} - {\listadd\blx@opts@type{#1}}} - {\listadd\blx@opts@type{#1}}} + {\listgadd\blx@opts@type{#1}}} + {\listgadd\blx@opts@type{#1}}} {}} % load-time only diff --git a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def index dcee0112012..6456e06b0b8 100644 --- a/Master/texmf-dist/tex/latex/biblatex/blx-dm.def +++ b/Master/texmf-dist/tex/latex/biblatex/blx-dm.def @@ -378,8 +378,8 @@ pagetotal, part, related, - relatedtype, relatedstring, + relatedtype, reprinttitle, series, shorthand, @@ -492,7 +492,7 @@ \DeclareDatamodelFields[type=field, datatype=uri]{url} \DeclareDatamodelFields[type=field, datatype=csv]{keywords} -\DeclareDatamodelFields[type=field, datatype=csv, skipout]{options} +\DeclareDatamodelFields[type=field, datatype=csv, skipout]{options, relatedoptions} \DeclareDatamodelFields[type=field, datatype=range]{pages} \DeclareDatamodelFields[type=field, datatype=code]{execute} @@ -537,8 +537,9 @@ pagination, presort, related, - relatedtype, + relatedoptions, relatedstring, + relatedtype, shortauthor, shorteditor, shorthand, diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx index 4a4d425a8aa..fc8d96d2c59 100644 --- a/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/catalan.lbx @@ -1,8 +1,11 @@ -% -*- latex -*- +3% -*- latex -*- \ProvidesFile{catalan.lbx} % Changes: -% 2012-4-23 Translation by Sebastià Vila-Marta +% 2012-4-23 Translation (Sebastià Vila-Marta) +% 2012-10-23 Added to biblatex project (Sebastià Vila-Marta) +% 2012-11-4 All strings translated (Sebastià Vila-Marta) + \DeclareRedundantLanguages{catalan}{catalan} @@ -16,11 +19,7 @@ \@tempcnta0#1\relax\number\@tempcnta \ifcase\@tempcnta x\or er\or n\or er\or rt\else \`e\fi \endgroup}% - \protected\def\mkbibordinalf#1{% - \begingroup - \@tempcnta0#1\relax\number\@tempcnta - \ifcase\@tempcnta x\or era\or na\or era\else a\fi - \endgroup}% + \protected\def\mkbibordinalf#1{#1a}% \protected\def\mkbibmascord#1{\mkbibordinalm{#1}}% \protected\def\mkbibfemord#1{\mkbibordinalf{#1}}% \protected\def\mkbibdatelong#1#2#3{% @@ -80,8 +79,8 @@ shorthands = {{Llista de abreviatures}{Abreviatures}}, editor = {{editor}{ed\adddot}}, editors = {{editors}{eds\adddot}}, - compiler = {{compilador}{comp\adddot}}, - compilers = {{compiladors}{comps\adddot}}, + compiler = {{compilador}{comp\adddot}}, % Revisar + compilers = {{compiladors}{comps\adddot}}, % Revisar redactor = {{redactor}{red\adddot}}, redactors = {{redactors}{reds\adddot}}, reviser = {{revisor}{rev\adddot}}, @@ -96,8 +95,8 @@ translators = {{traductors}{trads\adddot}}, commentator = {{comentarista}{com\adddot}}, commentators = {{comentaristes}{coms\adddot}}, - annotator = {{autor de les notes}{autor de les notes}}, - annotators = {{autors de les notes}{autors de les notes}}, + annotator = {{anotador}{anot\adddot}}, + annotators = {{anotadors}{anots\adddot}}, commentary = {{comentari}{com\adddot}}, annotations = {{notes}{notes}}, introduction = {{introducci\'o}{intr\adddot}}, @@ -107,70 +106,128 @@ editorstr = {{editors i traductors}{eds\adddotspace i trads\adddot}}, editorco = {{editor i comentarista}{ed\adddotspace i com\adddot}}, editorsco = {{editors i comentaristes}{eds\adddotspac i coms\adddot}}, - editoran = {{editor i autor de les notes}{ed\adddotspace i autor de les notes}}, - editorsan = {{editors i autors de les notes}{eds\adddotspace i autors de les notes}}, + editoran = {{editor i anotador}{ed\adddotspace i anot\adddot}}, + editorsan = {{editors i anotadors}{eds\adddotspace i anots\adddot}}, editorin = {{editor i autor de la introducci\'o}{ed\adddotspace i autor de la intr\addot}}, editorsin = {{editors i autors de la introducci\'o}{eds\adddotspace i autors de la intr\adddot}}, - editorfo = {{editor i autor del pròleg}{ed\adddotspace i autor del pr\`ol\addot}}, - editorsfo = {{editors i autors del pròleg}{eds\adddotspace i autors del pr\`ol\addot}}, -% editoraf = {{}{}}, % FIXME: missing -% editorsaf = {{}{}}, % FIXME: missing -% editortrco = {{}{}}, % FIXME: missing -% editorstrco = {{}{}}, % FIXME: missing -% editortran = {{}{}}, % FIXME: missing -% editorstran = {{}{}}, % FIXME: missing -% editortrin = {{}{}}, % FIXME: missing -% editorstrin = {{}{}}, % FIXME: missing -% editortrfo = {{}{}}, % FIXME: missing -% editorstrfo = {{}{}}, % FIXME: missing -% editortraf = {{}{}}, % FIXME: missing -% editorstraf = {{}{}}, % FIXME: missing -% editorcoin = {{}{}}, % FIXME: missing -% editorscoin = {{}{}}, % FIXME: missing -% editorcofo = {{}{}}, % FIXME: missing -% editorscofo = {{}{}}, % FIXME: missing -% editorcoaf = {{}{}}, % FIXME: missing -% editorscoaf = {{}{}}, % FIXME: missing -% editoranin = {{}{}}, % FIXME: missing -% editorsanin = {{}{}}, % FIXME: missing -% editoranfo = {{}{}}, % FIXME: missing -% editorsanfo = {{}{}}, % FIXME: missing -% editoranaf = {{}{}}, % FIXME: missing -% editorsanaf = {{}{}}, % FIXME: missing -% editortrcoin = {{}{}}, % FIXME: missing -% editorstrcoin = {{}{}}, % FIXME: missing -% editortrcofo = {{}{}}, % FIXME: missing -% editorstrcofo = {{}{}}, % FIXME: missing -% editortrcoaf = {{}{}}, % FIXME: missing -% editorstrcoaf = {{}{}}, % FIXME: missing -% editortranin = {{}{}}, % FIXME: missing -% editorstranin = {{}{}}, % FIXME: missing -% editortranfo = {{}{}}, % FIXME: missing -% editorstranfo = {{}{}}, % FIXME: missing -% editortranaf = {{}{}}, % FIXME: missing -% editorstranaf = {{}{}}, % FIXME: missing -% translatorco = {{}{}}, % FIXME: missing -% translatorsco = {{}{}}, % FIXME: missing -% translatoran = {{}{}}, % FIXME: missing -% translatorsan = {{}{}}, % FIXME: missing -% translatorin = {{}{}}, % FIXME: missing -% translatorsin = {{}{}}, % FIXME: missing -% translatorfo = {{}{}}, % FIXME: missing -% translatorsfo = {{}{}}, % FIXME: missing -% translatoraf = {{}{}}, % FIXME: missing -% translatorsaf = {{}{}}, % FIXME: missing -% translatorcoin = {{}{}}, % FIXME: missing -% translatorscoin = {{}{}}, % FIXME: missing -% translatorcofo = {{}{}}, % FIXME: missing -% translatorscofo = {{}{}}, % FIXME: missing -% translatorcoaf = {{}{}}, % FIXME: missing -% translatorscoaf = {{}{}}, % FIXME: missing -% translatoranin = {{}{}}, % FIXME: missing -% translatorsanin = {{}{}}, % FIXME: missing -% translatoranfo = {{}{}}, % FIXME: missing -% translatorsanfo = {{}{}}, % FIXME: missing -% translatoranaf = {{}{}}, % FIXME: missing -% translatorsanaf = {{}{}}, % FIXME: missing + editorfo = {{editor i autor del pr\`oleg}{ed\adddotspace i autor del pr\`ol\addot}}, + editorsfo = {{editors i autors del pr\`oleg}{eds\adddotspace i autors del pr\`ol\addot}}, + editoraf = {{editor i autor de l'ep{\´\i}leg} % + {ed\adddotspace i aut\adddot de l'ep{\`\i]\adddot}}, + editorsaf = {{editors i autors de l'ep{\´\i}leg} % + {eds\adddotspace i auts\adddotspace de l'ep{\`\i]\adddot}}, + editortrco = {{editor, traductor i comentarista} + {ed.,\addabbrvspace trad\adddot i com\adddot}}, + editorstrco = {{editors, traductors i comentaristes} + {eds.,\addabbrvspace trads\adddot i coms\adddot}}, + editortran = {{editor, traductor i anotador} + {ed.,\addabbrvspace trad\adddot i anot\adddot}}, + editorstran = {{editors, traductors i anotadors} + {eds.,\addabbrvspace trads\adddot i anots\adddot}}, + editortrin = {{editor, traductor i autor de la introducci\´o} + {ed.,\addabbrvspace trad\adddot i aut\adddot de la intr\adddot}}, + editorstrin = {{editors, traductors i autors de la introducci\´o} + {eds.,\addabbrvspace trads\adddot i auts\adddot de la intr\adddot}}, + editortrfo = {{editor, traductor i autor del pr\`oleg} + {ed.,\addabbrvspace trad\adddot i aut\adddot del pr\`ol\adddot}}, + editorstrfo = {{editors, traductors i autors del pr\`oleg} + {eds.,\addabbrvspace trads\adddot i auts\adddot del pr\`ol\adddot}}, + editortraf = {{editor, traductor i autor de l'ep{\´\i}leg} + {ed.,\addabbrvspace trad\adddot i aut\adddot de l'ep{\´\i}l\adddot}}, + editorstraf = {{editors, traductors i autors de l'ep{\´\i}leg} + {eds.,\addabbrvspace trads\adddot i auts\adddot de l'ep{\´\i}l\adddot}}, + editorcoin = {{editor, comentarista i autor de la introducci\´o} + {ed.,\addabbrvspace com\adddot i aut\adddot de la intr\adddot}}, + editorscoin = {{editors, comentaristes i autors de la introducci\´o} + {eds.,\addabbrvspace coms\adddot i auts\adddot de la intr\adddot}}, + editorcofo = {{editor, comentarista i autor del pr\`oleg} + {ed.,\addabbrvspace com\adddotspace i aut\adddotspace del pr\`ol\adddot}}, + editorscofo = {{editors, comentaristes i autors del pr\`oleg} + {eds.,\addabbrvspace coms\adddotspace i auts\adddotspace del pr\`ol\adddot}}, + editorcoaf = {{editor, comentarista i autor de l'ep{\`\i}leg} + {ed.,\addabbrvspace com\adddotspace i aut\adddotspace de l'ep{\´\i}l\adddot}}, + editorscoaf = {{editors, comentaristes i autors de l'ep{\`\i}leg} + {eds.,\addabbrvspace coms\adddotspace i auts\adddotspace de l'ep{\´\i}l\adddot}}, + editoranin = {{editor, anotador i autor de la introducci\´o} + {ed.,\addabbrvspace anot\adddotspace i aut\adddotspace de la intr\adddot}}, + editorsanin = {{editors, anotadors i autors de la introducci\`o} + {eds.,\addabbrvspace anots\adddotspace i auts\adddotspace de la intr\adddot}}, + editoranfo = {{editor, anotador i autor del pr\`oleg} + {ed.,\addabbrvspace anot\adddotspace i aut\adddotspace del pr\`ol\adddot}}, + editorsanfo = {{editors, anotadors i autors del pr\`oleg} + {eds.,\addabbrvspace anots\adddotspace i auts\adddotspace del pr\`ol\adddot}}, + editoranaf = {{editor, anotador i autor de l'ep{\`\i}leg} + {ed.,\addabbrvspace anot\adddotspace i aut\adddotspace de l'ep{\`\i}l\adddot}}, + editorsanaf = {{editors, anotadors i autors de l'ep{\`\i}leg} + {eds.,\addabbrvspace anots\adddotspace i auts\adddotspace de l'ep{\`\i}l\adddot}}, + editortrcoin = {{editor, traductor, comentarista i autor de la introducci\´o} + {ed.,\addabbrevspace trad.,\addabbrevspace com\adddotspace i aut\adddotspace de la intr\adddot}}, + editorstrcoin = {{editors, traductors, comentaristes i autors de la introducci\´o} + {eds.,\addabbrevspace trads.,\addabbrevspace coms\adddotspace i aut\adddotspace de la intr\adddot}}, + editortrcofo = {{editor, traductor, comentarista i autor del pr\`oleg} + {ed.,\addabbrvspace trad.,\addabbrevspace com\adddotspace i aut\adddotspace del pr\`ol\adddot }}, + editorstrcofo = {{editors, traductors, comentaristes i autors del pr\`oleg} + {eds.,\addabbrvspace trads.,\addabbrevspace coms\adddotspace i auts\adddotspace del pr\`ol\adddot }}, + editortrcoaf = {{editor, traductor, comentarista i autor de l'ep{\´\i}leg} + {ed,.\addabbrevspace trad.,\addabbrevspace com\adddotspace i aut\adddotspace de l'ep{\´\i}l\adddot}}, + editorstrcoaf = {{editors, traductors, comentaristes i autors de l'ep{\´\i}leg} + {eds,.\addabbrevspace trads.,\addabbrevspace coms\adddotspace i auts\adddotspace de l'ep{\´\i}l\adddot}}, + editortranin = {{editor, traductor, anotador i autor de la introducci\´o} + {ed.,\addabbrevspace trad.,\addabbrevspace anot\adddotspace i aut\adddotspace de la intr\adddot}}, + editorstranin = {{editors, traductors, anotadors i autors de la introducci\´o} + {eds.,\addabbrevspace trads.,\addabbrevspace anots\adddotspace i auts\adddotspace de la intr\adddot}}, + editortranfo = {{editor, traductor, anotador i autor del pr\`oleg} + {ed.,\addabrevspace trad.,\addabbrevspace anot\adddotspace i aut\adddotspace de pr\`ol\adddot}}, + editorstranfo = {{editors, traductors, anotadors i autors del pr\`oleg} + {eds.,\addabrevspace trads.,\addabbrevspace anots\adddotspace i auts\adddotspace de pr\`ol\adddot}}, + editortranaf = {{editor, traductor, anotador i autor de l'ep{\´\i}eg} + {ed.,\addabbrevspace trad.,\addabbrevspace anot\adddotspace i aut\adddotspace de l'ep{\´\i}l\addot}}, + editorstranaf = {{editors, traductors, anotadors i autors de l'ep{\´\i}eg} + {eds.,\addabbrevspace trads.,\addabbrevspace anots\adddotspace i auts\adddotspace de l'ep{\´\i}l\addot}}, + translatorco = {{traductor i comentarista} + {trad\adddotspace i com\adddot}}, + translatorsco = {{traductors i comentaristes} + {trads\adddotspace i coms\adddot}}, + translatoran = {{traductor i anotador} + {trad\adddotspace i anot\adddot}}, + translatorsan = {{traductors i anotadors} + {trads\adddotspace i anots\adddot}}, + translatorin = {{traductor i autor de la introducci\´o} + {trad\adddotspace i aut\adddotspace de la intr\adddot}}, + translatorsin = {{traductors i autors de la introducci\´o} + {trads\adddotspace i auts\adddotspace de la intr\adddot}}, + translatorfo = {{traductor i autor del pr\`oleg} + {trad\adddotspace i aut\adddotspace del pr\`ol\adddot}}, + translatorsfo = {{traductors i autors del pr\`oleg} + {trads\adddotspace i auts\adddotspace del pr\`ol\adddot}}, + translatoraf = {{traductor i autor de l'ep{\´\i}leg} + {trad\adddotspace i aut\adddotspace de l'ep{\´\i}l\adddot}}, + translatorsaf = {{traductors i autors de l'ep{\´\i}leg} + {trads\adddotspace i auts\adddotspace de l'ep{\´\i}l\adddot}}, + translatorcoin = {{traductor, comentarista i autor de la introducci\´o} + {trad.,\addabbrevspace com\adddotspace i aut\adddotspace de la intr\adddotspace}}, + translatorscoin = {{traductors, comentaristes i autors de la introducci\´o} + {trads.,\addabbrevspace coms\adddotspace i auts\adddotspace de la intr\adddotspace}}, + translatorcofo = {{traductor, comentarista i autor del pr\`oleg} + {trad.,\addabbrevspace com\adddotspace i aut\adddotspace del pr\`ol\adddot}}, + translatorscofo = {{traductors, comentaristes i autors del pr\`oleg} + {trads.,\addabbrevspace coms\adddotspace i auts\adddotspace del pr\`ol\adddot}}, + translatorcoaf = {{traductor, comentarista i autor de l'ep{\´\i}leg} + {trad.,\addabbrevspace com\adddotspace i aut\adddotspace de l'ep{\´\i}l\adddot}}, + translatorscoaf = {{traductors, comentaristes i autors de l'ep{\´\i}leg} + {trads.,\addabbrevspace coms\adddotspace i auts\adddotspace de l'ep{\´\i}l\adddot}}, + translatoranin = {{traductor, anotador i autor de la introducci\´o} + {trad.,\addabbrevspace anot\adddotspace i aut\adddotspace de la intr\adddot}}, + translatorsanin = {{traductors, anotadors i autors de la introducci\´o} + {trads.,\addabbrevspace anots\adddotspace i auts\adddotspace de la intr\adddot}}, + translatoranfo = {{traductor, anotador i autor del pr\`oleg} + {trad.,\addabbrevspace anot\adddotspace i aut\adddotspace del pr\`ol\adddot}}, + translatorsanfo = {{traductors, anotadors i autors del pr\`oleg} + {trads.,\addabbrevspace anots\adddotspace i auts\adddotspace del pr\`ol\adddot}}, + translatoranaf = {{traductor, anotador i autor de l'ep{\´\i}leg} + {trad.,\addabbrevspace anot\adddotspace i aut\adddotspace de l'ep{\´\i}l\adddot}}, + translatorsanaf = {{traductors, anotadors i autors de l'ep{\´\i}leg} + {trads.,\addabbrevspace anots\adddotspace i auts\adddotspace de l'ep{\´\i}l\adddot}}, byauthor = {{per}{per}}, byeditor = {{edici\´o a cura de}{ed\adddotspace de}}, bycompiler = {{compilaci\'o a cura de}{comp\adddotspace de}}, @@ -184,7 +241,7 @@ byannotator = {{notes a cura de}{notes de}}, withcommentator = {{amb comentaris a cura de}{amb com\adddotspace a cura de}}, withannotator = {{amb notes a cura de}{amb notes de}}, - withintroduction = {{amb l'introducci\'o a cura de}{amb l'intr\adddotspace de}}, + withintroduction = {{amb la introducci\'o a cura de}{amb la intr\adddotspace de}}, withforeword = {{amb el pr\`oleg a cura de}{amb el pr\`ol\adddotspace de}}, withafterword = {{amb l'ep\'{\i}leg a cura de}{amb l'ep\'{\i}l\adddotspace de}}, byeditortr = {{edici\'o i traducci\'o \lbx@fromlang\ a cura de}% @@ -214,19 +271,19 @@ byeditorcofo = {{edici\'o, comentaris i pr\`oleg a cura de} {ed\adddot com\adddotspace i pr\`ol\adddotspace de}}, byeditorcoaf = {{edici\'o, comentaris i ep\'{\i}leg a cura de}% - {ed\adddot, com\adddotspace y epil\adddotspace de}}, + {ed\adddot, com\adddotspace i epil\adddotspace de}}, byeditoranin = {{edici\'o, notes i introducci\'o a cura de}% {ed\adddot, not\adddotspace i introd\adddotspace de}}, - byeditoranfo = {{edici\'o, notes y pr\`oleg a cura de}% + byeditoranfo = {{edici\'o, notes i pr\`oleg a cura de}% {ed.,\addabbrvspace not\adddotspace ì pr\'ol\adddotspace de}}, byeditoranaf = {{edici\'o, notes i ep\'{\i}leg a cura de}% - {ed.,\addabbrvspace not\adddotspace y ep\'{\i}l\adddotspace de}}, + {ed.,\addabbrvspace not\adddotspace i ep\'{\i}l\adddotspace de}}, byeditortrcoin = {{edici\'o, traducció \lbx@fromlang, comentaris i introducci\'o a cura de}% {ed.,\addabbrvspace trad\adddotspace \lbx@fromlang, com\adddotspace i intr\adddotspace de}}, byeditortrcofo = {{edici\'o, traducció \lbx@fromlang, comentaris i pr\`oleg a cura de}% {ed.,\addabbrvspace trad\adddotspace \lbx@fromlang, com\adddotspace i pr\`ol\adddotspace de}}, byeditortrcoaf = {{edici\´o, traducci\´o \lbx@fromlang, comentaris i ep\´{\i}leg a cura de}% - {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ y ep\´{i}l\adddot\ de}}, + {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, com\adddot\ i ep\´{i}l\adddot\ de}}, byeditortranin = {{edici\´o, traducci\´o \lbx@fromlang, notes i introducci\´o a cura de}% {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, not\adddot\ i intr\adddot\ de}}, byeditortranfo = {{edici\´o, traducci\´o \lbx@fromlang, notes i pr\`oleg a cura de}% @@ -245,28 +302,28 @@ {trad\adddot\ \lbx@fromlang\ i ep\´{\i}l\adddot\ de}}, bytranslatorcoin = {{traducci\´o \lbx@fromlang, comentaris i introducci\´o a cura de}% {trad\adddot\ \lbx@fromlang, com\adddot\ i introd\adddot\ de}}, - bytranslatorcofo = {{traducci\´o \lbx@fromlang, comentaris y pr\`oleg a cura de}% - {trad\adddot\ \lbx@fromlang, com\adddot\ y pr\`ol\adddot\ de}}, + bytranslatorcofo = {{traducci\´o \lbx@fromlang, comentaris i pr\`oleg a cura de}% + {trad\adddot\ \lbx@fromlang, com\adddot\ i pr\`ol\adddot\ de}}, bytranslatorcoaf = {{traducci\´o \lbx@fromlang, comentaris i ep\´{\i}leg a cura de}% - {trad\adddot\ \lbx@fromlang, com\adddot\ y ep\´{\i}l\adddot\ de}}, + {trad\adddot\ \lbx@fromlang, com\adddot\ i ep\´{\i}l\adddot\ de}}, bytranslatoranin = {{traducci\´o \lbx@fromlang, notes i introducci\´o a cura de}% {trad\adddot\ \lbx@fromlang, anot\adddot\ i introd\adddot\ de}}, bytranslatoranfo = {{traducci\´o \lbx@fromlang, notes i pr\`oleg a cura de}% {trad\adddot\ \lbx@fromlang, not\adddot\ i pr\'ol\adddot\ de}}, bytranslatoranaf = {{traducci\´o \lbx@fromlang, notes i ep\´{\i}leg a cura de}% - {trad\adddot\ \lbx@fromlang, not\adddot\ y ep\´{\i}l\adddot\ de}}, + {trad\adddot\ \lbx@fromlang, not\adddot\ i ep\´{\i}l\adddot\ de}}, and = {{i}{i}}, - andothers = {{i d'altres\adddot}{i d'altres\adddot}}, - andmore = {{\textit{et al.}}{\textit{et al.}}}, + andothers = {{et al\adddot}{et al\adddot}}, + andmore = {i m\´es}{i m\´es}}, volume = {{volum}{vol\adddot}}, volumes = {{volums}{vols\adddot}}, jourvol = {{volum}{vol\adddot}}, - jourser = {{\`epoca}{\`ep\adddot}}, + jourser = {{s\`erie}{s\`er\adddot}}, book = {{llibre}{llib\addot}}, part = {{part}{part}}, issue = {{n\´umero}{n\´um\adddot}}, - newseries = {{nova \`epoca}{n\adddotspace\`ep\adddot}}, - oldseries = {{antiga \`epoca}{ant\adddotspace\`ep\adddot}}, + newseries = {{nova s\`erie}{n\adddotspace s\`er\adddot}}, + oldseries = {{antiga s\`erie}{ant\adddotspace s\`er\adddot}}, edition = {{edici\'o}{ed\adddot}}, reprint = {{reimpressi\'o}{reimpr\adddot}}, reprintof = {{reimpressi\'o de}{reimpr\adddotspace de}}, @@ -294,7 +351,7 @@ techreport = {{informe t\`ecnic}{inf\adddotspace t\`ec\adddot}}, software = {{programari}{prog\adddot}}, datacd = {{CD de dades}{CD de dades}}, - audiocd = {{CD d'audio}{CD d'audio}}, + audiocd = {{CD d'\`audio}{CD d'\`audio}}, version = {{versi\'o}{ver\adddot}}, url = {{adreça}{adr\adddot}}, urlseen = {{visitat \ifthenelse{\thefield{urlday}=1}{l'}{el\space}}{vis\adddotspace}}, @@ -321,16 +378,16 @@ sequens = {{s\adddot}{s\adddot}}, sequentes = {{ss\adddot}{ss\adddot}}, passim = {{p\`assim}{p\`assim}}, - see = {{vegeu}{vegeu}}, + see = {{vegeu}{veg\adddot}}, seealso = {{vegeu tamb\'e}{veg\adddotspace tamb\'e}}, backrefpage = {{vegeu la p\`agina}{veg\adddotspace la p\`ag\adddot}}, backrefpages = {{vegeu les p\`agines}{veg\adddotspace les p\`ag\adddot}}, january = {{gener}{gen\adddot}}, february = {{febrer}{feb\adddot}}, - march = {{març}{març}}, + march = {{març}{mar\adddot}}, april = {{abril}{abr\adddot}}, - may = {{maig}{maig}}, - june = {{juny}{juny}}, + may = {{maig}{mai\adddot}}, + june = {{juny}{jun\adddot}}, july = {{juliol}{jul\adddot}}, august = {{agost}{ago\adddot}}, september = {{setembre}{set\adddot}}, @@ -340,11 +397,11 @@ langamerican = {{angl\`es americ\`a}{ang\adddotspace amer\adddot}}, langbrazilian = {{portugu\`es brasiler}{port\adddotspace bras\adddot}}, langcroatian = {{croat}{croat}}, -% langcatalan = {{catal\`a}{catal\`a}}, + langcatalan = {{catal\`a}{catal\`a}}, langdanish = {{dan\`es}{dan\adddot}}, langdutch = {{neerland\`es}{neerland\`es}}, langenglish = {{angl\`es}{ang\adddot}}, - langfinish = {{fin\`es}{fin\`es}}, + langfinnish = {{fin\`es}{fin\`es}}, langfrench = {{franc\`es}{fran\adddot}}, langgerman = {{alemany}{alem\adddot}}, langgreek = {{grec}{grec}}, @@ -358,11 +415,11 @@ fromamerican = {{de l'anglès americ\`a}{de l'ang\adddotspace amer\adddot}}, frombrazilian = {{del portugu\`es brasiler}{del port\adddot bras\adddot}}, fromcroatian = {{del croat}{del croat}}, -% fromcatalan = {{del catal\`a}{del catal\`a}}, + fromcatalan = {{del catal\`a}{del catal\`a}}, fromdanish = {{del dan\`es}{del dan\ès}}, fromdutch = {{del neerland\`es}{del neerl\adddot}}, fromenglish = {{de l'angl\`es}{de l'ang\adddot}}, - fromfinish = {{del fin\`es}{del fin\`es}}, + fromfinnish = {{del fin\`es}{del fin\`es}}, fromfrench = {{del franc\`es}{del fran\adddot}}, fromgerman = {{de l'alemany}{de l'alem\adddot}}, fromgreek = {{del grec}{del grec}}, @@ -373,7 +430,7 @@ fromrussian = {{del rus}{del rus}}, fromspanish = {{del castell\`a}{del cast\adddot}}, fromswedish = {{del suec}{del suec}}, -% countryca = {{Catalunya}{CAT}}, +% countryca = {{Catalunya}{CAT}}, countryde = {{Alemanya}{DE}}, countryeu = {{Uni\'o Europea}{UE}}, countryep = {{Uni\'o Europea}{UE}}, @@ -391,10 +448,10 @@ patreqeu = {{so\l.licitud de patent europea}{so\l.l\adddotspace de pat\adddot\ eur\adddot}}, patreqfr = {{so\l.licitud de patent francesa}{so\l.l\adddotspace de pat\adddot\ fran\adddot}}, patrequk = {{so\l.licitud de patent brit\`anica}{so\l.l\adddotspace de pat\adddot\ brit\adddot}}, - patrequs = {{so\l.licitud de patent americana}{so\l. l\adddotspace de pat\adddot\ amer\adddot}}, + patrequs = {{so\l.licitud de patent americana}{so\l.l\adddotspace de pat\adddot\ amer\adddot}}, file = {{fitxer}{fitx\adddot}}, library = {{biblioteca}{bibl\adddot}}, abstract = {{resum}{resum}}, - annotation = {{anotaci\´o}{anot\adddot}}, + annotation = {{nota}{not\adddot}}, } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx new file mode 100644 index 00000000000..50cf0cd0796 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex/lbx/czech.lbx @@ -0,0 +1,404 @@ +\ProvidesFile{czech.lbx}
+
+\InheritBibliographyExtras{english}
+\InheritBibliographyStrings{english}
+
+%Turabian calls for mostly abbreviated bibstrings in the footnotes, but mostly long forms in the bibliography. Here the entire list of bibstrings from the english.lbx file is redefined to select strings by bibliography vs. footnote environment, rather than long vs. short.
+
+\DeclareBibliographyExtras{
+ \protected\def\mkbibordinal#1{
+ \ifnumequal{#1}{1}{Prvn\'i}{%
+ \ifnumequal{#1}{2}{Druh\'e}{%
+ \ifnumequal{#1}{3}{T\v{r}et\'i}{%
+ #1\adddot}}}}
+ \renewcommand\finalandcomma{}
+ %\protected\def\nameprint#1#2{#2\space#1}
+}
+
+\DeclareBibliographyStrings{%
+ edition={{vyd\'an\'i}{vyd\adddot}},
+ page={{strana}{s\adddot}},
+ pages={{strany}{s\adddot}},
+ andothers={{a dal\v{s}\'i}{aj\adddot}},
+ volume={{ro\v{c}n\'ik}{ro\v{c}\adddot}},
+ jourvol={{ro\v{c}n\'ik}{ro\v{c}\adddot}},
+ number={{\v{c}\'islo}{\v{c}\adddot}},
+ urlseen={{citov\'ano}{cit\adddot}},
+ url = {{Dostupn\'y z WWW}{WWW}},
+ %urlcited = {{citov\'ano},{cit\adddot}}
+ bibliography = {{Bibliografie}{Bibliografie}},
+ references = {{Odkazy}{Odkazy}},
+ shorthands = {{Seznam zkratek}{Zkratky}},
+ editor = {{editor}{ed\adddot}},
+ editors = {{edotoři}{ed\adddot}},
+ compiler = {{sestavil}{sest\adddot}},
+ compilers = {{sestavili}{sest\adddot}},
+ redactor = {{redaktor}{red\adddot}},
+ redactors = {{redaktoři}{red\adddot}},
+ founder = {{zakladatel}{zakl\adddot}},
+ founders = {{zakladatelé}{zakl\adddot}},
+ continuator = {{pokračující}{pok\adddot}}, % FIXME: unsure
+ continuators = {{continued}{cont\adddot}}, % FIXME: unsure
+ collaborator = {{spolupracovník}{spoluprac\adddot}}, % FIXME: unsure
+ collaborators = {{spolupracovníci}{spoluprac\adddot}}, % FIXME: unsure
+ translator = {{překladatel}{překl\adddot}},
+ translators = {{překladatelé}{překl\adddot}},
+ commentator = {{komentátor}{kom\adddot}},
+ commentators = {{komentátoři}{kom\adddot}},
+ annotator = {{anotátor}{anot\adddot}},
+ annotators = {{anotátoři}{anot\adddot}},
+ commentary = {{commentary}{comm\adddot}},
+ annotations = {{anotatace}{anot\adddot}},
+ introduction = {{úvod}{úv\adddot}},
+ foreword = {{předmluva}{předml\adddot}},
+ afterword = {{doslov}{dosl\adddot}},
+ editortr = {{editor a překladatel}%
+ {ed\adddotspace a překl\adddot}},
+ editorstr = {{editoři a překladatelé}%
+ {ed\adddotspace a překl\adddot}},
+ editorco = {{editor a komentátor}%
+ {ed\adddotspace a kom\adddot}},
+ editorsco = {{editor a komentátoři}%
+ {ed\adddotspace a kom\adddot}},
+ editoran = {{editor a anotátor}%
+ {ed\adddotspace a anot\adddot}},
+ editorsan = {{editor a anotátoři}%
+ {ed\adddotspace a anot\adddot}},
+ editorin = {{editor a úvod}%
+ {ed\adddotspace úv\adddot}},
+ editorsin = {{editoři a úvod}%
+ {ed\adddotspace a úv\adddot}},
+ editorfo = {{editor a předmluva}%
+ {ed\adddotspace a forew\adddot}},
+ editorsfo = {{editoři a předmluva}%
+ {ed\adddotspace a forew\adddot}},
+ editoraf = {{editor a afterword}%
+ {ed\adddotspace a afterw\adddot}},
+ editorsaf = {{editoři a doslov}%
+ {ed\adddotspace a afterw\adddot}},
+ editortrco = {{editor, translator\ a komentátor}%
+ {ed.,\addabbrvspace překl\adddot\ a comm\adddot}},
+ editorstrco = {{editors, translators\ a komentátoři}%
+ {eds.,\addabbrvspace překl\adddot\ a comm\adddot}},
+ editortran = {{editor, translator\ a annotator}%
+ {ed.,\addabbrvspace překl\adddot\ a anot\adddot}},
+ editorstran = {{editors, translators\ a annotators}%
+ {ed.,\addabbrvspace překl\adddot\ a anot\adddot}},
+ editortrin = {{editor, translator\ a úvod}%
+ {ed.,\addabbrvspace překl\adddot\ a introd\adddot}},
+ editorstrin = {{editors, translators\ a úvod}%
+ {ed.,\addabbrvspace překl\adddot\ a introd\adddot}},
+ editortrfo = {{editor, translator\ a předmluva}%
+ {ed.,\addabbrvspace překl\adddot\ a forew\adddot}},
+ editorstrfo = {{editors, translators\ a předmluva}%
+ {ed.,\addabbrvspace překl\adddot\ a forew\adddot}},
+ editortraf = {{editor, translator\ a doslov}%
+ {ed.,\addabbrvspace překl\adddot\ a afterw\adddot}},
+ editorstraf = {{editors, translators\ a doslov}%
+ {ed.,\addabbrvspace překl\adddot\ a afterw\adddot}},
+ editorcoin = {{editor, commentator\ a úvod}%
+ {ed.,\addabbrvspace comm\adddot\ a introd\adddot}},
+ editorscoin = {{editors, commentators\ a úvod}%
+ {ed.,\addabbrvspace comm\adddot\ a introd\adddot}},
+ editorcofo = {{editor, commentator\ a předmluva}%
+ {ed.,\addabbrvspace comm\adddot\ a forew\adddot}},
+ editorscofo = {{editors, commentators\ a předmluva}%
+ {ed.,\addabbrvspace comm\adddot\ a forew\adddot}},
+ editorcoaf = {{editor, commentator\ a doslov}%
+ {ed.,\addabbrvspace comm\adddot\ a dosl\adddot}},
+ editorscoaf = {{editors, commentators\ a doslov}%
+ {ed.,\addabbrvspace comm\adddot\ a dosl\adddot}},
+ editoranin = {{editor, annotator\ a úvod}%
+ {ed.,\addabbrvspace anot\adddot\ a introd\adddot}},
+ editorsanin = {{editors, annotators\ a úvod}%
+ {ed.,\addabbrvspace anot\adddot\ a introd\adddot}},
+ editoranfo = {{editor, annotator\ a předmluva}%
+ {ed.,\addabbrvspace anot\adddot\ a forew\adddot}},
+ editorsanfo = {{editors, annotators\ a předmluva}%
+ {ed.,\addabbrvspace anot\adddot\ a forew\adddot}},
+ editoranaf = {{editor, annotator\ a doslov}%
+ {ed.,\addabbrvspace anot\adddot\ a dosl\adddot}},
+ editorsanaf = {{editors, annotators\ a doslov}%
+ {ed.,\addabbrvspace anot\adddot\ a dosl\adddot}},
+ editortrcoin = {{editor, překladatel, commentator\ a úvod}%
+ {ed.,\addabbrvspace trans., comm\adddot\ a introd\adddot}},
+ editorstrcoin = {{editors, překladatelé, commentators\ a úvod}%
+ {ed.,\addabbrvspace trans., comm\adddot\ a introd\adddot}},
+ editortrcofo = {{editor, překladatel, commentator\ a předmluva}%
+ {ed.,\addabbrvspace trans., comm\adddot\ a forew\adddot}},
+ editorstrcofo = {{editors, překladatelé, commentators\ a předmluva}%
+ {ed.,\addabbrvspace trans., comm\adddot\ a forew\adddot}},
+ editortrcoaf = {{editor, překladatel, commentator\ a doslov}%
+ {ed.,\addabbrvspace trans., comm\adddot\ a dosl\adddot}},
+ editorstrcoaf = {{editors, překladatelé, commentators\ a doslov}%
+ {ed.,\addabbrvspace trans., comm\adddot\ a dosl\adddot}},
+ editortranin = {{editor, překladatel, annotator\ a úvod}%
+ {ed.,\addabbrvspace trans., anot\adddot\ a introd\adddot}},
+ editorstranin = {{editors, překladatelé, annotators\ a úvod}%
+ {ed.,\addabbrvspace trans., anot\adddot\ a introd\adddot}},
+ editortranfo = {{editor, překladatel, annotator\ a předmluva}%
+ {ed.,\addabbrvspace trans., anot\adddot\ a forew\adddot}},
+ editorstranfo = {{editors, překladatelé, annotators\ a předmluva}%
+ {ed.,\addabbrvspace trans., anot\adddot\ a forew\adddot}},
+ editortranaf = {{editor, překladatel, annotator\ a doslov}%
+ {ed.,\addabbrvspace trans., anot\adddot\ a dosl\adddot}},
+ editorstranaf = {{editors, překladatelé, annotators\ a doslov}%
+ {ed.,\addabbrvspace trans., anot\adddot\ a dosl\adddot}},
+ translatorco = {{překladatel a komentátor}%
+ {překl\adddot\ a comm\adddot}},
+ translatorsco = {{překladatelé a komentátoři}%
+ {překl\adddot\ a comm\adddot}},
+ translatoran = {{překladatel a annotator}%
+ {překl\adddot\ a anot\adddot}},
+ translatorsan = {{překladatelé a annotators}%
+ {překl\adddot\ a anot\adddot}},
+ translatorin = {{překlad a úvod}%
+ {překl\adddot\ a introd\adddot}},
+ translatorsin = {{překlad a úvod}%
+ {překl\adddot\ a introd\adddot}},
+ translatorfo = {{překlad a předmluva}%
+ {překl\adddot\ a forew\adddot}},
+ translatorsfo = {{překlad a předmluva}%
+ {překl\adddot\ a forew\adddot}},
+ translatoraf = {{překlad a doslov}%
+ {překl\adddot\ a dosl\adddot}},
+ translatorsaf = {{překlad a doslov}%
+ {překl\adddot\ a dosl\adddot}},
+ translatorcoin = {{překlad, commentary\ a úvod}%
+ {trans., comm\adddot\ a introd\adddot}},
+ translatorscoin = {{překlad, commentary\ a úvod}%
+ {trans., comm\adddot\ a introd\adddot}},
+ translatorcofo = {{překlad, commentary\ a předmluva}%
+ {trans., comm\adddot\ a forew\adddot}},
+ translatorscofo = {{překlad, commentary\ a předmluva}%
+ {trans., comm\adddot\ a forew\adddot}},
+ translatorcoaf = {{překlad, commentary\ a doslov}%
+ {trans., comm\adddot\ a dosl\adddot}},
+ translatorscoaf = {{překlad, commentary\ a doslov}%
+ {trans., comm\adddot\ a dosl\adddot}},
+ translatoranin = {{překlad, anotace,\ a úvod}%
+ {trans., anot\adddot\ a introd\adddot}},
+ translatorsanin = {{překlad, anotace,\ a úvod}%
+ {trans., anot\adddot\ a introd\adddot}},
+ translatoranfo = {{překlad, anotace,\ a předmluva}%
+ {trans., anot\adddot\ a forew\adddot}},
+ translatorsanfo = {{překlad, anotace,\ a předmluva}%
+ {trans., anot\adddot\ a forew\adddot}},
+ translatoranaf = {{překlad, anotace,\ a doslov}%
+ {trans., anot\adddot\ a dosl\adddot}},
+ translatorsanaf = {{překlad, anotace,\ a doslov}%
+ {trans., anot\adddot\ a dosl\adddot}},
+ byauthor = {{by}{by}},
+ byeditor = {{edited by}{ed\adddotspace by}},
+ bycompiler = {{compiled by}{comp\adddotspace by}},
+ byredactor = {{redacted by}{red\adddotspace by}},
+ byfounder = {{founded by}{found\adddotspace by}},
+ bycontinuator = {{continued by}{cont\adddotspace by}},
+ bycollaborator = {{in collaboration with}{in collab\adddotspace with}}, % FIXME: unsure
+ bytranslator = {{translated \lbx@lfromlang\ by}{překl\adddot\ \lbx@sfromlang\ by}},
+ bycommentator = {{commented by}{comm\adddot\ by}},
+ byannotator = {{annotated by}{anot\adddot\ by}},
+ withcommentator = {{with a commentary by}{with a comment\adddot\ by}},
+ withannotator = {{s anotacemi od}{s anot\adddot\ od}},
+ withintroduction = {{s úvodem od}{u úv\adddot\ od}},
+ withforeword = {{s předmluvou od}{s předml\adddot\ od}},
+ withafterword = {{with an afterword by}{with an dosl\adddot\ by}},
+ byeditortr = {{edited a translated \lbx@lfromlang\ by}%
+ {ed\adddotspace a překl\adddot\ \lbx@sfromlang\ by}},
+ byeditorco = {{edited a commented by}%
+ {ed\adddotspace a kom\adddot\ by}},
+ byeditoran = {{edited a annotated by}%
+ {ed\adddotspace a anot\adddot\ by}},
+ byeditorin = {{edited, with an úvod, by}%
+ {ed.,\addabbrvspace with an introd., by}},
+ byeditorfo = {{edited, with a foreword, by}%
+ {ed.,\addabbrvspace with a forew., by}},
+ byeditoraf = {{edited, with an afterword, by}%
+ {ed.,\addabbrvspace with an afterw., by}},
+ byeditortrco = {{edited, translated \lbx@lfromlang\ a commented by}%
+ {ed.,\addabbrvspace překl\adddot\ \lbx@sfromlang\ a kom\adddot\ by}},
+ byeditortran = {{edited, translated \lbx@lfromlang\ a annotated by}%
+ {ed.,\addabbrvspace překl\adddot\ \lbx@sfromlang\ a anot\adddot\ by}},
+ byeditortrin = {{edited a translated \lbx@lfromlang, with an úvod, by}%
+ {ed\adddotspace a překl\adddot\ \lbx@sfromlang, with an introd., by}},
+ byeditortrfo = {{edited a translated \lbx@lfromlang, with a foreword, by}%
+ {ed\adddotspace a překl\adddot\ \lbx@sfromlang, with a forew., by}},
+ byeditortraf = {{edited a translated \lbx@lfromlang, with an afterword, by}%
+ {ed\adddotspace a překl\adddot\ \lbx@sfromlang, with an afterw., by}},
+ byeditorcoin = {{edited a commented, with an úvod, by}%
+ {ed\adddotspace a comm., with an introd., by}},
+ byeditorcofo = {{edited a commented, with a foreword, by}%
+ {ed\adddotspace a comm., with a forew., by}},
+ byeditorcoaf = {{edited a commented, with an afterword, by}%
+ {ed\adddotspace a comm., with an afterw., by}},
+ byeditoranin = {{edited a annotated, with an úvod, by}%
+ {ed\adddotspace a annot., with an introd., by}},
+ byeditoranfo = {{edited a annotated, with a foreword, by}%
+ {ed\adddotspace a annot., with a forew., by}},
+ byeditoranaf = {{edited a annotated, with an afterword, by}%
+ {ed\adddotspace a annot., with an afterw., by}},
+ byeditortrcoin = {{edited, translated \lbx@lfromlang\ a commented, with an úvod, by}%
+ {ed.,\addabbrvspace překl\adddot\ \lbx@sfromlang\ a comm., with an introd., by}},
+ byeditortrcofo = {{edited, translated \lbx@lfromlang\ a commented, with a foreword, by}%
+ {ed.,\addabbrvspace překl\adddot\ \lbx@sfromlang\ a comm., with a forew., by}},
+ byeditortrcoaf = {{edited, translated \lbx@lfromlang\ a commented, with an afterword, by}%
+ {ed.,\addabbrvspace překl\adddot\ \lbx@sfromlang\ a comm., with an afterw., by}},
+ byeditortranin = {{edited, translated \lbx@lfromlang\ a annotated, with an úvod, by}%
+ {ed.,\addabbrvspace překl\adddot\ \lbx@sfromlang\ a annot, with an introd., by}},
+ byeditortranfo = {{edited, translated \lbx@lfromlang\ a annotated, with a foreword, by}%
+ {ed.,\addabbrvspace překl\adddot\ \lbx@sfromlang\ a annot, with a forew., by}},
+ byeditortranaf = {{edited, translated \lbx@lfromlang\ a annotated, with an afterword, by}%
+ {ed.,\addabbrvspace překl\adddot\ \lbx@sfromlang\ a annot, with an afterw., by}},
+ bytranslatorco = {{translated \lbx@lfromlang\ a commented by}%
+ {překl\adddot\ \lbx@sfromlang\ a kom\adddot\ by}},
+ bytranslatoran = {{translated \lbx@lfromlang\ a annotated by}%
+ {překl\adddot\ \lbx@sfromlang\ a anot\adddot\ by}},
+ bytranslatorin = {{translated \lbx@lfromlang, with an úvod, by}%
+ {překl\adddot\ \lbx@sfromlang, with an introd., by}},
+ bytranslatorfo = {{translated \lbx@lfromlang, with a foreword, by}%
+ {překl\adddot\ \lbx@sfromlang, with a forew., by}},
+ bytranslatoraf = {{translated \lbx@lfromlang, with an afterword, by}%
+ {překl\adddot\ \lbx@sfromlang, with an afterw., by}},
+ bytranslatorcoin = {{translated \lbx@lfromlang\ a commented, with an úvod, by}%
+ {překl\adddot\ \lbx@sfromlang\ a comm., with an introd., by}},
+ bytranslatorcofo = {{translated \lbx@lfromlang\ a commented, with a foreword, by}%
+ {překl\adddot\ \lbx@sfromlang\ a comm., with a forew., by}},
+ bytranslatorcoaf = {{translated \lbx@lfromlang\ a commented, with an afterword, by}%
+ {překl\adddot\ \lbx@sfromlang\ a comm., with an afterw., by}},
+ bytranslatoranin = {{translated \lbx@lfromlang\ a annotated, with an úvod, by}%
+ {překl\adddot\ \lbx@sfromlang\ a annot., with an introd., by}},
+ bytranslatoranfo = {{translated \lbx@lfromlang\ a annotated, with a foreword, by}%
+ {překl\adddot\ \lbx@sfromlang\ a annot., with a forew., by}},
+ bytranslatoranaf = {{translated \lbx@lfromlang\ a annotated, with an afterword, by}%
+ {překl\adddot\ \lbx@sfromlang\ a annot., with an afterw., by}},
+ and = {{and}{and}},
+ %andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ andmore = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ %volume = {{volume}{vol\adddot}},
+ volumes = {{volumes}{vols\adddot}},
+ %jourvol = {{volume}{vol\adddot}},
+ jourser = {{series}{ser\adddot}},
+ newseries = {{new series}{new ser\adddot}},
+ oldseries = {{old series}{old ser\adddot}},
+ %edition = {{edition}{ed\adddot}},
+ reprint = {{reprint}{repr\adddot}},
+ reprintof = {{reprint of}{repr\adddotspace of}},
+ reprintas = {{reprinted as}{rpt\adddotspace as}},
+ %page = {{page}{p\adddot}},
+ %pages = {{pages}{pp\adddot}},
+ column = {{column}{col\adddot}},
+ columns = {{columns}{cols\adddot}},
+ line = {{řádek}{ř\adddot}},
+ lines = {{řádky}{ř\adddot}},
+ verse = {{verš}{v\adddot}},
+ verses = {{verše}{v\adddot}},
+ section = {{sekce}{\S}},
+ sections = {{secce}{\S\S}},
+ paragraph = {{odstavec}{ods\adddot}},
+ paragraphs = {{odstavce}{ods\adddot}},
+ in = {{in}{in}},
+ inseries = {{in}{in}},
+ ofseries = {{of}{of}},
+ %number = {{number}{no\adddot}},
+ chapter = {{kapitola}{kap\adddot}},
+ mathesis = {{diplomová práce}{dipl\addabbrvspace práce}},
+ phdthesis = {{disertační práce}{dis\addabbrvspace práce}},
+ resreport = {{výzkumná zpráca}{výzk\adddot zpr\adddot}},
+ techreport = {{technická zpráva}{tech\adddotspace zpr\adddot}},
+ software = {{počítačový software}{soft\adddot}},
+ datacd = {{CD-ROM}{CD-ROM}},
+ audiocd = {{audio CD}{audio CD}},
+ version = {{version}{version}},
+ %url = {{address}{address}},
+ %urlseen = {{visited on}{visited on}},
+ inpress = {{in press}{in press}},
+ submitted = {{submitted}{submitted}},
+ citedas = {{henceforth cited as}{henceforth cited as}},
+ thiscite = {{especially}{esp\adddot}},
+ seenote = {{viz poznámka}{viz poz\adddot}},
+ quotedin = {{quoted in}{qtd\adddotspace in}},
+ idem = {{idem}{idem}},
+ idemsm = {{idem}{idem}},
+ idemsf = {{eadem}{eadem}},
+ idemsn = {{idem}{idem}},
+ idempm = {{eidem}{eidem}},
+ idempf = {{eaedem}{eaedem}},
+ idempn = {{eadem}{eadem}},
+ idempp = {{eidem}{eidem}},
+ ibidem = {{ibidem}{ibid\adddot}},
+ opcit = {{op\adddotspace cit\adddot}{op\adddotspace cit\adddot}},
+ loccit = {{loc\adddotspace cit\adddot}{loc\adddotspace cit\adddot}},
+ confer = {{cf\adddot}{cf\adddot}},
+ sequens = {{sq\adddot}{sq\adddot}},
+ sequentes = {{sqq\adddot}{sqq\adddot}},
+ passim = {{passim}{pass\adddot}},
+ see = {{viz}{viz}},
+ seealso = {{viz také}{viz také}},
+ backrefpage = {{citováno na straně}{cit\adddotspace na s\adddot}},
+ backrefpages = {{citováno na stranách}{cit\adddotspace na s\adddot}},
+ january = {{ledna}{led\adddot}},
+ february = {{února}{ún\adddot}},
+ march = {{března}{břez\adddot}},
+ april = {{dubna}{dub\adddot}},
+ may = {{kvetna}{květ\adddot}},
+ june = {{června}{červ\adddot}},
+ july = {{července}{čvc}},
+ august = {{srpna}{srp\adddot}},
+ september = {{září}{zář\adddot}},
+ october = {{října}{říj\adddot}},
+ november = {{listopadu}{lis\adddot}},
+ december = {{prosince}{pros\adddot}},
+ langamerican = {{Americká angličtina}{Am\adddot angl\adddot}},
+ langbrazilian = {{Brazilská portugalština}{Braz\adddot portugal\adddot}},
+ langdanish = {{Dánština}{Dán\adddot}},
+ langdutch = {{Holandština}{Hol.\adddot}},
+ langenglish = {{Angličtina}{Angl\adddot}},
+ langfrench = {{Francouzština}{Franc\adddot}},
+ langgerman = {{Němčina}{Něm\adddot}},
+ langgreek = {{Řečtina}{Řeč\adddot}},
+ langitalian = {{Italština}{Ital\adddot}},
+ langlatin = {{Latina}{Lat\adddot}},
+ langnorwegian = {{Norština}{Norš\adddot}},
+ langportuguese = {{Portugalština}{Port\adddot}},
+ langspanish = {{Šanělština}{Špaň\adddot}},
+ langswedish = {{Švédština}{Švéd\adddot}},
+ fromamerican = {{z americké Angličtiny}{z amer\adddot angl\adddot}},
+ frombrazilian = {{z Brazilské Portugalštiny}{z Braz\adddot Port\adddot}},
+ fromdanish = {{z Danštiny}{z Dán\adddot}},
+ fromdutch = {{z Holandštiny}{z Hol\adddot}},
+ fromenglish = {{z Angličtiny}{z Angl\adddot}},
+ fromfrench = {{z Francouzštiny}{z Franc\adddot}},
+ fromgerman = {{z Němčiny}{z Něm\adddot}},
+ fromgreek = {{z Řečtiny}{z Řeč\adddot}},
+ fromitalian = {{z Italštiny}{z Ital\adddot}},
+ fromlatin = {{z Latiny}{z Lat\adddot}},
+ fromnorwegian = {{z Norštiny}{z Nor\adddot}},
+ fromportuguese = {{z Portugalštiny}{z Portuguese}},
+ fromspanish = {{ze Španělštiny}{ze Špaň\adddot}},
+ fromswedish = {{ze Švédštiny}{ze Švéd\adddot}},
+ countryde = {{Německo}{DE}},
+ countryeu = {{European Union}{EU}},
+ countryep = {{European Union}{EP}},
+ countryfr = {{Francie}{FR}},
+ countryuk = {{Velká Británie}{GB}},
+ countryus = {{Spojené Státy Americké}{US}},
+ patent = {{patent}{pat\adddot}},
+ patentde = {{German patent}{German pat\adddot}},
+ patenteu = {{European patent}{European pat\adddot}},
+ patentfr = {{French patent}{French pat\adddot}},
+ patentuk = {{British patent}{British pat\adddot}},
+ patentus = {{U.S\adddotspace patent}{U.S\adddotspace pat\adddot}},
+ patreq = {{patent request}{pat\adddot\ req\adddot}},
+ patreqde = {{German patent request}{German pat\adddot\ req\adddot}},
+ patreqeu = {{European patent request}{European pat\adddot\ req\adddot}},
+ patreqfr = {{French patent request}{French pat\adddot\ req\adddot}},
+ patrequk = {{British patent request}{British pat\adddot\ req\adddot}},
+ patrequs = {{U.S\adddotspace patent request}{U.S\adddotspace pat\adddot\ req\adddot}},
+ file = {{soubor}{soub\adddot}},
+ library = {{knihovna}{knih\adddot}},
+ abstract = {{abstrakt}{abst\adddot}},
+ annotation = {{anotace}{anot\adddot}},
+}
+
+
+\endinput
|