anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.lyx.org:lyx

Browse Source
This commit is contained in:
Uwe Stöhr 2012-10-01 01:43:06 +02:00
commit de45075def
54 changed files with 1557 additions and 891 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
RELEASE-NOTES
View File

@ -6,6 +6,17 @@ when upgrading from earlier versions to a version of the 2.1.x series.
Interface changes
-----------------
Whenever the user closes a (tabbed) view on a document, either by
clicking on the tab close button, or by using the File->Close menu,
LyX now closes exclusively that specific view. If there are other
views showing the same document, they are not closed. When the user
closes the last view, LyX can be configured for either closing the
document, or keeping it into memory as a hidden document (that can be
shown again through the View->Hidden-> submenu).
A new configurable preference option has been added, allowing for either
(close_buffer_with_last_view)
There have been some changes to the LyX command line. The following new
options have been added:
@ -27,6 +38,11 @@ search operation by hitting the ESC key.
The following pref variables were changed in 2.1:
- \\close_buffer_with_last_view [yes|no|ask]
When user closes the last view on a document, close the document
as well ("yes"), or hide the document ("no"), or ask the user
("ask").
The following pref variables are obsoleted in 2.1:
- \\default_language
@ -37,6 +53,12 @@ To set the default language and paper size for new documents, use the
The following new LyX functions have been introduced:
- LFUN_BRANCH_MASTER_ACTIVATE <branch>:
LFUN_BRANCH_MASTER_DEACTIVATE <branch>:
Activates or deactivates a branch in a master document from within
a child (as opposed to the existing LFUN_BRANCH_[DE]ACTIVATE, which
toggle the branch in the document itself).
- LFUN_BUFFER_EXPORT_AS <format> <filename>
Equivalent to the new -export-to command-line switch (see above).
@ -45,6 +67,10 @@ The following new LyX functions have been introduced:
This is also available through a new menu voice within the
[Edit]->[Paste Special...] sub-menu.
- LFUN_VIEW_CLOSE
Close the current document view only, if there are no more views
on the document, either close or hide it (see the new preference
option \\close_buffer_with_last_view)
The following LyX functions have been removed:
@ -59,6 +85,14 @@ The following LyX functions have been changed:
to show the settings dialog. This is no longer possible and one should use
inset-settings for this purpose.
- LFUN_CLOSE_TAB_GROUP_CLOSE ("close-tab-group") was renamed to
LFUN_TAB_GROUP_CLOSE ("tab-group-close").
- LFUN_SPIT_VIEW ("split-view") was renamed to
LFUN_VIEW_SPLIT ("view-split").
- LFUN_BREAK_PARAGRAPH ("break-paragraph") was renamed to
LFUN_PARAGRAPH_BREAK ("paragraph-break").
The following LyX key bindings have been changed:
@ -66,6 +100,9 @@ The following LyX key bindings have been changed:
- LFUN_MATH_MACRO_FOLD ("math-macro-fold")
The binding to "C-minus" has changed to "C-S-underscore".
- The binding "C-w" was moved from "buffer-close" to "view-close"
(only in cua.bind).
Linux desktop file specification and scalable icon has been included
into the tarball.

2
development/qmake/Resources.qrc
View File

@ -608,7 +608,7 @@
<file alias="images/all-changes-accept.png">../../lib/images/all-changes-accept.png</file>
<file alias="images/banner.png">../../lib/images/banner.png</file>
<file alias="images/url-insert.png">../../lib/images/url-insert.png</file>
<file alias="images/close-tab-group.png">../../lib/images/close-tab-group.png</file>
<file alias="images/tab-group-close.png">../../lib/images/tab-group-close.png</file>
<file alias="images/tabular-feature_delete-row.png">../../lib/images/tabular-feature_delete-row.png</file>
<file alias="images/tabular-feature_set-longtabular.png">../../lib/images/tabular-feature_set-longtabular.png</file>
<file alias="images/buffer-view_pdf2.png">../../lib/images/buffer-view_pdf2.png</file>

18
lib/Makefile.am
View File

@ -355,7 +355,7 @@ dist_images_DATA = \
images/changes-output.png \
images/changes-track.png \
images/closetab.png \
images/close-tab-group.png \
images/tab-group-close.png \
images/copy.png \
images/cut.png \
images/demote.png \
@ -434,8 +434,8 @@ dist_images_DATA = \
images/reload.png \
images/script-insert_subscript.png \
images/script-insert_superscript.png \
images/split-view_horizontal.png \
images/split-view_vertical.png \
images/view-split_horizontal.png \
images/view-split_vertical.png \
images/standard.png \
images/tabular-feature_align-decimal.png \
images/tabular-feature_append-column.png \
@ -1212,7 +1212,7 @@ dist_imagesoxygen_DATA = \
images/oxygen/change-reject.png \
images/oxygen/changes-output.png \
images/oxygen/changes-track.png \
images/oxygen/close-tab-group.png \
images/oxygen/tab-group-close.png \
images/oxygen/closetab.png \
images/oxygen/copy.png \
images/oxygen/cut.png \
@ -1258,8 +1258,8 @@ dist_imagesoxygen_DATA = \
images/oxygen/paste.png \
images/oxygen/redo.png \
images/oxygen/reload.png \
images/oxygen/split-view_horizontal.png \
images/oxygen/split-view_vertical.png \
images/oxygen/view-split_horizontal.png \
images/oxygen/view-split_vertical.png \
images/oxygen/tabular-insert.png \
images/oxygen/textstyle-apply.png \
images/oxygen/thesaurus-entry.png \
@ -1322,7 +1322,7 @@ dist_imagesclassic_DATA = \
images/classic/changes-merge.png \
images/classic/changes-output.png \
images/classic/changes-track.png \
images/classic/close-tab-group.png \
images/classic/tab-group-close.png \
images/classic/copy.png \
images/classic/cut.png \
images/classic/demote.png \
@ -1395,8 +1395,8 @@ dist_imagesclassic_DATA = \
images/classic/reload.png \
images/classic/script-insert_subscript.png \
images/classic/script-insert_superscript.png \
images/classic/split-view_horizontal.png \
images/classic/split-view_vertical.png \
images/classic/view-split_horizontal.png \
images/classic/view-split_vertical.png \
images/classic/tabular-feature_align-decimal.png \
images/classic/tabular-feature_append-column.png \
images/classic/tabular-feature_append-row.png \

4
lib/bind/cua.bind
View File

@ -39,7 +39,7 @@ Format 1
\bind "C-n" "buffer-new"
\bind "C-S-N" "buffer-new-template"
\bind "C-o" "file-open"
\bind "C-w" "buffer-close"
\bind "C-w" "view-close"
\bind "C-s" "buffer-write"
\bind "C-S-S" "buffer-write-as"
\bind "C-p" "dialog-show print"
@ -222,7 +222,7 @@ Format 1
\bind "C-Delete" "word-delete-forward"
\bind "C-BackSpace" "word-delete-backward"
\bind "M-Return" "break-paragraph inverse"
\bind "M-Return" "paragraph-break inverse"
\bind "C-Return" "newline-insert newline"
\bind "C-S-Return" "newline-insert linebreak"
\bind "C-k" "line-delete-forward"

5
lib/bind/emacs.bind
View File

@ -40,7 +40,7 @@ Format 1
\bind "C-h" "specialchar-insert hyphenation"
\bind "C-M-minus" "specialchar-insert nobreakdash"
\bind "C-i" "space-insert hfill"
\bind "C-j" "break-paragraph"
\bind "C-j" "paragraph-break"
\bind "C-k" "line-delete-forward"
\bind "C-l" "screen-recenter"
\bind "C-m" "mark-toggle"
@ -106,6 +106,7 @@ Format 1
\bind "C-x C-t" "buffer-update dvi"
\bind "C-Next" "buffer-next"
\bind "C-Prior" "buffer-previous"
\bind "C-x 0" "view-close"
# this is "upcase-region" in emacs
@ -215,7 +216,7 @@ Format 1
\bind "C-Delete" "word-delete-forward"
\bind "M-d" "word-delete-forward"
\bind "C-BackSpace" "word-delete-backward"
\bind "M-Return" "break-paragraph inverse"
\bind "M-Return" "paragraph-break inverse"
\bind "C-Return" "newline-insert newline"
\bind "C-S-Return" "newline-insert linebreak"
\bind "C-S-L" "specialchar-insert ligature-break"

4
lib/bind/mac.bind
View File

@ -68,7 +68,7 @@ Format 1
# +: "Control-N" # Move down one line
\bind "M-n" "down"
# +: "Control-O" # Insert a new line after the cursor
\bind "M-o" "break-paragraph"
\bind "M-o" "paragraph-break"
# -: "Control-P" # Move up one line
# used by menu.bind - layouts
# +: "Control-T" # Transpose the character behind the cursor and the character in front of the cursor
@ -347,7 +347,7 @@ Format 1
\bind "A-Delete" "word-delete-forward"
\bind "A-BackSpace" "word-delete-backward"
\bind "M-Return" "break-paragraph inverse"
\bind "M-Return" "paragraph-break inverse"
\bind "C-Return" "newline-insert newline"
\bind "C-S-Return" "newline-insert linebreak"
\bind "A-space" "command-alternatives space-insert protected ; math-space"

4
lib/bind/site.bind
View File

@ -37,11 +37,11 @@ Format 1
\bind "Prior" "screen-up"
\bind "Next" "screen-down"
\bind "Return" "break-paragraph"
\bind "Return" "paragraph-break"
\bind "Delete" "char-delete-forward"
\bind "BackSpace" "char-delete-backward"
\bind "KP_Enter" "break-paragraph"
\bind "KP_Enter" "paragraph-break"
\bind "KP_Right" "char-right"
\bind "KP_Left" "char-left"
\bind "KP_Up" "up"

4
lib/bind/xemacs.bind
View File

@ -221,7 +221,7 @@ Format 1
\bind "C-Delete" "word-delete-forward"
\bind "M-d" "word-delete-forward"
\bind "C-BackSpace" "word-delete-backward"
\bind "M-Return" "break-paragraph inverse"
\bind "M-Return" "paragraph-break inverse"
\bind "C-Return" "newline-insert newline"
\bind "C-S-Return" "newline-insert linebreak"
\bind "C-S-L" "specialchar-insert ligature-break"
@ -332,7 +332,7 @@ Format 1
\bind "C-c percent" "layout Comment"
\bind "C-c Return" "break-paragraph inverse"
\bind "C-c Return" "paragraph-break inverse"
#
## End AucTeX
#

338
lib/doc/LFUNs.lyx
View File

