texmacs
/
doc
mirror of https://github.com/texmacs/doc.git
1
0
Fork 0
Code

Fixes

This commit is contained in:
Joris van der Hoeven 2017-07-06 13:53:54 +00:00
parent 19804cfb3d
commit 6b74364c06
8 changed files with 158 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
main/editing/man-cut-and-paste.en.tm
View File

@ -1,6 +1,6 @@
<TeXmacs|1.0.5.3>
<TeXmacs|1.99.5>
<style|tmdoc>
<style|<tuple|tmdoc|english>>
<\body>
<tmdoc-title|Cut and paste>
@ -14,9 +14,9 @@
It is also possible to the change text properties of a selected region. For
instance, in order to transform some black text in red, you select it using
the left mouse button and click on <menu|Format|Color|Red>. Similarly, if you
select a formula and you click on <menu|Insert|Fraction>, then
the formula becomes the numerator of some fraction.
the left mouse button and click on <menu|Format|Color|Red>. Similarly, if
you select a formula and you click on <menu|Insert|Fraction>, then the
formula becomes the numerator of some fraction.
When using the copy and paste mechanism to communicate with other
applications, text is copied and pasted using the <TeXmacs> data format.
@ -26,19 +26,21 @@
specify as many other buffers as you like.
There are two ways to make selections using the keyboard. When using the
cursor keys <key|left>, <key|right>, <abbr|etc.> while holding
down the <prefix|S-> button, you may select text while moving around
the cursor. Alternatively, you may press <shortcut|(kbd-select-enlarge)> once to fix a
cursor keys <key|left>, <key|right>, <abbr|etc.> while holding down the
<prefix|S-> button, you may select text while moving around the cursor.
Alternatively, you may press <shortcut|(kbd-select-enlarge)> once to fix a
starting position. When moving around using the cursor keys, the text
between the starting position and the current position keeps being
selected. The selection gets cleared when pressing <shortcut|(selection-cancel)>.
selected. The selection gets cleared when pressing
<shortcut|(selection-cancel)>.
Notice that the <shortcut|(kbd-select-enlarge)> shortcut also allows you to make
<em|structured selections>. You may select the current word you are in by
pressing<nbsp><shortcut|(kbd-select-enlarge)> twice. Each additional time you press
<shortcut|(kbd-select-enlarge)> results in the selection of the smallest structure
which englobes the current selection. Ultimately, when the entire document
gets selected, pressing <shortcut|(kbd-select-enlarge)> once more clears the selection.
Notice that the <shortcut|(kbd-select-enlarge)> shortcut also allows you to
make <em|structured selections>. You may select the current word you are in
by pressing<nbsp><shortcut|(kbd-select-enlarge)> twice. Each additional
time you press <shortcut|(kbd-select-enlarge)> results in the selection of
the smallest structure that englobes the current selection. Ultimately,
when the entire document gets selected, pressing
<shortcut|(kbd-select-enlarge)> once more clears the selection.
<tmdoc-copyright|1998--2002|Joris van der Hoeven>
@ -50,8 +52,5 @@
Documentation License".>
</body>
<\initial>
<\collection>
<associate|language|english>
</collection>
</initial>
<initial|<\collection>
</collection>>

51
main/editing/man-search-and-replace.en.tm
View File

