mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
remove !NEW_INSETS cruft from LyXAction and LyXParagraph
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1965 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes
parent
0cf6b74770
commit
662d0acd45
@ -10,8 +10,8 @@ src/CutAndPaste.C
|
||||
src/debug.C
|
||||
src/exporter.C
|
||||
src/ext_l10n.h
|
||||
src/figureForm.C
|
||||
src/figure_form.C
|
||||
src/figureForm.C
|
||||
src/FontLoader.C
|
||||
src/frontends/controllers/ButtonController.h
|
||||
src/frontends/controllers/character.C
|
||||
@ -90,67 +90,67 @@ src/frontends/qt2/paragraphdlgimpl.C
|
||||
src/frontends/qt2/tabularcreatedlgimpl.C
|
||||
src/frontends/xforms/combox.C
|
||||
src/frontends/xforms/FileDialog.C
|
||||
src/frontends/xforms/FormBibitem.C
|
||||
src/frontends/xforms/form_bibitem.C
|
||||
src/frontends/xforms/FormBibtex.C
|
||||
src/frontends/xforms/FormBibitem.C
|
||||
src/frontends/xforms/form_bibtex.C
|
||||
src/frontends/xforms/FormBibtex.C
|
||||
src/frontends/xforms/form_browser.C
|
||||
src/frontends/xforms/FormCharacter.C
|
||||
src/frontends/xforms/form_character.C
|
||||
src/frontends/xforms/FormCitation.C
|
||||
src/frontends/xforms/FormCharacter.C
|
||||
src/frontends/xforms/form_citation.C
|
||||
src/frontends/xforms/FormCopyright.C
|
||||
src/frontends/xforms/FormCitation.C
|
||||
src/frontends/xforms/form_copyright.C
|
||||
src/frontends/xforms/FormCredits.C
|
||||
src/frontends/xforms/FormCopyright.C
|
||||
src/frontends/xforms/form_credits.C
|
||||
src/frontends/xforms/FormDocument.C
|
||||
src/frontends/xforms/FormCredits.C
|
||||
src/frontends/xforms/form_document.C
|
||||
src/frontends/xforms/FormError.C
|
||||
src/frontends/xforms/FormDocument.C
|
||||
src/frontends/xforms/form_error.C
|
||||
src/frontends/xforms/FormExternal.C
|
||||
src/frontends/xforms/FormError.C
|
||||
src/frontends/xforms/form_external.C
|
||||
src/frontends/xforms/FormFiledialog.C
|
||||
src/frontends/xforms/FormExternal.C
|
||||
src/frontends/xforms/form_filedialog.C
|
||||
src/frontends/xforms/FormGraphics.C
|
||||
src/frontends/xforms/FormFiledialog.C
|
||||
src/frontends/xforms/form_graphics.C
|
||||
src/frontends/xforms/FormInclude.C
|
||||
src/frontends/xforms/FormGraphics.C
|
||||
src/frontends/xforms/form_include.C
|
||||
src/frontends/xforms/FormIndex.C
|
||||
src/frontends/xforms/FormInclude.C
|
||||
src/frontends/xforms/form_index.C
|
||||
src/frontends/xforms/FormIndex.C
|
||||
src/frontends/xforms/FormLog.C
|
||||
src/frontends/xforms/FormMathsBitmap.C
|
||||
src/frontends/xforms/FormMathsDeco.C
|
||||
src/frontends/xforms/form_maths_deco.C
|
||||
src/frontends/xforms/FormMathsDelim.C
|
||||
src/frontends/xforms/FormMathsDeco.C
|
||||
src/frontends/xforms/form_maths_delim.C
|
||||
src/frontends/xforms/FormMathsMatrix.C
|
||||
src/frontends/xforms/FormMathsDelim.C
|
||||
src/frontends/xforms/form_maths_matrix.C
|
||||
src/frontends/xforms/FormMathsPanel.C
|
||||
src/frontends/xforms/FormMathsMatrix.C
|
||||
src/frontends/xforms/form_maths_panel.C
|
||||
src/frontends/xforms/FormMathsSpace.C
|
||||
src/frontends/xforms/FormMathsPanel.C
|
||||
src/frontends/xforms/form_maths_space.C
|
||||
src/frontends/xforms/FormMinipage.C
|
||||
src/frontends/xforms/FormMathsSpace.C
|
||||
src/frontends/xforms/form_minipage.C
|
||||
src/frontends/xforms/FormParagraph.C
|
||||
src/frontends/xforms/FormMinipage.C
|
||||
src/frontends/xforms/form_paragraph.C
|
||||
src/frontends/xforms/FormPreamble.C
|
||||
src/frontends/xforms/FormParagraph.C
|
||||
src/frontends/xforms/form_preamble.C
|
||||
src/frontends/xforms/FormPreferences.C
|
||||
src/frontends/xforms/FormPreamble.C
|
||||
src/frontends/xforms/form_preferences.C
|
||||
src/frontends/xforms/FormPrint.C
|
||||
src/frontends/xforms/FormPreferences.C
|
||||
src/frontends/xforms/form_print.C
|
||||
src/frontends/xforms/FormRef.C
|
||||
src/frontends/xforms/FormPrint.C
|
||||
src/frontends/xforms/form_ref.C
|
||||
src/frontends/xforms/FormSearch.C
|
||||
src/frontends/xforms/FormRef.C
|
||||
src/frontends/xforms/form_search.C
|
||||
src/frontends/xforms/FormTabular.C
|
||||
src/frontends/xforms/FormSearch.C
|
||||
src/frontends/xforms/form_tabular.C
|
||||
src/frontends/xforms/FormTabularCreate.C
|
||||
src/frontends/xforms/FormTabular.C
|
||||
src/frontends/xforms/form_tabular_create.C
|
||||
src/frontends/xforms/FormToc.C
|
||||
src/frontends/xforms/FormTabularCreate.C
|
||||
src/frontends/xforms/form_toc.C
|
||||
src/frontends/xforms/FormUrl.C
|
||||
src/frontends/xforms/FormToc.C
|
||||
src/frontends/xforms/form_url.C
|
||||
src/frontends/xforms/FormUrl.C
|
||||
src/frontends/xforms/FormVCLog.C
|
||||
src/frontends/xforms/input_validators.C
|
||||
src/frontends/xforms/Menubar_pimpl.C
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
2001-04-26 Lars Gullik Bjønnes <larsbj@birdstep.com>
|
||||
|
||||
* LyXAction.C: removed all !NEW_INSETS cruft
|
||||
(init): moved lfun_item in method
|
||||
|
||||
* lyxparagraph.[Ch]: removed all !NEW_INSETS cruft
|
||||
|
||||
2001-04-26 Angus Leeming <a.leeming@ic.ac.uk>
|
||||
|
||||
* BufferView2.C (theLockingInset): white space.
|
||||
|
||||
@ -18,10 +18,6 @@
|
||||
#include "debug.h"
|
||||
#include "gettext.h"
|
||||
#include "support/lstrings.h"
|
||||
#if 1
|
||||
// only to get access to NEW_INSETS
|
||||
#include "lyxparagraph.h"
|
||||
#endif
|
||||
|
||||
using std::ostream;
|
||||
using std::endl;
|
||||
@ -42,7 +38,7 @@ using std::endl;
|
||||
|
||||
(May 19 1996, 12:04, RvdK)
|
||||
*/
|
||||
|
||||
|
||||
// These are globals.
|
||||
LyXAction lyxaction;
|
||||
|
||||
@ -58,13 +54,6 @@ void LyXAction::newFunc(kb_action action, string const & name,
|
||||
}
|
||||
|
||||
|
||||
struct lfun_item {
|
||||
kb_action action;
|
||||
char const * name;
|
||||
char const * helpText;
|
||||
unsigned int attrib;
|
||||
};
|
||||
|
||||
void LyXAction::init()
|
||||
{
|
||||
// This function was changed to use the array below in initalization
|
||||
@ -76,6 +65,13 @@ void LyXAction::init()
|
||||
static bool init = false;
|
||||
if (init) return;
|
||||
|
||||
struct lfun_item {
|
||||
kb_action action;
|
||||
char const * name;
|
||||
char const * helpText;
|
||||
unsigned int attrib;
|
||||
};
|
||||
|
||||
lfun_item items[] = {
|
||||
{ LFUN_ACUTE, "accent-acute", "", Noop },
|
||||
{ LFUN_BREVE, "accent-breve", "", Noop },
|
||||
@ -128,9 +124,6 @@ void LyXAction::init()
|
||||
{ LFUN_ENDBUFSEL, "buffer-end-select",
|
||||
N_("Select to end of document"), ReadOnly },
|
||||
{ LFUN_EXPORT, "buffer-export", N_("Export to"), ReadOnly },
|
||||
#ifndef NEW_INSETS
|
||||
{ LFUN_INSERTFOOTNOTE, "buffer-float-insert", "", Noop },
|
||||
#endif
|
||||
{ LFUN_IMPORT, "buffer-import",
|
||||
N_("Import document"), NoBuffer },
|
||||
{ LFUN_BUFFER_PRINT, "buffer-print-xtl", N_("Print"),
|
||||
@ -203,9 +196,6 @@ void LyXAction::init()
|
||||
{ LFUN_MENUSEARCH, "find-replace", N_("Find & Replace"),
|
||||
ReadOnly },
|
||||
{ LFUN_INSET_FLOAT, "float-insert", "", Noop },
|
||||
#if 0
|
||||
{ LFUN_FLOATSOPERATE, "floats-operate", "", ReadOnly },
|
||||
#endif
|
||||
{ LFUN_BOLD, "font-bold", N_("Toggle bold"), Noop },
|
||||
{ LFUN_CODE, "font-code", N_("Toggle code style"), Noop },
|
||||
{ LFUN_DEFAULT, "font-default", N_("Default font style"),
|
||||
@ -222,13 +212,8 @@ void LyXAction::init()
|
||||
ReadOnly },
|
||||
{ LFUN_UNDERLINE, "font-underline",
|
||||
N_("Toggle font underline"), Noop },
|
||||
#ifndef NEW_INSETS
|
||||
{ LFUN_FOOTMELT, "footnote-insert", N_("Insert Footnote"),
|
||||
Noop },
|
||||
#else
|
||||
{ LFUN_INSET_FOOTNOTE, "footnote-insert",
|
||||
N_("Insert Footnote"), Noop },
|
||||
#endif
|
||||
{ LFUN_RIGHTSEL, "forward-select", N_("Select next char"),
|
||||
ReadOnly },
|
||||
{ LFUN_HFILL, "hfill-insert",
|
||||
@ -302,10 +287,6 @@ void LyXAction::init()
|
||||
{ LFUN_QUIT, "lyx-quit", N_("Exit"), NoBuffer },
|
||||
{ LFUN_INSET_MARGINAL, "marginalnote-insert",
|
||||
N_("Insert Marginalnote"), Noop },
|
||||
#ifndef NEW_INSETS
|
||||
{ LFUN_MARGINMELT, "marginpar-insert",
|
||||
N_("Insert Margin note"), Noop },
|
||||
#endif
|
||||
{ LFUN_MARK_OFF, "mark-off", "", ReadOnly },
|
||||
{ LFUN_MARK_ON, "mark-on", "", ReadOnly },
|
||||
{ LFUN_SETMARK, "mark-toggle", "", ReadOnly },
|
||||
@ -325,9 +306,6 @@ void LyXAction::init()
|
||||
{ LFUN_MATH_EXTERN, "math-extern", "", Noop },
|
||||
{ LFUN_MATH_PANEL, "math-panel", "", Noop },
|
||||
{ LFUN_MATH_SIZE, "math-size", "", Noop },
|
||||
#if 0
|
||||
{ LFUN_MELT, "melt", N_("Melt"), Noop },
|
||||
#endif
|
||||
{ LFUN_MENU_OPEN_BY_NAME, "menu-open", "", NoBuffer },
|
||||
{ LFUN_MENU_SEPARATOR, "menu-separator-insert", "", Noop },
|
||||
{ LFUN_META_FAKE, "meta-prefix", "", NoBuffer },
|
||||
@ -686,7 +664,6 @@ bool LyXAction::funcHasFlag(kb_action action,
|
||||
"No info about kb_action: " << action << '\n';
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -66,64 +66,13 @@ public:
|
||||
#endif
|
||||
///
|
||||
enum META_KIND {
|
||||
#ifndef NEW_INSETS
|
||||
///
|
||||
META_FOOTNOTE = 1,
|
||||
///
|
||||
META_MARGIN,
|
||||
///
|
||||
META_FIG,
|
||||
///
|
||||
META_TAB,
|
||||
///
|
||||
META_ALGORITHM,
|
||||
///
|
||||
META_WIDE_FIG,
|
||||
///
|
||||
META_WIDE_TAB,
|
||||
///
|
||||
META_HFILL,
|
||||
#else
|
||||
///
|
||||
META_HFILL = 1,
|
||||
#endif
|
||||
///
|
||||
META_NEWLINE,
|
||||
//
|
||||
//META_PROTECTED_SEPARATOR,
|
||||
///
|
||||
META_INSET
|
||||
};
|
||||
#ifndef NEW_INSETS
|
||||
|
||||
/// The footnoteflag
|
||||
enum footnote_flag {
|
||||
///
|
||||
NO_FOOTNOTE,
|
||||
///
|
||||
OPEN_FOOTNOTE,
|
||||
///
|
||||
CLOSED_FOOTNOTE
|
||||
};
|
||||
|
||||
/// The footnotekinds
|
||||
enum footnote_kind {
|
||||
///
|
||||
FOOTNOTE,
|
||||
///
|
||||
MARGIN,
|
||||
///
|
||||
FIG,
|
||||
///
|
||||
TAB,
|
||||
///
|
||||
ALGORITHM, // Bernhard, 970807
|
||||
///
|
||||
WIDE_FIG, // CFO-G, 971106
|
||||
///
|
||||
WIDE_TAB // CFO-G, 971106
|
||||
};
|
||||
#endif
|
||||
///
|
||||
typedef char value_type;
|
||||
///
|
||||
@ -173,25 +122,14 @@ public:
|
||||
///
|
||||
LyXParagraph * TeXOnePar(Buffer const *, BufferParams const &,
|
||||
std::ostream &, TexRow & texrow,
|
||||
bool moving_arg
|
||||
#ifndef NEW_INSETS
|
||||
,
|
||||
std::ostream & foot, TexRow & foot_texrow,
|
||||
int & foot_count
|
||||
#endif
|
||||
);
|
||||
bool moving_arg);
|
||||
///
|
||||
bool SimpleTeXOnePar(Buffer const *, BufferParams const &,
|
||||
std::ostream &, TexRow & texrow, bool moving_arg);
|
||||
|
||||
///
|
||||
LyXParagraph * TeXEnvironment(Buffer const *, BufferParams const &,
|
||||
std::ostream &, TexRow & texrow
|
||||
#ifndef NEW_INSETS
|
||||
,std::ostream & foot, TexRow & foot_texrow,
|
||||
int & foot_count
|
||||
#endif
|
||||
);
|
||||
std::ostream &, TexRow & texrow);
|
||||
///
|
||||
LyXParagraph * Clone() const;
|
||||
|
||||
@ -236,20 +174,6 @@ public:
|
||||
|
||||
///
|
||||
LyXTextClass::LayoutList::size_type layout;
|
||||
#ifndef NEW_INSETS
|
||||
/**
|
||||
\begin{itemize}
|
||||
\item no footnote, closed footnote,
|
||||
\item open footnote, where footnote
|
||||
\item means footnote-environment
|
||||
\end{itemize}
|
||||
*/
|
||||
footnote_flag footnoteflag;
|
||||
|
||||
/// footnote, margin, fig, tab
|
||||
footnote_kind footnotekind;
|
||||
#endif
|
||||
|
||||
private:
|
||||
///
|
||||
boost::array<int, 10> counter_;
|
||||
@ -266,9 +190,7 @@ public:
|
||||
|
||||
///
|
||||
char itemdepth;
|
||||
#ifdef NEW_INSETS
|
||||
private:
|
||||
#endif
|
||||
///
|
||||
LyXParagraph * next_;
|
||||
///
|
||||
@ -292,30 +214,6 @@ public:
|
||||
///
|
||||
LyXParagraph const * previous() const;
|
||||
|
||||
#ifndef NEW_INSETS
|
||||
/** these function are able to hide open and closed footnotes
|
||||
*/
|
||||
LyXParagraph * NextAfterFootnote();
|
||||
///
|
||||
LyXParagraph const * NextAfterFootnote() const;
|
||||
|
||||
///
|
||||
LyXParagraph * PreviousBeforeFootnote();
|
||||
///
|
||||
LyXParagraph * LastPhysicalPar();
|
||||
///
|
||||
LyXParagraph const * LastPhysicalPar() const;
|
||||
|
||||
///
|
||||
LyXParagraph * FirstPhysicalPar();
|
||||
///
|
||||
LyXParagraph const * FirstPhysicalPar() const;
|
||||
/// returns the physical paragraph
|
||||
LyXParagraph * ParFromPos(size_type pos);
|
||||
/// returns the position in the physical par
|
||||
int PositionInParFromPos(size_type pos) const;
|
||||
#endif
|
||||
|
||||
/// for the environments
|
||||
LyXParagraph * DepthHook(int depth);
|
||||
/// for the environments
|
||||
@ -336,21 +234,10 @@ public:
|
||||
char GetAlign() const;
|
||||
///
|
||||
char GetDepth() const;
|
||||
#ifndef NEW_INSETS
|
||||
///
|
||||
void SetLayout(BufferParams const &,
|
||||
LyXTextClass::LayoutList::size_type new_layout);
|
||||
///
|
||||
void SetOnlyLayout(BufferParams const &,
|
||||
LyXTextClass::LayoutList::size_type new_layout);
|
||||
///
|
||||
size_type Last() const;
|
||||
#else
|
||||
///
|
||||
void SetLayout(LyXTextClass::LayoutList::size_type new_layout);
|
||||
///
|
||||
void SetOnlyLayout(LyXTextClass::LayoutList::size_type new_layout);
|
||||
#endif
|
||||
///
|
||||
int GetFirstCounter(int i) const;
|
||||
///
|
||||
@ -361,9 +248,9 @@ public:
|
||||
///
|
||||
void BreakParagraphConservative(BufferParams const &, size_type pos);
|
||||
/** Get unistantiated font setting. Returns the difference
|
||||
between the characters font and the layoutfont.
|
||||
This is what is stored in the fonttable
|
||||
*/
|
||||
between the characters font and the layoutfont.
|
||||
This is what is stored in the fonttable
|
||||
*/
|
||||
LyXFont const
|
||||
GetFontSettings(BufferParams const &, size_type pos) const;
|
||||
///
|
||||
@ -404,12 +291,6 @@ public:
|
||||
Inset * GetInset(size_type pos);
|
||||
///
|
||||
Inset const * GetInset(size_type pos) const;
|
||||
#ifndef NEW_INSETS
|
||||
///
|
||||
void OpenFootnote(size_type pos);
|
||||
///
|
||||
void CloseFootnote(size_type pos);
|
||||
#endif
|
||||
/** important for cut and paste
|
||||
Temporary change from BufferParams to Buffer. Will revert when we
|
||||
get rid of the argument to Inset::Clone(Buffer const &) */
|
||||
@ -423,10 +304,6 @@ public:
|
||||
bool IsHfill(size_type pos) const;
|
||||
///
|
||||
bool IsInset(size_type pos) const;
|
||||
#ifndef NEW_INSETS
|
||||
///
|
||||
bool IsFloat(size_type pos) const;
|
||||
#endif
|
||||
///
|
||||
bool IsNewline(size_type pos) const;
|
||||
///
|
||||
@ -441,13 +318,13 @@ public:
|
||||
bool IsWord(size_type pos) const;
|
||||
|
||||
/** This one resets all layout and dtp switches but not the font
|
||||
of the single characters
|
||||
*/
|
||||
of the single characters
|
||||
*/
|
||||
void Clear();
|
||||
|
||||
/** paste this paragraph with the next one
|
||||
be carefull, this doesent make any check at all
|
||||
*/
|
||||
be carefull, this doesent make any check at all
|
||||
*/
|
||||
void PasteParagraph(BufferParams const &);
|
||||
|
||||
/// used to remove the error messages
|
||||
@ -456,28 +333,9 @@ public:
|
||||
/// returns -1 if inset not found
|
||||
int GetPositionOfInset(Inset * inset) const;
|
||||
|
||||
#ifndef NEW_INSETS
|
||||
/// ok and now some footnote functions
|
||||
void OpenFootnotes();
|
||||
|
||||
///
|
||||
void CloseFootnotes();
|
||||
///
|
||||
LyXParagraph * FirstSelfrowPar();
|
||||
#endif
|
||||
|
||||
///
|
||||
int StripLeadingSpaces(LyXTextClassList::size_type tclass);
|
||||
|
||||
#ifndef NEW_INSETS
|
||||
/** A paragraph following a footnote is a "dummy". A paragraph
|
||||
with a footnote in it is stored as three paragraphs:
|
||||
First a paragraph with the text up to the footnote, then
|
||||
one (or more) paragraphs with the footnote, and finally
|
||||
the a paragraph with the text after the footnote. Only the
|
||||
first paragraph keeps information about layoutparameters, */
|
||||
bool IsDummy() const;
|
||||
#endif
|
||||
#ifndef NO_PEXTRA_REALLY
|
||||
/* If I set a PExtra Indent on one paragraph of a ENV_LIST-TYPE
|
||||
I have to set it on each of it's elements */
|
||||
@ -511,23 +369,23 @@ private:
|
||||
}
|
||||
};
|
||||
/** A font entry covers a range of positions. Notice that the
|
||||
entries in the list are inserted in random order.
|
||||
I don't think it's worth the effort to implement a more effective
|
||||
datastructure, because the number of different fonts in a paragraph
|
||||
is limited. (Asger)
|
||||
Nevertheless, I decided to store fontlist using a sorted vector:
|
||||
fontlist = { {pos_1,font_1} , {pos_2,font_2} , ... } where
|
||||
pos_1 < pos_2 < ..., font_{i-1} != font_i for all i,
|
||||
and font_i covers the chars in positions pos_{i-1}+1,...,pos_i
|
||||
(font_1 covers the chars 0,...,pos_1) (Dekel)
|
||||
entries in the list are inserted in random order.
|
||||
I don't think it's worth the effort to implement a more effective
|
||||
datastructure, because the number of different fonts in a paragraph
|
||||
is limited. (Asger)
|
||||
Nevertheless, I decided to store fontlist using a sorted vector:
|
||||
fontlist = { {pos_1,font_1} , {pos_2,font_2} , ... } where
|
||||
pos_1 < pos_2 < ..., font_{i-1} != font_i for all i,
|
||||
and font_i covers the chars in positions pos_{i-1}+1,...,pos_i
|
||||
(font_1 covers the chars 0,...,pos_1) (Dekel)
|
||||
*/
|
||||
struct FontTable {
|
||||
///
|
||||
FontTable(size_type p, LyXFont const & f)
|
||||
: pos_(p)
|
||||
{
|
||||
font_ = container.get(f);
|
||||
}
|
||||
{
|
||||
font_ = container.get(f);
|
||||
}
|
||||
///
|
||||
size_type pos() const { return pos_; }
|
||||
///
|
||||
@ -540,13 +398,13 @@ private:
|
||||
/// End position of paragraph this font attribute covers
|
||||
size_type pos_;
|
||||
/** Font. Interpretation of the font values:
|
||||
If a value is LyXFont::INHERIT_*, it means that the font
|
||||
attribute is inherited from either the layout of this
|
||||
paragraph or, in the case of nested paragraphs, from the
|
||||
layout in the environment one level up until completely
|
||||
resolved.
|
||||
The values LyXFont::IGNORE_* and LyXFont::TOGGLE are NOT
|
||||
allowed in these font tables.
|
||||
If a value is LyXFont::INHERIT_*, it means that the font
|
||||
attribute is inherited from either the layout of this
|
||||
paragraph or, in the case of nested paragraphs, from the
|
||||
layout in the environment one level up until completely
|
||||
resolved.
|
||||
The values LyXFont::IGNORE_* and LyXFont::TOGGLE are NOT
|
||||
allowed in these font tables.
|
||||
*/
|
||||
boost::shared_ptr<LyXFont> font_;
|
||||
///
|
||||
@ -574,20 +432,7 @@ private:
|
||||
InsetList insetlist;
|
||||
///
|
||||
LyXParagraph * TeXDeeper(Buffer const *, BufferParams const &,
|
||||
std::ostream &, TexRow & texrow
|
||||
#ifndef NEW_INSETS
|
||||
,std::ostream & foot, TexRow & foot_texrow,
|
||||
int & foot_count
|
||||
#endif
|
||||
);
|
||||
#ifndef NEW_INSETS
|
||||
///
|
||||
LyXParagraph * TeXFootnote(Buffer const *, BufferParams const &,
|
||||
std::ostream &, TexRow & texrow,
|
||||
std::ostream & foot, TexRow & foot_texrow,
|
||||
int & foot_count,
|
||||
bool parent_is_rtl);
|
||||
#endif
|
||||
std::ostream &, TexRow & texrow);
|
||||
///
|
||||
void SimpleTeXBlanks(std::ostream &, TexRow & texrow,
|
||||
size_type const i,
|
||||
@ -651,7 +496,6 @@ LyXParagraph::size_type LyXParagraph::size() const
|
||||
}
|
||||
|
||||
|
||||
#ifdef NEW_INSETS
|
||||
inline
|
||||
LyXParagraph::value_type
|
||||
LyXParagraph::GetChar(LyXParagraph::size_type pos) const
|
||||
@ -666,7 +510,7 @@ LyXParagraph::GetChar(LyXParagraph::size_type pos) const
|
||||
|
||||
return text[pos];
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
inline
|
||||
int LyXParagraph::id() const
|
||||
@ -685,11 +529,7 @@ void LyXParagraph::id(int id_arg)
|
||||
inline
|
||||
LyXTextClass::size_type LyXParagraph::GetLayout() const
|
||||
{
|
||||
#ifndef NEW_INSETS
|
||||
return FirstPhysicalPar()->layout;
|
||||
#else
|
||||
return layout;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
1807
src/paragraph.C
1807
src/paragraph.C
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user