anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-14 23:12:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
637ae9528f
lyx_mirror/src/texstream.cpp

359 lines
7.4 KiB
C++
Raw Normal View History

Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
/**
* \file texstream.cpp
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Enrico Forestieri
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "texstream.h"
Rationalise includes Modifying TexRow.h or texstream.h no longer triggers the recompilation of the complete source tree.
2016-06-19 02:39:38 +00:00
#include "TexRow.h"
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
#include "support/lstrings.h"
#include "support/unicode.h"
#include <algorithm>
#include <cerrno>
#include <cstdio>
#include <cstring>
#include <iconv.h>
#include <locale>
using namespace std;
using lyx::support::contains;
using lyx::support::split;
namespace lyx {
Add cursor<->row correspondance tracking for tables and subcaptions. Please use the new function otexstream.append(str, texrow) to append an odocstringstream with texrow information to the output when outputing to a string buffer (e.g. case of subcaptions).
2015-10-13 22:51:50 +00:00
Remove option to disable texrow I suspect that the gain was negligible, yet it made debugging and maintainance harder.
2016-09-04 02:02:47 +00:00
otexrowstream::otexrowstream(odocstream & os)
: os_(os), texrow_(make_unique<TexRow>())
Rationalise includes Modifying TexRow.h or texstream.h no longer triggers the recompilation of the complete source tree.
2016-06-19 02:39:38 +00:00
{}
otexrowstream::~otexrowstream() = default;
Amend 670efa8f Lost in rebasing.
2016-07-04 02:43:22 +00:00
unique_ptr<TexRow> otexrowstream::releaseTexRow()
Rationalise includes Modifying TexRow.h or texstream.h no longer triggers the recompilation of the complete source tree.
2016-06-19 02:39:38 +00:00
{
auto p = make_unique<TexRow>();
swap(texrow_, p);
Amend 670efa8f Lost in rebasing.
2016-07-04 02:43:22 +00:00
return p;
Rationalise includes Modifying TexRow.h or texstream.h no longer triggers the recompilation of the complete source tree.
2016-06-19 02:39:38 +00:00
}
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
void otexrowstream::put(char_type const & c)
{
os_.put(c);
if (c == '\n')
Rationalise includes Modifying TexRow.h or texstream.h no longer triggers the recompilation of the complete source tree.
2016-06-19 02:39:38 +00:00
texrow_->newline();
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
}
Add cursor<->row correspondance tracking for tables and subcaptions. Please use the new function otexstream.append(str, texrow) to append an odocstringstream with texrow information to the output when outputing to a string buffer (e.g. case of subcaptions).
2015-10-13 22:51:50 +00:00
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
void otexstream::put(char_type const & c)
{
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
bool isprotected = false;
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
if (protectspace_) {
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
if (!canbreakline_ && c == ' ') {
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
os() << "{}";
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
isprotected = true;
}
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
protectspace_ = false;
}
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
if (terminate_command_) {
Fix command termination before line breaks.
2016-12-12 16:00:20 +00:00
if ((c == ' ' || c == '\0' || c == '\n') && !isprotected)
// A space or line break follows. Terminate with brackets.
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
os() << "{}";
else if (c != '\\' && c != '{' && c != '}')
// Non-terminating character follows. Terminate with space.
os() << " ";
terminate_command_ = false;
}
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otexrowstream::put(c);
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
lastChar(c);
}
texstring and otexstringstream texstring is a pair of a docstring and a corresponding TexRow. The row count in the TexRow has to match the number of lines in the docstring. otexstringstream is an output string stream that can be used to create texstrings (i.e. it's an odocstringstream that records the TexRow information and let us extract a texstring from it). texstrings can be passed around and output to otexstream and otexrowstream, which produces an accurate TexRow information by concatenating TexRows.
2016-09-04 02:21:19 +00:00
size_t otexstringstream::length()
{
auto pos = ods_.tellp();
return (pos >= 0) ? size_t(pos) : 0;
}
TexString otexstringstream::release()
{
Always qualify calls to std::move() This quashes a new warning in clang++ 15, when std::move() (the one-parameter version) is used as simply move(). There is a strong recommendation from WG21 to avoid that. Details here: https://reviews.llvm.org/D119670 It might be that we should not use that many move()s. I am not competent to decide on that. I also used this occasion to get rid of a spacial casing for C++11 that does not seem necessary after all.
2022-10-21 12:11:36 +00:00
TexString ts(ods_.str(), std::move(texrow()));
TexRow for InPreamble This enables error reporting for the preamble, provided the preamble is written using the new InPreamble layouts. In the future, I find it preferable to deprecate the usual preamble in favour of InPreamble layouts rather than implementing error reporting for the usual preamble. This requires some improvements to code editing in the buffer view first (line breaking behaviour, syntax highlighting).
2016-09-25 10:38:53 +00:00
// reset this
texrow() = TexRow();
Gcc 4.6 compatibility :(
2016-09-22 23:42:57 +00:00
ods_.clear();
ods_.str(docstring());
texstring and otexstringstream texstring is a pair of a docstring and a corresponding TexRow. The row count in the TexRow has to match the number of lines in the docstring. otexstringstream is an output string stream that can be used to create texstrings (i.e. it's an odocstringstream that records the TexRow information and let us extract a texstring from it). texstrings can be passed around and output to otexstream and otexrowstream, which produces an accurate TexRow information by concatenating TexRows.
2016-09-04 02:21:19 +00:00
return ts;
}
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
BreakLine breakln;
SafeBreakLine safebreakln;
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
TerminateCommand termcmd;
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
otexstream & operator<<(otexstream & ots, BreakLine)
{
if (ots.canBreakLine()) {
Fix command termination before line breaks.
2016-12-12 16:00:20 +00:00
if (ots.terminateCommand())
ots << "{}";
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
ots.otexrowstream::put('\n');
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
ots.lastChar('\n');
}
ots.protectSpace(false);
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
ots.terminateCommand(false);
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
return ots;
}
otexstream & operator<<(otexstream & ots, SafeBreakLine)
{
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otexrowstream & otrs = ots;
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
if (ots.canBreakLine()) {
Fix command termination before line breaks.
2016-12-12 16:00:20 +00:00
if (ots.terminateCommand())
Thinko This needs to be a char_type, not char.
2016-12-18 12:13:19 +00:00
otrs << "{}";
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otrs << "%\n";
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
ots.lastChar('\n');
}
ots.protectSpace(false);
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
ots.terminateCommand(false);
return ots;
}
otexstream & operator<<(otexstream & ots, TerminateCommand)
{
ots.terminateCommand(true);
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
return ots;
}
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otexrowstream & operator<<(otexrowstream & ots, odocstream_manip pf)
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
{
ots.os() << pf;
if (pf == static_cast<odocstream_manip>(endl)) {
ots.texrow().newline();
}
return ots;
}
texstring and otexstringstream texstring is a pair of a docstring and a corresponding TexRow. The row count in the TexRow has to match the number of lines in the docstring. otexstringstream is an output string stream that can be used to create texstrings (i.e. it's an odocstringstream that records the TexRow information and let us extract a texstring from it). texstrings can be passed around and output to otexstream and otexrowstream, which produces an accurate TexRow information by concatenating TexRows.
2016-09-04 02:21:19 +00:00
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otexstream & operator<<(otexstream & ots, odocstream_manip pf)
{
otexrowstream & otrs = ots;
otrs << pf;
if (pf == static_cast<odocstream_manip>(endl)) {
ots.lastChar('\n');
}
return ots;
}
texstring and otexstringstream texstring is a pair of a docstring and a corresponding TexRow. The row count in the TexRow has to match the number of lines in the docstring. otexstringstream is an output string stream that can be used to create texstrings (i.e. it's an odocstringstream that records the TexRow information and let us extract a texstring from it). texstrings can be passed around and output to otexstream and otexrowstream, which produces an accurate TexRow information by concatenating TexRows.
2016-09-04 02:21:19 +00:00
otexrowstream & operator<<(otexrowstream & ots, TexString ts)
{
ts.validate();
Always qualify calls to std::move() This quashes a new warning in clang++ 15, when std::move() (the one-parameter version) is used as simply move(). There is a strong recommendation from WG21 to avoid that. Details here: https://reviews.llvm.org/D119670 It might be that we should not use that many move()s. I am not competent to decide on that. I also used this occasion to get rid of a spacial casing for C++11 that does not seem necessary after all.
2022-10-21 12:11:36 +00:00
ots.os() << std::move(ts.str);
ots.texrow().append(std::move(ts.texrow));
texstring and otexstringstream texstring is a pair of a docstring and a corresponding TexRow. The row count in the TexRow has to match the number of lines in the docstring. otexstringstream is an output string stream that can be used to create texstrings (i.e. it's an odocstringstream that records the TexRow information and let us extract a texstring from it). texstrings can be passed around and output to otexstream and otexrowstream, which produces an accurate TexRow information by concatenating TexRows.
2016-09-04 02:21:19 +00:00
return ots;
}
otexstream & operator<<(otexstream & ots, TexString ts)
{
size_t const len = ts.str.length();
// Check whether there is something to output
if (len == 0)
return ots;
otexrowstream & otrs = ots;
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
bool isprotected = false;
Thinko This needs to be a char_type, not char.
2016-12-18 12:13:19 +00:00
char_type const c = ts.str[0];
texstring and otexstringstream texstring is a pair of a docstring and a corresponding TexRow. The row count in the TexRow has to match the number of lines in the docstring. otexstringstream is an output string stream that can be used to create texstrings (i.e. it's an odocstringstream that records the TexRow information and let us extract a texstring from it). texstrings can be passed around and output to otexstream and otexrowstream, which produces an accurate TexRow information by concatenating TexRows.
2016-09-04 02:21:19 +00:00
if (ots.protectSpace()) {
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
if (!ots.canBreakLine() && c == ' ') {
texstring and otexstringstream texstring is a pair of a docstring and a corresponding TexRow. The row count in the TexRow has to match the number of lines in the docstring. otexstringstream is an output string stream that can be used to create texstrings (i.e. it's an odocstringstream that records the TexRow information and let us extract a texstring from it). texstrings can be passed around and output to otexstream and otexrowstream, which produces an accurate TexRow information by concatenating TexRows.
2016-09-04 02:21:19 +00:00
otrs << "{}";
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
isprotected = true;
}
texstring and otexstringstream texstring is a pair of a docstring and a corresponding TexRow. The row count in the TexRow has to match the number of lines in the docstring. otexstringstream is an output string stream that can be used to create texstrings (i.e. it's an odocstringstream that records the TexRow information and let us extract a texstring from it). texstrings can be passed around and output to otexstream and otexrowstream, which produces an accurate TexRow information by concatenating TexRows.
2016-09-04 02:21:19 +00:00
ots.protectSpace(false);
}
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
if (ots.terminateCommand()) {
Fix command termination before line breaks.
2016-12-12 16:00:20 +00:00
if ((c == ' ' || c == '\0' || c == '\n') && !isprotected)
// A space or line break follows. Terminate with brackets.
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
otrs << "{}";
else if (c != '\\' && c != '{' && c != '}')
// Non-terminating character follows. Terminate with space.
otrs << " ";
ots.terminateCommand(false);
}
texstring and otexstringstream texstring is a pair of a docstring and a corresponding TexRow. The row count in the TexRow has to match the number of lines in the docstring. otexstringstream is an output string stream that can be used to create texstrings (i.e. it's an odocstringstream that records the TexRow information and let us extract a texstring from it). texstrings can be passed around and output to otexstream and otexrowstream, which produces an accurate TexRow information by concatenating TexRows.
2016-09-04 02:21:19 +00:00
if (len > 1)
ots.canBreakLine(ts.str[len - 2] != '\n');
ots.lastChar(ts.str[len - 1]);
Always qualify calls to std::move() This quashes a new warning in clang++ 15, when std::move() (the one-parameter version) is used as simply move(). There is a strong recommendation from WG21 to avoid that. Details here: https://reviews.llvm.org/D119670 It might be that we should not use that many move()s. I am not competent to decide on that. I also used this occasion to get rid of a spacial casing for C++11 that does not seem necessary after all.
2022-10-21 12:11:36 +00:00
otrs << std::move(ts);
texstring and otexstringstream texstring is a pair of a docstring and a corresponding TexRow. The row count in the TexRow has to match the number of lines in the docstring. otexstringstream is an output string stream that can be used to create texstrings (i.e. it's an odocstringstream that records the TexRow information and let us extract a texstring from it). texstrings can be passed around and output to otexstream and otexrowstream, which produces an accurate TexRow information by concatenating TexRows.
2016-09-04 02:21:19 +00:00
return ots;
}
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otexrowstream & operator<<(otexrowstream & ots, docstring const & s)
{
ots.os() << s;
ots.texrow().newlines(count(s.begin(), s.end(), '\n'));
return ots;
}
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
otexstream & operator<<(otexstream & ots, docstring const & s)
{
size_t const len = s.length();
// Check whether there's something to output
if (len == 0)
return ots;
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otexrowstream & otrs = ots;
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
bool isprotected = false;
Thinko This needs to be a char_type, not char.
2016-12-18 12:13:19 +00:00
char_type const c = s[0];
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
if (ots.protectSpace()) {
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
if (!ots.canBreakLine() && c == ' ') {
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otrs << "{}";
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
isprotected = true;
}
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
ots.protectSpace(false);
}
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
if (ots.terminateCommand()) {
Fix command termination before line breaks.
2016-12-12 16:00:20 +00:00
if ((c == ' ' || c == '\0' || c == '\n') && !isprotected)
// A space or line break follows. Terminate with brackets.
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
otrs << "{}";
else if (c != '\\' && c != '{' && c != '}')
// Non-terminating character follows. Terminate with space.
otrs << " ";
ots.terminateCommand(false);
}
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
if (contains(s, 0xF0000)) {
// Some encoding changes for the underlying stream are embedded
// in the docstring. The encoding names to be used are enclosed
// between the code points 0xF0000 and 0xF0001, the first two
// characters of plane 15, which is a Private Use Area whose
// codepoints don't have any associated glyph.
docstring s1;
docstring s2 = split(s, s1, 0xF0000);
while (true) {
if (!s1.empty())
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otrs << s1;
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
if (s2.empty())
break;
docstring enc;
docstring const s3 = split(s2, enc, 0xF0001);
if (!contains(s2, 0xF0001))
s2 = split(enc, s1, 0xF0000);
else {
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otrs << setEncoding(to_ascii(enc));
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
s2 = split(s3, s1, 0xF0000);
}
}
} else
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otrs << s;
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
if (len > 1)
ots.canBreakLine(s[len - 2] != '\n');
ots.lastChar(s[len - 1]);
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
return ots;
}
otexrowstream & operator<<(otexrowstream & ots, string const & s)
{
ots << from_utf8(s);
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
return ots;
}
otexstream & operator<<(otexstream & ots, string const & s)
{
ots << from_utf8(s);
return ots;
}
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otexrowstream & operator<<(otexrowstream & ots, char const * s)
{
ots << from_utf8(s);
return ots;
}
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
otexstream & operator<<(otexstream & ots, char const * s)
{
ots << from_utf8(s);
return ots;
}
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
otexrowstream & operator<<(otexrowstream & ots, char c)
{
ots.put(c);
return ots;
}
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
otexstream & operator<<(otexstream & ots, char c)
{
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
ots.put(c);
return ots;
}
template <typename Type>
otexrowstream & operator<<(otexrowstream & ots, Type value)
{
ots.os() << value;
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
return ots;
}
Splitting otexstream into otexrowstream and otexstream. otexstream used to count lines to build a TexRow, and some other things. The new class otexrowstream has the line counting feature of the previous otexstream without other stuff. otexstream is now a subclass of otexrowstream that has the same features as before. This is preliminary work for extending the cursor<->row tracking to math.
2015-10-07 03:02:40 +00:00
template otexrowstream & operator<< <SetEnc>(otexrowstream & os, SetEnc);
template otexrowstream & operator<< <double>(otexrowstream &, double);
template otexrowstream & operator<< <int>(otexrowstream &, int);
template otexrowstream & operator<< <unsigned int>(otexrowstream &,
unsigned int);
template otexrowstream & operator<< <unsigned long>(otexrowstream &,
unsigned long);
Use HAVE_LONG_LONG_INT instead of LYX_USE_LONG_LONG It seems that the extra complication hurts more than it helps (for example with OpenBSD). Some adaptation will be needed for cmake.
2019-03-21 13:05:50 +00:00
#ifdef HAVE_LONG_LONG_INT
Mingw-w64 build fixes for long long On mingw-w64, long long (64bit wide) is larger than long (32bit wide). Therefore we need some more specializations for string, docstring, otextstream and << overloaded ostream functions. The configuration code is by me, the source code changes by Shankar Giri Venkita Giri (bug 10053).
2016-05-05 11:05:12 +00:00
template otexrowstream & operator<< <unsigned long long>(otexrowstream &,
unsigned long long);
#endif
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
template <typename Type>
otexstream & operator<<(otexstream & ots, Type value)
{
ots.os() << value;
ots.lastChar(0);
ots.protectSpace(false);
texstream: implement way to terminate a command depending on the context i.e., * space if non terminating char follows * {} if space follows * nothing if \, { or } follow
2016-12-12 14:55:28 +00:00
ots.terminateCommand(false);
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
return ots;
}
template otexstream & operator<< <SetEnc>(otexstream & os, SetEnc);
template otexstream & operator<< <double>(otexstream &, double);
template otexstream & operator<< <int>(otexstream &, int);
template otexstream & operator<< <unsigned int>(otexstream &, unsigned int);
template otexstream & operator<< <unsigned long>(otexstream &, unsigned long);
Use HAVE_LONG_LONG_INT instead of LYX_USE_LONG_LONG It seems that the extra complication hurts more than it helps (for example with OpenBSD). Some adaptation will be needed for cmake.
2019-03-21 13:05:50 +00:00
#ifdef HAVE_LONG_LONG_INT
Mingw-w64 build fixes for long long On mingw-w64, long long (64bit wide) is larger than long (32bit wide). Therefore we need some more specializations for string, docstring, otextstream and << overloaded ostream functions. The configuration code is by me, the source code changes by Shankar Giri Venkita Giri (bug 10053).
2016-05-05 11:05:12 +00:00
template otexstream & operator<< <unsigned long long>(otexstream &, unsigned long long);
#endif
Move otexstream out of support This resolves a dependency of src/support/docstream.cpp on src/TexRow.cpp, which is the wrong way round. This fixes the linking src/tests/check_ExternalTransforms with MSVC where the linker is not clever enough to detect that the whole otexstream class is unused.
2015-01-09 20:07:59 +00:00
Bulk cleanup/fix incorrect annotation at the end of namespaces. This commit does a bulk fix of incorrect annotations (comments) at the end of namespaces. The commit was generated by initially running clang-format, and then from the diff of the result extracting the hunks corresponding to fixes of namespace comments. The changes being applied and all the results have been manually reviewed. The source code successfully builds on macOS. Further details on the steps below, in case they're of interest to someone else in the future. 1. Checkout a fresh and up to date version of src/ git pull && git checkout -- src && git status src 2. Ensure there's a suitable .clang-format in place, i.e. with options to fix the comment at the end of namespaces, including: FixNamespaceComments: true SpacesBeforeTrailingComments: 1 and that clang-format is >= 5.0.0, by doing e.g.: clang-format -dump-config | grep Comments: clang-format --version 3. Apply clang-format to the source: clang-format -i $(find src -name "*.cpp" -or -name "*.h") 4. Create and filter out hunks related to fixing the namespace git diff -U0 src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace.patch 5. Filter out hunks corresponding to simple fixes into to a separate patch: pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n' \ -e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n' \ fix_namespace.patch > fix_namespace_simple.patch 6. Manually review the simple patch and then apply it, after first restoring the source. git checkout -- src patch -p1 < fix_namespace_simple.path 7. Manually review the (simple) changes and then stage the changes git diff src git add src 8. Again apply clang-format and filter out hunks related to any remaining fixes to the namespace, this time filter with more context. There will be fewer hunks as all the simple cases have already been handled: clang-format -i $(find src -name "*.cpp" -or -name "*.h") git diff src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace2.patch 9. Manually review/edit the resulting patch file to remove hunks for files which need to be dealt with manually, noting the file names and line numbers. Then restore files to as before applying clang-format and apply the patch: git checkout src patch -p1 < fix_namespace2.patch 10. Manually fix the files noted in the previous step. Stage files, review changes and commit.
2017-07-23 11:11:54 +00:00
} // namespace lyx
Reference in New Issue Copy Permalink