From 5934035bf60f1b5a5fcc83a3bdf9e1267c9b7125 Mon Sep 17 00:00:00 2001
From: Kolan Sh <mecareful@gmail.com>
Date: Thu, 30 Jun 2011 16:38:54 +0400
Subject: [PATCH] =?UTF-8?q?tex=5Fparser=20=D1=80=D0=B0=D0=B7=D0=B1=D0=B8?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=8E=20=D0=BD=D0=B0=20=D0=BC=D0=BE=D0=B4=D1=83?=
 =?UTF-8?q?=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 c/tex_parser/Makefile          |   8 ++--
 c/tex_parser/tex_parser.c      |   2 +-
 c/tex_parser/tex_parser.geany  |  14 ++++++-
 c/tex_parser/tex_parser.h      |  18 +++++++-
 c/tex_parser/tex_parser_test.c |   7 +++-
 tex/twocols/twocols1.aux       |   6 +++
 tex/twocols/twocols1.pdf       | Bin 0 -> 13211 bytes
 tex/twocols/twocols1.tex       |  28 +++++++++++++
 tex/twocols/twocols2.lyx       |  74 +++++++++++++++++++++++++++++++++
 tex/twocols/twopics.lyx        |  74 +++++++++++++++++++++++++++++++++
 10 files changed, 221 insertions(+), 10 deletions(-)
 create mode 100644 tex/twocols/twocols1.aux
 create mode 100644 tex/twocols/twocols1.pdf
 create mode 100644 tex/twocols/twocols1.tex
 create mode 100644 tex/twocols/twocols2.lyx
 create mode 100644 tex/twocols/twopics.lyx

diff --git a/c/tex_parser/Makefile b/c/tex_parser/Makefile
index b3c5f99..20cce62 100644
--- a/c/tex_parser/Makefile
+++ b/c/tex_parser/Makefile
@@ -38,7 +38,7 @@ ifneq ($(mode),profile)
 ifneq ($(mode),develop)
 ifneq ($(mode),release)
 	@echo "Invalid build mode."
-	@echo "Please use 'make mode=release' or 'make mode=develop' or 'make mode=debug'"
+	@echo "Please use 'make mode=release', 'make mode=develop' or 'make mode=debug'"
 	@exit 1
 endif
 endif
@@ -53,13 +53,13 @@ endif
 %.o :
 	$(CC) -c $(CFLAGS) $(LDFLAGS) $(INCLUDE) -o $@ $<
 
-tex_parser_test_obj = tex_parser_test.o tex_parser.o zalloc_ext.o zalloc.o xalloc.o xerror.o
+tex_parser_test_obj = tex_parser_test.o tex_parser.o zalloc_ext.o zalloc.o xalloc.o zerror.o xerror.o
 tex_parser_test: $(tex_parser_test_obj)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDE) -o $@ $(tex_parser_test_obj)
 
 tex_parser_test.o: tex_parser_test.c tex_parser.o
 
-tex_parser.o: tex_parser.c tex_parser.h zalloc_ext.o zalloc.o xalloc.o
+tex_parser.o: tex_parser.c tex_parser.h zalloc_ext.o zalloc.o xalloc.o zerror.o
 
 zalloc_ext.o: $(KOLAN_INCLUDE)/zalloc_ext.c $(KOLAN_INCLUDE)/zalloc_ext.h zalloc.o xerror.o
 
@@ -67,6 +67,8 @@ zalloc.o: $(KOLAN_INCLUDE)/zalloc.c $(KOLAN_INCLUDE)/zalloc.h xerror.o
 
 xalloc.o: $(KOLAN_INCLUDE)/xalloc.c $(KOLAN_INCLUDE)/xalloc.h xerror.o
 
+zerror.o: $(KOLAN_INCLUDE)/zerror.c $(KOLAN_INCLUDE)/zerror.h
+
 xerror.o: $(KOLAN_INCLUDE)/xerror.c $(KOLAN_INCLUDE)/xerror.h
 
 clean:
diff --git a/c/tex_parser/tex_parser.c b/c/tex_parser/tex_parser.c
index 668f752..8af74be 100644
--- a/c/tex_parser/tex_parser.c
+++ b/c/tex_parser/tex_parser.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 
 