@ -1,4 +1,4 @@
<TeXmacs|1.99.1>
<TeXmacs|1.99.5>
<style|<tuple|tmdoc|english>>
@ -6,10 +6,10 @@
<tmdoc-title|Search and replace>
You can start searching text by pressing <key|C-s> or <menu|Edit|Search>.
Doing this, a new special ``search toolbar'' will appear below the main
Doing this, a new special \Psearch toolbar\Q will appear below the main
text, just above the footer. When typing text in the search field of the
toolbar, all occurrences of this text will be highlighted in the main
document. Moreover, one ``principal'' occurrence will be highlighted in red
document. Moreover, one \Pprincipal\Q occurrence will be highlighted in red
and you may navigate through all occurrences using <key|pageup> and
<key|pagedown> (or <key|up> and <key|down>, or <key|return>). Using
<key|home> and <key|end>, you may jump to the first and last occurrences
@ -17,16 +17,16 @@
toolbar will be closed, searching stops and focus returns to the main
document.
During a search, only text in the same mode and the same language will be
found, as those which are active at the position where you started your
search. In other words, when searching an <math|x> in math-mode, you will
not find any x's in the ordinary text. As a current limitation, the search
string can only contain ordinary text and no math-symbols or more
complicated structured text.
During a search, <TeXmacs> only looks for text in the same mode and
language as at the position where you started your search. In other words,
when searching an <math|x> in math-mode, you will not find any x's in the
ordinary text. As a current limitation, the search string on the search
toolbar can only contain ordinary text and no math-symbols or more
complicated structured text. More complex searches will be discussed below.
In order to replace text, you should use <menu|Edit|Replace> or press
<key|C-=>. This will cause a special ``replace toolbar'' to appear below
the main text, just above the footer. You are prompted for a string which
<key|C-=>. This will cause a special \Preplace toolbar\Q to appear below
the main text, just above the footer. You are prompted for the string that
is to be replaced and the string by which to replace. Again, you may use
the <key|pageup> and <key|pagedown> keys in order to navigate through the
occurrences of the search string. When pressing <key|tab> or <key|return>
@ -43,7 +43,7 @@
they only allow for searching and replacing plain text. By pressing the
<icon|tm_expand_tool.xpm> icon on either of these toolbars, you may expand
the toolbar into a full blown widget with larger search and replace fields
which may contain arbitrary markup. Searching and replacing can be done
that may contain arbitrary markup. Searching and replacing can be done
using more or less the same keyboard shortcuts as in the case of the
toolbars, but you may now search and replace arbitrary content.
@ -51,14 +51,14 @@
somewhat released. For instance, assume that you are just starting a new
search with an empty search field. Then typing<nbsp><key|F6> inserts the
<markup|strong> tag with no text inside yet. Instead of looking only for
``strong empty strings'', <TeXmacs> will rather look for all strong markup
in your document. If you next enter the letter ``a'', then <TeXmacs> will
look for all strong text which contains the letter ``a''. In a<nbsp>similar
\Pstrong empty strings\Q, <TeXmacs> will rather look for all strong markup
in your document. If you next enter the letter \Pa\Q, then <TeXmacs> will
look for all strong text that contains the letter \Pa\Q. In a<nbsp>similar
way, when searching for the formula <math|<frac|x|>>, <TeXmacs> will
highlight all fractions in which the numerator contains the variable
<math|x>. Yet another example: a search for <math|<frac||<sqrt|x>>> will
highlight all formulas in which the denominator contains a square root
which contains the variable <math|x>. For instance, the fraction
highlight all formulas in which the denominator contains a square root that
contains the variable <math|x>. For instance, the fraction
<math|<frac|a+b|c+<sqrt|x+y>>> will be highlighted, but not
<math|<frac|<sqrt|x+y>|a+<sqrt|y>>>.
@ -66,15 +66,15 @@
implements a few additional special tags for enhancing structured
searching. First of all, it can happen that you would like to search for
certain content <em|inside> a special context. For instance, you might want
to search for all occurrences of the letter ``a'' inside a <markup|strong>
to search for all occurrences of the letter \Pa\Q inside a <markup|strong>
tag. When searching for <strong|a>, as above, <TeXmacs> will highlight all
<markup|strong> tags which contain the letter ``a''. In order to highlight
the letters ``a'' themselves, you should first enter the <markup|strong>
<markup|strong> tags that contain the letter \Pa\Q. In order to highlight
the letters \Pa\Q themselves, you should first enter the <markup|strong>
tag inside an empty search field using <key|F6>. You next enter a special
<markup|select-region> tag using <key|std ?>, and finally insert the letter
``a'' inside this tag. Other special markup which can be used inside search
fields are the ``wildcards'' <math|x>, <math|y> and <math|z> which are
entered using <key|std 1>, <key|std 2> and <key|std 3>.
\Pa\Q inside this tag. Other special markup that can be used inside search
fields are the \Pwildcards\Q <math|x>, <math|y> and <math|z>, which are
entered using <key|std 1>,<nbsp><key|std 2> and<nbsp><key|std 3>.
As soon as you start using the structured text and replace widgets instead
of the toolbars, this will be remembered as a user preference: any
@ -90,4 +90,7 @@
Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
Texts. A copy of the license is included in the section entitled "GNU Free
Documentation License".>
</body>
</body>
<initial|<\collection>
</collection>>

