Browse Source

Merge branch 'release-0.1.9'

master v0.1.9
Kolan Sh 6 years ago
parent
commit
4ff168ff45
  1. 2
      CMakeLists.txt
  2. 2
      cmake/backbone
  3. 5
      pkg-config/CMakeLists.txt
  4. 37
      po/laview-latex-struct.pot
  5. 35
      po/ru/laview-latex-struct.po
  6. 4
      src/latex-struct/CMakeLists.txt
  7. 35
      src/library_constructor.c
  8. 2
      util/backbone

2
CMakeLists.txt

@ -7,7 +7,7 @@ SET (PROJECT_DESCRIPTION "LaTeX representation in the memory.")
SET (MAJOR 0)
SET (MINOR 1)
SET (PATCH 8)
SET (PATCH 9)
LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone)

2
cmake/backbone

@ -1 +1 @@
Subproject commit 85724cbd4ef273ab6ce06507013dc5e6087023a6
Subproject commit 02f3a0f7d969534872799b45a95d3c5a6fef14c3

5
pkg-config/CMakeLists.txt

@ -1 +1,6 @@
INCLUDE (PkgConfigCommonRules)
CONFIGURE_FILE (
"${CMAKE_SOURCE_DIR}/cmake/backbone/templates/pkg-config.pc.in"
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_LOWERCASE_NAME}-${MAJOR}.pc"
)

37
po/laview-latex-struct-0.pot → po/laview-latex-struct.pot

@ -1,14 +1,14 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# This file is distributed under the same license as the laview-latex-struct package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: laview-latex-struct-0\n"
"Project-Id-Version: laview-latex-struct\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-26 17:59+0300\n"
"POT-Creation-Date: 2015-11-13 22:13+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,56 +18,69 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:58
#: src/latex-struct/GlobParser.vala:58
#, c-format
msgid "Begin tag sequence '%s' without end tag pair."
msgstr ""
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:127
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:585
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:126
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:584
#: src/latex-struct/GlobParser.vala:127 src/latex-struct/TableParser.vala:585
#, c-format
msgid ": Unexpected end tag sequence '%s' without begin tag pair."
msgstr ""
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:148
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:147
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:148
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:179
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:188
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:205
#: src/latex-struct/GlobParser.vala:148 src/latex-struct/TableParser.vala:148
#: src/latex-struct/TableParser.vala:179 src/latex-struct/TableParser.vala:188
#: src/latex-struct/TableParser.vala:205
msgid "Error parsing subdoc."
msgstr ""
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/LongtableParser.vala:44
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/LongtableParser.vala:46
#: src/latex-struct/LongtableParser.vala:47
#, c-format
msgid "Incorrect longtable parameters doesn't match '%s' regexp."
msgstr ""
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:298
#: src/latex-struct/Table.vala:298
msgid "2nd param (ATable) isn't a child of the 1st (Glob)."
msgstr ""
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:312
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:311
#: src/latex-struct/Table.vala:311
msgid "3rd param (limits) is incorrect. Read the manual."
msgstr ""
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:329
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:328
#: src/latex-struct/Table.vala:328
msgid "Cann't split the table. Read the manual."
msgstr ""
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:416
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:415
#: src/latex-struct/TableParser.vala:416
#, c-format
msgid "Unexpected end external tag sequence '%s' without begin tag pair."
msgstr ""
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:452
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:451
#: src/latex-struct/TableParser.vala:452
#, c-format
msgid "Begin tag sequence '%s':%d:%d without end tag pair."
msgstr ""
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:615
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:614
#: src/latex-struct/TableParser.vala:615
msgid "\\cline parameters doesn't match {number-number} regexp."
msgstr ""
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TabularParser.vala:43
#: src/latex-struct/TabularParser.vala:44
#, c-format
msgid "Incorrect tabular parameters doesn't match '%s' regexp."
msgstr ""

35
po/ru/laview-latex-struct-0.po → po/ru/laview-latex-struct.po

