% extra space for tables
\newcommand{\extratablespace}[1]{\noalign{\vskip#1}}
+
+% Improve line breaking
+\tolerance 1414
+\hbadness 1414
+\emergencystretch 1.5em
+\hfuzz 0.3pt
\end_preamble
\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading
\use_default_options false
\html_css_as_file 0
\html_be_strict true
\author -712698321 "Jürgen Spitzmüller"
+\author 34634807 "Jean-Pierre"
\end_header
\begin_body
loves
\emph default
to spew these out.
- They are warnings about lines that were too long and run past the right
+
+\change_inserted -712698321 1501222056
+It seems to generate at least one of these messages for just about any document
+ you write.
+
+\change_unchanged
+They are warnings about lines that were too long and run past the right
margin.
- Almost always, this is unnoticeable in the final output.
- (It can be just a point or two.) Or, only one or two characters extend past
- the margin.
- \SpecialChar LaTeX
+
+\change_inserted -712698321 1501222913
+ This happens if \SpecialChar LaTeX
+ does not find a reasonable way to break the lines (notoriously
+ often with typewriter font, since this does not allow for automatic break
+ points).
+
+\change_unchanged
+
+\change_deleted -712698321 1501221633
+Almost always
+\change_inserted -712698321 1501221635
+In many cases
+\change_unchanged
+, this is unnoticeable in the final output.
+ (It can be just a point or two.)
+\change_deleted -712698321 1501221644
+Or, only one or two characters extend past the margin
+\change_inserted -712698321 1501222092
+Sometimes, however, the lines run rather visibly into the margin; something
+ you will not want to have in your final print
+\change_unchanged
+.
+
+\change_deleted -712698321 1501222038
+\SpecialChar LaTeX
seems to generate at least one of these messages for just about any document
you write.
+\change_unchanged
+
\begin_inset Newline newline
\end_inset
+
+\change_deleted -712698321 1501222960
You can ignore these messages.
Your eyes will tell you if there's a problem with something that's too
wide; just look at the output.
\end_inset
+\change_inserted -712698321 1501223436
+There are several global ways to try to minimize the overfull lines.
+ Clicking
+\family sans
+Enable micro-typographic extensions
+\family default
+ in
+\family sans
+Document\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
+Fonts
+\family default
+ might already improve things a lot.
+ Furthermore, \SpecialChar LaTeX
+ code such as the following in
+\family sans
+Document\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
+Preamble
+\family default
+ usually reduces the overfull lines drastically (we use this in the preamble
+ of this document):
+\end_layout
+
+\begin_deeper
+\begin_layout LyX-Code
+
+\change_inserted -712698321 1501223447
+
+\backslash
+tolerance 1414
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+hbadness 1414
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+emergencystretch 1.5em
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+hfuzz 0.3pt
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted -712698321 1501223436
+In some cases, however, you eventually have to rewrite the text to get the
+ line breaking right.
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501223436
+For more information, see
+\begin_inset Flex URL
+status open
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501223436
+
+http://www.tex.ac.uk/FAQ-overfull.html
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted -712698321 1501223436
+In any case, you should check the respective lines, at least for the final
+ version of your document.
+ Your eyes will tell you if there's a problem with something that's too
+ wide.
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501223436
+You can also enable the `draft' option in
+\begin_inset Flex Noun
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501223436
+Document\SpecialChar menuseparator
+Settings
+\end_layout
+
+\end_inset
+
+, and then \SpecialChar LaTeX
+ will draw a black box in the margin of lines that are overfull.
+\end_layout
+
+\end_inset
+
+
\end_layout
+\end_deeper
\begin_layout Itemize
\begin_inset Flex Code
status collapsed
\end_inset
Not quite as common as its cousin.
+
+\change_inserted -712698321 1501223875
+ This happens again if
+\change_unchanged
\SpecialChar LaTeX
- seems to like to print lines that are a bit too wide as opposed to ones
+
+\change_inserted -712698321 1501223913
+does not find a reasonable break point and consequently generates too loose
+ lines.
+
+\change_deleted -712698321 1501223919
+seems to like to print lines that are a bit too wide as opposed to ones
that are a bit too narrow.
We have no idea why.
+\change_inserted -712698321 1501223940
+As with the overfull lines, you should check if this is a visible problem.
+\change_unchanged
+
\end_layout
\begin_layout Itemize
\begin_layout Subsection
Multiple Bibliographies
+\change_inserted -712698321 1501227893
+
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:Multiple-Bibliographies"
+
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\begin_layout Standard
\end_inset
.
- The difference between
+ The
+\change_deleted -712698321 1501225702
+difference between
+\change_inserted -712698321 1501225703
+methods
+\change_unchanged
+
\begin_inset Quotes eld
\end_inset
\begin_inset Quotes erd
\end_inset
- is really only meaningful to \SpecialChar LaTeX
-perts, but the practical difference is that
- files that are
+
+\change_deleted -712698321 1501225710
+is really only meaningful to \SpecialChar LaTeX
+perts
+\change_inserted -712698321 1501225747
+are similar in many ways, but there are also some notable differences:
+\end_layout
+
+\begin_layout Enumerate
+
+\change_deleted -712698321 1501225754
+, but the practical difference is that f
+\change_inserted -712698321 1501225754
+F
+\change_unchanged
+iles that are
\begin_inset Quotes eld
\end_inset
\end_inset
are typeset starting on the current page.
+\change_inserted -712698321 1501225760
+
+\end_layout
+
+\begin_layout Enumerate
+
+\change_inserted -712698321 1501225830
+\begin_inset Quotes eld
+\end_inset
+
+Included
+\begin_inset Quotes erd
+\end_inset
+
+ files cannot themselves
+\begin_inset Quotes eld
+\end_inset
+
+include
+\begin_inset Quotes erd
+\end_inset
+
+ further files (
+\begin_inset Quotes eld
+\end_inset
+
+grandchilds
+\begin_inset Quotes erd
+\end_inset
+
+).
+ With
+\begin_inset Quotes eld
+\end_inset
+
+input
+\begin_inset Quotes erd
+\end_inset
+
+, on the other hand, infinite sub-inputting is possible.
+\end_layout
+
+\begin_layout Enumerate
+
+\change_inserted -712698321 1501226017
+\begin_inset Quotes eld
+\end_inset
+
+Include
+\begin_inset Quotes erd
+\end_inset
+
+ allow for the output of only selected
+\begin_inset Quotes eld
+\end_inset
+
+included
+\begin_inset Quotes erd
+\end_inset
+
+ files, while maintaining the actual counters (pagination etc.) and references
+ (please refer to the section
+\emph on
+Child
+\begin_inset space ~
+\end_inset
+
+Documents
+\emph default
+ of the
+\emph on
+Embedded
+\begin_inset space ~
+\end_inset
+
+Objects
+\emph default
+ manual for details).
+\change_unchanged
+
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted -712698321 1501225947
+Hence,
+\begin_inset Quotes eld
+\end_inset
+
+include
+\begin_inset Quotes erd
+\end_inset
+
+ is the preferred method for chapters that are outsourced to child documents,
+ while
+\begin_inset Quotes eld
+\end_inset
+
+input
+\begin_inset Quotes erd
+\end_inset
+
+ is more suitable for arbitrary file inheritance.
\end_layout
\begin_layout Standard
+
+\change_deleted -712698321 1501226562
Generally, the master file is converted into a full \SpecialChar LaTeX
file before typesetting,
while the included files are converted to \SpecialChar LaTeX
files that do not have all the
preamble information.
+\change_unchanged
+
\end_layout
\begin_layout Standard
checkbox typesets a mark to unambiguously define the presence of a space.
+\change_inserted -712698321 1501226563
+
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted -712698321 1501226564
+Generally, the master file is converted into a full \SpecialChar LaTeX
+ file before typesetting,
+ while the included files are converted to \SpecialChar LaTeX
+ files that do not have all the
+ preamble information.
+\change_unchanged
+
\end_layout
\begin_layout Subsection
\end_layout
\begin_layout Standard
+
+\change_deleted -712698321 1501227275
\begin_inset Box Frameless
position "t"
hor_pos "c"
\end_inset
+\change_unchanged
+
\end_layout
\begin_layout Standard
-Copy the bibliography list with all entries to all subdocuments and transform
- them to a comment.
- This way \SpecialChar LyX
- will find the
-\begin_inset Flex Code
-status collapsed
-\begin_layout Plain Layout
-.bib
+\change_inserted -712698321 1501226979
+If you work with child documents, you might want to have only one main bibliogra
+phy at the end, but still be able to have a selected bibliography for the
+ child if you output it on its own.
+ Here is how to achieve this.
\end_layout
-\end_inset
+\begin_layout Standard
--files and you can easily insert references without making the bibliography
- list visible.
+\change_inserted -712698321 1501227105
+For the main document, you just insert a bibliography inset at the place
+ where the main bibliography has to appear (within the master file or within
+ a child).
+ If the bibliography inset is in the master file, the references will be
+ inherited by all children, so they are available in the citation dialog
+ within each child.
\end_layout
\begin_layout Standard
-As the bibliography list is in a comment, \SpecialChar LaTeX
- won't use it and the references
- will look like this: [?], instead of like this: [1].
- One solution is to use the \SpecialChar LaTeX
--package
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-comment
-\end_layout
-\end_inset
+\change_inserted -712698321 1501227910
+For child-specific bibliographies, insert bibliography insets within the
+ child documents, at the place where the bibliography should appear when
+ the child is compiled separately.
+ However, the trick is to insert them into a branch (
+\family sans
+Insert\SpecialChar menuseparator
+Branch\SpecialChar menuseparator
+Insert New Branch...
+\family default
+), e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+ called
+\begin_inset Quotes eld
+\end_inset
+
+Childonly
+\begin_inset Quotes erd
+\end_inset
+
+.
+ Within the children, activate the branch (
+\family sans
+Document\SpecialChar menuseparator
+Settings...\SpecialChar menuseparator
+Branches
+\family default
+).
+ Within the master, deactivate the branch (
+\family sans
+Document\SpecialChar menuseparator
+Settings...\SpecialChar menuseparator
+Branches
+\family default
+).
+ Now the child's bibliography will be ignored by the master, but considered
+ by the child.
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted -712698321 1501228082
+If you need multiple bibliographies (e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g., one per child in the
+\emph on
+main document
+\emph default
+), please refer to sec.
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "subsec:Multiple-Bibliographies"
+
+\end_inset
+
+.
+\change_unchanged
+
+\end_layout
+
+\begin_layout Standard
+
+\change_deleted -712698321 1501227257
+Copy the bibliography list with all entries to all subdocuments and transform
+ them to a comment.
+ This way \SpecialChar LyX
+ will find the
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+.bib
+\end_layout
+
+\end_inset
+
+-files and you can easily insert references without making the bibliography
+ list visible.
+\end_layout
+
+\begin_layout Standard
+
+\change_deleted -712698321 1501227257
+As the bibliography list is in a comment, \SpecialChar LaTeX
+ won't use it and the references
+ will look like this: [?], instead of like this: [1].
+ One solution is to use the \SpecialChar LaTeX
+-package
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+comment
+\end_layout
+
+\end_inset
that will only include comments by processing the files separately.
To do this, add in the \SpecialChar LaTeX
\begin_layout LyX-Code
+\change_deleted -712698321 1501227257
+
\backslash
usepackage{comment}
\end_layout
\begin_layout LyX-Code
+\change_deleted -712698321 1501227257
+
\backslash
includecomment{comment}
\end_layout
\begin_layout Standard
+
+\change_deleted -712698321 1501227257
See also
\begin_inset Flex URL
-status collapsed
+status open
\begin_layout Plain Layout
\end_inset
.
+\change_unchanged
+
\end_layout
\begin_layout Section
\begin_layout Section
Starting the \SpecialChar LyX
Server
+\change_inserted -712698321 1501232552
+
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:Starting-the-Server"
+
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\begin_layout Standard
\begin_layout Plain Layout
-http://www.edpsciences.fr/aa/
+https://www.aanda.org/
\end_layout
\end_inset
\end_layout
\begin_layout Standard
-Also note that CVS support is not as good as subversion support so we advise
- using SVN instead.
- A good place to start learning Subversion is SVN Book
+Also note that CVS support is not as good as subversion support
+\change_inserted -712698321 1501253107
+,
+\change_unchanged
+ so we advise using SVN instead.
+ A good place to start learning Subversion is
+\change_inserted -712698321 1501253115
+ the
+\change_unchanged
+ SVN Book
\begin_inset Foot
status collapsed
assumes a recent version of the GNU RCS or CVS/SVN
package — no guarantees are made for older versions.
Most of the log messages are not currently displayed after operations —
- you can check them in the Messages pane if unsure.
- Regular users of version control will appreciate VC toolbar, which can
- be enabled via
+ you can check them in the Messages pane if
+\change_inserted -712698321 1501253142
+you are
+\change_unchanged
+unsure.
+ Regular users of version control will appreciate
+\change_inserted -712698321 1501253149
+the
+\change_unchanged
+VC toolbar, which can be enabled via
\family sans
View\SpecialChar menuseparator
Toolbars\SpecialChar menuseparator
\end_layout
\begin_layout Standard
-For introducing your own external commands consult vc-command in the manual
- of \SpecialChar LyX
- functions.
+For introducing your own external commands consult
+\change_deleted -712698321 1501253161
+vc-command
+\change_inserted -712698321 1501253161
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501253161
+vc-command
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
+ in the manual
+\change_deleted -712698321 1501253168
+of
+\change_unchanged
+
+\emph on
+\SpecialChar LyX
+
+\change_inserted -712698321 1501253174
+F
+\change_deleted -712698321 1501253173
+f
+\change_unchanged
+unctions
+\emph default
+.
\end_layout
\begin_layout Standard
\end_layout
\begin_layout Standard
-RCS command that is run:
+RCS command that is run:
+\change_inserted -712698321 1501253193
+
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_deleted -712698321 1501253193
+
+\change_unchanged
+
\family typewriter
ci -q -u -i -t-"<initial description>" <file-name>
\end_layout
file, the document is unlocked and set to Read-Only mode.
\end_layout
-\begin_layout Standard
+\begin_layout Itemize
RCS command:
\family typewriter
ci -q -u -m"<description>" <file-name>
The status line is changed to reflect that you have locked the file.
\end_layout
-\begin_layout Standard
+\begin_layout Itemize
RCS command:
\family typewriter
co -q -l <file-name>
You get a warning before changes are discarded.
\end_layout
-\begin_layout Standard
+\begin_layout Itemize
RCS command:
\family typewriter
co -f -u<version> <file-name>
\begin_layout Plain Layout
+\change_deleted -712698321 1501253225
+
\family typewriter
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253225
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<file-name>
+\change_deleted -712698321 1501253231
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501253231
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\end_inset
\begin_layout Plain Layout
+\change_deleted -712698321 1501253233
+
\family typewriter
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253233
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<new-file-name>
+\change_deleted -712698321 1501253234
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501253235
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\end_inset
ci -q -u
\family typewriter
-i
+\change_deleted -712698321 1501253236
+
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253236
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<new-file-name>
+\change_deleted -712698321 1501253239
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501253239
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\end_inset
is removed from the master RCS file.
\end_layout
-\begin_layout Standard
+\begin_layout Itemize
RCS command:
\family typewriter
rcs -o<version> <file-name>
\begin_layout Plain Layout
+\change_deleted -712698321 1501254263
+
\family typewriter
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501254263
+
+\lang ngerman
+"
+\change_unchanged
+
+\lang english
<file-name>
+\change_deleted -712698321 1501254266
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501254266
+
+\lang ngerman
+"
+\change_unchanged
+
\end_layout
\end_inset
\begin_layout Plain Layout
+\change_deleted -712698321 1501254267
+
\family typewriter
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501254267
+
+\lang ngerman
+"
+\change_unchanged
+
+\lang english
<new-file-name>
+\change_deleted -712698321 1501254269
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501254269
+
+\lang ngerman
+"
+\change_unchanged
+
\end_layout
\end_inset
\begin_layout Plain Layout
cvs -q add
+\change_deleted -712698321 1501254271
+
\family typewriter
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501254271
+
+\lang ngerman
+"
+\change_unchanged
+
+\lang english
<new-file-name>
+\change_deleted -712698321 1501254272
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501254272
+
+\lang ngerman
+"
+\change_unchanged
+
\end_layout
\end_inset
\begin_layout Plain Layout
+\change_deleted -712698321 1501254274
+
\family typewriter
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501254274
+
+\lang ngerman
+"
+\change_unchanged
+
+\lang english
<file-name>
+\change_deleted -712698321 1501254277
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501254277
+
+\lang ngerman
+"
+\change_unchanged
+
\end_layout
\end_inset
\begin_layout Plain Layout
+\change_deleted -712698321 1501254278
+
\family typewriter
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501254278
+
+\lang ngerman
+"
+\change_unchanged
+
+\lang english
<new-file-name>
+\change_deleted -712698321 1501254279
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501254279
+
+\lang ngerman
+"
+\change_unchanged
+
\end_layout
\end_inset
\begin_layout Plain Layout
cvs -q add
+\change_deleted -712698321 1501254281
+
\family typewriter
\begin_inset Quotes eld
\end_inset
-<new-file-name>
-\begin_inset Quotes erd
-\end_inset
+\change_inserted -712698321 1501254281
+
+\lang ngerman
+"
+\change_unchanged
+
+\lang english
+<new-file-name>
+\change_deleted -712698321 1501254282
+
+\begin_inset Quotes erd
+\end_inset
+
+
+\change_inserted -712698321 1501254282
+
+\lang ngerman
+"
+\change_unchanged
\end_layout
\begin_layout Plain Layout
cvs -q remove
+\change_deleted -712698321 1501254285
+
\family typewriter
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501254285
+
+\lang ngerman
+"
+\change_unchanged
+
+\lang english
<file-name>
+\change_deleted -712698321 1501254287
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501254287
+
+\lang ngerman
+"
+\change_unchanged
+
\end_layout
\end_inset
\SpecialChar LyX
was tested against SVN 1.5, 1.6, 1.7 and 1.8
\begin_inset Foot
-status open
+status collapsed
\begin_layout Plain Layout
Most of the commands will work with 1.4 too, see
SVN command that is run:
\family typewriter
svn add -q
+\change_deleted -712698321 1501253346
+
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253346
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<file-name>
+\change_deleted -712698321 1501253348
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501253348
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\begin_layout Standard
\family typewriter
svn update --non-interactive
+\change_deleted -712698321 1501253354
+
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253354
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<file-name>
+\change_deleted -712698321 1501253356
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501253356
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\begin_layout Subsubsection
SVN command:
\family typewriter
svn revert -q
+\change_deleted -712698321 1501253358
+
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253358
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<file-name>
+\change_deleted -712698321 1501253360
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501253360
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\begin_layout Subsubsection
\begin_layout Plain Layout
svn copy -q
+\change_deleted -712698321 1501253363
+
\family typewriter
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253363
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<file-name>
+\change_deleted -712698321 1501253365
+
\begin_inset Quotes erd
\end_inset
+
+\change_inserted -712698321 1501253365
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+\change_deleted -712698321 1501253366
+
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253366
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<new-file-name>
+\change_deleted -712698321 1501253368
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501253368
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\end_inset
\begin_layout Plain Layout
svn move -q
+\change_deleted -712698321 1501253375
+
\family typewriter
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253375
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<file-name>
+\change_deleted -712698321 1501253377
+
\begin_inset Quotes erd
\end_inset
+
+\change_inserted -712698321 1501253377
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+\change_deleted -712698321 1501253378
+
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253378
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<new-file-name>
+\change_deleted -712698321 1501253380
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501253380
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\end_inset
\end_layout
\begin_layout Standard
-All the commands above have one shortcomming - they deal with the current
- document only.
+All the commands above have one shortco
+\change_deleted -712698321 1501253385
+m
+\change_unchanged
+ming
+\change_inserted -712698321 1501253389
+–
+\change_deleted -712698321 1501253389
+-
+\change_unchanged
+ they deal with the current document only.
Once your document contains pictures, includes external
\begin_inset Flex Code
status collapsed
The output of
\family typewriter
svn log
+\change_deleted -712698321 1501253404
+
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253404
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<file-name>
+\change_deleted -712698321 1501253406
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501253406
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
\family default
is shown in a browser.
\end_layout
\begin_layout Standard
SVN has two such mechanisms to provide mutual exclusivity for file access
- - locks and automatic setting of write permissions (see sec.
+
+\change_inserted -712698321 1501253410
+–
+\change_deleted -712698321 1501253410
+-
+\change_unchanged
+ locks and automatic setting of write permissions (see sec.
\begin_inset CommandInset ref
LatexCommand ref
file svn property
\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_deleted -712698321 1501253418
+http://svnbook.red-bean.com/en/1.2/svn.advanced.locking.html
+\change_inserted -712698321 1501253418
+
+\begin_inset Flex URL
status open
\begin_layout Plain Layout
+
+\change_inserted -712698321 1501253418
+
http://svnbook.red-bean.com/en/1.2/svn.advanced.locking.html
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\end_inset
\begin_layout Itemize
Locked state.
- The loaded file is in the 'normal' edit mode.
+ The loaded file is in the
+\change_deleted -712698321 1501253433
+'
+\change_inserted -712698321 1501253433
+
+\begin_inset Quotes els
+\end_inset
+
+
+\change_unchanged
+normal
+\change_deleted -712698321 1501253435
+'
+\change_inserted -712698321 1501253435
+
+\begin_inset Quotes ers
+\end_inset
+
+
+\change_unchanged
+ edit mode.
No other user is allowed to edit the file.
\emph on
\end_inset
Control\SpecialChar menuseparator
-Toggle locking property
+
+\change_deleted -712698321 1501244235
+Toggle
+\change_inserted -712698321 1501244235
+Use
+\change_unchanged
+
+\change_deleted -712698321 1501244236
+l
+\change_inserted -712698321 1501244237
+L
+\change_unchanged
+ocking
+\change_inserted -712698321 1501244242
+P
+\change_deleted -712698321 1501244242
+p
+\change_unchanged
+roperty
\family default
.
This command is active only when the file is not locked on the svn server
\begin_inset Tabular
<lyxtabular version="3" rows="6" columns="2">
<features tabularvalignment="middle">
-<column alignment="center" valignment="top">
-<column alignment="center" valignment="top">
+<column alignment="left" valignment="top">
+<column alignment="left" valignment="top">
<row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\series bold
Output
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\series bold
Meaning
\end_layout
</cell>
</row>
<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
</cell>
</row>
<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
</cell>
</row>
<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
</cell>
</row>
<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
</cell>
</row>
<row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
tag in your document (e.g.
+\change_deleted -712698321 1501253475
+
\begin_inset ERT
status open
\end_inset
+
+\change_inserted -712698321 1501253480
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501253480
+$Rev$
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
).
This way svn client will automatically substitute revision number (e.g.
+\change_deleted -712698321 1501253467
+
\begin_inset ERT
status open
\end_inset
+
+\change_inserted -712698321 1501253473
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501253473
+$Rev: 59 $
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
) after each update and commit.
There are more problems with this approach.
Firstly, the '$' character is used in \SpecialChar TeX
\SpecialChar LyX
was tested against GIT 1.7.
\begin_inset Foot
-status open
+status collapsed
\begin_layout Plain Layout
Windows users please note that you need to ensure that git is on the path.
\begin_layout Standard
Then you are asked interactively to supply an initial description of the
document.
- Don't forget that registered file is not yet commited.
+ Don't forget that registered file is not yet commi
+\change_inserted -712698321 1501253542
+t
+\change_unchanged
+ted.
\end_layout
\begin_layout Standard
GIT command that is run:
\family typewriter
git add
+\change_deleted -712698321 1501253534
+
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253534
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<file-name>
+\change_deleted -712698321 1501253538
+
\begin_inset Quotes erd
\end_inset
-\end_layout
+\change_inserted -712698321 1501253538
-\begin_layout Standard
-Read
-\family typewriter
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
+\end_layout
+
+\begin_layout Standard
+Read
+\family typewriter
man git
\family default
to understand the switches.
\begin_layout Standard
When you are finished editing a file, you commit your changes.
When you do this, you are asked for a description of the changes.
- After that changes are commited.
+ After that changes are commit
+\change_inserted -712698321 1501253548
+t
+\change_unchanged
+ed.
\end_layout
\begin_layout Standard
GIT command:
\family typewriter
git checkout -q
+\change_deleted -712698321 1501253553
+
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253553
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<file-name>
+\change_deleted -712698321 1501253555
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501253555
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\begin_layout Subsubsection
\begin_layout Plain Layout
git mv
+\change_deleted -712698321 1501253559
+
\family typewriter
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253559
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<file-name>
+\change_deleted -712698321 1501253561
+
\begin_inset Quotes erd
\end_inset
+
+\change_inserted -712698321 1501253561
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+\change_deleted -712698321 1501253562
+
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253562
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<new-file-name>
+\change_deleted -712698321 1501253564
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501253564
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
\end_layout
\end_inset
The output of
\family typewriter
git log
+\change_deleted -712698321 1501253567
+
\begin_inset Quotes eld
\end_inset
+
+\change_inserted -712698321 1501253567
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
<file-name>
+\change_deleted -712698321 1501253569
+
\begin_inset Quotes erd
\end_inset
+\change_inserted -712698321 1501253569
+
+\begin_inset Quotes qld
+\end_inset
+
+
+\change_unchanged
+
\family default
is shown in a browser.
\end_layout
\end_layout
\begin_layout Standard
-With the recent addition of the vc-command function \SpecialChar LyX
- power users are allowed
- to create their own commands for revision control.
+With the recent addition of the
+\change_deleted -712698321 1501253582
+vc-command
+\change_inserted -712698321 1501253582
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501253582
+vc-command
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
+ function \SpecialChar LyX
+ power users are allowed to create their own commands for revision
+ control.
\end_layout
\begin_layout Standard
case of \SpecialChar LyX
files, which have more a complicated structure.
Hence we provide binding to the Document comparison feature.
- There are two ways of calling this feature - either by direct call of
+ There are two ways of calling this feature
+\change_inserted -712698321 1501253613
+–
+\change_deleted -712698321 1501253613
+-
+\change_unchanged
+ either by direct call of
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
+
+\change_deleted -712698321 1501253619
VC_COMPARE
+\change_inserted -712698321 1501253621
+vc-compare
+\change_unchanged
+
\end_layout
\end_inset
\SpecialChar LyX
function (for details see \SpecialChar LyX
- functions manual) or by icon/menu item
+ functions manual) or by
+\change_inserted -712698321 1501253630
+ the toolbar
+\change_unchanged
+ icon
+\change_inserted -712698321 1501253655
+
+\begin_inset Info
+type "icon"
+arg "vc-compare"
+\end_inset
+
+
+\change_deleted -712698321 1501253665
+/
+\change_inserted -712698321 1501253675
+ or the
+\change_unchanged
+menu item
+\change_inserted -712698321 1501253679
+
+\begin_inset Info
+type "menu"
+arg "vc-compare"
+\end_inset
+
+
+\change_deleted -712698321 1501253689
+
\begin_inset Flex Noun
status collapsed
\end_inset
+
+\change_inserted -712698321 1501253693
+, respectively
+\change_unchanged
.
One can either compare two chosen revisions of the document or he can simply
compare the current version of edited text with older revisions (where
'35' in '1.2.35'.
We don't currently support GIT addressing of revisions, one can just compare
edited document with its revision X steps backs, where X is addressed as
- HEAD~X.
+
+\change_deleted -712698321 1501253702
+HEAD~X
+\change_inserted -712698321 1501253702
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501253702
+HEAD~X
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
+.
\end_layout
\begin_layout Section
\begin_layout Quote
Literate Programming FAQ
\begin_inset Flex URL
-status collapsed
+status open
\begin_layout Plain Layout
\begin_inset space \space{}
\end_inset
-it is easy to plug in new filters and to perform special processing that
- you may need.
+it is easy to plug in new filters
+\change_inserted -712698321 1501229014
+
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501229136
+
+\emph on
+Filters
+\emph default
+are programs that read a given data stream and output a manipulated data
+ stream.
+ That way, a WEB file (consisting of literate code) can be turned into a
+ file consisting only of C program code or \SpecialChar LaTeX
+ code.
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
+ and to perform special processing that you may need.
\end_layout
\begin_layout Plain Layout
-http://www.cs.virginia.edu/~nr/noweb/
+https://www.cs.tufts.edu/~nr/noweb/
\end_layout
\end_inset
\begin_layout Standard
If you have installed Noweb and \SpecialChar LyX
successfully, whenever you open a new document,
- after you have chosen its document class, use the Document->Settings menu
- to add the
+ after you have chosen its document class, use the
+\family sans
+Document
+\change_deleted -712698321 1501229457
+->
+\change_inserted -712698321 1501229457
+\SpecialChar menuseparator
+
+\change_unchanged
+Settings
+\family default
+ menu to add the
\begin_inset Quotes eld
\end_inset
\begin_layout Standard
\SpecialChar LyX
- enables you to write code with a layout named
+ enables you to write code with a
+\change_deleted -712698321 1501229783
+layout
+\change_inserted -712698321 1501229785
+custom inset
+\change_unchanged
+ named
\begin_inset Flex Noun
status collapsed
\end_inset
-, that works like a normal paragraph but has a free spacing capability.
+, that works like a normal
+\change_deleted -712698321 1501229871
+paragraph
+\change_inserted -712698321 1501229873
+text inset
+\change_unchanged
+ but has a free spacing capability.
\end_layout
\begin_layout Standard
\end_inset
- layout that, by itself, takes care of the business.
+
+\change_deleted -712698321 1501230025
+layout
+\change_inserted -712698321 1501230027
+inset
+\change_unchanged
+that, by itself, takes care of the business.
\end_layout
\begin_layout Enumerate
\end_inset
setting, should be set to
+\change_inserted -712698321 1501230220
+
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_deleted -712698321 1501230232
\begin_inset Newline newline
\end_inset
\end_inset
+\change_unchanged
+
\family typewriter
build-script $$i
\family default
$$r
+\change_deleted -712698321 1501230236
+
\begin_inset Quotes erd
\end_inset
\begin_inset Newline newline
\end_inset
+
+\change_inserted -712698321 1501230224
+
+\end_layout
+
+\begin_layout Standard
This basically means that \SpecialChar LyX
will call
\begin_inset Quotes eld
\end_layout
\begin_layout Standard
+
+\change_deleted -712698321 1501230298
\begin_inset VSpace defskip
\end_inset
+\change_unchanged
+
\end_layout
\begin_layout Standard
+
+\change_deleted -712698321 1501230296
\begin_inset Newpage pagebreak
\end_inset
+\change_unchanged
+
\end_layout
-\begin_layout Standard
+\begin_layout LyX-Code
\family sans
#!/bin/sh
\end_layout
-\begin_layout Standard
+\begin_layout LyX-Code
\family sans
#
\end_layout
-\begin_layout Standard
+\begin_layout LyX-Code
\family sans
notangle -Rbuild-script $1 | env NOWEB_SOURCE=$1 NOWEB_OUTPUT_DIR=$2 sh
\end_layout
\begin_layout Standard
+
+\change_deleted -712698321 1501230299
\begin_inset VSpace defskip
\end_inset
+\change_unchanged
+
\end_layout
\begin_layout Standard
\end_inset
which is to be set to
+\change_inserted -712698321 1501230552
+
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_deleted -712698321 1501230577
\begin_inset Newline newline
\end_inset
\end_inset
+\change_unchanged
+
\family typewriter
parselog=$$s/scripts/listerrors
+\change_deleted -712698321 1501230575
+
\family default
\begin_inset Quotes erd
\begin_inset Newline newline
\end_inset
+
+\change_inserted -712698321 1501230544
+
+\end_layout
+
+\begin_layout Standard
This will run any errors that are generated by the
\begin_inset Quotes eld
\end_inset
\end_layout
\begin_layout Standard
+
+\change_deleted -712698321 1501232274
\begin_inset VSpace defskip
\end_inset
-\end_layout
+\change_inserted -712698321 1501232276
-\begin_layout Standard
+\end_layout
-\family sans
+\begin_layout LyX-Code
echo "LYXCMD:monitor:server-goto-file-row:@FILE@ @LINE@" >~/.lyxpipe.in
\end_layout
\begin_layout Standard
+
+\change_deleted -712698321 1501232278
\begin_inset VSpace defskip
\end_inset
+\change_unchanged
+
\end_layout
\begin_layout Standard
Note however that you must enable the \SpecialChar LyX
server to get this feature working
(it is disabled by default).
- You can enable it in
+
+\change_deleted -712698321 1501232597
+You can enable it in
\family sans
Preferences
\family default
\end_layout
\begin_layout Standard
+
+\change_inserted -712698321 1501232576
+Sec.
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:Starting-the-Server"
+
+\end_inset
+
+ explains how to do that
+\change_deleted -712698321 1501232579
Read the \SpecialChar LyX
server documentation in the
\emph on
Customization Manual
\emph default
- for further information.
+ for further information
+\change_unchanged
+.
\end_layout
\begin_layout Subsubsection
\begin_layout Standard
There are six new buttons that can be added to your \SpecialChar LyX
toolbar.
- Five of these buttons are short cuts to layout styles:
+
+\change_deleted -712698321 1501232976
+Five
+\change_inserted -712698321 1501232977
+Four
+\change_unchanged
+ of these buttons are short cuts to layout styles:
\family sans
Standard
\family default
\SpecialChar LaTeX
\family default
-,
+,
+\change_inserted -712698321 1501232982
+ and
+\change_unchanged
+
\family sans
\SpecialChar LyX
-Code
\family default
-, and
+,
+\change_deleted -712698321 1501232984
+and
+\change_inserted -712698321 1501232988
+one f
+\change_inserted 34634807 1501446371
+o
+\change_deleted 34634807 1501446371
+p
+\change_inserted -712698321 1501232988
+r the custom inset
+\change_unchanged
+
\family sans
Chunk
\family default
\end_layout
\begin_layout LyX-Code
- Icon "layout Chunk"
+ Icon "
+\change_deleted -712698321 1501232918
+layout
+\change_inserted -712698321 1501232921
+flex.insert
+\change_unchanged
+ Chunk"
\end_layout
\begin_layout LyX-Code
\family default
) and must have the \SpecialChar LaTeX
-package
-\series bold
+\change_deleted -712698321 1501235255
multicol
-\series default
+\change_inserted -712698321 1501235255
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235255
+multicol
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
installed.
\end_layout
\end_layout
\begin_layout Standard
-For more features of multiple columns, have a look at the documentation
- of the \SpecialChar LaTeX
--package
-\series bold
-multicol
-\series default
-,
-\begin_inset CommandInset citation
-LatexCommand cite
-key "multicol"
+For more features of multiple columns, have a look at the
+\change_deleted -712698321 1501236578
+documentation
+\change_inserted -712698321 1501236578
+
+\begin_inset CommandInset href
+LatexCommand href
+name "documentation"
+target "http://mirror.ctan.org/macros/latex/required/tools/multicol.pdf"
+literal "false"
+
+\end_inset
+
+
+\change_unchanged
+ of the \SpecialChar LaTeX
+-package
+\change_deleted -712698321 1501235271
+multicol
+\change_inserted -712698321 1501235271
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235271
+multicol
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_deleted -712698321 1501236609
+,
+\begin_inset CommandInset citation
+LatexCommand cite
+key "multicol"
literal "true"
\end_inset
+
+\change_unchanged
.
\end_layout
For example the command
\end_layout
-\begin_layout Standard
-
-\series bold
+\begin_layout LyX-Code
\backslash
subsection{subsection title}
\end_inset
text lines by using
+\change_deleted -712698321 1501235295
+
\begin_inset Quotes eld
\end_inset
7
\backslash
baselineskip
+\change_inserted -712698321 1501235293
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235293
+7
+\backslash
+baselineskip
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_deleted -712698321 1501235296
+
\begin_inset Quotes erd
\end_inset
+
+\change_unchanged
(where the command
-\series bold
+\change_deleted -712698321 1501235285
\backslash
baselineskip
-\series default
+\change_inserted -712698321 1501235285
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235285
+
+\backslash
+baselineskip
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
needs to be inserted as \SpecialChar TeX
code):
\end_layout
\begin_layout Standard
The amount of space before and after multiple columns can be changed by
changing the length
-\series bold
+\change_deleted -712698321 1501235307
\backslash
multicolsep
-\series default
+\change_inserted -712698321 1501235307
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235307
+
+\backslash
+multicolsep
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
.
For example the command
\end_layout
-\begin_layout Standard
-
-\series bold
+\begin_layout LyX-Code
\backslash
setlength{
\begin_layout Standard
For this example
-\series bold
+\change_deleted -712698321 1501235314
\backslash
multicolsep
-\series default
+\change_inserted -712698321 1501235315
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235315
+
+\backslash
+multicolsep
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
was set to 2.5
\begin_inset space \thinspace{}
\end_inset
Note:
\series default
The values you set with
+\change_inserted -712698321 1501235328
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235333
+
+\backslash
+setlength
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_deleted -712698321 1501235331
+
\series bold
\backslash
setlength
+\change_unchanged
+
\series default
will be used for all following multiple columns until you change them again.
\end_layout
\begin_layout Standard
A column break can be forced by inserting the command
-\series bold
+\change_deleted -712698321 1501235399
\backslash
columnbreak{}
-\series default
+\change_inserted -712698321 1501235399
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235399
+
+\backslash
+columnbreak{}
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
as \SpecialChar TeX
Code to that position in the text where the column should be broken.
Note that this leads in most cases to whitespace in the text.
The width of the columns is automatically calculated, but you can modify
the space between the columns.
This is done by changing the length
-\series bold
+\change_deleted -712698321 1501235412
\backslash
columnsep
-\series default
+\change_inserted -712698321 1501235412
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235412
+
+\backslash
+columnsep
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
.
Its predefined value is 10
\begin_inset space \thinspace{}
pt.
Here is an example where
-\series bold
+\change_deleted -712698321 1501235418
\backslash
columnsep
-\series default
+\change_inserted -712698321 1501235418
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235418
+
+\backslash
+columnsep
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
is set to 3
\begin_inset space \thinspace{}
\end_inset
\begin_layout Standard
Between the columns a rule with a width of the length
-\series bold
+\change_deleted -712698321 1501235428
\backslash
columnseprule
-\series default
+\change_inserted -712698321 1501235428
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235428
+
+\backslash
+columnseprule
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
is placed.
If this rule width is set to 0
\begin_inset space \thinspace{}
\begin_layout Standard
The rule can be colored by redefining the command
-\series bold
+\change_deleted -712698321 1501235439
\backslash
columnseprulecolor
-\series default
+\change_inserted -712698321 1501235439
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235439
+
+\backslash
+columnseprulecolor
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
.
This is done by inserting the command
+\change_deleted -712698321 1501235443
+
\begin_inset Newline newline
\end_inset
-\series bold
+\change_inserted -712698321 1501235444
+
+\end_layout
+
+\begin_layout LyX-Code
\backslash
renewcommand{
columnseprulecolor}{
\backslash
color{red}}
-\series default
+\change_deleted -712698321 1501235445
\begin_inset Newline newline
\end_inset
+
+\change_inserted -712698321 1501235446
+
+\end_layout
+
+\begin_layout Standard
as \SpecialChar TeX
Code before the multicolumn inset.
Replace
-\series bold
+\change_deleted -712698321 1501235460
red
-\series default
+\change_inserted -712698321 1501235457
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501235462
+red
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
in this command by a color of your choice.
You can use all pre- and self-defined colors.
See the
\emph default
for more information about pre- and self-defined colors.
To go back to the default color insert the command
+\change_inserted -712698321 1501235474
+
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_deleted -712698321 1501235472
\begin_inset Newline newline
\end_inset
-\series bold
+\change_unchanged
\backslash
renewcommand{
columnseprulecolor}{
\backslash
normalcolor}
-\series default
+\change_inserted -712698321 1501235475
+\end_layout
+
+\begin_layout Standard
+
+\change_deleted -712698321 1501235473
\begin_inset Newline newline
\end_inset
+
+\change_unchanged
Here is the example with a cyan rule and 1
\begin_inset space \thinspace{}
\end_inset
can modify the paragraph shape to one of your choice.
This can be done by using the \SpecialChar LaTeX
-package
-\series bold
+\change_deleted -712698321 1501236703
shapepar
-\series default
+\change_inserted -712698321 1501236703
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+\noindent
+
+\change_inserted -712698321 1501236703
+shapepar
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
which is loaded by using in the document settings the module
\family sans
Custom paragraph shapes
\begin_inset Tabular
<lyxtabular version="3" rows="13" columns="3">
<features booktabs="true" islongtable="true" longtabularalignment="center">
-<column alignment="center" valignment="middle" width="16col%">
-<column alignment="center" valignment="middle" width="40col%">
-<column alignment="center" valignment="middle" width="35col%">
+<column alignment="left" valignment="middle" width="16col%">
+<column alignment="left" valignment="middle" width="40col%">
+<column alignment="left" valignment="middle" width="35col%">
<row endhead="true">
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\series bold
+\size small
Name
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\series bold
+\size small
Description
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\series bold
+\size small
Annotation
\end_layout
\end_inset
</cell>
</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<row interlinespace="default">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
CDlabel
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Circle with circular hole (in the size of a CD/DVD)
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Cannot be scaled, take care there is not too much text
\end_layout
\end_inset
</cell>
</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" usebox="none">
+<row interlinespace="default">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Circle
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Circle
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Fragile, calculation might fail
\end_layout
\end_inset
</cell>
</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<row interlinespace="default">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Diamond
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Rhomboid (symbolizing a
\begin_inset Quotes eld
\end_inset
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
-
\end_layout
\end_inset
</cell>
</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<row interlinespace="default">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Heart
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Heart-like shape
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
-
\end_layout
\end_inset
</cell>
</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<row interlinespace="default">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Hexagon
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Hexagon
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
-
\end_layout
\end_inset
</cell>
</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<row interlinespace="default">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Nut
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Nut for bolt (hexagon with circular hole)
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
-
\end_layout
\end_inset
</cell>
</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<row interlinespace="default">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Square
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Square
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
-
\end_layout
\end_inset
</cell>
</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<row interlinespace="default">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Star
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Five-point star
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
-
\end_layout
\end_inset
</cell>
</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<row interlinespace="default">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Candle
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Burning candle
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
-
\end_layout
\end_inset
</cell>
</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<row interlinespace="default">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Drop down/up
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Normal/reversed rain drop
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Fragile, calculation might fail
\end_layout
\end_inset
</cell>
</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<row interlinespace="default">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
\SpecialChar TeX
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
The \SpecialChar TeX
logo
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
-
\end_layout
\end_inset
</cell>
</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<row interlinespace="default">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Triangle up/down/
\begin_inset Newline newline
\end_inset
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
Triangles in different orientations
\end_layout
\end_inset
</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
+
+\size small
-
\end_layout
\series bold
Note
\series default
-: shapepar paragraphs cannot run over a page break.
+:
+\family sans
+shapepar
+\family default
+ paragraphs cannot run over a page break.
\end_layout
\end_inset
\begin_layout Standard
-\series bold
+\change_inserted -712698321 1501236716
+The package
+\change_deleted -712698321 1501236722
shapepar
-\series default
+\change_inserted -712698321 1501236723
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501236723
+shapepar
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_unchanged
takes care that the shape will always be preserved, no matter how much
text is in the paragraph.
Therefore the paragraph size changes with the amount of contained text.
\end_inset
For information how these styles are used and about further customization
- possibilities, have a look at the documentation of the package
-\series bold
+ possibilities, have a look at the
+\change_inserted -712698321 1501236534
+
+\lang ngerman
+
+\begin_inset CommandInset href
+LatexCommand href
+name "documentation"
+target "http://mirrors.ctan.org/macros/latex/contrib/shapepar/shapepar.pdf"
+literal "false"
+
+\end_inset
+
+
+\change_deleted -712698321 1501236537
+
+\lang english
+documentation
+\change_unchanged
+ of the package
+\change_deleted -712698321 1501236618
shapepar
-\series default
+\change_inserted -712698321 1501236618
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1501236618
+shapepar
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+
+\change_deleted -712698321 1501236618
,
\begin_inset CommandInset citation
LatexCommand cite
\end_inset
+
+\change_unchanged
.
+\change_deleted -712698321 1501236666
+
\end_layout
\begin_layout Bibliography
+
+\change_deleted -712698321 1501236522
\begin_inset CommandInset bibitem
LatexCommand bibitem
key "multicol"
\end_layout
\begin_layout Bibliography
+
+\change_deleted -712698321 1501236522
\begin_inset CommandInset bibitem
LatexCommand bibitem
key "shapepar"
\end_inset
+\change_unchanged
+
\end_layout
\end_body
projects / lyx.git / blobdiff