Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Added support for the rest of the alignment tags to format PAC

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1576 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-01-22 18:18:21 +00:00
parent f8029920db
commit 4edb239b69
1 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/Logic/SubtitleFormats/Pac.cs
View File

@ -34,6 +34,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
0x5d, // Ø 0x5d, // Ø
0x5e, // ÷ 0x5e, // ÷
0x5f, // - 0x5f, // -
0x2d, // –
0xE54f, // Ö 0xE54f, // Ö
0xE56f, // ö 0xE56f, // ö
0xe541, // Ä 0xe541, // Ä
@ -41,6 +42,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
0xe555, // Ü 0xe555, // Ü
0xe575, // ü 0xe575, // ü
0x81, // ß 0x81, // ß
0x82, // ²
0xe241, // Á 0xe241, // Á
0xe249, // Í 0xe249, // Í
0xe255, // Ú 0xe255, // Ú
@ -134,6 +136,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
"Ø", "Ø",
"÷", "÷",
"-", "-",
"–",
"Ö", "Ö",
"ö", "ö",
"Ä", "Ä",
@ -141,6 +144,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
"Ü", "Ü",
"ü", "ü",
"ß", "ß",
"²",
"Á", "Á",
"Í", "Í",
"Ú", "Ú",
@ -679,16 +683,27 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
GetCodePage(null, 0, 0); GetCodePage(null, 0, 0);
byte alignment = 2; // center byte alignment = 2; // center
byte verticalAlignment = 0x0a; // bottom
if (!p.Text.Contains(Environment.NewLine))
verticalAlignment = 0x0b;
string text = p.Text; string text = p.Text;
if (text.StartsWith("{\\an1}")) if (text.StartsWith("{\\an1}") || text.StartsWith("{\\an4}") || text.StartsWith("{\\an7}"))
{ {
alignment = 1; // left alignment = 1; // left
} }
else if (text.StartsWith("{\\an3}")) else if (text.StartsWith("{\\an3}") || text.StartsWith("{\\an6}") || text.StartsWith("{\\an9}"))
{ {
alignment = 0; // right alignment = 0; // right
} }
if (text.Length > 6 && text[0] == '{' && text[5] == '}') if (text.StartsWith("{\\an7}") || text.StartsWith("{\\an8}") || text.StartsWith("{\\an9}"))
{
verticalAlignment = 0; // top
}
else if (text.StartsWith("{\\an4}") || text.StartsWith("{\\an5}") || text.StartsWith("{\\an6}"))
{
verticalAlignment = 5; // center
}
if (text.Length >= 6 && text[0] == '{' && text[5] == '}')
text = text.Remove(0, 6); text = text.Remove(0, 6);
text = MakePacItalicsAndRemoveOtherTags(text); text = MakePacItalicsAndRemoveOtherTags(text);
@ -710,7 +725,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
var length = (UInt16)(textBuffer.Length + 4); var length = (UInt16)(textBuffer.Length + 4);
fs.Write(BitConverter.GetBytes(length), 0, 2); fs.Write(BitConverter.GetBytes(length), 0, 2);
fs.WriteByte(0x0a); // sometimes 0x0b? fs.WriteByte(verticalAlignment); // fs.WriteByte(0x0a); // sometimes 0x0b? - this seems to be vertical alignment - 0 to 11
fs.WriteByte(0xfe); fs.WriteByte(0xfe);
fs.WriteByte(alignment); //2=centered, 1=left aligned, 0=right aligned, 09=Fount2 (large font), fs.WriteByte(alignment); //2=centered, 1=left aligned, 0=right aligned, 09=Fount2 (large font),
//55=safe area override (too long line), 0A=Fount2 + centered, 06=centered + safe area override //55=safe area override (too long line), 0A=Fount2 + centered, 06=centered + safe area override
@ -887,6 +902,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
int feIndex = index; int feIndex = index;
int endDelimiter = 0x00; int endDelimiter = 0x00;
byte alignment = buffer[feIndex + 1]; byte alignment = buffer[feIndex + 1];
byte verticalAlignment = buffer[feIndex - 1];
var p = new Paragraph(); var p = new Paragraph();
int timeStartIndex = feIndex - 15; int timeStartIndex = feIndex - 15;
@ -984,10 +1000,32 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
if (_codePage == 3) if (_codePage == 3)
p.Text = Utilities.FixEnglishTextInRightToLeftLanguage(p.Text, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); p.Text = Utilities.FixEnglishTextInRightToLeftLanguage(p.Text, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
if (alignment == 1)
if (verticalAlignment < 5)
{
if (alignment == 1) // left
p.Text = "{\\an7}" + p.Text;
else if (alignment == 0) // right
p.Text = "{\\an9}" + p.Text;
else
p.Text = "{\\an8}" + p.Text;
}
else if (verticalAlignment < 9)
{
if (alignment == 1) // left
p.Text = "{\\an4}" + p.Text;
else if (alignment == 0) // right
p.Text = "{\\an6}" + p.Text;
else
p.Text = "{\\an5}" + p.Text;
}
else
{
if (alignment == 1) // left
p.Text = "{\\an1}" + p.Text; p.Text = "{\\an1}" + p.Text;
else if (alignment == 0) else if (alignment == 0) // right
p.Text = "{\\an3}" + p.Text; p.Text = "{\\an3}" + p.Text;
}
return p; return p;
} }