mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-24 13:48:59 +00:00
New tag MaxCiteNames
This determines the number of authors before "et al.". We had it hardcoded to 2, but actually the nuumber differs.
This commit is contained in:
parent
23c231c761
commit
979294d5ec
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
# Author: Julien Rioux <jrioux@lyx.org>
|
# Author: Julien Rioux <jrioux@lyx.org>
|
||||||
|
|
||||||
Format 62
|
Format 63
|
||||||
|
|
||||||
# The framework (biblatex|bibtex)
|
# The framework (biblatex|bibtex)
|
||||||
CiteFramework bibtex
|
CiteFramework bibtex
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
# Author: Julien Rioux <jrioux@lyx.org>
|
# Author: Julien Rioux <jrioux@lyx.org>
|
||||||
|
|
||||||
Format 62
|
Format 63
|
||||||
|
|
||||||
Requires jurabib
|
Requires jurabib
|
||||||
|
|
||||||
@ -22,6 +22,9 @@ CiteEngineType authoryear
|
|||||||
# Default style file
|
# Default style file
|
||||||
DefaultBiblio jurabib
|
DefaultBiblio jurabib
|
||||||
|
|
||||||
|
# Maximum number of names before "et al." chimes in
|
||||||
|
MaxCiteNames 3
|
||||||
|
|
||||||
|
|
||||||
# The syntax of the cite command definitions below is:
|
# The syntax of the cite command definitions below is:
|
||||||
# LyXName|alias*<!_stardesc!_stardesctooltip>[][]=latexcmd
|
# LyXName|alias*<!_stardesc!_stardesctooltip>[][]=latexcmd
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
# Author: Julien Rioux <jrioux@lyx.org>
|
# Author: Julien Rioux <jrioux@lyx.org>
|
||||||
|
|
||||||
Format 62
|
Format 63
|
||||||
|
|
||||||
Requires natbib
|
Requires natbib
|
||||||
|
|
||||||
@ -23,6 +23,9 @@ CiteEngineType authoryear|numerical
|
|||||||
# Default style files for either engine type
|
# Default style files for either engine type
|
||||||
DefaultBiblio authoryear:plainnat|numerical:plainnat
|
DefaultBiblio authoryear:plainnat|numerical:plainnat
|
||||||
|
|
||||||
|
# Maximum number of names before "et al." chimes in
|
||||||
|
MaxCiteNames 2
|
||||||
|
|
||||||
|
|
||||||
# The syntax of the cite command definitions below is:
|
# The syntax of the cite command definitions below is:
|
||||||
# LyXName|alias*<!_stardesc!_stardesctooltip>[][]=latexcmd
|
# LyXName|alias*<!_stardesc!_stardesctooltip>[][]=latexcmd
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
# This script will update a .layout file to current format
|
# This script will update a .layout file to current format
|
||||||
|
|
||||||
# The latest layout format is also defined in src/TextClass.cpp
|
# The latest layout format is also defined in src/TextClass.cpp
|
||||||
currentFormat = 62
|
currentFormat = 63
|
||||||
|
|
||||||
|
|
||||||
# Incremented to format 4, 6 April 2007, lasgouttes
|
# Incremented to format 4, 6 April 2007, lasgouttes
|
||||||
@ -208,6 +208,10 @@ currentFormat = 62
|
|||||||
# Incremented to format 62, 21 October 2016 by spitz
|
# Incremented to format 62, 21 October 2016 by spitz
|
||||||
# New Layout argument tag "PassThru"
|
# New Layout argument tag "PassThru"
|
||||||
|
|
||||||
|
# Incremented to format 63, 7 January 2017 by spitz
|
||||||
|
# - New textclass tags CiteFramework, MaxCiteNames (for cite engines)
|
||||||
|
# - Extended InsetCite syntax.
|
||||||
|
|
||||||
# Do not forget to document format change in Customization
|
# Do not forget to document format change in Customization
|
||||||
# Manual (section "Declaring a new text class").
|
# Manual (section "Declaring a new text class").
|
||||||
|
|
||||||
@ -451,7 +455,7 @@ def convert(lines, end_format):
|
|||||||
i += 1
|
i += 1
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if format >= 60 and format <= 61:
|
if format >= 60 and format <= 62:
|
||||||
# nothing to do.
|
# nothing to do.
|
||||||
i += 1
|
i += 1
|
||||||
continue
|
continue
|
||||||
|
@ -62,7 +62,7 @@ namespace lyx {
|
|||||||
// You should also run the development/tools/updatelayouts.py script,
|
// You should also run the development/tools/updatelayouts.py script,
|
||||||
// to update the format of all of our layout files.
|
// to update the format of all of our layout files.
|
||||||
//
|
//
|
||||||
int const LAYOUT_FORMAT = 62; //spitz PassThru for arguments.
|
int const LAYOUT_FORMAT = 63; //spitz: new tags CiteFramework, MaxCiteNames, extended InsetCite syntax.
|
||||||
|
|
||||||
|
|
||||||
// Layout format for the current lyx file format. Controls which format is
|
// Layout format for the current lyx file format. Controls which format is
|
||||||
@ -155,7 +155,7 @@ TextClass::TextClass()
|
|||||||
outputType_(LATEX), outputFormat_("latex"),
|
outputType_(LATEX), outputFormat_("latex"),
|
||||||
defaultfont_(sane_font),
|
defaultfont_(sane_font),
|
||||||
titletype_(TITLE_COMMAND_AFTER), titlename_("maketitle"),
|
titletype_(TITLE_COMMAND_AFTER), titlename_("maketitle"),
|
||||||
min_toclevel_(0), max_toclevel_(0),
|
min_toclevel_(0), max_toclevel_(0), maxcitenames_(2),
|
||||||
cite_full_author_list_(true)
|
cite_full_author_list_(true)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@ -222,6 +222,7 @@ enum TextClassTags {
|
|||||||
TC_CITEENGINETYPE,
|
TC_CITEENGINETYPE,
|
||||||
TC_CITEFORMAT,
|
TC_CITEFORMAT,
|
||||||
TC_CITEFRAMEWORK,
|
TC_CITEFRAMEWORK,
|
||||||
|
TC_MAXCITENAMES,
|
||||||
TC_DEFAULTBIBLIO,
|
TC_DEFAULTBIBLIO,
|
||||||
TC_FULLAUTHORLIST,
|
TC_FULLAUTHORLIST,
|
||||||
TC_OUTLINERNAME
|
TC_OUTLINERNAME
|
||||||
@ -256,6 +257,7 @@ LexerKeyword textClassTags[] = {
|
|||||||
{ "input", TC_INPUT },
|
{ "input", TC_INPUT },
|
||||||
{ "insetlayout", TC_INSETLAYOUT },
|
{ "insetlayout", TC_INSETLAYOUT },
|
||||||
{ "leftmargin", TC_LEFTMARGIN },
|
{ "leftmargin", TC_LEFTMARGIN },
|
||||||
|
{ "maxcitenames", TC_MAXCITENAMES },
|
||||||
{ "modifystyle", TC_MODIFYSTYLE },
|
{ "modifystyle", TC_MODIFYSTYLE },
|
||||||
{ "nocounter", TC_NOCOUNTER },
|
{ "nocounter", TC_NOCOUNTER },
|
||||||
{ "nofloat", TC_NOFLOAT },
|
{ "nofloat", TC_NOFLOAT },
|
||||||
@ -765,6 +767,11 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
|
|||||||
citeframework_ = rtrim(lexrc.getString());
|
citeframework_ = rtrim(lexrc.getString());
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case TC_MAXCITENAMES:
|
||||||
|
lexrc.next();
|
||||||
|
maxcitenames_ = size_t(lexrc.getInteger());
|
||||||
|
break;
|
||||||
|
|
||||||
case TC_DEFAULTBIBLIO:
|
case TC_DEFAULTBIBLIO:
|
||||||
if (lexrc.next()) {
|
if (lexrc.next()) {
|
||||||
vector<string> const dbs =
|
vector<string> const dbs =
|
||||||
|
@ -335,6 +335,8 @@ protected:
|
|||||||
std::map<std::string, std::string> cite_default_biblio_style_;
|
std::map<std::string, std::string> cite_default_biblio_style_;
|
||||||
/// Citation command aliases
|
/// Citation command aliases
|
||||||
std::map<std::string, std::string> cite_command_aliases_;
|
std::map<std::string, std::string> cite_command_aliases_;
|
||||||
|
/// The maximum number of citations before "et al."
|
||||||
|
size_t maxcitenames_;
|
||||||
/// Whether full author lists are supported
|
/// Whether full author lists are supported
|
||||||
bool cite_full_author_list_;
|
bool cite_full_author_list_;
|
||||||
/// The possible citation styles
|
/// The possible citation styles
|
||||||
@ -498,6 +500,8 @@ public:
|
|||||||
///
|
///
|
||||||
std::map<std::string, std::string> const & citeCommandAliases() const
|
std::map<std::string, std::string> const & citeCommandAliases() const
|
||||||
{ return cite_command_aliases_; }
|
{ return cite_command_aliases_; }
|
||||||
|
/// The maximum number of citations before "et al."
|
||||||
|
size_t max_citenames() const { return maxcitenames_; }
|
||||||
///
|
///
|
||||||
bool const & fullAuthorList() const { return cite_full_author_list_; }
|
bool const & fullAuthorList() const { return cite_full_author_list_; }
|
||||||
protected:
|
protected:
|
||||||
|
Loading…
Reference in New Issue
Block a user