69
main/editing/man-spell-checking.en.tm
View File

@ -1,68 +1,51 @@
<TeXmacs|1.0.0.8>
<TeXmacs|1.99.5>
<style|tmdoc>
<style|<tuple|tmdoc|english>>
<\body>
<expand|tmdoc-title|Spell checking>
<tmdoc-title|Spell checking>
If the program <verbatim|ispell> has been installed on your system, then
you may use it to check your text for misspelled words by pressing
<shortcut|(spell-start)> or <submenu|Edit|spell>. Notice that you might have to
verify that the dictionaries corresponding to the languages in which your
texts have been written have been installed on your system; this is usually
the case for English.
<shortcut|(spell-start)> or <menu|Edit|Spell>. Notice that you might have
to verify that the dictionaries corresponding to the languages in which
your texts have been written have been installed on your system; this is
usually the case for English.
When you launch the spell checker (either on the whole text or a selected
region), you will be prompted at each misspelled word and the footer
displays the available options:
<\description>
<expand|item*|a)>Accepts the misspelled word and all its future
occurrences in the text.
<item*|a)>Accepts the misspelled word and all its future occurrences in
the text.
<expand|item*|r)>Replace the misspelled word by a correction you have to
enter.
<item*|r)>Replace the misspelled word by a correction you have to enter.
<expand|item*|i)>Indicate that the ``misspelled'' word is actually
correct and that it has to be inserted in your personal dictionary.
<item*|i)>Indicate that the \Pmisspelled\Q word is actually correct and
that it has to be inserted in your personal dictionary.
<expand|item*|1-9)>Several suggested corrections for your misspelled
word.
<item*|1-9)>Several suggested corrections for your misspelled word.
</description>
Notice that <verbatim|ispell> just checks for misspelled words. No
grammatical faults will be detected.
When starting the spell checker, it will use the dictionary of the language
which is active at the current cursor position (or the start of a
selection). Only text in that language will be checked for. If your
document contains text in several languages, then you will have to launch
the spell checker once for each language being used.
that is active at the current cursor position (or the start of a
selection). Only text in that language will be checked. If your document
contains text in several languages, then you will have to launch the spell
checker once for each language being used.
<apply|tmdoc-copyright|1998--2002|Joris van der Hoeven>
<tmdoc-copyright|1998--2002|Joris van der Hoeven>
<expand|tmdoc-license|Permission is granted to copy, distribute and/or
modify this document under the terms of the GNU Free Documentation License,
Version 1.1 or any later version published by the Free Software Foundation;
with no Invariant Sections, with no Front-Cover Texts, and with no
Back-Cover Texts. A copy of the license is included in the section entitled
"GNU Free Documentation License".>
<tmdoc-license|Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License, Version 1.1
or any later version published by the Free Software Foundation; with no
Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
Texts. A copy of the license is included in the section entitled "GNU Free
Documentation License".>
</body>
<\initial>
<\collection>
<associate|paragraph width|150mm>
<associate|odd page margin|30mm>
<associate|shrinking factor|4>
<associate|page right margin|30mm>
<associate|page top margin|30mm>
<associate|reduction page right margin|25mm>
<associate|page type|a4>
<associate|reduction page bottom margin|15mm>
<associate|even page margin|30mm>
<associate|reduction page left margin|25mm>
<associate|page bottom margin|30mm>
<associate|reduction page top margin|15mm>
<associate|language|english>
</collection>
</initial>
<initial|<\collection>
</collection>>

29
main/editing/man-structured-editing.en.tm
View File

