[texworks] 48/73: Imported Upstream version 0.5~svn1363
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texworks.
commit b16143c82cdb511ac33b615ce202f08e39a2cd01
Author: Atsuhito KOHDA <kohda@debian.org>
Date: Wed May 14 16:24:12 2014 +0900
Imported Upstream version 0.5~svn1363
---
CMake/Modules/COPYING-CMAKE-MODULES | 2 +-
README | 2 +-
TeXworks.plist.in | 2 +-
man/texworks.1 | 2 +-
plugins-src/TWLuaPlugin/TWLuaPlugin.cpp | 2 +-
plugins-src/TWLuaPlugin/TWLuaPlugin.h | 2 +-
plugins-src/TWPythonPlugin/TWPythonPlugin.cpp | 2 +-
plugins-src/TWPythonPlugin/TWPythonPlugin.h | 2 +-
res/TeXworks.rc | 2 +-
src/CMakeLists.txt | 5 +
src/ClickableLabel.cpp | 2 +-
src/ClickableLabel.h | 2 +-
src/ClosableTabWidget.cpp | 2 +-
src/ClosableTabWidget.h | 2 +-
src/CommandlineParser.cpp | 2 +-
src/CommandlineParser.h | 2 +-
src/CompletingEdit.h | 2 +-
src/ConfigurableApp.cpp | 2 +-
src/ConfigurableApp.h | 2 +-
src/ConfirmDelete.cpp | 2 +-
src/ConfirmDelete.h | 2 +-
src/DefaultBinaryPathsWin.h | 2 +-
src/DefaultPrefs.h | 2 +-
src/FindDialog.cpp | 2 +-
src/HardWrapDialog.cpp | 2 +-
src/HardWrapDialog.h | 2 +-
src/PDFDocks.cpp | 2 +-
src/PDFDocks.h | 2 +-
src/ResourcesDialog.cpp | 2 +-
src/ResourcesDialog.h | 2 +-
src/ScriptManager.cpp | 2 +-
src/ScriptManager.h | 2 +-
src/SvnRev.h | 4 +-
src/TWApp.cpp | 6 +-
src/TWApp.h | 2 +-
src/TWScript.cpp | 2 +-
src/TWScript.h | 2 +-
src/TWScriptAPI.cpp | 2 +-
src/TWScriptAPI.h | 2 +-
src/TWScriptable.cpp | 2 +-
src/TWScriptable.h | 2 +-
src/TWSystemCmd.cpp | 2 +-
src/TWSystemCmd.h | 2 +-
src/TWTextCodecs.cpp | 2 +-
src/TWTextCodecs.h | 2 +-
src/TWUtils.cpp | 2 +-
src/TWVersion.h | 2 +-
src/TeXDocks.cpp | 2 +-
src/TeXDocks.h | 2 +-
src/TeXDocument.cpp | 3 +-
src/TeXDocument.h | 2 +-
src/TeXHighlighter.cpp | 6 +-
src/TeXHighlighter.h | 6 +-
src/TemplateDialog.cpp | 2 +-
src/TemplateDialog.h | 2 +-
src/main.cpp | 4 +-
src/synctex_parser.c | 24 ++---
src/synctex_parser_utils.c | 8 +-
src/synctex_parser_utils.h | 11 +--
trans/TeXworks_ru.qm | Bin 57677 -> 57760 bytes
trans/TeXworks_ru.ts | 4 +
updateCopyrights.py | 128 ++++++++++++++++++++++++++
updateSyncTeX.sh | 14 +++
63 files changed, 240 insertions(+), 81 deletions(-)
diff --git a/CMake/Modules/COPYING-CMAKE-MODULES b/CMake/Modules/COPYING-CMAKE-MODULES
index 670a787..a189b31 100644
--- a/CMake/Modules/COPYING-CMAKE-MODULES
+++ b/CMake/Modules/COPYING-CMAKE-MODULES
@@ -2,7 +2,7 @@ Unless noted otherwise, all files in this directory and are released under the
following terms:
-Copyright (C) 2011-2012 Charlie Sharpsteen
+Copyright (C) 2011-2014 Charlie Sharpsteen, Stefan Löffler
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
diff --git a/README b/README
index 5035df6..556b471 100644
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ Mailing list: http://tug.org/mailman/listinfo/texworks
License
=======
-TeXworks is copyright (C) 2007-2013 by Jonathan Kew, Stefan Löffler, and Charlie
+TeXworks is copyright (C) 2007-2014 by Jonathan Kew, Stefan Löffler, and Charlie
Sharpsteen. Distributed under the terms of the GNU General Public License,
version 2 or (at your option) any later version.
See the file COPYING for details.
diff --git a/TeXworks.plist.in b/TeXworks.plist.in
index 3f5c9c1..3df79b5 100644
--- a/TeXworks.plist.in
+++ b/TeXworks.plist.in
@@ -51,7 +51,7 @@
<key>CFBundleIconFile</key>
<string>TeXworks.icns</string>
<key>CFBundleGetInfoString</key>
- <string>TeXworks version @VER@ (r.@REV@)
(C) 2007-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
Released under GPL (v2.0 or later)</string>
+ <string>TeXworks version @VER@ (r.@REV@)
(C) 2007-2014 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
Released under GPL (v2.0 or later)</string>
<key>CFBundleExecutable</key>
<string>TeXworks</string>
<key>CFBundleIdentifier</key>
diff --git a/man/texworks.1 b/man/texworks.1
index 03f6c8c..73b676d 100644
--- a/man/texworks.1
+++ b/man/texworks.1
@@ -69,7 +69,7 @@ If you find a bug, please report it at \%http://code.google.com/p/texworks/issue
Jonathan Kew, Stefan Löffler, Charlie Sharpsteen, and others
.SH COPYRIGHT
-Copyright (C) 2007-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+Copyright (C) 2007-2014 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
License GPLv2+: GNU GPL (version 2 or later) <http://gnu.org/licenses/gpl.html>
diff --git a/plugins-src/TWLuaPlugin/TWLuaPlugin.cpp b/plugins-src/TWLuaPlugin/TWLuaPlugin.cpp
index 310e505..b0e905f 100644
--- a/plugins-src/TWLuaPlugin/TWLuaPlugin.cpp
+++ b/plugins-src/TWLuaPlugin/TWLuaPlugin.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2010-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/plugins-src/TWLuaPlugin/TWLuaPlugin.h b/plugins-src/TWLuaPlugin/TWLuaPlugin.h
index b025a28..c92cf73 100644
--- a/plugins-src/TWLuaPlugin/TWLuaPlugin.h
+++ b/plugins-src/TWLuaPlugin/TWLuaPlugin.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2010-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/plugins-src/TWPythonPlugin/TWPythonPlugin.cpp b/plugins-src/TWPythonPlugin/TWPythonPlugin.cpp
index befcd4e..2e7e92f 100644
--- a/plugins-src/TWPythonPlugin/TWPythonPlugin.cpp
+++ b/plugins-src/TWPythonPlugin/TWPythonPlugin.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2010-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/plugins-src/TWPythonPlugin/TWPythonPlugin.h b/plugins-src/TWPythonPlugin/TWPythonPlugin.h
index ea97298..64dfb5d 100644
--- a/plugins-src/TWPythonPlugin/TWPythonPlugin.h
+++ b/plugins-src/TWPythonPlugin/TWPythonPlugin.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2010-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/res/TeXworks.rc b/res/TeXworks.rc
index 8d1d142..ed5ccc0 100644
--- a/res/TeXworks.rc
+++ b/res/TeXworks.rc
@@ -22,7 +22,7 @@ BEGIN
VALUE "FileDescription", "TeXworks editor & previewer"
VALUE "FileVersion", TEXWORKS_VERSION ".r" SVN_REVISION_STR
VALUE "InternalName", "TeXworks"
- VALUE "LegalCopyright", "Copyright (C) 2007-2013 Jonathan Kew, Stefan L�ffler, Charlie Sharpsteen"
+ VALUE "LegalCopyright", "Copyright (C) 2007-2014 Jonathan Kew, Stefan L�ffler, Charlie Sharpsteen"
VALUE "OriginalFilename", "TeXworks.exe"
VALUE "ProductName", "TeXworks"
VALUE "ProductVersion", "TeXworks " TEXWORKS_VERSION
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb87c12..9cfc6ee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,6 +16,11 @@ FILE(GLOB TEXWORKS_RCS "${TeXworks_SOURCE_DIR}/res/*.qrc")
FILE(GLOB TEXWORKS_TRANS_TS "${TeXworks_SOURCE_DIR}/trans/*.ts")
FILE(GLOB TEXWORKS_TRANS_QM "${TeXworks_SOURCE_DIR}/trans/*.qm")
+IF ( WIN32 )
+ FILE(GLOB TEXWORKS_WIN_RCS "${TeXworks_SOURCE_DIR}/res/*.rc")
+ LIST(APPEND TEXWORKS_SRCS ${TEXWORKS_WIN_RCS})
+ENDIF ( WIN32 )
+
# These source files along with the `.moc` files generated from some headers
# form the TeXworks scripting API. We export them to variables in the
# `PARENT_SCOPE` (top level CMake file) so that they will be available to the
diff --git a/src/ClickableLabel.cpp b/src/ClickableLabel.cpp
index fd059e9..379792d 100644
--- a/src/ClickableLabel.cpp
+++ b/src/ClickableLabel.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/ClickableLabel.h b/src/ClickableLabel.h
index c692341..658cd12 100644
--- a/src/ClickableLabel.h
+++ b/src/ClickableLabel.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2011-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/ClosableTabWidget.cpp b/src/ClosableTabWidget.cpp
index 61691a7..08f6258 100644
--- a/src/ClosableTabWidget.cpp
+++ b/src/ClosableTabWidget.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/ClosableTabWidget.h b/src/ClosableTabWidget.h
index ac5e3d8..5306c7a 100644
--- a/src/ClosableTabWidget.h
+++ b/src/ClosableTabWidget.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/CommandlineParser.cpp b/src/CommandlineParser.cpp
index d538bb4..11174e1 100644
--- a/src/CommandlineParser.cpp
+++ b/src/CommandlineParser.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2010-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/CommandlineParser.h b/src/CommandlineParser.h
index e4a2fc4..fbe2939 100644
--- a/src/CommandlineParser.h
+++ b/src/CommandlineParser.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2010-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/CompletingEdit.h b/src/CompletingEdit.h
index af56941..540b81e 100644
--- a/src/CompletingEdit.h
+++ b/src/CompletingEdit.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2007-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/ConfigurableApp.cpp b/src/ConfigurableApp.cpp
index 01f1e25..05d4048 100644
--- a/src/ConfigurableApp.cpp
+++ b/src/ConfigurableApp.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/ConfigurableApp.h b/src/ConfigurableApp.h
index 3d65190..099a02f 100644
--- a/src/ConfigurableApp.h
+++ b/src/ConfigurableApp.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2010-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/ConfirmDelete.cpp b/src/ConfirmDelete.cpp
index a9c7ac9..e2809ea 100644
--- a/src/ConfirmDelete.cpp
+++ b/src/ConfirmDelete.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2008-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/ConfirmDelete.h b/src/ConfirmDelete.h
index 3cd583b..a7a886e 100644
--- a/src/ConfirmDelete.h
+++ b/src/ConfirmDelete.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2008-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/DefaultBinaryPathsWin.h b/src/DefaultBinaryPathsWin.h
index 4f0017b..668077c 100644
--- a/src/DefaultBinaryPathsWin.h
+++ b/src/DefaultBinaryPathsWin.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2011-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/DefaultPrefs.h b/src/DefaultPrefs.h
index 12882b9..b86af07 100644
--- a/src/DefaultPrefs.h
+++ b/src/DefaultPrefs.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2013 Stefan Löffler
+ Copyright (C) 2013 Stefan Löffler
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
diff --git a/src/FindDialog.cpp b/src/FindDialog.cpp
index 18a6ad8..49d8e9e 100644
--- a/src/FindDialog.cpp
+++ b/src/FindDialog.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2007-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/HardWrapDialog.cpp b/src/HardWrapDialog.cpp
index 391ca51..962f925 100644
--- a/src/HardWrapDialog.cpp
+++ b/src/HardWrapDialog.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2009-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/HardWrapDialog.h b/src/HardWrapDialog.h
index 60cb232..7b9e49a 100644
--- a/src/HardWrapDialog.h
+++ b/src/HardWrapDialog.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2009-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/PDFDocks.cpp b/src/PDFDocks.cpp
index 84eaa5b..648c918 100644
--- a/src/PDFDocks.cpp
+++ b/src/PDFDocks.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2008-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/PDFDocks.h b/src/PDFDocks.h
index 23af1b2..7f6cc91 100644
--- a/src/PDFDocks.h
+++ b/src/PDFDocks.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2008-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/ResourcesDialog.cpp b/src/ResourcesDialog.cpp
index 177e696..154307e 100644
--- a/src/ResourcesDialog.cpp
+++ b/src/ResourcesDialog.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2011-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/ResourcesDialog.h b/src/ResourcesDialog.h
index 57f5c11..468fb53 100644
--- a/src/ResourcesDialog.h
+++ b/src/ResourcesDialog.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2011-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/ScriptManager.cpp b/src/ScriptManager.cpp
index 7814464..c55806a 100644
--- a/src/ScriptManager.cpp
+++ b/src/ScriptManager.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2010-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/ScriptManager.h b/src/ScriptManager.h
index 1f4f6ae..fc89f5c 100644
--- a/src/ScriptManager.h
+++ b/src/ScriptManager.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2010-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/SvnRev.h b/src/SvnRev.h
index b1c0252..97e7348 100644
--- a/src/SvnRev.h
+++ b/src/SvnRev.h
@@ -1,2 +1,2 @@
-#define SVN_REVISION 1350
-#define SVN_REVISION_STR "1350"
+#define SVN_REVISION 1361
+#define SVN_REVISION_STR "1361"
diff --git a/src/TWApp.cpp b/src/TWApp.cpp
index 6425bc9..7d76584 100644
--- a/src/TWApp.cpp
+++ b/src/TWApp.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2007-2014 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
@@ -289,7 +289,7 @@ void TWApp::about()
{
QString aboutText = tr("<p>%1 is a simple environment for editing, typesetting, and previewing TeX documents.</p>").arg(TEXWORKS_NAME);
aboutText += "<small>";
- aboutText += "<p>© 2007-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen";
+ aboutText += "<p>© 2007-2014 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen";
aboutText += tr("<br>Version %1 r.%2 (%3)").arg(TEXWORKS_VERSION).arg(SVN_REVISION).arg(TW_BUILD_ID_STR);
aboutText += tr("<p>Distributed under the <a href=\"http://www.gnu.org/licenses/gpl-2.0.html\";>GNU General Public License</a>, version 2 or (at your option) any later version.");
aboutText += tr("<p><a href=\"http://qt.nokia.com/\";>Qt application framework</a> v%1 by Qt Software, a division of Nokia Corporation.").arg(qVersion());
@@ -685,7 +685,7 @@ QObject* TWApp::openFile(const QString &fileName, int pos /* = 0 */)
if (doc != NULL) {
if (pos > 0)
doc->widget()->goToPage(pos - 1);
- doc->selectWindow();
+ QTimer::singleShot(0, doc, SLOT(selectWindow()));
return doc;
}
return NULL;
diff --git a/src/TWApp.h b/src/TWApp.h
index 17805b8..147ea03 100644
--- a/src/TWApp.h
+++ b/src/TWApp.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2007-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TWScript.cpp b/src/TWScript.cpp
index bd84c9a..d483aa4 100644
--- a/src/TWScript.cpp
+++ b/src/TWScript.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2009-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TWScript.h b/src/TWScript.h
index 39a5aa2..291f0d5 100644
--- a/src/TWScript.h
+++ b/src/TWScript.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2009-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TWScriptAPI.cpp b/src/TWScriptAPI.cpp
index 89743b6..28fa9c8 100644
--- a/src/TWScriptAPI.cpp
+++ b/src/TWScriptAPI.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2010-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TWScriptAPI.h b/src/TWScriptAPI.h
index 2e13114..b5d395e 100644
--- a/src/TWScriptAPI.h
+++ b/src/TWScriptAPI.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2010-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TWScriptable.cpp b/src/TWScriptable.cpp
index 2fbcc80..a43daef 100644
--- a/src/TWScriptable.cpp
+++ b/src/TWScriptable.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2009-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TWScriptable.h b/src/TWScriptable.h
index 22eb15b..48f3a73 100644
--- a/src/TWScriptable.h
+++ b/src/TWScriptable.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2009-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TWSystemCmd.cpp b/src/TWSystemCmd.cpp
index 0686878..4071c51 100644
--- a/src/TWSystemCmd.cpp
+++ b/src/TWSystemCmd.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TWSystemCmd.h b/src/TWSystemCmd.h
index cba33a3..07fc09e 100644
--- a/src/TWSystemCmd.h
+++ b/src/TWSystemCmd.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2010-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TWTextCodecs.cpp b/src/TWTextCodecs.cpp
index 9d9987a..857f7b3 100644
--- a/src/TWTextCodecs.cpp
+++ b/src/TWTextCodecs.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TWTextCodecs.h b/src/TWTextCodecs.h
index 0bcdd50..809bf5e 100644
--- a/src/TWTextCodecs.h
+++ b/src/TWTextCodecs.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TWUtils.cpp b/src/TWUtils.cpp
index 338e610..c3fee9a 100644
--- a/src/TWUtils.cpp
+++ b/src/TWUtils.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2007-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TWVersion.h b/src/TWVersion.h
index d3c3843..64a8cb5 100644
--- a/src/TWVersion.h
+++ b/src/TWVersion.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2008-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TeXDocks.cpp b/src/TeXDocks.cpp
index ad75ba6..df18e5c 100644
--- a/src/TeXDocks.cpp
+++ b/src/TeXDocks.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2008-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TeXDocks.h b/src/TeXDocks.h
index 689c278..a6355aa 100644
--- a/src/TeXDocks.h
+++ b/src/TeXDocks.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2008-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TeXDocument.cpp b/src/TeXDocument.cpp
index e989d34..86f94ed 100644
--- a/src/TeXDocument.cpp
+++ b/src/TeXDocument.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2007-2014 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
@@ -2643,6 +2643,7 @@ void TeXDocument::typeset()
}
// ensure the window is visible - otherwise we can't see the output
// panel (and the typeset process appears to hang in case of an error)
+ consoleTabs->setCurrentIndex(0);
raise();
inputLine->setFocus(Qt::OtherFocusReason);
diff --git a/src/TeXDocument.h b/src/TeXDocument.h
index 125c9ab..78e0692 100644
--- a/src/TeXDocument.h
+++ b/src/TeXDocument.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2007-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TeXHighlighter.cpp b/src/TeXHighlighter.cpp
index db0c340..575a88c 100644
--- a/src/TeXHighlighter.cpp
+++ b/src/TeXHighlighter.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2007-2014 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
@@ -33,16 +33,18 @@ QList<TeXHighlighter::HighlightingSpec> *TeXHighlighter::syntaxRules = NULL;
QList<TeXHighlighter::TagPattern> *TeXHighlighter::tagPatterns = NULL;
TeXHighlighter::TeXHighlighter(QTextDocument *parent, TeXDocument *texDocument)
- : QSyntaxHighlighter(parent)
+ : QSyntaxHighlighter((QObject*)NULL)
, texDoc(texDocument)
, highlightIndex(-1)
, isTagging(true)
, pHunspell(NULL)
, spellingCodec(NULL)
+ , textDoc(parent)
{
loadPatterns();
spellFormat.setUnderlineStyle(QTextCharFormat::SpellCheckUnderline);
spellFormat.setUnderlineColor(Qt::red);
+ QTimer::singleShot(1000, this, SLOT(delayedInstallParent()));
}
void TeXHighlighter::spellCheckRange(const QString &text, int index, int limit, const QTextCharFormat &spellFormat)
diff --git a/src/TeXHighlighter.h b/src/TeXHighlighter.h
index 209b5a9..ed29f09 100644
--- a/src/TeXHighlighter.h
+++ b/src/TeXHighlighter.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2007-2014 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
@@ -86,6 +86,10 @@ private:
Hunhandle *pHunspell;
QTextCodec *spellingCodec;
+
+ QTextDocument * textDoc;
+private slots:
+ void delayedInstallParent() { setDocument(textDoc); }
};
#endif
diff --git a/src/TemplateDialog.cpp b/src/TemplateDialog.cpp
index a65aa5f..2a26d15 100644
--- a/src/TemplateDialog.cpp
+++ b/src/TemplateDialog.cpp
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2008-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/TemplateDialog.h b/src/TemplateDialog.h
index f1c7095..4b2e98c 100644
--- a/src/TemplateDialog.h
+++ b/src/TemplateDialog.h
@@ -1,6 +1,6 @@
/*
This is part of TeXworks, an environment for working with TeX documents
- Copyright (C) 2007-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
+ Copyright (C) 2008-2012 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen
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
diff --git a/src/main.cpp b/src/main.cpp
index f383f22..d61ddf7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -84,10 +84,10 @@ int main(int argc, char *argv[])
QTextStream strm(stdout);
strm << QString("TeXworks %1r%2 (%3)\n\n").arg(TEXWORKS_VERSION).arg(SVN_REVISION_STR).arg(TW_BUILD_ID_STR);
strm << QString::fromUtf8("\
-Copyright (C) 2007-2013 Jonathan Kew, Stefan Löffler, Charlie Sharpsteen\n\
+Copyright (C) %1 %2\n\
License GPLv2+: GNU GPL (version 2 or later) <http://gnu.org/licenses/gpl.html>\n\
This is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law.\n\n");
+There is NO WARRANTY, to the extent permitted by law.\n\n").arg("2007-2014", "Jonathan Kew, Stefan Löffler, Charlie Sharpsteen");
strm.flush();
}
if ((i = clp.getNextSwitch("help")) >= 0) {
diff --git a/src/synctex_parser.c b/src/synctex_parser.c
index 508db2e..f4d9633 100644
--- a/src/synctex_parser.c
+++ b/src/synctex_parser.c
@@ -119,7 +119,7 @@ typedef union _synctex_info_t {
} synctex_info_t;
# if defined(SYNCTEX_USE_CHARINDEX)
-# define SYNCTEX_DECLARE_CHARINDEX synctex_charindex_t char_index
+# define SYNCTEX_DECLARE_CHARINDEX synctex_charindex_t char_index;
# define SYNCTEX_CHARINDEX(NODE) (NODE->char_index)
# define SYNCTEX_PRINT_CHARINDEX printf("#%i\n",SYNCTEX_CHARINDEX(node))
# define SYNCTEX_DECLARE_CHAR_OFFSET synctex_charindex_t charindex_offset
@@ -133,7 +133,7 @@ typedef union _synctex_info_t {
# endif
struct _synctex_node {
- SYNCTEX_DECLARE_CHARINDEX;
+ SYNCTEX_DECLARE_CHARINDEX
synctex_class_t class;
synctex_info_t * implementation;
};
@@ -357,7 +357,7 @@ SYNCTEX_MAKE_GET(_synctex_implementation_4,4)
SYNCTEX_MAKE_GET(_synctex_implementation_5,5)
typedef struct {
- SYNCTEX_DECLARE_CHARINDEX;
+ SYNCTEX_DECLARE_CHARINDEX
synctex_class_t class;
synctex_info_t implementation[3+SYNCTEX_PAGE_IDX+1];/* child, sibling, next box,
* SYNCTEX_PAGE_IDX */
@@ -425,7 +425,7 @@ DEFINE_synctex_new_NODE(sheet)
# define SYNCTEX_ABS_DEPTH(NODE) ((SYNCTEX_DEPTH(NODE)>0?SYNCTEX_DEPTH(NODE):-SYNCTEX_DEPTH(NODE)))
typedef struct {
- SYNCTEX_DECLARE_CHARINDEX;
+ SYNCTEX_DECLARE_CHARINDEX
synctex_class_t class;
synctex_info_t implementation[5+SYNCTEX_DEPTH_IDX+1]; /* parent,child,sibling,friend,next box,
* SYNCTEX_TAG,SYNCTEX_LINE,SYNCTEX_COLUMN,
@@ -478,7 +478,7 @@ DEFINE_synctex_new_NODE(vbox)
# define SYNCTEX_ABS_DEPTH_V(NODE) ((SYNCTEX_DEPTH_V(NODE)>0?SYNCTEX_DEPTH_V(NODE):-SYNCTEX_DEPTH_V(NODE)))
typedef struct {
- SYNCTEX_DECLARE_CHARINDEX;
+ SYNCTEX_DECLARE_CHARINDEX
synctex_class_t class;
synctex_info_t implementation[5+SYNCTEX_DEPTH_V_IDX+1]; /*parent,child,sibling,friend,next box,
* SYNCTEX_TAG,SYNCTEX_LINE,SYNCTEX_COLUMN,
@@ -514,7 +514,7 @@ DEFINE_synctex_new_NODE(hbox)
* It does not contain a child field.
*/
typedef struct {
- SYNCTEX_DECLARE_CHARINDEX;
+ SYNCTEX_DECLARE_CHARINDEX
synctex_class_t class;
synctex_info_t implementation[3+SYNCTEX_DEPTH_IDX+1]; /* parent,sibling,friend,
* SYNCTEX_TAG,SYNCTEX_LINE,SYNCTEX_COLUMN,
@@ -569,7 +569,7 @@ DEFINE_synctex_new_NODE(void_hbox)
/* The medium nodes correspond to kern, glue, penalty and math nodes.
* In LuaTeX, the size of the nodes may have changed. */
typedef struct {
- SYNCTEX_DECLARE_CHARINDEX;
+ SYNCTEX_DECLARE_CHARINDEX
synctex_class_t class;
synctex_info_t implementation[3+SYNCTEX_WIDTH_IDX+1]; /* parent,sibling,friend,
* SYNCTEX_TAG,SYNCTEX_LINE,SYNCTEX_COLUMN,
@@ -634,7 +634,7 @@ DEFINE_synctex_new_NODE(kern)
/* The small nodes correspond to glue and boundary nodes. */
typedef struct {
- SYNCTEX_DECLARE_CHARINDEX;
+ SYNCTEX_DECLARE_CHARINDEX
synctex_class_t class;
synctex_info_t implementation[3+SYNCTEX_VERT_IDX+1]; /* parent,sibling,friend,
* SYNCTEX_TAG,SYNCTEX_LINE,SYNCTEX_COLUMN,
@@ -692,7 +692,7 @@ DEFINE_synctex_new_NODE(boundary)
/* Input nodes only know about their sibling, which is another input node.
* The synctex information is the SYNCTEX_TAG and SYNCTEX_NAME*/
typedef struct {
- SYNCTEX_DECLARE_CHARINDEX;
+ SYNCTEX_DECLARE_CHARINDEX
synctex_class_t class;
synctex_info_t implementation[1+SYNCTEX_NAME_IDX+1]; /* sibling,
* SYNCTEX_TAG,SYNCTEX_NAME */
@@ -4328,9 +4328,9 @@ typedef int (*synctex_fprintf_t)(void *, const char * , ...); /* print formatte
# define SYNCTEX_BITS_PER_BYTE 8
struct __synctex_updater_t {
- void *file; /* the foo.synctex or foo.synctex.gz I/O identifier */
- synctex_fprintf_t fprintf; /* either fprintf or gzprintf */
- int length; /* the number of chars appended */
+ gzFile file; /* the foo.synctex or foo.synctex.gz I/O identifier */
+ synctex_fprintf_t fprintf; /* either fprintf or gzprintf */
+ int length; /* the number of chars appended */
struct _flags {
unsigned int no_gz:1; /* Whether zlib is used or not */
unsigned int reserved:SYNCTEX_BITS_PER_BYTE*sizeof(int)-1; /* Align */
diff --git a/src/synctex_parser_utils.c b/src/synctex_parser_utils.c
index 0000f7e..f8a9f6f 100644
--- a/src/synctex_parser_utils.c
+++ b/src/synctex_parser_utils.c
@@ -57,6 +57,10 @@ authorization from the copyright holder.
#define SYNCTEX_WINDOWS 1
#endif
+#if defined(__OS2__)
+#define SYNCTEX_OS2 1
+#endif
+
#ifdef _WIN32_WINNT_WINXP
#define SYNCTEX_RECENT_WINDOWS 1
#endif
@@ -121,7 +125,7 @@ void _synctex_strip_last_path_extension(char * string) {
last_component = next+1;
}
}
-# ifdef SYNCTEX_WINDOWS
+# if defined(SYNCTEX_WINDOWS) || defined(SYNCTEX_OS2)
/* On Windows, the '\' is also a path separator. */
while((next = strstr(last_component,"\\"))){
last_component = next+1;
@@ -207,7 +211,7 @@ synctex_bool_t _synctex_path_is_absolute(const char * name) {
if(!strlen(name)) {
return synctex_NO;
}
-# if SYNCTEX_WINDOWS
+# if defined(SYNCTEX_WINDOWS) || defined(SYNCTEX_OS2)
if(strlen(name)>2) {
return (name[1]==':' && SYNCTEX_IS_PATH_SEPARATOR(name[2]))?synctex_YES:synctex_NO;
}
diff --git a/src/synctex_parser_utils.h b/src/synctex_parser_utils.h
index 18348aa..db19b2d 100644
--- a/src/synctex_parser_utils.h
+++ b/src/synctex_parser_utils.h
@@ -61,18 +61,15 @@ authorization from the copyright holder.
extern "C" {
#endif
-#define FALSE 0
-#define TRUE !FALSE
-
-# if _WIN32
-# define SYNCTEX_CASE_SENSITIVE_PATH FALSE
+# if defined(_WIN32) || defined(__OS2__)
+# define SYNCTEX_CASE_SENSITIVE_PATH 0
# define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c || '\\' == c)
# else
-# define SYNCTEX_CASE_SENSITIVE_PATH TRUE
+# define SYNCTEX_CASE_SENSITIVE_PATH 1
# define SYNCTEX_IS_PATH_SEPARATOR(c) ('/' == c)
# endif
-# if _WIN32
+# if defined(_WIN32) || defined(__OS2__)
# define SYNCTEX_IS_DOT(c) ('.' == c)
# else
# define SYNCTEX_IS_DOT(c) ('.' == c)
diff --git a/trans/TeXworks_ru.qm b/trans/TeXworks_ru.qm
index 71c0aaf..8cef30f 100644
Binary files a/trans/TeXworks_ru.qm and b/trans/TeXworks_ru.qm differ
diff --git a/trans/TeXworks_ru.ts b/trans/TeXworks_ru.ts
index 723de88..9b71590 100644
--- a/trans/TeXworks_ru.ts
+++ b/trans/TeXworks_ru.ts
@@ -130,6 +130,10 @@
<source>Re-wrap paragraphs</source>
<translation>Переразбить абзацы</translation>
</message>
+ <message>
+ <source>Unwrap</source>
+ <translation>Объединить строки</translation>
+ </message>
</context>
<context>
<name>PDFDocument</name>
diff --git a/updateCopyrights.py b/updateCopyrights.py
new file mode 100755
index 0000000..ba2df73
--- /dev/null
+++ b/updateCopyrights.py
@@ -0,0 +1,128 @@
+#!/usr/bin/python
+
+# This script requires pysvn
+# Under Debian/Ubuntu, you can install it via
+# sudo apt-get install python-svn
+
+import pysvn, datetime, re, os, sys
+
+def infoMsg(msg):
+ sys.stdout.write(msg)
+ sys.stdout.flush()
+
+def svnModified():
+ for s in svnClient.status('.', get_all = False):
+ if not s['text_status'] in [pysvn.wc_status_kind.none, pysvn.wc_status_kind.unversioned, pysvn.wc_status_kind.normal, pysvn.wc_status_kind.ignored]:
+ return True
+ if not s['prop_status'] in [pysvn.wc_status_kind.none, pysvn.wc_status_kind.unversioned, pysvn.wc_status_kind.normal, pysvn.wc_status_kind.ignored]:
+ return True
+ return False
+
+# Uses globals: svnClient, svnLog
+def getCopyrightYears(filename):
+ global svnClient, svnLog
+
+ # Get canonical path (as shown in the changelog)
+ info = svnClient.info2(filename)[0][1]
+ path = info['URL'].replace(info['repos_root_URL'], "")
+
+ minYear = maxYear = None
+
+ for rev in svnLog:
+ for p in rev['changed_paths']:
+ if path == p['path']:
+ year = datetime.datetime.utcfromtimestamp(rev['date']).year
+ if not minYear or year < minYear:
+ minYear = year
+ if not maxYear or year > maxYear:
+ maxYear = year
+ # Follow copies
+ if p['copyfrom_path']:
+ path = p['copyfrom_path']
+ break
+ return (minYear, maxYear)
+
+
+# Inspired by http://stackoverflow.com/questions/1597649/replace-strings-in-files-by-python
+
+DEFAULT_REPLACE_EXTENSIONS = (".cpp", ".h")
+
+def try_to_replace(fname, replace_extensions=DEFAULT_REPLACE_EXTENSIONS):
+ if replace_extensions:
+ return fname.lower().endswith(replace_extensions)
+ return True
+
+def replaceInFile(filename):
+ infoMsg("Updating %s... " % filename)
+
+ # first, see if the pattern is even in the file.
+ f = open(filename)
+ content = f.read()
+ f.close()
+
+ m = re.search("(This is part of TeXworks, an environment for working with TeX documents\s*\n\s*Copyright \(C\)) [-0-9]+ ([^\n]+)", content)
+ if not m:
+ infoMsg("noop\n")
+ return
+
+ (yearStart, yearEnd) = getCopyrightYears(filename)
+ if not yearStart:
+ infoMsg("ERROR\n")
+ return
+
+ orig = m.group(0)
+ if yearStart == yearEnd:
+ subst = "%s %i %s" % (m.group(1), yearStart, m.group(2))
+ else:
+ subst = "%s %i-%i %s" % (m.group(1), yearStart, yearEnd, m.group(2))
+
+ content = content.replace(orig, subst)
+
+ f = open(filename, 'w')
+ f.write(content)
+ f.close()
+
+ infoMsg("OK\n")
+
+
+
+
+################################################################################
+# MAIN
+################################################################################
+
+svnClient = pysvn.Client()
+
+# Abort if there are local changes (so if this script should mess things up, it's easy to recover
+if svnModified():
+ print("Your working copy has local changes. Please commit (or revert) them first")
+ sys.exit(1)
+
+
+
+# Get the full log
+infoMsg("Retrieving svn log... ")
+svnLog = svnClient.log('.', discover_changed_paths = True)
+infoMsg("OK\n")
+
+# Get all versioned files
+infoMsg("Retrieving file list... ")
+files = svnClient.list('.', recurse = True)
+infoMsg("OK\n")
+
+# The first entry is the directory component
+repo_dir = files[0][0]['repos_path']
+files = files[1:]
+
+# Update copyright information
+for f in files:
+ fname = f[0]['repos_path'][len(repo_dir) + 1:]
+ if try_to_replace(fname):
+ replaceInFile(fname)
+
+# Reminder for places where the copyright information must be updated manually
+print("")
+print("Don't forget to manually update the copyright information in the following files:")
+for f in ["README", "TeXworks.plist.in", "man/texworks.1", "CMake/Modules/COPYING-CMAKE-MODULES", "res/TeXworks.rc", "src/main.cpp", "src/TWApp.cpp"]:
+ print(" %s" % f)
+
diff --git a/updateSyncTeX.sh b/updateSyncTeX.sh
new file mode 100755
index 0000000..1fa4c28
--- /dev/null
+++ b/updateSyncTeX.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+for FILE in synctex_parser.c synctex_parser.h synctex_parser_utils.c synctex_parser_utils.h synctex_parser_version.txt; do
+ echo -n "Updating $FILE... "
+ STAT=$(wget -O "src/${FILE}" "http://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/synctexdir/${FILE}?view=co"; 2>&1)
+ if [ $? -eq 0 ]; then
+ echo "OK"
+ else
+ echo "ERROR"
+ echo "$STAT"
+ exit 1
+ fi
+done
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texworks.git
Reply to: