mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Whitespace, only whitespace. s/ +$//
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10024 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming
parent
3347317b27
commit
70572847e2
@ -553,8 +553,8 @@ AC_SUBST(FRONTENDS_PROGS)
|
||||
])
|
||||
|
||||
|
||||
## Check what kind of packaging should be used at install time.
|
||||
## The default is autodetected.
|
||||
## Check what kind of packaging should be used at install time.
|
||||
## The default is autodetected.
|
||||
AC_DEFUN([LYX_USE_PACKAGING],
|
||||
[AC_MSG_CHECKING([what packaging should be used])
|
||||
AC_ARG_WITH(packaging,
|
||||
@ -567,20 +567,20 @@ AC_ARG_WITH(packaging,
|
||||
*) lyx_use_packaging=posix;;
|
||||
esac])
|
||||
AC_MSG_RESULT($lyx_use_packaging)
|
||||
case $lyx_use_packaging in
|
||||
macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
|
||||
case $lyx_use_packaging in
|
||||
macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
|
||||
default_prefix="/Applications/LyX.app"
|
||||
bindir='${prefix}/Contents/MacOS'
|
||||
libdir='${prefix}/Contents/Resources'
|
||||
datadir='${prefix}/Contents/Resources'
|
||||
mandir='${prefix}/Contents/Resources/man' ;;
|
||||
windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout])
|
||||
windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout])
|
||||
default_prefix="C:/Program Files/LyX"
|
||||
bindir='${prefix}/bin'
|
||||
libdir='${prefix}/Resources'
|
||||
datadir='${prefix}/Resources'
|
||||
mandir='${prefix}/Resources/man' ;;
|
||||
posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout])
|
||||
posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout])
|
||||
default_prefix=$ac_default_prefix ;;
|
||||
*) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
|
||||
esac
|
||||
|
||||
@ -7,8 +7,8 @@ AC_DEFUN([CHECK_WITH_ASPELL],
|
||||
test "$with_aspell" = "no" && lyx_use_aspell=false
|
||||
|
||||
if $lyx_use_aspell ; then
|
||||
AC_CHECK_HEADERS(aspell.h aspell/aspell.h,
|
||||
[lyx_use_aspell=true; break;],
|
||||
AC_CHECK_HEADERS(aspell.h aspell/aspell.h,
|
||||
[lyx_use_aspell=true; break;],
|
||||
[lyx_use_aspell=false])
|
||||
AC_CHECK_LIB(aspell, new_aspell_config, LIBS="-laspell $LIBS", lyx_use_aspell=false)
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ LyX file-format changes
|
||||
2005-01-23 Jürgen Spitzmüller <j.spitzmüller@gmx.de>
|
||||
|
||||
* format incremented to 240.
|
||||
* new bufferparam:
|
||||
* new bufferparam:
|
||||
\output_changes {true|false}
|
||||
(should the change tracking marks be visible in the output or not?)
|
||||
* lyx2lyx should just delete the param in 239.
|
||||
|
||||
@ -13,7 +13,7 @@ ASCII text representation of a DVI file.
|
||||
|
||||
References for DVI file structure:
|
||||
----------------------------------
|
||||
|
||||
|
||||
In this distribution:
|
||||
|
||||
dvi.doc
|
||||
@ -21,7 +21,7 @@ In this distribution:
|
||||
In the TeX archives:
|
||||
|
||||
CTAN: dviware/driv-standard/level-0/dvistd0.tex
|
||||
|
||||
|
||||
"The DVI Driver Standard, Level 0",
|
||||
by The TUG DVI Driver Standards Committee (now defunct)
|
||||
chaired by Joachim Schrod.
|
||||
@ -39,7 +39,7 @@ The other DTL commands correspond one-to-one with DVI commands, but I
|
||||
have used briefer names (except for `special') than those used in the
|
||||
DVI standards document.
|
||||
|
||||
DTL : DVI
|
||||
DTL : DVI
|
||||
|
||||
(text) : series of set_char commands, for printable ASCII text
|
||||
\( : literal ASCII left parenthesis in (text)
|
||||
|
||||
@ -22,7 +22,7 @@ DVI Commands
|
||||
Listed in the free format:
|
||||
"Opcode Symbol Parameter[Signed? Bytes] ... Action".
|
||||
|
||||
|
||||
|
||||
0 set_char_0 - set character 0 from current font
|
||||
...
|
||||
127 set_char_127 - set character 127 from current font
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
!ifdef HAVE_SYSTEM_PLUGIN
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; RefreshShellIcons based on
|
||||
;; RefreshShellIcons based on
|
||||
;; http://nsis.sourceforge.net/archive/nsisweb.php?page=236&instances=0
|
||||
;; by jerome tremblay - april 2003
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ Type=Label
|
||||
Left=5
|
||||
Right=-1
|
||||
Top=0
|
||||
Bottom=10
|
||||
Bottom=10
|
||||
|
||||
[Field 2]
|
||||
Type=RadioButton
|
||||
|
||||
@ -32,7 +32,7 @@ Pop $R2
|
||||
|
||||
StrCmp $R2 "Admin" 0 Continue
|
||||
; Observation: I get here when running Win98SE. (Lilla)
|
||||
; The functions UserInfo.dll looks for are there on Win98 too,
|
||||
; The functions UserInfo.dll looks for are there on Win98 too,
|
||||
; but just don't work. So UserInfo.dll, knowing that admin isn't required
|
||||
; on Win98, returns admin anyway. (per kichik)
|
||||
; MessageBox MB_OK 'User "$R1" is in the Administrators group'
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# it with the rest of us. Send it using the `glibcbug' script to
|
||||
# bugs@gnu.org.
|
||||
|
||||
# Packages using this file:
|
||||
# Packages using this file:
|
||||
|
||||
bokmal nb_NO.ISO-8859-1
|
||||
bokmål nb_NO.ISO-8859-1
|
||||
|
||||
@ -414,8 +414,8 @@ static const unsigned char yyrline[] =
|
||||
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
|
||||
static const char *const yytname[] =
|
||||
{
|
||||
"$end", "error", "$undefined", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
|
||||
"ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
|
||||
"$end", "error", "$undefined", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
|
||||
"ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
|
||||
"$accept", "start", "exp", 0
|
||||
};
|
||||
#endif
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
* ui/stdmenus.ui
|
||||
* ui/classic.ui: fix use of "..." according to KDE
|
||||
human interface guidelines; fix capitalization; align
|
||||
functionality of stdmenus.ui and classic.ui; remove
|
||||
functionality of stdmenus.ui and classic.ui; remove
|
||||
"inset-toggle"; remove "Bibliography Key" from classic.ui
|
||||
|
||||
|
||||
2005-05-20 Michael Schmitt <michael.schmitt@teststep.org>
|
||||
|
||||
* configure.m4: rename "ASCII" to "Plain text"
|
||||
@ -23,14 +23,14 @@
|
||||
|
||||
* layouts/report.layout: no need to change LabelString here
|
||||
|
||||
* layouts/heb-article.layout:
|
||||
* layouts/heb-letter.layout:
|
||||
* layouts/heb-article.layout:
|
||||
* layouts/heb-letter.layout:
|
||||
* layouts/dinbrief.layout: avoid 8bit characters
|
||||
|
||||
* layouts/scrclass.inc: no need to reset LabelString here
|
||||
|
||||
* layouts/amsbook.layout: no need to remove numbering of paragraph
|
||||
layout.
|
||||
layout.
|
||||
|
||||
* layouts/amsdefs.inc: fix case of LabelString
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
* layouts/llncs.layout: fix some font sizes; change description;
|
||||
fix subsection counter.
|
||||
|
||||
* layouts/apa.layout:
|
||||
* layouts/apa.layout:
|
||||
* layouts/seminar.layout: fix numbering; change description
|
||||
|
||||
2005-05-09 Michael Schmitt <michael.schmitt@teststep.org>
|
||||
@ -62,7 +62,7 @@
|
||||
|
||||
* ui/*.ui: Synchronize menu entries with dialog titles:
|
||||
"TeX" => "TeX Code", "BibTeX Reference" => "BibTeX Bibliography",
|
||||
"Citation Reference" => "Citation", "Cross Reference" =>
|
||||
"Citation Reference" => "Citation", "Cross Reference" =>
|
||||
"Cross-reference"; fix semantics: "Goto Reference" => "Goto Label",
|
||||
"Refs" => "Labels"
|
||||
|
||||
@ -102,7 +102,7 @@
|
||||
2005-04-14 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* layouts/scrclass.inc: do not assign a toclevel to addchap or
|
||||
addsec.
|
||||
addsec.
|
||||
|
||||
* layouts/numreport.inc: use data from numarticle.inc, so that
|
||||
changes from article are obvious.
|
||||
@ -118,7 +118,7 @@
|
||||
|
||||
2005-04-15 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* scripts/convertDefault.sh: post error messages to STDERR.
|
||||
* scripts/convertDefault.sh: post error messages to STDERR.
|
||||
|
||||
2005-04-09 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
@ -187,7 +187,7 @@
|
||||
|
||||
2005-02-09 Martin Vermeer <martin.vermeer@hut.fi>
|
||||
|
||||
* ui/stdmenus.ui: add facilities for drawing/deleting partition
|
||||
* ui/stdmenus.ui: add facilities for drawing/deleting partition
|
||||
lines in matrix
|
||||
|
||||
2005-02-08 Mike Ressler <mike.ressler@alum.mit.edu>
|
||||
@ -196,11 +196,11 @@
|
||||
|
||||
2005-02-03 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* reLyX/configure.ac: use AC_CANONICAL_TARGET; use
|
||||
RELYX_USE_PACKAGING as in main configure.
|
||||
* reLyX/configure.ac: use AC_CANONICAL_TARGET; use
|
||||
RELYX_USE_PACKAGING as in main configure.
|
||||
|
||||
* reLyX/acinclude.m4 (RELYX_ERROR, RELYX_USE_PACKAGING): new
|
||||
macros.
|
||||
macros.
|
||||
|
||||
2005-01-24 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||
|
||||
@ -261,7 +261,7 @@
|
||||
2004-12-16 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.m4: remove code for checking languages in the LaTeX
|
||||
format...
|
||||
format...
|
||||
|
||||
* chkconfig.ltx: ... and replace it with a TeX solution
|
||||
|
||||
@ -326,7 +326,7 @@
|
||||
|
||||
2004-10-28 José Matos <jamatos@lyx.org>
|
||||
|
||||
* layouts/agu_stdclass.inc:
|
||||
* layouts/agu_stdclass.inc:
|
||||
* layouts/agu_stdsections.inc: since we are using substituion
|
||||
change the the dread " to <> syntax, since that can never
|
||||
happen in a parameter.
|
||||
|
||||
@ -463,16 +463,16 @@ changequote(,)dnl
|
||||
b
|
||||
|
||||
:match
|
||||
# Remove the \DeclareFOOClass macro and add the correct boolean
|
||||
# at the end of the line telling whether the class is
|
||||
# Remove the \DeclareFOOClass macro and add the correct boolean
|
||||
# at the end of the line telling whether the class is
|
||||
# available
|
||||
s/^.*\DeclareLaTeXClass *\(.*\)/\1 "false"/
|
||||
s/^.*\DeclareDocBookClass *\(.*\)/\1 "'$bool_docbook'"/
|
||||
s/^.*\DeclareLinuxDocClass *\(.*\)/\1 "'$bool_linuxdoc'"/
|
||||
# If the macro had an optional argument with several
|
||||
# If the macro had an optional argument with several
|
||||
# parameters, only keep the first one
|
||||
s/\[\([^,]*\),[^]]*\]/[\1]/
|
||||
# If the macro did not have an optional argument, provide one
|
||||
# If the macro did not have an optional argument, provide one
|
||||
# (equal to the class name)
|
||||
s/^{/['$class']{/
|
||||
# Remove brackets and replace with correctly quoted entries
|
||||
|
||||
@ -60,7 +60,7 @@ def build_from_toc(par_list):
|
||||
|
||||
if len(par_list) == 1:
|
||||
return par_list
|
||||
|
||||
|
||||
for i in range(1, len(par_list)):
|
||||
if par_list[i].name == 'Title':
|
||||
return [par] + \
|
||||
@ -80,7 +80,7 @@ def nest_struct(name, par_list):
|
||||
|
||||
if len(par_list) == 1:
|
||||
return par_list
|
||||
|
||||
|
||||
for i in range(1, len(par_list)):
|
||||
if par_list[i].name == name:
|
||||
par.child = build_from_toc(par_list[1:i])
|
||||
@ -111,7 +111,7 @@ def main(argv):
|
||||
file = LyX.File(input= file)
|
||||
file.convert()
|
||||
toc_general.extend(file.get_toc())
|
||||
|
||||
|
||||
file = LyX.NewFile(output= pref + 'TOC.lyx')
|
||||
data = info[lang]
|
||||
file.set_header(language = data[0], language_quotes = data[1], inputencoding = data[2])
|
||||
|
||||
@ -628,7 +628,7 @@ def update_longtables(file):
|
||||
i = find_token(body, '<features', i)
|
||||
if i == -1:
|
||||
break
|
||||
|
||||
|
||||
# is this a longtable?
|
||||
longtable = longtable_re.search(body[i])
|
||||
|
||||
|
||||
@ -110,8 +110,8 @@ fi
|
||||
fi])
|
||||
|
||||
|
||||
dnl Check what kind of packaging should be used at install time.
|
||||
dnl The default is autodetected.
|
||||
dnl Check what kind of packaging should be used at install time.
|
||||
dnl The default is autodetected.
|
||||
AC_DEFUN([RELYX_USE_PACKAGING],
|
||||
[AC_MSG_CHECKING([what packaging should be used])
|
||||
AC_ARG_WITH(packaging,
|
||||
@ -124,7 +124,7 @@ AC_ARG_WITH(packaging,
|
||||
*) lyx_use_packaging=posix;;
|
||||
esac])
|
||||
AC_MSG_RESULT($lyx_use_packaging)
|
||||
case $lyx_use_packaging in
|
||||
case $lyx_use_packaging in
|
||||
macosx) default_prefix="/Applications/LyX.app"
|
||||
bindir='${prefix}/Contents/MacOS'
|
||||
libdir='${prefix}/Contents/Resources'
|
||||
|
||||
@ -30,7 +30,7 @@ test "x$prefix" = xNONE && prefix=$default_prefix
|
||||
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
|
||||
if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
|
||||
RELYX_WARNING([The installation prefix \"${prefix}\" contains a space, which
|
||||
causes problems with the Makefiles. The installation will be done in
|
||||
causes problems with the Makefiles. The installation will be done in
|
||||
directory \"`pwd`/installprefix\" instead. Please move its contents to
|
||||
the right place after installation.])
|
||||
prefix=`pwd`/installprefix
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!@PERL@
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1999 Kayvan A. Sylvan <kayvan@sylvan.com>
|
||||
# You are free to use and modify this code under the terms of
|
||||
# the GNU General Public Licence version 2 or later.
|
||||
@ -8,11 +8,11 @@
|
||||
# Edmar Wienskoski Jr. <edmar-w-jr@technologist.com>
|
||||
# Amir Karger <karger@post.harvard.edu>
|
||||
#
|
||||
# $Id: noweb2lyx.in,v 1.2 2000/03/29 23:02:36 karger Exp $
|
||||
# $Id: noweb2lyx.in,v 1.3 2005/06/09 09:58:02 leeming Exp $
|
||||
#
|
||||
# NOTE: This file was automatically generated from noweb2lyx.lyx using noweb.
|
||||
#
|
||||
&usage() if ($#ARGV < 1); # zero or one argument
|
||||
&usage() if ($#ARGV < 1); # zero or one argument
|
||||
if ($ARGV[0] eq "-pre") {
|
||||
&usage unless ($#ARGV == 2);
|
||||
$input_file = $ARGV[1]; $output_file = $ARGV[2]; $pre_only = 1;
|
||||
@ -123,7 +123,7 @@ if (!$pre_only) {
|
||||
next line;
|
||||
}
|
||||
print OUTPUT; # default
|
||||
}
|
||||
}
|
||||
close(INPUT);
|
||||
close(OUTPUT);
|
||||
}
|
||||
|
||||
@ -11,18 +11,18 @@ LyX stores some properties in a file, for example:
|
||||
\inputencoding default
|
||||
\fontscheme default
|
||||
\epsfig dvips
|
||||
\papersize a4paper
|
||||
\paperfontsize 12
|
||||
\baselinestretch 1.00
|
||||
\secnumdepth 3
|
||||
\tocdepth 3
|
||||
\paragraph_separation skip
|
||||
\quotes_language german
|
||||
\quotes_times 2
|
||||
\paperorientation portrait
|
||||
\papercolumns 9
|
||||
\papersides 1
|
||||
\paperpagestyle plain
|
||||
\papersize a4paper
|
||||
\paperfontsize 12
|
||||
\baselinestretch 1.00
|
||||
\secnumdepth 3
|
||||
\tocdepth 3
|
||||
\paragraph_separation skip
|
||||
\quotes_language german
|
||||
\quotes_times 2
|
||||
\paperorientation portrait
|
||||
\papercolumns 9
|
||||
\papersides 1
|
||||
\paperpagestyle plain
|
||||
|
||||
Some of these may be very reasonable for a certain template. In the
|
||||
case of a dinbrief-template this might be the papersize, the language
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
# This is the default LyX user interface definition file.
|
||||
# The syntax should be straightforward enough.
|
||||
|
||||
# The interface is designed (partially) following the KDE Human Interface
|
||||
# The interface is designed (partially) following the KDE Human Interface
|
||||
# Guidelines (http://usability.kde.org/hig/)
|
||||
|
||||
Include "stdmenus.ui"
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
# Full author contact details are available in file CREDITS.
|
||||
|
||||
# The interface is designed (partially) following the KDE Human Interface
|
||||
# The interface is designed (partially) following the KDE Human Interface
|
||||
# Guidelines (http://usability.kde.org/hig/)
|
||||
|
||||
Menuset
|
||||
|
||||
@ -37,23 +37,23 @@ class ParIterator;
|
||||
|
||||
|
||||
namespace Update {
|
||||
enum flags {
|
||||
FitCursor = 1,
|
||||
enum flags {
|
||||
FitCursor = 1,
|
||||
Force = 2,
|
||||
SinglePar = 4
|
||||
SinglePar = 4
|
||||
};
|
||||
|
||||
inline flags operator|(flags const f, flags const g)
|
||||
inline flags operator|(flags const f, flags const g)
|
||||
{
|
||||
return static_cast<flags>(int(f) | int(g));
|
||||
}
|
||||
|
||||
inline flags operator&(flags const f, flags const g)
|
||||
inline flags operator&(flags const f, flags const g)
|
||||
{
|
||||
return static_cast<flags>(int(f) & int(g));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@ -619,9 +619,9 @@ void BufferView::Pimpl::update(Update::flags flags)
|
||||
|
||||
CoordCache backup;
|
||||
std::swap(theCoords, backup);
|
||||
|
||||
|
||||
// This, together with doneUpdating(), verifies (using
|
||||
// asserts) that screen redraw is not called from
|
||||
// asserts) that screen redraw is not called from
|
||||
// within itself.
|
||||
theCoords.startUpdating();
|
||||
|
||||
|
||||
@ -20,10 +20,10 @@
|
||||
|
||||
2005-06-06 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||
|
||||
* text.C (redoParagraph): move cursor right after a bibitem
|
||||
* text.C (redoParagraph): move cursor right after a bibitem
|
||||
has been inserted.
|
||||
|
||||
* text3.C: disable LFUN_BIBITEM_INSERT outside Bibliography.
|
||||
* text3.C: disable LFUN_BIBITEM_INSERT outside Bibliography.
|
||||
|
||||
2005-06-02 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
* metricsinfo.h (ViewMetricsInfo):
|
||||
* rowpainter.C (paintText):
|
||||
* lyxtext.h:
|
||||
* text.C (redoParagraph):
|
||||
* text.C (redoParagraph):
|
||||
* text3.C (dispatch): Make LyX only repaint current paragraph in
|
||||
case of character insert --> speedup. Also fix cursor draw
|
||||
artifacts
|
||||
@ -52,7 +52,7 @@
|
||||
2005-05-27 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
Fix bug 1892:
|
||||
|
||||
|
||||
* text2.C (getStringToIndex): constify cur argument.
|
||||
|
||||
* factory.C (createInset/LFUN_TABULAR_INSERT): return 0 if no
|
||||
@ -113,7 +113,7 @@
|
||||
2005-05-10 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* buffer_funcs.C (setCounter): fix test for numbering of
|
||||
environments.
|
||||
environments.
|
||||
|
||||
* toc.C (getTocList): use LyXTextClass:min_toclevel to set toc
|
||||
depth correctly; use optional argument when it exists
|
||||
@ -127,7 +127,7 @@
|
||||
|
||||
* lyxlayout.[Ch]: add special NOT_IN_TOC toclevel value for
|
||||
layouts that should not appear in a table of contents.
|
||||
|
||||
|
||||
2005-05-09 Georg Baum <Georg.Baum@post.rwth-aachen.de>
|
||||
|
||||
* cursor.h (undispatched, noUpdate): add comments from André
|
||||
|
||||
@ -610,7 +610,7 @@ void expandToc2(Menu & tomenu,
|
||||
|
||||
// check whether depth is smaller than the smallest depth in toc.
|
||||
int min_depth = 1000;
|
||||
for (lyx::toc::Toc::size_type i = from; i < to; ++i)
|
||||
for (lyx::toc::Toc::size_type i = from; i < to; ++i)
|
||||
min_depth = std::min(min_depth, toc_list[i].depth);
|
||||
if (min_depth > depth)
|
||||
depth = min_depth;
|
||||
|
||||
@ -444,7 +444,7 @@ void setCounter(Buffer const & buf, ParIterator & it)
|
||||
} else if (layout->labeltype == LABEL_BIBLIO) {// ale970302
|
||||
counters.step("bibitem");
|
||||
int number = counters.value("bibitem");
|
||||
if (par.bibitem())
|
||||
if (par.bibitem())
|
||||
par.bibitem()->setCounter(number);
|
||||
par.params().labelString(buf.B_(layout->labelstring()));
|
||||
// In biblio should't be following counters but...
|
||||
@ -507,7 +507,7 @@ string expandLabel(Buffer const & buf,
|
||||
{
|
||||
LyXTextClass const & tclass = buf.params().getLyXTextClass();
|
||||
|
||||
string fmt = buf.B_(appendix ? layout->labelstring_appendix()
|
||||
string fmt = buf.B_(appendix ? layout->labelstring_appendix()
|
||||
: layout->labelstring());
|
||||
|
||||
// handle 'inherited level parts' in 'fmt',
|
||||
|
||||
@ -45,7 +45,7 @@ void bufferErrors(Buffer const &, ErrorList const &);
|
||||
int countWords(DocIterator const & from, DocIterator const & to);
|
||||
|
||||
/// Expand the counters for the labelstring of \c layout
|
||||
std::string expandLabel(Buffer const & buf, LyXLayout_ptr const & layout,
|
||||
std::string expandLabel(Buffer const & buf, LyXLayout_ptr const & layout,
|
||||
bool appendix);
|
||||
|
||||
/// updates all counters
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
* QContentPane.[Ch]: implement keystroke event stack with
|
||||
repeat key "regulation". Key are not sent to LyX core faster
|
||||
than rendering can handle.
|
||||
than rendering can handle.
|
||||
|
||||
2005-06-03 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
* Dialogs.C: add missing ":" to text messages
|
||||
* QTexinfo.C: dialog title "LaTeX Information" => "TeX Information"
|
||||
* ui/QBibtexAddDialogBase.ui: fix label & tooltip
|
||||
* ui/QCitationFindDialogBase.ui: change text "citation key/entry" =>
|
||||
* ui/QCitationFindDialogBase.ui: change text "citation key/entry" =>
|
||||
"bibliography key/entry"
|
||||
|
||||
2005-05-19 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
@ -277,7 +277,7 @@ int InsetCharStyle::docbook(Buffer const & buf, ostream & os,
|
||||
ParagraphList::const_iterator end = paragraphs().end();
|
||||
|
||||
if (!undefined())
|
||||
sgml::openTag(os, params_.latexname,
|
||||
sgml::openTag(os, params_.latexname,
|
||||
par->getID(buf, runparams) + params_.latexparam);
|
||||
|
||||
for (; par != end; ++par) {
|
||||
|
||||
@ -395,16 +395,16 @@ bool LyXTextClass::Read(string const & filename, bool merge)
|
||||
if (min_toclevel_ == LyXLayout::NOT_IN_TOC)
|
||||
min_toclevel_ = toclevel;
|
||||
else
|
||||
min_toclevel_ = std::min(min_toclevel_,
|
||||
min_toclevel_ = std::min(min_toclevel_,
|
||||
toclevel);
|
||||
max_toclevel_ = std::max(max_toclevel_,
|
||||
max_toclevel_ = std::max(max_toclevel_,
|
||||
toclevel);
|
||||
}
|
||||
}
|
||||
lyxerr[Debug::TCLASS]
|
||||
lyxerr[Debug::TCLASS]
|
||||
<< "Minimum TocLevel is " << min_toclevel_
|
||||
<< ", maximum is " << max_toclevel_ <<endl;
|
||||
|
||||
|
||||
} else
|
||||
lyxerr[Debug::TCLASS] << "Finished reading input file "
|
||||
<< MakeDisplayPath(filename)
|
||||
|
||||
@ -926,7 +926,7 @@ bool MathNestInset::getStatus(LCursor & /*cur*/, FuncRequest const & cmd,
|
||||
flag.enabled(true);
|
||||
break;
|
||||
case LFUN_INSERT_MATH: {
|
||||
bool const textarg =
|
||||
bool const textarg =
|
||||
arg == "\\textbf" || arg == "\\textsf" ||
|
||||
arg == "\\textrm" || arg == "\\textmd" ||
|
||||
arg == "\\textit" || arg == "\\textsc" ||
|
||||
|
||||
@ -97,7 +97,7 @@ class TextMetricsInfo {};
|
||||
class ViewMetricsInfo
|
||||
{
|
||||
public:
|
||||
ViewMetricsInfo(lyx::pit_type p1, lyx::pit_type p2, int y1, int y2,
|
||||
ViewMetricsInfo(lyx::pit_type p1, lyx::pit_type p2, int y1, int y2,
|
||||
bool singlepar) : p1(p1), p2(p2), y1(y1), y2(y2),
|
||||
singlepar(singlepar) {}
|
||||
lyx::pit_type p1;
|
||||
|
||||
@ -385,7 +385,7 @@ public:
|
||||
boost::shared_ptr<InsetText> getCellInset(row_type row,
|
||||
col_type column) const;
|
||||
///
|
||||
void setCellInset(row_type row, col_type column,
|
||||
void setCellInset(row_type row, col_type column,
|
||||
boost::shared_ptr<InsetText>) const;
|
||||
/// Search for \param inset in the tabular, with the
|
||||
///
|
||||
|
||||
@ -654,7 +654,7 @@
|
||||
* math.C:
|
||||
preamble.C:
|
||||
table.C:
|
||||
text.C: new files
|
||||
text.C: new files
|
||||
|
||||
* table.C: better table handling
|
||||
|
||||
|
||||
@ -1657,7 +1657,7 @@ bool LyXText::redoParagraph(pit_type const pit)
|
||||
// Add bibitem insets if necessary
|
||||
if (par.layout()->labeltype == LABEL_BIBLIO) {
|
||||
bool hasbibitem(false);
|
||||
if (!par.insetlist.empty()
|
||||
if (!par.insetlist.empty()
|
||||
// Insist on it being in pos 0
|
||||
&& par.getChar(0) == Paragraph::META_INSET) {
|
||||
InsetBase * inset = par.insetlist.begin()->inset;
|
||||
@ -1701,7 +1701,7 @@ bool LyXText::redoParagraph(pit_type const pit)
|
||||
|
||||
dim.asc += par.rows()[0].ascent();
|
||||
dim.des -= par.rows()[0].ascent();
|
||||
|
||||
|
||||
bool const same = dim == par.dim();
|
||||
|
||||
par.dim() = dim;
|
||||
|
||||
@ -98,7 +98,7 @@ TocList const getTocList(Buffer const & buf)
|
||||
break;
|
||||
Paragraph const & par = *static_cast<InsetOptArg*>(it->inset)->paragraphs().begin();
|
||||
if (!pit->getLabelstring().empty())
|
||||
tocstring = pit->getLabelstring()
|
||||
tocstring = pit->getLabelstring()
|
||||
+ ' ';
|
||||
tocstring += par.asString(buf, false);
|
||||
break;
|
||||
@ -110,12 +110,12 @@ TocList const getTocList(Buffer const & buf)
|
||||
|
||||
/// now the toc entry for the paragraph
|
||||
int const toclevel = pit->layout()->toclevel;
|
||||
if (toclevel >= min_toclevel
|
||||
if (toclevel >= min_toclevel
|
||||
&& toclevel <= bufparams.tocdepth) {
|
||||
// insert this into the table of contents
|
||||
if (tocstring.empty())
|
||||
tocstring = pit->asString(buf, true);
|
||||
TocItem const item(pit->id(), toclevel - min_toclevel,
|
||||
TocItem const item(pit->id(), toclevel - min_toclevel,
|
||||
tocstring);
|
||||
toclist["TOC"].push_back(item);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user