@ -1,14 +1,14 @@
<TeXmacs|1.0.7.7>
<TeXmacs|1.99.5>
<style|tmdoc>
<style|<tuple|tmdoc|english>>
<\body>
<tmdoc-title|Structured editing>
As a general rule, the behaviour of most structured editing operations is
conditioned by the <em|<rigid|current focus>>. By default, the innermost
tag which contains the cursor. Whenever some selection is active, the
current focus is the innermost tag which contains the selection. During
tag that contains the cursor. Whenever some selection is active, the
current focus is the innermost tag that contains the selection. During
structured operations, such as navigating among similar tags, the current
focus may temporarily be set to something else. The current focus is
visually indicated by the innermost cyan box around the cursor.
@ -24,7 +24,7 @@
tree, and node insertions will take precedence over the insertion of new
rows and columns.
In many cases, a ``default particular behaviour'' has been defined for all
In many cases, a \Pdefault particular behaviour\Q has been defined for all
tags minus some exceptional ones. In our example of structured insertion,
the default behaviour of <shortcut|(structured-insert-left)> and
<shortcut|(structured-insert-right)> is to insert a new argument to the tag
@ -32,11 +32,11 @@
<\big-figure>
<\equation*>
<matrix|<tformat|<table|<row|<cell|a>|<cell|b<value|cursor>>|<cell|c>>|<row|<cell|d>|<cell|e>|<cell|f>>>>><space|5em><matrix|<tformat|<table|<row|<cell|a>|<cell|b>|<cell|<value|cursor>>|<cell|c>>|<row|<cell|d>|<cell|e>|<cell|>|<cell|f>>>>><space|2em><matrix|<tformat|<table|<row|<cell|a>|<cell|<value|cursor>>|<cell|b>|<cell|c>>|<row|<cell|d>|<cell|>|<cell|e>|<cell|f>>>>><space|2em><matrix|<tformat|<table|<row|<cell|a>|<cell|b>|<cell|c>>|<row|<cell|>|<cell|<value|cursor>>|<cell|>>|<row|<cell|d>|<cell|e>|<cell|f>>>>><space|2em><matrix|<tformat|<table|<row|<cell|>|<cell|<value|cursor>>|<cell|>>|<row|<cell|a>|<cell|b>|<cell|c>>|<row|<cell|d>|<cell|e>|<cell|f>>>>>
<matrix|<tformat|<table|<row|<cell|a>|<cell|b<cursor>>|<cell|c>>|<row|<cell|d>|<cell|e>|<cell|f>>>>><space|5em><matrix|<tformat|<table|<row|<cell|a>|<cell|b>|<cell|<cursor>>|<cell|c>>|<row|<cell|d>|<cell|e>|<cell|>|<cell|f>>>>><space|2em><matrix|<tformat|<table|<row|<cell|a>|<cell|<cursor>>|<cell|b>|<cell|c>>|<row|<cell|d>|<cell|>|<cell|e>|<cell|f>>>>><space|2em><matrix|<tformat|<table|<row|<cell|a>|<cell|b>|<cell|c>>|<row|<cell|>|<cell|<cursor>>|<cell|>>|<row|<cell|d>|<cell|e>|<cell|f>>>>><space|2em><matrix|<tformat|<table|<row|<cell|>|<cell|<cursor>>|<cell|>>|<row|<cell|a>|<cell|b>|<cell|c>>|<row|<cell|d>|<cell|e>|<cell|f>>>>>
</equation*>
<|big-figure>
<label|matrix-insert-fig>Assume that the cursor is at the position of
<value|cursor> inside the left-most matrix. Then the four other matrices
<cursor> inside the left-most matrix. Then the four other matrices
respectively correspond to the insertion of a new column at the
left<nbsp>(<shortcut|(structured-insert-left)>) or
right<nbsp>(<shortcut|(structured-insert-right)>), <abbr|resp.> a new row
@ -44,9 +44,9 @@
below<nbsp>(<shortcut|(structured-insert-down)>).
</big-figure>
<\big-figure|<tree|a|b|c<value|cursor>|d><space|3em><space|3em><tree|a|b|<value|cursor>|c|d><space|3em><tree|a|b|c|<value|cursor>|d><space|3em><tree|a|b|<tree|<value|cursor>|c>|d><space|3em><tree|a|b|<tree|c|<value|cursor>>|d>>
<\big-figure|<tree|a|b|c<cursor>|d><space|3em><space|3em><tree|a|b|<cursor>|c|d><space|3em><tree|a|b|c|<cursor>|d><space|3em><tree|a|b|<tree|<cursor>|c>|d><space|3em><tree|a|b|<tree|c|<cursor>>|d>>
<label|tree-insert-fig>Assume that the cursor is at the position of
<value|cursor> inside the left-most tree. Then the four other trees
<cursor> inside the left-most tree. Then the four other trees
respectively correspond to the insertion of a new node at the
left<nbsp>(<shortcut|(structured-insert-left)>), at the
right<nbsp>(<shortcut|(structured-insert-right)>),
@ -68,11 +68,11 @@
<\big-figure>
<\equation*>
<matrix|<tformat|<table|<row|<cell|a>|<cell|b<value|cursor>>|<cell|c>>|<row|<cell|d>|<cell|e>|<cell|f>>>>><space|5em><matrix|<tformat|<table|<row|<cell|b<value|cursor>>|<cell|c>>|<row|<cell|e>|<cell|f>>>>><space|2em><matrix|<tformat|<table|<row|<cell|a>|<cell|<value|cursor>c>>|<row|<cell|d>|<cell|f>>>>><space|2em>b<value|cursor>
<matrix|<tformat|<table|<row|<cell|a>|<cell|b<cursor>>|<cell|c>>|<row|<cell|d>|<cell|e>|<cell|f>>>>><space|5em><matrix|<tformat|<table|<row|<cell|b<cursor>>|<cell|c>>|<row|<cell|e>|<cell|f>>>>><space|2em><matrix|<tformat|<table|<row|<cell|a>|<cell|<cursor>c>>|<row|<cell|d>|<cell|f>>>>><space|2em>b<cursor>
</equation*>
<|big-figure>
<label|matrix-remove-fig>Assume that the cursor is at the position of
<value|cursor> inside the left-most matrix. Then pressing the
<cursor> inside the left-most matrix. Then pressing the
keys<nbsp><shortcut|(structured-remove-left)> and
<shortcut|(structured-remove-right)> respectively result in the next two
matrices. Pressing either<nbsp><shortcut|(remove-structure-upwards)> or
@ -91,8 +91,5 @@
Documentation License".>
</body>
<\initial>
<\collection>
<associate|language|english>
</collection>
</initial>
<initial|<\collection>
</collection>>

