[LyX/master] DocBook: for computing font changes, simplify code by removing state evolution from iteration to iteration. This surely makes the code slightly slower (although the compiler should be sma

2022-12-26 Thread Thibaut Cuvelier 
commit ed7072985e6a76a8013ea670728fc40e6359c723
Author: Thibaut Cuvelier 
Date:   Mon Dec 26 02:45:03 2022 +0100

DocBook: for computing font changes, simplify code by removing state 
evolution from iteration to iteration. This surely makes the code slightly 
slower (although the compiler should be smart enough), but (much) easier to 
reason about.
---
 src/Paragraph.cpp |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 9c3b0dc..8650826 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3568,8 +3568,6 @@ std::tuple, 
std::vector, std::vectorlayout_;
-FontInfo font_old = style.labeltype == LABEL_MANUAL ? style.labelfont : 
style.font;
-string const default_family = 
buf.masterBuffer()->params().fonts_default_family;
 
// Conversion of the font opening/closing into DocBook tags.
 vector tagsToOpen;
@@ -3602,14 +3600,17 @@ std::tuple, 
std::vector, std::vectorparams(), i - 1, 
outerfont).fontInfo());
Font const font = getFont(buf.masterBuffer()->params(), i, 
outerfont);
-tie(tagsToOpen, tagsToClose) = computeDocBookFontSwitch(font_old, 
font, default_family, fs);
+tie(tagsToOpen, tagsToClose) = computeDocBookFontSwitch(
+   font_old, font, 
buf.masterBuffer()->params().fonts_default_family, fs);
 
if (!ignore_fonts_i) {
 vector::const_iterator cit = tagsToClose.begin();
@@ -3665,7 +3666,6 @@ std::tuple, 
std::vector, std::vectorhttp://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] DocBook: add some TODOs for the future.

2022-12-26 Thread Thibaut Cuvelier 
commit 2b03f0a2c1d9becc3261a97fecd3aab8f6e518c6
Author: Thibaut Cuvelier 
Date:   Tue Dec 27 00:02:30 2022 +0100

DocBook: add some TODOs for the future.
---
 src/output_docbook.h |9 +
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/output_docbook.h b/src/output_docbook.h
index a65e0c8..1fd8d5e 100644
--- a/src/output_docbook.h
+++ b/src/output_docbook.h
@@ -12,6 +12,15 @@
  * Full author contact details are available in file CREDITS.
  */
 
+// TODO: respect languages when opening tags: par.getParLanguage(bparams) in 
output_latex.cpp
+// TODO: if the user specifically asks, output change-tracking information 
(choice between revisionflag attribute and
+//  Oxygen's formatting)
+// 
+//...
+//XXX
+// 
+
 #ifndef OUTPUT_DOCBOOK_H
 #define OUTPUT_DOCBOOK_H
 
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] layout2layout: improve coding style.

2022-12-26 Thread Thibaut Cuvelier 
commit 55ccae72d4c93e95caf9c2424eb85e5be5dd7650
Author: Thibaut Cuvelier 
Date:   Mon Dec 26 21:21:52 2022 +0100

layout2layout: improve coding style.

Useless parentheses (not helping with readability either) and semicolon. 
Redo indentation to be consistent throughout the file. Also, fix typos along 
the way.
---
 lib/scripts/layout2layout.py |  338 -
 1 files changed, 165 insertions(+), 173 deletions(-)

diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index d923d65..cc60992 100644
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -504,7 +504,6 @@ def convert(lines, end_format):
 toclevel = b""
 label = b""
 labelstring = b""
-labelstringappendix = b""
 space1 = b""
 labelstring_line = -1
 labelstringappendix_line = -1
@@ -520,30 +519,28 @@ def convert(lines, end_format):
 opts = 0
 reqs = 0
 inchapter = False
-isflexlayout = False # only used for 48 -> 49
 # Whether a style is inherited (works only for CopyStyle currently,
 # not for true inherited styles, see bug 8920
 inherited = False# only used for 48 -> 49
-resetsfont_found = False # only used for 48 -> 49
 
 while i < len(lines):
 # Skip comments and empty lines
 if (re_Comment.match(lines[i]) or re_Empty.match(lines[i])):
-  # We need to deal with this conversion here, because it happens
-  # inside the initial comment block.
-  if only_comment and format == 39:
-  match = re_ExtractCategory.match(lines[i])
-  if match:
-  lpre = match.group(1)
-  lcat = match.group(2)
-  lnam = match.group(3)
-  if lcat in ConvDict:
-  lcat = ConvDict[lcat]
-  lines[i] = lpre + b"{" + lnam + b"}"
-  lines.insert(i+1, b"#  \\DeclareCategory{" + lcat + b"}")
-  i += 1
-  i += 1
-  continue
+# We need to deal with this conversion here, because it happens
+# inside the initial comment block.
+if only_comment and format == 39:
+match = re_ExtractCategory.match(lines[i])
+if match:
+lpre = match.group(1)
+lcat = match.group(2)
+lnam = match.group(3)
+if lcat in ConvDict:
+lcat = ConvDict[lcat]
+lines[i] = lpre + b"{" + lnam + b"}"
+lines.insert(i+1, b"#  \\DeclareCategory{" + lcat + b"}")
+i += 1
+i += 1
+continue
 
 # insert file format if not already there
 if only_comment:
@@ -735,8 +732,8 @@ def convert(lines, end_format):
 if format == 48:
 # The default of ResetsFont in LyX changed from true to false,
 # because it is now used for all InsetLayouts, not only flex ones.
-# Therefore we need to set it to true for all flex insets which do
-# do not already have a ResetsFont.
+# Therefore, we need to set it to true for all flex insets which do
+# not already have a ResetsFont.
 match = re_InsetLayout2.match(lines[i])
 if not match:
 i += 1
@@ -749,22 +746,21 @@ def convert(lines, end_format):
 
 resetsfont_found = False
 inherited = False
-notdone = True
 while i < len(lines):
-  match = re_ResetsFont.match(lines[i])
-  if match:
-  resetsfont_found = True
-  else:
-match = re_CopyStyle.match(lines[i])
+match = re_ResetsFont.match(lines[i])
 if match:
-  inherited = True
+resetsfont_found = True
 else:
-  match = re_End.match(lines[i])
-  if match:
-break
-  i += 1
+match = re_CopyStyle.match(lines[i])
+if match:
+inherited = True
+else:
+match = re_End.match(lines[i])
+if match:
+break
+i += 1
 if not resetsfont_found and not inherited:
-  lines.insert(i, b"\tResetsFont true")
+lines.insert(i, b"\tResetsFont true")
 
 continue
 
@@ -774,38 +770,38 @@ def convert(lines, end_format):
 continue
 
 if format == 43:
-  match = re_LabelTypeIsCounter.match(lines[i])
-  if match:
-if inchapter:
- lines[i] = match.group(1) + b"LabelType" + match.group(2) + 
b"Above"
-else:
-  lines[i] = match.group(1) + b"LabelType" + match.group(2) +

[LyX/master] Add comments about variable usage.

2022-12-26 Thread Thibaut Cuvelier 
commit e3eddd4cf9f63b365846ceba162a6f2b7505051b
Author: Thibaut Cuvelier 
Date:   Mon Dec 26 02:44:57 2022 +0100

Add comments about variable usage.
---
 src/Paragraph.cpp |   13 +
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 6baac81..9c3b0dc 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3528,9 +3528,12 @@ std::tuple, 
std::vector, std::vector prependedParagraphs;
-   std::vector generatedParagraphs;
-   std::vector appendedParagraphs;
+   // Return values: segregation of the content of this paragraph.
+   std::vector prependedParagraphs; // Anything that must be 
output before the main tag of this paragraph.
+   std::vector generatedParagraphs; // The main content of the 
paragraph.
+   std::vector appendedParagraphs;  // Anything that must be 
output after the main tag of this paragraph.
+
+   // Internal string stream to store the output before being added to one 
of the previous lists.
odocstringstream os;
 
// If there is an argument that must be output before the main tag, do 
it before handling the rest of the paragraph.
@@ -3560,13 +3563,15 @@ std::tuple, 
std::vector, std::vector delayedChars; // When a font tag ends with a space, 
output it after the closing font tag.
 // This requires to store delayed characters at some point.
 
-DocBookFontState fs; // Track whether we have opened font tags
+   // Track whether we have opened font tags
+DocBookFontState fs;
 DocBookFontState old_fs = fs;
 
 Layout const & style = *d->layout_;
 FontInfo font_old = style.labeltype == LABEL_MANUAL ? style.labelfont : 
style.font;
 string const default_family = 
buf.masterBuffer()->params().fonts_default_family;
 
+   // Conversion of the font opening/closing into DocBook tags.
 vector tagsToOpen;
 vector tagsToClose;
 
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Fix a typo in a comment.

2022-12-26 Thread Thibaut Cuvelier 
commit 8b6ec979ff26f36062f4cad07cce0c11a4583c6b
Author: Thibaut Cuvelier 
Date:   Mon Dec 26 02:44:29 2022 +0100

Fix a typo in a comment.
---
 src/Paragraph.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index e2338ba..6baac81 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3589,7 +3589,7 @@ std::tuple, 
std::vector, std::vectorhttp://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] InsetIPAMacro: implement the XHTML conversion, refactor plaintext and DocBook to share more code.

2022-12-26 Thread Thibaut Cuvelier 
commit b2fdc04f9638c7def8f74f0af1c3e480431b28a6
Author: Thibaut Cuvelier 
Date:   Mon Dec 26 20:50:48 2022 +0100

InsetIPAMacro: implement the XHTML conversion, refactor plaintext and 
DocBook to share more code.
---
 src/insets/InsetIPAMacro.cpp |   37 -
 1 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/insets/InsetIPAMacro.cpp b/src/insets/InsetIPAMacro.cpp
index 5aeaf84..2d4b1fb 100644
--- a/src/insets/InsetIPAMacro.cpp
+++ b/src/insets/InsetIPAMacro.cpp
@@ -283,14 +283,27 @@ void InsetIPADeco::latex(otexstream & os, OutputParams 
const & runparams) const
 }
 
 
