Skip to content

Commit

Permalink
Version 1.11.1. Fixes Issue #8, stupid bug on my part.
Browse files Browse the repository at this point in the history
  • Loading branch information
larrykollar committed Oct 15, 2017
1 parent ea64f2a commit 9ebc4ff
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 15 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
asc2c
tines
test.*
pkgs/
tines.work*
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@

# Arguments to install
# Use this one for Linux
INSTFLAGS=-D
# INSTFLAGS=-D
# Use this one for MacOSX, BSD, and Cygwin
# INSTFLAGS=-d
INSTFLAGS=-d

# Install directories
BINDIR=/usr/local/bin
MANDIR=/usr/local/man
SHAREDIR=/usr/local/share/tines
PKGBINDIR=ar/bin
PKGMANDIR=ar/man
PKGSHAREDIR=ar/share/tines

# Override the shell builtin echo
ECHO=/bin/echo
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Tines is a console-based outliner/planner/notebook.
It is a fork of the hnb outliner,
which has not been updated in over 10 years.

The current version is 1.10. See the [Changelog](https://github.com/larrykollar/tines/wiki/Changelog.md) for a list of new features.
The current version is 1.11.1. See the [Changelog](https://github.com/larrykollar/tines/wiki/Changelog.md) for a list of new features.

See the ROADMAP file for further planned updates
along the way to version 2.0 and beyond.
Expand Down
2 changes: 1 addition & 1 deletion extras/tinesdoc.ms
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ savepos (integer)
.LP
If true, saves the current position along with the data. Supported in both hnb and OPML formats.
.LP
On save, Tines inserts a \<?pos="x"?> processing instruction, where x is the current position. When reading the file, Tines sets the current position to the value found in the processing instruction.
On save, Tines inserts a \<?tines pos="x"?> processing instruction, where x is the current position. When reading the file, Tines sets the current position to the value found in the processing instruction.
.NH 3
readonly (integer)
.LP
Expand Down
2 changes: 1 addition & 1 deletion src/config.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#define PACKAGE "tines"
#define VERSION "1.10.2"
#define VERSION "1.11.1"
#define SHAREDIR "/usr/local/share/tines/"
#define RCFILEIN "tinesrc"
#define RCFILEOUT ".tinesrc"
Expand Down
2 changes: 1 addition & 1 deletion src/file_xml.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* file_ascii.c -- generic xml import/export filters for hnb
*
* Copyright (C) 2001-2003 Øyvind Kolås <[email protected]>
* Copyright (C) 2001-2003 Øyvind Kolås <[email protected]>
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free
Expand Down
18 changes: 9 additions & 9 deletions src/ui_draw.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ extern int nodes_above;
extern int active_line;
extern int nodes_below;

extern int tines_nodes_up;
extern int tines_nodes_down;

static Node *up (Node *sel, Node *node)
{
if (node_up (node) && node_getflag( node_up (node), F_expanded)) {
Expand Down Expand Up @@ -731,9 +734,6 @@ void ui_draw (Node *node, char *input, int edit_mode)
{
int lines;

int hnb_nodes_up;
int hnb_nodes_down;

static struct {
long self;
long prev;
Expand Down Expand Up @@ -787,8 +787,8 @@ void ui_draw (Node *node, char *input, int edit_mode)
nodes_below = LINES - active_line;

{
hnb_nodes_up = 0;
hnb_nodes_down = 0;
tines_nodes_up = 0;
tines_nodes_down = 0;

erase ();
/* draw nodes above selected node */
Expand All @@ -805,7 +805,7 @@ void ui_draw (Node *node, char *input, int edit_mode)
line_nodeno[line] = node_no (tnode);

if (node_down (tnode) == prev_down) {
hnb_nodes_up++;
tines_nodes_up++;
prev_down = tnode;
}

Expand Down Expand Up @@ -839,7 +839,7 @@ void ui_draw (Node *node, char *input, int edit_mode)
lines += draw_item (lines, 0, tnode, drawmode_normal);

if (node_up (tnode) == prev_up) {
hnb_nodes_down++;
tines_nodes_down++;
prev_up = tnode;
}

Expand All @@ -857,8 +857,8 @@ void ui_draw (Node *node, char *input, int edit_mode)

/* refresh ();*/

hnb_nodes_up++;
hnb_nodes_down++;
tines_nodes_up++;
tines_nodes_down++;
}

/*
Expand Down

0 comments on commit 9ebc4ff

Please sign in to comment.