Hello,
Following discussions in ticket #6608, please find attached updates of
these manuals (sections 6.1 in UserGuide and 3.4.1 in EmbeddedObjects),
with change tracking.
I guess that thes files won't go through the mailing list, so I post
patches wrt the current versions of the manuals in branch.
I've already translated in French, I'll post it later.
--
Jean-Pierre
--- UserGuide.lyx.orig 2010-04-19 18:01:47.000000000 +0200
+++ UserGuide.lyx 2010-04-20 10:39:34.000000000 +0200
@@ -108,9 +108,9 @@
\papercolumns 1
\papersides 2
\paperpagestyle default
-\tracking_changes false
+\tracking_changes true
\output_changes false
-\author ""
+\author "Jean-Pierre"
\author ""
\end_header
@@ -24445,8 +24445,24 @@
\end_layout
\begin_layout Standard
-Note that the style <page> won't print the page number if the label is on
- the previous, the same, or the next page.
+Note that the style
+\change_inserted 0 1271691416
+
+\begin_inset Quotes eld
+\end_inset
+
+on page
+\change_unchanged
+<page>
+\change_inserted 0 1271691060
+
+\begin_inset Quotes erd
+\end_inset
+
+
+\change_unchanged
+ won't print the page number if the label is on the previous, the same,
+ or the next page.
You will e.
\begin_inset space \thinspace{}
\end_inset
@@ -24468,6 +24484,19 @@
\end_inset
instead.
+
+\change_inserted 0 1271752702
+ Style
+\begin_inset Quotes eld
+\end_inset
+
+<reference> on page <page>
+\begin_inset Quotes erd
+\end_inset
+
+ won't print anything if the label if on the same page.
+\change_unchanged
+
\end_layout
\begin_layout Standard
@@ -24564,8 +24593,339 @@
Embedded Objects
\emph default
manual.
+\change_inserted 0 1271693304
+
\end_layout
+\begin_layout Standard
+
+\change_inserted 0 1271693498
+
+\series bold
+prettyref
+\series default
+ does not know currently all the possible label shortcuts, you may extend
+ to other shortcuts than
+\family typewriter
+eq
+\family default
+,
+\family typewriter
+lem
+\family default
+,
+\family typewriter
+thm
+\family default
+,
+\family typewriter
+cha
+\family default
+,
+\family typewriter
+sec
+\family default
+,
+\family typewriter
+tab
+\family default
+, and
+\family typewriter
+fig
+\family default
+ by adding to the preamble e.g.:
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694162
+
+\backslash
+newrefformat{cor}{Corollary
+\backslash
+ref{#1}}
+\end_layout
+
+\begin_layout Paragraph
+
+\change_inserted 0 1271694428
+Note for non-English documents:
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 0 1271694166
+using babel languages which make the period character active (like French)
+ creates an error with styles
+\begin_inset Quotes eld
+\end_inset
+
+on
+\begin_inset space ~
+\end_inset
+
+page
+\begin_inset space ~
+\end_inset
+
+<page>
+\begin_inset Quotes erd
+\end_inset
+
+ and
+\begin_inset Quotes eld
+\end_inset
+
+<reference>
+\begin_inset space ~
+\end_inset
+
+on
+\begin_inset space ~
+\end_inset
+
+page
+\begin_inset space ~
+\end_inset
+
+<page>
+\begin_inset Quotes erd
+\end_inset
+
+, and with style
+\begin_inset Quotes eld
+\end_inset
+
+Formatted
+\begin_inset space ~
+\end_inset
+
+reference
+\begin_inset Quotes erd
+\end_inset
+
+.
+
+\end_layout
+
+\begin_layout Itemize
+
+\change_inserted 0 1271694166
+In the latter case, you can embed each reference in two ERT boxes like this:
+
+\end_layout
+
+\begin_deeper
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\series bold
+{
+\backslash
+shorthandoff{:}
+\series default
+<Formatted
+\begin_inset space ~
+\end_inset
+
+reference>
+\series bold
+}
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 0 1271694166
+Moreover, as
+\series bold
+prettyref
+\series default
+ is not internationalized, you will have to redefine the
+\backslash
+
+\family typewriter
+newformat
+\family default
+ commands in the preamble:
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\backslash
+newrefformat{eq}{
+\backslash
+textup{(
+\backslash
+ref{#1})}}
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\backslash
+newrefformat{lem}{Lemma
+\backslash
+ref{#1}}
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\backslash
+newrefformat{thm}{Theorem
+\backslash
+ref{#1}}
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\backslash
+newrefformat{cha}{Chapter
+\backslash
+ref{#1}}
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\backslash
+newrefformat{sec}{Section
+\backslash
+ref{#1}}
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\backslash
+newrefformat{tab}{Table
+\backslash
+ref{#1} on page
+\backslash
+pageref{#1}}
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\backslash
+newrefformat{fig}{Figure
+\backslash
+ref{#1} on page
+\backslash
+pageref{#1}}
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 0 1271694166
+by the adequate string for your language (you may also add strings for currently
+ undefined formats).
+\end_layout
+
+\end_deeper
+\begin_layout Itemize
+
+\change_inserted 0 1271694166
+In the former case, which only happens when
+\series bold
+hyperref
+\series default
+ is not active for the document (with recent TeX distributions,
+\series bold
+varioref.sty
+\series default
+ version 1.4w), you may either use the previous workaround, or globally redefine
+ command
+\family typewriter
+
+\backslash
+v...@pagenum
+\family default
+ in the preamble as
+\end_layout
+
+\begin_deeper
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\backslash
+def
+\backslash
+v...@pagenum#1#2{%
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\backslash
+...@ifundefined{r@#2}{
+\backslash
+...@namedef{r@#2}{{??}{??}}}{}%
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\backslash
+edef#1{
+\backslash
+expandafter
+\backslash
+expandafter
+\backslash
+expandafter
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\backslash
+...@cdr
+\backslash
+csname r...@#2
+\backslash
+endcsname
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+
+\backslash
+...@nil}%
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694166
+}
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 0 1271694272
+You may of course also make hyperref active, if you don' mind having an
+ hypertexed pdf output.
+\change_deleted 0 1271694240
+
+\end_layout
+
+\end_deeper
\begin_layout Section
Table of Contents and other Listings
\begin_inset Index
--- EmbeddedObjects.lyx.orig 2010-04-19 18:28:20.000000000 +0200
+++ EmbeddedObjects.lyx 2010-04-20 10:39:29.000000000 +0200
@@ -209,9 +209,9 @@
\bullet 1 1 34 -1
\bullet 2 2 35 -1
\bullet 3 2 7 -1
-\tracking_changes false
+\tracking_changes true
\output_changes false
-\author ""
+\author "Jean-Pierre"
\author ""
\end_header
@@ -20439,8 +20439,24 @@
\end_layout
\begin_layout Standard
-Note that the style <page> won't print the page number if the label is on
- the previous, the same, or the next page.
+Note that the style
+\change_inserted 0 1271692938
+
+\begin_inset Quotes eld
+\end_inset
+
+on page
+\change_unchanged
+<page>
+\change_inserted 0 1271692943
+
+\begin_inset Quotes erd
+\end_inset
+
+
+\change_unchanged
+ won't print the page number if the label is on the previous, the same,
+ or the next page.
You will e.
\begin_inset space \thinspace{}
\end_inset
@@ -20462,6 +20478,23 @@
\end_inset
instead.
+
+\change_inserted 0 1271752735
+ Style
+\begin_inset Quotes eld
+\end_inset
+
+
+\begin_inset Quotes eld
+\end_inset
+
+<reference> on page <page>
+\begin_inset Quotes erd
+\end_inset
+
+ won't print anything if the label if on the same page.
+\change_unchanged
+
\end_layout
\begin_layout Standard
@@ -20475,6 +20508,337 @@
e box.
\end_layout
+\begin_layout Standard
+
+\change_inserted 0 1271693581
+
+\series bold
+prettyref
+\series default
+ does not know currently all the possible label shortcuts, you may extend
+ to other shortcuts than
+\family typewriter
+eq
+\family default
+,
+\family typewriter
+lem
+\family default
+,
+\family typewriter
+thm
+\family default
+,
+\family typewriter
+cha
+\family default
+,
+\family typewriter
+sec
+\family default
+,
+\family typewriter
+tab
+\family default
+, and
+\family typewriter
+fig
+\family default
+ by adding to the preamble e.g.:
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694328
+
+\backslash
+newrefformat{cor}{Corollary
+\backslash
+ref{#1}}
+\end_layout
+
+\begin_layout Paragraph
+
+\change_inserted 0 1271694359
+
+\series bold
+Note for non-English documents:
+\series default
+
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 0 1271694335
+using babel languages which make the period character active (like French)
+ creates an error with styles
+\begin_inset Quotes eld
+\end_inset
+
+on
+\begin_inset space ~
+\end_inset
+
+page
+\begin_inset space ~
+\end_inset
+
+<page>
+\begin_inset Quotes erd
+\end_inset
+
+ and
+\begin_inset Quotes eld
+\end_inset
+
+<reference>
+\begin_inset space ~
+\end_inset
+
+on
+\begin_inset space ~
+\end_inset
+
+page
+\begin_inset space ~
+\end_inset
+
+<page>
+\begin_inset Quotes erd
+\end_inset
+
+, and with style
+\begin_inset Quotes eld
+\end_inset
+
+Formatted
+\begin_inset space ~
+\end_inset
+
+reference
+\begin_inset Quotes erd
+\end_inset
+
+.
+
+\end_layout
+
+\begin_layout Itemize
+
+\change_inserted 0 1271694335
+In the latter case, you can embed each reference in two ERT boxes like this:
+
+\end_layout
+
+\begin_deeper
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\series bold
+{
+\backslash
+shorthandoff{:}
+\series default
+<Formatted
+\begin_inset space ~
+\end_inset
+
+reference>
+\series bold
+}
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 0 1271694335
+Moreover, as
+\series bold
+prettyref
+\series default
+ is not internationalized, you will have to redefine the
+\backslash
+
+\family typewriter
+newformat
+\family default
+ commands in the preamble:
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\backslash
+newrefformat{eq}{
+\backslash
+textup{(
+\backslash
+ref{#1})}}
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\backslash
+newrefformat{lem}{Lemma
+\backslash
+ref{#1}}
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\backslash
+newrefformat{thm}{Theorem
+\backslash
+ref{#1}}
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\backslash
+newrefformat{cha}{Chapter
+\backslash
+ref{#1}}
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\backslash
+newrefformat{sec}{Section
+\backslash
+ref{#1}}
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\backslash
+newrefformat{tab}{Table
+\backslash
+ref{#1} on page
+\backslash
+pageref{#1}}
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\backslash
+newrefformat{fig}{Figure
+\backslash
+ref{#1} on page
+\backslash
+pageref{#1}}
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 0 1271694335
+by the adequate string for your language (you may also add strings for currently
+ undefined formats).
+\end_layout
+
+\end_deeper
+\begin_layout Itemize
+
+\change_inserted 0 1271694335
+In the former case, which only happens when
+\series bold
+hyperref
+\series default
+ is not active for the document (with recent TeX distributions,
+\series bold
+varioref.sty
+\series default
+ version 1.4w), you may either use the previous workaround, or globally redefine
+ command
+\family typewriter
+
+\backslash
+v...@pagenum
+\family default
+ in the preamble as
+\end_layout
+
+\begin_deeper
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\backslash
+def
+\backslash
+v...@pagenum#1#2{%
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\backslash
+...@ifundefined{r@#2}{
+\backslash
+...@namedef{r@#2}{{??}{??}}}{}%
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\backslash
+edef#1{
+\backslash
+expandafter
+\backslash
+expandafter
+\backslash
+expandafter
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\backslash
+...@cdr
+\backslash
+csname r...@#2
+\backslash
+endcsname
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+
+\backslash
+...@nil}%
+\end_layout
+
+\begin_layout LyX-Code
+
+\change_inserted 0 1271694335
+}
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 0 1271694335
+You may of course also make hyperref active, if you don' mind having an
+ hypertexed pdf output.
+\end_layout
+
+\end_deeper
\begin_layout Subsection
Automatic Reference Naming
\begin_inset Index