-int InsetIPADeco::plaintext(odocstringstream & os,
-   OutputParams const & runparams, size_t max_length) 
const
+namespace {
+std::pair splitPlainTextInHalves(
+   const InsetIPADeco * inset, OutputParams const & runparams,
+   size_t max_length = INT_MAX)
 {
odocstringstream ods;
-   int h = InsetCollapsible::plaintext(ods, runparams, max_length) / 2;
+   int h = inset->InsetCollapsible::plaintext(ods, runparams, max_length) 
/ 2;
docstring result = ods.str();
docstring const before = result.substr(0, h);
docstring const after = result.substr(h, result.size());
+   return {before, after};
+}
+}
+
+
+int InsetIPADeco::plaintext(odocstringstream & os,
+   OutputParams const & runparams, size_t max_length) 
const
+{
+   docstring before;
+   docstring after;
+   tie(before, after) = splitPlainTextInHalves(this, runparams, 
max_length);
 
if (params_.type == InsetIPADecoParams::Toptiebar) {
os << before;
@@ -302,7 +315,7 @@ int InsetIPADeco::plaintext(odocstringstream & os,
os.put(0x035c);
os << after;
}
-   return result.size();
+   return before.size() + after.size();
 }
 
 
@@ -310,11 +323,9 @@ void InsetIPADeco::docbook(XMLStream & xs, OutputParams 
const & runparams) const
 {
// The special combining character must be put in the middle, between 
the two other characters.
// It will not work if there is anything else than two pure characters, 
so going back to plaintext.
-   odocstringstream ods;
-   int h = InsetText::plaintext(ods, runparams) / 2;
-   docstring result = ods.str();
-   docstring const before = result.substr(0, h);
-   docstring const after = result.substr(h, result.size());
+   docstring before;
+   docstring after;
+   tie(before, after) = splitPlainTextInHalves(this, runparams);
 
xs << XMLStream::ESCAPE_NONE << before;
if (params_.type == InsetIPADecoParams::Toptiebar)
@@ -327,10 +338,10 @@ void InsetIPADeco::docbook(XMLStream & xs, OutputParams 
const & runparams) const
 
 docstring InsetIPADeco::xhtml(XMLStream & xs, OutputParams const & runparams) 
const
 {
-   // FIXME: Like in plaintext, the combining characters "" 
(toptiebar)
-   // or "" (bottomtiebar) would need to be inserted just in the mid
-   // of the text string. (How) can this be done with the xhtml stream?
-   return InsetCollapsible::xhtml(xs, runparams);
+   // The DocBook encoding for this inset has no DocBook tag, but sheer 
XML (relying on a plaintext
+   // transformation of the inset).
+   docbook(xs, runparams);
+   return docstring();
 }
 
 
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Insert four entries for Floats & Captions modules, four entries for Foot- and Endnotes modules and two entries for Leisure, Sports and Music modules into Chapter 4 Modules of Additional.l

2022-12-26 Thread Pavel Sanda 
commit f1bb623fb2d7de2e32dd073ff58b01a691be57ca
Author: John R Hudson 
Date:   Mon Dec 26 19:06:04 2022 +

Insert four entries for Floats & Captions modules, four entries for Foot- 
and Endnotes modules and two entries for Leisure, Sports and Music modules into 
Chapter 4 Modules of Additional.lyx.
---
 lib/doc/Additional.lyx |  400 
 1 files changed, 400 insertions(+), 0 deletions(-)

diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index c06d1a8..74558a5 100644
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -14415,6 +14415,406 @@ maketitle
 \end_layout
 
 \begin_layout Section
+
+\change_inserted 564990737 1672081439
+
+\lang american
+Floats & captions
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted 564990737 1672081439
+
+\lang american
+Algorithm2e Float
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 564990737 1672081439
+
+\lang american
+This module uses the 
+\family sans
+algorithm2e
+\family default
+ package for algorithm floats rather than LyX’s home-brewed algorithm floats.
+ Use the Algorithm paragraph style to enter and indent the algorithm.
+ See the 
+\begin_inset CommandInset href
+LatexCommand href
+name "algorithm2e documentation"
+target 
"http://mirrors.ctan.org/macros/latex/contrib/algorithm2e/doc/algorithm2e.pdf;
+literal "false"
+
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted 564990737 1672081439
+
+\lang american
+Bilingual Captions AKA Multilingual Captions
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 564990737 1672081439
+
+\lang american
+This module provides the paragraph style 
+\family sans
+Caption
+\begin_inset space ~
+\end_inset
+
+setup
+\family default
+ with which to typeset multilingual captions.
+ Within this paragraph style 
+\family sans
+Insert\SpecialChar menuseparator
+Language
+\family default
+ allows you to enter the desired language using one of the babel names.
+ See 
+\family sans
+File\SpecialChar menuseparator
+Open Example\SpecialChar menuseparator
+Multilingual Captions
+\family default
+ and 
+\family sans
+Help\SpecialChar menuseparator
+Specific Manuals\SpecialChar menuseparator
+Multilingual Captions
+\family default
+ further information on its use.
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted 564990737 1672081439
+
+\lang american
+Number Figures by Section
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 564990737 1672081439
+
+\lang american
+This module resets the figure number at section start and prepends the section
+ number to the figure number, as in “Figure 2.1.” (By default book and report
+ document classes number by Chapter and article document classes have a
+ single sequence.) 
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted 564990737 1672081439
+
+\lang american
+Number Tables by Section
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 564990737 1672081439
+
+\lang american
+This module resets the table number at section start and prepends the section
+ number to the table number, as in “Table 2.1.” (By default book and report
+ document classes number by Chapter and article document classes have a
+ single sequence.) 
+\end_layout
+
+\begin_layout Section
+
+\change_inserted 564990737 1672081439
+
+\lang american
+Foot- and Endnotes
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted 564990737 1672081439
+
+\lang american
+Endnotes (Basic)
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 564990737 1672081439
+
+\lang american
+This module adds an endnote inset, in addition to footnotes.
+ This uses the 
+\family sans
+endnotes
+\family default
+ package, which has some limitations but works with older LaTeX distributions
+ as well.
+ Use 
+\family sans
+Insert\SpecialChar menuseparator
+Custom Inset\SpecialChar menuseparator
+Endnote
+\family default
+ to insert an endnote and 
+\family sans
+Insert\SpecialChar menuseparator
+List/Contents/References\SpecialChar menuseparator
+Endnotes
+\family default
+ to insert the endnotes list where you want the endnotes to appear.
+ See also 
+\family sans
+Help\SpecialChar menuseparator
+Embedded\SpecialChar menuseparator
+ Objects\SpecialChar menuseparator
+Notes\SpecialChar menuseparator
+Footnotes
+\family default
+.
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted 564990737 1672081439
+
+\lang american
+Endnotes (Extended)
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 564990737 1672081439
+
+\lang american
+This module adds an endnote inset, in addition to footnotes.
+ This uses the 
+\family sans
+enotez
+\family default
+ package which is more powerful and customizable than the 
+\family sans
+endnotes
+\family default
+ package, but requires a fairly modern LaTeX distribution (with LaTeX3).
+ Use 
+\family sans
+Insert\SpecialChar menuseparator
+Custom Inset\SpecialChar menuseparator
+Endnote
+\family default
+ to insert an endnote and

[LyX/master] InsetMathExFunc: use XML entities instead of HTML in MathML.

2022-12-26 Thread Thibaut Cuvelier 
commit 3839897c0fcaa5b2275d05d901a517610331f304
Author: Thibaut Cuvelier 
Date:   Mon Dec 26 20:38:06 2022 +0100

InsetMathExFunc: use XML entities instead of HTML in MathML.

This part should have been committed with bc73a857 in the first place.
---
 src/mathed/InsetMathExFunc.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mathed/InsetMathExFunc.cpp b/src/mathed/InsetMathExFunc.cpp
index c450cce..ea557b1 100644
--- a/src/mathed/InsetMathExFunc.cpp
+++ b/src/mathed/InsetMathExFunc.cpp
@@ -128,7 +128,7 @@ void InsetMathExFunc::mathmlize(MathMLStream & ms) const
   << name_
<< ETagInline("mi")
   << MTagInline("mo")
-  << ""
+  << ""
   << ETagInline("mo")
   << cell(0);
 }
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] InsetMathSpace: use XML entities instead of HTML in MathML.

2022-12-26 Thread Thibaut Cuvelier 
commit 9b80a5ba9e1d072daa9ec3fd3e6470e5460db1f4
Author: Thibaut Cuvelier 
Date:   Mon Dec 26 20:35:26 2022 +0100

InsetMathSpace: use XML entities instead of HTML in MathML.

This part should have been committed with bc73a857 in the first place.
---
 src/mathed/InsetMathSpace.cpp |   17 +++--
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/mathed/InsetMathSpace.cpp b/src/mathed/InsetMathSpace.cpp
index 874012d..f507592 100644
--- a/src/mathed/InsetMathSpace.cpp
+++ b/src/mathed/InsetMathSpace.cpp
@@ -203,11 +203,8 @@ void InsetMathSpace::mathmlize(MathMLStream & ms) const
string l;
if (si.custom)
l = length_.asHTMLString();
-   else if (si.kind != InsetSpaceParams::MEDIUM) {
-   stringstream ss;
-   ss << si.width;
-   l = ss.str() + "px";
-   }
+   else if (si.kind != InsetSpaceParams::MEDIUM)
+   l = to_string(si.width) + "px";
 
std::string attr;
if (!l.empty())
@@ -222,23 +219,23 @@ void InsetMathSpace::htmlize(HtmlStream & ms) const
SpaceInfo const & si = space_info[space_];
switch (si.kind) {
case InsetSpaceParams::THIN:
-   ms << from_ascii("");
+   ms << from_ascii(""); // HTML: 
break;
case InsetSpaceParams::MEDIUM:
ms << from_ascii("");
break;
case InsetSpaceParams::THICK:
-   ms << from_ascii("");
+   ms << from_ascii(""); // HTML: 
break;
case InsetSpaceParams::ENSKIP:
case InsetSpaceParams::ENSPACE:
-   ms << from_ascii("");
+   ms << from_ascii(""); // HTML: 
break;
case InsetSpaceParams::QUAD:
-   ms << from_ascii("");
+   ms << from_ascii(""); // HTML: 
break;
case InsetSpaceParams::QQUAD:
-   ms << from_ascii("");
+   ms << from_ascii(""); // HTML: 
break;
case InsetSpaceParams::HFILL:
case InsetSpaceParams::HFILL_PROTECTED:
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] InsetIPAMacro: refactor code between DocBook and XHTML.

2022-12-26 Thread Thibaut Cuvelier 
commit df025d15df89dac100a368eed7c86a5b754e9f7c
Author: Thibaut Cuvelier 
Date:   Mon Dec 26 20:23:05 2022 +0100

InsetIPAMacro: refactor code between DocBook and XHTML.
---
 src/insets/InsetIPAMacro.cpp |   67 +
 1 files changed, 21 insertions(+), 46 deletions(-)

diff --git a/src/insets/InsetIPAMacro.cpp b/src/insets/InsetIPAMacro.cpp
index a529d04..5aeaf84 100644
--- a/src/insets/InsetIPAMacro.cpp
+++ b/src/insets/InsetIPAMacro.cpp
@@ -553,59 +553,34 @@ int InsetIPAChar::plaintext(odocstringstream & os, 
OutputParams const &, size_t)
 }
 
 
