From 87afabc0936d6acca0bca69175778f3449a7d177 Mon Sep 17 00:00:00 2001
From: Offray Luna <offray.luna@mutabit.com>
Date: Thu, 29 Jan 2015 10:14:44 +0000
Subject: [PATCH] Integrating the Testing branch.

---
 .../Grafoscopio/GrafoscopioBrowser.class.st    | 18 +++++++++---------
 .../Grafoscopio/GrafoscopioNode.class.st       | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/repository/Grafoscopio/GrafoscopioBrowser.class.st b/repository/Grafoscopio/GrafoscopioBrowser.class.st
index 0964976..a0abd5a 100644
--- a/repository/Grafoscopio/GrafoscopioBrowser.class.st
+++ b/repository/Grafoscopio/GrafoscopioBrowser.class.st
@@ -344,10 +344,11 @@ GrafoscopioBrowser >> configureInitialTags [
 
 	tagsAvailable := OrderedCollection new.
 	tagsAvailable
+		add: 'código';
+		add: 'invisible';
 		add: 'obra';
 		add: 'original';
-		add: 'transmediado';
-		add: 'código'.
+		add: 'transmediado'.
 ]
 
 { #category : #'system-support' }
@@ -959,25 +960,24 @@ GrafoscopioBrowser >> treeOn: constructor [
 		act: [self addToTagsAvailable] entitled: 'Agregar a disponibles' categorized: 'Etiquetas';
 
 		"For projects"
-		act: [self enableRepository] entitled: 'Activar' categorized: 'Proyecto';
+		act: [self enableRepository] entitled: 'Activar proyecto local' categorized: 'Proyecto';
+		act: [self messageNotImplementedYet] entitled: 'Activar proyecto remoto' categorized: 'Proyecto';
 		act: [self addFileToRepository] entitled: 'Agregar archivo' categorized: 'Proyecto';
 		act: [self messageNotImplementedYet] entitled: 'Eliminar archivo' categorized: 'Proyecto';
 		act: [self repositoryCommit] entitled: 'Enviar al histórico' categorized: 'Proyecto';
 		act: [self repositoryCredentials] entitled: 'Acreditarse' categorized: 'Proyecto';
-		
-		"For modes"
-		act: [GrafoscopioBrowser new openFromFile: workingFile fullName asFileReference] entitled: 'Predeterminado' categorized: 'Modos';
-		act: [self buildBrowserNamed: workingFile inMode: 'transmedia'] entitled: 'Transmedia' categorized: 'Modos';
-		
+		act: [self repositoryCredentials] entitled: 'Sincronizar local y remoto' categorized: 'Proyecto';
+				
 		"For help"
 		act: [self messageNotImplementedYet] entitled: 'Ver como html en línea' categorized: 'Ayuda';
 		act: [self messageNotImplementedYet] entitled: 'Ver como html fuera línea' categorized: 'Ayuda';
 		act: [self messageNotImplementedYet] entitled: 'Ver como árbol en grafoscopio' categorized: 'Ayuda';		
 
 		"For external tools"
+		act: [self messageNotImplementedYet] entitled: 'Instalar' categorized: 'Herramientas externas';
 		act: [self messageNotImplementedYet] entitled: 'Actualizar' categorized: 'Herramientas externas';
 		act: [self configurePandoc] entitled: 'Definir ruta a pandoc' categorized: 'Herramientas externas';
-		act: [self messageNotImplementedYet] entitled: 'Definir ruta a fossil' categorized: 'Herramientas externas';		
+		act: [self configureFossil] entitled: 'Definir ruta a fossil' categorized: 'Herramientas externas';		
 				
 		"For grafoscopio"
 		act: [self updateGrafoscopio] entitled: 'Actualizar' categorized: 'Grafoscopio';
diff --git a/repository/Grafoscopio/GrafoscopioNode.class.st b/repository/Grafoscopio/GrafoscopioNode.class.st
index 6812e55..d474ba9 100644
--- a/repository/Grafoscopio/GrafoscopioNode.class.st
+++ b/repository/Grafoscopio/GrafoscopioNode.class.st
@@ -89,8 +89,8 @@ GrafoscopioNode >> ancestors [
 	
 	currentNode := self.
 	ancestors := OrderedCollection new.
-	(self level - 1) 
-		timesRepeat: [ 
+	[currentNode level > 0] 
+		whileTrue: [ 
 			ancestors add: currentNode parent.
 			currentNode := currentNode parent.].
 	ancestors := ancestors reversed.
@@ -119,14 +119,14 @@ GrafoscopioNode >> ancestorsHeaders [
 
 { #category : #exporting }
 GrafoscopioNode >> asMarkdown [
-	"Exports children of the curren node as pandoc markdown, using special nodes for config options and bibliography."
+	"Exports children of the current node as pandoc markdown, using special nodes accoding to tags"
 	| markdownOutput |
 	
 	markdownOutput := '' writeStream.
 	(self preorderTraversal) do: [ :eachNode | 
-		(eachNode level > 0) & (eachNode header notNil) ifTrue: [
-										 (eachNode hasAncestorHeaderWith: '%invisible') not
-											ifTrue: [ markdownOutput nextPutAll:  (eachNode markdownContent) ]]].
+		(eachNode level > 0) 
+			ifTrue: [(eachNode hasAncestorTaggedAs: 'invisible') | (eachNode tags = 'invisible')
+							ifFalse: [ markdownOutput nextPutAll:  (eachNode markdownContent) ]]].
 	
 	^markdownOutput contents 
 	
@@ -211,9 +211,9 @@ GrafoscopioNode >> hasAncestorHeaderWith: aSpecialWord [
 
 { #category : #exporting }
 GrafoscopioNode >> hasAncestorTaggedAs: aSpecialWord [
-	"Looks if the receptor node has an ancestor with a header with 'aSpecialWord' as the only or the first word"
+	"Looks if the receptor node has an ancestor with a header with 'aSpecialWord' in its tags"
 	
-	^ self ancestors detect: [:eachAncestor | eachAncestor tags = aSpecialWord ]
+	self ancestors detect: [:eachAncestor | eachAncestor tags = aSpecialWord ] ifFound: [^true ] ifNone: [^false ].
  
 	
 ]
@@ -341,7 +341,7 @@ GrafoscopioNode >> markdownContent [
 			markdown nextPutAll: (self body contents withInternetLineEndings); lf; lf. ].
 	((self header findString: '%embed') = 1)
 		ifTrue: [ ].	
-	((self header findString: '%invisible') = 1) | (self header = '%invisible')
+	(self tags = 'invisible')
 		ifTrue: [
 			invisibleChildren := self children.
 			invisibleChildren ifNotNil: [ ] ].