@ -1,5 +1,5 @@
#LyX 2.0 created this file. For more info see http://www.lyx.org/
\lyxformat 413
#LyX 2.1 created this file. For more info see http://www.lyx.org/
\lyxformat 444
\begin_document
\begin_header
\textclass article
@ -22,13 +22,13 @@
\font_roman default
\font_sans default
\font_typewriter default
\font_math auto
\font_default_family default
\use_non_tex_fonts false
\font_sc false
\font_osf false
\font_sf_scale 100
\font_tt_scale 100
\graphics default
\default_output_format default
\output_sync 0
@ -39,15 +39,21 @@
\use_hyperref false
\papersize default
\use_geometry true
\use_amsmath 1
\use_esint 1
\use_mhchem 1
\use_mathdots 1
\use_package amsmath 1
\use_package amssymb 1
\use_package esint 1
\use_package mathdots 0
\use_package mathtools 0
\use_package mhchem 1
\use_package undertilde 0
\cite_engine basic
\cite_engine_type numerical
\biblio_style plain
\use_bibtopic false
\use_indices false
\paperorientation portrait
\suppress_date false
\justification true
\use_refstyle 0
\index Index
\shortcut idx
@ -75,7 +81,7 @@
\begin_body
\begin_layout Section*
LFUNs documentation automatically generated 2011-12-15
LFUNs documentation automatically generated 2012-09-29
\end_layout
\begin_layout Standard
@ -816,8 +822,13 @@ Syntax space-insert <NAME> [<LEN>]
\end_layout
\begin_layout Description
Params <NAME>: normal, protected, thin, quad, qquad, enspace, enskip, negthinspa
ce, hfill, hfill*, dotfill, hrulefill, hspace, hspace*
Params <NAME>: normal, protected, visible, thin, quad, qquad, enspace, enskip,
negthinspace, negmedspace, negthickspace, hfill, hfill*, dotfill, hrulefill,
hspace, hspace*
\begin_inset Newline newline
\end_inset
Only in math mode: med and thick.
\begin_inset Newline newline
\end_inset
@ -923,7 +934,7 @@ Syntax index-insert [<TYPE:Name>]
\begin_layout Description
Params <TYPE:Name>: name of the index, if multiple indices are defined.
with an empty argument, the default index is selected.
With an empty argument, the default index is selected.
\end_layout
\begin_layout Description
@ -944,13 +955,71 @@ Syntax index-print [<TYPE:Name>]
\begin_layout Description
Params <TYPE:Name>: name of the index, if multiple indices are defined.
with an empty argument, the default index is selected.
With an empty argument, the default index is selected.
\end_layout
\begin_layout Description
Origin Lgb, 27 Feb 1997
\end_layout
\begin_layout Subsection*
LFUN_IPA_INSERT
\end_layout
\begin_layout Description
Action Inserts an IPA inset.
\end_layout
\begin_layout Description
Syntax ipa-insert
\end_layout
\begin_layout Description
Origin spitz, 05 Mar 2012
\end_layout
\begin_layout Subsection*
LFUN_IN_IPA
\end_layout
\begin_layout Description
Action Only active in IPA inset.
\end_layout
\begin_layout Description
Notion Dummy function which is only active in a IPA inset.
It's used to toggle the IPA toolbar if the cursor moves into an IPA inset.
\end_layout
\begin_layout Description
Syntax in-ipa
\end_layout
\begin_layout Description
Origin spitz, 20 May 2012
\end_layout
\begin_layout Subsection*
LFUN_IPAMACRO_INSERT
\end_layout
\begin_layout Description
Action Inserts special IPA macros into the document.
\end_layout
\begin_layout Description
Syntax ipamacro-insert <CHAR>
\end_layout
\begin_layout Description
Params <CHAR>: tone-falling, tone-rising, tone-high-rising, tone-low-rising,
tone-high-rising-falling, deco bottomtiebar, deco toptiebar.
\end_layout
\begin_layout Description
Origin JSpitzm, 22 Aug 2012
\end_layout
\begin_layout Subsection*
LFUN_NOMENCL_INSERT
\end_layout
@ -993,7 +1062,7 @@ LFUN_NOTE_INSERT
\end_layout
\begin_layout Description
Action Inserts Note on the current cursor postion, move selection inside
Action Inserts Note on the current cursor position, move selection inside
the inset.
\end_layout
@ -1010,7 +1079,7 @@ LFUN_NOTE_NEXT
\end_layout
\begin_layout Description
Action Moves the cursor to the begining of next Note inset.
Action Moves the cursor to the beginning of next Note inset.
\end_layout
\begin_layout Description
@ -1022,7 +1091,7 @@ LFUN_PHANTOM_INSERT
\end_layout
\begin_layout Description
Action Inserts phantom on the current cursor postion, move selection inside
Action Inserts phantom on the current cursor position, move selection inside
the inset.
\end_layout
@ -1450,8 +1519,8 @@ LFUN_WORD_DELETE_BACKWARD
\end_layout
\begin_layout Description
Action Deletes characters to the begining of the word (usually the "C+BackSpace"
key).
Action Deletes characters to the beginning of the word (usually the "C+BackSpace
" key).
\end_layout
\begin_layout Description
@ -1518,7 +1587,7 @@ LFUN_WORD_FIND
\end_layout
\begin_layout Description
Action Search for next occurence of a string.
Action Search for next occurrence of a string.
\end_layout
\begin_layout Description
@ -1557,7 +1626,7 @@ Params <DATA>: data is of the form "<replace>
\begin_inset Newline newline
\end_inset
<casesensitive> <matchword> <all> <forward>"
<casesensitive> <matchword> <all> <forward> <findnext>"
\end_layout
\begin_layout Description
@ -1569,7 +1638,7 @@ LFUN_WORD_FINDADV
\end_layout
\begin_layout Description
Action Search for next occurence of a pattern.
Action Search for next occurrence of a pattern.
\end_layout
\begin_layout Description
@ -2017,7 +2086,7 @@ LFUN_LINE_BEGIN
\end_layout
\begin_layout Description
Action Move the cursor to the begining of the (screen) line.
Action Move the cursor to the beginning of the (screen) line.
\end_layout
\begin_layout Description
@ -2080,7 +2149,7 @@ LFUN_COPY
\end_layout
\begin_layout Description
Action Copies to the clipboard the last edit.
Action Copies the current selection to the clipboard.
\end_layout
\begin_layout Description
@ -2166,7 +2235,7 @@ LFUN_SELECTION_PASTE
\end_layout
\begin_layout Description
Action Pastes the the internal selection text in permanent selection.
Action Pastes the internal selection text in permanent selection.
\end_layout
\begin_layout Description
@ -2182,6 +2251,23 @@ Syntax selection-paste
Origin lasgouttes, 14 Jan 2009
\end_layout
\begin_layout Subsection*
LFUN_CLIPBOARD_PASTE_SIMPLE
\end_layout
\begin_layout Description
Action Pastes simple unformatted text from the active clipboard.
\end_layout
\begin_layout Description
Syntax clipboard-paste-simple [<ARG>]
\end_layout
\begin_layout Description
Params <ARG>: "paragraph" will cause pasting as one paragraph, i.e.
"Join lines".
\end_layout
\begin_layout Subsection*
LFUN_UNDO
\end_layout
@ -2482,7 +2568,7 @@ Action Toggle user-defined (=last-time used) text style.
\begin_layout Description
Notion This style is set via LFUN_TEXTSTYLE_UPDATE, which is automatically
trigerred when using Text Style dialog.
triggered when using Text Style dialog.
\end_layout
\begin_layout Description
@ -2586,7 +2672,7 @@ Action Adds database, which will be used for bibtex citations.
\begin_layout Description
Notion Databases are added to the first BibTeX inset (Inset->List/TOC->BibTeX
bibliography) found from the cursor postion.
bibliography) found from the cursor position.
\end_layout
\begin_layout Description
@ -2607,7 +2693,7 @@ Action Adds database, which will be used for bibtex citations.
\begin_layout Description
Notion Databases are deleted from the first BibTeX inset (Inset->List/TOC->BibTe
X bibliography) found from the cursor postion.
X bibliography) found from the cursor position.
\end_layout
\begin_layout Description
@ -3252,7 +3338,7 @@ Params <LANG>: octave|maxima|maple|mathematica|script
\begin_inset Newline newline
\end_inset
where "script" stands fot the external script (normalized expression will
where "script" stands for the external script (normalized expression will
be passed)
\end_layout
@ -3614,6 +3700,12 @@ LFUN_PARAGRAPH_MOVE_UP
Action Moves the current paragraph upwards in the document.
\end_layout
\begin_layout Description
Notion Movement through the document will possibly break the paragraph-depth
(e.g.
itemize structure).
\end_layout
\begin_layout Description
Syntax paragraph-move-up
\end_layout
@ -3627,7 +3719,7 @@ LFUN_PARAGRAPH_UP
\end_layout
\begin_layout Description
Action Move the cursor to the next paragraph (or begining of the current
Action Move the cursor to the next paragraph (or beginning of the current
one) in upward direction.
\end_layout
@ -3644,7 +3736,7 @@ LFUN_PARAGRAPH_UP_SELECT
\end_layout
\begin_layout Description
Action Move the cursor and select the text to the next paragraph (or begining
Action Move the cursor and select the text to the next paragraph (or beginning
of the current one) in upward direction.
\end_layout
@ -3661,7 +3753,7 @@ LFUN_PARAGRAPH_DOWN
\end_layout
\begin_layout Description
Action Move the cursor to the next paragraph (or begining of the current
Action Move the cursor to the next paragraph (or beginning of the current
one) in downward direction.
\end_layout
@ -3678,7 +3770,7 @@ LFUN_PARAGRAPH_DOWN_SELECT
\end_layout
\begin_layout Description
Action Move the cursor and select the text to the next paragraph (or begining
Action Move the cursor and select the text to the next paragraph (or beginning
of the current one) in downward direction.
\end_layout
@ -3722,7 +3814,7 @@ Origin Dekel, 26 Aug 2000
\end_layout
\begin_layout Subsection*
LFUN_BREAK_PARAGRAPH
LFUN_PARAGRAPH_BREAK
\end_layout
\begin_layout Description
@ -3734,7 +3826,7 @@ Notion Removes the selection.
\end_layout
\begin_layout Description
Syntax break-paragraph [<LAYOUT>]
Syntax paragraph-break [<LAYOUT>]
\end_layout
\begin_layout Description
@ -3830,7 +3922,7 @@ Action Updates the values inside the paragraph dialog from the paragraph.
\end_layout
\begin_layout Description
Notion This is internal LFUN, not to be used by users.
Notion This is an internal LFUN, not to be used by users.
Called internally by LFUN_DIALOG_UPDATE.
\end_layout
@ -4489,7 +4581,7 @@ Syntax inset-insert <INSET> <ARGS>
\end_layout
\begin_layout Description
Params <INSET>: <bibitem|bibtex|cite|ert|listings|external|graphics|tabular|
Params <INSET>: <bibitem|bibtex|citation|ert|listings|external|graphics|tabular|
\begin_inset Newline newline
\end_inset
@ -4605,7 +4697,7 @@ Action Updates the values inside the dialog from the inset.
\end_layout
\begin_layout Description
Notion This is internal LFUN, not to be used by users.
Notion This is an internal LFUN, not to be used by users.
Called internally by LFUN_DIALOG_UPDATE
\end_layout
@ -4640,8 +4732,11 @@ Params <INSET>: <bibitem|bibtex|box|branch|citation|ert|external|float|
\begin_inset Newline newline
\end_inset
graphics|href|include|index|index_print|label|line| listings|note|phantom|ref|sp
ace|tabular|vspace|wrap>.
graphics|href|include|index|index_print|label|line|
\begin_inset Newline newline
\end_inset
listings|note|phantom|ref|space|tabular|vspace|wrap>.
\end_layout
\begin_layout Subsection*
@ -4649,7 +4744,7 @@ LFUN_INSET_TOGGLE
\end_layout
\begin_layout Description
Action Toggles the collapsable inset at cursor position, or the inset we
Action Toggles the collapsible inset at cursor position, or the inset we
are currently in.
\end_layout
@ -4662,7 +4757,7 @@ Params <ARG>: <open|close|toggle|assign>.
\begin_inset Newline newline
\end_inset
open/close/toggle are for collapsable insets.
open/close/toggle are for collapsible insets.
toggle is used when no argument is given.
\begin_inset Newline newline
\end_inset
@ -4915,7 +5010,7 @@ LFUN_BOOKMARK_GOTO
\begin_layout Description
Action Moves the cursor to the numbered bookmark, opening the file if necessary.
Note that bookmarsk are saved per-session, not per file.
Note that bookmarks are saved per-session, not per file.
\end_layout
\begin_layout Description
@ -5157,7 +5252,7 @@ Origin Abdel, 23 Oct 2006
\end_layout
\begin_layout Subsection*
LFUN_SPLIT_VIEW
LFUN_VIEW_SPLIT
\end_layout
\begin_layout Description
@ -5165,11 +5260,11 @@ Action Creates another split view of current buffer.
\end_layout
\begin_layout Description
Notion All split views act in the same way indpendently.
Notion All split views act in the same way independently.
\end_layout
\begin_layout Description
Syntax split-view <vertical|horizontal>
Syntax view-split <vertical|horizontal>
\end_layout
\begin_layout Description
@ -5185,7 +5280,29 @@ Origin Abdel, 20 Feb 2008
\end_layout
\begin_layout Subsection*
LFUN_CLOSE_TAB_GROUP
LFUN_VIEW_CLOSE
\end_layout
\begin_layout Description
Action Close the current document work area.
\end_layout
\begin_layout Description
Notion Close the current work area.
If no other work areas are showing the buffer, then close the associated
buffer as well.
\end_layout
\begin_layout Description
Syntax view-close
\end_layout
\begin_layout Description
Origin Tommaso, 15 Sep 2012
\end_layout
\begin_layout Subsection*
LFUN_TAB_GROUP_CLOSE
\end_layout
\begin_layout Description
@ -5193,12 +5310,12 @@ Action Close the current tab group.
\end_layout
\begin_layout Description
Notion This only closes the work areas, not the buffer themselves.
Notion This only closes the work areas, not the buffers themselves.
The still opened buffers can be visualized in another tab group.
\end_layout
\begin_layout Description
Syntax close-tab-group
Syntax tab-group-close
\end_layout
\begin_layout Description
@ -5210,7 +5327,7 @@ LFUN_DIALOG_SHOW
\end_layout
\begin_layout Description
Action Shows hidden dialog or create new one for a given function/inset
Action Shows hidden dialog or creates new one for a given function/inset
settings etc.
\end_layout
@ -5381,7 +5498,7 @@ Action This function is called when mouse button is pressed (inside workarea).
\end_layout
\begin_layout Description
Notion This is internal LFUN, not to be used by users.
Notion This is an internal LFUN, not to be used by users.
\end_layout
\begin_layout Description
@ -5399,7 +5516,7 @@ Action This function is called when double click on mouse button is pressed
\end_layout
\begin_layout Description
Notion This is internal LFUN, not to be used by users.
Notion This is an internal LFUN, not to be used by users.
\end_layout
\begin_layout Description
@ -5417,7 +5534,7 @@ Action This function is called when triple click on mouse button is pressed
\end_layout
\begin_layout Description
Notion This is internal LFUN, not to be used by users.
Notion This is an internal LFUN, not to be used by users.
\end_layout
\begin_layout Description
@ -5434,7 +5551,7 @@ Action This function is called when mouse cursor is moving over the text.
\end_layout
\begin_layout Description
Notion This is internal LFUN, not to be used by users.
Notion This is an internal LFUN, not to be used by users.
\end_layout
\begin_layout Description
@ -5451,7 +5568,7 @@ Action This function is called when mouse button is released (inside workarea).
\end_layout
\begin_layout Description
Notion This is internal LFUN, not to be used by users.
Notion This is an internal LFUN, not to be used by users.
\end_layout
\begin_layout Description
@ -5482,7 +5599,7 @@ Action Turn on the primary keyboard map.
Notion Maps were widely used in past, when X-windows didn't have nowadays
keyboard support.
They can be still used to maintain uniform keyboard layout across the various
plaforms.
platforms.
\begin_inset Newline newline
\end_inset
@ -5645,7 +5762,7 @@ LFUN_SERVER_SET_XY
\begin_layout Description
Action Sets the cursor position based on the editing area coordinates (similar
as clicking on that point with left mouse button).
to clicking on that point with left mouse button).
\end_layout
\begin_layout Description
@ -5678,7 +5795,7 @@ Notion Latex file with extension
literate_extension is generated.
Then LyX invokes
\backslash
build_command (with a default of``make'') to generate the code and
build_command (with a default of ``make'') to generate the code and
\backslash
build_error_filter to process the compilation error messages.
\begin_inset Newline newline
@ -5847,7 +5964,7 @@ Action Exports the current buffer (document) to the given format.
\end_layout
\begin_layout Description
Syntax buffer-export <FORMAT>
Syntax buffer-export <FORMAT> [<DEST>]
\end_layout
\begin_layout Description
@ -5861,6 +5978,9 @@ Params <FORMAT> is either "custom" or one of the formats which you can find
In case of "custom" you will be asked for a format you want to start from
and for the command that you want to apply to this format.
Internally the control is then passed to LFUN_BUFFER_EXPORT_CUSTOM.
<DEST> If present, this argument provides the export destination filename.
Its containing folder will also be the destination folder, where all
the needed external files will be copied.
\end_layout
\begin_layout Description
@ -5898,6 +6018,22 @@ Sample buffer-export-custom dvi dvips -f $$FName -o myfile.ps
Origin leeming, 27 Mar 2004
\end_layout
\begin_layout Subsection*
LFUN_BUFFER_EXPORT_AS
\end_layout
\begin_layout Description
Action Pops up a dialog for exporting the current buffer.
\end_layout
\begin_layout Description
Syntax buffer-export-as
\end_layout
\begin_layout Description
Origin tommaso, 6 Oct 2011
\end_layout
\begin_layout Subsection*
LFUN_BUFFER_PRINT
\end_layout
@ -5944,8 +6080,8 @@ Action Import a given file as a lyx document.
\begin_layout Description
Notion File can be imported iff lyx file format is (transitively) reachable
via defined convertors in preferences.
Look into File->Import menu to get an idea of the currently active import
via defined converters in preferences.
Look in the File->Import menu to get an idea of the currently active import
formats.
\end_layout
@ -5962,7 +6098,7 @@ LFUN_BUFFER_NEW
\end_layout
\begin_layout Description
Action Creates a new buffer (that is, document).
Action Creates a new buffer (that is, document) and switches to it.
\end_layout
\begin_layout Description
@ -6019,7 +6155,7 @@ LFUN_BUFFER_SWITCH
\end_layout
\begin_layout Description
Action Display/switch to the given buffer.
Action Display and switch to the given buffer.
\end_layout
\begin_layout Description
@ -6089,7 +6225,7 @@ Action Exports the current document and put the result into the temporary
\begin_layout Description
Notion In case you are already viewing the exported document (see LFUN_BUFFER_VI
EW) the output will be rewriten - updated.
EW) the output will be rewritten - updated.
This is useful in case your viewer is able to detect such changes (e.g.
ghostview for postscript).
\end_layout
@ -6143,6 +6279,80 @@ Params <FILENAME>: New name of the buffer/file.
A relative path is with respect to the original location of the buffer/file.
\end_layout
\begin_layout Subsection*
LFUN_BUFFER_FORALL
\end_layout
\begin_layout Description
Action Applies a command to all visible, hidden, or both types of buffers
in the active window.
\end_layout
\begin_layout Description
Syntax buffer-forall [<BUFFER-TYPE>] <LFUN-COMMAND>
\end_layout
\begin_layout Description
Params <BUFFER-TYPE>: <visible|hidden|both default:> default: visible <LFUN-COMM
AND>: The command that is to be applied to the buffers.
\end_layout
\begin_layout Description
Sample Close all Notes in all visible documents:
\begin_inset Newline newline
\end_inset
buffer-forall inset-forall Note inset-toggle close
\begin_inset Newline newline
\end_inset
Toggle change tracking on all documents:
\begin_inset Newline newline
\end_inset
buffer-forall both changes-track
\begin_inset Newline newline
\end_inset
Toggle read-only for all visible documents:
\begin_inset Newline newline
\end_inset
buffer-forall buffer-toggle-read-only
\begin_inset Newline newline
\end_inset
Show statistics for each document:
\begin_inset Newline newline
\end_inset
buffer-forall both statistics
\begin_inset Newline newline
\end_inset
Activate the branch named "Solutions" in all visible documents:
\begin_inset Newline newline
\end_inset
buffer-forall branch-activate Solutions
\begin_inset Newline newline
\end_inset
Export all visible documents to PDF (pdflatex):
\begin_inset Newline newline
\end_inset
buffer-forall buffer-export pdf2
\begin_inset Newline newline
\end_inset
\end_layout
\begin_layout Description
Origin scottkostyshak, 20 Jul 2012
\end_layout
\begin_layout Subsection*
LFUN_BUFFER_WRITE_ALL
\end_layout
@ -6633,8 +6843,8 @@ LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE
\end_layout
\begin_layout Description
Action Determine whether keep cursor inside the editing window regardless
the scrollbar movement.
Action Determine whether to keep cursor inside the editing window regardless
of the scrollbar movement.
\end_layout
\begin_layout Description

2
lib/doc/Math.lyx
View File

@ -34760,7 +34760,7 @@ Maxima
\begin_layout Standard
\series bold
command-alternatives break-paragraph;math-extern maxima
command-alternatives paragraph-break;math-extern maxima
\end_layout
\begin_layout Standard

42
lib/doc/UserGuide.lyx
View File

@ -4394,7 +4394,7 @@ Return
use
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
instead.
@ -5353,7 +5353,7 @@ Standard
depth, you can use
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
to break paragraphs.
@ -7199,7 +7199,7 @@ Return
\family default
is the
\family typewriter
break-paragraph
paragraph-break
\family default
function, and the individual lines of an address are not paragraphs.
Thus, you have to use
@ -8841,7 +8841,7 @@ List
We created it by using
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
followed by
@ -8872,7 +8872,7 @@ arg "depth-increment"
by hitting
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
followed by
@ -8903,7 +8903,7 @@ Standard
We did this by hitting
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
, then
@ -8941,7 +8941,7 @@ Standard
paragraph, also at level #4, made with just a
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
.
@ -8953,7 +8953,7 @@ arg "break-paragraph inverse"
We hit
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
and changed the paragraph environment back to
@ -9003,7 +9003,7 @@ and this is level #6.
Just hit
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
followed by a
@ -9021,7 +9021,7 @@ arg "depth-decrement"
#4-b After another
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
followed by a
@ -9192,7 +9192,7 @@ This is level #2.
We used
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
followed by
@ -9226,7 +9226,7 @@ Itemize
(We got here by using
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
, then
@ -9247,7 +9247,7 @@ Itemize
Here's level #4, produced using
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
, then
@ -9315,7 +9315,7 @@ don't
Oh, as if you couldn't guess by now, we're just using
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
to keep the current environment and depth but create a new item.
@ -9331,7 +9331,7 @@ arg "depth-decrement"
to decrease the depth after the next
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
.
@ -9372,7 +9372,7 @@ did
Another
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -9395,7 +9395,7 @@ Enumerate
The same thing happens if we do another
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -9526,7 +9526,7 @@ Bippitey boppitey boo!
(
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -9641,7 +9641,7 @@ blue-fish
(
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -9657,7 +9657,7 @@ arg "depth-increment"
3 times,
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -9733,7 +9733,7 @@ Quotation
We will use
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
to preserve the depth.

2
lib/doc/de/Math.lyx
View File

@ -34808,7 +34808,7 @@ Maxima
\begin_layout Standard
\series bold
command-alternatives break-paragraph;math-extern maxima
command-alternatives paragraph-break;math-extern maxima
\end_layout
\begin_layout Standard

2
lib/doc/es/Math.lyx
View File

@ -35284,7 +35284,7 @@ Maxima
\begin_layout Standard
\series bold
command-alternatives break-paragraph;math-extern maxima
command-alternatives paragraph-break;math-extern maxima
\end_layout
\begin_layout Section

2
lib/doc/fr/Math.lyx
View File

@ -35049,7 +35049,7 @@ Maxima
\begin_layout Standard
\series bold
command-alternatives break-paragraph;math-extern maxima
command-alternatives paragraph-break;math-extern maxima
\end_layout
\begin_layout Standard

42
lib/doc/fr/UserGuide.lyx
View File

@ -4579,7 +4579,7 @@ Entrée
que la profondeur actuels, utilisez
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
.
@ -5560,7 +5560,7 @@ Standard
la profondeur d'emboîtement courante, vous pouvez utiliser
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
pour séparer les paragraphes.
@ -7486,7 +7486,7 @@ Entrée
\family default
est la fonction
\family typewriter
break-paragraph
paragraph-break
\family default
, et les lignes d'une adresse, prises isolément, ne sont pas des paragraphes.
Ainsi, vous vous servirez de
@ -9368,7 +9368,7 @@ Liste;
Nous l'avons obtenu avec
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
suivi de
@ -9398,7 +9398,7 @@ arg "depth-increment"
Nous aurions pu le créer de la même manière que le précédent, avec
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
suivi de
@ -9429,7 +9429,7 @@ Standard
Nous l'avons obtenu avec
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
, puis
@ -9467,7 +9467,7 @@ Standard
, également au niveau n°4, obtenu juste avec
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
.
@ -9479,7 +9479,7 @@ arg "break-paragraph inverse"
Nous avons tapé
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
et remis l'environnement de paragraphe à
@ -9527,7 +9527,7 @@ pouvons
Tapez
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
puis
@ -9545,7 +9545,7 @@ arg "depth-decrement"
4-b Après un autre
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
suivi de
@ -9736,7 +9736,7 @@ Voici le niveau n°2.
Nous avons fait
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
suivi de
@ -9773,7 +9773,7 @@ ListePuces
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
, puis
@ -9794,7 +9794,7 @@ ListePuces
Voici le niveau n°4, obtenu avec
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
, puis
@ -9856,7 +9856,7 @@ pas
Au fait, vous aurez deviné que nous utilisons
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
pour conserver le même environnement et la même profondeur mais créer un
@ -9873,7 +9873,7 @@ arg "depth-decrement"
pour diminuer la profondeur après le prochain
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
.
@ -9912,7 +9912,7 @@ toujours
Après un autre
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
suivi de
@ -9937,7 +9937,7 @@ Gauche
Nous obtenons la même chose avec une autre suite
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -10071,7 +10071,7 @@ PooPooPiDoo !
(
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
)
@ -10148,7 +10148,7 @@ poisson bleu
(
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
,
@ -10164,7 +10164,7 @@ arg "depth-increment"
3 fois,
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
,
@ -10241,7 +10241,7 @@ Citation
Nous utilisons
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
pour préserver la profondeur.

42
lib/doc/id/UserGuide.lyx
View File

@ -4537,7 +4537,7 @@ Return
use
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
instead.
@ -5504,7 +5504,7 @@ Standard
depth, you can use
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
to break paragraphs.
@ -7400,7 +7400,7 @@ Return
\family default
is the
\family typewriter
break-paragraph
paragraph-break
\family default
function, and the individual lines of an address are not paragraphs.
Thus, you have to use
@ -9038,7 +9038,7 @@ List
We created it by using
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
followed by
@ -9069,7 +9069,7 @@ arg "depth-increment"
by hitting
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
followed by
@ -9100,7 +9100,7 @@ Standard
We did this by hitting
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
, then
@ -9138,7 +9138,7 @@ Standard
paragraph, also at level #4, made with just a
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
.
@ -9150,7 +9150,7 @@ arg "break-paragraph inverse"
We hit
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
and changed the paragraph environment back to
@ -9200,7 +9200,7 @@ and this is level #6.
Just hit
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
followed by a
@ -9218,7 +9218,7 @@ arg "depth-decrement"
#4-b After another
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
followed by a
@ -9389,7 +9389,7 @@ This is level #2.
We used
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
followed by
@ -9423,7 +9423,7 @@ Itemize
(We got here by using
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
, then
@ -9444,7 +9444,7 @@ Itemize
Here's level #4, produced using
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
, then
@ -9512,7 +9512,7 @@ don't
Oh, as if you couldn't guess by now, we're just using
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
to keep the current environment and depth but create a new item.
@ -9528,7 +9528,7 @@ arg "depth-decrement"
to decrease the depth after the next
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
.
@ -9569,7 +9569,7 @@ did
Another
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -9592,7 +9592,7 @@ Enumerate
The same thing happens if we do another
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -9723,7 +9723,7 @@ Bippitey boppitey boo!
(
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -9838,7 +9838,7 @@ blue-fish
(
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -9854,7 +9854,7 @@ arg "depth-increment"
3 times,
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -9930,7 +9930,7 @@ Quotation
We'll use
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
to preserve the depth.

2
lib/doc/ja/Math.lyx
View File

@ -34050,7 +34050,7 @@ Maxima
\series bold
\lang english
command-alternatives break-paragraph;math-extern maxima
command-alternatives paragraph-break;math-extern maxima
\end_layout
\begin_layout Standard

40
lib/doc/ja/UserGuide.lyx
View File

@ -6015,7 +6015,7 @@ Return
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -7895,7 +7895,7 @@ Return
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -11433,7 +11433,7 @@ Return
\bar default
\noun default
\color inherit
break-paragraph
paragraph-break
\family roman
\series medium
\shape up
@ -14106,7 +14106,7 @@ status collapsed
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -14211,7 +14211,7 @@ arg "depth-increment"
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -14291,7 +14291,7 @@ arg "depth-increment"
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -14416,7 +14416,7 @@ arg "depth-increment"
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -14454,7 +14454,7 @@ arg "break-paragraph inverse"
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -14591,7 +14591,7 @@ arg "break-paragraph inverse"
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -14636,7 +14636,7 @@ arg "depth-decrement"
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -14972,7 +14972,7 @@ status collapsed
ここは第2階層です。
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
の後に
@ -15052,7 +15052,7 @@ arg "depth-increment"
環境なので、ラベルが黒丸になるのです（ここに来るには、
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
の後に
@ -15096,7 +15096,7 @@ arg "depth-increment"
ここは第4階層です。
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
の後に
@ -15260,7 +15260,7 @@ arg "depth-increment"
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -15288,7 +15288,7 @@ arg "break-paragraph inverse"
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
と押してから
@ -15394,7 +15394,7 @@ arg "depth-increment"
もう一度
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
と
@ -15438,7 +15438,7 @@ arg "depth-decrement"
もう一度
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
と
@ -15698,7 +15698,7 @@ arg "depth-increment"
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -15802,7 +15802,7 @@ arg "break-paragraph inverse"
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
@ -16023,7 +16023,7 @@ Return
環境を使います。階層を保持するためには
\begin_inset Info
type "shortcut"
arg "break-paragraph inverse"
arg "paragraph-break inverse"
\end_inset
を使うことにします。

0
lib/images/classic/close-tab-group.png → lib/images/classic/tab-group-close.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 624 B

After

Width:  |  Height:  |  Size: 624 B

0
lib/images/classic/split-view_horizontal.png → lib/images/classic/view-split_horizontal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 657 B

After

Width:  |  Height:  |  Size: 657 B

0
lib/images/classic/split-view_vertical.png → lib/images/classic/view-split_vertical.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 649 B

After

Width:  |  Height:  |  Size: 649 B

0
lib/images/oxygen/close-tab-group.png → lib/images/oxygen/tab-group-close.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 492 B

After

Width:  |  Height:  |  Size: 492 B

0
lib/images/oxygen/split-view_horizontal.png → lib/images/oxygen/view-split_horizontal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 316 B

0
lib/images/oxygen/split-view_vertical.png → lib/images/oxygen/view-split_vertical.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

0
lib/images/close-tab-group.png → lib/images/tab-group-close.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 624 B

After

Width:  |  Height:  |  Size: 624 B

0
lib/images/split-view_horizontal.png → lib/images/view-split_horizontal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 657 B

After

Width:  |  Height:  |  Size: 657 B

0
lib/images/split-view_vertical.png → lib/images/view-split_vertical.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 649 B

After

Width:  |  Height:  |  Size: 649 B

16
lib/scripts/prefs2prefs_lfuns.py
View File

@ -146,6 +146,15 @@ def Bar2bar(line):
newline = btype + " \"" + mod + "bar\"" + rest
return (True, newline)
def paragraph_break(line):
return simple_renaming(line, "break-paragraph", "paragraph-break")
def tab_group_close(line):
return simple_renaming(line, "close-tab-group", "tab-group-close")
def view_split(line):
return simple_renaming(line, "split-view", "view-split")
#
#
###########################################################
@ -154,7 +163,7 @@ def Bar2bar(line):
# Conversion chain
conversions = [
[ 1, [ # this will be a long list of conversions to format 1
[ 1, [ # this will be a long list of conversions to format 1, LyX 2.0
next_inset_toggle,
next_inset_modify,
optional_insert,
@ -166,5 +175,10 @@ conversions = [
tabular_feature,
Bar2bar
]],
[ 2, [ # list of conversions to format 2, LyX 2.1
paragraph_break,
tab_group_close,
view_split
]],
]

5
lib/ui/stdcontext.inc
View File

@ -317,7 +317,7 @@ Menuset
LanguageSelector
Separator
Item "Fullscreen Mode" "ui-toggle fullscreen"
OptItem "Close Current View" "close-tab-group"
OptItem "Close Current View" "tab-group-close"
End
@ -441,6 +441,9 @@ Menuset
Menu "context-branch"
OptItem "Activate Branch|A" "branch-activate"
OptItem "Deactivate Branch|e" "branch-deactivate"
OptItem "Activate Branch in Master|M" "branch-master-activate"
OptItem "Deactivate Branch in Master|v" "branch-master-deactivate"
OptItem "Add Unknown Branch|w" "branch-add"
End
#

6
lib/ui/stdmenus.inc
View File

@ -328,9 +328,9 @@ Menuset
OptItem "View Master Document|M" "master-buffer-view"
OptItem "Update Master Document|a" "master-buffer-update"
Separator
Item "Split View Into Left and Right Half|i" "split-view horizontal"
Item "Split View Into Upper and Lower Half|e" "split-view vertical"
OptItem "Close Current View|w" "close-tab-group"
Item "Split View Into Left and Right Half|i" "view-split horizontal"
Item "Split View Into Upper and Lower Half|e" "view-split vertical"
OptItem "Close Current View|w" "tab-group-close"
Item "Fullscreen|l" "ui-toggle fullscreen"
Submenu "Toolbars|b" "toolbars"
Separator

595
po/de.po
View File

File diff suppressed because it is too large Load Diff

658
po/it.po Executable file → Normal file
View File

File diff suppressed because it is too large Load Diff

140
po/sk.po
View File

@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: LyX-2.1\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
"POT-Creation-Date: 2012-09-28 15:56+0200\n"
"PO-Revision-Date: 2012-04-08 11:27+0100\n"
"POT-Creation-Date: 2012-09-30 15:04+0200\n"
"PO-Revision-Date: 2012-09-30 15:14+0200\n"
"Last-Translator: Kornel Benko <kornel@lyx.org>\n"
"Language-Team: Slovak <lyx-docs@lists.lyx.org>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.2\n"
"X-Generator: Lokalize 1.4\n"
"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
"X-Language: sk_SK\n"
"X-Source-Language: en_US\n"
@ -303,7 +303,7 @@ msgstr "Z&mazať"
#: src/frontends/qt4/ui/BoxUi.ui:28
msgid "Check this if the box should break across pages"
msgstr "Vybrať aby rámok mohol prejsť aj na druhú stránku"
msgstr "Vybrať aby rámik mohol prejsť aj na druhú stránku"
#: src/frontends/qt4/ui/BoxUi.ui:31
msgid "Allow &page breaks"
@ -372,7 +372,7 @@ msgstr "Vertikálne zarovnanie obsahu v rámku (vzťahujúce sa na základnú li
#: src/frontends/qt4/ui/BoxUi.ui:144
msgid "&Box:"
msgstr "&Rámok:"
msgstr "&Rámik:"
#: src/frontends/qt4/ui/BoxUi.ui:154
msgid "Co&ntent:"
@ -393,7 +393,7 @@ msgstr "&Výška:"
#: src/frontends/qt4/ui/BoxUi.ui:213
msgid "Inner Bo&x:"
msgstr "V&nútorný rámok:"
msgstr "V&nútorný rámik:"
#: src/frontends/qt4/ui/BoxUi.ui:229
msgid "&Decoration:"
@ -415,7 +415,7 @@ msgstr "Hodnota Šírky"
#: src/frontends/qt4/ui/BoxUi.ui:269
msgid "Inner box -- needed for fixed width & line breaks"
msgstr "Vnútorný rámok -- potrebný pre pevnú šírku a lom riadkov"
msgstr "Vnútorný rámik -- potrebný pre pevnú šírku a lom riadkov"
#: src/frontends/qt4/ui/BoxUi.ui:273 src/frontends/qt4/ui/HSpaceUi.ui:32
#: src/frontends/qt4/ui/ListingsUi.ui:98
@ -1260,9 +1260,10 @@ msgstr "x"
msgid "Right &top:"
msgstr "Vpravo &hore:"
#: src/frontends/qt4/ui/ExternalUi.ui:514 src/frontends/qt4/ui/GraphicsUi.ui:437
#: src/frontends/qt4/ui/ExternalUi.ui:514
#: src/frontends/qt4/ui/GraphicsUi.ui:437
msgid "Get bounding box from the (EPS) file"
msgstr "Získať ohraničujúci rámok z (EPS) súboru"
msgstr "Získať ohraničujúci rámik z (EPS) súboru"
#: src/frontends/qt4/ui/ExternalUi.ui:517 src/frontends/qt4/ui/GraphicsUi.ui:440
msgid "&Get from File"
@ -3150,7 +3151,7 @@ msgstr "&Zoskupiť prostredia odstavcov podľa kategórií"
#: src/frontends/qt4/ui/PrefEditUi.ui:99
msgid "Edit Math Macros inline with a box around"
msgstr "Zobraz rámok pri editácii matematických makrov v riadku"
msgstr "Zobraz rámik pri editácii matematických makrov v riadku"
#: src/frontends/qt4/ui/PrefEditUi.ui:104
msgid "Edit Math Macros inline with the name in the status bar"
@ -3947,7 +3948,7 @@ msgstr "Súbor s &užívateľským rozhraním:"
msgid "&Icon Set:"
msgstr "Sada &ikon:"
#: src/frontends/qt4/ui/PrefUi.ui:68
#: src/frontends/qt4/ui/PrefUi.ui:69
msgid ""
"The icon set to use. Warning: normal size of icons may be\n"
"wrong until you save the preferences and restart LyX."
@ -4022,7 +4023,7 @@ msgstr "&Maximum posledných súborov:"
msgid "&Open documents in tabs"
msgstr "&Otvoriť dokumenty v paneloch"
#: src/frontends/qt4/ui/PrefUi.ui:262
#: src/frontends/qt4/ui/PrefUi.ui:263
msgid ""
"Whether to open documents in an already running instance of LyX.\n"
"(Set the LyXServer pipe path and restart LyX to enable this feature)"
@ -4043,6 +4044,22 @@ msgstr "Dať tlačidlo \"Zavrieť\" na každý panel, alebo len jediné vľavo h
msgid "&Single close-tab button"
msgstr "&Jediné tlačidlo na zavretie panelov"
#: src/frontends/qt4/ui/PrefUi.ui:285
msgid "Closing last view:"
msgstr "Pri zavieraní posledného náhľadu:"
#: src/frontends/qt4/ui/PrefUi.ui:293
msgid "Closes document"
msgstr "Zavrieť dokument"
#: src/frontends/qt4/ui/PrefUi.ui:298
msgid "Hides document"
msgstr "Skryť dokument"
#: src/frontends/qt4/ui/PrefUi.ui:303
msgid "Ask the user"
msgstr "Opýtať sa, čo zrobiť"
#: src/frontends/qt4/ui/PrefsUi.ui:70 src/frontends/qt4/GuiView.cpp:2649
#: src/frontends/qt4/GuiView.cpp:2656 src/frontends/qt4/GuiView.cpp:2755
msgid "&Save"
@ -4581,7 +4598,7 @@ msgstr "Zlúčiť bunky rozličných stĺpcov"
#: src/frontends/qt4/ui/TabularUi.ui:556
msgid "&Multicolumn"
msgstr "Viac&stĺpcové"
msgstr "Viac-&stĺpcové"
#: src/frontends/qt4/ui/TabularUi.ui:563
msgid "LaTe&X argument:"
@ -10499,11 +10516,11 @@ msgstr "Braille_zrkadlenie_vyp"
#: lib/layouts/braille.module:163
msgid "Braillebox"
msgstr "BrailleRámok"
msgstr "BrailleRámik"
#: lib/layouts/braille.module:167
msgid "Braille box"
msgstr "Braille rámok"
msgstr "Braille rámik"
#: lib/layouts/customHeadersFooters.module:2
msgid "Custom Header/Footerlines"
@ -11261,7 +11278,7 @@ msgid ""
"changed by loading one of the 'Theorems (Numbered by ...)' modules."
msgstr ""
"Definuje prostredie mat. viet a dôkazov používajúce rozšírenie AMS. K "
"dispozícii sú číslované a nečíslované typy. Implicitne sú vety číslované "
"dispozícii sú číslované a ne-číslované typy. Implicitne sú vety číslované "
"postupne bez ohľadu na štruktúru dokumentu. To sa dá zmeniť voľbou jedného z "
"'Teorémy (Číslované podľa ...)' modulu."
@ -12846,13 +12863,21 @@ msgstr "Info Dokumentu"
msgid "Copy Text|o"
msgstr "Kopíruj Text"
#: lib/ui/stdcontext.inc:441 lib/ui/stdcontext.inc:461
#: lib/ui/stdcontext.inc:442 lib/ui/stdcontext.inc:464
msgid "Activate Branch|A"
msgstr "Aktivuj Vetvu|A"
msgstr "Aktivuj vetvu|A"
#: lib/ui/stdcontext.inc:442 lib/ui/stdcontext.inc:462
#: lib/ui/stdcontext.inc:443 lib/ui/stdcontext.inc:465
msgid "Deactivate Branch|e"
msgstr "Dezaktivuj Vetvu|e"
msgstr "Dezaktivuj vetvu|e"
#: lib/ui/stdcontext.inc:444
msgid "Activate Branch in Master|M"
msgstr "Aktivuj vetvu v hlavnom dokumente|H"
#: lib/ui/stdcontext.inc:445
msgid "Deactivate Branch in Master|v"
msgstr "Dezaktivuj vetvu v hlavnom dokumente|v"
#: lib/ui/stdcontext.inc:451
msgid "Insert Reference at Cursor Position|I"
@ -13004,7 +13029,7 @@ msgstr "Prevziať na Úpravu"
#: lib/ui/stdmenus.inc:77
msgid "Update Local Directory From Repository|d"
msgstr "Aktualizuj Lokálny Adresár Z Repositáru"
msgstr "Aktualizuj Lokálny Adresár Z Repozitáru"
#: lib/ui/stdmenus.inc:78
msgid "Revert to Repository Version|v"
@ -13484,7 +13509,7 @@ msgstr "Súbor|S"
#: lib/ui/stdmenus.inc:359
msgid "Box[[Menu]]"
msgstr "Rámok"
msgstr "Rámik"
#: lib/ui/stdmenus.inc:362
msgid "Citation...|C"
@ -14056,7 +14081,7 @@ msgstr "Vložiť poznámku"
#: lib/ui/stdtoolbars.inc:131
msgid "Insert box"
msgstr "Vložiť rámok"
msgstr "Vložiť rámik"
#: lib/ui/stdtoolbars.inc:132
msgid "Insert hyperlink"
@ -14402,9 +14427,9 @@ msgstr "Vložiť Info Verzie"
msgid "Use SVN file locking property"
msgstr "Použiť blokovanie súborov z SVN"
#: lib/ui/stdtoolbars.inc:269
#: lib/ui/stdtoolbars.inc:279
msgid "Update local directory from repository"
msgstr "Aktualizuj lokálny adresár z repositáru"
msgstr "Aktualizuj lokálny adresár z repozitáru"
#: lib/ui/stdtoolbars.inc:272
msgid "Math Panels"
@ -18961,7 +18986,7 @@ msgstr "vložka textu phantom"
#: src/Color.cpp:230
msgid "shaded box"
msgstr "tieňovaný rámok"
msgstr "tieňovaný rámik"
#: src/Color.cpp:231
msgid "listings background"
@ -19957,7 +19982,7 @@ msgid ""
"Show a small box around a Math Macro with the macro name when the cursor is "
"inside."
msgstr ""
"Zobraziť malý rámok okolo mat. makra spolu s menom makra keď je kurzor "
"Zobraziť malý rámik okolo mat. makra spolu s menom makra keď je kurzor "
"vnútri."
#: src/LyXRC.cpp:3145
@ -20289,6 +20314,15 @@ msgid ""
"Select to have visual bidi cursor movement, unselect for logical movement."
msgstr "Vyberte pre vizuálny/logický pohyb kurzoru v dvojsmernom móde (bidi)."
#: src/LyXRC.cpp:3405
msgid ""
"Specify whether, closing the last view of an open document, LyX should close "
"the document (yes), hide it (no), or ask the user (ask)."
msgstr ""
"Definuje čo by sa malo robiť pri zavieraní posledného náhľadu otvoreného "
"dokumentu. LyX by mal zavrieť dokument(yes), skryť ho(no), alebo pýtať sa čo "
"zrobiť(ask)."
#: src/LyXRC.cpp:3409
msgid ""
"DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes "
@ -23701,6 +23735,35 @@ msgstr "Premenovať a uložiť ?"
msgid "&Retry"
msgstr "Zopakuj"
#: src/frontends/qt4/GuiView.cpp:2497
#, c-format
msgid ""
"Last view on document %1$s is being closed.\n"
"Would you like to close or hide the document?\n"
"\n"
"Hidden documents can be displayed back through\n"
"the menu: View->Hidden->...\n"
"\n"
"To remove this question, set your preference in:\n"
" Tools->Preferences->Look&Feel->UserInterface\n"
msgstr ""
"Posledný náhľad dokumentu %1$s sa zaviera.\n"
"Chcete ho zavrieť alebo len skryť?\n"
"\n"
"Skryté dokumenty možno zase vidieť cez\n"
"menu: Zobraziť->Skryté->...\n"
"\n"
"Na zbavenie sa tejto otázky, nastavte preferenciu v:\n"
" Nástroje Preferencie...->Vzhľad->Užívateľské Rozhranie\n"
#: src/frontends/qt4/GuiView.cpp:2506
msgid "Close or hide document?"
msgstr "Zavrieť alebo skryť dokument?"
#: src/frontends/qt4/GuiView.cpp:2507
msgid "&Hide"
msgstr "Skryť"
#: src/frontends/qt4/GuiView.cpp:2540
msgid "Close document"
msgstr "Zavrieť dokument"
@ -23886,9 +23949,9 @@ msgstr " (iba pre čítanie)"
msgid "Close File"
msgstr "Zavrieť Súbor"
#: src/frontends/qt4/GuiWorkArea.cpp:1976
#: src/frontends/qt4/GuiWorkArea.cpp:1996
msgid "Hide tab"
msgstr "Panel schovať"
msgstr "Panel skryť"
#: src/frontends/qt4/GuiWorkArea.cpp:1978
msgid "Close tab"
@ -24177,9 +24240,9 @@ msgstr "TeX kód"
msgid "Float"
msgstr "Plávajúci objekt"
#: src/insets/Inset.cpp:109 src/insets/InsetBox.cpp:130
#: src/insets/Inset.cpp:112 src/insets/InsetBox.cpp:130
msgid "Box"
msgstr "Rámok"
msgstr "Rámik"
#: src/insets/Inset.cpp:111
msgid "Horizontal Space"
@ -24293,7 +24356,7 @@ msgstr "s tieňom"
#: src/insets/InsetBox.cpp:72
msgid "shaded background"
msgstr "pozadie tieňovaný rámok"
msgstr "pozadie tieňovaný rámik"
#: src/insets/InsetBox.cpp:73
msgid "double frame"
@ -24317,6 +24380,11 @@ msgstr "aktívna"
msgid "non-active"
msgstr "ne-aktívna"
#: src/insets/InsetBranch.cpp:73
#, c-format
msgid "master: %1$s, child: %2$s"
msgstr "hlavný dokument:%1$s, potomok: %2$s"
#: src/insets/InsetBranch.cpp:70
#, c-format
msgid "Branch (%1$s): %2$s"
@ -24330,6 +24398,10 @@ msgstr "Vetva: "
msgid "Branch (child only): "
msgstr "Vetva (len potomok): "
#: src/insets/InsetBranch.cpp:93
msgid "Branch (master only): "
msgstr "Vetva (len hlavný dokument): "
#: src/insets/InsetBranch.cpp:86
msgid "Branch (undefined): "
msgstr "Vetva (ne-definovaná): "
@ -24599,9 +24671,9 @@ msgstr "Neznámy typ registra!"
msgid "All indexes"
msgstr "Všetky registre"
#: src/insets/InsetIndex.cpp:456
#: src/insets/InsetIndex.cpp:453
msgid "subindex"
msgstr "Podregister"
msgstr "Pod-register"
#: src/insets/InsetInfo.cpp:119
#, c-format

24
src/BufferView.cpp
View File

@ -1188,8 +1188,13 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
// handle their dispatch here, for reasons explained there, so we'll
// handle this here, too, for consistency.
case LFUN_BRANCH_ACTIVATE:
case LFUN_BRANCH_DEACTIVATE: {
BranchList const & branchList = buffer().params().branchlist();
case LFUN_BRANCH_DEACTIVATE:
case LFUN_BRANCH_MASTER_ACTIVATE:
case LFUN_BRANCH_MASTER_DEACTIVATE: {
bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE
|| cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE);
BranchList const & branchList = master ? buffer().masterBuffer()->params().branchlist()
: buffer().params().branchlist();
docstring const branchName = cmd.argument();
flag.setEnabled(!branchName.empty() && branchList.find(branchName));
break;
@ -1969,15 +1974,21 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
// So, if this does get fixed, this code can be moved back to Buffer.cpp,
// and the corresponding code in getStatus() should be moved back, too.
case LFUN_BRANCH_ACTIVATE:
case LFUN_BRANCH_DEACTIVATE: {
BranchList & branch_list = buffer().params().branchlist();
case LFUN_BRANCH_DEACTIVATE:
case LFUN_BRANCH_MASTER_ACTIVATE:
case LFUN_BRANCH_MASTER_DEACTIVATE: {
bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE
|| cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE);
Buffer * buf = master ? const_cast<Buffer *>(buffer().masterBuffer())
: &buffer();
docstring const branch_name = cmd.argument();
// the case without a branch name is handled elsewhere
if (branch_name.empty()) {
dispatched = false;
break;
}
Branch * branch = branch_list.find(branch_name);
Branch * branch = buf->params().branchlist().find(branch_name);
if (!branch) {
LYXERR0("Branch " << branch_name << " does not exist.");
dr.setError(true);
@ -1986,7 +1997,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
dr.setMessage(msg);
break;
}
bool activate = cmd.action() == LFUN_BRANCH_ACTIVATE;
bool activate = (cmd.action() == LFUN_BRANCH_ACTIVATE
|| cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE);
if (branch->isSelected() != activate) {
branch->setSelected(activate);
cur.recordUndoFullDocument();

26
src/FuncCode.h
View File

@ -51,14 +51,14 @@ enum FuncCode
LFUN_SELECTION_PASTE, // JMarc 2008/12/15
LFUN_CUT,
LFUN_COPY,
LFUN_CLOSE_TAB_GROUP,
LFUN_TAB_GROUP_CLOSE,
LFUN_NOTE_NEXT,
// 20
LFUN_INSET_TOGGLE,
LFUN_HFILL_INSERT,
LFUN_TEXTSTYLE_APPLY,
LFUN_TEXTSTYLE_UPDATE,
LFUN_FONT_EMPH,
LFUN_CLIPBOARD_PASTE_SIMPLE, // tommaso, 20111028
// 25
LFUN_FONT_BOLD,
LFUN_FONT_BOLDSYMBOL,
@ -106,7 +106,7 @@ enum FuncCode
LFUN_CHAR_DELETE_FORWARD,
LFUN_CHAR_DELETE_BACKWARD,
LFUN_NEWLINE_INSERT, // renamed: JSpitzm, 20080325
LFUN_BREAK_PARAGRAPH,
LFUN_PARAGRAPH_BREAK,
// 65
LFUN_QUOTE_INSERT,
LFUN_ACCENT_CIRCUMFLEX,
@ -132,11 +132,11 @@ enum FuncCode
LFUN_ACCENT_OGONEK,
LFUN_SELF_INSERT,
// 85
LFUN_GETBUFNAME,
LFUN_SERVER_GET_XY,
LFUN_SERVER_SET_XY,
LFUN_SPLIT_VIEW,
LFUN_LINEATCURSOR,
LFUN_VIEW_SPLIT,
LFUN_VIEW_CLOSE, // Tommaso, 20120915
LFUN_BUFFER_FORALL, // scottkostyshak, 20120720
// 90
LFUN_SERVER_GET_LAYOUT,
LFUN_SERVER_GET_FILENAME,
@ -246,10 +246,10 @@ enum FuncCode
LFUN_FOOTNOTE_INSERT, // Jug 20000307
LFUN_MATH_AMS_MATRIX, // uwestoehr 12-07-2009
// 180
LFUN_IPA_INSERT, // spitz, 20120305
LFUN_IN_IPA, // spitz, 20120520
LFUN_IPAMACRO_INSERT, // spitz, 20120822
LFUN_TABULAR_INSERT, // Jug 20000412
LFUN_LOFVIEW, // Dekel 20000519
LFUN_LOTVIEW, // Dekel 20000519
LFUN_LOAVIEW, // Dekel 20000519
LFUN_SET_COLOR, // SLior 20000611
// 185
LFUN_MARGINALNOTE_INSERT, // Lgb 20000626
@ -450,12 +450,8 @@ enum FuncCode
LFUN_SCRIPT_INSERT, // gb, 20101123
LFUN_BUFFER_EXPORT_AS, // tommaso 20111006
// 350
LFUN_CLIPBOARD_PASTE_SIMPLE, // tommaso, 20111028
LFUN_IPA_INSERT, // spitz, 20120305
LFUN_BUFFER_FORALL, // scottkostyshak, 20120720
LFUN_IN_IPA, // spitz, 20120520
LFUN_IPAMACRO_INSERT, // spitz, 20120822
// 355
LFUN_BRANCH_MASTER_ACTIVATE, // spitz 20120930
LFUN_BRANCH_MASTER_DEACTIVATE, // spitz 20120930
LFUN_LASTACTION // end of the table
};

53
src/LyXAction.cpp
View File

@ -1996,16 +1996,16 @@ void LyXAction::init()
*/
{ LFUN_PARAGRAPH_GOTO, "paragraph-goto", ReadOnly | NoInternal, Edit },
/*!
* \var lyx::FuncCode lyx::LFUN_BREAK_PARAGRAPH
* \var lyx::FuncCode lyx::LFUN_PARAGRAPH_BREAK
* \li Action: Breaks the current paragraph at the current location.
* \li Notion: Removes the selection.
* \li Syntax: break-paragraph [<LAYOUT>]
* \li Syntax: paragraph-break [<LAYOUT>]
* \li Params: <LAYOUT>: "inverse" - decreases depth by one (or change layout
to default layout) when the cursor is at the end of
the line.
* \endvar
*/
{ LFUN_BREAK_PARAGRAPH, "break-paragraph", Noop, Edit },
{ LFUN_PARAGRAPH_BREAK, "paragraph-break", Noop, Edit },
/*!
* \var lyx::FuncCode lyx::LFUN_PARAGRAPH_PARAMS
* \li Action: Change paragraph settings.
@ -2664,27 +2664,39 @@ void LyXAction::init()
{ LFUN_WINDOW_CLOSE, "window-close", NoBuffer, Buffer },
/*!
* \var lyx::FuncCode lyx::LFUN_SPLIT_VIEW
* \var lyx::FuncCode lyx::LFUN_VIEW_SPLIT
* \li Action: Creates another split view of current buffer.
* \li Notion: All split views act in the same way independently.
* \li Syntax: split-view <vertical|horizontal>
* \li Syntax: view-split <vertical|horizontal>
* \li Params: horizontal : The work areas are laid out side by side.\n
vertical : The work areas laid out vertically.
* \li Origin: Abdel, 20 Feb 2008
* \endvar
*/
{ LFUN_SPLIT_VIEW, "split-view", ReadOnly, Buffer },
{ LFUN_VIEW_SPLIT, "view-split", ReadOnly, Buffer },
/*!
* \var lyx::FuncCode lyx::LFUN_CLOSE_TAB_GROUP
* \var lyx::FuncCode lyx::LFUN_VIEW_CLOSE
* \li Action: Close the current document work area.
* \li Notion: Close the current work area. If no other work areas are showing the buffer,
then close the associated buffer as well.
* \li Syntax: view-close
* \li Origin: Tommaso, 15 Sep 2012
* \endvar
*/
{ LFUN_VIEW_CLOSE, "view-close", ReadOnly, Buffer },
/*!
* \var lyx::FuncCode lyx::LFUN_TAB_GROUP_CLOSE
* \li Action: Close the current tab group.
* \li Notion: This only closes the work areas, not the buffers themselves.
The still opened buffers can be visualized in another tab group.
* \li Syntax: close-tab-group
* \li Syntax: tab-group-close
* \li Origin: Abdel, 21 Feb 2008
* \endvar
*/
{ LFUN_CLOSE_TAB_GROUP, "close-tab-group", ReadOnly, Buffer },
{ LFUN_TAB_GROUP_CLOSE, "tab-group-close", ReadOnly, Buffer },
/*!
* \var lyx::FuncCode lyx::LFUN_DIALOG_SHOW
* \li Action: Shows hidden dialog or creates new one for a given function/inset settings etc.
@ -3489,7 +3501,7 @@ void LyXAction::init()
* \li Origin: spitz, 7 Jul 2009
* \endvar
*/
{ LFUN_BRANCH_ADD, "branch-add", Noop, Buffer },
{ LFUN_BRANCH_ADD, "branch-add", AtPoint, Buffer },
/*!
@ -3513,6 +3525,27 @@ void LyXAction::init()
* \endvar
*/
{ LFUN_BRANCH_DEACTIVATE, "branch-deactivate", AtPoint, Buffer },
/*!
* \var lyx::FuncCode lyx::LFUN_BRANCH_MASTER_ACTIVATE
* \li Action: Activate the branch in the master buffer.
* \li Syntax: branch-master-activate <BRANCH>
* \li Params: <BRANCH>: The branch to activate
* \li Sample: lyx -x "branch-activate answers" -e pdf2 finalexam.lyx \n
could be used to export a pdf with the answers branch included
without one's having to open LyX and activate the branch manually.
* \li Origin: spitz, 30 Sep 2012
* \endvar
*/
{ LFUN_BRANCH_MASTER_ACTIVATE, "branch-master-activate", AtPoint, Buffer },
/*!
* \var lyx::FuncCode lyx::LFUN_BRANCH_MASTER_DEACTIVATE
* \li Action: De-activate the branch in the master buffer.
* \li Syntax: branch-master-deactivate <BRANCH>
* \li Params: <BRANCH>: The branch to deactivate
* \li Origin: spitz, 30 Sep 2012
* \endvar
*/
{ LFUN_BRANCH_MASTER_DEACTIVATE, "branch-master-deactivate", AtPoint, Buffer },
/*!
* \var lyx::FuncCode lyx::LFUN_BRANCHES_RENAME

2
src/LyXAction.h
View File

@ -22,7 +22,7 @@
namespace lyx {
// current LFUN format
static unsigned int const LFUN_FORMAT = 1;
static unsigned int const LFUN_FORMAT = 2;
class FuncRequest;
class LyXErr;

18
src/LyXRC.cpp
View File

@ -73,6 +73,7 @@ LexerKeyword lyxrcTags[] = {
{ "\\bind_file", LyXRC::RC_BINDFILE },
{ "\\check_lastfiles", LyXRC::RC_CHECKLASTFILES },
{ "\\chktex_command", LyXRC::RC_CHKTEX_COMMAND },
{ "\\close_buffer_with_last_view", LyXRC::RC_CLOSE_BUFFER_WITH_LAST_VIEW },
{ "\\completion_cursor_text", LyXRC::RC_COMPLETION_CURSOR_TEXT },
{ "\\completion_inline_delay", LyXRC::RC_COMPLETION_INLINE_DELAY },
{ "\\completion_inline_dots", LyXRC::RC_COMPLETION_INLINE_DOTS },
@ -370,6 +371,7 @@ void LyXRC::setDefaults()
default_decimal_point = ".";
default_length_unit = Length::CM;
cursor_width = 1;
close_buffer_with_last_view = "yes";
}
@ -1042,6 +1044,9 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
case RC_VISUAL_CURSOR:
lexrc >> visual_cursor;
break;
case RC_CLOSE_BUFFER_WITH_LAST_VIEW:
lexrc >> close_buffer_with_last_view;
break;
case RC_AUTO_NUMBER:
lexrc >> auto_number;
break;
@ -2528,6 +2533,14 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
}
if (tag != RC_LAST)
break;
case RC_CLOSE_BUFFER_WITH_LAST_VIEW:
if (ignore_system_lyxrc ||
close_buffer_with_last_view != system_lyxrc.close_buffer_with_last_view) {
os << "# When closing last view, buffer closes (yes), hides (no), or ask the user (ask)\n";
os << "\\close_buffer_with_last_view " << close_buffer_with_last_view << '\n';
}
if (tag != RC_LAST)
break;
case RC_LANGUAGE_CUSTOM_PACKAGE:
if (ignore_system_lyxrc ||
language_custom_package != system_lyxrc.language_custom_package) {
@ -3025,6 +3038,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
case LyXRC::RC_FULL_SCREEN_TOOLBARS:
case LyXRC::RC_FULL_SCREEN_WIDTH:
case LyXRC::RC_VISUAL_CURSOR:
case LyXRC::RC_CLOSE_BUFFER_WITH_LAST_VIEW:
case LyXRC::RC_VIEWER:
case LyXRC::RC_VIEWER_ALTERNATIVES:
case LyXRC::RC_FORWARD_SEARCH_DVI:
@ -3387,6 +3401,10 @@ string const LyXRC::getDescription(LyXRCTags tag)
str = _("Select to have visual bidi cursor movement, unselect for logical movement.");
break;
case RC_CLOSE_BUFFER_WITH_LAST_VIEW:
str = _("Specify whether, closing the last view of an open document, LyX should close the document (yes), hide it (no), or ask the user (ask).");
break;
case RC_SCREEN_DPI:
str = _("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here.");
break;

3
src/LyXRC.h
View File

@ -190,6 +190,7 @@ public:
RC_VIEWER,
RC_VIEWER_ALTERNATIVES,
RC_VISUAL_CURSOR,
RC_CLOSE_BUFFER_WITH_LAST_VIEW,
RC_LAST
};
@ -547,6 +548,8 @@ public:
bool force_paint_single_char;
///
int cursor_width;
/// One of: yes, no, ask
std::string close_buffer_with_last_view;
};

9
src/Text3.cpp
View File

@ -294,7 +294,12 @@ static bool doInsertInset(Cursor & cur, Text * text,
// Merge multiple paragraphs -- hack
while (cur.lastpit() > 0)
mergeParagraph(bparams, cur.text()->paragraphs(), 0);
Cursor old = cur;
cur.leaveInset(*inset);
if (cmd.action() == LFUN_PREVIEW_INSERT
|| cmd.action() == LFUN_IPA_INSERT)
// trigger preview
notifyCursorLeavesOrEnters(old, cur);
}
} else {
cur.leaveInset(*inset);
@ -1063,7 +1068,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
}
break;
case LFUN_BREAK_PARAGRAPH:
case LFUN_PARAGRAPH_BREAK:
cap::replaceSelection(cur);
breakParagraph(cur, cmd.argument() == "inverse");
cur.resetAnchor();
@ -2747,7 +2752,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
flag.setOnOff(to_utf8(cmd.argument()) == cur.real_current_font.language()->lang());
break;
case LFUN_BREAK_PARAGRAPH:
case LFUN_PARAGRAPH_BREAK:
enable = cur.inset().getLayout().isMultiPar();
break;

21
src/frontends/qt4/GuiPrefs.cpp
View File

@ -2526,6 +2526,8 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form)
this, SIGNAL(changed()));
connect(iconSetCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
connect(closeLastViewCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
connect(restoreCursorCB, SIGNAL(clicked()),
this, SIGNAL(changed()));
connect(loadSessionCB, SIGNAL(clicked()),
@ -2572,6 +2574,19 @@ void PrefUserInterface::apply(LyXRC & rc) const
#if QT_VERSION < 0x040500
rc.single_close_tab_button = true;
#endif
switch (closeLastViewCO->currentIndex()) {
case 0:
rc.close_buffer_with_last_view = "yes";
break;
case 1:
rc.close_buffer_with_last_view = "no";
break;
case 2:
rc.close_buffer_with_last_view = "ask";
break;
default:
;
}
}
@ -2601,6 +2616,12 @@ void PrefUserInterface::update(LyXRC const & rc)
singleInstanceCB->setChecked(rc.single_instance && !rc.lyxpipes.empty());
singleInstanceCB->setEnabled(!rc.lyxpipes.empty());
singleCloseTabButtonCB->setChecked(rc.single_close_tab_button);
if (rc.close_buffer_with_last_view == "yes")
closeLastViewCO->setCurrentIndex(0);
else if (rc.close_buffer_with_last_view == "no")
closeLastViewCO->setCurrentIndex(1);
else if (rc.close_buffer_with_last_view == "ask")
closeLastViewCO->setCurrentIndex(2);
}

36
src/frontends/qt4/GuiRef.cpp
View File

@ -48,14 +48,6 @@ GuiRef::GuiRef(GuiView & lv)
at_ref_ = false;
// Enabling is set in updateRefs. Disable for now in case no
// call to updateContents follows (e.g. read-only documents).
sortCB->setEnabled(false);
caseSensitiveCB->setEnabled(false);
caseSensitiveCB->setChecked(false);
refsTW->setEnabled(false);
gotoPB->setEnabled(false);
refsTW->setColumnCount(1);
refsTW->header()->setVisible(false);
@ -98,19 +90,22 @@ GuiRef::GuiRef(GuiView & lv)
bc().setOK(okPB);
bc().setApply(applyPB);
bc().setCancel(closePB);
bc().addReadOnly(refsTW);
bc().addReadOnly(sortCB);
bc().addReadOnly(caseSensitiveCB);
bc().addReadOnly(nameED);
bc().addReadOnly(referenceED);
bc().addReadOnly(typeCO);
bc().addReadOnly(bufferCO);
restored_buffer_ = -1;
active_buffer_ = -1;
}
void GuiRef::enableView(bool enable)
{
if (!enable)
// In the opposite case, updateContents() will be called anyway.
updateContents();
GuiDialog::enableView(enable);
}
void GuiRef::changed_adaptor()
{
changed();
@ -139,9 +134,6 @@ void GuiRef::selectionChanged()
void GuiRef::refHighlighted(QTreeWidgetItem * sel)
{
if (isBufferReadonly())
return;
if (sel->childCount() > 0) {
sel->setExpanded(true);
return;
@ -158,7 +150,7 @@ void GuiRef::refHighlighted(QTreeWidgetItem * sel)
if (at_ref_)
gotoRef();
gotoPB->setEnabled(true);
if (typeAllowed())
if (typeAllowed() && !isBufferReadonly())
typeCO->setEnabled(true);
nameED->setHidden(!nameAllowed());
nameL->setHidden(!nameAllowed());
@ -235,11 +227,13 @@ void GuiRef::updateContents()
{
int orig_type = typeCO->currentIndex();
referenceED->setText(toqstr(params_["reference"]));
referenceED->clear();
nameED->clear();
referenceED->setText(toqstr(params_["reference"]));
nameED->setText(toqstr(params_["name"]));
nameED->setHidden(!nameAllowed() && !isBufferReadonly());
nameL->setHidden(!nameAllowed() && !isBufferReadonly());
nameED->setHidden(!nameAllowed());
nameL->setHidden(!nameAllowed());
// restore type settings for new insets
if (params_["reference"].empty())

4
src/frontends/qt4/GuiRef.h
View File

@ -30,6 +30,10 @@ class GuiRef : public GuiDialog, public Ui::RefUi
public:
GuiRef(GuiView & lv);
/// Dialog inherited methods
//@{
void enableView(bool enable);
//@}
private Q_SLOTS:
void changed_adaptor();

73
src/frontends/qt4/GuiView.cpp
View File

@ -330,6 +330,18 @@ struct GuiView::GuiViewPrivate
return tabWorkArea(0);
}
int countWorkAreasOf(Buffer & buf)
{
int areas = tabWorkAreaCount();
int count = 0;
for (int i = 0; i != areas; ++i) {
TabWorkArea * twa = tabWorkArea(i);
if (twa->workArea(buf))
++count;
}
return count;
}
#if (QT_VERSION >= 0x040400)
void setPreviewFuture(QFuture<Buffer::ExportStatus> const & f)
{
@ -1688,6 +1700,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
break;
case LFUN_BUFFER_CLOSE:
case LFUN_VIEW_CLOSE:
enable = doc_buffer;
break;
@ -1695,7 +1708,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
enable = theBufferList().last() != theBufferList().first();
break;
case LFUN_SPLIT_VIEW:
case LFUN_VIEW_SPLIT:
if (cmd.getArg(0) == "vertical")
enable = doc_buffer && (d.splitter_->count() == 1 ||
d.splitter_->orientation() == Qt::Vertical);
@ -1704,7 +1717,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
d.splitter_->orientation() == Qt::Horizontal);
break;
case LFUN_CLOSE_TAB_GROUP:
case LFUN_TAB_GROUP_CLOSE:
enable = d.tabWorkAreaCount() > 1;
break;
@ -2458,10 +2471,45 @@ bool GuiView::hideWorkArea(GuiWorkArea * wa)
}
// We only want to close the buffer if it is not visible in other workareas
// of the same view, nor in other views, and if this is not a child
bool GuiView::closeWorkArea(GuiWorkArea * wa)
{
Buffer & buf = wa->bufferView().buffer();
return closeWorkArea(wa, !buf.parent());
bool last_wa = d.countWorkAreasOf(buf) == 1
&& !inOtherView(buf) && !buf.parent();
bool close_buffer = last_wa;
if (last_wa) {
if (lyxrc.close_buffer_with_last_view == "yes")
; // Nothing to do
else if (lyxrc.close_buffer_with_last_view == "no")
close_buffer = false;
else {
docstring file;
if (buf.isUnnamed())
file = from_utf8(buf.fileName().onlyFileName());
else
file = buf.fileName().displayName(30);
docstring const text = bformat(
_("Last view on document %1$s is being closed.\n"
"Would you like to close or hide the document?\n"
"\n"
"Hidden documents can be displayed back through\n"
"the menu: View->Hidden->...\n"
"\n"
"To remove this question, set your preference in:\n"
" Tools->Preferences->Look&Feel->UserInterface\n"
), file);
int ret = Alert::prompt(_("Close or hide document?"),
text, 0, 1, _("&Close"), _("&Hide"));
close_buffer = (ret == 0);
}
}
return closeWorkArea(wa, close_buffer);
}
@ -3545,7 +3593,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
break;
}
case LFUN_SPLIT_VIEW: {
case LFUN_VIEW_SPLIT: {
LASSERT(doc_buffer, break);
string const orientation = cmd.getArg(0);
d.splitter_->setOrientation(orientation == "vertical"
@ -3555,7 +3603,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
setCurrentWorkArea(wa);
break;
}
case LFUN_CLOSE_TAB_GROUP:
case LFUN_TAB_GROUP_CLOSE:
if (TabWorkArea * twa = d.currentTabWorkArea()) {
closeTabWorkArea(twa);
d.current_work_area_ = 0;
@ -3570,6 +3618,21 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
}
break;
case LFUN_VIEW_CLOSE:
if (TabWorkArea * twa = d.currentTabWorkArea()) {
closeWorkArea(twa->currentWorkArea());
d.current_work_area_ = 0;
twa = d.currentTabWorkArea();
// Switch to the next GuiWorkArea in the found TabWorkArea.
if (twa) {
// Make sure the work area is up to date.
setCurrentWorkArea(twa->currentWorkArea());
} else {
setCurrentWorkArea(0);
}
}
break;
case LFUN_COMPLETION_INLINE:
if (d.current_work_area_)
d.current_work_area_->completer().showInline();

2
src/frontends/qt4/GuiView.h
View File

@ -145,7 +145,7 @@ public:
/// hides the workarea and makes sure it is clean
bool hideWorkArea(GuiWorkArea * wa);
/// closes the workarea
/// closes workarea; close buffer only if no other workareas point to it
bool closeWorkArea(GuiWorkArea * wa);
/// closes the buffer
bool closeBuffer(Buffer & buf);

45
src/frontends/qt4/ui/PrefUi.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PrefUi</class>
<widget class="QWidget" name="PrefUi">
@ -5,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>413</width>
<height>408</height>
<width>604</width>
<height>559</height>
</rect>
</property>
<property name="sizePolicy">
@ -52,19 +53,19 @@
</property>
</spacer>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="iconSetLA" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="iconSetLA">
<property name="text">
<string>&amp;Icon Set:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>iconSetCO</cstring>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QComboBox" name="iconSetCO" >
<property name="toolTip" >
<item row="1" column="1">
<widget class="QComboBox" name="iconSetCO">
<property name="toolTip">
<string>The icon set to use. Warning: normal size of icons may be&#x0a;wrong until you save the preferences and restart LyX.</string>
</property>
</widget>
@ -276,6 +277,32 @@
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Closing last view:</string>
</property>
</widget>
</item>
<item row="7" column="1" colspan="4">
<widget class="QComboBox" name="closeLastViewCO">
<item>
<property name="text">
<string>Closes document</string>
</property>
</item>
<item>
<property name="text">
<string>Hides document</string>
</property>
</item>
<item>
<property name="text">
<string>Ask the user</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>

2
src/insets/InsetBox.cpp
View File

@ -239,7 +239,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
flag.setEnabled(true);
return true;
case LFUN_BREAK_PARAGRAPH:
case LFUN_PARAGRAPH_BREAK:
if ((params_.inner_box && !params_.use_makebox)
|| params_.type == "Shaded" || params_.type == "Framed")
return InsetCollapsable::getStatus(cur, cmd, flag);

77
src/insets/InsetBranch.cpp
View File

@ -23,6 +23,7 @@
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "Lexer.h"
#include "LyX.h"
#include "OutputParams.h"
#include "output_xhtml.h"
#include "TextClass.h"
@ -64,8 +65,14 @@ void InsetBranch::read(Lexer & lex)
docstring InsetBranch::toolTip(BufferView const & bv, int, int) const
{
docstring const status = isBranchSelected() ?
docstring const masterstatus = isBranchSelected() ?
_("active") : _("non-active");
docstring const childstatus = isBranchSelected(true) ?
_("active") : _("non-active");
docstring const status = (masterstatus == childstatus) ?
masterstatus :
support::bformat(_("master: %1$s, child: %2$s"),
masterstatus, childstatus);
docstring const heading =
support::bformat(_("Branch (%1$s): %2$s"), status, params_.branch);
if (isOpen(bv))
@ -79,10 +86,13 @@ docstring const InsetBranch::buttonLabel(BufferView const & bv) const
docstring s = _("Branch: ") + params_.branch;
Buffer const & realbuffer = *buffer().masterBuffer();
BranchList const & branchlist = realbuffer.params().branchlist();
if (!branchlist.find(params_.branch)
&& buffer().params().branchlist().find(params_.branch))
bool const inmaster = branchlist.find(params_.branch);
bool const inchild = buffer().params().branchlist().find(params_.branch);
if (!inmaster && inchild)
s = _("Branch (child only): ") + params_.branch;
else if (!branchlist.find(params_.branch))
else if (inmaster && !inchild)
s = _("Branch (master only): ") + params_.branch;
else if (!inmaster)
s = _("Branch (undefined): ") + params_.branch;
if (!params_.branch.empty()) {
// FIXME UNICODE
@ -90,7 +100,12 @@ docstring const InsetBranch::buttonLabel(BufferView const & bv) const
if (c == Color_none)
s = _("Undef: ") + s;
}
s = char_type(isBranchSelected() ? 0x2714 : 0x2716) + s;
bool const master_selected = isBranchSelected();
bool const child_selected = isBranchSelected(true);
docstring symb = docstring(1, char_type(master_selected ? 0x2714 : 0x2716));
if (inchild && master_selected != child_selected)
symb += char_type(child_selected ? 0x2714 : 0x2716);
s = symb + s;
if (decoration() == InsetLayout::CLASSIC)
return isOpen(bv) ? s : getNewLabel(s);
else
@ -125,32 +140,35 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
break;
}
case LFUN_BRANCH_ACTIVATE:
case LFUN_BRANCH_DEACTIVATE: {
Buffer * buf = const_cast<Buffer *>(buffer().masterBuffer());
// is the branch in our master buffer?
bool branch_in_master = (buf != &buffer());
case LFUN_BRANCH_DEACTIVATE:
case LFUN_BRANCH_MASTER_ACTIVATE:
case LFUN_BRANCH_MASTER_DEACTIVATE: {
bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE
|| cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE);
Buffer * buf = master ? const_cast<Buffer *>(buffer().masterBuffer())
: &buffer();
Branch * our_branch = buf->params().branchlist().find(params_.branch);
if (branch_in_master && !our_branch) {
// child only?
our_branch = buffer().params().branchlist().find(params_.branch);
if (!our_branch)
break;
branch_in_master = false;
}
bool const activate = (cmd.action() == LFUN_BRANCH_ACTIVATE);
bool const activate = (cmd.action() == LFUN_BRANCH_ACTIVATE
|| cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE);
if (our_branch->isSelected() != activate) {
// FIXME If the branch is in the master document, we cannot
// call recordUndo..., becuase the master may be hidden, and
// call recordUndo..., because the master may be hidden, and
// the code presently assumes that hidden documents can never
// be dirty. See GuiView::closeBufferAll(), for example.
if (!branch_in_master)
if (!master)
buffer().undo().recordUndoFullDocument(cur);
our_branch->setSelected(activate);
cur.forceBufferUpdate();
}
break;
}
case LFUN_BRANCH_ADD:
lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, params_.branch));
break;
case LFUN_INSET_TOGGLE:
if (cmd.argument() == "assign")
setStatus(cur, isBranchSelected() ? Open : Collapsed);
@ -168,17 +186,34 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
bool const known_branch =
buffer().params().branchlist().find(params_.branch);
switch (cmd.action()) {
case LFUN_INSET_MODIFY:
flag.setEnabled(true);
break;
case LFUN_BRANCH_ACTIVATE:
flag.setEnabled(!isBranchSelected());
flag.setEnabled(known_branch && !isBranchSelected(true));
break;
case LFUN_BRANCH_ADD:
flag.setEnabled(!known_branch);
break;
case LFUN_BRANCH_DEACTIVATE:
flag.setEnabled(isBranchSelected());
flag.setEnabled(isBranchSelected(true));
break;
case LFUN_BRANCH_MASTER_ACTIVATE:
flag.setEnabled(buffer().parent()
&& buffer().masterBuffer()->params().branchlist().find(params_.branch)
&& !isBranchSelected());
break;
case LFUN_BRANCH_MASTER_DEACTIVATE:
flag.setEnabled(buffer().parent() && isBranchSelected());
break;
case LFUN_INSET_TOGGLE:
@ -195,9 +230,9 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd,
}
bool InsetBranch::isBranchSelected() const
bool InsetBranch::isBranchSelected(bool const child) const
{
Buffer const & realbuffer = *buffer().masterBuffer();
Buffer const & realbuffer = child ? buffer() : *buffer().masterBuffer();
BranchList const & branchlist = realbuffer.params().branchlist();
Branch const * ourBranch = branchlist.find(params_.branch);

4
src/insets/InsetBranch.h
View File

@ -88,9 +88,9 @@ private:
void setParams(InsetBranchParams const & params) { params_ = params; }
/** \returns true if params_.branch is listed as 'selected' in
\c buffer. This handles the case of child documents.
\c buffer. \p child only checks within child documents.
*/
bool isBranchSelected() const;
bool isBranchSelected(bool const child = false) const;
/*!
* Is the content of this inset part of the output document?
*

2
src/insets/InsetCaption.cpp
View File

@ -197,7 +197,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
{
switch (cmd.action()) {
case LFUN_BREAK_PARAGRAPH:
case LFUN_PARAGRAPH_BREAK:
status.setEnabled(false);
return true;

3
src/insets/InsetScript.cpp
View File

@ -261,7 +261,7 @@ bool InsetScript::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
switch (cmd.action()) {
case LFUN_BREAK_PARAGRAPH:
case LFUN_PARAGRAPH_BREAK:
case LFUN_LAYOUT:
case LFUN_LAYOUT_PARAGRAPH:
case LFUN_MATH_DISPLAY:
@ -272,7 +272,6 @@ bool InsetScript::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_FLOAT_LIST_INSERT:
case LFUN_FLOAT_WIDE_INSERT:
case LFUN_FOOTNOTE_INSERT:
case LFUN_HFILL_INSERT:
case LFUN_INDEX_PRINT:
case LFUN_LISTING_INSERT:
case LFUN_MARGINALNOTE_INSERT:

2
src/insets/InsetTabular.cpp
View File

@ -4729,7 +4729,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
}
// disable in non-fixed-width cells
case LFUN_BREAK_PARAGRAPH:
case LFUN_PARAGRAPH_BREAK:
// multirow does not allow paragraph breaks
if (tabular.isMultiRow(cur.idx())) {
status.setEnabled(false);

4
src/mathed/InsetMathHull.cpp
View File

@ -1368,7 +1368,7 @@ void InsetMathHull::doDispatch(Cursor & cur, FuncRequest & cmd)
cur.undispatched();
break;
case LFUN_BREAK_PARAGRAPH:
case LFUN_PARAGRAPH_BREAK:
// just swallow this
break;
@ -1570,7 +1570,7 @@ bool InsetMathHull::getStatus(Cursor & cur, FuncRequest const & cmd,
// we never allow this in math, and we want to bind enter
// to another actions in command-alternatives
case LFUN_BREAK_PARAGRAPH:
case LFUN_PARAGRAPH_BREAK:
status.setEnabled(false);
return true;
case LFUN_MATH_MUTATE: {

16
src/tex2lyx/text.cpp
View File

@ -1839,8 +1839,10 @@ void fix_relative_filename(string & name)
if (FileName::isAbsolute(name))
return;
name = to_utf8(makeRelPath(from_utf8(makeAbsPath(name, getMasterFilePath()).absFileName()),
from_utf8(getParentFilePath())));
string const absMaster = makeAbsPath(getMasterFilePath()).absFileName();
string const absParent = makeAbsPath(getParentFilePath()).absFileName();
string const abs = makeAbsPath(name, absMaster).absFileName();
name = to_utf8(makeRelPath(from_utf8(abs), from_utf8(absParent)));
}
@ -2531,7 +2533,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
skip_braces(p);
p.get_token();
string name = normalize_filename(p.verbatim_item());
string const path = getMasterFilePath();
string const path = makeAbsPath(getMasterFilePath()).absFileName();
// We want to preserve relative / absolute filenames,
// therefore path is only used for testing
// The file extension is in every case ".tex".
@ -2758,7 +2760,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
opts["clip"] = string();
string name = normalize_filename(p.verbatim_item());
string const path = getMasterFilePath();
string const path = makeAbsPath(getMasterFilePath()).absFileName();
// We want to preserve relative / absolute filenames,
// therefore path is only used for testing
if (!makeAbsPath(name, path).exists()) {
@ -3723,7 +3725,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
name += p.get_token().asInput();
context.check_layout(os);
string filename(normalize_filename(p.getArg('{', '}')));
string const path = getMasterFilePath();
string const path = makeAbsPath(getMasterFilePath()).absFileName();
// We want to preserve relative / absolute filenames,
// therefore path is only used for testing
if ((t.cs() == "include" || t.cs() == "input") &&
@ -4183,7 +4185,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
vector<string> keys;
split_map(arg, opts, keys);
string name = normalize_filename(p.verbatim_item());
string const path = getMasterFilePath();
string const path = makeAbsPath(getMasterFilePath()).absFileName();
// We want to preserve relative / absolute filenames,
// therefore path is only used for testing
if (!makeAbsPath(name, path).exists()) {
@ -4248,7 +4250,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
else if (t.cs() == "loadgame") {
p.skip_spaces();
string name = normalize_filename(p.verbatim_item());
string const path = getMasterFilePath();
string const path = makeAbsPath(getMasterFilePath()).absFileName();
// We want to preserve relative / absolute filenames,
// therefore path is only used for testing
if (!makeAbsPath(name, path).exists()) {