+namespace {
+std::string ipaCharToXMLEntity(InsetIPAChar::Kind kind) {
+   switch (kind) {
+   case InsetIPAChar::Kind::TONE_FALLING:
+   return "";
+   case InsetIPAChar::Kind::TONE_RISING:
+   return "";
+   case InsetIPAChar::Kind::TONE_HIGH_RISING:
+   return "";
+   case InsetIPAChar::Kind::TONE_LOW_RISING:
+   return "";
+   case InsetIPAChar::Kind::TONE_HIGH_RISING_FALLING:
+   return "";
+   }
+   return "";
+}
+}
+
+
 void InsetIPAChar::docbook(XMLStream & xs, OutputParams const &) const
 {
-   switch (kind_) {
-   case TONE_FALLING:
-   xs << XMLStream::ESCAPE_NONE << "";
-   xs << XMLStream::ESCAPE_NONE << "";
-   break;
-   case TONE_RISING:
-   xs << XMLStream::ESCAPE_NONE << "";
-   xs << XMLStream::ESCAPE_NONE << "";
-   break;
-   case TONE_HIGH_RISING:
-   xs << XMLStream::ESCAPE_NONE << "";
-   xs << XMLStream::ESCAPE_NONE << "";
-   break;
-   case TONE_LOW_RISING:
-   xs << XMLStream::ESCAPE_NONE << "";
-   xs << XMLStream::ESCAPE_NONE << "";
-   break;
-   case TONE_HIGH_RISING_FALLING:
-   xs << XMLStream::ESCAPE_NONE << "";
-   xs << XMLStream::ESCAPE_NONE << "";
-   xs << XMLStream::ESCAPE_NONE << "";
-   break;
-   }
+   xs << XMLStream::ESCAPE_NONE << from_ascii(ipaCharToXMLEntity(kind()));
 }
 
 
 docstring InsetIPAChar::xhtml(XMLStream & xs, OutputParams const &) const
 {
-   switch (kind_) {
-   case TONE_FALLING:
-   xs << XMLStream::ESCAPE_NONE << ""
-  << XMLStream::ESCAPE_NONE << "";
-   break;
-   case TONE_RISING:
-   xs << XMLStream::ESCAPE_NONE << ""
-  << XMLStream::ESCAPE_NONE << "";
-   break;
-   case TONE_HIGH_RISING:
-   xs << XMLStream::ESCAPE_NONE << ""
-  << XMLStream::ESCAPE_NONE << "";
-   break;
-   case TONE_LOW_RISING:
-   xs << XMLStream::ESCAPE_NONE << ""
-  << XMLStream::ESCAPE_NONE << "";
-   break;
-   case TONE_HIGH_RISING_FALLING:
-   xs << XMLStream::ESCAPE_NONE << ""
-  << XMLStream::ESCAPE_NONE << ""
-  << XMLStream::ESCAPE_NONE << "";
-   break;
-   }
+   xs << XMLStream::ESCAPE_NONE << from_ascii(ipaCharToXMLEntity(kind()));
return docstring();
 }
 
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] DocBook/HTML: use XML entities for spaces.