13
main/editing/man-structured-geometry.en.tm
View File

@ -1,6 +1,6 @@
<TeXmacs|1.0.7.7>
<TeXmacs|1.99.5>
<style|tmdoc>
<style|<tuple|tmdoc|english>>
<\body>
<tmdoc-title|Positioning and resizing objects>
@ -47,7 +47,7 @@
or increase the step size when positioning or resizing.
</description>
Particular tags to which the shortcuts apply are the following
Particular tags to which the shortcuts apply are the following:
<\description>
<item*|Spaces>Both horizontal and vertical spaces from the
@ -74,8 +74,5 @@
Documentation License".>
</body>
<\initial>
<\collection>
<associate|language|english>
</collection>
</initial>
<initial|<\collection>
</collection>>

65
main/editing/man-structured-move.en.tm
View File

@ -1,6 +1,6 @@
<TeXmacs|1.0.7.6>
<TeXmacs|1.99.5>
<style|tmdoc>
<style|<tuple|tmdoc|english>>
<\body>
<tmdoc-title|Structured cursor movement>
@ -11,7 +11,7 @@
<\enumerate>
<item>Traversal of the entire structure of the document.
<item>Traversal of tags which are similar to the innermost tag.
<item>Traversal of tags that are similar to the innermost tag.
<item>Movements inside the innermost tag.
</enumerate>
@ -24,33 +24,41 @@
<paragraph*|Structured traversal of the document>
The <shortcut|(traverse-left)>, <shortcut|(traverse-right)>,
<shortcut|(traverse-up)> and <shortcut|(traverse-down)> keys are used for
the structured traversal of the entire document. Inside plain text,
<shortcut|(traverse-left)> and <shortcut|(traverse-right)> allow you to
move in a word-by-word manner, while <shortcut|(traverse-up)> and
<shortcut|(traverse-down)> correspond to paragraph-by-paragraph motion.
The <shortcut|(kbd-select-if-active traverse-left)>,
<shortcut|(kbd-select-if-active traverse-right)>,
<shortcut|(kbd-select-if-active traverse-up)> and
<shortcut|(kbd-select-if-active traverse-down)> keys are used for the
structured traversal of the entire document. Inside plain text,
<shortcut|(kbd-select-if-active traverse-left)> and
<shortcut|(kbd-select-if-active traverse-right)> allow you to move in a
word-by-word manner, while <shortcut|(kbd-select-if-active traverse-up)>
and <shortcut|(kbd-select-if-active traverse-down)> correspond to
paragraph-by-paragraph motion.
In the presence of other markup, the <shortcut|(traverse-left)> and
<shortcut|(traverse-right)> keys allow you to visit all accessible cursor
positions of the document, except that we keep moving in a word-by-word
manner inside plain text. The behaviour of the <shortcut|(traverse-up)> and
<shortcut|(traverse-down)> keys is more context-dependent. Inside matrices,
they typically allow you to move one row up or down.
In the presence of other markup, the <shortcut|(kbd-select-if-active
traverse-left)> and <shortcut|(kbd-select-if-active traverse-right)> keys
allow you to visit all accessible cursor positions of the document, except
that we keep moving in a word-by-word manner inside plain text. The
behaviour of the <shortcut|(kbd-select-if-active traverse-up)> and
<shortcut|(kbd-select-if-active traverse-down)> keys is more
context-dependent. Inside matrices, they typically allow you to move one
row up or down.
<paragraph*|Traversal of tags which are similar to the innermost tag>
<paragraph*|Traversal of tags that are similar to the innermost tag>
This type of cursor movement allows you to quickly visit all other tags in
the document which are <em|similar> to the innermost tag. The
<shortcut|(traverse-previous)> and <shortcut|(traverse-next)> keys allow
you move to the previous or next similar tags, whereas
<shortcut|(traverse-first)> and <shortcut|(traverse-last)> directly jump to
the first or last similar tags.
the document that are <em|similar> to the innermost tag. The
<shortcut|(kbd-select-if-active traverse-previous)> and
<shortcut|(kbd-select-if-active traverse-next)> keys allow you move to the
previous or next similar tags, whereas <shortcut|(kbd-select-if-active
traverse-first)> and <shortcut|(kbd-select-if-active traverse-last)>
directly jump to the first or last similar tags.
For instance, when you are inside a section title, you may move to the
previous sectional title (which could also be the title of a subsection or
a chapter, for instance) using <shortcut|(traverse-previous)>. Notice that
you may use <key|C-Ÿ> to jump to the previous section title.
For instance, if you are inside a section title, then you may move to the
previous sectional title using <shortcut|(kbd-select-if-active
traverse-previous)>. Subsection and chapter titles are in particular
understood to be \Psimilar\Q to section titles. Notice that you may use
<key|C-Ÿ> to jump to the previous section title.
<paragraph*|Movements inside the innermost tag>
@ -79,8 +87,5 @@
Documentation License".>
</body>
<\initial>
<\collection>
<associate|language|english>
</collection>
</initial>
<initial|<\collection>
</collection>>

