[Scummvm-cvs-logs] SF.net SVN: scummvm:[34807] scummvm/trunk
tanoku at users.sourceforge.net
tanoku at users.sourceforge.net
Wed Oct 15 15:34:18 CEST 2008
Revision: 34807
http://scummvm.svn.sourceforge.net/scummvm/?rev=34807&view=rev
Author: tanoku
Date: 2008-10-15 13:34:18 +0000 (Wed, 15 Oct 2008)
Log Message:
-----------
Changed XMLParser comment syntax to conform to XML standards (<!-- * -->)
Changed STX version string to 0.2.
Modified Paths:
--------------
scummvm/trunk/common/xmlparser.h
scummvm/trunk/gui/theme.h
scummvm/trunk/gui/themes/scummclassic/THEMERC
scummvm/trunk/gui/themes/scummclassic/classic_gfx.stx
scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx
scummvm/trunk/gui/themes/scummclassic.zip
scummvm/trunk/gui/themes/scummmodern/THEMERC
scummvm/trunk/gui/themes/scummmodern/scummodern_gfx.stx
scummvm/trunk/gui/themes/scummmodern/scummodern_layout.stx
scummvm/trunk/gui/themes/scummmodern/scummodern_layout_320.stx
scummvm/trunk/gui/themes/scummmodern.zip
scummvm/trunk/gui/themes/scummtheme.py
Modified: scummvm/trunk/common/xmlparser.h
===================================================================
--- scummvm/trunk/common/xmlparser.h 2008-10-15 11:22:22 UTC (rev 34806)
+++ scummvm/trunk/common/xmlparser.h 2008-10-15 13:34:18 UTC (rev 34807)
@@ -349,32 +349,35 @@
* 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;
Modified: scummvm/trunk/gui/theme.h
===================================================================
--- scummvm/trunk/gui/theme.h 2008-10-15 11:22:22 UTC (rev 34806)
+++ scummvm/trunk/gui/theme.h 2008-10-15 13:34:18 UTC (rev 34807)
@@ -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 {
Modified: scummvm/trunk/gui/themes/scummclassic/THEMERC
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/THEMERC 2008-10-15 11:22:22 UTC (rev 34806)
+++ scummvm/trunk/gui/themes/scummclassic/THEMERC 2008-10-15 13:34:18 UTC (rev 34807)
@@ -1 +1 @@
-[SCUMMVM_THEME_V23:ScummVM Classic Theme:No Author]
\ No newline at end of file
+[SCUMMVM_STX0.2:ScummVM Classic Theme:No Author]
\ No newline at end of file
Modified: scummvm/trunk/gui/themes/scummclassic/classic_gfx.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_gfx.stx 2008-10-15 11:22:22 UTC (rev 34806)
+++ scummvm/trunk/gui/themes/scummclassic/classic_gfx.stx 2008-10-15 13:34:18 UTC (rev 34807)
@@ -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>
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2008-10-15 11:22:22 UTC (rev 34806)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2008-10-15 13:34:18 UTC (rev 34807)
@@ -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>
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx 2008-10-15 11:22:22 UTC (rev 34806)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx 2008-10-15 13:34:18 UTC (rev 34807)
@@ -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>
Modified: scummvm/trunk/gui/themes/scummclassic.zip
===================================================================
(Binary files differ)
Modified: scummvm/trunk/gui/themes/scummmodern/THEMERC
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/THEMERC 2008-10-15 11:22:22 UTC (rev 34806)
+++ scummvm/trunk/gui/themes/scummmodern/THEMERC 2008-10-15 13:34:18 UTC (rev 34807)
@@ -1 +1 @@
-[SCUMMVM_THEME_V23:ScummVM Modern Theme:No Author]
\ No newline at end of file
+[SCUMMVM_STX0.2:ScummVM Modern Theme:No Author]
\ No newline at end of file
Modified: scummvm/trunk/gui/themes/scummmodern/scummodern_gfx.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummodern_gfx.stx 2008-10-15 11:22:22 UTC (rev 34806)
+++ scummvm/trunk/gui/themes/scummmodern/scummodern_gfx.stx 2008-10-15 13:34:18 UTC (rev 34807)
@@ -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>
Modified: scummvm/trunk/gui/themes/scummmodern/scummodern_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummodern_layout.stx 2008-10-15 11:22:22 UTC (rev 34806)
+++ scummvm/trunk/gui/themes/scummmodern/scummodern_layout.stx 2008-10-15 13:34:18 UTC (rev 34807)
@@ -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>
Modified: scummvm/trunk/gui/themes/scummmodern/scummodern_layout_320.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummodern_layout_320.stx 2008-10-15 11:22:22 UTC (rev 34806)
+++ scummvm/trunk/gui/themes/scummmodern/scummodern_layout_320.stx 2008-10-15 13:34:18 UTC (rev 34807)
@@ -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>
Modified: scummvm/trunk/gui/themes/scummmodern.zip
===================================================================
(Binary files differ)
Modified: scummvm/trunk/gui/themes/scummtheme.py
===================================================================
--- scummvm/trunk/gui/themes/scummtheme.py 2008-10-15 11:22:22 UTC (rev 34806)
+++ scummvm/trunk/gui/themes/scummtheme.py 2008-10-15 13:34:18 UTC (rev 34807)
@@ -34,7 +34,7 @@
buildTheme(f)
def parseSTX(theme_file, def_file):
- comm = re.compile("\/\*(.*?)\*\/", re.DOTALL)
+ comm = re.compile("<!--(.*?)-->", re.DOTALL)
output = ""
for line in theme_file:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list