2022-12-26 Thread Thibaut Cuvelier 
commit 21d1d917ba0b3da902a1c4648a5fbf3a6d287d75
Author: Thibaut Cuvelier 
Date:   Mon Dec 26 19:11:41 2022 +0100

DocBook/HTML: use XML entities for spaces.

This part should have been committed with bc73a857 in the first place.
---
 src/insets/InsetSpace.cpp |  118 +++-
 1 files changed, 30 insertions(+), 88 deletions(-)

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index 71c7395..6541a30 100644
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -774,44 +774,36 @@ int InsetSpace::plaintext(odocstringstream & os,
 }
 
 
-void InsetSpace::docbook(XMLStream & xs, OutputParams const &) const
-{
-   switch (params_.kind) {
+namespace {
+std::string spaceToXMLEntity(InsetSpaceParams::Kind kind) {
+   switch (kind) {
case InsetSpaceParams::NORMAL:
-   xs << XMLStream::ESCAPE_NONE << " ";
-   break;
+   return " ";
case InsetSpaceParams::QUAD:
-   xs << XMLStream::ESCAPE_NONE << ""; // HTML: 
-   break;
+   return ""; // HTML: 
case InsetSpaceParams::QQUAD:
-   xs << XMLStream::ESCAPE_NONE << ""; // HTML: 

-   break;
+   return ""; // HTML: 
case InsetSpaceParams::ENSKIP:
-   xs << XMLStream::ESCAPE_NONE << ""; // HTML: 
-   break;
-   case InsetSpaceParams::PROTECTED:
-   xs << XMLStream::ESCAPE_NONE << ""; // HTML: 
-   break;
+   return ""; // HTML: 
case InsetSpaceParams::VISIBLE:
-   xs << XMLStream::ESCAPE_NONE << "";
-   break;
+   return "";
case InsetSpaceParams::ENSPACE: // HTML:  (word 
joiners)
-   xs << XMLStream::ESCAPE_NONE << "";
-   break;
+   return "";
case InsetSpaceParams::THIN:
-   xs << XMLStream::ESCAPE_NONE << ""; // HTML: 
-   break;
+   return ""; // HTML: 
case InsetSpaceParams::MEDIUM:
-   xs << XMLStream::ESCAPE_NONE << ""; // HTML: 
-   break;
+   return ""; // HTML: 
case InsetSpaceParams::THICK:
-   xs << XMLStream::ESCAPE_NONE << ""; // HTML: 
-   break;
+   return ""; // HTML: 
+   case InsetSpaceParams::PROTECTED:
case InsetSpaceParams::NEGTHIN:
case InsetSpaceParams::NEGMEDIUM:
case InsetSpaceParams::NEGTHICK:
-   xs << XMLStream::ESCAPE_NONE << ""; // HTML: 
-   break;
+   return ""; // HTML: 
+   case InsetSpaceParams::CUSTOM_PROTECTED:
+   // FIXME XHTML/DocBook
+   // Probably we could do some sort of blank span?
+   return "";
case InsetSpaceParams::HFILL:
case InsetSpaceParams::HFILL_PROTECTED:
case InsetSpaceParams::DOTFILL:
@@ -821,74 +813,24 @@ void InsetSpace::docbook(XMLStream & xs, OutputParams 
const &) const
case InsetSpaceParams::UPBRACEFILL:
case InsetSpaceParams::DOWNBRACEFILL:
case InsetSpaceParams::CUSTOM:
-   case InsetSpaceParams::CUSTOM_PROTECTED:
-   xs << '\n';
-   break;
+   // FIXME XHTML/DocBook
+   // Can we do anything with those?
+   return "\n";
}
+   return "";
+}
+}
+
+
+void InsetSpace::docbook(XMLStream & xs, OutputParams const &) const
+{
+   xs << XMLStream::ESCAPE_NONE << 
from_ascii(spaceToXMLEntity(params_.kind));
 }
 
 
 docstring InsetSpace::xhtml(XMLStream & xs, OutputParams const &) const
 {
-   string output;
-   switch (params_.kind) {
-   case InsetSpaceParams::NORMAL:
-   output = " ";
-   break;
-   case InsetSpaceParams::ENSKIP:
-   output ="";
-   break;
-   case InsetSpaceParams::ENSPACE:
-   output ="";
-   break;
-   case InsetSpaceParams::QQUAD:
-   output ="";
-   break;
-   case InsetSpaceParams::THICK:
-   output ="";
-   break;
-   case InsetSpaceParams::QUAD:
-   output ="";
-   break;
-   case InsetSpaceParams::MEDIUM:
-   output ="";
-   break;
-   case InsetSpaceParams::THIN:
-   output ="";
-   break;
-   case InsetSpaceParams::PROTECTED:
-   case InsetSpaceParams::NEGTHIN:
-   case InsetSpaceParams::NEGMEDIUM:
-   case InsetSpaceParams::NEGTHICK:
-   output ="";
-   break;
-   // no XML entity, only Unicode code for space character exists
-   case InsetSpaceParams::VISIBLE:
-   output ="";
-   break;
-   case InsetSpaceParams::HFILL:
-   case InsetSpaceParams::HFILL_PROTECTED:
-   case InsetSpaceParams::DOTFILL:
-   case InsetSpaceParams::HRULEFILL:
-

[LyX/master] Revert doc update for Additional.lyx so maitenance work can continue.

2022-12-26 Thread Pavel Sanda 
commit 90dab5d1e9a67f4b263c2c4f92c9d94e43a63a82
Author: Pavel Sanda 
Date:   Mon Dec 26 17:46:55 2022 +0100

Revert doc update for Additional.lyx so maitenance work can continue.
---
 lib/doc/Additional.lyx |   30 +-
 1 files changed, 1 insertions(+), 29 deletions(-)

diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index cec2fc9..c06d1a8 100644
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -1,5 +1,5 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 614
+\lyxformat 610
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -4964,7 +4964,6 @@ See also the document classes in the Collections (section
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:Collections"
 
 \end_inset
@@ -7783,7 +7782,6 @@ See also the document classes in the Collections (section
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:Collections"
 
 \end_inset
@@ -7874,7 +7872,6 @@ section
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:Inserting-TeX-Code"
 
 \end_inset
@@ -8839,7 +8836,6 @@ slides (default)
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:slitex"
 
 \end_inset
@@ -9014,7 +9010,6 @@ Foil\SpecialChar TeX
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:foilfoot"
 
 \end_inset
@@ -9586,7 +9581,6 @@ Foil\SpecialChar TeX
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:unsuppfoils"
 
 \end_inset
@@ -9773,7 +9767,6 @@ Selection
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "chap:bullets"
 
 \end_inset
@@ -9783,7 +9776,6 @@ reference "chap:bullets"
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:bullet"
 
 \end_inset
@@ -10481,7 +10473,6 @@ slides (Foil\SpecialChar TeX
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:foiltex"
 
 \end_inset
@@ -10688,7 +10679,6 @@ s.
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:slideNote"
 
 \end_inset
@@ -11228,7 +11218,6 @@ Slide
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:slideQuirk"
 
 \end_inset
@@ -11585,7 +11574,6 @@ VisibleText
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:slideQuirk"
 
 \end_inset
@@ -12041,7 +12029,6 @@ clock
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:slidesetup"
 
 \end_inset
@@ -12461,7 +12448,6 @@ Foils
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:foiltex"
 
 \end_inset
@@ -12547,7 +12533,6 @@ report
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:Collections"
 
 \end_inset
@@ -17830,7 +17815,6 @@ status collapsed
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:Inserting-TeX-Code"
 
 \end_inset
@@ -19220,7 +19204,6 @@ main document
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "subsec:Multiple-Bibliographies"
 
 \end_inset
@@ -21759,7 +21742,6 @@ ation manually.
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "subsec:configuring-viewers"
 
 \end_inset
@@ -23004,7 +22986,6 @@ To make forward search possible, you first need to 
provide the generated
  This can be done via the methods described in the section 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "subsec:rev-search"
 
 \end_inset
@@ -24925,7 +24906,6 @@ peculiar
 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "subsec:kluwer_peculiarities"
 
 \end_inset
@@ -25760,7 +25740,6 @@ If you have bad luck, the text will break right between 
the referenced text
  See section 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "sec:chktex"
 
 \end_inset
@@ -27117,7 +27096,6 @@ rlog -r 
  See 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "subsec:VCS-Revision-Information"
 
 \end_inset
@@ -27818,7 +27796,6 @@ cvs log -r 
  See 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "subsec:VCS-Revision-Information"
 
 \end_inset
@@ -27855,7 +27832,6 @@ status collapsed
 Most of the commands will work with 1.4 too, see 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "subsec:SVN-Repo-Update"
 
 \end_inset
@@ -27946,7 +27922,6 @@ In case locking is not enabled.
  See Section 
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "subsec:SVN-File-Locking"
 
 \end_inset
@@ -28362,7 +28337,6 @@ SVN has two such mechanisms to provide mutual 
exclusivity for file access
  
 \begin_inset CommandInset ref
 LatexCommand ref
-nolink "false"
 reference "subsec:Automatical-Locking-Property"
 
 \end_inset
@@ -29701,7 +29675,6 @@ git

[LyX/master] Update fr.po

2022-12-26 Thread jpc 
commit 548ce5f87bfe6da5c6e43de8eee5b4277731a1da
Author: jpc 
Date:   Mon Dec 26 17:11:34 2022 +0100

 Update fr.po
---
 po/fr.gmo |  Bin 637897 -> 638374 bytes
 po/fr.po  |  179 ++--
 2 files changed, 101 insertions(+), 78 deletions(-)

diff --git a/po/fr.gmo b/po/fr.gmo
index bcda28f..dd97761 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 2740956..6931d3b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -362,8 +362,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.4\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2022-12-23 09:24+0100\n"
-"PO-Revision-Date: 2022-12-23 09:26+0100\n"
+"POT-Creation-Date: 2022-12-26 17:05+0100\n"
+"PO-Revision-Date: 2022-12-26 17:11+0100\n"
 "Last-Translator: Jean-Pierre Chrétien \n"
 "Language-Team: lyxfr\n"
 "Language: fr\n"
@@ -1043,7 +1043,7 @@ msgid "Remove the selected branch"
 msgstr "Enlever la branche sélectionnée"
 
 #: src/frontends/qt/ui/BranchesUi.ui:74 src/frontends/qt/ui/IndicesUi.ui:165
-#: src/Buffer.cpp:4758 src/Buffer.cpp:4771
+#: src/Buffer.cpp:4757 src/Buffer.cpp:4770
 msgid ""
 msgstr ""
 
@@ -1117,7 +1117,7 @@ msgid "Add A"
 msgstr "Ajouter "
 
 #: src/frontends/qt/ui/BranchesUnknownUi.ui:58 src/Buffer.cpp:1476
-#: src/Buffer.cpp:4732 src/Buffer.cpp:4842 src/LyXVC.cpp:114 src/LyXVC.cpp:310
+#: src/Buffer.cpp:4731 src/Buffer.cpp:4841 src/LyXVC.cpp:114 src/LyXVC.cpp:310
 #: src/buffer_funcs.cpp:56 src/frontends/qt/GuiBranches.cpp:226
 #: src/frontends/qt/GuiClipboard.cpp:252 src/frontends/qt/GuiDocument.cpp:2894
 #: src/frontends/qt/GuiParagraph.cpp:177 src/frontends/qt/GuiPrefs.cpp:3417
@@ -2692,8 +2692,12 @@ msgid "Link type"
 msgstr "Type de lien"
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:133
-msgid "Link to the web or to every other target"
-msgstr "Lien vers le web ou vers chaque autre cible"
+msgid ""
+"Link to the web or any other target with an \"authority\" component (i."
+"e., :// in the URI)"
+msgstr ""
+"Lien vers le web ou n’importe quelle autre cible avec un composant impératif "
+"(i.e., :// dans l'URI)"
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:136
 msgid ""
@@ -2715,6 +2719,18 @@ msgstr "Lien vers un fichier"
 msgid "Fi"
 msgstr "Fic"
 
+#: src/frontends/qt/ui/HyperlinkUi.ui:166
+msgid ""
+"Link to an arbitrary URI scheme not matched by the other three types (to be "
+"fully spelled out in the Target field above)"
+msgstr ""
+"Lien vers un URI quelconque qui ne correspond pas à l'un des trois autres "
+"types (à expliciter en détail dans le champ « Cible » ci-dessus)"
+
+#: src/frontends/qt/ui/HyperlinkUi.ui:169
+msgid "[[Link Type]]"
+msgstr ""
+
 #: src/frontends/qt/ui/IncludeUi.ui:35
 msgid "I Type:"
 msgstr "Type de  inclus :"
@@ -27847,11 +27863,11 @@ msgstr "il manque \\begin_header"
 msgid "\\begin_document is missing"
 msgstr "il manque \\begin_document"
 
-#: src/Buffer.cpp:1043 src/Buffer.cpp:3044
+#: src/Buffer.cpp:1043 src/Buffer.cpp:3043
 msgid "Changes not shown in LaTeX output"
 msgstr "Modifications non affichées dans la sortie"
 
-#: src/Buffer.cpp:1044 src/Buffer.cpp:3045
+#: src/Buffer.cpp:1044 src/Buffer.cpp:3044
 msgid ""
 "Changes will not be highlighted in LaTeX output, because xcolor and ulem are "
 "not installed.\n"
@@ -27941,7 +27957,7 @@ msgstr ""
 "%1$s vient d'une version plus récente de LyX, et le script lyx2lyx n'a pas "
 "réussi à le convertir."
 
-#: src/Buffer.cpp:1463 src/Buffer.cpp:4742 src/Buffer.cpp:4851
+#: src/Buffer.cpp:1463 src/Buffer.cpp:4741 src/Buffer.cpp:4850
 msgid "File is read-only"
 msgstr "Fichier en lecture seule"
 
@@ -28168,53 +28184,53 @@ msgstr ""
 "LaTeX car elles requièrent des paquetages de langues en conflit.\n"
 "%1$s%2$s"
 
-#: src/Buffer.cpp:2352
+#: src/Buffer.cpp:2351
 msgid "Running chktex..."
 msgstr "Exécution de chktex..."
 
-#: src/Buffer.cpp:2371
+#: src/Buffer.cpp:2370
 msgid "chktex failure"
 msgstr "échec de chktex"
 
-#: src/Buffer.cpp:2372
+#: src/Buffer.cpp:2371
 msgid "Could not run chktex successfully."
 msgstr "Chktex ne s'est pas exécuté correctement."
 
-#: src/Buffer.cpp:2747
+#: src/Buffer.cpp:2746
 #, c-format
 msgid "Don't know how to export to format: %1$s"
 msgstr "Pas d'information pour exporter au format : %1$s"
 
-#: src/Buffer.cpp:2851
+#: src/Buffer.cpp:2850
 #, c-format
 msgid "Error exporting to format: %1$s."
 msgstr "Erreur à l'exportation au format %1$s."
 
-#: src/Buffer.cpp:2860
+#: src/Buffer.cpp:2859
 msgid "Error generating literate programming code."
 msgstr "Erreur lors de la génération du code de programmation littéraire."
 
-#: src/Buffer.cpp:2936
+#: src/Buffer.cpp:2935
 #, c-format
 msgid "Branch \"%1$s\" does not exist."
 msgstr "Branche « %1$s » inexistante."
 
-#: src/Buffer.cpp:2969
+#: src/Buffer.cpp:2968
 #, c-format
 msgid "Branch \"%1$s\" already exists."
 msgstr "La branche « %1$s » existe déjà."
 
-#: src/Buffer.cpp:3026
+#: src/Buffer.cpp:3025
 msgid "Error viewing the output file."

[LyX/master] de.po

2022-12-26 Thread Juergen Spitzmueller 
commit ca3d97603ab2ff20e29967bea8924e246845042f
Author: Juergen Spitzmueller 
Date:   Mon Dec 26 13:51:19 2022 +0100

de.po
---
 po/de.po |  193 ++---
 1 files changed, 108 insertions(+), 85 deletions(-)

diff --git a/po/de.po b/po/de.po
index 3c9c594..efd4266 100644
--- a/po/de.po
+++ b/po/de.po
@@ -94,8 +94,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.4git\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2022-12-23 10:25+0100\n"
-"PO-Revision-Date: 2022-12-23 10:31+0100\n"
+"POT-Creation-Date: 2022-12-26 13:44+0100\n"
+"PO-Revision-Date: 2022-12-26 13:50+0100\n"
 "Last-Translator: Jürgen Spitzmüller \n"
 "Language-Team: Deutsch \n"
 "Language: de\n"
@@ -773,7 +773,7 @@ msgid "Remove the selected branch"
 msgstr "Den ausgewählten Zweig entfernen"
 
 #: src/frontends/qt/ui/BranchesUi.ui:74 src/frontends/qt/ui/IndicesUi.ui:165
-#: src/Buffer.cpp:4758 src/Buffer.cpp:4771
+#: src/Buffer.cpp:4757 src/Buffer.cpp:4770
 msgid ""
 msgstr ""
 
@@ -848,7 +848,7 @@ msgid "Add A"
 msgstr "A hinzufügen"
 
 #: src/frontends/qt/ui/BranchesUnknownUi.ui:58 src/Buffer.cpp:1476
-#: src/Buffer.cpp:4732 src/Buffer.cpp:4842 src/LyXVC.cpp:114 src/LyXVC.cpp:310
+#: src/Buffer.cpp:4731 src/Buffer.cpp:4841 src/LyXVC.cpp:114 src/LyXVC.cpp:310
 #: src/buffer_funcs.cpp:56 src/frontends/qt/GuiBranches.cpp:226
 #: src/frontends/qt/GuiClipboard.cpp:252 src/frontends/qt/GuiDocument.cpp:2894
 #: src/frontends/qt/GuiParagraph.cpp:177 src/frontends/qt/GuiPrefs.cpp:3417
@@ -2425,8 +2425,12 @@ msgid "Link type"
 msgstr "Linktyp"
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:133
-msgid "Link to the web or to every other target"
-msgstr "Link zum Internet oder jedem anderen Ziel"
+msgid ""
+"Link to the web or any other target with an \"authority\" component (i."
+"e., :// in the URI)"
+msgstr ""
+"Link zu Internetadresse oder irgend einem anderen Ziel mit einer "
+"\"Authority\"-Komponente (d.h. :// in der Adresse)"
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:136
 msgid ""
@@ -2448,6 +2452,18 @@ msgstr "Link zu einer Datei"
 msgid "Fi"
 msgstr ""
 
+#: src/frontends/qt/ui/HyperlinkUi.ui:166
+msgid ""
+"Link to an arbitrary URI scheme not matched by the other three types (to be "
+"fully spelled out in the Target field above)"
+msgstr ""
+"Link zu einem beliebigen URI-Schema, das von den anderen drei Typen nicht "
+"erfasst wird (muss im Feld 'Ziel' oben voll ausformuliert werden)"
+
+#: src/frontends/qt/ui/HyperlinkUi.ui:169
+msgid "[[Link Type]]"
+msgstr ""
+
 #: src/frontends/qt/ui/IncludeUi.ui:35
 msgid "I Type:"
 msgstr " der Einbindung:"
@@ -27336,18 +27352,14 @@ msgid "Multilingual Typesetting with platex"
 msgstr "Mehrsprachige Dokumente mit platex"
 
 #: lib/examples/Articles:0
-msgid "Springers Global Journal Template (V. 3)"
-msgstr "Springers globale Vorlage für Zeitschriften (V. 3)"
+msgid "Hebrew Article (KOMA-Script)"
+msgstr "Hebräischer Aufsatz (KOMA-Script)"
 
 #: lib/examples/Articles:0
 msgid "IEEE Transactions Conference"
 msgstr "IEEE Transactions Conference"
 
 #: lib/examples/Articles:0
-msgid "Hebrew Article (KOMA-Script)"
-msgstr "Hebräischer Aufsatz (KOMA-Script)"
-
-#: lib/examples/Articles:0
 msgid "IEEE Transactions Journal"
 msgstr "IEEE Transactions Journal"
 
@@ -27356,6 +27368,10 @@ msgid "Mathematical Monthly"
 msgstr "Mathematical Monthly"
 
 #: lib/examples/Articles:0
+msgid "Springers Global Journal Template (V. 3)"
+msgstr "Springers globale Vorlage für Zeitschriften (V. 3)"
+
+#: lib/examples/Articles:0
 msgid "00 Main File"
 msgstr "00 Hauptdatei"
 
@@ -27540,11 +27556,11 @@ msgstr "\\begin_header fehlt"
 msgid "\\begin_document is missing"
 msgstr "\\begin_document fehlt"
 
-#: src/Buffer.cpp:1043 src/Buffer.cpp:3044
+#: src/Buffer.cpp:1043 src/Buffer.cpp:3043
 msgid "Changes not shown in LaTeX output"
 msgstr "Änderungen nicht in der LaTeX-Ausgabe angezeigt"
 
-#: src/Buffer.cpp:1044 src/Buffer.cpp:3045
+#: src/Buffer.cpp:1044 src/Buffer.cpp:3044
 msgid ""
 "Changes will not be highlighted in LaTeX output, because xcolor and ulem are "
 "not installed.\n"
@@ -27633,7 +27649,7 @@ msgstr ""
 "%1$s stammt von einer neueren LyX-Version, aber das lyx2lyx-Skript konnte "
 "das Dokument nicht konvertieren."
 
-#: src/Buffer.cpp:1463 src/Buffer.cpp:4742 src/Buffer.cpp:4851
+#: src/Buffer.cpp:1463 src/Buffer.cpp:4741 src/Buffer.cpp:4850
 msgid "File is read-only"
 msgstr "Datei ist schreibgeschützt"
 
@@ -27858,53 +27874,53 @@ msgstr ""
 "kombinieren, weil sie inkompatible Sprachpakete erfordern:\n"
 "%1$s%2$s"
 
-#: src/Buffer.cpp:2352
+#: src/Buffer.cpp:2351
 msgid "Running chktex..."
 msgstr "ChkTeX wird ausgeführt..."
 
-#: src/Buffer.cpp:2371
+#: src/Buffer.cpp:2370
 msgid "chktex failure"
 msgstr "ChkTeX ist fehlgeschlagen"
 
-#: src/Buffer.cpp:2372
+#: src/Buffer.cpp:2371
 msgid "Could not run chktex successfully."
 msgstr "Chktex konnte nicht erfolgreich ausgeführt werden."
 
-#: src/Buffer.cpp:2747
+#:

[LyX/master] Minor doc updates

2022-12-26 Thread Juergen Spitzmueller 
commit 68146184a800a222a68eea9e3e4e7eea14819b77
Author: Juergen Spitzmueller 
Date:   Mon Dec 26 13:43:11 2022 +0100

Minor doc updates
---
 lib/doc/UserGuide.lyx|   21 +++--
 lib/doc/de/UserGuide.lyx |   22 --
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index d6b6802..30698e1 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -33870,7 +33870,19 @@ literal "false"
 \end_inset
 
 ,
- or a link to a file.
+ 
+\change_deleted -712698321 1672058176
+or 
+\change_unchanged
+a link to a file
+\change_inserted -712698321 1672058271
+ or any other valid URI (such as 
+\family sans
+tel:
+\family default
+)
+\change_unchanged
+.
  The option 
 \family sans
 Literal
@@ -33896,7 +33908,12 @@ run:
 \begin_inset Quotes erd
 \end_inset
 
- to the link target.
+ to the link target
+\change_inserted -712698321 1672058343
+,
+ but note that most PDF viewers disable such links for security reasons
+\change_unchanged
+.
 \end_layout
 
 \begin_layout Standard
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 6094887..bc567cb 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -9917,10 +9917,12 @@ Unformatiert
 \end_layout
 
 \begin_layout Verbatim
+
 Dies ist Unformatiert.
 \end_layout
 
 \begin_layout Verbatim
+
 Die folgenden 2 Zeilen sind leer:
 \end_layout
 
@@ -9933,6 +9935,7 @@ Die folgenden 2 Zeilen sind leer:
 \end_layout
 
 \begin_layout Verbatim
+
 Fast alles ist in Unformatiert erlaubt:"%&$§#~'`
 \backslash
 }][{|
@@ -9958,6 +9961,7 @@ Unformatiert
 \end_layout
 
 \begin_layout Verbatim*
+
 Dies ist Unformatiert*.
 \end_layout
 
@@ -31644,7 +31648,18 @@ literal "false"
 
 \end_inset
 
- oder einen Link auf eine Datei handelt.
+,
+ einen Link auf eine Datei oder irgend ein anderer zulässiger 
+\emph on
+\lang english
+Uniform Resource Identifier
+\emph default
+\lang ngerman
+ (URI) wie etwa 
+\family sans
+tel:
+\family default
+ handelt.
  Die Option 
 \family sans
 Unformatiert
@@ -31670,7 +31685,8 @@ run:
 
 \family default
  einfügen,
- wird eine Anwendung gestartet:
+ wird das System angewiesen,
+ eine Anwendung zu starten:
  
 \begin_inset CommandInset href
 LatexCommand href
@@ -31682,6 +31698,8 @@ literal "false"
 \end_inset
 
 .
+ Beachten Sie aber,
+ dass die meisten PDF-Betrachter solche Links aus Sicherheitsgründen 
deaktivieren.
 \end_layout
 
 \begin_layout Standard
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Associate "run:" link types with "Other"

2022-12-26 Thread Juergen Spitzmueller 
commit 0c56f60535230ffd2033efff0a0bb56058845e4e
Author: Juergen Spitzmueller 
Date:   Mon Dec 26 13:19:52 2022 +0100

Associate "run:" link types with "Other"

 lib/doc/Math.lyx  |1 +
 lib/doc/de/Math.lyx   |1 +
 lib/doc/de/UserGuide.lyx  |1 +
 lib/doc/es/Math.lyx   |1 +
 lib/doc/fr/Math.lyx   | 3036 +++--
 lib/doc/ja/Math.lyx   |1 +
 lib/doc/ru/Math.lyx   |  201 ++--
 lib/lyx2lyx/lyx_2_4.py|   41 +-
 src/insets/InsetHyperlink.cpp |3 +-
 9 files changed, 1820 insertions(+), 1466 deletions(-)
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Update sk.po

2022-12-26 Thread Kornel Benko 
commit 7b5c410fbe6a72ee08a02caa299b727b22076e2b
Author: Kornel Benko 
Date:   Mon Dec 26 11:34:26 2022 +0100

Update sk.po
---
 po/sk.po |   21 +
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/po/sk.po b/po/sk.po
index 82c2850..224101c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.4\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2022-12-26 10:33+0100\n"
-"PO-Revision-Date: 2022-12-26 09:56+\n"
+"POT-Creation-Date: 2022-12-26 11:28+0100\n"
+"PO-Revision-Date: 2022-12-26 10:31+\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -2324,8 +2324,12 @@ msgid "Link type"
 msgstr "Typ odkazu"
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:133
-msgid "Link to the web"
-msgstr "Odkaz na web"
+msgid ""
+"Link to the web or any other target with an \"authority\" component (i."
+"e., :// in the URI)"
+msgstr ""
+"Odkaz na web alebo iný ľubovoľný cieľ obsahujúci protokol (čiže má '://' v "
+"URI)"
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:136
 msgid ""
@@ -2349,10 +2353,11 @@ msgstr "úbor"
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:166
 msgid ""
-"Link to an arbitrary other URI scheme (to be specified in the Target field "
-"above)"
+"Link to an arbitrary URI scheme not matched by the other three types (to be "
+"fully spelled out in the Target field above)"
 msgstr ""
-"Odkaz na ľubovoľnú URI schému (musí byť špecifikovaný v cieľovom poli hore)"
+"Odkaz na ľubovoľnú URI schému ktorý nepasuje do tých iných troch typov (musí "
+"byť špecifikovaný v cieľovom poli hore)"
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:169
 msgid "[[Link Type]]"
@@ -35932,7 +35937,7 @@ msgid "file"
 msgstr "súbor"
 
 #: src/insets/InsetHyperlink.cpp:284
-msgid "other"
+msgid "other[[Hyperlink Type]]"
 msgstr "iný"
 
 #: src/insets/InsetHyperlink.cpp:275
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Disambiguate string

2022-12-26 Thread Juergen Spitzmueller 
commit be25181d87007d8abeee59926347f2475b5a22a9
Author: Juergen Spitzmueller 
Date:   Mon Dec 26 11:24:29 2022 +0100

Disambiguate string
---
 src/insets/InsetHyperlink.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 4c1b435..a3759e9 100644
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -281,7 +281,7 @@ docstring InsetHyperlink::toolTip(BufferView const & 
/*bv*/, int /*x*/, int /*y*
else if (type == "file:")
guitype = _("file");
else if (type == "other")
-   guitype = _("other");
+   guitype = _("other[[Hyperlink Type]]");
return bformat(_("Hyperlink (%1$s) to %2$s"), guitype, url);
 }
 
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Update sk.po

2022-12-26 Thread Kornel Benko 
commit 1c10656e3d86ffd1aa162136b6fc89738d64c814
Author: Kornel Benko 
Date:   Mon Dec 26 10:58:39 2022 +0100

Update sk.po
---
 po/sk.po |   27 +--
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/po/sk.po b/po/sk.po
index ddac220..82c2850 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.4\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2022-12-23 14:04+0100\n"
-"PO-Revision-Date: 2022-12-23 13:19+\n"
+"POT-Creation-Date: 2022-12-26 10:33+0100\n"
+"PO-Revision-Date: 2022-12-26 09:56+\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -2324,8 +2324,8 @@ msgid "Link type"
 msgstr "Typ odkazu"
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:133
-msgid "Link to the web or to every other target"
-msgstr "Odkaz na web alebo každý iný ciel"
+msgid "Link to the web"
+msgstr "Odkaz na web"
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:136
 msgid ""
@@ -2337,7 +2337,7 @@ msgstr "Odkaz na e-mailovú adresu"
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:149
 msgid "E"
-msgstr "E-ma"
+msgstr ""
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:156
 msgid "Link to a file"
@@ -2345,7 +2345,18 @@ msgstr "Odkaz na súbor"
 
 #: src/frontends/qt/ui/HyperlinkUi.ui:159
 msgid "Fi"
-msgstr "Súbo"
+msgstr "úbor"
+
+#: src/frontends/qt/ui/HyperlinkUi.ui:166
+msgid ""
+"Link to an arbitrary other URI scheme (to be specified in the Target field "
+"above)"
+msgstr ""
+"Odkaz na ľubovoľnú URI schému (musí byť špecifikovaný v cieľovom poli hore)"
+
+#: src/frontends/qt/ui/HyperlinkUi.ui:169
+msgid "[[Link Type]]"
+msgstr "ý"
 
 #: src/frontends/qt/ui/IncludeUi.ui:35
 msgid "I Type:"
@@ -35920,6 +35931,10 @@ msgstr "e-mail"
 msgid "file"
 msgstr "súbor"
 
+#: src/insets/InsetHyperlink.cpp:284
+msgid "other"
+msgstr "iný"
+
 #: src/insets/InsetHyperlink.cpp:275
 #, c-format
 msgid "Hyperlink (%1$s) to %2$s"
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Try to be more precise in the hyperlink type tooltips

2022-12-26 Thread Juergen Spitzmueller 
commit 14d74c9578319a00ab04fc402031b61c5272545c
Author: Juergen Spitzmueller 
Date:   Mon Dec 26 10:46:54 2022 +0100

Try to be more precise in the hyperlink type tooltips
---
 src/frontends/qt/ui/HyperlinkUi.ui |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/frontends/qt/ui/HyperlinkUi.ui 
b/src/frontends/qt/ui/HyperlinkUi.ui
index ab90a46..4a33789 100644
--- a/src/frontends/qt/ui/HyperlinkUi.ui
+++ b/src/frontends/qt/ui/HyperlinkUi.ui
@@ -6,7 +6,7 @@

 0
 0
-319
+402
 226

   
@@ -130,7 +130,7 @@
   

 
- Link to the web
+ Link to the web or any other target with an 
authority component (i.e., :// in the URI)
 
 
  Web
@@ -163,7 +163,7 @@
   

 
- Link to an arbitrary other URI scheme (to be specified in the 
Target field above)
+ Link to an arbitrary URI scheme not matched by the other 
three types (to be fully spelled out in the Target field above)
 
 
  Other[[Link Type]]
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] tex2lyx: support "Other" type

2022-12-26 Thread Juergen Spitzmueller 
commit d3b59050072669b49a64c28ca15d0b87d19a8d0c
Author: Juergen Spitzmueller 
Date:   Mon Dec 26 10:40:39 2022 +0100

tex2lyx: support "Other" type
---
 src/tex2lyx/text.cpp |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index b4afeee..6e58fba 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -4454,6 +4454,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, 
bool outer,
type = target.substr(0, i + 1);
if (type == "mailto:; || type == "file:")
target = target.substr(i + 1);
+   else if (target.find("://") == string::npos)
+   type = "other";
// handle the case that name is equal to 
target, except of "http(s)://"
else if (target.substr(i + 3) == name && (type 
== "http:" || type == "https:"))
target = name;
@@ -4462,7 +4464,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, 
bool outer,
if (name != target)
os << "name \"" << name << "\"\n";
os << "target \"" << target << "\"\n";
-   if (type == "mailto:; || type == "file:")
+   if (type == "mailto:; || type == "file:" || type == 
"other")
os << "type \"" << type << "\"\n";
os << "literal " << lit << "\n";
end_inset(os);
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] GuiHyperlink: some minor fixes

2022-12-26 Thread Juergen Spitzmueller 
commit 5f8e41dc9bfe4daf47796fe66c24c8fdce25f043
Author: Juergen Spitzmueller 
Date:   Mon Dec 26 10:13:51 2022 +0100

GuiHyperlink: some minor fixes

* disambiguate "Other" label
* Add accelerator
* Add tooltip to "Other" widget
* Amend tooltip of "Web" widget (since "other" now seems to have taken
part of its function)
---
 src/frontends/qt/ui/HyperlinkUi.ui |9 ++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/frontends/qt/ui/HyperlinkUi.ui 
b/src/frontends/qt/ui/HyperlinkUi.ui
index 9f19721..ab90a46 100644
--- a/src/frontends/qt/ui/HyperlinkUi.ui
+++ b/src/frontends/qt/ui/HyperlinkUi.ui
@@ -6,7 +6,7 @@

 0
 0
-306
+319
 226

   
@@ -130,7 +130,7 @@
   

 
- Link to the web or to every other target
+ Link to the web
 
 
  Web
@@ -162,8 +162,11 @@
   
   

+
+ Link to an arbitrary other URI scheme (to be specified in the 
Target field above)
+
 
- Other
+ Other[[Link Type]]
 

   
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs