anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

#178 added support for VersePosition.Single

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-07-14 13:28:10 +04:30
parent dfef566e01
commit 78f58a631f
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GanjooRazor/wwwroot/css/p6.css
View File

@ -301,7 +301,7 @@ div.spacer, .item, .b2 {
clear: both;
}
div.n {
div.n, div.l {
clear: left;
}

20
RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-MySqlImports.cs
View File

@ -835,7 +835,10 @@ namespace RMuseum.Services.Implementation
poemtext = poemtext.Replace("<div class=\"b\">", "b");
poemtext = poemtext.Replace("<div class=\"m1\">", "m");
poemtext = poemtext.Replace("<div class=\"m2\">", "n");
poemtext = poemtext.Replace("<div class=\"n\">", "");
poemtext = poemtext.Replace("<div class=\"n\"><p>", "s");
poemtext = poemtext.Replace("<div class=\"n\">", "s");
poemtext = poemtext.Replace("<div class=\"l\"><p>", "l");
poemtext = poemtext.Replace("<div class=\"l\">", "l");
poemtext = poemtext.Replace("<p>", "p");
poemtext = poemtext.Replace("bmp", "b");
poemtext = poemtext.Replace("np", "n");
@ -849,13 +852,14 @@ namespace RMuseum.Services.Implementation
if (poemtext.Length > 0)
{
int idx = poemtext.IndexOfAny(new char[] { 'a', 'b', 'm', 'n', 'p' });
int idx = poemtext.IndexOfAny(new char[] { 'a', 'b', 'm', 'n', 'p', 's', 'l' });
bool preWasBand = false;
while (idx != -1)
{
GanjoorVerse verse = new GanjoorVerse();
verse.PoemId = poemId;
verse.VOrder = verses.Count + 1;
switch (poemtext[idx])
{
case 'p':
@ -877,8 +881,16 @@ namespace RMuseum.Services.Implementation
verse.VersePosition = VersePosition.CenteredVerse1;
preWasBand = true;
break;
case 's':
verse.VersePosition = VersePosition.Paragraph;
preWasBand = false;
break;
case 'l':
verse.VersePosition = VersePosition.Single;
preWasBand = false;
break;
}
int nextIdx = poemtext.IndexOfAny(new char[] { 'a', 'b', 'm', 'n', 'p' }, idx + 1);
int nextIdx = poemtext.IndexOfAny(new char[] { 'a', 'b', 'm', 'n', 'p', 's', 'l' }, idx + 1);
if (nextIdx == -1)
{
verse.Text = poemtext.Substring(idx + 1).Replace("یییییییییییییییییییی", "Adaptation du milieu").Replace("ببببببببب", "Empirique");
@ -888,6 +900,8 @@ namespace RMuseum.Services.Implementation
verse.Text = poemtext.Substring(idx + 1, nextIdx - idx - 1).Replace("یییییییییییییییییییی", "Adaptation du milieu").Replace("ببببببببب", "Empirique");
}
verse.Text = verse.Text.Trim();
verses.Add(verse);
idx = nextIdx;

10
RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs
View File

@ -785,18 +785,24 @@ namespace RMuseum.Services.Implementation
string[] lines = v.Text.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
string cssClass = v.VersePosition == VersePosition.Paragraph ? "n" : "l";
if (lines.Length != 0)
{
if (v.Text.Length / lines.Length < 150)
{
htmlText += $"<div class=\"n\"><p>{v.Text.Replace("\r\n", " ")}</p></div>{Environment.NewLine}";
htmlText += $"<div class=\"{cssClass}\"><p>{v.Text.Replace("\r\n", " ")}</p></div>{Environment.NewLine}";
}
else
{
foreach (string line in lines)
htmlText += $"<div class=\"n\"><p>{line}</p></div>{Environment.NewLine}";
htmlText += $"<div class=\"{cssClass}\"><p>{line}</p></div>{Environment.NewLine}";
}
}
else
{
htmlText += $"<div class=\"{cssClass}\"><p>{v.Text}</p></div>{Environment.NewLine}";//empty line!
}
}
}
return htmlText.Trim();