libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed XMLParser comment syntax to conform to XML standards (<!-- * -->)

Browse Source 
Changed STX version string to 0.2.

svn-id: r34807
This commit is contained in:
Vicent Marti 2008-10-15 13:34:18 +00:00
parent 9ad49cf983
commit 0cd4939110
13 changed files with 166 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
common/xmlparser.h
View File

@ -349,32 +349,35 @@ protected:
* or to change the commenting syntax.
*/
virtual bool skipComments() {
char endComment1 = 0, endComment2 = 0;
if (_char == '/') {
if (_char == '<') {
_char = _stream->readByte();
if (_char != '*') {
if (_char != '!') {
_stream->seek(-1, SEEK_CUR);
_char = '/';
_char = '<';
return false;
}
if (_stream->readByte() != '-' || _stream->readByte() != '-')
return parserError("Malformed comment syntax.");
_char = _stream->readByte();
bool dash = false;
while (_char) {
endComment1 = endComment2;
endComment2 = _char;
if (_char == '-') {
if (dash && _stream->readByte() == '>') {
_char = _stream->readByte();
return true;
}
dash = !dash;
}
_char = _stream->readByte();
if (endComment1 == '*' && endComment2 == '/')
break;
if (_char == 0)
return parserError("Comment has no closure.");
}
_char = _stream->readByte();
return true;
return parserError("Comment has no closure.");
}
return false;

2
gui/theme.h
View File

@ -35,7 +35,7 @@
#include "graphics/fontman.h"
#define THEME_VERSION 24
#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_THEME_V23"
#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.2"
namespace GUI {

BIN
gui/themes/scummclassic.zip
View File

Binary file not shown.

2
gui/themes/scummclassic/THEMERC
View File

@ -1 +1 @@
[SCUMMVM_THEME_V23:ScummVM Classic Theme:No Author]
[SCUMMVM_STX0.2:ScummVM Classic Theme:No Author]

48
gui/themes/scummclassic/classic_gfx.stx
View File

@ -1,27 +1,27 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
*
*/
<!-- ScummVM - Graphic Adventure Engine
-
- ScummVM is the legal property of its developers, whose names
- are too numerous to list here. Please refer to the COPYRIGHT
- file distributed with this source distribution.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- $URL$
- $Id$
-
-->
<render_info>
<palette>

48
gui/themes/scummclassic/classic_layout.stx
View File

@ -1,27 +1,27 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
*
*/
<!-- ScummVM - Graphic Adventure Engine
-
- ScummVM is the legal property of its developers, whose names
- are too numerous to list here. Please refer to the COPYRIGHT
- file distributed with this source distribution.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- $URL$
- $Id$
-
-->
<layout_info resolution = '-320xY, -256x240'>
<globals>

48
gui/themes/scummclassic/classic_layout_320.stx
View File

@ -1,27 +1,27 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
*
*/
<!-- ScummVM - Graphic Adventure Engine
-
- ScummVM is the legal property of its developers, whose names
- are too numerous to list here. Please refer to the COPYRIGHT
- file distributed with this source distribution.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- $URL$
- $Id$
-
-->
<layout_info resolution = "320xY, 256x240">
<globals>

BIN
gui/themes/scummmodern.zip
View File

Binary file not shown.

2
gui/themes/scummmodern/THEMERC
View File

@ -1 +1 @@
[SCUMMVM_THEME_V23:ScummVM Modern Theme:No Author]
[SCUMMVM_STX0.2:ScummVM Modern Theme:No Author]

48
gui/themes/scummmodern/scummodern_gfx.stx
View File

@ -1,27 +1,27 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
*
*/
<!-- ScummVM - Graphic Adventure Engine
-
- ScummVM is the legal property of its developers, whose names
- are too numerous to list here. Please refer to the COPYRIGHT
- file distributed with this source distribution.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- $URL$
- $Id$
-
-->
<render_info>
<palette>

48
gui/themes/scummmodern/scummodern_layout.stx
View File

@ -1,27 +1,27 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
*
*/
<!-- ScummVM - Graphic Adventure Engine
-
- ScummVM is the legal property of its developers, whose names
- are too numerous to list here. Please refer to the COPYRIGHT
- file distributed with this source distribution.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- $URL$
- $Id$
-
-->
<layout_info resolution = '-320xY, -256x240'>
<globals>

48
gui/themes/scummmodern/scummodern_layout_320.stx
View File

@ -1,27 +1,27 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
*
*/
<!-- ScummVM - Graphic Adventure Engine
-
- ScummVM is the legal property of its developers, whose names
- are too numerous to list here. Please refer to the COPYRIGHT
- file distributed with this source distribution.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- $URL$
- $Id$
-
-->
<layout_info resolution = "320xY, 256x240">
<globals>

2
gui/themes/scummtheme.py
View File

@ -34,7 +34,7 @@ def buildAllThemes():
buildTheme(f)
def parseSTX(theme_file, def_file):
comm = re.compile("\/\*(.*?)\*\/", re.DOTALL)
comm = re.compile("<!--(.*?)-->", re.DOTALL)
output = ""
for line in theme_file: