anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into biblatex2

Browse Source
This commit is contained in:
Juergen Spitzmueller 2017-01-09 09:53:20 +01:00
commit 322808281f
7 changed files with 7737 additions and 7808 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15510
lib/doc/Additional.lyx
View File

File diff suppressed because it is too large Load Diff

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

@ -4094,13 +4094,6 @@ dots
decide el tipo a usar en función del carácter siguiente. decide el tipo a usar en función del carácter siguiente.
\end_layout \end_layout
\begin_layout Standard
\begin_inset Separator parbreak
\end_inset
\end_layout
\begin_layout Standard \begin_layout Standard
\align center \align center
\begin_inset Tabular \begin_inset Tabular

4
lib/examples/ca/mathed.lyx
View File

@ -93,10 +93,6 @@ m
. .
El text es pot acotar per delimitadors o no. El text es pot acotar per delimitadors o no.
Així, si seleccioneu qualsevol de les fórmules següents: Així, si seleccioneu qualsevol de les fórmules següents:
\begin_inset Separator latexpar
\end_inset
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard

14
lib/examples/de/linguistics.lyx
View File

@ -188,10 +188,7 @@ Linguistik
aus der Liste der verfügbaren Module und drücken auf den Knopf aus der Liste der verfügbaren Module und drücken auf den Knopf
\family sans \family sans
\bar under Hinzufügen
H
\bar default
inzufügen
\family default \family default
(so wie es für dieses Dokument bereits getan wurde). (so wie es für dieses Dokument bereits getan wurde).
\end_layout \end_layout
@ -284,10 +281,6 @@ Bedeutung
. .
Das Paket erlaubt es, kontextsensible Anführungszeichen zu generieren (bspw. Das Paket erlaubt es, kontextsensible Anführungszeichen zu generieren (bspw.
je nach aktuell verwendeter Sprache). je nach aktuell verwendeter Sprache).
\begin_inset Separator latexpar
\end_inset
\end_layout \end_layout
\begin_deeper \begin_deeper
@ -469,11 +462,6 @@ Das Linguistikmodul stellt zwei Arten von Glossen zur Verfügung.
\family sans \family sans
Einfügen\SpecialChar menuseparator Einfügen\SpecialChar menuseparator
Benutzerdefinierte Einfügungen Benutzerdefinierte Einfügungen
\begin_inset space ~
\end_inset
\SpecialChar ldots
\family default \family default
zugänglich. zugänglich.
Die einfache Die einfache

2
src/Buffer.cpp
View File

@ -2031,7 +2031,7 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
if (! tclass.class_header().empty()) if (! tclass.class_header().empty())
os << from_ascii(tclass.class_header()); os << from_ascii(tclass.class_header());
else if (runparams.flavor == OutputParams::XML) else if (runparams.flavor == OutputParams::XML)
os << "PUBLIC \"-//OASIS//DTD DocBook XML//EN\" " os << "PUBLIC \"-//OASIS//DTD DocBook XML V4.2//EN\" "
<< "\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\""; << "\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";
else else
os << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\""; os << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\"";

1
src/insets/InsetExternal.cpp
View File

@ -99,6 +99,7 @@ TempName::~TempName()
TempName & TempName::operator=(TempName const & other) TempName & TempName::operator=(TempName const & other)
{ {
if (this != &other) { if (this != &other) {
if (!tempname_.empty())
tempname_.removeFile(); tempname_.removeFile();
support::TempFile f("lyxextXXXXXX.tmp"); support::TempFile f("lyxextXXXXXX.tmp");
f.setAutoRemove(false); f.setAutoRemove(false);

3
src/insets/InsetHyperlink.cpp
View File

@ -22,6 +22,7 @@
#include "LaTeXFeatures.h" #include "LaTeXFeatures.h"
#include "OutputParams.h" #include "OutputParams.h"
#include "output_xhtml.h" #include "output_xhtml.h"
#include "sgml.h"
#include "texstream.h" #include "texstream.h"
#include "support/docstream.h" #include "support/docstream.h"
@ -233,7 +234,7 @@ int InsetHyperlink::docbook(odocstream & os, OutputParams const &) const
os << "<ulink url=\"" os << "<ulink url=\""
<< subst(getParam("target"), from_ascii("&"), from_ascii("&amp;")) << subst(getParam("target"), from_ascii("&"), from_ascii("&amp;"))
<< "\">" << "\">"
<< getParam("name") << sgml::escapeString(getParam("name"))
<< "</ulink>"; << "</ulink>";
return 0; return 0;
} }