@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: laview-latex-struct-0\n"
"Project-Id-Version: laview-latex-struct\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-26 15:56+0300\n"
"POT-Creation-Date: 2015-11-13 22:13+0300\n"
"PO-Revision-Date: 2014-05-28 10:50+0400\n"
"Last-Translator: <backbone@backbone.ws>\n"
"Language-Team: Russian\n"
@ -19,61 +19,74 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:58
#: src/latex-struct/GlobParser.vala:58
#, c-format
msgid "Begin tag sequence '%s' without end tag pair."
msgstr "Стартовая последовательность тегов '%s' без соответствующей стоп-пары."
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:127
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:585
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:126
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:584
#: src/latex-struct/GlobParser.vala:127 src/latex-struct/TableParser.vala:585
#, c-format
msgid ": Unexpected end tag sequence '%s' without begin tag pair."
msgstr ""
": Неожиданная завершающая последовательность тегов '%s' без соответствующей "
"старт-пары."
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:148
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/GlobParser.vala:147
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:148
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:179
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:188
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:205
#: src/latex-struct/GlobParser.vala:148 src/latex-struct/TableParser.vala:148
#: src/latex-struct/TableParser.vala:179 src/latex-struct/TableParser.vala:188
#: src/latex-struct/TableParser.vala:205
msgid "Error parsing subdoc."
msgstr "Ошибка разбора поддокумента."
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/LongtableParser.vala:44
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/LongtableParser.vala:46
#: src/latex-struct/LongtableParser.vala:47
#, c-format
msgid "Incorrect longtable parameters doesn't match '%s' regexp."
msgstr "Неверные параметры longtable не удовлетворяют рег. выражению '%s'."
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:298
#: src/latex-struct/Table.vala:298
msgid "2nd param (ATable) isn't a child of the 1st (Glob)."
msgstr "2-ой параметр (ATable) не является дочерним узлом 1-ого (Glob)."
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:312
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:311
#: src/latex-struct/Table.vala:311
msgid "3rd param (limits) is incorrect. Read the manual."
msgstr "3-ий параметр (limits) не верный. Смотрите документацию."
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:329
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/Table.vala:328
#: src/latex-struct/Table.vala:328
msgid "Cann't split the table. Read the manual."
msgstr "Невозможно разбить таблицу. Смотрите документацию."
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:416
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:415
#: src/latex-struct/TableParser.vala:416
#, c-format
msgid "Unexpected end external tag sequence '%s' without begin tag pair."
msgstr ""
": Неожиданная завершающая последовательность внешних тегов '%s' без "
"соответствующей старт-пары."
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:452
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:451
#: src/latex-struct/TableParser.vala:452
#, c-format
msgid "Begin tag sequence '%s':%d:%d without end tag pair."
msgstr ""
"Стартовая последовательность тегов '%s':%d:%d без соответствующей стоп-пары."
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:615
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TableParser.vala:614
#: src/latex-struct/TableParser.vala:615
msgid "\\cline parameters doesn't match {number-number} regexp."
msgstr "Параметры \\cline не соответствует рег. выражению {число-число}."
#: /home/kolan/projects/LAview/latex-struct/src/latex-struct/TabularParser.vala:43
#: src/latex-struct/TabularParser.vala:44
#, c-format
msgid "Incorrect tabular parameters doesn't match '%s' regexp."
msgstr "Неверные параметры tabular не удовлетворяют рег. выражению '%s'."

4
src/latex-struct/CMakeLists.txt

@ -2,6 +2,8 @@ SET (LibName ${PROJECT_LOWERCASE_NAME})
FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.vala)
SET (LibPackages gee-0.8 posix)
SET (LibPkgModules gee-0.8)
SET (LibExtraSources ${PROJECT_SOURCE_DIR}/src/library_constructor.c)
SET (LibInstall ON)
SET (LibExtraSources ${CMAKE_CURRENT_BINARY_DIR}/library_constructor.c)
SET (LC_RELATIVE_PREFIX "..")
CONFIGURE_FILE ( "${CMAKE_SOURCE_DIR}/cmake/backbone/templates/library_constructor.c.in" "${LibExtraSources}")
INCLUDE (ValaLibCommonRules)

35
src/library_constructor.c

@ -1,35 +0,0 @@
#if defined(_WIN32) || defined(_WIN64)
#include <windows.h>
#endif
#include "gettext-config.h"
#if defined(_WIN32) || defined(_WIN64)
BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
#elif defined(linux) || defined(UNIX) || defined(__unix__)
void __attribute__ ((constructor)) load_library (void)
#endif
{
#if defined(_WIN32) || defined(_WIN64)
gchar dllPath[FILENAME_MAX],
*dllDir,
*localePath;
GetModuleFileName (hInstance, dllPath, FILENAME_MAX);
dllDir = g_path_get_dirname (dllPath);
localePath = g_build_filename (dllDir, "../share/locale", NULL);
g_free (dllDir);
bindtextdomain (GETTEXT_PACKAGE, localePath);
g_free (localePath);
#endif
#if (!GLIB_CHECK_VERSION (2, 36, 0))
g_type_init ();
#endif
#if defined(_WIN32) || defined(_WIN64)
(void) dwReason; // avoid
(void) lpReserved; // warngings
return TRUE;
#endif
}

2
util/backbone

@ -1 +1 @@
Subproject commit aa78f6d42c85f7f9a98a1a6273230a9775824fc7
Subproject commit d4e233ae72412f4dfef9b7c39ae7a1b6667fb446
Loading…
Cancel
Save