-int tex_parse(const char *source, size_t len, struct xerror_s *error)
+int tex_parse(const char *source, size_t len, struct zerror_s *error)
 {
 	error->code = 0;
 	error->message = NULL;
diff --git a/c/tex_parser/tex_parser.geany b/c/tex_parser/tex_parser.geany
index 071f8fd..d5a8ccf 100644
--- a/c/tex_parser/tex_parser.geany
+++ b/c/tex_parser/tex_parser.geany
@@ -16,8 +16,18 @@ long_line_behaviour=1
 long_line_column=72
 
 [files]
-current_page=0
-FILE_NAME_0=1859;Make;0;16;1;1;1;/home/kolan/dev/c/tex_parser/Makefile;0
+current_page=10
+FILE_NAME_0=1032;C;0;16;1;1;1;/home/kolan/dev/c/tex_parser/tex_parser_test.c;0
+FILE_NAME_1=1320;C;0;16;1;1;1;/home/kolan/dev/c/tex_parser/tex_parser.c;0
+FILE_NAME_2=655;C;0;16;1;1;1;/home/kolan/dev/c/tex_parser/tex_parser_tags.h;0
+FILE_NAME_3=1871;Make;0;16;1;1;1;/home/kolan/dev/c/tex_parser/Makefile;0
+FILE_NAME_4=334;C;0;16;1;1;1;/home/kolan/dev/c/tex_parser/tex_parser.h;0
+FILE_NAME_5=0;C;0;16;1;1;1;/home/kolan/projects/include/xerror.c;0
+FILE_NAME_6=1146;C;0;16;1;1;1;/home/kolan/projects/include/xerror.h;0
+FILE_NAME_7=3137;C;0;16;1;1;1;/home/kolan/projects/include/zerror.c;0
+FILE_NAME_8=1902;C;0;16;1;1;1;/home/kolan/projects/include/zerror.h;0
+FILE_NAME_9=2406;C;0;16;1;1;1;/home/kolan/projects/include/xalloc.c;0
+FILE_NAME_10=3312;C;0;16;1;1;1;/home/kolan/projects/include/xalloc.h;0
 
 [build-menu]
 NF_00_LB=_Сделать
diff --git a/c/tex_parser/tex_parser.h b/c/tex_parser/tex_parser.h
index c34cba9..2ad82e3 100644
--- a/c/tex_parser/tex_parser.h
+++ b/c/tex_parser/tex_parser.h
@@ -3,12 +3,26 @@
 
 #include <sys/types.h>
 
-#include "xerror.h"
+#include "zerror.h"
+//~ #include "tex_table.h"
+//~ #include "tex_image.h"
 
 #define	MAX_TEX_STACK_LEVEL 128
+//~
+//~ struct node_s {
+	//~ enum {
+		//~ TEXOBJ_UNDEF = 0,
+		//~ TEXOBJ_TABLE,
+		//~ TEXOBJ_IMAGE,
+	//~ } type;
+//~ };
+//~
+//~ struct tex_tree_s {
+//~
+//~ };
 
 /* LaTeX parser
  */
-int tex_parse(const char *source, size_t len, struct xerror_s *error);
+int tex_parse(const char *source, size_t len, struct zerror_s *error);
 
 #endif
diff --git a/c/tex_parser/tex_parser_test.c b/c/tex_parser/tex_parser_test.c
index 8e087eb..aca7123 100644
--- a/c/tex_parser/tex_parser_test.c
+++ b/c/tex_parser/tex_parser_test.c
@@ -29,13 +29,16 @@ int main(int argc, char *argv[])
 	fclose(tex_file);
 	tex_buf[stat_buf.st_size] = 0;
 
-	struct xerror_s error;
-	memset(&error, 0, sizeof(struct xerror_s));
+	struct zerror_s error;
+	memset(&error, 0, sizeof(struct zerror_s));
 
 	//~ setlocale(LC_ALL, "ru_RU.KOI8-R");
 
 	/* Коммент по-русски */
 	int result = tex_parse(tex_buf, (size_t)stat_buf.st_size, &error);
+
+	//~ setlocale(LC_ALL, "");
+
 	if (result) {
 		printf("Parsing error at %d, symb=%c: %s\n", error.code + 1, tex_buf[error.code], error.message);
 	}
diff --git a/tex/twocols/twocols1.aux b/tex/twocols/twocols1.aux
new file mode 100644
index 0000000..76e182a
--- /dev/null
+++ b/tex/twocols/twocols1.aux
@@ -0,0 +1,6 @@
+\relax 
+\catcode`"\active
+\select@language{russian}
+\@writefile{toc}{\select@language{russian}}
+\@writefile{lof}{\select@language{russian}}
+\@writefile{lot}{\select@language{russian}}
diff --git a/tex/twocols/twocols1.pdf b/tex/twocols/twocols1.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..233f32685c1387fc234c8c1766da1d6e4a5d9249
GIT binary patch
literal 13211
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
G_`d+tz%;`E

literal 0
HcmV?d00001

diff --git a/tex/twocols/twocols1.tex b/tex/twocols/twocols1.tex
new file mode 100644
index 0000000..dbc96a5
--- /dev/null
+++ b/tex/twocols/twocols1.tex
@@ -0,0 +1,28 @@
+\documentclass[russian]{article}
+%~ \usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+%~ \usepackage{textcomp}
+%~ \usepackage{amstext}
+
+\usepackage[russian]{babel}
+\usepackage{array}
+\usepackage{longtable}
+\usepackage{rotating}
+\usepackage{setspace}
+\usepackage{geometry}
+\usepackage{float}
+\usepackage{multirow}
+\usepackage{multicol}
+
+\begin{document}
+
+\begin{multicols}{3}
+	Она начинает новую страницу (используя команду \clearpage) и начинает пе-
+чать следующего за ней текста в две колонки. Если имеется необязательный ар-
+гумент text, он будет напечатан в верхней части новой страницы в одну колонку;
+если опция отсутствует, то печать в две колонки начинается от начала страницы.
+Возврат к одноколоночному формату осуществляет команда
+
+\end{multicols}
+
+\end{document}
diff --git a/tex/twocols/twocols2.lyx b/tex/twocols/twocols2.lyx
new file mode 100644
index 0000000..77944ce
--- /dev/null
+++ b/tex/twocols/twocols2.lyx
@@ -0,0 +1,74 @@
+#LyX 1.6.8 created this file. For more info see http://www.lyx.org/
+\lyxformat 345
+\begin_document
+\begin_header
+\textclass article
+\begin_preamble
+\usepackage[russian]{babel}
+\usepackage{array,longtable}
+\usepackage{rotating}
+\usepackage{setspace}
+\usepackage{geometry}
+\usepackage{float}
+\usepackage{multirow}
+%\usepackage{multicol}
+\renewcommand{\multirowsetup}{\centering}
+\end_preamble
+\use_default_options true
+\language english
+\inputencoding auto
+\font_roman default
+\font_sans default
+\font_typewriter default
+\font_default_family default
+\font_sc false
+\font_osf false
+\font_sf_scale 100
+\font_tt_scale 100
+
+\graphics default
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_amsmath 1
+\use_esint 1
+\cite_engine basic
+\use_bibtopic false
+\paperorientation portrait
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\defskip medskip
+\quotes_language english
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\author "" 
+\author "" 
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset Graphics
+	filename /home/kolan/img/dragon022.jpg
+	scale 50
+
+\end_inset
+
+
+\begin_inset Graphics
+	filename /home/kolan/img/akinator_9_confiant.png
+	scale 50
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document
diff --git a/tex/twocols/twopics.lyx b/tex/twocols/twopics.lyx
new file mode 100644
index 0000000..77944ce
--- /dev/null
+++ b/tex/twocols/twopics.lyx
@@ -0,0 +1,74 @@
+#LyX 1.6.8 created this file. For more info see http://www.lyx.org/
+\lyxformat 345
+\begin_document
+\begin_header
+\textclass article
+\begin_preamble
+\usepackage[russian]{babel}
+\usepackage{array,longtable}
+\usepackage{rotating}
+\usepackage{setspace}
+\usepackage{geometry}
+\usepackage{float}
+\usepackage{multirow}
+%\usepackage{multicol}
+\renewcommand{\multirowsetup}{\centering}
+\end_preamble
+\use_default_options true
+\language english
+\inputencoding auto
+\font_roman default
+\font_sans default
+\font_typewriter default
+\font_default_family default
+\font_sc false
+\font_osf false
+\font_sf_scale 100
+\font_tt_scale 100
+
+\graphics default
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_amsmath 1
+\use_esint 1
+\cite_engine basic
+\use_bibtopic false
+\paperorientation portrait
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\defskip medskip
+\quotes_language english
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\author "" 
+\author "" 
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset Graphics
+	filename /home/kolan/img/dragon022.jpg
+	scale 50
+
+\end_inset
+
+
+\begin_inset Graphics
+	filename /home/kolan/img/akinator_9_confiant.png
+	scale 50
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document