The branch, xhtml/bugs/8280, has been updated. - Log -----------------------------------------------------------------
commit 10162f80c4991f18616d586d1938479d0ef8f557 Author: Josh Hieronymus <[email protected]> Date: Wed Jul 10 06:57:49 2013 -0400 Use convertDelimToXMLEscape() in mathmlize() and htmlize() in InsetMathBig diff --git a/src/mathed/InsetMathBig.cpp b/src/mathed/InsetMathBig.cpp index 1befd77..0990fa0 100644 --- a/src/mathed/InsetMathBig.cpp +++ b/src/mathed/InsetMathBig.cpp @@ -108,46 +108,7 @@ void InsetMathBig::normalize(NormalStream & os) const void InsetMathBig::mathmlize(MathStream & os) const { os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>"; - if (delim_ == "(" || delim_ == ")" - || delim_ == "[" || delim_ == "]" - || delim_ == "|" || delim_ == "/") - os << delim_; - else if (delim_ == "\\{" || delim_ == "\\lbrace") - os << "{"; - else if (delim_ == "\\}" || delim_ == "\\rbrace") - os << "}"; - else if (delim_ == "\\slash") - os << "/"; - else if (delim_ == "\\|" || delim_ == "\\vert") - os << "|"; - else if (delim_ == "\\Vert") - os << "∥"; - else if (delim_ == "\\\\" || delim_ == "\\backslash") - os <<" \\"; - else if (delim_ == "\\langle") - os << "⟨"; - else if (delim_ == "\\rangle") - os << "⟩"; - else if (delim_ == "\\lceil") - os << "⌈"; - else if (delim_ == "\\rceil") - os << "⌉"; - else if (delim_ == "\\lfloor") - os << "⌊"; - else if (delim_ == "\\rfloor") - os << "⌋"; - else if (delim_ == "\\downarrow") - os << "↓"; - else if (delim_ == "\\uparrow") - os << "↑"; - else if (delim_ == "\\Downarrow") - os << "⇓"; - else if (delim_ == "\\Uparrow") - os << "⇑"; - else if (delim_ == "\\updownarrow") - os << "↕"; - else if (delim_ == "\\Updownarrow") - os << "⇕"; + os << convertDelimToXMLEscape(delim_); os << "</mo>"; } @@ -162,46 +123,7 @@ void InsetMathBig::htmlize(HtmlStream & os) const default: name = "big"; break; } os << MTag("span", "class='" + name + "symbol'"); - if (delim_ == "(" || delim_ == ")" - || delim_ == "[" || delim_ == "]" - || delim_ == "|" || delim_ == "/") - os << delim_; - else if (delim_ == "\\{" || delim_ == "\\lbrace") - os << "{"; - else if (delim_ == "\\}" || delim_ == "\\rbrace") - os << "}"; - else if (delim_ == "\\slash") - os << "/"; - else if (delim_ == "\\|" || delim_ == "\\vert") - os << "|"; - else if (delim_ == "\\Vert") - os << "∥"; - else if (delim_ == "\\\\" || delim_ == "\\backslash") - os <<" \\"; - else if (delim_ == "\\langle") - os << "⟨"; - else if (delim_ == "\\rangle") - os << "⟩"; - else if (delim_ == "\\lceil") - os << "⌈"; - else if (delim_ == "\\rceil") - os << "⌉"; - else if (delim_ == "\\lfloor") - os << "⌊"; - else if (delim_ == "\\rfloor") - os << "⌋"; - else if (delim_ == "\\downarrow") - os << "↓"; - else if (delim_ == "\\uparrow") - os << "↑"; - else if (delim_ == "\\Downarrow") - os << "⇓"; - else if (delim_ == "\\Uparrow") - os << "⇑"; - else if (delim_ == "\\updownarrow") - os << "↕"; - else if (delim_ == "\\Updownarrow") - os << "⇕"; + os << convertDelimToXMLEscape(delim_); os << ETag("span"); } commit e5b897655bf9e5f3102a5bcbd2ac3ea192c822f6 Author: Josh Hieronymus <[email protected]> Date: Wed Jul 10 06:42:35 2013 -0400 Move convertDelimToXMLEscape() from InsetMathDelim to MathFactory diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp index f26e072..aa724ce 100644 --- a/src/mathed/InsetMathDelim.cpp +++ b/src/mathed/InsetMathDelim.cpp @@ -40,29 +40,6 @@ static docstring convertDelimToLatexName(docstring const & name) return '\\' + name + ' '; } -static docstring convertDelimToXMLEscape(docstring const & name) -{ - if (name.size() == 1) { - char_type const c = name[0]; - if (c == '<') { - return from_ascii("<"); - } else if (c == '>') { - return from_ascii(">"); - } else { - return name; - } - } - MathWordList const & words = mathedWordList(); - MathWordList::const_iterator it = words.find(name); - if (it != words.end()) - { - docstring const escape = it->second.xmlname; - return escape; - } - LYXERR0("Unable to find `" << name <<"' in the mathWordList."); - return from_ascii("("); -} - InsetMathDelim::InsetMathDelim(Buffer * buf, docstring const & l, docstring const & r) : InsetMathNest(buf, 1), left_(l), right_(r) diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp index 151771d..51dcabe 100644 --- a/src/mathed/MathFactory.cpp +++ b/src/mathed/MathFactory.cpp @@ -598,5 +598,27 @@ bool isAsciiOrMathAlpha(char_type c) return isASCII(c) || Encodings::isMathAlpha(c); } +docstring convertDelimToXMLEscape(docstring const & name) +{ + if (name.size() == 1) { + char_type const c = name[0]; + if (c == '<') { + return from_ascii("<"); + } else if (c == '>') { + return from_ascii(">"); + } else { + return name; + } + } + MathWordList const & words = mathedWordList(); + MathWordList::const_iterator it = words.find(name); + if (it != words.end()) + { + docstring const escape = it->second.xmlname; + return escape; + } + LYXERR0("Unable to find `" << name <<"' in the mathWordList."); + return from_ascii("("); +} } // namespace lyx diff --git a/src/mathed/MathFactory.h b/src/mathed/MathFactory.h index 9837ca7..3a0029d 100644 --- a/src/mathed/MathFactory.h +++ b/src/mathed/MathFactory.h @@ -41,6 +41,8 @@ bool isAsciiOrMathAlpha(char_type); typedef std::map<docstring, latexkeys> MathWordList; MathWordList const & mathedWordList(); +docstring convertDelimToXMLEscape(docstring const & name); + } // namespace lyx #endif commit 24a1321d2477b20f968b59a8f046d0cb5bcbbfeb Author: Josh Hieronymus <[email protected]> Date: Mon Jul 8 07:13:18 2013 -0400 Issue error message and default escape sequence when delim can't be found diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp index d3d01e0..f26e072 100644 --- a/src/mathed/InsetMathDelim.cpp +++ b/src/mathed/InsetMathDelim.cpp @@ -59,8 +59,8 @@ static docstring convertDelimToXMLEscape(docstring const & name) docstring const escape = it->second.xmlname; return escape; } - - return '\\' + name + ' '; + LYXERR0("Unable to find `" << name <<"' in the mathWordList."); + return from_ascii("("); } InsetMathDelim::InsetMathDelim(Buffer * buf, docstring const & l, commit 4faacabdfb168f067b6821385c1e95c5b804ab24 Merge: 61a4b1c f7ac0f7 Author: Josh Hieronymus <[email protected]> Date: Mon Jul 8 06:48:01 2013 -0400 Merge branch 'xhtml/master' into xhtml/bugs/8280 commit f7ac0f7bdaed81edb36b60caadb6c819c9c793db Author: Juergen Spitzmueller <[email protected]> Date: Mon Jul 8 10:24:56 2013 +0200 Fix a typo diff --git a/lib/examples/de/beamer.lyx b/lib/examples/de/beamer.lyx index 6633e7c..c05a376 100644 --- a/lib/examples/de/beamer.lyx +++ b/lib/examples/de/beamer.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 465 +\lyxformat 474 \begin_document \begin_header \textclass beamer @@ -45,7 +45,7 @@ \use_package stmaryrd 1 \use_package undertilde 1 \cite_engine basic -\cite_engine_type numerical +\cite_engine_type default \biblio_style plain \use_bibtopic false \use_indices false @@ -563,6 +563,7 @@ status open \begin_layout Plain Layout + \backslash small \end_layout @@ -749,6 +750,7 @@ Standard status collapsed \begin_layout Plain Layout + "= \end_layout @@ -759,6 +761,7 @@ Overlay status collapsed \begin_layout Plain Layout + "= \end_layout @@ -830,6 +833,7 @@ status collapsed \begin_layout Plain Layout + \backslash small \end_layout @@ -1007,6 +1011,7 @@ Eingebettete Absätze sind durch eine rote Linie am Rand des LyX status collapsed \begin_layout Plain Layout + "= \end_layout @@ -1880,6 +1885,7 @@ status collapsed \begin_layout Plain Layout + \backslash small \end_layout @@ -2303,6 +2309,7 @@ status open \begin_layout Plain Layout + \backslash small \end_layout @@ -3244,7 +3251,7 @@ Tipp \begin_layout Block Verwenden Sie diese Hervorhebungs- und Fett-Einfügungen (anstelle der üblichen Schriftattribute) auch dann, wenn Sie keine Overlay-Spezifikationen benötigen! - Aufgrund der Art und Weise, wie Fettdruck und Herorhebung in + Aufgrund der Art und Weise, wie Fettdruck und Hervorhebung in \begin_inset Flex Structure status collapsed @@ -3773,6 +3780,7 @@ Spalten status collapsed \begin_layout Plain Layout + "" \end_layout commit 61a4b1c97b6425f3b20da415dedac5765574f606 Author: Josh Hieronymus <[email protected]> Date: Mon Jul 8 00:59:21 2013 -0400 Move tests for less-than (<) and greater-than (>) delimiters ahead of tests for other single-character delimiters diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp index bdc5ec4..d3d01e0 100644 --- a/src/mathed/InsetMathDelim.cpp +++ b/src/mathed/InsetMathDelim.cpp @@ -44,15 +44,12 @@ static docstring convertDelimToXMLEscape(docstring const & name) { if (name.size() == 1) { char_type const c = name[0]; - if (c == '(' || c == '[' || c == '.' || c == ')' - || c == ']' || c == '/' || c == '|') { - return name; - } if (c == '<') { return from_ascii("<"); - } - if (c == '>') { + } else if (c == '>') { return from_ascii(">"); + } else { + return name; } } MathWordList const & words = mathedWordList(); commit 8f6a203e0f03e8bc8603b4769cc37c1698cb4766 Author: Josh Hieronymus <[email protected]> Date: Mon Jul 8 00:39:10 2013 -0400 Change main indentation from spaces to tabs diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp index 975eeb5..bdc5ec4 100644 --- a/src/mathed/InsetMathDelim.cpp +++ b/src/mathed/InsetMathDelim.cpp @@ -34,7 +34,7 @@ static docstring convertDelimToLatexName(docstring const & name) if (name.size() == 1) { char_type const c = name[0]; if (c == '<' || c == '(' || c == '[' || c == '.' - || c == '>' || c == ')' || c == ']' || c == '/' || c == '|') + || c == '>' || c == ')' || c == ']' || c == '/' || c == '|') return name; } return '\\' + name + ' '; @@ -42,38 +42,38 @@ static docstring convertDelimToLatexName(docstring const & name) static docstring convertDelimToXMLEscape(docstring const & name) { - if (name.size() == 1) { - char_type const c = name[0]; - if (c == '(' || c == '[' || c == '.' || c == ')' - || c == ']' || c == '/' || c == '|') { - return name; - } - if (c == '<') { - return from_ascii("<"); - } - if (c == '>') { - return from_ascii(">"); - } - } - MathWordList const & words = mathedWordList(); - MathWordList::const_iterator it = words.find(name); - if (it != words.end()) - { - docstring const escape = it->second.xmlname; - return escape; - } - - return '\\' + name + ' '; + if (name.size() == 1) { + char_type const c = name[0]; + if (c == '(' || c == '[' || c == '.' || c == ')' + || c == ']' || c == '/' || c == '|') { + return name; + } + if (c == '<') { + return from_ascii("<"); + } + if (c == '>') { + return from_ascii(">"); + } + } + MathWordList const & words = mathedWordList(); + MathWordList::const_iterator it = words.find(name); + if (it != words.end()) + { + docstring const escape = it->second.xmlname; + return escape; + } + + return '\\' + name + ' '; } InsetMathDelim::InsetMathDelim(Buffer * buf, docstring const & l, - docstring const & r) + docstring const & r) : InsetMathNest(buf, 1), left_(l), right_(r) {} InsetMathDelim::InsetMathDelim(Buffer * buf, docstring const & l, docstring const & r, - MathData const & ar) + MathData const & ar) : InsetMathNest(buf, 1), left_(l), right_(r) { cell(0) = ar; @@ -151,7 +151,7 @@ void InsetMathDelim::draw(PainterInfo & pi, int x, int y) const cell(0).draw(pi, x + dw_ + 4, y); mathed_draw_deco(pi, x + 4, b, dw_, dim.height(), left_); mathed_draw_deco(pi, x + dim.width() - dw_ - 4, - b, dw_, dim.height(), right_); + b, dw_, dim.height(), right_); setPosCache(pi, x, y); } @@ -215,16 +215,16 @@ void InsetMathDelim::mathematica(MathematicaStream & os) const void InsetMathDelim::mathmlize(MathStream & os) const { - os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>" - << convertDelimToXMLEscape(left_) << "</mo>" << cell(0) - << "<mo form='postfix' fence='true' stretchy='true' symmetric='true'>" - << convertDelimToXMLEscape(right_) << "</mo>"; + os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>" + << convertDelimToXMLEscape(left_) << "</mo>" << cell(0) + << "<mo form='postfix' fence='true' stretchy='true' symmetric='true'>" + << convertDelimToXMLEscape(right_) << "</mo>"; } void InsetMathDelim::htmlize(HtmlStream & os) const { - os << convertDelimToXMLEscape(left_) << cell(0) << convertDelimToXMLEscape(right_); + os << convertDelimToXMLEscape(left_) << cell(0) << convertDelimToXMLEscape(right_); } commit 978ecc33092206c9d3ffcead33af5442f3370a5b Author: Vincent van Ravesteijn <[email protected]> Date: Thu Jul 4 21:34:21 2013 +0200 Update RELEASE-NOTES diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 39f1621..e0fdd5e 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -6,65 +6,142 @@ 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: - --export-to <format> <dest> (-E <format> <dest>) - - Allows one to perform a batch export of the LyX file that is opened - to the specified destination file <dest> and format <format>. - For example, to create a PDF of a LyX document, you can run: - lyx -export-to pdf /path/to/dest.pdf /path/to/source.lyx - See the manual page for details. - This functionality is also available via a new menu voice - Export->Export As..., that pops up a dialog allowing one to - choose the export format, as well as the destination pathname. - Also, it is available via the mini-buffer (or the -x switch) - through a proper new LFUN (see below). - -The Advanced Find and Replace feature now supports cancel of a long -search operation by hitting the ESC key. +- There have been changes to some often used menu items. + + The following menu items moved from View to Document: + * View (Default format) + * View (Other formats) + * Update (Default format) + * Update (Other formats) + + The following menu item moved from Document to View: + * Outline -> Outline Pane + +- 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: + + -export-to <format> <dest> (-E <format> <dest>) + + Allows one to perform a batch export of the LyX file that is + opened to the specified destination file <dest> and format + <format>. For example, to create a PDF of a LyX document, + you can run: + lyx -export-to pdf /path/to/dest.pdf /path/to/source.lyx + See the manual page for details. + + This functionality is also available via a new menu voice + Export->Export As..., that pops up a dialog allowing one to + choose the export format, as well as the destination pathname. + Also, it is available via the mini-buffer (or the -x switch) + through a proper new LFUN (see below). + +- The Advanced Find and Replace feature now supports cancel of a + long search operation by hitting the ESC key. + +- Linux desktop file specification and scalable icon has been + included into the tarball. + +- The format pdf aka "PDF (ps2pdf)" was split in two formats: pdf aka + "PDF (ps2pdf)" and pdf6 aka "PDF (graphics)". pdf6 is used for PDF + files included as graphics. Custom external templates and converters + might need to be adjusted. The format split was needed since otherwise + an odt->pdf converter which is intended for included graphics only + did interfere with document export via ps2pdf. + +- The support for ArmTeX (a special typesetting engine for Armenian) + was removed. Writing text in Armenian is now possible in a native + way using XeTeX. + + +The following pref variables were added in 2.1: + +- \\close_buffer_with_last_view [yes|no|ask] + When the user closes the last view on a document, close the + document as well ("yes"), or hide the document ("no"), or ask + the user ("ask"). + +- \\completion_minlength + Defines the minimal length of a word to be added to the list of + words for text completion. + +- \\default_length_unit + Defines the default length unit: 2 for centimers, 6 for inches. + +- \\default_otf_view_format + Defines the default output format for documents with non-tex + fonts (OpenType fonts). + +- \\texinputs_prefix + Defines the prefix for the TEXINPUTS environment variable. A + single '.' in the paths will get replaced with the current + document dir and also non-absolute paths will be prefixed with + that dir. + + The default semantics of TEXINPUTS apply, such that, for example, + if a path is terminated with a double slash, all subdirectories + will also be searched by both the TeX engine amnd ancillary programs + such as dvi previewers or dvips. + + (see also commit 1717ef20) + +- \\use_qimage + See Caveats section below. + +- \\use_system_theme_icons + If set to true, LyX tries to use the theme icons as defined by + the OS. + 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"). +- \\mac_like_word_movement -> \\mac_like_cursor_movement + When this option is set, the cursor is now moved to the end of + the current paragraph on paragrah-down. The pref variable was + renamed to better reflect this new behaviour. The following pref variables are obsoleted in 2.1: -- \\default_language -- \\default_papersize +- \\default_language and \\default_papersize + To set the default language and paper size for new documents, use + the "Save As Document Defaults" button in Document > Settings. + +The following new LyX functions have been introduced: -To set the default language and paper size for new documents, use the -"Save As Document Defaults" button in Document > Settings. +- LFUN_IPA_INSERT + Inserts an IPA (International Phonetic Alphabet) inset. -The format pdf aka "PDF (ps2pdf)" was split in two formats: pdf aka -"PDF (ps2pdf)" and pdf6 aka "PDF (graphics)". pdf6 is used for PDF files -included as graphics. Custom external templates and converters might need -to be adjusted. The format split was needed since otherwise an odt->pdf -converter which is intended for included graphics only did interfere with -document export via ps2pdf. +- LFUN_IPAMACRO_INSERT <char> + Inserts special IPA macros into the document. <char> can be + one of 'tone-falling', 'tone-rising', 'tone-high-rising', + 'tone-low-rising', 'tone-high-rising-falling', 'deco bottomtiebar', + 'deco toptiebar'. -The support for ArmTeX (a special typesetting engine for Armenian) was removed. -Writing text in Armenian is now possible in a native way using XeTeX. +- LFUN_SPELLING_CONTINUOUSLY + Toggles continuous spell-checking. -The following new LyX functions have been introduced: +- LFUN_VC_RENAME +- LFUN_VC_COPY + Renames or copies a file under version control. + +- LFUN_BUFFER_FORALL <command> + Applies the <command> to all non-hidden buffers. -- LFUN_BRANCH_MASTER_ACTIVATE <branch>: - LFUN_BRANCH_MASTER_DEACTIVATE <branch>: +- LFUN_ENVIRONMENT_SPLIT + Splits the current environment with a Separator. + +- 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). @@ -82,50 +159,35 @@ The following new LyX functions have been introduced: 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: - -//template, remove this entry later on -- LFUN_NEXT_INSET_TOGGLE ("next-inset-toggle"): use "inset-toggle" instead. - - The following LyX functions have been changed: - -//template, remove this entry later on -- LFUN_INSET_TOGGLE ("inset-toggle"): For some insets, this function was used - 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_CLOSE_TAB_GROUP ("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_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: -//template, remove this entry later on -- 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. - - -New external programs and libraries: ------------------------------------- +Changes with respect to external programs and libraries: +-------------------------------------------------------- - LyX links now against libmagic (http://www.darwinsys.com/file/) if it is available at compile time. This improves the file format detection of included graphics and other files. The old builtin format detection code is used if libmagic is not available. +- LyX no longer uses gettext for reading the translation files. This + especially has an advantage on Windows, reducing the time it takes to + find the correct translation. + Known issues in version 2.1.0 ----------------------------- @@ -138,8 +200,8 @@ Known issues in version 2.1.0 Caveats when upgrading from earlier versions to 2.1.x ------------------------------------------------------- -In order to improve reported scrolling slowness, we changed the way screen -painting is done. This, however, can slow down the performance on remote -X connections and we provide RC_USE_QIMAGE variable, which brings back -the old way of painting (when set to false). +- In order to improve reported scrolling slowness, we changed the way + screen painting is done. This, however, can slow down the performance + on remote X connections and we provide the \\use_qimage preference + variable, which brings back the old way of painting (when set to false). commit d24d2c36c77127cb730751416df55c07b6d586f2 Author: Vincent van Ravesteijn <[email protected]> Date: Thu Jul 4 21:29:48 2013 +0200 Update ANNOUNCE diff --git a/ANNOUNCE b/ANNOUNCE index 7591dcc..ead5d44 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,31 +1,30 @@ -Public release of LyX version 2.0.0 -=================================== +Public release of LyX version 2.1.0beta1 +======================================== -We are proud to announce the public release of LyX 2.0.0. +We are proud to announce the first public beta release of the new +LyX 2.1 series. -With this release, LyX celebrates 15 years of existence, and we start -a new family of 2.x releases to acknowledge LyX's passing from a child -to an adult. We hope you will celebrate this anniversary with us. +With this release, LyX celebrates 18 years of existence. The 2.1 series +has a rich set of new features compared to the current stable series. -LyX 2.0.0 is the culmination of two and half years of hard work. This -release begins a new series of 2.0.x which will incrementally improve its -stability as the time passes. +LyX 2.1.0beta1 is the culmination of two and half years of hard work. +This release is meant for testing before we actually release LyX 2.1. An overview of the new features can be found here: - http://wiki.lyx.org/LyX/NewInLyX20 + http://wiki.lyx.org/LyX/NewInLyX21 -You can download LyX 2.0.0 from http://www.lyx.org/Download/. +You can download LyX 2.1.0beta1 from http://www.lyx.org/Download/. We hope you will enjoy the result! The file RELEASE-NOTES lists some known issues and problems compared -to the current stable releases (LyX 1.6.x). We strongly recommend that +to the current stable releases (LyX 2.0.x). We strongly recommend that packagers of LyX on various platforms and distributions read this file. As with any major release, this one comes with lot of new features but -also some bugs. If you think you have found a bug in LyX 2.0.0, either email -the LyX developers' mailing list (lyx-devel at lists.lyx.org), or open a bug -report at http://www.lyx.org/trac/wiki/BugTrackerHome. +also some bugs. If you think you have found a bug in LyX 2.1.0beta1, +either email the LyX developers' mailing list (lyx-devel at lists.lyx.org), +or open a bug report at http://www.lyx.org/trac/wiki/BugTrackerHome. If you have trouble using LyX or have a question, consult the documentation that comes with LyX (under Help) and the LyX wiki, which you commit 50426600dbcf5bf1ab061ddfbdfaa82c1f40f8c0 Author: Juergen Spitzmueller <[email protected]> Date: Thu Jul 4 18:25:04 2013 +0200 Fix beamer frame conversion diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index 25f5aaa..0b6103b 100644 --- a/lib/lyx2lyx/lyx_2_1.py +++ b/lib/lyx2lyx/lyx_2_1.py @@ -3757,8 +3757,8 @@ def convert_lyxframes(document): return framebeg = ["BeginFrame", "BeginPlainFrame"] - frameend = ["EndFrame", "BeginFrame", "BeginPlainFrame", "AgainFrame", "Section", "Section*", - "Subsection", "Subsection*", "Subsubsection", "Subsubsection*"] + frameend = ["Frame", "PlainFrame", "EndFrame", "BeginFrame", "BeginPlainFrame", "AgainFrame", + "Section", "Section*", "Subsection", "Subsection*", "Subsubsection", "Subsubsection*"] for lay in framebeg: i = 0 while True: commit b76b6575bdcca8fda2380a11d8d7301c63fe6887 Author: Pavel Sanda <[email protected]> Date: Mon Jul 1 09:52:06 2013 -0700 Add introduction to cursor related classes, written by JMarc. diff --git a/src/Cursor.h b/src/Cursor.h index 006919b..c3ae448 100644 --- a/src/Cursor.h +++ b/src/Cursor.h @@ -9,6 +9,47 @@ * Full author contact details are available in file CREDITS. */ +/* +First some explanation about what a Cursor really is. I try to go from +more local to general. + +* a CursorSlice indicates the position of the cursor at local level. +It contains in particular: + * idx(): the cell that contains the cursor (for Tabular or math + arrays). Always 0 for 'plain' insets + * pit(): the index of the current paragraph (only for Texted) + * pos(): the position in the current paragraph (or in the math + equation in Mathed). + * inset(): the inset in which the cursor is. + +* a DocIterator indicated the position of the cursor in the document. + It knows about the current buffer (buffer() method) and contains a + vector of CursorSlices that describes the nesting of insets up to the + point of interest. Note that operator<< has been implemented, so that + one can send a DocIterator to a stream to see its value. Try it, it is + very helpful to understand the cursor layout. + * when using idx/pit/pos on a DocIterator, one gets the information + from the inner slice (this slice can be accessed as top()) + * inMathed() returns true when the cursor is in a math formula + * inTexted() returns true when the cursor is in text + * innerTextSlice() returns the deepest slice that is text (useful + when one is in a math equation and looks for the enclosing text) + +* A CursorData is a descendent of Dociterator that contains + * a second DocIterator object, the anchor, that is useful when + selecting. + * some other data not interesting here +This class is used only for undo and contains the Cursor element that +are not GUI-related. In LyX 2.0, Cursor was directly deriving from +DocIterator + +* A Cursor is a descendant of CursorData that contains interesting + display-related information, in particular targetX(), the horizontal + position of the cursor in pixels. + * one interesting method for what you want to do is textRow(), that + returns the inner Row object that contains the cursor +*/ + #ifndef LCURSOR_H #define LCURSOR_H ----------------------------------------------------------------------- Summary of changes: ANNOUNCE | 29 +- RELEASE-NOTES | 216 +- configure.ac | 2 +- lib/doc/de/UserGuide.lyx | 4 +- lib/doc/es/Additional.lyx | 2544 +++-- lib/examples/de/beamer.lyx | 14 +- lib/layouts/stdsections.inc | 2 + lib/lyx2lyx/lyx_2_1.py | 4 +- po/cs.po |28983 ++++++++++++++++++++++++----------------- po/es.po |11637 +++++++++-------- src/Bidi.h | 18 +- src/Cursor.h | 41 + src/mathed/InsetMathBig.cpp | 82 +- src/mathed/InsetMathDelim.cpp | 44 +- src/mathed/InsetMathHull.cpp | 2 +- src/mathed/MathFactory.cpp | 22 + src/mathed/MathFactory.h | 2 + 17 files changed, 25110 insertions(+), 18536 deletions(-) hooks/post-receive -- Repositories for GSOC work
