Pantyhose-X
/
LibreWeb-Browser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working bullet and number listing

master
Melroy van den Berg 2020-11-30 03:54:21 +01:00
parent 45583564b9
commit 23570fe9fb
8 changed files with 115 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/settings.json vendored
View File

@ -68,6 +68,9 @@
"qsizepolicy": "cpp",
"qgraphicsscene": "cpp",
"qstring": "cpp",
"qtglobal": "cpp"
"qtglobal": "cpp",
"cstring": "cpp",
"set": "cpp",
"valarray": "cpp"
}
}

3
src/mainwindow.cc
View File

@ -42,6 +42,9 @@ void MainWindow::setupParser()
cmark_node *root_node = parser->parseFile(filePath);
if (root_node != NULL) {
/*std::string html = parser->renderHTML(root_node);
printf("HTML %s\n\n", html.c_str());*/
// process AST, which can then be drawed on render/drawing area
m_renderArea.processDocument(root_node);
cmark_node_free(root_node);

4
src/md-parser.cc
View File

@ -38,13 +38,13 @@ cmark_node * Parser::parseFile(const std::string &filePath)
return NULL;
}
/*std::string const Parser::renderHTML(cmark_node *node)
std::string const Parser::renderHTML(cmark_node *node)
{
char *tmp = cmark_render_html(node, options, NULL);
std::string output = std::string(tmp);
free(tmp);
return output;
}*/
}
/**
* This is a function that will make enabling extensions easier

1
src/md-parser.h
View File

@ -13,6 +13,7 @@ class Parser
public:
Parser();
cmark_node * parseFile(const std::string &filePath);
std::string const renderHTML(cmark_node *node);
private:
int options;

113
src/render-area.cc
View File

@ -1,6 +1,8 @@
#include "render-area.h"
#include "node.h"
#include <algorithm>
#define PANGO_SCALE_XXX_LARGE ((double)1.98)
RenderArea::RenderArea()
@ -8,22 +10,25 @@ RenderArea::RenderArea()
currentY(0),
sceneMarginX(3),
sceneMarginY(3),
currentXList(sceneMarginX),
headingLevel(0),
listLevel(0),
wordSpacing(4), // spacing may depend on the font
heighestHigh(0),
paragraphHeightOffset(5),
headingHeightOffset(10),
listXOffset(15),
bulletPointDynamicOffset(0),
paragraphMargin(5),
headingMargin(10),
listMargin(5),
listXOffset(20),
isBold(false),
isItalic(false),
bulletListLevel(0),
orderedListLevel(0),
isOrderedList(false),
fontSize(10),
fontFamily("Ubuntu")
{
// Resize the drawing area to get scroll bars
set_size_request(800, 1000);
createPangoContexts();
}
@ -52,15 +57,12 @@ void RenderArea::createPangoContexts()
heading1Font.set_family(fontFamily);
heading1Font.set_size(fontSize * PANGO_SCALE * PANGO_SCALE_XXX_LARGE);
heading1Font.set_weight(Pango::WEIGHT_BOLD);
heading2Font.set_family(fontFamily);
heading2Font.set_size(fontSize * PANGO_SCALE * PANGO_SCALE_XX_LARGE);
heading2Font.set_weight(Pango::WEIGHT_BOLD);
heading3Font.set_family(fontFamily);
heading3Font.set_size(fontSize * PANGO_SCALE * PANGO_SCALE_X_LARGE);
heading3Font.set_weight(Pango::WEIGHT_BOLD);
heading4Font.set_family(fontFamily);
heading4Font.set_size(fontSize * PANGO_SCALE * PANGO_SCALE_LARGE);
heading4Font.set_weight(Pango::WEIGHT_BOLD);
@ -92,33 +94,58 @@ void RenderArea::processNode(cmark_node *node, cmark_event_type ev_type)
currentX = sceneMarginX;
currentY = sceneMarginY;
headingLevel = 0;
bulletListLevel = 0;
listLevel = 0;
heighestHigh = 0;
bulletPointDynamicOffset = 0;
}
break;
case CMARK_NODE_BLOCK_QUOTE:
break;
case CMARK_NODE_LIST:
case CMARK_NODE_LIST: {
cmark_list_type listType = node->as.list.list_type;
if (entering) {
if (listLevel == 0) {
currentY += listMargin; // First level Y margin
}
listLevel++;
} else {
if (listLevel == 1) {
currentY += listMargin; // First level Y margin
}
listLevel--;
if (listLevel < 0)
listLevel = 0;
}
if (listLevel == 0) {
// Reset X to be safe
currentX = sceneMarginX;
currentXList = currentX;
// Reset bullet/ordered levels
bulletListLevel = 0;
orderedListLevel = 0;
isOrderedList = false;
} else if (listLevel > 0) {
if (entering) {
currentX += listXOffset;
currentXList += listXOffset;
if (listType == cmark_list_type::CMARK_BULLET_LIST) {
bulletListLevel++;
} else if(listType == cmark_list_type::CMARK_ORDERED_LIST) {
orderedListLevel++;
// Create the counter (and reset to zero)
orderedListCounters[orderedListLevel] = 0;
}
} else {
currentX -= listXOffset;
currentXList -= listXOffset;
if (listType == cmark_list_type::CMARK_BULLET_LIST) {
bulletListLevel--;
} else if(listType == cmark_list_type::CMARK_ORDERED_LIST) {
orderedListLevel--;
}
}
isOrderedList = (orderedListLevel > 0) && (bulletListLevel <= 0);
}
}
break;
@ -127,14 +154,12 @@ void RenderArea::processNode(cmark_node *node, cmark_event_type ev_type)
currentY += heighestHigh;
// Reset heighest high (Y-axis)
heighestHigh = 0;
// Set new node item to the correct X position
currentX = currentXList;
// Add bullet before text items
if (entering) {
//const QRectF rec = drawBullet();
//bulletPointDynamicOffset = rec.width() + 2.0; // + offset
currentX += bulletPointDynamicOffset;
} else {
currentX -= bulletPointDynamicOffset;
if (entering && isOrderedList) {
// Increasement ordered list counter
orderedListCounters[orderedListLevel]++;
}
break;
@ -147,7 +172,7 @@ void RenderArea::processNode(cmark_node *node, cmark_event_type ev_type)
// Move to left again
currentX = sceneMarginX;
// New heading
currentY += heighestHigh + headingHeightOffset;
currentY += heighestHigh + headingMargin;
// Reset heighest high (Y-axis)
heighestHigh = 0;
@ -172,7 +197,7 @@ void RenderArea::processNode(cmark_node *node, cmark_event_type ev_type)
// Move to left again
currentX = sceneMarginX;
// New paragraph
currentY += heighestHigh + paragraphHeightOffset;
currentY += heighestHigh + paragraphMargin;
// Reset heighest high (Y-axis)
heighestHigh = 0;
@ -189,7 +214,19 @@ void RenderArea::processNode(cmark_node *node, cmark_event_type ev_type)
// https://gitlab.gnome.org/GNOME/pango/-/blob/master/pango/pango-markup.c#L515
// For some reason Pango::Layout:create objects doesn't show up in cairo content
auto layout = create_pango_layout(cmark_node_get_literal(node));
std::string text = cmark_node_get_literal(node);
if (bulletListLevel > 0) {
text.insert(0, "\u2022 ");
} else if(orderedListLevel > 0) {
std::string number;
if (orderedListLevel % 2 == 0) {
number = intToRoman(orderedListCounters[orderedListLevel]) + " ";
} else {
number = std::to_string(orderedListCounters[orderedListLevel]) + ". ";
}
text.insert(0, number);
}
auto layout = create_pango_layout(text);
if (headingLevel > 0) {
switch (headingLevel)
{
@ -223,18 +260,20 @@ void RenderArea::processNode(cmark_node *node, cmark_event_type ev_type)
layout->get_pixel_size(textWidth, textHeight);
// Add text to list
text textStruct;
text_struct textStruct;
textStruct.x = currentX;
textStruct.y = currentY;
textStruct.layout = layout;
textList.push_back(textStruct);
if (textHeight > heighestHigh)
if (textHeight > heighestHigh) {
heighestHigh = textHeight;
}
// Skip paragraph if listing is enabled,
// in all other cases increase x with text width
if (listLevel == 0)
currentX += textWidth;
currentX += textWidth;
/*if (listLevel == 0)
currentX += textWidth;*/
}
break;
@ -288,6 +327,20 @@ void RenderArea::processNode(cmark_node *node, cmark_event_type ev_type)
}
}
std::string const RenderArea::intToRoman(int num)
{
static const int values[] = {1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1 };
static const std::string numerals[] = {"M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I" };
std::string res;
for (int i = 0; i < 13; ++i) {
while (num >= values[i]) {
num -= values[i];
res += numerals[i];
}
}
return res;
}
// Overrided method of GTK DrawingArea
bool RenderArea::on_draw(const Cairo::RefPtr<Cairo::Context>& cr)
{
@ -304,7 +357,7 @@ bool RenderArea::on_draw(const Cairo::RefPtr<Cairo::Context>& cr)
// Set to black for text
cr->set_source_rgb(0.0, 0.0, 0.0);
std::list<text>::iterator it;
std::list<text_struct>::iterator it;
for(it = textList.begin(); it != textList.end(); ++it) {
auto text = (*it);
cr->move_to(text.x, text.y);

16
src/render-area.h
View File

@ -5,7 +5,7 @@
#include <pangomm/layout.h>
#include <cmark-gfm.h>
struct text {
struct text_struct {
int x;
int y;
Glib::RefPtr<Pango::Layout> layout;
@ -20,7 +20,7 @@ public:
void processDocument(cmark_node *root_node);
protected:
std::list<text> textList;
std::list<text_struct> textList;
// Override default signal handler:
bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr) override;
@ -30,16 +30,21 @@ private:
int currentY;
int sceneMarginX;
int sceneMarginY;
int currentXList;
int headingLevel;
int listLevel;
int wordSpacing;
int heighestHigh;
int paragraphHeightOffset;
int headingHeightOffset;
int paragraphMargin;
int headingMargin;
int listMargin;
int listXOffset;
int bulletPointDynamicOffset;
bool isBold;
bool isItalic;
int bulletListLevel;
int orderedListLevel;
bool isOrderedList;
std::map<int,int> orderedListCounters;
int fontSize;
std::string fontFamily;
@ -54,6 +59,7 @@ private:
void createPangoContexts();
void processNode(cmark_node *node, cmark_event_type ev_type);
std::string const intToRoman(int num);
};
#endif

2
suppressions.txt
View File

@ -1,3 +1,3 @@
missingIncludeSystem
missingInclude:lib/*
unusedFunction:src/render-area.cc:292
unusedFunction:src/*

11
test.md
View File

@ -18,4 +18,13 @@ New line.
* list 3.2
* list 4
Normal text.
1. first
2. second
3. third
1. 1st
2. 2nd
3. grappig
4. he
4. four
Extra text.