UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finish merging (unsolved conflicts)

Browse Source
This commit is contained in:
Mino1289
2021-10-22 22:57:45 +02:00
parent 559d5d26dd
commit 18e7926500
1 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
apps/reader/tex_parser.cpp
View File

@@ -12,48 +12,7 @@ TexParser::TexParser(const char * text, const char * endOfText) :
}
Layout TexParser::getLayout() {
<<<<<<< HEAD
HorizontalLayout layout = HorizontalLayout::Builder();
const char * start = m_text;
while (m_text < m_endOfText) {
switch (*m_text)
{
case '\\':
if (start != m_text) {
layout.addOrMergeChildAtIndex(LayoutHelper::String(start, m_text - start), layout.numberOfChildren(), false);
}
m_text ++;
layout.addOrMergeChildAtIndex(popCommand(), layout.numberOfChildren(), false);
start = m_text;
break;
case ' ':
if (start != m_text) {
layout.addOrMergeChildAtIndex(LayoutHelper::String(start, m_text - start), layout.numberOfChildren(), false);
}
m_text++;
start = m_text;
break;
case '^':
if (start != m_text) {
layout.addOrMergeChildAtIndex(LayoutHelper::String(start, m_text - start), layout.numberOfChildren(), false);
}
m_text++;
layout.addOrMergeChildAtIndex(popCommand(), layout.numberOfChildren(),false);
start = m_text;
break;
default:
m_text++;
break;
}
}
if (start != m_text) {
layout.addOrMergeChildAtIndex(LayoutHelper::String(start, m_text - start), layout.numberOfChildren(), false);
}
=======
Layout layout = popText(0);
>>>>>>> 89c08acc7f59900fd12f2bdaacbae1827ccb73a1
if (m_hasError) {
return CodePointLayout::Builder(CodePoint(0xFFD));