repo string | commit string | message string | diff string |
|---|---|---|---|
ushakov/mapsoft | 71cbd42f4b71a29343e75c6626a9e28c33733da3 | vmap_get_track/vmap_put_track: keep poit names with "=" prefix | diff --git a/vector/vmap3/vmap_get_track.cpp b/vector/vmap3/vmap_get_track.cpp
index 8177206..6c5ba1c 100644
--- a/vector/vmap3/vmap_get_track.cpp
+++ b/vector/vmap3/vmap_get_track.cpp
@@ -1,74 +1,81 @@
#include <string>
#include <cstring>
#include "options/m_getopt.h"
#include "vmap/vmap.h"
#include "vmap/zn.h"
... |
ushakov/mapsoft | 92e36cccbc3319cecfbe168478d6c8435a08f1e0 | styles.m4: smaller labels for 0x2c04 (monuments) | diff --git a/vector/data/styles.m4 b/vector/data/styles.m4
index fb58062..4c2638a 100644
--- a/vector/data/styles.m4
+++ b/vector/data/styles.m4
@@ -1,584 +1,584 @@
divert(-1)
# Source for mmb and hr style files. Same types but different colors
define(VYS_COL, ifelse(STYLE,hr, 24,0)) # ÑÐ²ÐµÑ Ð¾ÑмеÑок вÑÑ... |
ushakov/mapsoft | 940eb214d992441942c2b88f785a80e365d167b5 | programs/mapsoft_geofig: add options for controlling fig masks | diff --git a/programs/mapsoft_geofig.cpp b/programs/mapsoft_geofig.cpp
index 1c81fc5..884ca36 100644
--- a/programs/mapsoft_geofig.cpp
+++ b/programs/mapsoft_geofig.cpp
@@ -1,164 +1,167 @@
#include "options/m_getopt.h"
#include "geo_io/geofig.h"
#include "geo_io/geo_refs.h"
#include "geo_io/io.h"
#include "err/err... |
ushakov/mapsoft | 8c5c85652db097848c7b535a61d56656ba0ccaf8 | programs: do not build convs_gtiles (problems with boost/geometry in Altlinux) | diff --git a/programs/SConscript b/programs/SConscript
index ca350a7..4301739 100644
--- a/programs/SConscript
+++ b/programs/SConscript
@@ -1,38 +1,39 @@
Import ('env')
progs = Split("""
mapsoft_convert
mapsoft_mkmap
mapsoft_ref
mapsoft_toxyz
mapsoft_map2fig
mapsoft_srtm2fig
map... |
ushakov/mapsoft | 7c5d73e8ac8763b0becfa88f844e6f83d819b749 | misc/tif2hgt: relax aspect ratio checks (for ALOS data) | diff --git a/misc/tif2hgt/tif2hgt.cpp b/misc/tif2hgt/tif2hgt.cpp
index c7e4503..c07fc7a 100644
--- a/misc/tif2hgt/tif2hgt.cpp
+++ b/misc/tif2hgt/tif2hgt.cpp
@@ -1,100 +1,101 @@
#include <tiffio.h>
#include <cstring>
#include <cstdio>
#include <iostream>
// convert TIFF to hgt
using namespace std;
+int
main(i... |
ushakov/mapsoft | 7310086bf8cffb5e346b26139b47e0ab908a08e5 | mapsoft_map2fig: allow custom fig masks when adding wpt/trk objects | diff --git a/core/geo_io/geofig.cpp b/core/geo_io/geofig.cpp
index 087889a..d671e9c 100644
--- a/core/geo_io/geofig.cpp
+++ b/core/geo_io/geofig.cpp
@@ -1,403 +1,412 @@
#include <boost/spirit/include/classic_core.hpp>
#include <boost/spirit/include/classic_file_iterator.hpp>
#include <boost/spirit/include/classic_as... |
ushakov/mapsoft | 45fdd650f1fb1d30ac0682550c541bc7a3d368fc | vector/data/styles.m4: revert large labels for some point objects | diff --git a/vector/data/styles.m4 b/vector/data/styles.m4
index fde6852..fb58062 100644
--- a/vector/data/styles.m4
+++ b/vector/data/styles.m4
@@ -1,719 +1,719 @@
divert(-1)
# Source for mmb and hr style files. Same types but different colors
define(VYS_COL, ifelse(STYLE,hr, 24,0)) # ÑÐ²ÐµÑ Ð¾ÑмеÑок вÑÑ... |
ushakov/mapsoft | f6c95bde415e4c3fa93c76a8766900aea1cb0699 | vector/data/styles.m4: smaller sizes of some point objects | diff --git a/vector/data/styles.m4 b/vector/data/styles.m4
index 53daf38..fde6852 100644
--- a/vector/data/styles.m4
+++ b/vector/data/styles.m4
@@ -1,723 +1,723 @@
divert(-1)
# Source for mmb and hr style files. Same types but different colors
define(VYS_COL, ifelse(STYLE,hr, 24,0)) # ÑÐ²ÐµÑ Ð¾ÑмеÑок вÑÑ... |
ushakov/mapsoft | 7b5ca2a0737c1bee3ac5202a72bb8f564f25d7a5 | vector/data/styles.m4: change text alignment of glacier numbers | diff --git a/vector/data/styles.m4 b/vector/data/styles.m4
index 6697e64..53daf38 100644
--- a/vector/data/styles.m4
+++ b/vector/data/styles.m4
@@ -1,682 +1,682 @@
divert(-1)
# Source for mmb and hr style files. Same types but different colors
define(VYS_COL, ifelse(STYLE,hr, 24,0)) # ÑÐ²ÐµÑ Ð¾ÑмеÑок вÑÑ... |
ushakov/mapsoft | adabe528fdfdce6e1d74964f2ba52d42283e9ce4 | mapsoft_srtm2fig: sctn operation (finding slope contours) | diff --git a/programs/mapsoft_srtm2fig.cpp b/programs/mapsoft_srtm2fig.cpp
index 6045771..c73767f 100644
--- a/programs/mapsoft_srtm2fig.cpp
+++ b/programs/mapsoft_srtm2fig.cpp
@@ -1,143 +1,171 @@
#include <string>
#include <iostream>
#include <fstream>
#include <map>
#include <set>
#include <list>
#include <std... |
ushakov/mapsoft | 5b635cb53c7114154be4aeb6420c547f905107c4 | core/srtm: add find_slope_contour() method | diff --git a/core/srtm/srtm3.cpp b/core/srtm/srtm3.cpp
index d9d83b2..e2a10e8 100644
--- a/core/srtm/srtm3.cpp
+++ b/core/srtm/srtm3.cpp
@@ -1,566 +1,628 @@
#include <fstream>
#include <sstream>
#include <iostream>
#include <iomanip>
#include <queue>
#include <cstdio>
#include <2d/point_int.h>
#include <2d/... |
ushakov/mapsoft | ecd5e8e82b5f06ddc3e3a9fdca1229e1060b2d3f | 20210121-alt1 | diff --git a/mapsoft.spec b/mapsoft.spec
index 4774235..f1d14fb 100644
--- a/mapsoft.spec
+++ b/mapsoft.spec
@@ -1,204 +1,212 @@
Name: mapsoft
-Version: 20201212
+Version: 20210121
Release: alt1
License: GPL3.0
Summary: mapsoft - programs for working with maps and geodata
Group: Sciences/Geosciences
Url: http:/... |
ushakov/mapsoft | f5ad9ca8701b23a9553f24d8d5c12977ffc4cc79 | vector/vmap3/vmap_put_track: skip point names | diff --git a/vector/vmap3/vmap_put_track.cpp b/vector/vmap3/vmap_put_track.cpp
index 11756bb..32348db 100644
--- a/vector/vmap3/vmap_put_track.cpp
+++ b/vector/vmap3/vmap_put_track.cpp
@@ -1,92 +1,92 @@
#include <string>
#include <cstring>
#include "options/m_getopt.h"
#include "vmap/vmap.h"
#include "vmap/zn.h"
... |
ushakov/mapsoft | ae4574dc9fed24c1915d9cd6ab1807b66d42da5c | scripts/mapsoft_wp_parse: fix name conversions | diff --git a/scripts/mapsoft_wp_parse b/scripts/mapsoft_wp_parse
index 168f918..382ad9c 100755
--- a/scripts/mapsoft_wp_parse
+++ b/scripts/mapsoft_wp_parse
@@ -1,97 +1,97 @@
#!/usr/bin/perl
use strict;
use warnings;
use Text::Iconv;
# parse kml file downloaded from Westra Passes
# (http://westra.ru/passes/kml/... |
ushakov/mapsoft | 1c497326a9b09d05fe5b89a4e8c3b311f4ebc8c7 | skip convs_gtiles problem in Altlinux build (build problem with new boost) | diff --git a/.gear-rules b/.gear-rules
index 461a5cb..4aac8f5 100644
--- a/.gear-rules
+++ b/.gear-rules
@@ -1 +1,2 @@
tar: .
+copy: *.patch
\ No newline at end of file
diff --git a/0001-skip-convs_gtiles.patch b/0001-skip-convs_gtiles.patch
new file mode 100644
index 0000000..16f42d9
--- /dev/null
+++ b/0001-skip-con... |
ushakov/mapsoft | 08a1481a07b10adc8b8168ffdaa62d8ab06ada78 | vector/vmap3/vmap_mmb_filter: convert glacier names to points | diff --git a/vector/vmap3/vmap_mmb_filter.cpp b/vector/vmap3/vmap_mmb_filter.cpp
index cbf1aaa..a49b9a2 100644
--- a/vector/vmap3/vmap_mmb_filter.cpp
+++ b/vector/vmap3/vmap_mmb_filter.cpp
@@ -1,106 +1,124 @@
#include <string>
#include <cstring>
#include "options/m_getopt.h"
#include "vmap/vmap.h"
#include "fig/fi... |
ushakov/mapsoft | f02812e5766a81e168ab34e6021b7753a771f61c | vector/data: add new types: point 0x650B, 0x650C (glacier names) | diff --git a/vector/data/styles.m4 b/vector/data/styles.m4
index 486f9e7..6697e64 100644
--- a/vector/data/styles.m4
+++ b/vector/data/styles.m4
@@ -1,677 +1,687 @@
divert(-1)
# Source for mmb and hr style files. Same types but different colors
define(VYS_COL, ifelse(STYLE,hr, 24,0)) # ÑÐ²ÐµÑ Ð¾ÑмеÑок вÑÑ... |
ushakov/mapsoft | 5efb1529722ac1cf3b83eb9423545634aeec00d7 | vector/vmap3: add vmap_put_track and vmap_get_track programs | diff --git a/vector/vmap3/SConscript b/vector/vmap3/SConscript
index 539f01c..b34ae47 100644
--- a/vector/vmap3/SConscript
+++ b/vector/vmap3/SConscript
@@ -1,10 +1,13 @@
Import ('env')
env.Program("vmap_render.cpp")
env.Program("vmap_mmb_filter.cpp")
env.Program("vmap_1km_filter.cpp")
env.Program("vmap_fix_diff... |
ushakov/mapsoft | 51b65054dbec044343dc55418afbbc462573a22e | programs/mapsoft_map2fig: put images into compound object; add 50px margins | diff --git a/programs/mapsoft_map2fig.cpp b/programs/mapsoft_map2fig.cpp
index 9dc4adf..1637a2a 100644
--- a/programs/mapsoft_map2fig.cpp
+++ b/programs/mapsoft_map2fig.cpp
@@ -1,131 +1,149 @@
#include <string>
#include <sstream>
#include <fstream>
#include <iostream>
#include <sys/stat.h>
#include "img_io/gobj... |
ushakov/mapsoft | 55399c6158b4a57cc08942df2e39d24d3a576ff1 | 20201212-alt1 | diff --git a/mapsoft.spec b/mapsoft.spec
index 0bde348..59d11f3 100644
--- a/mapsoft.spec
+++ b/mapsoft.spec
@@ -1,196 +1,202 @@
Name: mapsoft
-Version: 20191201
+Version: 20201212
Release: alt1
License: GPL3.0
Summary: mapsoft - programs for working with maps and geodata
Group: Sciences/Geosciences
Url: http:/... |
ushakov/mapsoft | 1e275af72da3852dc2b38310e19034f429b2ea3c | remove -O2 flag on i586 and armh (problem with boost::spirit) | diff --git a/SConstruct b/SConstruct
index 7b2623d..67f5f27 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,102 +1,104 @@
######################################
# What do we want to build
subdirs_min = Split("core programs viewer vector man scripts")
subdirs_max = subdirs_min + Split("tests misc")
###############... |
ushakov/mapsoft | b33a5b9ca19df293b4073343fa77cafa013d7352 | core/vmap/zn.cpp: fix error in make_labels (should not have any effect) | diff --git a/core/vmap/zn.cpp b/core/vmap/zn.cpp
index a7cfd11..7d263f0 100644
--- a/core/vmap/zn.cpp
+++ b/core/vmap/zn.cpp
@@ -195,675 +195,675 @@ zn_conv::zn_conv(const string & style_): style(style_){
z.fig=default_fig;
z.mp=default_mp;
z.ocad=z.ocad_txt=0;
state=KEY;
}
if (e... |
ushakov/mapsoft | c048d1c517bca07226b9f73e40629adda433dc50 | fix more warnings | diff --git a/core/mp/mp_io.cpp b/core/mp/mp_io.cpp
index 3fac45e..df65852 100644
--- a/core/mp/mp_io.cpp
+++ b/core/mp/mp_io.cpp
@@ -1,224 +1,223 @@
#include "utils/spirit_utils.h"
#include <boost/spirit/include/classic_assign_actor.hpp>
#include <boost/spirit/include/classic_push_back_actor.hpp>
#include <boost/sp... |
ushakov/mapsoft | 4106ef7df27e7237caa87178b21822c77a0c6e21 | core/loaders: fix warnings | diff --git a/core/2d/image_source.h b/core/2d/image_source.h
index 4fc12eb..fbdf872 100644
--- a/core/2d/image_source.h
+++ b/core/2d/image_source.h
@@ -1,101 +1,101 @@
#ifndef IMAGE_SOURCE_H
#define IMAGE_SOURCE_H
#include "point.h"
#include "rect.h"
#include <cassert>
#include "image.h"
///\addtogroup lib2... |
ushakov/mapsoft | f4e8d23992f4c23696d9607a62fdf66398af4c41 | core/img_io: fix warnings | diff --git a/core/img_io/draw_trk.cpp b/core/img_io/draw_trk.cpp
index 818ee31..566c802 100644
--- a/core/img_io/draw_trk.cpp
+++ b/core/img_io/draw_trk.cpp
@@ -1,167 +1,167 @@
#include <vector>
#include <cmath>
#include "draw_trk.h"
#include "utils/cairo_wrapper.h"
#include "2d/line_utils.h"
#include "2d/rainb... |
ushakov/mapsoft | 5af22d68336f930da27bce30e536a38078fc90be | 2d: fix more -Wsign-compare warnings | diff --git a/core/2d/image.h b/core/2d/image.h
index c3ec1df..c88a4f6 100644
--- a/core/2d/image.h
+++ b/core/2d/image.h
@@ -1,308 +1,308 @@
#ifndef IMAGE_H
#define IMAGE_H
#include "point.h"
#include "line_tests.h"
#include "rect.h"
#include <cassert>
#ifdef DEBUG_IMAGE
#include <iostream>
#endif
///... |
ushakov/mapsoft | 23c4c908792c4716840db15361f2cf4ce869d6a3 | core/cache: fix -Wsign-compare warning | diff --git a/core/cache/cache.h b/core/cache/cache.h
index 6290ec1..d80236d 100644
--- a/core/cache/cache.h
+++ b/core/cache/cache.h
@@ -1,254 +1,254 @@
#ifndef CACHE_H
#define CACHE_H
#include <map>
#include <vector>
#include <set>
#include <cassert>
#include <iostream>
///\addtogroup libmapsoft
///@{
//... |
ushakov/mapsoft | 5de837822451fa35f56f75a2214a16342a8fc4c4 | SConstruct: add -Wall flag | diff --git a/SConstruct b/SConstruct
index ddcf739..7b2623d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,102 +1,102 @@
######################################
# What do we want to build
subdirs_min = Split("core programs viewer vector man scripts")
subdirs_max = subdirs_min + Split("tests misc")
###############... |
ushakov/mapsoft | 98dc123e7f6db1113c5eeeb3b955aa9b807278f9 | core/fig: fix initialization error; fix -Wsign-compare warnings | diff --git a/core/fig/fig_data.cpp b/core/fig/fig_data.cpp
index 6fb3ab6..268ef13 100644
--- a/core/fig/fig_data.cpp
+++ b/core/fig/fig_data.cpp
@@ -1,149 +1,149 @@
#include "fig_data.h"
#include <map>
#include <string>
namespace fig {
using namespace std;
/*************************************************/... |
ushakov/mapsoft | 287070c435b804897851ac94d0972e7b77a0e932 | core/geo_io: fix -Wparentheses warning | diff --git a/core/geo_io/io.cpp b/core/geo_io/io.cpp
index ea2f375..67af982 100644
--- a/core/geo_io/io.cpp
+++ b/core/geo_io/io.cpp
@@ -1,201 +1,201 @@
#include <iostream>
#include <fstream>
#include <sstream>
#include <iomanip>
#include <cstring>
#include <dirent.h>
#include <vector>
#include <list>
#inclu... |
ushakov/mapsoft | 4bbc860c4b67f405b0b5ba8f66282a9648c078e9 | core/geo_io: fix error handling in io_zip | diff --git a/core/geo_io/io_zip.cpp b/core/geo_io/io_zip.cpp
index 2beeb17..5806eff 100644
--- a/core/geo_io/io_zip.cpp
+++ b/core/geo_io/io_zip.cpp
@@ -1,108 +1,115 @@
#include <iostream>
#include <fstream>
#include <string>
#include <cstring>
#include <zip.h>
#include "io.h"
#include "io_zip.h"
#include "er... |
ushakov/mapsoft | a00ce3ab039360cce196e616d5fc18ae14c89851 | core/geo_io: fix a few sign-compare warning | diff --git a/core/geo_io/geo_refs.cpp b/core/geo_io/geo_refs.cpp
index e7b7bc4..fa73a13 100644
--- a/core/geo_io/geo_refs.cpp
+++ b/core/geo_io/geo_refs.cpp
@@ -1,345 +1,345 @@
// ÐÑивÑзки ÑпеÑиалÑнÑÑ
каÑÑ Ð¸ Ñнимков
#include "tiles/tiles.h"
#include "geo_refs.h"
#include "geo/geo_... |
ushakov/mapsoft | fd74b9a1f617a4849e3e6b91b0f1159e29260a49 | core/geo: fix sign-compare warning | diff --git a/core/geo/geo_convs.cpp b/core/geo/geo_convs.cpp
index f295647..5a9363f 100644
--- a/core/geo/geo_convs.cpp
+++ b/core/geo/geo_convs.cpp
@@ -1,440 +1,440 @@
#include "geo_convs.h"
#include <cmath>
#include <cstring>
#include <sstream>
#include <cassert>
#include <map>
#include "2d/line_utils.h"
#i... |
ushakov/mapsoft | 570832f7f8f6af364158e194257304a116fec8bf | core/2d: fix sign-compare warning | diff --git a/core/2d/conv.cpp b/core/2d/conv.cpp
index 7f90876..791cbf9 100644
--- a/core/2d/conv.cpp
+++ b/core/2d/conv.cpp
@@ -1,180 +1,180 @@
#include "conv.h"
#include "line_utils.h"
Conv::Conv(){sc_dst=1; sc_src=1;}
void
Conv::line_frw_p2p(dLine & l) const {
for (dLine::iterator i=l.begin(); i!=l.end()... |
ushakov/mapsoft | e984a25532b4021a0ac76b2d0cd22280eaf03a7c | core/jeeps: fix multiple definition error (for gcc-10) | diff --git a/core/jeeps/garminusb.h b/core/jeeps/garminusb.h
index 9681822..d790966 100644
--- a/core/jeeps/garminusb.h
+++ b/core/jeeps/garminusb.h
@@ -1,68 +1,74 @@
/*
Definitions for Garmin USB protocol and implementation.
Copyright (C) 2004, 2005, 2006 Robert Lipe, robertlipe@usa.net
This progra... |
ushakov/mapsoft | f07ec214b6d470e952e3b72cba7e2471eb05dfee | core/2d/point.h: add missing header (for gcc-10) | diff --git a/core/2d/point.h b/core/2d/point.h
index 3c4eeb4..367680d 100644
--- a/core/2d/point.h
+++ b/core/2d/point.h
@@ -1,193 +1,194 @@
#ifndef POINT_H
#define POINT_H
#include <boost/operators.hpp>
#include <ios> // for << and >> operators
#include <iomanip> // for setprecision
+#include <istream> // f... |
ushakov/mapsoft | ad86a3a317523aa0b5a529619ed1368a5bfbd0d3 | vmap3: add missed install targets | diff --git a/vector/vmap3/SConscript b/vector/vmap3/SConscript
index 539f01c..bbc4cad 100644
--- a/vector/vmap3/SConscript
+++ b/vector/vmap3/SConscript
@@ -1,10 +1,13 @@
Import ('env')
env.Program("vmap_render.cpp")
env.Program("vmap_mmb_filter.cpp")
env.Program("vmap_1km_filter.cpp")
env.Program("vmap_fix_diff... |
ushakov/mapsoft | 23bd02a05ecf86280acbc2f836803699fa6b13b9 | img_io/gobj_vmap: draw pattens with solid color at small scales (A.Kazantsev) | diff --git a/core/img_io/gobj_vmap.cpp b/core/img_io/gobj_vmap.cpp
index 1e1f699..78016d5 100644
--- a/core/img_io/gobj_vmap.cpp
+++ b/core/img_io/gobj_vmap.cpp
@@ -1,796 +1,802 @@
#include <string>
#include <sstream>
#include <iomanip>
#include <boost/lexical_cast.hpp>
#include "loaders/image_r.h"
#include "gobj... |
ushakov/mapsoft | 866632367a5e2342138a0d14da1014678b57127a | 20191201-alt1 | diff --git a/mapsoft.spec b/mapsoft.spec
index 0dd4234..36647a2 100644
--- a/mapsoft.spec
+++ b/mapsoft.spec
@@ -1,183 +1,191 @@
Name: mapsoft
-Version: 20191110
+Version: 20191201
Release: alt1
-License: GPL
+License: GPL3.0
+
Summary: mapsoft - programs for working with maps and geodata
Group: Sciences/Geoscience... |
ushakov/mapsoft | ad645b914e3e754cb1933294e060fe89c5b626e5 | scripts: fix python shebang: python -> python2 | diff --git a/scripts/map-helper.py b/scripts/map-helper.py
index f583c01..f839808 100755
--- a/scripts/map-helper.py
+++ b/scripts/map-helper.py
@@ -1,61 +1,61 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# GIMP plug-in to create map references for soviet nomenclature maps
import re
from gimpfu import *
def help... |
ushakov/mapsoft | ab439a51c1a0abf7156eee403d9df7f8eacf4fb4 | Add LICENSE (Altlinux requires unambiguous licence in all packages) | diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..f288702
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to cop... |
ushakov/mapsoft | 52e46a784be3930ad7795fd91d63f1c10052cb5c | geo_io/geo_refs: change dpi calculation for google tiles (only --google mode), by A.Kazantsev | diff --git a/core/geo_io/geo_refs.cpp b/core/geo_io/geo_refs.cpp
index a6102d3..e7b7bc4 100644
--- a/core/geo_io/geo_refs.cpp
+++ b/core/geo_io/geo_refs.cpp
@@ -1,344 +1,345 @@
// ÐÑивÑзки ÑпеÑиалÑнÑÑ
каÑÑ Ð¸ Ñнимков
#include "tiles/tiles.h"
#include "geo_refs.h"
#include "geo/geo_... |
ushakov/mapsoft | da3ff7b17bf6e465aea28e4d5eb2923acca6b55e | programs: fix gitignore; fix convs_gtiles help message (by A.Kazantsev) | diff --git a/programs/.gitignore b/programs/.gitignore
index 64dc6ef..d5e8d7d 100644
--- a/programs/.gitignore
+++ b/programs/.gitignore
@@ -1,15 +1,16 @@
convs_map2pt
convs_nom
convs_pt2pt
+convs_gtiles
mapsoft_convert
mapsoft_fig2fig
mapsoft_geofig
mapsoft_map2fig
mapsoft_mkmap
mapsoft_pano
mapsoft_ref
map... |
ushakov/mapsoft | 415ac80d83507e001c28830c2f77eec1ae2c6edf | fix error in vmap rendering introduced by previous commit | diff --git a/core/img_io/gobj_vmap.cpp b/core/img_io/gobj_vmap.cpp
index 2d93205..1e1f699 100644
--- a/core/img_io/gobj_vmap.cpp
+++ b/core/img_io/gobj_vmap.cpp
@@ -1,600 +1,600 @@
#include <string>
#include <sstream>
#include <iomanip>
#include <boost/lexical_cast.hpp>
#include "loaders/image_r.h"
#include "gobj... |
ushakov/mapsoft | 62a7069f5631c86d1ed1fe539de98abf00fffd41 | vmap_render: --patt_filter option for controlling Cairo::Pattern filters | diff --git a/core/img_io/gobj_vmap.cpp b/core/img_io/gobj_vmap.cpp
index dfe6ce2..2d93205 100644
--- a/core/img_io/gobj_vmap.cpp
+++ b/core/img_io/gobj_vmap.cpp
@@ -1,800 +1,812 @@
#include <string>
#include <sstream>
#include <iomanip>
#include <boost/lexical_cast.hpp>
#include "loaders/image_r.h"
#include "gobj... |
ushakov/mapsoft | 397329a1b7ff22bbf561504e1a57383a7410e994 | vmap_render: initialize image; do not use border from mk_ref | diff --git a/vector/vmap3/vmap_render.cpp b/vector/vmap3/vmap_render.cpp
index 1c2b070..ff7d480 100644
--- a/vector/vmap3/vmap_render.cpp
+++ b/vector/vmap3/vmap_render.cpp
@@ -1,198 +1,199 @@
#include "img_io/gobj_vmap.h"
#include "options/m_getopt.h"
#include "options/m_time.h"
#include "geo_io/geo_refs.h"
#incl... |
ushakov/mapsoft | 23877648ff79b7a084bc65d208670c8c94c66606 | convs_gtiles: catch errors globally | diff --git a/programs/convs_gtiles.cpp b/programs/convs_gtiles.cpp
index 41c54a0..4db9b1c 100644
--- a/programs/convs_gtiles.cpp
+++ b/programs/convs_gtiles.cpp
@@ -1,159 +1,158 @@
#include "tiles/tiles.h"
#include "opts/opts.h"
#include "geo_io/geo_refs.h"
#include <iostream>
#include <cstring>
#include <vector>... |
ushakov/mapsoft | df98800ca2ec3a475aeba49267035e70bde0ceff | move convs_gtiles to programs/, add it to the installation | diff --git a/core/SConscript b/core/SConscript
index 38dc8d8..fe5f180 100644
--- a/core/SConscript
+++ b/core/SConscript
@@ -1,226 +1,224 @@
Import ('env')
import os
#swig = env.Clone()
#swig.Append(CPPPATH = [distutils.sysconfig.get_python_inc()])
#swig.Replace(SWIGFLAGS = ['-c++', '-python'])
#swig.Replace(SH... |
ushakov/mapsoft | 674cf6c8f235324beb4f69d806210655bf39fd9a | core/tiles/convs_gtiles: add -bi, -bc options, thanks to ioctl@ya | diff --git a/core/tiles/convs_gtiles.cpp b/core/tiles/convs_gtiles.cpp
index 94bd68e..fe418fd 100644
--- a/core/tiles/convs_gtiles.cpp
+++ b/core/tiles/convs_gtiles.cpp
@@ -1,80 +1,159 @@
#include "tiles.h"
#include "opts/opts.h"
+#include "geo_io/geo_refs.h"
#include <iostream>
#include <cstring>
+#include <vector... |
ushakov/mapsoft | 5c23edab1acc45bd5b6f676e31873e7a04501e12 | vmap_render: fix image size calculation (thanks to ioctl@ya) | diff --git a/vector/vmap3/vmap_render.cpp b/vector/vmap3/vmap_render.cpp
index 1a795e5..1c2b070 100644
--- a/vector/vmap3/vmap_render.cpp
+++ b/vector/vmap3/vmap_render.cpp
@@ -1,198 +1,198 @@
#include "img_io/gobj_vmap.h"
#include "options/m_getopt.h"
#include "options/m_time.h"
#include "geo_io/geo_refs.h"
#incl... |
ushakov/mapsoft | 7f90d93e5c2f9254ce3d8fa689e5341a978f247e | core/geo_io/geo_refs.cpp: fix error in option checks (thanks to ioctl@ya) | diff --git a/core/geo_io/geo_refs.cpp b/core/geo_io/geo_refs.cpp
index 06678d4..a6102d3 100644
--- a/core/geo_io/geo_refs.cpp
+++ b/core/geo_io/geo_refs.cpp
@@ -1,344 +1,344 @@
// ÐÑивÑзки ÑпеÑиалÑнÑÑ
каÑÑ Ð¸ Ñнимков
#include "tiles/tiles.h"
#include "geo_refs.h"
#include "geo/geo_... |
ushakov/mapsoft | 7fc8f3fddcaea4058919ddba761cf62b9b22e75b | 20191110-alt1 | diff --git a/mapsoft.spec b/mapsoft.spec
index 4708139..0dd4234 100644
--- a/mapsoft.spec
+++ b/mapsoft.spec
@@ -1,180 +1,183 @@
Name: mapsoft
-Version: 20190916
-Release: alt2
+Version: 20191110
+Release: alt1
License: GPL
Summary: mapsoft - programs for working with maps and geodata
Group: Sciences/Geosciences
U... |
ushakov/mapsoft | 20e2c14e478ba6c26bbae326de69719f163f0f3e | install scripts; add scripts to mapsoft_vmap package | diff --git a/mapsoft.spec b/mapsoft.spec
index 8028a5f..4708139 100644
--- a/mapsoft.spec
+++ b/mapsoft.spec
@@ -1,176 +1,180 @@
Name: mapsoft
Version: 20190916
Release: alt2
License: GPL
Summary: mapsoft - programs for working with maps and geodata
Group: Sciences/Geosciences
Url: http://github.org/ushakov/maps... |
ushakov/mapsoft | 8efde2a0f3617219e645f14dfcf7cca9f8e0d30a | scripts: add comments | diff --git a/scripts/map_gl_upd_gk b/scripts/map_gl_upd_gk
index b30a40a..628c71c 100755
--- a/scripts/map_gl_upd_gk
+++ b/scripts/map_gl_upd_gk
@@ -1,29 +1,29 @@
#!/bin/sh -efux
. mapsoft_gl.sh
. mapsoft_map.sh
-# map_gl_gk_update -- update glaciers in rectangular maps
+# map_gl_gk_update -- update glaciers in ... |
ushakov/mapsoft | 725b130dc7e1857cc3b9e6e56a574840901dd86e | scripts: move obsolete mapsoft_wp library to obsolete/ folder. Add comments. | diff --git a/scripts/map_wp_upd_gk b/scripts/map_wp_upd_gk
index 5a42308..aa6b2e8 100755
--- a/scripts/map_wp_upd_gk
+++ b/scripts/map_wp_upd_gk
@@ -1,29 +1,29 @@
#!/bin/sh -efu
-. mapsoft_wp1.sh
+. mapsoft_wp.sh
. mapsoft_map.sh
# map_wp_upd_gk -- update passes in rectangular maps
# example: map_wp_upd_gk elbr... |
ushakov/mapsoft | ed2a737de12f9056214799713ad7f7854c16e2ec | add Readme.md (EN) (closes #3) | diff --git a/Readme.md b/Readme.md
new file mode 100644
index 0000000..411f095
--- /dev/null
+++ b/Readme.md
@@ -0,0 +1,27 @@
+## Mapsoft
+
+Mapsoft is a set of libraries and tools for working with geodata, raster
+and vector maps etc. It was is not too accurate, but it was used for
+many our projects including making... |
ushakov/mapsoft | 49f945b22fe2e944326f9e0b026816ca859db125 | fix PKG_CONFIG_PATH setting in SConstruct (thanks to suntar@github) | diff --git a/SConstruct b/SConstruct
index 88a90cd..ddcf739 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,102 +1,102 @@
######################################
# What do we want to build
subdirs_min = Split("core programs viewer vector man scripts")
subdirs_max = subdirs_min + Split("tests misc")
###############... |
ushakov/mapsoft | 6e9d17931ea2512cba1e218daf8a3d77bcfc4be0 | 20190916-alt2 | diff --git a/SConstruct b/SConstruct
index 192a83f..88a90cd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,101 +1,102 @@
######################################
# What do we want to build
subdirs_min = Split("core programs viewer vector man scripts")
subdirs_max = subdirs_min + Split("tests misc")
###############... |
ushakov/mapsoft | 7b04752e09ec25048c94cf353ad6b9c955176c95 | 20190916-alt1 | diff --git a/mapsoft.spec b/mapsoft.spec
index 6e9ba6b..8dfbb69 100644
--- a/mapsoft.spec
+++ b/mapsoft.spec
@@ -1,167 +1,173 @@
Name: mapsoft
-Version: 20190213
-Release: alt2
+Version: 20190916
+Release: alt1
License: GPL
Summary: mapsoft - programs for working with maps and geodata
Group: Sciences/Geosciences
U... |
ushakov/mapsoft | 8bf479b4995322f1026dca821e8ac9438a8dced3 | mapsoft_mapview: install desktop file | diff --git a/SConstruct b/SConstruct
index e3bda78..192a83f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,100 +1,101 @@
######################################
# What do we want to build
subdirs_min = Split("core programs viewer vector man scripts")
subdirs_max = subdirs_min + Split("tests misc")
###############... |
ushakov/mapsoft | ae6b98626c4df6a6b36d72af44dbfe233d688333 | raw flag in mapsoft_geofig program | diff --git a/core/geo_io/geofig.cpp b/core/geo_io/geofig.cpp
index 6c09b94..087889a 100644
--- a/core/geo_io/geofig.cpp
+++ b/core/geo_io/geofig.cpp
@@ -1,399 +1,403 @@
#include <boost/spirit/include/classic_core.hpp>
#include <boost/spirit/include/classic_file_iterator.hpp>
#include <boost/spirit/include/classic_as... |
ushakov/mapsoft | e379b1d1d2134f0cb52fc9b877de2eb963a3e845 | mapsoft_wp_parse: fix charset conversions | diff --git a/scripts/mapsoft_wp_parse b/scripts/mapsoft_wp_parse
index d176475..168f918 100755
--- a/scripts/mapsoft_wp_parse
+++ b/scripts/mapsoft_wp_parse
@@ -1,94 +1,97 @@
#!/usr/bin/perl
use strict;
use warnings;
use Text::Iconv;
# parse kml file downloaded from Westra Passes
# (http://westra.ru/passes/kml/... |
ushakov/mapsoft | dcadce8a49a5563828fe17904fbc81563e7341cc | Revert "vector/data/styles.m4: change MP type for unknown pass" | diff --git a/vector/data/styles.m4 b/vector/data/styles.m4
index 6b286d6..486f9e7 100644
--- a/vector/data/styles.m4
+++ b/vector/data/styles.m4
@@ -1,612 +1,612 @@
divert(-1)
# Source for mmb and hr style files. Same types but different colors
define(VYS_COL, ifelse(STYLE,hr, 24,0)) # ÑÐ²ÐµÑ Ð¾ÑмеÑок вÑÑ... |
ushakov/mapsoft | 4f948e313a80ca3913b7a9427d56a936a2951ef9 | scripts/mapsoft_wp_parse: add s modifier to all regexps to allow multiline data | diff --git a/scripts/mapsoft_wp_parse b/scripts/mapsoft_wp_parse
index e22ede2..d176475 100755
--- a/scripts/mapsoft_wp_parse
+++ b/scripts/mapsoft_wp_parse
@@ -1,94 +1,94 @@
#!/usr/bin/perl
use strict;
use warnings;
use Text::Iconv;
# parse kml file downloaded from Westra Passes
# (http://westra.ru/passes/kml/... |
ushakov/mapsoft | a2b5f598328c7e1bef3a2f4be5a8253c511157ff | vector/data/styles.m4: change MP type for unknown pass | diff --git a/vector/data/styles.m4 b/vector/data/styles.m4
index 486f9e7..6b286d6 100644
--- a/vector/data/styles.m4
+++ b/vector/data/styles.m4
@@ -1,612 +1,612 @@
divert(-1)
# Source for mmb and hr style files. Same types but different colors
define(VYS_COL, ifelse(STYLE,hr, 24,0)) # ÑÐ²ÐµÑ Ð¾ÑмеÑок вÑÑ... |
quetzalzun/TianguisCabal | 1d142515c48ac134ec6942cec6a72c3434013c16 | segundo commit cambios de Richard | diff --git a/MensajeError.php b/MensajeError.php
index da08c66..82d6731 100644
--- a/MensajeError.php
+++ b/MensajeError.php
@@ -1,502 +1,552 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="FixAnotherMSIEBug.xsl"?>
<?php
include( "includes/TianguisCabalROEnviron.inc" );
// E... |
mdavid/Rx.NET | 1cb2a97fde2c028f1810d4c86d968869efe3d892 | Injection of v1.0.2838.0 redistributables | diff --git a/Net35/System.CoreEx.dll b/Net35/System.CoreEx.dll
index 0226e73..b096ad9 100644
Binary files a/Net35/System.CoreEx.dll and b/Net35/System.CoreEx.dll differ
diff --git a/Net35/System.Interactive.dll b/Net35/System.Interactive.dll
index b6f8ddf..7edef6c 100644
Binary files a/Net35/System.Interactive.dll and ... |
mdavid/Rx.NET | cc4dd1d616ceeb672f7078e3fe9ab999fea53337 | Injection of the latest release of the Rx.NET framework redistributable files from 9.10.2010 | diff --git a/Net35/System.CoreEx.dll b/Net35/System.CoreEx.dll
new file mode 100644
index 0000000..3e72878
Binary files /dev/null and b/Net35/System.CoreEx.dll differ
diff --git a/Net35/System.Interactive.dll b/Net35/System.Interactive.dll
new file mode 100644
index 0000000..2c245d9
Binary files /dev/null and b/Net35/S... |
fkhan/mupdf_fareed | 432d2f140b052e8db6b44d76339988262c0f9f40 | Some updated APIs | diff --git a/apps/kno_pdfapp.c b/apps/kno_pdfapp.c
index d49ab79..eec4def 100644
--- a/apps/kno_pdfapp.c
+++ b/apps/kno_pdfapp.c
@@ -1,165 +1,246 @@
#include <fitz.h>
#include <mupdf.h>
#include "pdfapp.h"
#include "kno_pdfapp.h"
-void kno_addHighlight(pdfapp_t *app, int x0, int y0, int x1, int y1)
+int kno_addHi... |
fkhan/mupdf_fareed | e3f65eb0771b5bd34522e8e511953b1f4fc5f6e4 | muPDF api functions | diff --git a/apps/kno_pdfapp.c b/apps/kno_pdfapp.c
new file mode 100644
index 0000000..d49ab79
--- /dev/null
+++ b/apps/kno_pdfapp.c
@@ -0,0 +1,165 @@
+#include <fitz.h>
+#include <mupdf.h>
+#include "pdfapp.h"
+#include "kno_pdfapp.h"
+
+void kno_addHighlight(pdfapp_t *app, int x0, int y0, int x1, int y1)
+{
+ app->se... |
fkhan/mupdf_fareed | 0fcbacb28558dfb145ddb5011ae7ad7248f788a8 | With muPDF api's | diff --git a/Makefile b/Makefile
index de4298b..db134d3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,360 +1,361 @@
# GNU Makefile for MuPDF
#
# make build=release prefix=$HOME install
#
prefix ?= /usr/local
build ?= debug
default: all
#
# Compiler and configuration
#
OS := $(shell uname)
OS := $(OS:MI... |
fkhan/mupdf_fareed | be0efa438b227c810b8b413fc64dcdf3cb47a880 | Separate from muPDF files. | diff --git a/Makefile b/Makefile
index 2060f29..de4298b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,360 +1,360 @@
# GNU Makefile for MuPDF
#
# make build=release prefix=$HOME install
#
prefix ?= /usr/local
build ?= debug
default: all
#
# Compiler and configuration
#
OS := $(shell uname)
OS := $(OS:MI... |
clairvy/localenv | 971d228c9cc2b4c65340ff50dad838bba38dc2a1 | ZSH use lsd | diff --git a/.zshrc b/.zshrc
index 1e60e2e..67c345e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,772 +1,772 @@
#!/usr/bin/env zsh
# -*- coding: utf-8-unix; sh-basic-offset: 2; -*-
stty -ixon
stty -istrip
bindkey -e
bindkey '^W' kill-region
HISTFILE=~/.zhistory
HISTSIZE=100000000
SAVEHIST=100000000
autoload hi... |
clairvy/localenv | bfd728af51eb8c021392cfb6fb640ef23b807cd5 | ZSH unuse ruby opt | diff --git a/.zshrc b/.zshrc
index a0b86da..1e60e2e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,775 +1,772 @@
#!/usr/bin/env zsh
# -*- coding: utf-8-unix; sh-basic-offset: 2; -*-
stty -ixon
stty -istrip
bindkey -e
bindkey '^W' kill-region
HISTFILE=~/.zhistory
HISTSIZE=100000000
SAVEHIST=100000000
autoload hi... |
clairvy/localenv | 2ae680589f794d3e5463e9f22485e4dc4e0c5dec | ZSH expand history | diff --git a/.zshrc b/.zshrc
index f62d0ae..a0b86da 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,523 +1,523 @@
#!/usr/bin/env zsh
# -*- coding: utf-8-unix; sh-basic-offset: 2; -*-
stty -ixon
stty -istrip
bindkey -e
bindkey '^W' kill-region
HISTFILE=~/.zhistory
-HISTSIZE=100000
-SAVEHIST=10000000
+HISTSIZE=10000000... |
clairvy/localenv | 831e46a16e0cbe33debe646782184d143c720a83 | TMUX change path to zsh | diff --git a/.tmux.conf b/.tmux.conf
index 42ebe27..8e5660b 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,36 +1,36 @@
# tmuxèµ·åæã®ã·ã§ã«ãzshã«ãã
-set-option -g default-shell /usr/local/bin/zsh
+set-option -g default-shell /bin/zsh
## ã¢ã¯ãã£ããªãã¤ã³ã®ã¿ç½ã£ã½ãå¤æ´ï¼çã£é»ã... |
clairvy/localenv | 0cd8a24cc1f2f47310e89f256af84e433882db1d | BREW update brew file | diff --git a/Brewfile b/Brewfile
index 4dd02ed..c7f8f61 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,34 +1,26 @@
-tap "greymd/tools"
-tap "homebrew/bundle"
-tap "homebrew/cask"
-tap "homebrew/core"
-brew "emacs", args: ["HEAD", "cocoa", "srgb", "use-git-head"]
-brew "exa"
brew "fzf"
-brew "gist"
brew "git"
-brew "go"
+... |
clairvy/localenv | f965c71858d55902e8028829c2536ca652cb1f2c | VIM some settings | diff --git a/.vim/userautoload/dein/lazy.toml b/.vim/userautoload/dein/lazy.toml
index 2b0e999..49b41af 100644
--- a/.vim/userautoload/dein/lazy.toml
+++ b/.vim/userautoload/dein/lazy.toml
@@ -1,3 +1,24 @@
[[plugins]]
repo = 'cespare/vim-toml'
on_ft = ['toml']
+
+[[plugins]]
+repo = 'puremourning/vimspector'
+on_ft ... |
clairvy/localenv | 80e6d3f69a2537e27b64af56be3f31faa2e84d22 | VIM add color theme | diff --git a/.vimrc b/.vimrc
index 8a62e4c..05be9d4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,278 +1,279 @@
filetype on
"dein Scripts-----------------------------
if &compatible
set nocompatible " Be iMproved
endif
let s:dein_dir = $HOME . '/.cache/dein'
let s:dein_repo_dir = s:dein_dir . '/repo... |
clairvy/localenv | 2bba23f77c0cbcbc5c900fc5c7fb0ebbc641066b | ZSH Add git switch command alias | diff --git a/.zshrc b/.zshrc
index 10fbe2f..f62d0ae 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,773 +1,775 @@
#!/usr/bin/env zsh
# -*- coding: utf-8-unix; sh-basic-offset: 2; -*-
stty -ixon
stty -istrip
bindkey -e
bindkey '^W' kill-region
HISTFILE=~/.zhistory
HISTSIZE=100000
SAVEHIST=10000000
autoload histor... |
clairvy/localenv | ad19e3e4f670ae20fc9b95bc048fc9988e653f39 | VIM expand redrawtime | diff --git a/.vimrc b/.vimrc
index e14977b..8a62e4c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,276 +1,278 @@
filetype on
"dein Scripts-----------------------------
if &compatible
set nocompatible " Be iMproved
endif
let s:dein_dir = $HOME . '/.cache/dein'
let s:dein_repo_dir = s:dein_dir . '/repo... |
clairvy/localenv | baa31a687b1786383fb93309f586635376aee98e | KARABINER update version | diff --git a/.config/karabiner/.gitignore b/.config/karabiner/.gitignore
new file mode 100644
index 0000000..63c8467
--- /dev/null
+++ b/.config/karabiner/.gitignore
@@ -0,0 +1 @@
+/automatic_backups
diff --git a/.config/karabiner/karabiner.json b/.config/karabiner/karabiner.json
index 090316e..790efed 100644
--- a/.co... |
clairvy/localenv | f1cee3fdf96e17a8bbf980da4c15f47df99687f1 | ZSH rg to use default option | diff --git a/.zshrc b/.zshrc
index 6e96c10..10fbe2f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -248,513 +248,526 @@ if [[ $os == 'bsd' ]]; then
manpath=($manpath /usr/local/share/man /usr/local/man)
export PKG_DBDIR=$HOME/local/var/db/pkg
export PORT_DBDIR=$HOME/local/var/db/pkg
export INSTALL_AS_USER
export LD... |
clairvy/localenv | 774ecb9195844b133007f1dd0a2da669f06594b6 | VIM Add vim-lsp-settings and some test code | diff --git a/.vim/userautoload/dein/plugins.toml b/.vim/userautoload/dein/plugins.toml
index 24e6631..1179f6c 100644
--- a/.vim/userautoload/dein/plugins.toml
+++ b/.vim/userautoload/dein/plugins.toml
@@ -1,141 +1,157 @@
[[plugins]]
repo = 'Shougo/dein.vim'
[[plugins]]
repo = 'Shougo/neosnippet.vim'
[[plugins]... |
clairvy/localenv | e63862f85c6a283b61ad92fe6de11ffcaa7abb18 | BREW Add some tools | diff --git a/Brewfile b/Brewfile
index 24225a3..4dd02ed 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,30 +1,34 @@
tap "greymd/tools"
tap "homebrew/bundle"
tap "homebrew/cask"
tap "homebrew/core"
brew "emacs", args: ["HEAD", "cocoa", "srgb", "use-git-head"]
+brew "exa"
brew "fzf"
brew "gist"
brew "git"
brew "go"
... |
clairvy/localenv | 214c3c24f5924a8f957d004a49658a5daa1b9c5b | ZSH Add path to openssl for ruby build | diff --git a/.zshrc b/.zshrc
index 853c467..6e96c10 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,757 +1,760 @@
#!/usr/bin/env zsh
# -*- coding: utf-8-unix; sh-basic-offset: 2; -*-
stty -ixon
stty -istrip
bindkey -e
bindkey '^W' kill-region
HISTFILE=~/.zhistory
HISTSIZE=100000
SAVEHIST=10000000
autoload histor... |
clairvy/localenv | 0c01c13146342b1230abbe9055187dc5cc326ceb | ZSH Bindkey Ctrl-O to fzf | diff --git a/.zshrc b/.zshrc
index b44bbc9..853c467 100644
--- a/.zshrc
+++ b/.zshrc
@@ -229,523 +229,529 @@ if [[ -d /usr/local/sbin ]]; then
path=(/usr/local/sbin $path)
fi
if [[ -d /usr/local/bin ]]; then
path=(/usr/local/bin $path)
fi
if [[ -d /usr/local/share/man ]]; then
manpath=(/usr/local/share/man... |
clairvy/localenv | 010be2d2340d02502d7b6f4043080cef5eef6f88 | VIM Add indent setting | diff --git a/.vimrc b/.vimrc
index da94713..6d1dbfd 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,265 +1,284 @@
filetype on
"dein Scripts-----------------------------
if &compatible
set nocompatible " Be iMproved
endif
let s:dein_dir = $HOME . '/.cache/dein'
let s:dein_repo_dir = s:dein_dir . '/repo... |
clairvy/localenv | b6b9a8404d6f5b85f2a2b2c7a56f424ff1460478 | TIG add move command and view setting | diff --git a/.tigrc b/.tigrc
index 0ea54e9..292a446 100644
--- a/.tigrc
+++ b/.tigrc
@@ -1,33 +1,69 @@
#--------------------------------------------------------------#
## tig settings ##
#--------------------------------------------------------------#
set main-view = i... |
clairvy/localenv | b71974a53500793fe6b6167bfbfbc67c960a3ca0 | VIM Add fzf conf | diff --git a/.vim/userautoload/dein/plugins.toml b/.vim/userautoload/dein/plugins.toml
index dfb3d86..24e6631 100644
--- a/.vim/userautoload/dein/plugins.toml
+++ b/.vim/userautoload/dein/plugins.toml
@@ -1,119 +1,141 @@
[[plugins]]
repo = 'Shougo/dein.vim'
[[plugins]]
repo = 'Shougo/neosnippet.vim'
[[plugins]... |
clairvy/localenv | 1317a633c81509db2b60a9f9074fe0c03258f90a | ZSH Add fzf conf | diff --git a/.zshrc b/.zshrc
index af6b121..b44bbc9 100644
--- a/.zshrc
+++ b/.zshrc
@@ -227,513 +227,525 @@ fi
# /usr/local
if [[ -d /usr/local/sbin ]]; then
path=(/usr/local/sbin $path)
fi
if [[ -d /usr/local/bin ]]; then
path=(/usr/local/bin $path)
fi
if [[ -d /usr/local/share/man ]]; then
manpath=(/u... |
clairvy/localenv | c13b14324f013096a4b2fcd60d344fa345298e9f | BREW Add ripgrep | diff --git a/Brewfile b/Brewfile
index c37183c..24225a3 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,29 +1,30 @@
tap "greymd/tools"
tap "homebrew/bundle"
tap "homebrew/cask"
tap "homebrew/core"
brew "emacs", args: ["HEAD", "cocoa", "srgb", "use-git-head"]
brew "fzf"
brew "gist"
brew "git"
brew "go"
brew "lv"
b... |
clairvy/localenv | f0e35493cca6f072a21476ad13425dfeabe2c931 | BREW Update format for bundle dump | diff --git a/Brewfile b/Brewfile
index d046d3c..c37183c 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,32 +1,29 @@
-update
-
-upgrade
-
-install zsh 2>&1 | egrep -v '^Warning: ' || true
-install git 2>&1 | egrep -v '^Warning: ' || true
-install lv 2>&1 | egrep -v '^Warning: ' || true
-install rlwrap 2>&1 | egrep -v '^Warni... |
clairvy/localenv | b2e769070118ddb5444c167a45e81b3aedbd68d2 | Ignore history file. | diff --git a/.gitignore b/.gitignore
index c38d3fa..a28371e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
*~
.emacs.d/auto-save-list
.emacs.d/js2-mode/build/
.emacs.d/url
*.elc
/.emacs.d/ac-comphist.dat
/.emacs.d/anything-c-adaptive-history
/.config/gcloud
+/.vim/.netrwhist
|
clairvy/localenv | 66ca37344bca09b6f35e7eb66dbe0b12fb3a72a8 | BREW Add vim, tig | diff --git a/Brewfile b/Brewfile
index be74256..d046d3c 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,32 +1,32 @@
update
upgrade
install zsh 2>&1 | egrep -v '^Warning: ' || true
install git 2>&1 | egrep -v '^Warning: ' || true
install lv 2>&1 | egrep -v '^Warning: ' || true
install rlwrap 2>&1 | egrep -v '^Warni... |
clairvy/localenv | 388f35ec4c8973a0ead9d0cdc15e715c9238a925 | TIG Add tig config | diff --git a/.tigrc b/.tigrc
new file mode 100644
index 0000000..0ea54e9
--- /dev/null
+++ b/.tigrc
@@ -0,0 +1,33 @@
+#--------------------------------------------------------------#
+## tig settings ##
+#--------------------------------------------------------------#
+set ... |
clairvy/localenv | 641fdedea9a0833f0078c19dab2766d9edc990ed | VIM Add window shortcut | diff --git a/.vimrc b/.vimrc
index d76b34f..da94713 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,255 +1,265 @@
filetype on
"dein Scripts-----------------------------
if &compatible
set nocompatible " Be iMproved
endif
let s:dein_dir = $HOME . '/.cache/dein'
let s:dein_repo_dir = s:dein_dir . '/repo... |
clairvy/localenv | 4d025b0807fccdcf41e3061593a430687956f135 | VIM Add plugin for window resize. | diff --git a/.vim/userautoload/dein/plugins.toml b/.vim/userautoload/dein/plugins.toml
index 95605bb..dfb3d86 100644
--- a/.vim/userautoload/dein/plugins.toml
+++ b/.vim/userautoload/dein/plugins.toml
@@ -1,116 +1,119 @@
[[plugins]]
repo = 'Shougo/dein.vim'
[[plugins]]
repo = 'Shougo/neosnippet.vim'
[[plugins]... |
clairvy/localenv | a0c3dbce4fbfa13898398705b3ed55a56b179975 | Ignore gcloud files. | diff --git a/.gitignore b/.gitignore
index eba2dd0..c38d3fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
*~
.emacs.d/auto-save-list
.emacs.d/js2-mode/build/
.emacs.d/url
*.elc
/.emacs.d/ac-comphist.dat
/.emacs.d/anything-c-adaptive-history
+/.config/gcloud
|
clairvy/localenv | e24cfa1660c562b72ce2f4d29d7a6897b1f4a08f | VIM Add some plugins | diff --git a/.vim/userautoload/dein/plugins.toml b/.vim/userautoload/dein/plugins.toml
index dd9587e..95605bb 100644
--- a/.vim/userautoload/dein/plugins.toml
+++ b/.vim/userautoload/dein/plugins.toml
@@ -1,81 +1,116 @@
[[plugins]]
repo = 'Shougo/dein.vim'
[[plugins]]
repo = 'Shougo/neosnippet.vim'
[[plugins]]... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.