51
main/editing/man-undo-and-redo.en.tm
View File

@ -1,17 +1,17 @@
<TeXmacs|1.0.0.8>
<TeXmacs|1.99.5>
<style|tmdoc>
<style|<tuple|tmdoc|english>>
<\body>
<expand|tmdoc-title|Undo and redo>
<tmdoc-title|Undo and redo>
It is possible to gradually undo the changes you made in a document from
the moment that you launched <apply|TeXmacs>. This can be done via
<submenu|Edit|undo> or using the keystrokes <shortcut|(undo 0)> or
<shortcut|(undo 0)>. Undone changes can be ``redone'' using <submenu|Edit|redo> or
<shortcut|(redo 0)>.
the moment that you launched <TeXmacs>. This can be done via
<menu|Edit|Undo> or using the keystrokes <shortcut|(undo 0)> or
<shortcut|(undo 0)>. Undone changes can be \Predone\Q using
<menu|Edit|Redo> or <shortcut|(redo 0)>.
In order to save memory, the number of successive actions which can be
In order to save memory, the number of successive actions that can be
undone is limited to 100 (by default). It is possible to increase this
number by adding a command like\
@ -19,34 +19,19 @@
\ \ \ \ (set-maximal-undo-depth 1000)
</verbatim>
in our personal initialization file (see <submenu|Help|scheme>). When
in our personal initialization file (see <menu|Help|Scheme>). When
specifying a negative number as your maximal undo depth, any number of
actions can be undone.
<apply|tmdoc-copyright|1998--2002|Joris van der Hoeven>
<tmdoc-copyright|1998--2002|Joris van der Hoeven>
<expand|tmdoc-license|Permission is granted to copy, distribute and/or
modify this document under the terms of the GNU Free Documentation License,
Version 1.1 or any later version published by the Free Software Foundation;
with no Invariant Sections, with no Front-Cover Texts, and with no
Back-Cover Texts. A copy of the license is included in the section entitled
"GNU Free Documentation License".>
<tmdoc-license|Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License, Version 1.1
or any later version published by the Free Software Foundation; with no
Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
Texts. A copy of the license is included in the section entitled "GNU Free
Documentation License".>
</body>
<\initial>
<\collection>
<associate|paragraph width|150mm>
<associate|odd page margin|30mm>
<associate|shrinking factor|4>
<associate|page right margin|30mm>
<associate|page top margin|30mm>
<associate|reduction page right margin|25mm>
<associate|page type|a4>
<associate|reduction page bottom margin|15mm>
<associate|even page margin|30mm>
<associate|reduction page left margin|25mm>
<associate|page bottom margin|30mm>
<associate|reduction page top margin|15mm>
<associate|language|english>
</collection>
</initial>
<initial|<\collection>
</collection>>

