From 5d4ec6c43f4713cec6e84fabf9f5d8d6f14f4e93 Mon Sep 17 00:00:00 2001 From: Felix Krause Date: Sat, 8 Oct 2016 21:08:12 +0200 Subject: [PATCH] Numeric sorting also for snippet files --- doc/rstPreproc.nim | 6 +++--- doc/snippets/quickstart/{01/code.nim => 00/00-code.nim} | 0 doc/snippets/quickstart/{01/out.yaml => 00/01-out.yaml} | 0 doc/snippets/quickstart/00/title | 1 + doc/snippets/quickstart/{02/code.nim => 01/00-code.nim} | 0 doc/snippets/quickstart/{02/in.yaml => 01/01-in.yaml} | 0 doc/snippets/quickstart/01/title | 2 +- doc/snippets/quickstart/{03/code.nim => 02/00-code.nim} | 0 doc/snippets/quickstart/{03/out.yaml => 02/01-out.yaml} | 0 doc/snippets/quickstart/02/title | 2 +- doc/snippets/quickstart/{04/code.nim => 03/00-code.nim} | 0 doc/snippets/quickstart/{04/out.yaml => 03/01-out.yaml} | 0 doc/snippets/quickstart/03/title | 2 +- doc/snippets/quickstart/{05/code.nim => 04/00-code.nim} | 0 doc/snippets/quickstart/{05/in.yaml => 04/01-in.yaml} | 0 doc/snippets/quickstart/04/title | 2 +- doc/snippets/quickstart/{06/code.nim => 05/00-code.nim} | 0 doc/snippets/quickstart/{06/out.yaml => 05/01-out.yaml} | 0 doc/snippets/quickstart/05/title | 2 +- doc/snippets/quickstart/{07/code.nim => 06/00-code.nim} | 0 doc/snippets/quickstart/{07/out.yaml => 06/01-out.yaml} | 0 doc/snippets/quickstart/06/title | 2 +- doc/snippets/quickstart/{08/code.nim => 07/00-code.nim} | 0 doc/snippets/quickstart/{08/in.yaml => 07/01-in.yaml} | 0 doc/snippets/quickstart/07/title | 2 +- .../quickstart/{09/01/code.nim => 08/00/00-code.nim} | 0 doc/snippets/quickstart/{09/01/in.yaml => 08/00/01-in.yaml} | 0 doc/snippets/quickstart/{09/01 => 08/00}/title | 0 .../quickstart/{09/02/code.nim => 08/01/00-code.nim} | 0 doc/snippets/quickstart/{09/02/in.yaml => 08/01/01-in.yaml} | 0 doc/snippets/quickstart/{09/02 => 08/01}/title | 0 doc/snippets/quickstart/08/title | 2 +- doc/snippets/quickstart/09/title | 1 - 33 files changed, 12 insertions(+), 12 deletions(-) rename doc/snippets/quickstart/{01/code.nim => 00/00-code.nim} (100%) rename doc/snippets/quickstart/{01/out.yaml => 00/01-out.yaml} (100%) create mode 100644 doc/snippets/quickstart/00/title rename doc/snippets/quickstart/{02/code.nim => 01/00-code.nim} (100%) rename doc/snippets/quickstart/{02/in.yaml => 01/01-in.yaml} (100%) rename doc/snippets/quickstart/{03/code.nim => 02/00-code.nim} (100%) rename doc/snippets/quickstart/{03/out.yaml => 02/01-out.yaml} (100%) rename doc/snippets/quickstart/{04/code.nim => 03/00-code.nim} (100%) rename doc/snippets/quickstart/{04/out.yaml => 03/01-out.yaml} (100%) rename doc/snippets/quickstart/{05/code.nim => 04/00-code.nim} (100%) rename doc/snippets/quickstart/{05/in.yaml => 04/01-in.yaml} (100%) rename doc/snippets/quickstart/{06/code.nim => 05/00-code.nim} (100%) rename doc/snippets/quickstart/{06/out.yaml => 05/01-out.yaml} (100%) rename doc/snippets/quickstart/{07/code.nim => 06/00-code.nim} (100%) rename doc/snippets/quickstart/{07/out.yaml => 06/01-out.yaml} (100%) rename doc/snippets/quickstart/{08/code.nim => 07/00-code.nim} (100%) rename doc/snippets/quickstart/{08/in.yaml => 07/01-in.yaml} (100%) rename doc/snippets/quickstart/{09/01/code.nim => 08/00/00-code.nim} (100%) rename doc/snippets/quickstart/{09/01/in.yaml => 08/00/01-in.yaml} (100%) rename doc/snippets/quickstart/{09/01 => 08/00}/title (100%) rename doc/snippets/quickstart/{09/02/code.nim => 08/01/00-code.nim} (100%) rename doc/snippets/quickstart/{09/02/in.yaml => 08/01/01-in.yaml} (100%) rename doc/snippets/quickstart/{09/02 => 08/01}/title (100%) delete mode 100644 doc/snippets/quickstart/09/title diff --git a/doc/rstPreproc.nim b/doc/rstPreproc.nim index 22522eb..92dfae4 100644 --- a/doc/rstPreproc.nim +++ b/doc/rstPreproc.nim @@ -85,21 +85,21 @@ proc outputExamples(curPath: string, level: int = 0) = case codeFiles.len of 0: discard of 1: - let (nullPath, name, extension) = codeFiles[0].splitFile() + let (_, _, extension) = codeFiles[0].splitFile() append(".. code:: " & extension[1..^1]) append(" :file: " & (curPath / codeFiles[0]) & '\l') of 2: append(".. raw:: html") append(" ") for codeFile in codeFiles: - append(" ") + append(" ") append(" \n
" & codeFile & "" & codeFile[3..^1] & "
\n") var first = true for codeFile in codeFiles: if first: first = false else: append(".. raw:: html\n \n") - let (nullPath, name, extension) = codeFile.splitFile() + let (_, _, extension) = codeFile.splitFile() append(".. code:: " & extension[1..^1]) append(" :file: " & (curPath / codeFile) & '\l') diff --git a/doc/snippets/quickstart/01/code.nim b/doc/snippets/quickstart/00/00-code.nim similarity index 100% rename from doc/snippets/quickstart/01/code.nim rename to doc/snippets/quickstart/00/00-code.nim diff --git a/doc/snippets/quickstart/01/out.yaml b/doc/snippets/quickstart/00/01-out.yaml similarity index 100% rename from doc/snippets/quickstart/01/out.yaml rename to doc/snippets/quickstart/00/01-out.yaml diff --git a/doc/snippets/quickstart/00/title b/doc/snippets/quickstart/00/title new file mode 100644 index 0000000..fd45668 --- /dev/null +++ b/doc/snippets/quickstart/00/title @@ -0,0 +1 @@ +Dumping Nim objects as YAML diff --git a/doc/snippets/quickstart/02/code.nim b/doc/snippets/quickstart/01/00-code.nim similarity index 100% rename from doc/snippets/quickstart/02/code.nim rename to doc/snippets/quickstart/01/00-code.nim diff --git a/doc/snippets/quickstart/02/in.yaml b/doc/snippets/quickstart/01/01-in.yaml similarity index 100% rename from doc/snippets/quickstart/02/in.yaml rename to doc/snippets/quickstart/01/01-in.yaml diff --git a/doc/snippets/quickstart/01/title b/doc/snippets/quickstart/01/title index fd45668..96a5007 100644 --- a/doc/snippets/quickstart/01/title +++ b/doc/snippets/quickstart/01/title @@ -1 +1 @@ -Dumping Nim objects as YAML +Loading Nim objects from YAML diff --git a/doc/snippets/quickstart/03/code.nim b/doc/snippets/quickstart/02/00-code.nim similarity index 100% rename from doc/snippets/quickstart/03/code.nim rename to doc/snippets/quickstart/02/00-code.nim diff --git a/doc/snippets/quickstart/03/out.yaml b/doc/snippets/quickstart/02/01-out.yaml similarity index 100% rename from doc/snippets/quickstart/03/out.yaml rename to doc/snippets/quickstart/02/01-out.yaml diff --git a/doc/snippets/quickstart/02/title b/doc/snippets/quickstart/02/title index 96a5007..944d448 100644 --- a/doc/snippets/quickstart/02/title +++ b/doc/snippets/quickstart/02/title @@ -1 +1 @@ -Loading Nim objects from YAML +Customizing output style diff --git a/doc/snippets/quickstart/04/code.nim b/doc/snippets/quickstart/03/00-code.nim similarity index 100% rename from doc/snippets/quickstart/04/code.nim rename to doc/snippets/quickstart/03/00-code.nim diff --git a/doc/snippets/quickstart/04/out.yaml b/doc/snippets/quickstart/03/01-out.yaml similarity index 100% rename from doc/snippets/quickstart/04/out.yaml rename to doc/snippets/quickstart/03/01-out.yaml diff --git a/doc/snippets/quickstart/03/title b/doc/snippets/quickstart/03/title index 944d448..4ffce07 100644 --- a/doc/snippets/quickstart/03/title +++ b/doc/snippets/quickstart/03/title @@ -1 +1 @@ -Customizing output style +Dumping reference types and cyclic structures diff --git a/doc/snippets/quickstart/05/code.nim b/doc/snippets/quickstart/04/00-code.nim similarity index 100% rename from doc/snippets/quickstart/05/code.nim rename to doc/snippets/quickstart/04/00-code.nim diff --git a/doc/snippets/quickstart/05/in.yaml b/doc/snippets/quickstart/04/01-in.yaml similarity index 100% rename from doc/snippets/quickstart/05/in.yaml rename to doc/snippets/quickstart/04/01-in.yaml diff --git a/doc/snippets/quickstart/04/title b/doc/snippets/quickstart/04/title index 4ffce07..225029d 100644 --- a/doc/snippets/quickstart/04/title +++ b/doc/snippets/quickstart/04/title @@ -1 +1 @@ -Dumping reference types and cyclic structures +Loading reference types and cyclic structures diff --git a/doc/snippets/quickstart/06/code.nim b/doc/snippets/quickstart/05/00-code.nim similarity index 100% rename from doc/snippets/quickstart/06/code.nim rename to doc/snippets/quickstart/05/00-code.nim diff --git a/doc/snippets/quickstart/06/out.yaml b/doc/snippets/quickstart/05/01-out.yaml similarity index 100% rename from doc/snippets/quickstart/06/out.yaml rename to doc/snippets/quickstart/05/01-out.yaml diff --git a/doc/snippets/quickstart/05/title b/doc/snippets/quickstart/05/title index 225029d..dda14d4 100644 --- a/doc/snippets/quickstart/05/title +++ b/doc/snippets/quickstart/05/title @@ -1 +1 @@ -Loading reference types and cyclic structures +Defining a custom tag uri for a type diff --git a/doc/snippets/quickstart/07/code.nim b/doc/snippets/quickstart/06/00-code.nim similarity index 100% rename from doc/snippets/quickstart/07/code.nim rename to doc/snippets/quickstart/06/00-code.nim diff --git a/doc/snippets/quickstart/07/out.yaml b/doc/snippets/quickstart/06/01-out.yaml similarity index 100% rename from doc/snippets/quickstart/07/out.yaml rename to doc/snippets/quickstart/06/01-out.yaml diff --git a/doc/snippets/quickstart/06/title b/doc/snippets/quickstart/06/title index dda14d4..21eb8cf 100644 --- a/doc/snippets/quickstart/06/title +++ b/doc/snippets/quickstart/06/title @@ -1 +1 @@ -Defining a custom tag uri for a type +Dumping Nim objects as JSON diff --git a/doc/snippets/quickstart/08/code.nim b/doc/snippets/quickstart/07/00-code.nim similarity index 100% rename from doc/snippets/quickstart/08/code.nim rename to doc/snippets/quickstart/07/00-code.nim diff --git a/doc/snippets/quickstart/08/in.yaml b/doc/snippets/quickstart/07/01-in.yaml similarity index 100% rename from doc/snippets/quickstart/08/in.yaml rename to doc/snippets/quickstart/07/01-in.yaml diff --git a/doc/snippets/quickstart/07/title b/doc/snippets/quickstart/07/title index 21eb8cf..5fb44c7 100644 --- a/doc/snippets/quickstart/07/title +++ b/doc/snippets/quickstart/07/title @@ -1 +1 @@ -Dumping Nim objects as JSON +Loading Nim objects from JSON diff --git a/doc/snippets/quickstart/09/01/code.nim b/doc/snippets/quickstart/08/00/00-code.nim similarity index 100% rename from doc/snippets/quickstart/09/01/code.nim rename to doc/snippets/quickstart/08/00/00-code.nim diff --git a/doc/snippets/quickstart/09/01/in.yaml b/doc/snippets/quickstart/08/00/01-in.yaml similarity index 100% rename from doc/snippets/quickstart/09/01/in.yaml rename to doc/snippets/quickstart/08/00/01-in.yaml diff --git a/doc/snippets/quickstart/09/01/title b/doc/snippets/quickstart/08/00/title similarity index 100% rename from doc/snippets/quickstart/09/01/title rename to doc/snippets/quickstart/08/00/title diff --git a/doc/snippets/quickstart/09/02/code.nim b/doc/snippets/quickstart/08/01/00-code.nim similarity index 100% rename from doc/snippets/quickstart/09/02/code.nim rename to doc/snippets/quickstart/08/01/00-code.nim diff --git a/doc/snippets/quickstart/09/02/in.yaml b/doc/snippets/quickstart/08/01/01-in.yaml similarity index 100% rename from doc/snippets/quickstart/09/02/in.yaml rename to doc/snippets/quickstart/08/01/01-in.yaml diff --git a/doc/snippets/quickstart/09/02/title b/doc/snippets/quickstart/08/01/title similarity index 100% rename from doc/snippets/quickstart/09/02/title rename to doc/snippets/quickstart/08/01/title diff --git a/doc/snippets/quickstart/08/title b/doc/snippets/quickstart/08/title index 5fb44c7..d413d92 100644 --- a/doc/snippets/quickstart/08/title +++ b/doc/snippets/quickstart/08/title @@ -1 +1 @@ -Loading Nim objects from JSON +Processing a Sequence of Heterogeneous Items diff --git a/doc/snippets/quickstart/09/title b/doc/snippets/quickstart/09/title deleted file mode 100644 index d413d92..0000000 --- a/doc/snippets/quickstart/09/title +++ /dev/null @@ -1 +0,0 @@ -Processing a Sequence of Heterogeneous Items