32
main/editing/man-versioning.en.tm
View File

@ -1,6 +1,6 @@
<TeXmacs|1.0.7.15>
<TeXmacs|1.99.5>
<style|tmdoc>
<style|<tuple|tmdoc|english>>
<\body>
<tmdoc-title|Versioning tools>
@ -38,9 +38,10 @@
versions either from the items in the submenu <menu|Version|Move>, or using
the keyboard shortcuts <shortcut|(version-previous-difference)> and
<shortcut|(version-next-difference)>. One may also use the more general
structured navigation shortcuts <shortcut|(traverse-first)>,
<shortcut|(traverse-last)>, <shortcut|(traverse-previous)> and
<shortcut|(traverse-next)>.
structured navigation shortcuts <shortcut|(kbd-select-if-active
traverse-first)>, <shortcut|(kbd-select-if-active traverse-last)>,
<shortcut|(kbd-select-if-active traverse-previous)> and
<shortcut|(kbd-select-if-active traverse-next)>.
<paragraph*|Visualization of the differences>
@ -68,11 +69,11 @@
difference, this can be done from entries in the submenu
<menu|Version|Retain>. Alternatively, one may use the shortcuts
<shortcut|(version-retain 0)>, <shortcut|(version-retain 1)> and
<shortcut|(version-retain 'current)> to retain the old, new and currently
<shortcut|(kbd-control-return)> to retain the old, new and currently
displayed version, respectively. If both versions are displayed, then
<shortcut|(version-retain 'current)> retains the new version. After
retaining one of the versions, we automatically jump to the next
difference, which can then be processed.
<shortcut|(kbd-control-return)> retains the new version. After retaining
one of the versions, we automatically jump to the next difference, which
can then be processed.
If you selected some text, then any of the above action will retain the
appropriate version for each of the differences in the selection. This
@ -102,7 +103,7 @@
applied on the entire buffer. Similarly, if you change the grain inside a
difference, then the difference will be recomputed using the new grain.
Notice that you may also ``change'' the grain to the current grain. This
Notice that you may also \Pchange\Q the grain to the current grain. This
has the effect of reactualizing the differences of a selected portion or of
the current difference at the cursor position. This may be useful, if you
made some changes to one of the versions. For instance, assume that the old
@ -116,7 +117,7 @@
<paragraph*|Using external programs for version control such as
<name|Subversion>>
If the file you are editing belongs to a directory which is under version
If the file you are editing belongs to a directory that is under version
control (only <name|Subversion> is currently supported, although other
systems might follow), then the first part of the <menu|Version> menu will
contain some clickable entries.
@ -133,7 +134,7 @@
repository. Using<nbsp><menu|Version|Commit>, the current user's version
can be committed to the repository. When doing so, you will be prompted for
a small explanatory message about the changes that you have made. A file
which is not yet under version control can be added to the version control
that is not yet under version control can be added to the version control
system using <menu|Version|Register>. Registering a file does <em|not>
commit it to the repository; you still have to use <menu|Version|Commit> in
order to do so.
@ -153,8 +154,5 @@
Documentation License".>
</body>
<\initial>
<\collection>
<associate|language|english>
</collection>
</initial>
<initial|<\collection>
</collection>>